Changeset 16127 for schedule/Module

Timestamp:

05/24/13 15:46:10 (11 years ago)

Author:

tanio

Message:

 

File:

• schedule/Module/calendar.php (modified) (2 diffs)

schedule/Module/calendar.php

@@ -195 +195 @@
                                                                                         //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<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<Data[src].length;DataCnt++)
+                                                                                {
+                                                                                        
+                                                                                        chart.series[src].addPoint({ // series[0] means index of zero in data;
+                                                                                        x:Time[src][DataCnt], // Time
+                                                                                        y:Data[src][DataCnt] // Value
+                                                                                        })
+                                                                                        
+                                                                                }
+                                                                        }
                                                                 
                                                                                 
@@ -202 +252 @@
                                                                 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);
                                                                 
                                                         }
-                                                        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++)
-                                                        {
-                                                                chart.addSeries({name:source[src], data:[]}); // created a series of data and add name of displayed source
-                                                                for(var DataCnt=0;DataCnt<Data[src].length;DataCnt++)
-                                                                {
-                                                                        
-                                                                        chart.series[src].addPoint({ // series[0] means index of zero in data;
-                                                                        x:Time[src][DataCnt], // Time
-                                                                        y:Data[src][DataCnt] // Value
-                                                                        })
-                                                                        
-                                                                }
-                                                        }
-                                                        $('#Graph').load('chart.php?day='+day+"&month="+month+"&year="+year);
+                                                        
+                                                        
                                                   });