Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
141
Merge Requests
141
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
34bc99d0
Commit
34bc99d0
authored
Apr 10, 2014
by
Sebastien Robin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_calendar: make sure to take into account start and stop date of assignment
parent
5e43bd5b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
bt5/erp5_calendar/DocumentTemplateItem/portal_components/document.erp5.GroupCalendarAssignment.py
...ortal_components/document.erp5.GroupCalendarAssignment.py
+9
-4
bt5/erp5_calendar/bt/revision
bt5/erp5_calendar/bt/revision
+1
-1
No files found.
bt5/erp5_calendar/DocumentTemplateItem/portal_components/document.erp5.GroupCalendarAssignment.py
View file @
34bc99d0
...
@@ -40,11 +40,16 @@ class GroupCalendarAssignment(PresencePeriod):
...
@@ -40,11 +40,16 @@ class GroupCalendarAssignment(PresencePeriod):
def
_getDatePeriodDataList
(
self
):
def
_getDatePeriodDataList
(
self
):
result
=
[]
result
=
[]
start_date
=
self
.
getStartDate
()
stop_date
=
self
.
getStopDate
()
group_calendar
=
self
.
getSpecialiseValue
()
group_calendar
=
self
.
getSpecialiseValue
()
if
not
(
None
in
(
self
.
getDestinationUid
(),
group_calendar
)):
if
not
(
None
in
(
self
.
getDestinationUid
(),
group_calendar
,
start_date
,
stop_date
)):
presence_period_list
=
group_calendar
.
objectValues
(
presence_period_list
=
group_calendar
.
objectValues
(
portal_type
=
"Group Presence Period"
)
portal_type
=
"Group Presence Period"
)
for
presence_period
in
presence_period_list
:
for
presence_period
in
presence_period_list
:
result
.
extend
(
presence_period
.
_getDatePeriodDataList
())
for
date_period_data
in
presence_period
.
_getDatePeriodDataList
():
if
date_period_data
[
'start_date'
].
greaterThanEqualTo
(
start_date
)
and
\
date_period_data
[
'stop_date'
].
lessThanEqualTo
(
stop_date
):
result
.
append
(
date_period_data
)
return
result
return
result
\ No newline at end of file
bt5/erp5_calendar/bt/revision
View file @
34bc99d0
385
386
\ No newline at end of file
\ No newline at end of file
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