From 0a7f905c21a4e03e5bdba1f4754b16618515a472 Mon Sep 17 00:00:00 2001 From: Sean Engelhardt Date: Fri, 1 Feb 2019 18:11:10 +0100 Subject: [PATCH] Add current list of speakers to agenda-list Adds a current-list-of-speakers button to the agenda list view The user may select a projector which will return an agenda item which will be used to determine the CLOS --- .../app/site/agenda/agenda-routing.module.ts | 1 + .../agenda-list/agenda-list.component.html | 7 +- .../speaker-list/speaker-list.component.html | 21 +++- .../speaker-list/speaker-list.component.ts | 112 +++++++++++++++--- 4 files changed, 121 insertions(+), 20 deletions(-) diff --git a/client/src/app/site/agenda/agenda-routing.module.ts b/client/src/app/site/agenda/agenda-routing.module.ts index 8ac7a8b4f..848d57dce 100644 --- a/client/src/app/site/agenda/agenda-routing.module.ts +++ b/client/src/app/site/agenda/agenda-routing.module.ts @@ -12,6 +12,7 @@ const routes: Routes = [ { path: 'import', component: AgendaImportListComponent }, { path: 'topics/new', component: TopicDetailComponent }, { path: 'sort-agenda', component: AgendaSortComponent }, + { path: 'speakers', component: SpeakerListComponent }, { path: 'topics/:id', component: TopicDetailComponent }, { path: ':id/speakers', component: SpeakerListComponent } ]; diff --git a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html index 7b02282b2..88db7addc 100644 --- a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html +++ b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html @@ -110,7 +110,12 @@ Sort - + + + + + +

+ Manage the list of speakers for... +

+ + + + {{ projector.name }} + + + + +

{{ viewItem.getTitle() }}

