Skip to content

Commit e20ac2e

Browse files
author
Rinke Hoekstra
committed
Making things look nicer... eh
1 parent 18eb00c commit e20ac2e

2 files changed

Lines changed: 47 additions & 40 deletions

File tree

‎src/app/templates/recommendations_list.html‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ <h4>Recommendations</h4>
77
{% for e in list %}
88
{% if loop.first %}
99
<a href="#" class="list-group-item" uri='{{e.rec.value }}'>
10-
<span class="list-group-item-heading">{{ grouper.value }}</span>
10+
<span class="list-group-item-heading">{{ grouper.value }} <span class="badge alert-info">{{ e.rec_stripped.value }}</span></span>
1111
{% endif %}
1212
{% if loop.last %}
1313
</a>
@@ -22,17 +22,33 @@ <h4>Recommendations</h4>
2222
{% if loop.first %}
2323
{% set uri = e.rec.value %}
2424
<div class="transition" style="display: none;" transition_container_for='{{e.rec.value}}'>
25-
<h3>{{ grouper.value }}</h3>
26-
{%if 'irec_label' in e %}
27-
<span class="badge alert-info" target="{{ e.irec.value }}">{{ e.irec_label.value }}</span>
25+
<h3>{{ grouper.value }} <small>({{e.rec_stripped.value }})</small></h3>
26+
{% if 'irec_label' in e or 'erec_label' in e %}
27+
<table class="table table-striped">
28+
<tbody>
29+
<tr><th class='col-md-3'>Type</th><td>
30+
{% if 'irec_label' in e %}
31+
<span class="badge alert-warning" target="{{ e.irec.value }}">{{ e.irec_label.value }}</span>
32+
{% endif %}
33+
{% if 'erec_label' in e %}
34+
<span class="badge alert-error" target="{{ e.erec.value }}">{{ e.erec_label.value }}</span>
35+
{% endif %}
36+
</td></tr>
37+
<tr><th>Interactions</th><td>
2838
{% endif %}
2939
{% endif %}
30-
{% if 'crec_label' in e %}
31-
<span class="badge alert-warning" target="{{ e.crec.value }}">{{ e.crec_label.value }}</span>
40+
{% if 'internal_rec_label' in e and e.internal_rec.value != e.rec.value %}
41+
<span class="badge alert-warning" target="{{ e.internal_rec.value }}">{{ e.internal_rec_label.value }}</span>
42+
{% endif %}
43+
{% if 'external_rec_label' in e and e.external_rec.value != e.rec.value %}
44+
<span class="badge alert-error" target="{{ e.external_rec.value }}">{{ e.external_rec_label.value }}</span>
3245
{% endif %}
3346
{% if loop.last %}
34-
35-
47+
{%if 'irec_label' in e %}
48+
</td>
49+
</tbody>
50+
</table>
51+
{% endif %}
3652
<div transitions_for='{{ uri }}'>
3753
</div>
3854
</div>

‎src/app/templates/transitions_list.html‎

Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,60 @@
11
{% if pos_transitions|length %}
2-
<h4>Transitions to Pursue</h4>
3-
<div class="list-group">
2+
<div class="panel panel-info">
3+
<div class="panel-heading">Transitions to Pursue</div>
4+
<div class="panel-body">
45
{% for grouper, list in pos_transitions|groupby('transition_label') %}
56
{% for e in list %}
67
{% if loop.first %}
7-
<a href="#" class="list-group-item" uri='{{e.transition.value }}'>
8-
<h4 class="list-group-item-heading">{{ e.transition_label.value }}</h4>
9-
<p class="list-group-item-text">
8+
<div uri='{{e.transition.value }}'>
9+
<h4>Transition from <strong>{{ e.transformable_situation_label.value }}</strong> to <strong>{{ e.post_situation_label.value }}</strong>{% if e.filter_condition_label.value != 'none' %} given a filter condition of <strong>{{ e.filter_condition_label.value }}</strong>{% endif %}. <span class="badge">{{ e.transition_label.value }}</span>
10+
</h4>
11+
1012
<table class="table table-striped">
11-
<thead>
12-
<tr><th class='col-sm-2'>Condition</th><th>Situation</th></tr>
13-
</thead>
1413
<tbody>
15-
<tr><th>Transformable situation</th><td>{{ e.transformable_situation_label.value }}</td></tr>
16-
<tr><th>Filter condition</th><td>{{ e.filter_condition_label.value }}</td></tr>
17-
<tr><th>Post situation</th><td>{{ e.post_situation_label.value }}</td></tr>
14+
<tr><th class="col-md-3">Care action</th><td>{{ e.care_action_label.value }}</td></tr>
1815
{% endif %}
1916
{% if e.inverse_transition %}
20-
<tr><th>Inverse transition</th><td>{{ e.irec_label.value }} <span class='badge alert-danger'>{{ e.inverse_transition_label.value }}</span></td></tr>
17+
<tr><th class="col-md-3">Inverse transition</th><td><span class='badge alert-danger'>{{ e.inverse_transition_label.value }}</span> <span class="badge">{{ e.irec_stripped.value }}</span> <small>({{ e.irec_label.value }})</small></td></tr>
2118
{% endif %}
2219
{% if e.similar_transition %}
23-
<tr><th>Similar transition</th><td>{{ e.srec_label.value }} <span class='badge alert-warning'>{{ e.similar_transition_label.value }}</span></td></tr>
20+
<tr><th class="col-md-3">Similar transition</th><td><span class='badge alert-warning'>{{ e.similar_transition_label.value }}</span> <span class="badge">{{ e.srec_stripped.value }}</span> <small>({{ e.srec_label.value }})</small></td></tr>
2421
{% endif %}
2522
{% if loop.last %}
2623
</tbody>
2724
</table>
2825

