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
290dc9f7
Commit
290dc9f7
authored
Oct 06, 2022
by
Félicie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_cooperatic' into 3867-ratio-button-binome-option
parents
f54ca15d
04f149b4
Pipeline
#2410
passed with stage
in 1 minute 24 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
manage_regular_shifts.js
members/static/js/admin/manage_regular_shifts.js
+1
-1
models.py
shifts/models.py
+7
-1
views.py
shifts/views.py
+3
-2
No files found.
members/static/js/admin/manage_regular_shifts.js
View file @
290dc9f7
...
...
@@ -276,7 +276,7 @@ function display_possible_members() {
$
(
document
).
ready
(
function
()
{
if
(
coop_is_connected
())
{
$
.
ajaxSetup
({
headers
:
{
"X-CSRFToken"
:
getCookie
(
'csrftoken'
)
}
});
dbc
=
new
PouchDB
(
couchdb_
dbname
);
dbc
=
new
PouchDB
(
couchdb_
server
);
$
(
".page_content"
).
show
();
...
...
shifts/models.py
View file @
290dc9f7
...
...
@@ -632,9 +632,15 @@ class CagetteServices(models.Model):
@staticmethod
def
reopen_registration
(
registration_id
,
overrided_date
=
""
):
api
=
OdooAPI
()
f
=
{
'state'
:
'open'
}
try
:
cond
=
[[
'id'
,
'='
,
int
(
registration_id
)]]
fields
=
[
'partner_id'
]
res
=
api
.
search_read
(
'shift.registration'
,
cond
,
fields
)
coop_logger
.
info
(
"On invalide la présence de
%
s "
,
res
[
0
][
'partner_id'
][
1
])
except
Exception
as
e
:
coop_logger
.
error
(
"On invalide shift_registration
%
s (erreur :
%
s)"
,
str
(
registration_id
),
str
(
e
))
return
api
.
update
(
'shift.registration'
,
[
int
(
registration_id
)],
f
)
@staticmethod
...
...
shifts/views.py
View file @
290dc9f7
...
...
@@ -334,10 +334,9 @@ def cancel_shift(request):
listRegister
=
[
int
(
request
.
POST
[
'idRegister'
])]
try
:
response
=
cs
.
cancel_shift
(
listRegister
)
# decrement extra_shift_done if param exists
if
'extra_shift_done'
in
request
.
POST
:
response
=
cs
.
cancel_shift
(
listRegister
,
origin
=
'memberspace extra shift done'
)
target
=
int
(
request
.
POST
[
"extra_shift_done"
])
-
1
# extra security
...
...
@@ -346,6 +345,8 @@ def cancel_shift(request):
cm
=
CagetteMember
(
partner_id
)
cm
.
update_extra_shift_done
(
target
)
else
:
response
=
cs
.
cancel_shift
(
listRegister
)
return
JsonResponse
({
"res"
:
'response'
})
except
Exception
as
e
:
...
...
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