[robotframework] 2 new revisions pushed by pekka.klarck on 2012-08-27 12:15 GMT

[robotframework]

2 new revisions:

Revision: b7e1e732be4e
Author:   Pekka Klärck
Date:     Mon Aug 27 05:10:46 2012
Log:      report: better way to show initially sorted columns in test  
details ta...
http://code.google.com/p/robotframework/source/detail?r=b7e1e732be4e
Revision: 825581da588f
Author:   Pekka Klärck
Date:     Mon Aug 27 05:15:01 2012
Log:      report: add custom parser to tablesorter only once
http://code.google.com/p/robotframework/source/detail?r=825581da588f

==============================================================================
Revision: b7e1e732be4e
Author:   Pekka Klärck
Date:     Mon Aug 27 05:10:46 2012
Log:      report: better way to show initially sorted columns in test  
details table
http://code.google.com/p/robotframework/source/detail?r=b7e1e732be4e

Modified:
 /src/robot/htmldata/rebot/report.html

=======================================
--- /src/robot/htmldata/rebot/report.html       Mon Aug 27 03:59:01 2012
+++ /src/robot/htmldata/rebot/report.html       Mon Aug 27 05:10:46 2012
@@ -124,10 +124,10 @@
 function renderTotalDetails(name) {
     var index = (name == 'critical') ? 0 : 1;
     var stat = window.testdata.statistics().total[index];
-    var tests = getTotalTests(name)
+    var tests = getTotalTests(name);
     stat.totalTime = calculateTotalTime(tests);
     $.tmpl('tagOrTotalDetailsTemplate', stat).appendTo('#details_header');
-    drawTestDetailsTable(tests, 'Status');
+    drawTestDetailsTable(tests, true);
 }

 function tagDetailSelected(name) {
@@ -152,7 +152,7 @@
     if (tag)
         tag.totalTime = calculateTotalTime(tests);
     $.tmpl('tagOrTotalDetailsTemplate', tag).appendTo('#details_header');
-    drawTestDetailsTable(tests, 'Status');
+    drawTestDetailsTable(tests, true);
 }

 function suiteDetailSelected(id) {
@@ -174,7 +174,7 @@
         var suite = testdata.find(id);
         var opts = {logURL: window.settings.logURL};
         $.tmpl('suiteDetailsTemplate', suite,  
opts).appendTo('#details_header');
-        drawTestDetailsTable(suite.allTests());
+        drawTestDetailsTable(suite.allTests(), false);
         $('#print_selector').text(suite.name);
     });
 }
@@ -192,10 +192,10 @@
     $.tmpl(template, stats).appendTo('#test_details_container');
 }

-function drawTestDetailsTable(tests, sortedColumn) {
+function drawTestDetailsTable(tests, sortByStatus) {
     $.tmpl('testDetailsTableTemplate').appendTo('#test_details_container');
     window.elementsToRender = tests;
-    renderTestDetails(sortedColumn);
+    renderTestDetails(sortByStatus);
 }

 function sortByStatus(t1, t2) {
@@ -226,21 +226,19 @@
     return util.formatElapsed(totaltime);
 }

-function renderTestDetails(sortedColumn) {
+function renderTestDetails(sortByStatus) {
     if (!window.elementsToRender.length)
         return;
     var elements = popUpTo(window.elementsToRender, 10);
     $.tmpl('testDetailsTableRowTemplate', elements,
            {logURL: window.settings.logURL}).appendTo('#test_details >  
tbody');
     if (window.elementsToRender.length)
-        setTimeout(function () {renderTestDetails(sortedColumn);}, 0);
-    else {
-        configureTableSorter();
-        highlightDefaultSortColumn(sortedColumn);
-    }
+        setTimeout(function () {renderTestDetails(sortByStatus);}, 0);
+    else
+        configureTableSorter(sortByStatus);
 }

-function configureTableSorter() {
+function configureTableSorter(sortByStatus) {
     $.tablesorter.addParser({
         id: 'criticality',
         type: 'numeric',
@@ -251,16 +249,11 @@
             return s.toLowerCase().replace(/no/, 1).replace(/yes/, 0);
         }
     });
-    $("#test_details").tablesorter({
-        headers: {3: {sorter:'criticality'}, 6: {sortInitialOrder: 'desc'}}
-    });
-}
-
-function highlightDefaultSortColumn(sortColumn) {
-    if (sortColumn) {
-        var locator = '#test_details th:contains(' + sortColumn + ')';
-        $(locator).addClass('tablesorter-headerSortDown');
-    }
+    var config = {headers: {3: {sorter: 'criticality'},
+                            6: {sortInitialOrder: 'desc'}}};
+    if (sortByStatus)
+        config['sortList'] = [[4, 0], [3, 0]];
+    $("#test_details").tablesorter(config);
 }

 function popUpTo(list, upTo) {

==============================================================================
Revision: 825581da588f
Author:   Pekka Klärck
Date:     Mon Aug 27 05:15:01 2012
Log:      report: add custom parser to tablesorter only once
http://code.google.com/p/robotframework/source/detail?r=825581da588f

Modified:
 /src/robot/htmldata/rebot/report.html

=======================================
--- /src/robot/htmldata/rebot/report.html       Mon Aug 27 05:10:46 2012
+++ /src/robot/htmldata/rebot/report.html       Mon Aug 27 05:15:01 2012
@@ -71,6 +71,16 @@
 }

 function addDetails() {
+    $.tablesorter.addParser({
+        id: 'criticality',
+        type: 'numeric',
+        is: function(s) {
+            return false;  // do not auto-detect
+        },
+        format: function(s) {
+            return s === 'yes' ? 0 : 1;
+        }
+    });
     if (window.location.hash)
         showDetailsByHash();
     else
@@ -239,16 +249,6 @@
 }

 function configureTableSorter(sortByStatus) {
-    $.tablesorter.addParser({
-        id: 'criticality',
-        type: 'numeric',
-        is: function(s) {
-            return false;  // do not auto-detect
-        },
-        format: function(s) {
-            return s.toLowerCase().replace(/no/, 1).replace(/yes/, 0);
-        }
-    });
     var config = {headers: {3: {sorter: 'criticality'},
                             6: {sortInitialOrder: 'desc'}}};
     if (sortByStatus)