Index: schedule/Module/calendar.php
===================================================================
--- schedule/Module/calendar.php	(revision 16222)
+++ schedule/Module/calendar.php	(revision 16223)
@@ -90,195 +90,193 @@
 							var DataVal = [];
 							var source=['Mrk 421'];
-							
-							for(var i=0; i<source.length;i++)
+							var lines = [];
+							function LoadData()
 							{
-								if(window.XMLHttpRequest)
+								for(var i=0; i<source.length;i++)
 								{
-										xml=new XMLHttpRequest();
+									if(window.XMLHttpRequest)
+									{
+											xml=new XMLHttpRequest();
+									}
+									else
+									{
+											xml=new ActiveXObject("Microsoft.XMLHTTP");
+									}
+									xml.onreadystatechange = function()
+									{
+										if(xml.readyState==4 && xml.status ==200)
+										{
+											
+												var lines[i]=xml.responseText.split("\n");
+												
+											
+										}
+									}
+									xml.open("GET","http://www.fact-project.org/smartfact/index.php?source="+escape(source[i])+"&time="+year+"-"+month+"-"+day,true);
+									xml.send();
 								}
-								else
+								Charts(lines[i]);
+							}
+							LoadData();
+							function Charts(line)
+							{
+								for(var row=0;row<line.length;row++)
 								{
-										xml=new ActiveXObject("Microsoft.XMLHTTP");
+									var splitted=line[row].split(',');
+										Time1[row]=splitted[0];
+									for(var SplittedTime=0;SplittedTime<Time1.length;SplittedTime++)
+									{
+										var SplitTime=Time1[SplittedTime].split(':');
+										TimeColon[SplittedTime]=SplitTime[0];
+										MinTime[SplittedTime]=(parseInt(SplitTime[1]/60*100)||parseInt("0"));
+										for(var TimeT=0;TimeT<TimeColon.length;TimeT++)
+										{
+											var SplittedT=TimeColon[TimeT].split('T');
+											HourTime[TimeT]=(parseFloat(SplittedT[1])||parseInt('0'));
+										}
+									}
+										DataVal[row]=(parseFloat(splitted[4])||parseInt('0'));
+										//document.getElementById('data').innerHTML=DataValue;
+									
+										for(var Data=0; Data<DataVal.length;Data++)
+										{
+											if(DataVal[Data]==0)
+											{
+											
+											}
+											else
+												DataValue.push(parseFloat(DataVal[Data]));
+										}
+									
+									
+										for(var ConTime=1;ConTime<HourTime.length-1;ConTime++)
+										{
+											if(HourTime[ConTime]==0)
+											{
+												if(MinTime[ConTime]==8)
+												{
+													Time.push(HourTime[ConTime]+24+'.'+'.08');
+												}
+												else
+													Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
+											}
+											else if(HourTime[ConTime]==1)
+											{
+												if(MinTime[ConTime]==8)
+												{
+													Time.push(HourTime[ConTime]+24+'.'+'.08');
+												}
+												else
+													Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
+											}
+											else if(HourTime[ConTime]==2)
+											{
+												if(MinTime[ConTime]==8)
+												{
+													Time.push(HourTime[ConTime]+24+'.'+'.08');
+												}
+												else
+													Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
+											}
+											else if(HourTime[ConTime]==3)
+											{
+												if(MinTime[ConTime]==8)
+												{
+													Time.push(HourTime[ConTime]+24+'.'+'.08');
+												}
+												else
+													Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
+											}
+											else if(HourTime[ConTime]==4)
+											{
+												if(MinTime[ConTime]==8)
+												{
+													Time.push(HourTime[ConTime]+24+'.'+'.08');
+												}
+												else
+													Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
+											}
+											else if(HourTime[ConTime]==5)
+											{
+												if(MinTime[ConTime]==8)
+												{
+													Time.push(HourTime[ConTime]+24+'.'+'.08');
+												}
+												else
+													Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
+											}
+											else if(HourTime[ConTime]==6)
+											{
+												if(MinTime[ConTime]==8)
+												{
+													Time.push(HourTime[ConTime]+24+'.'+'.08');
+												}
+												else
+													Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
+											}
+											else
+												Time.push(HourTime[ConTime]+'.'+MinTime[ConTime]);
+												
+										}
+									
+									//GrapData(Data,Time);
+									
 								}
-								xml.onreadystatechange = function()
+								 var options = {
+										chart: {
+											renderTo: 'container' /* display to div Graph*/
+											
+										},
+										
+										xAxis: {
+											categories:["12PM","1PM","2PM","3PM","4PM","5PM","6PM","7PM","8PM","9PM","10PM","11PM","12AM","1AM","2AM","3AM","4AM","5AM","6AM","7AM","8AM","9AM","10AM","12PM"]
+										},
+										series:[], /* array of Data  */
+										
+										remove:function()
+										{
+											return false;
+										},
+										
+										 exporting: {							/*--------------------*/
+											buttons: {							/*					  */
+												exportButton: {					/*		Export		  */
+													menuItems: null,			/*		  to		  */
+													onclick: function() {		/*			PNG.file  */
+														this.exportChart();		/*--------------------*/
+													}
+												}
+											}
+										},
+										plotOptions : {
+										
+										series : {
+												lineWidth: 3,
+										
+											marker : {
+												enabled:false
+											}
+										}
+									}				
+								};
+								var chart=new Highcharts.Chart(options);
+								for(var src=0;src<source.length;src++)
 								{
-									if(xml.readyState==4 && xml.status ==200)
-									{
-										function LoadData()
-										{
-											var lines=xml.responseText.split("\n");
-											Charts(lines);
-										}
-										
-										LoadData();
-										function Charts(line)
-										{
-											for(var row=0;row<line.length;row++)
-											{
-												var splitted=line[row].split(',');
-													Time1[row]=splitted[0];
-												for(var SplittedTime=0;SplittedTime<Time1.length;SplittedTime++)
-												{
-													var SplitTime=Time1[SplittedTime].split(':');
-													TimeColon[SplittedTime]=SplitTime[0];
-													MinTime[SplittedTime]=(parseInt(SplitTime[1]/60*100)||parseInt("0"));
-													for(var TimeT=0;TimeT<TimeColon.length;TimeT++)
-													{
-														var SplittedT=TimeColon[TimeT].split('T');
-														HourTime[TimeT]=(parseFloat(SplittedT[1])||parseInt('0'));
-													}
-												}
-													DataVal[row]=(parseFloat(splitted[4])||parseInt('0'));
-													//document.getElementById('data').innerHTML=DataValue;
-												
-													for(var Data=0; Data<DataVal.length;Data++)
-													{
-														if(DataVal[Data]==0)
-														{
-														
-														}
-														else
-															DataValue.push(parseFloat(DataVal[Data]));
-													}
-												
-												
-													for(var ConTime=1;ConTime<HourTime.length-1;ConTime++)
-													{
-														if(HourTime[ConTime]==0)
-														{
-															if(MinTime[ConTime]==8)
-															{
-																Time.push(HourTime[ConTime]+24+'.'+'.08');
-															}
-															else
-																Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
-														}
-														else if(HourTime[ConTime]==1)
-														{
-															if(MinTime[ConTime]==8)
-															{
-																Time.push(HourTime[ConTime]+24+'.'+'.08');
-															}
-															else
-																Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
-														}
-														else if(HourTime[ConTime]==2)
-														{
-															if(MinTime[ConTime]==8)
-															{
-																Time.push(HourTime[ConTime]+24+'.'+'.08');
-															}
-															else
-																Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
-														}
-														else if(HourTime[ConTime]==3)
-														{
-															if(MinTime[ConTime]==8)
-															{
-																Time.push(HourTime[ConTime]+24+'.'+'.08');
-															}
-															else
-																Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
-														}
-														else if(HourTime[ConTime]==4)
-														{
-															if(MinTime[ConTime]==8)
-															{
-																Time.push(HourTime[ConTime]+24+'.'+'.08');
-															}
-															else
-																Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
-														}
-														else if(HourTime[ConTime]==5)
-														{
-															if(MinTime[ConTime]==8)
-															{
-																Time.push(HourTime[ConTime]+24+'.'+'.08');
-															}
-															else
-																Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
-														}
-														else if(HourTime[ConTime]==6)
-														{
-															if(MinTime[ConTime]==8)
-															{
-																Time.push(HourTime[ConTime]+24+'.'+'.08');
-															}
-															else
-																Time.push(HourTime[ConTime]+24+'.'+MinTime[ConTime]);
-														}
-														else
-															Time.push(HourTime[ConTime]+'.'+MinTime[ConTime]);
-															
-													}
-												
-												//GrapData(Data,Time);
-												
-											}
-											 var options = {
-													chart: {
-														renderTo: 'container' /* display to div Graph*/
-														
-													},
-													
-													xAxis: {
-														categories:["12PM","1PM","2PM","3PM","4PM","5PM","6PM","7PM","8PM","9PM","10PM","11PM","12AM","1AM","2AM","3AM","4AM","5AM","6AM","7AM","8AM","9AM","10AM","12PM"]
-													},
-													series:[], /* array of Data  */
-													
-													remove:function()
-													{
-														return false;
-													},
-													
-													 exporting: {							/*--------------------*/
-														buttons: {							/*					  */
-															exportButton: {					/*		Export		  */
-																menuItems: null,			/*		  to		  */
-																onclick: function() {		/*			PNG.file  */
-																	this.exportChart();		/*--------------------*/
-																}
-															}
-														}
-													},
-													plotOptions : {
-													
-													series : {
-															lineWidth: 3,
-													
-														marker : {
-															enabled:false
-														}
-													}
-												}				
-											};
-											var chart=new Highcharts.Chart(options);
-											for(var src=0;src<i;src++)
-											{
-												chart.addSeries({name:source[src], data:[]}); // created a series of data and add name of displayed source
-												for(var DataCnt=0;DataCnt<DataValue.length;DataCnt++)
-												{
-													
-													chart.series[src].addPoint({ // series[0] means index of zero in data;
-													x:Time[DataCnt], // Time
-													y:DataValue[DataCnt] // Value
-													})
-													//document.getElementById('data').innerHTML=Time[src][DataCnt];
-													
-												}
-												
-											}
-											return Charts;
-										}
-										Charts();
-										
-										
-									}
+									chart.addSeries({name:source[src], data:[]}); // created a series of data and add name of displayed source
+									for(var DataCnt=0;DataCnt<DataValue[src].length;DataCnt++)
+									{
+										
+										chart.series[src].addPoint({ // series[0] means index of zero in data;
+										x:Time[src][DataCnt], // Time
+										y:DataValue[src][DataCnt] // Value
+										})
+										//document.getElementById('data').innerHTML=Time[src][DataCnt];
+										
+									}
+									
 								}
-								xml.open("GET","http://www.fact-project.org/smartfact/index.php?source="+escape(source[i])+"&time="+year+"-"+month+"-"+day,true);
-								xml.send();
-								
-								
+								return Charts;
 							}
+							Charts();
 							//Charts();
 							$('#Graph').load('chart.php?day='+day+"&month="+month+"&year="+year);