Changeset 660

Timestamp:

May 31, 2014, 12:08:52 AM (10 years ago)

Author:

chronos

Message:

• Přidáno: Nyní lze v definici formulářových struktůr vybrat výchozí směr řazení.
• Opraveno: V typu TimeDiff nezobrazovat nulový údaj pokud je hodnota null.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Form/Types/TimeDiff.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (5 diffs)
• Modules/IS/IS.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php (modified) (1 diff)
• Modules/News/News.php (modified) (13 diffs)
• Modules/Task/Task.php (modified) (4 diffs)
• Modules/TimeMeasure/Measurement/System.php (modified) (6 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 659; // Subversion revision
+$Revision = 660; // Subversion revision
 $DatabaseRevision = 657; // SQL structure revision
-$ReleaseTime = strtotime('2014-05-25');
+$ReleaseTime = strtotime('2014-05-29');

trunk/Common/Form/Types/TimeDiff.php

@@ -7 +7 @@
   function OnView($Item)
   {
-    $Output = sprintf('%02d', floor($Item['Value'] / 3600 % 24)).':'.
-      sprintf('%02d', floor($Item['Value'] / 60 % 60)).':'.
-      sprintf('%02d', floor($Item['Value'] % 60));
-    $Days = floor($Item['Value'] / (60 * 60 * 24));
-    if($Days > 0) $Output = $Days.' dnů '.$Output;
+    if($Item['Value'] == null) $Output = '';
+    else {
+      $Output = sprintf('%02d', floor($Item['Value'] / 3600 % 24)).':'.
+        sprintf('%02d', floor($Item['Value'] / 60 % 60)).':'.
+        sprintf('%02d', floor($Item['Value'] % 60));
+      $Days = floor($Item['Value'] / (60 * 60 * 24));
+      if($Days > 0) $Output = $Days.' dnů '.$Output;
+    }
     return($Output);
   }

trunk/Modules/Finance/Finance.php

@@ -293 +293 @@
     return($Output);
   }
-  
+
   function GetVATByType($TypeId)
   {
@@ -345 +345 @@
       'Table' => 'FinanceOperation',
       'DefaultSortColumn' => 'Time',
+      'DefaultSortOrder' => 1,
       'Items' => array(
         'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
@@ -367 +368 @@
       'Table' => 'FinanceInvoice',
       'DefaultSortColumn' => 'Time',
+      'DefaultSortOrder' => 1,
       'Items' => array(
         'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => ''),
@@ -378 +380 @@
         'Generate' => array('Type' => 'Boolean', 'Caption' => 'Generovat', 'Default' => ''),
         'PeriodFrom' => array('Type' => 'Date', 'Caption' => 'Období od', 'Default' => '', 'Null' => true),
-        'PeriodTo' => array('Type' => 'Date', 'Caption' => 'Období do', 'Default' => '', 'Null' => true),        
+        'PeriodTo' => array('Type' => 'Date', 'Caption' => 'Období do', 'Default' => '', 'Null' => true),
         'Items' => array('Type' => 'TFinanceInvoiceItemListInvoice', 'Caption' => 'Položky', 'Default' => ''),
         'OperationRel' => array('Type' => 'TFinanceInvoiceOperationRelListInvoice', 'Caption' => 'Platba', 'Default' => ''),
-        'OperationRelCount' => array('Type' => 'Integer', 'Caption' => 'Plateb', 
+        'OperationRelCount' => array('Type' => 'Integer', 'Caption' => 'Plateb',
           'ReadOnly' => true, 'SQL' => '(SELECT COUNT(`FinanceInvoiceOperationRel`.`Id`) FROM `FinanceInvoiceOperationRel` '.
           'WHERE `FinanceInvoiceOperationRel`.`Invoice`=#Id)'),
@@ -396 +398 @@
         'Quantity' => array('Type' => 'Integer', 'Caption' => 'Množství', 'Default' => '1'),
         'VAT' => array('Type' => 'Integer', 'Caption' => 'Daň', 'Default' => '21', 'Suffix' => '%'),
-        'Total' => array('Type' => 'Integer', 'Caption' => 'Celkem', 'Default' => '', 'Suffix' => 'Kč', 
+        'Total' => array('Type' => 'Integer', 'Caption' => 'Celkem', 'Default' => '', 'Suffix' => 'Kč',
           'ReadOnly' => true, 'SQL' => '`Price` * `Quantity`'),
       ),

trunk/Modules/IS/IS.php

@@ -400 +400 @@
     if(!array_key_exists('DefaultSortColumn', $FormClass))
       $FormClass['DefaultSortColumn'] = 'Id';
-    $Order = GetOrderTableHeader($TableColumns, $FormClass['DefaultSortColumn'], 0);
+    if(!array_key_exists('DefaultSortOrder', $FormClass))
+      $FormClass['DefaultSortOrder'] = 0;
+    $Order = GetOrderTableHeader($TableColumns, $FormClass['DefaultSortColumn'], $FormClass['DefaultSortOrder']);
     $Output .= $Order['Output'];
 

trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php

@@ -30 +30 @@
       'Title' => 'Změny stavu rozhraní',
       'Table' => 'NetworkInterfaceUpDown',
+      'DefaultSortColumn' => 'Time',
+      'DefaultSortOrder' => 1,
       'Items' => array(
         'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => '', 'ReadOnly' => true),

trunk/Modules/News/News.php

@@ -3 +3 @@
 include_once(dirname(__FILE__).'/NewsPage.php');
 
-function CategoryItemCompare($Item1, $Item2) 
+function CategoryItemCompare($Item1, $Item2)
 {
   if ($Item1['Index'] == $Item2['Index']) return(0);
@@ -25 +25 @@
     $this->SupportedModules = array('Search');
   }
-  
+
   function DoInstall()
   {
@@ -32 +32 @@
   function DoUnInstall()
   {
-  }  
-  
+  }
+
   function DoStart()
   {
@@ -40 +40 @@
       'Title' => 'Aktualita',
       'Table' => 'News',
+      'DefaultSortColumn' => 'Date',
+      'DefaultSortOrder' => 1,
       'Items' => array(
         'Category' => array('Type' => 'TNewsCategory', 'Caption' => 'Kategorie', 'Default' => 0),
@@ -67 +69 @@
     {
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('Novinky', 'News', array('Title', 'Content'));
-    } 
-  }
-  
+    }
+  }
+
   function ShowNews($Category, $ItemCount, $DaysAgo)
   {
@@ -76 +78 @@
     $DbResult = $this->Database->select('NewsCategory', '*', 'Id='.$Category);
     $Row = $DbResult->fetch_array();
-    $Output = '<div class="NewsPanel"><div class="Title">'.$Row['Caption'];      
+    $Output = '<div class="NewsPanel"><div class="Title">'.$Row['Caption'];
     $Output .= '<div class="Action"><a href="aktuality/?category='.$Category.'">Zobrazit</a>';
     if($this->System->User->CheckPermission('News', 'Insert', 'Group', $Category))
@@ -100 +102 @@
 
         if($Row['Enclosure'] != '')
-        { 
+        {
           $Output .= '<br />Přílohy: ';
           $Enclosures = explode(';', $Row['Enclosure']);
           foreach($Enclosures as $Enclosure)
           {
-            if(file_exists($this->UploadedFilesFolder.$Enclosure)) 
+            if(file_exists($this->UploadedFilesFolder.$Enclosure))
               $Output .= ' <a href="'.$this->UploadedFilesFolder.$Enclosure.'">'.$Enclosure.'</a>';
           }
         }
         $Output .= '</div></td></tr>';
-        $Index = $Index + 1;    
+        $Index = $Index + 1;
         $FontSize = $FontSize - 1;
       }
@@ -127 +129 @@
     while($NewsCategory = $DbResult->fetch_array())
     {
-      $this->NewsSetting[] = array('CategoryId' => $NewsCategory['Id'], 'Index' => $I, 'Enabled' => 1, 
+      $this->NewsSetting[] = array('CategoryId' => $NewsCategory['Id'], 'Index' => $I, 'Enabled' => 1,
         'ItemCount' => $this->System->Config['Web']['News']['Count'], 'DaysAgo' => $this->System->Config['Web']['News']['DaysAgo'], 'Group' => $NewsCategory['Group']);
       $I++;
@@ -166 +168 @@
       $Output .= '<td style="vertical-align: top; width: '.round(100 / $ColumnCount).'%;">';
       foreach($this->NewsSetting as $SettingItem)
-        if(($SettingItem['Enabled'] == 1) and ($SettingItem['Group'] == $Column)) 
+        if(($SettingItem['Enabled'] == 1) and ($SettingItem['Group'] == $Column))
           $Output .= $this->ShowNews($SettingItem['CategoryId'], $SettingItem['ItemCount'], $SettingItem['DaysAgo']);
       $Output .= '</td>';
@@ -175 +177 @@
     $Output .= '</div>';
     return($Output);
-  }  
+  }
 
   function ShowCustomizeMenu()
@@ -188 +190 @@
       $NewsCategory = $DbResult->fetch_array();
       $Output .= '<tr><td>'.$NewsCategory['Caption'].'</td><td align="center"><input type="text" size="2" name="NewsCategoryIndex'.$I.'" value="'.$SettingItem['Index'].'" /></td><td align="center"><input type="checkbox" name="NewsCategoryEnabled'.$I.'"';
-      if($SettingItem['Enabled'] == 1) $Output .= ' checked="checked"'; 
+      if($SettingItem['Enabled'] == 1) $Output .= ' checked="checked"';
       $Output .= ' /></td>'.
       '<td align="center"><input type="text" size="2" name="NewsCategoryCount'.$I.'" value="'.$SettingItem['ItemCount'].'" />'.
@@ -224 +226 @@
     setcookie('NewsSetting', $_COOKIE['NewsSetting'], time() + 60 * 60 * 24 * 365);
   }
- 
+
   function ModifyContent($Content)
   {
     $Result = '';
-  
+
     // Make HTML link from URL
     $I = 0;
@@ -251 +253 @@
     $Result .= $Content;
     return($Result);
-  } 
+  }
 }

trunk/Modules/Task/Task.php

@@ -13 +13 @@
     $this->Dependencies = array('User');
   }
-  
+
   function DoStart()
   {
@@ -19 +19 @@
       'Title' => 'Úkoly',
       'Table' => 'Task',
-      'DefaultSortColumn' => 'Name',
+      'DefaultSortColumn' => 'TimeCreate',
+      'DefaultSortOrder' => 1,
       'Items' => array(
         'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => '', 'Required' => true),
@@ -28 +29 @@
         'Priority' => array('Type' => 'TPriority', 'Caption' => 'Důležitost', 'Default' => 1),
         'Conclusion' => array('Type' => 'Text', 'Caption' => 'Vyhodnocení', 'Default' => ''),
-        'Public' => array('Type' => 'Boolean', 'Caption' => 'Veřejné', 'Default' => '0'), 
+        'Public' => array('Type' => 'Boolean', 'Caption' => 'Veřejné', 'Default' => '0'),
         'Progress' => array('Type' => 'Integer', 'Caption' => 'Průběh', 'Default' => '0', 'Suffix' => '%'),
         'Group' => array('Type' => 'TTaskGroup', 'Caption' => 'Kategorie', 'Default' => '', 'Null' => true),
@@ -59 +60 @@
       ),
     ));
