Revise scheduler module configuration form

Author: Jamie Snape

modules/scheduler/configs/module.ini

@@ -1,5 +1,8 @@
+; MIDAS Server. Copyright Kitware SAS. Licensed under the Apache License 2.0.
+
 [global]
-version = 1.1.0
 fullname = "Task Scheduler"
-description = "Schedules periodic background tasks"
-category = Core
+description = "Schedule periodic background tasks"
+category = "Core"
+uuid = "6ab62486-28b7-4673-bc93-e409b73a2eab"
+version = "1.1.0"

modules/scheduler/controllers/ConfigController.php renamed to modules/scheduler/controllers/AdminController.php

@@ -18,15 +18,22 @@
  limitations under the License.
 =========================================================================*/
 
-/** Config controller for the scheduler module */
-class Scheduler_ConfigController extends Scheduler_AppController
+/**
+ * Admin controller for the scheduler module.
+ *
+ * @property Scheduler_JobModel $Scheduler_Job
+ */
+class Scheduler_AdminController extends Scheduler_AppController
 {
-    public $_moduleModels = array('Job', 'JobLog');
+    /** @var array */
+    public $_moduleModels = array('Job');
 
     /** Index action */
     public function indexAction()
     {
         $this->requireAdminPrivileges();
+
+        $this->view->pageTitle = 'Scheduler Module Configuration';
         $this->view->jobs = $this->Scheduler_Job->getJobsToRun();
         $this->view->jobsErrors = $this->Scheduler_Job->getLastErrors();
     }

modules/scheduler/controllers/RunController.php

@@ -40,7 +40,7 @@ public function indexAction()
         }
         ignore_user_abort(true);
 
-        $this->Setting->setConfig('lastrun', ''.$startTime, $this->moduleName);
+        $this->Setting->setConfig('lastrun', $startTime, $this->moduleName);
 
         $id = $this->getParam('id');
         if (isset($id)) {

modules/scheduler/views/admin/index.phtml

@@ -0,0 +1,97 @@
+<?php
+/*=========================================================================
+ MIDAS Server
+ Copyright (c) Kitware SAS. 26 rue Louis Guérin. 69100 Villeurbanne, FRANCE
+ All rights reserved.
+ More information http://www.kitware.com
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0.txt
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+=========================================================================*/
+
+$this->declareVars('jobs', 'jobsErrors', 'pageTitle');
+$this->headTitle($this->escape($this->pageTitle));
+?>
+
+<div class="viewMain">
+    <h1><?php echo $this->escape($this->pageTitle); ?></h1>
+    <p>Visit the Midas Platform
+    <a href="http://www.kitware.com/midaswiki/index.php/Documentation/Latest/User/Administration/ConfigurePlugins#Task_Scheduler">wiki
+    pages</a> for instructions on completing the installation of the task scheduler.</a></p>
+    <?php
+    if (!empty($this->jobs)) {
+        ?>
+        <h2>Scheduled Tasks</h2>
+        <table>
+            <tr>
+                <th>Name</th>
+                <th>Date</th>
+                <th>Parameters (JSON)</th>
+                <th>Actions</th>
+            </tr>
+            <?php
+            foreach ($this->jobs as $job) {
+                ?>
+                <tr>
+                    <td>
+                        <?php echo $this->escape($job->getTask()); ?>
+                    </td>
+                    <td>
+                        <?php echo $this->escape($job->getFireTime()); ?>
+                    </td>
+                    <td qtip='<?php echo $this->escape(str_replace("'", '"', $job->getParams())); ?>'>
+                        <?php echo $this->escape(substr($job->getParams(), 0, 30)); ?>
+                    </td>
+                    <td>
+                        <a href="<?php echo $this->url(array('module' => 'scheduler', 'controller' => 'run', 'action' => 'index')); ?>?id=<?php echo $this->escape($job->getKey()); ?>">Run
+                            Now</a>
+                    </td>
+                </tr>
+            <?php
+            }
+            ?>
+        </table>
+    <?php
+    }
+    if (!empty($this->jobsErrors)) {
+        ?>
+        <h2>Last Failed Tasks</h2>
+        <table>
+            <tr>
+                <th>Name</th>
+                <th>Date</th>
+                <th>Parameters (JSON)</th>
+            </tr>
+            <?php
+            foreach ($this->jobsErrors as $job) {
+                ?>
+                <tr>
+                    <td>
+                        <?php echo $this->escape($job->getTask()); ?>
+                    </td>
+                    <td>
+                        <?php echo $this->escape($job->getFireTime()); ?>
+                    </td>
+                    <td qtip="<?php echo $this->escape($job->getParams()); ?>">
+                        <?php echo $this->escape(substr($job->getParams(), 0, 30)); ?>
+                    </td>
+                </tr>
+            <?php
+            }
+            ?>
+        </table>
+    <?php
+    }
+    ?>
+    <p><a href="<?php echo $this->url(array('controller' => 'admin', 'action' => 'index'), 'default'); ?>#tabs-modules">&laquo; Back to Modules Administration</a></p>
+</div>
+