Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AKPlanning
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Dominik Weitz
AKPlanning
Commits
594cc292
Commit
594cc292
authored
4 years ago
by
Nils Steinger
Browse files
Options
Downloads
Patches
Plain Diff
Show AK start and end, not just start
parent
505a6050
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
AKModel/models.py
+9
-0
9 additions, 0 deletions
AKModel/models.py
AKSubmission/templates/AKSubmission/ak_detail.html
+1
-1
1 addition, 1 deletion
AKSubmission/templates/AKSubmission/ak_detail.html
with
10 additions
and
1 deletion
AKModel/models.py
+
9
−
0
View file @
594cc292
...
...
@@ -345,6 +345,15 @@ class AKSlot(models.Model):
return
_
(
"
Not scheduled yet
"
)
return
self
.
start
.
astimezone
(
self
.
event
.
timezone
).
strftime
(
'
%a %H:%M
'
)
@property
def
time_simplified
(
self
):
"""
Display start and end time of slot in format weekday + time, e.g.
"
Fri 14:00 - 15:30
"
"""
if
self
.
start
is
None
:
return
_
(
"
Not scheduled yet
"
)
return
self
.
start
.
astimezone
(
self
.
event
.
timezone
).
strftime
(
'
%a %H:%M
'
)
+
'
-
'
+
self
.
end
.
astimezone
(
self
.
event
.
timezone
).
strftime
(
'
%H:%M
'
)
@property
def
end
(
self
):
"""
...
...
This diff is collapsed.
Click to expand it.
AKSubmission/templates/AKSubmission/ak_detail.html
+
1
−
1
View file @
594cc292
...
...
@@ -187,7 +187,7 @@
<tr>
<td>
{{ slot.duration }}
</td>
{% if not ak.event.plan_hidden or user.is_staff %}
<td>
{{ slot.
start
_simplified }}
</td>
<td>
{{ slot.
time
_simplified }}
</td>
<td>
{% if "AKPlan"|check_app_installed and slot.room %}
<a
href=
"{% url 'plan:plan_room' event_slug=ak.event.slug pk=slot.room.pk %}"
>
{{ slot.room }}
</a>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment