From e05874cf6fd239511f0e57cb10203d197176aa5b Mon Sep 17 00:00:00 2001 From: Maximilian Krambach Date: Wed, 6 Mar 2019 16:54:00 +0100 Subject: [PATCH] clarifying duration service usage --- client/src/app/core/ui-services/duration.service.ts | 9 +++++---- .../agenda-import-list/agenda-import-list.component.ts | 2 +- .../components/agenda-list/agenda-list.component.html | 2 +- .../components/agenda-list/agenda-list.component.ts | 2 +- .../item-info-dialog/item-info-dialog.component.ts | 2 +- .../list-of-speakers/list-of-speakers.component.ts | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/client/src/app/core/ui-services/duration.service.ts b/client/src/app/core/ui-services/duration.service.ts index 286f7e029..a6ef5b2f6 100644 --- a/client/src/app/core/ui-services/duration.service.ts +++ b/client/src/app/core/ui-services/duration.service.ts @@ -22,10 +22,10 @@ import { Injectable } from '@angular/core'; * @example * ```ts * // will result in 01:10 h - * const a = this.durationService.durationToString(70); + * const a = this.durationService.durationToString(70, 'h'); * * // will result in 00:30 m (30 is interpreted as seconds) - * const a = this.durationService.durationToString(30); + * const a = this.durationService.durationToString(30, 'm'); * ``` */ @Injectable({ @@ -65,10 +65,11 @@ export class DurationService { /** * Converts a duration number (given in minutes or seconds) * - * @param duration value in minutes + * @param duration value in minutes or seconds (60 units being the next bigger unit) + * @param suffix any suffix to add. * @returns a more human readable time representation */ - public durationToString(duration: number, suffix: 'h' | 'm' = 'h'): string { + public durationToString(duration: number, suffix: 'h' | 'm'): string { const major = Math.floor(duration / 60); const minor = `0${duration % 60}`.slice(-2); if (!isNaN(+major) && !isNaN(+minor)) { diff --git a/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.ts b/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.ts index 23c218677..a3d8a53ad 100644 --- a/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.ts +++ b/client/src/app/site/agenda/components/agenda-import-list/agenda-import-list.component.ts @@ -98,7 +98,7 @@ export class AgendaImportListComponent extends BaseImportListComponent= 0) { - return this.durationService.durationToString(duration); + return this.durationService.durationToString(duration, 'h'); } else { return ''; } 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 48b2b0a0e..8f195fe9f 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 @@ -60,7 +60,7 @@
access_time - {{ durationService.durationToString(item.duration) }} + {{ durationService.durationToString(item.duration, 'h') }}
comment diff --git a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts index af942d232..c9d57bfb5 100644 --- a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts +++ b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts @@ -296,7 +296,7 @@ export class AgendaListComponent extends ListViewBaseComponent i if (!duration) { return ''; } - const durationString = this.durationService.durationToString(duration); + const durationString = this.durationService.durationToString(duration, 'h'); const endTime = this.repo.calculateEndTime(); const result = `${this.translate.instant('Duration')}: ${durationString}`; if (endTime) { diff --git a/client/src/app/site/agenda/components/item-info-dialog/item-info-dialog.component.ts b/client/src/app/site/agenda/components/item-info-dialog/item-info-dialog.component.ts index 48091e7f1..e30a70a06 100644 --- a/client/src/app/site/agenda/components/item-info-dialog/item-info-dialog.component.ts +++ b/client/src/app/site/agenda/components/item-info-dialog/item-info-dialog.component.ts @@ -49,7 +49,7 @@ export class ItemInfoDialogComponent { // load current values this.agendaInfoForm.get('type').setValue(item.type); - this.agendaInfoForm.get('durationText').setValue(this.durationService.durationToString(item.duration)); + this.agendaInfoForm.get('durationText').setValue(this.durationService.durationToString(item.duration, 'h')); this.agendaInfoForm.get('item_number').setValue(item.itemNumber); this.agendaInfoForm.get('comment').setValue(item.comment); } diff --git a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.ts b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.ts index f4857d044..2469838d2 100644 --- a/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.ts +++ b/client/src/app/site/agenda/components/list-of-speakers/list-of-speakers.component.ts @@ -382,6 +382,6 @@ export class ListOfSpeakersComponent extends BaseViewComponent implements OnInit const duration = Math.floor( (new Date(speaker.end_time).valueOf() - new Date(speaker.begin_time).valueOf()) / 1000 ); - return `${this.durationService.durationToString(duration, 'm')} ${this.translate.instant('minutes')}`; + return `${this.durationService.durationToString(duration, 'm')}`; } }