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
ed014f4c
Verified
Commit
ed014f4c
authored
5 years ago
by
Tom Teichler
Browse files
Options
Downloads
Patches
Plain Diff
Clean up code.
parent
9f2a4605
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!26
Resolve "Register absences and excuses centrally"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
biscuit/apps/alsijil/forms.py
+5
-5
5 additions, 5 deletions
biscuit/apps/alsijil/forms.py
biscuit/apps/alsijil/urls.py
+1
-1
1 addition, 1 deletion
biscuit/apps/alsijil/urls.py
biscuit/apps/alsijil/views.py
+9
-11
9 additions, 11 deletions
biscuit/apps/alsijil/views.py
with
15 additions
and
17 deletions
biscuit/apps/alsijil/forms.py
+
5
−
5
View file @
ed014f4c
...
@@ -50,10 +50,10 @@ PersonalNoteFormSet = forms.modelformset_factory(
...
@@ -50,10 +50,10 @@ PersonalNoteFormSet = forms.modelformset_factory(
PersonalNote
,
form
=
PersonalNoteForm
,
max_num
=
0
,
extra
=
0
)
PersonalNote
,
form
=
PersonalNoteForm
,
max_num
=
0
,
extra
=
0
)
class
AbsentExcused
Form
(
forms
.
Form
):
class
ManageAbsence
Form
(
forms
.
Form
):
date_start
=
forms
.
DateField
(
label
=
_
(
'
Start date
'
),
widget
=
forms
.
SelectDateWidget
,
initial
=
datetime
.
today
()
)
date_start
=
forms
.
DateField
(
label
=
_
(
'
Start date
'
),
widget
=
forms
.
SelectDateWidget
,
initial
=
datetime
.
today
)
date_end
=
forms
.
DateField
(
label
=
_
(
'
End date
'
),
widget
=
forms
.
SelectDateWidget
,
initial
=
datetime
.
today
()
)
date_end
=
forms
.
DateField
(
label
=
_
(
'
End date
'
),
widget
=
forms
.
SelectDateWidget
,
initial
=
datetime
.
today
)
starting_lesson
=
forms
.
IntegerField
(
label
=
_
(
'
Starting lesson
'
),
initial
=
0
)
starting_lesson
=
forms
.
IntegerField
(
label
=
_
(
'
Starting lesson
'
),
initial
=
0
)
person
=
forms
.
ModelChoiceField
(
label
=
_
(
'
Person
'
),
queryset
=
Person
.
objects
.
all
(),
widget
=
Select2Widget
)
person
=
forms
.
ModelChoiceField
(
label
=
_
(
'
Person
'
),
queryset
=
Person
.
objects
.
all
(),
widget
=
Select2Widget
)
absent
=
forms
.
BooleanField
(
label
=
_
(
'
Absent
'
))
absent
=
forms
.
BooleanField
(
label
=
_
(
'
Absent
'
)
,
initial
=
True
)
excused
=
forms
.
BooleanField
(
label
=
_
(
'
Excused
'
))
excused
=
forms
.
BooleanField
(
label
=
_
(
'
Excused
'
)
,
initial
=
True
)
This diff is collapsed.
Click to expand it.
biscuit/apps/alsijil/urls.py
+
1
−
1
View file @
ed014f4c
...
@@ -12,5 +12,5 @@ urlpatterns = [
...
@@ -12,5 +12,5 @@ urlpatterns = [
name
=
'
week_view_by_week
'
),
name
=
'
week_view_by_week
'
),
path
(
'
print/group/<int:id_>
'
,
views
.
full_register_group
,
path
(
'
print/group/<int:id_>
'
,
views
.
full_register_group
,
name
=
'
full_register_group
'
),
name
=
'
full_register_group
'
),
path
(
'
absences/new
'
,
views
.
absence
s_excuses
,
name
=
'
manage_absence
'
),
path
(
'
absences/new
'
,
views
.
manage_
absence
,
name
=
'
manage_absence
'
),
]
]
This diff is collapsed.
Click to expand it.
biscuit/apps/alsijil/views.py
+
9
−
11
View file @
ed014f4c
...
@@ -15,7 +15,7 @@ from biscuit.core.models import Group, Person
...
@@ -15,7 +15,7 @@ from biscuit.core.models import Group, Person
from
biscuit.core.decorators
import
admin_required
from
biscuit.core.decorators
import
admin_required
from
biscuit.core.util
import
messages
from
biscuit.core.util
import
messages
from
.forms
import
AbsentExcused
Form
,
LessonDocumentationForm
,
PersonalNoteFormSet
,
SelectForm
from
.forms
import
ManageAbsence
Form
,
LessonDocumentationForm
,
PersonalNoteFormSet
,
SelectForm
from
.models
import
LessonDocumentation
from
.models
import
LessonDocumentation
...
@@ -207,28 +207,26 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
...
@@ -207,28 +207,26 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
@admin_required
@admin_required
def
absence
s_excuses
(
request
:
HttpRequest
)
->
HttpResponse
:
def
manage_
absence
(
request
:
HttpRequest
)
->
HttpResponse
:
context
=
{}
context
=
{}
manage_absence_form
=
AbsentExcusedForm
(
manage_absence_form
=
ManageAbsenceForm
(
request
.
POST
or
None
)
request
.
POST
or
None
,
initial
=
{
'
absent
'
:
True
,
'
excused
'
:
True
})
if
request
.
method
==
'
POST
'
:
if
request
.
method
==
'
POST
'
:
if
manage_absence_form
.
is_valid
():
if
manage_absence_form
.
is_valid
():
# Get
person
from form
# Get
data
from form
person
=
manage_absence_form
.
cleaned_data
[
'
person
'
]
person
=
manage_absence_form
.
cleaned_data
[
'
person
'
]
# Get dates and starting lesson
start_date
=
manage_absence_form
.
cleaned_data
[
'
date_start
'
]
start_date
=
manage_absence_form
.
cleaned_data
[
'
date_start
'
]
end_date
=
manage_absence_form
.
cleaned_data
[
'
date_end
'
]
end_date
=
manage_absence_form
.
cleaned_data
[
'
date_end
'
]
starting_lesson
=
manage_absence_form
.
cleaned_data
[
'
starting_lesson
'
]
starting_lesson
=
manage_absence_form
.
cleaned_data
[
'
starting_lesson
'
]
absent
=
manage_absence_form
.
cleaned_data
[
'
absent
'
]
excused
=
manage_absence_form
.
cleaned_data
[
'
excused
'
]
# Mark person as absent
# Mark person as absent
day_list
=
[]
delta
=
end_date
-
start_date
delta
=
end_date
-
start_date
for
i
in
range
(
delta
.
days
+
1
):
for
date
in
range
(
delta
.
days
+
1
):
day
=
start_date
+
timedelta
(
days
=
1
)
day
=
start_date
+
timedelta
(
days
=
1
)
person
.
mark_absent
(
day
,
absent
=
manage_absence_form
.
cleaned_data
[
'
absent
'
]
,
excused
=
manage_absence_form
.
cleaned_data
[
'
excused
'
]
)
person
.
mark_absent
(
day
,
absent
=
absent
,
excused
=
excused
)
person
.
save
()
person
.
save
()
messages
.
success
(
request
,
_
(
'
The absence has been saved.
'
))
messages
.
success
(
request
,
_
(
'
The absence has been saved.
'
))
...
...
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