diff --git a/src/frontend_celery/webapp/static/css/styles.css b/src/frontend_celery/webapp/static/css/styles.css index 9112a570..cd39d7cb 100644 --- a/src/frontend_celery/webapp/static/css/styles.css +++ b/src/frontend_celery/webapp/static/css/styles.css @@ -5,6 +5,20 @@ }*/ + +.crossed { + background: + linear-gradient(to top left, + rgba(0,0,0,0) calc(50% - 0.1em), + rgb(255, 0, 0) 50%, + rgba(0,0,0,0) calc(50% + 0.1em)), + linear-gradient(to top right, + rgba(0,0,0,0) calc(50% - 0.1em), + rgb(255, 0, 0) 50%, + rgba(0,0,0,0) calc(50% + 0.1em)); +} + + .clickable { cursor: pointer; color:blue; diff --git a/src/frontend_celery/webapp/templates/macros.html b/src/frontend_celery/webapp/templates/macros.html index 61cc5f07..7d527478 100644 --- a/src/frontend_celery/webapp/templates/macros.html +++ b/src/frontend_celery/webapp/templates/macros.html @@ -155,6 +155,10 @@
Type
Info
+
+
Is selected
+
{{ criterium.is_selected }}
+
Strength
{{ criterium.strength }}
@@ -165,7 +169,7 @@
" > -
{{ criterium.display_name() }}
+
{{ criterium.display_name() }}
{% endfor %} {% endmacro %} @@ -638,6 +642,7 @@ HGVS c. HGVS p. GENE + Automatic classification Your classification Consensus classification @@ -697,6 +702,10 @@ {% endif %} + + {% set automatic_classification = variant.automatic_classification %} + {% if automatic_classification is not none %}{{ automatic_classification.classification }}{% else %}-{% endif %} + {% set your_classification = variant.get_recent_user_classification(session['user']['user_id']) %} {% if your_classification is not none %} {{ your_classification.selected_class }} {% else %}-{%endif%} diff --git a/src/frontend_celery/webapp/templates/variant/variant_base.html b/src/frontend_celery/webapp/templates/variant/variant_base.html index 818d23b6..f0a70000 100644 --- a/src/frontend_celery/webapp/templates/variant/variant_base.html +++ b/src/frontend_celery/webapp/templates/variant/variant_base.html @@ -106,7 +106,7 @@

HerediVar user classifications

- + @@ -137,38 +137,67 @@

HerediVar user classifications

{% endif %} - + + + {% set automatic_classification = variant.automatic_classification %} + {% if automatic_classification is not none %} +
+

Automatic classification

+
+
+
Final class
Final class
Scheme
Selected criteria
Comment
+ + + + + + + + + + + + + + + + +
Selected classDateSchemeCriteria
{{ automatic_classification.classification}}{{ automatic_classification.date}}{{ automatic_classification.scheme_name}}{{ macros.draw_criteria_display(automatic_classification.criteria) }}
+ + + + {% endif %} + {% set heredicare_consensus_classifications = variant.get_heredicare_consensus_classifications() %} {% if heredicare_consensus_classifications | length > 0 %} -
-

HerediCare consensus classifications

- -
- - - {% for heredicare_consensus_classification in heredicare_consensus_classifications %} - - - - - {% endfor %} - -
VID {{heredicare_consensus_classification.vid}} -
    -
  • - Class: {{heredicare_consensus_classification.selected_class_to_text()}} -
  • -
  • - Date: {{heredicare_consensus_classification.classification_date}} -
  • -
  • - Comment: {{heredicare_consensus_classification.comment}} -
  • -
-
-
+
+

HerediCare consensus classifications

+
+ + + {% for heredicare_consensus_classification in heredicare_consensus_classifications %} + + + + + {% endfor %} + +
VID {{heredicare_consensus_classification.vid}} +
    +
  • + Class: {{heredicare_consensus_classification.selected_class_to_text()}} +
  • +
  • + Date: {{heredicare_consensus_classification.classification_date}} +
  • +
  • + Comment: {{heredicare_consensus_classification.comment}} +
  • +
+
+
{% endif %}