-    
-  }  
+
+  }
 }

trunk/Modules/TimeMeasure/Measurement/System.php

@@ -24 +24 @@
 
   function Ping($Host = 'nix.cz')
-  {  
+  {
+    $Row = array();
     exec('ping '.$Host.' -c 1 -W 1|grep time=', $Row);
     // W - timeout in seconds
@@ -55 +56 @@
     $LastCpuUsage = unserialize(file_get_contents($CpuStateFileName));
     //$cpuIDLEprev, $cpuSYSTprev, $cpuUSERprev;
-  
+
     // get processor usage seconds for pct stats ###
     $File = fopen('/proc/stat', 'r');
@@ -69 +70 @@
     $CpuUsageDiffTotal = (($CpuUsageDiff['User'] + $CpuUsageDiff['System']) + $CpuUsageDiff['Idle']);
     if ($CpuUsageDiffTotal > 0)
-    { 
+    {
       $CpuUsagePercent['User'] = ($CpuUsageDiff['User'] / $CpuUsageDiffTotal) * 100;
       $CpuUsagePercent['System'] = ($CpuUsageDiff['System'] / $CpuUsageDiffTotal) * 100;
@@ -93 +94 @@
     array_shift($Output); // Skip header
     foreach($Output as $Item)
-    { 
+    {
       while(strpos($Item, '  ') !== false) $Item = str_replace('  ', ' ', $Item);  // Rrmove multiple spaces
       $Item = explode(':', $Item);
@@ -108 +109 @@
         $NetworkState[$Interface]['DownAverage'] = 0;
         $NetworkState[$Interface]['UpAverage'] = 0;
-      } 
+      }
       if($NetworkState[$Interface]['DownAverage'] < 0) $NetworkState[$Interface]['DownAverage'] = 0;
       if($NetworkState[$Interface]['UpAverage'] < 0) $NetworkState[$Interface]['UpAverage'] = 0;
@@ -121 +122 @@
     return($NetworkState['Interface']['DownAverage']);
   }
-  
+
   function NetworkSpeedUpload($Interface)
   {