diff --git a/UI/Input/OpeningHours/OpeningHoursInput.ts b/UI/Input/OpeningHours/OpeningHoursInput.ts index 254331e..dd83dc3 100644 --- a/UI/Input/OpeningHours/OpeningHoursInput.ts +++ b/UI/Input/OpeningHours/OpeningHoursInput.ts @@ -27,9 +27,9 @@ export default class OpeningHoursInput extends InputElement { constructor(value: UIEventSource = new UIEventSource("")) { super(); - const rulesFromOhPicker = value.map(OH.Parse); - + const leftoverRules = value.map(str => { + console.log("Leftovers?",str) if (str === undefined) { return [] } @@ -46,8 +46,11 @@ export default class OpeningHoursInput extends InputElement { } return leftOvers; }) + // NOte: MUST be bound AFTER the leftover rules! + const rulesFromOhPicker = value.map(OH.Parse); const ph = value.map(str => { + console.log("PH RULE?", ph) if (str === undefined) { return "" } @@ -62,6 +65,7 @@ export default class OpeningHoursInput extends InputElement { this._phSelector = new PublicHolidayInput(ph); function update() { + console.log("UPdating") let rules = OH.ToString(rulesFromOhPicker.data); if (leftoverRules.data.length != 0) { rules += ";" + leftoverRules.data.join(";") @@ -83,7 +87,7 @@ export default class OpeningHoursInput extends InputElement { } return new Combine([ Translations.t.general.opening_hours.not_all_rules_parsed, - new FixedUiElement(leftovers.map(r => `${r}
`).join("") ).SetClass("subtle") + new FixedUiElement(leftovers.map(r => `${r}
`).join("")).SetClass("subtle") ]).Render(); })) diff --git a/UI/OhVisualization.ts b/UI/OhVisualization.ts index d5ce35f..cf1df28 100644 --- a/UI/OhVisualization.ts +++ b/UI/OhVisualization.ts @@ -160,7 +160,6 @@ export default class OpeningHoursVisualization extends UIElement { // ranges[0] are all ranges for monday const ranges = OpeningHoursVisualization.GetRanges(oh, lastMonday, nextSunday); - console.log(ranges) if (ranges.map(r => r.length).reduce((a, b) => a + b, 0) == 0) { // Closed! const opensAtDate = oh.getNextChange(); diff --git a/UI/i18n/Translations.ts b/UI/i18n/Translations.ts index fed6ab3..db386ae 100644 --- a/UI/i18n/Translations.ts +++ b/UI/i18n/Translations.ts @@ -907,8 +907,8 @@ export default class Translations { "nl": "Gesloten" }), ph_not_known: new T({ - "en": "unknown", - "nl": "niet gekend" + "en": " ", + "nl": " " }), ph_closed: new T({ "en": "closed", diff --git a/assets/layers/cycling_themed_object/cycling_themed_objects.json b/assets/layers/cycling_themed_object/cycling_themed_objects.json index 5acca30..e53ae02 100644 --- a/assets/layers/cycling_themed_object/cycling_themed_objects.json +++ b/assets/layers/cycling_themed_object/cycling_themed_objects.json @@ -47,6 +47,12 @@ "freeform": { "key": "email" } + }, + { + "render": "{opening_hours_table(opening_hours)}", + "freeform": { + "key": "opening_hours" + } } ], "hideUnderlayingFeaturesMinPercentage": 0, diff --git a/test.ts b/test.ts index 761a7a4..5cfbd67 100644 --- a/test.ts +++ b/test.ts @@ -1,15 +1,15 @@ //* -import OpeningHoursVisualization from "./UI/OhVisualization"; -import {UIEventSource} from "./Logic/UIEventSource"; -new OpeningHoursVisualization( new UIEventSource({ - opening_hours: "2000 Dec 21 10:00-12:00;", - _country: "be", - _lat: "51.2", - _lon: "3.2" - } -), 'opening_hours').AttachTo("maindiv") +import {UIEventSource} from "./Logic/UIEventSource"; +import OpeningHoursInput from "./UI/Input/OpeningHours/OpeningHoursInput"; + +const oh = "Sep 1-Feb 28 Mo-Th 08:00-12:00, 13:30-17:30; Mar 1-Aug 31 Mo-Fr 07:00-12:00, 13:30-17:30; PH off" + +const source = new UIEventSource("") +new OpeningHoursInput(source).AttachTo('maindiv') +console.log("SEtting ",oh) +source.setData(oh) /*/