Index: schedule/Module/calendar.php
===================================================================
--- schedule/Module/calendar.php	(revision 16215)
+++ schedule/Module/calendar.php	(revision 16216)
@@ -106,110 +106,114 @@
 									if(xml.readyState==4 && xml.status ==200)
 									{
-										var lines=xml.responseText.split("\n");
-										for(var row=0;row<lines.length;row++)
+										function LoadData()
 										{
-											var splitted=lines[row].split(',');
-												Time1[row]=splitted[0];
-											for(var SplittedTime=0;SplittedTime<Time1.length;SplittedTime++)
+											var lines=xml.responseText.split("\n");
+											for(var row=0;row<lines.length;row++)
 											{
-												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 splitted=lines[row].split(',');
+													Time1[row]=splitted[0];
+												for(var SplittedTime=0;SplittedTime<Time1.length;SplittedTime++)
 												{
-													var SplittedT=TimeColon[TimeT].split('T');
-													HourTime[TimeT]=(parseFloat(SplittedT[1])||parseInt('0'));
+													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);
+												
 											}
-												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);
-											
+											Charts(DataValue,Time);
 										}
 										
-										
-										function Charts()
+										LoadData();
+										function Charts(y,x)
 										{
 											 var options = {
@@ -254,10 +258,10 @@
 											{
 												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++)
+												for(var DataCnt=0;DataCnt<y[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
+													x:x[src][DataCnt], // Time
+													y:y[src][DataCnt] // Value
 													})
 													//document.getElementById('data').innerHTML=Time[src][DataCnt];
