From bedb55e25f2722fc6b049dc0ea09d6a96c24a6b6 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 13 Jul 2020 15:09:29 +0200 Subject: [PATCH] Update to preview --- Customizations/Layers/Bookcases.ts | 13 ++++++++----- index.html | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Customizations/Layers/Bookcases.ts b/Customizations/Layers/Bookcases.ts index 43a6872bb2..acc9d65ba9 100644 --- a/Customizations/Layers/Bookcases.ts +++ b/Customizations/Layers/Bookcases.ts @@ -1,6 +1,6 @@ import {LayerDefinition} from "../LayerDefinition"; import L from "leaflet"; -import {And, Regex, Tag} from "../../Logic/TagsFilter"; +import {And, Or, Regex, Tag} from "../../Logic/TagsFilter"; import {QuestionDefinition} from "../../Logic/Question"; import {TagRenderingOptions} from "../TagRendering"; import {NameInline} from "../Questions/NameInline"; @@ -109,16 +109,19 @@ export class Bookcases extends LayerDefinition { k: new And([new Tag("brand", ""), new Tag("nobrand", "yes")]), txt: "Maakt geen deel uit van een groter netwerk" }] - }).OnlyShowIf(new Tag("ref", "")), + }).OnlyShowIf(new Or([ + new Tag("ref", ""), + new And([new Tag("ref","*"), new Tag("brand","")]) + ])), new TagRenderingOptions({ - question: "Wat is het LFL-referentienummer van dit boekenruilkastje?", + question: "Wat is het referentienummer van dit boekenruilkastje?", freeform: { key: "ref", - template: "Het refernetienummer is $$$", + template: "Het referentienummer is $$$", renderTemplate: "Gekend als {brand} {ref}" } - }), + }).OnlyShowIf(new Tag("brand","*")), new TagRenderingOptions({ question: "Wanneer werd dit boekenruilkastje geinstalleerd?", diff --git a/index.html b/index.html index 42d433ee4c..e340617d11 100644 --- a/index.html +++ b/index.html @@ -9,10 +9,10 @@ integrity="sha512-xwE/Az9zrjBIphAcBb3F6JVqxf46+CDLwfLMHloNu6KEQCAWi6HcDUbeOfBIptF7tcCzusKFjFw2yuvEpDL9wQ==" crossorigin=""/> - + - +