Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
saclaze-api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Perret Silvestre
saclaze-api
Commits
230e2ec1
Commit
230e2ec1
authored
Jan 13, 2018
by
Silvestre Perret
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add is_open function
parent
b0d9763d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
models.py
saclaze_api/saclaze_back/models.py
+8
-0
serializers.py
saclaze_api/saclaze_back/serializers.py
+8
-4
No files found.
saclaze_api/saclaze_back/models.py
View file @
230e2ec1
...
...
@@ -98,6 +98,14 @@ class Location(models.Model):
dt
=
timezone
.
now
()
return
self
.
schedules
.
filter
(
day_of_the_week
=
dt
.
weekday
())
def
is_open
(
self
):
dt
=
timezone
.
now
()
schedule
=
self
.
schedules
.
filter
(
day_of_the_week
=
dt
.
weekday
())
if
not
schedule
:
return
False
schedule
=
schedule
[
0
]
return
schedule
.
opening_time
<=
dt
.
time
()
<=
schedule
.
closing_time
def
get_incident
(
self
):
qs
=
self
.
incident_set
.
filter
(
status
=
True
)
.
order_by
(
'-id'
)
return
qs
[
0
]
if
bool
(
qs
)
else
None
...
...
saclaze_api/saclaze_back/serializers.py
View file @
230e2ec1
...
...
@@ -50,6 +50,7 @@ class ListLocationSerializer(serializers.ModelSerializer):
estimated_waiting_time
=
serializers
.
DurationField
(
source
=
'get_waiting_time_now'
,
read_only
=
True
)
waiting_time_level
=
serializers
.
IntegerField
(
source
=
'get_wt_now_level'
,
read_only
=
True
)
incident
=
IncidentSerializer
(
source
=
'get_incident'
,
read_only
=
True
,
allow_null
=
True
)
is_open
=
serializers
.
BooleanField
(
read_only
=
True
)
class
Meta
:
model
=
Location
...
...
@@ -59,8 +60,9 @@ class ListLocationSerializer(serializers.ModelSerializer):
'category_id'
,
'category'
,
'latitude'
,
'longitude'
,
'estimated_waiting_time'
,
'waiting_time_level'
,
'incident'
'estimated_waiting_time'
,
'waiting_time_level'
,
'incident'
,
'is_open'
)
...
...
@@ -68,6 +70,7 @@ class LocationSerializer(serializers.ModelSerializer):
category_id
=
serializers
.
PrimaryKeyRelatedField
(
read_only
=
True
)
category
=
serializers
.
StringRelatedField
(
read_only
=
True
)
schedule
=
ScheduleSerializer
(
source
=
'get_schedule'
,
many
=
True
,
read_only
=
True
,
allow_null
=
True
)
is_open
=
serializers
.
BooleanField
(
read_only
=
True
)
estimated_waiting_time
=
serializers
.
DurationField
(
source
=
'get_waiting_time_now'
,
read_only
=
True
)
waiting_time_level
=
serializers
.
IntegerField
(
source
=
'get_wt_now_level'
,
read_only
=
True
)
incident
=
IncidentSerializer
(
source
=
'get_incident'
,
read_only
=
True
,
allow_null
=
True
)
...
...
@@ -81,7 +84,8 @@ class LocationSerializer(serializers.ModelSerializer):
'category'
,
'description'
,
'latitude'
,
'longitude'
,
'estimated_waiting_time'
,
'waiting_time_level'
,
'estimated_waiting_time'
,
'waiting_time_level'
,
'incident'
,
'schedule'
'schedule'
,
'is_open'
)
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