Skip to content
Snippets Groups Projects

Resolve "Add rules and permissions"

Merged Resolve "Add rules and permissions"
73-add-rules-and-permissions into master
Merged Jonathan Weth requested to merge 73-add-rules-and-permissions into master
Compare
and
Show latest version
2 files
+ 28
− 46
Compare changes
  • Side-by-side
  • Inline
Files
2
aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+ 26
− 44
@@ -24,15 +24,19 @@
{% endblock %}
{% block content %}
{% has_perm "alsijil.view_lessondocumentation" user lesson_period as can_view_lesson_documentation %}
{% has_perm "alsijil.edit_lessondocumentation" user lesson_period as can_edit_lesson_documentation %}
{% has_perm "alsijil.edit_personalnote" user lesson_period as can_edit_personalnote %}
<form method="post">
<div class="row">
<div class="col s12">
{% include "core/partials/save_button.html" %}
{% if can_edit_lesson_documentation or can_edit_personalnote %}
{% include "core/partials/save_button.html" %}
{% endif %}
</div>
</div>
{% csrf_token %}
{% has_perm "alsijil.view_lessondocumentation" user lesson_period as can_view_lesson_documentation %}
{% has_perm "alsijil.edit_lessondocumentation" user lesson_period as can_edit_lesson_documentation %}
<div class="row">
<div class="col s12 m12 l6 xl8">
<div class="card">
@@ -40,6 +44,7 @@
<span class="card-title">
{% blocktrans %}Lesson documentation{% endblocktrans %}
</span>
{% if can_edit_lesson_documentation %}
{% form form=lesson_documentation_form %}{% endform %}
{% elif can_view_lesson_documentation %}
@@ -65,16 +70,19 @@
</div>
</div>
</div>
<div class="col s12 m12 l6 xl4">
<div class="card">
<div class="card-content">
{% if can_view_lesson_documentation %}
<div class="col s12 m12 l6 xl4">
<div class="card">
<div class="card-content">
<span class="card-title">
{% blocktrans %}Change history{% endblocktrans %}
</span>
{% include 'core/partials/crud_events.html' with obj=lesson_documentation %}
{% include 'core/partials/crud_events.html' with obj=lesson_documentation %}
</div>
</div>
</div>
</div>
{% endif %}
</div>
<div class="row">
@@ -84,7 +92,6 @@
<span class="card-title">
{% blocktrans %}Personal notes{% endblocktrans %}
</span>
{% has_perm "alsijil.edit_personalnote" user lesson_period as can_edit_personalnote %}
{% form form=personal_note_formset.management_form %}{% endform %}
<table class="striped responsive-table alsijil-table">
@@ -131,41 +138,16 @@
</label>
</div>
</td>
</tr>
{% else %}
<tr>
{{ form.id }}
<td>{{ form.person_name }}{{ form.person_name.value }}</td>
<td class="center-align">
<label>
{{ form.absent }}
<span></span>
</label>
</td>
<td>
<div class="input-field">
{{ form.late }}
<label for="{{ form.absent.id_for_label }}">
{% trans "Tardiness (in m)" %}
</label>
</div>
</td>
<td class="center-align">
<label>
{{ form.excused }}
<span></span>
</label>
</td>
<td>
<div class="input-field">
{{ form.remarks }}
<label for="{{ form.absent.id_for_label }}">
{% trans "Remarks" %}
</label>
</div>
</td>
</tr>
{% endif %}
</tr>
{% else %}
<tr>
<td>{{ form.person_name.value }}</td>
<td>{{ form.absent.value }}</td>
<td>{{ form.late.value }}</td>
<td>{{ form.excused.value }}</td>
<td>{{ form.remarks.value }}</td>
</tr>
{% endif %}
{% endfor %}
</tbody>
</table>