mirror of
https://codeberg.org/Mo8it/AdvLabDB.git
synced 2025-03-21 20:03:57 +00:00
Format templates
This commit is contained in:
parent
6edb47fed9
commit
8846a867f5
6 changed files with 93 additions and 82 deletions
|
|
@ -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>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 %}
|
||||||
|
|
|
||||||
|
|
@ -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 %}
|
||||||
|
|
|
||||||
|
|
@ -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() }}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,84 +1,84 @@
|
||||||
<div class="alert alert-warning" role="alert">
|
<div class="alert alert-warning" role="alert">
|
||||||
Changes have been done to the web interface. Read the section
|
Changes have been done to the web interface. Read the section
|
||||||
<a href="#_group_experiment">Group Experiment</a> for more information.
|
<a href="#_group_experiment">Group Experiment</a> for more information.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h2>Welcome</h2>
|
<h2>Welcome</h2>
|
||||||
<p>
|
<p>
|
||||||
Welcome to this website, AdvLabDB, where you will be able to manage your lab
|
Welcome to this website, AdvLabDB, where you will be able to manage your lab
|
||||||
assistance. Please, <strong>read this documentation</strong> to familiarize
|
assistance. Please, <strong>read this documentation</strong> to familiarize
|
||||||
yourself with this website.
|
yourself with this website.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h2>Menu items</h2>
|
<h2>Menu items</h2>
|
||||||
<p>
|
<p>
|
||||||
In this section, you will find explanations to each menu item on the upper
|
In this section, you will find explanations to each menu item on the upper
|
||||||
navigation bar.
|
navigation bar.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h3>Home</h3>
|
<h3>Home</h3>
|
||||||
<p>
|
<p>
|
||||||
This is your home page. Here, you currently only find the number of
|
This is your home page. Here, you currently only find the number of
|
||||||
<strong>missing</strong> final experiment marks for the experiments that you
|
<strong>missing</strong> final experiment marks for the experiments that you
|
||||||
are assigned to. At the latest at the end of the semester, this number should
|
are assigned to. At the latest at the end of the semester, this number should
|
||||||
be 0. A number higher than 0 means that some oral and/or protocol marks are
|
be 0. A number higher than 0 means that some oral and/or protocol marks are
|
||||||
missing. The final experiment mark is calculated automatically after the oral
|
missing. The final experiment mark is calculated automatically after the oral
|
||||||
and protocol marks of an experiment are set.
|
and protocol marks of an experiment are set.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h3 id="_group_experiment">Group Experiment</h3>
|
<h3 id="_group_experiment">Group Experiment</h3>
|
||||||
<p>
|
<p>
|
||||||
This is the most important menu item. Here, you see all pairs of experiments
|
This is the most important menu item. Here, you see all pairs of experiments
|
||||||
and groups that you are responsible for. If a value in the column
|
and groups that you are responsible for. If a value in the column
|
||||||
<em>Experiment Marks Missing</em> is <span style="color: red">Yes</span>, then
|
<em>Experiment Marks Missing</em> is <span style="color: red">Yes</span>, then
|
||||||
you did not set all the experiment marks for the pair in the related row. If
|
you did not set all the experiment marks for the pair in the related row. If
|
||||||
you click on the edit button on the left side of a row, then you will get a
|
you click on the edit button on the left side of a row, then you will get a
|
||||||
form.
|
form.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
In the form, you can edit the <em>date</em> of an appointment by clicking on
|
In the form, you can edit the <em>date</em> of an appointment by clicking on
|
||||||
it. You should do so after writing with the students doing the experiment
|
it. You should do so after writing with the students doing the experiment
|
||||||
corresponding to the appointment. The initial date you find before editing it
|
corresponding to the appointment. The initial date you find before editing it
|
||||||
is only a suggestion in the week where the appointment should take place.
|
is only a suggestion in the week where the appointment should take place.
|
||||||
Please take take into account if the appointment should be in the semester
|
Please take take into account if the appointment should be in the semester
|
||||||
break.
|
break.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
Below the appointments in the form, you can set the students' oral and
|
Below the appointments in the form, you can set the students' oral and
|
||||||
protocol marks. Students in a group have separate marks. The oral mark has to
|
protocol marks. Students in a group have separate marks. The oral mark has to
|
||||||
be set after the oral exam. The protocol mark has to be set after correcting
|
be set after the oral exam. The protocol mark has to be set after correcting
|
||||||
the group's protocol.
|
the group's protocol.
|
||||||
</p>
|
</p>
|
||||||
<div class="alert alert-warning" role="alert">
|
<div class="alert alert-warning" role="alert">
|
||||||
Oral and protocol marks are between 0 and 15!
|
Oral and protocol marks are between 0 and 15!
|
||||||
</div>
|
</div>
|
||||||
<p>
|
<p>
|
||||||
After editing appointment date(s) or experiment marks, click on the
|
After editing appointment date(s) or experiment marks, click on the
|
||||||
<em>Save</em> button to save the changes.
|
<em>Save</em> button to save the changes.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
The changes are lost if you don't click on <em>Save</em>. Therefore, if you
|
The changes are lost if you don't click on <em>Save</em>. Therefore, if you
|
||||||
want to discard the changes, just click on the back button of your browser.
|
want to discard the changes, just click on the back button of your browser.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h3>User</h3>
|
<h3>User</h3>
|
||||||
<p>
|
<p>
|
||||||
Here, you find a table with only one row which is you as a user. Make sure
|
Here, you find a table with only one row which is you as a user. Make sure
|
||||||
that the fields <em>Phone Number</em>, <em>Mobile Phone Number</em>,
|
that the fields <em>Phone Number</em>, <em>Mobile Phone Number</em>,
|
||||||
<em>Building</em> and <em>Room</em> are filled and up to date, especially if
|
<em>Building</em> and <em>Room</em> are filled and up to date, especially if
|
||||||
you are a new assistant. To edit these fields, click on the pen icon at the
|
you are a new assistant. To edit these fields, click on the pen icon at the
|
||||||
left of the single entry in the table. After editing, click on <em>Save</em>.
|
left of the single entry in the table. After editing, click on <em>Save</em>.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
You can generate a new random password by clicking on the pen icon, checking
|
You can generate a new random password by clicking on the pen icon, checking
|
||||||
the corresponding checkbox and then clicking on
|
the corresponding checkbox and then clicking on
|
||||||
<em>Save</em>. You will be then logged out. Your new password is displayed
|
<em>Save</em>. You will be then logged out. Your new password is displayed
|
||||||
above the login fields. Make sure that you save the password in a safe place.
|
above the login fields. Make sure that you save the password in a safe place.
|
||||||
Using a free open source password manager like
|
Using a free open source password manager like
|
||||||
<a href="https://bitwarden.com/" target="_blank" rel="noopener">Bitwarden</a>
|
<a href="https://bitwarden.com/" target="_blank" rel="noopener">Bitwarden</a>
|
||||||
or
|
or
|
||||||
<a href="https://keepassxc.org/" target="_blank" rel="noopener">KeepassXC</a>
|
<a href="https://keepassxc.org/" target="_blank" rel="noopener">KeepassXC</a>
|
||||||
is recommended.
|
is recommended.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h3>Docs</h3>
|
<h3>Docs</h3>
|
||||||
|
|
@ -86,13 +86,13 @@
|
||||||
|
|
||||||
<h3>Active semester</h3>
|
<h3>Active semester</h3>
|
||||||
<p>
|
<p>
|
||||||
An active semester is the semester you are working in. All shown experiment
|
An active semester is the semester you are working in. All shown experiment
|
||||||
marks and appointments are in your active semester. By default as a new
|
marks and appointments are in your active semester. By default as a new
|
||||||
assistant, your active semester should be the latest semester.
|
assistant, your active semester should be the latest semester.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
If you see a warning that you are in an old semester, click on
|
If you see a warning that you are in an old semester, click on
|
||||||
<em>Active semester</em> and choose the latest semester. You should only work
|
<em>Active semester</em> and choose the latest semester. You should only work
|
||||||
in an old semester if there are still experiment marks to be set in the old
|
in an old semester if there are still experiment marks to be set in the old
|
||||||
semester.
|
semester.
|
||||||
</p>
|
</p>
|
||||||
|
|
|
||||||
|
|
@ -1,20 +1,31 @@
|
||||||
{% macro information(current_user, active_semester_str, role) %} User:
|
{% macro information(current_user, active_semester_str, role) %}
|
||||||
<a
|
User:
|
||||||
href="{{ url_for('main.index') }}{{ role }}/user/edit/?id={{ current_user.id }}"
|
<a
|
||||||
>{{ current_user }}</a
|
href="{{ url_for('main.index') }}{{ role }}/user/edit/?id={{ current_user.id }}"
|
||||||
>
|
>
|
||||||
|
{{ current_user }}
|
||||||
| Active semester: {{ active_semester_str() }} {% if (role == "admin") and
|
</a>
|
||||||
(current_user.has_role("assistant")) %} |
|
| Active semester: {{ active_semester_str() }}
|
||||||
<a href="{{ url_for('main.index') }}assistant">Assistant space</a>. {% elif
|
{% if (role == "admin") and (current_user.has_role("assistant")) %}
|
||||||
(role == "assistant") and (current_user.has_role("admin")) %} |
|
|
|
||||||
<a href="{{ url_for('main.index') }}admin">Admin space</a>. {% endif %} {%
|
<a
|
||||||
endmacro %} {% macro
|
href="{{ url_for('main.index') }}assistant"
|
||||||
missing_final_experiment_marks(number_of_missing_final_experiment_marks,
|
>
|
||||||
number_of_all_experiment_marks) %}
|
Assistant space
|
||||||
<p>
|
</a>.
|
||||||
Number of <strong>missing</strong> final experiment marks: {{
|
{% elif (role == "assistant") and (current_user.has_role("admin")) %}
|
||||||
number_of_missing_final_experiment_marks }} / {{
|
|
|
||||||
number_of_all_experiment_marks }}
|
<a
|
||||||
</p>
|
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 %}
|
{% endmacro %}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue