Changeset 43 for trunk/Application/View/Main.php

Timestamp:

Nov 24, 2009, 2:03:29 PM (14 years ago)

Author:

george

Message:

• Upraveno: Skripty pro načítání hodnot byly pročištěny a přepsány na třídy. Pro definici místně měřených veličin nyní použita tabulky MeasureClient odkazující se na tabulku MeasureMethod obsahující globální registr měřících metod.
• Opraveno: Různé chyby vzniklé při přepisu třídy Measure a použité pro zobrazení obrázku grafu.

File:

• trunk/Application/View/Main.php (modified) (5 diffs)

trunk/Application/View/Main.php

@@ -100 +100 @@
     $Debug = 0;
 
-    foreach($this->Config['DefaultVariables'] as $Index => $Variable)
+    foreach($this->Config['Application']['DefaultVariables'] as $Index => $Variable)
     {
       if(!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $Variable;
@@ -147 +147 @@
     {
       $Output .= 'Délka úseku: ';
-      foreach($GrafTimeRanges as $Index => $Item)
+      foreach($this->GraphTimeRanges as $Index => $Item)
         $Output .= '<a href="?Period='.$Index.'">'.$Item['caption'].'</a>&nbsp;';
       $Output .= '<br/>';
@@ -167 +167 @@
   {
     $Output = '<strong>Graf:</strong><br/>';
-    $Output .= '<img alt="Graf" src="?Module=Graph&amp;Measure='.$_SESSION['Measure'].'&amp;From='.$_SESSION['TimeStart'].'&amp;To='.$_SESSION['TimeEnd'].'&amp;Width=750&amp;Height=200&amp;Differential='.$_SESSION['Differential'].'" width="750" height="200"><br>';
+    $Output .= '<img alt="Graf" src="?M=Graph&amp;Measure='.$_SESSION['Measure'].'&amp;From='.$_SESSION['TimeStart'].'&amp;To='.$_SESSION['TimeEnd'].'&amp;Width='.$this->Config['Application']['GraphSize']['Width'].'&amp;Height='.$this->Config['Application']['GraphSize']['Height'].'&amp;Differential='.$_SESSION['Differential'].'" width="'.$this->Config['Application']['GraphSize']['Width'].'" height="'.$this->Config['Application']['GraphSize']['Height'].'"><br>';
     $Output .= '<a href="?Measure='.$_SESSION['Measure'].'&amp;TimeStart='.$_SESSION['TimeStart'].'&amp;TimeEnd='.$_SESSION['TimeEnd'].'&amp;TimeSpecify=1&amp;Differential='.$_SESSION['Differential'].'">Odkaz na vybraný graf</a><br>';
 //print_r(GetValues($Measure, $TimeStart, $TimeEnd));
@@ -191 +191 @@
         $RowCount = $RowCount[0];
       }
-      $Result2 = $this->Database->select($Measure['DataTable'], 'Time, Average', 'Measure='.$Measure['Id'].' AND Level=0 ORDER BY Time DESC LIMIT 1');
+      $Result2 = $this->Database->select($Measure['DataTable'], 'Time, Avg', 'Measure='.$Measure['Id'].' AND Level=0 ORDER BY Time DESC LIMIT 1');
       if($Result2->num_rows > 0)
       {
         $Row = $Result2->fetch_array();
-        $LastMeasureTime = date('j.n.Y G:i:s', MysqlDateTimeToTime($Row['Time']));
-        $LastMeasureValue = AddPrefixMultipliers($Row['Average'], $Measure['Unit']);
+        $LastMeasureTime = date('j.n.Y G:i:s', $this->Database->MysqlDateTimeToTime($Row['Time']));
+        $LastMeasureValue = $this->System->AddPrefixMultipliers($Row['Avg'], $Measure['Unit']);
       } else
       {
@@ -202 +202 @@
         $LastMeasureValue = '&nbsp;';
       }
-      if($Measure['Continuity'] == 1) $Interpolate = 'Ano'; else $Interpolate = 'Ne';
+      if($Measure['Continuity'] == 1) $Interpolate = 'Ano'; 
+        else $Interpolate = 'Ne';
       if($Measure['Info'] == '') $Measure['Info'] = '&nbsp;';
       $GenerationTime = floor(($this->System->GetMicrotime() - $StopWatchStart) * 1000  ) / 1000;