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

Timestamp:

Jan 31, 2020 11:13:38 AM (5 years ago)

Author:

vboxsync

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

135938

Message:

TestManager: Added revision range filtering.

File:

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

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

@@ -932 +932 @@
         sHtml += u' <dl>\n';
         for oCrit in oFilter.aCriteria:
-            if oCrit.aoPossible:
+            if oCrit.aoPossible or oCrit.sType == oCrit.ksType_Ranges:
                 if   (    oCrit.oSub is None \
                       and (   oCrit.sState == oCrit.ksState_Selected \
-                           or len(oCrit.aoPossible) <= 2)) \
+                           or (len(oCrit.aoPossible) <= 2 and oCrit.sType != oCrit.ksType_Ranges))) \
                   or (    oCrit.oSub is not None \
                       and (   oCrit.sState == oCrit.ksState_Selected \
@@ -962 +962 @@
                          % (sClass);
 
-                for oDesc in oCrit.aoPossible:
-                    fChecked = oDesc.oValue in oCrit.aoSelected;
-                    sHtml += u'    <li%s%s><label><input type="checkbox" name="%s" value="%s"%s%s/>%s%s</label>\n' \
-                           % ( ' class="side-filter-irrelevant"' if oDesc.fIrrelevant else '',
-                               (' title="%s"' % (webutils.escapeAttr(oDesc.sHover,)) if oDesc.sHover is not None else ''),
-                               oCrit.sVarNm,
-                               oDesc.oValue,
-                               ' checked' if fChecked else '',
-                               ' onclick="toggleCollapsibleCheckbox(this);"' if oDesc.aoSubs is not None else '',
-                               webutils.escapeElem(oDesc.sDesc),
-                               '<span class="side-filter-count"> [%u]</span>' % (oDesc.cTimes) if oDesc.cTimes is not None
-                               else '', );
-                    if oDesc.aoSubs is not None:
-                        sHtml += u'     <ul class="sf-checkbox-%s">\n' % ('collapsible' if fChecked else 'expandable', );
-                        for oSubDesc in oDesc.aoSubs:
-                            fSubChecked = oSubDesc.oValue in oCrit.oSub.aoSelected;
-                            sHtml += u'     <li%s%s><label><input type="checkbox" name="%s" value="%s"%s/>%s%s</label>\n' \
-                                   % ( ' class="side-filter-irrelevant"' if oSubDesc.fIrrelevant else '',
-                                       ' title="%s"' % ( webutils.escapeAttr(oSubDesc.sHover,) if oSubDesc.sHover is not None
-                                                         else ''),
-                                       oCrit.oSub.sVarNm, oSubDesc.oValue, ' checked' if fSubChecked else '',
-                                       webutils.escapeElem(oSubDesc.sDesc),
-                                       '<span class="side-filter-count"> [%u]</span>' % (oSubDesc.cTimes)
-                                       if oSubDesc.cTimes is not None else '', );
-
-                        sHtml += u'     </ul>\n';
-                    sHtml += u'    </li>';
+                if oCrit.sType == oCrit.ksType_Ranges:
+                    assert not oCrit.oSub;
+                    assert not oCrit.aoPossible;
+                    asValues = [];
+                    for tRange in oCrit.aoSelected:
+                        if tRange[0] == tRange[1]:
+                            asValues.append('%s' % (tRange[0],));
+                        else:
+                            asValues.append('%s-%s' % (tRange[0] if tRange[0] is not None else 'inf',
+                                                       tRange[1] if tRange[1] is not None else 'inf'));
+                    sHtml += u'    <li title="%s"><input type="text" name="%s" value="%s"/></li>\n' \
+                           % ( webutils.escapeAttr('comma separate list of numerical ranges'), oCrit.sVarNm,
+                               ', '.join(asValues), );
+                else:
+                    for oDesc in oCrit.aoPossible:
+                        fChecked = oDesc.oValue in oCrit.aoSelected;
+                        sHtml += u'    <li%s%s><label><input type="checkbox" name="%s" value="%s"%s%s/>%s%s</label>\n' \
+                               % ( ' class="side-filter-irrelevant"' if oDesc.fIrrelevant else '',
+                                   (' title="%s"' % (webutils.escapeAttr(oDesc.sHover,)) if oDesc.sHover is not None else ''),
+                                   oCrit.sVarNm,
+                                   oDesc.oValue,
+                                   ' checked' if fChecked else '',
+                                   ' onclick="toggleCollapsibleCheckbox(this);"' if oDesc.aoSubs is not None else '',
+                                   webutils.escapeElem(oDesc.sDesc),
+                                   '<span class="side-filter-count"> [%u]</span>' % (oDesc.cTimes) if oDesc.cTimes is not None
+                                   else '', );
+                        if oDesc.aoSubs is not None:
+                            sHtml += u'     <ul class="sf-checkbox-%s">\n' % ('collapsible' if fChecked else 'expandable', );
+                            for oSubDesc in oDesc.aoSubs:
+                                fSubChecked = oSubDesc.oValue in oCrit.oSub.aoSelected;
+                                sHtml += u'     <li%s%s><label><input type="checkbox" name="%s" value="%s"%s/>%s%s</label>\n' \
+                                       % ( ' class="side-filter-irrelevant"' if oSubDesc.fIrrelevant else '',
+                                           ' title="%s"' % ( webutils.escapeAttr(oSubDesc.sHover,) if oSubDesc.sHover is not None
+                                                             else ''),
+                                           oCrit.oSub.sVarNm, oSubDesc.oValue, ' checked' if fSubChecked else '',
+                                           webutils.escapeElem(oSubDesc.sDesc),
+                                           '<span class="side-filter-count"> [%u]</span>' % (oSubDesc.cTimes)
+                                           if oSubDesc.cTimes is not None else '', );
+
+                            sHtml += u'     </ul>\n';
+                        sHtml += u'    </li>';
+
                 sHtml += u'   </ul>\n' \
                          u'  </dd>\n';