Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Alsijil
Commits
420f07a0
Commit
420f07a0
authored
4 years ago
by
Hangzhi Yu
Browse files
Options
Downloads
Patches
Plain Diff
Add rules&permissions in class register template
parent
45de9a0c
No related branches found
No related tags found
1 merge request
!49
Resolve "Add rules and permissions"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+97
-38
97 additions, 38 deletions
...apps/alsijil/templates/alsijil/class_register/lesson.html
with
97 additions
and
38 deletions
aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+
97
−
38
View file @
420f07a0
{# -*- engine:django -*- #}
{# -*- engine:django -*- #}
{% extends "core/base.html" %}
{% extends "core/base.html" %}
{% load material_form i18n static %}
{% load material_form i18n static
rules
%}
{% block browser_title %}{% blocktrans %}Lesson{% endblocktrans %}{% endblock %}
{% block browser_title %}{% blocktrans %}Lesson{% endblocktrans %}{% endblock %}
...
@@ -31,7 +31,8 @@
...
@@ -31,7 +31,8 @@
</div>
</div>
</div>
</div>
{% csrf_token %}
{% 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=
"row"
>
<div
class=
"col s12 m12 l6 xl8"
>
<div
class=
"col s12 m12 l6 xl8"
>
<div
class=
"card"
>
<div
class=
"card"
>
...
@@ -39,8 +40,28 @@
...
@@ -39,8 +40,28 @@
<span
class=
"card-title"
>
<span
class=
"card-title"
>
{% blocktrans %}Lesson documentation{% endblocktrans %}
{% blocktrans %}Lesson documentation{% endblocktrans %}
</span>
</span>
{% if can_edit_lesson_documentation %}
{% form form=lesson_documentation_form %}{% endform %}
{% form form=lesson_documentation_form %}{% endform %}
{% elif can_view_lesson_documentation %}
<table>
<tr>
<th>
{% trans "Lesson topic" %}
</th>
<td>
{{ lesson_documentation.topic }}
</td>
</tr>
<tr>
<th>
{% trans "Homework" %}
</th>
<td>
{{ lesson_documentation.homework }}
</td>
</tr>
</table>
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -63,6 +84,7 @@
...
@@ -63,6 +84,7 @@
<span
class=
"card-title"
>
<span
class=
"card-title"
>
{% blocktrans %}Personal notes{% endblocktrans %}
{% blocktrans %}Personal notes{% endblocktrans %}
</span>
</span>
{% has_perm "alsijil.edit_personalnote" user lesson_period as can_edit_personalnote %}
{% form form=personal_note_formset.management_form %}{% endform %}
{% form form=personal_note_formset.management_form %}{% endform %}
<table
class=
"striped responsive-table alsijil-table"
>
<table
class=
"striped responsive-table alsijil-table"
>
...
@@ -77,38 +99,73 @@
...
@@ -77,38 +99,73 @@
</thead>
</thead>
<tbody>
<tbody>
{% for form in personal_note_formset %}
{% for form in personal_note_formset %}
<tr>
{% if can_edit_personalnote %}
{{ form.id }}
<tr>
<td>
{{ form.person_name }}{{ form.person_name.value }}
</td>
{{ form.id }}
<td
class=
"center-align"
>
<td>
{{ form.person_name }}{{ form.person_name.value }}
</td>
<label>
<td
class=
"center-align"
>
{{ form.absent }}
<label>
<span></span>
{{ form.absent }}
</label>
<span></span>
</td>
<td>
<div
class=
"input-field"
>
{{ form.late }}
<label
for=
"{{ form.absent.id_for_label }}"
>
{% trans "Tardiness (in m)" %}
</label>
</label>
</d
iv
>
</
t
d>
<
/
td>
<td>
<td
class=
"center-align
"
>
<div
class=
"input-field
"
>
<label>
{{ form.late }}
{{ form.excused
}}
<label
for=
"{{ form.absent.id_for_label
}}
"
>
<span></span>
{% trans "Tardiness (in m)" %}
</label>
</label>
</td
>
</div
>
<
td>
</
td>
<d
iv
class=
"
input-field
"
>
<
t
d
class=
"
center-align
"
>
{{ form.remarks }}
<label>
<label
for=
"{{ form.absent.id_for_label
}}
"
>
{{ form.excused
}}
{% trans "Remarks" %}
<span></span>
</label>
</label>
</div>
</td>
</td>
<td>
</tr>
<div
class=
"input-field"
>
{{ form.remarks }}
<label
for=
"{{ form.absent.id_for_label }}"
>
{% trans "Remarks" %}
</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 %}
{% endfor %}
{% endfor %}
</tbody>
</tbody>
</table>
</table>
...
@@ -117,10 +174,12 @@
...
@@ -117,10 +174,12 @@
</div>
</div>
</div>
</div>
<div
class=
"row"
>
{% if can_edit_lesson_documentation or can_edit_personalnote %}
<div
class=
"col s12"
>
<div
class=
"row"
>
{% include "core/partials/save_button.html" %}
<div
class=
"col s12"
>
{% include "core/partials/save_button.html" %}
</div>
</div>
</div>
</div>
{% endif %}
</form>
</form>
{% endblock %}
{% endblock %}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment