Improve sorting order

Signed-off-by: Conor MacBride <[email protected]>

Author: ConorMacBride

pytest_mpl/summary/html.py

@@ -42,18 +42,18 @@ def template(name):
 
 
 def get_status_sort(status):
-    s = 50
+    s = 0
     if status['overall'] == 'failed':
-        s -= 10
+        s += 10
     if status['image'] == 'diff':
-        s -= 3
+        s += 3
     elif status['image'] == 'missing':
-        s -= 4
+        s += 4
     if status['hash'] == 'diff':
-        s -= 1
+        s += 1
     elif status['hash'] == 'missing':
-        s -= 5
-    return s
+        s += 5
+    return f"{s:02.0f}"
 
 
 def get_status(item, card_id, warn_missing):
@@ -135,13 +135,13 @@ def card(name, item, warn_missing=None):
 
     if status['image'] == 'match':
         rms = '< tolerance'
-        rms_sort = 999999
+        rms_sort = "000000"
     elif status['image'] == 'diff':
         rms = item['rms']
-        rms_sort = 99999 - item['rms']
+        rms_sort = f"{(item['rms']+2)*1000:06.0f}"
     else:
         rms = 'None'
-        rms_sort = 999998
+        rms_sort = "000001"
 
     offcanvas = RESULT_IMAGES.format(
 
@@ -206,7 +206,7 @@ def generate_summary_html(results, results_dir):
     cards = []
     for name, item in results.items():
         cards += [card(name, item, warn_missing=warn_missing)]
-    cards = [j[0] for j in sorted(cards, key=lambda i: i[1])]
+    cards = [j[0] for j in sorted(cards, key=lambda i: i[1], reverse=True)]
 
     # Generate HTML
     html = BASE.format(

pytest_mpl/summary/templates/extra.js

@@ -17,7 +17,7 @@ var options = {
         'rms-value', 'baseline-hash-value', 'result-hash-value']
 };
 var resultsList = new List('results', options);
-resultsList.sort('status-sort');
+resultsList.sort('status-sort', { order: "desc" });
 
 function applyFilters() {
     var cond_and = document.getElementById('filterForm').elements['conditionand'].checked;

pytest_mpl/summary/templates/filter.html

@@ -6,13 +6,13 @@ <h6>Filter results</h6>
     <div class="offcanvas-body">
         <h5>Sort tests by...</h5>
         <div class="btn-group m-2 pb-2" role="group" aria-label="Select sorting">
-            <input type="radio" class="btn-check sort" data-sort="status-sort" name="sort" id="sortstatus"
+            <input type="radio" class="btn-check sort" data-sort="status-sort" data-order="desc" name="sort" id="sortstatus"
                    autocomplete="off" checked>
             <label class="btn btn-outline-secondary" for="sortstatus">status</label>
             <input type="radio" class="btn-check sort" data-sort="test-name" name="sort" id="sortname"
                    autocomplete="off">
             <label class="btn btn-outline-secondary" for="sortname">name</label>
-            <input type="radio" class="btn-check sort" data-sort="rms-sort" name="sort" id="sortrms" autocomplete="off">
+            <input type="radio" class="btn-check sort" data-sort="rms-sort" data-order="desc" name="sort" id="sortrms" autocomplete="off">
             <label class="btn btn-outline-secondary" for="sortrms">RMS</label>
         </div>
         <form id="filterForm" onsubmit="return false;">