Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
third-party
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cooperatic-foodcoops
third-party
Commits
40eaa1cd
Commit
40eaa1cd
authored
Oct 30, 2023
by
Damien Moulard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
admin makups, display shift type in column
parent
4def3c86
Pipeline
#3067
failed with stage
in 1 minute 7 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
0 deletions
+16
-0
admin.py
members/admin.py
+2
-0
manage_makeups.js
members/static/js/admin/manage_makeups.js
+13
-0
manage_makeups.html
templates/members/admin/manage_makeups.html
+1
-0
No files found.
members/admin.py
View file @
40eaa1cd
...
...
@@ -321,9 +321,11 @@ def admin(request):
def
manage_makeups
(
request
):
""" Administration des membres """
template
=
loader
.
get_template
(
'members/admin/manage_makeups.html'
)
committees_shift_id
=
CagetteServices
.
get_committees_shift_id
()
m
=
CagetteMembersSpace
()
context
=
{
'title'
:
'BDM - Rattrapages'
,
'module'
:
'Membres'
,
'has_committe_shift'
:
committees_shift_id
is
not
None
,
'extension_duration'
:
m
.
get_extension_duration
()
}
return
HttpResponse
(
template
.
render
(
context
,
request
))
...
...
members/static/js/admin/manage_makeups.js
View file @
40eaa1cd
...
...
@@ -89,6 +89,19 @@ function display_makeups_members() {
},
{
data
:
"shift_type"
,
title
:
"<div class='title_center'>Type de créneau</div>"
,
className
:
"dt-body-center"
,
width
:
"5%"
,
render
:
function
(
data
)
{
if
(
data
==
'ftop'
)
{
return
(
has_committe_shift
===
"True"
)
?
"Comités"
:
"Volant"
;
}
else
{
return
'ABCD'
;
}
}
},
{
data
:
"shift_type"
,
title
:
"<div class='title_center'>Nb de points</div>"
,
className
:
"dt-body-center"
,
width
:
"5%"
,
...
...
templates/members/admin/manage_makeups.html
View file @
40eaa1cd
...
...
@@ -85,6 +85,7 @@
<script
src=
'{% static "js/all_common.js" %}?v=1651853225'
></script>
<script
src=
'{% static "js/admin/manage_makeups.js" %}?v=1651853225'
></script>
<script>
var
has_committe_shift
=
'{{has_committe_shift}}'
const
extension_duration
=
{{
extension_duration
}};
</script>
{% endblock %}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment