Index: schedule/Module/calendar.php
===================================================================
--- schedule/Module/calendar.php	(revision 16288)
+++ schedule/Module/calendar.php	(revision 16289)
@@ -100,225 +100,242 @@
 							var month =this.selection.print("%m").join("\n");
 							var year =this.selection.print("%Y").join("\n");				  
-							var xml;
-							var Time = [];
-							var DataValue = [];
-							var Time1 = [];
-							var TimeColon = [];
-							var MinTime = [];
-							var HourTime = [];
-							var DataVal = [];
-							var source=['Mrk 421','Mrk 501'];
-							var lines = [];
-							<?php 
-							$sqlSched2=mysql_query("SELECT*FROM schedule");
-							while($rowSched2=mysql_fetch_array($sqlSched2))
-							{
 							
-								$timestamp2=strtotime($rowSched2['fStart']);
-							 ?>
-								if(year+"-"+day+"-"+month==<?php echo date('Y-d-m',$timestamp2); ?>)
-								{
-									alert('zz');
-								}
-							<?php
-							}
-							?>
-							else
-							{
-									var options = {
-										chart: {
-											renderTo: 'container',
-											type:'line'/* display to div Graph*/
-											
-										},
-										
-										xAxis: {
-											categories:[]
+							var newline = [];	
+							var YaxisData = [];
+							var Timedata=[]; 
+							var newtime;
+							var source=['Mrk 421','Crab'];
+							var options = {
+											chart: {
+												renderTo: 'container' /* display to div Graph*/
+												
 											},
-										series:[], /* array of Data  */
-										
-										remove:function()
-										{
-											return false;
-										},
-										
-										 exporting: {							/*--------------------*/
-											buttons: {							/*					  */
-												exportButton: {					/*		Export		  */
-													menuItems: null,			/*		  to		  */
-													onclick: function() {		/*			PNG.file  */
-														this.exportChart();		/*--------------------*/
+											
+											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:true
+											},
+											plotOptions : {
+											
+											series : {
+													lineWidth: 3,
+											
+												marker : {
+													enabled:false
+												}
 											}
 										}
-									}				
-								};
-
-
+										
+										
+										
+									};
 							
-								for(var i=0; i<source.length;i++)
+							var xmlhttp;
+							
+							for (var src=0;src<source.length;src++)
+							{
+							if (window.XMLHttpRequest)
+							  {// code for IE7+, Firefox, Chrome, Opera, Safari
+							  xmlhttp=new XMLHttpRequest();
+							  }
+							else
+							  {// code for IE6, IE5
+							  xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");
+							  }
+							xmlhttp.onreadystatechange=function()
+							  {
+							  if (xmlhttp.readyState==4 && xmlhttp.status==200)
 								{
-									Time[i] = new Array();
-									DataValue[i] = new Array();
-									if(window.XMLHttpRequest)
+									var YaxisData[src] = new Array();
+									var Timedata[src] = new Array();
+									var lines = xmlhttp.responseText.split('\n');
+									var arr;
+									var arrTime = [];
+									var Time = [];
+									var colon = [];
+									var Temp = [];
+									
+									//var source = [];
+									for(var row=0;row<lines.length; row++) 
+									{ 
+													var f = lines[row].split(','); 
+													Time[row]=f[0]; 
+													 
+															for(var c=0;c<Time.length;c++) 
+															{ 
+																	var cst=Time[c].split(':'); 
+																	colon[c]=cst[0]; 
+																	Temp[c]=(parseInt(cst[1]/60*100)||parseFloat("0")); 
+																	for(var i=1;i<colon.length;i++) 
+																	{ 
+																			var st=colon[i].split('T'); 
+																			arrTime[i]=(parseFloat(st[1])||parseFloat("0")); 
+																	} 
+															} 
+													//arr[row]="["+f[4]+"]";         
+														newline[row]=(parseFloat(f[4])||parseFloat("0")); 
+
+													for(var c=0;c<newline.length;c++) 
+													{ 
+															if(newline[c]==0) 
+															{ 
+																		 
+															}                                                
+															else 
+															YaxisData[src][c]=newline[c]; 
+														} 
+													
+														var a=[]; 
+														for(var i=1;i<arrTime.length-1;i++) 
+														{ 
+															if(arrTime[i]==0) 
+															{ 
+																		if(Temp[i]==8) 
+																		{ 
+																				Timedata[src][i]=arrTime[i]+24+'.08'; 
+																		} 
+																		else 
+																		Timedata[src][i]=arrTime[i]+24+'.'+Temp[i]; 
+															} 
+																else if(arrTime[i]==1) 
+																{ 
+																		if(Temp[i]==8) 
+																		{ 
+																				Timedata[src][i]=arrTime[i]+24+'.08'; 
+																		} 
+																		else 
+																		Timedata[src][i]=arrTime[i]+24+'.'+Temp[i]; 
+															} 
+																else if(arrTime[i]==2) 
+																{ 
+																	if(Temp[i]==8) 
+																		{ 
+																				Timedata[src][i]=arrTime[i]+24+'.08'; 
+																		} 
+																		else 
+																		Timedata[src][i]=arrTime[i]+24+'.'+Temp[i];  
+																} 
+															else if(arrTime[i]==3) 
+																{ 
+																	if(Temp[i]==8) 
+																		{ 
+																				Timedata[src][i]=arrTime[i]+24+'.08'; 
+																		} 
+																		else 
+																		Timedata[src][i]=arrTime[i]+24+'.'+Temp[i];  
+															} 
+																else if(arrTime[i]==4) 
+																{ 
+																	if(Temp[i]==8) 
+																		{ 
+																				Timedata[src][i]=arrTime[i]+24+'.08'; 
+																		} 
+																		else 
+																		Timedata[src][i]=arrTime[i]+24+'.'+Temp[i]; 
+																} 
+																else if(arrTime[i]==5) 
+																{ 
+																		if(Temp[i]==8) 
+																		{ 
+																				Timedata[src][i]=arrTime[i]+24+'.08'; 
+																		} 
+																		else 
+																		Timedata[src][i]=arrTime[i]+24+'.'+Temp[i];  
+															} 
+																else if(arrTime[i]==6) 
+															{ 
+																	if(Temp[i]==8) 
+																		{ 
+																				Timedata[src][i]=arrTime[i]+24+'.08'; 
+																		} 
+																		else 
+																		Timedata[src][i]=arrTime[i]+24+'.'+Temp[i]; 
+															} 
+															else if(arrTime[i]==7) 
+																{ 
+																	iif(Temp[i]==8) 
+																		{ 
+																				Timedata[src][i]=arrTime[i]+24+'.08'; 
+																		} 
+																		else 
+																		Timedata[src][i]=arrTime[i]+24+'.'+Temp[i]; 
+																} 
+															else if(arrTime[i]==8) 
+															{ 
+																	if(Temp[i]==8) 
+																		{ 
+																				Timedata[src][i]=arrTime[i]+24+'.08'; 
+																		} 
+																		else 
+																		Timedata[src][i]=arrTime[i]+24+'.'+Temp[i]; 
+															} 
+															else if(Temp[i]==8) 
+																{ 
+																 
+																				Timedata[src][i]=arrTime[i]+'.08'; 
+																	 
+																} 
+																else 
+																Timedata[src][i]=arrTime[i]+'.'+Temp[i]; 
+																 
+														} 
+														
+														 
+										} 
+
+										
+										
+										
+									
+										
+										
+										//document.getElementById('data').innerHTML=Timedata+"T"+s;
+										//document.getElementById('sourcelist').innerHTML=; //aki man edit kuya
+										
+										
+										/*options.series.push({
+										
+											data:[parseFloat(Timedata),parseFloat(YaxisData1)]
+										});*/
+											
+									}
+								}
+								
+								xmlhttp.open("GET","http://www.fact-project.org/smartfact/index.php?source="+escape(source)+"&time="+year+"-"+month+"-"+day,true);
+								xmlhttp.send();
+							}
+								var chart = new Highcharts.Chart(options);
+								for(var src=0;src<source.length;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 i=0;i<Timedat[src].length;i++)
 										{
-												document.getElementById('data').innerHTML=DataValue;
-											
-												lines[i]=xml.responseText.split("\n");
-												for(var row=0;row<lines[i].length;row++)
-												{
-													var splitted=lines[i][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]==undefined)
-															{
-															
-															}
-															else if(DataVal[Data]==0)
-															{
-															
-															}
-															else
-																DataValue[i][Data]=parseFloat(DataVal[Data]);
-														}
-													
-													
-														for(var ConTime=1;ConTime<HourTime.length-1;ConTime++)
-														{
-															if(HourTime[ConTime]==undefined)
-															{
-															
-															}
-															else 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[ConTime]=HourTime[ConTime]+24+'.'+'.08';
-																}
-																else
-																	Time[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);
-													
-												}
+											
+											chart.series[0].addPoint({ // series[0] means index of zero in data;
+											x:Timedata[src][i], // Time
+											y:YaxisData[src][i] // Value
+											})
+											
 										}
 									}
-									xml.open("GET","http://www.fact-project.org/smartfact/index.php?source="+escape(source[i])+"&time="+year+"-"+month+"-"+day,true);
-									xml.send();
-								}
-								var chart=new Highcharts.Chart(options);
-								for(var src=0;src<source.length;src++)
-								{
-									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
-										})
-										
-										
-									}
-									
-								}	
-								//Charts(DataValue[[i]],Time);
-								$('#Graph').fadeOut();
-								$('#Graph').fadeIn('slow').load("chart.php?year="+year+"&day="+day+"&month="+month);
-							}
+								
+								$('#Graph').load('chart.php?day='+day+"&month="+month+"&year="+year);
+								
 							
 						  });