- + diff --git a/client/src/app/site/agenda/components/speaker-list/speaker-list.component.ts b/client/src/app/site/agenda/components/speaker-list/speaker-list.component.ts index 1b9406888..8b34d8fd5 100644 --- a/client/src/app/site/agenda/components/speaker-list/speaker-list.component.ts +++ b/client/src/app/site/agenda/components/speaker-list/speaker-list.component.ts @@ -1,20 +1,24 @@ -import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { BehaviorSubject, Subscription } from 'rxjs'; +import { Component, OnInit } from '@angular/core'; import { FormGroup, FormControl } from '@angular/forms'; -import { BehaviorSubject } from 'rxjs'; +import { MatSnackBar, MatSelectChange } from '@angular/material'; -import { SpeakerState } from 'app/shared/models/agenda/speaker'; -import { User } from 'app/shared/models/users/user'; -import { ViewSpeaker } from '../../models/view-speaker'; -import { DataStoreService } from 'app/core/core-services/data-store.service'; -import { AgendaRepositoryService } from 'app/core/repositories/agenda/agenda-repository.service'; -import { ViewItem } from '../../models/view-item'; -import { OperatorService } from 'app/core/core-services/operator.service'; -import { BaseViewComponent } from 'app/site/base/base-view'; -import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { MatSnackBar } from '@angular/material'; + +import { AgendaRepositoryService } from 'app/core/repositories/agenda/agenda-repository.service'; +import { BaseViewComponent } from 'app/site/base/base-view'; +import { CurrentListOfSpeakersSlideService } from 'app/site/projector/services/current-list-of-of-speakers-slide.service'; +import { DataStoreService } from 'app/core/core-services/data-store.service'; +import { OperatorService } from 'app/core/core-services/operator.service'; +import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service'; import { PromptService } from 'app/core/ui-services/prompt.service'; +import { SpeakerState } from 'app/shared/models/agenda/speaker'; +import { Title } from '@angular/platform-browser'; +import { User } from 'app/shared/models/users/user'; +import { ViewItem } from '../../models/view-item'; +import { ViewSpeaker } from '../../models/view-speaker'; +import { ViewProjector } from 'app/site/projector/models/view-projector'; /** * The list of speakers for agenda items. @@ -25,6 +29,11 @@ import { PromptService } from 'app/core/ui-services/prompt.service'; styleUrls: ['./speaker-list.component.scss'] }) export class SpeakerListComponent extends BaseViewComponent implements OnInit { + /** + * Determine if the user is viewing the current list if speakers + */ + public currentListOfSpeakers = false; + /** * Holds the view item to the given topic */ @@ -35,6 +44,16 @@ export class SpeakerListComponent extends BaseViewComponent implements OnInit { */ public speakers: ViewSpeaker[]; + /** + * Holds a list of projectors. Only in CurrentListOfSpeakers mode + */ + public projectors: ViewProjector[]; + + /** + * Holds the subscription to the current projector (if any) + */ + private projectorSubscription: Subscription; + /** * Holds the active speaker */ @@ -76,6 +95,7 @@ export class SpeakerListComponent extends BaseViewComponent implements OnInit { * @param title * @param translate * @param snackBar + * @param projectorRepo * @param route Angulars ActivatedRoute * @param DS the DataStore * @param itemRepo Repository fpr agenda items @@ -85,15 +105,27 @@ export class SpeakerListComponent extends BaseViewComponent implements OnInit { title: Title, translate: TranslateService, snackBar: MatSnackBar, + projectorRepo: ProjectorRepositoryService, private route: ActivatedRoute, private DS: DataStoreService, private itemRepo: AgendaRepositoryService, private op: OperatorService, - private promptService: PromptService + private promptService: PromptService, + private currentListOfSpeakersService: CurrentListOfSpeakersSlideService ) { super(title, translate, snackBar); + this.isCurrentListOfSpeakers(); this.addSpeakerForm = new FormGroup({ user_id: new FormControl([]) }); - this.getAgendaItemByUrl(); + + if (this.currentListOfSpeakers) { + this.projectors = projectorRepo.getViewModelList(); + this.showClosOfProjector(this.projectors[0]); + projectorRepo.getViewModelListObservable().subscribe(newProjectors => { + this.projectors = newProjectors; + }); + } else { + this.getItemByUrl(); + } } /** @@ -120,19 +152,64 @@ export class SpeakerListComponent extends BaseViewComponent implements OnInit { }); } + /** + * Check the URL to determine a current list of Speakers + */ + private isCurrentListOfSpeakers(): void { + if (this.route.snapshot.url[0]) { + this.currentListOfSpeakers = this.route.snapshot.url[0].path === 'speakers'; + } + } + + /** + * Executed by selecting projectors + * + * @param event Holds the selected projector + */ + public onSelectProjector(event: MatSelectChange): void { + this.showClosOfProjector(event.value); + } + + /** + * Shows the current lost of speakers of a given projector. + * Triggers after mat-select-change + * + * @param event Mat select change event, holds the projector in value + */ + private showClosOfProjector(projector: ViewProjector): void { + if (this.projectorSubscription) { + this.projectorSubscription.unsubscribe(); + this.viewItem = null; + } + + this.projectorSubscription = this.currentListOfSpeakersService + .getAgendaItemIdObservable(projector) + .subscribe(agendaId => { + if (agendaId) { + this.setSpeakerList(agendaId); + } + }); + } + /** * Extract the ID from the url * Determine whether the speaker list belongs to a motion or a topic */ - public getAgendaItemByUrl(): void { + private getItemByUrl(): void { const id = +this.route.snapshot.url[0]; + this.setSpeakerList(id); + } + /** + * Sets the current item as list of speakers + * + * @param item the item to use as List of Speakers + */ + private setSpeakerList(id: number): void { this.itemRepo.getViewModelObservable(id).subscribe(newAgendaItem => { if (newAgendaItem) { this.viewItem = newAgendaItem; - const allSpeakers = this.itemRepo.createViewSpeakers(newAgendaItem.item); - this.speakers = allSpeakers.filter(speaker => speaker.state === SpeakerState.WAITING); this.finishedSpeakers = allSpeakers.filter(speaker => speaker.state === SpeakerState.FINISHED); this.activeSpeaker = allSpeakers.find(speaker => speaker.state === SpeakerState.CURRENT); @@ -142,6 +219,7 @@ export class SpeakerListComponent extends BaseViewComponent implements OnInit { /** * Create a speaker out of an id + * * @param userId the user id to add to the list. No parameter adds the operators user as speaker. */ public addNewSpeaker(userId?: number): void {