[rhmessaging-commits] rhmessaging commits: r2465 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2008-09-12 15:33:21 -0400 (Fri, 12 Sep 2008)
New Revision: 2465

Modified:
   mgmt/trunk/cumin/python/cumin/submitter.py
   mgmt/trunk/cumin/python/cumin/submitter.strings
Log:
Adding Job tab to Submitter view

Modified: mgmt/trunk/cumin/python/cumin/submitter.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/submitter.py	2008-09-12 19:32:44 UTC (rev 2464)
+++ mgmt/trunk/cumin/python/cumin/submitter.py	2008-09-12 19:33:21 UTC (rev 2465)
@@ -11,6 +11,7 @@
 from parameters import *
 from formats import *
 from util import *
+from job import *
 
 strings = StringCatalog(__file__)
 log = logging.getLogger("cumin.submitter")
@@ -48,6 +49,25 @@
         self.add_mode(view)
         self.set_view_mode(view)
 
+    def show_scheduler(self, session, scheduler):
+        return self.frame.show_scheduler(session, scheduler)
+        
+    def show_job(self, session, job):
+        return self.frame.show_job(session, job)
+        
+    def show_job_group(self, session, job_group):
+        return self.frame.show_job_group(session, job_group)
+
+    def show_jobs_hold(self, session):
+        return self.frame.show_jobs_hold(session)
+    
+    def show_jobs_release(self, session):
+        return self.frame.show_jobs_release(session)
+    
+    def show_jobs_remove(self, session):
+        return self.frame.show_jobs_remove(session)
+    
+
 class SubmitterView(CuminView):
     def __init__(self, app, name):
         super(SubmitterView, self).__init__(app, name)
@@ -61,6 +81,9 @@
         stats = SubmitterStats(app, "stats")
         self.__tabs.add_tab(stats)
 
+        jobs = SubmitterJobSet(app, "jobs")
+        self.__tabs.add_tab(jobs)
+        
         details = CuminDetails(app, "details")
         self.__tabs.add_tab(details)
 
@@ -93,3 +116,36 @@
 
         def render_title(self, session, sched):
             return "Jobs"
+
+class SubmitterJobSet(JobSet, Form):
+    def __init__(self, app, name):
+        super(SubmitterJobSet, self).__init__(app, name)
+        
+        self.set_default_column_name("global_job_id")
+
+        self.__remove = JobRemoveButton(app, "remove", self)
+        self.add_child(self.__remove)
+
+        self.__hold = JobHoldButton(app, "hold", self)
+        self.add_child(self.__hold)
+
+        self.__release = JobReleaseButton(app, "release", self)
+        self.add_child(self.__release)
+
+    def pre_render(self, session, args):
+        self.show_column(session, "global_job_id")
+        self.show_column(session, "custom_id")
+        self.show_column(session, "cmd")
+        self.show_column(session, "scheduler")
+        self.show_column(session, "custom_group")
+        self.show_column(session, "job_status")
+    
+    def render_sql_where(self, session, submitter):
+        phase_sql = self.get_phase_sql(session)
+        submitter_sql = "owner = '%s'" % submitter.Name
+        return "where %s" % " and ".join([phase_sql, submitter_sql])
+
+    def render_title(self, session, submitter):
+        submitter_sql = "owner = '%s'" % submitter.Name
+        return "Jobs %s" % fmt_count(Job.select(submitter_sql).count())
+

Modified: mgmt/trunk/cumin/python/cumin/submitter.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/submitter.strings	2008-09-12 19:32:44 UTC (rev 2464)
+++ mgmt/trunk/cumin/python/cumin/submitter.strings	2008-09-12 19:33:21 UTC (rev 2465)
@@ -38,3 +38,28 @@
   </tr>
   </tbody>
 </table>
+
+[SubmitterJobSet.html]
+  <div class="rfloat">{phase}</div>
+<form id="{id}" style="clear:right;" method="post" action="?">
+
+	  <div class="sactions">
+	    <h2>Act on Selected Jobs:</h2>
+	    {hold} {release} {remove}
+	  </div>
+	
+	<table class="mobjects">
+	  <thead>
+	    <tr>
+	      <th class="setnav" colspan="{column_count}">
+	        <div class="rfloat">{page}</div>
+	        {count}
+	      </th>
+	    </tr>
+	    <tr>{headers}</tr>
+	  </thead>
+	  <tbody>{items}</tbody>
+	</table>
+	<div>{hidden_inputs}</div>
+</form>
+