From 112e300d2a2690ede2951ebcf9a56c21c16e54c2 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 29 Nov 2022 15:26:48 +0000 Subject: [PATCH] additional_checks: Add more info & add unique ID checks https://github.com/Open-Telecoms-Data/cove-ofds/issues/13 --- .../cove_ofds/additional_checks_table.html | 252 +++++++++++++++++- 1 file changed, 249 insertions(+), 3 deletions(-) diff --git a/cove_ofds/templates/cove_ofds/additional_checks_table.html b/cove_ofds/templates/cove_ofds/additional_checks_table.html index 924d3ff..1329861 100644 --- a/cove_ofds/templates/cove_ofds/additional_checks_table.html +++ b/cove_ofds/templates/cove_ofds/additional_checks_table.html @@ -17,6 +17,7 @@

{% trans 'Network ID' %} {% trans 'Span Id' %} + {% trans 'Path' %} {% trans 'Node Id we can\'t find' %} @@ -29,6 +30,9 @@

{{ additional_check.span_id }} + + {{ additional_check.path }} + {{ additional_check.missing_node_id }} @@ -42,6 +46,9 @@

{{ additional_check.span_id }} + + {{ additional_check.path }} + {{ additional_check.missing_node_id }} @@ -66,6 +73,7 @@

{% trans 'Network ID' %} {% trans 'Node Id' %} + {% trans 'Path' %} {% trans 'Type' %} @@ -78,6 +86,9 @@

{{ additional_check.node_id }} + + {{ additional_check.path }} + {{ additional_check.incorrect_type }} @@ -102,6 +113,7 @@

{% trans 'Network ID' %} {% trans 'Node Id' %} + {% trans 'Path' %} {% trans 'Coordinates' %} @@ -114,6 +126,9 @@

{{ additional_check.node_id }} + + {{ additional_check.path }} + {{ additional_check.incorrect_coordinates }} @@ -138,6 +153,7 @@

{% trans 'Network ID' %} {% trans 'Span Id' %} + {% trans 'Path' %} {% trans 'Type' %} @@ -150,6 +166,9 @@

{{ additional_check.span_id }} + + {{ additional_check.path }} + {{ additional_check.incorrect_type }} @@ -174,6 +193,7 @@

{% trans 'Network ID' %} {% trans 'Span Id' %} + {% trans 'Path' %} {% trans 'Coordinates' %} @@ -186,6 +206,9 @@

{{ additional_check.span_id }} + + {{ additional_check.path }} + {{ additional_check.incorrect_coordinates }} @@ -211,6 +234,7 @@

{% trans 'Network ID' %} {% trans 'Node Id' %} + {% trans 'Path' %} {% trans 'Phase reference' %} @@ -223,6 +247,9 @@

{{ additional_check.node_id }} + + {{ additional_check.path }} + {{ additional_check.phase_id_not_found }} @@ -237,6 +264,7 @@

{% trans 'Network ID' %} {% trans 'Span Id' %} + {% trans 'Path' %} {% trans 'Phase reference' %} @@ -249,6 +277,9 @@

{{ additional_check.span_id }} + + {{ additional_check.path }} + {{ additional_check.phase_id_not_found }} @@ -263,6 +294,7 @@

{% trans 'Network ID' %} {% trans 'Contract Id' %} + {% trans 'Path' %} {% trans 'Phase reference' %} @@ -275,6 +307,9 @@

{{ additional_check.contract_id }} + + {{ additional_check.path }} + {{ additional_check.phase_id_not_found }} @@ -303,7 +338,9 @@

{% trans 'Network ID' %} {% trans 'Node Id' %} + {% trans 'Path' %} {% trans 'Phase reference name' %} + {% trans 'Phase name' %} @@ -315,9 +352,15 @@

{{ additional_check.node_id }} + + {{ additional_check.path }} + {{ additional_check.name_in_reference }} + + {{ additional_check.name_should_be }} + {% endfor %} @@ -329,7 +372,9 @@

{% trans 'Network ID' %} {% trans 'Span Id' %} + {% trans 'Path' %} {% trans 'Phase reference name' %} + {% trans 'Phase name' %} @@ -341,9 +386,15 @@

{{ additional_check.span_id }} + + {{ additional_check.path }} + {{ additional_check.name_in_reference }} + + {{ additional_check.name_should_be }} + {% endfor %} @@ -355,7 +406,9 @@

{% trans 'Network ID' %} {% trans 'Contract Id' %} + {% trans 'Path' %} {% trans 'Phase reference name' %} + {% trans 'Phase name' %} @@ -367,9 +420,15 @@

{{ additional_check.contract_id }} + + {{ additional_check.path }} + {{ additional_check.name_in_reference }} + + {{ additional_check.name_should_be }} + {% endfor %} @@ -394,6 +453,7 @@

{% trans 'Network ID' %} {% trans 'Node Id' %} {% trans 'Field' %} + {% trans 'Path' %} {% trans 'Organisation reference' %} @@ -409,6 +469,9 @@

{{ additional_check.field }} + + {{ additional_check.path }} + {{ additional_check.organisation_id_not_found }} @@ -424,6 +487,7 @@

{% trans 'Network ID' %} {% trans 'Span Id' %} {% trans 'Field' %} + {% trans 'Path' %} {% trans 'Organisation reference' %} @@ -439,6 +503,9 @@

