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
7b266f4d
Commit
7b266f4d
authored
Oct 08, 2021
by
François
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modifications pour test borne accueil (présences validées date autre que 'maintenant')
parent
a8b0fcb4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
17 deletions
+28
-17
models.py
members/models.py
+17
-14
views.py
members/views.py
+11
-3
No files found.
members/models.py
View file @
7b266f4d
...
...
@@ -9,7 +9,7 @@ from products.models import OFF
from
envelops.models
import
CagetteEnvelops
import
sys
from
pytz
import
timezone
import
pytz
import
locale
import
re
import
dateutil.parser
...
...
@@ -653,7 +653,7 @@ class CagetteMember(models.Model):
locale
.
setlocale
(
locale
.
LC_ALL
,
'fr_FR.utf8'
)
if
len
(
res
)
>
0
:
local_tz
=
timezone
(
'Europe/Paris'
)
local_tz
=
pytz
.
timezone
(
'Europe/Paris'
)
for
s
in
res
:
date
,
t
=
s
[
'date_begin'
]
.
split
(
' '
)
year
,
month
,
day
=
date
.
split
(
'-'
)
...
...
@@ -712,8 +712,8 @@ class CagetteMember(models.Model):
cond
=
[[
'id'
,
'='
,
m
[
'tmpl_reg_line_ids'
][
0
]]]
fields
=
[
'shift_template_id'
]
shift_templ_res
=
api
.
search_read
(
'shift.template.registration.line'
,
cond
,
fields
)
if
(
len
(
shift_templ_res
)
>
0
and
if
(
len
(
shift_templ_res
)
>
0
and
int
(
shift_templ_res
[
0
][
'shift_template_id'
][
0
])
==
int
(
shift_id
)):
keep_it
=
True
else
:
...
...
@@ -1078,7 +1078,7 @@ class CagetteServices(models.Model):
res
=
api
.
search_read
(
'shift.shift'
,
c
,
f
,
1
,
0
,
'date_begin ASC'
)
if
(
res
and
res
[
0
]):
locale
.
setlocale
(
locale
.
LC_ALL
,
'fr_FR.utf8'
)
local_tz
=
timezone
(
'Europe/Paris'
)
local_tz
=
pytz
.
timezone
(
'Europe/Paris'
)
date
,
t
=
res
[
0
][
'date_begin'
]
.
split
(
' '
)
year
,
month
,
day
=
date
.
split
(
'-'
)
start
=
datetime
.
datetime
(
int
(
year
),
int
(
month
),
int
(
day
),
...
...
@@ -1090,7 +1090,7 @@ class CagetteServices(models.Model):
@staticmethod
def
get_services_at_time
(
time
,
tz_offset
,
with_members
=
True
):
"""Retrieve present services with member linked."""
# import operator
min_before_shift_starts_delay
=
20
min_after_shift_starts_delay
=
20
...
...
@@ -1141,22 +1141,25 @@ class CagetteServices(models.Model):
return
services
@staticmethod
def
registration_done
(
registration_id
):
def
registration_done
(
registration_id
,
overrided_date
=
""
):
"""Equivalent to click present in presence form."""
api
=
OdooAPI
()
f
=
{
'state'
:
'done'
}
late_mode
=
getattr
(
settings
,
'ENTRANCE_WITH_LATE_MODE'
,
False
)
if
late_mode
is
True
:
# services = CagetteServices.get_services_at_time('14:28',0, with_members=False)
local_tz
=
timezone
(
'Europe/Paris'
)
now
=
datetime
.
datetime
.
now
()
.
astimezone
(
local_tz
)
.
strftime
(
"
%
H:
%
MZ"
)
# coop_logger.info("Maintenant = %s", now)
services
=
CagetteServices
.
get_services_at_time
(
now
,
0
,
with_members
=
False
)
if
len
(
overrided_date
)
>
0
and
getattr
(
settings
,
'APP_ENV'
,
"prod"
)
!=
"prod"
:
now
=
overrided_date
else
:
local_tz
=
pytz
.
timezone
(
'Europe/Paris'
)
now
=
datetime
.
datetime
.
utcnow
()
.
replace
(
tzinfo
=
pytz
.
utc
)
.
astimezone
(
local_tz
)
.
strftime
(
"
%
H:
%
MZ"
)
# coop_logger.info("Maintenant = %s (overrided %s) %s", now, overrided_date)
services
=
CagetteServices
.
get_services_at_time
(
now
,
0
,
with_members
=
False
)
if
len
(
services
)
>
0
:
# Notice : Despite is_late is defined as boolean in Odoo, 0 or 1 is needed for api call
is_late
=
0
if
services
[
0
][
'late'
]
is
True
:
is_late
=
1
is_late
=
1
f
[
'is_late'
]
=
is_late
else
:
return
False
...
...
@@ -1301,8 +1304,8 @@ class CagetteServices(models.Model):
cond
=
[[
'id'
,
'='
,
coop
[
0
][
'tmpl_reg_line_ids'
][
0
]]]
fields
=
[
'shift_template_id'
]
shift_templ_res
=
api
.
search_read
(
'shift.template.registration.line'
,
cond
,
fields
)
if
(
len
(
shift_templ_res
)
>
0
and
if
(
len
(
shift_templ_res
)
>
0
and
shift_templ_res
[
0
][
'shift_template_id'
][
0
]
==
committees_shift_id
):
evt_name
=
getattr
(
settings
,
'ENTRANCE_ADD_PT_EVENT_NAME'
,
'Validation service comité'
)
...
...
members/views.py
View file @
7b266f4d
...
...
@@ -47,7 +47,7 @@ def index(request):
return
HttpResponse
(
"Le créneau des comités n'est pas configuré dans Odoo !"
)
else
:
context
[
'committees_shift_id'
]
=
committees_shift_id
if
'no_picture_member_advice'
in
msettings
:
if
len
(
msettings
[
'no_picture_member_advice'
][
'value'
])
>
0
:
context
[
'no_picture_member_advice'
]
=
msettings
[
'no_picture_member_advice'
][
'value'
]
...
...
@@ -245,7 +245,7 @@ def search(request, needle, shift_id):
except
ValueError
:
key
=
needle
k_type
=
'name'
res
=
CagetteMember
.
search
(
k_type
,
key
,
shift_id
)
return
JsonResponse
({
'res'
:
res
})
...
...
@@ -274,7 +274,14 @@ def record_service_presence(request):
mid
=
int
(
request
.
POST
.
get
(
"mid"
,
0
))
# member id
sid
=
int
(
request
.
POST
.
get
(
"sid"
,
0
))
# shift id
stid
=
int
(
request
.
POST
.
get
(
"stid"
,
0
))
# shift_ticket_id
app_env
=
getattr
(
settings
,
'APP_ENV'
,
"prod"
)
if
(
rid
>
-
1
and
mid
>
0
):
overrided_date
=
""
if
app_env
!=
"prod"
:
import
re
o_date
=
re
.
search
(
r'/([^\/]+?)$'
,
request
.
META
.
get
(
'HTTP_REFERER'
))
if
o_date
:
overrided_date
=
o_date
.
group
(
1
)
# rid = 0 => C'est un rattrapage, sur le service
if
sid
>
0
and
stid
>
0
:
# Add member to service and take presence into account
...
...
@@ -282,7 +289,8 @@ def record_service_presence(request):
if
res
[
'rattrapage'
]
is
True
:
res
[
'update'
]
=
'ok'
else
:
if
(
CagetteServices
.
registration_done
(
rid
)
is
True
):
if
(
CagetteServices
.
registration_done
(
rid
,
overrided_date
)
is
True
):
res
[
'update'
]
=
'ok'
else
:
res
[
'update'
]
=
'ko'
...
...
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