1
0
Fork 0
mirror of https://codeberg.org/Mo8it/AdvLabDB.git synced 2024-09-19 18:31:16 +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" %}
{% block body %}
{{information(current_user, active_semester_str, role="admin")}}
{{ information(current_user, active_semester_str, role="admin")}}
<hr>

View file

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

View file

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

View file

@ -6,7 +6,7 @@
<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() }}

View file

@ -1,20 +1,31 @@
{% macro information(current_user, active_semester_str, role) %} User:
<a
{% macro information(current_user, active_semester_str, role) %}
User:
<a
href="{{ url_for('main.index') }}{{ role }}/user/edit/?id={{ current_user.id }}"
>{{ current_user }}</a
>
| Active semester: {{ active_semester_str() }} {% 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 href="{{ url_for('main.index') }}admin">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>
>
{{ current_user }}
</a>
| Active semester: {{ active_semester_str() }}
{% 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
href="{{ url_for('main.index') }}admin"
>
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 %}