Changeset 730 for trunk/Modules/Scheduler/Scheduler.php

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.

File:

• trunk/Modules/Scheduler/Scheduler.php (modified) (3 diffs)

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);
         }