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
017602dd
Commit
017602dd
authored
4 years ago
by
Hangzhi Yu
Browse files
Options
Downloads
Patches
Plain Diff
Add filtered dropdowns for week overview
parent
5b18cc4e
No related branches found
No related tags found
2 merge requests
!72
Resolve "Filter selects on week overview and register absence"
,
!49
Resolve "Add rules and permissions"
Pipeline
#3477
passed
4 years ago
Stage: test
Stage: build
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/alsijil/forms.py
+13
-7
13 additions, 7 deletions
aleksis/apps/alsijil/forms.py
aleksis/apps/alsijil/views.py
+1
-1
1 addition, 1 deletion
aleksis/apps/alsijil/views.py
with
14 additions
and
8 deletions
aleksis/apps/alsijil/forms.py
+
13
−
7
View file @
017602dd
...
...
@@ -6,11 +6,12 @@ from django.db.models import Count
from
django.utils.translation
import
gettext_lazy
as
_
from
django_select2.forms
import
Select2Widget
from
guardian.shortcuts
import
get_objects_for_user
from
material
import
Layout
,
Row
from
aleksis.core.util.core_helpers
import
queryset_rules_filter
from
aleksis.apps.chronos.managers
import
TimetableType
from
aleksis.core.models
import
Group
,
Person
from
aleksis.core.util.predicates
import
check_global_permission
from
.models
import
ExcuseType
,
ExtraMark
,
LessonDocumentation
,
PersonalNote
...
...
@@ -51,12 +52,7 @@ class SelectForm(forms.Form):
queryset
=
None
,
label
=
_
(
"
Group
"
),
required
=
False
,
widget
=
Select2Widget
,
)
teacher
=
forms
.
ModelChoiceField
(
queryset
=
Person
.
objects
.
annotate
(
lessons_count
=
Count
(
"
lessons_as_teacher
"
)
).
filter
(
lessons_count__gt
=
0
),
label
=
_
(
"
Teacher
"
),
required
=
False
,
widget
=
Select2Widget
,
queryset
=
None
,
label
=
_
(
"
Teacher
"
),
required
=
False
,
widget
=
Select2Widget
,
)
def
clean
(
self
)
->
dict
:
...
...
@@ -78,12 +74,22 @@ class SelectForm(forms.Form):
return
data
def
__init__
(
self
,
*
args
,
**
kwargs
):
self
.
request
=
kwargs
.
pop
(
"
request
"
)
super
().
__init__
(
*
args
,
**
kwargs
)
self
.
fields
[
"
group
"
].
queryset
=
(
Group
.
objects
.
for_current_school_term_or_all
()
.
annotate
(
lessons_count
=
Count
(
"
lessons
"
))
.
filter
(
lessons_count__gt
=
0
)
)
if
not
check_global_permission
(
self
.
request
.
user
,
"
alsijil.view_week
"
):
self
.
fields
[
"
group
"
].
queryset
=
self
.
fields
[
"
group
"
].
queryset
&
get_objects_for_user
(
self
.
request
.
user
,
"
core.register_absence_group
"
,
Group
)
self
.
fields
[
"
teacher
"
].
queryset
=
(
Person
.
objects
.
annotate
(
lessons_count
=
Count
(
"
lessons_as_teacher
"
)).
filter
(
lessons_count__gt
=
0
)
)
if
not
check_global_permission
(
self
.
request
.
user
,
"
alsijil.view_week
"
):
self
.
fields
[
"
teacher
"
].
queryset
=
self
.
fields
[
"
teacher
"
].
queryset
.
filter
(
pk
=
self
.
request
.
user
.
person
.
pk
)
PersonalNoteFormSet
=
forms
.
modelformset_factory
(
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/views.py
+
1
−
1
View file @
017602dd
...
...
@@ -206,7 +206,7 @@ def week_view(
initial
=
{
type_
.
value
:
instance
}
else
:
initial
=
{}
select_form
=
SelectForm
(
request
.
POST
or
None
,
initial
=
initial
)
select_form
=
SelectForm
(
request
.
POST
or
None
,
initial
=
initial
,
request
=
request
)
if
request
.
method
==
"
POST
"
:
if
select_form
.
is_valid
():
...
...
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