Simplify subject detail view

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

Author: mbuechse

compliance-monitor/templates/details.md.j2

@@ -1,7 +1,3 @@
-Testcase occurrences inside scope versions are marked
-"X" for required testcases (target _main_) and
-"(x)" for recommended testcases (with the specific target in the tooltip).
-
 Version numbers are suffixed by a symbol depending on state:
 \* for _draft_, † for _warn_ (soon to be deprecated), and †† for _deprecated_.
 
@@ -29,29 +25,22 @@ No recent test results available.
 
 {% else %}
 
-{% for cat, val in (('FAILED', -1), ('Aborted', 0), ('Missing', None), ('Passed', 1)) -%}
-{% set bucket = scope_result.buckets[val] -%}
-{% if bucket -%}
-### {{cat}} testcases
-
-{% if val == -1 %}Note: recommended testcases (marked "(x)") do not count into the
-overall result of a version.{% endif %}
+The columns labeled _(rec)_ contain recommended testcases for the scope version named in the preceding column header.
 
-| testcase id |{% if val is not none %} reported on |{% endif %}{% for version in scope_result.relevant %} {{ version }}{{ scope_result.versions[version].validity | validity_symbol }} |{% endfor %} description |
-|---|{% if val is not none %}---|{% endif %}{% for version in scope_result.relevant %}---|{% endfor %}---|
+| testcase id | result |{% for version in scope_result.relevant %} {{ version }}{{ scope_result.versions[version].validity | validity_symbol }} | (rec) |{% endfor %} description |
+|---|---|{% for version in scope_result.relevant %}---|---|{% endfor %}---|
+{% for cat, val in (('FAILED', -1), ('MISSING', None), ('inconclusive', 0), ('passed', 1)) -%}
+{% set bucket = scope_result.buckets[val] -%}
 {% for testcase_id in bucket -%}
 {% set testcase = scope_result.testcases[testcase_id] -%}
 {% set res = scope_result.results[testcase_id] if testcase_id in scope_result.results else dict(result=0) -%}
 | [{{ testcase_id }}]({{ testcase.url }}) {# -#}
-{%- if val is not none -%}
-| {% if res.report %}[{{ res.checked_at | short_isodate }}]({{ report_url(res.report, version, testcase_id) }}) { title="{{ res.report }} {{ res.checked_at }}" }{% endif %} {# -#}
-{%- endif %}{# val is not none -#}
+| {{cat}}{% if res.report %} ([{{ res.checked_at | short_isodate }}]({{ report_url(res.report, version, testcase_id) }})) { title="{{ res.report }} {{ res.checked_at }}" }{% endif %} {# -#}
 {% for version in scope_result.relevant %}| {%
 set tgt = scope_result.versions[version].tc_target[testcase_id]
-%}{% if tgt == 'main' %}X { title="main" }{% elif tgt %}(x) { title="{{ tgt }}" }{% endif %} {% endfor -%}
+%}{% if tgt == 'main' %}X { title="main" }{% endif %} | {% if tgt and tgt != 'main' %}x { title="{{ tgt }}" }{% endif %} {% endfor -%}
 | {{ testcase.description | trim }} |
-{% endfor %}{# testcase #}
-{% endif %}{# bucket nonempty -#}
+{% endfor %}{# testcase -#}
 {% endfor %}{# categories #}
 
 {% endif %}{# results available -#}