Changeset 45 for trunk/Application

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

Files:

• Controller/Add.php (added)
• Controller/Client.php (added)
• Controller/Graph.php (modified) (1 diff)
• Controller/MeasureClient.php (deleted)
• CustomOutput.php (modified) (2 diffs)
• Model/Measure.php (modified) (7 diffs)
• View/Graph.php (modified) (3 diffs)
• View/Main.php (modified) (2 diffs)

trunk/Application/Controller/Graph.php

@@ -8 +8 @@
   function Show()
   {
+    $this->System->Output->FullPage = false;
+    
     $View = new GraphView($this->System);
     return($View->Render());

trunk/Application/CustomOutput.php

@@ -8 +8 @@
   var $Unload = '';
   var $Document;
-  var $Title;
+  var $Title = '';
+  var $FullPage = true;
 
   function Header()
@@ -41 +42 @@
   function Show($Content)
   {
-    $this->Document = new XHTMLDocument();
-    $BodyParam = '';
-    if($this->Load != '') $BodyParam .= ' onload="'.$this->Load.'"';
-    if($this->Unload != '') $BodyParam .= ' onunload="'.$this->Unload.'"';
-    $this->Document->Encoding = $this->Config['System']['Charset'];
-    $this->Document->Formated = $this->Config['System']['FormatHTML'];
-    $Style = new XMLTag('link');
-    $Style->Attributes = array('rel' => 'stylesheet', 'href' => 'Application/Style/'.$this->Config['System']['Style'].'/Style.css',
-      'type' => 'text/css', 'media' => 'all');
-    $this->Document->HeadTag->SubElements[] = $Style;
-    $JavaScript = new XMLTag('script');
-    $JavaScript->Attributes = array('type' => 'text/javascript', 'src' => 'Application/Style/'.$this->Config['System']['Style'].'/Global.js');
-    $JavaScript->ShringEmpty = false;
-    $this->Document->HeadTag->SubElements[] = $JavaScript;
-    $JavaScript = new XMLTag('script');
-    $JavaScript->Attributes = array('type' => 'text/javascript', 'src' => 'Base/Style/jquery.js');
-    $JavaScript->ShringEmpty = false;
-    $this->Document->HeadTag->SubElements[] = $JavaScript;
-    $this->Document->TitleTag->SubElements = $this->Config['System']['Title'].' - '.$this->Title;
-    $this->Document->BodyTag->SubElements = array($this->Header(), $Content, $this->Footer());
-    echo($this->Document->GetOutput());
+    if($this->FullPage)
+    {
+      $this->Document = new XHTMLDocument();
+      $BodyParam = '';
+      if($this->Load != '') $BodyParam .= ' onload="'.$this->Load.'"';
+      if($this->Unload != '') $BodyParam .= ' onunload="'.$this->Unload.'"';
+      $this->Document->Encoding = $this->Config['System']['Charset'];
+      $this->Document->Formated = $this->Config['System']['FormatHTML'];
+      $Style = new XMLTag('link');
+      $Style->Attributes = array('rel' => 'stylesheet', 'href' => 'Application/Style/'.$this->Config['System']['Style'].'/Style.css',
+        'type' => 'text/css', 'media' => 'all');
+      $this->Document->HeadTag->SubElements[] = $Style;
+      $JavaScript = new XMLTag('script');
+      $JavaScript->Attributes = array('type' => 'text/javascript', 'src' => 'Application/Style/'.$this->Config['System']['Style'].'/Global.js');
+      $JavaScript->ShringEmpty = false;
+      $this->Document->HeadTag->SubElements[] = $JavaScript;
+      $JavaScript = new XMLTag('script');
+      $JavaScript->Attributes = array('type' => 'text/javascript', 'src' => 'Base/Style/jquery.js');
+      $JavaScript->ShringEmpty = false;
+      $this->Document->HeadTag->SubElements[] = $JavaScript;
+      $this->Document->TitleTag->SubElements = $this->Config['System']['Title'].' - '.$this->Title;
+      $this->Document->BodyTag->SubElements = array($this->Header(), $Content, $this->Footer());
+      echo($this->Document->GetOutput());
+    } else echo($Content);
   }
 

trunk/Application/Model/Measure.php

@@ -14 +14 @@
   var $ValueTypes = array('Min', 'Avg', 'Max');
   
-  function Add($Value)
-  {
-    if(gethostbyaddr($_SERVER['REMOTE_ADDR']) == $this->Data['PermissionAdd']) 
-    {
-      $this->AddValue(array('Min' => $Value, 'Avg' => $Value, 'Max' => $Value));
-      $Output = 'Hodnota '.$Value.' uložena';
-    } else throw new Exception('Access denied');
-  }
-  
   function Load($Id)
   {
@@ -57 +48 @@
     //echo(TimeToMysqlDateTime($Time).'|'.$Level."\n");
 
-    $Result = $Database->select($this->Data['DataTable'], '*', 'Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 2');
+    $Result = $this->Database->select($this->Data['DataTable'], '*', 'Measure='.$this->Data['Id'].' AND Level='.$Level.' ORDER BY Time DESC LIMIT 2');
     //echo($Database->LastQuery."\n");
     if($Result->num_rows == 0) 
     {
-       $Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 0)); 
+       $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 0)); 
        //echo($Database->LastQuery."\n");
     } else if($Result->num_rows == 1)
     {
-      $Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 1));
+      $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => 1));
       //echo($Database->LastQuery."\n");
     } else
