Changeset 59 for branches/mvc/Application/View/Main.php

Timestamp:

Mar 1, 2015, 12:43:56 PM (9 years ago)

Author:

chronos

Message:

• Moved trunk as mvc branch.

Location:

branches/mvc

Files:

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

branches/mvc/Application/View/Main.php

@@ -113 +113 @@
     }
 
-    $Output = '<div class="Title">Statistiky</div>';
+    $Output = '<div class="Main">';
+    $Output .= '<div class="Title">Statistiky</div>';
 
     if(!array_key_exists('Operation', $_GET)) $_GET['Operation'] = '';
@@ -160 +161 @@
 
     $Output .= '<br/>'.$this->MeasureTable();
+    $Output .= '</div>';
     return($Output);
   }
@@ -178 +180 @@
   function MeasureTable()
   {
-    $Output = '<table border="1" cellspacing="0" cellpadding="2" style="font-size: small;">';
+    $Output = '<table class="WideTable">';
     $Output .= '<tr><th>Měřená veličina</th><th>Poslední hodnota</th><th>Čas posledního měření</th><th>Interpolace</th><th>Poznámky</th>';
     if(array_key_exists('Debug', $_GET)) $Output .= '<th>Počet položek</th><th>Čas vykonání</th>';
     $Output .= '</tr>';
+    $PrefixMultiplier = new PrefixMultiplier();
     $Result = $this->Database->select('Measure', '*', 'Enabled=1 ORDER BY Description');
     while($Measure = $Result->fetch_array())
@@ -199 +202 @@
         $Row = $Result2->fetch_array();
         $LastMeasureTime = date('j.n.Y G:i:s', $this->Database->MysqlDateTimeToTime($Row['Time']));
-        $LastMeasureValue = $this->System->AddPrefixMultipliers($Row['Avg'], $MeasureMethod['Unit']);
+        $LastMeasureValue = $PrefixMultiplier->Add($Row['Avg'], $MeasureMethod['Unit']);
       } else
       {
@@ -219 +222 @@
 
     //ShowPage($Output);
-    //echo(AddPrefixMultipliers('-0.000000071112345', 'B'));
     return($Output);
   }