-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{item.name}}
+ {{item.type}}
+
+
+
+
+
+
+
+
diff --git a/src/app/modules/data/types/date-series/date-series-list-item.html b/src/app/modules/data/types/date-series/date-series-list-item.html
index 2514889d..3c29b41a 100644
--- a/src/app/modules/data/types/date-series/date-series-list-item.html
+++ b/src/app/modules/data/types/date-series/date-series-list-item.html
@@ -5,7 +5,7 @@
{{ 'name' | thingTranslate: item }}
-
+
{{ item.repeatFrequency | amDuration }},
{{ item.dates[0] | dateFormat: 'weekday:long' }}
diff --git a/src/app/modules/data/types/place/place-list-item.html b/src/app/modules/data/types/place/place-list-item.html
index 7b9e7af1..2131cf74 100644
--- a/src/app/modules/data/types/place/place-list-item.html
+++ b/src/app/modules/data/types/place/place-list-item.html
@@ -2,9 +2,26 @@
-
{{ 'name' | thingTranslate: item }}
+
{{'name' | thingTranslate: item}}
+
+
+
+ {{item.openingHours | openingHours}}
+
+
+
+
+ {{'categories' | thingTranslate: item | join:', ' | titlecase }}
+
+
+
+
+ {{'type' | thingTranslate: item}}
+
+
+
- {{ 'description' | thingTranslate: item }}
+ {{'description' | thingTranslate: item}}
+
+ {{'name' | thingTranslate: item.inPlace}}
+
+
diff --git a/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts b/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts
index 8f2f1ed0..8200a291 100644
--- a/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts
+++ b/src/app/modules/data/types/place/special/mensa/place-mensa-detail.component.ts
@@ -39,7 +39,7 @@ export class PlaceMensaDetailComponent implements AfterViewInit {
/**
* number of days to display mensa menus for
*/
- @Input() displayRange = 5;
+ @Input() displayRange = 7;
/**
* TODO
diff --git a/src/app/translation/common-string-pipes.ts b/src/app/translation/common-string-pipes.ts
index 1787b362..3c736226 100644
--- a/src/app/translation/common-string-pipes.ts
+++ b/src/app/translation/common-string-pipes.ts
@@ -15,9 +15,15 @@
import {Injectable, OnDestroy, Pipe, PipeTransform} from '@angular/core';
import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
+import moment from 'moment';
import {Subscription} from 'rxjs';
import {logger} from '../_helpers/ts-logger';
+// tslint:disable-next-line: no-var-requires
+const openingHoursFn = require('opening_hours');
+
+// tslint:disable: completed-docs
+
@Injectable()
@Pipe({
name: 'join',
@@ -89,6 +95,78 @@ export class StringSplitPipe implements PipeTransform {
}
}
+@Injectable()
+@Pipe({
+ name: 'openingHours',
+ pure: false, // required to update the value when the promise is resolved
+})
+export class OpeningHoursPipe implements PipeTransform {
+ locale: string;
+ onLangChange?: Subscription;
+ value = '';
+
+ constructor(private readonly translate: TranslateService) {
+ this.locale = translate.currentLang;
+ }
+
+ private _dispose(): void {
+ if (this.onLangChange?.closed === false) {
+ this.onLangChange?.unsubscribe();
+ }
+ }
+
+
+ transform(aString: string | unknown): string {
+ this.updateValue(aString);
+ this._dispose();
+ if (this.onLangChange?.closed === true) {
+ this.onLangChange = this.translate.onLangChange.subscribe((event: LangChangeEvent) => {
+ this.locale = event.lang;
+ this.updateValue(aString);
+ });
+ }
+
+ return this.value;
+ }
+
+ updateValue(aString: string | unknown) {
+ if (typeof aString !== 'string'){
+ logger.warn(`openingHours pipe unable to parse input: ${aString}`);
+
+ return;
+ }
+ const openingHours = new openingHoursFn(aString);
+
+ if ((openingHours.getWarnings() as string[]).length > 0){
+ logger.warn((openingHours.getWarnings() as string[]).join('. '));
+
+ return;
+ }
+
+ const isOpen: boolean = openingHours.getState();
+ const nextChange: Date = openingHours.getNextChange();
+
+ let prefixKey = isOpen ?
+ 'common.openingHours.open_until' :
+ 'common.openingHours.closed_until';
+
+ let formattedCalender = moment(nextChange)
+ .calendar();
+
+ if (moment(nextChange)
+ .isBefore(moment()
+ .add(1, 'hours'))) {
+ prefixKey= isOpen ?
+ 'common.openingHours.closing_soon' :
+ 'common.openingHours.opening_soon';
+ formattedCalender = formattedCalender.substr(0,1)
+ .toUpperCase() + formattedCalender.substr(1);
+ }
+ this.value = `${this.translate.instant(prefixKey)} ${formattedCalender}`;
+ }
+}
+
+
@Injectable()
@Pipe({
name: 'numberLocalized',
diff --git a/src/app/translation/thing-translate.module.ts b/src/app/translation/thing-translate.module.ts
index 3434fe47..bb8b72b1 100644
--- a/src/app/translation/thing-translate.module.ts
+++ b/src/app/translation/thing-translate.module.ts
@@ -14,7 +14,7 @@
*/
import {ModuleWithProviders, NgModule, Provider} from '@angular/core';
-import {ArrayJoinPipe, DateLocalizedFormatPipe, NumberLocalizedPipe, SentenceCasePipe, StringSplitPipe} from './common-string-pipes';
+import {ArrayJoinPipe, DateLocalizedFormatPipe, NumberLocalizedPipe, SentenceCasePipe, StringSplitPipe, OpeningHoursPipe} from './common-string-pipes';
import {ThingTranslateDefaultParser, ThingTranslateParser} from './thing-translate.parser';
import {ThingPropertyNameTranslatePipe, ThingTranslatePipe} from './thing-translate.pipe';
import {ThingTranslateService} from './thing-translate.service';
@@ -31,6 +31,7 @@ export interface ThingTranslateModuleConfig {
ThingPropertyNameTranslatePipe,
ThingTranslatePipe,
DateLocalizedFormatPipe,
+ OpeningHoursPipe,
SentenceCasePipe,
],
exports: [
@@ -40,6 +41,7 @@ export interface ThingTranslateModuleConfig {
ThingPropertyNameTranslatePipe,
ThingTranslatePipe,
DateLocalizedFormatPipe,
+ OpeningHoursPipe,
SentenceCasePipe,
],
})
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index b2bcc5f5..96b5598e 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -9,6 +9,14 @@
"UNKNOWN": "Unbekannter Fehler"
}
},
+ "common": {
+ "openingHours": {
+ "closed_until": "Geschlossen bis",
+ "closing_soon": "Schließt bald!",
+ "open_until": "Geöffnet bis",
+ "opening_soon": "Öffnet"
+ }
+ },
"data": {
"REFRESH_ACTION": "Aktualisieren",
"REFRESHING": "Aktualisierung läuft...",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 320c2a06..6d7c86ba 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -9,6 +9,14 @@
"UNKNOWN": "Unknown problem"
}
},
+ "common": {
+ "openingHours": {
+ "closed_until": "Closed until",
+ "closing_soon": "Closing soon!",
+ "open_until": "Open until",
+ "opening_soon": "Opens"
+ }
+ },
"data": {
"REFRESH_ACTION": "Refresh",
"REFRESHING": "Refreshing...",