loviuz/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Last fixes to the OH picker

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-06-16 16:39:48 +02:00
parent 64ec06bfc8
commit 48f66bd17e
11 changed files with 327 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

6
UI/OpeningHours/OpeningHoursInput.ts
View file

@ -37,14 +37,14 @@ export default class OpeningHoursInput extends InputElement<string> {
if (OH.ParseRule(rule) !== null) {
continue;
}
if (PublicHolidayInput.LoadValue(rule) !== null) {
if (OH.ParsePHRule(rule) !== null) {
continue;
}
leftOvers.push(rule);
}
return leftOvers;
})
// NOte: MUST be bound AFTER the leftover rules!
// Note: MUST be bound AFTER the leftover rules!
const rulesFromOhPicker = value.map(OH.Parse);
const ph = value.map<string>(str => {
@ -53,7 +53,7 @@ export default class OpeningHoursInput extends InputElement<string> {
}
const rules = str.split(";");
for (const rule of rules) {
if (PublicHolidayInput.LoadValue(rule) !== null) {
if (OH.ParsePHRule(rule) !== null) {
return rule;
}
}