1
0
Fork 0
mirror of https://codeberg.org/Mo8it/AdvLabDB.git synced 2024-11-08 21:21:06 +00:00

Format templates

This commit is contained in:
Mo 2022-09-11 16:29:26 +02:00
parent 6edb47fed9
commit 8846a867f5
6 changed files with 93 additions and 82 deletions

View file

@ -2,7 +2,7 @@
{% extends "admin/master.html" %} {% extends "admin/master.html" %}
{% block body %} {% block body %}
{{information(current_user, active_semester_str, role="admin")}} {{ information(current_user, active_semester_str, role="admin")}}
<hr> <hr>

View file

@ -2,7 +2,7 @@
{% extends "admin/master.html" %} {% extends "admin/master.html" %}
{% block body %} {% block body %}
{{information(current_user, active_semester_str, role="admin")}} {{ information(current_user, active_semester_str, role="admin")}}
<hr> <hr>
@ -15,8 +15,8 @@
<hr> <hr>
{% for histInd in histIndices %} {% for histInd in histIndices %}
<img src="data:image/png;base64,{{oralMarkHists[histInd]}}"> <img src="data:image/png;base64,{{ oralMarkHists[histInd]}}">
<img src="data:image/png;base64,{{protocolMarkHists[histInd]}}"> <img src="data:image/png;base64,{{ protocolMarkHists[histInd]}}">
<hr> <hr>
{% endfor %} {% endfor %}
{% endblock body %} {% endblock body %}

View file

@ -2,14 +2,14 @@
{% extends "admin/master.html" %} {% extends "admin/master.html" %}
{% block body %} {% block body %}
{{information(current_user, active_semester_str, role="admin")}} {{ information(current_user, active_semester_str, role="admin")}}
<hr> <hr>
{% for activeSemesterFinalPartMarksHist in activeSemesterFinalPartMarksHists %} {% for activeSemesterFinalPartMarksHist in activeSemesterFinalPartMarksHists %}
<img src="data:image/png;base64,{{activeSemesterFinalPartMarksHist}}"> <img src="data:image/png;base64,{{ activeSemesterFinalPartMarksHist }}">
<hr> <hr>
{% endfor %} {% endfor %}
<img src="data:image/png;base64,{{meanFinalPartMarksPlot}}"> <img src="data:image/png;base64,{{ meanFinalPartMarksPlot }}">
{% endblock body %} {% endblock body %}

View file

@ -6,7 +6,7 @@
<hr> <hr>
{{missing_final_experiment_marks(number_of_missing_final_experiment_marks, number_of_all_experiment_marks)}} {{ missing_final_experiment_marks(number_of_missing_final_experiment_marks, number_of_all_experiment_marks)}}
{{ super() }} {{ super() }}

View file

@ -1,20 +1,31 @@
{% macro information(current_user, active_semester_str, role) %} User: {% macro information(current_user, active_semester_str, role) %}
<a User:
<a
href="{{ url_for('main.index') }}{{ role }}/user/edit/?id={{ current_user.id }}" href="{{ url_for('main.index') }}{{ role }}/user/edit/?id={{ current_user.id }}"
>{{ current_user }}</a >
> {{ current_user }}
</a>
| Active semester: {{ active_semester_str() }} {% if (role == "admin") and | Active semester: {{ active_semester_str() }}
(current_user.has_role("assistant")) %} | {% if (role == "admin") and (current_user.has_role("assistant")) %}
<a href="{{ url_for('main.index') }}assistant">Assistant space</a>. {% elif |
(role == "assistant") and (current_user.has_role("admin")) %} | <a
<a href="{{ url_for('main.index') }}admin">Admin space</a>. {% endif %} {% href="{{ url_for('main.index') }}assistant"
endmacro %} {% macro >
missing_final_experiment_marks(number_of_missing_final_experiment_marks, Assistant space
number_of_all_experiment_marks) %} </a>.
<p> {% elif (role == "assistant") and (current_user.has_role("admin")) %}
Number of <strong>missing</strong> final experiment marks: {{ |
number_of_missing_final_experiment_marks }} / {{ <a
number_of_all_experiment_marks }} href="{{ url_for('main.index') }}admin"
</p> >
Admin space
</a>.
{% endif %}
{% endmacro %}
{% macro missing_final_experiment_marks(number_of_missing_final_experiment_marks, number_of_all_experiment_marks) %}
<p>
Number of <strong>missing</strong> final experiment marks:
{{ number_of_missing_final_experiment_marks }} / {{ number_of_all_experiment_marks }}
</p>
{% endmacro %} {% endmacro %}