OAR/GUI: fixed ordering and naming of arrays

Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>

zUtil_Python/dct_batch_gui.py

@@ -42,13 +42,20 @@ class DCTBatchGui(QtGui.QWidget):
         self._pbutt_load_params()
 
     def _init_gui(self):
-        self.resize(1024, 768)
+        self.resize(1280, 768)
         self._center_gui()
         self.setWindowTitle("DCT Batch GUI")
 
         self.array_list = QtGui.QTreeWidget()
-        self.array_list.setColumnCount(7)
-        self.array_list.setHeaderLabels(["ID", "Name", "Status", "Exit code", "Submitted", "Launched", "Finished"])
+        self.array_list.setColumnCount(8)
+        self.array_list.setHeaderLabels(["ID", "Name", "Status", "Exit code", "Submitted", "Launched", "Finished", "Resubmitted ID"])
+        self.array_list.header().resizeSection(0, 140)
+        self.array_list.header().resizeSection(1, 140)
+        self.array_list.header().resizeSection(2, 80)
+        self.array_list.header().resizeSection(3, 80)
+        self.array_list.header().resizeSection(4, 140)
+        self.array_list.header().resizeSection(5, 140)
+        self.array_list.header().resizeSection(6, 140)
 
         hbox_array_control = QtGui.QHBoxLayout()
         hbox_array_control.addWidget(self.array_list)
@@ -257,6 +264,7 @@ class DCTBatchGui(QtGui.QWidget):
                                      "Job %d, resubmitted with id: %d" % (orig_job_id, new_job_id))
             dial.exec_()
 
+            self.records.update_content_arrays()
             self.update_display_arrays()
 
     def _pbutt_delete_job(self):
@@ -305,9 +313,9 @@ class DCTBatchGui(QtGui.QWidget):
 
     def update_display_arrays(self):
         self.array_list.clear()
-        for (array_key, array_content) in self.records.arrays.iteritems():
-            array_item = QtGui.QTreeWidgetItem(["Array: %d" % array_key, ])
-            for job in array_content:
+        for array in self.records.arrays:
+            array_item = QtGui.QTreeWidgetItem(["Array: %d" % array['array_id'], array['function']])
+            for job in array['jobs']:
                 if job['exit_code'] is None:
                     exit_code = ""
                 else:
@@ -325,9 +333,13 @@ class DCTBatchGui(QtGui.QWidget):
                     stop_time = ""
                 else:
                     stop_time = datetime.datetime.fromtimestamp(job['stopTime']).strftime('%Y-%m-%d %H:%M:%S')
+                if job['resubmit_job_id'] == 0:
+                    resub_id = ""
+                else:
+                    resub_id = "%d" % job['resubmit_job_id']
                 job_info = ["Job: %d" % job['Job_Id'], name, \
                             job['state'], exit_code, sub_time, start_time, \
-                            stop_time ]
+                            stop_time, resub_id ]
                 job_item = QtGui.QTreeWidgetItem(QtCore.QStringList(job_info))
                 array_item.addChild(job_item)
             array_item.setExpanded(True)

zUtil_Python/dct_batch_oar_parameters.py

@@ -16,15 +16,12 @@ class DCTBatchOarParameters(object):
         Constructor
         '''
         self.parent = parent
-        self.arrays = {}
+        self.arrays = []
+        self.array_ids = {}
 
         if stream is not None:
             self.load_content_from_oarparameters(stream)
 
-    def _sort_jobs(self, field = 'submissionTime'):
-        for aid in self.arrays.keys():
-            self.arrays[aid] = self._sort_by_field(self.arrays[aid], field)
-
     def _sort_by_field(self, in_list, field):
         contents = [x[field] for x in in_list]
         indices = sorted(range(len(contents)), key=contents.__getitem__)
@@ -55,12 +52,8 @@ class DCTBatchOarParameters(object):
             print("Not doing anything")
             return
 
-        arrays = {}
-
         arrays_content = {}
         for aid in array_ids:
-            arrays[aid] = []
-
             print("Query Array ID: %d" % aid)
             content = self.parent.qapi.query(array = aid)
 
@@ -73,8 +66,6 @@ class DCTBatchOarParameters(object):
             print("Not doing anything")
             return
 
-        self.arrays = {}
-
         print("Query Job IDs: %s" % ", ".join(("%d" % x for x in jobs)))
         content = self.parent.qapi.query(jobs = jobs)
 
@@ -88,16 +79,31 @@ class DCTBatchOarParameters(object):
         # Content is supposed to be in structures, where the Job ID is the main
         # thing
         jobs = [job for job in content.itervalues()]
-        self._sort_by_field(jobs, 'submissionTime')
+        jobs = self._sort_by_field(jobs, 'Job_Id')
+
+        map_arrays = {}
+
         array_ids = (x for x in set((job['array_id'] for job in jobs)))
-        self.arrays = {};
+
         for aid in array_ids:
-            self.arrays[aid] = []
+            map_arrays[aid] = {'array_id' : aid, 'function' : '', 'jobs' : []}
+
         for job in jobs:
-            type(job['array_id'])
-            self.arrays[job['array_id']].append(job)
+            array_id = job['array_id']
+            if len(map_arrays[array_id]['jobs']) == 0:
+                map_arrays[array_id]['function'] = job['name']
+            map_arrays[array_id]['jobs'].append(job)
+
+        for aid in array_ids:
+            map_arrays[aid]['jobs'] = self._sort_by_field(map_arrays[aid]['jobs'], 'Job_Id')
+
+        self.arrays = [array for array in map_arrays.itervalues()]
+        self.arrays = self._sort_by_field(self.arrays, 'array_id')
 
-        self._sort_jobs()
+        self.array_ids = {}
+        for ia in range(len(self.arrays)):
+            aid = self.arrays[ia]['array_id']
+            self.array_ids[aid] = ia
 
     def get_current_array_and_job(self, selected):
         if selected.row() == -1:
@@ -105,16 +111,17 @@ class DCTBatchOarParameters(object):
 
         parent = selected.parent()
 
-        array_ids = [x for x in self.arrays.iterkeys()]
+        array_ids = self._get_array_ids()
         if parent.row() == -1:
             array_id = array_ids[selected.row()]
             return (array_id, None)
         else:
             array_id = array_ids[parent.row()]
-            return (array_id, self.arrays[array_id][selected.row()])
+            return (array_id, self.arrays[parent.row()]['jobs'][selected.row()])
 
     def update_content_arrays(self):
-        self.load_content_from_arrayids_query_oar(self.arrays.iterkeys())
+        array_ids = self._get_array_ids()
+        self.load_content_from_arrayids_query_oar(array_ids)
 
     def update_content_jobs(self):
         jobs = []
@@ -124,4 +131,6 @@ class DCTBatchOarParameters(object):
 
         self.load_content_from_jobids_query_oar(jobs)
 
+    def _get_array_ids(self):
+        return [x['array_id'] for x in self.arrays]