From 3f77cc7b24d83b5ac8bb3e615d4578f3f547470a Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Fri, 1 Mar 2019 08:41:44 +0100 Subject: [PATCH] Add item number to topic title, hide clos slide for one projector --- .../list-of-speakers/list-of-speakers.component.html | 2 +- .../topic-detail/topic-detail.component.html | 2 +- client/src/app/site/agenda/models/view-topic.ts | 6 +++++- .../projector-detail/projector-detail.component.html | 12 ++++++------ .../projector-detail/projector-detail.component.ts | 3 +++ .../src/app/slides/topics/topic/topic-slide-data.ts | 1 + .../slides/topics/topic/topic-slide.component.html | 7 ++++++- openslides/topics/projector.py | 12 +++++++++++- 8 files changed, 34 insertions(+), 11 deletions(-) diff --git a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html index 925d2eaa2..e75339092 100644 --- a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html +++ b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.html @@ -25,7 +25,7 @@ -

{{ viewItem.getTitle() }}

+

{{ viewItem.contentObject.getTitle() }}

diff --git a/client/src/app/site/agenda/components/topic-detail/topic-detail.component.html b/client/src/app/site/agenda/components/topic-detail/topic-detail.component.html index 3cc017cc9..bf34b2956 100644 --- a/client/src/app/site/agenda/components/topic-detail/topic-detail.component.html +++ b/client/src/app/site/agenda/components/topic-detail/topic-detail.component.html @@ -26,7 +26,7 @@
-

{{ topic.title }}

+

{{ topic.getTitle() }}

diff --git a/client/src/app/site/agenda/models/view-topic.ts b/client/src/app/site/agenda/models/view-topic.ts index bf363ffde..cd220ace7 100644 --- a/client/src/app/site/agenda/models/view-topic.ts +++ b/client/src/app/site/agenda/models/view-topic.ts @@ -64,7 +64,11 @@ export class ViewTopic extends BaseAgendaViewModel { } public getTitle = () => { - return this.title; + if (this.agendaItem) { + return this.agendaItem.itemNumber + ' ยท ' + this.title; + } else { + return this.title; + } }; public getAgendaItem(): ViewItem { diff --git a/client/src/app/site/projector/components/projector-detail/projector-detail.component.html b/client/src/app/site/projector/components/projector-detail/projector-detail.component.html index caded1525..a8ef04d89 100644 --- a/client/src/app/site/projector/components/projector-detail/projector-detail.component.html +++ b/client/src/app/site/projector/components/projector-detail/projector-detail.component.html @@ -117,12 +117,12 @@
- {{ i + 1 }}. {{ getSlideTitle(element) }} + {{ getSlideTitle(element) }}
@@ -144,7 +144,7 @@ History

- {{ i + 1 }}. {{ getSlideTitle(elements[0]) }} + {{ i + 1 }}.   {{ getSlideTitle(elements[0]) }}

@@ -191,7 +191,7 @@ - + Current list of speakers @@ -207,8 +207,8 @@ - - + +