Merged in from DEV trunk...

KTC-541 "On Task Scheduler Management Page in web interface - 'Frequency' drop-down and save button combo jumps" Fixed. The drop-down form is now displayed in the table cell and not as a floating div. KTC-542 "Task Scheduler Management Page - remove 'Clean-up old tasks' link at the bottom of the page" Fixed. Removed the link. KTS-3417 "Scheduler - replace YUI with ExtJS" Fixed. Removed the yui ajax, used an extjs request. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/branches/3.5.3-Branch@8580 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTC-541 "On Task Scheduler Management Page in web interface - 'Frequency' drop-down and save button combo jumps" Fixed. The drop-down form is now displayed in the table cell and not as a floating div. KTC-542 "Task Scheduler Management Page - remove 'Clean-up old tasks' link at the bottom of the page" Fixed. Removed the link. KTS-3417 "Scheduler - replace YUI with ExtJS" Fixed. Removed the yui ajax, used an extjs request. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/branches/3.5.3-Branch@8580 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent ee5fb602
Showing 5 changed files with 147 additions and 108 deletions
plugins/ktcore/scheduler/schedulerEntity.php
plugins/ktcore/scheduler/schedulerUtil.php
plugins/ktcore/scheduler/taskScheduler.php
resources/js/scheduler.js
templates/ktcore/scheduler.smarty
@@ -6,31 +6,31 @@
  * Document Management Made Simple
  * Copyright (C) 2008 KnowledgeTree Inc.
  * Portions copyright The Jam Warehouse Software (Pty) Limited
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  * California 94120-7775, or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
+ * must display the words "Powered by KnowledgeTree" and retain the original
  * copyright notice.
  * Contributor( s): ______________________________________
  *
@@ -201,9 +201,9 @@ class schedulerEntity extends KTEntity
         $sStatus = $this->getStatus();
         $sFreqs = $this->getFrequencyByLang();
-        $sLink = "<a href='#' id='freqDrop{$sId}' onclick='javascript: showFrequencyDiv(\"{$sId}\");'";
+        $sLink = "<div id='div{$sId}'";
         $sLink .= ($sStatus == 'disabled') ? 'style="visibility: hidden;" >' : '>';
-        $sLink .= "<div id='div{$sId}'>$sFreqs</div></a>";
+        $sLink .= $sFreqs.'</div>';
         return $sLink;
     }
@@ -214,9 +214,10 @@ class schedulerEntity extends KTEntity
         $sId = $this->getId();
         $sStatus = $this->getStatus();
-        $sLink = "<a href='#' id='freqLink{$this->getId()}' onclick='javascript: showFrequencyDiv({$sId});'";
-        $sLink .= ($sStatus == 'disabled') ? 'style="visibility: hidden;" >' : '>';
-        $sLink .= _kt('Alter frequency')."</a>";
+        $sLink = "<input type='button' id='freqLink{$this->getId()}' onclick='javascript: showFrequencyDiv(\"{$sId}\");'";
+        $sLink .= " value='"._kt('Change Frequency')."' ";
+        $sLink .= ($sStatus == 'disabled') ? 'style="visibility: hidden;" />' : ' />';
+
         return $sLink;
     }
@@ -228,9 +229,11 @@ class schedulerEntity extends KTEntity
         $sStatus = $this->getStatus();
         $sUrl = KTUtil::ktLink('admin.php', 'misc/scheduler', 'action=updateRunTime');
-        $sLink = "<a href='#' id='runnowLink{$this->getId()}' onclick='javascript: runOnNext(\"{$sId}\", \"{$sUrl}\");'";
-        $sLink .= ($sStatus == 'disabled') ? 'style="visibility: hidden;" >' : '>';
-        $sLink .= _kt('Run on next iteration')."</a>";
+        $sTitle = _kt('This task will run the next time the Scheduler runs'); //, and then revert to the frequency you set on this page');
+        $sLink = "<input type='button' id='runnowLink{$this->getId()}' onclick='javascript: runOnNext(\"{$sId}\", \"{$sUrl}\");'";
+        $sLink .= " title='$sTitle' value='"._kt('Run on Next Iteration')."' ";
+        $sLink .= ($sStatus == 'disabled') ? 'style="visibility: hidden;" />' : ' />';
+
         return $sLink;
     }
@@ -244,13 +247,13 @@ class schedulerEntity extends KTEntity
             return '';
         }
-        $sDisableText = _kt('Disable task');
-        $sEnableText = _kt('Enable task');
+        $sDisableText = _kt('Disable Task');
+        $sEnableText = _kt('Enable Task');
         $sLinkText = ($sStatus == 'enabled') ? $sDisableText : $sEnableText;
         $sUrl = KTUtil::ktLink('admin.php', 'misc/scheduler', 'action=updateStatus');