{{ additional_check.field }} + + {{ additional_check.path }} + {{ additional_check.organisation_id_not_found }} @@ -453,6 +520,7 @@

{% trans 'Network ID' %} {% trans 'Phase Id' %} + {% trans 'Path' %} {% trans 'Organisation reference' %} @@ -465,6 +533,9 @@

{{ additional_check.phase_id }} + + {{ additional_check.path }} + {{ additional_check.organisation_id_not_found }} @@ -493,7 +564,9 @@

{% trans 'Network ID' %} {% trans 'Node Id' %} {% trans 'Field' %} - {% trans 'Organisation reference' %} + {% trans 'Path' %} + {% trans 'Organisation reference name' %} + {% trans 'Organisation name' %} @@ -508,9 +581,15 @@

{{ additional_check.field }} + + {{ additional_check.path }} + {{ additional_check.name_in_reference }} + + {{ additional_check.name_should_be }} + {% endfor %} @@ -523,7 +602,9 @@

{% trans 'Network ID' %} {% trans 'Span Id' %} {% trans 'Field' %} - {% trans 'Organisation reference' %} + {% trans 'Path' %} + {% trans 'Organisation reference name' %} + {% trans 'Organisation name' %} @@ -538,9 +619,15 @@

{{ additional_check.field }} + + {{ additional_check.path }} + {{ additional_check.name_in_reference }} + + {{ additional_check.name_should_be }} + {% endfor %} @@ -552,7 +639,9 @@

{% trans 'Network ID' %} {% trans 'Phase ID' %} - {% trans 'Organisation reference' %} + {% trans 'Path' %} + {% trans 'Organisation reference name' %} + {% trans 'Organisation name' %} @@ -564,9 +653,15 @@

{{ additional_check.phase_id }} + + {{ additional_check.path }} + {{ additional_check.name_in_reference }} + + {{ additional_check.name_should_be }} + {% endfor %} @@ -589,6 +684,7 @@

{% trans 'Network ID' %} {% trans 'Node Id' %} + {% trans 'Path' %} @@ -600,6 +696,9 @@

{{ additional_check.node_id }} + + {{ additional_check.path }} + {% endfor %} @@ -618,6 +717,7 @@

{% trans 'Network ID' %} {% trans 'Node Id' %} + {% trans 'Path' %} @@ -629,9 +729,155 @@

{{ additional_check.node_id }} + + {{ additional_check.path }} + {% endfor %} {% endif %} + + +{% if 'duplicate_node_id' in additional_checks or 'duplicate_span_id' in additional_checks or 'duplicate_phase_id' in additional_checks or 'duplicate_organisation_id' in additional_checks or 'duplicate_contract_id' in additional_checks %} +

+ {% trans 'Non-unique identifiers' %} + {% include 'cove_ofds/additional_checks_table_failure_counter.html' with list1=additional_checks.node_organisation_reference_name_does_not_match list2=additional_checks.span_organisation_reference_name_does_not_match list3=additional_checks.phase_organisation_reference_name_does_not_match %} +

+

+ {% trans 'Your data contains non-unique identifiers.' %} + For more information, see identifiers. +

+ {% if 'duplicate_node_id' in additional_checks %} + + + + + + + + + + {% for additional_check in additional_checks.duplicate_node_id %} + + + + + + {% endfor %} + +
{% trans 'Network ID' %}{% trans 'Node Id' %}{% trans 'Path' %}
+ {{ additional_check.network_id }} + + {{ additional_check.node_id }} + + {{ additional_check.path }} +
+ {% endif %} + {% if 'duplicate_span_id' in additional_checks %} + + + + + + + + + + {% for additional_check in additional_checks.duplicate_span_id %} + + + + + + {% endfor %} + +
{% trans 'Network ID' %}{% trans 'Span Id' %}{% trans 'Path' %}
+ {{ additional_check.network_id }} + + {{ additional_check.span_id }} + + {{ additional_check.path }} +
+ {% endif %} + {% if 'duplicate_phase_id' in additional_checks %} + + + + + + + + + + {% for additional_check in additional_checks.duplicate_phase_id %} + + + + + + {% endfor %} + +
{% trans 'Network ID' %}{% trans 'Phase Id' %}{% trans 'Path' %}
+ {{ additional_check.network_id }} + + {{ additional_check.phase_id }} + + {{ additional_check.path }} +
+ {% endif %} + {% if 'duplicate_organisation_id' in additional_checks %} + + + + + + + + + + {% for additional_check in additional_checks.duplicate_organisation_id %} + + + + + + {% endfor %} + +
{% trans 'Network ID' %}{% trans 'Organisation Id' %}{% trans 'Path' %}
+ {{ additional_check.network_id }} + + {{ additional_check.organisation_id }} + + {{ additional_check.path }} +
+ {% endif %} + {% if 'duplicate_contract_id' in additional_checks %} + + + + + + + + + + {% for additional_check in additional_checks.duplicate_contract_id %} + + + + + + {% endfor %} + +
{% trans 'Network ID' %}{% trans 'Contract Id' %}{% trans 'Path' %}
+ {{ additional_check.network_id }} + + {{ additional_check.contract_id }} + + {{ additional_check.path }} +
+ {% endif %} +{% endif %} +