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

Timestamp:

Jun 5, 2016 5:46:15 PM (9 years ago)

Author:

vboxsync

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

107799

Message:

testmanager: adding sComment columns to TestCases, TestGroups and SchedGroups.

Location:

trunk/src/VBox/ValidationKit/testmanager/webui

Files:

• wuiadminschedgroup.py (modified) (3 diffs)
• wuiadmintestbox.py (modified) (1 diff)
• wuiadmintestcase.py (modified) (3 diffs)
• wuiadmintestgroup.py (modified) (3 diffs)
• wuicontentbase.py (modified) (2 diffs)

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

@@ -84 +84 @@
                                          fReadOnly = self._sMode == WuiFormContentBase.ksMode_Show);
 
+        oForm.addMultilineText  (SchedGroupData.ksParam_sComment,     oData.sComment,         'Comment');
         oForm.addSubmit()
 
@@ -100 +101 @@
         self._asColumnHeaders = [
             'ID',  'Name', 'Enabled', 'Scheduler Type',
-            'Build Source', 'Validation Kit Source', 'Test Groups', 'TestBoxes', 'Actions',
+            'Build Source', 'Validation Kit Source', 'Test Groups', 'TestBoxes', 'Note', 'Actions',
         ];
 
         self._asColumnAttribs = [
             'align="right"', 'align="center"', 'align="center"', 'align="center"',
-            'align="center"', 'align="center"', '', '', 'align="center"',
+            'align="center"', 'align="center"', '', '', 'align="center"', 'align="center"',
         ];
 
@@ -181 +182 @@
             aoMembers,
             aoTestBoxes,
+            self._formatCommentCell(oEntry.sComment),
             aoActions,
         ];

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

@@ -235 +235 @@
                                    fBracketed = False);
         # Comment
-        oComment = None;
-        if oEntry.sComment is not None:
-            sComment = oEntry.sComment.strip();
-            if len(sComment) > 64:
-                oComment = WuiRawHtml('<span title="%s">%s...</span>'
-                                      % (webutils.escapeAttr(sComment), webutils.escapeElem(sComment[:60]),));
-            elif len(sComment) > 0:
-                oComment = WuiRawHtml(webutils.escapeElem(sComment));
+        oComment = self._formatCommentCell(oEntry.sComment);
 
         # Group link.

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

@@ -64 +64 @@
         self._asColumnHeaders = \
         [
-            'Name', 'Active', 'Default Timeout', 'Base Command / Variations', 'Validation Kit Files',
-            'Test Case Prereqs', 'Global Resources', 'Actions'
+            'Name', 'Active', 'Timeout', 'Base Command / Variations', 'Validation Kit Files',
+            'Test Case Prereqs', 'Global Rsrces', 'Note', 'Actions'
         ];
         self._asColumnAttribs = \
         [
-            '', '', '', '', '',
-            'valign="top"', 'valign="top"', 'align="center"'
+            '', '', 'align="center"', '', '',
+            'valign="top"', 'valign="top"', 'align="center"', 'align="center"'
         ];
 
@@ -154 +154 @@
         aoRet.append(WuiRawHtml(sHtml));
 
+        # Comment (note).
+        aoRet.append(self._formatCommentCell(oEntry.sComment));
+
         # Show actions that can be taken.
         aoActions = [ WuiTmLink('Details', WuiAdmin.ksScriptName,
@@ -237 +240 @@
         oForm.addListOfResources(TestCaseDataEx.ksParam_aoDepGlobalResources, aoGlobalResrcDeps, 'Depends on resources')
 
+        oForm.addMultilineText(TestCaseDataEx.ksParam_sComment, oData.sComment, 'Comment');
+
         oForm.addSubmit();
 

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

@@ -74 +74 @@
                                         fReadOnly = self._sMode == WuiFormContentBase.ksMode_Show);
 
+        oForm.addMultilineText  (TestGroupData.ksParam_sComment,         self._oData.sComment,       'Comment');
         oForm.addSubmit();
         return True;
@@ -88 +89 @@
         WuiListContentBase.__init__(self, aoEntries, iPage, cItemsPerPage, tsEffective,
                                     sTitle = 'Test Groups', fnDPrint = fnDPrint, oDisp = oDisp);
-        self._asColumnHeaders = [ 'ID', 'Name', 'Description', 'Test Cases', 'Actions' ];
-        self._asColumnAttribs = [ 'align="right"', '', '', '', 'align="center"' ];
+        self._asColumnHeaders = [ 'ID', 'Name', 'Description', 'Test Cases', 'Note', 'Actions' ];
+        self._asColumnAttribs = [ 'align="right"', '', '', '', 'align="center"', 'align="center"' ];
 
 
@@ -178 +179 @@
                  oEntry.sDescription if oEntry.sDescription is not None else '',
                  oTestCases,
+                 self._formatCommentCell(oEntry.sComment, cMaxLines = max(3, len(oEntry.aoMembers) * 2)),
                  aoActions ];
 

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

@@ -203 +203 @@
     Outputs the given text within a span of the given CSS class.
     """
-    def __init__(self, sSpanClass, sText):
-        WuiRawHtml.__init__(self,
-                            u'<span class="%s">%s</span>'
-                            % (webutils.escapeAttr(sSpanClass), webutils.escapeElem(sText),));
+    def __init__(self, sSpanClass, sText, sTitle = None):
+        if sTitle is None:
+            WuiRawHtml.__init__(self,
+                                u'<span class="%s">%s</span>'
+                                % ( webutils.escapeAttr(sSpanClass),  webutils.escapeElem(sText),));
+        else:
+            WuiRawHtml.__init__(self,
+                                u'<span class="%s" title="%s">%s</span>'
+                                % ( webutils.escapeAttr(sSpanClass), webutils.escapeAttr(sTitle), webutils.escapeElem(sText),));
+
 
 
@@ -692 +698 @@
         self._asColumnAttribs   = [];
 
+    def _formatCommentCell(self, sComment, cMaxLines = 3, cchMaxLine = 63):
+        """
+        Helper functions for formatting comment cell.
+        Returns None or WuiRawHtml instance.
+        """
+        # Nothing to do for empty comments.
+        if sComment is None:
+            return None;
+        sComment = sComment.strip();
+        if len(sComment) == 0:
+            return None;
+
+        # Restrict the text if necessary, making the whole text available thru mouse-over.
+        ## @todo this would be better done by java script or smth, so it could automatically adjust to the table size.
+        if len(sComment) > cchMaxLine or sComment.count('\n') >= cMaxLines:
+            sShortHtml = '';
+            for iLine, sLine in enumerate(sComment.split('\n')):
+                if iLine >= cMaxLines:
+                    break;
+                if iLine > 0:
+                    sShortHtml += '<br>\n';
+                if len(sLine) > cchMaxLine:
+                    sShortHtml += webutils.escapeElem(sLine[:(cchMaxLine - 3)]);
+                    sShortHtml += '...';
+                else:
+                    sShortHtml += webutils.escapeElem(sLine);
+            return WuiRawHtml('<span class="tmcomment" title="%s">%s</span>' % (webutils.escapeAttr(sComment), sShortHtml,));
+
+        return WuiRawHtml('<span class="tmcomment">%s</span>' % (webutils.escapeElem(sComment).replace('\n', '<br>'),));
+
     def _formatListEntry(self, iEntry):
         """