Changeset 65430 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jan 24, 2017 3:58:34 PM (8 years ago)

Author:

vboxsync

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

113043

Message:

TestManager: Added basic sorting of report tables.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• core/report.py (modified) (1 diff)
• htdocs/js/common.js (modified) (1 diff)
• webui/wuimain.py (modified) (2 diffs)
• webui/wuireport.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/testmanager/core/report.py

@@ -531 +531 @@
     if/when it becomes necessary.
     """
-
 
     kdsStatusSimplificationMap = {

trunk/src/VBox/ValidationKit/testmanager/htdocs/js/common.js

@@ -259 +259 @@
                 var offValue = offMatch + 1 + sParam.length + 1;
                 offEnd = sArgs.indexOf('&', offValue);
-                if (offEnd < 0)
+                if (offEnd < offValue)
                     offEnd = sArgs.length;
 
                 var iColumn = parseInt(sArgs.substring(offValue, offEnd));
                 if (!isMemberOfArray(aiColumns, iColumn) && !isMemberOfArray(aiColumns, -iColumn))
-                    sNew += sArgs.substring(off, offEnd);
+                    sNew += sArgs.substring(offMatch, offEnd);
 
                 off = offEnd;

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

@@ -1256 +1256 @@
             if aidSubjects is None:
                 raise WuiException('Missing parameter %s' % (self.ksParamReportSubjectIds,));
+
+        aiSortColumnsDup = self.getListOfIntParams(self.ksParamSortColumns,
+                                                   iMin = -getattr(oReportType, 'kcMaxSortColumns', cPeriods) + 1,
+                                                   iMax = getattr(oReportType, 'kcMaxSortColumns', cPeriods), aiDefaults = []);
+        aiSortColumns   = [];
+        for iSortColumn in aiSortColumnsDup:
+            if iSortColumn not in aiSortColumns:
+                aiSortColumns.append(iSortColumn);
+
         oFilter = oFilterType().initFromParams(self);
         self._checkForUnknownParameters();
@@ -1270 +1279 @@
 
         oModel   = oModelType(self._oDb, tsEffective, cPeriods, cHoursPerPeriod, sSubject, aidSubjects, oFilter);
-        oContent = oReportType(oModel, dParams, fSubReport = False, fnDPrint = self._oSrvGlue.dprint, oDisp = self);
+        oContent = oReportType(oModel, dParams, fSubReport = False, aiSortColumns = aiSortColumns,
+                               fnDPrint = self._oSrvGlue.dprint, oDisp = self);
         (self._sPageTitle, self._sPageBody) = oContent.show();
         sNavi = self._generateReportNavigation(tsEffective, cHoursPerPeriod, cPeriods);

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

@@ -67 +67 @@
     """
 
-    def __init__(self, oModel, dParams, fSubReport = False, fnDPrint = None, oDisp = None):
+    def __init__(self, oModel, dParams, fSubReport = False, aiSortColumns = None, fnDPrint = None, oDisp = None):
         WuiContentBase.__init__(self, fnDPrint = fnDPrint, oDisp = oDisp);
         self._oModel        = oModel;
@@ -73 +73 @@
         self._fSubReport    = fSubReport;
         self._sTitle        = None;
+        self._aiSortColumns = aiSortColumns;
 
         # Additional URL parameters for reports
@@ -283 +284 @@
         sHtml += self._formatSeriesNameColumnHeadersForTable();
         for iPeriod, oPeriod in enumerate(reversed(oSet.aoPeriods)):
-            sHtml += u'<th colspan="%d">%s%s</th>' % ( cColsPerSeries, webutils.escapeElem(oPeriod.sDesc),
-                                                       '&#x25bc;' if iPeriod == iSortColumn else '');
+            sHtml += u'<th colspan="%d"><a href="javascript:ahrefActionSortByColumns(\'%s\',[%s]);">%s</a>%s</th>' \
+                   % ( cColsPerSeries, self._oDisp.ksParamSortColumns, iPeriod, webutils.escapeElem(oPeriod.sDesc),
+                       '&#x25bc;' if iPeriod == iSortColumn else '');
         if fWithTotals:
