Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scheduling-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SMASCH
scheduling-system
Merge requests
!77
information about location in daily planning
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
information about location in daily planning
154-daily-planning
into
master
Overview
0
Commits
1
Pipelines
1
Changes
2
Merged
Piotr Gawron
requested to merge
154-daily-planning
into
master
7 years ago
Overview
0
Commits
1
Pipelines
1
Changes
2
Expand
Closes
#154 (closed)
0
0
Merge request reports
Viewing commit
e8583bf7
Show latest version
2 files
+
9
−
3
Side-by-side
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
e8583bf7
information about location in daily planning
· e8583bf7
Piotr Gawron
authored
7 years ago
smash/web/api_views/daily_planning.py
+
4
−
1
Options
@@ -191,7 +191,10 @@ def events(request, date):
@@ -191,7 +191,10 @@ def events(request, date):
'
name
'
:
unicode
(
appointment_subject
),
'
name
'
:
unicode
(
appointment_subject
),
'
id
'
:
appointment_subject
.
id
,
'
id
'
:
appointment_subject
.
id
,
'
color
'
:
RANDOM_COLORS
[
i
],
'
color
'
:
RANDOM_COLORS
[
i
],
'
start
'
:
appointment
.
datetime_when
.
replace
(
tzinfo
=
None
).
strftime
(
"
%H:%M:00
"
),
'
start
'
:
appointment
.
datetime_when
.
replace
(
tzinfo
=
None
).
strftime
(
"
%H:%M:00
"
),
# this indicates only location of the first appointment
# (there is small chance to have two appointments in two different places at the same day)
'
location
'
:
str
(
appointment
.
location
),
'
events
'
:
[]
'
events
'
:
[]
}
}
subjects
[
appointment_subject
.
id
]
=
subject
subjects
[
appointment_subject
.
id
]
=
subject
Loading