Changeset 95 for trunk/Modules/Measure

Timestamp:

Dec 6, 2021, 11:33:48 AM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Added: Explicit types for better type checking.
• Fixed: Support for php 8.0.

Location:

trunk/Modules/Measure

Files:

• Measure.php (modified) (14 diffs)
• Page.php (modified) (13 diffs)

trunk/Modules/Measure/Measure.php

@@ -3 +3 @@
 include_once(dirname(__FILE__).'/Page.php');
 
-class ModuleMeasure extends AppModule
+class ModuleMeasure extends Module
 {
   function __construct($System)
@@ -16 +16 @@
   }
 
-  function DoStart()
-  {
-    $this->System->RegisterPage('', 'PageMain');
-  }
-
-  function DoInstall()
-  {
-   $this->Database->query('CREATE TABLE IF NOT EXISTS `Measure` (
-  `Id` int(11) NOT NULL auto_increment,
-  `Name` varchar(255) collate utf8_general_ci NOT NULL,
-  `Description` varchar(255) collate utf8_general_ci NOT NULL,
-  `Divider` int(11) NOT NULL default 1,
-  `Unit` varchar(16) collate utf8_general_ci NOT NULL,
-  `Continuity` tinyint(1) NOT NULL default 0,
-  `Period` int(11) NOT NULL default 60,
-  `PermissionView` varchar(255) collate utf8_general_ci NOT NULL default "all",
-  `PermissionAdd` varchar(255) collate utf8_general_ci NOT NULL default "localhost.localdomain",
-  `Info` varchar(255) collate utf8_general_ci NOT NULL,
-  `Enabled` int(11) NOT NULL default 1,
-  `Cumulative` int(11) NOT NULL default 0,
-  `DataTable` varchar(32) collate utf8_general_ci NOT NULL default "data",
-  `DataType` varchar(32) collate utf8_general_ci NOT NULL,
-  PRIMARY KEY  (`Id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;');
-   }
-
-  function DoUninstall()
+  function DoStart(): void
+  {
+    $this->System->RegisterPage(array(''), 'PageMain');
+  }
+
+  function DoInstall(): void
+  {
+    $this->Database->query('CREATE TABLE IF NOT EXISTS `Measure` (
+    `Id` int(11) NOT NULL auto_increment,
+    `Name` varchar(255) collate utf8_general_ci NOT NULL,
+    `Description` varchar(255) collate utf8_general_ci NOT NULL,
+    `Divider` int(11) NOT NULL default 1,
+    `Unit` varchar(16) collate utf8_general_ci NOT NULL,
+    `Continuity` tinyint(1) NOT NULL default 0,
+    `Period` int(11) NOT NULL default 60,
+    `PermissionView` varchar(255) collate utf8_general_ci NOT NULL default "all",
+    `PermissionAdd` varchar(255) collate utf8_general_ci NOT NULL default "localhost.localdomain",
+    `Info` varchar(255) collate utf8_general_ci NOT NULL,
+    `Enabled` int(11) NOT NULL default 1,
+    `Cumulative` int(11) NOT NULL default 0,
+    `DataTable` varchar(32) collate utf8_general_ci NOT NULL default "data",
+    `DataType` varchar(32) collate utf8_general_ci NOT NULL,
+    PRIMARY KEY  (`Id`)
+    ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;');
+  }
+
+  function DoUninstall(): void
   {
     $this->Database->query('DROP TABLE IF EXISTS `Measure`');
-  }
-
-  function DoUpgrade()
-  {
-
   }
 }
@@ -81 +76 @@
   }
 
-  function TimeSegment($Level)
+  function TimeSegment(int $Level): int
   {
     return pow($this->LevelReducing, $Level) * 60;
   }
 
-  function GetDataTable()
+  function GetDataTable(): string
   {
     return 'data_'.$this->Data['Name'];
   }
 
-  function AlignTime($Time, $TimeSegment)
+  function AlignTime(int $Time, int $TimeSegment): int
   {
     return round(($Time - $this->ReferenceTime) / $TimeSegment) * $TimeSegment +
@@ -97 +92 @@
   }
 
-  function Load($Id)
+  function Load(int $Id): void
   {
     $Result = $this->Database->select('Measure', '*', '`Id`='.$Id);
@@ -108 +103 @@
   }
 
-  function AddValue($Value, $Time)
+  function AddValue(float $Value, int $Time): void
   {
     $Result = $this->Database->select($this->Data['DataTable'], '*', '(`Measure`='.$this->Data['Id'].') AND '.
@@ -163 +158 @@
   }
 
-  function UpdateHigherLevels($Time)
+  function UpdateHigherLevels(int $Time): void
   {
     for ($Level = 1; $Level <= $this->MaxLevel; $Level++)
@@ -206 +201 @@
 
   /* Compute one value for upper time level from multiple values */
-  function ComputeOneValue($LeftTime, $RightTime, $Values, $Level)
+  function ComputeOneValue(int $LeftTime, int $RightTime, array $Values, int $Level): array
   {
     $NewValue = array('Min' => +1000000000000000000, 'Avg' => 0, 'Max' => -1000000000000000000);
@@ -294 +289 @@
   }
 
-  function GetTimeRange($Level)
+  function GetTimeRange(int $Level): array
   {
     // Get first and last time
@@ -317 +312 @@
 
   // Load one nearest value newer then given time
-  function LoadRightSideValue($Level, $Time)
+  function LoadRightSideValue(int $Level, int $Time): array
   {
     $Result = array();
@@ -350 +345 @@
 
   // Load one nearest value older then given time
-  function LoadLeftSideValue($Level, $Time)
+  function LoadLeftSideValue(int $Level, int $Time): array
   {
     $Result = array();
@@ -382 +377 @@
   }
 
-  function GetValues($TimeFrom, $TimeTo, $Level)
+  function GetValues(int $TimeFrom, int $TimeTo, int $Level): array
   {
   //$AbsoluteTime = GetTimeRange($this->DataId);
@@ -430 +425 @@
   }
 
-  function RebuildMeasureCache()
+  function RebuildMeasureCache(): void
   {
     echo('Velicina '.$this->Data['Name']."<br>\n");
@@ -508 +503 @@
   }
 
-  function RebuildAllMeasuresCache()
+  function RebuildAllMeasuresCache(): void
   {
     $Result = $this->Database->select('Measure', 'Id');
     while ($Row = $Result->fetch_array())
     {
-      $Measure = new Measure();
+      $Measure = new Measure($this->Database);
       $Measure->Load($Row['Id']);
       $Measure->RebuildMeasureCache();
@@ -520 +515 @@
   }
 
-  function ClearData()
+  function ClearData(): void
   {
     $this->Database->delete($this->Data['DataTable'], '1');

trunk/Modules/Measure/Page.php

@@ -44 +44 @@
     $this->Time = time();
   }
-  
-  function GetTimeRange()
+
+  function GetTimeRange(): string
   {
     if (!array_key_exists($_SESSION['Period'], $this->GraphTimeRanges))
       $_SESSION['Period'] = 'day';
-    
+
     $Result = $this->GraphTimeRanges[$_SESSION['Period']]['period'];
     if ($Result == -1)
@@ -61 +61 @@
   }
 
-  function EditTime($Time)
+  function EditTime($Time): string
   {
     $Output = '<form style="display: inline;" action="?Operation=SetTime&amp;Time='.$Time.'" method="post">';
@@ -119 +119 @@
     return $Output;
   }
-  
-  function GetFirstMeasure($Measure)
+
+  function GetFirstMeasure($Measure): array
   {
     $Result2 = $this->Database->select($Measure['DataTable'], '`Time`, `Avg`', '(`Measure`='.$Measure['Id'].') AND (`Level`=0) ORDER BY `Time` ASC LIMIT 1');
@@ -135 +135 @@
   }
 
-  function GetLastMeasure($Measure)
+  function GetLastMeasure($Measure): array
   {
     $Result2 = $this->Database->select($Measure['DataTable'], '`Time`, `Avg`', '(`Measure`='.$Measure['Id'].') AND (`Level`=0) ORDER BY `Time` DESC LIMIT 1');
@@ -149 +149 @@
     return array('Time' => $LastMeasureTime, 'Value' => $LastMeasureValue);
   }
-  
-  function LoadMeasure($Id)
+
+  function LoadMeasure($Id): array
   {
     $DbResult = $this->Database->select('Measure', '*', '( `Enabled`=1) AND (`Id`='.$Id.') AND ((`PermissionView`="all") OR (`PermissionView`="'.
-      gethostbyaddr($_SERVER['REMOTE_ADDR']).'"))');    
+      gethostbyaddr($_SERVER['REMOTE_ADDR']).'"))');
     $DbRow = $DbResult->fetch_array();
     return $DbRow;
   }
-  
+
   /* Produce table with available measures */
-  function ShowMeasureTable()
+  function ShowMeasureTable(): string
   {
     $PrefixMultiplier = new PrefixMultiplier();
@@ -195 +195 @@
         $LastMeasureValue.'</td><td align="center">'.$LastMeasureTime.'</td><td align="center">'.
         $Interpolate.'</td><td>'.$Measure['Info'].'</td>';
-      if (array_key_exists('Debug', $_GET)) 
+      if (array_key_exists('Debug', $_GET))
         $Output .= '<td>'.$RowCount.'</td><td>'.$GenerationTime.'</td>';
       $Output .= '</tr>';
@@ -203 +203 @@
   }
 
-  function ShowGraph()
+  function ShowGraph(): string
   {
     $Output = '<strong>Graf:</strong><br>';
@@ -217 +217 @@
   }
 
-  function ShowTimeRange()
+  function ShowTimeRange(): string
   {
     $Output = '';
@@ -269 +269 @@
 
   }
-  
-  function HandleURL()
-  {
-    global $Config;
-    
-    foreach ($Config['DefaultVariables'] as $Index => $Variable)
+
+  function HandleURL(): void
+  {
+    foreach ($this->System->Config['DefaultVariables'] as $Index => $Variable)
     {
       if (!array_key_exists($Index, $_SESSION)) $_SESSION[$Index] = $Variable;
@@ -285 +283 @@
       $_SESSION['Period'] = $_GET['Period'];
       // Update time start according time period
-      if ($_SESSION['Period'] == 'all') 
+      if ($_SESSION['Period'] == 'all')
       {
         $Measure = $this->LoadMeasure($_SESSION['Measure']);
@@ -322 +320 @@
       $_SESSION['TimeSpecify'] = $_GET['TimeSpecify'];
     }
-    
+
     if (array_key_exists('Move', $_GET))
     {
       $Move = $_GET['Move'];
-      if ($Move == 'Left') 
+      if ($Move == 'Left')
       {
         $_SESSION['TimeStart'] = $_SESSION['TimeStart'] - $this->GetTimeRange();
         $_SESSION['TimeEnd'] = $_SESSION['TimeEnd'] - $this->GetTimeRange();
       } else
-      if ($Move == 'Right') 
+      if ($Move == 'Right')
       {
         $_SESSION['TimeStart'] = $_SESSION['TimeStart'] + $this->GetTimeRange();
         $_SESSION['TimeEnd'] = $_SESSION['TimeEnd'] + $this->GetTimeRange();
-      } else 
+      } else
       if ($Move == 'Now')
       {
@@ -358 +356 @@
   }
 
-  function Show()
+  function Show(): string
   {
     global $Config;
@@ -364 +362 @@
     $Debug = 0;
     $this->HandleURL();
-    
+
     $Output = '<div style="text-align: center"><div class="Title">'.$Config['Web']['Title'].'</div>';