-        $sLink = "<a id='statusLink{$this->getId()}' href='#'
-            onclick='javascript: toggleStatus(\"{$sId}\", \"{$sUrl}\", \"{$sDisableText}\", \"{$sEnableText}\");'>{$sLinkText}</a>";
+        $sLink = "<input type='button' id='statusLink{$this->getId()}'
+            onclick='javascript: toggleStatus(\"{$sId}\", \"{$sUrl}\", \"{$sDisableText}\", \"{$sEnableText}\");' value='{$sLinkText}' />";
         return $sLink;
     }
 }
@@ -6,31 +6,31 @@
  * Document Management Made Simple
  * Copyright (C) 2008 KnowledgeTree Inc.
  * Portions copyright The Jam Warehouse Software (Pty) Limited
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  * California 94120-7775, or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
+ * must display the words "Powered by KnowledgeTree" and retain the original
  * copyright notice.
  * Contributor( s): ______________________________________
  *
@@ -214,6 +214,7 @@ class schedulerUtil extends KTUtil
         // Recalculate the next run time, use the previous run time as the start time.
         $iPrevious = $oScheduler->getPrevious();
         $iNextTime = schedulerUtil::calculateRunTime($sFreq, $iPrevious);
+        $iNextTime = ($iNextTime < time()) ? time() : $iNextTime;
         $oScheduler->setFrequency($sFreq);
         $oScheduler->setRunTime($iNextTime);
@@ -250,6 +251,12 @@ class schedulerUtil extends KTUtil
             // ignore
             return $sStatus;
         }
+        if($sStatus == 'disabled'){
+            // If the task is being enabled, set the next run time to the current date plus the frequency period
+            $freq = $oScheduler->getFrequency();
+            $runTime = schedulerUtil::calculateRunTime($freq, time());
+            $oScheduler->setRunTime($runTime);
+        }
         $sNewStatus = ($sStatus == 'enabled') ? 'disabled' : 'enabled';
         $oScheduler->setStatus($sNewStatus);
@@ -6,31 +6,31 @@
  * Document Management Made Simple
  * Copyright (C) 2008 KnowledgeTree Inc.
  * Portions copyright The Jam Warehouse Software (Pty) Limited
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, 
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  * California 94120-7775, or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
+ * must display the words "Powered by KnowledgeTree" and retain the original
  * copyright notice.
  * Contributor( s): ______________________________________
  *
@@ -49,24 +49,21 @@ class manageSchedulerDispatcher extends KTAdminDispatcher
     function do_main() {
         $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _kt('Task Scheduler Management'));
         $this->oPage->setTitle(_kt('Task Scheduler Management'));
-        $this->oPage->requireJSResource('thirdpartyjs/yui/event/event.js');
-        $this->oPage->requireJSResource('thirdpartyjs/yui/connection/connection.js');
-        $this->oPage->requireJSResource('thirdpartyjs/yui/dom/dom.js');
         $this->oPage->requireJSResource('resources/js/scheduler.js');
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate = $oTemplating->loadTemplate('ktcore/scheduler');
         // Link for clearing out old tasks
-        $lClear = KTUtil::ktLink('admin.php', 'misc/scheduler', 'action=clearTasks');
-        $sClear = "<a href='#' onclick='javascript: clearTasks(\"{$lClear}\");'>"._kt('Clean-up old tasks').'</a>';
+//        $lClear = KTUtil::ktLink('admin.php', 'misc/scheduler', 'action=clearTasks');
+//        $sClear = "<a href='#' onclick='javascript: clearTasks(\"{$lClear}\");'>"._kt('Clean-up old tasks').'</a>';
         // Link for saving the updated frequencies
         $sUrl = KTUtil::ktLink('admin.php', 'misc/scheduler', 'action=saveFreq');
         // Get all tasks
         $aList = SchedulerEntity::getTaskList();
-        $aHeadings = array('', _kt('Task'), _kt('Frequency'), _kt('Next run time'), _kt('Previous run time'), _kt('Time taken to complete'), '');
+        $aHeadings = array('&nbsp;', _kt('Task'), _kt('Frequency'), _kt('Next run time'), _kt('Previous run time'), _kt('Time taken to complete'), '&nbsp;');
         //$aFrequencies = array('monthly', 'weekly', 'daily', 'hourly', 'half_hourly', 'quarter_hourly', '10mins', '5mins');
         $aFrequencies = array(
@@ -89,7 +86,7 @@ class manageSchedulerDispatcher extends KTAdminDispatcher
               'aFrequencies' => $aFrequencies,
               'i' => 1,
               'sUrl' => $sUrl,
-              'sClear' => $sClear
+//              'sClear' => $sClear
         );
         return $oTemplate->render($aTemplateData);
     }