29-
</p>
30-
</a>
26+
27+
</div>
3128
{% endif %}
3229
{% endfor %}
3330
{% endfor %}
34-
</div>
31+
3532
{% endif %}
3633

3734
{% if neg_transitions|length %}
38-
<h4>Transitions to Avoid</h4>
39-
<div class="list-group">
35+
<div class="panel panel-warning">
36+
<div class="panel-heading">Transitions to Avoid</div>
37+
<div class="panel-body">
4038
{% for grouper, list in neg_transitions|groupby('transition_label') %}
4139
{% for e in list %}
4240
{% if loop.first %}
43-
<a href="#" class="list-group-item" uri='{{e.transition.value }}'>
44-
<h4 class="list-group-item-heading">{{ e.transition_label.value }}</h4>
45-
<p class="list-group-item-text">
41+
<div uri='{{e.transition.value }}'>
42+
<h4>Transition from <strong>{{ e.transformable_situation_label.value }}</strong> to <strong>{{ e.post_situation_label.value }}</strong>{% if e.filter_condition_label.value != 'none' %} given a filter condition of <strong>{{ e.filter_condition_label.value }}</strong>{% endif %}. <span class="badge">{{ e.transition_label.value }}</span>
43+
</h4>
4644
<table class="table table-striped">
47-
<thead>
48-
<tr><th class='col-sm-2'>Condition</th><th>Situation</th></tr>
49-
</thead>
50-
<tbody>
51-
<tr><th>Transformable situation</th><td>{{ e.transformable_situation_label.value }}</td></tr>
52-
<tr><th>Filter condition</th><td>{{ e.filter_condition_label.value }}</td></tr>
53-
<tr><th>Post situation</th><td>{{ e.post_situation_label.value }}</td></tr>
45+
<tr><th class="col-md-3">Care action</th><td>{{ e.care_action_label.value }}</td></tr>
5446
{% endif %}
5547
{% if e.inverse_transition %}
56-
<tr><th>Inverse transition</th><td><span class='badge alert-danger'>{{ e.inverse_transition_label.value }}</span></td></tr>
48+
<tr><th class="col-md-3">Inverse transition</th><td><span class='badge alert-danger'>{{ e.inverse_transition_label.value }}</span> <span class="badge">{{ e.irec_stripped.value }}</span> <small>({{ e.irec_label.value }})</small></td></tr>
5749
{% endif %}
5850
{% if e.similar_transition %}
59-
<tr><th>Similar transition</th><td><span class='badge alert-warning'>{{ e.similar_transition_label.value }}</span></td></tr>
51+
<tr><th class="col-md-3">Similar transition</th><td><span class='badge alert-warning'>{{ e.similar_transition_label.value }}</span> <span class="badge">{{ e.srec_stripped.value }}</span> <small>({{ e.srec_label.value }})</small></td></tr>
6052
{% endif %}
6153
{% if loop.last %}
6254
</tbody>
6355
</table>
6456

65-
</p>
66-
</a>
57+
</div>
6758
{% endif %}
6859
{% endfor %}
6960
{% endfor %}

0 commit comments

Comments
 (0)