From 532b2c985147661725b0c4e3e478f6a18b0edd54 Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Tue, 14 Jun 2022 15:28:49 +0200 Subject: [PATCH 01/12] bump frontend --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ecb725f..9c4f754 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -158,7 +158,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.9.0-4 + image: lblod/frontend-organization-portal:1.9.0-5 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 804dfd9f4e48e0de029e074f1c8a053f45ca37eb Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Tue, 14 Jun 2022 15:28:49 +0200 Subject: [PATCH 02/12] bump frontend --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0e6aff6..427c400 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -158,7 +158,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.9.0-4 + image: lblod/frontend-organization-portal:1.9.0-5 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 3562be85017d334382118ded24d8620828e97d67 Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Thu, 16 Jun 2022 05:49:57 +0200 Subject: [PATCH 03/12] release frontend --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 427c400..788a9c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -158,7 +158,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.9.0-5 + image: lblod/frontend-organization-portal:1.9.0 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 1cdc2e9c46cf445fedbd1abd2a2e850db5de48dc Mon Sep 17 00:00:00 2001 From: Nordine Bittich <3816305+nbittich@users.noreply.github.com> Date: Thu, 16 Jun 2022 08:27:35 +0200 Subject: [PATCH 04/12] normalize spaces (#157) --- .../202206131O4623-normalize-space.sparql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 config/migrations/2022/202206131O4623-normalize-space.sparql diff --git a/config/migrations/2022/202206131O4623-normalize-space.sparql b/config/migrations/2022/202206131O4623-normalize-space.sparql new file mode 100644 index 0000000..ca1b34d --- /dev/null +++ b/config/migrations/2022/202206131O4623-normalize-space.sparql @@ -0,0 +1,20 @@ +DELETE { + graph { + ?s ?p ?o. + } + +} +INSERT { + graph { + ?s ?p ?normalize. + } +} +WHERE { + graph { + ?s ?p ?o. + BIND(replace(?o, "\\s+|\\t", " ") AS ?single_space) + BIND(replace(?single_space, "^(\\s+)|(\\s+)$|(\\t)$|(\\t)", "") AS ?normalize) + + FILTER ( isLiteral(?o) && ( regex(?o, "\\s+|\\t") || regex(?o, "^(\\s+)|(\\s+)$|(\\t)$|(\\t)") ) ) + } +} \ No newline at end of file From 1e516c58ac7eb18fab19a8096058834fa1e28d54 Mon Sep 17 00:00:00 2001 From: Nordine Bittich <3816305+nbittich@users.noreply.github.com> Date: Wed, 22 Jun 2022 17:02:29 +0200 Subject: [PATCH 05/12] remove involvements (#159) --- .../20220620112423-remove-involvements.sparql | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 config/migrations/2022/20220620112423-remove-involvements.sparql diff --git a/config/migrations/2022/20220620112423-remove-involvements.sparql b/config/migrations/2022/20220620112423-remove-involvements.sparql new file mode 100644 index 0000000..4a6e7a0 --- /dev/null +++ b/config/migrations/2022/20220620112423-remove-involvements.sparql @@ -0,0 +1,32 @@ + +# OP-1520 & OP-1529 - OP-1519 & OP-1518 + +prefix org: +prefix ere: +prefix skos: + +delete where { + +graph { + +?involvement a ere:BetrokkenLokaleBesturen; + org:organization ?worshipService; + ere:typebetrokkenheid ?typebetrokkenheid. + +?betrokkenBestuur ere:betrokkenBestuur ?involvement. +?involvement ?p ?o. + +filter (?typebetrokkenheid = && +(?worshipService = +|| ?worshipService = +|| ?worshipService = +|| ?worshipService = +|| ?worshipService = + + )) +} +} + + + + From 8c9957d256ee0c794fe66935416bcff7e308f5fe Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Wed, 6 Jul 2022 15:04:44 +0200 Subject: [PATCH 06/12] bump frontend --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 788a9c9..901d2a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -158,7 +158,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.9.0 + image: lblod/frontend-organization-portal:1.9.1 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 7364d1190d91e236e44e7fefe2ebac7030e96eea Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Tue, 12 Jul 2022 13:48:46 +0200 Subject: [PATCH 07/12] bump frontend --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 594da21..4f24444 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -158,7 +158,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.9.1 + image: lblod/frontend-organization-portal:1.10.0-0 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 3256fe6b889dda9c14f337ea8167c2d7b911aed2 Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Fri, 15 Jul 2022 15:37:14 +0200 Subject: [PATCH 08/12] bump frontend --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4f24444..1086dba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -158,7 +158,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.10.0-0 + image: lblod/frontend-organization-portal:1.10.0-1 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 81ac4342ad6140b94d94ed22b74c7103aba37098 Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Mon, 18 Jul 2022 12:53:52 +0200 Subject: [PATCH 09/12] rename code list for bestrokken locale bestuuren --- ...112423-rename-codelist-betrokken-lb.sparql | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 config/migrations/2022/20220718112423-rename-codelist-betrokken-lb.sparql diff --git a/config/migrations/2022/20220718112423-rename-codelist-betrokken-lb.sparql b/config/migrations/2022/20220718112423-rename-codelist-betrokken-lb.sparql new file mode 100644 index 0000000..0a1454e --- /dev/null +++ b/config/migrations/2022/20220718112423-rename-codelist-betrokken-lb.sparql @@ -0,0 +1,26 @@ + +# OP-1565 + +prefix skos: + +delete { + graph { + skos:prefLabel ?prefLabel1. + skos:prefLabel ?prefLabel2. + skos:prefLabel ?prefLabel3. + } + +}insert { + graph { + skos:prefLabel "Toezichthoudend". + skos:prefLabel "Mede-financierend". + skos:prefLabel "Adviserend". + } + +}where { + graph { + skos:prefLabel ?prefLabel1. + skos:prefLabel ?prefLabel2. + skos:prefLabel ?prefLabel3. + } +} \ No newline at end of file From c8134e2372a9a7028bc0a1800cb86fb442fa126d Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Mon, 18 Jul 2022 12:58:14 +0200 Subject: [PATCH 10/12] bump frontend --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1086dba..a96f5e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -158,7 +158,7 @@ services: restart: always logging: *default-logging frontend: - image: lblod/frontend-organization-portal:1.10.0-1 + image: lblod/frontend-organization-portal:1.10.0-2 volumes: - ./config/frontend/add-x-frame-options-header.conf:/config/add-x-frame-options.conf environment: From 5ab723a8836560f0c079b3260c98d78db0dc7218 Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Wed, 20 Jul 2022 09:43:49 +0200 Subject: [PATCH 11/12] update toezicht with new definition --- .../20220719112423-update-toezicht.sparql | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 config/migrations/2022/20220719112423-update-toezicht.sparql diff --git a/config/migrations/2022/20220719112423-update-toezicht.sparql b/config/migrations/2022/20220719112423-update-toezicht.sparql new file mode 100644 index 0000000..d80597c --- /dev/null +++ b/config/migrations/2022/20220719112423-update-toezicht.sparql @@ -0,0 +1,90 @@ +PREFIX org: +PREFIX locn: +PREFIX schema: +PREFIX regorg: +PREFIX person: +PREFIX vcard: +PREFIX dbpedia: +PREFIX adms: +PREFIX euro: +PREFIX prov: +PREFIX organisatie: +PREFIX persoon: +PREFIX adres: +PREFIX generiek: +PREFIX mandaat: +PREFIX besluit: +PREFIX lblodlg: +PREFIX dc_terms: +PREFIX foaf: +PREFIX skos: +PREFIX euvoc: +PREFIX ere: +PREFIX ch: +PREFIX code: +PREFIX ext: +PREFIX rdfs: +PREFIX adres: + + +SELECT DISTINCT ?bestuur ?label ?typeEredienst ?provincie ?municipality ?betrokkenheid WHERE { + { + SELECT ?bestuur ?betrokkenheid (COUNT(DISTINCT ?betrokkenheid) as ?betrokkenheidCount) WHERE { + ?bestuur + a + ?type. + + FILTER (?type IN ( + , + + )) + + ?betrokkenheid + org:organization + ?bestuur; + ere:typebetrokkenheid ; + a + ere:BetrokkenLokaleBesturen. + } + GROUP BY ?bestuur ?betrokkenheid + HAVING(COUNT(DISTINCT ?betrokkenheid) > 1) + ORDER BY DESC(?betrokkenheidCount) + } + OPTIONAL { + ?bestuur + skos:prefLabel + ?label + } + OPTIONAL { + ?bestuur + ere:typeEredienst + ?typeEredienstUri. + OPTIONAL { + ?typeEredienstUri + skos:prefLabel + ?typeEredienst. + } + } + OPTIONAL { + ?bestuur + org:hasPrimarySite + ?primarySite. + OPTIONAL { + ?primarySite + organisatie:bestaatUit + ?sa. + OPTIONAL { + ?sa + locn:adminUnitL2 + ?provincie. + } + OPTIONAL { + ?sa + adres:gemeentenaam + ?municipality. + } + } + } +} + + \ No newline at end of file From 44665ca2acc035343bbf0296980a722dc500b2fa Mon Sep 17 00:00:00 2001 From: Nordine Bittich Date: Wed, 20 Jul 2022 09:50:35 +0200 Subject: [PATCH 12/12] forgot to save --- .../20220719112423-update-toezicht.sparql | 97 ++++++++----------- 1 file changed, 38 insertions(+), 59 deletions(-) diff --git a/config/migrations/2022/20220719112423-update-toezicht.sparql b/config/migrations/2022/20220719112423-update-toezicht.sparql index d80597c..36ae9d7 100644 --- a/config/migrations/2022/20220719112423-update-toezicht.sparql +++ b/config/migrations/2022/20220719112423-update-toezicht.sparql @@ -20,71 +20,50 @@ PREFIX foaf: PREFIX skos: PREFIX euvoc: PREFIX ere: -PREFIX ch: +PREFIX ch: PREFIX code: PREFIX ext: PREFIX rdfs: PREFIX adres: - -SELECT DISTINCT ?bestuur ?label ?typeEredienst ?provincie ?municipality ?betrokkenheid WHERE { - { - SELECT ?bestuur ?betrokkenheid (COUNT(DISTINCT ?betrokkenheid) as ?betrokkenheidCount) WHERE { - ?bestuur - a - ?type. - - FILTER (?type IN ( - , - - )) - - ?betrokkenheid - org:organization - ?bestuur; - ere:typebetrokkenheid ; - a - ere:BetrokkenLokaleBesturen. - } - GROUP BY ?bestuur ?betrokkenheid - HAVING(COUNT(DISTINCT ?betrokkenheid) > 1) - ORDER BY DESC(?betrokkenheidCount) - } - OPTIONAL { - ?bestuur - skos:prefLabel - ?label - } - OPTIONAL { - ?bestuur - ere:typeEredienst - ?typeEredienstUri. - OPTIONAL { - ?typeEredienstUri - skos:prefLabel - ?typeEredienst. - } - } - OPTIONAL { - ?bestuur - org:hasPrimarySite - ?primarySite. - OPTIONAL { - ?primarySite - organisatie:bestaatUit - ?sa. - OPTIONAL { - ?sa - locn:adminUnitL2 - ?provincie. +DELETE { GRAPH { ?betrokkenheid ere:typebetrokkenheid . } } +INSERT { GRAPH { ?betrokkenheid ere:typebetrokkenheid . } } +WHERE { + GRAPH { + { + SELECT DISTINCT ?bestuur ?label ?typeEredienst ?provincie ?municipality ?betrokkenheidCount WHERE { + { + SELECT ?bestuur (COUNT(DISTINCT ?betrokkenheid) AS ?betrokkenheidCount) WHERE { + ?bestuur rdf:type ?type. + FILTER(?type IN(ere:CentraalBestuurVanDeEredienst, ere:BestuurVanDeEredienst)) + ?betrokkenheid org:organization ?bestuur; + ere:typebetrokkenheid ; + rdf:type ere:BetrokkenLokaleBesturen. + } + GROUP BY ?bestuur + HAVING ((COUNT(DISTINCT ?betrokkenheid)) > 1 ) + ORDER BY DESC (?betrokkenheidCount) } - OPTIONAL { - ?sa - adres:gemeentenaam - ?municipality. + OPTIONAL { ?bestuur skos:prefLabel ?label. } + OPTIONAL { + ?bestuur ere:typeEredienst ?typeEredienstUri. + OPTIONAL { ?typeEredienstUri skos:prefLabel ?typeEredienst. } + } + OPTIONAL { + ?bestuur org:hasPrimarySite ?primarySite. + OPTIONAL { + ?primarySite organisatie:bestaatUit ?sa. + OPTIONAL { ?sa locn:adminUnitL2 ?provincie. } + OPTIONAL { ?sa adres:gemeentenaam ?municipality. } + } } } } -} - - \ No newline at end of file + ?betrokkenheid org:organization ?bestuur; + ere:typebetrokkenheid ; + rdf:type ere:BetrokkenLokaleBesturen. + ?administrativeUnit ere:betrokkenBestuur ?betrokkenheid. + OPTIONAL { ?administrativeUnit skos:prefLabel ?administrativeUnitLabel. } + FILTER(?administrativeUnitLabel != ?municipality) + } +} \ No newline at end of file