Mercurial > gemma

changeset 5273:9a903cdebd97 multi-geoms

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged default into multi-geoms.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Wed, 10 Jun 2020 20:41:41 +0200
parents c84784486265 (current diff) aca4bf7af270 (diff)
children 3bab0e19f08b
files
diffstat 1 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/importoverview/FairwayDimensionDetail.vue	Tue Jun 09 12:02:45 2020 +0200
+++ b/client/src/components/importoverview/FairwayDimensionDetail.vue	Wed Jun 10 20:41:41 2020 +0200
@@ -26,7 +26,13 @@
  * Author(s):
  * Thomas Junk <thomas.junk@intevation.de>
  */
-import { or as orFilter, equalTo as equalToFilter } from "ol/format/filter";
+import {
+  or as orFilter,
+  and as andFilter,
+  greaterThanOrEqualTo,
+  lessThanOrEqualTo,
+  equalTo as equalToFilter
+} from "ol/format/filter";
 //import { displayError } from "@/lib/errors";
 import { mapGetters } from "vuex";
 import VectorSource from "ol/source/Vector";
@@ -87,7 +93,11 @@
         {
           geometryName: "area",
           featureTypes: ["fairway_dimensions"],
-          filter: orFilter(...ids)
+          filter: andFilter(
+            lessThanOrEqualTo("valid_from", new Date().toISOString()),
+            greaterThanOrEqualTo("valid_to", new Date().toISOString()),
+            orFilter(...ids)
+          )
         },
         source,
         false