Changeset 45 for trunk/Application/View

Timestamp:

Nov 24, 2009, 6:01:08 PM (15 years ago)

Author:

george

Message:

• Přidáno: Kontrolér pro přidávání nových hodnot.
• Opraveno: Informace o použité jednotce načítat z tabulky MeasureMethod.

Location:

trunk/Application/View

Files:

• Graph.php (modified) (3 diffs)
• Main.php (modified) (2 diffs)

trunk/Application/View/Graph.php

@@ -37 +37 @@
     $Measure->Differential = $this->Config['Application']['DefaultVariables']['Differential'];
     $Measure->Debug = $Debug;
+    $DbResult2 = $this->Database->select('MeasureMethod', '*', 'Id='.$Measure->Data['Method']);
+    $MeasureMethod = $DbResult2->fetch_assoc();
 
     $FontSize = $this->Config['Application']['FontSize'];
@@ -177 +179 @@
         $Y = $Height - 1 - ($VerticalLinesDistance * $I);
         //$Y = $Height - 1 - ($VerticalLinesDistance * $I / ($MaxValue - $MinValue) * $this->Config['Application']['ValueToImageHeigthCoefficient'] * $Height);
-        $Text = $this->System->AddPrefixMultipliers(round(($I * $VerticalLinesDistance / $Height / $this->Config['Application']['ValueToImageHeigthCoefficient'] * ($MaxValue - $MinValue) + $MinValue)), $Measure->Data['Unit'], 3);
+        $Text = $this->System->AddPrefixMultipliers(round(($I * $VerticalLinesDistance / $Height / $this->Config['Application']['ValueToImageHeigthCoefficient'] * ($MaxValue - $MinValue) + $MinValue)), $MeasureMethod['Unit'], 3);
         $BoundBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
         if(($Y - ($BoundBox[5] - $BoundBox[1]) / 2) > 10)
@@ -185 +187 @@
 
       $Left = $Width - 10;
-      $Text = '    Max. '.$this->System->AddPrefixMultipliers($MaxValue, $Measure->Data['Unit']);
+      $Text = '    Max. '.$this->System->AddPrefixMultipliers($MaxValue, $MeasureMethod['Unit']);
       $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
       $Left -= ($BoundingBox[2] - $BoundingBox[0]);
       imagettftext($Image, $FontSize, 0, $Left, 14, $Red, $FontFile, $Text);
 
-      $Text = '    Avg.  '.$this->System->AddPrefixMultipliers($AvgValue, $Measure->Data['Unit']);
+      $Text = '    Avg.  '.$this->System->AddPrefixMultipliers($AvgValue, $MeasureMethod['Unit']);
       $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
       $Left -= ($BoundingBox[2] - $BoundingBox[0]);
       imagettftext($Image, $FontSize, 0, $Left, 14, $Green, $FontFile, $Text);
 
-      $Text = '    Min.  '.$this->System->AddPrefixMultipliers($MinValue, $Measure->Data['Unit']);
+      $Text = '    Min.  '.$this->System->AddPrefixMultipliers($MinValue, $MeasureMethod['Unit']);
       $BoundingBox = imagettfbbox($FontSize, 0, $FontFile, $Text);
       $Left -= ($BoundingBox[2] - $BoundingBox[0]);

trunk/Application/View/Main.php

@@ -180 +180 @@
     $Output .= '</tr>';
     $Result = $this->Database->select('Measure', '*', 'Enabled=1 ORDER BY Description');
-    //echo($Database->error);
-
     while($Measure = $Result->fetch_array())
     {
+      $DbResult2 = $this->Database->select('MeasureMethod', '*', 'Id='.$Measure['Method']);
+      $MeasureMethod = $DbResult2->fetch_assoc();
       $StopWatchStart = $this->System->GetMicrotime();
       if(array_key_exists('Debug', $_GET))
@@ -196 +196 @@
         $Row = $Result2->fetch_array();
         $LastMeasureTime = date('j.n.Y G:i:s', $this->Database->MysqlDateTimeToTime($Row['Time']));
-        $LastMeasureValue = $this->System->AddPrefixMultipliers($Row['Avg'], $Measure['Unit']);
+        $LastMeasureValue = $this->System->AddPrefixMultipliers($Row['Avg'], $MeasureMethod['Unit']);
       } else
       {