Index: /schedule/Module/calendar.php
===================================================================
--- /schedule/Module/calendar.php	(revision 16193)
+++ /schedule/Module/calendar.php	(revision 16194)
@@ -46,11 +46,11 @@
 					?>
 			
-             <?php
+             // 20130507: { klass: "highlight", tooltip: "%Y/%m/%d (%A)<br />That was yesterday" },
+             // 20130508: { klass: "highlight", tooltip: "And this is TODAY" }
+			<?php
 				}
 			?>
 			};
-		// 20130507: { klass: "highlight", tooltip: "%Y/%m/%d (%A)<br />That was yesterday" },
-             // 20130508: { klass: "highlight", tooltip: "And this is TODAY" }
-			
+		
 			function getDateInfo(date, wantsClassName) {
               var as_number = Calendar.dateToInt(date);
@@ -78,205 +78,188 @@
 							var xml;
 							var Time = [[]];
-							var DataValue = [[]];
-							var Time1 = [];
+							var Data = [[]];
 							var TimeColon = [];
 							var MinTime = [];
 							var HourTime = [];
 							var DataVal = [];
-							var source=['Crab','Mrk 501','Mrk 421'];
-							
+							var source=['Crab','Mrk 501','Mrk 402'];
+							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
+												}
+											}
+										}				
+									};
+							for(var i=0; i<source.length;i++)
+							{
 								
-								for(var i=0; i<source.length;i++)
+								if(window.XMLHttpRequest)
 								{
+										xml=new XMLHttpRequest();
+								}
+								else
+								{
+										xml=new ActiveXObject("Microsoft.XMLHTTP");
+								}
+								xml.onreadystatechange = function()
+								{
+									if(xml.readyState==4 && xml.status ==200)
+									{
+										var lines=xml.responseText.split("\n");
+										for(var row=0;row<lines.length;row++)
+										{
+											var splitted=lines[row].split(',');
+												Time[row]=splitted[0];
+											for(var SplittedTime=0;SplittedTime<Time.length;SplittedTime++)
+											{
+												var SplitTime=Time[SplittedTime].split(':');
+												TimeColon[SplittedTime]=SplitTime[0];
+												MinTime[SplittedTime]=(parseInt(SplitTime[1]/60*100)||parseFloat("0"));
+												for(var TimeT=0;TimeT<TimeColon.length;TimeT++)
+												{
+													var SplittedT=TimeColon[TimeT].split('T');
+													HourTime[TimeT]=(parseFloat(SplittedT[1])||parseFloat('0'));
+												}
+											}
+												DataVal[row]=(parseFloat(splitted[4])||parseFloat('0'));
+											for(var Data=0; Data<DataVal.length;Data++)
+											{
+												if(DataVal[Data]==0)
+												{
+												
+												}
+												else
+													Data[i][Data]=parseFlaot(DataVal[Data]);
+											}
+											for(var ConTime=1;ConTime<HourTime.length-1;ConTime++)
+											{
+												if(HourTime[ConTime]=='0')
+												{
+													if(MinTime[ConTime]==8)
+													{
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+'.08';
+													}
+													else
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+MinTime[ConTime];
+												}
+												else if(HourTime[ConTime]=='1')
+												{
+													if(MinTime[ConTime]==8)
+													{
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+'.08';
+													}
+													else
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+MinTime[ConTime];
+												}
+												else if(HourTime[ConTime]==2)
+												{
+													if(MinTime[ConTime]==8)
+													{
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+'.08';
+													}
+													else
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+MinTime[ConTime];
+												}
+												else if(HourTime[ConTime]==3)
+												{
+													if(MinTime[ConTime]==8)
+													{
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+'.08';
+													}
+													else
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+MinTime[ConTime];
+												}
+												else if(HourTime[ConTime]==4)
+												{
+													if(MinTime[ConTime]==8)
+													{
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+'.08';
+													}
+													else
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+MinTime[ConTime];
+												}
+												else if(HourTime[ConTime]==5)
+												{
+													if(MinTime[ConTime]==8)
+													{
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+'.08';
+													}
+													else
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+MinTime[ConTime];
+												}
+												else if(HourTime[ConTime]==6)
+												{
+													if(MinTime[ConTime]==8)
+													{
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+'.08';
+													}
+													else
+														Time[i][ConTime]=HourTime[ConTime]+24+'.'+MinTime[ConTime];
+												}
+												else
+													Time[i][ConTime]=HourTime[ConTime]+'.'+MinTime[ConTime];
+											}
+											//GrapData(Data,Time);
+										}
 									
-									if(window.XMLHttpRequest)
+									var chart = new Highcharts.Chart(options);
+									for(var src=0;src<i;src++)
 									{
-											xml=new XMLHttpRequest();
-									}
-									else
-									{
-											xml=new ActiveXObject("Microsoft.XMLHTTP");
-									}
-									xml.onreadystatechange = function()
-									{
-										if(xml.readyState==4 && xml.status ==200)
+										chart.addSeries({name:source[src], data:[]}); // created a series of data and add name of displayed source
+										for(var DataCnt=0;DataCnt<Data.length;DataCnt++)
 										{
-											var lines=xml.responseText.split("\n");
-											for(var row=0;row<lines.length;row++)
-											{
-												var splitted=lines[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]);
-															
-													}
-												
-												//loadGraph(DataValue,Time);
-												
-											}
-											
+											
+											chart.series[i].addPoint({ // series[0] means index of zero in data;
+											x:Time[src][DataCnt], // Time
+											y:Data[src][DataCnt] // Value
+											})
 											
 										}
-									}
-									xml.open("GET","http://www.fact-project.org/smartfact/index.php?source="+escape(source[i])+"&time="+year+"-"+month+"-"+day,true);
-									xml.send();
-								
-								
-									
-								}
-								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<x[src].length;DataCnt++)
-									{
-										
-										chart.series[src].addPoint({ // series[0] means index of zero in data;
-										x:x[src][DataCnt], // Time
-										y:y[src][DataCnt] // Value
-										})
-										
 										
 									}
-									
+								
+										
+									}
 								}
+								xml.open("GET","http://www.fact-project.org/smartfact/index.php?source="+escape(source[i])+"&time="+year+"-"+month+"-"+day,true);
+								xml.send();
+								$('#Graph').load('chart.php?day='+day+"&month="+month+"&year="+year);
 								
-								document.getElementById('data').innerHTML=x;
-						
+							}
 							
-							//loadGraph();
-							$('#Graph').load('chart.php?day='+day+"&month="+month+"&year="+year);
 							
 						  });
 
                 //]]></script>
-				
               </td>
             </tr>