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
Iterations
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
KIF
AKPlanning
Commits
ea89a77d
Commit
ea89a77d
authored
3 years ago
by
Benjamin Hättasch
Browse files
Options
Downloads
Patches
Plain Diff
Show unscheduled slots in scheduler grouped by tracks
parent
6bb63bdb
No related branches found
Branches containing commit
No related tags found
1 merge request
!102
Show unscheduled slots in scheduler grouped by tracks
Pipeline
#22545
passed
3 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
AKScheduling/templates/admin/AKScheduling/scheduling.html
+11
-5
11 additions, 5 deletions
AKScheduling/templates/admin/AKScheduling/scheduling.html
AKScheduling/views.py
+1
-1
1 addition, 1 deletion
AKScheduling/views.py
with
12 additions
and
6 deletions
AKScheduling/templates/admin/AKScheduling/scheduling.html
+
11
−
5
View file @
ea89a77d
...
@@ -184,11 +184,17 @@
...
@@ -184,11 +184,17 @@
<div
id=
"planCalendar"
></div>
<div
id=
"planCalendar"
></div>
</div>
</div>
<div
class=
"col-md-2 col-lg-2"
id=
"unscheduled-slots"
>
<div
class=
"col-md-2 col-lg-2"
id=
"unscheduled-slots"
>
{% for slot in slots_unscheduled %}
{% regroup slots_unscheduled by ak.track as slots_unscheduled_by_track_list %}
<div
class=
"unscheduled-slot badge badge-primary"
style=
'background-color: {{ slot.ak.category.color }}'
{% for track_slots in slots_unscheduled_by_track_list %}
data-event=
'{ "title": "{{ slot.ak.short_name }}", "duration": {"hours": "{{ slot.duration|unlocalize }}"}, "constraint": "roomAvailable", "description": "{{ slot.ak.details | escapejs }}", "slotID": "{{ slot.pk }}", "backgroundColor": "{{ slot.ak.category.color }}"}'
data-details=
"{{ slot.ak.details }}"
>
{{ slot.ak.short_name }}
{% if track_slots.grouper %}
({{ slot.duration }} h)
<br>
{{ slot.ak.owners_list }}
<h5
class=
"mt-2"
>
{{ track_slots.grouper }}
</h5>
</div>
{% endif %}
{% for slot in track_slots.list %}
<div
class=
"unscheduled-slot badge badge-primary"
style=
'background-color: {{ slot.ak.category.color }}'
data-event=
'{ "title": "{{ slot.ak.short_name }}", "duration": {"hours": "{{ slot.duration|unlocalize }}"}, "constraint": "roomAvailable", "description": "{{ slot.ak.details | escapejs }}", "slotID": "{{ slot.pk }}", "backgroundColor": "{{ slot.ak.category.color }}"}'
data-details=
"{{ slot.ak.details }}"
>
{{ slot.ak.short_name }}
({{ slot.duration }} h)
<br>
{{ slot.ak.owners_list }}
</div>
{% endfor %}
{% endfor %}
{% endfor %}
</div>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
AKScheduling/views.py
+
1
−
1
View file @
ea89a77d
...
@@ -25,7 +25,7 @@ class SchedulingAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView):
...
@@ -25,7 +25,7 @@ class SchedulingAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView):
context_object_name
=
"
slots_unscheduled
"
context_object_name
=
"
slots_unscheduled
"
def
get_queryset
(
self
):
def
get_queryset
(
self
):
return
super
().
get_queryset
().
filter
(
start__isnull
=
True
)
return
super
().
get_queryset
().
filter
(
start__isnull
=
True
)
.
order_by
(
'
ak__track
'
)
def
get_context_data
(
self
,
*
,
object_list
=
None
,
**
kwargs
):
def
get_context_data
(
self
,
*
,
object_list
=
None
,
**
kwargs
):
context
=
super
().
get_context_data
(
object_list
=
object_list
,
**
kwargs
)
context
=
super
().
get_context_data
(
object_list
=
object_list
,
**
kwargs
)
...
...
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