Changeset 729 for trunk/Modules

Timestamp:

Jan 12, 2015, 12:20:30 AM (10 years ago)

Author:

chronos

Message:

• Added: Generic Scheduler module for running tasks on specified time and with specified period.
• Added: System execution from command line using cmd.php entry point.

Location:

trunk/Modules

Files:

• Finance/Finance.php (modified) (1 diff)
• FinanceBankAPI/FinanceBankAPI.php (modified) (4 diffs)
• Scheduler (added)
• Scheduler/Scheduler.php (added)
• User/User.php (modified) (2 diffs)

trunk/Modules/Finance/Finance.php

@@ -380 +380 @@
           'ReadOnly' => true, 'Suffix' => 'Kč', 'SQL' => '(SELECT SUM(`FinanceOperation`.`Value` * `FinanceOperation`.`Direction`) FROM `FinanceOperation` '.
           'WHERE `FinanceOperation`.`BankAccount`=#Id)'),
+        'AutoImport' => array('Type' => 'Boolean', 'Caption' => 'Automaticky stahovat z banky', 'Default' => ''),
       ),
       'ItemActions' => array(

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -4 +4 @@
 include_once(dirname(__FILE__).'/ImportPS.php');
 include_once(dirname(__FILE__).'/ImportFio.php');
+include_once(dirname(__FILE__).'/../Scheduler/Scheduler.php');
 
 class ModuleFinanceBankAPI extends AppModule
@@ -15 +16 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Communication through API to various banks, manual file import';
-    $this->Dependencies = array('Finance');
+    $this->Dependencies = array('Finance', 'Scheduler');
   }
 
@@ -58 +59 @@
 
     $this->System->RegisterPage(array('finance', 'import-api'), 'PageImportAPI');
-    $this->System->RegisterPage(array('finance', 'import-soubor'), 'PageImportFile');
+    $this->System->RegisterPage(array('finance', 'import-soubor'), 'PageImportFile');    
   }
 
@@ -81 +82 @@
   }
 }
+
+class ScheduleBankImport extends SchedulerTask
+{
+        function Execute()
+        {
+                $Output = '';
+                $DbResult = $this->Database->select('FinanceBankAccount', 'Id', '(AutoImport=1) AND ((TimeEnd IS NULL) OR (TimeEnd > NOW()))');
+                while($DbRow = $DbResult->fetch_assoc())
+                {                       
+                        $Page = new PageImportAPI($this->System);
+                        $Output .= $Page->Show();
+                }
+                return($Output);
+        }
+}

trunk/Modules/User/User.php

@@ -66 +66 @@
     $this->OnlineStateTimeout = 600; // in seconds
     $this->PasswordHash = new PasswordHash();
+    $this->User = array('Id' => null, 'Member' => null);
   }
 
@@ -694 +695 @@
   function TopBarCallback()
   {
-    if($this->System->User->User['Id'] == null)
+    if($this->System->User->User['Id'] == null) 
+    {
       $Output = '<a href="'.$this->System->Link('/user/?Action=LoginForm').'">Přihlášení</a> '.
         '<a href="'.$this->System->Link('/user/?Action=UserRegister').'">Registrace</a>';
-      else $Output = $this->System->User->User['Name'].
+    } else 
+    {
+        $Output = $this->System->User->User['Name'].
         ' <a href="'.$this->System->Link('/user/?Action=UserMenu').'">Nabídka</a>'.
         ' <a href="'.$this->System->Link('/user/?Action=Logout').'">Odhlásit</a>';
-//   <a href="'.$this->System->Link('/?Action=UserOptions').'">Nastavení</a>';
+        //   <a href="'.$this->System->Link('/?Action=UserOptions').'">Nastavení</a>';
+    }
     return($Output);
   }