-            sHtml += u'<th colspan="%d">Total%s</th>' % (cColsPerSeries,
-                                                         '&#x25bc;' if iSortColumn == len(oSet.aoPeriods) else '');
+            sHtml += u'<th colspan="%d"><a href="javascript:ahrefActionSortByColumns(\'%s\',[%s]);">Total</a>%s</th>' \
+                   % ( cColsPerSeries, self._oDisp.ksParamSortColumns, iPeriod,
+                       '&#x25bc;' if iSortColumn == len(oSet.aoPeriods) else '');
         sHtml += u'</thead></td>\n';
 
@@ -320 +323 @@
         return str(oSubject);
 
-    def _getSortedIds(self, oSet, fByTotal = None):
+    def _getSortedIds(self, oSet):
         """
         Get default sorted subject IDs and which column.
         """
 
-        if fByTotal is None:
-            fByTotal = oSet.cMaxTotal < 10;
-
-        if fByTotal is True:
+        # Figure the sorting column.
+        if self._aiSortColumns is not None \
+          and len(self._aiSortColumns) > 0 \
+          and abs(self._aiSortColumns[0]) <= len(oSet.aoPeriods):
+            iSortColumn = abs(self._aiSortColumns[0]);
+            fByTotal = iSortColumn >= len(oSet.aoPeriods);
+        elif oSet.cMaxTotal < 10:
+            iSortColumn = len(oSet.aoPeriods);
+        else:
+            iSortColumn = 0;
+
+        if iSortColumn >= len(oSet.aoPeriods):
             # Sort the total.
             aidSortedRaw = sorted(oSet.dSubjects,
                                   key = lambda idKey: oSet.dcHitsPerId[idKey] * 10000 / oSet.dcTotalPerId[idKey],
                                   reverse = True);
-            iColumn = len(oSet.aoPeriods);
         else:
             # Sort by NOW column.
             dTmp = {};
             for idKey in oSet.dSubjects:
-                oRow = oSet.aoPeriods[-1].dRowsById.get(idKey, None);
+                oRow = oSet.aoPeriods[-1 - iSortColumn].dRowsById.get(idKey, None);
                 if oRow is None:    dTmp[idKey] = 0;
                 else:               dTmp[idKey] = oRow.cHits * 10000 / max(1, oRow.cTotal);
             aidSortedRaw = sorted(dTmp, key = lambda idKey: dTmp[idKey], reverse = True);
-            iColumn = 0;
-        return (aidSortedRaw, iColumn);
+        return (aidSortedRaw, iSortColumn);
 
     def _generateGraph(self, oSet, sIdBase, aidSortedRaw):
@@ -629 +638 @@
 
         aoReports.append(WuiReportSuccessRate(     self._oModel, self._dParams, fSubReport = True,
+                                                   aiSortColumns = self._aiSortColumns,
                                                    fnDPrint = self._fnDPrint, oDisp = self._oDisp));
         aoReports.append(WuiReportTestCaseFailures(self._oModel, self._dParams, fSubReport = True,
+                                                   aiSortColumns = self._aiSortColumns,
                                                    fnDPrint = self._fnDPrint, oDisp = self._oDisp));
         if self._oModel.sSubject == ReportModelBase.ksSubTestCase:
             aoReports.append(WuiReportTestCaseArgsFailures(self._oModel, self._dParams, fSubReport = True,
+                                                           aiSortColumns = self._aiSortColumns,
                                                            fnDPrint = self._fnDPrint, oDisp = self._oDisp));
         aoReports.append(WuiReportTestBoxFailures( self._oModel, self._dParams, fSubReport = True,
+                                                   aiSortColumns = self._aiSortColumns,
                                                    fnDPrint = self._fnDPrint, oDisp = self._oDisp));
         aoReports.append(WuiReportFailureReasons(  self._oModel, self._dParams, fSubReport = True,
+                                                   aiSortColumns = self._aiSortColumns,
                                                    fnDPrint = self._fnDPrint, oDisp = self._oDisp));