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

Timestamp:

Jul 6, 2015 12:32:55 AM (10 years ago)

Author:

vboxsync

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

101459

Message:

testmanager: Test result sorting.

File:

• trunk/src/VBox/ValidationKit/testmanager/webui/wuimain.py (modified) (7 diffs)

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

@@ -142 +142 @@
     ## @}
 
+    ## @name Test result listing parameters.
+    ## @{
+    ## If this param is specified, then show only results for this member when results grouped by some parameter.
+    ksParamGroupMemberId        = 'GroupMemberId'
+    ## Optional parameter for indicating whether to restrict the listing to failures only.
+    ksParamOnlyFailures         = 'OnlyFailures'
+    ## Result listing sorting.
+    ksParamTestResultsSortBy    = 'enmSortBy'
+    ## @}
+
     ## Effective time period. one of the first column values in kaoResultPeriods.
     ksParamEffectivePeriod      = 'sEffectivePeriod'
-
-    ## If this param is specified, then show only results for this member when results grouped by some parameter.
-    ksParamGroupMemberId        = 'GroupMemberId'
-
-    ## Optional parameter for indicating whether to restrict the listing to failures only.
-    ksParamOnlyFailures         = 'OnlyFailures'
 
     ## Test result period values.
@@ -296 +300 @@
     #
 
+    def _generateSortBySelector(self, dParams, sPreamble, sPostamble):
+        """
+        Generate HTML code for the sort by selector.
+        """
+        if self.ksParamTestResultsSortBy in dParams:
+            enmResultSortBy = dParams[self.ksParamTestResultsSortBy];
+            del dParams[self.ksParamTestResultsSortBy];
+        else:
+            enmResultSortBy = TestResultLogic.ksResultsSortByRunningAndStart;
+
+        sHtmlSortBy  = '<form name="TimeForm" method="GET"> Sort by\n';
+        sHtmlSortBy += sPreamble;
+        sHtmlSortBy += '\n  <select name="%s" onchange="window.location=' % (self.ksParamTestResultsSortBy,);
+        sHtmlSortBy += '\'?%s&%s=\' + ' % (webutils.encodeUrlParams(dParams), self.ksParamTestResultsSortBy)
+        sHtmlSortBy += 'this.options[this.selectedIndex].value;" title="Sorting by">\n'
+
+        fSelected = False;
+        for enmCode, sTitle in TestResultLogic.kaasResultsSortByTitles:
+            if enmCode == enmResultSortBy:
+                fSelected = True;
+            sHtmlSortBy += '    <option value="%s"%s>%s</option>\n' \
+                         % (enmCode, ' selected="selected"' if enmCode == enmResultSortBy else '', sTitle,);
+        assert fSelected;
+        sHtmlSortBy += '  </select>\n';
+        sHtmlSortBy += sPostamble;
+        sHtmlSortBy += '\n</form>\n'
+        return sHtmlSortBy;
+
     def _generateStatusSelector(self, dParams, fOnlyFailures):
         """
@@ -318 +350 @@
         if WuiDispatcherBase.ksParamPageNo in dParams:
             del dParams[WuiDispatcherBase.ksParamPageNo]
-
 
         sHtmlTimeSelector  = '<form name="TimeForm" method="GET">\n'
@@ -546 +577 @@
         # Generate the elements.
         sHtmlStatusSelector = self._generateStatusSelector(self.getParameters(), fOnlyFailures);
+        sHtmlSortBySelector = self._generateSortBySelector(self.getParameters(), '', sHtmlStatusSelector);
         sHtmlPeriodSelector = self._generateResultPeriodSelector(self.getParameters(), sCurPeriod)
         sHtmlTimeWalker     = self._generateTimeWalker(self.getParameters(), tsEffective, sCurPeriod);
@@ -564 +596 @@
                 '</tr>\n' \
                 '<tr>\n' \
-                ' <td width=30%>' + sHtmlStatusSelector + '</td>\n' \
+                ' <td width=30%>' + sHtmlSortBySelector + '</td>\n' \
                 ' <td width=40% align=center>\n' + sHtmlPager + '</td>\n' \
                 ' <td width=30% align=right>\n' + sHtmlItemsPerPageSelector + '</td>\n'\
@@ -638 +670 @@
         oListContentType is a child of WuiListContentBase.
         """
-        cItemsPerPage     = self.getIntParam(self.ksParamItemsPerPage,  iMin =  2, iMax =   9999, iDefault = 128)
-        iPage             = self.getIntParam(self.ksParamPageNo,        iMin =  0, iMax = 999999, iDefault = 0)
-        tsEffective       = self.getEffectiveDateParam()
-        iGroupMemberId    = self.getIntParam(self.ksParamGroupMemberId, iMin = -1, iMax = 999999, iDefault = -1)
+        cItemsPerPage     = self.getIntParam(self.ksParamItemsPerPage,  iMin =  2, iMax =   9999, iDefault = 128);
+        iPage             = self.getIntParam(self.ksParamPageNo,        iMin =  0, iMax = 999999, iDefault = 0);
+        tsEffective       = self.getEffectiveDateParam();
+        iGroupMemberId    = self.getIntParam(self.ksParamGroupMemberId, iMin = -1, iMax = 999999, iDefault = -1);
         fOnlyFailures     = self.getBoolParam(self.ksParamOnlyFailures, fDefault = False);
+        enmResultSortBy   = self.getStringParam(self.ksParamTestResultsSortBy,
+                                                asValidValues = TestResultLogic.kasResultsSortBy,
+                                                sDefault = TestResultLogic.ksResultsSortByRunningAndStart);
 
         # Get testing results period and validate it
-        asValidValues = [x for (x, _, _) in self.kaoResultPeriods]
+        asValidValues     = [x for (x, _, _) in self.kaoResultPeriods]
         sCurPeriod        = self.getStringParam(self.ksParamEffectivePeriod, asValidValues = asValidValues,
                                                 sDefault = self.ksResultPeriodDefault)
@@ -727 +762 @@
                                                             tsNow = tsEffective,
                                                             sInterval = sCurPeriod,
+                                                            enmResultSortBy = enmResultSortBy,
                                                             enmResultsGroupingType = enmResultsGroupingType,
                                                             iResultsGroupingValue = idMember,
-                                                            fOnlyFailures = fOnlyFailures)
-
+                                                            fOnlyFailures = fOnlyFailures);
             cEntriesMax = max(cEntriesMax, cEntries)