Changeset 15701

Timestamp:

05/20/13 06:42:57 (12 years ago)

Author:

tanio

Message:

 

File:

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

schedule/Module/calendar.php

@@ -101 +101 @@
                                                                         newdata=newline.join(",");
                                                                         document.getElementById('data').innerHTML=newdata;
+                                                                        /*for(var c=0;c<newline.length;c++)
+                                                                        {
+                                                                                arr[c];
+                                                                        };
                                                                         var chart = new Highcharts.Chart({
                                                                         
@@ -106 +110 @@
                                                                                 chart: {
                                                                                         renderTo: 'container' /* display to div Graph*/
-                                                                           },
+                                                                          /* },
                                                                                 
                                                                                 xAxis: {
@@ -114 +118 @@
                                                                                                         },
                                                                                         categories:["","","","","","","","19:00","20:00","21:00","22:00","23:00","24:00","1:00","2:00","3:00","4:00","5:00","6:00","7:00"]},
-                                                                                series:[{data:[parseFloat(newdata)]}], /* array of Data  */
-                                                                                
-                                                                                remove:function()
+                                                                                series:[], /* array of Data  */
+                                                                                
+                                                                                /*remove:function()
                                                                                 {
                                                                                         return false;
@@ -122 +126 @@
                                                                                 
                                                                                  exporting: {                                                   /*--------------------*/
-                                                                                  buttons: {                                                    /*                                        */
-                                                                                        exportButton: {                                 /*              Export            */
-                                                                                                        menuItems: null,                        /*                to              */
-                                                                                                   onclick: function() {                /*                      PNG.file  */
-                                                                                                                this.exportChart();             /*--------------------*/
-                                                                                                        }
+                                                                                  /*buttons: {                                                  /*                                        */
+                                                                                        /*exportButton: {                                       /*              Export            */
+                                                                                                /*      menuItems: null,                        /*                to              */
+                                                                                                  /* onclick: function() {              /*                      PNG.file  */
+                                                                                                        /*      this.exportChart();             /*--------------------*/
+                                                                                                        /*}
                                                                                                 }
                                                                                         }
@@ -149 +153 @@
                                                                                 
                                                                         });*/
-                                                                        
+                                                                        $(function () {
+                                                                                var data = '[{"name":"Station 1","data":"1360191600,398.625"},{"name":"Station 1","data":"1360192500,398.625"},{"name":"Station 1","data":"1360193400,398.25"},{"name":"Station 1","data":"1360194300,397.375"},{"name":"Station 1","data":"1360195200,397.5"},{"name":"Station 1","data":"1360196100,397.5"},{"name":"Station 1","data":"1360199700,396.75"},{"name":"Station 1","data":"1360200600,397"}]';
+
+
+                                                                                var options = {
+                                                                                        chart: {
+                                                                                                renderTo: 'container'
+                                                                                        },
+                                                                                        xAxis: {
+                                                                                                type:'datetime'
+                                                                                        },
+                                                                                        series: []
+                                                                                };
+
+                                                                                data = JSON.parse(data);
+                                                                                var names = [];
+                                                                                $.each(data, function (i, ligne) {
+                                                                                        var ind = names.indexOf(ligne.name),
+                                                                                                splited = ligne.data.split(','),
+                                                                                                x = parseFloat(splited[0]),
+                                                                                                y = parseFloat(splited[1]);
+                                                                                        if (ind == -1) {
+                                                                                                ind = names.push(ligne.name) - 1;
+                                                                                                options.series.push({
+                                                                                                        data: [],
+                                                                                                        name: ligne.name
+                                                                                                });
+                                                                                        } 
+                                                                                        if(!isNaN(x) && !isNaN(y)){
+                                                                                                options.series[ind].data.push([x,y]);    
+                                                                                        }
+                                                                                });
+                                                                                
+                                                                                console.log(options);
+
+                                                                                var chart = new Highcharts.Chart(options);
+                                                                        });
                                                                         
                                                                 }