Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
oser-backend
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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hamza Touizrat
oser-backend
Commits
d5f0d27e
Commit
d5f0d27e
authored
Feb 12, 2021
by
Bidot-Naude Thomas
Browse files
Options
Downloads
Patches
Plain Diff
Ajout de 3 filtres par etablissements
parent
94442a5d
No related branches found
No related tags found
7 merge requests
!39
Solve public permission files on AWS
,
!41
Rectification Exportation excel sorties
,
!32
Sortie thomas
,
!37
Add context_sheet for visits
,
!33
Sortie thomas (export CSV sorties)
,
!38
Add context sheet for visits V4
,
!35
Notifications for Sec-Gen
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
projects/admin.py
+26
-4
26 additions, 4 deletions
projects/admin.py
register/admin.py
+22
-1
22 additions, 1 deletion
register/admin.py
visits/admin.py
+21
-1
21 additions, 1 deletion
visits/admin.py
with
69 additions
and
6 deletions
projects/admin.py
+
26
−
4
View file @
d5f0d27e
...
@@ -5,6 +5,8 @@ from django.contrib import admin
...
@@ -5,6 +5,8 @@ from django.contrib import admin
from
dynamicforms.views
import
download_multiple_forms_entries
from
dynamicforms.views
import
download_multiple_forms_entries
from
dynamicforms.models
import
Form
from
dynamicforms.models
import
Form
from
.models
import
Edition
,
Participation
,
Project
,
EditionForm
from
.models
import
Edition
,
Participation
,
Project
,
EditionForm
from
django.contrib.admin
import
SimpleListFilter
from
profiles.models
import
Student
@admin.register
(
Project
)
@admin.register
(
Project
)
...
@@ -37,6 +39,25 @@ class OrganizersInline(admin.TabularInline):
...
@@ -37,6 +39,25 @@ class OrganizersInline(admin.TabularInline):
extra
=
0
extra
=
0
class
SchoolFilter
(
admin
.
SimpleListFilter
):
title
=
'
établissement
'
parameter_name
=
'
profiles__school
'
def
lookups
(
self
,
request
,
model_admin
):
list_of_school
=
[]
query
=
Student
.
objects
.
values_list
(
"
school
"
,
flat
=
True
).
distinct
()
for
school
in
query
:
list_of_school
.
append
((
school
,
school
))
return
list_of_school
def
queryset
(
self
,
request
,
queryset
):
if
self
.
value
():
emails
=
Student
.
objects
.
filter
(
school
=
self
.
value
()).
values_list
(
"
user__email
"
,
flat
=
True
)
return
queryset
.
filter
(
user__email__in
=
emails
)
@
admin
.
register
(
Edition
)
@
admin
.
register
(
Edition
)
class
EditionAdmin
(
admin
.
ModelAdmin
):
class
EditionAdmin
(
admin
.
ModelAdmin
):
"""
Admin panel for editions.
"""
"""
Admin panel for editions.
"""
...
@@ -86,6 +107,7 @@ class ParticipationAdmin(admin.ModelAdmin):
...
@@ -86,6 +107,7 @@ class ParticipationAdmin(admin.ModelAdmin):
"""
Participation admin panel.
"""
"""
Participation admin panel.
"""
list_display
=
(
'
user
'
,
'
edition
'
,
'
submitted
'
,
'
state
'
)
list_display
=
(
'
user
'
,
'
edition
'
,
'
submitted
'
,
'
state
'
)
list_filter
=
(
'
edition
'
,
'
submitted
'
,
'
state
'
,)
list_filter
=
(
SchoolFilter
,
'
edition
'
,
'
submitted
'
,
'
state
'
,)
readonly_fields
=
(
'
submitted
'
,)
readonly_fields
=
(
'
submitted
'
,)
search_fields
=
(
'
user__first_name
'
,
'
user__last_name
'
,
'
user__email
'
,)
search_fields
=
(
'
user__first_name
'
,
'
user__last_name
'
,
'
user__email
'
,)
This diff is collapsed.
Click to expand it.
register/admin.py
+
22
−
1
View file @
d5f0d27e
...
@@ -2,14 +2,35 @@
...
@@ -2,14 +2,35 @@
from
django.contrib
import
admin
from
django.contrib
import
admin
from
.models
import
Registration
from
.models
import
Registration
from
profiles.models
import
Student
# Register your models here.
# Register your models here.
class
SchoolFilter
(
admin
.
SimpleListFilter
):
title
=
'
établissement
'
parameter_name
=
'
profiles__school
'
def
lookups
(
self
,
request
,
model_admin
):
list_of_school
=
[]
query
=
Student
.
objects
.
values_list
(
"
school
"
,
flat
=
True
).
distinct
()
for
school
in
query
:
list_of_school
.
append
((
school
,
school
))
return
list_of_school
def
queryset
(
self
,
request
,
queryset
):
if
self
.
value
():
emails
=
Student
.
objects
.
filter
(
school
=
self
.
value
()).
values_list
(
"
user__email
"
,
flat
=
True
)
return
queryset
.
filter
(
email__in
=
emails
)
@admin.register
(
Registration
)
@admin.register
(
Registration
)
class
RegistrationAdmin
(
admin
.
ModelAdmin
):
class
RegistrationAdmin
(
admin
.
ModelAdmin
):
"""
Admin panel for registrations.
"""
"""
Admin panel for registrations.
"""
list_display
=
(
'
last_name
'
,
'
first_name
'
,
'
submitted
'
)
list_display
=
(
'
last_name
'
,
'
first_name
'
,
'
submitted
'
)
readonly_fields
=
(
'
submitted
'
,)
readonly_fields
=
(
'
submitted
'
,)
list_filter
=
(
'
submitted
'
,
'
validated
'
)
list_filter
=
(
SchoolFilter
,
'
submitted
'
,
'
validated
'
)
This diff is collapsed.
Click to expand it.
visits/admin.py
+
21
−
1
View file @
d5f0d27e
...
@@ -8,10 +8,30 @@ from django.utils.safestring import mark_safe
...
@@ -8,10 +8,30 @@ from django.utils.safestring import mark_safe
from
django.http
import
HttpResponse
from
django.http
import
HttpResponse
import
csv
import
csv
from
.models
import
Participation
,
Place
,
Visit
from
.models
import
Participation
,
Place
,
Visit
from
profiles.models
import
Student
# Register your models here.
# Register your models here.
class
SchoolFilter
(
admin
.
SimpleListFilter
):
title
=
'
établissement
'
parameter_name
=
'
profiles__school
'
def
lookups
(
self
,
request
,
model_admin
):
list_of_school
=
[]
query
=
Student
.
objects
.
values_list
(
"
school
"
,
flat
=
True
).
distinct
()
for
school
in
query
:
list_of_school
.
append
((
school
,
school
))
return
list_of_school
def
queryset
(
self
,
request
,
queryset
):
if
self
.
value
():
emails
=
Student
.
objects
.
filter
(
school
=
self
.
value
()).
values_list
(
"
user__email
"
,
flat
=
True
)
return
queryset
.
filter
(
user__email__in
=
emails
)
class
RegistrationsOpenFilter
(
admin
.
SimpleListFilter
):
class
RegistrationsOpenFilter
(
admin
.
SimpleListFilter
):
"""
Custom filter to filter visits by their registration openness.
"""
Custom filter to filter visits by their registration openness.
...
@@ -115,7 +135,7 @@ class ParticipationAdmin(admin.ModelAdmin):
...
@@ -115,7 +135,7 @@ class ParticipationAdmin(admin.ModelAdmin):
"""
Admin panel for visit participations.
"""
"""
Admin panel for visit participations.
"""
list_display
=
(
'
submitted
'
,
'
visit
'
,
'
user_link
'
,
'
accepted
'
,
'
present
'
)
list_display
=
(
'
submitted
'
,
'
visit
'
,
'
user_link
'
,
'
accepted
'
,
'
present
'
)
list_filter
=
(
'
submitted
'
,
'
accepted
'
,
'
present
'
)
list_filter
=
(
SchoolFilter
,
'
submitted
'
,
'
accepted
'
,
'
present
'
)
actions
=
[
accept_selected_participations
,
reject_selected_participations
]
actions
=
[
accept_selected_participations
,
reject_selected_participations
]
def
user_link
(
self
,
participation
:
Participation
):
def
user_link
(
self
,
participation
:
Participation
):
...
...
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