Changeset 689

Timestamp:

Sep 7, 2014, 6:15:54 PM (10 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazení stavu placení u Subjektů v ISu.
• Přidáno: Výchozí řazení u fronty emailů podle času.

Location:

trunk

Files:

• Common/Setup/Updates.php (modified) (1 diff)
• Modules/EmailQueue/EmailQueue.php (modified) (8 diffs)
• Modules/News/ImportObecHovezi.php (modified) (5 diffs)
• Modules/Subject/Subject.php (modified) (1 diff)

trunk/Common/Setup/Updates.php

@@ -889 +889 @@
         // Convert monthly plus payment for consumption to regular service
   $DbResult = $Manager->Execute('SELECT `MonthlyPlus`, `Member` FROM `MemberPayment` WHERE `MonthlyPlus` > 0');
-  while($DbResult->num_rows > 0)
+  while($DbRow = $DbResult->fetch_assoc)
   {
-        $DbRow = $DbResult->fetch_assoc();
     $Manager->Execute("INSERT INTO `Service` (`Id` ,`Name` ,`Category` ,`Price` ,`VAT`) ".
       "VALUES (NULL , 'Spotřeba energie', 3, -".$DbRow['MonthlyPlus'].", 2);");

trunk/Modules/EmailQueue/EmailQueue.php

@@ -6 +6 @@
   var $ShortTitle = 'Fronta pošty';
   var $ParentClass = 'PagePortal';
-  
+
   function Show()
   {
@@ -12 +12 @@
     $Output = $this->SystemMessage('Zpracování fronty emailů', 'Nové emaily byly odeslány').$Output;
     return($Output);
-  }  
+  }
 }
-  
+
 class ModuleEmailQueue extends AppModule
 {
@@ -37 +37 @@
 
   function DoStart()
-  {    
+  {
     $this->System->RegisterPage('fronta-posty', 'PageEmailQueueProcess');
     $this->System->FormManager->RegisterClass('Email', array(
@@ -52 +52 @@
         'Title' => 'Fronta e-mailů',
         'Table' => 'EmailQueue',
+                'DefaultSortColumn' => 'Time',
+                'DefaultSortOrder' => 1,
         'Items' => array(
             'Time' => array('Type' => 'DateTime', 'Caption' => 'Vytvořeno'),
@@ -65 +67 @@
             array('Caption' => 'Odeslat nové', 'URL' => '/fronta-posty/'),
         ),
-    ));    
+    ));
   }
 
@@ -74 +76 @@
   function AddItem($To, $Subject, $Content, $From, $AttachmentFileId = '')
   {
-    $Values = array('To' => $To, 
-      'Subject' => $Subject, 'Content' => $Content, 'Time' => 'NOW()', 
+    $Values = array('To' => $To,
+      'Subject' => $Subject, 'Content' => $Content, 'Time' => 'NOW()',
       'From' => $From);
     if($AttachmentFileId != '') $Values['AttachmentFile'] = $AttachmentFileId;
     $this->Database->insert('EmailQueue', $Values);
   }
- 
+
   function Process()
   {
@@ -86 +88 @@
     $DbResult = $this->Database->select('EmailQueue', '*', 'Archive=0');
     while($DbRow = $DbResult->fetch_assoc())
-    {      
+    {
       $Mail = new Mail();
       $Mail->AddToCombined($DbRow['To']);
@@ -103 +105 @@
       $this->System->ModuleManager->Modules['Log']->NewRecord('System', 'SendEmail', $DbRow['Id']);
       $Output .= 'To: '.$DbRow['To'].'  Subject: '.$DbRow['Subject'].'<br />';
-    }    
+    }
     return($Output);
   }

trunk/Modules/News/ImportObecHovezi.php

@@ -15 +15 @@
 
 $doc = new DOMDocument();
-$doc->load($SourceURL);
-foreach($doc->getElementsByTagName('item') as $node) 
+@$doc->load($SourceURL);
+foreach($doc->getElementsByTagName('item') as $node)
 {
   $Title = $node->getElementsByTagName('title')->item(0)->nodeValue;
   $Description = $node->getElementsByTagName('description')->item(0)->nodeValue;
-  $Link = $node->getElementsByTagName('link')->item(0)->nodeValue;  
+  $Link = $node->getElementsByTagName('link')->item(0)->nodeValue;
   $Date = $node->getElementsByTagName('pubDate')->item(0)->nodeValue;
-  
+
   $Description = strip_tags($Description);
   $Description = str_replace("\r", '', $Description);
@@ -29 +29 @@
   //  $Date = substr($Date, $CommaPos + 1);
   $Date = TimeToMysqlDateTime(strtotime($Date));
-  
-  
+
+
   $DbResult = $System->Database->select('News', 'Id', '(`Title`="'.$System->Database->real_escape_string($Title).'") AND (`Category`='.$Category.') AND (`Content` = "'.$System->Database->real_escape_string($Description).'") AND (`Link` = "'.$System->Database->real_escape_string($Link).'")');
   //echo($System->Database->LastQuery);
@@ -52 +52 @@
   $Description = substr($Content, strpos($Content, $DescriptionSeparator) + strlen($DescriptionSeparator));
   $Description = trim(substr($Description, 0, strpos($Description, '</')));
-  
+
   $Content = substr($Content, strpos($Content, $StartLink) + strlen($StartLink));
   $Link = substr($Content, 0, strpos($Content, '<'));
@@ -62 +62 @@
   //echo('Description: '.$Description.'<br>');
   //echo('Link: '.$Link.'<br><hr>');
-  
+
   $Link = $System->Database->real_escape_string($Link);
   $Title = $System->Database->real_escape_string($Title);
   $Description = strip_cdata($Description);
   $Description = strip_tags($Description);
-  
+
   $Description = str_replace("\n", '<br>', $Description);
   $Description = str_replace("\r", '', $Description);
   $Description = $System->Database->real_escape_string($Description);
-  
+
   $DbResult = $System->Database->select('News', 'Id', '(`Title`="'.$Title.'") AND (`Category`='.$Category.') AND (`Content` = "'.$Description.'") AND (`Link` = "'.$Link.'")');
   //echo($System->Database->LastQuery);
@@ -79 +79 @@
     echo($System->Database->insert_id.',');
   }
-} 
+}
 */

trunk/Modules/Subject/Subject.php

@@ -36 +36 @@
         'Invoices' => array('Type' => 'TFinanceInvoiceListSubject', 'Caption' => 'Faktury', 'Default' => ''),
         'Payment' => array('Type' => 'Float', 'Caption' => 'Placení', 'Default' => '',
-          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value`) FROM `FinanceOperation` '.
-          'WHERE `FinanceOperation`.`Subject`=#Id) - (SELECT SUM(`FinanceInvoice`.`Value`) FROM `FinanceInvoice` '.
-          'WHERE `FinanceInvoice`.`Subject`=#Id)'),
+          'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => 'IFNULL((SELECT SUM(`FinanceOperation`.`Value`) FROM `FinanceOperation` '.
+          'WHERE `FinanceOperation`.`Subject`=#Id), 0) - IFNULL((SELECT SUM(`FinanceInvoice`.`Value`) FROM `FinanceInvoice` '.
+          'WHERE `FinanceInvoice`.`Subject`=#Id), 0)'),
       ),
     ));