[Zope-CVS] CVS: Products/Scheduler/www - manage_current_tasks.zpt:1.6

[Chris McDonough]

Update of /cvs-repository/Products/Scheduler/www
In directory cvs.zope.org:/tmp/cvs-serv11728/www

Modified Files:
	manage_current_tasks.zpt 
Log Message:
Changes which allow the descheduling of a task by its task id rather than by its time.  Now, when a task is scheduled, it is assigned a task id (available as the taskid attribute of the task).  The task must now be descheduled using its task id rather than its time.  A tag was made before this change named "before_taskid" in CVS in case changes to the HEAD cause breakages in dependent code.


=== Products/Scheduler/www/manage_current_tasks.zpt 1.5 => 1.6 ===
--- Products/Scheduler/www/manage_current_tasks.zpt:1.5	Wed Sep 25 08:48:00 2002
+++ Products/Scheduler/www/manage_current_tasks.zpt	Sat May 17 14:46:08 2003
@@ -2,38 +2,36 @@
 <h2 tal:define="manage_tabs_message options/manage_tabs_message | nothing"
     tal:replace="structure here/manage_tabs">Tabs</h2>
 
-<!-- cheesy sys.maxint inlined below --> 
 <h4 tal:content="python: here.format_time(here.now())"
     class="form-label">10:00 am</h4>
-<h4 tal:define="global tasks python: here.getPendingTaskInfo(2147483647)"
+<h4 tal:define="global tasks python: here.getPendingTaskInfo(here.maxTime())"
     tal:condition="not:tasks">There are no current tasks.</h4>
 
 <form action="" method="post" tal:attributes="action request/URL1" >
 <table width="100%" cellspacing="0" cellpadding="2" border="0"
        tal:condition="tasks">
 
-<tr align="left">
-  <th></th>
+<tr align="left" class="form-help">
+  <th width="5%"></th>
   <th>Initial Schedule Time</th>
   <th>Next Run Time</th>
   <th>Description</th>
   <th>Run Specs</th>
 </tr>
 
-<tbody tal:repeat="task_tup tasks">
+<tbody tal:repeat="task_tup tasks" tal:omit-tag="">
 
-<span tal:condition="nothing">
-Whoever puts the coloring back in had better not do it by cloning
-the row!
-</span>
 <tr align="left" class="form-help"
-    tal:condition="repeat/task_tup/even"
     tal:define="current_time python:task_tup[0];
                 current_task_info python:task_tup[1];
                 scheduled_when current_task_info/when;
-               ">
-  <td><input type="checkbox" name="when:int:list"
-       tal:attributes="value current_time"></td>
+                taskid current_task_info/taskid;
+		is_even repeat/task_tup/even;"
+    tal:attributes="bgcolor python: test(is_even, '#FFFFFF', '#EEEEEE')">
+
+  <td width="5%">
+     <input type="checkbox" name="taskids:list" tal:attributes="value taskid">
+  </td>
   <td tal:content="python: here.format_time(scheduled_when)">
    11:00 am</td>
   <td tal:content="python: here.format_time(current_time)">11:00 am</td>
@@ -41,20 +39,18 @@
   <td tal:content="current_task_info/info">
     incidental run info
   </td>
+
 </tr>
 
 </tbody>
 
-<tr align="left">
-  <td>
-    <input type="submit" name="manage_descheduleTask:method"
-           value="Deschedule">
-
-    <input type="submit" name="manage_notifyTasks:method"
-           value="Notify Pending">
-  </td>
-</tr>
 </table>
+
+
+<input type="submit" name="manage_descheduleTask:method" value="Deschedule"/>
+
+<input type="submit" name="manage_notifyTasks:method" value="Notify Pending"/>
+
 </form>
 
 <h1 tal:replace="structure here/manage_page_footer">Footer</h1>