Changeset 687

Timestamp:

Sep 7, 2014, 12:28:06 PM (10 years ago)

Author:

chronos

Message:

• Upraveno: Vylepšení čitelnosti záznamu změn v IS do tabulky Log.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Form/Form.php (modified) (2 diffs)
• Modules/IS/IS.php (modified) (4 diffs)
• Modules/Network/Availability.php (modified) (7 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 684; // Subversion revision
+$Revision = 687; // Subversion revision
 $DatabaseRevision = 679; // SQL structure revision
-$ReleaseTime = strtotime('2014-08-13');
+$ReleaseTime = strtotime('2014-09-07');

trunk/Common/Form/Form.php

@@ -42 +42 @@
   }
 
+  function GetValue($Index, $Event = 'OnView')
+  {
+        $Item = $this->Definition['Items'][$Index];
+        if(array_key_exists($Item['Type'], $this->FormManager->FormTypes))
+        {
+                if(!array_key_exists($Item['Type'], $this->FormManager->Type->TypeDefinitionList))
+                        $this->FormManager->Type->RegisterType($Item['Type'], '', $this->FormManager->FormTypes[$Item['Type']]);
+                if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Reference')
+                        $UseType = 'OneToMany';
+                else if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Enumeration')
+                        $UseType = 'Enumeration';
+        } else $UseType = $Item['Type'];
+        return $this->FormManager->Type->ExecuteTypeEvent($UseType, $Event,
+        array('Value' => $this->Values[$Index], 'Name' => $Index,
+        'Type' => $Item['Type'], 'Values' => $this->Values,
+        'Filter' => $this->Values[$Index]));
+  }
+
   function ShowViewForm()
   {
@@ -53 +71 @@
     ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
     {
-        if(array_key_exists($Item['Type'], $this->FormManager->FormTypes))
-        {
-          if(!array_key_exists($Item['Type'], $this->FormManager->Type->TypeDefinitionList))
-            $this->FormManager->Type->RegisterType($Item['Type'], '', $this->FormManager->FormTypes[$Item['Type']]);
-          if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Reference')
-            $UseType = 'OneToMany';
-          else if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Enumeration')
-            $UseType = 'Enumeration';
-        } else $UseType = $Item['Type'];
+      if(array_key_exists($Item['Type'], $this->FormManager->FormTypes))
+      {
+        if(!array_key_exists($Item['Type'], $this->FormManager->Type->TypeDefinitionList))
+          $this->FormManager->Type->RegisterType($Item['Type'], '', $this->FormManager->FormTypes[$Item['Type']]);
+        if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Reference')
+          $UseType = 'OneToMany';
+        else if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Enumeration')
+          $UseType = 'Enumeration';
+      } else $UseType = $Item['Type'];
       $Edit = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnView',
         array('Value' => $this->Values[$Index], 'Name' => $Index,

trunk/Modules/IS/IS.php

@@ -123 +123 @@
   }
 
+  function LogChange($Form, $Action, $NewId, $OldId)
+  {
+        $Values = $Form->Definition['Table'].' (Id: '.$OldId.' => '.$NewId.'):'."\n";
+        // Compare old values loaded from database with new values in Form variable
+        $NewValues = $Form->Values;
+        if($OldId != 0)
+        {
+          $FormOld = new Form($this->System->FormManager);
+          $FormOld->SetClass($Form->Definition['Table']);
+          $FormOld->LoadValuesFromDatabase($OldId);
+                $OldValues = $FormOld->Values;
+                // Keep only changes values
+          foreach($NewValues as $Index => $Value)
+          {
+                if($OldValues[$Index] != $NewValues[$Index])
+                {
+                $Values .= $Index.': '.$FormOld->GetValue($Index);
+                if($NewId != 0) $Values .= ' => '.$Form->GetValue($Index);
+                $Values .= "\n";
+                }
+        }
+        } else {
+                foreach($NewValues as $Index => $Value)
+                {
+                        $Values .= $Index.': '.$Form->GetValue($Index)."\n";
+                }
+        }
+        $this->System->ModuleManager->Modules['Log']->NewRecord('IS', $Action, $Values);
+  }
+
   function ShowEdit($Table, $Id)
   {
@@ -139 +169 @@
         try {
           $Form->Validate();
+          $this->LogChange($Form, 'Edit', $Id, $Id);
           $Form->SaveValuesToDatabase($Id);
-          $Values = $Table.': '.str_replace('=>', '=', str_replace('array', '', var_export($Form->Values, true)));
-          $this->System->ModuleManager->Modules['Log']->NewRecord('IS', 'Edit', $Values);
           $Output .= $this->SystemMessage('Úprava položky', 'Položka upravena');
           $Output .= $this->ShowView($Table, $Id);
@@ -190 +219 @@
         $DbRow = $DbResult->fetch_assoc();
         try {
+        $Form = new Form($this->System->FormManager);
+        $Form->SetClass($Table);
+        $this->LogChange($Form, 'Delete', 0, $Id);
         $this->Database->delete($Table, '`Id`='.$Id);
-        $Values = $Table.': '.str_replace('=>', '=', str_replace('array', '', var_export($DbRow, true)));
-        $this->System->ModuleManager->Modules['Log']->NewRecord('IS', 'Delete', $Values);
         $Output .= $this->SystemMessage('Smazání položky', 'Položka odstraněna');
       } catch (Exception $E)
@@ -227 +257 @@
           $Form->SaveValuesToDatabase(0);
           $Id = $this->Database->insert_id;
-          $Values = $Table.': '.str_replace('=>', '=', str_replace('array', '', var_export($Form->Values, true)));
-          $this->System->ModuleManager->Modules['Log']->NewRecord('IS', 'Add', $Values);
+          $this->LogChange($Form, 'Add', $Id, 0);
           $Output .= $this->SystemMessage('Přidání položky', 'Nová položka vytvořena');
           $Output .= $this->ShowView($Table, $Id, $_GET['a'] == 'addsub');

trunk/Modules/Network/Availability.php

@@ -8 +8 @@
   var $PeriodCount = 24;
   var $Period = array(
-    array('Column' => 'Hour', 'Title' => 'Hodina', 'Period' => 1, 'MinPercent' => 100), 
-    array('Column' => 'Day', 'Title' => 'Den', 'Period' => 24, 'MinPercent' => 98), 
-    array('Column' => 'Week', 'Title' => 'Týden', 'Period' => 168, 'MinPercent' => 96), // 24 * 7  
+    array('Column' => 'Hour', 'Title' => 'Hodina', 'Period' => 1, 'MinPercent' => 100),
+    array('Column' => 'Day', 'Title' => 'Den', 'Period' => 24, 'MinPercent' => 98),
+    array('Column' => 'Week', 'Title' => 'Týden', 'Period' => 168, 'MinPercent' => 96), // 24 * 7
     array('Column' => 'Month', 'Title' => 'Měsíc', 'Period' => 720, 'MinPercent' => 93), // 24 * 30
     array('Column' => 'Year', 'Title' => 'Rok', 'Period' => 8760, 'MinPercent' => 92), // 365 * 24
@@ -19 +19 @@
   {
     $Output = '<div style="font-size: small;">Dostupnost zařízení se kontroluje jednou za minutu. '.
-    'Hodnoty u delších intervalů nemusí odpovídat skutečnosti, protože záznam byl spuštěn až v průběhu těchto intervalu.'. 
+    'Hodnoty u delších intervalů nemusí odpovídat skutečnosti, protože záznam byl spuštěn až v průběhu těchto intervalu.'.
     'Všechny prvky sítě jsou kontrolovány ze směrovačů, tj. pokud vypadne některé blízké zařízení, všechny další zařízení propojené přes něj jsou také nedostupné.</div>';
     $Output .= '<div align="center">';
@@ -36 +36 @@
     while($DbRow = $DbResult->fetch_assoc())
       $HostTypeList[$DbRow['Id']] = $DbRow;
-   
-    
+
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `NetworkInterface` '.
       'JOIN `NetworkDevice` ON `NetworkInterface`.`Device` = `NetworkDevice`.`Id` WHERE `NetworkDevice`.`Used` = 1 AND `NetworkDevice`.`PermanentOnline`=1');
     $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);    
+    $PageList = GetPageList($DbRow[0]);
 
     $Output .= '<br />';
@@ -47 +46 @@
     $Output .= $PageList['Output'];
     $Output .= '<table class="WideTable" style="font-size: small;">';
-   
+
     $TableColumns = array(
-      array('Name' => 'Name', 'Title' => 'Jméno'), 
-    );   
-   
-    
+      array('Name' => 'Name', 'Title' => 'Jméno'),
+    );
+
     $Join = '';
     $Columns = '';
@@ -66 +64 @@
         $Columns .= ', `Period'.$Period['Column'].'`.`Percent` AS `'.$Period['Column'].'`';
       }
-    } else 
+    } else
     {
       if(array_key_exists($_GET['Period'], $this->Period))
@@ -85 +83 @@
     $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
     $Output .= $Order['Output'];
-      
+
     $DbResult2 = $this->Database->query('SELECT `NetworkInterface`.`Name` AS `InterfaceName`'.$Columns.', '.
       'CONCAT(`NetworkDevice`.`Name`, "-", `NetworkInterface`.`Name`) AS `Name`, `NetworkDevice`.`Name` AS `DeviceName` FROM `NetworkInterface` '.
@@ -103 +101 @@
           $Output .= '<td style="text-align: right;'.$Color.'">'.sprintf('%01.2f', $Interface[$Period['Column']]).'</td>';
         }
-      } else 
+      } else
       {
         if(array_key_exists($_GET['Period'], $this->Period))