Changeset 15703

Timestamp:

05/20/13 07:16:39 (12 years ago)

Author:

tanio

Message:

 

File:

• schedule/Module/calendar.php (modified) (1 diff)

schedule/Module/calendar.php

@@ -81 +81 @@
                                                                                         Time[row]=f[0];
                                                                                         //var DateT= new Date(Time);
-                                                                                        //arr[row]="["+f[4]+"]";
-                                                                                        for(var t=0; t<Time.length;t++)
-                                                                                        {
-                                                                                                var x=Time[t].split('T');
-                                                                                                arr[t]=x[1];
-                                                                                                for(var st=0;st<arr.length;st++)
-                                                                                                {
-                                                                                                        var c=Time[st].split(':');
-                                                                                                
-                                                                                                                newline[row]=(parseFloat(f[4])||parseInt("0"));
-                                                                                                                
-                                                                                                        
-                                                                                                }
-                                                                                                //h[t]=x[1];
-                                                                                                        
-                                                                                        }
-                                                                                
+                                                                                        //arr[row]="["+f[4]+"]";        
+                                                                                        newline[row]=(parseFloat(f[4])||parseInt("0"));
+                                                                                        
+                                                                                 }
                                                                         }
                                                                         newdata=newline.join(",");
                                                                         document.getElementById('data').innerHTML=newdata;
-                                                                        $(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: []
-                                                                                };
-
-                                                                                newline = JSON.parse(newline);
-                                                                                var names = [];
-                                                                                $.each(newline, function (i, ligne) {
-                                                                                        var ind = names.indexOf(ligne.name),
-                                                                                                splited = ligne.newline.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].newline.push([x,y]);    
+                                                                        /*if(source==<?php echo $rows['SourceID']; ?>)
+                                                                        {
+                                                                                if(chart.series)
+                                                                                {
+                                                                                        <?php $s=$rows['SourceID']; ?>*/
+                                                                                                chart.addSeries({name:$(this).text(),
+                                                                                                data:[newdata]
+                                                                                        });
+                                                                                /*}
+                                                                        }
+                                                                        /*for (var i = 0; i < newSeries.data.length; i++) {
+                                                                                         var datum = newSeries.data[i];
+                                                                                         datum.marker = {
+                                                                                                 enabled: false, 
+                                                                                                 states: {
+                                                                                                         hover: {
+                                                                                                                 enabled: false,
+                                                                                                                 lineColor: '#ff0000'
+                                                                                                         }
+                                                                                                 }
+                                                                                        };
+                                                                        for(var c=0;c<newline.length;c++)
+                                                                        {
+                                                                                arr[c];
+                                                                        };*/
+                                                                        var chart = new Highcharts.Chart({
+                                                                        
+                                                                        
+                                                                                chart: {
+                                                                                        renderTo: 'container' /* display to div Graph*/
+                                                                           },
+                                                                                
+                                                                                xAxis: {
+                                                                                labels: {
+                                                                                                        rotation: -45,
+                                                                                                        align: 'right',
+                                                                                                        },
+                                                                                        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:[], /* array of Data  */
+                                                                                
+                                                                                remove:function()
+                                                                                {
+                                                                                        return false;
+                                                                                },
+                                                                                
+                                                                                 exporting: {                                                   /*--------------------*/
+                                                                                  buttons: {                                                    /*                                        */
+                                                                                        exportButton: {                                 /*              Export            */
+                                                                                                menuItems: null,                        /*                to              */
+                                                                                                   onclick: function() {                /*                      PNG.file  */
+                                                                                                                this.exportChart();             /*--------------------*/
+                                                                                                        }
+                                                                                                }
                                                                                         }
-                                                                                });
+                                                                                },
                                                                                 
-                                                                                console.log(options);
-
-                                                                                var chart = new Highcharts.Chart(options);
+                                                                                plotOptions:
+                                                                                {
+                                                                                series: {
+                                                                                                marker: {
+                                                                                                        enabled: true,
+                                                                                                        
+                                                                                                }
+                                                                                                 
+                                                                                }
+                                                                                },
+                                                                        
+                                                                                
+                                                                                
                                                                         });
+                                                                        /*$('#add').click(function(){
+                                                                                
+                                                                        });*/
+                                                                        
                                                                         
                                                                 }