@@ -77 +68 @@
       } else
       {
-        if(($Time - MysqlDateTimeToTime($LastValue['Time'])) < 1.25 * $this->Data['Period']) $Continuity = 1;
+        if(($Time - $this->Database->MysqlDateTimeToTime($LastValue['Time'])) < 1.25 * $this->Data['Period']) $Continuity = 1;
           else $Continuity = 0;
         echo('('.$LastValue['Avg'].'=='.$NextToLastValue['Avg'].') and ('.$LastValue['Avg'].' == '.$Value.') and ('.$LastValue['Continuity'].' == 1) and ('.$Continuity.' == 1))'."\n");
@@ -83 +74 @@
         {
           $this->Database->update($this->Data['DataTable'], '(Time="'.$LastValue['Time'].'") AND (Level='.$Level.') AND (Measure='.$Measure['Id'].')', array('Time' => $this->Database->TimeToMysqlDateTime($Time)));
-          echo($this->Database->LastQuery."\n");
+          //echo($this->Database->LastQuery."\n");
         } else
         {
-          $Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $Measure['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => $Continuity));
-          echo($this->Database->LastQuery."\n");
+          $this->Database->insert($this->Data['DataTable'], array('Min' => $Value['Min'], 'Avg' => $Value['Avg'], 'Max' => $Value['Max'], 'Level' => $Level, 'Measure' => $this->Data['Id'], 'Time' => $this->Database->TimeToMysqlDateTime($Time), 'Continuity' => $Continuity));
         }
       }  
 
       // Update next level
-      if($Level < $MaxLevel)
+      if($Level < $this->MaxLevel)
       {
         $Level = $Level + 1;
@@ -120 +110 @@
           // Load subsidary values
           print_r($Values);
-          $Values = array_merge($this->LoadLeftSideValue($Level - 1, $this->Data, $StartTime), $Values, $this->LoadRightSideValue($Level - 1, $Measure, $EndTime));
+          $Values = array_merge($this->LoadLeftSideValue($Level - 1, $this->Data, $StartTime), $Values, $this->LoadRightSideValue($Level - 1, $EndTime));
           print_r($Values);
 
-          $Point = $this->ComputeOneValue($StartTime, $EndTime, $Values, $this->Data, $Level);
+          $Point = $this->ComputeOneValue($StartTime, $EndTime, $Values, $Level);
         //print_r($Point);
 
           $this->Database->delete($this->Data['DataTable'], '(Time > "'.$this->Database->TimeToMysqlDateTime($StartTime).'") AND (Time < "'.$this->Database->TimeToMysqlDateTime($EndTime).'") AND Measure='.$this->Data['Id'].' AND Level='.$Level);
           $this->Data['Period'] = $TimeSegment;
-          $this->AddValue($this->Data, array('Min' => $Point['Min'], 'Avg' => $Point['Avg'], 'Max' => $Point['Max']), $Level, $StartTime + ($EndTime - $StartTime) / 2);
+          $this->AddValue(array('Min' => $Point['Min'], 'Avg' => $Point['Avg'], 'Max' => $Point['Max']), $Level, $StartTime + ($EndTime - $StartTime) / 2);
         }
       }
@@ -288 +278 @@
       //$Time = $Values[0]['Time'] - 60;
       //array_unshift($Values, array('Time' => $Time, 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0));
+      if($this->Debug) echo($this->TimeSegment($this->Data['Period'], $Level));
       $Result[] = array('Time' => ($Time - $this->TimeSegment($this->Data['Period'], $Level)), 'Min' => 0, 'Avg' => 0, 'Max' => 0, 'Continuity' => 0);
 
@@ -350 +341 @@
 
         $EndIndex = $StartIndex;
-        //while(($Values[$EndIndex]['Time'] < $TimeEnd) and ($EndIndex < count($Values))) $EndIndex = $EndIndex + 1;
-        while(($Values[$EndIndex]['Time'] < $TimeEnd)) $EndIndex = $EndIndex + 1;
+        while(($Values[$EndIndex]['Time'] < $TimeEnd) and ($EndIndex < count($Values))) $EndIndex = $EndIndex + 1;
+        //while(($Values[$EndIndex]['Time'] < $TimeEnd)) $EndIndex = $EndIndex + 1;
         $SubValues = array_slice($Values, $StartIndex, $EndIndex - $StartIndex + 1);
         //echo($StartIndex.','.$EndIndex.' '.count($SubValues).'<br>');

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
       {