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
5659046c
Commit
5659046c
authored
Sep 13, 2022
by
François C.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow STANDARD_BLOCK_SERVICE_EXCHANGE_DELAY setting
parent
ec495097
Pipeline
#2374
failed with stage
in 1 minute 41 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
94 additions
and
0 deletions
+94
-0
members-space-shifts-exchange.js
members_space/static/js/members-space-shifts-exchange.js
+5
-0
config.md
outils/config.md
+3
-0
models.py
shifts/models.py
+81
-0
views.py
shifts/views.py
+5
-0
No files found.
members_space/static/js/members-space-shifts-exchange.js
View file @
5659046c
...
...
@@ -125,6 +125,11 @@ function add_or_change_shift(new_shift_id) {
`Afin de faciliter la logistique des services, il n'est plus possible de l'échanger. `
+
`Si tu ne peux vraiment pas venir, tu seras noté.e absent.e à ton service. `
+
`Tu devras alors sélectionner un service de rattrapage sur ton espace membre.`
);
}
else
if
(
error
.
status
===
400
&&
'msg'
in
error
.
responseJSON
&&
error
.
responseJSON
.
msg
===
"Not allowed to change shift"
)
{
alert
(
`Désolé ! Le service que tu souhaites échanger démarre dans trop peu de temps. `
+
`Afin de faciliter la logistique des services, il n'est plus possible de l'échanger. `
+
`Si tu ne peux vraiment pas venir, tu seras noté.e absent.e à ton service. `
+
`Tu devras alors sélectionner un service de rattrapage sur ton espace membre.`
);
}
else
if
(
error
.
status
===
500
&&
'msg'
in
error
.
responseJSON
&&
error
.
responseJSON
.
msg
===
"Fail to create shift"
)
{
// TODO differentiate error cases!
alert
(
`Une erreur est survenue. `
+
...
...
outils/config.md
View file @
5659046c
...
...
@@ -445,6 +445,9 @@
-
PERMANENT_MESSAGE_BELOW_CONNECTION_FIELDS = "Si vous avez des difficultés à vous connecter, ...."
Default is None
-
STANDARD_BLOCK_SERVICE_EXCHANGE_DELAY = 36 (default = 24)
Define duration, in hours, before shift starts within exchange is not more available, for standard shift_type member
### BDM Admin
...
...
shifts/models.py
View file @
5659046c
...
...
@@ -17,6 +17,87 @@ class CagetteShift(models.Model):
self
.
tz
=
pytz
.
timezone
(
"Europe/Paris"
)
self
.
o_api
=
OdooAPI
()
def
get_cycle_week_data
(
self
,
date
=
None
):
result
=
{}
try
:
res_param
=
self
.
o_api
.
search_read
(
'ir.config_parameter'
,
[[
'key'
,
'='
,
'coop_shift.week_a_date'
]],
[
'value'
])
if
res_param
:
import
math
WEEKS
=
[
'A'
,
'B'
,
'C'
,
'D'
]
start_A
=
tz
.
localize
(
datetime
.
datetime
.
strptime
(
res_param
[
0
][
'value'
],
'
%
Y-
%
m-
%
d'
))
result
[
'start'
]
=
start_A
now
=
datetime
.
datetime
.
now
(
tz
)
# + datetime.timedelta(hours=72)
if
date
is
not
None
:
now
=
tz
.
localize
(
datetime
.
datetime
.
strptime
(
date
,
'
%
Y-
%
m-
%
d'
))
diff
=
now
-
start_A
weeks_diff
=
diff
.
total_seconds
()
/
3600
/
24
/
7
week_index
=
math
.
floor
(
weeks_diff
%
4
)
result
[
'week_name'
]
=
WEEKS
[
week_index
]
result
[
'start_date'
]
=
start_A
+
datetime
.
timedelta
(
weeks
=
math
.
floor
(
weeks_diff
))
except
Exception
as
e
:
coop_logger
.
error
(
"get_current_cycle_week_data
%
s"
,
str
(
e
))
result
[
'error'
]
=
str
(
e
)
return
result
def
is_matching_ftop_rules
(
self
,
partner_id
,
idNewShift
,
idOldShift
=
0
):
answer
=
True
rules
=
getattr
(
settings
,
'FTOP_SERVICES_RULES'
,
{})
if
(
"successive_shifts_allowed"
in
rules
or
"max_shifts_per_cycle"
in
rules
):
try
:
now
=
datetime
.
datetime
.
now
(
tz
)
# Have to retrive shifts (from now to a cycle period forward to check rules respect)
[
shift_registrations
,
is_ftop
]
=
self
.
get_shift_partner
(
partner_id
,
now
+
datetime
.
timedelta
(
weeks
=
4
))
new_shift
=
self
.
get_shift
(
idNewShift
)
# WARNING : use date_begin_tz while shift_registrations use date_begin (UTC)
if
"successive_shifts_allowed"
in
rules
:
min_duration
=
getattr
(
settings
,
'MIN_SHIFT_DURATION'
,
2
)
for
sr
in
shift_registrations
:
if
int
(
sr
[
'shift_id'
][
0
])
!=
int
(
idOldShift
):
diff
=
(
datetime
.
datetime
.
strptime
(
sr
[
'date_begin'
],
'
%
Y-
%
m-
%
d
%
H:
%
M:
%
S'
)
.
astimezone
(
tz
)
-
tz
.
localize
(
datetime
.
datetime
.
strptime
(
new_shift
[
'date_begin_tz'
],
'
%
Y-
%
m-
%
d
%
H:
%
M:
%
S'
)))
if
abs
(
diff
.
total_seconds
()
/
3600
)
<
(
min_duration
*
2
)
*
(
int
(
rules
[
'successive_shifts_allowed'
])
+
1
):
answer
=
False
# coop_logger.info(sr['date_begin'] + ' - ' + new_shift['date_begin_tz'])
# coop_logger.info(str(diff.total_seconds()/3600) + 'h')
if
"max_shifts_per_cycle"
in
rules
:
[
ymd
,
hms
]
=
new_shift
[
'date_begin_tz'
]
.
split
(
" "
)
cw
=
self
.
get_cycle_week_data
(
ymd
)
if
'start_date'
in
cw
:
sd
=
cw
[
'start_date'
]
ed
=
cw
[
'start_date'
]
+
datetime
.
timedelta
(
weeks
=
4
)
[
cycle_shift_regs
,
is_ftop
]
=
self
.
get_shift_partner
(
partner_id
,
start_date
=
sd
,
end_date
=
ed
)
if
len
(
cycle_shift_regs
)
>=
int
(
rules
[
'max_shifts_per_cycle'
]):
answer
=
False
coop_logger
.
info
(
"services max par cycle atteint pour partner_id
%
s"
,
str
(
partner_id
))
except
Exception
as
e
:
coop_logger
.
error
(
"is_shift_exchange_allowed
%
s
%
s"
,
str
(
e
),
str
(
new_shift
))
return
answer
def
is_shift_exchange_allowed
(
self
,
idOldShift
,
idNewShift
,
shift_type
,
partner_id
):
answer
=
True
min_delay
=
getattr
(
settings
,
'STANDARD_BLOCK_SERVICE_EXCHANGE_DELAY'
,
0
)
if
shift_type
==
"ftop"
:
min_delay
=
getattr
(
settings
,
'FTOP_BLOCK_SERVICE_EXCHANGE_DELAY'
,
0
)
if
min_delay
>
0
:
now
=
datetime
.
datetime
.
now
(
tz
)
old_shift
=
self
.
get_shift
(
idOldShift
)
day_before_old_shift_date_start
=
\
tz
.
localize
(
datetime
.
datetime
.
strptime
(
old_shift
[
'date_begin_tz'
],
'
%
Y-
%
m-
%
d
%
H:
%
M:
%
S'
)
-
datetime
.
timedelta
(
hours
=
min_delay
))
if
now
>
day_before_old_shift_date_start
:
answer
=
False
elif
shift_type
==
"ftop"
:
answer
=
self
.
is_matching_ftop_rules
(
partner_id
,
idNewShift
,
idOldShift
)
return
answer
def
get_shift
(
self
,
id
):
"""Get one shift by id"""
cond
=
[[
'id'
,
'='
,
id
]]
...
...
shifts/views.py
View file @
5659046c
...
...
@@ -215,6 +215,11 @@ def change_shift(request):
response
=
{
'msg'
:
"Old service in less than 24hours."
}
return
JsonResponse
(
response
,
status
=
400
)
if
cs
.
is_shift_exchange_allowed
(
idOldShift
,
data
[
"idShift"
],
data
[
"shift_type"
],
data
[
"idPartner"
])
is
False
:
response
=
{
'msg'
:
"Not allowed to change shift"
}
return
JsonResponse
(
response
,
status
=
400
)
st_r_id
=
False
#Insertion du nouveau shift
try
:
...
...
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