Changeset 16686

Timestamp:

06/04/13 15:20:33 (12 years ago)

Author:

tanio

Message:

 

Location:

schedule

Files:

• Module/Scheduling.php (modified) (1 diff)
• function/function.php (modified) (1 diff)
• include/factdb.php (modified) (1 diff)
• js/chart.js (modified) (6 diffs)

schedule/Module/Scheduling.php

@@ -4 +4 @@
 ?>
 <table width="100%" id="TableHolder" >
-<?php echo $_GET['year'],'-',$_GET['month'],'-',$_GET['day'];?>
+
         <tr>
                 <td width="184" style="border:1px solid white; color:#37DFB1; font-size:14px;" align="center"  >Time</td>

schedule/function/function.php

@@ -58 +58 @@
         ?>
         $('#save').click(function(){
-                alert(getDate());
+        
         
                 var InputValue = [];

schedule/include/factdb.php

@@ -2 +2 @@
 
         
-//      $con=mysql_connect("localhost","root","");
+        //$con=mysql_connect("localhost","root","");
         $con=mysql_connect("localhost","scheduletest","t3stsched");
         mysql_select_db("sandboxschedule",$con);

schedule/js/chart.js

@@ -11 +11 @@
         }
 }
-function getDate(day){
-        
-                var days = day;
-                return days;
-        }
+
 
 function GetXMLData(index, source) 
@@ -32 +28 @@
                         //alert("request ok");
                         line=XML.responseText.split('\n');
-                        dataSource.push(new Array());
-            n = dataSource.length-1;
-                for(row=0;row<line.length;row++)
-                                {
-                        rows=line[row].split(',');
-                                dataSource[n].push(parseFloat(rows[4])||parseFloat('0'));
-                                }
+                        dataSource.push(line);
                         if (dataSource.length == source.length)
                                 {
@@ -94 +84 @@
         };
         //This function splits the lines of data per data source
-        //var dataGraph = new Array(source.length);
+        var dataGraph = new Array(source.length);
         var Time = new Array(source.length);
         var Temp = new Array();
@@ -103 +93 @@
         for (i=0; i<source.length; i++) 
         {
-                //dataGraph[i] = new Array(); //dataGraph contains the individual points for each source i
+                dataGraph[i] = new Array(); //dataGraph contains the individual points for each source i
                 Time[i] = new Array(); // Time contains the individual time for each sources.
                 chart.addSeries({name:source[i], data:[]}); // created a series of data and add name of displayed source        
@@ -110 +100 @@
                         //rows=line[row].split(',');
                         Temp[row]=dataSource[i][0];
-                        //dataGraph[i].push(parseFloat(rows[4])||parseFloat('0'));
+                        dataGraph[i].push(parseFloat(rows[4])||parseFloat('0'));
                         for(T=0;T<Temp.length;T++)
                         {
@@ -181 +171 @@
                         
                 }
-                for(Graph=0;Graph<dataSource[i].length;Graph++)
+                for(Graph=0;Graph<dataGraph[i].length;Graph++)
                 {                                               
                                 chart.series[i].addPoint({ // series[0] means index of zero in data;
                                 x:Time[i][Graph], // Time
-                                y:dataSource[i][Graph] // Value
+                                y:dataGraph[i][Graph] // Value
                                 })
                 }