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
20e1026a
Commit
20e1026a
authored
Nov 07, 2024
by
Yvon Kerdoncuff
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix variable wrongly named after v12 port causing change rattrapages bug
parent
e25fc1f2
Pipeline
#3896
canceled with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
admin.py
members/admin.py
+1
-1
manage_makeups.js
members/static/js/admin/manage_makeups.js
+3
-3
No files found.
members/admin.py
View file @
20e1026a
...
@@ -410,7 +410,7 @@ def update_members_makeups_core(members_data, res):
...
@@ -410,7 +410,7 @@ def update_members_makeups_core(members_data, res):
if
member_data
[
"member_shift_type"
]
==
"standard"
:
if
member_data
[
"member_shift_type"
]
==
"standard"
:
# Set points to minus the number of makeups to do + the makeups to come (limited to -2)
# Set points to minus the number of makeups to do + the makeups to come (limited to -2)
cs
=
CagetteShift
()
cs
=
CagetteShift
()
[
shift
D
ata
,
is_ftop
]
=
cs
.
get_shift_partner
(
int
(
member_data
[
"member_id"
]))
[
shift
_d
ata
,
is_ftop
]
=
cs
.
get_shift_partner
(
int
(
member_data
[
"member_id"
]))
target_points
=
-
int
(
member_data
[
"target_makeups_nb"
])
-
sum
(
1
for
value
in
shift_data
if
value
[
'is_makeup'
])
target_points
=
-
int
(
member_data
[
"target_makeups_nb"
])
-
sum
(
1
for
value
in
shift_data
if
value
[
'is_makeup'
])
if
(
target_points
<
-
2
):
if
(
target_points
<
-
2
):
target_points
=
-
2
target_points
=
-
2
...
...
members/static/js/admin/manage_makeups.js
View file @
20e1026a
...
@@ -358,14 +358,14 @@ function update_members_makeups(member_ids, action, description) {
...
@@ -358,14 +358,14 @@ function update_members_makeups(member_ids, action, description) {
closeModal
();
closeModal
();
},
},
error
:
function
(
data
)
{
error
:
function
(
data
)
{
err
=
{
msg
:
"erreur serveur pour
décrémenter les rattrapages"
,
ctx
:
'decrement
_makeups'
};
err
=
{
msg
:
"erreur serveur pour
incrémenter ou décrémenter les rattrapages"
,
ctx
:
'update_members
_makeups'
};
if
(
typeof
data
.
responseJSON
!=
'undefined'
&&
typeof
data
.
responseJSON
.
error
!=
'undefined'
)
{
if
(
typeof
data
.
responseJSON
!=
'undefined'
&&
typeof
data
.
responseJSON
.
error
!=
'undefined'
)
{
err
.
msg
+=
' : '
+
data
.
responseJSON
.
error
;
err
.
msg
+=
' : '
+
data
.
responseJSON
.
error
;
}
}
report_JS_error
(
err
,
'members_admin-manage_makeups'
);
report_JS_error
(
err
,
'members_admin-manage_makeups'
);
closeModal
();
closeModal
();
alert
(
'Erreur serveur pour
décrémenter les rattrapages. Veuillez contac
er le service informatique.'
);
alert
(
'Erreur serveur pour
incrémenter ou décrémenter les rattrapages. Veuillez contact
er le service informatique.'
);
}
}
});
});
}
}
...
@@ -411,7 +411,7 @@ function extend_member_delay(member) {
...
@@ -411,7 +411,7 @@ function extend_member_delay(member) {
report_JS_error
(
err
,
'members_admin-manage_makeups'
);
report_JS_error
(
err
,
'members_admin-manage_makeups'
);
closeModal
();
closeModal
();
alert
(
'Erreur serveur pour créer un délai. Veuillez contacer le service informatique.'
);
alert
(
'Erreur serveur pour créer un délai. Veuillez contac
t
er le service informatique.'
);
}
}
});
});
}
}
...
...
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