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

Timestamp:

Jul 27, 2014, 9:05:14 PM (10 years ago)

Author:

chronos

Message:

• Opraveno: SQL aktualizace 40 plus chybějící tabulka MeasureMethod.
• Opraveno: Neplatné ukázkové konfigurační soubory.

File:

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

trunk/Application/View/Main.php

@@ -24 +24 @@
       'caption' => 'Měsíc',
       'period' => 2592000, // 3600 * 24 * 30,
-    ),  
+    ),
     'year' => array(
       'caption' => 'Rok',
@@ -46 +46 @@
     for($I = 1; $I < 32; $I++)
     {
-      if($I == $TimeParts['mday']) $Selected = ' selected="1"'; else $Selected = ''; 
+      if($I == $TimeParts['mday']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
     }
@@ -54 +54 @@
     $Output .= '<select name="Month">';
     foreach($this->Months as $Index => $Month)
-    { 
+    {
       if($Index == $TimeParts['mon']) $Selected = ' selected="1"'; else $Selected = '';
       if($Index > 0) $Output .= '<option value="'.$Index.'"'.$Selected.'>'.$Month.'</option>';
@@ -63 +63 @@
     $Output .= '<select name="Year">';
     for($I = 2000; $I < 2010; $I++)
-    { 
+    {
       if($I == $TimeParts['year']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
@@ -72 +72 @@
     $Output .= '<select name="Hour">';
     for($I = 0; $I < 24; $I++)
-    { 
+    {
       if($I == $TimeParts['hours']) $Selected = ' selected="1"'; else $Selected = '';
       $Output .= '<option value="'.$I.'"'.$Selected.'>'.$I.'</option>';
@@ -80 +80 @@
     // Minute selection
     $Output .= '<select name="Minute">';
-    for($I = 0; $I < 60; $I++) 
+    for($I = 0; $I < 60; $I++)
     {
       if($I == $TimeParts['minutes']) $Selected = ' selected="1"'; else $Selected = '';
@@ -99 +99 @@
   {
     $Debug = 0;
-
     foreach($this->Config['Application']['DefaultVariables'] as $Index => $Variable)
     {
@@ -112 +111 @@
       $_SESSION['TimeEnd'] = time() - 60;
       $_SESSION['TimeStart'] = $_SESSION['TimeEnd'] - $this->GraphTimeRanges[$_SESSION['Period']]['period'];
-    } 
+    }
 
     $Output = '<div class="Title">Statistiky</div>';
@@ -130 +129 @@
           }
         }
-        break; 
+        break;
       case 'SetTimeNow':
-        if(array_key_exists('Time', $_GET)) 
+        if(array_key_exists('Time', $_GET))
         {
           if(($_GET['Time'] == 'TimeStart') or ($_GET['Time'] == 'TimeEnd'))
@@ -142 +141 @@
         break;
     }
-    $Output .= '<strong>Časový úsek:</strong><br>';
+    $Output .= '<strong>Časový úsek:</strong><br/>';
     // Show graf time range menu
     if($_SESSION['TimeSpecify'] == 0)
@@ -150 +149 @@
         $Output .= '<a href="?Period='.$Index.'">'.$Item['caption'].'</a>&nbsp;';
       $Output .= '<br/>';
-      $Output .= '<a href="?TimeSpecify=1">Přesnější nastavení...</a><br>';
+      $Output .= '<a href="?TimeSpecify=1">Přesnější nastavení...</a><br/>';
     } else {
       $Output .= '<table cellspacing="0" cellpadding="2" border="0">';
@@ -156 +155 @@
       $Output .= '<tr><td>Konec:</td><td>'.$this->EditTime('TimeEnd').'</td></tr>';
       $Output .= '</table>';
-      $Output .= '<a href="?TimeSpecify=0">Jednoduché nastavení...</a><br>';
+      $Output .= '<a href="?TimeSpecify=0">Jednoduché nastavení...</a><br/>';
     }
     $Output .= '<br/>'.$this->Graph();
@@ -162 +161 @@
     $Output .= '<br/>'.$this->MeasureTable();
     return($Output);
-  }  
-  
+  }
+
   function Graph()
   {
     $Output = '<strong>Graf:</strong><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>';
+    $Output .= '<img alt="Graf" src="?M=Graph&amp;Measure='.$_SESSION['Measure'].
+      '&amp;From='.$_SESSION['TimeStart'].'&amp;To='.$_SESSION['TimeEnd'].'&amp;Width='.
+      $this->Config['Application']['ImageWidth'].'&amp;Height='.$this->Config['Application']['ImageHeight'].
+      '&amp;Differential='.$_SESSION['Differential'].'" width="'.$this->Config['Application']['ImageWidth'].
+      '" height="'.$this->Config['Application']['ImageHeight'].'"/><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));
     return($Output);
   }
-  
+
   function MeasureTable()
   {
@@ -202 +205 @@
         $LastMeasureValue = '&nbsp;';
       }
-      if($Measure['Continuity'] == 1) $Interpolate = 'Ano'; 
+      if($Measure['Continuity'] == 1) $Interpolate = 'Ano';
         else $Interpolate = 'Ne';
       if($Measure['Info'] == '') $Measure['Info'] = '&nbsp;';
@@ -214 +217 @@
     //print_r(gd_info());
     //print_r($_SESSION);
- 
+
     //ShowPage($Output);
     //echo(AddPrefixMultipliers('-0.000000071112345', 'B'));