LPNL#68408 Leaseplan wil dat de werkplekreserveringen bevestigd worden via een QR code

svn path=/Database/branches/DB40/; revision=53027

ADM/ADM_PAC.SRC

@@ -145,7 +145,8 @@ AS
                          'SERVICE_NAME',
                          'IP_ADDRESS');
 
-      tekst := 'OS-user: ' || SYS_CONTEXT('USERENV','OS_USER');
+      tekst := 'Time: ' || TO_CHAR(SYSDATE, 'YYYY-MM-DD HH24:MI:SS');
+      tekst := tekst || CHR(10) ||'OS-user: ' || SYS_CONTEXT('USERENV','OS_USER');
       FOR elem IN 1 .. var_table_varchar.COUNT
       LOOP
           tekst := tekst ||

ALG/ALG_TAB.SRC

@@ -21,6 +21,10 @@ CREATE_TABLE(alg_regio,0)
     alg_regio_verwijder
         DATE
         DEFAULT NULLDATUM,
+    alg_regio_externnr
+        VARCHAR2(256),
+    alg_regio_externsyncdate
+        DATE,
     CONSTRAINT alg_u_alg_regio_upper UNIQUE(alg_regio_upper, alg_regio_verwijder)
 );
 
@@ -45,6 +49,10 @@ CREATE_TABLE(alg_district,0)
     alg_district_verwijder
         DATE
         DEFAULT NULLDATUM,
+    alg_district_externnr
+        VARCHAR2(256),
+    alg_district_externsyncdate
+        DATE,
     CONSTRAINT alg_u_alg_district_upper UNIQUE(alg_regio_key, alg_district_upper,alg_district_verwijder)
 );
 
@@ -106,6 +114,10 @@ CREATE_TABLE(alg_locatie,0)
         DATE,
     alg_locatie_image
         VARCHAR2(255),
+    alg_locatie_externnr
+        VARCHAR2(256),
+    alg_locatie_externsyncdate
+        DATE,
 -- in MLD_TAB.SRC:
 --    mld_dienstniveau_key
 --        NUMBER(10)
@@ -202,6 +214,10 @@ CREATE_TABLE(alg_terreinsector,0)
     alg_terreinsector_toon_kentk
         NUMBER(3) DEFAULT(0) NOT NULL
         CONSTRAINT alg_c_alg_terreinsector_kent CHECK(alg_terreinsector_toon_kentk IN (0,1,2,3)),   /* 0=Onzichtbaar; 1=Niet verplicht; 2=Verplicht bij parkeerplaats. 3=Altijd verplicht */
+    alg_terreinsector_externnr
+        VARCHAR2(256),
+    alg_terreinsector_extsyncdate
+        DATE,
 -- in PRS_TAB.SRC:
 --    prs_kostenplaats_key
 --        NUMBER(10)
@@ -333,9 +349,9 @@ CREATE_TABLE(alg_gebouw,0)
 --        NUMBER(10)
 --        CONSTRAINT alg_r_prs_perslid_key2 REFERENCES prs_perslid(prs_perslid_key),
     alg_gebouw_dwgx
-        NUMBER(10,3),
+        NUMBER(16,3),
     alg_gebouw_dwgy
-        NUMBER(10,3),
+        NUMBER(16,3),
     alg_gebouw_x
         NUMBER(16,6),
     alg_gebouw_y
@@ -373,6 +389,10 @@ CREATE_TABLE(alg_gebouw,0)
         CONSTRAINT alg_c_alg_gebouw_toon_kent CHECK(alg_gebouw_toon_kenteken IN (0,1,2,3)),   /* 0=Onzichtbaar; 1=Niet verplicht; 2=Verplicht bij parkeerplaats. 3=Altijd verplicht */
     alg_gebouw_groep
         VARCHAR2(60),
+    alg_gebouw_externnr
+        VARCHAR2(256),
+    alg_gebouw_externsyncdate
+        DATE,
     CONSTRAINT alg_u_alg_gebouw_upper UNIQUE(alg_locatie_key, alg_gebouw_upper, alg_gebouw_verwijder)
 );
 
@@ -410,6 +430,10 @@ CREATE_TABLE(alg_verdieping,0)
     alg_verdieping_code
     	VARCHAR2(10)
     	NOT_NULL(alg_verdieping_code, alg_c_alg_verdieping_code),
+    alg_verdieping_externnr
+        VARCHAR2(256),
+    alg_verdieping_externsyncdate
+        DATE,
 -- in MLD_TAB.SRC:
 --    mld_dienstniveau_key
 --        NUMBER(10)
@@ -509,10 +533,10 @@ CREATE_TABLE(alg_ruimte,0)
         NUMBER(10)
         CONSTRAINT alg_r_alg_srtruimte_key REFERENCES alg_srtruimte(alg_srtruimte_key),
     alg_ruimte_nr
-        VARCHAR2(10)
+        VARCHAR2(20)
         NOT_NULL(alg_ruimte_nr, alg_c_alg_ruimte_nr),
     alg_ruimte_upper_nr         /* references into the drawing */
-        VARCHAR2(10)
+        VARCHAR2(20)
         NOT_NULL(alg_ruimte_upper_nr, alg_c_alg_ruimte_upper_nr),
     alg_ruimte_acadkey
         VARCHAR2(10),
@@ -559,6 +583,10 @@ CREATE_TABLE(alg_ruimte,0)
         NUMBER(1)
         -- DEFAULT NULL op gebouw terugvallen
         CONSTRAINT alg_c_alg_ruimte_werk CHECK(alg_ruimte_werkdagen IN (0,1)),
+    alg_ruimte_externnr
+        VARCHAR2(256),
+    alg_ruimte_externsyncdate
+        DATE,
 -- in MLD_TAB.SRC:
 --    mld_dienstniveau_key
 --        NUMBER(10)

BES/BES_IND.SRC

@@ -40,12 +40,8 @@ create index prs_i_prs_afdeling_p_bdr_key on prs_afdeling (prs_bedrijf_key);
 create unique index bes_i_bes_disc_params1 on bes_disc_params(bes_ins_discipline_key);
 
 CREATE INDEX bes_i_bes_kenmerkbestell1 ON bes_kenmerkbestell(bes_bestelling_key);
-CREATE INDEX bes_i_bes_kenmerkbestell2 ON bes_kenmerkbestell(bes_kenmerk_key);
-CREATE INDEX bes_i_bes_kenmerkbestell3 ON bes_kenmerkbestell(bes_kenmerkbestell_waarde);
 
 CREATE INDEX bes_i_bes_kenmerkbesteli1 ON bes_kenmerkbesteli(bes_bestelling_item_key);
-CREATE INDEX bes_i_bes_kenmerkbesteli2 ON bes_kenmerkbesteli(bes_kenmerk_key);
-CREATE INDEX bes_i_bes_kenmerkbesteli3 ON bes_kenmerkbesteli(bes_kenmerkbesteli_waarde);
 
 CREATE INDEX bes_i_bes_favoriet1 ON bes_favoriet(prs_perslid_key);
 

BES/BES_PAC.SRC

@@ -71,6 +71,12 @@ AS
       RETURN varchar2;
    FUNCTION opdrsprintf (ps IN varchar2, pbes_bestelopdr_key IN number)
       RETURN varchar2;
+   PROCEDURE remove(p_bes_bestelling_key IN NUMBER);
+   PROCEDURE remove_opdr(p_bes_opdr_key IN NUMBER);
+   FUNCTION bes_besteed_budget_pgb (p_prs_key IN NUMBER, p_disc_key IN NUMBER)
+      RETURN NUMBER;
+   FUNCTION bes_besteed_budget_agb (p_kp_key IN NUMBER)
+      RETURN NUMBER;
 END bes;
 /
 
@@ -2154,6 +2160,240 @@ AS
       RETURN s;
     END;
 
+    PROCEDURE remove(p_bes_bestelling_key IN NUMBER)
+    IS
+        CURSOR c_bestelling(p_bestelling_key IN NUMBER) IS
+            SELECT bes_bestelling_key
+              FROM bes_bestelling
+             WHERE bes_bestelling_retourvan_key = p_bestelling_key
+                OR bes_bestelling_parentkey = p_bestelling_key;
+
+        CURSOR c_opdracht(p_bestelling_key IN NUMBER) IS
+            SELECT DISTINCT oi.bes_bestelopdr_key
+              FROM bes_bestelling_item bi
+                 , bes_bestelopdr_item oi
+             WHERE bi.bes_bestelopdr_item_key = oi.bes_bestelopdr_item_key
+               AND bi.bes_bestelling_key = p_bestelling_key;
+
+       CURSOR c_bijlagen(p_refkey IN NUMBER) IS
+          SELECT b.fac_bijlagen_key
+            FROM fac_bijlagen b
+               , bes_bestelling r
+               , (SELECT k.bes_kenmerk_key kenmerk_key
+                    FROM bes_kenmerk k
+                       , bes_srtkenmerk s
+                   WHERE k.bes_srtkenmerk_key = s.bes_srtkenmerk_key
+                     AND k.bes_kenmerk_type = 'B'
+                     AND s.bes_srtkenmerk_kenmerktype IN ('F', 'M', 'E', 'X')
+                 ) k
+           WHERE b.fac_bijlagen_refkey = r.bes_bestelling_key
+             AND b.fac_bijlagen_kenmerk_key = k.kenmerk_key
+             AND b.fac_bijlagen_module = 'BES'
+             AND r.bes_bestelling_key = p_refkey
+          UNION
+          SELECT b.fac_bijlagen_key
+            FROM fac_bijlagen b
+               , bes_bestelling_item r
+               , (SELECT k.bes_kenmerk_key kenmerk_key
+                    FROM bes_kenmerk k
+                       , bes_srtkenmerk s
+                   WHERE k.bes_srtkenmerk_key = s.bes_srtkenmerk_key
+                     AND k.bes_kenmerk_type = 'B'
+                     AND s.bes_srtkenmerk_kenmerktype IN ('F', 'M', 'E', 'X')
+                 ) k
+           WHERE b.fac_bijlagen_refkey = r.bes_bestelling_item_key
+             AND b.fac_bijlagen_kenmerk_key = k.kenmerk_key
+             AND b.fac_bijlagen_module = 'BES'
+             AND r.bes_bestelling_key = p_refkey;
+
+    BEGIN
+        -- Ook alle child/retour bestellingen verwijderen.
+        FOR ref_bestelling IN c_bestelling(p_bes_bestelling_key)
+        LOOP
+            bes.remove(ref_bestelling.bes_bestelling_key);
+        END LOOP;
+
+        -- Alle bestelopdrachten onder de bestelling verwijderen.
+        FOR ref_opdracht IN c_opdracht(p_bes_bestelling_key)
+        LOOP
+            bes.remove_opdr(ref_opdracht.bes_bestelopdr_key);
+        END LOOP;
+
+        -- Van alle bestellingen en bestelitems die worden verwijderd moeten ook de bijlagen verwijderd worden.
+        FOR ref_bijlagen IN c_bijlagen(p_bes_bestelling_key)
+        LOOP
+            flx.deleteflexbijlage (ref_bijlagen.fac_bijlagen_key);
+        END LOOP;
+
+        -- Verwijderen bestelling
+        DELETE FROM bes_bestelling
+         WHERE bes_bestelling_key = p_bes_bestelling_key;
+
+        -- Van de volgende tabellen worden de records die naar deze p_bes_bestelling_key
+        -- verwijzen met ON DELETE CASCADE ook verwijderd:
+        --  bes_kenmerkbestell
+        --  bes_bestelling_item
+        -- Hierdoor worden de afhankelijkheden in de volgende tabel ook verwijderd:
+        --  bes_kenmerkbesteli
+
+        fac.remove_tracking('bestelling', p_bes_bestelling_key);
+    END;
+
+    PROCEDURE remove_opdr(p_bes_opdr_key IN NUMBER)
+    IS
+        CURSOR c_factuur(p_bestelopdracht_key IN NUMBER) IS
+            SELECT fin_factuur_key
+              FROM fin_factuur
+             WHERE bes_bestelopdr_key = p_bestelopdracht_key;
+    BEGIN
+        -- Verwijderen bestelopdracht
+        FOR ref_factuur IN c_factuur(p_bes_opdr_key)
+        LOOP
+            fin.remove(ref_factuur.fin_factuur_key);
+        END LOOP;
+
+        -- verwijder de verwijzing van bestelaanvraag regel naar bestelopdracht regel
+        -- dat had een on delete set null mogen zijn
+        UPDATE bes_bestelling_item
+           SET bes_bestelopdr_item_key = NULL
+         WHERE bes_bestelopdr_item_key IN
+                (SELECT bes_bestelopdr_item_key
+                   FROM bes_bestelopdr_item
+                  WHERE bes_bestelopdr_key = p_bes_opdr_key);
+
+        FOR ref_contract IN (SELECT cnt_contract_key
+                               FROM cnt_contract
+                              WHERE bes_bestelopdr_key = p_bes_opdr_key
+                            )
+        LOOP
+            -- Verwijder contracten die aan deze bestelopdracht zitten.
+            cnt.remove(ref_contract.cnt_contract_key);
+        END LOOP;
+
+        DELETE FROM bes_bestelopdr
+         WHERE bes_bestelopdr_key = p_bes_opdr_key;
+
+        -- Van de volgende tabellen worden de records die naar deze p_bestelling_key
+        -- verwijzen met ON DELETE CASCADE ook verwijderd:
+        --  bes_bestelopdr_item
+
+        fac.remove_tracking('bestelopdr', p_bes_opdr_key);
+    END;
+
+   FUNCTION bes_besteed_budget_pgb (p_prs_key IN NUMBER, p_disc_key IN NUMBER)
+      RETURN NUMBER
+   AS
+      l_budgetbesteld            NUMBER := 0;
+   BEGIN
+      -- Besteed budget van meegegeven persoon dit jaar voor de meegegeven discipline i.v.m. Persoons Gebonden Budget (PGB).
+      -- Eventueel uitgezonderd (huidige) bestellingkey bes_key en meldingopdrachtkey opdr_key.
+      -- De discipline instelling disc_params_pgb moet 1 of 3 zijn. Afhankelijk van deze instelling roep je de pgb of agb versie aan. Hier opnieuw controleren is niet nodig.
+      -- Totaalbedrag van eerdere bestellingen en meldingopdrachten dit jaar van de besteller en behandelaar i.v.m. Persoons Gebonden Budget (PGB).
+      SELECT COALESCE(SUM(totaalbedrag), 0) - COALESCE(SUM(korting), 0) + COALESCE(SUM(levkosten), 0) budgetbesteld
+        INTO l_budgetbesteld
+        FROM (SELECT SUM(totaalbedrag) totaalbedrag
+                   , SUM(b.bes_bestelling_korting) korting
+                   , SUM(b.bes_bestelling_levkosten) levkosten
+                FROM (SELECT SUM (boi.bes_bestelopdr_item_aantal * boi.bes_bestelopdr_item_prijs) totaalbedrag
+                           , b.bes_bestelling_key
+                        FROM bes_bestelling b
+                           , bes_bestelling_item bi
+                           , bes_bestelopdr_item boi
+                           , bes_bestelopdr bo
+                           , bes_srtdeel isd
+                           , bes_srtgroep isg
+                       WHERE b.bes_bestelling_key = bi.bes_bestelling_key
+                         AND bi.bes_bestelopdr_item_key = boi.bes_bestelopdr_item_key
+                         AND boi.bes_bestelopdr_key = bo.bes_bestelopdr_key
+                         AND bi.bes_srtdeel_key = isd.bes_srtdeel_key
+                         AND isd.bes_srtgroep_key = isg.bes_srtgroep_key
+                         AND b.prs_perslid_key = p_prs_key
+                         AND isg.ins_discipline_key = p_disc_key
+                         -- Alleen bestellingopdrachten in de behandelings fase (In bestelling (Bevestigd)(4)) en in de gereed fase (Geleverd(6) en Verwerkt(7)).
+                         -- Afgewezen(1), In behandeling(3), Ter bevestiging(5) en Geannuleerd(8) doen niet mee in de bepaling van geraamde en definitieve kosten.
+                         AND bo.bes_bestelopdr_status IN (4, 6, 7)
+                         AND b.bes_bestelling_datum >= TRUNC (SYSDATE, 'YEAR')
+                      GROUP BY b.bes_bestelling_key) tot
+                   , bes_bestelling b
+               WHERE b.bes_bestelling_key = tot.bes_bestelling_key);
+      RETURN l_budgetbesteld;
+   END;
+
+   FUNCTION bes_besteed_budget_agb (p_kp_key IN NUMBER)
+      RETURN NUMBER
+   AS
+      l_budgetbesteld            NUMBER := 0;
+      l_kp_limietperiode         NUMBER (1);
+      l_periode                  VARCHAR2 (4);
+   BEGIN
+      -- Besteed budget van meegegeven persoon afgelopen periode i.v.m. Afdelings Gebonden Budget (AGB).
+      -- Eventueel uitgezonderd (huidige) bestellingkey bes_key en meldingopdrachtkey opdr_key.
+      -- De discipline instelling disc_params_pgb moet 1 of 3 zijn. Afhankelijk van deze instelling roep je de pgb of agb versie aan. Hier opnieuw controleren is niet nodig.
+      -- Totaalbedrag van eerdere bestellingen en meldingopdrachten van afgelopen periode van de besteller en behandeaar i.v.m. Afdelings Gebonden Budget (AGB).
+
+      -- Limietperiode kostenplaats (prs_kostenplaats_limietperiode): 0(of NULL)=geen(oneindig) (default), 1=maand, 2=jaar.
+      IF p_kp_key > 0
+      THEN
+         -- Er is een kostenplaats gevonden.
+         -- De limiet periode van de kostenplaatsgroep overruled die van de kostenplaats indien ingevuld.
+         SELECT CASE COALESCE(kg.prs_kostenplaatsgrp_limperiode, 0)   -- Indien kostenplaats geen kostenplaatsgroep heeft dan ook "Geen" en eigen limietperiode van de kostenplaats nemen.
+                WHEN 0    -- Geen.
+                THEN k.prs_kostenplaats_limietperiode
+                ELSE kg.prs_kostenplaatsgrp_limperiode   -- Maand of Jaar.
+                END limietperiode
+           INTO l_kp_limietperiode
+           FROM prs_kostenplaats k
+              , prs_kostenplaatsgrp kg
+          WHERE k.prs_kostenplaatsgrp_key = kg.prs_kostenplaatsgrp_key(+)
+            AND k.prs_kostenplaats_key = p_kp_key;
+
+         IF l_kp_limietperiode = 1
+         THEN
+            l_periode := 'MM';     -- Maandelijks budget.
+         ELSIF l_kp_limietperiode = 2
+         THEN
+            l_periode := 'YYYY';   -- Jaarlijks budget.
+         ELSE
+            l_periode := NULL;
+         END IF;
+
+        SELECT COALESCE(SUM(totaalbedrag), 0) - COALESCE(SUM(korting), 0) + COALESCE(SUM(levkosten), 0) budgetbesteld
+         INTO l_budgetbesteld
+         FROM (SELECT SUM(totaalbedrag) totaalbedrag
+                    , SUM(b.bes_bestelling_korting) korting
+                    , SUM(b.bes_bestelling_levkosten) levkosten
+                 FROM (SELECT SUM (boi.bes_bestelopdr_item_aantal * boi.bes_bestelopdr_item_prijs) totaalbedrag
+                            , b.bes_bestelling_key
+                         FROM bes_bestelling b
+                            , bes_bestelling_item bi
+                            , bes_bestelopdr_item boi
+                            , bes_bestelopdr bo
+                            , bes_srtdeel bsd
+                            , bes_srtgroep bsg
+                            , bes_discipline bd
+                            , bes_disc_params bdp
+                        WHERE b.bes_bestelling_key = bi.bes_bestelling_key
+                          AND bi.bes_bestelopdr_item_key = boi.bes_bestelopdr_item_key
+                          AND boi.bes_bestelopdr_key = bo.bes_bestelopdr_key
+                          AND bi.bes_srtdeel_key = bsd.bes_srtdeel_key
+                          AND bsd.bes_srtgroep_key = bsg.bes_srtgroep_key
+                          AND bsg.ins_discipline_key = bd.ins_discipline_key
+                          AND bsg.ins_discipline_key = bdp.bes_ins_discipline_key
+                          AND bdp.bes_disc_params_pgb IN (2, 3)   -- Alleenn agb meetellen: 2 = Alleen agb, 3 = Beiden, pgb en agb.
+                          AND b.prs_kostenplaats_key = p_kp_key
+                          -- Alleen bestellingopdrachten in de behandelings fase (In bestelling (Bevestigd)(4)) en in de gereed fase (Geleverd(6) en Verwerkt(7)).
+                          -- Afgewezen(1), In behandeling(3), Ter bevestiging(5) en Geannuleerd(8) doen niet mee in de bepaling van geraamde en definitieve kosten.
+                          AND bo.bes_bestelopdr_status IN (4, 6, 7)
+                          AND ((l_periode IS NOT NULL AND b.bes_bestelling_datum >= TRUNC (SYSDATE, l_periode))
+                            OR (l_periode IS NULL))   -- De eerste van de deze maand of 1 januari dit jaar
+                       GROUP BY b.bes_bestelling_key) tot
+                    , bes_bestelling b
+                WHERE b.bes_bestelling_key = tot.bes_bestelling_key);
+      END IF;
+
+      RETURN l_budgetbesteld;
+   END;
+
 END bes;
 /
 

BES/BES_TAB.SRC

@@ -160,9 +160,11 @@ CREATE_TABLE(bes_srtdeel,0)
     bes_srtdeel_details_loc
         VARCHAR2(255),
     bes_srtdeel_veelvoud
-        NUMBER(6),
+        NUMBER(9,3),
     bes_srtdeel_minimum
         NUMBER(6),
+    bes_srtdeel_maximum
+        NUMBER(6),
     bes_staffeltabel_key
         NUMBER(10)
         CONSTRAINT bes_r_staffeltabel2 REFERENCES bes_staffeltabel(bes_staffeltabel_key),
@@ -255,7 +257,7 @@ CREATE_TABLE(bes_bestelling, 0)
         CONSTRAINT fac_r_fac_activiteit3 REFERENCES fac_activiteit(fac_activiteit_key) ON DELETE CASCADE,
     mld_melding_key /* optionele verwijzing naar veroorzakende melding */
         NUMBER(10)
-        CONSTRAINT bes_r_mld_melding1 REFERENCES mld_melding(mld_melding_key),
+        CONSTRAINT bes_r_mld_melding1 REFERENCES mld_melding(mld_melding_key) ON DELETE SET NULL,
     bes_bestelling_kto_verstuurd
         DATE,
     bes_bestelling_satisfaction
@@ -265,7 +267,11 @@ CREATE_TABLE(bes_bestelling, 0)
     bes_bestelling_approved
         NUMBER(11,2),
     bes_bestelling_lev_opm
-        VARCHAR2(320)
+        VARCHAR2(320),
+    bes_bestelling_externnr
+        VARCHAR2(256),
+    bes_bestelling_externsyncdate
+        DATE
 );
 
 CREATE_TABLE(bes_bestelopdr, 0)
@@ -307,7 +313,11 @@ CREATE_TABLE(bes_bestelopdr, 0)
     bes_bestelopdr_delivery_opmerk
         VARCHAR2(320),
     bes_bestelopdr_flag
-        NUMBER(1)
+        NUMBER(1),
+    bes_bestelopdr_externnr
+        VARCHAR2(256),
+    bes_bestelopdr_externsyncdate
+        DATE
 );
 
 ALTER TABLE cnt_contract ADD bes_bestelopdr_key
@@ -330,12 +340,12 @@ CREATE_TABLE(bes_bestelopdr_item, 0)
     bes_bestelopdr_item_posnr
         NUMBER(5),
     bes_bestelopdr_item_aantal
-        NUMBER(5)
+        NUMBER(15,3)
         CONSTRAINT bes_c_bes_bestelopdr_i_aantal CHECK(bes_bestelopdr_item_aantal IS NOT NULL),
     bes_bestelopdr_item_aantalontv
-        NUMBER(5),
+        NUMBER(15,3),
     bes_bestelopdr_item_aantalexp
-        NUMBER(5),
+        NUMBER(15,3),
     bes_bestelopdr_item_omschrijv
         VARCHAR2(320),
     bes_bestelopdr_item_opmerking
@@ -371,7 +381,7 @@ CREATE_TABLE(bes_bestelling_item, 0)
         CONSTRAINT bes_c_bes_srtdeel_key1 CHECK(bes_srtdeel_key IS NOT NULL)
         CONSTRAINT bes_r_bes_srtdeel_key REFERENCES bes_srtdeel(bes_srtdeel_key),
     bes_bestelling_item_aantal
-        NUMBER(5)
+        NUMBER(15,3)
         CONSTRAINT bes_c_bes_bestelling_i_aantal CHECK(bes_bestelling_item_aantal IS NOT NULL),
     bes_bestelling_item_brutoprijs /* verkoopprijs ten tijde van bestelling */
         NUMBER(8,2),
@@ -383,7 +393,7 @@ CREATE_TABLE(bes_bestelling_item, 0)
         NUMBER(10)
         CONSTRAINT bes_r_bes_bestelopdr_i_key1 REFERENCES bes_bestelopdr_item(bes_bestelopdr_item_key),
     bes_bestelling_item_aantalontv
-        NUMBER(5),
+        NUMBER(15,3),
     bes_bestelling_item_status
         NUMBER(10),
     CONSTRAINT bes_c_bes_bestelling_item

BEZ/BEZ_PAC.SRC

@@ -12,6 +12,7 @@ CREATE OR REPLACE PACKAGE bez AS
   FUNCTION  hasparking    (pbez_bezoekers_key IN NUMBER) RETURN NUMBER;
   FUNCTION  afssprintf       (ps IN VARCHAR2 , p_afspraak_key IN NUMBER) RETURN VARCHAR2 ;
   FUNCTION  bzksprintf       (ps IN VARCHAR2 , p_bezoekers_key IN NUMBER) RETURN VARCHAR2 ;
+  PROCEDURE remove (p_afspraak_key IN NUMBER);
 END bez;
 /
 
@@ -389,7 +390,6 @@ CREATE OR REPLACE PACKAGE BODY bez AS
       RETURN aantal;
    END;
 
-
   FUNCTION afssprintf (ps IN VARCHAR2, p_afspraak_key IN NUMBER) RETURN VARCHAR2 IS
     lafspraak_datum  bez_afspraak.bez_afspraak_datum%TYPE;
     lbezoek          VARCHAR2 (200);
@@ -454,7 +454,30 @@ CREATE OR REPLACE PACKAGE BODY bez AS
 
   END;
 
+   PROCEDURE remove(p_afspraak_key IN NUMBER)
+   IS
+      CURSOR c_bezoekers IS
+          SELECT bez_bezoekers_key
+            FROM bez_bezoekers
+           WHERE bez_afspraak_key = p_afspraak_key;
+   BEGIN
+       FOR ref_bezoekers IN c_bezoekers
+       LOOP
+           DELETE FROM bez_bezoekers
+            WHERE bez_bezoekers_key = ref_bezoekers.bez_bezoekers_key;
+           -- Van de volgende tabel worden de records die naar deze bez_bezoekers_key
+           -- verwijzen met ON DELETE CASCADE verwijderd;
+           --  bez_kenmerkwaarde
+           -- In de volgende tabel wordt bez_bezoekers_key leeg gemaakt bij het verwijderen van bez_bezoekers:
+           --  res_rsv_deel
+           fac.remove_tracking('bezoeker', ref_bezoekers.bez_bezoekers_key);
+       END LOOP;
 
+       DELETE FROM bez_afspraak
+        WHERE bez_afspraak_key = p_afspraak_key;
+
+       fac.remove_tracking('afspraak', p_afspraak_key);
+   END;
 
 END bez;
 /

BEZ/BEZ_TAB.SRC

@@ -64,7 +64,11 @@ CREATE_TABLE(bez_afspraak,0)
         DATE,
     bez_afspraak_aanmaak
         DATE
-        DEFAULT SYSDATE NOT NULL
+        DEFAULT SYSDATE NOT NULL,
+    bez_afspraak_externnr
+        VARCHAR2(256),
+    bez_afspraak_externsyncdate
+        DATE
 );
 
 CREATE_TABLE(bez_bezoekers,0)
@@ -95,6 +99,10 @@ CREATE_TABLE(bez_bezoekers,0)
         DATE,
     bez_bezoekers_out
         DATE,
+    bez_bezoekers_done_actual
+        DATE,
+    bez_bezoekers_out_actual
+        DATE,
     bez_bezoekers_oproep
         DATE,
     bez_bezoekers_flags -- documentatie in appl/bez/xxx.inc
@@ -107,7 +115,9 @@ CREATE_TABLE(bez_bezoekers,0)
         DEFAULT SYSDATE NOT NULL,
     bez_bezoekers_telefoon VARCHAR2(20),
     bez_bezoekers_email VARCHAR2(200),
-    bez_bezoekers_kenteken VARCHAR2(10)
+    bez_bezoekers_kenteken VARCHAR2(10),
+    bez_bezoekers_externnr VARCHAR2(256),
+    bez_bezoekers_externsyncdate DATE
  );
 
 

BEZ/BEZ_VIE.SRC

@@ -69,6 +69,9 @@ CREATE_VIEW(bez_v_udr_bezoeker, 1)
     pasnr,
     parkeerplaats,
     fclt_3d_locatie_key,
+    fclt_3d_divisie_key,
+    divisie_naam,
+    divisie_omschrijving,
     fclt_3d_afdeling_key,
     selfservice
 )
@@ -106,6 +109,9 @@ AS
            b.bez_bezoekers_pasnr,
            rd.res_deel_omschrijving,
            a.alg_locatie_key,
+           an.prs_afdeling_key,
+           an.prs_afdeling_naam,
+           an.prs_afdeling_omschrijving,
            pp1.prs_afdeling_key,
            DECODE (p2.prs_perslid_naam_full, p3.prs_perslid_naam_full, lcl.l ('lcl_yes'), lcl.l ('lcl_no')) selfservice
       FROM bez_afspraak a,
@@ -119,6 +125,8 @@ AS
            alg_regio r,
            bez_actie ba,
            prs_perslid pp1,
+           prs_v_afdeling_boom ab,
+           prs_v_afdeling an,
            res_rsv_deel rrd,
            res_deel rd
      WHERE     a.bez_afspraak_key = b.bez_afspraak_key
@@ -133,6 +141,8 @@ AS
            AND a.alg_onrgoed_keys = og.alg_onroerendgoed_keys(+)
            AND b.bez_bezoekers_key = rrd.bez_bezoekers_key(+)
            AND rrd.res_deel_key = rd.res_deel_key(+)
+           AND ab.prs_afdeling_key1 = an.prs_afdeling_key
+           AND ab.prs_afdeling_key = pp1.prs_afdeling_key
            AND a.bez_afspraak_datum >= TO_DATE ('01-01-2010', 'DD-MM-YYYY');
 
 CREATE_VIEW(bez_v_udr_reserveringbezoeker, 1)
@@ -175,6 +185,9 @@ CREATE_VIEW(bez_v_udr_reserveringbezoeker, 1)
    kostensoort,
    kpn,
    kpn_omschrijving,
+   fclt_3d_divisie_key,
+   divisie_naam,
+   divisie_omschrijving,
    fclt_3d_afdeling_key,
    afdeling_code,
    afdeling_omschrijving,
@@ -254,6 +267,9 @@ SELECT
    r.kostensoort,
    r.kpn,
    r.kpn_omschrijving,
+   r.fclt_3d_divisie_key,
+   r.divisie_naam,
+   r.divisie_omschrijving,
    r.fclt_3d_afdeling_key,
    r.afdeling_code,
    r.afdeling_omschrijving,

CAD/CAD_VIE.SRC

@@ -50,22 +50,19 @@ SELECT
 CREATE_VIEW(cad_v_label_bewoner, 0)
      (alg_ruimte_key, waarde)
 AS
-SELECT prs_w.prs_alg_ruimte_key,
-          prs_p.prs_perslid_naam
-       || DECODE (prs_p.prs_perslid_voorletters, NULL, '', ', ' || prs_p.prs_perslid_voorletters)
-       || DECODE (prs_p.prs_perslid_voornaam, NULL, '', ' (' || prs_p.prs_perslid_voornaam || ')')
-  FROM prs_werkplek prs_w, prs_perslidwerkplek prs_pw, prs_perslid prs_p
- WHERE prs_w.prs_werkplek_key = prs_pw.prs_werkplek_key
-   AND prs_pw.prs_perslid_key IS NOT NULL
-   AND prs_pw.prs_perslid_key = prs_p.prs_perslid_key
-   AND prs_w.prs_werkplek_virtueel = 0
-UNION
-SELECT prs_w.prs_alg_ruimte_key, '[Vrij]'
-  FROM prs_werkplek prs_w, prs_v_werkplek_bezetting prs_wb
- WHERE prs_w.prs_werkplek_key = prs_wb.prs_werkplek_key
-   AND prs_w.prs_werkplek_virtueel = 0
-   AND prs_wb.prs_werkplek_bezetting < 100;
-
+    SELECT prs_w.prs_alg_ruimte_key,
+              prs_p.prs_perslid_naam_friendly
+      FROM prs_werkplek prs_w, prs_perslidwerkplek prs_pw, prs_v_perslid_fullnames prs_p
+     WHERE     prs_w.prs_werkplek_key = prs_pw.prs_werkplek_key
+           AND prs_pw.prs_perslid_key IS NOT NULL
+           AND prs_pw.prs_perslid_key = prs_p.prs_perslid_key
+           AND prs_w.prs_werkplek_virtueel = 0
+    UNION
+    SELECT prs_w.prs_alg_ruimte_key, '['||lcl.l('lcl_free')||']'
+      FROM prs_werkplek prs_w, prs_v_werkplek_bezetting prs_wb
+     WHERE     prs_w.prs_werkplek_key = prs_wb.prs_werkplek_key
+           AND prs_w.prs_werkplek_virtueel = 0
+           AND prs_wb.prs_werkplek_bezetting < 100;
 
 -- Toont alle afdelingen die aan een ruimte gekoppeld zijn
 CREATE_VIEW(cad_v_label_afdelingen, 0)
@@ -128,37 +125,31 @@ SELECT wp.prs_alg_ruimte_key, d.prs_afdeling_naam
 
 CREATE_VIEW(cad_v_label_bewonerwp, 0) (alg_ruimte_key,waarde)
 AS
-   SELECT DISTINCT prs_alg_ruimte_key, waarde
-              FROM (SELECT prs_w.prs_alg_ruimte_key,
-                              CHR (1)
-                           || prs_w.prs_werkplek_volgnr
-                           || ' '
-                           || prs_p.prs_perslid_naam
-                           || DECODE (prs_p.prs_perslid_voorletters, NULL, '', ', ' || prs_p.prs_perslid_voorletters)
-                           || DECODE (prs_p.prs_perslid_voornaam, NULL, '', ' (' || prs_p.prs_perslid_voornaam || ')')
-                           || ': '
-                           || TO_CHAR (NVL (prs_pw.prs_perslidwerkplek_bezetting, 0))
-                           || '%' waarde
-                      FROM prs_werkplek prs_w,
-                           prs_perslidwerkplek prs_pw,
-                           prs_perslid prs_p
-                     WHERE prs_w.prs_werkplek_key = prs_pw.prs_werkplek_key
-                       AND prs_pw.prs_perslid_key IS NOT NULL
-                       AND prs_pw.prs_perslid_key = prs_p.prs_perslid_key
-                    UNION
-                    SELECT   prs_w.prs_alg_ruimte_key,
-                                CHR (1)
-                             || prs_w.prs_werkplek_volgnr
-                             || ' Vrij: '
-                             || TO_CHAR (100 - NVL (SUM (prs_wb.prs_perslidwerkplek_bezetting), 0))
-                             || '%'
-                        FROM prs_werkplek prs_w,
-                             prs_perslidwerkplek prs_wb
-                       WHERE prs_w.prs_werkplek_key = prs_wb.prs_werkplek_key(+)
-                    GROUP BY prs_w.prs_alg_ruimte_key, prs_w.prs_werkplek_key, prs_w.prs_werkplek_volgnr
-                      HAVING SUM (NVL (prs_wb.prs_perslidwerkplek_bezetting, 0)) < 100) DATA
-/
-
+    SELECT DISTINCT prs_alg_ruimte_key, waarde
+      FROM (SELECT prs_w.prs_alg_ruimte_key,
+                      CHR (1)
+                   || prs_w.prs_werkplek_volgnr
+                   || ' '
+                   || prs_p.prs_perslid_naam_friendly
+                   || ' '
+                   || TO_CHAR (NVL (prs_pw.prs_perslidwerkplek_bezetting, 0))
+                   || '%'
+                       waarde
+              FROM prs_werkplek prs_w, prs_perslidwerkplek prs_pw, prs_v_perslid_fullnames prs_p
+             WHERE     prs_w.prs_werkplek_key = prs_pw.prs_werkplek_key
+                   AND prs_pw.prs_perslid_key IS NOT NULL
+                   AND prs_pw.prs_perslid_key = prs_p.prs_perslid_key
+            UNION
+              SELECT prs_w.prs_alg_ruimte_key,
+                        CHR (1)
+                     || prs_w.prs_werkplek_volgnr
+                     || ' '|| initcap(lcl.l('lcl_free'))||' '
+                     || TO_CHAR (100 - NVL (SUM (prs_wb.prs_perslidwerkplek_bezetting), 0))
+                     || '%'
+                FROM prs_werkplek prs_w, prs_perslidwerkplek prs_wb
+               WHERE prs_w.prs_werkplek_key = prs_wb.prs_werkplek_key(+)
+            GROUP BY prs_w.prs_alg_ruimte_key, prs_w.prs_werkplek_key, prs_w.prs_werkplek_volgnr
+              HAVING SUM (NVL (prs_wb.prs_perslidwerkplek_bezetting, 0)) < 100) data;
 
 CREATE_VIEW(CAD_V_THEMA_AANTALWP, 0) (ALG_RUIMTE_KEY, WAARDE)
 AS
@@ -274,26 +265,24 @@ AS
 
 CREATE_VIEW(cad_v_label_bewoner2,0) (alg_ruimte_key, waarde)
 AS
-   SELECT alg_ruimte_key,
-             prs_p.prs_perslid_naam
-          || DECODE (prs_p.prs_perslid_voorletters,
-                     NULL, '',
-                     ', ' || prs_p.prs_perslid_voorletters
-                    )
-          || DECODE (prs_p.prs_perslid_voornaam,
-                     NULL, '',
-                     ' (' || prs_p.prs_perslid_voornaam || ')'
-                    )
-          || '-'
-          || CASE
-                WHEN aantalwp > 1
-                   THEN norm_verband || '/'
-                ELSE ''
-             END
-          || prs_p.prs_perslid_dienstverband
-          || ' FTE'
-     FROM prs_perslid prs_p, prs_v_norm_verband pnv
-    WHERE pnv.prs_perslid_key = prs_p.prs_perslid_key;
+    SELECT alg_ruimte_key,
+              pf.prs_perslid_naam_friendly
+           || '-'
+           || CASE
+                  WHEN aantalwp > 1 AND norm_verband IS NOT NULL THEN norm_verband || '/'
+                  ELSE ''
+              END
+           || CASE
+                  WHEN p.prs_perslid_dienstverband IS NOT NULL
+                  THEN
+                      p.prs_perslid_dienstverband || '%'
+                  ELSE
+                      ''
+              END
+      FROM prs_v_perslid_fullnames pf, prs_perslid p, prs_v_norm_verband pnv
+     WHERE     pf.prs_perslid_key = p.prs_perslid_key
+           AND pnv.prs_perslid_key = p.prs_perslid_key
+           AND p.prs_perslid_verwijder IS NULL;
 
 CREATE OR REPLACE FORCE VIEW PRJ_V_CAD_LABEL_BEWONERWPE
 (
@@ -302,59 +291,48 @@ CREATE OR REPLACE FORCE VIEW PRJ_V_CAD_LABEL_BEWONERWPE
    HIGHLIGHT
 )
 AS
-   SELECT DISTINCT
-          prj_werkplek_key, waarde, DECODE (prj_selectie_key, NULL, 0, 1)
-     FROM (SELECT prj_r.prj_scenario_key,
-                  prs_w.prj_werkplek_key,
-                     prs_p.prs_perslid_naam
-                  || DECODE (prs_p.prs_perslid_voorletters,
-                             NULL, '',
-                             ', ' || prs_p.prs_perslid_voorletters)
-                  || DECODE (prs_p.prs_perslid_voornaam,
-                             NULL, '',
-                             ' (' || prs_p.prs_perslid_voornaam || ')')
-                  || ': '
-                  || TO_CHAR (NVL (prs_pw.prj_perslidwerkplek_bezetting, 0))
-                  || '%'
-                     waarde,
-                  'PRJ_WERKPLEK' label_soort,
-                  prs_pw.prj_werkplek_key label_key
-             FROM PRJ_RUIMTE prj_r,
-                  PRJ_WERKPLEK prs_w,
-                  (SELECT *
-                     FROM PRJ_PERSLIDWERKPLEK
-                    WHERE prj_perslidwerkplek_verwijder IS NULL) prs_pw,
-                  PRS_PERSLID prs_p
-            WHERE     prs_w.prj_werkplek_key = prs_pw.prj_werkplek_key
-                  AND prs_pw.prs_perslid_key IS NOT NULL
-                  AND prs_pw.prs_perslid_key = prs_p.prs_perslid_key
-                  AND prs_w.prj_ruimte_key = prj_r.prj_ruimte_key
-           UNION
-             SELECT -1,
-                    prs_w.prj_werkplek_key,
-                    ' Vrij: '
-                    || TO_CHAR(100
-                               - NVL (
-                                    SUM (prs_wb.prj_perslidwerkplek_bezetting),
-                                    0))
-                    || '%',
-                    'PRJ_WERKPLEK',
-                    prs_w.prj_werkplek_key
-               FROM PRJ_WERKPLEK prs_w,
-                    (SELECT *
-                       FROM PRJ_PERSLIDWERKPLEK
-                      WHERE prj_perslidwerkplek_verwijder IS NULL) prs_wb
-              WHERE prs_w.prj_werkplek_key = prs_wb.prj_werkplek_key(+)
-                    AND prj_werkplek_verwijder IS NULL
-           GROUP BY prs_w.prj_werkplek_key,
-                    prs_w.prj_werkplek_key,
-                    prs_w.prj_werkplek_volgnr
-             HAVING SUM (NVL (prs_wb.prj_perslidwerkplek_bezetting, 0)) < 100)
-          DATA,
-          PRJ_SELECTIE ps
-    WHERE     ps.prj_scenario_key(+) = DATA.prj_scenario_key
-          AND ps.prj_selectie_tabelnaam(+) = label_soort
-          AND ps.prj_selectie_tabelkey(+) = label_key;
+    SELECT DISTINCT prj_werkplek_key, waarde, DECODE (prj_selectie_key, NULL, 0, 1)
+      FROM (SELECT prj_r.prj_scenario_key,
+                   prs_w.prj_werkplek_key,
+                      prs_p.prs_perslid_naam_friendly
+                   || ': '
+                   || TO_CHAR (NVL (prs_pw.prj_perslidwerkplek_bezetting, 0))
+                   || '%'
+                       waarde,
+                   'PRJ_WERKPLEK'
+                       label_soort,
+                   prs_pw.prj_werkplek_key
+                       label_key
+              FROM prj_ruimte               prj_r,
+                   prj_werkplek             prs_w,
+                   (SELECT *
+                      FROM prj_perslidwerkplek
+                     WHERE prj_perslidwerkplek_verwijder IS NULL) prs_pw,
+                   prs_v_perslid_fullnames  prs_p
+             WHERE     prs_w.prj_werkplek_key = prs_pw.prj_werkplek_key
+                   AND prs_pw.prs_perslid_key IS NOT NULL
+                   AND prs_pw.prs_perslid_key = prs_p.prs_perslid_key
+                   AND prs_w.prj_ruimte_key = prj_r.prj_ruimte_key
+            UNION
+              SELECT -1,
+                     prs_w.prj_werkplek_key,
+                        ' Vrij: '
+                     || TO_CHAR (100 - NVL (SUM (prs_wb.prj_perslidwerkplek_bezetting), 0))
+                     || '%',
+                     'PRJ_WERKPLEK',
+                     prs_w.prj_werkplek_key
+                FROM prj_werkplek prs_w,
+                     (SELECT *
+                        FROM prj_perslidwerkplek
+                       WHERE prj_perslidwerkplek_verwijder IS NULL) prs_wb
+               WHERE     prs_w.prj_werkplek_key = prs_wb.prj_werkplek_key(+)
+                     AND prj_werkplek_verwijder IS NULL
+            GROUP BY prs_w.prj_werkplek_key, prs_w.prj_werkplek_key, prs_w.prj_werkplek_volgnr
+              HAVING SUM (NVL (prs_wb.prj_perslidwerkplek_bezetting, 0)) < 100) data,
+           prj_selectie  ps
+     WHERE     ps.prj_scenario_key(+) = data.prj_scenario_key
+           AND ps.prj_selectie_tabelnaam(+) = label_soort
+           AND ps.prj_selectie_tabelkey(+) = label_key;
 
 /* Lijstje met (ALGCAD) wijzigingen op een ruimte
    Kolom FAC_TRACKING_DATUM om een klantspecifieke beperking mogelijk te maken
@@ -443,26 +421,14 @@ CREATE_VIEW(cad_v_label_wp_bewoner, 0)
 AS
     SELECT DISTINCT
            prs_w.prs_werkplek_key,
-           DECODE (
-               prs_p.prs_perslid_voornaam,
-               NULL,
-               DECODE (prs_p.prs_perslid_voorletters,
-                       NULL, '',
-                       prs_p.prs_perslid_voorletters || ' '),
-               prs_p.prs_perslid_voornaam || ' ')
-           || DECODE (prs_p.prs_perslid_tussenvoegsel,
-                      NULL, '',
-                      prs_p.prs_perslid_tussenvoegsel || ' ')
-           || prs_p.prs_perslid_naam
+              prs_p.prs_perslid_naam_friendly
            || CASE
                   WHEN prs_pw.prs_perslidwerkplek_bezetting < 100
                   THEN
                       ' (' || TO_CHAR (NVL (prs_pw.prs_perslidwerkplek_bezetting, 0)) || '%)'
               END
                waarde
-      FROM prs_werkplek prs_w,
-           prs_perslidwerkplek prs_pw,
-           prs_perslid prs_p
+      FROM prs_werkplek prs_w, prs_perslidwerkplek prs_pw, prs_v_perslid_fullnames prs_p
      WHERE     prs_w.prs_werkplek_key = prs_pw.prs_werkplek_key
            AND prs_pw.prs_perslid_key IS NOT NULL
            AND prs_pw.prs_perslid_key = prs_p.prs_perslid_key;
@@ -629,10 +595,10 @@ AS
                 CHR (10)
              || LISTAGG (
                     DECODE (
-                        prs_perslid_naam_friendly,
+                        naam,
                         NULL, '',
                            '[s40]'
-                        || prs_perslid_naam_friendly
+                        || naam
                         || ' ('
                         || TO_CHAR (res_rsv_deel_van, 'HH24:MI')
                         || '-'
@@ -645,65 +611,59 @@ AS
                  waarde1,
                 CHR (10)
              || LISTAGG (
-                    DECODE (
-                        prs_perslid_naam_friendly,
-                        NULL, '',
-                           '[s40]'
-                        || TO_CHAR (res_rsv_deel_van, 'HH24:MI')
-                        || ' '
-                        || prs_perslid_naam_friendly),
+                    DECODE (naam,
+                            NULL, '',
+                            '[s40]' || TO_CHAR (res_rsv_deel_van, 'HH24:MI') || ' ' || naam),
                     CHR (10))
                     WITHIN GROUP (ORDER BY res_rsv_deel_van)
                  waarde2,
                 CHR (10)
-             || LISTAGG (
-                    DECODE (prs_perslid_naam_friendly,
-                            NULL, '',
-                            '[s40]' || prs_perslid_naam_friendly),
-                    CHR (10))
+             || LISTAGG (DECODE (naam, NULL, '', '[s40]' || naam), CHR (10))
                     WITHIN GROUP (ORDER BY res_rsv_deel_van)
                  waarde3,
              LISTAGG (
                  DECODE (
-                     prs_perslid_naam_friendly,
+                     naam,
                      NULL, '',
                         '<span class="body">'
                      || TO_CHAR (res_rsv_deel_van, 'HH24:MI')
                      || ' '
-                     || prs_perslid_naam_friendly
+                     || naam
                      || '</span>'),
                  '<br>')
                  WITHIN GROUP (ORDER BY res_rsv_deel_van)
                  waarde_html,
-             LISTAGG (
-                 DECODE (prs_perslid_naam_friendly,
-                         NULL, '',
-                         '<span class="body">' || prs_perslid_naam_friendly || '</span>'),
-                 '<br>')
+             LISTAGG (DECODE (naam, NULL, '', '<span class="body">' || naam || '</span>'), '<br>')
                  WITHIN GROUP (ORDER BY res_rsv_deel_van)
                  waarde_html2
         FROM res_v_aanwezigdeel isd,
              datums,
              (SELECT datum,
                      res_ins_deel_key,
-                     prs_perslid_naam_friendly,
+                     DECODE (p.prs_perslid_visibility,
+                             1, pf.prs_perslid_naam_friendly,
+                             a.prs_afdeling_omschrijving)
+                         naam,
                      res_rsv_deel_van,
                      res_rsv_deel_tot
                 FROM res_v_aanwezigdeel     r,
                      res_v_aanwezigrsv_deel rrd,
                      res_rsv_ruimte         rrr,
-                     prs_v_perslid_fullnames p,
+                     prs_v_perslid_fullnames pf,
+                     prs_perslid            p,
+                     prs_afdeling           a,
                      datums
                WHERE     r.res_deel_key = rrd.res_deel_key
                      AND rrd.res_rsv_ruimte_key = rrr.res_rsv_ruimte_key
-                     AND rrr.res_rsv_ruimte_host_key = p.prs_perslid_key
+                     AND rrr.res_rsv_ruimte_host_key = pf.prs_perslid_key
+                     AND pf.prs_perslid_key = p.prs_perslid_key
+                     AND p.prs_afdeling_key = a.prs_afdeling_key
                      AND datum >= TRUNC (res_rsv_deel_van)
                      AND datum < TRUNC (res_rsv_deel_tot + 1)) res                          -- Bezet
        WHERE isd.res_ins_deel_key = res.res_ins_deel_key(+) AND datums.datum = res.datum(+)
     GROUP BY datums.datum, isd.res_ins_deel_key, res_deel_omschrijving;
 
 
-
 --
 -- Thema's gebaseerd op objectstatus van objecten binnen ruimte/werkplek (typisch sensoren)
 --

CARE/CARE_VIE.SRC

@@ -5,9 +5,6 @@
  */
 
 
-
-
-/* Formatted on 6-9-2010 18:29:56 (QP5 v5.136.908.31019) */
 CREATE_VIEW( care_v_gemeente, 0)
 AS
    SELECT   gemeente.alg_locatie_key,
@@ -155,7 +152,7 @@ AS
 CREATE OR REPLACE FORCE VIEW CARE_V_AANWEZIG_CLIENT
 AS
    SELECT   prs_client_key,
-   					prs_client_naam,
+   		    prs_client_naam,
             prs_client_tussenvoegsel,
             prs_client_voorletters,
             prs_client_voornaam,
@@ -4742,7 +4739,24 @@ AS
       AND 	uur.mld_opdr_uren_key = ouk.mld_opdr_uren_key
       AND		ouk.mld_kosten_key = k.mld_kosten_key
       AND 	k.mld_kosten_verwijder IS NULL
-      AND 	uur.uren_status = 3;
+      AND 	uur.uren_status = 3
+	  UNION ALL
+SELECT periode,
+       bsn,
+       nr_verzorger,
+          prs_perslid_naam
+       || ','
+       || prs_perslid_voorletters
+       || ' '
+       || prs_perslid_tussenvoegsel    verzorger,
+       prs_perslid_dienstverband,
+       NULL                            mld_kosten_key,
+       kosten_code,
+       kosten_omschrijving,
+       rt.interkm,
+       NULL,
+       datum_gewerkt
+  FROM care_v_reistijden_all rt;
 
 
 
@@ -4772,6 +4786,20 @@ AS
        FROM   care_v_tmp2_auto
    GROUP BY   periode, bsn_verzorger, nr_verzorger, verzorger;
 
+CREATE_VIEW (care_v_rap2_reistijd (periode, bsn_verzorger,nr_verzorger,verzorger,prs_perslid_dienstverband,reistijd ), 0)
+AS
+      SELECT periode,
+             bsn_verzorger,
+             nr_verzorger,
+             verzorger,
+             MIN (prs_perslid_dienstverband),
+             SUM (mld_opdruren_kosten_besteed)             
+        FROM care_v_onkosten2_all
+           WHERE mld_kosten_code = 'T'
+    GROUP BY periode,
+             bsn_verzorger,
+             nr_verzorger,
+             verzorger;
 
 -- mld_kosten_code = 'F', Dit zijn de onkosten voor FIETS gebruik: elke dag dat er gefietst is, telt als 1 (meerdere keren op 1 dag telt ook als 1)
 
@@ -4928,6 +4956,18 @@ SELECT jaar_periode, bsn_verzorger, nr_verzorger, verzorger, prs_perslid_dienstv
      FROM  care_v_periodetabel_2jaar pt, care_v_rap2_bromfiets x
     WHERE      pt.jaar_periode = x.periode;
 
+CREATE_VIEW (care_v_periode_x_reistijd, 0)
+(periode, bsn_verzorger, nr_verzorger, verzorger, prs_perslid_dienstverband, mld_opdruren_kosten_besteed,bsn_periode)
+AS
+    SELECT jaar_periode,
+           bsn_verzorger,
+           nr_verzorger,
+           verzorger,
+           prs_perslid_dienstverband,
+           reistijd,
+           bsn_verzorger || '_' || jaar_periode
+      FROM care_v_periodetabel_2jaar pt, care_v_rap2_reistijd x
+     WHERE pt.jaar_periode = x.periode;
 
 CREATE_VIEW( care_v_salaris_all, 0)
 (periode, bsn_verzorger, nr_verzorger, verzorger, prs_perslid_dienstverband, periode_uren_besteed, werkdagen,ziekte_uren, ziekdagen, verlof_uren, verlofdagen, woonwerk_km, rest_km, fietsdagen, bromfietsdagen)
@@ -5087,7 +5127,20 @@ AS
             'BROMF',
             mld_opdruren_kosten_besteed
      FROM   care_v_periode_x_bromfiets
-    WHERE   mld_opdruren_kosten_besteed != 0;
+    WHERE   mld_opdruren_kosten_besteed != 0
+	 UNION
+    SELECT periode,
+           SYSDATE,
+           bsn_verzorger,
+           nr_verzorger,
+           verzorger,
+           NULL,
+           NULL,
+           NULL,
+           'REISTIJD',
+           ROUND(mld_opdruren_kosten_besteed)
+      FROM care_v_periode_x_reistijd
+     WHERE mld_opdruren_kosten_besteed != 0;
 
 -- Herdefinietie van oorspronkelijk 'care_v_rap_salaris_b' die nog op 6 weken is gebaseerd,
 -- !!Let op: care_v_rap_salaris_b komt in de cust/atch.sql en bons.sql terug!!!
@@ -6020,6 +6073,34 @@ AS
    GROUP BY prs_perslid_key, datum;
 
 
+// De inter-client kilometers slaan we emt een '#' op achteraan de url van mld_opdruren_dagkosten_opm
+// Deze view decodeert dat en moet gebruikt worden in plaats van mld_opdruren_dagkosten
+// Als mld_opdruren_dagkosten een eigen veld mld_opdruren_dag_interkm heeft kan 
+// deze view weer veel simpelere (of zelfs opgedoekt worden)
+CREATE_VIEW(care_v_opdruren_dagkosten, 0)
+AS SELECT
+    mld_opdruren_dagkosten_key,
+    prs_perslid_key,
+    mld_opdruren_dagkosten_datum,
+    mld_opdruren_dagkosten_aantal,
+    mld_opdruren_dagkosten_totaal,
+    CASE
+        WHEN INSTR (mld_opdruren_dagkosten_opm, '#') > 0
+        THEN
+            SUBSTR (mld_opdruren_dagkosten_opm, 1, INSTR (mld_opdruren_dagkosten_opm, '#') - 1)
+        ELSE
+            mld_opdruren_dagkosten_opm
+    END mld_opdruren_dagkosten_opm,
+    mld_opdruren_dagkosten_aanmaak,
+    CASE
+        WHEN INSTR (mld_opdruren_dagkosten_opm, '#') > 0
+        THEN
+            fac.safe_to_number (SUBSTR (mld_opdruren_dagkosten_opm, INSTR (mld_opdruren_dagkosten_opm, '#') + 1))
+        ELSE
+            0
+    END interkm
+FROM mld_opdruren_dagkosten;
+
 CREATE_VIEW( care_v_rap_km_per_periode, 0)
 (
    hide_f_prs_perslid_key,
@@ -6049,7 +6130,7 @@ AS
 				            ROUND((SUM(km.kilometers) - ROUND((SUM(cd.mld_opdruren_dagkosten_totaal+500))/1000))/ROUND((SUM(cd.mld_opdruren_dagkosten_totaal+500))/1000)*100) || ' %'
 				       ELSE 'Onbekend'
 				   END
-   FROM care_v_verzorger_km_per_dag km, mld_opdruren_dagkosten cd
+   FROM care_v_verzorger_km_per_dag km, care_v_opdruren_dagkosten cd
    WHERE km.prs_perslid_key = cd.prs_perslid_key (+)
    AND   km.datum = cd.mld_opdruren_dagkosten_datum (+)
    GROUP BY km.prs_perslid_key, km.jaar, km.periode;
@@ -6086,7 +6167,7 @@ AS
 				            ROUND((SUM(km.kilometers) - ROUND((SUM(cd.mld_opdruren_dagkosten_totaal+500))/1000))/ROUND((SUM(cd.mld_opdruren_dagkosten_totaal+500))/1000)*100) || ' %'
 				       ELSE 'Onbekend'
 				   END
-   FROM care_v_verzorger_km_per_dag km, mld_opdruren_dagkosten cd
+   FROM care_v_verzorger_km_per_dag km, care_v_opdruren_dagkosten cd
    WHERE km.prs_perslid_key = cd.prs_perslid_key (+)
    AND   km.datum = cd.mld_opdruren_dagkosten_datum (+)
    GROUP BY km.prs_perslid_key, km.jaar, km.periode, km.week;
@@ -6213,7 +6294,7 @@ AS
 				   		 ELSE '<a href="' || cd.mld_opdruren_dagkosten_opm || '" target="_blank"><img src="..\..\appl\care\images\googlemaps.png"></a>'
            END,
            km.mld_opdr_uren_key
-   FROM care_v_verzorger_km_per_dag km, mld_opdruren_dagkosten cd
+   FROM care_v_verzorger_km_per_dag km, care_v_opdruren_dagkosten cd
    WHERE km.prs_perslid_key = cd.prs_perslid_key (+)
    AND   km.datum = cd.mld_opdruren_dagkosten_datum (+);
 
@@ -7056,7 +7137,7 @@ AS
                                      TRUNC (
                                          TRUNC (ADD_MONTHS (SYSDATE, LEVEL * -1)),
                                          'Month')),
-                                 'IYYY'))
+                                 'YYYY'))
                          || '-'
                          || (TO_CHAR (
                                  TO_DATE (
@@ -7100,8 +7181,145 @@ AS
              u.uren_beschikking,
              u.product,
              u.tarief
-    ORDER BY u.gemeente, u.periode DESC;                                  
+    ORDER BY u.gemeente, u.periode DESC;
 
+CREATE OR REPLACE VIEW CARE_V_REISTIJDEN_ALL
+(
+    PRS_PERSLID_KEY,
+    PRS_PERSLID_NAAM,
+    PRS_PERSLID_TUSSENVOEGSEL,
+    PRS_PERSLID_VOORLETTERS,
+    PRS_PERSLID_VOORNAAM,
+    BSN,
+    NR_VERZORGER,
+    MEISJESNAAM,
+    GEBOORTEDATUM,
+    ADRES,
+    POSTCODE,
+    TELEFOON_THUIS,
+    TELEFOON_WERK,
+    PRS_PERSLID_MOBIEL,
+    PRS_PERSLID_EMAIL,
+    PRS_PERSLID_DIENSTVERBAND,
+    JAAR,
+    WEEKNR,
+    PERIODENR,
+    PERIODE,
+    MAANDAG_VANDEWEEK,
+    DATUM_GEWERKT,
+    INTERKM,
+    INTERM,
+    KOSTEN_CODE,
+    KOSTEN_OMSCHRIJVING,
+    UREN_STATUS
+)
+AS
+    SELECT DISTINCT
+           verzorger.prs_perslid_key,
+           verzorger.prs_perslid_naam,
+           verzorger.prs_perslid_tussenvoegsel,
+           verzorger.prs_perslid_voorletters,
+           verzorger.prs_perslid_voornaam,
+           (SELECT kl.prs_kenmerklink_waarde
+              FROM prs_kenmerklink kl
+             WHERE     kl.prs_link_key = verzorger.prs_perslid_key
+                   AND kl.prs_kenmerklink_niveau = 'P'
+                   AND kl.prs_kenmerklink_verwijder IS NULL
+                   AND prs_kenmerk_key = 1020)
+               bsn,
+           verzorger.prs_perslid_nr
+               nr_verzorger,
+           (SELECT kl.prs_kenmerklink_waarde
+              FROM prs_kenmerklink kl
+             WHERE     kl.prs_link_key = verzorger.prs_perslid_key
+                   AND kl.prs_kenmerklink_niveau = 'P'
+                   AND kl.prs_kenmerklink_verwijder IS NULL
+                   AND prs_kenmerk_key = 1001)
+               meisjesnaam,
+           (SELECT kl.prs_kenmerklink_waarde
+              FROM prs_kenmerklink kl
+             WHERE     kl.prs_link_key = verzorger.prs_perslid_key
+                   AND kl.prs_kenmerklink_niveau = 'P'
+                   AND kl.prs_kenmerklink_verwijder IS NULL
+                   AND prs_kenmerk_key = 1002)
+               geboortedatum,
+           (SELECT kl.prs_kenmerklink_waarde
+              FROM prs_kenmerklink kl
+             WHERE     kl.prs_link_key = verzorger.prs_perslid_key
+                   AND kl.prs_kenmerklink_niveau = 'P'
+                   AND kl.prs_kenmerklink_verwijder IS NULL
+                   AND prs_kenmerk_key = 1003)
+               adres,
+           (SELECT kl.prs_kenmerklink_waarde
+              FROM prs_kenmerklink kl
+             WHERE     kl.prs_link_key = verzorger.prs_perslid_key
+                   AND kl.prs_kenmerklink_niveau = 'P'
+                   AND kl.prs_kenmerklink_verwijder IS NULL
+                   AND prs_kenmerk_key = 1004)
+               postcode,
+           (SELECT kl.prs_kenmerklink_waarde
+              FROM prs_kenmerklink kl
+             WHERE     kl.prs_link_key = verzorger.prs_perslid_key
+                   AND kl.prs_kenmerklink_niveau = 'P'
+                   AND kl.prs_kenmerklink_verwijder IS NULL
+                   AND prs_kenmerk_key = 1006)
+               telefoon_thuis,
+           verzorger.prs_perslid_telefoonnr
+               telefoon_werk,
+           verzorger.prs_perslid_mobiel,
+           verzorger.prs_perslid_email,
+           verzorger.prs_perslid_dienstverband,
+           TO_NUMBER (
+               TO_CHAR (dk.mld_opdruren_dagkosten_datum, 'IYYY'))
+               jaar,
+           TO_NUMBER (TO_CHAR (dk.mld_opdruren_dagkosten_datum, 'IW'))
+               weeknr,
+           LEAST (
+                 FLOOR (
+                       (TO_CHAR (dk.mld_opdruren_dagkosten_datum, 'IW') - 1)
+                     / 4)
+               + 1,
+               13)
+               periodenr,
+              TO_NUMBER (TO_CHAR (dk.mld_opdruren_dagkosten_datum, 'IYYY'))
+           || '-'
+           || LPAD (
+                  LEAST (
+                        FLOOR (
+                              (  TO_CHAR (dk.mld_opdruren_dagkosten_datum,
+                                          'IW')
+                               - 1)
+                            / 4)
+                      + 1,
+                      13),
+                  2,
+                  '0')
+               periode,
+           (  TRUNC (dk.mld_opdruren_dagkosten_datum)
+            - DECODE (TO_CHAR (dk.mld_opdruren_dagkosten_datum, 'D'),
+                      '1', 8,
+                      TO_CHAR (dk.mld_opdruren_dagkosten_datum, 'D'))
+            + 2)
+               maandag_vandeweek,
+           dk.mld_opdruren_dagkosten_datum
+               datum_gewerkt,
+           dk.interkm/1000,
+           dk.interkm,
+           'T'
+               kosten_code,
+           'Reistijd'
+               kosten_omschrijving,
+           ou.mld_opdr_uren_status
+               uren_status
+      FROM prs_perslid                verzorger,
+           care_v_opdruren_dagkosten  dk,
+           mld_opdr_uren              ou,
+           mld_opdruren_kosten        ok
+     WHERE     dk.prs_perslid_key = verzorger.prs_perslid_key
+           AND ou.prs_perslid_key = dk.prs_perslid_key
+           AND ou.mld_opdr_uren_datum = dk.mld_opdruren_dagkosten_datum
+           AND ok.mld_opdr_uren_key = ou.mld_opdr_uren_key
+           AND  dk.interkm > 0;
 
 REGISTERRUN('$Id$')
 

CND/CND_PAC.SRC

@@ -755,75 +755,82 @@ AS
                v_a7_max
           FROM alg_srtgebouw
          WHERE alg_srtgebouw_key = v_srtgebouw_key;
-          SELECT MAX (
-                     (SELECT km.mld_kenmerkmelding_waarde
-                        FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
-                       WHERE     km.mld_melding_key = g.mld_melding_key
-                             AND k.mld_kenmerk_key = km.mld_kenmerk_key
-                             AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
-                             AND sk.mld_srtkenmerk_code = 'ASPECT1'))
-                     a1,
-                 MAX (
-                     (SELECT km.mld_kenmerkmelding_waarde
-                        FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
-                       WHERE     km.mld_melding_key = g.mld_melding_key
-                             AND k.mld_kenmerk_key = km.mld_kenmerk_key
-                             AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
-                             AND sk.mld_srtkenmerk_code = 'ASPECT2'))
-                     a2,
-                 MAX (
-                     (SELECT km.mld_kenmerkmelding_waarde
-                        FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
-                       WHERE     km.mld_melding_key = g.mld_melding_key
-                             AND k.mld_kenmerk_key = km.mld_kenmerk_key
-                             AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
-                             AND sk.mld_srtkenmerk_code = 'ASPECT3'))
-                     a3,
-                 MAX (
-                     (SELECT km.mld_kenmerkmelding_waarde
-                        FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
-                       WHERE     km.mld_melding_key = g.mld_melding_key
-                             AND k.mld_kenmerk_key = km.mld_kenmerk_key
-                             AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
-                             AND sk.mld_srtkenmerk_code = 'ASPECT4'))
-                     a4,
-                 MAX (
-                     (SELECT km.mld_kenmerkmelding_waarde
-                        FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
-                       WHERE     km.mld_melding_key = g.mld_melding_key
-                             AND k.mld_kenmerk_key = km.mld_kenmerk_key
-                             AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
-                             AND sk.mld_srtkenmerk_code = 'ASPECT5'))
-                     a5,
-                 MAX (
-                     (SELECT km.mld_kenmerkmelding_waarde
-                        FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
-                       WHERE     km.mld_melding_key = g.mld_melding_key
-                             AND k.mld_kenmerk_key = km.mld_kenmerk_key
-                             AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
-                             AND sk.mld_srtkenmerk_code = 'ASPECT6'))
-                     a6,
-                 MAX (
-                     (SELECT km.mld_kenmerkmelding_waarde
-                        FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
-                       WHERE     km.mld_melding_key = g.mld_melding_key
-                             AND k.mld_kenmerk_key = km.mld_kenmerk_key
-                             AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
-                             AND sk.mld_srtkenmerk_code = 'ASPECT7'))
-                     a7
-            INTO v_a1,
-                 v_a2,
-                 v_a3,
-                 v_a4,
-                 v_a5,
-                 v_a6,
-                 v_a7
-            FROM cnd_v_nen2767_srtgebrek g
-           WHERE (gcndusagemodel= 1 OR (gcndusagemodel= 2 AND mld_melding_status <> 5))
-                 AND mld_melding_status <> 2
-                 AND (p_deel_key IS NULL OR g.ins_deel_key = p_deel_key)
-                 AND (p_mld_key IS NULL OR mld_melding_key = p_mld_key)
-        GROUP BY g.ins_deel_key;
+        SELECT MAX(a1),
+               MAX(a2),
+               MAX(a3),
+               MAX(a4),
+               MAX(a5),
+               MAX(a6),
+               MAX(a7)
+          INTO v_a1,
+               v_a2,
+               v_a3,
+               v_a4,
+               v_a5,
+               v_a6,
+               v_a7
+          FROM (  SELECT MAX (
+                             (SELECT km.mld_kenmerkmelding_waarde
+                                FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
+                               WHERE     km.mld_melding_key = g.mld_melding_key
+                                     AND k.mld_kenmerk_key = km.mld_kenmerk_key
+                                     AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
+                                     AND sk.mld_srtkenmerk_code = 'ASPECT1'))
+                             a1,
+                         MAX (
+                             (SELECT km.mld_kenmerkmelding_waarde
+                                FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
+                               WHERE     km.mld_melding_key = g.mld_melding_key
+                                     AND k.mld_kenmerk_key = km.mld_kenmerk_key
+                                     AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
+                                     AND sk.mld_srtkenmerk_code = 'ASPECT2'))
+                             a2,
+                         MAX (
+                             (SELECT km.mld_kenmerkmelding_waarde
+                                FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
+                               WHERE     km.mld_melding_key = g.mld_melding_key
+                                     AND k.mld_kenmerk_key = km.mld_kenmerk_key
+                                     AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
+                                     AND sk.mld_srtkenmerk_code = 'ASPECT3'))
+                             a3,
+                         MAX (
+                             (SELECT km.mld_kenmerkmelding_waarde
+                                FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
+                               WHERE     km.mld_melding_key = g.mld_melding_key
+                                     AND k.mld_kenmerk_key = km.mld_kenmerk_key
+                                     AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
+                                     AND sk.mld_srtkenmerk_code = 'ASPECT4'))
+                             a4,
+                         MAX (
+                             (SELECT km.mld_kenmerkmelding_waarde
+                                FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
+                               WHERE     km.mld_melding_key = g.mld_melding_key
+                                     AND k.mld_kenmerk_key = km.mld_kenmerk_key
+                                     AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
+                                     AND sk.mld_srtkenmerk_code = 'ASPECT5'))
+                             a5,
+                         MAX (
+                             (SELECT km.mld_kenmerkmelding_waarde
+                                FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
+                               WHERE     km.mld_melding_key = g.mld_melding_key
+                                     AND k.mld_kenmerk_key = km.mld_kenmerk_key
+                                     AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
+                                     AND sk.mld_srtkenmerk_code = 'ASPECT6'))
+                             a6,
+                         MAX (
+                             (SELECT km.mld_kenmerkmelding_waarde
+                                FROM mld_kenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk
+                               WHERE     km.mld_melding_key = g.mld_melding_key
+                                     AND k.mld_kenmerk_key = km.mld_kenmerk_key
+                                     AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key
+                                     AND sk.mld_srtkenmerk_code = 'ASPECT7'))
+                             a7
+                    FROM cnd_v_nen2767_srtgebrek g
+                   WHERE (gcndusagemodel= 1 OR (gcndusagemodel= 2 AND mld_melding_status <> 5))
+                         AND mld_melding_status <> 2
+                         AND (p_deel_key IS NULL OR g.ins_deel_key = p_deel_key)
+                         AND (p_mld_key IS NULL OR mld_melding_key = p_mld_key)
+                GROUP BY g.ins_deel_key);
         v_result := getmaxprio (v_a1_max, v_a1, 10);
         v_result := getmaxprio (v_a2_max, v_a2, v_result);
         v_result := getmaxprio (v_a3_max, v_a3, v_result);

CNT/CNT_PAC.SRC

@@ -17,6 +17,7 @@ CREATE OR REPLACE PACKAGE cnt AS
 
   FUNCTION getnieuwsteversiekey(p_key IN NUMBER) RETURN NUMBER;
   FUNCTION sprintf (ps IN VARCHAR2 , p_contract_key IN NUMBER) RETURN VARCHAR2;
+  PROCEDURE remove(p_contract_key IN NUMBER);
 
   PRAGMA RESTRICT_REFERENCES (cnt_contract_status, WNDS, WNPS);
 END cnt;
@@ -231,7 +232,7 @@ CREATE OR REPLACE PACKAGE BODY cnt AS
 
       RETURN 4;
    END;
-   
+
    PROCEDURE splitscontract (p_key IN NUMBER, p_datum IN DATE, p_user IN NUMBER, p_amount NUMBER)
    IS
       begin1 DATE;
@@ -515,6 +516,72 @@ CREATE OR REPLACE PACKAGE BODY cnt AS
       RETURN s;
    END;
 
+   PROCEDURE remove(p_contract_key IN NUMBER)
+   IS
+       CURSOR c_contract IS
+           SELECT cnt_contract_key
+             FROM cnt_contract
+            WHERE cnt_contract_mantel_key = p_contract_key;
+
+       CURSOR c_factuur IS
+           SELECT fin_factuur_key
+             FROM fin_factuur
+            WHERE cnt_contract_key = p_contract_key;
+
+       CURSOR c_bijlagen(p_refkey IN NUMBER) IS
+           SELECT fac_bijlagen_key
+             FROM fac_bijlagen b
+                , cnt_contract r
+            WHERE b.fac_bijlagen_refkey = r.cnt_contract_key
+              AND b.fac_bijlagen_module = 'CNT'
+              AND b.fac_bijlagen_refkey = p_refkey;
+
+   BEGIN
+       -- Verwijder alle subcontracten van dit contract.
+       FOR ref_contract IN c_contract
+       LOOP
+           cnt.remove(ref_contract.cnt_contract_key);
+       END LOOP;
+
+       FOR ref_factuur IN c_factuur
+       LOOP
+           fin.remove(ref_factuur.fin_factuur_key);
+       END LOOP;
+
+       FOR ref_bijlagen IN c_bijlagen(p_contract_key)
+       LOOP
+           flx.deleteflexbijlage (ref_bijlagen.fac_bijlagen_key);
+       END LOOP;
+
+       FOR ref_mldopdr IN (SELECT mld_opdr_key
+                             FROM mld_opdr
+                            WHERE cnt_contract_key = p_contract_key
+                           )
+       LOOP
+           -- Verwijder melding-opdrachten die aan dit contract zitten.
+           mld.remove_opdr(ref_mldopdr.mld_opdr_key);
+       END LOOP;
+
+       DELETE FROM cnt_contract
+        WHERE cnt_contract_key = p_contract_key;
+
+       -- Van de volgende tabellen worden de records die naar deze p_contact_key
+       -- verwijzen met ON DELETE CASCADE ook verwijderd:
+       --  cnt_contract_note
+       --  cnt_contract_object
+       --  cnt_contract_plaats
+       --  cnt_contract_dienst
+       --  cnt_factuurschema
+       --  cnt_kenmerkcontract
+       -- In de volgende tabel wordt cnt_contract_key leeg gemaakt bij het verwijderen van p_contract_key:
+       --  mld_opdr
+
+       fac.remove_tracking('contract', p_contract_key);
+       -- NB:
+       -- Tabel bes_bestelopdr heeft ook een cnt_contract key, maar deze heeft geen referential integrity constraint.
+       -- In geen enkele omgeving is cnt_contract_key in deze tabel ingevuld.
+   END;
+
 END cnt;
 /
 

CNT/CNT_TAB.SRC

@@ -205,7 +205,7 @@ CREATE_TABLE(cnt_contract_object,0)
    CONSTRAINT cnt_k_cnt_contract_object_key PRIMARY KEY
 ,  cnt_contract_key
    NUMBER(10)
-   CONSTRAINT cnt_r_cnt_contract_key_object REFERENCES cnt_contract(cnt_contract_key)
+   CONSTRAINT cnt_r_cnt_contract_key_object REFERENCES cnt_contract(cnt_contract_key) ON DELETE CASCADE
 ,  cnt_ins_srtdeel_key
    NUMBER(10)
    CONSTRAINT cnt_r_ins_srtdeel_key REFERENCES ins_srtdeel(ins_srtdeel_key)
@@ -226,7 +226,7 @@ CREATE_TABLE(cnt_contract_plaats,0)
    CONSTRAINT cnt_k_cnt_contract_plaats PRIMARY KEY
 ,  cnt_contract_key
    NUMBER(10)
-   CONSTRAINT cnt_r_cnt_contract_key_plaats REFERENCES cnt_contract(cnt_contract_key)
+   CONSTRAINT cnt_r_cnt_contract_key_plaats REFERENCES cnt_contract(cnt_contract_key) ON DELETE CASCADE
 ,  cnt_alg_plaats_key
    NUMBER(10)
 ,  cnt_alg_plaats_code
@@ -247,7 +247,7 @@ CREATE_TABLE (CNT_CONTRACT_DIENST,0)
    PRIMARY KEY,
   cnt_contract_key
    NUMBER(10)
-   CONSTRAINT cnt_r_cnt_contract_dienst REFERENCES cnt_contract(cnt_contract_key),
+   CONSTRAINT cnt_r_cnt_contract_dienst REFERENCES cnt_contract(cnt_contract_key) ON DELETE CASCADE,
   mld_stdmelding_key
    NUMBER(10)
    CONSTRAINT cnt_r_cnt_contract_stdmld REFERENCES mld_stdmelding(mld_stdmelding_key),
@@ -269,7 +269,7 @@ ALTER TABLE mld_opdr ADD
 (
     cnt_contract_key
         NUMBER(10)
-        CONSTRAINT mld_r_cnt_contract_key REFERENCES cnt_contract(cnt_contract_key)
+        CONSTRAINT mld_r_cnt_contract_key REFERENCES cnt_contract(cnt_contract_key) ON DELETE SET NULL
 );
 
 ALTER TABLE mld_opdr ADD
@@ -418,7 +418,7 @@ CREATE_TABLE(cnt_factuurschema , 0)
     cnt_contract_key
         NUMBER(10)
         NOT NULL
-        CONSTRAINT cnt_r_cnt_factuurschema1 REFERENCES cnt_contract(cnt_contract_key),
+        CONSTRAINT cnt_r_cnt_factuurschema1 REFERENCES cnt_contract(cnt_contract_key) ON DELETE CASCADE,
     cnt_factuurschema_boekmaand  /* format YYYY-MM */
         VARCHAR2(7),
     cnt_factuurschema_bedrag

COMSQL.H

@@ -21,10 +21,6 @@
  * It is now defined by external macro _DBV
  */
 /* The minimum required software version */
-#define _VERSIONMAJ 2019
-#define _VERSIONMIN 1
-#define _VERSIONPATCH '0'
-#define _VERSION '2019.1.0'
 #define _DBV_STRING _MKSTRING(_DBV)
 
 #define REGISTERONCE(svnid) \
@@ -353,7 +349,7 @@ ELSIF
 
 #define _FAC_MODULE(module,omschrijving) \
  INSERT INTO fac_module (fac_module_name, fac_module_version, fac_module_date, fac_module_remark, fac_module_extern) \
-  VALUES (module,_VERSION,TO_CHAR(SYSDATE,'YYYYMMDD'),omschrijving, 1);
+  VALUES (module,_DBV_STRING,TO_CHAR(SYSDATE,'YYYYMMDD'),omschrijving, 1);
 
 #define APPLICATION_ERROR(code,text)   raise_application_error(code, text)
 

FAC/FAC_INI.SRC

@@ -6,6 +6,7 @@
  *      Register the FAC module
  */
 _FAC_MODULE('FAC', 'lcl_module_FAC')
+_FAC_MODULE('CHT', 'lcl_module_CHT')
 _FAC_MODULE('FAQ', 'lcl_module_FAQ')
 _FAC_MODULE('PDA', 'lcl_module_PDA')
 _FAC_MODULE('UDR', 'lcl_module_UDR')
@@ -17,13 +18,12 @@ INSERT INTO fac_version (fac_version_date, fac_version_lang) VALUES (SYSDATE, 'N
  *      The GENERAL MESSAGES
  *
  */
-DEF_FAC_MESSAGE ('fac_m002', 'Facilitor '_CONCAT _VERSION,'Facilitor '_CONCAT _VERSION);
+DEF_FAC_MESSAGE ('fac_m002', 'Facilitor '_CONCAT _DBV_STRING,'Facilitor '_CONCAT _DBV_STRING);
 
 /* FAC */
 DEF_FAC_MESSAGE ('fac_m001', 'Printvoorbeeld','Preview');
 DEF_FAC_MESSAGE ('fac_m003', 'U heeft geen rechten om Facilitor te gebruiken.','No rights to use Facilitor');
 DEF_FAC_MESSAGE ('fac_m004', 'Er is een probleem opgetreden bij het opstarten van ','Problem starting Facilitor');
-DEF_FAC_MESSAGE ('fac_m005', 'Copyright (c) 1996-2019, Aareon Nederland B.V.', 'Copyright (c) 1996-2019, Aareon  Nederland B.V.');
 DEF_FAC_MESSAGE ('fac_m006', 'Geinstalleerde modules','Installed modules');
 DEF_FAC_MESSAGE ('fac_m007', 'Uitvoer Rapportage','Output Reports');
 DEF_FAC_MESSAGE ('fac_m008', 'Bestandsnaam is niet ingevuld.','Filename not entered.');
@@ -1689,6 +1689,8 @@ DEF_FAC_FUNCTIE3('WEB_CADPRS', 'CAD',  0, 0,    0);  //    0
 DEF_FAC_FUNCTIE3('WEB_CADSCH', 'CAD',  0, 0,    0);  //    0
 DEF_FAC_FUNCTIE3('WEB_CADSLE', 'CAD',  0, 0,    0);  //    0
 DEF_FAC_FUNCTIE3('WEB_CADUSE', 'CAD', 11, 0,    0);  //    0
+DEF_FAC_FUNCTIE3('WEB_CHTOPR', 'CHT',  0, 1,    0);
+DEF_FAC_FUNCTIE3('WEB_CHTREQ', 'CHT',  0, 1,    0);
 DEF_FAC_FUNCTIE3('WEB_CNTFIN', 'CNT',  5, 1,    0);  //    0
 DEF_FAC_FUNCTIE3('WEB_CNTGO1', 'CNT', 11, 1,    0);  //    0
 DEF_FAC_FUNCTIE3('WEB_CNTGO2', 'CNT', 11, 1,    0);  //    0
@@ -1914,10 +1916,12 @@ DEF_FAC_SRTNOT('BEZDO2', 0, 'lcl_noti_BEZDO2', 'bez/bez_afspraak.asp?bez_key=',
 DEF_FAC_SRTNOT('BEZUN2', 0, 'lcl_noti_BEZUN2', 'bez/bez_afspraak.asp?bez_key=', '0', 'bezoeker', 0);
 DEF_FAC_SRTNOT('BEZOUT', 1, 'lcl_noti_BEZOUT', 'bez/bez_afspraak.asp?bez_key=', '0', 'bezoeker', 10);
 DEF_FAC_SRTNOT('BEZOU2', 0, 'lcl_noti_BEZOU2', 'bez/bez_afspraak.asp?bez_key=', '0', 'bezoeker', 10);
+DEF_FAC_SRTNOT('BEZBEZ', 18, 'lcl_noti_BEZBEZ', '', '0', 'afspraak', 10);
 
 DEF_FAC_SRTNOT('MESMES', 1, 'lcl_noti_MESMES', 'msg/msg_message.asp?message_key=', '0', 'message', 10);
 
 DEF_FAC_SRTNOT('FACUSR', 0, 'lcl_noti_FACUSR', '', '0', 'rapport', 10);
+DEF_FAC_SRTNOT('FACTST', 0, 'lcl_noti_FACTST', '', '0', 'perslid', 10);
 
 DEF_FAC_SRTNOT('IMPFAT', 0, 'lcl_noti_IMPFAT', '', '0', null, 10);
 DEF_FAC_SRTNOT('IMPERR', 0, 'lcl_noti_IMPERR', '', '0', null, 10);
@@ -1976,6 +1980,8 @@ DEF_FAC_SRTNOT('ORDVER', 0, 'lcl_noti_ORDVER', 'mld/mld_opdr.asp?opdr_key=', '0'
 DEF_FAC_SRTNOT('ORDSNT', 0, 'lcl_noti_ORDSNT', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
 DEF_FAC_SRTNOT('ORDSNX', 0, 'lcl_noti_ORDSNX', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
 DEF_FAC_SRTNOT('ORDCAN', 0, 'lcl_noti_ORDCAN', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
+DEF_FAC_SRTNOT('ORDCAE', 0, 'lcl_noti_ORDCAE', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
+DEF_FAC_SRTNOT('ORDCAI', 0, 'lcl_noti_ORDCAI', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
 DEF_FAC_SRTNOT('ORDAFR', 0, 'lcl_noti_ORDAFR', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
 DEF_FAC_SRTNOT('ORDGOE', 0, 'lcl_noti_ORDGOE', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
 DEF_FAC_SRTNOT('ORDGNO', 0, 'lcl_noti_ORDGNO', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
@@ -1985,6 +1991,7 @@ DEF_FAC_SRTNOT('ORDOOK', 0, 'lcl_noti_ORDOOK', 'mld/mld_opdr.asp?opdr_key=', '0'
 DEF_FAC_SRTNOT('ORDONO', 0, 'lcl_noti_ORDONO', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
 
 DEF_FAC_SRTNOT('PRSINF', 2, 'lcl_noti_PRSINF', ''                            ,       '0', 'perslid',      10);
+DEF_FAC_SRTNOT('PRSREG', 127, 'lcl_noti_PRSREG', ''                          ,       '0', 'perslid',       0);
 DEF_FAC_SRTNOT('PRSNEW', 0, 'lcl_noti_PRSNEW', 'prs/prs_perslid.asp?prs_key=',       '0', 'perslid',      10);
 DEF_FAC_SRTNOT('PRSUPD', 0, 'lcl_noti_PRSUPD', 'prs/prs_perslid.asp?prs_key=',       '0', 'perslid',      10);
 DEF_FAC_SRTNOT('PRSDEL', 0, 'lcl_noti_PRSDEL', 'prs/prs_perslid.asp?prs_key=',       '0', 'perslid',      10);
@@ -2130,6 +2137,9 @@ INSERT INTO fac_notificatie_job (fac_notificatie_job_view, fac_notificatie_job_o
 INSERT INTO fac_notificatie_job (fac_notificatie_job_view, fac_notificatie_job_oms, fac_notificatie_job_mode, fac_notificatie_job_interval, fac_notificatie_job_flags)
      VALUES ('fac_v_noti_facorderqueuefails', 'Notificatie van problemen bij het versturen van opdrachten.', 2, 24, 0);
 
+-- Eens per dag gaan er mails naar de applicatiebeheerders voor de hardnekkige inlogpogingen
+INSERT INTO fac_notificatie_job (fac_notificatie_job_view, fac_notificatie_job_oms, fac_notificatie_job_mode, fac_notificatie_job_interval, fac_notificatie_job_flags)
+     VALUES ('fac_v_noti_auditfail_day', 'Dagelijkse signaleringen van >5 inlogpogingen', 2, 24, 0);
 
 // Settings hebben fac_functies nodig dus na fac_ini.src
 #include "fac_set.src"
@@ -2522,7 +2532,7 @@ DEF_RAPPORT('WEB_UDRMAN', 32, 'fac_v_udr_faqkenmerk_cnd',      'UDR: Kennisbank
 // fac_menuitems_image      standaardafbeelding
 //
 // ==================================== FRONTEND OPTIES ===========================================
-DEF_MENUKOP(0, 'lcl_menu_fe_mld', 'fa-bell-o');
+DEF_MENUKOP(0, 'lcl_menu_fe_mld', 'fa-bell');
 DEF_MENUITEM(0, 'lcl_menu_mld_fe_1'             , '', 'MLD', 'appl/mld/mld_melding.asp?urole=fe', 1, 0, 'WEB_MLDUSE', 'W', '1', '');
 DEF_MENUITEM(0, 'lcl_menu_mld_fe_2'             , '', 'MLD', 'appl/mld/mld_melding.asp?urole=fe', 0, 0, 'WEB_MLDUSE', 'W', '0', '');
 DEF_MENUITEM(0, 'lcl_menu_mld_fe_overview'      , '', 'MLD', 'appl/mld/mld_search.asp?urole=fe', 0, 0, 'WEB_MLDUSE', 'R', '1', '');
@@ -2553,9 +2563,10 @@ DEF_MENUITEM(0, 'lcl_menu_fac_fiattering_fe'    , '', 'FAC', 'appl/fac/fac_fiatt
 DEF_MENUITEM(0, 'lcl_menu_fe_marktplaats'       , '', 'MRK', 'appl/mrk/mrk_search.asp?urole=fe', 0, 0, 'WEB_MRKUSE', 'R', '0', '');
 DEF_MENUITEM(0, 'lcl_menu_fe_myinfo'            , '', 'FAC', 'appl/fac/fac_user_info.asp', 0, 0, 'WEB_PROFIL', 'R', '1', '');
 DEF_MENUITEM(0, 'lcl_menu_fe_search'            , '', 'FAC', 'appl/fac/prodsearch.asp', 0, 0, 'WEB_MLDUSE', 'R', '1', '');  /* autorisatie? */
+DEF_MENUITEM(0, 'lcl_menu_cht_chatnow'          , '', 'CHT', 'appl/chat/ChatterWant.asp', 0, 1, 'WEB_CHTREQ', 'R', '1', '');
 
 // ==================================== PROFESSIONAL OPTIES =======================================
-DEF_MENUKOP(1, 'lcl_fo', 'fa-user-o');
+DEF_MENUKOP(1, 'lcl_fo', 'fa-user');
 DEF_MENUITEM(1, 'lcl_menu_mld_fo_overview'      , '', 'MLD', 'appl/mld/mld_search.asp?urole=fo', 0, 0, 'WEB_MLDFOF', 'R', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_mld_fo_1'             , '', 'MLD', 'appl/mld/mld_melding.asp?urole=fo', 1, 0, 'WEB_MLDFOF', 'W', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_mld_fo_2'             , '', 'MLD', 'appl/mld/mld_melding.asp?urole=fo', 0, 0, 'WEB_MLDFOF', 'W', '0', '');
@@ -2575,6 +2586,7 @@ DEF_MENUITEM(1, 'lcl_menu_sle_sleutels'         , '', 'SLE', 'appl/sle/sleutel_s
 DEF_MENUITEM(1, 'lcl_menu_sle_cilinders'        , '', 'SLE', 'appl/sle/cilinder_search.asp?urole=fo', 0, 0, 'WEB_SLEFOF', 'W', '0', '');
 DEF_MENUITEM(1, 'lcl_menu_sle_toegangwie'       , '', 'SLE', 'appl/sle/toegang_wie.asp?urole=fo', 0, 0, 'WEB_SLEFOF', 'R', '0', '');
 DEF_MENUITEM(1, 'lcl_menu_sle_toegangwaar'      , '', 'SLE', 'appl/sle/toegang_waar.asp?urole=fo', 0, 0, 'WEB_SLEFOF', 'R', '0', '');
+DEF_MENUITEM(1, 'lcl_menu_cht_incoming'         , '', 'CHT', 'appl/chat/ChatterAccept.asp', 0, 1, 'WEB_CHTOPR', 'W', '1', '');
 
 DEF_MENUKOP(1, 'lcl_bo', 'fa-list-ul');
 DEF_MENUITEM(1, 'lcl_menu_mld_bo_call_center'   , '', 'MLD', 'appl/mld/mld_search.asp?urole=bo', 0, 0, 'WEB_MLDBOF', 'R', '1', '');
@@ -2601,7 +2613,7 @@ DEF_MENUITEM(1, 'lcl_menu_bes_bo_voorraad'      , '', 'BES', 'appl/bes/bes_voorr
 DEF_MENUITEM(1, 'lcl_menu_faq_kennisbank_fo'    , '', 'FAQ', 'appl/fac/fac_faq_search.asp?urole=fo', 0, 0, 'WEB_FAQFOF', 'R', '0', '');
 DEF_MENUITEM(1, 'lcl_menu_mrk_bo_overview'      , '', 'MRK', 'appl/mrk/mrk_search.asp?urole=bo', 0, 0, 'WEB_MRKBOF', 'R', '0', '');
 
-DEF_MENUKOP(1, 'lcl_maninfo', 'fa-bar-chart');
+DEF_MENUKOP(1, 'lcl_maninfo', 'fa-chart-bar');
 DEF_MENUITEM(1, 'lcl_menu_mld_mi'               , '', 'MLD', 'appl/mld/mld_search.asp?urole=mi', 0, 0, 'WEB_MLDBAC', 'R', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_bes_mi'               , '', 'BES', 'appl/bes/bes_search.asp?urole=mi', 0, 0, 'WEB_BESBAC', 'R', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_res_mi'               , '', 'RES', 'appl/res/res_search.asp?urole=mi', 0, 0, 'WEB_RESBAC', 'R', '1', '');
@@ -2609,12 +2621,12 @@ DEF_MENUITEM(1, 'lcl_menu_bez_mi'               , '', 'BEZ', 'appl/bez/bez_searc
 DEF_MENUITEM(1, 'lcl_menu_res_quality'          , '', 'MLD', 'appl/res/res_search_ppi.asp',      0, 0, 'WEB_RESBAC', 'R', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_kpi'                  , '', 'KPI', 'appl/kpi/kpi_search.asp',          0, 0, 'WEB_KPIRAP', 'R', '0', '');
 
-DEF_MENUKOP(1, 'lcl_menu_fac_qlikview', 'fa-pie-chart');
+DEF_MENUKOP(1, 'lcl_menu_fac_qlikview', 'fa-chart-pie');
 DEF_MENUITEM(1, 'lcl_menu_fac_qlikview_mld'     , '', 'FAC', 'appl/qvw/qlikview.asp?module=MLD', 0, 0, 'WEB_MGTRAP', 'R', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_fac_qlikview_bes'     , '', 'FAC', 'appl/qvw/qlikview.asp?module=BES', 0, 0, 'WEB_MGTRAP', 'R', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_fac_qlikview_res'     , '', 'FAC', 'appl/qvw/qlikview.asp?module=RES', 0, 0, 'WEB_MGTRAP', 'R', '1', '');
 
-DEF_MENUKOP(1, 'lcl_bgt', 'fa-money');
+DEF_MENUKOP(1, 'lcl_bgt', 'fa-money-bill');
 DEF_MENUITEM(1, 'lcl_menu_bgt_disciplines_1'    , '', 'BGT', 'appl/bgt/bgt_search.asp?mode=wrap&id={1}&autosearch=1', 0, 1, 'WEB_BGTMAN', 'R', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_bgt_disciplines'      , '', 'BGT', 'appl/bgt/bgt_discipline.asp', 0, 0, 'WEB_BGTMGT', 'W', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_bgt_account'          , '', 'BGT', 'appl/mgt/prs_kostenplaats.asp',            0, 0, 'WEB_BGTMGT', 'W', '1', '');
@@ -2625,7 +2637,7 @@ DEF_MENUITEM(1, 'lcl_menu_bgt_opdracht'         , '', 'BGT', 'appl/bgt/mld_opdr.
 DEF_MENUITEM(1, 'lcl_menu_bgt_factuur'          , '', 'BGT', 'appl/bgt/fin_factuur.asp',                 0, 0, 'WEB_BGTORD', 'W', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_bgt_rapport'          , '', 'BGT', 'appl/fac/fac_reportx.asp',                 0, 0, 'WEB_BGTMAN', 'R', '1', '');
 
-DEF_MENUKOP(1, 'lcl_fin', 'fa-eur');
+DEF_MENUKOP(1, 'lcl_fin', 'fa-euro-sign');
 DEF_MENUITEM(1, 'lcl_menu_fin_kpn_overview'     , '', 'FIN', 'appl/prs/kpn_overview.asp', 0, 0, 'WEB_PRSUSE', 'R', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_fin_fo'               , '', 'FIN', 'appl/fin/fin_factuur.asp?urole=fo', 0, 0, 'WEB_FINFOF', 'W', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_fin_fo_overz'         , '', 'FIN', 'appl/fin/fin_search.asp', 0, 0, 'WEB_FINFOF', 'W', '1', '');
@@ -2649,7 +2661,7 @@ DEF_MENUITEM(1, 'lcl_menu_ins_verbruik'         , '', 'INS', 'appl/ins/ins_verbr
 DEF_MENUITEM(1, 'lcl_menu_ins_outlet'           , '', 'INS', 'appl/ins/outlet.asp', 0, 0, 'WEB_INSMAN', 'W', '0', '');
 DEF_MENUITEM(1, 'lcl_menu_ctr_scenarios'        , '', 'CTR', 'appl/mgt/ctr_scenario.asp', 0, 0, 'WEB_INSMAN', 'W', '1', '');
 
-DEF_MENUKOP(1, 'lcl_fg', 'fa-map-o');
+DEF_MENUKOP(1, 'lcl_fg', 'fa-map');
 DEF_MENUITEM(1, 'lcl_menu_fg'                   , '', 'CAD', 'appl/cad/default.asp', 0, 0, 'WEB_CADUSE', 'R', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_fg_in'                , '', 'CAD', 'appl/cad/default.asp?mode=0', 0, 0, 'WEB_CADUSE', 'R', '0', '');
 DEF_MENUITEM(1, 'lcl_menu_fg_out'               , '', 'CAD', 'appl/cad/default.asp?mode=1', 0, 0, 'WEB_CADUSE', 'R', '0', '');
@@ -2659,7 +2671,7 @@ DEF_MENUITEM(1, 'lcl_menu_prj_bo_scenarios'     , '', 'PRJ', 'appl/prj/prj_searc
 
 // WEB_ALGUSE is lichter, het is beter te verkopen dat je (ook) USE moet hebben om de optie op de portal te krijgen
 // dan dat je MAN nodig zou hebben (denk aan vertrouwelijkere flexkenmerken onder de 100)
-DEF_MENUKOP(1, 'lcl_alg', 'fa-building-o');
+DEF_MENUKOP(1, 'lcl_alg', 'fa-building');
 DEF_MENUITEM(1, 'lcl_menu_alg_browser'          , '', 'ALG', 'appl/alg/alg_search.asp', 0, 0, 'WEB_ALGUSE', 'R', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_alg_regio'            , '', 'ALG', 'appl/alg/alg_regio_search.asp', 0, 0, 'WEB_ALGUSE', 'R', '1', '');
 DEF_MENUITEM(1, 'lcl_menu_alg_district'         , '', 'ALG', 'appl/alg/alg_district_search.asp', 0, 0, 'WEB_ALGUSE', 'R', '1', '');
@@ -2695,7 +2707,7 @@ DEF_MENUKOP(2, 'lcl_facmgt_fac', 'fa-life-ring');
 DEF_MENUITEM(2, 'lcl_Facilitor_Logcentre'       , '', 'FAC', 'https://logcentre.facilitor.nl', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_Facilitor_Forum'           , '', 'FAC', 'http://forum.facilitor.nl', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
 
-DEF_MENUKOP(2, 'lcl_facmgt_alg', 'fa-building-o');
+DEF_MENUKOP(2, 'lcl_facmgt_alg', 'fa-building');
 DEF_MENUITEM(2, 'lcl_menu_alg_gebouwfuncties'   , '', 'ALG', 'appl/mgt/alg_srtgebouw.asp', 0, 0, 'WEB_ALGMSU', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_alg_ruimtefuncties'   , '', 'ALG', 'appl/mgt/alg_srtruimte.asp', 0, 0, 'WEB_ALGMSU', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_alg_ruimtetarieven'   , '', 'ALG', 'appl/alg/alg_ruimtefunctie_search.asp', 0, 0, 'WEB_ALGMSU', 'R', '1', '');
@@ -2786,7 +2798,7 @@ DEF_MENUITEM(2, 'lcl_menu_bes_importeren'       , '', 'BES', 'appl/mgt/fac_impor
 DEF_MENUITEM(2, 'lcl_menu_bes_importfuncties'   , '', 'BES', 'appl/imp/imp_search.asp?catonly=1', 0, 0, 'WEB_IMPORT', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_bes_setting'          , '', 'BES', 'appl/fac/fac_setting_search.asp?module=BES', 0, 0, 'WEB_PRSSYS', 'W', '0', '');
 
-DEF_MENUKOP(2, 'lcl_facmgt_cnt', 'fa-file-text-o');
+DEF_MENUKOP(2, 'lcl_facmgt_cnt', 'fa-file-alt');
 DEF_MENUITEM(2, 'lcl_menu_cnt_contractsoorten'  , '', 'CNT', 'appl/mgt/cnt_discipline.asp', 0, 0, 'WEB_CNTMGT', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_cnt_termijnen'        , '', 'CNT', 'appl/mgt/cnt_termijn.asp', 0, 0, 'WEB_CNTMGT', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_cnt_kenmerken'        , '', 'CNT', 'appl/mgt/cnt_kenmerk.asp', 0, 0, 'WEB_CNTMGT', 'W', '1', '');
@@ -2794,7 +2806,7 @@ DEF_MENUITEM(2, 'lcl_menu_cnt_kenmerksoorten'   , '', 'CNT', 'appl/mgt/cnt_srtke
 DEF_MENUITEM(2, 'lcl_menu_cnt_kenmerkdomeinen'  , '', 'CNT', 'appl/fac/fac_kenmerkdomein_search.asp?fkdmodule=CNT', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_cnt_setting'          , '', 'CNT', 'appl/fac/fac_setting_search.asp?module=CNT', 0, 0, 'WEB_PRSSYS', 'W', '0', '');
 
-DEF_MENUKOP(2, 'lcl_facmgt_fin', 'fa-eur');
+DEF_MENUKOP(2, 'lcl_facmgt_fin', 'fa-euro-sign');
 DEF_MENUITEM(2, 'lcl_menu_fin_kostenplaatsen'   , '', 'FIN', 'appl/mgt/prs_kostenplaats.asp', 0, 0, 'WEB_FINMSU', 'R', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_fin_kostenplaatsgroep', '', 'FIN', 'appl/mgt/prs_kostenplaatsgrp.asp', 0, 0, 'WEB_FINMSU', 'R', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_fin_kostensoorten'    , '', 'FIN', 'appl/mgt/prs_kostensoort.asp', 0, 0, 'WEB_FINMSU', 'W', '1', '');
@@ -2807,7 +2819,7 @@ DEF_MENUITEM(2, 'lcl_menu_fin_kenmerken'        , '', 'FIN', 'appl/mgt/fin_kenme
 DEF_MENUITEM(2, 'lcl_menu_fin_kenmerkdomeinen'  , '', 'FIN', 'appl/fac/fac_kenmerkdomein_search.asp?fkdmodule=FIN', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_fin_setting'          , '', 'FIN', 'appl/fac/fac_setting_search.asp?module=FIN', 0, 0, 'WEB_PRSSYS', 'W', '0', '');
 
-DEF_MENUKOP(2, 'lcl_facmgt_fg', 'fa-map-o');
+DEF_MENUKOP(2, 'lcl_facmgt_fg', 'fa-map');
 DEF_MENUITEM(2, 'lcl_menu_cad_labels'           , '', 'CAD', 'appl/mgt/cad_label.asp', 0, 0, 'WEB_CADMGT', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_cad_themas'           , '', 'CAD', 'appl/mgt/cad_thema.asp', 0, 0, 'WEB_CADMGT', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_cad_legendas'         , '', 'CAD', 'appl/mgt/cad_legenda.asp', 0, 0, 'WEB_CADMGT', 'W', '1', '');
@@ -2838,9 +2850,10 @@ DEF_MENUITEM(2, 'lcl_menu_fac_vrije_dagen'      , '', 'FAC', 'appl/mgt/mld_vrije
 DEF_MENUITEM(2, 'lcl_menu_fac_eigen_tabellen'   , '', 'FAC', 'appl/mgt/fac_usrtab.asp', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_about'                , '', 'FAC', 'appl/fac/about.asp', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
 
-DEF_MENUITEM(2, 'lcl_menu_msg_overzicht'        , '', 'MSG', 'appl/msg/msg_search.asp?urole=bo', 0, 0, 'WEB_MSGBOF', 'R', '1', '');
-DEF_MENUITEM(2, 'lcl_menu_msg_berichten'        , '', 'MSG', 'appl/msg/msg_message.asp?urole=bo', 0, 0, 'WEB_MSGBOF', 'W', '0', '');
+DEF_MENUITEM(2, 'lcl_menu_msg_overzicht'        , '', 'MSG', 'appl/msg/fac_nieuws_search.asp', 0, 0, 'WEB_MSGBOF', 'R', '1', '');
+DEF_MENUITEM(2, 'lcl_menu_msg_bericht_maken'    , '', 'MSG', 'appl/msg/msg_message.asp?urole=bo', 0, 0, 'WEB_MSGBOF', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_fac_notificaties'     , '', 'FAC', 'appl/mgt/fac_srtnotificatie.asp', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
+DEF_MENUITEM(2, 'lcl_menu_cht_chatkanalen'      , '', 'CHT', 'appl/mgt/cht_discipline.asp', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
 
 DEF_MENUITEM(2, 'lcl_menu_fac_menustructuur'    , '', 'FAC', 'appl/fac/fac_menu_search.asp?urole=bo', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_fac_bookmarks'        , '', 'FAC', 'appl/fac/fac_bookmark_list.asp', 0, 0, 'WEB_HLPADM', 'R', '0', '');
@@ -2854,7 +2867,7 @@ DEF_MENUITEM(2, 'lcl_menu_fac_styling'          , '', 'FAC', 'appl/fac/fac_edit_
 DEF_MENUITEM(2, 'lcl_menu_fac_widgets'          , '', 'FAC', 'appl/mgt/fac_widget.asp', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
 DEF_MENUITEM(2, 'lcl_menu_fac_note_group'       , '', 'FAC', 'appl/mgt/fac_note_group.asp', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
 
-DEF_MENUKOPV(2, 99000, 'lcl_facmgt_setup', 'fa-sliders'); // Facilitor-use only
+DEF_MENUKOPV(2, 99000, 'lcl_facmgt_setup', 'fa-sliders-v-square'); // Facilitor-use only
 DEF_MENUENTRY(2, 99010, 'lcl_menu_fac_exporteren'      , '', 'FAC', 'appl/mgt/fac_export_app.asp', 0, 0, 'WEB_FACFAC');
 DEF_MENUENTRY(2, 99020, 'lcl_menu_fac_importeren'      , '', 'FAC', 'appl/mgt/fac_import_app.asp?gen=1', 0, 0, 'WEB_FACFAC');
 DEF_MENUENTRY(2, 99020, 'lcl_menu_admtracking_search'  , '', 'FAC', 'appl/fac/fac_admtracking_search.asp', 0, 0, 'WEB_FACTAB');
@@ -2881,12 +2894,14 @@ DEF_MENUENTRY(2, 99160, 'lcl_menu_fac_refresh_accept'  , '', 'FAC', 'appl/fac/fa
 // Voor een aantal is eigenlijk geen autorisatie vereist; we kiezen dan voor eentje die geen bezwaar kent om authenticatie generiek te controleren
 DEF_MENUITEM(3, 'lcl_mobile_search'             , '', 'FAC', 'appl/pda/productsearch.asp', 0, 0, 'WEB_MLDUSE', 'R', '0',          'fa-search');
 DEF_MENUITEM(3, 'lcl_mobile_lopendezaken'       , '', 'FAC', 'appl/pda/fac_list.asp', 0, 0, 'WEB_MLDUSE', 'R', '1',               'fa-list-ul');
-DEF_MENUITEM(3, 'lcl_mobile_fiattering'         , '', 'FAC', 'appl/pda/fiat_list.asp', 0, 0, 'WEB_MLDUSE', 'R', '1',              'fa-check-square-o');
+DEF_MENUITEM(3, 'lcl_mobile_fiattering'         , '', 'FAC', 'appl/pda/fiat_list.asp', 0, 0, 'WEB_MLDUSE', 'R', '1',              'fa-check-square');
 
 DEF_MENUITEM(3, 'lcl_mobile_doemelding'         , '', 'MLD', 'appl/pda/melding.asp', 0, 0, 'WEB_MLDUSE', 'W', '1',                'fa-exclamation-circle');
-DEF_MENUITEM(3, 'lcl_mobile_doebezoeker'        , '', 'BEZ', 'appl/pda/afspraak.asp', 0, 0, 'WEB_BEZUSE', 'W', '1',               'fa-handshake-o');
-DEF_MENUITEM(3, 'lcl_mobile_doereservering'     , '', 'RES', 'appl/pda/reservering.asp', 0, 0, 'WEB_RESUSE', 'W', '1',            'fa-user-circle-o');
+DEF_MENUITEM(3, 'lcl_mobile_doebezoeker'        , '', 'BEZ', 'appl/pda/afspraak.asp', 0, 0, 'WEB_BEZUSE', 'W', '1',               'fa-handshake');
+DEF_MENUITEM(3, 'lcl_mobile_doereservering'     , '', 'RES', 'appl/pda/reservering.asp', 0, 0, 'WEB_RESUSE', 'W', '1',            'fa-user-circle');
 DEF_MENUITEM(3, 'lcl_mobile_res_voorziening'    , '', 'RES', 'appl/pda/reservering.asp?restype=CV', 0, 0, 'WEB_RESUSE', 'W', '0', 'fa-bicycle');
+DEF_MENUITEM(3, 'lcl_mobile_res_catering'       , '', 'RES', 'appl/pda/reservering.asp?restype=C',  0, 0, 'WEB_RESUSE', 'W', '0', 'fa-coffee');
+DEF_MENUITEM(3, 'lcl_mobile_res_looplijst'      , '', 'RES', 'appl/pda/catering_looplijst.asp',     0, 0, 'WEB_RESUSE', 'W', '0', 'fa-person-carry');
 //DEF_MENUITEM(3, 'lcl_mobile_doebestelling'         , '', 'MLD', 'appl/pda/bestelling.asp', 0, 0, 'WEB_BESUSE', 'W', '0',        'fa-shopping-cart');
 
 DEF_MENUITEM(3, 'lcl_mobile_meldingen'          , '', 'MLD', 'appl/pda/mld_list.asp', 0, 0, 'WEB_MLDBOF', 'R', '1',               'fa-wrench');
@@ -2896,18 +2911,18 @@ DEF_MENUITEM(3, 'lcl_mobile_opdrachten1'        , '', 'MLD', 'appl/pda/orders_li
 DEF_MENUITEM(3, 'lcl_mobile_opdrachten_ext'     , '', 'MLD', 'appl/pda/orders_list.asp', 0, 0, 'WEB_EXTORD', 'R', '1',            'fa-briefcase');
 DEF_MENUITEM(3, 'lcl_mobile_opdrachten2'        , '', 'MLD', 'appl/pda/orders_list.asp', 0, 0, 'WEB_ORDBOF', 'R', '1',            'fa-briefcase');
 DEF_MENUITEM(3, 'lcl_mobile_bezoekers'          , '', 'BEZ', 'appl/pda/bez_list.asp', 0, 0, 'WEB_BEZBOF', 'R', '1',               'fa-users');
-DEF_MENUITEM(3, 'lcl_mobile_contracten'         , '', 'CNT', 'appl/pda/cnt_list.asp', 0, 0, 'WEB_CNTUSE', 'R', '1',               'fa-file-text-o');
-DEF_MENUITEM(3, 'lcl_mobile_objecten'           , '', 'INS', 'appl/pda/ins_list.asp', 0, 0, 'WEB_INSUSE', 'R', '1',               'fa-circle-o');
+DEF_MENUITEM(3, 'lcl_mobile_contracten'         , '', 'CNT', 'appl/pda/cnt_list.asp', 0, 0, 'WEB_CNTUSE', 'R', '1',               'fa-file-alt');
+DEF_MENUITEM(3, 'lcl_mobile_objecten'           , '', 'INS', 'appl/pda/ins_list.asp', 0, 0, 'WEB_INSUSE', 'R', '1',               'fa-circle');
 DEF_MENUITEM(3, 'lcl_mobile_ins_fo'             , '', 'INS', 'appl/pda/ins_list.asp?urole=fo', 0, 0, 'WEB_INSFOF', 'R', '1',      'fa-arrow-circle-up');
 DEF_MENUITEM(3, 'lcl_mobile_planned_act'        , '', 'CTR', 'appl/pda/ins_inspect_list.asp', 0, 0, 'WEB_CTRUSE', 'R', '1',       'fa-repeat');
 DEF_MENUITEM(3, 'lcl_mobile_locaties'           , '', 'ALG', 'appl/pda/locatie_list.asp', 0, 0, 'WEB_ALGMAN', 'R', '0',           'fa-location-arrow');
-DEF_MENUITEM(3, 'lcl_mobile_gebouwen'           , '', 'ALG', 'appl/pda/gebouw_list.asp', 0, 0, 'WEB_ALGMAN', 'R', '0',            'fa-building-o');
+DEF_MENUITEM(3, 'lcl_mobile_gebouwen'           , '', 'ALG', 'appl/pda/gebouw_list.asp', 0, 0, 'WEB_ALGMAN', 'R', '0',            'fa-building');
 DEF_MENUITEM(3, 'lcl_mobile_ruimten'            , '', 'ALG', 'appl/pda/ruimte_list.asp', 0, 0, 'WEB_ALGUSE', 'R', '1',            'fa-map-marker');
-DEF_MENUITEM(3, 'lcl_mobile_plattegronden'      , '', 'CAD', 'appl/pda/verdieping_list.asp', 0, 0, 'WEB_CADUSE', 'R', '1',        'fa-map-o');
+DEF_MENUITEM(3, 'lcl_mobile_plattegronden'      , '', 'CAD', 'appl/pda/verdieping_list.asp', 0, 0, 'WEB_CADUSE', 'R', '1',        'fa-map');
 DEF_MENUITEM(3, 'lcl_mobile_setlocation'        , '', 'FAC', 'appl/pda/setlocation.asp', 0, 0, 'WEB_CADUSE', 'R', '0',            'fa-map-marker');
-DEF_MENUITEM(3, 'lcl_mobile_messages'           , '', 'FAC', 'appl/pda/message_list.asp', 0, 0, 'WEB_MLDUSE', 'R', '0',           'fa-comment-o');
-DEF_MENUITEM(3, 'lcl_mobile_rapporten'          , '', 'FAC', 'appl/pda/reports.asp', 0, 0, 'WEB_USRRAP', 'R', '0',                'fa-file-text');
-DEF_MENUITEM(3, 'lcl_logoff'                    , '', 'FAC', 'appl/pda/logoff_confirm.asp', 0, 0, 'WEB_MLDUSE', 'R', '0',         'fa-fa-window-close-o');
+DEF_MENUITEM(3, 'lcl_mobile_messages'           , '', 'FAC', 'appl/pda/message_list.asp', 0, 0, 'WEB_MLDUSE', 'R', '0',           'fa-comment');
+DEF_MENUITEM(3, 'lcl_mobile_rapporten'          , '', 'FAC', 'appl/pda/reports.asp', 0, 0, 'WEB_USRRAP', 'R', '0',                'fa-file-alt');
+DEF_MENUITEM(3, 'lcl_logoff'                    , '', 'FAC', 'appl/pda/logoff_confirm.asp', 0, 0, 'WEB_MLDUSE', 'R', '0',         'fa-fa-window-close');
 
 DEF_MENUITEM(7, 'lcl_mobile_scanqr'             , '', 'FAC', 'qr:', 0, 0, 'WEB_FACQRC', 'R', '1',                                 'fa-camera');
 

FAC/FAC_LCLHINTS.SRC

@@ -990,9 +990,9 @@ FAC_LCL('hint.ins_tab_discipline.fields',                   '', '')
 FAC_LCL('hint.ins_tab_discipline.foreign',                  '', '')
 FAC_LCL('hint.ins_tab_discipline.includes',                 '', '')
 FAC_LCL('hint.ins_tab_discipline.module',                   '', '')
-FAC_LCL('hint.ins_tab_discipline.name',                     'De naam van de vakgroep. Deze moet uniek zijn.', 'Name of the discipline. The name must be unique')
+FAC_LCL('hint.ins_tab_discipline.name',                     'De naam van de discipline. Deze moet uniek zijn.', 'Name of the discipline. The name must be unique')
 FAC_LCL('hint.ins_tab_discipline.outertoggle',              '', '')
-FAC_LCL('hint.ins_tab_discipline.remark',                   '', '')
+FAC_LCL('hint.ins_tab_discipline.remark',                   'De tekst die een gebruiker te zien krijgt bij een mouse over.', 'The text that a user will see with a mouse over.')
 FAC_LCL('hint.ins_tab_discipline.satisfactionpercentage',   '', '')
 FAC_LCL('hint.ins_tab_discipline.satisfactionthreshold',    '', '')
 FAC_LCL('hint.ins_tab_discipline.scope',                    '', '')
@@ -1185,7 +1185,7 @@ FAC_LCL('hint.mld_stdmelding.disciplines',                  '', '')
 FAC_LCL('hint.mld_stdmelding.disciplinetype',               '', '')
 FAC_LCL('hint.mld_stdmelding.enddateempty',                 'Indien aangevinkt wordt de einddatum van de opdracht leeggelaten', 'When checked the enddate will be left empty.')
 FAC_LCL('hint.mld_stdmelding.expires',                      'Als een meldingsoort niet meer gebruikt kan worden, kan hier de vervaldatum (dd-mm-jjjj) ingevuld worden. Bij nieuwe meldingen is de meldingsoort vanaf die datum niet meer zichtbaar. Het verschil met verwijderen is dat wanneer er een vervaldatum ingevuld is, de managementinformatie beschikbaar blijft.', 'If a call no longer should be used, an expiration date (dd-mm-yyyy) can be filled in. New calls cannot be created from this date. As long as expired calls are not deleted their information is still access able at management info.')
-FAC_LCL('hint.mld_stdmelding.externallink',                 'Hier kan een URL (bv. https://www.facilitor.nl) worden opgegeven. Indien gebruik gemaakt wordt van harmonica<63>s wordt bij het kiezen van deze melding deze link aangeroepen in plaats van dat er een melding in Facilitor wordt aangemaakt. Meestal wil je dit niet maar wanneer je Facilitor gebruikt als het belangrijkste portaal voor de gebruikers kan het prettig zijn om de toegang naar <20>meldingen<65> in een ander systeem centraal te regelen. NB: als hier een link is ingevuld zijn alle overige gegevens met uitzondering van Vakgroep, Omschrijving en Symbool niet meer van toepassing. Uiteraard worden melding die via deze link worden behandeld niet vanzelf in Facilitor opgenomen en maken ze geen deel uit van de bewaking, notificaties en rapportages. Standaardmeldingen met een externe link kunnen niet uit keuzelijstje gekozen worden, alleen via de harmonica of de zoekfunctie. Tip: wil je juist niet dat deze link in een tabblad van Facilitor wordt geopend maar in een eigen pagina van je browser, dan kan dat door de link met een * te laten beginnen, dus bv. *http://www.facilitor.nl.', 'A URL (eg https://www.facilitor.nl) can be specified here. If harmonicas are used, this link will be invoked when choosing this message instead of a message being created in Facilitor. Usually you do not want this, but when you use Facilitor as the main portal for users, it can be nice to centrally control access to "notifications" in another system. Note: if a link is entered here, all other details with the exception of Department, Description and Symbol no longer apply. Naturally, reports that are handled via this link are not automatically included in Facilitor and do not form part of the monitoring, notifications and reports. Standard messages with an external link cannot be selected from the selection list, only via the harmonica or the search function. Tip: if you do not want this link to be opened in a tab of Facilitor but in its own page of your browser, you can do so by having the link start with a *, so eg * http: //www.facilitor. NL.')
+FAC_LCL('hint.mld_stdmelding.externallink',                 'Hier kan een URL (bv. https://www.facilitor.nl) worden opgegeven. Indien gebruik gemaakt wordt van harmonica<63>s wordt bij het kiezen van deze melding deze link aangeroepen in plaats van dat er een melding in Facilitor wordt aangemaakt. Meestal wil je dit niet maar wanneer je Facilitor gebruikt als het belangrijkste portaal voor de gebruikers kan het prettig zijn om de toegang naar <20>meldingen<65> in een ander systeem centraal te regelen. NB: als hier een link is ingevuld zijn alle overige gegevens met uitzondering van Vakgroep, Omschrijving en Symbool niet meer van toepassing. Uiteraard worden melding die via deze link worden behandeld niet vanzelf in Facilitor opgenomen en maken ze geen deel uit van de bewaking, notificaties en rapportages. Standaardmeldingen met een externe link kunnen niet uit keuzelijstje gekozen worden, alleen via de harmonica of de zoekfunctie. Tip: wil je juist niet dat deze link in een tabblad van Facilitor wordt geopend maar in een eigen pagina van je browser, dan kan dat door de link met een * te laten beginnen, dus bv. *https://www.facilitor.nl.', 'A URL (eg https://www.facilitor.nl) can be specified here. If harmonicas are used, this link will be invoked when choosing this message instead of a message being created in Facilitor. Usually you do not want this, but when you use Facilitor as the main portal for users, it can be nice to centrally control access to "notifications" in another system. Note: if a link is entered here, all other details with the exception of Department, Description and Symbol no longer apply. Naturally, reports that are handled via this link are not automatically included in Facilitor and do not form part of the monitoring, notifications and reports. Standard messages with an external link cannot be selected from the selection list, only via the harmonica or the search function. Tip: if you do not want this link to be opened in a tab of Facilitor but in its own page of your browser, you can do so by having the link start with a *, so eg * http: //www.facilitor. NL.')
 FAC_LCL('hint.mld_stdmelding.fixedmalus',                   'Indien van toepassing in uw organisatie, kunt u hier een vaste malus invoeren voor als SLA-normen overschreden worden.', 'If applicable you can enter a fixed malus if SLA is exceeded.')
 FAC_LCL('hint.mld_stdmelding.foreign',                      '', '')
 FAC_LCL('hint.mld_stdmelding.freetext',                     'Hier kan aangegeven worden of de omschrijving verplicht ingevuld moet worden, niet ingevuld moet worden, evt optioneel ingevuld moet worden. ', 'Here you can indicate whether the discription must be filled in, not filled in, and possibly filled in optionally.')

FAC/FAC_PAC.SRC

@@ -106,20 +106,21 @@ CREATE OR REPLACE PACKAGE fac
     PROCEDURE imp_mld_delete_mld (p_import_key IN NUMBER, p_mode IN NUMBER);
     PROCEDURE fac_perfmon_incr(limiet IN NUMBER, zwaarte IN NUMBER);
     PROCEDURE putnotificationprio (pfrom NUMBER, pto NUMBER, pmessage VARCHAR2, pmode NUMBER,
-                                   poptemail VARCHAR2, poptmobile VARCHAR2, pprio NUMBER, pattach VARCHAR2 DEFAULT NULL);
+                                   poptemail VARCHAR2, poptmobile VARCHAR2, pprio NUMBER, pattach VARCHAR2 DEFAULT NULL, pbedrijfadreskey NUMBER DEFAULT NULL, pqueue VARCHAR DEFAULT 'DEFAULT');
     PROCEDURE putnotification (pfrom NUMBER, pto NUMBER, pmessage VARCHAR2, pmode NUMBER,
                                poptemail VARCHAR2, poptmobile VARCHAR2);
     PROCEDURE putsystemnotification (pmessage VARCHAR2, pmode NUMBER);
     PROCEDURE putnotificationsrtprio (pfrom NUMBER, pto NUMBER, pcode VARCHAR2, pref NUMBER,
               poptmessage VARCHAR2, poptstatus NUMBER, poptemail VARCHAR2, poptmobile VARCHAR2, pxref NUMBER,
-              pprio NUMBER, psender VARCHAR2, pattach VARCHAR2 DEFAULT NULL);
+              pprio NUMBER, psender VARCHAR2, pattach VARCHAR2 DEFAULT NULL, pbedrijfadreskey NUMBER DEFAULT NULL, pqueue VARCHAR DEFAULT 'DEFAULT');
     PROCEDURE clrnotifications (pcode VARCHAR2, pref NUMBER, pxref NUMBER DEFAULT NULL, puitz VARCHAR2 DEFAULT NULL, puitz2 VARCHAR2 DEFAULT NULL);
     PROCEDURE clrnotifications (pcode VARCHAR2, pref NUMBER, psubject VARCHAR2, preceiver NUMBER, pextrakey NUMBER);
     PROCEDURE clrnotifications_xmlnode (pxmlnode VARCHAR2, prefkey NUMBER);
     PROCEDURE clrtracking_xmlnode (pxmlnode VARCHAR2, prefkey NUMBER);
-    PROCEDURE putnotificationjobs (pcust VARCHAR2);
-    PROCEDURE putjobnotifications (pviewname VARCHAR2, pmode NUMBER, pflags NUMBER);
-    FUNCTION getMobile  ( pkey IN NUMBER ) RETURN VARCHAR2;
+    PROCEDURE putnotificationjobs (pqueue VARCHAR2 DEFAULT 'DEFAULT');
+    PROCEDURE putjobnotifications (pviewname VARCHAR2, pmode NUMBER, pflags NUMBER, pqueue VARCHAR DEFAULT 'DEFAULT');
+    FUNCTION getEmail  ( pkey IN NUMBER ) RETURN VARCHAR2;
+    FUNCTION getMobile ( pkey IN NUMBER ) RETURN VARCHAR2;
     PROCEDURE fac_nightly;
     PROCEDURE fac_daily;
     PROCEDURE fac_weekly;
@@ -135,7 +136,7 @@ CREATE OR REPLACE PACKAGE fac
     FUNCTION gettrackinguserkey (peventcode IN VARCHAR2, pkey IN number) RETURN number;
     PROCEDURE initsession (flcode IN VARCHAR2);
     PROCEDURE initsession (pkey NUMBER, flcode IN VARCHAR2, usertimezone IN VARCHAR2);
-    PROCEDURE registerversion (pmaj IN NUMBER, pmin IN NUMBER, ppatch IN VARCHAR2, pschema IN VARCHAR2, plang IN VARCHAR2);
+    PROCEDURE registerversion (pschema IN VARCHAR2, plang IN VARCHAR2);
     PROCEDURE registercustversion (pcustid IN VARCHAR2, pcustnr IN NUMBER);
     FUNCTION getdbversion RETURN VARCHAR2;
     FUNCTION getDefaultBehandelgroep(p_stdm IN NUMBER) RETURN NUMBER;
@@ -149,6 +150,11 @@ CREATE OR REPLACE PACKAGE fac
     FUNCTION testhash (p_hash VARCHAR2, p_in VARCHAR2) RETURN NUMBER;
     PROCEDURE createlikebookmark (pxmlnode VARCHAR2, prefkey NUMBER);
     PROCEDURE sequence_nextval(p_seqname IN VARCHAR2, p_initval IN NUMBER DEFAULT 1, p_initexpire IN DATE DEFAULT NULL);
+    PROCEDURE remove_tracking(p_xmlnode IN VARCHAR2, p_refkey IN NUMBER);
+    FUNCTION exceeds_profiel (p_bestelbedrag IN NUMBER, p_prs_key IN NUMBER, p_disc_key IN NUMBER) RETURN BOOLEAN;
+    FUNCTION exceeds_pgb (p_opdrachtbedrag IN NUMBER, p_prs_key IN NUMBER, p_disc_key IN NUMBER, disc_params_pgb IN NUMBER) RETURN BOOLEAN;
+    FUNCTION exceeds_agb (p_opdrachtbedrag IN NUMBER, p_kp_key IN NUMBER, p_disc_key IN NUMBER, disc_params_pgb IN NUMBER) RETURN BOOLEAN;
+    PROCEDURE fac_cleanup;
 END fac;
 /
 
@@ -960,10 +966,10 @@ CREATE OR REPLACE PACKAGE BODY fac AS
       CURSOR old_rap
       IS
           SELECT fac_usrrap_cols_key          column_id
-               , fac_usrrap_cols_volgnr
+               , fac_usrrap_cols_volgnr       column_seq
                , fac_usrrap_cols_column_name  column_name
-               , fac_usrrap_cols_caption
-               , fac_usrrap_cols_filter
+               , fac_usrrap_cols_caption      column_caption
+               , fac_usrrap_cols_filter       column_filter
                , fac_usrrap_cols_datatype     column_datatype
             FROM fac_usrrap_cols
            WHERE fac_usrrap_key = p_usrrap_key
@@ -988,6 +994,9 @@ CREATE OR REPLACE PACKAGE BODY fac AS
            WHERE table_name = UPPER(cp_viewname)
            ORDER BY column_id;
 
+      TYPE t_rap_col IS VARRAY(200) OF old_rap%ROWTYPE;
+
+
       v_error_nr        NUMBER;
       v_viewname        fac_usrrap.fac_usrrap_view_name%TYPE;
       v_procname        fac_usrrap.fac_usrrap_view_name%TYPE;
@@ -1005,6 +1014,12 @@ CREATE OR REPLACE PACKAGE BODY fac AS
       v_column_caption  fac_usrrap_cols.fac_usrrap_cols_caption%TYPE;
       v_column_visible  fac_usrrap_cols.fac_usrrap_cols_visible%TYPE;
       v_column_filter   fac_usrrap_cols.fac_usrrap_cols_filter%TYPE;
+
+      v_rap_cols        t_rap_col := t_rap_col();
+      v_column_prev     fac_usrrap_cols.fac_usrrap_cols_column_name%TYPE;
+      v_newkey          fac_usrrap_cols.fac_usrrap_cols_key%TYPE;
+      v_index           NUMBER := 0;
+
   BEGIN
       BEGIN
           SELECT SUBSTR(fac_usrrap_view_name, INSTR(fac_usrrap_view_name, '.')+1) viewname
@@ -1085,6 +1100,15 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                       END LOOP;
                   END IF;
                   --
+                  -- Vul array met de huidige volgorde van kolommen
+                  FOR rap_col IN old_rap
+                  LOOP
+                      v_index := v_index + 1;
+                      v_rap_cols.EXTEND;
+                      v_rap_cols(v_index) := rap_col;
+                  END LOOP;
+                  v_column_prev := '';
+                  --
                   -- Nieuwe en gewijzigde kolommen
                   FOR c_new IN new_rap(v_viewname)
                   LOOP
@@ -1170,8 +1194,33 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                           , v_column_filter
                           , c_new.column_datatype
                           , v_column_visible
-                          );
+                          )
+                          RETURNING fac_usrrap_cols_key
+                          INTO v_newkey;
+                          --
+                          -- Voeg nieuwe kolom toe aan array op de juiste plaats.
+                          v_rap_cols.EXTEND;
+                          FOR i IN REVERSE v_rap_cols.FIRST .. v_rap_cols.LAST
+                          LOOP
+                              IF ((i=1) OR (v_rap_cols(i-1).column_name = v_column_prev))
+                              THEN
+                                  v_rap_cols(i).column_name := c_new.column_name;
+                                  v_rap_cols(i).column_id := v_newkey;
+                                  EXIT;
+                              ElSE
+                                  v_rap_cols(i) := v_rap_cols(i-1);
+                              END IF;
+                          END LOOP;
+
                       END IF;
+                      v_column_prev := c_new.column_name;
+                  END LOOP;
+                  -- Volgorde van kolommen opnieuw vastleggen.
+                  FOR i IN v_rap_cols.FIRST .. v_rap_cols.LAST
+                  LOOP
+                      UPDATE fac_usrrap_cols
+                         SET fac_usrrap_cols_volgnr = i * 10
+                       WHERE fac_usrrap_cols_key = v_rap_cols(i).column_id;
                   END LOOP;
                   -- Update lastrefresh.
                   UPDATE fac_usrrap
@@ -1897,7 +1946,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
    END;
 
    -- Retourneert string met emailadres van persoon pkey, '' indien niet beschikbaar
-   FUNCTION getemail (pkey IN NUMBER)
+   FUNCTION getEmail (pkey IN NUMBER)
       RETURN VARCHAR2
    IS
       lemail   prs_perslid.prs_perslid_email%TYPE;
@@ -1970,7 +2019,8 @@ CREATE OR REPLACE PACKAGE BODY fac AS
    -- In plaats van pto (een intern prs_perslid) kan optioneel ook expliciete adressering worden meegegeven.
    -- Bij een interne ontvanger wordt diens taal bijgezocht.
    PROCEDURE putnotificationprio (pfrom NUMBER, pto NUMBER, pmessage VARCHAR2, pmode NUMBER,
-                                  poptemail VARCHAR2, poptmobile VARCHAR2, pprio NUMBER, pattach VARCHAR2 DEFAULT NULL)
+                                  poptemail VARCHAR2, poptmobile VARCHAR2, pprio NUMBER, pattach VARCHAR2 DEFAULT NULL,
+                                  pbedrijfadreskey NUMBER DEFAULT NULL, pqueue VARCHAR DEFAULT 'DEFAULT')
    AS
       lemail   prs_perslid.prs_perslid_email%TYPE;
       lphone   prs_perslid.prs_perslid_mobiel%TYPE;
@@ -2023,17 +2073,17 @@ CREATE OR REPLACE PACKAGE BODY fac AS
         lmode := BITAND(lmode, 255-4);
       END IF;
 
-      IF lmode > 0 OR lsysteem IS NOT NULL THEN
+      IF lmode > 0 OR lsysteem IS NOT NULL OR pbedrijfadreskey IS NOT NULL THEN
       INSERT INTO fac_notificatie
                   (fac_srtnotificatie_key, fac_notificatie_status, prs_perslid_key_sender, prs_perslid_key_receiver,
                    fac_notificatie_receiver_email, fac_notificatie_receiver_phone, fac_notificatie_oms,
                    fac_notificatie_refkey, fac_notificatie_prioriteit, fac_notificatie_lang, fac_notificatie_systeemadres,
-                   fac_notificatie_attachments
+                   fac_notificatie_attachments, prs_bedrijfadres_key, fac_notificatie_queue
                   )
            VALUES (NULL, lmode, pfrom, pto,
                    lemail, lphone, SUBSTR(pmessage, 1, 2048),
                    NULL, pprio, llang, lsysteem,
-                   pattach
+                   pattach, pbedrijfadreskey, pqueue
                   );
       END IF;
    END;
@@ -2082,7 +2132,9 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                                      pxref          NUMBER,
                                      pprio          NUMBER,
                                      psender        VARCHAR2,
-                                     pattach        VARCHAR2 DEFAULT NULL)
+                                     pattach        VARCHAR2 DEFAULT NULL,
+                                     pbedrijfadreskey NUMBER DEFAULT NULL,
+                                     pqueue VARCHAR DEFAULT 'DEFAULT')
    AS
       soms         fac_srtnotificatie.fac_srtnotificatie_oms%TYPE;
       smode        fac_srtnotificatie.fac_srtnotificatie_mode%TYPE;
@@ -2138,7 +2190,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                -- Wel status meegegeven; die is dan vast
                -- Als status=2 en pcode=xxxMAI, dan moet de mail altijd vertuurd worden.
                smode := poptstatus;
-               IF SUBSTR(pcode, -3) = 'MAI' AND poptstatus = 2
+               IF ((SUBSTR(pcode, -3) = 'MAI' AND poptstatus = 2) OR pcode = 'PRSREG')
                THEN
                  immediate := 1;
                END IF;
@@ -2320,7 +2372,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
          END IF;
       END IF;
 
-      IF lmode > 0 OR lsysteem IS NOT NULL
+      IF lmode > 0 OR lsysteem IS NOT NULL OR pbedrijfadreskey IS NOT NULL
       THEN
          -- Stuur notificatie.
          INSERT INTO fac_notificatie (fac_srtnotificatie_key,
@@ -2336,7 +2388,9 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                                       fac_notificatie_sender_email,
                                       fac_notificatie_lang,
                                       fac_notificatie_systeemadres,
-                                      fac_notificatie_attachments)
+                                      fac_notificatie_attachments,
+                                      prs_bedrijfadres_key,
+                                      fac_notificatie_queue)
              VALUES (skey,
                      lmode,
                      pfrom,
@@ -2350,7 +2404,9 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                      psender,
                      llang,
                      lsysteem,
-                     pattach);
+                     pattach,
+                     pbedrijfadreskey,
+                     pqueue);
       END IF;
    END;
 
@@ -2425,21 +2481,24 @@ CREATE OR REPLACE PACKAGE BODY fac AS
    END;
 
    -- Kijk welke jobs gescheduled zijn en nu uitgevoerd moeten worden.
-   PROCEDURE putnotificationjobs (pcust VARCHAR2)
+   -- Dit kan ook voor een specifieke jobqueue (niet voor meerdere queue's tegelijk)
+   PROCEDURE putnotificationjobs (pqueue VARCHAR2 DEFAULT 'DEFAULT')
    AS
       CURSOR c1
       IS
          SELECT fac_notificatie_job_key, fac_notificatie_job_view, fac_notificatie_job_oms,
                 fac_notificatie_job_interval, fac_notificatie_job_mode, fac_notificatie_job_nextrun,
-                fac_notificatie_job_flags
+                fac_notificatie_job_flags, fac_notificatie_job_seconds
            FROM fac_notificatie_job
-          WHERE fac_notificatie_job_nextrun <= SYSDATE OR fac_notificatie_job_nextrun IS NULL;           -- eerste keer
+          WHERE (fac_notificatie_job_nextrun <= SYSDATE OR fac_notificatie_job_nextrun IS NULL) -- eerste keer
+            AND fac_notificatie_job_queue = pqueue;
        tnextrun fac_notificatie_job.fac_notificatie_job_nextrun%TYPE;
    BEGIN
       FOR rec1 IN c1
       LOOP
          -- Voer de job uit
-         putjobnotifications (rec1.fac_notificatie_job_view, rec1.fac_notificatie_job_mode, rec1.fac_notificatie_job_flags);
+         putjobnotifications (rec1.fac_notificatie_job_view, rec1.fac_notificatie_job_mode, rec1.fac_notificatie_job_flags, pqueue);
+
          UPDATE fac_notificatie_job
             SET fac_notificatie_job_lastrun = SYSDATE
           WHERE fac_notificatie_job_key = rec1.fac_notificatie_job_key;
@@ -2451,12 +2510,23 @@ CREATE OR REPLACE PACKAGE BODY fac AS
 
          WHILE tnextrun <= SYSDATE
          LOOP
-            -- Interval in hrs, DATE arithmetics are in days, so we will have to divide by 24 hrs a day
-            UPDATE fac_notificatie_job
-               SET fac_notificatie_job_nextrun =
-                                 COALESCE (fac_notificatie_job_nextrun, SYSDATE)
-                                 + rec1.fac_notificatie_job_interval / 24
-             WHERE fac_notificatie_job_key = rec1.fac_notificatie_job_key;
+            IF rec1.fac_notificatie_job_interval IS NOT NULL AND rec1.fac_notificatie_job_interval > 0
+            THEN
+                -- Notify-interval in hrs, DATE arithmetics are in days, so we will have to divide by 24 hrs a day
+                UPDATE fac_notificatie_job
+                   SET fac_notificatie_job_nextrun =
+                                     COALESCE (fac_notificatie_job_nextrun, SYSDATE)
+                                     + rec1.fac_notificatie_job_interval / 24
+                 WHERE fac_notificatie_job_key = rec1.fac_notificatie_job_key;
+            ELSIF rec1.fac_notificatie_job_seconds IS NOT NULL AND rec1.fac_notificatie_job_seconds > 0
+            THEN
+                -- Command-interval in seconds, DATE arithmetics are in days, so we will have to divide by 24*60*60 seconds a day
+                UPDATE fac_notificatie_job
+                   SET fac_notificatie_job_nextrun =
+                                     COALESCE (fac_notificatie_job_nextrun, SYSDATE)
+                                     + rec1.fac_notificatie_job_seconds / (24*60*60)
+                 WHERE fac_notificatie_job_key = rec1.fac_notificatie_job_key;
+            END IF;
 
             SELECT fac_notificatie_job_nextrun
               INTO tnextrun
@@ -2466,79 +2536,92 @@ CREATE OR REPLACE PACKAGE BODY fac AS
       END LOOP;
    END;
 
-   -- Voer nu job pcode uit.
-   PROCEDURE putjobnotifications (pviewname VARCHAR2, pmode NUMBER, pflags NUMBER)
+   -- Voer nu job met pviewname uit, die kennelijk nu aan de beurt is
+   PROCEDURE putjobnotifications (pviewname VARCHAR2, pmode NUMBER, pflags NUMBER, pqueue VARCHAR DEFAULT 'DEFAULT')
    AS
        TYPE noticursortype IS REF CURSOR;
 
-       messages      noticursortype;
-       lsender       fac_notificatie.prs_perslid_key_sender%TYPE;
-       lreceiver     fac_notificatie.prs_perslid_key_receiver%TYPE;
-       ltext         fac_notificatie.fac_notificatie_oms%TYPE;
-       lcode         fac_srtnotificatie.fac_srtnotificatie_code%TYPE;
-       lsrt_key      fac_srtnotificatie.fac_srtnotificatie_key%TYPE;
-       lrefkey       fac_notificatie.fac_notificatie_refkey%TYPE;
-       lxkey         fac_notificatie.fac_notificatie_extrakey%TYPE;
-       lxsender      fac_notificatie.fac_notificatie_sender_email%TYPE;
-       lxemail       fac_notificatie.fac_notificatie_receiver_email%TYPE;
-       lxmobile      fac_notificatie.fac_notificatie_receiver_phone%TYPE;
-       attachments   fac_notificatie.fac_notificatie_attachments%TYPE;
+       messages           noticursortype;
+       lsender            fac_notificatie.prs_perslid_key_sender%TYPE;
+       lreceiver          fac_notificatie.prs_perslid_key_receiver%TYPE;
+       ltext              fac_notificatie.fac_notificatie_oms%TYPE;
+       lcode              fac_srtnotificatie.fac_srtnotificatie_code%TYPE;
+       lsrt_key           fac_srtnotificatie.fac_srtnotificatie_key%TYPE;
+       lrefkey            fac_notificatie.fac_notificatie_refkey%TYPE;
+       lxkey              fac_notificatie.fac_notificatie_extrakey%TYPE;
+       lxsender           fac_notificatie.fac_notificatie_sender_email%TYPE;
+       lxemail            fac_notificatie.fac_notificatie_receiver_email%TYPE;
+       lxmobile           fac_notificatie.fac_notificatie_receiver_phone%TYPE;
+       attachments        fac_notificatie.fac_notificatie_attachments%TYPE;
+       lbedrijfadreskey   fac_notificatie.prs_bedrijfadres_key%TYPE;
    BEGIN
        -- The flags are for compatibility mostly. Flags 2 and 4 cannot be combined (useless)
        -- flags: 0=default,  1=view has xemail and xmobile, 2=use fac.notifytracking instead of fac.putnotification(srtprio)
        --        4=view has attachments, 8=view has xsender
        --        16=do tracking of text (requires code, key and text to be NOT NULL)
        -- Kijk of de extra kolommen xemail en xmobile in de view zitten, dan gebruiken we die ook
+       -- Merk op: met deze implementatie zijn niet alle combi's ondersteund, we wegen 32 het zwaarst
 
-       IF BITAND(pflags, 2) = 2 -- Alleen sender, text, code en xkey verplicht (met xkey zoals in fac_tracking zou komen)
+       IF BITAND(pflags, 32) = 32  /* met prs_bedrijfadres_key en *alle* andere velden */
        THEN
            OPEN messages FOR
-               'SELECT sender, NULL receiver, text, code, fac_srtnotificatie_key, NULL key, xkey, NULL xsender, NULL xemail, NULL xmobile, NULL attachments'
+               'SELECT sender, receiver, text, code, fac_srtnotificatie_key, key, xkey, xsender, xemail, xmobile, attachments, prs_bedrijfadres_key FROM '
+               || pviewname;
+       ELSIF BITAND(pflags, 2) = 2 -- Alleen sender, text, code en xkey verplicht (met xkey zoals in fac_tracking zou komen)
+       THEN
+           OPEN messages FOR
+               'SELECT sender, NULL receiver, text, code, fac_srtnotificatie_key, NULL key, xkey, NULL xsender, NULL xemail, NULL xmobile, NULL attachments, NULL prs_bedrijfadres_key'
                || ' FROM fac_srtnotificatie, ' || pviewname
                || ' WHERE code = fac_srtnotificatie_code';
        ELSIF BITAND(pflags, 13) = 13  /* 8+4+1 */
        THEN
            OPEN messages FOR
-               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, xsender, xemail, xmobile, attachments FROM '
+               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, xsender, xemail, xmobile, attachments, NULL prs_bedrijfadres_key FROM '
                || pviewname;
        ELSIF BITAND(pflags, 9) = 9  /* 8+1 */
        THEN
            OPEN messages FOR
-               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, xsender, xemail, xmobile, NULL attachments FROM '
+               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, xsender, xemail, xmobile, NULL attachments, NULL prs_bedrijfadres_key FROM '
                || pviewname;
        ELSIF BITAND(pflags, 8) = 8
        THEN
            OPEN messages FOR
-               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, xsender, NULL xemail, NULL xmobile, NULL attachments FROM '
+               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, xsender, NULL xemail, NULL xmobile, NULL attachments, NULL prs_bedrijfadres_key FROM '
                || pviewname;
        ELSIF BITAND(pflags, 5) = 5  /* 4+1 */
        THEN
            OPEN messages FOR
-               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, NULL xsender, xemail, xmobile, attachments FROM '
+               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, NULL xsender, xemail, xmobile, attachments, NULL prs_bedrijfadres_key FROM '
                || pviewname;
        ELSIF BITAND(pflags, 4) = 4
        THEN
            OPEN messages FOR
-               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, NULL xsender, NULL xemail, NULL xmobile, attachments FROM '
+               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, NULL xsender, NULL xemail, NULL xmobile, attachments, NULL prs_bedrijfadres_key FROM '
                || pviewname;
        ELSIF BITAND(pflags, 1) = 1
        THEN
            OPEN messages FOR
-               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, NULL xsender, xemail, xmobile, NULL attachments FROM '
+               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, NULL xsender, xemail, xmobile, NULL attachments, NULL prs_bedrijfadres_key FROM '
                || pviewname;
        ELSE -- BITAND(pflags, 1) = 0
            OPEN messages FOR
-               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, NULL xsender, NULL xemail, NULL xmobile, NULL attachments FROM '
+               'SELECT sender, receiver, text, code, NULL fac_srtnotificatie_key, key, xkey, NULL xsender, NULL xemail, NULL xmobile, NULL attachments, NULL prs_bedrijfadres_key FROM '
                || pviewname;
        END IF;
 
 
        LOOP
            FETCH messages
-           INTO lsender, lreceiver, ltext, lcode, lsrt_key, lrefkey, lxkey, lxsender, lxemail, lxmobile, attachments;
+           INTO lsender, lreceiver, ltext, lcode, lsrt_key, lrefkey, lxkey, lxsender, lxemail, lxmobile, attachments, lbedrijfadreskey;
 
            EXIT WHEN messages%NOTFOUND;
 
+           -- we willen weten als we teveel sturen
+           IF BITAND(pflags, 32) = 32 AND LENGTH(ltext) > 2048
+           THEN
+                raise_application_error (-20001, 'Facilitor warning: Jobcommand too long');
+           END IF;
+
            IF BITAND(pflags, 16) = 16 AND lcode IS NOT NULL AND lrefkey IS NOT NULL AND ltext IS NOT NULL
            THEN
                 fac.trackaction (lcode, lrefkey, lsender /*user_key*/, NULL /* datum */, ltext);
@@ -2550,6 +2633,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                               lsender,
                               ltext,
                               lxkey);
+
            ELSIF lcode IS NULL
            THEN
                putnotificationprio (lsender,
@@ -2559,7 +2643,9 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                                     lxemail,
                                     lxmobile,
                                     2,
-                                    attachments);
+                                    attachments,
+                                    lbedrijfadreskey,
+                                    pqueue);
            ELSE
                putnotificationsrtprio (lsender,
                                        lreceiver,
@@ -2572,7 +2658,9 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                                        lxkey,
                                        2,
                                        lxsender,
-                                       attachments);
+                                       attachments,
+                                       lbedrijfadreskey,
+                                       pqueue);
            END IF;
        END LOOP;
 
@@ -2580,9 +2668,10 @@ CREATE OR REPLACE PACKAGE BODY fac AS
    EXCEPTION
        WHEN OTHERS
        THEN
-          putsystemnotification ('FACILITOR: invalid notification job/view ' || pviewname ||' '|| SQLERRM , 3);
+          putsystemnotification ('Facilitor notifier: Invalid notification job ' || pviewname ||' ('|| SQLERRM ||')' , 3);
    END;
 
+
    PROCEDURE executeactiviteit (pxmlnode VARCHAR2, pactkey NUMBER)
    AS
       CURSOR berekendeflex (
@@ -2901,10 +2990,10 @@ CREATE OR REPLACE PACKAGE BODY fac AS
          WHEN OTHERS
          THEN
             putsystemnotification (
-                  'Facilitor scheduler: opdracht voor activiteit '
+                  'Facilitor scheduler: Unable to create planned activity '
                || pactkey
-               || ' kan niet worden aangemaakt: '
-               || SQLERRM,
+               || ' ('
+               || SQLERRM||')',
                3);
       END;
    END;
@@ -2949,8 +3038,15 @@ CREATE OR REPLACE PACKAGE BODY fac AS
       -- als xxxx_daily bestaat dan deze aanroepen.
       IF (has_cust_daily = 1)
       THEN
-         EXECUTE IMMEDIATE 'BEGIN ' || cust_daily || '; END;';
+         BEGIN
+            EXECUTE IMMEDIATE 'BEGIN ' || cust_daily || '; END;';
+         EXCEPTION
+            WHEN OTHERS
+            THEN
+               putsystemnotification ('Facilitor notifier: Invalid daily job ' || cust_daily ||' ('|| SQLERRM ||')' , 3);
+         END;
       END IF;
+      fac.fac_cleanup;
    END;
 
    PROCEDURE fac_weekly
@@ -2970,7 +3066,13 @@ CREATE OR REPLACE PACKAGE BODY fac AS
       -- als xxxx_weekly bestaat dan deze aanroepen
       IF (has_cust_weekly = 1)
       THEN
-         EXECUTE IMMEDIATE 'BEGIN ' || cust_weekly || '; END;';
+         BEGIN
+            EXECUTE IMMEDIATE 'BEGIN ' || cust_weekly || '; END;';
+         EXCEPTION
+            WHEN OTHERS
+            THEN
+               putsystemnotification ('Facilitor notifier: Invalid weekly job ' || cust_weekly ||' ('|| SQLERRM ||')' , 3);
+         END;
       END IF;
    END;
 
@@ -2991,7 +3093,13 @@ CREATE OR REPLACE PACKAGE BODY fac AS
       -- als xxxx_monthly bestaat dan deze aanroepen
       IF (has_cust_monthly = 1)
       THEN
-         EXECUTE IMMEDIATE 'BEGIN ' || cust_monthly || '; END;';
+         BEGIN
+            EXECUTE IMMEDIATE 'BEGIN ' || cust_monthly || '; END;';
+         EXCEPTION
+            WHEN OTHERS
+            THEN
+               putsystemnotification ('Facilitor notifier: Invalid monthly job ' || cust_monthly ||' ('|| SQLERRM ||')' , 3);
+         END;
       END IF;
    END;
 
@@ -3008,28 +3116,24 @@ CREATE OR REPLACE PACKAGE BODY fac AS
       -- Als bijvoorbeeld 1 januari 2019 als startdatum van een acie wordt opgegeven en de actie elke 2-de woensdag van de maand moet plaatsvinden,
       -- dan is de werkelijke eerste actie op woensdag 9 januari 2019.
       -- Dus de datum van de werkelijke eerste actie kan afwijken van de startdatum (fac_activiteit_eerste).
+      -- Als fac_activiteit_volgende NULL is, dan is de eerste geplande actie nog niet geweest.
       CURSOR c1
       IS
         SELECT fac_activiteit_key,
                fac_activiteit_xmlnode,
                fac_activiteit_status_key,
-               fac_activiteit_aantal,
-               fac.calcnextcyclusdate(TRUNC(fac_activiteit_eerste, 'DD') - 1, -- <20><>n dag voor de startdatum.
-                                      0, -- mode: moment-modus
-                                      COALESCE(fac_activiteit_eenheid, 1),
-                                      fac_activiteit_periode,
-                                      fac_activiteit_bits) eerste_actiedag
+               fac_activiteit_aantal
           FROM fac_activiteit
          WHERE ((fac_activiteit_volgende <= SYSDATE AND fac_activiteit_einddatum IS NULL)
              OR (fac_activiteit_volgende <= SYSDATE AND SYSDATE < fac_activiteit_einddatum)
-             OR (fac_activiteit_volgende IS NULL AND SYSDATE BETWEEN fac.calcnextcyclusdate(COALESCE(fac_activiteit_volgende, TRUNC(fac_activiteit_eerste, 'DD') - 1),
+             OR (fac_activiteit_volgende IS NULL AND SYSDATE BETWEEN fac.calcnextcyclusdate(TRUNC(fac_activiteit_eerste, 'DD') - 1,
                                                                                             0, -- mode: moment-modus
                                                                                             COALESCE(fac_activiteit_eenheid, 1),
                                                                                             fac_activiteit_periode,
                                                                                             fac_activiteit_bits)
                                                                  AND fac_activiteit_einddatum)
              OR (fac_activiteit_volgende IS NULL AND fac_activiteit_einddatum IS NULL
-                                                 AND SYSDATE > fac.calcnextcyclusdate(COALESCE(fac_activiteit_volgende, TRUNC(fac_activiteit_eerste, 'DD') - 1),
+                                                 AND SYSDATE > fac.calcnextcyclusdate(TRUNC(fac_activiteit_eerste, 'DD') - 1,
                                                                                       0, -- mode: moment-modus
                                                                                       COALESCE(fac_activiteit_eenheid, 1),
                                                                                       fac_activiteit_periode,
@@ -3055,9 +3159,9 @@ CREATE OR REPLACE PACKAGE BODY fac AS
             executeactiviteit (rec1.fac_activiteit_xmlnode, rec1.fac_activiteit_key);
 
             -- Remove time-part from volgende (ie. set to 0:00)!
-            -- De eerste actiedag (rec1.eerste_actiedag) is hier de datum van de werkelijke eerste actie en kan afwijken van de startdatum (fac_activiteit_eerste).
+            -- De geplande actie is net aangemaakt en de volgende geplande actie vanaf nu (SYSDATE) berekenen.
             UPDATE fac_activiteit
-               SET fac_activiteit_volgende = fac.calcnextcyclusdate(COALESCE(fac_activiteit_volgende, TRUNC(rec1.eerste_actiedag, 'DD') - 1),
+               SET fac_activiteit_volgende = fac.calcnextcyclusdate(TRUNC(SYSDATE, 'DD'),
                                                                     0, -- mode: moment-modus
                                                                     COALESCE(fac_activiteit_eenheid, 1),
                                                                     COALESCE(fac_activiteit_periode, 1),
@@ -3067,8 +3171,9 @@ CREATE OR REPLACE PACKAGE BODY fac AS
              WHERE fac_activiteit_key = rec1.fac_activiteit_key;
          ELSE
             -- 1 keer overslaan, de volgende keer weer wel dus. Ook hier: remove time-part from volgende (ie. set to 0:00)!
+            -- De geplande actie is net aangemaakt en de volgende geplande actie vanaf nu (SYSDATE) berekenen.
             UPDATE fac_activiteit
-               SET fac_activiteit_volgende = fac.calcnextcyclusdate(COALESCE(fac_activiteit_volgende, TRUNC(rec1.eerste_actiedag, 'DD') - 1),
+               SET fac_activiteit_volgende = fac.calcnextcyclusdate(TRUNC(SYSDATE, 'DD'),
                                                                     0, -- mode: moment-modus
                                                                     COALESCE(fac_activiteit_eenheid, 1),
                                                                     COALESCE(fac_activiteit_periode, 1),
@@ -3495,8 +3600,8 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                     -- dan dus nogmaals een notificatie. Dat accepteren we vooralsnog gewoon maar.
                     mld.notifybackoffice (prefkey, lcode);
                 END IF;
-                -- Notificatie bij nieuwe melding per prioriteit
-                IF (lcode = 'MLDNEW')
+                -- Notificatie bij nieuwe melding of doorsturen melding per prioriteit.
+                IF (lcode = 'MLDNEW' OR lcode = 'MLDFWD')
                 THEN
                     mld.notifyprio (prefkey, lspoed, pperslid_key);
                 END IF;
@@ -3610,9 +3715,9 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                 -- Echter: wie houden we hiervan nou actief op de hoogte?
                 -- Dat wordt de interne contacpersoon van de opdracht
                 -- behalve:
-                -- 1) ORDMLE/ORDMLI en ORDONO/ORDOOK, die naar de uitvoerder
+                -- 1) ORDMLE/ORDMLI, ORDCAE/ORDCAI en ORDONO/ORDOOK, die naar de uitvoerder
                 -- 2) ORDDAT, die naar de gebouwverantwoordelijke van het betreffende gebouw van de onderliggende melding
-                IF lcode IN ('ORDMLI', 'ORDMLE', 'ORDONO', 'ORDOOK')
+                IF lcode IN ('ORDMLI', 'ORDMLE', 'ORDONO', 'ORDOOK', 'ORDCAE', 'ORDCAI')
                 THEN
                     SELECT mld_uitvoerende_keys
                       INTO lreceiver
@@ -3803,8 +3908,10 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                         -- Een voorzieningenreservering kan uit meerdere catalogi items hebben,
                         -- maar bij maar 1 afzender. Zwaarst geldt een cateringcatalogusafzender
                         SELECT MAX (d.ins_discipline_email),
+                               MAX (res_disc_params_notify),
                                MAX (res_disc_params_bonotify)
                           INTO lsender,
+                               lnotify,
                                lbonotify
                           FROM ins_tab_discipline d,
                                res_artikel a,
@@ -3820,8 +3927,10 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                         IF lsender IS NULL
                         THEN
                             SELECT MAX (d.ins_discipline_email),
+                                   MAX (res_disc_params_notify),
                                    MAX (res_disc_params_bonotify)
                               INTO lsender,
+                                   lnotify,
                                    lbonotify
                               FROM ins_tab_discipline d,
                                    res_deel r,
@@ -4389,26 +4498,22 @@ CREATE OR REPLACE PACKAGE BODY fac AS
         EXECUTE IMMEDIATE setsql;
    END;
 
-   PROCEDURE registerversion (pmaj IN NUMBER, pmin IN NUMBER, ppatch IN VARCHAR2, pschema IN VARCHAR2, plang IN VARCHAR2)
+   PROCEDURE registerversion (pschema IN VARCHAR2, plang IN VARCHAR2)
    AS
        verstring fac_module.fac_module_version%TYPE;
        revisionnr fac_version.fac_version_schema%TYPE;
      BEGIN
-       IF pmaj IS NOT NULL AND pmin IS NOT NULL AND ppatch IS NOT NULL
+       IF pschema IS NOT NULL
        THEN
-          verstring := TO_CHAR (pmaj) || '.' || TO_CHAR (pmin) || '.' || TO_CHAR (ppatch);
           UPDATE   fac_module
-             SET   fac_module_version = verstring;
+             SET   fac_module_version = TO_CHAR(pschema);
 
           UPDATE   fac_version
-             SET   fac_version_major = pmaj,
-                   fac_version_minor = pmin,
-                   fac_version_patch = ppatch,
-                   fac_version_schema = pschema,
+             SET   fac_version_schema = pschema,
                    fac_version_date = SYSDATE;
 
           UPDATE   fac_message
-             SET   fac_message_text = 'FACILITOR ' || verstring || 'DB' || TO_CHAR(pschema)
+             SET   fac_message_text = 'FACILITOR  DB' || TO_CHAR(pschema)
            WHERE   fac_message_code = 'FAC_M002';
        END IF;
 
@@ -5308,6 +5413,128 @@ CREATE OR REPLACE PACKAGE BODY fac AS
                       p_initval,
                       p_initexpire);
    END;
+
+   PROCEDURE remove_tracking(p_xmlnode IN VARCHAR2, p_refkey IN NUMBER)
+   IS
+   BEGIN
+       DELETE FROM fac_tracking
+        WHERE fac_tracking_refkey = p_refkey
+          AND fac_srtnotificatie_key IN
+              (SELECT fac_srtnotificatie_key
+                 FROM fac_srtnotificatie
+                WHERE fac_srtnotificatie_xmlnode = p_xmlnode
+              );
+   END;
+
+   -- Geeft true als het bestelde bedrag boven de profiel-limiet van prs_key komt
+   -- en dus goedkeuring vereist zal zijn.
+   FUNCTION exceeds_profiel (p_bestelbedrag IN NUMBER, p_prs_key IN NUMBER, p_disc_key IN NUMBER)
+      RETURN BOOLEAN
+   AS
+      l_limiet                   NUMBER;
+   BEGIN
+      SELECT prs.getprofiellimiet(p_prs_key, p_disc_key) limiet
+        INTO l_limiet
+        FROM DUAL;
+
+      IF l_limiet IS NOT NULL
+      THEN
+         RETURN l_limiet < p_bestelbedrag;
+      ELSE
+         RETURN TRUE; -- Geen profiel is altijd te hoog.
+      END IF;
+   END;
+
+   -- Geeft true als het bestelde bedrag boven de PGB-limiet van prs_key uit komt
+   -- en dus (eventueel) goedkeuring vereist zal zijn.
+   FUNCTION exceeds_pgb (p_opdrachtbedrag IN NUMBER, p_prs_key IN NUMBER, p_disc_key IN NUMBER, disc_params_pgb IN NUMBER)
+      RETURN BOOLEAN
+   AS
+      l_limiet                   NUMBER;
+   BEGIN
+      IF disc_params_pgb = 1 OR disc_params_pgb = 3
+      THEN
+         SELECT prs.getprofiellimiet(p_prs_key, p_disc_key)
+           INTO l_limiet
+           FROM DUAL;
+         IF l_limiet IS NOT NULL
+         THEN
+            RETURN l_limiet < (p_opdrachtbedrag + bes.bes_besteed_budget_pgb(p_prs_key, p_disc_key) + mld.mld_besteed_budget_pgb(p_prs_key, p_disc_key));
+         ELSE
+            RETURN TRUE; -- Geen profiel is altijd te hoog.
+         END IF;
+      ELSE
+         -- Geen pgb. Dan kan je ook niet boven de pgb zitten.
+         RETURN FALSE;
+      END IF;
+   END;
+
+   -- Geeft true als het bestelde bedrag boven de AGB-limiet van prs_key uit komt
+   -- en dus (eventueel) goedkeuring vereist zal zijn.
+   -- Negeer evt bestaand bestelbedrag van bes_key (indien > -1)
+   FUNCTION exceeds_agb (p_opdrachtbedrag IN NUMBER, p_kp_key IN NUMBER, p_disc_key IN NUMBER, disc_params_pgb IN NUMBER)
+      RETURN BOOLEAN
+   AS
+      l_limiet                   NUMBER;
+   BEGIN
+      IF disc_params_pgb = 2 OR disc_params_pgb = 3
+      THEN
+         SELECT prs.getlimietagb(p_kp_key, fac.getsetting('prs_approvemethod'), p_disc_key) limiet
+           INTO l_limiet
+           FROM DUAL;
+         IF l_limiet IS NOT NULL
+         THEN
+            RETURN l_limiet < (p_opdrachtbedrag + bes.bes_besteed_budget_agb(p_kp_key) + mld.mld_besteed_budget_agb(p_kp_key));
+         ELSE
+            RETURN TRUE; -- Geen profiel is altijd te hoog.
+         END IF;
+      ELSE
+         -- Geen agb. Dan kan je ook niet boven de agb zitten.
+         RETURN FALSE;
+      END IF;
+   END;
+
+   PROCEDURE fac_cleanup
+   AS
+      CURSOR c_imp
+      IS
+         SELECT fac_import_app_key
+           FROM fac_import_app;
+      r_imp  c_imp%ROWTYPE;
+   BEGIN
+      DELETE FROM fac_session WHERE fac_session_expire < SYSDATE - 2;
+      DELETE FROM aut_client_perslid WHERE aut_client_perslid_login < SYSDATE - 60;
+      DELETE FROM fac_bookmark WHERE fac_bookmark_expire < SYSDATE - 2;
+      DELETE FROM web_user_messages WHERE web_user_mess_action_datum < SYSDATE - 60;
+      DELETE FROM fac_notificatie WHERE fac_notificatie_status=0
+                                    AND fac_notificatie_systeemadres IS NULL;
+      DELETE fac_result WHERE fac_result_aanmaak < SYSDATE - 7;
+      COMMIT;
+
+      -- Wissen oude (gisteren) popups van Putorders.
+      UPDATE fac_notificatie n
+         SET n.fac_notificatie_status = BITAND(n.fac_notificatie_status, 255 - 8)
+       WHERE BITAND (n.fac_notificatie_status, 8) = 8
+         AND TRUNC (n.fac_notificatie_datum) < TRUNC (SYSDATE);
+
+      -- Import logging opschonen.
+      FOR r_imp IN c_imp
+      LOOP
+         DELETE FROM imp_log
+               WHERE imp_log_status <> 'S'
+                 AND fac_import_key IN
+                     (SELECT fac_import_key
+                        FROM fac_import
+                       WHERE fac_import_app_key = r_imp.fac_import_app_key
+                         AND fac_import_datum_gelezen <= SYSDATE - 1/24) -- afblijven van zeer recente imports
+                 AND fac_import_key <
+                     (SELECT MAX(fac_import_key)
+                        FROM fac_import
+                       WHERE fac_import_app_key = r_imp.fac_import_app_key
+                         AND fac_import_datum_gelezen <= SYSDATE - 1/24);
+      END LOOP;
+   END;
+
 END fac;
 /
 

FAC/FAC_PACANO.SRC

@@ -11,7 +11,14 @@ CREATE OR REPLACE PACKAGE ano AS
   PROCEDURE anonymizebez (p_startdatum IN DATE, p_einddatum IN DATE);
   PROCEDURE anonymizemld (p_startdatum IN DATE, p_einddatum IN DATE);
   PROCEDURE anonymizeprs (p_startdatum IN DATE, p_einddatum IN DATE);
+  PROCEDURE anonymizefull(p_flags NUMBER DEFAULT 65535);
   PROCEDURE anonymize (p_startdatum IN DATE, p_einddatum IN DATE);
+  FUNCTION postcode(postcode_veld IN VARCHAR2) RETURN VARCHAR2;
+  FUNCTION telefoon(telefoon_veld IN VARCHAR2) RETURN VARCHAR2;
+  FUNCTION adres(adres_veld IN VARCHAR2) RETURN VARCHAR2;
+  FUNCTION naam(naam_veld IN VARCHAR2) RETURN VARCHAR2;
+  FUNCTION email(email_veld IN VARCHAR2) RETURN VARCHAR2;
+  FUNCTION memo(memo_veld IN VARCHAR2) RETURN VARCHAR2;
 END ano;
 /
 
@@ -20,6 +27,7 @@ CREATE OR REPLACE PACKAGE BODY ano AS
                             p_einddatum  IN DATE)
     AS
        anonymize_period                 NUMBER := fac.safe_to_number (fac.getsetting ('anonymize_period'));
+       v_count                          NUMBER;
 
        -- Alle bestellingen waarvan de afwijsdatum, alles geleverd datum, verwerkingsdatum of annuleringsdatum tussen de startdatum en de einddatum liggen.
        CURSOR c_bestelling
@@ -53,6 +61,7 @@ CREATE OR REPLACE PACKAGE BODY ano AS
          raise_application_error (-20000, 'ano_m001 Einddatum is te groot');
        END IF;
 
+       v_count := 0;
        FOR rec_b IN c_bestelling
        LOOP
           -- Verwijder alle kenmerkwaarden van de bestelling waarvan het &8 (BITAND) bit van het bes_srtkenmerk.bes_srtkenmerk_systeem veld is gezet.
@@ -113,6 +122,14 @@ CREATE OR REPLACE PACKAGE BODY ano AS
              -- Anonimiseren van de bestelopdracht tracken.
              fac.trackaction('BES2AN', rec_bo.bes_bestelopdr_key, NULL, NULL, NULL);
           END LOOP;
+
+          IF v_count >= 1000
+          THEN
+             COMMIT;
+             v_count := 0;
+          ELSE
+             v_count := v_count + 1;
+          END IF;
        END LOOP;
     END;
 
@@ -121,6 +138,7 @@ CREATE OR REPLACE PACKAGE BODY ano AS
     AS
        anonymize_period                 NUMBER := fac.safe_to_number (fac.getsetting ('anonymize_period'));
        bez_generic_visitor              VARCHAR2 (2001) := lcl.l('lcl_bez_generic_visitor');
+       v_count                          NUMBER;
 
        -- Alle afspraken die tussen de startdatum en de einddatum liggen.
        CURSOR c_afspraak
@@ -142,6 +160,7 @@ CREATE OR REPLACE PACKAGE BODY ano AS
          raise_application_error (-20000, 'ano_m001 Einddatum is te groot');
        END IF;
 
+       v_count := 0;
        FOR rec IN c_afspraak
        LOOP
           -- Verwijder alle kenmerkwaarden van bezoekers van de afspraak waarvan het &8 (BITAND) bit van het bez_kenmerk.bez_kenmerk_systeem veld is gezet.
@@ -197,6 +216,14 @@ CREATE OR REPLACE PACKAGE BODY ano AS
 
           -- Anonimiseren van de afspraak tracken.
           fac.trackaction('BEZANO', rec.bez_afspraak_key, NULL, NULL, NULL);
+
+          IF v_count >= 1000
+          THEN
+             COMMIT;
+             v_count := 0;
+          ELSE
+             v_count := v_count + 1;
+          END IF;
        END LOOP;
     END;
 
@@ -204,6 +231,7 @@ CREATE OR REPLACE PACKAGE BODY ano AS
                             p_einddatum  IN DATE)
     AS
        anonymize_period                 NUMBER := fac.safe_to_number (fac.getsetting ('anonymize_period'));
+       v_count                          NUMBER;
 
        -- Alle meldingen waarvan de afwijsdatum of verwerkingsdatum tussen de startdatum en de einddatum liggen.
        CURSOR c_melding
@@ -237,6 +265,7 @@ CREATE OR REPLACE PACKAGE BODY ano AS
          raise_application_error (-20000, 'ano_m001 Einddatum is te groot');
        END IF;
 
+       v_count := 0;
        FOR rec_m IN c_melding
        LOOP
           -- Verwijder alle kenmerkwaarden van de melding waarvan het &8 (BITAND) bit van het mld_srtkenmerk.mld_srtkenmerk_systeem veld is gezet.
@@ -292,6 +321,14 @@ CREATE OR REPLACE PACKAGE BODY ano AS
              -- Anonimiseren van de meldingsopdracht tracken.
              fac.trackaction('ORDANO', rec_o.mld_opdr_key, NULL, NULL, NULL);
           END LOOP;
+
+          IF v_count >= 1000
+          THEN
+             COMMIT;
+             v_count := 0;
+          ELSE
+             v_count := v_count + 1;
+          END IF;
        END LOOP;
     END;
 
@@ -301,6 +338,7 @@ CREATE OR REPLACE PACKAGE BODY ano AS
        anonymize_period                 NUMBER := fac.safe_to_number (fac.getsetting ('anonymize_period'));
        bez_generic_visitor              VARCHAR2 (2001) := lcl.l('lcl_bez_generic_visitor');
        prs_old_employee                 VARCHAR2 (100) := lcl.l('lcl_prs_old_employee');
+       v_count                          NUMBER;
 
        -- Alle personen die tussen de startdatum en de einddatum verwijderd zijn.
        CURSOR c_perslid
@@ -324,6 +362,7 @@ CREATE OR REPLACE PACKAGE BODY ano AS
          raise_application_error (-20000, 'ano_m001 Einddatum is te groot');
        END IF;
 
+       v_count := 0;
        FOR rec IN c_perslid
        LOOP
           BEGIN
@@ -382,10 +421,164 @@ CREATE OR REPLACE PACKAGE BODY ano AS
 
              -- Anonimiseren van de persoon tracken.
              fac.trackaction('PRSANO', rec.prs_perslid_key, NULL, NULL, NULL);
+
+          IF v_count >= 1000
+          THEN
+             COMMIT;
+             v_count := 0;
+          ELSE
+             v_count := v_count + 1;
+          END IF;
           END;
        END LOOP;
     END;
 
+    PROCEDURE anonymizefull(p_flags NUMBER DEFAULT 65535)
+    AS
+    BEGIN
+        -- Destructive obstrufication of personal data.
+        UPDATE prs_perslid
+           SET prs_perslid_naam = INITCAP (DBMS_RANDOM.string ('l', LENGTH (prs_perslid_naam)))
+         WHERE prs_perslid_naam NOT LIKE 'INACTIEF:%'
+           AND prs_perslid_naam NOT LIKE 'Facilitor'
+           AND (prs_perslid_oslogin IS NULL OR SUBSTR(prs_perslid_oslogin, 1, 1) <> '_');
+
+        UPDATE prs_perslid
+           SET prs_perslid_voornaam = INITCAP (DBMS_RANDOM.string ('l', LENGTH (prs_perslid_voornaam)))
+         WHERE prs_perslid_voornaam IS NOT NULL
+           AND (prs_perslid_oslogin IS NULL OR SUBSTR(prs_perslid_oslogin, 1, 1) <> '_');
+
+        UPDATE prs_perslid
+           SET prs_perslid_voorletters = UPPER (DBMS_RANDOM.string ('l', LENGTH (prs_perslid_voorletters)))
+         WHERE prs_perslid_voorletters IS NOT NULL;
+
+        UPDATE prs_perslid
+           SET prs_perslid_naam = 'INACTIEF:' || INITCAP (DBMS_RANDOM.string ('l', LENGTH (prs_perslid_naam) - 9))
+         WHERE prs_perslid_naam LIKE 'INACTIEF:%';
+
+        UPDATE prs_perslid
+           SET prs_perslid_email = 'P' || TO_CHAR(prs_perslid_key) || '@notexist.facilitor.nl'
+         WHERE prs_perslid_email IS NOT NULL;
+
+        UPDATE prs_perslid
+           SET prs_perslid_oslogin2='O' || TO_CHAR(prs_perslid_key)
+         WHERE prs_perslid_oslogin2 IS NOT NULL;
+
+        UPDATE prs_perslid
+           SET prs_perslid_wachtwoord_hash = null;
+
+        UPDATE prs_perslid
+           SET prs_perslid_apikey = 'TEST_' || dbms_utility.get_hash_value(prs_perslid_apikey  , 0, power(2,24))
+         WHERE prs_perslid_apikey IS NOT NULL;
+
+        DELETE FROM fac_imp_perslid;
+
+        UPDATE prs_contactpersoon
+           SET prs_contactpersoon_naam = INITCAP (DBMS_RANDOM.string ('l', LENGTH(prs_contactpersoon_naam)));
+
+        UPDATE prs_contactpersoon
+           SET prs_contactpersoon_voornaam = INITCAP (DBMS_RANDOM.string ('l', LENGTH(prs_contactpersoon_voornaam)))
+         WHERE prs_contactpersoon_voornaam IS NOT NULL;
+
+        UPDATE prs_contactpersoon
+           SET prs_contactpersoon_voorletters = SUBSTR(prs_contactpersoon_voornaam,1,1) || SUBSTR(prs_contactpersoon_voorletters,2)
+         WHERE prs_contactpersoon_voorletters IS NOT NULL;
+
+        UPDATE prs_contactpersoon
+           SET prs_contactpersoon_email= 'EC' || TO_CHAR(prs_contactpersoon_key) || '@notexist.facilitor.nl'
+         WHERE prs_contactpersoon_email IS NOT NULL;
+
+        EXECUTE IMMEDIATE 'ALTER TRIGGER bez_t_bez_afspraak_B_IU DISABLE';
+
+            UPDATE bez_afspraak
+               SET bez_afspraak_gastheer = (SELECT SUBSTR(prs_perslid_naam_full,1,50)
+                                              FROM prs_v_perslid_fullnames_all
+                                             WHERE prs_perslid_key = bez_afspraak_host_key
+                                           )
+             WHERE bez_afspraak_host_key IS NOT NULL;
+
+            UPDATE bez_afspraak
+               SET bez_afspraak_gastheer = INITCAP (DBMS_RANDOM.string ('l', LENGTH (bez_afspraak_gastheer)))
+             WHERE bez_afspraak_host_key IS NULL;
+
+        EXECUTE IMMEDIATE 'ALTER TRIGGER bez_t_bez_afspraak_B_IU ENABLE';
+
+        UPDATE bez_bezoekers
+           SET bez_afspraak_naam = UPPER(SUBSTR(bez_afspraak_naam,1,1)) || '. Bezoeker'
+         WHERE bez_afspraak_naam IS NOT NULL
+           AND bez_afspraak_naam <> 'Anoniem';
+
+        UPDATE bez_bezoekers
+           SET bez_afspraak_bedrijf = UPPER(SUBSTR(bez_afspraak_bedrijf,1,1)) || 'areon B.V.'
+         WHERE bez_afspraak_bedrijf IS NOT NULL
+           AND bez_afspraak_bedrijf <> 'Anoniem';
+
+        UPDATE prs_bedrijf
+           SET prs_bedrijf_naam = ano.naam(prs_bedrijf_naam)
+             , prs_bedrijf_post_adres = ano.adres(prs_bedrijf_post_adres)
+             , prs_bedrijf_post_postcode = ano.postcode(prs_bedrijf_post_postcode)
+             , prs_bedrijf_bezoek_adres = ano.adres(prs_bedrijf_bezoek_adres)
+             , prs_bedrijf_bezoek_postcode = ano.postcode(prs_bedrijf_bezoek_postcode)
+             , prs_bedrijf_telefoon = ano.telefoon(prs_bedrijf_telefoon)
+             , prs_bedrijf_telefoon2 = ano.telefoon(prs_bedrijf_telefoon2)
+             , prs_bedrijf_fax = ano.telefoon(prs_bedrijf_fax)
+             , prs_bedrijf_email = ano.email(prs_bedrijf_email)
+             , prs_bedrijf_contact_persoon = ano.naam(prs_bedrijf_contact_persoon)
+             , prs_bedrijf_contact_telefoon = ano.telefoon(prs_bedrijf_contact_telefoon)
+             , prs_bedrijf_contact_fax = ano.telefoon(prs_bedrijf_contact_fax);
+
+        UPDATE prs_bedrijfadres
+           SET prs_bedrijfadres_url = ano.email(prs_bedrijfadres_url)
+             , prs_bedrijfadres_username = ano.naam(prs_bedrijfadres_username)
+             , prs_bedrijfadres_password = NULL;
+
+        UPDATE aut_idp
+           SET aut_idp_secret = 'TEST_' || DBMS_RANDOM.string('a', 10)
+         WHERE aut_idp_secret IS NOT NULL
+           AND aut_idp_internal = 0;
+
+        UPDATE aut_sp
+           SET aut_sp_secret = 'TEST_' || DBMS_RANDOM.string('a', 10)
+         WHERE aut_sp_secret IS NOT NULL
+           AND aut_sp_internal = 0;
+
+        UPDATE mld_adres
+           SET mld_adres_bezoek_adres = ano.adres(mld_adres_bezoek_adres)
+             , mld_adres_bezoek_postcode = ano.postcode(mld_adres_bezoek_postcode)
+             , mld_adres_post_adres = ano.adres(mld_adres_post_adres)
+             , mld_adres_post_postcode = ano.postcode(mld_adres_post_postcode)
+             , mld_adres_contactpersoon = ano.naam(mld_adres_contactpersoon)
+             , mld_adres_contactpers_telefoon = ano.telefoon(mld_adres_contactpers_telefoon)
+             , mld_adres_contactpers_email = ano.email(mld_adres_contactpers_email)
+             , mld_adres_telefoon = ano.telefoon(mld_adres_telefoon)
+             , mld_adres_email = ano.email(mld_adres_email);
+
+        UPDATE mld_melding
+           SET mld_melding_naam_ext = ano.naam(mld_melding_naam_ext)
+             , mld_melding_email_ext = ano.email(mld_melding_email_ext)
+             , mld_melding_tel_ext = ano.telefoon(mld_melding_tel_ext);
+
+        UPDATE mld_opdr
+           SET mld_opdr_contactpersoon = ano.naam(mld_opdr_contactpersoon)
+         WHERE mld_opdr_contactpersoon IS NOT NULL;
+
+        UPDATE mld_disc_params
+           SET mld_disc_params_emailnw1 = ano.email(mld_disc_params_emailnw1)
+             , mld_disc_params_emailnw2 = ano.email(mld_disc_params_emailnw2)
+             , mld_disc_params_emailnw3 = ano.email(mld_disc_params_emailnw3)
+             , mld_disc_params_emailnw4 = ano.email(mld_disc_params_emailnw4)
+             , mld_disc_params_smsnw1 = ano.telefoon(mld_disc_params_smsnw1)
+             , mld_disc_params_smsnw2 = ano.telefoon(mld_disc_params_smsnw2)
+             , mld_disc_params_smsnw3 = ano.telefoon(mld_disc_params_smsnw3)
+             , mld_disc_params_smsnw4 = ano.telefoon(mld_disc_params_smsnw4)
+         WHERE mld_ins_discipline_key IN (SELECT ins_discipline_key
+                                            FROM mld_discipline);
+
+        UPDATE fin_verkoopfactuur
+           SET prs_debiteur_naam = ano.naam(prs_debiteur_naam)
+         WHERE prs_debiteur_naam IS NOT NULL;
+    END;
+
     PROCEDURE anonymize (p_startdatum IN DATE,
                          p_einddatum  IN DATE)
     AS
@@ -396,6 +589,174 @@ CREATE OR REPLACE PACKAGE BODY ano AS
        anonymizeprs(p_startdatum, p_einddatum);
     END;
 
+    FUNCTION postcode(postcode_veld IN VARCHAR2) RETURN VARCHAR2
+    IS
+        c     VARCHAR2(1);
+        code VARCHAR2(15) := '';
+    BEGIN
+        IF (postcode_veld IS NOT NULL)
+        THEN
+            FOR i IN 1..LENGTH(SUBSTR(postcode_veld,1,15))
+            LOOP
+                c := SUBSTR(postcode_veld,i,1);
+                BEGIN
+                    c := TO_CHAR(TO_NUMBER(c));
+                    c := TO_CHAR(TRUNC(DBMS_RANDOM.value(0,10)));
+                EXCEPTION
+                    WHEN VALUE_ERROR THEN
+                        IF (c NOT IN (' ','-'))
+                        THEN
+                            c := DBMS_RANDOM.string('u',1);
+                        END IF;
+                END;
+                code := code||c;
+            END LOOP;
+        END IF;
+        RETURN code;
+    END postcode;
+
+    FUNCTION telefoon(telefoon_veld IN VARCHAR2) RETURN VARCHAR2
+    IS
+        n    NUMBER;
+        r    NUMBER;
+        i    NUMBER;
+        f    VARCHAR2(5) := '+-_ *'; -- alleen deze laten we staan
+        tel  VARCHAR2(30) := '';
+        c    VARCHAR2(1);
+    BEGIN
+        IF (telefoon_veld IS NOT NULL)
+        THEN
+            n := DBMS_RANDOM.value(0,1);
+            tel := TO_CHAR(TRUNC(n * POWER(10,LENGTH(telefoon_veld))));
+            FOR r IN 0..3
+            LOOP
+                c := SUBSTR(f,r,1);
+                i := 1;
+                WHILE (INSTR(telefoon_veld, c, 1, i) > 0)
+                LOOP
+                    tel := REGEXP_REPLACE(tel
+                                 ,'(^.{'||(INSTR(telefoon_veld,c,1,i)-1)||'})(.{1})(.*)$'
+                                 ,'\1'||c||'\3'
+                                  );
+                    i := i + 1;
+                END LOOP;
+            END LOOP;
+        END IF;
+        RETURN tel;
+    END telefoon;
+
+    FUNCTION adres(adres_veld IN VARCHAR2) RETURN VARCHAR2
+    IS
+        c      VARCHAR2(1);
+        adres  VARCHAR2(100) := '';
+    BEGIN
+        IF (adres_veld IS NOT NULL)
+        THEN
+            FOR i IN 1..LENGTH(adres_veld)
+            LOOP
+                c := SUBSTR(adres_veld,i,1);
+                BEGIN
+                    c := TO_CHAR(TO_NUMBER(c));
+                EXCEPTION
+                    WHEN VALUE_ERROR THEN
+                        IF (c <> ' ')
+                        THEN
+                            c := DBMS_RANDOM.string('l',1);
+                        END IF;
+                END;
+                adres := adres||c;
+            END LOOP;
+        END IF;
+        RETURN INITCAP(adres);
+    END adres;
+
+    FUNCTION email(email_veld IN VARCHAR2) RETURN VARCHAR2
+    IS
+        s      NUMBER;
+        c      VARCHAR2(1);
+        p      VARCHAR2(9) := '';
+        z      VARCHAR2(3) := '';
+        email  VARCHAR2(500) := '';
+    BEGIN
+        IF (email_veld IS NOT NULL)
+        THEN
+            s := 1+INSTR(email_veld,':',1);
+            IF (s > 1)
+            THEN
+                p := SUBSTR(email_veld,1,s-1);
+                IF (SUBSTR(email_veld,s,2) = '//')
+                THEN
+                    s := s+2;
+                    p := p||'//';
+                END IF;
+            END IF;
+            IF (SUBSTR(email_veld,LENGTH(email_veld)-2,1) = '.')
+            THEN
+                z := SUBSTR(email_veld, -3);
+            END IF;
+            FOR i IN s..(LENGTH(email_veld)-NVL(LENGTH(z),0))
+            LOOP
+                c := SUBSTR(email_veld,i,1);
+                IF (c NOT IN ('.','@'))
+                THEN
+                    c := DBMS_RANDOM.string('l',1);
+                END IF;
+                email := email||c;
+            END LOOP;
+            email := p||email||z;
+        END IF;
+        RETURN email;
+    END email;
+
+    FUNCTION naam(naam_veld IN VARCHAR2) RETURN VARCHAR2
+    IS
+        a     NUMBER;
+        i     VARCHAR2(1);
+        v     VARCHAR2(55) := '';
+        naam  VARCHAR2(200) := '';
+    BEGIN
+        IF (naam_veld IS NOT NULL)
+        THEN
+            a := LENGTH(naam_veld)-1;
+            IF (SUBSTR(naam_veld,LENGTH(naam_veld),1) = ')' AND INSTR(naam_veld,'(',-1) > 0)
+            THEN
+                v := DBMS_RANDOM.string('l',LENGTH(naam_veld) - INSTR(naam_veld,'(',-1) -1);
+                v := ' ('||SUBSTR(v,1,50)||')';
+                a := LENGTH(naam_veld) - LENGTH(v) -1;
+            END IF;
+            i := SUBSTR(naam_veld,1,1);
+            naam := UPPER(i)||DBMS_RANDOM.string('l', a)||v;
+        END IF;
+        RETURN naam;
+    END naam;
+
+    FUNCTION memo(memo_veld IN VARCHAR2) RETURN VARCHAR2
+    IS
+        memo  VARCHAR2(4000) := '';
+        c     VARCHAR2(1) := '';
+        r     VARCHAR2(1);
+    BEGIN
+        IF (memo_veld IS NOT NULL)
+        THEN
+            FOR i IN 1..LENGTH(memo_veld)
+            LOOP
+                r := SUBSTR(memo_veld,i,1);
+                IF (r NOT IN (' ','.') )
+                THEN
+                    c := DBMS_RANDOM.string('l',1);
+                    IF (r = UPPER(r))
+                    THEN
+                        c := UPPER(c);
+                    END IF;
+                ELSE
+                    c := r;
+                END IF;
+                memo := memo||c;
+            END LOOP;
+        END IF;
+        RETURN memo;
+    END memo;
+
 END ano;
 /
 

FAC/FAC_PACFLEX.SRC

@@ -55,7 +55,8 @@
                                , p_kenmerk_key       IN NUMBER
                                , p_from_bijlagen_key IN NUMBER
                                );
-     PROCEDURE deleteflexbijlage (p_bijlagen_key    IN NUMBER);
+     PROCEDURE deleteflexbijlage (p_bijlagen_key    IN NUMBER
+                                 ,p_fileisgone      IN BOOLEAN DEFAULT FALSE);
      PROCEDURE deleteflexbijlage (p_module          IN VARCHAR2,
                                   p_kenmerk_key     IN NUMBER,
                                   p_ref_key         IN NUMBER,
@@ -287,7 +288,8 @@
          WHERE fac_bijlagen_key = p_from_bijlagen_key;
      END;
 
-     PROCEDURE deleteflexbijlage (p_bijlagen_key    IN NUMBER)
+     PROCEDURE deleteflexbijlage (p_bijlagen_key    IN NUMBER
+                                 ,p_fileisgone      IN BOOLEAN DEFAULT FALSE)
      AS
         v_cur_root_key  NUMBER;
         v_new_root_key  NUMBER;
@@ -319,9 +321,25 @@
         END IF;
         --
         -- Nu mag dit record verwijderd worden
-        UPDATE fac_bijlagen
-           SET fac_bijlagen_verwijder = SYSDATE
-         WHERE fac_bijlagen_key = p_bijlagen_key;
+        IF (p_fileisgone)
+        THEN
+            IF (v_cur_root_key IS NULL AND v_new_root_key IS NULL)
+            THEN
+                -- Query heeft geen andere bijlage gevonden die de nieuwe root_key kan worden.
+                -- Er zijn dan geen kopieen van de bijlage, of van alle kopieen is ook de verwijderdatum gezet.
+                -- Verwijder eerst de kopieen met verwijderdatum.
+                DELETE FROM fac_bijlagen
+                 WHERE fac_bijlagen_verwijder IS NOT NULL
+                   AND fac_bijlagen_root_key = p_bijlagen_key;
+            END IF;
+
+            DELETE FROM fac_bijlagen
+             WHERE fac_bijlagen_key = p_bijlagen_key;
+        ELSE
+            UPDATE fac_bijlagen
+               SET fac_bijlagen_verwijder = SYSDATE
+             WHERE fac_bijlagen_key = p_bijlagen_key;
+        END IF;
      END;
 
      PROCEDURE deleteflexbijlage (p_module          IN VARCHAR2,
@@ -676,7 +694,16 @@
            IF l_exprtype IS NOT NULL AND l_expr IS NOT NULL
            THEN
                l_sql_exprval := 'SELECT ' || '(' || l_expr || ')' || '  FROM DUAL';
-               DBMS_SQL.parse (l_cursor_exprval, l_sql_exprval, DBMS_SQL.native);
+               BEGIN
+                 DBMS_SQL.parse (l_cursor_exprval, l_sql_exprval, DBMS_SQL.native);
+               EXCEPTION
+               WHEN OTHERS THEN
+                       raise_application_error (
+                               -20001,
+                                  'Error parsing flex-expression ' || pmodule || ' kenmerkkey:' || expr.fac_kenmwaarden_kenmerk_key
+                                  || CHR(10) || SQLERRM
+                                  || CHR(10) || l_sql_exprval);
+               END;
                --DBMS_SQL.describe_columns(l_cursor_exprval, l_colcnt, l_desctab);
                IF expr.fac_kenmwaarden_kenmerktype = 'N'
                THEN
@@ -718,25 +745,44 @@
                         l_kenmerkwaarde := NULL;
                         l_kenmerktype := NULL;
                   END;
-                  -- Als <20><>n van de flexkenmerken NULL is, dan met die waarde verder rekenen. Waarde kan bewust NULL zijn
-                  CASE l_kenmerktype
-                     WHEN 'D'
-                     THEN
-                        l_kenmerkw_date := TO_DATE(l_kenmerkwaarde, 'DD-MM-YYYY');
-                        DBMS_SQL.bind_variable (l_cursor_exprval, l_bvar, l_kenmerkw_date);
-                     WHEN 'N'
-                     THEN
-                        l_kenmerkw_num := TO_NUMBER(l_kenmerkwaarde);
-                        DBMS_SQL.bind_variable (l_cursor_exprval, l_bvar, l_kenmerkw_num);
-                     WHEN 'V'
-                     THEN
-                        l_kenmerkw_num := TO_NUMBER(l_kenmerkwaarde);
-                        DBMS_SQL.bind_variable (l_cursor_exprval, l_bvar, l_kenmerkw_num);
-                     ELSE
-                        DBMS_SQL.bind_variable (l_cursor_exprval, l_bvar, l_kenmerkwaarde);
-                  END CASE;
+                  BEGIN
+                      -- Als <20><>n van de flexkenmerken NULL is, dan met die waarde verder rekenen. Waarde kan bewust NULL zijn
+                      CASE l_kenmerktype
+                         WHEN 'D'
+                         THEN
+                            l_kenmerkw_date := TO_DATE(l_kenmerkwaarde, 'DD-MM-YYYY');
+                            DBMS_SQL.bind_variable (l_cursor_exprval, l_bvar, l_kenmerkw_date);
+                         WHEN 'N'
+                         THEN
+                            l_kenmerkw_num := TO_NUMBER(l_kenmerkwaarde);
+                            DBMS_SQL.bind_variable (l_cursor_exprval, l_bvar, l_kenmerkw_num);
+                         WHEN 'V'
+                         THEN
+                            l_kenmerkw_num := TO_NUMBER(l_kenmerkwaarde);
+                            DBMS_SQL.bind_variable (l_cursor_exprval, l_bvar, l_kenmerkw_num);
+                         ELSE
+                            DBMS_SQL.bind_variable (l_cursor_exprval, l_bvar, l_kenmerkwaarde);
+                      END CASE;
+                   EXCEPTION
+                   WHEN OTHERS THEN
+                           raise_application_error (
+                                   -20001,
+                                      'Error binding flex-expression ' || pmodule|| ' kkey:' || expr.fac_kenmwaarden_kenmerk_key
+                                      || ' type: ' || l_kenmerktype || ' val: ' || l_kenmerkwaarde
+                                      || CHR(10) || SQLERRM
+                                      || CHR(10) || l_sql_exprval);
+                   END;
                END LOOP;
-               l_rowsprocessed := DBMS_SQL.execute_and_fetch (l_cursor_exprval);
+               BEGIN
+                  l_rowsprocessed := DBMS_SQL.execute_and_fetch (l_cursor_exprval);
+               EXCEPTION
+               WHEN OTHERS THEN
+                       raise_application_error (
+                               -20001,
+                                  'Error executing flex-expression ' || pmodule|| ' kkey:' || expr.fac_kenmwaarden_kenmerk_key
+                                  || CHR(10) || SQLERRM
+                                  || CHR(10) || l_sql_exprval);
+               END;
                IF expr.fac_kenmwaarden_kenmerktype = 'N'
                THEN
                   DBMS_SQL.column_value (l_cursor_exprval, 1, l_exprval_num);
@@ -802,11 +848,23 @@
                END IF;
             END IF;
 
+            -- hierboven zijn ##EXPR## berekende kenmerken verwerkt
+            -- Nu nog eventuele ##SHOW## om voorwaardelijk zichtbaar te maken
+            -- (JGL: kan dat eigenlijk niet samengenomen worden? Ik zie veel herhaling)
             l_expr := flx.getflexshowexpr(pmodule, expr.fac_kenmwaarden_kenmerk_key, expr.fac_kenmwaarden_niveau);
             IF l_expr IS NOT NULL
             THEN
               l_sql_exprval := 'SELECT ' || '(' || l_expr || ')' || '  FROM DUAL';
-               DBMS_SQL.parse (l_cursor_exprval, l_sql_exprval, DBMS_SQL.native);
+              BEGIN
+                DBMS_SQL.parse (l_cursor_exprval, l_sql_exprval, DBMS_SQL.native);
+              EXCEPTION
+              WHEN OTHERS THEN
+                      raise_application_error (
+                              -20001,
+                                 'Error parsing flex-expression ' || pmodule || ' kenmerkkey:' || expr.fac_kenmwaarden_kenmerk_key
+                                 || CHR(10) || SQLERRM
+                                 || CHR(10) || l_sql_exprval);
+              END;
                --DBMS_SQL.describe_columns(l_cursor_exprval, l_colcnt, l_desctab);
                IF expr.fac_kenmwaarden_kenmerktype = 'N'
                THEN
@@ -866,7 +924,16 @@
                         DBMS_SQL.bind_variable (l_cursor_exprval, l_bvar, l_kenmerkwaarde);
                   END CASE;
                END LOOP;
-               l_rowsprocessed := DBMS_SQL.execute_and_fetch (l_cursor_exprval);
+               BEGIN
+                  l_rowsprocessed := DBMS_SQL.execute_and_fetch (l_cursor_exprval);
+               EXCEPTION
+               WHEN OTHERS THEN
+                       raise_application_error (
+                               -20001,
+                                  'Error executing flex-expression ' || pmodule|| ' kkey:' || expr.fac_kenmwaarden_kenmerk_key
+                                  || CHR(10) || SQLERRM
+                                  || CHR(10) || l_sql_exprval);
+               END;
                IF expr.fac_kenmwaarden_kenmerktype = 'N'
                THEN
                   DBMS_SQL.column_value (l_cursor_exprval, 1, l_exprval_num);

FAC/FAC_SEQ.SRC

@@ -38,6 +38,10 @@ CREATE SEQUENCE fac_s_fac_locale_xref_key       MINVALUE 1;
 CREATE SEQUENCE fac_s_fac_kenmerkdomein_key     MINVALUE 1;
 CREATE SEQUENCE fac_s_fac_kenmwaarden_key       MINVALUE 1;
 CREATE SEQUENCE fac_s_fac_widget_key            MINVALUE 1;
+/* Alvast voor 2022.1
+CREATE SEQUENCE fac_s_fac_widget_page_key       MINVALUE 100;
+CREATE SEQUENCE fac_s_fac_widget_onpage_key     MINVALUE 1;
+*/
 CREATE SEQUENCE fac_s_fac_note_group_key        MINVALUE 1;
 CREATE SEQUENCE fac_s_fac_code2label_key        MINVALUE 1;
 CREATE SEQUENCE imp_s_imp_log_key               MINVALUE 1;

FAC/FAC_SET.SRC

@@ -75,17 +75,17 @@ DEFINE_SETTING('CAD', 0001, 'WEB_FACFAC', 'fg_rap_mov'
 DEFINE_SETTING('CAD', 0001, 'WEB_FACFAC', 'fg_rap_prs'                            , 'string'                      , '../cad/rap_prs.asp'          , NULL)
 DEFINE_SETTING('CAD', 0001, 'WEB_FACFAC', 'fg_rap_sch'                            , 'string'                      , ''                            , NULL)
 DEFINE_SETTING('CAD', 0001, 'WEB_FACFAC', 'fg_rap_sle'                            , 'string'                      , '../cad/rap_sle.asp'          , NULL)
-DEFINE_SETTING('CAD', 0001, 'WEB_FACFAC', 'fg_symbols_path'                       , 'string'                      , NULL                          , 'full filepath to Facilitor Graphics symbol files')
+DEFINE_SETTING('CAD', 0001, 'WEB_FACFAC', 'fg_symbols_path'                       , 'string'                      , NULL                          , 'Full filepath to Facilitor Graphics symbol files')
 DEFINE_SETTING('CAD', 0001, 'WEB_FACFAC', 'fg_syncruimteview'                     , 'string'                      , 'cad_v_sync_alg_ruimte'       , NULL)
 DEFINE_SETTING('CAD', 0001, 'WEB_FACFAC', 'fg_syncterreinview'                    , 'string'                      , 'cad_v_sync_alg_terrein'      , NULL)
-DEFINE_SETTING('CAD', 0001, 'WEB_FACFAC', 'fg_vlucht_path'                        , 'string'                      , NULL                          , 'full filepath to Facilitor Graphics vlucht DWF files')
-DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_move_origin'                        , 'number'                      , 0                             , 'Move all dwf to logical (0,0) to prevent overflow')
+DEFINE_SETTING('CAD', 0001, 'WEB_FACFAC', 'fg_vlucht_path'                        , 'string'                      , NULL                          , 'Full filepath to Facilitor Graphics vlucht DWF files')
+DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_move_origin'                        , 'number'                      , '0'                           , 'Move all dwf to logical (0,0) to prevent overflow')
+DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_minmergedistance'                   , 'number'                      , '-1'                          , 'Distance (mm) allowed when merging ARC''s into contours')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'MaxDownloadSize'                       , 'number'                      , '-1'                          , 'Should match IIS Metabase AspBufferingLimit for download warning (Future use)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'alg_loc_string'                        , 'string'                      , ' l.alg_locatie_omschrijving || '' ('' || l.alg_locatie_code || '')'' ', NULL)
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'asp_max_download'                      , 'number'                      , '-1'                          , 'Copy the IIS configuration setting AspBufferingLimit (future use)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'asp_max_upload'                        , 'number'                      , '-1'                          , 'Copy the IIS configuration setting AspMaxRequestEntityAllowed (future use)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'asp_timeout'                           , 'number'                      , '-1'                          , 'Copy the IIS configuration asp AspScriptTimeout setting (future use)')
-DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'autoscrollmode'                        , 'number'                      , '255'                         , 'autoscroll mode (Future use)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'basic_auth_realm'                      , 'string'                      , ''                            , 'Realm for Basic Authentication (API only) (future use)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'cache_changecounter'                   , 'number'                      , '0'                           , 'Increment by one to reset FCLT caching.')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'cors_header'                           , 'string'                      , ''                            , 'CORS header (future use)')
@@ -95,7 +95,7 @@ DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'cssfordesktop'
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'cssformobile'                          , 'string'                      , ''                            , 'jQuery themeroller mobile replacement')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'fac_api_allow_impersonate'             , 'boolean'                     , 'false'                       , 'Allow impersonation through X-Facilitor-Switch-user (future use)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'fac_api_key_in_url'                    , 'boolean'                     , 'false'                       , 'Is APIKEY= in url also allowed (unsafe)? Default is header X-Facilitor-API-Key only')
-DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'fac_nieuws_forum_url'                  , 'string'                      , 'http://wordpress.facilitor.nl/api/get_category_posts/?category_id=40&count=15&date_format=d-m-Y', NULL)
+DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'fac_nieuws_forum_url'                  , 'string'                      , 'https://wordpress.facilitor.nl/api/get_category_posts/?category_id=40&count=15&date_format=d-m-Y', 'Deprecated')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'fac_pdf_printer'                       , 'number'                      , '0'                           , 'PDF Printer support bits (future use)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'fac_usrrap_mode'                       , 'number'                      , '0'                           , 'User reports mode {0=default, 1=advanced}')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'fac_usrrap_safe_view_regexp'           , 'string'                      , ''                            , 'User reports safe views regexp')
@@ -121,6 +121,7 @@ DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'xd_add2deeplinkurl'
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'xd_primary_bedrijfkey'                 , 'number'                      , '-1'                          , 'bedrijf_key of this Service Organisation (for XD-module)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'xd_secundarydomains'                   , 'json'                        , '' /* moet leeg!*/            , 'Object of related secondary domains {id: {name, url}} (for XD-module)')
 DEFINE_SETTING('FIN', 0001, 'WEB_FACFAC', 'fin_import_app_key'                    , 'number'                      , '-1'                          , 'fac_import_app_key of customer ''FACTUUR'' import: -1=Facilitor standard')
+DEFINE_SETTING('FIN', 0001, 'WEB_FACTAB', 'fin_import_btwmarge'                   , 'float'                       , '0.01'                        , 'Invoice import allowed BTW rounding margin')
 DEFINE_SETTING('INS', 0001, 'WEB_FACFAC', 'mjb_enabled'                           , 'number'                      , '0'                           , 'Is Preventive Maintenance (MJOB) available {0=no | 1=yes}')
 DEFINE_SETTING('PHB', 0001, 'WEB_FACFAC', 'locfax_kenmerk_key'                    , 'number'                      , '-1'                          , NULL)
 DEFINE_SETTING('PHB', 0001, 'WEB_FACFAC', 'locphone_kenmerk_key'                  , 'number'                      , '-1'                          , NULL)
@@ -150,7 +151,6 @@ DEFINE_SETTING('BES', 0001, 'WEB_FACTAB', 'besd_image_path'
 DEFINE_SETTING('BEZ', 0001, 'WEB_FACTAB', 'vis_afspraak_host_uses_keys'           , 'number'                      , '0'                           , 'the field "Bezoek voor" is a listbox (1 = true) otherwise a textfield (0 or 2 for required). INITIEEL INRICHTEN (BEZ-tabellen leeg)!')
 DEFINE_SETTING('BEZ', 0001, 'WEB_FACTAB', 'vis_afspraak_onrgoed_uses_keys'        , 'number'                      , '0'                           , 'listboxes location until room instead of only a room text field; INITIEEL INRICHTEN (BEZ-tabellen leeg)!')
 DEFINE_SETTING('BEZ', 0001, 'WEB_FACTAB', 'vis_afspraak_tel_required'             , 'number'                      , '2'                           , '0=optional with value, 1=required with value, 2=optional and empty, 3=required and empty')
-DEFINE_SETTING('BEZ', 0001, 'WEB_FACTAB', 'vis_park_image'                        , 'string'                      , '../Pictures/vis_park.gif'    , 'location and filename of visitors parking image.')
 DEFINE_SETTING('BEZ', 0001, 'WEB_FACTAB', 'vis_parking_key'                       , 'number'                      , '-1'                          , 'Catalog key (res_discipline_key) for Parking places')
 DEFINE_SETTING('BEZ', 0001, 'WEB_PRSSYS', 'vis_fobo_default_locatie_empty'        , 'boolean'                     , 'false'                       , 'No auto fill location when selecting host for new appointment back/front-office')
 DEFINE_SETTING('BGT', 0001, 'WEB_FACTAB', 'bgt_enabled'                           , 'number'                      , '0'                           , 'Is Facilitor Budgetting module (BGT) available {0 | 1}')
@@ -172,11 +172,13 @@ DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'allow_framed_facilitor'
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'allowedImgRegex'                       , 'string'                      , '^((http|https):\/\/)'    , 'Allowed url-regex in between [img][/img]-tags')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'allowedLinkRegex'                      , 'string'                      , '^((ftp|http|https):\/\/|(mailto|tel):)' , 'Allowed link-regex in between [link][/link]-tags')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'auto_https'                            , 'number'                      , '3'                           , '0=not https, 1=http redirects to https, (3=also all cookies ;Secure)')
+DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_html_strictness'                   , 'number'                      , '0'                           , '0=allow html in message, res-room description, flex-labels, 1=do not allow (strict, more secure)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'cal_showOn'                            , 'string'                      , 'button'                      , '''button'' or ''focus'' or ''both''')
-DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'csp_header'                            , 'string'                      , 'default-src *; style-src * ''unsafe-inline'';  script-src * ''unsafe-inline'' ''unsafe-eval''; img-src * data: ''unsafe-inline''; connect-src * ''unsafe-inline''; frame-src *; font-src * data: ''unsafe-inline'';', 'Content-Security-Policy header')
+DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'csp_header'                            , 'string'                      , 'default-src *; style-src * ''unsafe-inline'';  script-src * ''unsafe-inline'' ''unsafe-eval''; img-src * data: ''unsafe-inline''; connect-src * ''unsafe-inline''; frame-src * mailto: tel: phone: callto:; font-src * data: ''unsafe-inline'';', 'Content-Security-Policy header')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'referrer_policy_header'                , 'string'                      , 'strict-origin-when-cross-origin', 'Referrer-Policy header (future use)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'cssenvcust'                            , 'string'                      , ''                            , 'Custom css environment overrules')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'csstemplate'                           , 'json'                        , '{}'                          , 'Color scheme.')
+DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fontawesomestyle'                      , 'string'                      , 'fal'                         , 'Icons style. Options are far (regular), fas (solid), fal (light)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'custfunctionspath'                     , 'string'                      , NULL                          , 'path to custfunctions.wsc')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'email_regexp'                          , 'string'                      , '^\s*[A-Z0-9&\._%+-]+@[A-Z0-9\.-]+\.[A-Z]{2,4}\s*([,;]\s*[A-Z0-9&\._%+-]+@[A-Z0-9\.-]+\.[A-Z]{2,4}\s*)*$', 'Meerdere gescheiden door , of ;')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'email_regexp_single'                   , 'string'                      , '^\s*[A-Z0-9&\._%+-]+@[A-Z0-9\.-]+\.[A-Z]{2,4}\s*$', 'E<>n email adres')
@@ -184,7 +186,7 @@ DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_accept_terms'
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_apitoken_auth_expire'              , 'number'                      , '0'                           , 'Minutes api auth token is valid (default 0)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_emailtoken_auth_expire'            , 'number'                      , '0'                           , 'Minutes e-mail login token is valid (default 0)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_logo_file'                         , 'string'                      , 'tmpl_logo.gif'               , 'Customer logo file (Future use)')
-DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_nieuws_forum_max'                  , 'number'                      , '6'                           , 'Max number of news items to show (<0 to disable)')
+DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_nieuws_forum_max'                  , 'number'                      , '6'                           , 'Deprecated: Max number of news items to show (<0 to disable)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_reserved_number1'                  , 'number'                      , '0'                           , 'reserved_number1 (reserved and unused)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_reserved_number2'                  , 'number'                      , '0'                           , 'reserved_number2 (reserved and unused)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_reserved_string1'                  , 'string'                      , ''                            , 'reserved_string1 (reserved and unused)')
@@ -194,9 +196,9 @@ DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_t_endofworkday'
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_t_startofworkday'                  , 'float'                       ,  '8'                          , 'Start time (hour, decimal) of a working day')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'flexAllowedExt'                        , 'string'                      , '.*\.(doc|docx|xls|xlsx|jpg|jpeg|png|gif|bmp|dwg|dwf|eml|pdf|msg|zip|vsd|txt|ppt|pptx|oft|rtf|tif|tiff|csv|dot|xml|mcw|rar|encrypted|gz|gzip|7z)$', 'Allowed extensions')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'flexPreviewExt'                        , 'string'                      , '.*\.(jpg|jpeg|png|gif|bmp)$' , 'Extentions of attachments to preview in show_mld')
-DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'flex_mimetypes'                        , 'json'                        , '{ "jpg": "image/jpeg", "jpeg": "image/jpeg" , "png": "image/png", "bmp": "image/bmp", "gif": "image/gif", "pdf": "application/pdf" }', 'Supported streaming mimetypes')
+DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'flex_mimetypes'                        , 'json'                        , '{ "jpg": "image/jpeg", "jpeg": "image/jpeg" , "png": "image/png", "bmp": "image/bmp", "gif": "image/gif", "pdf": "application/pdf", "html": "text/html", "eml": "message/rfc822" }', 'Supported streaming mimetypes')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'flex_min_size'                         , 'number'                      , '64'                          , 'E-mail attachments smaller (in bytes) than this are silently ignored')
-DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'forum_url'                             , 'string'                      , 'http://wordpress.facilitor.nl', 'Forum url (future use)')
+DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'forum_url'                             , 'string'                      , 'https://wordpress.facilitor.nl', 'Forum url (future use)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'help_window'                           , 'boolean'                     , 'false'                       , 'New window for Help')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'hsts_maxage'                           , 'number'                      , '31536000'                    , 'HTTP Strict Transport Security max-age (0=off, eg. 31536000 for one year)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'http_meta_head'                        , 'string'                      , '<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">', 'Submitted in each html <head>')
@@ -219,8 +221,8 @@ DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'prs_login_attempts'
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'prs_login_lockout_delay'               , 'float'                       , '0.2'                         , 'Lockout seconds after each failed attempt (exponential)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'prs_login_lockout_expire'              , 'number'                      , '15'                          , 'Lockout minutes after prs_login_attempts failed attempts')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'prs_login_lockout_delayfactor'         , 'float'                       , '2'                           , 'Exponent base for prs_login_lockout_delay')
-DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'prs_password_hash_factor'              , 'number'                      , '16'                          , 'Password hash workfactor (2^x)')
-DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'prs_password_otp_mode'                 , 'number'                      , '0'                           , 'OTP mode (0=off,1=prssys only, 2=everyone with password, 3=everyone)')
+DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'prs_password_hash_factor'              , 'number'                      , '17'                          , 'Password hash workfactor (2^x)')
+DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'prs_password_otp_mode'                 , 'number'                      , '0'                           , 'OTP mode (0=off,1=prssys only, 2=everyone with password, 3=everyone, 4=force 2-factor auth)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'qr_auth_expire'                        , 'number'                      , '5'                           , 'Minutes QRC-code is valid (default 5)')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'qr_color'                              , 'number'                      , '5452544'                     , 'QRC color')
 DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'qrc_enable'                            , 'number'                      , '0'                           , 'Enable QRC-authentication feature (1) or not (0)')
@@ -276,7 +278,7 @@ DEFINE_SETTING('RES', 0001, 'WEB_FACTAB', 'res_pda_deel_times'
 DEFINE_SETTING('RES', 0001, 'WEB_FACTAB', 'res_pda_room_times'                    , 'array'                       , '30,60,120'                   , 'Mobile proposed reservation times for rooms')
 
 DEFINE_SETTING('ALG', 0001, 'WEB_PRSSYS', 'alg_fg_remote_maps'                    , 'string'                      , ''                            , 'API Key. if not empty use Google Maps for locations en buildings in Facilitor Graphics')
-DEFINE_SETTING('ALG', 0001, 'WEB_PRSSYS', 'alg_flexcolumns'                       , 'number'                      , '2'                           , 'number of flexcolumns for ALG [1|2]')
+DEFINE_SETTING('ALG', 0001, 'WEB_PRSSYS', 'alg_flexcolumns'                       , 'number'                      , '2'                           , 'DEPRECATED number of flexcolumns for ALG [1|2]')
 DEFINE_SETTING('ALG', 0001, 'WEB_PRSSYS', 'alg_onrgoed_recent'                    , 'number'                      , '60'                          , 'Tijdsinterval voor de recente onroerendgoed wijzigingen in minuten')
 DEFINE_SETTING('ALG', 0001, 'WEB_FACTAB', 'alg_image_path'                        , 'string'                      , NULL                          , 'path to folder storing alg pictures')
 DEFINE_SETTING('ALG', 0001, 'WEB_PRSSYS', 'alg_photo_size'                        , 'string'                      , 'r512x512'                    , 'Resize uploads to this maximum ALG photo size. Ex: r200x150')
@@ -288,7 +290,7 @@ DEFINE_SETTING('BES', 0001, 'WEB_PRSSYS', 'bes_bestelopdr_flags'
 DEFINE_SETTING('BES', 0001, 'WEB_PRSSYS', 'bes_bestelopdr_prefix'                 , 'string'                      , ''                            , 'prefix voor het opdrachtnummer van de bestelling')
 DEFINE_SETTING('BES', 0001, 'WEB_PRSSYS', 'bes_confirm_order_before_submit'       , 'boolean'                     , 'false'                       , 'Bevestig bestelaanvraag voordat het uitgevoerd wordt')
 DEFINE_SETTING('BES', 0001, 'WEB_PRSSYS', 'bes_datum_limiet'                      , 'number'                      , '90'                          , 'max days in the future')
-DEFINE_SETTING('BES', 0001, 'WEB_PRSSYS', 'bes_flexcolumns'                       , 'number'                      , '1'                           , 'number of flexcolumns for BES [1|2]')
+DEFINE_SETTING('BES', 0001, 'WEB_PRSSYS', 'bes_flexcolumns'                       , 'number'                      , '1'                           , 'DEPRECATED number of flexcolumns for BES [1|2]')
 DEFINE_SETTING('BES', 0001, 'WEB_PRSSYS', 'bes_pgb_fe_fiat'                       , 'number'                      , '0'                           , 'Een bestelling van FE-er moet naast PGB/AGB fiattering ook altijd gefiatteerd worden, anders altijd afwijzen {0=no | 1=yes}')
 DEFINE_SETTING('BES', 0001, 'WEB_PRSSYS', 'bes_pgb_fiattering'                    , 'number'                      , '0'                           , 'Algemene fiatteringsproces noodzakelijk naast PGB/AGB fiatering? {0=no | 1=yes}')
 DEFINE_SETTING('BES', 0001, 'WEB_PRSSYS', 'bes_photo_size'                        , 'string'                      , 'r512x512'                    , 'Resize uploads to this maximum BES photo size. Ex: r200x150')
@@ -300,7 +302,7 @@ DEFINE_SETTING('BEZ', 0001, 'WEB_PRSSYS', 'bez_bezoekers_recent'
 DEFINE_SETTING('BEZ', 0001, 'WEB_PRSSYS', 'bez_bo_orderby'                        , 'number'                      , '0'                           , 'Bezoekersbalie na datumtijd sorteren op { 0=Naam van de bezoeker | 1=Naam van de gastheer}')
 DEFINE_SETTING('BEZ', 0001, 'WEB_PRSSYS', 'bez_can_send_sms'                      , 'boolean'                     , 'false'                       , 'Option to send sms to host from visitors list')
 DEFINE_SETTING('BEZ', 0001, 'WEB_PRSSYS', 'bez_closeafteradd'                     , 'number'                      , '0'                           , '0=not, 1=bo, 2=fo, 3=bo&fo')
-DEFINE_SETTING('BEZ', 0001, 'WEB_PRSSYS', 'bez_flexcolumns'                       , 'number'                      , '1'                           , 'number of flexcolumns for BEZ [1|2]')
+DEFINE_SETTING('BEZ', 0001, 'WEB_PRSSYS', 'bez_flexcolumns'                       , 'number'                      , '1'                           , 'DEPRECATED number of flexcolumns for BEZ [1|2]')
 DEFINE_SETTING('BEZ', 0001, 'WEB_PRSSYS', 'bez_gastheer_telfnr'                   , 'number'                      , '1'                           , 'In bezoekersbalie telfoon nummer van gastheer ook tonen { 0=Nee | 1=Ja}')
 DEFINE_SETTING('BEZ', 0001, 'WEB_PRSSYS', 'bez_max_flex_on_line'                  , 'number'                      , '0'                           , 'Max aantal flexkenmerken op een bezoekersregel')
 DEFINE_SETTING('BEZ', 0001, 'WEB_PRSSYS', 'bez_multiday'                          , 'number'                      , '0'                           , 'Can user enter an end-date for an appointment')
@@ -371,6 +373,8 @@ DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_paperColor'
 DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_paperColorCpt'                      , 'number'                      , '13684944'                    , 'paper background concept')
 DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_publiclayers'                       , 'array'                       , ''                            , 'ins_disc_keys of layers visible without INSUSE')
 DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_werkpleksymbool'                    , 'string'                      , 'WERKPLEK'                    , 'Symbol for workplace in Graphics, file must exist in fg_symbols_path')
+DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'cad_symbols_snap'                      , 'number'                      , '1'                           , 'Snap INS-objects to grid, <1 =off, >=1 =grid in mm')
+DEFINE_SETTING('CHT', 0001, 'WEB_PRSSYS', 'cht_bo_naam'                           , 'number'                      , '0'                           , 'Toon naam van servicedesk medewerker 0=eigen naam 1=algemene term')
 DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_all_kostenplaats'                  , 'number'                      , '0'                           , 'show all (1) active kostenplaats values or only the one i have mandate for (0) in list')
 DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_approval_all'                      , 'number'                      , '0'                           , 'Goedkeuring contract vereist t.o.v. eerstvolgende limiet (=0 default) of t.o.v. totale kosten (in <20><>n keer)(=1)')
 DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_contract_approval'                 , 'number'                      , '0'                           , 'Het contract approval mechanisme is wel (=1) of niet (=0) ingeschakeld')
@@ -383,7 +387,7 @@ DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_contract_recent'
 DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_contract_requestor_required'       , 'boolean'                     , 'false'                       , 'Set the contract requestor field as required (true) or optional (false)')
 DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_enable_kostensoort'                , 'number'                      , '1'                           , 'can contract kostensoort be changed?')
 DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_factuur_totaalmarge'               , 'number'                      , '0'                           , 'De toegestane marge op de totaal factuur (default 0)')
-DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_flexcolumns'                       , 'number'                      , '2'                           , 'number of flexcolumns for CNT [1|2]')
+DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_flexcolumns'                       , 'number'                      , '2'                           , 'DEPRECATED number of flexcolumns for CNT [1|2]')
 DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_inactivate_mode'                   , 'number'                      , '0'                           , 'inactivate contract with WEB_CNTMAN/WEB_CNTUSE read rights and WEB_CNTMSU rights (0) or with extra WEB_CNTMAN write rights (1)')
 DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_internalnr_readonly'               , 'number'                      , '0'                           , 'Het interne contractnummer wordt automatisch bepaalt en is niet wijzigbaar')
 DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_rappel_abonnement'                 , 'number'                      , '3'                           , 'Rappel termijn van een abonnement contract')
@@ -392,16 +396,17 @@ DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_with_mld'
 DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_photo_size'                        , 'string'                      , 'r512x512'                    , 'Resize uploads to this maximum CNT photo size. Ex: r200x150')
 DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_merge_notes_and_tracking'          , 'number'                      , '1'                           , 'Combine notes and tracking in one frame with contract details (0=just notes | 1=both combined)')
 DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cntuse_can_edit_datum'                 , 'boolean'                     , 'false'                       , 'can cntuse edit datum')
+DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_grace_period'                      , 'number'                      , '30'                          , 'Show contract this number of days after end of contract')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'ProxyServerIPAddress'                  , 'string'                      , NULL                          , 'For webserver to reach outside world')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'interface_toggles'                     , 'number'                      , '1'                           , 'To keep track of the interface that is being used')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'ReplyAddress'                          , 'string'                      , ''                            , 'ReplyTo Address when e-mailing manually')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'anonymize_period'                      , 'number'                      , '365'                         , 'Period before data wil be [GDPR] anonymized (days)')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'aut_login_strip_domain'                , 'number'                      , '1'                           , 'Strip AD domain from login name { 0=no, 1=yes (default) } (Future use)')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'auth_edit_advanced'                    , 'boolean'                     , 'false'                       , 'Start autorisation popup dialog in advanced mode')
-DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'buttons_in_hamburger'                  , 'array'                       , 'print.png,email.png,csv.png,fa-print,fa-envelope-o,excel.png,fa-table,fa-refresh,page_refresh.png,legenda.png,fa-columns', 'Hide these frameheader buttons behind a hamburger.')
+DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'buttons_in_hamburger'                  , 'array'                       , 'print.png,email.png,csv.png,fa-print,fa-envelope-o,excel.png,fa-table,fa-sync,page_refresh.png,legenda.png,fa-columns', 'Hide these frameheader buttons behind a hamburger.')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'can_selfapprove'                       , 'number'                      , '999999'                      , 'I can approve myself below or equal this limit or someone else must approve always above this limit')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'checkBrowser'                          , 'number'                      , '0'                           , 'Check for IE6 at login (1) or not.')
-DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'currency_icon'                         , 'string'                      , 'fa-eur'                      , 'Currency icon. Use fa-money for generic')
+DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'currency_icon'                         , 'string'                      , 'fa-euro-sign'                , 'Currency icon. Use fa-money-bill-wave for generic')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'currency_pref'                         , 'string'                      , 'EUR '                        , 'Currency prefix')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'currency_suff'                         , 'string'                      , ''                            , 'Currency suffix')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'email_password'                        , 'number'                      , '0'                           , 'Show ''wachtwoord vergeten'' optie (1=voor mensen met wachtwoord, 2=voor iedereen)')
@@ -410,6 +415,7 @@ DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_api_limit'
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_api_limit2'                        , 'number'                      , '5000'                        , 'Ultime maximum number of records to return using the REST API')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_bes_deeplike_expire'               , 'number'                      , '0'                           , 'Number of days bestelling deeplike bookmark is valid (default 0 is disabled) future use')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_favicon_folder'                    , 'string'                      , 'appl/pictures/'              , 'Folder for favorite/bookmark icons')
+DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'fac_hide_fields'                       , 'string'                      , ''                            , 'Hide fields in the interface (future use)')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_firstlogin_expire'                 , 'number'                      , '14'                          , 'Remove firstlogin_url automatically after nn days')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_firstlogin_url'                    , 'string'                      , 'appl/fac/welcome.asp'        , 'Url to show upon first login of user')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_gui_counter_menu_daily'            , 'boolean'                     , 'true'                        , 'Compress menu usage count to anonymous daily or personal count')
@@ -422,8 +428,8 @@ DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_max_initial_attachments'
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_mld_deeplike_expire'               , 'number'                      , '0'                           , 'Number of days melding deeplike bookmark is valid (default 0 is disabled)')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_phone_protocol'                    , 'string'                      , 'callto'                      , 'Desktop protocol to use for phone links')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_res_deeplike_expire'               , 'number'                      , '0'                           , 'Number of days reservation deeplike bookmark is valid (default 0 is disabled) future use')
-DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_tabframes'                         , 'number'                      , '0'                           , 'Turn all subframes into tabs')
-DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_usrrap_keepfilter'                 , 'number'                      , '1'                           , 'User reports remember filters globally (future use)')
+DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_tabframes'                         , 'number'                      , '0'                           , 'DEPRECATED Turn all subframes into tabs')
+DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'fac_usrrap_keepfilter'                 , 'number'                      , '1'                           , 'User reports remember filters globally. 1=Remember 0=Do not remember')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'facilities_flike_past'                 , 'number'                      , '7'                           , 'Number of days in the past to show (my) facilities for rating')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'facilitiesfuture_mld'                  , 'number'                      , '31'                          , 'Number of days in the future to show (my) facilities for calls')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'facilitiesfuture_bes'                  , 'number'                      , '31'                          , 'Number of days in the future to show (my) facilities for orders')
@@ -433,7 +439,7 @@ DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'facilitiespast_bez'
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'facilitiespast_bes'                    , 'number'                      , '2'                           , 'Number of days in the past to show (my) facilities for orders')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'facilitiespast_mld'                    , 'number'                      , '10'                          , 'Number of days in the past to show (my) facilities for calls')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'facilitiespast_res'                    , 'number'                      , '2'                           , 'Number of days in the past to show (my) facilities for reservations')
-DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'faq_flexcolumns'                       , 'number'                      , '2'                           , 'number of flexcolumns for FAQ [1|2]')
+DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'faq_flexcolumns'                       , 'number'                      , '2'                           , 'DEPRECATED number of flexcolumns for FAQ [1|2]')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'favorites_on_portal_menu'              , 'number'                      , '1'                           , 'Display pinned favorites on the -desktop- portal menu { 0=no, 1=yes (default) } ')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'flexExtensionFilter'                   , 'string'                      , NULL                          , 'All files can be uploaded. "PDF DOC TIFF XLS" would filter')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'flexFilesOrdering'                     , 'number'                      , '0'                           , 'Ordering for list of flexfilenames {0=ascending | 1=descending}')
@@ -458,11 +464,11 @@ DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'mobile_password_pda'
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'mobile_position_required'              , 'number'                      , '1'                           , 'A current position is required for geo-scoping (1) or not (0)')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'note_collapsed'                        , 'number'                      , '1'                           , 'Notes overview collapsed/fold up (=1 default) or unfold (=0)')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'note_autocollapse'                     , 'string'                      , ''                            , 'Regexp note text that will allways start collapsed in note overviews (for technical system notes)')
-DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'note_autoscroll'                       , 'boolean'                     , 'true'                        , 'Scroll to input field in note overviews {true (default) | false}')
-DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'note_sort_ascending'                   , 'number'                      , '1'                           , 'Sort (of time) ordering of melding notes for FO and BO in note overviews {0 = descending | 1 = ascending}')
+DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'note_autoscroll'                       , 'boolean'                     , 'true'                        , 'DEPRECATED Scroll to input field in note overviews {true (default) | false}')
+DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'note_sort_ascending'                   , 'number'                      , '0'                           , 'Ordering of notes for FO and BO in note overviews {0 = descending | 1 = ascending}')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'portalmenu_combine_single'             , 'number'                      , '0'                           , '0: default, 1:If a portalmenukop consists of 1 item, should the image be moved in between the menukop and the menuitem? 2:only header')
-DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'portalmenucols'                        , 'number'                      , '2'                           , 'Nr cols in portal menu')
-DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'portalmenulines'                       , 'number'                      , '5'                           , 'Max lines in protalmenu (incl. "More..."')
+DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'portalmenucols'                        , 'number'                      , '2'                           , 'Number of columns in portal menu')
+DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'portalmenulines'                       , 'number'                      , '5'                           , 'Max. number of lines in portalmenu (incl. "More..."')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'portalmsgmax'                          , 'number'                      , '5'                           , 'Max. number of messages in messages frame {-1=unlimited | n=limit to n most recent messages | 0=no messages}')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'portalnewslength'                      , 'number'                      , '96'                          , 'Max. length of a line in statusinfo frame for hyperlinked messages {0..512}')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'portalnewsmax'                         , 'number'                      , '25'                          , 'Max. number of messages in statusinfo frame {-1=unlimited | n=limit to n most recent messages}')
@@ -476,7 +482,10 @@ DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'prs_password_validation'
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'prs_personal_noti_options'             , 'number'                      , '15'                          , 'Options that are provided for personal notification overrules (+8:popup,+4:sms,+2:mail,+1:portal)')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'qp_maxrows'                            , 'number'                      , '100'                         , 'Maximum number of rows to show, displays ''lcl_qp_maxrows1/2'' if exceeded')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'qp_maxrows2'                           , 'number'                      , '1000'                        , 'Maximum number of rows to show, displays ''lcl_qp_maxrows3'' if exceeded')
+DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'qp_maxgridrows'                        , 'number'                      , '250'                         , 'Maximum number of objects to show per discipline')
+DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'qp_maxgridrows2'                       , 'number'                      , '1200'                        , 'Maximum number of rows to show for all selected locations together')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'qp_maxrows_mobile'                     , 'number'                      , '50'                          , 'Maximum number of rows to show mobile, displays ''lcl_qp_maxrows'' if exceeded')
+DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'qp_maxrows_suggest'                    , 'number'                      , '1500'                        , 'Maximum number of rows to show suggest, displays ''lcl_shared_suggest_toomany_multi'' if exceeded')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'queuemail_sender_order'                , 'string'                      , 'URC'                         , 'Order in which senders are shown {default URC: Useraddress, Replyaddress, Catalogaddress}')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'refresher_doubleauto'                  , 'number'                      , '3'                           , 'Double buffering delay (seconds)')
 DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'rs_maxchar'                            , 'number'                      , '150'                         , 'vanaf hier afgekapt en ''Meer...'' tonen.')
@@ -507,7 +516,7 @@ DEFINE_SETTING('FIN', 0001, 'WEB_PRSSYS', 'fin_enable_goedkeuren'
 DEFINE_SETTING('FIN', 0001, 'WEB_PRSSYS', 'fin_enable_kostensoort'                , 'number'                      , '1'                           , 'can factuur kostensoort be changed?')
 DEFINE_SETTING('FIN', 0001, 'WEB_PRSSYS', 'fin_factuur_flags'                     , 'number'                      , '0'                           , 'Number of flags that can be defined on invoices. Max 10')
 DEFINE_SETTING('FIN', 0001, 'WEB_PRSSYS', 'fin_factuur_verlegdmode'               , 'number'                      , '0'                           , 'Use and validation of field fin_factuur_gbedrag: {0=field invisible | &1=visible and enterable | &2=required if invoicelines has a shifted VAT-value | &4=all invoicelines must have shifted VAT-value or must have standard VAT values (=not shifted)}')
-DEFINE_SETTING('FIN', 0001, 'WEB_PRSSYS', 'fin_flexcolumns'                       , 'number'                      , '1'                           , 'number of flexcolumns for FIN [1|2]')
+DEFINE_SETTING('FIN', 0001, 'WEB_PRSSYS', 'fin_flexcolumns'                       , 'number'                      , '1'                           , 'DEPRECATED number of flexcolumns for FIN [1|2]')
 DEFINE_SETTING('FIN', 0001, 'WEB_PRSSYS', 'fin_kostensoort_verplicht'             , 'number'                      , '0'                           , 'Is kostensoort required? {0=not required | 1=required}')
 DEFINE_SETTING('FIN', 0001, 'WEB_PRSSYS', 'fin_match_lowerlimit'                  , 'number'                      , '0'                           , 'Check lowerlimit also for matching {0=Only upperlimit (invoice<order+tolerance | 1=Upper and lowerlimit (order-tolerance<invoice<order+tolerance)}')
 DEFINE_SETTING('FIN', 0001, 'WEB_PRSSYS', 'fin_new_after_save'                    , 'number'                      , '0'                           , 'Na het opslaan terugkomen met de factuur in de showmode of met nieuw leeg invulformulier (0=showmode || 1=nieuw formulier)')
@@ -526,7 +535,7 @@ DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_element_description'
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_explode_objects'                   , 'number'                      , '1'                           , 'Explode the nummer of (new) object {0=no | 1=yes (default)}')
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_fg_remote_maps'                    , 'string'                      , ''                            , 'API Key. if not empty use Google Maps instead of FG if x,y coordinates of an object are available')
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_flex_uitgifte_empty'               , 'number'                      , '0'                           , 'Flexvelden die geen meetwaarden zijn leeg maken bij uitgifte {0=no (default) | 1=yes}')
-DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_flexcolumns'                       , 'number'                      , '2'                           , 'number of flexcolumns for INS [1|2]')
+DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_flexcolumns'                       , 'number'                      , '2'                           , 'DEPRECATED number of flexcolumns for INS [1|2]')
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_inspect_service_depend'            , 'number'                      , '0'                           , 'Company depends on the {0=servicecompanylocation {default} 1=contract scope 2=both}')
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_inspect_soon_days'                 , 'number'                      , '30'                          , 'Days margin for needs inspection ''soon''')
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_occupationsensors_srtgroep_key'    , 'number'                      , '-1'                          , 'INS_SRTGROEP_KEY of sensor objects to be used for occupation/availability')
@@ -534,21 +543,25 @@ DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_photo_size'
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_xcp_active_cost'                   , 'number'                      , '15'                          , 'Active cost fields used/shown {+1=kosten, +2=kosten2, +4=kosten3, +8=materiaal}')
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_srtdeelsuggest_info'               , 'number'                      , '1'                           , 'Show parent info of Object type in Suggest: 1=group, 2=discipline, 3=both')
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_merge_notes_and_tracking'          , 'number'                      , '1'                           , 'Combine notes and tracking in one frame with object details (0=just notes | 1=both combined)')
+DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_state_history'                     , 'number'                      , '30'                          , 'Number of days to keep ins_deel_state_history records')
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'mjb_freeze_year'                       , 'number'                      , EXTRACT(YEAR FROM SYSDATE)    , 'Frozen (approved/activated) year of Preventive Maintenance (MJOB)')
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'mjb_inflation'                         , 'float'                       , '1'                           , 'Default annual inflation rate (%) for Preventive Maintenance (MJOB)')
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'mjb_operation_external'                , 'number'                      , '0'                           , 'Operational handling of Preventive Maintenance (MJOB) tasks {0=internal | 1=external}')
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'mjb_show_years'                        , 'number'                      , '5'                           , 'Default number of years to be shown in the Preventive Maintenance (MJOB) console')
 DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'mjb_start_year'                        , 'number'                      , EXTRACT(YEAR FROM SYSDATE)    , 'Start/First year of freezing of Preventive Maintenance (MJOB)')
+DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'mjb_enable_moveup'                     , 'number'                      , '0'                           , 'Enable moveup of (MJOB) tasks  {0=moveup disabled | 1=moveup enabled}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'cnt_autolink_regexp'                   , 'string'                      , ''                            , 'Automatically turn CNT-references in texts into clickable links eg. (?:(?:contract [A-Z]*)|(?:[A-Z \,\n]+\#[A-Z]*))(\d+)')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'fac_flags_visible_for_fe'              , 'number'                      , '1'                           , 'An FE-user may see the flag-status of calls, reservations etc {0=No | 1=Yes(default)}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_accept_confirm'                    , 'boolean'                     , 'false'                       , 'bij accepteren melding direct afhandelingsveld invullen')
+DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'pda_melding_quick_note'                , 'number'                     , '1'                            , 'Snelle notitie mogelijkheid bij het aanpassen van een melding binnen de mobile omgeving (0=geen quicknote mogelijk | 1=wel een quicknote mogelijk)')
+DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'pda_order_quick_note'                  , 'number'                     , '1'                            , 'Snelle notitie mogelijkheid bij het aanpassen van een opdracht binnen de mobile omgeving (0=geen quicknote mogelijk | 1=wel een quicknote mogelijk)')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_add_mldopmerk_on_opdrclose'        , 'number'                      , '0'                           , 'Automatically copy remark from order to call when supplier close last order {1=Yes | 0=No}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_afhandeling_required_for_close'    , 'number'                      , '0'                           , 'Het veld afhandeling verplicht bij het afmelden van een melding (0=no, 1=yes)')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_afhandeling_restrict_edit'         , 'number'                      , '0'                           , 'Het veld afhandeling alleen in te vullen bij afmelden/afwijzen (0=no, 1=yes)')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_afmelden_extern'                   , 'number'                      , '0'                           , 'Are external orders visible and/or changeble by ORDBO2 (0=not visible | 1=visible for ORDBO2 | 2=visible and changeble by ORDBO2)')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_afrond_canflex'                    , 'boolean'                     , 'false'                       , 'Change flex of completed issue with MLDAFR ')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_afrond_canremark'                  , 'boolean'                     , 'false'                       , 'Change remark of completed issue with MLDAFR ')
-DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_allow_for_others'                  , 'number'                      , '0'                           , 'Can i make calls for others ? {0=no | 1=yes}')
+DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_allow_for_others'                  , 'number'                      , '0'                           , 'Can i make calls for others ? {0=no | 1=yes | 2=yes, initial empty}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_allow_parentmelding'               , 'number'                      , '0'                           , 'Allow attaching a call to another manually (0=not | 1=allow without orders | 2=allow with closed orders')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_archive_by_gui'                    , 'boolean'                     , 'false'                       , 'Can a call be archived by a button (true) or just by export (false)')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_ask_for_orders'                    , 'boolean'                     , 'true'                        , 'ask for immediate order input after call entry { true | false }')
@@ -558,16 +571,18 @@ DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_can_change_prio_and_place_while_i
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_clear_on_close'                    , 'number'                      , '0'                           , 'Clear when closing call (0=just close call | +1=reset attention, +2=reset Assigned to, +4=reset Back office groups, +8=reset Processor)')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_close_noti_default_off'            , 'number'                      , '0'                           , 'Checkbox [melder notificeren] at cancel is default off (0=no interference, 1=default off)')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_close_opdr_default'                , 'number'                      , '0'                           , 'De checkbox met de vraag of de open opdrachten ook afgemeld moeten worden is standaard niet(0=default) of wel(1) aangevinkt')
+DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_close_ctr_default'                 , 'number'                      , '0'                           , 'De checkbox met de vraag of de open inspecties ook afgemeld moeten worden is standaard niet(0=default) of wel(1) aangevinkt')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_continue_edit_issuer'              , 'boolean'                     , 'false'                       , 'Edit the issuer false= (default) of a continued complain')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_copy_objects_in_workflow'          , 'number'                      , '0'                           , 'Copy object-references to the next step in workflow (0=do not copy | 1=copy)')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_disable_continuation'              , 'boolean'                     , 'false'                       , 'Disable creating continuation calls { false | true }')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_edit_layout'                       , 'number'                      , '0'                           , 'Layout of mld edit screen {0=stdmelding first (default)| 1=place first}')
+DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_properties_order'                  , 'number'                      , '0'                           , 'Positie van de kenmerken bij een melding {0=voor het omschrijving blok (default) | 1=na het omschrijving blok}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_enable_workflow'                   , 'number'                      , '1'                           , 'enable workflow in call handling {0=workflow disabled | 1=workflow enabled }')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_endate_ordbo2'                     , 'number'                      , '1'                           , 'Enddate can be editted by MLDORD/ORDBO2 {0=no | 1=yes (default)}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_enforce_orderdates'                , 'number'                      , '0'                           , 'Enforce order start/ending dates to be within call start/ending dates')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_fe_show_statusnames'               , 'number'                      , '1'                           , 'Show name to FE of the users who changed the status of a melding {0=no | 1=yes}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_fixdatums_marge'                   , 'number'                      , '7'                           , 'WEB_MLDMSU can fix invoer/afgemeld dates')
-DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_flexcolumns'                       , 'number'                      , '1'                           , 'number of flexcolumns for MLD [1|2]')
+DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_flexcolumns'                       , 'number'                      , '1'                           , 'DEPRECATED number of flexcolumns for MLD [1|2]')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_fo_can_assign_team'                , 'number'                      , '0'                           , 'Allow assignment of a new call to a treatment team by the frontoffice {0=no | 1=yes}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_fo_default_user'                   , 'boolean'                     , 'false'                       , 'user current user a default caller, { true=user default | false=empty default }')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_fof_canFlexChange'                 , 'boolean'                     , 'false'                       , 'FOF flex kenmerken laten wijzigen >800 900<=.')
@@ -591,7 +606,6 @@ DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_merge_notes_and_tracking'
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_mobile_place_handler'              , 'number'                      , '1'                           , '1=always location to required level, 2=workplace level to required level')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_msu_can_stop_workflows'            , 'boolean'                     , 'false'                       , 'mld_msu mag een nog actieve workflow afbreken')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_note_autocollapse'                 , 'string'                      , ''                            , 'DEPRECATED: Regexp note text that will allways start collepsed (for technical system notes))')
-DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_note_autoscroll'                   , 'boolean'                     , 'true'                        , 'DEPRECATED: In note_mode=2 scroll to input field')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_note_change_threshold'             , 'number'                      , '30'                          , 'Minutes an author can change a note when it is no longer the last note')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_note_default_notifyFE'             , 'number'                      , '0'                           , 'Default value for checkboxes "<melder> hierover notificeren" and "Actie bij aanvrager <melder> laten" for notes {0=off(default) | 1=both on | 2=notificeren=on, actie=off}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_note_hidden_action2FE'             , 'number'                      , '0'                           , 'Is setting action to FE allowed for hidden notes')
@@ -623,7 +637,7 @@ DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_ord_change_type'
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_ord_flexsummary'                   , 'number'                      , '1'                           , 'User summary of melding-flexprop in initial order description {0=no | 1=yes}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_ord_show_kostenplaats'             , 'number'                      , '1'                           , 'show kostenplaats field for orders {0=don''t show | 1=editable | 2=show}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_ord_show_ordernr'                  , 'number'                      , '0'                           , 'show ordernr field for orders {0=don''t show(&use mld_melding_ordernr) | 1=show}')
-DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_order_autoprint'                   , 'number'                      , '1'                           , 'orders will be printed {0=print only at insert for extern and intern | 1=print with any save | 2=print only at insert for extern | 3=never print}')
+DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_order_autoprint'                   , 'number'                      , '1'                           , 'When to autoprint orders {0=print only at insert for extern and intern | 1=print with any save | 2=print only at insert for extern | 3=never print}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_orderlist_columns_compact'         , 'number'                      , '34052'                       , 'Bitwise coding of columns to show (when relevant) in compact orders list')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_orderlist_columns_full'            , 'number'                      , '49470'                       , 'Bitwise coding of columns to show (when relevant) in full orders list')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_performer_can_change_flags'        , 'boolean'                     , 'false'                       , 'Executor can change the flags of his orders.')
@@ -659,6 +673,7 @@ DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'nightly_mld2bo_emailaddress'
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'show_perslidselector_by_mail'          , 'number'                      , '1'                           , 'Show person selector at sending mail {1=true | 0=false}')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'workflow_collapsed'                    , 'number'                      , '1'                           , 'Workflow overview collapsed/fold up (=1 default) or unfold (=0)')
 DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_copy_order_attachment_from_call'   , 'boolean'                     , 'true'                        , 'On new order, copy attachments from the call by default')
+DEFINE_SETTING('MLD', 0001, 'WEB_PRSSYS', 'mld_opdr_hours_approve_monthly'        , 'boolean'                     , 'false'                       , 'Approve houres within month (false=whole weeks only (default) | true=within month)')
 DEFINE_SETTING('MRK', 0001, 'WEB_PRSSYS', 'mrk_message_expire_days'               , 'number'                      , '30'                          , 'Message automatically expires after ')
 DEFINE_SETTING('MRK', 0001, 'WEB_PRSSYS', 'mrk_photo_size'                        , 'string'                      , 'r512x512'                    , 'Resize uploads to this maximum MRK photo size. Ex: r200x150')
 DEFINE_SETTING('PDA', 0001, 'WEB_PRSSYS', 'pda_list_show_filter_from'             , 'number'                      , '7'                           , 'PDA result sets will include a filter from this many results on')
@@ -681,7 +696,7 @@ DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_collegas_used'
 DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_default_kpn_empty'                 , 'number'                      , '0'                           , 'Costcentre always default empty {0=no | 1=yes}')
 DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_dep_default_kpn'                   , 'number'                      , '1'                           , 'A user can make costs for his own department by default {0=no | 1=yes}')
 DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_dep_default_kpn_voor'              , 'number'                      , '0'                           , 'Gebruik de kostenplaatsen van de prs_perslid_voor indien gezet samen met mld_allow_for_others/bes_allow_for_others')
-DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_flexcolumns'                       , 'number'                      , '2'                           , 'number of flexcolumns for PRS [1|2]')
+DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_flexcolumns'                       , 'number'                      , '2'                           , 'DEPRECATED number of flexcolumns for PRS [1|2]')
 DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_fof_show_belongings'               , 'number'                      , '1'                           , '0=hide belongings, 1=show belongings')
 DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_h'                                 , 'float'                       , '0.25'                        , 'Employability time stepsize')
 DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_hide_fixed_fields'                 , 'number'                      , '0'                           , 'Do not (1) display phonenumber/tarif fields with person details')
@@ -695,6 +710,7 @@ DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_use_edit_photo'
 DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_use_edit_werkplek'                 , 'number'                      , '9'                           , 'enduser can change own location (9=no, 2=within location, 3=within building etc.)')
 DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_use_mld_wijzigkey'                 , 'number'                      , '-1'                          , 'enduser can create this ''melding'' to request change in information')
 DEFINE_SETTING('PRS', 0001, 'WEB_PRSSYS', 'prs_wpprefix_objectid'                 , 'number'                      , '0'                           , 'Workplace description as prefix in front of object id (at calls and contractscope) {0=no | 1=yes}')
+DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_lookhistory_days'                  , 'number'                      , '0'                           , 'Days to look back to sort DESC on reservations per room. 0= no sort on historic reservations.')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'fac_xml_max_factuur'                   , 'number'                      , '500'                         , 'Maximum number of lines for invoice in sales-invoice node')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_247organisation'                   , 'number'                      , '0'                           , '24/7 organisation (1= weekends are working days 0= weekends are holidays)')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_allow_for_others'                  , 'number'                      , '1'                           , 'Can I make reservations for others ? {0=no | 1=yes}')
@@ -722,6 +738,8 @@ DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_delete_ask_kosten'
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_delete_charge_perc'                , 'array'                       , ''                            , 'Aks for charge costs percentage at delete (array of integer values)')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_descript_required'                 , 'boolean'                     , 'false'                       , 'require description field for reservation')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_dur'                               , 'float'                       , '2'                           , 'initial reserving duration (hours)')
+DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_plantable_version'                 , 'number'                      , '2'                           , '2=use modern planning board for reservations (required css-grid support), 1=classic planboard')
+DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_plantable_condensed_from'          , 'number'                      , '3'                           , 'Number of days where plantable switches to condensed mode')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_fe_allow_dirty'                    , 'number'                      , '1'                           , '0=fe kan niets opslaan wat iets dirty zou maken, 1=het mag wel')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_fe_discs_only_in_res'              , 'number'                      , '-1'                          , 'List of disciplines that can only be reserved in RES_ROOMS')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_fe_edit_option_only'               , 'number'                      , '0'                           , 'FE can only edit ''Optional'' reservations (0=opties+definitieve (default) 1=alleen opties)')
@@ -729,10 +747,11 @@ DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_fe_init_host_empty'
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_fe_late_edit_vis'                  , 'number'                      , '0'                           , 'FE can edit visitors and (room-)configuration after the room expires {0=No (default) | 1=Yes}')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_fe_list_days'                      , 'number'                      , '5'                           , 'Default number of days in FE overview')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_fe_reservering_limiet'             , 'number'                      , '-1'                          , 'possible overrule of res_reservering_limiet for fe users')
-DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_flexcolumns'                       , 'number'                      , '1'                           , 'number of flexcolumns for RES [1|2]')
+DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_flexcolumns'                       , 'number'                      , '1'                           , 'DEPRECATED number of flexcolumns for RES [1|2]')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_fo_catering_scopeless'             , 'boolean'                     , 'false'                       , 'Ignore catering-scope for FO-users {true=yes | false=no (default)}')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_fo_default_user'                   , 'boolean'                     , 'true'                        , 'Res user current user a default caller, { true=user default | false=empty default }')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_fo_list_days'                      , 'number'                      , '0'                           , 'Default number of days in FO overview (working days)')
+DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_upwards_search_alg'                , 'number'                      , '5'                           , 'Upwards search level allowed 1=all, 2=loc, 3=bld, 4=floor, 5=room')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_h'                                 , 'float'                       , '0.5'                         , 'reservation interval (hours)')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_hide_remark'                       , 'number'                      , '0'                           , 'Hide remark field in reservation screen ( 0=show | 1=hide | 2=hide only at add)')
 DEFINE_SETTING('RES', 0001, 'WEB_PRSSYS', 'res_max_flex_on_line'                  , 'number'                      , '0'                           , 'Max aantal flexkenmerken op een artikelregel')
@@ -847,15 +866,16 @@ DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_forceapppushtoken'      , 'string
 DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_forcefromaddress'       , 'string'  , ''                                          , 'Force the from and reply address for test purposes eg john@example.com')
 DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_forcemailaddress'       , 'string'  , ''                                          , 'Force this email address for test purposes eg john@example.com')
 DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_forcemobile'            , 'string'  , ''                                          , 'Force this mobile number for test purposes eg 31612345678')
-DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_forcenotiaddress'       , 'string'  , ''                                          , 'Force the notification adress for test purposes eg. "http://facilitordev.azurewebsites.net')
+DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_forcenotiaddress'       , 'string'  , ''                                          , 'Force the notification adress for test purposes eg. "https://facilitordev.azurewebsites.net')
 DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_forceorderaddress'      , 'string'  , ''                                          , 'Force this order address for test purposes eg mailto://john@example.com')
+DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_forceallowedgroep'      , 'string'  , '_TESTERS'                                  , 'When mailto belongs to person in named authorisation group then dont force the mail address')
 DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_fromaddress'            , 'string'  , ''                                          , 'The fixed From address for Facilitor orders')
 DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_logdestination'         , 'number'  , '1'                                         , 'Where to log: 1=file, 2 = database, 3=both')
 DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_loglevel'               , 'number'  , '1'                                         , 'Level of logging (0-3) for troubleshooting purposes')
 DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_mailbodycharset'        , 'string'  , 'unicode-1-1-utf-8'                         , 'Putorders e-mail charset')
-DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_notificationinmailbody' , 'boolean' , 'false'                                     , 'false = as attachments, true = in body')
+DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_notificationinmailbody' , 'boolean' , 'true'                                      , 'false = as attachments, true = in body (deprecated)')
 DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_notificationxsl'        , 'string'  , ''                                          , 'stylesheet to be applied for notifications')
-DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_order_flexfiles'        , 'number'  , '0'                                         , 'Include flexfiles with sent orders')
+DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_order_flexfiles'        , 'number'  , '0'                                         , 'Include flexfiles with sent orders (deprecated, use technical address)')
 DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_proxyserveripaddress'   , 'string'  , '127.0.0.1:8888'                            , 'Proxy Server IP Address, only used when UseProxy = true')
 DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_receiptto'              , 'string'  , ''                                          , 'Address to send the receipt confirmation to for ORDERS only')
 DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_receivetimeout'         , 'number'  , '30'                                        , 'Default receive timeout for http-communication. Increase for slow servers')

FAC/FAC_TAB.SRC

@@ -453,6 +453,10 @@ CREATE_TABLE(imp_schedule, 0)
 , imp_schedule_name     VARCHAR2(20)
 , imp_schedule_aanmaak  DATE DEFAULT SYSDATE
 , imp_schedule_done     DATE
+// Note: this column is defined in PRS_TAB.SRC
+//  prs_perslid_key
+//        NUMBER(10)
+//        CONSTRAINT imp_r_perslid REFERENCES prs_perslid(prs_perslid_key) ON DELETE CASCADE,
 );
 
 CREATE_TABLE(fac_profiel, 0) (
@@ -587,6 +591,7 @@ CREATE_TABLE(fac_srtnotificatie, 0)
 /*
  * fac_notificatie_status: de actuele verzendingsstatus. Bij de insert is deze gelijk aan fac_srtnotificatie_mode
  *   waarin bitwise is aangegeven hoe de notificatie verspreid moet worden:
+ * 32 = POST conform prs_bedrijfadres
  * 16 = POST naar prs_perslid_systeemadres
  *  8 = popup aan receiver prs_perslid_key
  *  4 = per sms aan receiver prs_perslid_mobiel
@@ -594,6 +599,7 @@ CREATE_TABLE(fac_srtnotificatie, 0)
  *  1 = in statusinfo window op portal van receiver prs_perslid_key
  * fac_notificatie_refkey: de key van een melding, reservering etc. Welke entiteit het betreft wordt bepaald
  *  door fac_srtnotificatie_xmlnode. Deze kan ook worden toegevoegd aan fac_srtnotificatie_url.
+ * optional prs_bedrijfadres_key references to the techparams for transmission for appropraite channels
  */
 CREATE_TABLE(fac_notificatie, 0)
 (
@@ -605,13 +611,20 @@ CREATE_TABLE(fac_notificatie, 0)
   fac_notificatie_status
     NUMBER(3)
     NOT_NULL(fac_notificatie_status, fac_c_fac_notificatie_status),
-// Note: this column is defined in PRS_TAB.SRC
+  fac_notificatie_queue
+    VARCHAR2(20)
+    DEFAULT 'DEFAULT' NOT NULL,
+// Note: these columns are defined in PRS_TAB.SRC
 //  prs_perslid_key_sender
 //    NUMBER(10)
 //    REFERENCES prs_perslid(prs_perslid_key) ON DELETE CASCADE,
 //  prs_perslid_key_receiver
 //    NUMBER(10)
 //    REFERENCES prs_perslid(prs_perslid_key) ON DELETE CASCADE,
+//  prs_bedrijfadres_key
+//    NUMBER(10)
+//    CONSTRAINT prs_r_bedrijfadres_key1
+//    REFERENCES prs_bedrijfadres(prs_bedrijfadres_key) ON DELETE CASCADE,
   fac_notificatie_receiver_email
     VARCHAR2(255),
   fac_notificatie_receiver_phone
@@ -658,13 +671,19 @@ CREATE_TABLE(fac_notificatie_job, 0)
   fac_notificatie_job_mode
     NUMBER(3),
   fac_notificatie_job_flags
-    NUMBER(10) default 0, -- 1=view has xemail and xmobile, 2=use fac.notifytracking instead of fac.putnotification(srtprio)
+    NUMBER(10) default 0, -- see documentation &1=view has xemail and xmobile, &2=use fac.notifytracking instead of fac.putnotification(srtprio), &32=commando
   fac_notificatie_job_interval
      NUMBER(5),
+  fac_notificatie_job_seconds
+     NUMBER(5),
+  fac_notificatie_job_queue
+    VARCHAR2(20)
+    DEFAULT 'DEFAULT' NOT NULL,
   fac_notificatie_job_nextrun
      DATE,
   fac_notificatie_job_lastrun
      DATE
+, CONSTRAINT fac_c_notificatie_job1 CHECK((fac_notificatie_job_interval IS NOT NULL AND fac_notificatie_job_seconds IS NULL) OR (fac_notificatie_job_interval IS NULL AND fac_notificatie_job_seconds IS NOT NULL))
 );
 /* Welke importapps bestaan er */
 CREATE_TABLE(fac_import_app, 0)
@@ -690,8 +709,13 @@ CREATE_TABLE(fac_import_app, 0)
     NUMBER(10)
     NOT_NULL(fac_functie_key, fac_c_fac_functie_key2)
     CONSTRAINT fac_r_fac_functie_key REFERENCES fac_functie(fac_functie_key),
+  fac_import_app_browse_f_key
+    NUMBER(10)
+    CONSTRAINT fac_r_fac_functie_key4 REFERENCES fac_functie(fac_functie_key),
   fac_import_app_charset
     VARCHAR(32),
+  fac_import_app_delimiter
+    VARCHAR(2),
   fac_import_app_folder
     VARCHAR(320),
   fac_import_app_files
@@ -754,8 +778,13 @@ CREATE_TABLE(fac_export_app, 0)
     NUMBER(10)
     NOT_NULL(fac_functie_key, fac_c_fac_functie_key3)
     CONSTRAINT fac_r_fac_functie_key3 REFERENCES fac_functie(fac_functie_key),
+  fac_export_app_browse_f_key
+    NUMBER(10)
+    CONSTRAINT fac_r_fac_functie_key5 REFERENCES fac_functie(fac_functie_key),
   fac_export_app_charset
     VARCHAR(32),
+  fac_export_app_delimiter
+    VARCHAR(2),
   fac_export_app_folder
     VARCHAR(320),
   fac_export_app_prefix
@@ -852,7 +881,11 @@ CREATE_TABLE(fac_imp_catalogus, 0)
   bes_staffeltabel_key       NUMBER(10),
   ins_srtdeel_wijzigdagen    NUMBER(3),
   ins_srtdeel_annuleerdagen  NUMBER(3),
-  ins_srtdeel_opmerking      VARCHAR2(2000)
+  ins_srtdeel_opmerking      VARCHAR2(2000),
+  ins_srtdeel_sensortype     NUMBER(3),
+  ins_srtdeel_acadsymbol_dwgx NUMBER(16,3),
+  ins_srtdeel_acadsymbol_dwgy NUMBER(16,3),
+  ins_srtdeel_externnr        VARCHAR2(256)
 );
 
 // Facilitor Import (FIP) tabellen
@@ -913,6 +946,7 @@ CREATE_TABLE(fac_imp_mld, 0)
   , mld_stdmelding_afmeldtext       NUMBER(1)
   , mld_stdmelding_doublecheck      NUMBER(4)
   , mld_stdmelding_slabewaken       NUMBER(1)
+  , mld_stdmelding_externnr         VARCHAR2(256)
 );
 
 CREATE_TABLE(fac_imp_mldafmtxt, 0)
@@ -930,7 +964,7 @@ CREATE_TABLE(fac_imp_onrgoed2, 0)
   , alg_gebouw_code                VARCHAR2(12)
   , alg_verdieping_volgnr          NUMBER(3,0)
   , alg_srtruimte_omschrijving     VARCHAR2(50)
-  , alg_ruimte_nr                  VARCHAR2(10)
+  , alg_ruimte_nr                  VARCHAR2(20)
   , alg_ruimte_omschrijving        VARCHAR2(30)
   , alg_ruimte_bruto_vloeropp      NUMBER(8,2)
   , reserveerbaar                  VARCHAR2(1)
@@ -957,6 +991,7 @@ CREATE_TABLE(fac_imp_organisatie, 0)
   ,PRS_AFDELING_NAAM_PARENT       VARCHAR2 (15)
   ,PRS_AFDELING_OMSCHRIJVING      VARCHAR2 (60 CHAR)
   ,PRS_KOSTENPLAATS_NR            VARCHAR2 (30)
+  ,PRS_AFDELING_EXTERNID          VARCHAR2 (256)
 );
 
 CREATE_TABLE(fac_imp_kpn, 0)
@@ -971,7 +1006,8 @@ CREATE_TABLE(fac_imp_kpn, 0)
    prs_kostenplaats_limiet          NUMBER (8),
    prs_kostenplaats_limietperiode   NUMBER (1),
    prs_kostenplaats_extern          NUMBER (1),
-   prs_kostenplaats_fiat            NUMBER (1)
+   prs_kostenplaats_fiat            NUMBER (1),
+   prs_kostenplaats_externnr        VARCHAR2(256)
 );
 
 CREATE_TABLE(fac_imp_perslid, 0)
@@ -979,7 +1015,7 @@ CREATE_TABLE(fac_imp_perslid, 0)
    alg_locatie_code                VARCHAR2(10)
   ,alg_gebouw_code                 VARCHAR2(12)
   ,alg_verdieping_volgnr           NUMBER(3,0)
-  ,alg_ruimte_nr                   VARCHAR2(10)
+  ,alg_ruimte_nr                   VARCHAR2(20)
   ,prs_werkplek_volgnr             NUMBER (3)
   ,prs_werkplek_omschrijving       VARCHAR2 (30)
   ,prs_afdeling_naam               VARCHAR2 (15)
@@ -1024,6 +1060,8 @@ CREATE_TABLE(fac_imp_perslid, 0)
   ,fac_imp_file_index              NUMBER(10)       /* for internal processing */
   ,prs_perslid_key                 NUMBER(10)       /* for internal processing */
   ,prs_perslid_apikey              VARCHAR2(128)    /* for XD-syncing */
+  ,prs_perslid_visibility          NUMBER(3)
+  ,prs_perslid_externid            VARCHAR2(256)
 );
 
 CREATE_TABLE(fac_imp_ins, 0)
@@ -1041,7 +1079,7 @@ CREATE_TABLE(fac_imp_ins, 0)
   ,alg_locatie_code            VARCHAR2 (10)
   ,alg_gebouw_code             VARCHAR2 (12)
   ,alg_verdieping_volgnr       NUMBER (3)
-  ,alg_ruimte_nr               VARCHAR2 (10)
+  ,alg_ruimte_nr               VARCHAR2 (20)
   ,res_deel_alg_level          NUMBER (1)
   ,res_discipline_omschrijving VARCHAR2 (60)
   ,res_discipline_kostensoort  VARCHAR2 (60)
@@ -1070,6 +1108,7 @@ CREATE_TABLE(fac_imp_ins, 0)
   ,ins_deel_aanmaak            DATE
   ,ins_deel_vervaldatum        DATE
   ,ins_deel_aantal             NUMBER(8,2) DEFAULT(0) NOT NULL
+  ,ins_deel_externnr           VARCHAR2(256)
 );
 
 CREATE_TABLE(fac_imp_sle, 0)
@@ -1079,7 +1118,7 @@ CREATE_TABLE(fac_imp_sle, 0)
   ,alg_locatie_code            VARCHAR2 (10) -- stam + cilinder
   ,alg_gebouw_code             VARCHAR2 (12) -- stam
   ,alg_verdieping_code         VARCHAR2 (10) -- stam
-  ,alg_ruimte_nr               VARCHAR2 (10) -- stam
+  ,alg_ruimte_nr               VARCHAR2 (20) -- stam
   ,cil_gebouw_code             VARCHAR2 (12)
   ,cil_verdieping_code         VARCHAR2 (10)
   ,cil_ruimte_nr               VARCHAR2 (10)
@@ -1131,7 +1170,8 @@ CREATE_TABLE(fac_imp_res_artikel_sync, 0)
   res_artikel_volgnummer       NUMBER(3),
   res_artikel_ingangsdatum     DATE,
   res_artikel_vervaldatum      DATE,
-  res_artikel_minimum          NUMBER(3)
+  res_artikel_minimum          NUMBER(3),
+  res_artikel_externnr         VARCHAR2(256)
 );
 
 CREATE_TABLE(fac_imp_fac_groep, 0)
@@ -1204,7 +1244,9 @@ CREATE_TABLE(fac_imp_bedrijfadres, 0)
    prs_bedrijfadres_ext           VARCHAR2 (10),
    prs_bedrijfadres_attachfile    VARCHAR2 (256),
    prs_bedrijfadres_username      VARCHAR2 (32),
-   prs_bedrijfadres_password      VARCHAR2 (320)
+   prs_bedrijfadres_password      VARCHAR2 (320),
+   prs_bedrijfadres_plugin        VARCHAR2 (320),
+   prs_bedrijfadres_plugindata    VARCHAR2 (4000)
 );
 
 
@@ -1268,12 +1310,6 @@ CREATE_TABLE (fac_setting,0) (
 
 // We want the database to know what he is. This table has only one record.
 CREATE_TABLE (fac_version, 0) (
-  fac_version_major
-    NUMBER(4),
-  fac_version_minor
-    NUMBER(3),
-  fac_version_patch
-    VARCHAR(30),
   fac_version_schema
     VARCHAR(30),
   fac_version_upgrading
@@ -1435,8 +1471,9 @@ CREATE_TABLE(fac_faq, 0)
 // Note: this column is defined in PRS_TAB.SRC
 //   prs_perslid_key NUMBER(10) REFERENCES prs_perslid(prs_perslid_key) ON DELETE SET NULL,
    fac_functie_key NUMBER(10) REFERENCES fac_functie(fac_functie_key),
-   fac_faq_datum DATE,
-   fac_faq_wijzigdatum DATE,
+   fac_faq_datum DATE, // vanaf
+   fac_faq_wijzigdatum DATE,  // actualiteit
+   fac_faq_vervaldatum DATE,  // geldigheid
    fac_faq_lang VARCHAR2(3),
    fac_faq_hint VARCHAR2(1000),
    fac_faq_displaymode NUMBER(3) DEFAULT 0  NOT NULL -- 0 gewoon, +1 altijd bij invoeren, +2 altijd bij bewerken
@@ -1546,7 +1583,8 @@ CREATE_TABLE(fac_imp_factuur, 0) /* Standaard tabel voor de factuur-import */
    artikelcode          VARCHAR2(30),
    factuurregelaantal   NUMBER(8,2),
    eenheid              VARCHAR2(30),
-   opdrachtregelid      NUMBER(10)
+   opdrachtregelid      NUMBER(10),
+   externnr             VARCHAR2(256)
 );
 
 CREATE_TABLE(fac_imp_menu, 0)
@@ -1613,7 +1651,8 @@ CREATE_TABLE(fac_imp_flex, 0)
    cnt_discipline               VARCHAR2(255),
    ins_discipline               VARCHAR2(255),
    ins_srtgroep                 VARCHAR2(255),
-   ins_srtdeel                  VARCHAR2(255)
+   ins_srtdeel                  VARCHAR2(255),
+   kenmerk_wissen               NUMBER(1)
 );
 
 CREATE_TABLE (fac_kenmwaarden, 0)
@@ -1716,6 +1755,11 @@ CREATE_TABLE(fac_widget, 0)
     fac_widget_key
         NUMBER(10)
         CONSTRAINT fac_k_fac_widget_key PRIMARY KEY,
+/* Alvast voor 2022.1
+    fac_widget_naam                                      -- Widgetnaam (mn voor bilbiotheekwidgets)
+        VARCHAR2(60)
+        NOT NULL,
+*/
     fac_widget_groep                                     -- Pagina(naam) of groep(naam) van bijelkaar horende widgets
         VARCHAR2(60),
     fac_widget_volgnr                                    -- Onderlinge volgorde van de widgets op 1 pagina
@@ -1735,11 +1779,48 @@ CREATE_TABLE(fac_widget, 0)
         DEFAULT SYSDATE,
     fac_widget_refreshtime                               -- Refreshtijd van widget in seconden, NULL is geen refresh
         NUMBER(5),
-    FAC_FUNCTIE_KEY                                      -- A la menuitem, indien autorisatie dan tonen
+    fac_functie_key                                      -- A la menuitem, indien autorisatie dan tonen
         NUMBER(10)
         CONSTRAINT fac_r_fac_widget_functie_key REFERENCES fac_functie(fac_functie_key)
 );
 
+/* Alvast voor 2022.1
+CREATE_TABLE(fac_widget_page, 0)
+(
+    fac_widget_page_key
+        NUMBER(10)
+        CONSTRAINT fac_k_fac_widget_page_key PRIMARY KEY,
+    fac_widget_page_name                                  -- Paginanaam
+        VARCHAR2(60),
+// Note: this column is defined in PRS_TAB.SRC
+//  , prs_perslid_key
+//        NUMBER(10)
+//        CONSTRAINT fac_r_prs_perslid_key11 REFERENCES prs_perslid(prs_perslid_key) ON DELETE CASCADE,
+    fac_widget_page_aanmaak                               -- Aanmaak datum
+        DATE
+        DEFAULT SYSDATE
+);
+
+CREATE_TABLE(fac_widget_onpage, 0)                        -- Koppeltabel voor fac_widget en fac_widget_page
+(
+    fac_widget_onpage_key
+        NUMBER(10)
+        CONSTRAINT fac_k_fac_widget_onpage_key PRIMARY KEY,
+    fac_widget_page_key
+        NUMBER(10)
+        CONSTRAINT fac_r_fac_widget_page_key REFERENCES fac_widget_page(fac_widget_page_key) ON DELETE CASCADE,
+    fac_widget_key
+        NUMBER(10)
+        CONSTRAINT fac_r_fac_widget_key REFERENCES fac_widget(fac_widget_key) ON DELETE CASCADE,
+    fac_widget_onpage_order                                -- volgorde
+        NUMBER(5),
+    fac_widget_onpage_height                               -- Optioneel afwjkend van default
+        NUMBER(3),
+    fac_widget_onpage_width                                -- Optioneel afwijkend van default
+        NUMBER(3)
+);
+*/
+
 CREATE_TABLE(fac_note_group, 0)
 (
    fac_note_group_key             NUMBER (10)    PRIMARY KEY,
@@ -1851,7 +1932,8 @@ CREATE_TABLE(fac_imp_faq, 0) (
    fac_faq_url                  VARCHAR2 (250),
    fac_faq_datum                DATE,
    fac_faq_lang                 VARCHAR2 (3),
-   fac_faq_hint                 VARCHAR2 (1000)
+   fac_faq_hint                 VARCHAR2 (1000),
+   fac_faq_vervaldatum          DATE
 );
 
 -- FSN#25952: Generieke contractenimport

FAC/FAC_TRI.SRC

@@ -190,6 +190,15 @@ BEGIN
 END;
 /
 
+CREATE_TRIGGER(fac_t_fac_version_B_IU)
+BEFORE INSERT OR UPDATE ON fac_version
+FOR EACH ROW
+BEGIN
+    :new.fac_version_cust := UPPER(:new.fac_version_cust);
+    :new.fac_version_group := UPPER(:new.fac_version_group);
+END;
+/
+
 CREATE_TRIGGER(fac_t_fac_message_B_IU)
 BEFORE INSERT OR UPDATE ON fac_message
 FOR EACH ROW
@@ -375,14 +384,18 @@ BEGIN
    END IF;
    -- Always clear the notify_to_statinfo bit, even when no :new.prs_perslid_key_receiver
    :NEW.fac_notificatie_status := BITAND (:NEW.fac_notificatie_status, 255 - 1);
+   :NEW.fac_notificatie_queue:=UPPER(:NEW.fac_notificatie_queue);
 END;
 /
 
 CREATE_TRIGGER(fac_t_fac_notificatie_A_U)
 AFTER UPDATE ON fac_notificatie
 BEGIN
-  -- Ruim alle totaal verwerkte notificaties op.
-  DELETE FROM fac_notificatie WHERE fac_notificatie_status=0 AND fac_notificatie_systeemadres IS NULL;
+   -- Ruim alle totaal verwerkte notificaties op.
+   DELETE FROM fac_notificatie
+    WHERE fac_notificatie_status IN (0,16)
+      AND fac_notificatie_systeemadres IS NULL
+      AND prs_bedrijfadres_key IS NULL;
 END;
 /
 
@@ -392,6 +405,7 @@ FOR EACH ROW
 BEGIN
     UPDATE_PRIMARY_KEY(fac_notificatie_job_key, fac_s_fac_notificatie_job_key);
     :new.fac_notificatie_job_view:=UPPER(:new.fac_notificatie_job_view);
+    :new.fac_notificatie_job_queue:=UPPER(:new.fac_notificatie_job_queue);
 END;
 /
 
@@ -723,6 +737,24 @@ BEGIN
 END;
 /
 
+/* Alvast voor 2022.1
+CREATE_TRIGGER(fac_t_fac_widget_page_B_I)
+BEFORE INSERT ON fac_widget_page
+FOR EACH ROW
+BEGIN
+  UPDATE_PRIMARY_KEY(fac_widget_page_key, fac_s_fac_widget_page_key);
+END;
+/
+
+CREATE_TRIGGER(fac_t_fac_widget_onpage_B_I)
+BEFORE INSERT ON fac_widget_onpage
+FOR EACH ROW
+BEGIN
+  UPDATE_PRIMARY_KEY(fac_widget_onpage_key, fac_s_fac_widget_onpage_key);
+END;
+/
+*/
+
 CREATE_TRIGGER(fac_t_fac_code2label_B_IU)
 BEFORE INSERT OR UPDATE ON fac_code2label
 FOR EACH ROW

FAC/FAC_VIE.SRC

@@ -260,12 +260,12 @@ AS
  *
  * Definities van notificatie_job views met naamgeving FAC_V_NOTI_[mod][naam] voor de standaard/defaults
  * Voor klantspecifieke notificaties wordt [cust]_V_NOTI_[mod][naam] toegepast.
- * en (minimaal) verplicht de kolommen sender, receiver, text, code, key, xkey
- * als achtereenvolgens perslid_key, perslid_key, subject, srtnotificatiecode, entiteitkey
+ * en (minimaal) verplicht de kolommen sender, receiver, text, code, key, xkey, xemail, xmobile, fac_srtnotificatie_key, attachments, xsender, prs_bedrijfadres_key
+ * als achtereenvolgens perslid_key, perslid_key, subject, srtnotificatiecode, entiteitkey enz.
  * Als text niet null is, wordt die gebruikt ipv de tekst bij code.
  */
 // Voor een contactpersoon alle reserveringen binnen 4-5 werkdagen na nu, zowel ruimte, voorzieningen als catering
-CREATE_VIEW (fac_v_noti_resreminder, 0) (code, sender, receiver, text, key, xkey)
+CREATE_VIEW (fac_v_noti_resreminder, 0) (code, sender, receiver, text, key, xkey, xemail, xmobile, fac_srtnotificatie_key, attachments, xsender, prs_bedrijfadres_key)
 AS
 SELECT 'RESINF'
      , NULL
@@ -283,6 +283,12 @@ SELECT 'RESINF'
          ||   ' gereserveerd.'
      , res.res_reservering_key
      , rsvr.res_rsv_ruimte_key
+     , NULL xemail
+     , NULL xmobile
+     , NULL fac_srtnotificatie_key
+     , NULL attachments
+     , NULL xsender
+     , NULL prs_bedrijfadres_key
   FROM res_v_aanwezigreservering res
      , res_v_aanwezigrsv_ruimte rsvr
      , res_ruimte_opstelling opst
@@ -317,6 +323,12 @@ SELECT 'RESINF'
           || ' voorziening(en) gereserveerd.'
      , res_reservering_key
      , res_rsv_ruimte_key
+     , NULL xemail
+     , NULL xmobile
+     , NULL fac_srtnotificatie_key
+     , NULL attachments
+     , NULL xsender
+     , NULL prs_bedrijfadres_key
   FROM (
     SELECT rsvr.res_rsv_ruimte_contact_key
          , res.res_reservering_key
@@ -369,7 +381,7 @@ SELECT 'RESINF'
 GROUP BY res_rsv_ruimte_contact_key, res_reservering_key, res_rsv_ruimte_key, ruimte_key;
 
 
-CREATE_VIEW (fac_v_noti_cntreminder, 0) (code, sender, receiver, text, key, par1, par2, xkey)
+CREATE_VIEW (fac_v_noti_cntreminder, 0) (code, sender, receiver, text, key, par1, par2, xkey, xemail, xmobile, fac_srtnotificatie_key, attachments, xsender, prs_bedrijfadres_key)
 AS
    SELECT '', '', c.prs_perslid_key_beh,
              'Rappel: Contract '
@@ -383,6 +395,12 @@ AS
           || TO_CHAR (cnt.cnt_getopzegdatum (c.cnt_contract_key), 'DD-MM-YYYY')
           || ' worden verlengd of opgezegd.',
           c.cnt_contract_key, c.cnt_contract_nummer_intern, cnt.cnt_getopzegdatum (c.cnt_contract_key), NULL
+         , NULL xemail
+         , NULL xmobile
+         , NULL fac_srtnotificatie_key
+         , NULL attachments
+         , NULL xsender
+         , NULL prs_bedrijfadres_key
      FROM cnt_v_aanwezigcontract c, prs_bedrijf b
     WHERE b.prs_bedrijf_key = c.cnt_prs_bedrijf_key
       AND cnt_contract_verwijder IS NULL
@@ -392,7 +410,7 @@ AS
 /*
  * contract notificatie die ook naar collega's gestuurd wordt.
  */
-CREATE_VIEW (fac_v_noti_cntreminder_collega, 0) (code, sender, receiver, text, key, par1, par2, xkey)
+CREATE_VIEW (fac_v_noti_cntreminder_collega, 0) (code, sender, receiver, text, key, par1, par2, xkey, xemail, xmobile, fac_srtnotificatie_key, attachments, xsender, prs_bedrijfadres_key)
 AS
    SELECT '', '', p.prs_collega_key,
              'Rappel: Contract '
@@ -406,6 +424,12 @@ AS
           || TO_CHAR (cnt.cnt_getopzegdatum (c.cnt_contract_key), 'DD-MM-YYYY')
           || ' worden verlengd of opgezegd.',
           c.cnt_contract_key, c.cnt_contract_nummer_intern, cnt.cnt_getopzegdatum (c.cnt_contract_key), NULL
+         , NULL xemail
+         , NULL xmobile
+         , NULL fac_srtnotificatie_key
+         , NULL attachments
+         , NULL xsender
+         , NULL prs_bedrijfadres_key
      FROM cnt_v_aanwezigcontract c, prs_bedrijf b,
           ( SELECT prs_perslid_key, prs_perslid_key prs_collega_key
               FROM prs_perslid
@@ -430,7 +454,7 @@ CREATE_VIEW(fac_v_noti_resdirty, 0) (
    text,
    key,
    xkey,
-   contact
+   contact, xemail, xmobile, fac_srtnotificatie_key, attachments, xsender, prs_bedrijfadres_key
    )
 AS
    SELECT 'RESDIR',
@@ -455,6 +479,12 @@ AS
            FROM prs_v_perslid_fullnames_all pf
            WHERE pf.prs_perslid_key = rm.res_rsv_ruimte_contact_key)
              contact
+         , NULL xemail
+         , NULL xmobile
+         , NULL fac_srtnotificatie_key
+         , NULL attachments
+         , NULL xsender
+         , NULL prs_bedrijfadres_key
    FROM res_rsv_ruimte rm,
         res_ruimte_opstelling ro,
         res_ruimte r,
@@ -485,6 +515,72 @@ AS
             res_rsv_ruimte_contact_key
    ORDER BY res_rsv_ruimte_van, res_rsv_ruimte_key;
 
+-- View to notify sensors that are involved in upcoming reservations
+-- to announce we're about to start. First version, sample as well.
+-- Now uses res_disc_params_preposttime as the horizon for updates
+-- and keeps notifying until it starts. Will improve as we get
+-- more experienced
+CREATE_VIEW(fac_v_noti_ressensors)
+(
+    sender,
+    receiver,
+    text,
+    code,
+    fac_srtnotificatie_key,
+    key,
+    xkey,
+    xsender,
+    xemail,
+    xmobile,
+    attachments,
+    prs_bedrijfadres_key
+)
+AS
+    SELECT NULL                      sender,
+           NULL                      receiver,
+           prs_perslid_naam_friendly text,
+           'INSUPD'                  code,
+           NULL                      fac_srtnotificatie_key,
+           ins_deel_key              key,
+           NULL                      xkey,
+           NULL                      xsender,
+           NULL                      xemail,
+           NULL                      xmobile,
+           NULL                      attachments,
+           prs_bedrijfadres_key      prs_bedrijfadres_key
+      FROM (SELECT r.res_deel_key,
+                   d.ins_deel_key,
+                   rdp.res_disc_params_preposttime,
+                   sd.ins_srtdeel_sensortype,
+                   ba.prs_bedrijfadres_key
+              FROM ins_deel          d,
+                   ins_srtdeel       sd,
+                   res_deel          r,
+                   res_disc_params   rdp,
+                   prs_bedrijfadres  ba
+             WHERE     r.res_ins_deel_key = d.ins_deel_key
+                   AND d.ins_deel_actief = 1
+                   AND rdp.res_ins_discipline_key = r.res_discipline_key
+                   AND sd.prs_bedrijf_key = ba.prs_bedrijf_key
+                   AND ba.prs_bedrijfadres_type = 'I'
+                   AND d.ins_srtdeel_key = sd.ins_srtdeel_key
+                   AND BITAND (sd.ins_srtdeel_sensortype, 1) = 1
+                   AND (r.res_deel_vervaldatum IS NULL OR r.res_deel_vervaldatum > SYSDATE)
+                   AND res_deel_verwijder IS NULL) sensors,
+           (SELECT res_deel_key, res_rsv_deel_van, pf.prs_perslid_naam_friendly
+              FROM res_rsv_deel rd, res_rsv_ruimte rr, prs_v_perslid_fullnames_all pf
+             WHERE     rd.res_rsv_ruimte_key = rr.res_rsv_ruimte_key
+                   AND rr.res_rsv_ruimte_host_key = pf.prs_perslid_key
+                   AND res_rsv_deel_verwijder IS NULL
+                   AND res_rsv_deel_dirtlevel = 0
+                   AND res_rsv_deel_van BETWEEN TRUNC (SYSDATE) AND TRUNC (SYSDATE + 1))
+           reservations_today
+     WHERE     reservations_today.res_deel_key = sensors.res_deel_key
+           AND SYSDATE BETWEEN res_rsv_deel_van - (res_disc_params_preposttime / 24)
+                           AND res_rsv_deel_van;
+
+
+
 -- Notificatie voor opdrachten in de queue die al meer dan S(puo_failalert_threshold) minuten gefaald zijn
 CREATE_VIEW(fac_v_noti_facorderqueuefails, 0)
 (
@@ -494,7 +590,7 @@ CREATE_VIEW(fac_v_noti_facorderqueuefails, 0)
    par1,
    code,
    key,
-   xkey
+   xkey, xemail, xmobile, fac_srtnotificatie_key, attachments, xsender, prs_bedrijfadres_key
 )
 AS
      SELECT '',
@@ -526,6 +622,12 @@ AS
             NULL,
             NULL,
             NULL
+         , NULL xemail
+         , NULL xmobile
+         , NULL fac_srtnotificatie_key
+         , NULL attachments
+         , NULL xsender
+         , NULL prs_bedrijfadres_key
        FROM fac_v_orderqueue q,
             fac_tracking ft,
             fac_srtnotificatie fs,
@@ -543,13 +645,49 @@ AS
             wg.prs_perslid_key
      HAVING (SYSDATE - MIN (ft.fac_tracking_datum)) * 24 * 60 > fac.getSetting('puo_failalert_threshold');
 
+
+-- dagelijkse notificatie voor verwoede inlogpogingen (1 regel per user beetje veel misschien)
+CREATE OR REPLACE FORCE VIEW fac_v_noti_auditfail_day
+(
+    sender,
+    receiver,
+    text,
+    code,
+    key,
+    xkey, xemail, xmobile, fac_srtnotificatie_key, attachments, xsender, prs_bedrijfadres_key
+)
+AS
+      SELECT NULL
+           , NULL
+           , 'Facilitor/'
+             || (SELECT fac_version_cust || '-' || fac_version_otap
+                   FROM fac_version)
+             || ' alert ['
+             || TO_CHAR (fac_auditfail_datum, 'YYYY-MM-DD HH24:MI:SS')
+             || ']: '
+             || fac_auditfail_tekst
+           , NULL
+           , NULL
+           , NULL
+           , fac.getsetting('puo_emergencymailaddress') xemail
+           , NULL xmobile
+           , NULL fac_srtnotificatie_key
+           , NULL attachments
+           , NULL xsender
+           , NULL prs_bedrijfadres_key
+        FROM fac_auditfail
+       WHERE fac_auditfail_tekst LIKE '%dan 5 inlogpogingen%'
+         AND fac_auditfail_datum > SYSDATE - 1
+    ORDER BY fac_auditfail_datum DESC;
+
+
 CREATE_VIEW(fac_v_notifyqueue, 0)
 AS
 SELECT fac_notificatie_receiver_email, fac_notificatie_receiver_phone, fac_notificatie_oms, fac_notificatie_status,
        fac_notificatie_key, fac_notificatie_refkey, fac_notificatie_datum, fac_srtnotificatie_code, fac_srtnotificatie_xmlnode,
        fac_notificatie_extrakey, fac_notificatie_sender_email, fac_notificatie_lang, fac_notificatie_systeemadres,
        fac_notificatie_attachments, fac_srtnotificatie_delay, fac_srtnotificatie_srtkm_key, prs_perslid_key_receiver,
-       fac_notificatie_notbefore, fac_notificatie_failcount
+       fac_notificatie_notbefore, fac_notificatie_failcount, prs_bedrijfadres_key
   FROM fac_notificatie n
   LEFT OUTER JOIN fac_srtnotificatie sn ON n.fac_srtnotificatie_key = sn.fac_srtnotificatie_key;
 
@@ -1104,7 +1242,8 @@ SELECT SYSDATE
            datum,
        (SELECT COUNT (*)
           FROM res_reservering
-         WHERE res_reservering_aanmaak > SYSDATE - 90)
+         WHERE res_reservering_aanmaak > SYSDATE - 90
+           AND res_reservering_verwijder IS NULL)
            res90dagen,
        (SELECT COUNT (*)
           FROM mld_melding
@@ -1171,6 +1310,7 @@ AS
                    0                                 fin,
                    0     prs
               FROM res_reservering
+             WHERE res_reservering_verwijder IS NULL
           GROUP BY TRUNC (res_reservering_aanmaak, 'MM')
           UNION ALL
             SELECT TRUNC (mld_melding_datum, 'MM') maand,

FCLT.NMK

@@ -60,10 +60,10 @@ PROJEXE=z:\Project\FACILITOR\BUILD
 ##
 ## New style using schemanumbers
 ##
-CURRENTVERSION=37
-NEXTVERSION=38
+CURRENTVERSION=39
+NEXTVERSION=40g
 FILEVERSION=
-NEXTCAREVERSION=35
+NEXTCAREVERSION=37
 NEXTROOT=DB$(NEXTVERSION)$(FILEVERSION)
 CURRENTUPDATE=DB$(CURRENTVERSION)to$(NEXTVERSION)
 
@@ -181,6 +181,7 @@ $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).SQL:   \
       $(MSRC)\fac\fac_set.src   \
       $(MSRC)\fac\fac_pac.src   \
       $(MSRC)\fac\fac_paca.src  \
+      $(MSRC)\fac\fac_pacano.src   \
       $(MSRC)\fac\fac_pacx.src  \
       $(MSRC)\fac\fac_pacf.src  \
       $(MSRC)\fac\fac_pacl.src  \
@@ -268,7 +269,7 @@ $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).SQL:   \
  $(CLEANUP1) $(TEMP)\$(*B)_.sql
  COPY $(TEMP)\$(*B)_.sql $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION)_.SQL
 ## $(WRAP1) iname=$(TEMP)\$(*B)_.sql oname=$(TEMP)\$(*B).sql
- COPY $(TEMP)\$(*B).sql $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).SQL
+## COPY $(TEMP)\$(*B).sql $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).SQL
 
 $(MSRC)\fac\_fac_lclmdl.src: \
     $(MSRC)\fac\fac_lclmdl.csv

FCLT.SRC

@@ -47,7 +47,7 @@ WHENEVER SQLERROR CONTINUE;
 
 PROMPT [&fcltlogfile]
 PROMPT
-PROMPT Copyright 1996-2020 Aareon Nederland B.V. ALL RIGHTS RESERVED.
+PROMPT Copyright 1996-2021 Aareon Nederland B.V. ALL RIGHTS RESERVED.
 PROMPT
 PROMPT This is the generated list-file of EVALCONCAT(FCLT,_DBV).sql which was used
 PROMPT to create the FACILITOR(r) EVALCONCAT(DB,_DBV) schema in Oracle
@@ -158,7 +158,7 @@ COMMIT;
 ///////////////////////////// finally compile all views, triggers etc acc to the latest state ///////
 BEGIN DBMS_UTILITY.COMPILE_SCHEMA(USER, FALSE); END;
 /
-BEGIN fac.registerversion(_VERSIONMAJ, _VERSIONMIN, _VERSIONPATCH, _DBV_STRING, 'NL'); END;
+BEGIN fac.registerversion(_DBV_STRING, 'NL'); END;
 /
 REGISTERONCE('$Id$')
 
@@ -183,5 +183,5 @@ SELECT 'Schema FACILITOR@' || USER || ' is now ' || fac.getdbversion() FROM DUAL
 PROMPT
 PROMPT Your schema initialisation is ready. Please check the logfile for errors.
 PROMPT If in doubt please contact: FACILITOR Helpdesk +31 53 4800 710
-PROMPT Copyright (c) 1996-2020 Aareon Nederland B.V. All rights reserved.
+PROMPT Copyright (c) 1996-2021 Aareon Nederland B.V. All rights reserved.
 SPOOL OFF

FIN/FIN_PAC.SRC

@@ -45,6 +45,8 @@ AS
       RETURN NUMBER;
 
   FUNCTION sprintf (ps IN VARCHAR2 , p_factuur_key IN NUMBER) RETURN VARCHAR2;
+
+  PROCEDURE remove(p_factuur_key IN NUMBER);
 END fin;
 /
 
@@ -440,7 +442,7 @@ AS
              WHERE     bes_bestelopdr_key = b_key
                    AND fin_factuur_statuses_key <> 1
                    AND fin_factuur_verwijder IS NULL
-                   AND fin_factuur_datum <= factuurdatum;
+                   AND (fin_factuur_datum <= factuurdatum OR fin_factuur_statuses_key IN (6, 7)); -- Akkoord(6) en Verwerkt(7)
 
             IF inclbtw = 1    -- Artikelen zijn al inclusief, dan ook maar factuur inclusief matchen
             THEN
@@ -1050,6 +1052,57 @@ AS
       END IF;
       RETURN s;
    END;
+
+   PROCEDURE remove(p_factuur_key IN NUMBER)
+   IS
+       CURSOR c_bijlagen(p_refkey IN NUMBER) IS
+           SELECT fac_bijlagen_key
+             FROM fac_bijlagen b
+                , fin_factuur r
+                , fin_kenmerk k
+            WHERE b.fac_bijlagen_kenmerk_key = k.fin_kenmerk_key
+              AND b.fac_bijlagen_refkey = r.fin_factuur_key
+              AND b.fac_bijlagen_module = 'FIN'
+              AND k.fin_kenmerk_type = 'F'
+              AND b.fac_bijlagen_refkey = p_refkey;
+   BEGIN
+       -- Bijlagen van factuurregels verwijderen.
+       -- Zoek alle factuurregels bij deze factuur.
+       -- Garandeer dat de bijlage bij de factuurregel hoort en niet bij een factuur met dezelfde refkey als de factuurregel,
+       -- door alleen kenmerken te gebruiken die alleen voor factuurregels zijn.
+       FOR ref_bijlagen IN (SELECT fac_bijlagen_key
+                              FROM fac_bijlagen b
+                                 , fin_factuurregel r
+                                 , fin_kenmerk k
+                             WHERE b.fac_bijlagen_kenmerk_key = k.fin_kenmerk_key
+                               AND b.fac_bijlagen_refkey = r.fin_factuurregel_key
+                               AND b.fac_bijlagen_module = 'FIN'
+                               AND k.fin_kenmerk_type = 'R'
+                               AND r.fin_factuur_key = p_factuur_key
+                           )
+       LOOP
+           flx.deleteflexbijlage (ref_bijlagen.fac_bijlagen_key);
+       END LOOP;
+
+
+       FOR ref_bijlagen IN c_bijlagen(p_factuur_key)
+       LOOP
+           flx.deleteflexbijlage (ref_bijlagen.fac_bijlagen_key);
+       END LOOP;
+
+       DELETE FROM fin_factuur
+        WHERE fin_factuur_key = p_factuur_key;
+
+       -- Van de volgende tabellen worden de records die naar deze p_afspraak_key
+       -- verwijzen met ON DELETE CASCADE ook verwijderd:
+       --  fin_factuur_note
+       --  fin_kenmerkfactuur
+       -- Hierdoor worden de afhankelijkheden in de volgende tabellen ook verwijderd:
+       --  fin_factuurregel
+       --  fin_kenmerkfactregel
+
+       fac.remove_tracking('factuur', p_factuur_key);
+   END;
 END fin;
 /
 

FIN/FIN_TAB.SRC

@@ -131,6 +131,10 @@ CREATE_TABLE(fin_factuur,0)
 , cnt_contract_plaats_key
     NUMBER(10)
     CONSTRAINT fin_r_fin_factuur8 REFERENCES cnt_contract_plaats(cnt_contract_plaats_key)
+, fin_factuur_externnr
+    VARCHAR2(256)
+, fin_factuur_externsyncdate
+    DATE
 );
 
 CREATE_TABLE(fin_factuurregel,0)
@@ -140,7 +144,7 @@ CREATE_TABLE(fin_factuurregel,0)
     CONSTRAINT fin_k_fin_regel PRIMARY KEY
 , fin_factuur_key
     NUMBER(10)
-    CONSTRAINT fin_r_fin_factuurregel1 REFERENCES fin_factuur(fin_factuur_key)
+    CONSTRAINT fin_r_fin_factuurregel1 REFERENCES fin_factuur(fin_factuur_key) ON DELETE CASCADE
     NOT_NULL(fin_factuur_key, fin_c_fin_factuurregel1)
 , fin_factuurregel_nr
     NUMBER
@@ -238,7 +242,7 @@ CREATE_TABLE(fin_kenmerkfactuur,0)
         CONSTRAINT fin_k_fin_kenmerkfactuur_key PRIMARY KEY
     ,fin_factuur_key
         NUMBER(10)
-        CONSTRAINT fin_r_fin_factuur_key REFERENCES fin_factuur(fin_factuur_key)
+        CONSTRAINT fin_r_fin_factuur_key REFERENCES fin_factuur(fin_factuur_key) ON DELETE CASCADE
     ,fin_kenmerk_key
         NUMBER(10)
     ,fin_kenmerkfactuur_waarde
@@ -259,7 +263,7 @@ CREATE_TABLE(fin_kenmerkfactregel,0)
         CONSTRAINT fin_k_kenmerkfactregel_key PRIMARY KEY
     ,fin_factuurregel_key
         NUMBER(10)
-        CONSTRAINT fin_r_fin_factuurregel_key REFERENCES fin_factuurregel(fin_factuurregel_key)
+        CONSTRAINT fin_r_fin_factuurregel_key REFERENCES fin_factuurregel(fin_factuurregel_key) ON DELETE CASCADE
     ,fin_kenmerk_key
         NUMBER(10)
         CONSTRAINT fin_r_fin_kenmerk_key2 REFERENCES fin_kenmerk(fin_kenmerk_key)

INS/INS_IND.SRC

@@ -12,6 +12,7 @@ create index ins_i_ins_srtdeel3 on ins_srtdeel(ins_srtdeel_cadlayer, ins_srtdeel
 create index ins_i_ins_srtdeel4 on ins_srtdeel(ins_srtdeel_nr);
 create index ins_i_ins_srtdeel5 on ins_srtdeel(prs_bedrijf_key, ins_srtgroep_key, ins_srtdeel_verwijder);
 create index ins_i_ins_srtdeel6 on ins_srtdeel(ins_srtdeel_uitleenbaar);
+create index ins_i_ins_srtdeel7 on ins_srtdeel(ins_srtdeel_sensortype);
 create index ins_i_ins_srtdeel_prs_bdr_key on ins_srtdeel (prs_bedrijf_key);
 
 create index ins_i_ins_discipline1 on ins_tab_discipline(ins_discipline_module, ins_discipline_omschrijving);

INS/INS_PAC.SRC

@@ -12,6 +12,7 @@ CREATE OR REPLACE PACKAGE ins AS
     FUNCTION nextcyclusdate (p_insdeel IN NUMBER, p_srtcontrole IN NUMBER, p_scenario IN NUMBER, p_steps IN NUMBER DEFAULT 0) RETURN DATE;
     FUNCTION nextcyclusdatesteps (p_insdeel IN NUMBER, p_srtcontrole IN NUMBER, p_steps IN NUMBER DEFAULT 1) RETURN NUMBER;
     PROCEDURE setinspectstatus (pdlsrtcontrkey IN NUMBER, pstatus IN NUMBER, puserkey IN NUMBER);
+    PROCEDURE ins_daily(today IN DATE DEFAULT SYSDATE);
 END ins;
 /
 
@@ -348,6 +349,144 @@ CREATE OR REPLACE PACKAGE BODY ins AS
        END IF;
     END;
 
+    PROCEDURE ins_daily(today IN DATE DEFAULT SYSDATE)
+    AS
+        CURSOR c_days(eerste_dag IN DATE, laatste_dag IN DATE)
+        IS
+            SELECT DISTINCT TRUNC(h.ins_deel_statedate) uitvoer_dag
+              FROM ins_deel_state_history h
+                 , ins_deel d
+                 , ins_srtdeel s
+             WHERE h.ins_deel_key = d.ins_deel_key
+               AND d.ins_srtdeel_key = s.ins_srtdeel_key
+               AND BITAND(s.ins_srtdeel_sensortype, 1) = 1
+               AND h.ins_deel_statedate BETWEEN eerste_dag AND (laatste_dag + 1)
+             ORDER BY 1;
+
+        CURSOR c_sensors(dag IN DATE)
+        IS
+            SELECT DISTINCT h.ins_deel_key
+              FROM ins_deel_state_history h
+                 , ins_deel d
+                 , ins_srtdeel s
+             WHERE h.ins_deel_key = d.ins_deel_key
+               AND d.ins_srtdeel_key = s.ins_srtdeel_key
+               AND BITAND(s.ins_srtdeel_sensortype, 1) = 1
+               AND h.ins_deel_statedate BETWEEN (dag) AND (dag + 1);
+
+        -- Haal de statuswijzigingen van een dag op.
+        -- De laatste status loopt tot middernacht.
+        -- Ook de status van middernacht tot de eerste statuswijziging deze dag moet worden opgehaald.
+        -- Deze kan meerdere dagen voor deze dag voor het laatst gezet zijn!
+        CURSOR c_states ( deel_key IN NUMBER
+                        , dag IN DATE)
+        IS
+            SELECT x.status
+                 , SUM(x.eindtijd - x.starttijd) totaaltijd
+              FROM (
+                        (   SELECT a.ins_deel_state  status
+                                 , dag starttijd
+                                 , min(c.ins_deel_statedate)  eindtijd
+                                 , a.ins_deel_key
+                              FROM ins_deel_state_history a
+                                 , ins_deel_state_history c
+                             WHERE a.ins_deel_key = c.ins_deel_key
+                               AND c.ins_deel_statedate BETWEEN dag AND dag+1
+                               AND a.ins_deel_statedate = (SELECT MAX(b.ins_deel_statedate)
+                                                             FROM ins_deel_state_history b
+                                                            WHERE b.ins_deel_key = a.ins_deel_key
+                                                              AND b.ins_deel_statedate < dag
+                                                          )
+                             GROUP BY a.ins_deel_key
+                                    , a.ins_deel_state
+                        )
+                        UNION
+                        (   SELECT a.ins_deel_state     status
+                                 , a.ins_deel_statedate starttijd
+                                 , least(MIN(b.ins_deel_statedate), dag+1) eindtijd
+                                 , a.ins_deel_key
+                              FROM ins_deel_state_history a
+                                 , ins_deel_state_history b
+                             WHERE a.ins_deel_key = deel_key
+                               AND a.ins_deel_statedate BETWEEN dag AND dag+1
+                               AND a.ins_deel_key = b.ins_deel_key
+                               AND a.ins_deel_state <> b.ins_deel_state
+                               AND a.ins_deel_statedate < b.ins_deel_statedate
+                             GROUP BY a.ins_deel_statedate
+                                    , a.ins_deel_state
+                                    , a.ins_deel_key
+                        )
+                   ) x
+             WHERE x.ins_deel_key = deel_key
+             GROUP BY x.status;
+
+        keep_days             NUMBER(3);
+        first_day_available   DATE;
+        last_day_compressed   DATE;
+        start_day_compress    DATE;
+        end_day_compress      DATE;
+    BEGIN
+        -- Setting aantal dagen history ophalen.
+        SELECT COALESCE(fac_setting_default, fac_setting_pvalue)
+          INTO keep_days
+          FROM fac_setting
+         WHERE fac_setting_name = 'ins_state_history';
+
+        -- dbms_output.put_line('today: '||to_char(today,'dd-mm-yyyy'));
+        -- Vandaag comprimeren mag niet want je weet niet of je alle meetwaarden al hebt.
+        end_day_compress := TRUNC(today);
+        IF (end_day_compress = TRUNC(sysdate))
+        THEN
+            end_day_compress := end_day_compress -1;
+        END IF;
+
+        -- Voor welke dagen moet ins_deel_state_history gecomprimeerd worden?
+        -- (voor het geval ins_daily een aantal dagen niet heeft gewerkt.)
+        SELECT TRUNC(COALESCE(MIN(ins_deel_statedate), end_day_compress))
+          INTO first_day_available
+          FROM ins_deel_state_history;
+        -- dbms_output.put_line('first_day_available: ' ||to_char(first_day_available,'dd-mm-yyyy'));
+
+        SELECT COALESCE(TRUNC(MAX(ins_deel_statedate)), first_day_available)
+          INTO last_day_compressed
+          FROM ins_deel_state_history_all;
+        -- dbms_output.put_line('last_day_compressed: ' ||to_char(last_day_compressed,'dd-mm-yyyy'));
+
+        SELECT GREATEST(first_day_available, (last_day_compressed + 1))
+          INTO start_day_compress
+          FROM DUAL;
+        -- dbms_output.put_line('Compress from '||to_char(start_day_compress,'dd-mm-yyyy')||' to '||to_char(end_day_compress,'dd-mm-yyyy'));
+
+        FOR r_day IN c_days(start_day_compress, end_day_compress)
+        LOOP
+            -- dbms_output.put_line('Compress '||to_char(r_day.uitvoer_dag,'dd-mm-yyyy'));
+            FOR r_sensor IN c_sensors(r_day.uitvoer_dag)
+            LOOP
+                -- dbms_output.put_line('sensor: '||r_sensor.ins_deel_key);
+                FOR r_state IN c_states(r_sensor.ins_deel_key, r_day.uitvoer_dag)
+                LOOP
+                     -- dbms_output.put_line('-  '||to_char(r_sensor.ins_deel_key)||' '||r_state.status||' '||to_char(r_state.totaaltijd));
+                     INSERT INTO ins_deel_state_history_all
+                     ( ins_deel_key
+                     , ins_deel_statedate
+                     , ins_deel_state
+                     , ins_deel_statetime
+                     ) VALUES
+                     ( r_sensor.ins_deel_key
+                     , r_day.uitvoer_dag
+                     , r_state.status
+                     , r_state.totaaltijd
+                     );
+                END LOOP;
+            END LOOP;
+            COMMIT;
+        END LOOP;
+        --
+        -- Verwijder alle records uit ins_deel_state_history ouder dan x dagen.
+        DELETE FROM ins_deel_state_history
+         WHERE TRUNC(ins_deel_statedate) <= TRUNC(SYSDATE - keep_days);
+    END;
+
 END ins;
 /
 

INS/INS_SEQ.SRC

@@ -22,6 +22,7 @@ CREATE SEQUENCE ins_s_ins_deelkoppeling_key MINVALUE 1;
 CREATE SEQUENCE ins_s_ins_compositie_key MINVALUE 1;
 CREATE SEQUENCE ins_s_ins_srtdeel_comp_key MINVALUE 1;
 CREATE SEQUENCE ins_s_ins_deel_state_hist_key MINVALUE 1;
+CREATE SEQUENCE ins_s_ins_deel_st_histall_key MINVALUE 1;
 
 CREATE SEQUENCE ins_s_ins_scenario_key MINVALUE 10;
 CREATE SEQUENCE ins_s_ins_srtcontrole_key MINVALUE 10;

INS/INS_TAB.SRC

@@ -58,6 +58,10 @@ CREATE_TABLE(ins_srtdiscipline,0)
     ins_srtdiscipline_verwijder
         DATE
         DEFAULT NULLDATUM,
+    ins_srtdiscipline_externnr
+        VARCHAR2(256),
+    ins_srtdiscipline_extsyncdate
+        DATE,
     CONSTRAINT ins_u_ins_srtdisc_omschr UNIQUE (ins_srtdiscipline_omschrijving,
                                                 ins_srtdiscipline_verwijder,
                                                 ins_srtdiscipline_module)
@@ -85,7 +89,7 @@ CREATE_TABLE(ins_tab_discipline,0)
     ins_discipline_verwijder
         DATE
         DEFAULT NULLDATUM,
-    ins_discipline_min_level /* 1; Reserveerbaar object; 2; Verbruiksartikel; 3; Ruimte */
+    ins_discipline_min_level /* 1; Reserveerbaar object; 2; Verbruiksartikel; 3; Ruimte 4; Personenresource; 5; Werkplek;*/
         NUMBER(1),
     ins_discipline_kpnverplicht
         NUMBER(1) DEFAULT(0) NOT NULL
@@ -117,6 +121,10 @@ CREATE_TABLE(ins_tab_discipline,0)
         VARCHAR2(255),
     ins_discipline_color
         VARCHAR2(60 CHAR),
+    ins_discipline_externnr
+        VARCHAR2(256),
+    ins_discipline_externsyncdate
+        DATE,
     CONSTRAINT ins_u_ins_discipline_omschr UNIQUE (ins_discipline_omschrijving,
                                                    ins_srtdiscipline_key,
                                                    ins_discipline_verwijder,
@@ -180,6 +188,10 @@ CREATE_TABLE(ins_srtgroep,0)
     ins_srtgroep_verwijder
         DATE
         DEFAULT NULLDATUM,
+    ins_srtgroep_externnr
+        VARCHAR2(256),
+    ins_srtgroep_externsyncdate
+        DATE,
     CONSTRAINT ins_u_ins_srtgroep_upper UNIQUE(ins_discipline_key, ins_srtgroep_upper, ins_srtgroep_verwijder, ins_srtgroep_module)
 );
 
@@ -229,8 +241,12 @@ CREATE_TABLE(ins_srtdeel,0)
         VARCHAR2(30),
     ins_srtdeel_dimensie
         NUMBER(1),
-    ins_srtdeel_acadsymbol /* ACADSYMBOL vanuit INV_TAB veplaatst */
+    ins_srtdeel_acadsymbol
         VARCHAR2(256),
+    ins_srtdeel_acadsymbol_dwgx
+        NUMBER(16,3),
+    ins_srtdeel_acadsymbol_dwgy
+        NUMBER(16,3),
     ins_srtdeel_acad_tagvalue /* TAGVALUE vanuit ACAD */
         VARCHAR2(30),
     ins_srtdeel_cadlayer
@@ -272,6 +288,14 @@ CREATE_TABLE(ins_srtdeel,0)
         NUMBER(6),
     ins_srtdeel_mjb_grensscore1
         NUMBER(6,2),
+    ins_srtdeel_externnr
+        VARCHAR2(256),
+    ins_srtdeel_externsyncdate
+        DATE,
+    ins_srtdeel_sensortype  /* bitwise: 0=no sensor, &1=discrete values sensor, &2=continuous values sensor, rest tbd */
+        NUMBER(3)
+        DEFAULT 0
+        NOT NULL,
      CONSTRAINT ins_c_ins_srtdeel_binding CHECK ((ins_srtdeel_module ='INS' AND ins_srtdeel_binding > 0) OR ins_srtdeel_module <> 'INS')
 );
 
@@ -388,6 +412,10 @@ CREATE_TABLE(ins_deel,0)
         NUMBER(6,2), /* nu: laatst gemeten conditiescore; numeriek omdat vergeleken moet worden met ins_srtdeel_mjb_grensscore1 */
      ins_deel_mjb_score2
         NUMBER(6,2), /* nu: laatst bepaalde prioriteit;  */
+    ins_deel_externnr
+        VARCHAR2(256),
+    ins_deel_externsyncdate
+        DATE,
 -- In: PRS_TAB.SRC
 --    prs_perslid_key_beh
 --        NUMBER(10)
@@ -419,6 +447,22 @@ CREATE_TABLE(ins_deel_state_history, 0)
         VARCHAR2(320)
 );
 
+CREATE_TABLE(ins_deel_state_history_all, 0)
+(
+    ins_deel_state_history_all_key
+        NUMBER(10)
+        CONSTRAINT ins_k_deel_state_histall_key PRIMARY KEY,
+    ins_deel_key
+        NUMBER(10)
+        CONSTRAINT ins_r_ins_deel_key3 REFERENCES ins_deel(ins_deel_key),
+    ins_deel_statedate
+        DATE,
+    ins_deel_state
+        VARCHAR2(128),
+    ins_deel_statetime
+        NUMBER
+);
+
 CREATE_TABLE(ins_scenario, 0)
 (
     ins_scenario_key

INS/INS_TRI.SRC

@@ -354,14 +354,18 @@ BEGIN
      EXCEPTION
          WHEN DUP_VAL_ON_INDEX
          THEN
-            SELECT ins_deel_state
-              INTO prev_state
-              FROM ins_deel_state_history
-             WHERE ins_deel_state_history_key =
-                      (SELECT MAX (ins_deel_state_history_key)
-                         FROM ins_deel_state_history
-                        WHERE ins_deel_key = :new.ins_deel_key
-                              AND ins_deel_statedate < new_date);
+            BEGIN
+               SELECT ins_deel_state
+                 INTO prev_state
+                 FROM ins_deel_state_history
+                WHERE ins_deel_state_history_key =
+                         (SELECT MAX (ins_deel_state_history_key)
+                            FROM ins_deel_state_history
+                           WHERE ins_deel_key = :new.ins_deel_key
+                             AND ins_deel_statedate < new_date);
+            EXCEPTION
+               WHEN NO_DATA_FOUND THEN NULL;
+            END;
 
             IF (prev_state = :new.ins_deel_state)
             THEN
@@ -552,6 +556,14 @@ BEGIN
 END;
 /
 
+CREATE_TRIGGER(ins_t_ins_deel_st_histall_B_I)
+BEFORE INSERT ON ins_deel_state_history_all
+FOR EACH ROW
+BEGIN
+    UPDATE_PRIMARY_KEY(ins_deel_state_history_all_key,ins_s_ins_deel_st_histall_key);
+END;
+/
+
 
 CREATE_TRIGGER(ins_t_ins_import_B_IU)
 BEFORE INSERT OR UPDATE ON ins_import

INS/INS_VIE.SRC

@@ -2166,6 +2166,9 @@ SELECT
    m.afdeling,
    m.afdeling_omschrijving,
    --m.fclt_3d_afdeling_key,
+   m.divisie,
+   m.divisie_omschrijving,
+   --m.fclt_3d_divisie_key,
    m.bedrijf_key,
    m.invoerder,
    m.meldbron,
@@ -2300,6 +2303,10 @@ SELECT d.deel_key,
        d.fclt_3d_locatie_key,
        idsc.ins_deelsrtcontrole_key,
        idsc.ins_srtcontrole_key,
+       (SELECT cd.ins_discipline_omschrijving
+          FROM ctr_discipline cd, ins_srtcontrole isc
+         WHERE isc.ins_srtcontrole_key = idsc.ins_srtcontrole_key
+           AND isc.ctr_discipline_key = cd.ins_discipline_key) ctr_discipline_omschrijving,
        (SELECT isc.ins_srtcontrole_omschrijving
           FROM ins_srtcontrole isc
          WHERE isc.ins_srtcontrole_key = idsc.ins_srtcontrole_key) srtcontrole_omschrijving,

KPI/KPI_INI.SRC

@@ -77,7 +77,6 @@ UPDATE fac_usrgraph SET fac_usrgraph_options = '{
   },
   "series": [
     {
-      "renderer": "$.jqplot.BarRenderer",
       "rendererOptions": {
         "barWidth": 50,
         "varyBarColor": true,

MLD/MLD_IND.SRC

@@ -46,12 +46,8 @@ create index mld_i_mld_kenmerk1 on mld_kenmerk(mld_srtkenmerk_key);
 create index mld_i_mld_kenmerk2 on mld_kenmerk(mld_stdmelding_key);
 
 create index mld_i_mld_kenmerkmelding1 on mld_kenmerkmelding(mld_melding_key);
-create index mld_i_mld_kenmerkmelding2 on mld_kenmerkmelding(mld_kenmerk_key);
-create index mld_i_mld_kenmerkmelding3 on mld_kenmerkmelding(mld_kenmerkmelding_waarde);
 
 create index mld_i_mld_kenmerkopdr1 on mld_kenmerkopdr(mld_opdr_key);
-create index mld_i_mld_kenmerkopdr2 on mld_kenmerkopdr(mld_kenmerk_key);
-create index mld_i_mld_kenmerkopdr3 on mld_kenmerkopdr(mld_kenmerkopdr_waarde);
 
 CREATE UNIQUE INDEX mld_i_mld_disc_params1 ON mld_disc_params(mld_ins_discipline_key);
 

MLD/MLD_TAB.SRC

@@ -489,6 +489,10 @@ CREATE_TABLE(mld_stdmelding,0)
     mld_stdmelding_code
         VARCHAR2(60)
         CONSTRAINT mld_u_mld_stdmelding_code UNIQUE,
+    mld_stdmelding_externnr
+        VARCHAR2(256),
+    mld_stdmelding_externsyncdate
+        DATE,
 -- in CAD_TAB.SRC:
 --    cad_thema_key
 --        NUMBER(10)
@@ -786,6 +790,8 @@ CREATE_TABLE(mld_melding,0)
         MLD_T_UITVOERTIJD,
     mld_melding_einddatum  -- geplande einddatum, trigger vult eventueel
         DATE,
+    mld_melding_actiedatum  -- optionele datum voor volgende actie
+        DATE,
     mld_melding_t_respijt
         MLD_T_UITVOERTIJD,  -- tijdsduur die van de doorlooptijd afgetrokken wordt
     mld_melding_indult
@@ -886,8 +892,21 @@ CREATE_TABLE(mld_melding,0)
     mld_melding_email_ext
       VARCHAR2(100),
     mld_melding_tel_ext
-      VARCHAR2(15)
+      VARCHAR2(15),
+    mld_melding_dwgx
+        NUMBER(16,3),
+    mld_melding_dwgy
+        NUMBER(16,3),
+    mld_melding_dwgz
+        NUMBER(16,3),
+    mld_melding_x
+        NUMBER(16,6),
+    mld_melding_y
+        NUMBER(16,6),
+    mld_melding_z
+        NUMBER(16,6)
 );
+
 ALTER TABLE mld_melding MODIFY mld_melding_t_uitvoertijd DEFAULT MLD_T_UITVOERTIJD(NULL, NULL);
 ALTER TABLE mld_melding MODIFY mld_melding_t_accepttijd DEFAULT MLD_T_UITVOERTIJD(NULL, NULL);
 ALTER TABLE mld_melding MODIFY mld_melding_t_respijt DEFAULT MLD_T_UITVOERTIJD(NULL, NULL);
@@ -1042,7 +1061,7 @@ CREATE_TABLE(mld_opdr,0)
         DEFAULT SYSDATE
         NOT NULL,
     mld_opdr_parent_key
-      NUMBER(10)
+        NUMBER(10)
         CONSTRAINT mld_r_mld_opdr_key4 REFERENCES mld_opdr(mld_opdr_key)
 );
 
@@ -1064,6 +1083,7 @@ CREATE_TABLE(mld_melding_object, 0)
         CONSTRAINT mld_k_mld_object_key PRIMARY KEY,
     mld_melding_key
         NUMBER(10)
+        CONSTRAINT mld_r_mld_melding_key5 REFERENCES mld_melding(mld_melding_key) ON DELETE CASCADE
         NOT_NULL(mld_melding_key, mld_c_mld_melding_key),
     ins_deel_key
         NUMBER(10)
@@ -1179,6 +1199,10 @@ CREATE_TABLE(mld_kenmerk, 0)
 ,  mld_kenmerk_code
       VARCHAR2(60)
       CONSTRAINT mld_u_mld_kenmerk_code UNIQUE
+,  mld_kenmerk_wissen
+      NUMBER(1)
+      DEFAULT 0
+      NOT NULL
 //,  CONSTRAINT mld_r_mld_srtkenmerk_keys       CHECK((mld_typeopdr_key IS NULL AND mld_stdmelding_key IS NOT NULL)
 //                                                 OR (mld_typeopdr_key IS NOT NULL AND mld_stdmelding_key IS NULL))
 ,  CONSTRAINT mld_r_mld_srtkenmerk_key2 FOREIGN KEY(mld_srtkenmerk_key) REFERENCES mld_srtkenmerk(mld_srtkenmerk_key)
@@ -1333,7 +1357,7 @@ CREATE_TABLE(mld_opdr_uren, 0)
     mld_opdr_uren_datum
         DATE NOT NULL,
     mld_opdr_key
-        NUMBER(10) CONSTRAINT mld_r_mld_opdr_key1 REFERENCES mld_opdr(mld_opdr_key),
+        NUMBER(10) CONSTRAINT mld_r_mld_opdr_key1 REFERENCES mld_opdr(mld_opdr_key) ON DELETE CASCADE,
     mld_impropdr_key
         NUMBER(10) CONSTRAINT mld_r_mld_impropdr_key1 REFERENCES mld_impropdr(mld_impropdr_key),
     prs_perslid_key
@@ -1437,7 +1461,7 @@ CREATE_TABLE(mld_opdr_uitvoeren, 0)
     mld_opdr_key
         NUMBER(10)
         NOT_NULL(mld_opdr_key, mld_c_mld_opdr_key)
-        CONSTRAINT mld_r_mld_opdr_key2 REFERENCES mld_opdr(mld_opdr_key),
+        CONSTRAINT mld_r_mld_opdr_key2 REFERENCES mld_opdr(mld_opdr_key) ON DELETE CASCADE,
     mld_opdr_uitvoeren_van
         NUMBER(4)
         NOT_NULL(mld_opdr_uitvoeren_van, mld_c_opdr_inzetbaar_van)
@@ -1461,7 +1485,7 @@ CREATE_TABLE(mld_opdr_materiaal, 0)
     mld_opdr_key
         NUMBER(10)
         NOT_NULL(mld_opdr_key, mld_c_mld_opdr_key2)
-        CONSTRAINT mld_r_mld_opdr_key3 REFERENCES mld_opdr(mld_opdr_key),
+        CONSTRAINT mld_r_mld_opdr_key3 REFERENCES mld_opdr(mld_opdr_key) ON DELETE CASCADE,
     fac_usrdata_key
         NUMBER(10)
         CONSTRAINT fac_r_fac_usrdata_key REFERENCES fac_usrdata(fac_usrdata_key),
@@ -1498,6 +1522,10 @@ CREATE_TABLE(mld_opdr_materiaal, 0)
         VARCHAR2(4000),
     mld_opdr_materiaal_extra4
         VARCHAR2(4000),
+    mld_opdr_materiaal_externnr
+        VARCHAR2(256),
+    mld_opdr_materiaal_extsyncdate
+        DATE,
     CONSTRAINT mld_c_mld_opdr_mat_omschr CHECK((mld_opdr_materiaal_omschr IS NULL AND fac_usrdata_key IS NOT NULL) OR (mld_opdr_materiaal_omschr IS NOT NULL AND fac_usrdata_key IS NULL))
 );
 

MLD/MLD_TRI.SRC

@@ -184,7 +184,7 @@ BEGIN
     -- en afhankelijk van de setting ook gelijkhouden.
     IF :new.prs_perslid_key_voor IS NULL
        OR (:new.prs_perslid_key <> :old.prs_perslid_key
-           AND fac.getSetting('mld_allow_for_others') <> 1)
+           AND fac.getSetting('mld_allow_for_others') < 1)
     THEN
       :new.prs_perslid_key_voor := :new.prs_perslid_key;
     END IF;

MLD/MLD_VIE.SRC

@@ -669,42 +669,48 @@ CREATE_VIEW(mld_v_rap_expimp_afmtxt, 0)
    fclt_x_discipline_key,
    fclt_x_stdmelding_key,
    discipline_key,
-   stdmelding_key
+   stdmelding_key,
+   afmeldtekstusefor
 )
 AS
-   SELECT t.mld_afmeldtekst_naam,
-          t.mld_afmeldtekst_omschrijving,
-             md.ins_discipline_omschrijving
+   SELECT t.mld_afmeldtekst_naam
+        , t.mld_afmeldtekst_omschrijving
+        , md.ins_discipline_omschrijving
           || ' [key='
           || TO_CHAR (sm.mld_ins_discipline_key)
-          || ']',
-             sm.mld_stdmelding_omschrijving
+          || ']'
+        , sm.mld_stdmelding_omschrijving
           || ' [key='
           || TO_CHAR (sm.mld_stdmelding_key)
-          || ']',
-          sm.mld_ins_discipline_key,
-          t.mld_stdmelding_key
-     FROM mld_afmeldtekst t, mld_stdmelding sm, mld_discipline md
-    WHERE     t.mld_stdmelding_key IS NOT NULL
-          AND t.mld_stdmelding_key = sm.mld_stdmelding_key
-          AND sm.mld_ins_discipline_key = md.ins_discipline_key
-   UNION ALL
-   SELECT t.mld_afmeldtekst_naam,
-          t.mld_afmeldtekst_omschrijving,
-          DECODE (
+          || ']'
+        , sm.mld_ins_discipline_key
+        , t.mld_stdmelding_key
+        , mld_afmeldtekst_usefor
+     FROM mld_afmeldtekst t
+        , mld_stdmelding sm
+        , mld_discipline md
+    WHERE t.mld_stdmelding_key IS NOT NULL
+      AND t.mld_stdmelding_key = sm.mld_stdmelding_key
+      AND sm.mld_ins_discipline_key = md.ins_discipline_key
+   UNION
+   SELECT t.mld_afmeldtekst_naam
+        , t.mld_afmeldtekst_omschrijving
+        , DECODE (
              md.ins_discipline_key,
              NULL,
              NULL,
                 md.ins_discipline_omschrijving
              || ' [key='
              || TO_CHAR (md.ins_discipline_key)
-             || ']'),
-          NULL,
-          md.ins_discipline_key,
-          NULL
-     FROM mld_afmeldtekst t, mld_discipline md
+             || ']')
+        , NULL
+        , md.ins_discipline_key
+        , NULL
+        , mld_afmeldtekst_usefor
+     FROM mld_afmeldtekst t
+        , mld_discipline md
     WHERE t.mld_stdmelding_key IS NULL
-          AND t.mld_ins_discipline_key = md.ins_discipline_key(+);
+      AND t.mld_ins_discipline_key = md.ins_discipline_key(+);
 
 ---- KTO views + rapportages
 CREATE_VIEW(mld_v_kto_vragen, 0)
@@ -1189,9 +1195,13 @@ CREATE_VIEW(mld_v_udr_melding, 1)
    kostenplaats_oms,
    melder,
    melder_key,
+   melder_email,
    afdeling,
    afdeling_omschrijving,
    fclt_3d_afdeling_key,
+   divisie,
+   divisie_omschrijving,
+   fclt_3d_divisie_key,
    bedrijf_key,
    invoerder,
    meldbron,
@@ -1267,9 +1277,13 @@ AS
           kostenplaats_oms,
           melder,
           prs_perslid_key,
+          prs_perslid_email,
           afdeling,
           afdeling_omschrijving,
           afdeling_key,
+          divisie,
+          divisie_omschrijving,
+          divisie_key,
           prs_bedrijf_key,
           invoerder,
           meldbron,
@@ -1410,6 +1424,7 @@ AS
                   m.mld_melding_start_key,
                   m.mld_melding_externnr,
                   m.prs_perslid_key,
+                  mab.prs_perslid_email,
                   sd.ins_srtdiscipline_prefix || m.mld_melding_key meldingnummer,
                   alg_regio_omschrijving,
                   alg_district_omschrijving,
@@ -1452,35 +1467,13 @@ AS
                      FROM prs_v_perslid_fullnames_all pf
                     WHERE pf.prs_perslid_key = m.prs_perslid_key)
                      melder,
-                   COALESCE (
-                      (SELECT prs_afdeling_naam
-                         FROM prs_afdeling afd
-                        WHERE     afd.prs_afdeling_key = m.prs_afdeling_key),
-                      (SELECT prs_afdeling_naam
-                         FROM prs_afdeling afd, prs_perslid pp
-                        WHERE     afd.prs_afdeling_key = pp.prs_afdeling_key
-                              AND pp.prs_perslid_key = m.prs_perslid_key))
-                      afdeling,
-                   COALESCE (
-                      (SELECT prs_afdeling_omschrijving
-                         FROM prs_afdeling afd
-                        WHERE     afd.prs_afdeling_key = m.prs_afdeling_key),
-                      (SELECT prs_afdeling_omschrijving
-                         FROM prs_afdeling afd, prs_perslid pp
-                        WHERE     afd.prs_afdeling_key = pp.prs_afdeling_key
-                              AND pp.prs_perslid_key = m.prs_perslid_key))
-                      afdeling_omschrijving,
-                   COALESCE (
-                      (m.prs_afdeling_key),
-                      (SELECT prs_afdeling_key
-                         FROM prs_perslid pp
-                        WHERE pp.prs_perslid_key = m.prs_perslid_key))
-                      afdeling_key,
-                  (SELECT prs_bedrijf_key
-                     FROM prs_v_afdeling pva, prs_perslid pp
-                    WHERE pva.prs_afdeling_key = pp.prs_afdeling_key
-                          AND pp.prs_perslid_key = m.prs_perslid_key)
-                     prs_bedrijf_key,
+                  mab.afdeling_naam afdeling,
+                  mab.afdeling_omschrijving afdeling_omschrijving,
+                  mab.prs_afdeling_key afdeling_key,
+                  mab.divisie_naam divisie,
+                  mab.divisie_omschrijving,
+                  mab.prs_afdeling_key1 divisie_key,
+                  mab.prs_bedrijf_key,
                   (SELECT prs_perslid_naam_full
                      FROM prs_v_perslid_fullnames_all pf
                     WHERE pf.prs_perslid_key = mld.getmeldinguser (m.mld_melding_key))
@@ -1587,7 +1580,27 @@ AS
                   mld_disc_params mdp,
                   mld_behandelgroep mbg,
                   ins_srtdiscipline sd,
-                  mld_stdmeldinggroep smg
+                  mld_stdmeldinggroep smg,
+                  (SELECT mx.mld_melding_key
+                        , div.prs_bedrijf_key
+                        , ab.prs_afdeling_key1
+                        , div.prs_afdeling_naam divisie_naam
+                        , div.prs_afdeling_omschrijving divisie_omschrijving
+                        , ab.prs_afdeling_key
+                        , afd.prs_afdeling_naam afdeling_naam
+                        , afd.prs_afdeling_omschrijving afdeling_omschrijving
+                        , px.prs_perslid_key
+                        , px.prs_perslid_email
+                     FROM mld_melding mx
+                        , prs_perslid px
+                        , prs_v_afdeling_boom ab
+                        , prs_afdeling afd
+                        , prs_afdeling div
+                    WHERE px.prs_perslid_key = mx.prs_perslid_key
+                      AND ab.prs_afdeling_key = coalesce(mx.prs_afdeling_key, px.prs_afdeling_key)
+                      AND ab.prs_afdeling_key = afd.prs_afdeling_key
+                      AND ab.prs_afdeling_key1 = div.prs_afdeling_key
+                  ) mab
             WHERE     s.mld_stdmelding_key = m.mld_stdmelding_key
                   AND m.mld_alg_locatie_key = l.alg_locatie_key(+)
                   AND sd.ins_srtdiscipline_key = md.ins_srtdiscipline_key
@@ -1597,6 +1610,7 @@ AS
                   AND mdp.mld_behandelgroep_key = mbg.mld_behandelgroep_key(+)
                   AND l.alg_district_key = d.alg_district_key(+)
                   AND d.alg_regio_key = r.alg_regio_key(+)
+                  AND m.mld_melding_key = mab.mld_melding_key
                   AND m.mld_alg_onroerendgoed_keys = og.alg_onroerendgoed_keys(+)
                   AND m.fac_activiteit_key IS NULL
                   AND m.mld_melding_datum >= TO_DATE ('01-01-2010', 'DD-MM-YYYY')) x;
@@ -1880,9 +1894,13 @@ SELECT
    m.kostenplaats_oms,
    m.melder,
    m.melder_key,
+   m.melder_email,
    m.afdeling,
    m.afdeling_omschrijving,
    m.fclt_3d_afdeling_key,
+   m.divisie,
+   m.divisie_omschrijving,
+   m.fclt_3d_divisie_key,
    m.bedrijf_key,
    m.invoerder,
    m.meldbron,

PRJ/PRJ_PAC.SRC

@@ -39,6 +39,7 @@ AS
       RETURN VARCHAR2 ;
    FUNCTION find_or_create_free_werkplek (pruimtekey   IN   NUMBER,bezetting    IN   NUMBER )
       RETURN NUMBER ;
+   PROCEDURE remove(p_scenario_key IN NUMBER);
 END prj;
 /
 
@@ -1235,6 +1236,27 @@ AS
       prj_commit_additions (pscenariokey); -- Als laatste om tijdelijke dubbelen te voorkomen
       prj_commit_cleanup (pscenariokey);
    END prj_commit_scenario;
+
+   PROCEDURE remove(p_scenario_key IN NUMBER)
+   AS
+   BEGIN
+       DELETE FROM prj_scenario
+        WHERE prj_scenario_key = p_scenario_key;
+
+       -- Van de volgende tabellen worden de records die naar deze p_scenario_key
+       -- verwijzen met ON DELETE CASCADE ook verwijderd:
+       --  prj_scenario_note
+       --  prj_ruimte
+       -- Hierdoor worden de afhankelijkheden in de volgende tabellen ook verwijderd:
+       --  prj_deel
+       --  prj_ruimteafdeling
+       --  prj_werkplek
+       --  prj_perslidwerkplek
+       --  prj_selectie
+
+       fac.remove_tracking('scenario', p_scenario_key);
+   END;
+
 END prj;
 /
 

PRJ/PRJ_TAB.SRC

@@ -58,10 +58,10 @@ CREATE_TABLE(prj_ruimte, 0)
         NUMBER(10)
         CONSTRAINT prj_r_alg_srtruimte_key REFERENCES alg_srtruimte(alg_srtruimte_key),
     prj_ruimte_nr
-        VARCHAR2(10)
+        VARCHAR2(20)
         NOT_NULL(prj_ruimte_nr, prj_c_alg_ruimte_nr),
     prj_ruimte_upper_nr
-        VARCHAR2(10)
+        VARCHAR2(20)
         NOT_NULL(prj_ruimte_upper_nr, prj_c_alg_ruimte_upper_nr),
     prj_ruimte_omschrijving
         VARCHAR2(30),
@@ -113,11 +113,11 @@ CREATE_TABLE(prj_werkplek, 0)
         NOT_NULL(prj_ruimte_key, prj_r_prs_prj_ruimte_key1)
         CONSTRAINT prs_r_prs_prj_ruimte_key2 REFERENCES prj_ruimte(prj_ruimte_key) ON DELETE CASCADE,
     prj_werkplek_dwgx
-        NUMBER(10,3),
+        NUMBER(16,3),
     prj_werkplek_dwgy
-        NUMBER(10,3),
+        NUMBER(16,3),
     prj_werkplek_dwgz
-        NUMBER(10,3),
+        NUMBER(16,3),
     prj_werkplek_dwgrotatie
         NUMBER(5,1),
     prj_werkplek_dwgschaal
@@ -226,11 +226,11 @@ CREATE_TABLE(prj_deel, 0)
        VARCHAR2(60)
        CONSTRAINT prj_c_ins_deel_omschrijving CHECK(prj_deel_omschrijving IS NOT NULL)
 ,  prj_deel_dwgx
-       NUMBER(10,3)
+       NUMBER(16,3)
 ,  prj_deel_dwgy
-       NUMBER(10,3)
+       NUMBER(16,3)
 ,  prj_deel_dwgz
-       NUMBER(10,3)
+       NUMBER(16,3)
 ,  prj_deel_dwgrotatie
        NUMBER(5,1)
 ,  prj_deel_dwgschaal
@@ -279,9 +279,9 @@ CREATE_TABLE(prj_scenario_note, 0)
     prj_scenario_note_nr
         NUMBER(3),
     prj_scenario_note_DWGX
-        NUMBER(10),
+        NUMBER(16,3),
     prj_scenario_note_DWGY
-        NUMBER(10),
+        NUMBER(16,3),
     prj_scenario_note_omschrijving
         VARCHAR2(2000),
     prj_ruimte_key

PRS/PRS_PAC.SRC

@@ -107,6 +107,8 @@ AS
    PROCEDURE update_perslid (p_import_key IN NUMBER, p_sleutelkolom IN VARCHAR2, p_alg_type IN VARCHAR2);
 
    PROCEDURE delete_perslid (p_import_key IN NUMBER, p_perslid_key IN NUMBER);
+
+   FUNCTION combinatievalidatie (p_kp_key IN NUMBER, p_ksrt_key IN NUMBER, p_disc_key IN NUMBER) RETURN BOOLEAN;
 END prs;
 /
 
@@ -427,7 +429,8 @@ AS
              WHEN lteller = 3
              THEN
                 lkpgverantwkey := lkpgverantwkey3;
-                llastfiat := lgrens >= fac.getsetting ('mld_opdr_kpg_fin_limit2');
+                llastfiat := lgrens >= fac.getsetting ('mld_opdr_kpg_fin_limit2') OR
+                             lexcludeiskpgverantw = 1; -- Als de 2de fiatteur de exclude is dan moet de 3de fiatteur toch nog fiatteren.
              END CASE;
 
              IF lkpgverantwkey = pexcludekey
@@ -511,7 +514,7 @@ AS
                                    AND st.fac_srtnotificatie_code = 'BESFIT'
                                    AND fac_tracking_refkey = b.bes_bestelling_key)
                       THEN
-                          prs.getfiatteur(b.prs_kostenplaats_key, -1, binfo.totaal, binfo.ins_discipline_key, COALESCE(bes_bestelling_fiatbedrag, -1))
+                          prs.getfiatteur(b.prs_kostenplaats_key, pexcludekey, binfo.totaal, binfo.ins_discipline_key, COALESCE(bes_bestelling_fiatbedrag, -1))
                       WHEN bes_bestelling_fiatbedrag >= fac.getsetting('mld_opdr_kpg_fin_limit2')
                       THEN
                           COALESCE(prs_kostenplaatsgrp_fiat3_key, -1)
@@ -1284,9 +1287,9 @@ AS
               v_errorhint := 'Ongeldige ruimte nr';
               v_alg_ruimte_nr := TRIM (v_alg_ruimte_nr);
 
-              IF LENGTH (v_alg_ruimte_nr) > 10
+              IF LENGTH (v_alg_ruimte_nr) > 20
               THEN
-                 v_alg_ruimte_nr := SUBSTR (v_alg_ruimte_nr, 1, 10);
+                 v_alg_ruimte_nr := SUBSTR (v_alg_ruimte_nr, 1, 20);
                  fac.imp_writelog (
                     p_import_key,
                     'W',
@@ -2410,6 +2413,86 @@ AS
      END;
   END delete_perslid;
 
+   FUNCTION combinatievalidatie (p_kp_key IN NUMBER, p_ksrt_key IN NUMBER, p_disc_key IN NUMBER)
+      RETURN BOOLEAN
+   AS
+      l_dummy            prs_kostencombinatie.prs_kostencombinatie_key%TYPE;
+      l_kp_key           prs_kostenplaats.prs_kostenplaats_key%TYPE;
+      l_ksrt_key         prs_kostensoort.prs_kostensoort_key%TYPE;
+      l_disc_key         mld_stdmelding.mld_ins_discipline_key%TYPE;
+      l_combination_OK   BOOLEAN DEFAULT FALSE;                                         -- Start de afvalrace met FALSE.
+      l_kpgrp_key        prs_kostenplaatsgrp.prs_kostenplaatsgrp_key%TYPE DEFAULT -1;
+   BEGIN
+      l_kp_key := p_kp_key;
+      l_ksrt_key := p_ksrt_key;
+      l_disc_key := p_disc_key;
+
+      -- Als de kostensoort niet werd meegegeven dan deze proberen zelf te bepalen.
+      IF l_ksrt_key IS NULL AND l_disc_key IS NOT NULL
+      THEN
+         SELECT prs_kostensoort_key
+           INTO l_ksrt_key
+           FROM ins_tab_discipline
+          WHERE ins_discipline_key = l_disc_key;
+      END IF;
+
+      -- Start de afvalrace.
+      IF l_kp_key IS NULL OR l_ksrt_key IS NULL
+      THEN
+         l_combination_OK := TRUE;
+      END IF;
+
+      IF NOT l_combination_OK
+      THEN
+         BEGIN
+            SELECT prs_kostenplaatsgrp_key
+              INTO l_kpgrp_key
+              FROM prs_kostenplaats
+             WHERE prs_kostenplaats_key = l_kp_key;
+            -- het is goed als er geen groep gedefinieerd is
+            l_combination_OK := l_kpgrp_key IS NULL;
+         EXCEPTION
+            WHEN NO_DATA_FOUND
+            THEN
+               NULL;
+         END;
+      END IF;
+
+      IF NOT l_combination_OK
+      THEN
+         BEGIN
+            -- Geldt er uberhaupt een restrictie op deze kostensoort?
+            SELECT DISTINCT 1
+              INTO l_dummy
+              FROM prs_kostencombinatie kc
+             WHERE kc.prs_kostensoort_key = l_ksrt_key;
+         EXCEPTION
+            WHEN NO_DATA_FOUND
+            THEN
+               l_combination_OK := TRUE;
+         END;
+      END IF;
+
+      IF NOT l_combination_OK
+      THEN
+         BEGIN
+            SELECT prs_kostencombinatie_key
+              INTO l_dummy
+              FROM prs_kostencombinatie kc
+             WHERE kc.prs_kostenplaatsgrp_key = l_kpgrp_key
+               AND kc.prs_kostensoort_key = l_ksrt_key;
+            -- Er is een geldige combinatie gevonden.
+            l_combination_OK := TRUE;
+         EXCEPTION
+            WHEN NO_DATA_FOUND
+            THEN
+               NULL;
+         END;
+      END IF;
+
+      RETURN l_combination_OK;
+   END;
+
 END prs;
 /
 

PRS/PRS_TAB.SRC

@@ -164,12 +164,16 @@ CREATE_TABLE(prs_bedrijf_bedrijf,0)
         NUMBER (10)
         CONSTRAINT prs_r_prs_bedrijf_bedrijf1 REFERENCES prs_bedrijf (prs_bedrijf_key) NOT NULL,
    prs_bedrijf_externid1
-        VARCHAR2(60),     -- optional remote key of 1
+        VARCHAR2(256),     -- optional remote key of 1
+   prs_bedrijf_externsyncdate1
+        DATE,
    prs_bedrijf_key2
         NUMBER (10)
         CONSTRAINT prs_r_prs_bedrijf_bedrijf2 REFERENCES prs_bedrijf (prs_bedrijf_key) NOT NULL,
    prs_bedrijf_externid2
-        VARCHAR2(60),     -- optional remote key of 2
+        VARCHAR2(256),     -- optional remote key of 2
+   prs_bedrijf_externsyncdate2
+        DATE,
    prs_bedrijf_bedrijf_startdatum
         DATE
         DEFAULT SYSDATE,
@@ -218,9 +222,9 @@ CREATE_TABLE(prs_bedrijfadres, 0) (
     alg_locatie_key
         NUMBER(10)
         CONSTRAINT prs_r_alg_locatie_key REFERENCES alg_locatie(alg_locatie_key) ON DELETE CASCADE,
-    prs_bedrijfadres_type /* O=Order, B=Bestelling, V=Voorraadinfo, C=Contract, N=Notificatie */
+    prs_bedrijfadres_type /* O=Order, B=Bestelling, V=Voorraadinfo, C=Contract, N=Notificatie, I=IOT */
         VARCHAR2(1)
-        CONSTRAINT prs_c_prs_bedrijfadrestype CHECK (prs_bedrijfadres_type IN ('O','B','C','V','N')),
+        CONSTRAINT prs_c_prs_bedrijfadrestype CHECK (prs_bedrijfadres_type IN ('O','B','C','V','N','I')),
 -- In MLD_TAB.SRC:
 --    mld_typeopdr_key
 --        NUMBER(10) CONSTRAINT prs_r_mld_typeopdr_key REFERENCES mld_typeopdr(mld_typeopdr_key) ON DELETE CASCADE,
@@ -242,6 +246,10 @@ CREATE_TABLE(prs_bedrijfadres, 0) (
         VARCHAR2(256),
     prs_bedrijfadres_charset
         VARCHAR2(32),
+    prs_bedrijfadres_plugin
+        VARCHAR2(320),
+    prs_bedrijfadres_plugindata // naar eigen inzicht voor de plugin, bijvoorbeeld refreshtoken
+        VARCHAR2(4000),
     prs_bedrijfadres_error_handler
         NUMBER(1)
         DEFAULT 0
@@ -335,6 +343,10 @@ CREATE_TABLE(prs_kostenplaats,0) (
    prs_kostenplaats_extern -- 0=intern, 1=extern (gebruikt bij prijsberekeningen)
        NUMBER(1)
        DEFAULT 0,
+   prs_kostenplaats_externnr
+       VARCHAR2(256),
+   prs_kostenplaats_extsyncdate
+       DATE,
    prs_kostenplaats_fiat -- 0=geen, 1=wel fiattering
        NUMBER(1)
        DEFAULT 1
@@ -417,7 +429,9 @@ CREATE_TABLE(prs_afdeling,0)
 --        NUMBER(10)
 --        CONSTRAINT alg_r_mld_adres_key2 REFERENCES mld_adres(mld_adres_key),
     prs_afdeling_externid    /* voor koppelingen met externe systemen, bijvoorbeeld een externe GUID */
-        VARCHAR2(128),
+        VARCHAR2(256),
+    prs_afdeling_externsyncdate
+        DATE,
     prs_afdeling_aanmaak
         DATE
         DEFAULT SYSDATE
@@ -500,12 +514,16 @@ CREATE_TABLE(prs_werkplek,0)
         NUMBER(10)
         NOT_NULL(prs_alg_ruimte_key, prs_r_prs_alg_ruimte_key1)
         CONSTRAINT prs_r_prs_alg_ruimte_key2 REFERENCES alg_ruimte(alg_ruimte_key),
+    prs_werkplek_externnr
+        VARCHAR2(256),
+    prs_werkplek_externsyncdate
+        DATE,
     prs_werkplek_dwgx
-        NUMBER(10,3),
+        NUMBER(16,3),
     prs_werkplek_dwgy
-        NUMBER(10,3),
+        NUMBER(16,3),
     prs_werkplek_dwgz
-        NUMBER(10,3),
+        NUMBER(16,3),
     prs_werkplek_dwgrotatie
         NUMBER(5,1),
     prs_werkplek_dwgschaal
@@ -551,7 +569,7 @@ CREATE_TABLE(prs_perslid,0)
     prs_perslid_titel
         VARCHAR2(15),
     prs_perslid_geslacht
-        NUMBER(1),   -- 1=man; 0=vrouw (geen M/V ivm international)
+        NUMBER(1),   -- 1=man; 0=vrouw (others=others)
     prs_perslid_initialen
         VARCHAR2(10),
     prs_perslid_nr
@@ -610,6 +628,10 @@ CREATE_TABLE(prs_perslid,0)
         DEFAULT 1
         CONSTRAINT prs_c_prs_perslid_ingids CHECK(prs_perslid_ingids IS NULL
                                                  OR prs_perslid_ingids = 1 ),
+    prs_perslid_visibility
+        NUMBER(3) /* levels coded, opt-in */
+        DEFAULT 0
+        NOT NULL,
     fac_profiel_key
         NUMBER (10)
         CONSTRAINT prs_r_fac_profiel_key REFERENCES fac_profiel(fac_profiel_key),
@@ -646,7 +668,9 @@ CREATE_TABLE(prs_perslid,0)
         DATE
         DEFAULT SYSDATE NOT NULL,
     prs_perslid_externid    /* voor koppelingen met externe systemen, bijvoorbeeld een externe GUID */
-        VARCHAR2(128),
+        VARCHAR2(256),
+    prs_perslid_externsyncdate
+        DATE,
     prs_perslid_externoslogin -- SCIM only, not uppercased
         VARCHAR2(30),
     prs_perslid_terms_datum
@@ -659,11 +683,11 @@ CREATE_TABLE(prs_perslid,0)
         NUMBER(4),
     prs_perslid_opmerking
         VARCHAR2 (320),
-    CONSTRAINT prs_c_prs_perslid_datums CHECK(prs_perslid_einddatum >= prs_perslid_ingangsdatum),
     prs_perslid_loglevel
         NUMBER(1)
         DEFAULT 0
-        NOT NULL
+        NOT NULL,
+    CONSTRAINT prs_c_prs_perslid_datums CHECK(prs_perslid_einddatum >= prs_perslid_ingangsdatum)
 );
 
 // Without this column, that table is useless, but we must define it here, after prs_perslid.
@@ -686,7 +710,11 @@ ALTER TABLE fac_notificatie ADD(
     REFERENCES prs_perslid(prs_perslid_key) ON DELETE CASCADE,
   prs_perslid_key_receiver
     NUMBER(10)
-    REFERENCES prs_perslid(prs_perslid_key) ON DELETE CASCADE
+    REFERENCES prs_perslid(prs_perslid_key) ON DELETE CASCADE,
+  prs_bedrijfadres_key
+    NUMBER(10)
+    CONSTRAINT prs_r_bedrijfadres_key1
+    REFERENCES prs_bedrijfadres(prs_bedrijfadres_key) ON DELETE CASCADE
 );
 
 ALTER TABLE fac_activiteit ADD (
@@ -721,6 +749,13 @@ ALTER TABLE fac_session ADD (
         NUMBER(10)
         CONSTRAINT fac_r_prs_perslid_key2 REFERENCES prs_perslid(prs_perslid_key) ON DELETE CASCADE
 );
+/* Alvast voor 2022.1
+ALTER TABLE fac_widget_page ADD (
+  prs_perslid_key
+        NUMBER(10)
+        CONSTRAINT fac_r_prs_perslid_key11 REFERENCES prs_perslid(prs_perslid_key) ON DELETE CASCADE
+);
+*/
 ALTER TABLE fac_bookmark ADD (
   prs_perslid_key
         NUMBER(10)
@@ -830,6 +865,12 @@ ADD
         CONSTRAINT fac_c_prs_perslid_key1 CHECK(prs_perslid_key IS NOT NULL)
 );
 
+ALTER TABLE imp_schedule ADD (
+  prs_perslid_key
+  NUMBER(10)
+  CONSTRAINT imp_r_perslid REFERENCES prs_perslid(prs_perslid_key) ON DELETE SET NULL
+);
+
 ALTER TABLE fac_kenmwaarden
 ADD
 CONSTRAINT fac_u_fac_kenmwaarden UNIQUE(fac_kenmwaarden_module, fac_kenmwaarden_refkey, fac_kenmwaarden_kenmerk_key, prs_perslid_key);
@@ -967,6 +1008,10 @@ CREATE_TABLE(prs_perslidwerkplek,0)
          (prs_perslidwerkplek_bezetting is not null and prs_perslidwerkplek_bezetting BETWEEN 0 AND 100),
     prs_perslidwerkplek_volgnr  -- UWVA#18996
         NUMBER(2),
+    prs_perslidwerkplek_externnr
+        VARCHAR2(256),
+    prs_perslidwerkplek_extsyncd
+        DATE,
     prs_perslidwerkplek_aanmaak
         DATE
         DEFAULT SYSDATE
@@ -1088,7 +1133,7 @@ prs_contactpersoon_telefoon_2
 prs_contactpersoon_fax
     VARCHAR2(30),
 prs_contactpersoon_email
-    VARCHAR2(50),
+    VARCHAR2(200),
 prs_contactpersoon_functie
     VARCHAR2(60),
 prs_contactpersoon_opmerking
@@ -1101,6 +1146,10 @@ prs_bedrijf_key
 prs_perslid_key  /* kan eventueel een Facilitor user zijn */
     NUMBER(10)
     CONSTRAINT prs_r_prs_perslid_key16 REFERENCES prs_perslid(prs_perslid_key),
+prs_contactpersoon_externnr
+    VARCHAR2(256),
+prs_contactpersoon_extsyncdate
+    DATE,
 prs_contactpersoon_aanmaak
     DATE
     DEFAULT SYSDATE,

RES/RES_IND.SRC

@@ -14,7 +14,7 @@ create index res_i_res_ruimte_opstelling2 on res_ruimte_opstelling(res_opstellin
 
 create index res_i_res_deel1 on res_deel(res_deel_key, res_ins_deel_key);
 create index res_i_res_deel2 on res_deel(res_discipline_key);
-CREATE UNIQUE INDEX res_i_res_deel3 ON res_deel(res_ins_deel_key, res_discipline_key, res_deel_verwijder);
+CREATE UNIQUE INDEX res_i_res_deel3 ON res_deel(res_ins_deel_key, res_prs_perslid_key, res_discipline_key, res_deel_verwijder);
 create index res_i_res_deel4 ON res_deel(res_prs_perslid_key);
 
 create index res_i_res_artikel1 on res_artikel(res_discipline_key);

RES/RES_LCL.SRC

@@ -139,10 +139,6 @@ DEFINE_LOCALEITEM(lcl_res_objplantime)
 DEFINE_LOCALEITEM(lcl_res_opstelling)
 DEFINE_LOCALEITEM(lcl_res_pers)
 DEFINE_LOCALEITEM(lcl_res_plaats)
-DEFINE_LOCALEITEM(lcl_res_plan_eerder)
-DEFINE_LOCALEITEM(lcl_res_plan_later)
-DEFINE_LOCALEITEM(lcl_res_plan_meer_eerder)
-DEFINE_LOCALEITEM(lcl_res_plan_meer_later)
 DEFINE_LOCALEITEM(lcl_res_plan_tt_eerder)
 DEFINE_LOCALEITEM(lcl_res_plan_tt_later)
 DEFINE_LOCALEITEM(lcl_res_plan_tt_meer_eerder)

RES/RES_PAC.SRC

@@ -36,6 +36,7 @@ CREATE OR REPLACE PACKAGE res AS
    FUNCTION sprintf (ps IN VARCHAR2 , pres_rsv_ruimte_key IN NUMBER) RETURN VARCHAR2;
    FUNCTION notifypool (pbez_bezoeker_key IN NUMBER, pcode IN VARCHAR2) RETURN NUMBER;
    PROCEDURE notifybackoffice (prsvkey IN NUMBER, pcode IN VARCHAR2, ptype IN VARCHAR2 DEFAULT NULL, pkey IN NUMBER DEFAULT NULL);
+   PROCEDURE remove(p_rsv_ruimte_key IN NUMBER);
 END res;
 /
 
@@ -465,6 +466,8 @@ AS
                            , k1.res_srtkenmerk_key
                            , k1.res_activiteit_key
                            , k1.res_kenmerk_key
+                           , k1.res_kenmerk_omschrijving
+                           , s1.res_srtkenmerk_omschrijving
                         FROM res_kenmerkwaarde w1
                            , res_kenmerk k1
                            , res_srtkenmerk s1
@@ -486,6 +489,7 @@ AS
                 AND k.res_srtkenmerk_key = s.res_srtkenmerk_key
                 AND s.res_srtkenmerk_kenmerktype NOT IN ('F', 'M', 'E')
                 AND waarde_from.res_srtkenmerk_key = k.res_srtkenmerk_key
+                AND COALESCE(waarde_from.res_kenmerk_omschrijving, waarde_from.res_srtkenmerk_omschrijving) = COALESCE(k.res_kenmerk_omschrijving, s.res_srtkenmerk_omschrijving)
                 AND waarde_from.res_kenmerk_groep = k.res_kenmerk_groep
                 AND r.res_rsv_ruimte_key = prsv_ruimte_key_to;
       END IF;
@@ -712,6 +716,7 @@ AS
             FROM   res_rsv_ruimte
            WHERE   res_rsv_ruimte_dirtlevel <> 0
                    AND res_rsv_ruimte_verwijder IS NULL
+                   AND (res_status_bo_key IS NULL OR res_status_bo_key <> 6) -- status 6 is niet bij te werken.
                    AND res_rsv_ruimte_van BETWEEN TRUNC (checkdate) AND TRUNC (checkdate + 1))
       loop
          set_ruimte_dirty (prsv_ruimte.res_rsv_ruimte_key);
@@ -853,6 +858,7 @@ AS
       preposttime NUMBER(5,4); -- we gaan nog delen door 24, res_disc_params.res_disc_params_preposttime%TYPE is dan te klein;
       lres_deel_key res_rsv_deel.res_deel_key%TYPE;
       lres_ins_deel_key res_deel.res_ins_deel_key%TYPE;
+      lres_prs_perslid_key res_deel.res_prs_perslid_key%TYPE;
       lres_deel_vervaldatum res_deel.res_deel_vervaldatum%TYPE;
       lrsv_ruimte_key res_rsv_deel.res_rsv_ruimte_key%TYPE;
       lrsv_deel_key res_rsv_deel.res_rsv_deel_key%TYPE;
@@ -866,6 +872,7 @@ AS
       BEGIN
           SELECT   d.res_deel_key,
                    rd.res_ins_deel_key,
+                   rd.res_prs_perslid_key,
                    rd.res_deel_vervaldatum,
                    d.res_rsv_ruimte_key,
                    res_rsv_deel_key,
@@ -877,6 +884,7 @@ AS
                    res_disc_params_preposttime / 24
             INTO   lres_deel_key,
                    lres_ins_deel_key,
+                   lres_prs_perslid_key,
                    lres_deel_vervaldatum,
                    lrsv_ruimte_key,
                    lrsv_deel_key,
@@ -908,7 +916,8 @@ AS
             FROM   res_v_aanwezigrsv_deel rad,                                                                  -- de andere
                    res_deel rd
            WHERE rd.res_deel_key = rad.res_deel_key
-             AND rd.res_ins_deel_key = lres_ins_deel_key -- Er kunnen meerdere res_deel-en zijn met dezelfde ins_deel_key
+             AND (rd.res_ins_deel_key = lres_ins_deel_key -- Er kunnen meerdere res_deel-en zijn met dezelfde ins_deel_key/ prs_perslid_key
+                  OR rd.res_prs_perslid_key = lres_prs_perslid_key)
                    -- Er is overlap als
                    -- A) de andere ruimte begint voor ons einde
                    -- B) en eindigt na ons begin
@@ -920,10 +929,12 @@ AS
           THEN
              newdirtlevel :=  512;                                                                                 -- Overlap
           END IF;
-          IF NOT res_deel_in_scope (lres_deel_key, lrsv_ruimte_key) OR
-             lres_deel_vervaldatum <= lrsv_deel_tot
-          THEN
-             newdirtlevel :=  newdirtlevel + 256;                                                               -- OutOfScope/Not Allowed
+          IF lres_prs_perslid_key IS NULL THEN
+              IF NOT res_deel_in_scope (lres_deel_key, lrsv_ruimte_key) OR
+                 lres_deel_vervaldatum <= lrsv_deel_tot
+              THEN
+                 newdirtlevel :=  newdirtlevel + 256;                                                               -- OutOfScope/Not Allowed
+              END IF;
           END IF;
           IF (lrsv_deel_van < lruimtevan OR lrsv_deel_tot > lruimtetot)
           THEN
@@ -2275,6 +2286,64 @@ AS
       END;
    END;
 
+   PROCEDURE remove(p_rsv_ruimte_key IN NUMBER)
+   IS
+      CURSOR c_bijlagen(p_refkey IN NUMBER) IS
+         SELECT fac_bijlagen_key
+           FROM fac_bijlagen b
+              , res_rsv_ruimte r
+          WHERE b.fac_bijlagen_refkey = r.res_rsv_ruimte_key
+            AND b.fac_bijlagen_module = 'RES'
+            AND b.fac_bijlagen_refkey = p_refkey;
+
+      res_key  res_reservering.res_reservering_key%TYPE;
+   BEGIN
+      -- Verwijder afspraken en de bezoekers daarvan bij deelreservering.
+      FOR ref_afspraak IN (SELECT bez_afspraak_key
+                             FROM bez_afspraak
+                            WHERE res_rsv_ruimte_key = p_rsv_ruimte_key
+                          )
+      LOOP
+         bez.remove(ref_afspraak.bez_afspraak_key);
+      END LOOP;
+
+      -- Verwijder de deelreservering.
+      fac.remove_tracking('reservering', p_rsv_ruimte_key);
+      fac.remove_tracking('xreservering', p_rsv_ruimte_key);
+
+      SELECT res_reservering_key
+        INTO res_key
+        FROM res_rsv_ruimte
+       WHERE res_rsv_ruimte_key = p_rsv_ruimte_key;
+
+      FOR ref_bijlagen IN c_bijlagen(p_rsv_ruimte_key)
+      LOOP
+         flx.deleteflexbijlage (ref_bijlagen.fac_bijlagen_key);
+      END LOOP;
+
+      DELETE FROM res_rsv_ruimte
+       WHERE res_rsv_ruimte_key = p_rsv_ruimte_key;
+
+      -- Van de volgende tabellen worden de records die naar deze res_rsv_ruimte_key
+      -- verwijzen met ON DELETE CASCADE ook verwijderd:
+      --  res_kenmerkwaarde
+      --  res_rsv_artikel
+      --  res_rsv_deel
+      -- In de volgende tabel wordt res_rsv_ruimte_key leeg gemaakt bij het verwijderen van res_rsv_ruimte:
+      --  bez_afspraak
+      --  mld_melding
+
+      -- Als dit de laatste deelreservering in de reservering is mag de reservering ook weg.
+      DELETE FROM res_reservering
+       WHERE NOT EXISTS (SELECT 1
+                           FROM res_rsv_ruimte
+                          WHERE res_reservering_key = res_key
+                        )
+         AND res_reservering_key = res_key;
+
+      -- Geen tracking op res_reservering.
+   END;
+
 END res;
 /
 

RES/RES_TAB.SRC

@@ -48,6 +48,10 @@ CREATE_TABLE(res_ruimte,0)
     VARCHAR2(1000),
   res_ruimte_volgnummer
     NUMBER(3),
+  res_ruimte_minbezoekers
+    NUMBER(5)
+    DEFAULT 0
+    NOT_NULL(res_ruimte_minbezoekers, res_c_ruimte_minbezoekers),
   res_ruimte_info_url
     VARCHAR2(1000),
   res_ruimte_image
@@ -116,6 +120,10 @@ CREATE_TABLE(res_ruimte,0)
     CONSTRAINT res_c_res_status_fo2 CHECK(res_status_fo_key IN (1,2,3,4)),
   res_ruimte_extern_id
     VARCHAR2(256),
+  res_ruimte_externsyncdate
+    DATE,
+  res_ruimte_graphhooksecret
+    VARCHAR2(128),
   res_ruimte_cv
     NUMBER(1)
     DEFAULT 0
@@ -254,6 +262,10 @@ CREATE_TABLE(res_deel, 0)
     NUMBER(4)
     DEFAULT 127
     NOT NULL
+, res_deel_externnr
+    VARCHAR2(256)
+, res_deel_externsyncdate
+    DATE
 ,   CONSTRAINT res_c_deelperslid_key CHECK((res_ins_deel_key IS NOT NULL AND res_prs_perslid_key IS NULL) OR (res_ins_deel_key IS NULL AND res_prs_perslid_key IS NOT NULL))
 );
 
@@ -320,6 +332,10 @@ CREATE_TABLE(res_artikel, 0)
 , res_artikel_verwijder
     DATE
     DEFAULT NULLDATUM
+, res_artikel_externnr
+    VARCHAR2(256)
+, res_artikel_externsyncdate
+    DATE
 );
 
 CREATE_TABLE(res_arrangement,0)
@@ -406,7 +422,7 @@ CREATE_TABLE(res_activiteit, 0)
     CONSTRAINT res_c_activiteit_oms CHECK(res_activiteit_omsverplicht IN (0,1))
 , res_activiteit_aantalverplicht  /* is res_rsv_ruimte_bezoekers verplicht */
     NUMBER(1) DEFAULT(0)
-    CONSTRAINT res_c_activiteit_aantal CHECK(res_activiteit_aantalverplicht IN (0,1))
+    CONSTRAINT res_c_activiteit_aantal CHECK(res_activiteit_aantalverplicht IN (0,1,2))
 , res_activiteit_posttime
     NUMBER(5,2) DEFAULT 0 NOT NULL
 , res_activiteit_aanmaak
@@ -429,6 +445,8 @@ CREATE_TABLE(res_activiteit, 0)
     CONSTRAINT res_c_res_activiteit_cvab_mode CHECK(res_activiteit_cvab_mode IN (0,1,2,3))
 ,  res_activiteit_intervals
     VARCHAR(2000 CHAR)                   /* Optioneel: JSON-structured intervallen */
+,  res_activiteit_image
+    VARCHAR2(255)
 , CONSTRAINT res_u_res_activiteit_upper UNIQUE(res_activiteit_upper, res_activiteit_verwijder, res_srtactiviteit_key)
 );
 
@@ -445,7 +463,11 @@ CREATE_TABLE(res_reservering,0)
     DEFAULT 0 NOT NULL,
   res_reservering_verwijder
     DATE
-    DEFAULT NULLDATUM
+    DEFAULT NULLDATUM,
+  res_reservering_externnr
+    VARCHAR2(256),
+  res_reservering_externsyncdate
+    DATE
 );
 
 
@@ -494,6 +516,8 @@ CREATE_TABLE(res_rsv_ruimte, 0)
 , res_rsv_ruimte_van
     DATE
     NOT_NULL(res_rsv_ruimte_van, res_c_res_rsv_ruimte_van)
+, res_rsv_ruimte_van_actual
+    DATE
 , res_rsv_ruimte_tot
     DATE
     NOT_NULL(res_rsv_ruimte_tot, res_c_res_rsv_ruimte_tot)
@@ -556,6 +580,8 @@ CREATE_TABLE(res_rsv_ruimte, 0)
     CONSTRAINT res_c_res_rsv_ruimte_afgerond1 CHECK(res_rsv_ruimte_afgerond IN (0,1))
 , res_rsv_ruimte_externnr    /* voor koppelingen met externe systemen */
     VARCHAR2(1000)
+, res_rsv_ruimte_externsyncdate
+    DATE
 , res_rsv_ruimte_cat_appr    /* Catalogus artikelen dienen gefiatteerd te worden 0=Nee, 1=Ja */
     NUMBER(1)
     DEFAULT 0
@@ -565,7 +591,7 @@ CREATE_TABLE(res_rsv_ruimte, 0)
 
 ALTER TABLE mld_melding ADD res_rsv_ruimte_key
       NUMBER(10)
-      CONSTRAINT mld_r_res_rsv_ruimte_key REFERENCES res_rsv_ruimte(res_rsv_ruimte_key);
+      CONSTRAINT mld_r_res_rsv_ruimte_key REFERENCES res_rsv_ruimte(res_rsv_ruimte_key) ON DELETE SET NULL;
 
 CREATE_TABLE(res_rsv_deel, 0)
 (  res_rsv_deel_key
@@ -587,7 +613,7 @@ CREATE_TABLE(res_rsv_deel, 0)
      DEFAULT 2
      CONSTRAINT res_c_res_status_bo2 CHECK(res_status_bo_key IN (2,5,6))
 ,  res_rsv_ruimte_key NUMBER(10)
-     CONSTRAINT res_c_res_rsv_ruimte_key REFERENCES res_rsv_ruimte(res_rsv_ruimte_key)
+     CONSTRAINT res_c_res_rsv_ruimte_key REFERENCES res_rsv_ruimte(res_rsv_ruimte_key) ON DELETE CASCADE
 ,  res_rsv_deel_van
      DATE
 ,  res_rsv_deel_tot
@@ -614,7 +640,12 @@ CREATE_TABLE(res_rsv_deel, 0)
 ,  CONSTRAINT res_c_res_deel_ruimte
       CHECK (res_rsv_ruimte_key IS NOT NULL OR bez_bezoekers_key IS NOT NULL)
 */
-,  res_rsv_deel_geleverd DATE
+,  res_rsv_deel_geleverd
+    DATE
+, res_rsv_deel_externnr
+    VARCHAR2(256)
+, res_rsv_deel_externsyncdate
+    DATE
 );
 
 ALTER TABLE ins_deel ADD res_rsv_deel_key
@@ -641,7 +672,7 @@ CREATE_TABLE(res_rsv_artikel, 0)
      DEFAULT 2
      CONSTRAINT res_c_res_status_bo3 CHECK(res_status_bo_key IN (2,5,6))
 ,  res_rsv_ruimte_key NUMBER(10)
-     CONSTRAINT res_c_res_rsv_ruimte_key2 REFERENCES res_rsv_ruimte(res_rsv_ruimte_key)
+     CONSTRAINT res_c_res_rsv_ruimte_key2 REFERENCES res_rsv_ruimte(res_rsv_ruimte_key) ON DELETE CASCADE
      NOT_NULL(res_rsv_ruimte_key, res_c_res_artikel_ruimte)
 ,  res_rsv_artikel_prijs
      NUMBER(9,2)
@@ -671,6 +702,10 @@ CREATE_TABLE(res_rsv_artikel, 0)
     CONSTRAINT res_c_res_rsv_artikel_approved CHECK(res_rsv_artikel_approved IN (0,1,2))
 , res_rsv_artikel_geleverd
     DATE
+, res_rsv_artikel_externnr
+    VARCHAR2(256)
+, res_rsv_artikel_externsyncdate
+    DATE
 );
 
 

RES/RES_TRI.SRC

@@ -12,7 +12,6 @@ AUDIT_VALUE(res_disc_params, res_disc_params_noti_dagen)
 AUDIT_VALUE(res_disc_params, res_disc_params_expire_dagen)
 AUDIT_VALUE(res_disc_params, res_disc_params_expire_tijd)
 AUDIT_VALUE(res_disc_params, res_disc_params_cancel_dagen)
-AUDIT_VALUE(res_disc_params, res_disc_params_remoteurl)
 AUDIT_VALUE(res_disc_params, res_disc_params_maxduur)
 AUDIT_END()
 
@@ -367,7 +366,7 @@ CREATE_TRIGGER(res_t_res_rsv_ruimte_B_IU)
 BEFORE INSERT OR UPDATE ON res_rsv_ruimte
 FOR EACH ROW
 BEGIN
-  IF :old.res_status_bo_key=6 THEN raise_application_error(-20000, 'Reserveringsgegevens zijn verwerkt; wijzigen is niet meer toegestaan.'); END IF;
+  IF :old.res_status_bo_key=6 THEN raise_application_error(-20000, 'Reserveringsgegevens '||:new.res_rsv_ruimte_key||'/'||:new.res_rsv_ruimte_volgnr||' zijn verwerkt; wijzigen is niet meer toegestaan.'); END IF;
   UPDATE_PRIMARY_KEY(res_rsv_ruimte_key, res_s_res_rsv_ruimte_key);
   BEGIN IF :new.res_rsv_ruimte_verwijder IS NOT NULL OR (:new.res_rsv_ruimte_verwijder IS NULL AND :old.res_rsv_ruimte_verwijder IS NOT NULL) THEN UPDATE res_rsv_artikel SET res_rsv_artikel_verwijder = :new.res_rsv_ruimte_verwijder WHERE res_rsv_artikel.res_rsv_ruimte_key = :new.res_rsv_ruimte_key AND res_rsv_artikel.res_rsv_artikel_verwijder IS NULL; END IF; END;
   BEGIN IF :new.res_rsv_ruimte_verwijder IS NOT NULL OR (:new.res_rsv_ruimte_verwijder IS NULL AND :old.res_rsv_ruimte_verwijder IS NOT NULL) THEN UPDATE res_rsv_deel SET res_rsv_deel_verwijder = :new.res_rsv_ruimte_verwijder WHERE res_rsv_deel.res_rsv_ruimte_key = :new.res_rsv_ruimte_key AND res_rsv_deel.res_rsv_deel_verwijder IS NULL; END IF; END;

RES/RES_VIE.SRC

@@ -350,7 +350,7 @@ CREATE_VIEW(res_v_res_catalogus, 0)
 AS SELECT *
 FROM   INS_TAB_DISCIPLINE
 WHERE  ins_discipline_module = 'RES'
-AND    ins_discipline_min_level IN (1,2,3);
+AND    ins_discipline_min_level IN (1,2,3,4);
 
 
 -- View levert op in welke alg_ruimtes uit een bepaalde catalogus besteld mag worden
@@ -1369,12 +1369,17 @@ CREATE_VIEW(res_v_udr_reservering, 1)
    datum,
    gastheer,
    contact,
+   gastheer_email,
+   contact_email,
    invoerder,
    kostensoortgroep,
    kostensoort,
    kpn,
    kpn_omschrijving,
    kpn_extern,
+   fclt_3d_divisie_key,
+   divisie_naam,
+   divisie_omschrijving,
    fclt_3d_afdeling_key,
    afdeling_code,
    afdeling_omschrijving,
@@ -1419,6 +1424,12 @@ AS
           (SELECT prs_perslid_naam_full
              FROM prs_v_perslid_fullnames_all pf
             WHERE pf.prs_perslid_key = rrr.res_rsv_ruimte_contact_key),
+          (SELECT ph.prs_perslid_email
+             FROM prs_perslid ph
+            WHERE ph.prs_perslid_key = rrr.res_rsv_ruimte_host_key),
+          (SELECT pc.prs_perslid_email
+             FROM prs_perslid pc
+            WHERE pc.prs_perslid_key = rrr.res_rsv_ruimte_contact_key),
           (SELECT pf.prs_perslid_naam_full
              FROM fac_tracking tr, fac_srtnotificatie str, prs_v_perslid_fullnames_all pf
             WHERE     tr.prs_perslid_key = pf.prs_perslid_key
@@ -1457,6 +1468,9 @@ AS
           k.prs_kostenplaats_nr,
           k.prs_kostenplaats_omschrijving,
           k.prs_kostenplaats_extern,
+          an.prs_afdeling_key,
+          an.prs_afdeling_naam,
+          an.prs_afdeling_omschrijving,
           a.prs_afdeling_key,
           a.prs_afdeling_naam,
           a.prs_afdeling_omschrijving,
@@ -1574,6 +1588,8 @@ AS
           prs_kostenplaats k,
           prs_perslid p,
           prs_afdeling a,
+          prs_afdeling an,
+          prs_v_afdeling_boom ab,
           (  SELECT res_rsv_ruimte_key,
                     MAX (o.res_opstelling_omschrijving) opstelling,
                     MAX (ro.res_ruimte_opstel_bezoekers) capaciteit,
@@ -1605,6 +1621,8 @@ AS
           AND ra.res_srtactiviteit_key = rsa.res_srtactiviteit_key
           AND rrr.res_rsv_ruimte_host_key = p.prs_perslid_key
           AND p.prs_afdeling_key = a.prs_afdeling_key
+          AND ab.prs_afdeling_key1 = an.prs_afdeling_key
+          AND ab.prs_afdeling_key = p.prs_afdeling_key
           AND rrr.res_rsv_ruimte_van >= TO_DATE ('01-01-2010', 'DD-MM-YYYY');
 
 CREATE_VIEW(res_v_udr_reserveringincl, 1)
@@ -1616,12 +1634,17 @@ CREATE_VIEW(res_v_udr_reserveringincl, 1)
    datum,
    gastheer,
    contact,
+   gastheer_email,
+   contact_email,
    invoerder,
    kostensoortgroep,
    kostensoort,
    kpn,
    kpn_omschrijving,
    kpn_extern,
+   fclt_3d_divisie_key,
+   divisie_naam,
+   divisie_omschrijving,
    fclt_3d_afdeling_key,
    afdeling_code,
    afdeling_omschrijving,
@@ -1677,6 +1700,12 @@ AS
           (SELECT prs_perslid_naam_full
              FROM prs_v_perslid_fullnames_all pf
             WHERE pf.prs_perslid_key = rrr.res_rsv_ruimte_contact_key),
+          (SELECT ph.prs_perslid_email
+             FROM prs_perslid ph
+            WHERE ph.prs_perslid_key = rrr.res_rsv_ruimte_host_key),
+          (SELECT pc.prs_perslid_email
+             FROM prs_perslid pc
+            WHERE pc.prs_perslid_key = rrr.res_rsv_ruimte_contact_key),
           (SELECT pf.prs_perslid_naam_full
              FROM fac_tracking tr, fac_srtnotificatie str, prs_v_perslid_fullnames_all pf
             WHERE     tr.prs_perslid_key = pf.prs_perslid_key
@@ -1719,6 +1748,9 @@ AS
           k.prs_kostenplaats_nr,
           k.prs_kostenplaats_omschrijving,
           k.prs_kostenplaats_extern,
+          an.prs_afdeling_key,
+          an.prs_afdeling_naam,
+          an.prs_afdeling_omschrijving,
           a.prs_afdeling_key,
           a.prs_afdeling_naam,
           a.prs_afdeling_omschrijving,
@@ -1852,6 +1884,8 @@ AS
           prs_kostenplaats k,
           prs_perslid p,
           prs_afdeling a,
+          prs_afdeling an,
+          prs_v_afdeling_boom ab,
           (  SELECT res_rsv_ruimte_key,
                     MAX (o.res_opstelling_omschrijving) opstelling,
                     MAX (ro.res_ruimte_opstel_bezoekers) capaciteit,
@@ -1927,6 +1961,8 @@ AS
           AND ra.res_srtactiviteit_key = rsa.res_srtactiviteit_key
           AND rrr.res_rsv_ruimte_host_key = p.prs_perslid_key
           AND p.prs_afdeling_key = a.prs_afdeling_key
+          AND p.prs_afdeling_key = ab.prs_afdeling_key
+          AND ab.prs_afdeling_key1 = an.prs_afdeling_key
           AND (rrr.res_ruimte_opstel_key IS NOT NULL OR voorz.res_rsv_ruimte_key IS NOT NULL)
           AND rrr.res_rsv_ruimte_van >= TO_DATE ('01-01-2010', 'DD-MM-YYYY');
 

_UP/DB39to40e.src

@@ -0,0 +1,702 @@
+/*
+ * Update script van FACILITOR schema
+ * $Revision$
+ * $Id$
+ */
+#include "prologue.inc"
+
+COMMIT;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#64792
+-- Setting is al handmatig overgenomen naar fg_move_origin
+UPDATE fac_setting
+   SET fac_setting_pvalue = NULL
+ WHERE fac_setting_name = 'fac_reserved_number1';
+
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#63749
+UPDATE ins_tab_discipline
+   SET INS_DISCIPLINE_IMAGE = SUBSTR(INS_DISCIPLINE_IMAGE, 1, LENGTH(INS_DISCIPLINE_IMAGE) - 2)
+ WHERE INS_DISCIPLINE_IMAGE LIKE '%-o';
+
+UPDATE ins_srtdiscipline
+   SET INS_SRTDISCIPLINE_IMAGE = SUBSTR(INS_SRTDISCIPLINE_IMAGE, 1, LENGTH(INS_SRTDISCIPLINE_IMAGE) - 2)
+ WHERE INS_SRTDISCIPLINE_IMAGE LIKE '%-o';
+
+UPDATE mld_stdmelding
+   SET mld_stdmelding_image = SUBSTR(mld_stdmelding_image, 1, LENGTH(mld_stdmelding_image) - 2)
+ WHERE mld_stdmelding_image LIKE '%-o';
+
+UPDATE fac_menu
+   SET fac_menu_image = SUBSTR(fac_menu_image, 1, LENGTH(fac_menu_image) - 2)
+ WHERE fac_menu_image LIKE '%-o';
+
+UPDATE fac_menuitems
+   SET fac_menuitems_image = SUBSTR(fac_menuitems_image, 1, LENGTH(fac_menuitems_image) - 2)
+ WHERE fac_menuitems_image LIKE '%-o';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-sliders-v-square'
+ WHERE fac_menu_image = 'fa-sliders';
+
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#63749 2e batch
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-blank'
+ WHERE fac_menu_image = 'blank';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-euro-sign'
+ WHERE fac_menu_image = 'fa-eur';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-money-bill'
+ WHERE fac_menu_image = 'fa-money';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-chart-pie'
+ WHERE fac_menu_image = 'fa-pie-chart';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-blank'
+ WHERE fac_menu_image = 'blank';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-sliders-v'
+ WHERE fac_menu_image = 'fa-sliders';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-chart-bar'
+ WHERE fac_menu_image = 'fa-bar-chart';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-credit-card'
+ WHERE fac_menu_image = 'fa-vcard';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-chart-line'
+ WHERE fac_menu_image = 'fa-line-chart';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-utensils-alt'
+ WHERE fac_menu_image = 'fa-cutlery';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-file-alt'
+ WHERE fac_menu_image = 'fa-file-text';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-cog'
+ WHERE fac_menu_image = 'fa-gear';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-chart-line'
+ WHERE fac_menu_image = 'fa-chart';
+
+  UPDATE fac_menu
+   SET fac_menu_image = 'fa-cogs'
+ WHERE fac_menu_image = 'fa-gears';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-euro-sign'
+ WHERE fac_menu_image = 'fa-euro';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-exclamation-triangle'
+ WHERE fac_menu_image = 'fa-warning';
+
+UPDATE fac_menuitems
+   SET fac_menuitems_image = 'fa-file-alt'
+ WHERE fac_menuitems_image = 'fa-file-text';
+
+
+/////////////////////////////////////////////////////////////////////////////////////////// AAGN#61402
+DEF_FAC_SRTNOT('ORDCAE', 0, 'lcl_noti_ORDCAE', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
+DEF_FAC_SRTNOT('ORDCAI', 0, 'lcl_noti_ORDCAI', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
+
+/////////////////////////////////////////////////////////////////////////////////////////// MNNL#64001
+ALTER TABLE mld_kenmerk
+  ADD mld_kenmerk_wissen NUMBER(1) DEFAULT 0 NOT NULL;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#63906
+ALTER TABLE res_activiteit
+  ADD res_activiteit_image VARCHAR2(255);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#64850
+DELETE fac_kenmwaarden;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FLEX#64624
+ALTER TABLE res_rsv_ruimte
+  ADD res_rsv_ruimte_van_actual DATE;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#60030
+ALTER TABLE alg_regio          ADD (         alg_regio_externnr VARCHAR2(256),       alg_regio_externsyncdate DATE);
+ALTER TABLE alg_district       ADD (      alg_district_externnr VARCHAR2(256),    alg_district_externsyncdate DATE);
+ALTER TABLE alg_locatie        ADD (       alg_locatie_externnr VARCHAR2(256),     alg_locatie_externsyncdate DATE);
+ALTER TABLE alg_terreinsector  ADD ( alg_terreinsector_externnr VARCHAR2(256),  alg_terreinsector_extsyncdate DATE);
+ALTER TABLE alg_gebouw         ADD (        alg_gebouw_externnr VARCHAR2(256),      alg_gebouw_externsyncdate DATE);
+ALTER TABLE alg_verdieping     ADD (    alg_verdieping_externnr VARCHAR2(256),  alg_verdieping_externsyncdate DATE);
+ALTER TABLE alg_ruimte         ADD (        alg_ruimte_externnr VARCHAR2(256),      alg_ruimte_externsyncdate DATE);
+ALTER TABLE bes_bestelling     ADD (    bes_bestelling_externnr VARCHAR2(256),  bes_bestelling_externsyncdate DATE);
+ALTER TABLE bes_bestelopdr     ADD (    bes_bestelopdr_externnr VARCHAR2(256),  bes_bestelopdr_externsyncdate DATE);
+ALTER TABLE bez_afspraak       ADD (      bez_afspraak_externnr VARCHAR2(256),    bez_afspraak_externsyncdate DATE);
+ALTER TABLE bez_bezoekers      ADD (     bez_bezoekers_externnr VARCHAR2(256),   bez_bezoekers_externsyncdate DATE);
+ALTER TABLE fin_factuur        ADD (       fin_factuur_externnr VARCHAR2(256),     fin_factuur_externsyncdate DATE);
+ALTER TABLE ins_srtdiscipline  ADD ( ins_srtdiscipline_externnr VARCHAR2(256),  ins_srtdiscipline_extsyncdate DATE);
+ALTER TABLE ins_tab_discipline ADD (    ins_discipline_externnr VARCHAR2(256),  ins_discipline_externsyncdate DATE);
+ALTER TABLE ins_srtgroep       ADD (      ins_srtgroep_externnr VARCHAR2(256),    ins_srtgroep_externsyncdate DATE);
+ALTER TABLE ins_srtdeel        ADD (       ins_srtdeel_externnr VARCHAR2(256),     ins_srtdeel_externsyncdate DATE);
+ALTER TABLE ins_deel           ADD (          ins_deel_externnr VARCHAR2(256),        ins_deel_externsyncdate DATE);
+ALTER TABLE mld_opdr_materiaal ADD (mld_opdr_materiaal_externnr VARCHAR2(256), mld_opdr_materiaal_extsyncdate DATE);
+ALTER TABLE mld_stdmelding     ADD (    mld_stdmelding_externnr VARCHAR2(256),  mld_stdmelding_externsyncdate DATE);
+ALTER TABLE res_deel           ADD (          res_deel_externnr VARCHAR2(256),        res_deel_externsyncdate DATE);
+ALTER TABLE res_artikel        ADD (       res_artikel_externnr VARCHAR2(256),     res_artikel_externsyncdate DATE);
+ALTER TABLE res_ruimte         ADD (                                                res_ruimte_externsyncdate DATE);
+ALTER TABLE res_rsv_artikel    ADD (   res_rsv_artikel_externnr VARCHAR2(256), res_rsv_artikel_externsyncdate DATE);
+ALTER TABLE res_rsv_deel       ADD (      res_rsv_deel_externnr VARCHAR2(256),    res_rsv_deel_externsyncdate DATE);
+ALTER TABLE res_rsv_ruimte     ADD (                                            res_rsv_ruimte_externsyncdate DATE);
+ALTER TABLE res_reservering    ADD (   res_reservering_externnr VARCHAR2(256), res_reservering_externsyncdate DATE);
+
+ALTER TABLE prs_bedrijf_bedrijf ADD (  prs_bedrijf_externsyncdate1 DATE);
+ALTER TABLE prs_bedrijf_bedrijf ADD (  prs_bedrijf_externsyncdate2 DATE);
+ALTER TABLE prs_afdeling        ADD (  prs_afdeling_externsyncdate DATE);
+ALTER TABLE prs_perslid         ADD (   prs_perslid_externsyncdate DATE);
+ALTER TABLE prs_kostenplaats    ADD (    prs_kostenplaats_externnr VARCHAR2(256),   prs_kostenplaats_extsyncdate DATE);
+ALTER TABLE prs_werkplek        ADD (        prs_werkplek_externnr VARCHAR2(256),    prs_werkplek_externsyncdate DATE);
+ALTER TABLE prs_perslidwerkplek ADD ( prs_perslidwerkplek_externnr VARCHAR2(256),   prs_perslidwerkplek_extsyncd DATE);
+ALTER TABLE prs_contactpersoon  ADD (  prs_contactpersoon_externnr VARCHAR2(256), prs_contactpersoon_extsyncdate DATE);
+
+ALTER TABLE prs_bedrijf_bedrijf MODIFY prs_bedrijf_externid1 VARCHAR2(256);
+ALTER TABLE prs_bedrijf_bedrijf MODIFY prs_bedrijf_externid2 VARCHAR2(256);
+ALTER TABLE prs_afdeling        MODIFY prs_afdeling_externid VARCHAR2(256);
+ALTER TABLE prs_perslid         MODIFY prs_perslid_externid  VARCHAR2(256);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#64883
+ALTER TABLE fac_version DROP COLUMN fac_version_major;
+ALTER TABLE fac_version DROP COLUMN fac_version_minor;
+ALTER TABLE fac_version DROP COLUMN fac_version_patch;
+
+DELETE fac_message
+ WHERE fac_message_code = 'FAC_M005';
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#65049
+_FAC_MODULE('CHT', 'lcl_module_CHT')
+
+DEF_FAC_FUNCTIE3('WEB_CHTOPR', 'CHT',  0, 1,    0);
+DEF_FAC_FUNCTIE3('WEB_CHTREQ', 'CHT',  0, 1,    0);
+
+DEF_MENUITEM(2, 'lcl_menu_cht_chatkanalen', '', 'CHT', 'appl/mgt/cht_discipline.asp', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
+MENU_INS_AFTER('lcl_menu_cht_chatkanalen', 'lcl_menu_fac_notificaties', 2);
+
+DEF_MENUITEM(0, 'lcl_menu_cht_chatnow'          , '', 'CHT', 'appl/chat/ChatterWant.asp', 0, 1, 'WEB_CHTREQ', 'R', '1', '');
+MENU_INS_AFTER('lcl_menu_cht_chatnow', 'lcl_menu_fe_search', 2);
+
+DEF_MENUITEM(1, 'lcl_menu_cht_incoming'          , '', 'CHT', 'appl/chat/ChatterAccept.asp', 0, 1, 'WEB_CHTOPR', 'W', '1', '');
+MENU_INS_AFTER('lcl_menu_cht_incoming', 'lcl_menu_sle_sleutels', 2);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#64375
+UPDATE fac_usrgraph
+   SET fac_usrgraph_options = REPLACE (fac_usrgraph_options, '      "renderer": "$.jqplot.BarRenderer",' || CHR(10), '')
+ WHERE fac_usrgraph_omschrijving = 'Category';
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#63800
+UPDATE fac_menuitems
+   SET fac_menuitems_url = 'appl/msg/fac_nieuws_search.asp'
+ WHERE fac_menuitems_label = 'lcl_menu_msg_overzicht';
+
+UPDATE fac_menuitems
+   SET fac_menuitems_label = 'lcl_menu_msg_bericht_maken',
+       fac_menuitems_default = 1
+ WHERE fac_menuitems_label = 'lcl_menu_msg_berichten';
+
+/* Nu default wel in het menu, dat dan ook even voor bestaande klanten; */
+INSERT INTO fac_menu (fac_menuitems_key, fac_menu_volgnr)
+    SELECT fac_menuitems_key, fac_menuitems_key * 100
+      FROM fac_menuitems i
+     WHERE     fac_menuitems_label = 'lcl_menu_msg_bericht_maken'
+           AND i.fac_menuitems_key NOT IN
+                   (SELECT m.fac_menuitems_key
+                      FROM fac_menu m
+                     WHERE m.fac_menuitems_key IS NOT NULL);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66753
+DELETE FROM mld_melding_object mmo
+ WHERE mmo.mld_melding_key NOT IN (SELECT mld_melding_key FROM mld_melding);
+
+DELETE FROM mld_melding_object mmo
+ WHERE mmo.mld_melding_key IS NULL;
+
+/////////////////////////////////////////////////////////////////////////////////////////// UWVA#65182
+ALTER TABLE fin_kenmerkfactuur   DROP CONSTRAINT fin_r_fin_factuur_key;
+ALTER TABLE fin_factuurregel     DROP CONSTRAINT fin_r_fin_factuurregel1;
+ALTER TABLE fin_kenmerkfactregel DROP CONSTRAINT fin_r_fin_factuurregel_key;
+ALTER TABLE bes_bestelling       DROP CONSTRAINT bes_r_mld_melding1;
+ALTER TABLE cnt_contract_object  DROP CONSTRAINT cnt_r_cnt_contract_key_object;
+ALTER TABLE cnt_contract_plaats  DROP CONSTRAINT cnt_r_cnt_contract_key_plaats;
+ALTER TABLE cnt_contract_dienst  DROP CONSTRAINT cnt_r_cnt_contract_dienst;
+ALTER TABLE cnt_factuurschema    DROP CONSTRAINT cnt_r_cnt_factuurschema1;
+ALTER TABLE res_rsv_deel         DROP CONSTRAINT res_c_res_rsv_ruimte_key;
+ALTER TABLE res_rsv_artikel      DROP CONSTRAINT res_c_res_rsv_ruimte_key2;
+ALTER TABLE mld_melding          DROP CONSTRAINT mld_r_res_rsv_ruimte_key;
+ALTER TABLE mld_opdr             DROP CONSTRAINT mld_r_cnt_contract_key;
+ALTER TABLE mld_opdr_materiaal   DROP CONSTRAINT mld_r_mld_opdr_key3;
+ALTER TABLE mld_opdr_uitvoeren   DROP CONSTRAINT mld_r_mld_opdr_key2;
+ALTER TABLE mld_opdr_uren        DROP CONSTRAINT mld_r_mld_opdr_key1;
+
+ALTER TABLE fin_kenmerkfactuur   MODIFY fin_factuur_key      CONSTRAINT fin_r_fin_factuur_key         REFERENCES fin_factuur(fin_factuur_key)           ON DELETE CASCADE;
+ALTER TABLE fin_factuurregel     MODIFY fin_factuur_key      CONSTRAINT fin_r_factuurregel1           REFERENCES fin_factuur(fin_factuur_key)           ON DELETE CASCADE;
+ALTER TABLE fin_kenmerkfactregel MODIFY fin_factuurregel_key CONSTRAINT fin_r_fin_factuurregel_key    REFERENCES fin_factuurregel(fin_factuurregel_key) ON DELETE CASCADE;
+ALTER TABLE bes_bestelling       MODIFY mld_melding_key      CONSTRAINT bes_r_mld_melding1            REFERENCES mld_melding(mld_melding_key)           ON DELETE SET NULL;
+ALTER TABLE cnt_contract_object  MODIFY cnt_contract_key     CONSTRAINT cnt_r_cnt_contract_key_object REFERENCES cnt_contract(cnt_contract_key)         ON DELETE CASCADE;
+ALTER TABLE cnt_contract_plaats  MODIFY cnt_contract_key     CONSTRAINT cnt_r_cnt_contract_key_plaats REFERENCES cnt_contract(cnt_contract_key)         ON DELETE CASCADE;
+ALTER TABLE cnt_contract_dienst  MODIFY cnt_contract_key     CONSTRAINT cnt_r_cnt_contract_dienst     REFERENCES cnt_contract(cnt_contract_key)         ON DELETE CASCADE;
+ALTER TABLE cnt_factuurschema    MODIFY cnt_contract_key     CONSTRAINT cnt_r_cnt_factuurschema1      REFERENCES cnt_contract(cnt_contract_key)         ON DELETE CASCADE;
+ALTER TABLE res_rsv_deel         MODIFY res_rsv_ruimte_key   CONSTRAINT res_c_res_rsv_ruimte_key      REFERENCES res_rsv_ruimte(res_rsv_ruimte_key)     ON DELETE CASCADE;
+ALTER TABLE res_rsv_artikel      MODIFY res_rsv_ruimte_key   CONSTRAINT res_c_res_rsv_ruimte_key2     REFERENCES res_rsv_ruimte(res_rsv_ruimte_key)     ON DELETE CASCADE;
+ALTER TABLE mld_melding          MODIFY res_rsv_ruimte_key   CONSTRAINT mld_r_res_rsv_ruimte_key      REFERENCES res_rsv_ruimte(res_rsv_ruimte_key)     ON DELETE SET NULL;
+ALTER TABLE mld_melding_object   MODIFY mld_melding_key      CONSTRAINT mld_r_mld_melding_key5        REFERENCES mld_melding(mld_melding_key)           ON DELETE CASCADE;
+ALTER TABLE mld_opdr             MODIFY cnt_contract_key     CONSTRAINT mld_r_cnt_contract_key        REFERENCES cnt_contract(cnt_contract_key)         ON DELETE SET NULL;
+ALTER TABLE mld_opdr_materiaal   MODIFY mld_opdr_key         CONSTRAINT mld_r_mld_opdr_key3           REFERENCES mld_opdr(mld_opdr_key)                 ON DELETE CASCADE;
+ALTER TABLE mld_opdr_uitvoeren   MODIFY mld_opdr_key         CONSTRAINT mld_r_mld_opdr_key2           REFERENCES mld_opdr(mld_opdr_key)                 ON DELETE CASCADE;
+ALTER TABLE mld_opdr_uren        MODIFY mld_opdr_key         CONSTRAINT mld_r_mld_opdr_key1           REFERENCES mld_opdr(mld_opdr_key)                 ON DELETE CASCADE;
+
+/////////////////////////////////////////////////////////////////////////////////////////// LOGC#65120
+DEF_FAC_SRTNOT('PRSREG', 127, 'lcl_noti_PRSREG', '', '0', 'perslid', 0);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#65498
+UPDATE fac_version
+   SET fac_version_cust = UPPER(fac_version_cust)
+     , fac_version_group = UPPER(fac_version_group);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FLEX#64726
+ALTER TABLE ins_srtdeel
+ ADD ins_srtdeel_sensortype NUMBER(3) DEFAULT 0 NOT NULL;
+CREATE INDEX ins_i_ins_srtdeel7 ON ins_srtdeel(ins_srtdeel_sensortype);
+
+/////////////////////////////////////////////////////////////////////////////////////////// YKPN#64081
+DEF_FAC_SRTNOT('BEZBEZ', 18, 'lcl_noti_BEZBEZ', '', '0', 'afspraak', 10);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FLEX#64717
+ALTER TABLE prs_bedrijfadres DROP CONSTRAINT prs_c_prs_bedrijfadrestype;
+ALTER TABLE prs_bedrijfadres ADD  CONSTRAINT prs_c_prs_bedrijfadrestype CHECK (prs_bedrijfadres_type IN ('O','B','C','V','N','I'));
+ALTER TABLE fac_notificatie ADD prs_bedrijfadres_key
+    NUMBER(10) CONSTRAINT prs_r_bedrijfadres_key1
+    REFERENCES prs_bedrijfadres(prs_bedrijfadres_key) ON DELETE CASCADE;
+
+ALTER TABLE fac_notificatie_job ADD fac_notificatie_job_seconds NUMBER(5);
+ALTER TABLE fac_notificatie_job ADD CONSTRAINT fac_c_notificatie_job1 CHECK((fac_notificatie_job_interval IS NOT NULL AND fac_notificatie_job_seconds IS NULL) OR (fac_notificatie_job_interval IS NULL AND fac_notificatie_job_seconds IS NOT NULL));
+ALTER TABLE fac_notificatie_job ADD fac_notificatie_job_queue VARCHAR2(20) DEFAULT 'DEFAULT' NOT NULL;
+ALTER TABLE fac_notificatie ADD fac_notificatie_queue VARCHAR2(20) DEFAULT 'DEFAULT' NOT NULL;
+
+DEF_FAC_SRTNOT('FACTST', 0, 'lcl_noti_FACTST', '', '0', 'perslid', 10);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FLEX#65726
+
+ALTER TABLE prs_bedrijfadres
+    ADD prs_bedrijfadres_plugin VARCHAR(320);
+ALTER TABLE prs_bedrijfadres
+    ADD prs_bedrijfadres_plugindata VARCHAR(4000);
+
+/////////////////////////////////////////////////////////////////////////////////////////// YKPN#64730
+ALTER TABLE res_activiteit DROP CONSTRAINT res_c_activiteit_aantal;
+ALTER TABLE res_activiteit ADD  CONSTRAINT res_c_activiteit_aantal CHECK(res_activiteit_aantalverplicht IN (0,1,2));
+
+///////////////////////////////////////////////////////////////////////////////////////////  ARAI#59648
+ALTER TABLE mld_melding ADD mld_melding_dwgx NUMBER(16,3);
+ALTER TABLE mld_melding ADD mld_melding_dwgy NUMBER(16,3);
+ALTER TABLE mld_melding ADD mld_melding_dwgz NUMBER(16,3);
+ALTER TABLE mld_melding ADD mld_melding_x NUMBER(16,6);
+ALTER TABLE mld_melding ADD mld_melding_y NUMBER(16,6);
+ALTER TABLE mld_melding ADD mld_melding_z NUMBER(16,6);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FMHN#65858
+ALTER TABLE fac_imp_onrgoed2 MODIFY alg_ruimte_nr VARCHAR2(20);
+ALTER TABLE fac_imp_perslid MODIFY alg_ruimte_nr VARCHAR2(20);
+ALTER TABLE fac_imp_ins MODIFY alg_ruimte_nr VARCHAR2(20);
+ALTER TABLE fac_imp_sle MODIFY alg_ruimte_nr VARCHAR2(20);
+ALTER TABLE alg_ruimte MODIFY alg_ruimte_nr VARCHAR2(20);
+ALTER TABLE alg_ruimte MODIFY alg_ruimte_upper_nr VARCHAR2(20);
+ALTER TABLE prj_ruimte MODIFY prj_ruimte_nr VARCHAR2(20);
+ALTER TABLE prj_ruimte MODIFY prj_ruimte_upper_nr VARCHAR2(20);
+
+/////////////////////////////////////////////////////////////////////////////////////////// GDZW#65247
+ALTER TABLE bez_bezoekers ADD bez_bezoekers_done_actual DATE;
+ALTER TABLE bez_bezoekers ADD bez_bezoekers_out_actual DATE;
+
+/////////////////////////////////////////////////////////////////////////////////////////// MARX#65917
+ALTER TABLE bes_bestelopdr_item MODIFY bes_bestelopdr_item_aantal NUMBER (15, 3);
+ALTER TABLE bes_bestelopdr_item MODIFY bes_bestelopdr_item_aantalontv NUMBER (15, 3);
+ALTER TABLE bes_bestelopdr_item MODIFY bes_bestelopdr_item_aantalexp NUMBER (15, 3);
+ALTER TABLE bes_bestelling_item MODIFY bes_bestelling_item_aantal NUMBER (15, 3);
+ALTER TABLE bes_bestelling_item MODIFY bes_bestelling_item_aantalontv NUMBER (15, 3);
+
+/////////////////////////////////////////////////////////////////////////////////////////// MNNL#65934
+ALTER TABLE mld_melding ADD mld_melding_actiedatum DATE;
+
+/////////////////////////////////////////////////////////////////////////////////////////// AAXX#65358
+DECLARE
+    -- Bij afgemelden(5) of voltooien(6) van periodieke inspecties (NIET MJOB) wordt het veld ins_deelsrtcontrole_freezecost pas gevuld.
+    -- Het veld ins_deelsrtcontrole_freezedate veld wordt daarbij nooit gevuld. Dat gebeurd alleen bij MJOB taken.
+    -- Alle afgemelde of voltooide periodieke inspecties (NIET MJOB) ophalen waarvoor geldt:
+    -- 1) de freezecost zijn groter dan 0 en
+    -- 2) het aantal van het bijbehorende object is groter dan 1.
+    CURSOR c_freezecost IS
+        SELECT idsc.ins_deelsrtcontrole_key,
+               id.ins_deel_aantal
+          FROM ins_deelsrtcontrole idsc,
+               ins_deel id,
+               ins_srtcontrole isc,
+               ctr_disc_params cdp
+         WHERE idsc.ins_deel_key = id.ins_deel_key
+           AND idsc.ins_srtcontrole_key = isc.ins_srtcontrole_key
+           AND isc.ctr_discipline_key = cdp.ctr_ins_discipline_key
+           AND idsc.ins_deelsrtcontrole_status IN (5, 6)
+           AND idsc.ins_deelsrtcontrole_freezedate IS NULL
+           AND id.ins_deel_aantal > 1
+           AND idsc.ins_deelsrtcontrole_freezecost > 0
+           AND cdp.ctr_disc_params_ismjob = 0;
+
+BEGIN
+    FOR f_freezecost IN c_freezecost
+    LOOP
+        -- Vermenigvuldig het totaalbedrag (freezecost) met het aantal opbjecten.
+        UPDATE ins_deelsrtcontrole
+           SET ins_deelsrtcontrole_freezecost = (f_freezecost.ins_deel_aantal * ins_deelsrtcontrole_freezecost)
+         WHERE ins_deelsrtcontrole_key = f_freezecost.ins_deelsrtcontrole_key;
+    END LOOP;
+END;
+/
+
+/////////////////////////////////////////////////////////////////////////////////////////// MARX#63145
+DROP INDEX res_i_res_deel3;
+CREATE UNIQUE INDEX res_i_res_deel3 ON res_deel(res_ins_deel_key, res_prs_perslid_key, res_discipline_key, res_deel_verwijder);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66178
+ALTER TABLE prs_perslid ADD prs_perslid_visibility NUMBER(3) DEFAULT 0 NOT NULL;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#60561
+ALTER TABLE res_ruimte ADD res_ruimte_graphhooksecret VARCHAR(128);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66441
+ALTER TABLE ins_srtdeel ADD ins_srtdeel_acadsymbol_dwgx NUMBER(16,3);
+ALTER TABLE ins_srtdeel ADD ins_srtdeel_acadsymbol_dwgy NUMBER(16,3);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#65949
+ALTER TABLE bes_srtdeel MODIFY bes_srtdeel_veelvoud NUMBER(9,3);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FLEX#64726
+CREATE_TABLE(ins_deel_state_history_all, 0)
+(
+    ins_deel_state_history_all_key
+        NUMBER(10)
+        CONSTRAINT ins_k_deel_state_histall_key PRIMARY KEY,
+    ins_deel_key
+        NUMBER(10)
+        CONSTRAINT ins_r_ins_deel_key3 REFERENCES ins_deel(ins_deel_key),
+    ins_deel_statedate
+        DATE,
+    ins_deel_state
+        VARCHAR2(128),
+    ins_deel_statetime
+        NUMBER
+);
+
+CREATE SEQUENCE ins_s_ins_deel_st_histall_key MINVALUE 1;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#65180
+ALTER TABLE fac_import_app ADD   fac_import_app_delimiter VARCHAR(2);
+ALTER TABLE fac_export_app ADD   fac_export_app_delimiter VARCHAR(2);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FMHN#66368
+ALTER TABLE fac_faq ADD fac_faq_vervaldatum DATE;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66612
+ALTER TABLE alg_gebouw MODIFY (alg_gebouw_dwgx NUMBER(16,3) );
+ALTER TABLE alg_gebouw MODIFY (alg_gebouw_dwgy NUMBER(16,3) );
+
+ALTER TABLE prj_deel MODIFY (prj_deel_dwgx NUMBER(16,3) );
+ALTER TABLE prj_deel MODIFY (prj_deel_dwgy NUMBER(16,3) );
+ALTER TABLE prj_deel MODIFY (prj_deel_dwgz NUMBER(16,3) );
+
+ALTER TABLE prj_scenario_note MODIFY (prj_scenario_note_DWGX NUMBER(16,3) );
+ALTER TABLE prj_scenario_note MODIFY (prj_scenario_note_DWGY NUMBER(16,3) );
+
+ALTER TABLE prj_werkplek MODIFY (prj_werkplek_dwgx NUMBER(16,3) );
+ALTER TABLE prj_werkplek MODIFY (prj_werkplek_dwgy NUMBER(16,3) );
+ALTER TABLE prj_werkplek MODIFY (prj_werkplek_dwgz NUMBER(16,3) );
+
+ALTER TABLE prs_werkplek MODIFY (prs_werkplek_dwgx NUMBER(16,3) );
+ALTER TABLE prs_werkplek MODIFY (prs_werkplek_dwgy NUMBER(16,3) );
+ALTER TABLE prs_werkplek MODIFY (prs_werkplek_dwgz NUMBER(16,3) );
+
+/////////////////////////////////////////////////////////////////////////////////////////// FMHN#63210
+INSERT INTO fac_notificatie_job (fac_notificatie_job_view, fac_notificatie_job_oms, fac_notificatie_job_mode, fac_notificatie_job_interval, fac_notificatie_job_flags)
+     VALUES ('fac_v_noti_auditfail_day', 'Dagelijkse signaleringen van >5 inlogpogingen', 2, 24, 0);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66765
+drop index mld_i_mld_kenmerkmelding2;
+drop index mld_i_mld_kenmerkmelding3;
+
+drop index mld_i_mld_kenmerkopdr2;
+drop index mld_i_mld_kenmerkopdr3;
+
+drop index bes_i_bes_kenmerkbestell2;
+drop index bes_i_bes_kenmerkbestell3;
+
+drop index bes_i_bes_kenmerkbesteli2;
+drop index bes_i_bes_kenmerkbesteli3;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66677
+ALTER PACKAGE fac COMPILE; // anders (nog) invalid en lukt het volgende niet niet
+ALTER PACKAGE fac COMPILE BODY;
+
+-- Toevoegen ontbrekende gebruiker om HMAIL-API uit te voeren
+INSERT INTO prs_perslid (prs_perslid_module,
+                         prs_srtperslid_key,
+                         prs_afdeling_key,
+                         prs_perslid_naam,
+                         prs_perslid_oslogin,
+                         prs_perslid_apikey,
+                         prs_perslid_flags,
+                         prs_perslid_opmerking)
+   SELECT prs_perslid_module,
+          prs_srtperslid_key,
+          prs_afdeling_key,
+          'API-user tbv. hMail-koppeling',
+          '_HMAIL',
+          DBMS_RANDOM.string ('a', 32),
+          36,
+          'System account for incoming email.'||CHR(13)||'For Facilitor internal use'
+     FROM prs_perslid
+    WHERE prs_perslid_oslogin = '_FACILITOR'
+      AND NOT EXISTS (SELECT 1 FROM prs_perslid WHERE prs_perslid_oslogin = '_HMAIL');
+
+-- Toevoegen ontbrekende gebruiker om PUTORDERS-API uit te voeren
+INSERT INTO prs_perslid (prs_perslid_module,
+                         prs_srtperslid_key,
+                         prs_afdeling_key,
+                         prs_perslid_naam,
+                         prs_perslid_oslogin,
+                         prs_perslid_apikey,
+                         prs_perslid_flags,
+                         prs_perslid_opmerking)
+   SELECT prs_perslid_module,
+          prs_srtperslid_key,
+          prs_afdeling_key,
+          'API-user tbv. Putorders-koppeling',
+          '_PUTORDERS',
+          fac.getsetting('puo_fclt_web_apikey'),
+          36,
+          'System account for outgoing email.'||CHR(13)||'For Facilitor internal use'
+     FROM prs_perslid
+    WHERE prs_perslid_oslogin = '_FACILITOR'
+      AND NOT EXISTS (SELECT 1 FROM prs_perslid WHERE prs_perslid_oslogin = '_PUTORDERS');
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66686
+DELETE FROM fac_notificatie
+ WHERE fac_notificatie_status IN (0,16)
+   AND fac_notificatie_systeemadres IS NULL
+   AND prs_bedrijfadres_key IS NULL;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#56923
+DELETE FROM fac_api
+ WHERE LOWER(fac_api_filepath) IN ('appl/api/api_perslid.asp', 'appl/api/api_ressoap_info.asp');
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#65005
+
+ALTER TABLE fac_import_app ADD
+  fac_import_app_browse_f_key
+    NUMBER(10)
+    CONSTRAINT fac_r_fac_functie_key4 REFERENCES fac_functie(fac_functie_key);
+
+ALTER TABLE fac_export_app ADD
+  fac_export_app_browse_f_key
+    NUMBER(10)
+    CONSTRAINT fac_r_fac_functie_key5 REFERENCES fac_functie(fac_functie_key);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66924
+ALTER TABLE fac_imp_catalogus        ADD ( ins_srtdeel_sensortype         NUMBER(3)
+                                         , ins_srtdeel_acadsymbol_dwgx    NUMBER(16,3)
+                                         , ins_srtdeel_acadsymbol_dwgy    NUMBER(16,3)
+                                         , ins_srtdeel_externnr           VARCHAR2(256) );
+ALTER TABLE fac_imp_mld              ADD ( mld_stdmelding_externnr        VARCHAR2(256) );
+ALTER TABLE fac_imp_organisatie      ADD ( prs_afdeling_externid          VARCHAR2 (256) );
+ALTER TABLE fac_imp_kpn              ADD ( prs_kostenplaats_externnr      VARCHAR2(256) );
+ALTER TABLE fac_imp_perslid          ADD ( prs_perslid_visibility         NUMBER(3)
+                                         , prs_perslid_externid           VARCHAR2(256) );
+ALTER TABLE fac_imp_ins              ADD ( ins_deel_externnr              VARCHAR2(256) );
+ALTER TABLE fac_imp_res_artikel_sync ADD ( res_artikel_externnr           VARCHAR2(256) );
+ALTER TABLE fac_imp_bedrijfadres     ADD ( prs_bedrijfadres_plugin        VARCHAR2 (320)
+                                         , prs_bedrijfadres_plugindata    VARCHAR2 (4000) );
+ALTER TABLE fac_imp_factuur          ADD ( externnr                       VARCHAR2(256) );
+ALTER TABLE fac_imp_flex             ADD ( kenmerk_wissen                 NUMBER(1) );
+ALTER TABLE fac_imp_faq              ADD ( fac_faq_vervaldatum            DATE );
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66929
+ALTER TABLE imp_schedule ADD (
+  prs_perslid_key
+  NUMBER(10)
+  CONSTRAINT imp_r_perslid REFERENCES prs_perslid(prs_perslid_key) ON DELETE SET NULL
+);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#64018
+-- Dan hebben we de oude waarde in de logging
+SELECT fac_setting_pvalue
+  FROM fac_setting
+ WHERE fac_setting_name = 'csstemplate';
+
+-- Styling resetten
+UPDATE fac_setting
+   SET fac_setting_pvalue = NULL
+ WHERE fac_setting_name = 'csstemplate';
+
+/////////////////////////////////////////////////////////////////////////////////////////// KFHT#67002
+ALTER TABLE prs_contactpersoon MODIFY (prs_contactpersoon_email VARCHAR2(200));
+
+/////////////////////////////////////////////////////////////////////////////////////////// DLLG#60172
+DEF_MENUITEM(3, 'lcl_mobile_res_catering',  '', 'RES', 'appl/pda/reservering.asp?restype=C', 0, 0, 'WEB_RESUSE', 'W', '0', 'fa-coffee');
+MENU_INS_AFTER('lcl_mobile_res_catering', 'lcl_mobile_res_voorziening', 2);
+DEF_MENUITEM(3, 'lcl_mobile_res_looplijst', '', 'RES', 'appl/pda/catering_looplijst.asp',    0, 0, 'WEB_RESUSE', 'W', '0', 'fa-person-carry');
+MENU_INS_AFTER('lcl_mobile_res_looplijst', 'lcl_mobile_res_catering', 2);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#67053
+
+-- Verwijder alle kenmerken met kenmerktype 'Q' / Blanco, incl. references (ALG, BEZ, FAQ, FIN, PRS)
+DELETE FROM alg_onrgoedkenmerk
+      WHERE alg_kenmerk_key IN
+                (SELECT alg_kenmerk_key
+                   FROM alg_kenmerk
+                  WHERE alg_kenmerk_kenmerktype = 'Q');
+
+DELETE FROM alg_kenmerk
+      WHERE alg_kenmerk_kenmerktype = 'Q';
+
+DELETE FROM bez_kenmerkwaarde
+      WHERE bez_kenmerk_key IN
+                (SELECT bez_kenmerk_key
+                   FROM bez_kenmerk
+                  WHERE bez_kenmerk_kenmerktype = 'Q');
+
+DELETE FROM bez_kenmerk
+      WHERE bez_kenmerk_kenmerktype = 'Q';
+
+DELETE FROM faq_kenmerk
+      WHERE faq_kenmerk_kenmerktype = 'Q';
+
+DELETE FROM fin_kenmerkfactregel
+      WHERE fin_kenmerk_key IN
+                (SELECT fin_kenmerk_key
+                   FROM fin_kenmerk
+                  WHERE fin_kenmerk_kenmerktype = 'Q');
+
+DELETE FROM fin_kenmerk
+      WHERE fin_kenmerk_kenmerktype = 'Q';
+
+DELETE FROM prs_kenmerk
+      WHERE prs_kenmerk_kenmerktype = 'Q';
+
+-- Verwijder alle kenmerken van een kenmerksoort met kenmerktype 'Q' / Blanco, incl. references (BES, CNT, INS, MLD, RES)
+DELETE FROM bes_kenmerkbestell
+      WHERE bes_kenmerk_key IN
+                (SELECT bes_kenmerk_key
+                   FROM bes_kenmerk
+                  WHERE bes_srtkenmerk_key IN
+                            (SELECT bes_srtkenmerk_key
+                               FROM bes_srtkenmerk
+                              WHERE bes_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM bes_kenmerkbesteli
+      WHERE bes_kenmerk_key IN
+                (SELECT bes_kenmerk_key
+                   FROM bes_kenmerk
+                  WHERE bes_srtkenmerk_key IN
+                            (SELECT bes_srtkenmerk_key
+                               FROM bes_srtkenmerk
+                              WHERE bes_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM bes_kenmerk
+      WHERE bes_srtkenmerk_key IN
+                (SELECT bes_srtkenmerk_key
+                   FROM bes_srtkenmerk
+                  WHERE bes_srtkenmerk_kenmerktype = 'Q');
+
+DELETE FROM cnt_kenmerkcontract
+      WHERE cnt_kenmerk_key IN
+                (SELECT cnt_kenmerk_key
+                   FROM cnt_kenmerk
+                  WHERE cnt_srtkenmerk_key IN
+                            (SELECT cnt_srtkenmerk_key
+                               FROM cnt_srtkenmerk
+                              WHERE cnt_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM cnt_kenmerk
+      WHERE cnt_srtkenmerk_key IN
+                (SELECT cnt_srtkenmerk_key
+                   FROM cnt_srtkenmerk
+                  WHERE cnt_srtkenmerk_kenmerktype = 'Q');
+
+DELETE FROM ins_kenmerkdeel
+      WHERE ins_kenmerk_key IN
+                (SELECT ins_kenmerk_key
+                   FROM ins_kenmerk
+                  WHERE ins_srtkenmerk_key IN
+                            (SELECT ins_srtkenmerk_key
+                               FROM ins_srtkenmerk
+                              WHERE ins_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM ins_kenmerk
+      WHERE ins_srtkenmerk_key IN (SELECT ins_srtkenmerk_key
+                                     FROM ins_srtkenmerk
+                                    WHERE ins_srtkenmerk_kenmerktype = 'Q');
+
+DELETE FROM mld_kenmerkmelding
+      WHERE mld_kenmerk_key IN
+                (SELECT mld_kenmerk_key
+                   FROM mld_kenmerk
+                  WHERE mld_srtkenmerk_key IN
+                            (SELECT mld_srtkenmerk_key
+                               FROM mld_srtkenmerk
+                              WHERE mld_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM mld_kenmerkopdr
+      WHERE mld_kenmerk_key IN
+                (SELECT mld_kenmerk_key
+                   FROM mld_kenmerk
+                  WHERE mld_srtkenmerk_key IN
+                            (SELECT mld_srtkenmerk_key
+                               FROM mld_srtkenmerk
+                              WHERE mld_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM mld_kenmerk
+      WHERE mld_srtkenmerk_key IN (SELECT mld_srtkenmerk_key
+                                     FROM mld_srtkenmerk
+                                    WHERE mld_srtkenmerk_kenmerktype = 'Q');
+
+DELETE FROM res_kenmerk
+      WHERE res_srtkenmerk_key IN (SELECT res_srtkenmerk_key
+                                     FROM res_srtkenmerk
+                                    WHERE res_srtkenmerk_kenmerktype = 'Q');
+
+-- Verwijder alle kenmerksoorten met kenmerktype 'Q' / Blanco, incl. references (BES, CNT, INS, MLD, RES)
+DELETE FROM bes_srtkenmerk
+      WHERE bes_srtkenmerk_kenmerktype = 'Q';
+
+DELETE FROM cnt_srtkenmerk
+      WHERE cnt_srtkenmerk_kenmerktype = 'Q';
+
+DELETE FROM ins_srtkenmerk
+      WHERE ins_srtkenmerk_kenmerktype = 'Q';
+
+DELETE FROM mld_srtkenmerk
+      WHERE mld_srtkenmerk_kenmerktype = 'Q';
+
+DELETE FROM res_srtkenmerk
+      WHERE res_srtkenmerk_kenmerktype = 'Q';
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#*****
+///////////////////////////////////////////////////////////////////////////////////////////
+
+REGISTERONCE('$Id$')
+
+#include "epilogue.inc"

_UP/DB39to40g.src

@@ -0,0 +1,712 @@
+/*
+ * Update script van FACILITOR schema
+ * $Revision$
+ * $Id$
+ */
+#include "prologue.inc"
+
+COMMIT;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#64792
+-- Setting is al handmatig overgenomen naar fg_move_origin
+UPDATE fac_setting
+   SET fac_setting_pvalue = NULL
+ WHERE fac_setting_name = 'fac_reserved_number1';
+
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#63749
+UPDATE ins_tab_discipline
+   SET INS_DISCIPLINE_IMAGE = SUBSTR(INS_DISCIPLINE_IMAGE, 1, LENGTH(INS_DISCIPLINE_IMAGE) - 2)
+ WHERE INS_DISCIPLINE_IMAGE LIKE '%-o';
+
+UPDATE ins_srtdiscipline
+   SET INS_SRTDISCIPLINE_IMAGE = SUBSTR(INS_SRTDISCIPLINE_IMAGE, 1, LENGTH(INS_SRTDISCIPLINE_IMAGE) - 2)
+ WHERE INS_SRTDISCIPLINE_IMAGE LIKE '%-o';
+
+UPDATE mld_stdmelding
+   SET mld_stdmelding_image = SUBSTR(mld_stdmelding_image, 1, LENGTH(mld_stdmelding_image) - 2)
+ WHERE mld_stdmelding_image LIKE '%-o';
+
+UPDATE fac_menu
+   SET fac_menu_image = SUBSTR(fac_menu_image, 1, LENGTH(fac_menu_image) - 2)
+ WHERE fac_menu_image LIKE '%-o';
+
+UPDATE fac_menuitems
+   SET fac_menuitems_image = SUBSTR(fac_menuitems_image, 1, LENGTH(fac_menuitems_image) - 2)
+ WHERE fac_menuitems_image LIKE '%-o';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-sliders-v-square'
+ WHERE fac_menu_image = 'fa-sliders';
+
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#63749 2e batch
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-blank'
+ WHERE fac_menu_image = 'blank';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-euro-sign'
+ WHERE fac_menu_image = 'fa-eur';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-money-bill'
+ WHERE fac_menu_image = 'fa-money';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-chart-pie'
+ WHERE fac_menu_image = 'fa-pie-chart';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-blank'
+ WHERE fac_menu_image = 'blank';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-sliders-v'
+ WHERE fac_menu_image = 'fa-sliders';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-chart-bar'
+ WHERE fac_menu_image = 'fa-bar-chart';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-credit-card'
+ WHERE fac_menu_image = 'fa-vcard';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-chart-line'
+ WHERE fac_menu_image = 'fa-line-chart';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-utensils-alt'
+ WHERE fac_menu_image = 'fa-cutlery';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-file-alt'
+ WHERE fac_menu_image = 'fa-file-text';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-cog'
+ WHERE fac_menu_image = 'fa-gear';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-chart-line'
+ WHERE fac_menu_image = 'fa-chart';
+
+  UPDATE fac_menu
+   SET fac_menu_image = 'fa-cogs'
+ WHERE fac_menu_image = 'fa-gears';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-euro-sign'
+ WHERE fac_menu_image = 'fa-euro';
+
+UPDATE fac_menu
+   SET fac_menu_image = 'fa-exclamation-triangle'
+ WHERE fac_menu_image = 'fa-warning';
+
+UPDATE fac_menuitems
+   SET fac_menuitems_image = 'fa-file-alt'
+ WHERE fac_menuitems_image = 'fa-file-text';
+
+
+/////////////////////////////////////////////////////////////////////////////////////////// AAGN#61402
+DEF_FAC_SRTNOT('ORDCAE', 0, 'lcl_noti_ORDCAE', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
+DEF_FAC_SRTNOT('ORDCAI', 0, 'lcl_noti_ORDCAI', 'mld/mld_opdr.asp?opdr_key=', '0', 'opdracht', 10);
+
+/////////////////////////////////////////////////////////////////////////////////////////// MNNL#64001
+ALTER TABLE mld_kenmerk
+  ADD mld_kenmerk_wissen NUMBER(1) DEFAULT 0 NOT NULL;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#63906
+ALTER TABLE res_activiteit
+  ADD res_activiteit_image VARCHAR2(255);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#64850
+DELETE fac_kenmwaarden;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FLEX#64624
+ALTER TABLE res_rsv_ruimte
+  ADD res_rsv_ruimte_van_actual DATE;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#60030
+ALTER TABLE alg_regio          ADD (         alg_regio_externnr VARCHAR2(256),       alg_regio_externsyncdate DATE);
+ALTER TABLE alg_district       ADD (      alg_district_externnr VARCHAR2(256),    alg_district_externsyncdate DATE);
+ALTER TABLE alg_locatie        ADD (       alg_locatie_externnr VARCHAR2(256),     alg_locatie_externsyncdate DATE);
+ALTER TABLE alg_terreinsector  ADD ( alg_terreinsector_externnr VARCHAR2(256),  alg_terreinsector_extsyncdate DATE);
+ALTER TABLE alg_gebouw         ADD (        alg_gebouw_externnr VARCHAR2(256),      alg_gebouw_externsyncdate DATE);
+ALTER TABLE alg_verdieping     ADD (    alg_verdieping_externnr VARCHAR2(256),  alg_verdieping_externsyncdate DATE);
+ALTER TABLE alg_ruimte         ADD (        alg_ruimte_externnr VARCHAR2(256),      alg_ruimte_externsyncdate DATE);
+ALTER TABLE bes_bestelling     ADD (    bes_bestelling_externnr VARCHAR2(256),  bes_bestelling_externsyncdate DATE);
+ALTER TABLE bes_bestelopdr     ADD (    bes_bestelopdr_externnr VARCHAR2(256),  bes_bestelopdr_externsyncdate DATE);
+ALTER TABLE bez_afspraak       ADD (      bez_afspraak_externnr VARCHAR2(256),    bez_afspraak_externsyncdate DATE);
+ALTER TABLE bez_bezoekers      ADD (     bez_bezoekers_externnr VARCHAR2(256),   bez_bezoekers_externsyncdate DATE);
+ALTER TABLE fin_factuur        ADD (       fin_factuur_externnr VARCHAR2(256),     fin_factuur_externsyncdate DATE);
+ALTER TABLE ins_srtdiscipline  ADD ( ins_srtdiscipline_externnr VARCHAR2(256),  ins_srtdiscipline_extsyncdate DATE);
+ALTER TABLE ins_tab_discipline ADD (    ins_discipline_externnr VARCHAR2(256),  ins_discipline_externsyncdate DATE);
+ALTER TABLE ins_srtgroep       ADD (      ins_srtgroep_externnr VARCHAR2(256),    ins_srtgroep_externsyncdate DATE);
+ALTER TABLE ins_srtdeel        ADD (       ins_srtdeel_externnr VARCHAR2(256),     ins_srtdeel_externsyncdate DATE);
+ALTER TABLE ins_deel           ADD (          ins_deel_externnr VARCHAR2(256),        ins_deel_externsyncdate DATE);
+ALTER TABLE mld_opdr_materiaal ADD (mld_opdr_materiaal_externnr VARCHAR2(256), mld_opdr_materiaal_extsyncdate DATE);
+ALTER TABLE mld_stdmelding     ADD (    mld_stdmelding_externnr VARCHAR2(256),  mld_stdmelding_externsyncdate DATE);
+ALTER TABLE res_deel           ADD (          res_deel_externnr VARCHAR2(256),        res_deel_externsyncdate DATE);
+ALTER TABLE res_artikel        ADD (       res_artikel_externnr VARCHAR2(256),     res_artikel_externsyncdate DATE);
+ALTER TABLE res_ruimte         ADD (                                                res_ruimte_externsyncdate DATE);
+ALTER TABLE res_rsv_artikel    ADD (   res_rsv_artikel_externnr VARCHAR2(256), res_rsv_artikel_externsyncdate DATE);
+ALTER TABLE res_rsv_deel       ADD (      res_rsv_deel_externnr VARCHAR2(256),    res_rsv_deel_externsyncdate DATE);
+ALTER TABLE res_rsv_ruimte     ADD (                                            res_rsv_ruimte_externsyncdate DATE);
+ALTER TABLE res_reservering    ADD (   res_reservering_externnr VARCHAR2(256), res_reservering_externsyncdate DATE);
+
+ALTER TABLE prs_bedrijf_bedrijf ADD (  prs_bedrijf_externsyncdate1 DATE);
+ALTER TABLE prs_bedrijf_bedrijf ADD (  prs_bedrijf_externsyncdate2 DATE);
+ALTER TABLE prs_afdeling        ADD (  prs_afdeling_externsyncdate DATE);
+ALTER TABLE prs_perslid         ADD (   prs_perslid_externsyncdate DATE);
+ALTER TABLE prs_kostenplaats    ADD (    prs_kostenplaats_externnr VARCHAR2(256),   prs_kostenplaats_extsyncdate DATE);
+ALTER TABLE prs_werkplek        ADD (        prs_werkplek_externnr VARCHAR2(256),    prs_werkplek_externsyncdate DATE);
+ALTER TABLE prs_perslidwerkplek ADD ( prs_perslidwerkplek_externnr VARCHAR2(256),   prs_perslidwerkplek_extsyncd DATE);
+ALTER TABLE prs_contactpersoon  ADD (  prs_contactpersoon_externnr VARCHAR2(256), prs_contactpersoon_extsyncdate DATE);
+
+ALTER TABLE prs_bedrijf_bedrijf MODIFY prs_bedrijf_externid1 VARCHAR2(256);
+ALTER TABLE prs_bedrijf_bedrijf MODIFY prs_bedrijf_externid2 VARCHAR2(256);
+ALTER TABLE prs_afdeling        MODIFY prs_afdeling_externid VARCHAR2(256);
+ALTER TABLE prs_perslid         MODIFY prs_perslid_externid  VARCHAR2(256);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#64883
+ALTER TABLE fac_version DROP COLUMN fac_version_major;
+ALTER TABLE fac_version DROP COLUMN fac_version_minor;
+ALTER TABLE fac_version DROP COLUMN fac_version_patch;
+
+DELETE fac_message
+ WHERE fac_message_code = 'FAC_M005';
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#65049
+_FAC_MODULE('CHT', 'lcl_module_CHT')
+
+DEF_FAC_FUNCTIE3('WEB_CHTOPR', 'CHT',  0, 1,    0);
+DEF_FAC_FUNCTIE3('WEB_CHTREQ', 'CHT',  0, 1,    0);
+
+DEF_MENUITEM(2, 'lcl_menu_cht_chatkanalen', '', 'CHT', 'appl/mgt/cht_discipline.asp', 0, 0, 'WEB_PRSSYS', 'W', '1', '');
+MENU_INS_AFTER('lcl_menu_cht_chatkanalen', 'lcl_menu_fac_notificaties', 2);
+
+DEF_MENUITEM(0, 'lcl_menu_cht_chatnow'          , '', 'CHT', 'appl/chat/ChatterWant.asp', 0, 1, 'WEB_CHTREQ', 'R', '1', '');
+MENU_INS_AFTER('lcl_menu_cht_chatnow', 'lcl_menu_fe_search', 2);
+
+DEF_MENUITEM(1, 'lcl_menu_cht_incoming'          , '', 'CHT', 'appl/chat/ChatterAccept.asp', 0, 1, 'WEB_CHTOPR', 'W', '1', '');
+MENU_INS_AFTER('lcl_menu_cht_incoming', 'lcl_menu_sle_sleutels', 2);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#64375
+UPDATE fac_usrgraph
+   SET fac_usrgraph_options = REPLACE (fac_usrgraph_options, '      "renderer": "$.jqplot.BarRenderer",' || CHR(10), '')
+ WHERE fac_usrgraph_omschrijving = 'Category';
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#63800
+UPDATE fac_menuitems
+   SET fac_menuitems_url = 'appl/msg/fac_nieuws_search.asp'
+ WHERE fac_menuitems_label = 'lcl_menu_msg_overzicht';
+
+UPDATE fac_menuitems
+   SET fac_menuitems_label = 'lcl_menu_msg_bericht_maken',
+       fac_menuitems_default = 1
+ WHERE fac_menuitems_label = 'lcl_menu_msg_berichten';
+
+/* Nu default wel in het menu, dat dan ook even voor bestaande klanten; */
+INSERT INTO fac_menu (fac_menuitems_key, fac_menu_volgnr)
+    SELECT fac_menuitems_key, fac_menuitems_key * 100
+      FROM fac_menuitems i
+     WHERE     fac_menuitems_label = 'lcl_menu_msg_bericht_maken'
+           AND i.fac_menuitems_key NOT IN
+                   (SELECT m.fac_menuitems_key
+                      FROM fac_menu m
+                     WHERE m.fac_menuitems_key IS NOT NULL);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66753
+DELETE FROM mld_melding_object mmo
+ WHERE mmo.mld_melding_key NOT IN (SELECT mld_melding_key FROM mld_melding);
+
+DELETE FROM mld_melding_object mmo
+ WHERE mmo.mld_melding_key IS NULL;
+
+/////////////////////////////////////////////////////////////////////////////////////////// UWVA#65182
+ALTER TABLE fin_kenmerkfactuur   DROP CONSTRAINT fin_r_fin_factuur_key;
+ALTER TABLE fin_factuurregel     DROP CONSTRAINT fin_r_fin_factuurregel1;
+ALTER TABLE fin_kenmerkfactregel DROP CONSTRAINT fin_r_fin_factuurregel_key;
+ALTER TABLE bes_bestelling       DROP CONSTRAINT bes_r_mld_melding1;
+ALTER TABLE cnt_contract_object  DROP CONSTRAINT cnt_r_cnt_contract_key_object;
+ALTER TABLE cnt_contract_plaats  DROP CONSTRAINT cnt_r_cnt_contract_key_plaats;
+ALTER TABLE cnt_contract_dienst  DROP CONSTRAINT cnt_r_cnt_contract_dienst;
+ALTER TABLE cnt_factuurschema    DROP CONSTRAINT cnt_r_cnt_factuurschema1;
+ALTER TABLE res_rsv_deel         DROP CONSTRAINT res_c_res_rsv_ruimte_key;
+ALTER TABLE res_rsv_artikel      DROP CONSTRAINT res_c_res_rsv_ruimte_key2;
+ALTER TABLE mld_melding          DROP CONSTRAINT mld_r_res_rsv_ruimte_key;
+ALTER TABLE mld_opdr             DROP CONSTRAINT mld_r_cnt_contract_key;
+ALTER TABLE mld_opdr_materiaal   DROP CONSTRAINT mld_r_mld_opdr_key3;
+ALTER TABLE mld_opdr_uitvoeren   DROP CONSTRAINT mld_r_mld_opdr_key2;
+ALTER TABLE mld_opdr_uren        DROP CONSTRAINT mld_r_mld_opdr_key1;
+
+ALTER TABLE fin_kenmerkfactuur   MODIFY fin_factuur_key      CONSTRAINT fin_r_fin_factuur_key         REFERENCES fin_factuur(fin_factuur_key)           ON DELETE CASCADE;
+ALTER TABLE fin_factuurregel     MODIFY fin_factuur_key      CONSTRAINT fin_r_factuurregel1           REFERENCES fin_factuur(fin_factuur_key)           ON DELETE CASCADE;
+ALTER TABLE fin_kenmerkfactregel MODIFY fin_factuurregel_key CONSTRAINT fin_r_fin_factuurregel_key    REFERENCES fin_factuurregel(fin_factuurregel_key) ON DELETE CASCADE;
+ALTER TABLE bes_bestelling       MODIFY mld_melding_key      CONSTRAINT bes_r_mld_melding1            REFERENCES mld_melding(mld_melding_key)           ON DELETE SET NULL;
+ALTER TABLE cnt_contract_object  MODIFY cnt_contract_key     CONSTRAINT cnt_r_cnt_contract_key_object REFERENCES cnt_contract(cnt_contract_key)         ON DELETE CASCADE;
+ALTER TABLE cnt_contract_plaats  MODIFY cnt_contract_key     CONSTRAINT cnt_r_cnt_contract_key_plaats REFERENCES cnt_contract(cnt_contract_key)         ON DELETE CASCADE;
+ALTER TABLE cnt_contract_dienst  MODIFY cnt_contract_key     CONSTRAINT cnt_r_cnt_contract_dienst     REFERENCES cnt_contract(cnt_contract_key)         ON DELETE CASCADE;
+ALTER TABLE cnt_factuurschema    MODIFY cnt_contract_key     CONSTRAINT cnt_r_cnt_factuurschema1      REFERENCES cnt_contract(cnt_contract_key)         ON DELETE CASCADE;
+ALTER TABLE res_rsv_deel         MODIFY res_rsv_ruimte_key   CONSTRAINT res_c_res_rsv_ruimte_key      REFERENCES res_rsv_ruimte(res_rsv_ruimte_key)     ON DELETE CASCADE;
+ALTER TABLE res_rsv_artikel      MODIFY res_rsv_ruimte_key   CONSTRAINT res_c_res_rsv_ruimte_key2     REFERENCES res_rsv_ruimte(res_rsv_ruimte_key)     ON DELETE CASCADE;
+ALTER TABLE mld_melding          MODIFY res_rsv_ruimte_key   CONSTRAINT mld_r_res_rsv_ruimte_key      REFERENCES res_rsv_ruimte(res_rsv_ruimte_key)     ON DELETE SET NULL;
+ALTER TABLE mld_melding_object   MODIFY mld_melding_key      CONSTRAINT mld_r_mld_melding_key5        REFERENCES mld_melding(mld_melding_key)           ON DELETE CASCADE;
+ALTER TABLE mld_opdr             MODIFY cnt_contract_key     CONSTRAINT mld_r_cnt_contract_key        REFERENCES cnt_contract(cnt_contract_key)         ON DELETE SET NULL;
+ALTER TABLE mld_opdr_materiaal   MODIFY mld_opdr_key         CONSTRAINT mld_r_mld_opdr_key3           REFERENCES mld_opdr(mld_opdr_key)                 ON DELETE CASCADE;
+ALTER TABLE mld_opdr_uitvoeren   MODIFY mld_opdr_key         CONSTRAINT mld_r_mld_opdr_key2           REFERENCES mld_opdr(mld_opdr_key)                 ON DELETE CASCADE;
+ALTER TABLE mld_opdr_uren        MODIFY mld_opdr_key         CONSTRAINT mld_r_mld_opdr_key1           REFERENCES mld_opdr(mld_opdr_key)                 ON DELETE CASCADE;
+
+/////////////////////////////////////////////////////////////////////////////////////////// LOGC#65120
+DEF_FAC_SRTNOT('PRSREG', 127, 'lcl_noti_PRSREG', '', '0', 'perslid', 0);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#65498
+UPDATE fac_version
+   SET fac_version_cust = UPPER(fac_version_cust)
+     , fac_version_group = UPPER(fac_version_group);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FLEX#64726
+ALTER TABLE ins_srtdeel
+ ADD ins_srtdeel_sensortype NUMBER(3) DEFAULT 0 NOT NULL;
+CREATE INDEX ins_i_ins_srtdeel7 ON ins_srtdeel(ins_srtdeel_sensortype);
+
+/////////////////////////////////////////////////////////////////////////////////////////// YKPN#64081
+DEF_FAC_SRTNOT('BEZBEZ', 18, 'lcl_noti_BEZBEZ', '', '0', 'afspraak', 10);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FLEX#64717
+ALTER TABLE prs_bedrijfadres DROP CONSTRAINT prs_c_prs_bedrijfadrestype;
+ALTER TABLE prs_bedrijfadres ADD  CONSTRAINT prs_c_prs_bedrijfadrestype CHECK (prs_bedrijfadres_type IN ('O','B','C','V','N','I'));
+ALTER TABLE fac_notificatie ADD prs_bedrijfadres_key
+    NUMBER(10) CONSTRAINT prs_r_bedrijfadres_key1
+    REFERENCES prs_bedrijfadres(prs_bedrijfadres_key) ON DELETE CASCADE;
+
+ALTER TABLE fac_notificatie_job ADD fac_notificatie_job_seconds NUMBER(5);
+ALTER TABLE fac_notificatie_job ADD CONSTRAINT fac_c_notificatie_job1 CHECK((fac_notificatie_job_interval IS NOT NULL AND fac_notificatie_job_seconds IS NULL) OR (fac_notificatie_job_interval IS NULL AND fac_notificatie_job_seconds IS NOT NULL));
+ALTER TABLE fac_notificatie_job ADD fac_notificatie_job_queue VARCHAR2(20) DEFAULT 'DEFAULT' NOT NULL;
+ALTER TABLE fac_notificatie ADD fac_notificatie_queue VARCHAR2(20) DEFAULT 'DEFAULT' NOT NULL;
+
+DEF_FAC_SRTNOT('FACTST', 0, 'lcl_noti_FACTST', '', '0', 'perslid', 10);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FLEX#65726
+
+ALTER TABLE prs_bedrijfadres
+    ADD prs_bedrijfadres_plugin VARCHAR(320);
+ALTER TABLE prs_bedrijfadres
+    ADD prs_bedrijfadres_plugindata VARCHAR(4000);
+
+/////////////////////////////////////////////////////////////////////////////////////////// YKPN#64730
+ALTER TABLE res_activiteit DROP CONSTRAINT res_c_activiteit_aantal;
+ALTER TABLE res_activiteit ADD  CONSTRAINT res_c_activiteit_aantal CHECK(res_activiteit_aantalverplicht IN (0,1,2));
+
+///////////////////////////////////////////////////////////////////////////////////////////  ARAI#59648
+ALTER TABLE mld_melding ADD mld_melding_dwgx NUMBER(16,3);
+ALTER TABLE mld_melding ADD mld_melding_dwgy NUMBER(16,3);
+ALTER TABLE mld_melding ADD mld_melding_dwgz NUMBER(16,3);
+ALTER TABLE mld_melding ADD mld_melding_x NUMBER(16,6);
+ALTER TABLE mld_melding ADD mld_melding_y NUMBER(16,6);
+ALTER TABLE mld_melding ADD mld_melding_z NUMBER(16,6);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FMHN#65858
+ALTER TABLE fac_imp_onrgoed2 MODIFY alg_ruimte_nr VARCHAR2(20);
+ALTER TABLE fac_imp_perslid MODIFY alg_ruimte_nr VARCHAR2(20);
+ALTER TABLE fac_imp_ins MODIFY alg_ruimte_nr VARCHAR2(20);
+ALTER TABLE fac_imp_sle MODIFY alg_ruimte_nr VARCHAR2(20);
+ALTER TABLE alg_ruimte MODIFY alg_ruimte_nr VARCHAR2(20);
+ALTER TABLE alg_ruimte MODIFY alg_ruimte_upper_nr VARCHAR2(20);
+ALTER TABLE prj_ruimte MODIFY prj_ruimte_nr VARCHAR2(20);
+ALTER TABLE prj_ruimte MODIFY prj_ruimte_upper_nr VARCHAR2(20);
+
+/////////////////////////////////////////////////////////////////////////////////////////// GDZW#65247
+ALTER TABLE bez_bezoekers ADD bez_bezoekers_done_actual DATE;
+ALTER TABLE bez_bezoekers ADD bez_bezoekers_out_actual DATE;
+
+/////////////////////////////////////////////////////////////////////////////////////////// MARX#65917
+ALTER TABLE bes_bestelopdr_item MODIFY bes_bestelopdr_item_aantal NUMBER (15, 3);
+ALTER TABLE bes_bestelopdr_item MODIFY bes_bestelopdr_item_aantalontv NUMBER (15, 3);
+ALTER TABLE bes_bestelopdr_item MODIFY bes_bestelopdr_item_aantalexp NUMBER (15, 3);
+ALTER TABLE bes_bestelling_item MODIFY bes_bestelling_item_aantal NUMBER (15, 3);
+ALTER TABLE bes_bestelling_item MODIFY bes_bestelling_item_aantalontv NUMBER (15, 3);
+
+/////////////////////////////////////////////////////////////////////////////////////////// MNNL#65934
+ALTER TABLE mld_melding ADD mld_melding_actiedatum DATE;
+
+/////////////////////////////////////////////////////////////////////////////////////////// AAXX#65358
+DECLARE
+    -- Bij afgemelden(5) of voltooien(6) van periodieke inspecties (NIET MJOB) wordt het veld ins_deelsrtcontrole_freezecost pas gevuld.
+    -- Het veld ins_deelsrtcontrole_freezedate veld wordt daarbij nooit gevuld. Dat gebeurd alleen bij MJOB taken.
+    -- Alle afgemelde of voltooide periodieke inspecties (NIET MJOB) ophalen waarvoor geldt:
+    -- 1) de freezecost zijn groter dan 0 en
+    -- 2) het aantal van het bijbehorende object is groter dan 1.
+    CURSOR c_freezecost IS
+        SELECT idsc.ins_deelsrtcontrole_key,
+               id.ins_deel_aantal
+          FROM ins_deelsrtcontrole idsc,
+               ins_deel id,
+               ins_srtcontrole isc,
+               ctr_disc_params cdp
+         WHERE idsc.ins_deel_key = id.ins_deel_key
+           AND idsc.ins_srtcontrole_key = isc.ins_srtcontrole_key
+           AND isc.ctr_discipline_key = cdp.ctr_ins_discipline_key
+           AND idsc.ins_deelsrtcontrole_status IN (5, 6)
+           AND idsc.ins_deelsrtcontrole_freezedate IS NULL
+           AND id.ins_deel_aantal > 1
+           AND idsc.ins_deelsrtcontrole_freezecost > 0
+           AND cdp.ctr_disc_params_ismjob = 0;
+
+BEGIN
+    FOR f_freezecost IN c_freezecost
+    LOOP
+        -- Vermenigvuldig het totaalbedrag (freezecost) met het aantal opbjecten.
+        UPDATE ins_deelsrtcontrole
+           SET ins_deelsrtcontrole_freezecost = (f_freezecost.ins_deel_aantal * ins_deelsrtcontrole_freezecost)
+         WHERE ins_deelsrtcontrole_key = f_freezecost.ins_deelsrtcontrole_key;
+    END LOOP;
+END;
+/
+
+/////////////////////////////////////////////////////////////////////////////////////////// MARX#63145
+DROP INDEX res_i_res_deel3;
+CREATE UNIQUE INDEX res_i_res_deel3 ON res_deel(res_ins_deel_key, res_prs_perslid_key, res_discipline_key, res_deel_verwijder);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66178
+ALTER TABLE prs_perslid ADD prs_perslid_visibility NUMBER(3) DEFAULT 0 NOT NULL;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#60561
+ALTER TABLE res_ruimte ADD res_ruimte_graphhooksecret VARCHAR(128);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66441
+ALTER TABLE ins_srtdeel ADD ins_srtdeel_acadsymbol_dwgx NUMBER(16,3);
+ALTER TABLE ins_srtdeel ADD ins_srtdeel_acadsymbol_dwgy NUMBER(16,3);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#65949
+ALTER TABLE bes_srtdeel MODIFY bes_srtdeel_veelvoud NUMBER(9,3);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FLEX#64726
+CREATE_TABLE(ins_deel_state_history_all, 0)
+(
+    ins_deel_state_history_all_key
+        NUMBER(10)
+        CONSTRAINT ins_k_deel_state_histall_key PRIMARY KEY,
+    ins_deel_key
+        NUMBER(10)
+        CONSTRAINT ins_r_ins_deel_key3 REFERENCES ins_deel(ins_deel_key),
+    ins_deel_statedate
+        DATE,
+    ins_deel_state
+        VARCHAR2(128),
+    ins_deel_statetime
+        NUMBER
+);
+
+CREATE SEQUENCE ins_s_ins_deel_st_histall_key MINVALUE 1;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#65180
+ALTER TABLE fac_import_app ADD   fac_import_app_delimiter VARCHAR(2);
+ALTER TABLE fac_export_app ADD   fac_export_app_delimiter VARCHAR(2);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FMHN#66368
+ALTER TABLE fac_faq ADD fac_faq_vervaldatum DATE;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66612
+ALTER TABLE alg_gebouw MODIFY (alg_gebouw_dwgx NUMBER(16,3) );
+ALTER TABLE alg_gebouw MODIFY (alg_gebouw_dwgy NUMBER(16,3) );
+
+ALTER TABLE prj_deel MODIFY (prj_deel_dwgx NUMBER(16,3) );
+ALTER TABLE prj_deel MODIFY (prj_deel_dwgy NUMBER(16,3) );
+ALTER TABLE prj_deel MODIFY (prj_deel_dwgz NUMBER(16,3) );
+
+ALTER TABLE prj_scenario_note MODIFY (prj_scenario_note_DWGX NUMBER(16,3) );
+ALTER TABLE prj_scenario_note MODIFY (prj_scenario_note_DWGY NUMBER(16,3) );
+
+ALTER TABLE prj_werkplek MODIFY (prj_werkplek_dwgx NUMBER(16,3) );
+ALTER TABLE prj_werkplek MODIFY (prj_werkplek_dwgy NUMBER(16,3) );
+ALTER TABLE prj_werkplek MODIFY (prj_werkplek_dwgz NUMBER(16,3) );
+
+ALTER TABLE prs_werkplek MODIFY (prs_werkplek_dwgx NUMBER(16,3) );
+ALTER TABLE prs_werkplek MODIFY (prs_werkplek_dwgy NUMBER(16,3) );
+ALTER TABLE prs_werkplek MODIFY (prs_werkplek_dwgz NUMBER(16,3) );
+
+/////////////////////////////////////////////////////////////////////////////////////////// FMHN#63210
+INSERT INTO fac_notificatie_job (fac_notificatie_job_view, fac_notificatie_job_oms, fac_notificatie_job_mode, fac_notificatie_job_interval, fac_notificatie_job_flags)
+     VALUES ('fac_v_noti_auditfail_day', 'Dagelijkse signaleringen van >5 inlogpogingen', 2, 24, 0);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66765
+drop index mld_i_mld_kenmerkmelding2;
+drop index mld_i_mld_kenmerkmelding3;
+
+drop index mld_i_mld_kenmerkopdr2;
+drop index mld_i_mld_kenmerkopdr3;
+
+drop index bes_i_bes_kenmerkbestell2;
+drop index bes_i_bes_kenmerkbestell3;
+
+drop index bes_i_bes_kenmerkbesteli2;
+drop index bes_i_bes_kenmerkbesteli3;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66677
+ALTER PACKAGE fac COMPILE; // anders (nog) invalid en lukt het volgende niet niet
+ALTER PACKAGE fac COMPILE BODY;
+
+-- Toevoegen ontbrekende gebruiker om HMAIL-API uit te voeren
+INSERT INTO prs_perslid (prs_perslid_module,
+                         prs_srtperslid_key,
+                         prs_afdeling_key,
+                         prs_perslid_naam,
+                         prs_perslid_oslogin,
+                         prs_perslid_apikey,
+                         prs_perslid_flags,
+                         prs_perslid_opmerking)
+   SELECT prs_perslid_module,
+          prs_srtperslid_key,
+          prs_afdeling_key,
+          'API-user tbv. hMail-koppeling',
+          '_HMAIL',
+          DBMS_RANDOM.string ('a', 32),
+          36,
+          'System account for incoming email.'||CHR(13)||'For Facilitor internal use'
+     FROM prs_perslid
+    WHERE prs_perslid_oslogin = '_FACILITOR'
+      AND NOT EXISTS (SELECT 1 FROM prs_perslid WHERE prs_perslid_oslogin = '_HMAIL');
+
+-- Toevoegen ontbrekende gebruiker om PUTORDERS-API uit te voeren
+INSERT INTO prs_perslid (prs_perslid_module,
+                         prs_srtperslid_key,
+                         prs_afdeling_key,
+                         prs_perslid_naam,
+                         prs_perslid_oslogin,
+                         prs_perslid_apikey,
+                         prs_perslid_flags,
+                         prs_perslid_opmerking)
+   SELECT prs_perslid_module,
+          prs_srtperslid_key,
+          prs_afdeling_key,
+          'API-user tbv. Putorders-koppeling',
+          '_PUTORDERS',
+          fac.getsetting('puo_fclt_web_apikey'),
+          36,
+          'System account for outgoing email.'||CHR(13)||'For Facilitor internal use'
+     FROM prs_perslid
+    WHERE prs_perslid_oslogin = '_FACILITOR'
+      AND NOT EXISTS (SELECT 1 FROM prs_perslid WHERE prs_perslid_oslogin = '_PUTORDERS');
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66686
+DELETE FROM fac_notificatie
+ WHERE fac_notificatie_status IN (0,16)
+   AND fac_notificatie_systeemadres IS NULL
+   AND prs_bedrijfadres_key IS NULL;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#56923
+DELETE FROM fac_api
+ WHERE LOWER(fac_api_filepath) IN ('appl/api/api_perslid.asp', 'appl/api/api_ressoap_info.asp');
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#65005
+
+ALTER TABLE fac_import_app ADD
+  fac_import_app_browse_f_key
+    NUMBER(10)
+    CONSTRAINT fac_r_fac_functie_key4 REFERENCES fac_functie(fac_functie_key);
+
+ALTER TABLE fac_export_app ADD
+  fac_export_app_browse_f_key
+    NUMBER(10)
+    CONSTRAINT fac_r_fac_functie_key5 REFERENCES fac_functie(fac_functie_key);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66924
+ALTER TABLE fac_imp_catalogus        ADD ( ins_srtdeel_sensortype         NUMBER(3)
+                                         , ins_srtdeel_acadsymbol_dwgx    NUMBER(16,3)
+                                         , ins_srtdeel_acadsymbol_dwgy    NUMBER(16,3)
+                                         , ins_srtdeel_externnr           VARCHAR2(256) );
+ALTER TABLE fac_imp_mld              ADD ( mld_stdmelding_externnr        VARCHAR2(256) );
+ALTER TABLE fac_imp_organisatie      ADD ( prs_afdeling_externid          VARCHAR2 (256) );
+ALTER TABLE fac_imp_kpn              ADD ( prs_kostenplaats_externnr      VARCHAR2(256) );
+ALTER TABLE fac_imp_perslid          ADD ( prs_perslid_visibility         NUMBER(3)
+                                         , prs_perslid_externid           VARCHAR2(256) );
+ALTER TABLE fac_imp_ins              ADD ( ins_deel_externnr              VARCHAR2(256) );
+ALTER TABLE fac_imp_res_artikel_sync ADD ( res_artikel_externnr           VARCHAR2(256) );
+ALTER TABLE fac_imp_bedrijfadres     ADD ( prs_bedrijfadres_plugin        VARCHAR2 (320)
+                                         , prs_bedrijfadres_plugindata    VARCHAR2 (4000) );
+ALTER TABLE fac_imp_factuur          ADD ( externnr                       VARCHAR2(256) );
+ALTER TABLE fac_imp_flex             ADD ( kenmerk_wissen                 NUMBER(1) );
+ALTER TABLE fac_imp_faq              ADD ( fac_faq_vervaldatum            DATE );
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#66929
+ALTER TABLE imp_schedule ADD (
+  prs_perslid_key
+  NUMBER(10)
+  CONSTRAINT imp_r_perslid REFERENCES prs_perslid(prs_perslid_key) ON DELETE SET NULL
+);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#64018
+-- Dan hebben we de oude waarde in de logging
+SELECT fac_setting_pvalue
+  FROM fac_setting
+ WHERE fac_setting_name = 'csstemplate';
+
+-- Styling resetten
+UPDATE fac_setting
+   SET fac_setting_pvalue = NULL
+ WHERE fac_setting_name = 'csstemplate';
+
+/////////////////////////////////////////////////////////////////////////////////////////// KFHT#67002
+ALTER TABLE prs_contactpersoon MODIFY (prs_contactpersoon_email VARCHAR2(200));
+
+/////////////////////////////////////////////////////////////////////////////////////////// DLLG#60172
+DEF_MENUITEM(3, 'lcl_mobile_res_catering',  '', 'RES', 'appl/pda/reservering.asp?restype=C', 0, 0, 'WEB_RESUSE', 'W', '0', 'fa-coffee');
+MENU_INS_AFTER('lcl_mobile_res_catering', 'lcl_mobile_res_voorziening', 2);
+DEF_MENUITEM(3, 'lcl_mobile_res_looplijst', '', 'RES', 'appl/pda/catering_looplijst.asp',    0, 0, 'WEB_RESUSE', 'W', '0', 'fa-person-carry');
+MENU_INS_AFTER('lcl_mobile_res_looplijst', 'lcl_mobile_res_catering', 2);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#67053
+
+-- Verwijder alle kenmerken met kenmerktype 'Q' / Blanco, incl. references (ALG, BEZ, FAQ, FIN, PRS)
+DELETE FROM alg_onrgoedkenmerk
+      WHERE alg_kenmerk_key IN
+                (SELECT alg_kenmerk_key
+                   FROM alg_kenmerk
+                  WHERE alg_kenmerk_kenmerktype = 'Q');
+
+DELETE FROM alg_kenmerk
+      WHERE alg_kenmerk_kenmerktype = 'Q';
+
+DELETE FROM bez_kenmerkwaarde
+      WHERE bez_kenmerk_key IN
+                (SELECT bez_kenmerk_key
+                   FROM bez_kenmerk
+                  WHERE bez_kenmerk_kenmerktype = 'Q');
+
+DELETE FROM bez_kenmerk
+      WHERE bez_kenmerk_kenmerktype = 'Q';
+
+DELETE FROM faq_kenmerk
+      WHERE faq_kenmerk_kenmerktype = 'Q';
+
+DELETE FROM fin_kenmerkfactregel
+      WHERE fin_kenmerk_key IN
+                (SELECT fin_kenmerk_key
+                   FROM fin_kenmerk
+                  WHERE fin_kenmerk_kenmerktype = 'Q');
+
+DELETE FROM fin_kenmerk
+      WHERE fin_kenmerk_kenmerktype = 'Q';
+
+DELETE FROM prs_kenmerk
+      WHERE prs_kenmerk_kenmerktype = 'Q';
+
+-- Verwijder alle kenmerken van een kenmerksoort met kenmerktype 'Q' / Blanco, incl. references (BES, CNT, INS, MLD, RES)
+DELETE FROM bes_kenmerkbestell
+      WHERE bes_kenmerk_key IN
+                (SELECT bes_kenmerk_key
+                   FROM bes_kenmerk
+                  WHERE bes_srtkenmerk_key IN
+                            (SELECT bes_srtkenmerk_key
+                               FROM bes_srtkenmerk
+                              WHERE bes_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM bes_kenmerkbesteli
+      WHERE bes_kenmerk_key IN
+                (SELECT bes_kenmerk_key
+                   FROM bes_kenmerk
+                  WHERE bes_srtkenmerk_key IN
+                            (SELECT bes_srtkenmerk_key
+                               FROM bes_srtkenmerk
+                              WHERE bes_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM bes_kenmerk
+      WHERE bes_srtkenmerk_key IN
+                (SELECT bes_srtkenmerk_key
+                   FROM bes_srtkenmerk
+                  WHERE bes_srtkenmerk_kenmerktype = 'Q');
+
+DELETE FROM cnt_kenmerkcontract
+      WHERE cnt_kenmerk_key IN
+                (SELECT cnt_kenmerk_key
+                   FROM cnt_kenmerk
+                  WHERE cnt_srtkenmerk_key IN
+                            (SELECT cnt_srtkenmerk_key
+                               FROM cnt_srtkenmerk
+                              WHERE cnt_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM cnt_kenmerk
+      WHERE cnt_srtkenmerk_key IN
+                (SELECT cnt_srtkenmerk_key
+                   FROM cnt_srtkenmerk
+                  WHERE cnt_srtkenmerk_kenmerktype = 'Q');
+
+DELETE FROM ins_kenmerkdeel
+      WHERE ins_kenmerk_key IN
+                (SELECT ins_kenmerk_key
+                   FROM ins_kenmerk
+                  WHERE ins_srtkenmerk_key IN
+                            (SELECT ins_srtkenmerk_key
+                               FROM ins_srtkenmerk
+                              WHERE ins_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM ins_kenmerk
+      WHERE ins_srtkenmerk_key IN (SELECT ins_srtkenmerk_key
+                                     FROM ins_srtkenmerk
+                                    WHERE ins_srtkenmerk_kenmerktype = 'Q');
+
+DELETE FROM mld_kenmerkmelding
+      WHERE mld_kenmerk_key IN
+                (SELECT mld_kenmerk_key
+                   FROM mld_kenmerk
+                  WHERE mld_srtkenmerk_key IN
+                            (SELECT mld_srtkenmerk_key
+                               FROM mld_srtkenmerk
+                              WHERE mld_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM mld_kenmerkopdr
+      WHERE mld_kenmerk_key IN
+                (SELECT mld_kenmerk_key
+                   FROM mld_kenmerk
+                  WHERE mld_srtkenmerk_key IN
+                            (SELECT mld_srtkenmerk_key
+                               FROM mld_srtkenmerk
+                              WHERE mld_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM mld_kenmerk
+      WHERE mld_srtkenmerk_key IN (SELECT mld_srtkenmerk_key
+                                     FROM mld_srtkenmerk
+                                    WHERE mld_srtkenmerk_kenmerktype = 'Q');
+
+DELETE FROM res_kenmerk
+      WHERE res_srtkenmerk_key IN (SELECT res_srtkenmerk_key
+                                     FROM res_srtkenmerk
+                                    WHERE res_srtkenmerk_kenmerktype = 'Q');
+
+-- Verwijder alle kenmerksoorten met kenmerktype 'Q' / Blanco, incl. references (BES, CNT, INS, MLD, RES)
+DELETE FROM bes_srtkenmerk
+      WHERE bes_srtkenmerk_kenmerktype = 'Q';
+
+DELETE FROM cnt_srtkenmerk
+      WHERE cnt_srtkenmerk_kenmerktype = 'Q';
+
+DELETE FROM ins_srtkenmerk
+      WHERE ins_srtkenmerk_kenmerktype = 'Q';
+
+DELETE FROM mld_srtkenmerk
+      WHERE mld_srtkenmerk_kenmerktype = 'Q';
+
+DELETE FROM res_srtkenmerk
+      WHERE res_srtkenmerk_kenmerktype = 'Q';
+
+/////////////////////////////////////////////////////////////////////////////////////////// FMHN#67972
+ALTER TABLE res_ruimte ADD res_ruimte_minbezoekers
+      NUMBER(5)
+      DEFAULT 0
+      CONSTRAINT res_c_ruimte_minbezoekers CHECK(res_ruimte_minbezoekers IS NOT NULL);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FMHN#67970
+ALTER TABLE bes_srtdeel ADD bes_srtdeel_maximum
+        NUMBER(6);
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#*****
+///////////////////////////////////////////////////////////////////////////////////////////
+
+REGISTERONCE('$Id$')
+
+#include "epilogue.inc"

_UP/DB40eto40f.sql

@@ -0,0 +1,46 @@
+--
+-- $Id$
+--
+-- Aanpassingen om DB40e (prod) naar de () DB40f te brengen
+-- Merk op dat de recreate er nog bij komt die de DB-version bijwerkt
+--
+-- MOET OOK ZIJN/WORDEN OPGENOMEN IN DB39TO40f.src !!!
+
+DEFINE thisfile = 'DB40eto40f.sql'
+DEFINE dbuser   = '*'
+
+SET ECHO ON
+SET DEFINE ON
+COLUMN fcltlogfile NEW_VALUE fcltlogfile NOPRINT;
+COLUMN fcltcusterr NEW_VALUE fcltcusterr NOPRINT;
+WHENEVER SQLERROR CONTINUE;
+SELECT adm.getscriptspoolfile('&thisfile') AS fcltlogfile FROM DUAL;
+SPOOL &fcltlogfile
+WHENEVER SQLERROR EXIT;
+SELECT adm.checkscriptcust('&dbuser') AS fcltcusterr FROM DUAL;
+WHENEVER SQLERROR CONTINUE;
+PROMPT &fcltcusterr
+SET DEFINE OFF
+
+------ payload begin ------
+-- /////////////////////////////////////////////////////////////////////////////////////////// FMHN#67972
+ALTER TABLE res_ruimte ADD res_ruimte_minbezoekers
+      NUMBER(5)
+      DEFAULT 0
+      CONSTRAINT res_c_ruimte_minbezoekers CHECK(res_ruimte_minbezoekers IS NOT NULL);
+
+-- /////////////////////////////////////////////////////////////////////////////////////////// FMHN#67970
+ALTER TABLE bes_srtdeel ADD bes_srtdeel_maximum
+        NUMBER(6);
+
+------ payload end   ------
+
+SET DEFINE OFF
+BEGIN adm.systrackscriptId ('$Id$', 1); END;
+/
+
+COMMIT;
+SET ECHO OFF
+SPOOL OFF
+SET DEFINE ON
+PROMPT Logfile of this upgrade is: &fcltlogfile

_UP/DB40to40a.sql

@@ -0,0 +1,224 @@
+--
+-- $Id$
+--
+-- Aanpassingen om DB40 (accept) naar de (definitieve?) DB40a te brengen
+-- Merk op dat de recreate er nog bij komt die de DB-version bijwerkt
+
+DEFINE thisfile = 'DB40to40a.sql'
+DEFINE dbuser   = '*'
+
+SET ECHO ON
+SET DEFINE ON
+COLUMN fcltlogfile NEW_VALUE fcltlogfile NOPRINT;
+WHENEVER SQLERROR EXIT;
+SELECT adm.scriptspoolfile('&dbuser', '&thisfile') AS fcltlogfile FROM DUAL;
+WHENEVER SQLERROR CONTINUE;
+SPOOL &fcltlogfile
+SET DEFINE OFF
+
+------ payload begin ------
+
+-- /////////////////////////////////////////////////////////////////////////////////////////// PCHX#66970
+UPDATE fac_menuitems
+   SET fac_menuitems_disc = 0
+ WHERE fac_menuitems_label = 'lcl_menu_cht_chatkanalen';
+
+-- /////////////////////////////////////////////////////////////////////////////////////////// FCLT#66677
+-- Gefaald bij sommige accepts omdat FAC package invalid was. Hier herhalen.
+-- Toevoegen ontbrekende gebruiker om HMAIL-API uit te voeren
+INSERT INTO prs_perslid (prs_perslid_module,
+                         prs_srtperslid_key,
+                         prs_afdeling_key,
+                         prs_perslid_naam,
+                         prs_perslid_oslogin,
+                         prs_perslid_apikey,
+                         prs_perslid_flags,
+                         prs_perslid_opmerking)
+   SELECT prs_perslid_module,
+          prs_srtperslid_key,
+          prs_afdeling_key,
+          'API-user tbv. hMail-koppeling',
+          '_HMAIL',
+          DBMS_RANDOM.string ('a', 32),
+          36,
+          'System account for incoming email.'||CHR(13)||'For Facilitor internal use'
+     FROM prs_perslid
+    WHERE prs_perslid_oslogin = '_FACILITOR'
+      AND NOT EXISTS (SELECT 1 FROM prs_perslid WHERE prs_perslid_oslogin = '_HMAIL');
+
+-- Toevoegen ontbrekende gebruiker om PUTORDERS-API uit te voeren
+INSERT INTO prs_perslid (prs_perslid_module,
+                         prs_srtperslid_key,
+                         prs_afdeling_key,
+                         prs_perslid_naam,
+                         prs_perslid_oslogin,
+                         prs_perslid_apikey,
+                         prs_perslid_flags,
+                         prs_perslid_opmerking)
+   SELECT prs_perslid_module,
+          prs_srtperslid_key,
+          prs_afdeling_key,
+          'API-user tbv. Putorders-koppeling',
+          '_PUTORDERS',
+          fac.getsetting('puo_fclt_web_apikey'),
+          36,
+          'System account for outgoing email.'||CHR(13)||'For Facilitor internal use'
+     FROM prs_perslid
+    WHERE prs_perslid_oslogin = '_FACILITOR'
+      AND NOT EXISTS (SELECT 1 FROM prs_perslid WHERE prs_perslid_oslogin = '_PUTORDERS');
+
+-- /////////////////////////////////////////////////////////////////////////////////////////// KFHT#67002
+ALTER TABLE prs_contactpersoon MODIFY (prs_contactpersoon_email VARCHAR2(200));
+
+-- /////////////////////////////////////////////////////////////////////////////////////////// DLLG#60172
+INSERT INTO fac_menuitems (fac_menuitems_groep, fac_menuitems_label, fac_menuitems_oms, fac_menuitems_module, fac_menuitems_url, fac_menuitems_srtdisc, fac_menuitems_disc, fac_functie_key, fac_menuitems_rw, fac_menuitems_default, fac_menuitems_image) SELECT 3, 'lcl_mobile_res_catering', '', 'RES', 'appl/pda/reservering.asp?restype=C', 0, 0, fac_functie_key, 'W', '0', 'fa-coffee' FROM fac_functie WHERE fac_functie_code='WEB_RESUSE';
+INSERT INTO fac_menu (fac_menuitems_key, fac_menu_volgnr) SELECT i.fac_menuitems_key, m.fac_menu_volgnr + 2 FROM fac_menuitems i, fac_menu m WHERE i.fac_menuitems_key = (SELECT MAX(mmi.fac_menuitems_key) FROM fac_menuitems mmi WHERE mmi.fac_menuitems_label = 'lcl_mobile_res_catering') AND m.fac_menuitems_key = (SELECT MAX(mm.fac_menuitems_key) FROM fac_menu mm, fac_menuitems mmi WHERE mm.fac_menuitems_key = mmi.fac_menuitems_key AND mmi.fac_menuitems_label = 'lcl_mobile_res_voorziening');
+INSERT INTO fac_menuitems (fac_menuitems_groep, fac_menuitems_label, fac_menuitems_oms, fac_menuitems_module, fac_menuitems_url, fac_menuitems_srtdisc, fac_menuitems_disc, fac_functie_key, fac_menuitems_rw, fac_menuitems_default, fac_menuitems_image) SELECT 3, 'lcl_mobile_res_looplijst', '', 'RES', 'appl/pda/catering_looplijst.asp', 0, 0, fac_functie_key, 'W', '0', 'fa-person-carry' FROM fac_functie WHERE fac_functie_code='WEB_RESUSE';
+INSERT INTO fac_menu (fac_menuitems_key, fac_menu_volgnr) SELECT i.fac_menuitems_key, m.fac_menu_volgnr + 2 FROM fac_menuitems i, fac_menu m WHERE i.fac_menuitems_key = (SELECT MAX(mmi.fac_menuitems_key) FROM fac_menuitems mmi WHERE mmi.fac_menuitems_label = 'lcl_mobile_res_looplijst') AND m.fac_menuitems_key = (SELECT MAX(mm.fac_menuitems_key) FROM fac_menu mm, fac_menuitems mmi WHERE mm.fac_menuitems_key = mmi.fac_menuitems_key AND mmi.fac_menuitems_label = 'lcl_mobile_res_catering');
+
+-- /////////////////////////////////////////////////////////////////////////////////////////// FCLT#67053
+
+-- Verwijder alle kenmerken met kenmerktype 'Q' / Blanco, incl. references (ALG, BEZ, FAQ, FIN, PRS)
+DELETE FROM alg_onrgoedkenmerk
+      WHERE alg_kenmerk_key IN
+                (SELECT alg_kenmerk_key
+                   FROM alg_kenmerk
+                  WHERE alg_kenmerk_kenmerktype = 'Q');
+
+DELETE FROM alg_kenmerk
+      WHERE alg_kenmerk_kenmerktype = 'Q';
+
+DELETE FROM bez_kenmerkwaarde
+      WHERE bez_kenmerk_key IN
+                (SELECT bez_kenmerk_key
+                   FROM bez_kenmerk
+                  WHERE bez_kenmerk_kenmerktype = 'Q');
+
+DELETE FROM bez_kenmerk
+      WHERE bez_kenmerk_kenmerktype = 'Q';
+
+DELETE FROM faq_kenmerk
+      WHERE faq_kenmerk_kenmerktype = 'Q';
+
+DELETE FROM fin_kenmerkfactregel
+      WHERE fin_kenmerk_key IN
+                (SELECT fin_kenmerk_key
+                   FROM fin_kenmerk
+                  WHERE fin_kenmerk_kenmerktype = 'Q');
+
+DELETE FROM fin_kenmerk
+      WHERE fin_kenmerk_kenmerktype = 'Q';
+
+DELETE FROM prs_kenmerk
+      WHERE prs_kenmerk_kenmerktype = 'Q';
+
+-- Verwijder alle kenmerken van een kenmerksoort met kenmerktype 'Q' / Blanco, incl. references (BES, CNT, INS, MLD, RES)
+DELETE FROM bes_kenmerkbestell
+      WHERE bes_kenmerk_key IN
+                (SELECT bes_kenmerk_key
+                   FROM bes_kenmerk
+                  WHERE bes_srtkenmerk_key IN
+                            (SELECT bes_srtkenmerk_key
+                               FROM bes_srtkenmerk
+                              WHERE bes_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM bes_kenmerkbesteli
+      WHERE bes_kenmerk_key IN
+                (SELECT bes_kenmerk_key
+                   FROM bes_kenmerk
+                  WHERE bes_srtkenmerk_key IN
+                            (SELECT bes_srtkenmerk_key
+                               FROM bes_srtkenmerk
+                              WHERE bes_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM bes_kenmerk
+      WHERE bes_srtkenmerk_key IN
+                (SELECT bes_srtkenmerk_key
+                   FROM bes_srtkenmerk
+                  WHERE bes_srtkenmerk_kenmerktype = 'Q');
+
+DELETE FROM cnt_kenmerkcontract
+      WHERE cnt_kenmerk_key IN
+                (SELECT cnt_kenmerk_key
+                   FROM cnt_kenmerk
+                  WHERE cnt_srtkenmerk_key IN
+                            (SELECT cnt_srtkenmerk_key
+                               FROM cnt_srtkenmerk
+                              WHERE cnt_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM cnt_kenmerk
+      WHERE cnt_srtkenmerk_key IN
+                (SELECT cnt_srtkenmerk_key
+                   FROM cnt_srtkenmerk
+                  WHERE cnt_srtkenmerk_kenmerktype = 'Q');
+
+DELETE FROM ins_kenmerkdeel
+      WHERE ins_kenmerk_key IN
+                (SELECT ins_kenmerk_key
+                   FROM ins_kenmerk
+                  WHERE ins_srtkenmerk_key IN
+                            (SELECT ins_srtkenmerk_key
+                               FROM ins_srtkenmerk
+                              WHERE ins_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM ins_kenmerk
+      WHERE ins_srtkenmerk_key IN (SELECT ins_srtkenmerk_key
+                                     FROM ins_srtkenmerk
+                                    WHERE ins_srtkenmerk_kenmerktype = 'Q');
+
+DELETE FROM mld_kenmerkmelding
+      WHERE mld_kenmerk_key IN
+                (SELECT mld_kenmerk_key
+                   FROM mld_kenmerk
+                  WHERE mld_srtkenmerk_key IN
+                            (SELECT mld_srtkenmerk_key
+                               FROM mld_srtkenmerk
+                              WHERE mld_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM mld_kenmerkopdr
+      WHERE mld_kenmerk_key IN
+                (SELECT mld_kenmerk_key
+                   FROM mld_kenmerk
+                  WHERE mld_srtkenmerk_key IN
+                            (SELECT mld_srtkenmerk_key
+                               FROM mld_srtkenmerk
+                              WHERE mld_srtkenmerk_kenmerktype = 'Q'));
+
+DELETE FROM mld_kenmerk
+      WHERE mld_srtkenmerk_key IN (SELECT mld_srtkenmerk_key
+                                     FROM mld_srtkenmerk
+                                    WHERE mld_srtkenmerk_kenmerktype = 'Q');
+
+DELETE FROM res_kenmerk
+      WHERE res_srtkenmerk_key IN (SELECT res_srtkenmerk_key
+                                     FROM res_srtkenmerk
+                                    WHERE res_srtkenmerk_kenmerktype = 'Q');
+
+-- Verwijder alle kenmerksoorten met kenmerktype 'Q' / Blanco, incl. references (BES, CNT, INS, MLD, RES)
+DELETE FROM bes_srtkenmerk
+      WHERE bes_srtkenmerk_kenmerktype = 'Q';
+
+DELETE FROM cnt_srtkenmerk
+      WHERE cnt_srtkenmerk_kenmerktype = 'Q';
+
+DELETE FROM ins_srtkenmerk
+      WHERE ins_srtkenmerk_kenmerktype = 'Q';
+
+DELETE FROM mld_srtkenmerk
+      WHERE mld_srtkenmerk_kenmerktype = 'Q';
+
+DELETE FROM res_srtkenmerk
+      WHERE res_srtkenmerk_kenmerktype = 'Q';
+
+-- /////////////////////////////////////////////////////////////////////////////////////////// XXXX#12345
+------ payload end   ------
+
+SET DEFINE OFF
+BEGIN adm.systrackscriptId ('$Id$', 1); END;
+/
+
+COMMIT;
+SET ECHO OFF
+SPOOL OFF
+SET DEFINE ON
+PROMPT Logfile of this upgrade is: &fcltlogfile

_UP/DB40to41.src

@@ -0,0 +1,112 @@
+/*
+ * Update script van FACILITOR schema
+ * $Revision$
+ * $Id$
+ */
+#include "prologue.inc"
+
+COMMIT;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#64017
+
+CREATE_TABLE(fac_widget_page, 0)
+(
+    fac_widget_page_key
+        NUMBER(10)
+        CONSTRAINT fac_k_fac_widget_page_key PRIMARY KEY,
+    fac_widget_page_name                                  -- Paginanaam
+        VARCHAR2(60),
+    fac_widget_page_aanmaak                               -- Aanmaak datum
+        DATE
+        DEFAULT SYSDATE
+);
+
+ALTER TABLE fac_widget_page ADD (
+  prs_perslid_key
+        NUMBER(10)
+        CONSTRAINT fac_r_prs_perslid_key11 REFERENCES prs_perslid(prs_perslid_key) ON DELETE CASCADE
+);
+
+CREATE SEQUENCE fac_s_fac_widget_page_key MINVALUE 100;
+
+CREATE_TRIGGER(fac_t_fac_widget_page_B_I)
+BEFORE INSERT ON fac_widget_page
+FOR EACH ROW
+BEGIN
+  UPDATE_PRIMARY_KEY(fac_widget_page_key, fac_s_fac_widget_page_key);
+END;
+/
+
+CREATE_TABLE(fac_widget_onpage, 0)                        -- Koppeltabel voor fac_widget en fac_widget_page
+(
+    fac_widget_onpage_key
+        NUMBER(10)
+        CONSTRAINT fac_k_fac_widget_onpage_key PRIMARY KEY,
+    fac_widget_page_key
+        NUMBER(10)
+        CONSTRAINT fac_r_fac_widget_page_key REFERENCES fac_widget_page(fac_widget_page_key) ON DELETE CASCADE,
+    fac_widget_key
+        NUMBER(10)
+        CONSTRAINT fac_r_fac_widget_key REFERENCES fac_widget(fac_widget_key) ON DELETE CASCADE,
+    fac_widget_onpage_order
+        NUMBER(5)
+);
+
+ALTER TABLE fac_widget_onpage ADD (
+    fac_widget_onpage_height                               -- Optioneel afwjkend van default
+        NUMBER(3),
+    fac_widget_onpage_width                                -- Optioneel afwijkend van default
+        NUMBER(3)
+);
+
+CREATE SEQUENCE fac_s_fac_widget_onpage_key MINVALUE 1;
+
+CREATE_TRIGGER(fac_t_fac_widget_onpage_B_I)
+BEFORE INSERT ON fac_widget_onpage
+FOR EACH ROW
+BEGIN
+  UPDATE_PRIMARY_KEY(fac_widget_onpage_key, fac_s_fac_widget_onpage_key);
+END;
+/
+
+-- Moving widget page info from fac_widget to fac_widget_page
+-- Insert in new table
+-- Multiple-update-compatible
+INSERT INTO fac_widget_page (fac_widget_page_name)
+    SELECT DISTINCT fac_widget_groep
+      FROM fac_widget
+     WHERE fac_widget_groep NOT IN (SELECT DISTINCT fac_widget_page_name
+                                      FROM fac_widget_page);
+
+-- Ivm asynchrone DB update dit pas volgende DB release, no hurries
+-- ALTER TABLE fac_widget
+--     DROP (fac_widget_groep, fac_widget_volgnr);
+
+-- Het vullen van de koppeltabel inclusief conversie van fac_widget.fac_widget_volgnr -> fac_widget_onpage.fac_widget_onpage_order
+INSERT INTO fac_widget_onpage (fac_widget_page_key,
+                               fac_widget_key,
+                               fac_widget_onpage_order)
+    SELECT page.fac_widget_page_key,
+           widget.fac_widget_key,
+           widget.onpage_order
+      FROM (  SELECT fac_widget_page_key, fac_widget_page_name
+                FROM fac_widget_page) page,
+           (  SELECT fac_widget_key,
+                     fac_widget_groep,
+                     ROW_NUMBER ()
+                         OVER (PARTITION BY fac_widget_groep
+                               ORDER BY fac_widget_volgnr)    onpage_order
+                FROM fac_widget
+            ORDER BY fac_widget_groep, fac_widget_volgnr NULLS LAST) widget
+     WHERE widget.fac_widget_groep = page.fac_widget_page_name;
+
+ALTER TABLE fac_widget ADD fac_widget_naam VARCHAR2(60);
+UPDATE fac_widget SET fac_widget_naam = SUBSTR (fac_widget_groep, 1, 56) || '-' || fac_widget_volgnr;
+ALTER TABLE fac_widget MODIFY fac_widget_naam NOT NULL;
+
+/////////////////////////////////////////////////////////////////////////////////////////// FCLT#*****
+///////////////////////////////////////////////////////////////////////////////////////////
+
+REGISTERONCE('$Id$')
+
+#include "epilogue.inc"

_UP/epilogue.inc

@@ -6,19 +6,6 @@
  */
 COMMIT;
 
-DELETE FROM fac_session WHERE fac_session_expire < SYSDATE - 2;
-DELETE FROM aut_client_perslid WHERE aut_client_perslid_login < SYSDATE - 60;
-DELETE FROM fac_bookmark WHERE fac_bookmark_expire < SYSDATE - 2;
-DELETE FROM web_user_messages WHERE web_user_mess_action_datum < SYSDATE - 60;
-DELETE FROM fac_notificatie WHERE fac_notificatie_status=0
-      AND fac_notificatie_systeemadres IS NULL;
-COMMIT;
-
--- Dialect/terminologie items die niet meer bestaan
-DELETE FROM fac_localeitems
-      WHERE fac_localeitems_lcl NOT IN
-                  (SELECT fac_locale_xsl_label FROM fac_locale_xsl);
-
 -- Bij een DROP TABLE wordt nogal eens de PURGE vergeten
 PURGE RECYCLEBIN;
 
@@ -73,6 +60,11 @@ END;
 #include POST_RECREATE
 #endif
 
+BEGIN
+   fac.fac_cleanup;
+END;
+/
+
 INSERT INTO adm_tracking
     (adm_tracking_name, adm_tracking_revision)
 VALUES
@@ -90,6 +82,21 @@ SELECT 'OR'||'A-'||'DB'||_DBV_STRING||' Name too long: ' || TABLE_NAME || '.' ||
   FROM USER_TAB_COLUMNS
  WHERE LENGTH(column_name) > 30;
 
+SELECT 'OR'||'A-'||'DB'||_DBV_STRING||' Name too long: CONSTRAINT ' || constraint_name
+  FROM user_constraints
+ WHERE LENGTH (constraint_name) > 30;
+
+SELECT 'OR'||'A-'||'DB'||_DBV_STRING||' Name too long: ' || object_type || ' ' || object_name
+  FROM user_objects
+ WHERE LENGTH (object_name) > 30;
+
+// Soms nog niet goed
+BEGIN
+  DBMS_UTILITY.COMPILE_SCHEMA(USER, FALSE);
+  DBMS_UTILITY.COMPILE_SCHEMA(USER, FALSE);
+END;
+/
+
 PROMPT List of all invalid objects after Facilitor upgrade.
 PROMPT Some errors may resolve by running the customer specific script next.
 SELECT 'OR'||'A-'||'DB'||_DBV_STRING||' Warning: ' || object_type || ' ' || object_name || ' is ' || status

_UP/prologue.inc

@@ -62,10 +62,11 @@ END;
 /
 WHENEVER SQLERROR CONTINUE;
 
+PROMPT [&fcltlogfile]
 PROMPT
 PROMPT ************************************************************************
 PROMPT UPGRADE of Facilitor schema to version EVALCONCAT(DB, _DBV) $Revision$
-PROMPT Copyright (c) 1996-2020 Aareon Nederland B.V., the Netherlands. All rights reserved.
+PROMPT Copyright (c) 1996-2021 Aareon Nederland B.V., the Netherlands. All rights reserved.
 PROMPT
 SELECT 'The current version of Facilitor@' || USER || ' is: ' || fac.getdbversion()
   FROM DUAL;

_UP/recreate.inc

@@ -85,11 +85,11 @@
 ALTER PACKAGE fac COMPILE; // anders soms (nog) invalid en lukt het volgende niet niet
 ALTER PACKAGE fac COMPILE BODY; // Zelfs de COMPILE_SCHEMA van een paar regels verder naar voren halen hielp niet.
 
-BEGIN fac.registerversion(_VERSIONMAJ, _VERSIONMIN, _VERSIONPATCH, _DBV_STRING, NULL); END;
+BEGIN fac.registerversion(_DBV_STRING, NULL); END;
 /
 /* now compile all views, triggers etc acc to the latest state */
 BEGIN
-  DBMS_UTILITY.COMPILE_SCHEMA(USER, FALSE); 
+  DBMS_UTILITY.COMPILE_SCHEMA(USER, FALSE);
   DBMS_UTILITY.COMPILE_SCHEMA(USER, FALSE);  // Soms lukt het niet in 1 keer
 END;
 /

_UTIL/AnonymizeallAAXX.bat

@@ -1,14 +1,11 @@
 :: PRODUCTIE/Shared AAXX
 CALL UPGRADEONEAAXX.BAT AAAH X9zz76fYF81QFgkTa AAAH
 CALL UPGRADEONEAAXX.BAT AAAR XrnBKFzP_GG_wVuqH AAAR
-CALL UPGRADEONEAAXX.BAT AADB Xn_cQmKsReRCSbYZo AADB
 CALL UPGRADEONEAAXX.BAT AADO X_y4iaFLHiQvOFe7S AADO
 CALL UPGRADEONEAAXX.BAT AADS XwevTsmgFOduU3G_l AADS
 CALL UPGRADEONEAAXX.BAT AAES X4Uq3u0BlqiegE1TN AAES
 CALL UPGRADEONEAAXX.BAT AAGN X2vbVuNRfFRoETBIk AAGN
-CALL UPGRADEONEAAXX.BAT AAHB XaVAUvdE1Vub7_Q9L AAHB
 CALL UPGRADEONEAAXX.BAT AAIT XVVRjBJ4wyzFdD7Bt AAIT
-CALL UPGRADEONEAAXX.BAT AAPM X46ExOmRXVEDLIksW AAPM
 CALL UPGRADEONEAAXX.BAT AASA XgajPn1CLx2_1EN2d AASA
 CALL UPGRADEONEAAXX.BAT AAVG X5IMTNmN7mcTJ_EUB AAVG
 CALL UPGRADEONEAAXX.BAT AAXX X9zfWjE3EtS5O5ibG AAXX
@@ -18,6 +15,8 @@ CALL UPGRADEONEAAXX.BAT INLO XuOw5e0L463dmvQUO INLO
 CALL UPGRADEONEAAXX.BAT NMMS XCTaYCXNqeEKP8ASH NMMS
 CALL UPGRADEONEAAXX.BAT RABO XGuhRoFrOnS9S5QLP RABO
 CALL UPGRADEONEAAXX.BAT SMKA XMcYZU7selQamoJLX SMKA
+CALL UPGRADEONEAAXX.BAT CVGZ XV_XhHDmbDzglX_ct CVGZ
+CALL UPGRADEONEAAXX.BAT HDFM XrcjUgExCLAU966ha HDFM
 
 TITLE KLAAR!
 

_UTIL/AnonymizeallFCLT.bat

@@ -8,23 +8,30 @@ CALL UPGRADEONEFCLT.BAT AREO Xm9VTyaei0Q8PbTtV AREO
 CALL UPGRADEONEFCLT.BAT ASDL X9pKB3XUG_u5ppc_F ASDL
 CALL UPGRADEONEFCLT.BAT ASLE XVUZfHU6nsRwZqdov ASLE
 CALL UPGRADEONEFCLT.BAT ASTE XIQPjjHmTrSY6pVe8 ASTE
+CALL UPGRADEONEFCLT.BAT BAMG XPokYz6j0fJbiz4d6 BAMG
 CALL UPGRADEONEFCLT.BAT BLCC Xa2s4Q38qI8dWS1TR BLCC
+CALL UPGRADEONEFCLT.BAT BLIJ XjspODYIKtc31IRvu BLIJ
+CALL UPGRADEONEFCLT.BAT BLOS XJKEgj54OhceAEceI BLOS
 CALL UPGRADEONEFCLT.BAT BOFO XQigftoWTdwV92ll8 BOFO
 CALL UPGRADEONEFCLT.BAT BONS XHLG_Zqa0DUM0QM9J BONS
+CALL UPGRADEONEFCLT.BAT BRWN X_BH3F32TErIsCUH_ BRWN
 CALL UPGRADEONEFCLT.BAT BSSC XC85k0oFwE96VUgTL BSSC
+CALL UPGRADEONEFCLT.BAT CEVA Xkr5nxSI0980joIXQ CEVA
 CALL UPGRADEONEFCLT.BAT CONN X5dSiNgJMXLwTDtVe CONN
 CALL UPGRADEONEFCLT.BAT CSUN XsRVh_WnMCmUXIhH1 CSUN
 CALL UPGRADEONEFCLT.BAT CWTD XfW0o3qr4m1XjY2Bf CWTD
-CALL UPGRADEONEFCLT.BAT DCOL XKNNWym6GRK19Jsza DCOL
 CALL UPGRADEONEFCLT.BAT DENB X07Stmypvi902g0Da DENB
 CALL UPGRADEONEFCLT.BAT DIAN XGxPCZZf_wlEr6bNW DIAN
 CALL UPGRADEONEFCLT.BAT DLLG XelJSO3bF6VPpw2KH DLLG
 CALL UPGRADEONEFCLT.BAT DRIE X2ofiloXyNqFeut3z DRIE
 CALL UPGRADEONEFCLT.BAT FLEX XhKjFGVsT0Eik94B_ FLEX
+CALL UPGRADEONEFCLT.BAT FLOW XZKPzgYkFXa_mYgfn FLOW
 CALL UPGRADEONEFCLT.BAT GDFS X_pNbI2n_tFd_HZ1p GDFS
 CALL UPGRADEONEFCLT.BAT GDZW XVdjjHOtxNT9jBEx3 GDZW
 CALL UPGRADEONEFCLT.BAT GVBA XYfF5iiQD04NhXkZs GVBA
 CALL UPGRADEONEFCLT.BAT HCAS XD7o2FHL8DG2fg7_a HCAS
+CALL UPGRADEONEFCLT.BAT HEIN XrqnoRQbOt3vkoHNG HEIN
+CALL UPGRADEONEFCLT.BAT HMOD XH_kvggtXEc_lq5Gg HMOD
 CALL UPGRADEONEFCLT.BAT HOUT XaNk_EYi3bjeTsCJK HOUT
 CALL UPGRADEONEFCLT.BAT HPJI XS8UrdSkweLb3dIed HPJI
 CALL UPGRADEONEFCLT.BAT IVET XSoXmveHbWwB1gwVs IVET
@@ -32,16 +39,21 @@ CALL UPGRADEONEFCLT.BAT KFHT XMEKQD7rpAW1aiz8R KFHT
 CALL UPGRADEONEFCLT.BAT KFST XkzbOhMkAVG07cNwN KFST
 CALL UPGRADEONEFCLT.BAT KIBE XM427e7VCQcL342GG KIBE
 CALL UPGRADEONEFCLT.BAT KLIM XfGXlNZNQ8y64eXxn KLIM
+CALL UPGRADEONEFCLT.BAT KMMO Xnb_R0g_PFEX0Cx5d KMMO
 CALL UPGRADEONEFCLT.BAT KONG XG2vI1fxINb1CCA5U KONG
+CALL UPGRADEONEFCLT.BAT LBRN XuKLLuQmCAgHuRz50 LBRN
 CALL UPGRADEONEFCLT.BAT LOGC XfbxHI_Kyhtb_66RD LOGC
 CALL UPGRADEONEFCLT.BAT LOGI X6MKH63qn20ynqTE0 LOGI
 CALL UPGRADEONEFCLT.BAT LUDE XF_dyTeoUpg4Zo_XK LUDE
 CALL UPGRADEONEFCLT.BAT MAAS XeuH2K8pAoPxAa7_K MAAS
+CALL UPGRADEONEFCLT.BAT MARE XgWOZxC1Ipv5xHCyk MARE
 CALL UPGRADEONEFCLT.BAT MARX XP_aXRAppo2yqXto_ MARX
 CALL UPGRADEONEFCLT.BAT MDUX XFZejsZOuq40ZmX8L MDUX
 CALL UPGRADEONEFCLT.BAT MNNL XzzxvjjzdkJlgyPFK MNNL
+CALL UPGRADEONEFCLT.BAT MRTS XVQUK8x7IjOURIdm2 MRTS
 CALL UPGRADEONEFCLT.BAT NETS XIBff59esQQJH2klV NETS
 CALL UPGRADEONEFCLT.BAT NYBU XRhG5rq37nICfcvwZ NYBU
+CALL UPGRADEONEFCLT.BAT OOZR Xx78rvwxhXDogQSHZ OOZR
 CALL UPGRADEONEFCLT.BAT PCHA Xqv45hIz_1MyCxyO2 PCHA
 CALL UPGRADEONEFCLT.BAT PCHD XgP9DBeuqHXoj_RZF PCHD
 CALL UPGRADEONEFCLT.BAT PCHE XsEgrrzCt3c9piQTO PCHE
@@ -56,39 +68,43 @@ CALL UPGRADEONEFCLT.BAT PRIS Xg7M3eh8R_0MXD_mT PRIS
 CALL UPGRADEONEFCLT.BAT QUAW XROwIyCrLRizuSeUv QUAW
 CALL UPGRADEONEFCLT.BAT RENK Xptt70T9YaTsJn_Dy RENK
 CALL UPGRADEONEFCLT.BAT RTWE X0PSnnjJle9NvDJTZ RTWE
+CALL UPGRADEONEFCLT.BAT SCBR XBK3W2cJ_KDyEbPao SCBR
 CALL UPGRADEONEFCLT.BAT SGGR XAO310RUJR0heWma0 SGGR
 CALL UPGRADEONEFCLT.BAT SKAF Xyg6G9o9jLUHToJsI SKAF
+CALL UPGRADEONEFCLT.BAT SKBN XuDXwCN5hioYpq14A SKBN
 CALL UPGRADEONEFCLT.BAT SROZ Xjg8csW4__0zjBFAx SROZ
 CALL UPGRADEONEFCLT.BAT STAM XoJs8GkSngaBHHvHk STAM
+CALL UPGRADEONEFCLT.BAT STBR X_t_LG86MapOF_tDL STBR
 CALL UPGRADEONEFCLT.BAT STCH Xadq9KcSKmshOf8lf STCH
 CALL UPGRADEONEFCLT.BAT STPH XyYAS7o7BvgtbUqyW STPH
 CALL UPGRADEONEFCLT.BAT SUTF XLP2sY1LHvSHlx1q8 SUTF
 CALL UPGRADEONEFCLT.BAT SVRZ XKmbhAX0f0t_e321S SVRZ
+CALL UPGRADEONEFCLT.BAT TEAR XsElzDtLzbiPFKGLs TEAR
+CALL UPGRADEONEFCLT.BAT TRIV X5B3j_dImjWDdogUy TRIV
+CALL UPGRADEONEFCLT.BAT TWYN X70wTd4yasvW70AIm TWYN
+CALL UPGRADEONEFCLT.BAT UBRH XDGxbUdPgjVcaCpho UBRH
+CALL UPGRADEONEFCLT.BAT VBGO Xh2r8SPaCovMNJvmo VBGO
 CALL UPGRADEONEFCLT.BAT VEBE X_GvM7FRphkLOqjYP VEBE
 CALL UPGRADEONEFCLT.BAT VENR XZIhKs9hKfXiVcuAr VENR
 CALL UPGRADEONEFCLT.BAT VEST XS0_yHAeGuzw8mgod VEST
 CALL UPGRADEONEFCLT.BAT VGLD X3Tg5YV3zgxtKz0B4 VGLD
 CALL UPGRADEONEFCLT.BAT VLKC XM25OGK3xc0iV2Fgp VLKC
+CALL UPGRADEONEFCLT.BAT VOLK XVGY9ZT9RhYYZa5ys VOLK
 CALL UPGRADEONEFCLT.BAT WEHK XJvjh3WmdYRrR13xf WEHK
 CALL UPGRADEONEFCLT.BAT WELK X0L0tXXLY_JkR2dJv WELK
+CALL UPGRADEONEFCLT.BAT WEND XoxydOjYdSp4yg4BZ WEND
 CALL UPGRADEONEFCLT.BAT WOMA XEVSh9fSXd_qTs7aZ WOMA
 CALL UPGRADEONEFCLT.BAT WOWA X_XvQy4SSAil3KKmd WOWA
 CALL UPGRADEONEFCLT.BAT WOHA Xb1vF0SrmZR5nhKX7 WOHA
 CALL UPGRADEONEFCLT.BAT WOHW XX1QLGKXVMN2nwexb WOHW
 CALL UPGRADEONEFCLT.BAT WOMD XOcGpkWKx61WMtfOl WOMD
 CALL UPGRADEONEFCLT.BAT WOIJ XVg0HYfOcdqPsXTMA WOIJ
+CALL UPGRADEONEFCLT.BAT WOWW Xxn15bLVgs51LfmEd WOWW
 CALL UPGRADEONEFCLT.BAT WTCA X1LPtVUw3PUdEl26_ WTCA
 CALL UPGRADEONEFCLT.BAT WZUV XbCyBvFit0l2r_sIu WZUV
 CALL UPGRADEONEFCLT.BAT YASK XZSPjBDFVEYbMbbjm YASK
-CALL UPGRADEONEFCLT.BAT TEAR XsElzDtLzbiPFKGLs TEAR
-CALL UPGRADEONEFCLT.BAT TWYN X70wTd4yasvW70AIm TWYN
-CALL UPGRADEONEFCLT.BAT OOZR Xx78rvwxhXDogQSHZ OOZR
-CALL UPGRADEONEFCLT.BAT WOWW Xxn15bLVgs51LfmEd WOWW
-CALL UPGRADEONEFCLT.BAT SCBR XBK3W2cJ_KDyEbPao SCBR
-CALL UPGRADEONEFCLT.BAT UBRH XDGxbUdPgjVcaCpho UBRH
-CALL UPGRADEONEFCLT.BAT VOLK XVGY9ZT9RhYYZa5ys VOLK
-CALL UPGRADEONEFCLT.BAT MRTS XVQUK8x7IjOURIdm2 MRTS
-CALL UPGRADEONEFCLT.BAT STBR X_t_LG86MapOF_tDL STBR
+
+
 
 :: PRODUCTIE/Dedicated SaaS
 CALL UPGRADEONEFCLT.BAT PNBR Xnjy1KFYIkXtfqHqj PNBR
@@ -98,6 +114,7 @@ CALL UPGRADEONEFCLT.BAT KFSG XAsuEwkL0cZxwIhUY KFSG
 CALL UPGRADEONEFCLT.BAT NOUR XcaXudb1guD4E_yUm NOUR
 CALL UPGRADEONEFCLT.BAT YFTH Xd_VBLA8kAzZpV8og YFTH
 CALL UPGRADEONEFCLT.BAT YKPN XzFAciNbLCvmBc97G YKPN
+CALL UPGRADEONEFCLT.BAT AKZO XKqKfy_5sdsSOOfAP AKZO
 
 TITLE KLAAR!
 

_UTIL/TestOracle/_CREA_WORK.bat

@@ -22,7 +22,7 @@ ECHO @%BUILD%\DB%DBVER%\FCLT%DBVER%.sql >xtmp.sql
 ECHO UPDATE fac_version SET fac_version_cust = 'CREA'; >>xtmp.sql
 ECHO @@z:\Project\FACILITOR\Database\trunk\_UTIL\SUPPORT_IDP\supportJWT_SAAS.sql>>xtmp.sql
 ECHO EXIT >>xtmp.sql
-sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
+sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"PLS-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
 DEL xtmp.sql
 goto end
 

_UTIL/TestOracle/_CREA_WORK_UPDATE.bat

@@ -21,7 +21,7 @@ sqlplus.exe system/XZSTXnHGjfNNODfQc@%targetSERVER% @.\CreateUser%targetSERVER%.
 ECHO @@%DBPRVPATH% >xtmp.sql
 ECHO UPDATE fac_version SET fac_version_cust = 'CREA'; >>xtmp.sql
 ECHO EXIT >>xtmp.sql
-sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
+sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"PLS-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
 
 @TITLE Running DB%DBPRV%to%DBVER%.sql
 @ECHO   Running DB%DBPRV%to%DBVER%.sql on %targetUSER%@%targetSERVER% 1>&2
@@ -29,7 +29,7 @@ ECHO define ACCEPT_DB%DBVER%=1 >xtmp.sql
 ECHO @%BUILD%\DB%DBVER%\DB%DBPRV%to%DBVER%.sql >>xtmp.sql
 ECHO @@z:\Project\FACILITOR\Database\trunk\_UTIL\SUPPORT_IDP\supportJWT_SAAS.sql >>xtmp.sql
 ECHO EXIT >>xtmp.sql
-sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
+sqlplus.exe %targetUSER%/%targetPASS%@%targetSERVER% @xtmp.sql | FINDSTR /C:"BEGIN adm.sys" /C:"ORA-" /C:"PLS-" /C:"SP2-" /C:"Waarschuwing: package-body is aangemaakt met compilatiefouten."
 DEL xtmp.sql
 DEL SUPPORTJWT*.LST
 goto end

_UTIL/TestOracle/compare.js

@@ -4,6 +4,7 @@ var DBVER = WScript.Arguments(1);
 var newdb = 'TEST_DB' + DBVER;
 var olddb = 'TEST_DB' + DBPRV + 'toDB' + DBVER;
 
+WScript.Echo("CScript Compare.js " + DBPRV + " " + DBVER);
 WScript.Echo("Comparing " + olddb + " to " + newdb)
 
 
@@ -98,7 +99,7 @@ function checkora(sysview, cols, owner, extrawhere)
             + "  FROM " + sysview
             + " WHERE " + owner + " = UPPER('" + newdb + "')"
             + (extrawhere||"");
-    checkempty(sql, sysview + " in " + olddb + " maar niet in " + newdb);
+    checkempty(sql, "ORA- " + sysview + " in " + olddb + " maar niet in " + newdb);
     var sql = "SELECT " + cols
             + "  FROM " + sysview
             + " WHERE " + owner + " = UPPER('" + newdb + "')"
@@ -108,7 +109,7 @@ function checkora(sysview, cols, owner, extrawhere)
             + "  FROM " + sysview
             + " WHERE " + owner + " = UPPER('" + olddb + "')"
             + (extrawhere||"");
-    checkempty(sql, sysview + " in " + newdb + " maar niet in " +olddb);
+    checkempty(sql, "ORA- " + sysview + " in " + newdb + " maar niet in " +olddb);
 }
 
 function checkauto(tbl)

_UTIL/TestOracle/emailerror.js

@@ -1,6 +1,16 @@
 var wshShell = WScript.CreateObject( "WScript.Shell" );
 
+var dbver = WScript.Arguments(0).toUpperCase();
+var mailall = WScript.Arguments.Length > 1 && WScript.Arguments(1) == "mailall";
+
 fac_send_mail_html("j.grootlipman@facilitor.nl");
+if (mailall)
+{
+    fac_send_mail_html("e.groener@facilitor.nl");
+    fac_send_mail_html("m.geerdink@facilitor.nl");
+    fac_send_mail_html("a.tiehuis@facilitor.nl");
+    fac_send_mail_html("gijs.wassink@aareon.nl");
+}
 //fac_send_mail_html("glipman@home.nl");
 //fac_send_mail_html("helpdesk@facilitor.nl");
 
@@ -8,7 +18,9 @@ WScript.Echo(new Date());
 function fac_send_mail_html(adrTo,strSubj,strBody)
 {
     strSubj = "ORA-errors in TestOracle " + new Date();
-    strBody = "ORA-errors in TestOracle\n<code>" ;
+    strBody = "ORA-errors in TestOracle" ;
+    strBody += "<br/>More details in z:\\Project\\FACILITOR\\BUILD\\DB" + dbver + "\\TEST_OUTPUT"
+    strBody += "\n<br/><code>";
     while (!WScript.StdIn.AtEndOfStream)
     {
         strBody = strBody + WScript.StdIn.ReadAll();
@@ -34,6 +46,7 @@ function fac_send_mail_html(adrTo,strSubj,strBody)
     //var objAttachment = objMail.AddAttachment("diffwork_33.lst");
     //objAttachment.ContentTransferEncoding = "base64";
 
+    WScript.Echo("E-mailing to " + adrTo);
 
     objMail.To = adrTo;
     objMail.From = "oracletest@oracletest.facilitor.nl";

_UTIL/TestOracle/testbranch38.bat

@@ -1,4 +1,4 @@
-SET DBVER=38a
+SET DBVER=38e
 SET DBPRV=37
 SET DBPRVPATH=z:\Archief\FACILITOR\2019\02\DB37\FCLT37.sql
 @testworkCOMMON.bat branchDB38

_UTIL/TestOracle/testwork39.bat

@@ -1,4 +1,4 @@
 SET DBVER=39
 SET DBPRV=38
-SET DBPRVPATH=z:\Archief\FACILITOR\2020.1\DB38\FCLT38.sql
+SET DBPRVPATH=z:\Archief\FACILITOR\2020.1\DB38e\FCLT38e.sql
 @testworkCOMMON.bat trunk

_UTIL/TestOracle/testwork40.bat

@@ -0,0 +1,4 @@
+SET DBVER=40
+SET DBPRV=39
+SET DBPRVPATH=z:\Archief\FACILITOR\2020.2\DB39a\FCLT39a.sql
+@testworkCOMMON.bat trunk %*

_UTIL/TestOracle/testworkCOMMON.bat

@@ -13,7 +13,13 @@ GOTO EINDE
 
 :START
 @echo off
-REM Usage: %0
+REM Usage: %0 [mailall]
+SET mailall=%2
+
+SET OUTPUT=%BUILD%\DB%DBVER%\TEST_OUTPUT
+MKDIR %OUTPUT%>nul
+MKDIR %OUTPUT%\OLD>nul
+move %OUTPUT%\*.lst %OUTPUT%\OLD
 
 PUSHD %SOURCE%
 CALL mx12 NOWAIT
@@ -47,8 +53,10 @@ cscript compare.js %DBPRV% %DBVER% >>diffwork_%DBVER%.lst 2>>&1
 findstr /i "ORA-" "diffwork_%DBVER%.lst"
 if %errorlevel%==1 GOTO EINDE
 
-findstr /C:"ORA-" "diffwork_%DBVER%.lst" | cscript emailerror.js >> mail.log 2>>&1
+findstr /C:"ORA-" /C:"PLS-" "diffwork_%DBVER%.lst" | cscript emailerror.js %DBVER% %mailall% >> %0.log 2>>&1
 @TITLE ORA-Errors found, e-mail sent
-PAUSE
+::PAUSE
 
-:EINDE
+:EINDE
+
+move *.lst %OUTPUT%