Changeset 16651 for schedule

Timestamp:

06/03/13 17:52:49 (11 years ago)

Author:

tanio

Message:

 

File:

• schedule/js/chart.js (modified) (2 diffs)

schedule/js/chart.js

@@ -99 +99 @@
                         rows=line[row].split(',');
                         Temp[row]=rows[0];
-                        graphData[i].push(parseFloat(rows[4])}}parseFloat('0'));
+                        graphData[i].push(parseFloat(rows[4])||parseFloat('0'));
                         for(TT=0;TT<Temp.length;TT++)
                         {
@@ -111 +111 @@
                                         Hour.push(parseInt(rowsHour[1])||parseFloat('0'));
                         }
-                        
-                        Time[i].push(Hour[row]);
+                        for(vTime=0;vTime<Hour.length;vTime++)
+                        {
+                                if(Hour[vTime]==0)
+                                {
+                                        if(Hour[vTime]==8)
+                                        {
+                                                HourMin.push(Hour[vTime]+24+ '.08');
+                                        }
+                                        else
+                                                HourMin.push(Hour[vTime]+24+'.'+colonMin[vTime]);
+                                }
+                                else if(Hour[vTime]==1)
+                                {
+                                        if(Hour[vTime]==8)
+                                        {
+                                                HourMin.push(Hour[vTime]+24+ '.08');
+                                        }
+                                        else
+                                                HourMin.push(Hour[vTime]+24+'.'+colonMin[vTime]);
+                                }
+                                else if(Hour[vTime]==2)
+                                {
+                                        if(Hour[vTime]==8)
+                                        {
+                                                HourMin.push(Hour[vTime]+24+ '.08');
+                                        }
+                                        else
+                                                HourMin.push(Hour[vTime]+24+'.'+colonMin[vTime]);
+                                }
+                                else if(Hour[vTime]==3)
+                                {
+                                        if(Hour[vTime]==8)
+                                        {
+                                                HourMin.push(Hour[vTime]+24+ '.08');
+                                        }
+                                        else
+                                                HourMin.push(Hour[vTime]+24+'.'+colonMin[vTime]);
+                                }
+                                else if(Hour[vTime]==4)
+                                {
+                                        if(Hour[vTime]==8)
+                                        {
+                                                HourMin.push(Hour[vTime]+24+ '.08');
+                                        }
+                                        else
+                                                HourMin.push(Hour[vTime]+24+'.'+colonMin[vTime]);
+                                }
+                                else if(Hour[vTime]==5)
+                                {
+                                        if(Hour[vTime]==8)
+                                        {
+                                                HourMin.push(Hour[vTime]+24+ '.08');
+                                        }
+                                        else
+                                                HourMin.push(Hour[vTime]+24+'.'+colonMin[vTime]);
+                                }
+                                else if(Hour[vTime]==6)
+                                {
+                                        if(Hour[vTime]==8)
+                                        {
+                                                HourMin.push(Hour[vTime]+24+ '.08');
+                                        }
+                                        else
+                                                HourMin.push(Hour[vTime]+24+'.'+colonMin[vTime]);
+                                }
+                                else if(Hour[vTime]==7)
+                                {
+                                        if(Hour[vTime]==8)
+                                        {
+                                                HourMin.push(Hour[vTime]+24+ '.08');
+                                        }
+                                        else
+                                                HourMin.push(Hour[vTime]+24+'.'+colonMin[vTime]);
+                                }
+                                else if(Hour[vTime]==8)
+                                {
+                                        if(Hour[vTime]==8)
+                                        {
+                                                HourMin.push(Hour[vTime]+24+ '.08');
+                                        }
+                                        else
+                                                HourMin.push(Hour[vTime]+24+'.'+colonMin[vTime]);
+                                }
+                                else if(colonMin[vTime]==8)
+                                {
+                                        HourMin.push(Hour[vTime] + '.08');
+                                }
+                                else
+                                
+                                        HourMin.push(Hour[vTime]+'.'+colonMin[vTime]);
+                                
+                                
+                        }
+                        Time[i].push(HourMin[vTime]);
                         
                 }