Changeset 83338 in vbox for trunk/src/VBox/ValidationKit/testmanager

Timestamp:

Mar 19, 2020 5:51:47 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

136535

Message:

TestManager: Scheduling queue patch #4 with fEnable sorting adjustment. bugref:9657

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• core/schedqueue.py (added)
• webui/wuiadmin.py (modified) (6 diffs)
• webui/wuiadminschedqueue.py (added)
• webui/wuicontentbase.py (modified) (3 diffs)

trunk/src/VBox/ValidationKit/testmanager/webui/wuiadmin.py

@@ -158 +158 @@
     ksActionSchedGroupEdit          = 'SchedGroupEdit';
     ksActionSchedGroupEditPost      = 'SchedGroupEditPost';
+    ksActionSchedQueueList          = 'SchedQueueList';
     ## @}
 
@@ -299 +300 @@
 
         #
-        # Scheduling Group actions
+        # Scheduling Group and Queue actions
         #
         self._dDispatch[self.ksActionSchedGroupList]            = self._actionSchedGroupList;
@@ -309 +310 @@
         self._dDispatch[self.ksActionSchedGroupEditPost]        = self._actionSchedGroupEditPost;
         self._dDispatch[self.ksActionSchedGroupDoRemove]        = self._actionSchedGroupDoRemove;
+        self._dDispatch[self.ksActionSchedQueueList]            = self._actionSchedQueueList;
 
 
@@ -354 +356 @@
                     [ 'New testbox',            self._sActionUrlBase + self.ksActionTestBoxAdd,             True  ],
                     [ 'New scheduling group',   self._sActionUrlBase + self.ksActionSchedGroupAdd,          True  ],
+                    [ 'View scheduling queues', self._sActionUrlBase + self.ksActionSchedQueueList,         False ],
                     [ 'Regenerate all scheduling queues', self._sActionUrlBase + self.ksActionTestBoxesRegenQueues, True  ],
                 ]
@@ -637 +640 @@
         return self._actionGenericDoRemove(SchedGroupLogic, SchedGroupData.ksParam_idSchedGroup, self.ksActionSchedGroupList)
 
+    def _actionSchedQueueList(self):
+        """ Action wrapper. """
+        from testmanager.core.schedqueue                import SchedQueueLogic;
+        from testmanager.webui.wuiadminschedqueue       import WuiAdminSchedQueueList;
+        return self._actionGenericListing(SchedQueueLogic, WuiAdminSchedQueueList);
 
     def _actionRegenQueuesCommon(self):
@@ -741 +749 @@
 
     # Test Group actions
+
     def _actionTestGroupList(self):
         """ Action wrapper. """

trunk/src/VBox/ValidationKit/testmanager/webui/wuicontentbase.py

@@ -745 +745 @@
 
     def __init__(self, aoEntries, iPage, cItemsPerPage, tsEffectiveDate, sTitle, # pylint: disable=too-many-arguments
-                 sId = None, fnDPrint = None, oDisp = None, aiSelectedSortColumns = None):
+                 sId = None, fnDPrint = None, oDisp = None, aiSelectedSortColumns = None, fTimeNavigation = True):
         WuiContentBase.__init__(self, fnDPrint = fnDPrint, oDisp = oDisp);
         self._aoEntries         = aoEntries; ## @todo should replace this with a Logic object and define methods for querying.
@@ -751 +751 @@
         self._cItemsPerPage     = cItemsPerPage;
         self._tsEffectiveDate   = tsEffectiveDate;
+        self._fTimeNavigation   = fTimeNavigation;
         self._sTitle            = sTitle;       assert len(sTitle) > 1;
         if sId is None:
@@ -931 +932 @@
 
         # Time scale.
-        sNavigation += '<td align="center" class="tmtimenav">';
-        sNavigation += self._generateTimeNavigation(sWhere);
-        sNavigation += '</td>';
+        if self._fTimeNavigation:
+            sNavigation += '<td align="center" class="tmtimenav">';
+            sNavigation += self._generateTimeNavigation(sWhere);
+            sNavigation += '</td>';
 
         # Next