Changeset 65226 in vbox for trunk/src/VBox/ValidationKit/testmanager/webui

Timestamp:

Jan 10, 2017 3:36:36 PM (8 years ago)

Author:

vboxsync

Message:

TestManager: Hacked up some basic testbox sorting during the weekly meeting.

Location:

trunk/src/VBox/ValidationKit/testmanager/webui

Files:

• wuiadmintestbox.py (modified) (2 diffs)
• wuibase.py (modified) (2 diffs)
• wuicontentbase.py (modified) (3 diffs)

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

@@ -39 +39 @@
 from testmanager.core.db                import TMDatabaseConnection;
 from testmanager.core.schedgroup        import SchedGroupLogic, SchedGroupData;
-from testmanager.core.testbox           import TestBoxData, TestBoxDataEx;
+from testmanager.core.testbox           import TestBoxData, TestBoxDataEx, TestBoxLogic;
 from testmanager.core.testset           import TestSetData;
 from testmanager.core.db                import isDbTimestampInfinity;
@@ -192 +192 @@
                                        '', '', '', 'align="left"', 'align="right"', 'align="right"', 'align="right"',
                                        'align="center"' ]);
+        self._aaiColumnSorting.extend([
+            (TestBoxLogic.kiSortColumn_sName,),
+            None, # LOM
+            None, # Status
+            None, # Cmd
+            None, # Note
+            (TestBoxLogic.kiSortColumn_iTestBoxScriptRev,),
+            (TestBoxLogic.kiSortColumn_iPythonHexVersion,),
+            None, # Group
+            (TestBoxLogic.kiSortColumn_sOs, TestBoxLogic.kiSortColumn_sOsVersion, TestBoxLogic.kiSortColumn_sCpuArch,),
+            (TestBoxLogic.kiSortColumn_sCpuVendor, TestBoxLogic.kiSortColumn_lCpuRevision,),
+            (TestBoxLogic.kiSortColumn_fNestedPaging,),
+            (TestBoxLogic.kiSortColumn_cCpus,),
+            (TestBoxLogic.kiSortColumn_cMbMemory,),
+            (TestBoxLogic.kiSortColumn_cMbScratch,),
+            None, # Actions
+        ]);
+        assert len(self._aaiColumnSorting) == len(self._asColumnHeaders);
         self._aoActions     = list(self.kasTestBoxActionDescs);
         self._sAction       = oDisp.ksActionTestBoxListPost;

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

@@ -82 +82 @@
     ## The name of the list-action parameter (WuiListContentWithActionBase).
     ksParamListAction    = 'ListAction';
+
+    ## One or more columns to sort by.
+    ksParamSortColumns   = 'SortBy';
 
     ## The name of the change log enabled/disabled parameter.
@@ -801 +804 @@
         cItemsPerPage   = self.getIntParam(self.ksParamItemsPerPage, iMin = 2, iMax =   9999, iDefault = 300);
         iPage           = self.getIntParam(self.ksParamPageNo,       iMin = 0, iMax = 999999, iDefault = 0);
+        aiSortColumnsDup = self.getListOfIntParams(self.ksParamSortColumns, iMin = 0,
+                                                   iMax = getattr(oLogicType, 'kcMaxSortColumns', 0), aiDefaults = []);
+        aiSortColumns   = [];
+        for iSortColumn in aiSortColumnsDup:
+            if iSortColumn not in aiSortColumns:
+                aiSortColumns.append(iSortColumn);
         self._checkForUnknownParameters();
 
-        aoEntries  = oLogicType(self._oDb).fetchForListing(iPage * cItemsPerPage, cItemsPerPage + 1, tsEffective);
+        aoEntries  = oLogicType(self._oDb).fetchForListing(iPage * cItemsPerPage, cItemsPerPage + 1, tsEffective, aiSortColumns);
         oContent   = oListContentType(aoEntries, iPage, cItemsPerPage, tsEffective,
                                       fnDPrint = self._oSrvGlue.dprint, oDisp = self);

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

@@ -749 +749 @@
         self._asColumnHeaders   = [];
         self._asColumnAttribs   = [];
+        self._aaiColumnSorting  = [];   ##< list of list of integers
 
     def _formatCommentCell(self, sComment, cMaxLines = 3, cchMaxLine = 63):
@@ -944 +945 @@
 
         sHtml  = '  <thead class="tmheader"><tr>';
-        for oHeader in self._asColumnHeaders:
+        for iHeader, oHeader in enumerate(self._asColumnHeaders):
             if isinstance(oHeader, WuiHtmlBase):
                 sHtml += '<th>' + oHeader.toHtml() + '</th>';
+            elif iHeader < len(self._aaiColumnSorting) and self._aaiColumnSorting[iHeader] is not None:
+                sHtml += '<th>'
+                sHtml += '<a href="javascript:ahrefActionSortByColumns(\'%s\', [%s]);">' \
+                       % (WuiDispatcherBase.ksParamSortColumns, ','.join([str(i) for i in self._aaiColumnSorting[iHeader]]));
+                sHtml += webutils.escapeElem(oHeader) + '</a></th>';
             else:
                 sHtml += '<th>' + webutils.escapeElem(oHeader) + '</th>';
@@ -1024 +1030 @@
                                              % ('' if sId is None else sId)), ];
         self._asColumnAttribs = [ 'align="center"', ];
+        self._aaiColumnSorting = [ None, ];
 
     def _getCheckBoxColumn(self, iEntry, sValue):