Changeset 730

Timestamp:

Jan 13, 2015, 12:18:19 AM (10 years ago)

Author:

chronos

Message:

• Added: Scheduler available action table. Modules can register actions as read only items in table.

Location:

trunk

Files:

• Application/System.php (modified) (1 diff)
• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/FinanceBankAPI/FinanceBankAPI.php (modified) (1 diff)
• Modules/Scheduler/Scheduler.php (modified) (3 diffs)

trunk/Application/System.php

@@ -210 +210 @@
               echo($Output);
       } else echo('Command "'.$argv[1].'" not supported.'."\n");        
-        }
-        //print_r($argv);
+        } else echo('No command was given as parameter'."\n");
   }
   

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 729; // Subversion revision
-$DatabaseRevision = 729; // SQL structure revision
-$ReleaseTime = strtotime('2015-01-11');
+$Revision = 730; // Subversion revision
+$DatabaseRevision = 730; // SQL structure revision
+$ReleaseTime = strtotime('2015-01-12');

trunk/Common/Setup/Updates.php

@@ -1207 +1207 @@
   
   $Manager->Execute('INSERT INTO `Module` (`Id`, `Name`, `Title`) VALUES (NULL, "Plánovač", "Scheduler");');
+}
+
+function UpdateTo730($Manager)
+{
+        $Manager->Execute('CREATE TABLE IF NOT EXISTS `SchedulerAction` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  `Class` varchar(255) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');      
+        $Manager->Execute('ALTER TABLE `SchedulerAction` ADD PRIMARY KEY (`Id`);');
+        
+  $Manager->Execute('ALTER TABLE `Scheduler` CHANGE `Class` `Action` INT(11) NOT NULL;');
+  $Manager->Execute("ALTER TABLE `Scheduler` ADD INDEX ( `Action` ) ");
+  $Manager->Execute('ALTER TABLE `Scheduler` ADD CONSTRAINT `Schedule_ibfk_2` FOREIGN KEY (`Action`) REFERENCES `SchedulerAction` (`Id`);');
+  $Manager->Execute('INSERT INTO `SchedulerAction` (`Id`, `Name`, `Class`) VALUES (NULL, "Import bankovních účtů", "ScheduleBankImport");');  
 }
 
@@ -1271 +1286 @@
         725 => array('Revision' => 726, 'Function' => 'UpdateTo726'),
         726 => array('Revision' => 729, 'Function' => 'UpdateTo729'),
+        729 => array('Revision' => 730, 'Function' => 'UpdateTo730'),
     ));
   }

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -88 +88 @@
         {
                 $Output = '';
-                $DbResult = $this->Database->select('FinanceBankAccount', 'Id', '(AutoImport=1) AND ((TimeEnd IS NULL) OR (TimeEnd > NOW()))');
+                $DbResult = $this->Database->select('FinanceBankAccount', 'Id', '(`AutoImport`=1) AND ((`TimeEnd` IS NULL) OR (`TimeEnd` > NOW()))');
                 while($DbRow = $DbResult->fetch_assoc())
                 {                       
+                        echo($DbRow['Comment']."\n");
                         $Page = new PageImportAPI($this->System);
                         $Output .= $Page->Show();

trunk/Modules/Scheduler/Scheduler.php

@@ -24 +24 @@
         'Enabled' => array('Type' => 'Boolean', 'Caption' => 'Povoleno', 'Default' => '0'),
         'ScheduledTime' => array('Type' => 'DateTime', 'Caption' => 'Plánovaný čas', 'Default' => ''),
-        'Class' => array('Type' => 'String', 'Caption' => 'Vykonat třídu', 'Default' => ''),
+        'Action' => array('Type' => 'TSchedulerAction', 'Caption' => 'Akce', 'Default' => ''),
         'Period' => array('Type' => 'Integer', 'Caption' => 'Opakovat po', 'Default' => '', 'Null' => true, 'Suffix' => 'sekund'),
         'Log' => array('Type' => 'Text', 'Caption' => 'Poslední záznam', 'Default' => '', 'ReadOnly' => true),
         'LastExecutedTime' => array('Type' => 'DateTime', 'Caption' => 'Čas posledního spuštění', 'Default' => '', 'ReadOnly' => true),
       ),
+    ));
+    $this->System->FormManager->RegisterClass('SchedulerAction', array(
+      'Title' => 'Akce plánovače',
+      'Table' => 'SchedulerAction',
+      'DefaultSortColumn' => 'Name',
+        'ReadOnly' => true,
+      'Items' => array(
+        'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => '', 'ReadOnly' => true),
+        'Class' => array('Type' => 'String', 'Caption' => 'Vykonat třídu', 'Default' => '', 'ReadOnly' => true),
+      ),
+    ));
+    $this->System->FormManager->RegisterFormType('TSchedulerAction', array(
+        'Type' => 'Reference',
+        'Table' => 'SchedulerAction',
+        'Id' => 'Id',
+        'Name' => 'Name',
+        'Filter' => '1',
     ));
     $this->System->RegisterCommandLine('run-scheduler', array('ModuleScheduler', 'Run'));
@@ -45 +62 @@
         while(true) 
         {
-          $DbResult = $this->Database->select('Scheduler', '*', '(Enabled=1) AND (ScheduledTime < NOW())');
+          $DbResult = $this->Database->query('SELECT `Scheduler`.*, `SchedulerAction`.`Class` AS `Class` FROM `Scheduler` '.
+                'LEFT JOIN `SchedulerAction` ON `SchedulerAction`.`Id` = `Scheduler`.`Action` '.
+                'WHERE (`Scheduler`.`Enabled`=1) AND (`Scheduler`.`ScheduledTime` > `Scheduler`.`LastExecutedTime`)');
           while($DbRow = $DbResult->fetch_assoc())
           {
@@ -60 +79 @@
                                 array('ScheduledTime' => TimeToMysqlDateTime((MysqlDateTimeToTime($DbRow['ScheduledTime']) + $DbRow['Period']))));                        
           }     
+          echo('.');
           sleep(1);
         }