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

Timestamp:

Jan 2, 2017 4:43:09 PM (8 years ago)

Author:

vboxsync

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

112552

Message:

testmanager: More test result filtering.

File:

• trunk/src/VBox/ValidationKit/testmanager/webui/wuimain.py (modified) (1 diff)

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

@@ -928 +928 @@
 
         for iCrit, oCrit in enumerate(oFilter.aCriteria):
-            sClass = 'sf-collapsable' if oCrit.sState == oCrit.ksState_Selected else 'sf-expandable';
-            sChar  = '▼'        if oCrit.sState == oCrit.ksState_Selected else '▶';
-            sHtml += u'  <dt class="%s"><a href="javascript:void(0)" onclick="toggleCollapsableDtDd(this);">%s'\
-                     u' %s</a></dt>\n' \
-                     u'  <dd class="%s">\n' \
-                     u'   <ul>\n' \
-                     % (sClass, sChar, webutils.escapeElem(oCrit.sName), sClass);
-            for oDesc in oCrit.aoPossible:
-                fChecked = oDesc.oValue in oCrit.aoSelected;
-                sHtml += u'    <li><input type="checkbox" name="%s" value="%s"%s/>%s</li>\n' \
-                       % (oCrit.sVarNm, oDesc.oValue, ' checked' if fChecked else '', webutils.escapeElem(oDesc.sDesc),);
-
-            sHtml += u'   </ul>\n';
-            if iCrit + 1 < len(oFilter.aCriteria):                    ## @todo fix me.
-                sHtml += u'   <div class="filterend">&nbsp;</div>\n'; ## @todo fix me.
-            sHtml += u'  </dd>\n';
+            if len(oCrit.aoPossible) > 0:
+                sClass = 'sf-collapsable' if oCrit.sState == oCrit.ksState_Selected else 'sf-expandable';
+                sChar  = '&#9660;'        if oCrit.sState == oCrit.ksState_Selected else '&#9654;';
+                sHtml += u'  <dt class="%s"><a href="javascript:void(0)" onclick="toggleCollapsableDtDd(this);">%s'\
+                         u' %s</a></dt>\n' \
+                         u'  <dd class="%s">\n' \
+                         u'   <ul>\n' \
+                         % (sClass, sChar, webutils.escapeElem(oCrit.sName), sClass);
+
+                for oDesc in oCrit.aoPossible:
+                    fChecked = oDesc.oValue in oCrit.aoSelected;
+                    sHtml += u'    <li%s><input type="checkbox" name="%s" value="%s"%s/>%s</li>\n' \
+                           % ( ' class="side-filter-irrelevant"' if oDesc.fIrrelevant else '',
+                               oCrit.sVarNm, oDesc.oValue, ' checked' if fChecked else '',
+                               webutils.escapeElem(oDesc.sDesc),);
+
+                sHtml += u'   </ul>\n' \
+                         u'  </dd>\n';
 
         sHtml += u' </dl>\n';