-
+// Clean up tasks marked as completed
 var clearTasks = function(sUrl) {
-    var callback = {
-        success: function(o) {
-            alert('Tasks have been successfully cleaned up');
+    Ext.Ajax.request({
+        url: sUrl,
+        success: function(response) {
+            alert('The tasks have been successfully cleaned up');
         },
-        failure: function(o) {
-            alert('Clean up failed!');
+        failure: function(response) {
+            alert('Error. The clean up failed.');
         }
-    }
-
-    var transaction = YAHOO.util.Connect.asyncRequest('GET', sUrl, callback);
+    });
 }
-//<!-- Change the run time to now -->
+//<!-- Reschedule the task to run the next time the scheduler runs -->
 var runOnNext = function(fId, sUrl) {
     var runDiv = document.getElementById('runDiv'+fId);
     //<!-- Display the new runtime -->
     var displayDate = formatDate('','no');
-    var callback = {
-        success: function(o) {
+    Ext.Ajax.request({
+        url: sUrl,
+        success: function(response) {
             runDiv.innerHTML = displayDate;
-        }
-    }
-    var transaction = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, "fId="+fId);
+        },
+        failure: function(response) {
+            alert('Error. The update failed, please refresh the page and try again.');
+        },
+        params: { fId: fId }
+    });
 }
 //<!-- Enable / disable the task -->
@@ -34,52 +37,67 @@ var toggleStatus = function(fId, sUrl, sDisableText, sEnableText) {
     var statusLink = document.getElementById('statusLink'+fId);
     var freqLink = document.getElementById('freqLink'+fId);
     var runnowLink = document.getElementById('runnowLink'+fId);
-    var freqDrop = document.getElementById('freqDrop'+fId);
     var fontClass = document.getElementById('font'+fId);
     var freqDiv = document.getElementById('div'+fId);
-
-    var callback = {
-        success: function(o) {
-            if(statusLink.innerHTML == sDisableText){
-                statusLink.innerHTML = sEnableText;
+    var runDiv = document.getElementById('runDiv'+fId);
+    var freq = document.getElementById('freq_'+fId).value;
+
+    var date = new Date();
+    var msNow = date.getTime();
+    var now = parseInt(msNow / 1000);
+    var runTime = calculateFreq(freq, now);
+    var displayDate = formatDate(runTime);
+
+    Ext.Ajax.request({
+        url: sUrl,
+        success: function(response) {
+            if(statusLink.value == sDisableText){
+                statusLink.value = sEnableText;
                 freqLink.style.visibility = "hidden";
                 runnowLink.style.visibility = "hidden";
-                freqDrop.style.visibility = "hidden";
+                runDiv.style.visibility = 'hidden';
                 fontClass.className = 'descriptiveText';
                 freqDiv.style.display = "none";
             }else{
-                statusLink.innerHTML = sDisableText;
+                statusLink.value = sDisableText;
                 freqLink.style.visibility = "visible";
                 runnowLink.style.visibility = "visible";
-                freqDrop.style.visibility = "visible";
                 freqDiv.style.display = "block";
+                freqDiv.style.visibility = "visible";
                 fontClass.className = '';
+
+                runDiv.style.visibility = 'visible';
+                runDiv.innerHTML = displayDate;
             }
-        }
-    }
-    var transaction = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, "fId="+fId);
+        },
+        failure: function(response) {
+            alert('Error. The status update failed, please refresh the page and try again.');
+        },
+        params: { fId: fId }
+    });
 }
+// Display the form to changed the frequency at which the task runs
 var showFrequencyDiv = function(fId) {
     var formDiv = document.getElementById('formDiv');
+
+    if(formDiv.innerHTML == ''){
+        return;
+    }
+
     var fInput = document.getElementById('fId');
-    var tblCol = document.getElementById('tblCol');
-    var freqDiv = document.getElementById('div'+fId);
-    var posFreq = YAHOO.util.Dom.getXY('div'+fId);
+    var tblCol = document.getElementById('col_'+fId);
-    //<!-- Hide the frequency and display the form in place -->
-    formDiv.style.display = "block";
-    freqDiv.style.display = "none";
-    formDiv.style.visibility = "visible";
-    freqDiv.style.visibility = "hidden";
     fInput.value = fId;
-    tblCol.width = "20%";
-    YAHOO.util.Dom.setXY('formDiv', posFreq);
+    tblCol.innerHTML = formDiv.innerHTML;
+    tblCol.style.display = 'block';
+    formDiv.innerHTML = '';
 }
+// Save the new frequency
 var saveFreq = function(sUrl) {
     var fId = document.getElementById('fId').value;
-    var tblCol = document.getElementById('tblCol');
+    var tblCol = document.getElementById('col_'+fId);
     var formDiv = document.getElementById('formDiv');
     var freqDiv = document.getElementById('div'+fId);
     var runDiv = document.getElementById('runDiv'+fId);
@@ -89,32 +107,35 @@ var saveFreq = function(sUrl) {
     var freq = fSelect.options[fSelect.selectedIndex].value;
     var freqLabel = fSelect.options[fSelect.selectedIndex].label;
+    // Move the form content back to the form div
+    formDiv.innerHTML = tblCol.innerHTML;
+    tblCol.innerHTML = '';
+    tblCol.style.display = 'none';
+
     //<!-- Work out new runtime using the frequency -->
     var prevNum = new Number(prevInput);
     var nextTime = calculateFreq(freq, prevNum);
     var displayDate = formatDate(nextTime);
-    var callback = {
-        success: function(o) {
+    Ext.Ajax.request({
+        url: sUrl,
+        success: function(response) {
             freqDiv.innerHTML = freqLabel;
             runDiv.innerHTML = displayDate;
+            document.getElementById('freq_'+fId).value = freq;
+        },
+        failure: function(response) {
+            alert('Error. The frequency update failed, please refresh the page and try again.');
+        },
+        params: {
+            frequency: freq,
+            fId: fId
         }
-    }
-
-    YAHOO.util.Connect.setForm(freqForm);
-    var transaction = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback);
-
-    tblCol.width = "";
-    formDiv.style.display = "none";
-    freqDiv.style.display = "block";
-    formDiv.style.visibility = "hidden";
-    freqDiv.style.visibility = "visible";
+    });
 }
-//<!-- Calculate the next run time based on the previous runtime -->
+//<!-- Calculate the next run time based on the given runtime -->
 var calculateFreq = function(freq, prev) {
-
-    var curDate = new Date();
     var iDiff = 0;
     switch(freq) {
@@ -155,16 +176,23 @@ var calculateFreq = function(freq, prev) {
         }
         var iNextTime = prev + iDiff;
+
         return iNextTime;
 }
 //<!-- Return a formatted date given a unix timestamp -->
+// If the date if prior to the current date then return the current date
 var formatDate = function(unixTime, useUnix) {
     if(useUnix == 'no') {
         var newDate = new Date();
     }else{
         var milliTime = unixTime * 1000;
         var newDate = new Date(milliTime);
+
+        var curDate = new Date();
+        if(newDate < curDate){
+            newDate = curDate;
+        }
     }
     var year = newDate.getFullYear();
@@ -25,6 +25,7 @@
 {if $aList}
 {foreach from=$aList item=task}
+{assign var=taskId value=$task->getId()}
     <tr class="{cycle name=rows values=",odd"}">
         <td width='2%'>
@@ -33,17 +34,24 @@
         <td>
             {$task->getTaskDiv()}
         </td>
-        <td id="tblCol">
+        <td>
             {$task->getFreqDiv()}
+            <div id="col_{$taskId}">
+            </div>
+            <div style="visibility: hidden; display: none;">
+                <input type="hidden" name="freq_{$taskId}" id="freq_{$taskId}" value="{$task->getFrequency()}" />
+            </div>
         </td>
         <td>
-            <div id="runDiv{$task->getId()}">
-                {$task->getRunTime()}
+            <div id="runDiv{$taskId}">
+                {if $task->getStatus() != 'disabled'}
+                    {$task->getRunTime()}
+                {/if}
             </div>
         </td>
         <td>
-            <div id="prevDiv{$task->getId()}" style="display:none; visibility:hidden;">
-                <input type="hidden" name="prev{$task->getId()}" id="prev{$task->getId()}" value="{$task->getPrevious()}" />
+            <div id="prevDiv{$taskId}" style="display:none; visibility:hidden;">
+                <input type="hidden" name="prev{$taskId}" id="prev{$taskId}" value="{$task->getPrevious()}" />
             </div>
             {$task->getPrevious(TRUE)}
         </td>
@@ -76,7 +84,3 @@
         <input type="button" name="save" id="save" onclick='javascript: saveFreq("{$sUrl}");' value="{i18n}Save{/i18n}" />
     </form>
 </div>
-
-<p>
-    {$sClear}
-</p>