show whitespace with dot in sample error

EBIvariation · Jun 14, 2024 · fb5c454 · fb5c454
1 parent cc3c483
commit fb5c454
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/eva_sub_cli/jinja_templates/sample_name_check.html b/eva_sub_cli/jinja_templates/sample_name_check.html
@@ -1,6 +1,10 @@
 
 {% macro sample_name_check_report(validation_results) -%}
     {% set results = validation_results.get('sample_check', {}) %}
+    {% macro format_error(error) %}
+        {{ error | replace(' ', '•') }}
+    {% endmacro %}
+
     {% for analysis, results_for_analysis in results.get('results_per_analysis', {}).items() %}
         {% if results_for_analysis.get('difference') %}
             {% set expand_icon = "&#9654;" %}
@@ -33,21 +37,21 @@
 
                 <div id="metadata-{{ loop.index0 }}" class="description no-show">
                     <div class="error-description"><strong>All Errors For Category - Samples described in the metadata but not in the VCF files:</strong></div>
-                    <ul>
+                    <ol>
                         {% for error in results_for_analysis.get('more_metadata_submitted_files') %}
-                            <li>{{ error }}</li>
+                            <li>{{ format_error(error) }}</li>
                         {% endfor %}
-                    </ul>
+                    </ol>
                     <a href="#" onclick="toggleSampleAllErrorsList('metadata-{{ loop.index0 }}'); return false;">Hide</a>
                 </div>
 
                 <div id="vcf-{{ loop.index0 }}" class="description no-show">
                     <div class="error-description"><strong>All Errors For Category - Samples in the VCF files but not described in the metadata:</strong></div>
-                    <ul>
+                    <ol>
                         {% for error in results_for_analysis.get('more_submitted_files_metadata') %}
-                            <li>{{ error }}</li>
+                            <li>{{ format_error(error) }}</li>
                         {% endfor %}
-                    </ul>
+                    </ol>
                     <a href="#" onclick="toggleSampleAllErrorsList('vcf-{{ loop.index0 }}'); return false;">Hide</a>
                 </div>
             </div>

diff --git a/tests/resources/validation_reports/expected_report.html b/tests/resources/validation_reports/expected_report.html
diff --git a/tests/test_report.py b/tests/test_report.py
@@ -71,9 +71,9 @@
             },
             'Analysis C': {
                 'difference': True,
-                'more_metadata_submitted_files': ['SampleC1', 'SampleC2', 'SampleC3', 'SampleC4'],
+                'more_metadata_submitted_files': ['SampleC1 ', ' SampleC2', 'SampleC3', 'SampleC4'],
                 'more_per_submitted_files_metadata': {},
-                'more_submitted_files_metadata': ['C1Sample', 'C2Sample', 'C3Sample', 'C4Sample']
+                'more_submitted_files_metadata': ['C1Sample ', ' C2Sample', 'C3Sample', 'C4Sample']
             }
         }
     },