FCLT#84767 revert van revision 67892 (dd 6-2-2025)

svn path=/Website/branches/v2024.3/; revision=68058

APPL/ALG/alg.inc

@@ -309,6 +309,7 @@ alg = {
                   + "     , p.prs_perslid_key"
                   + "     , COALESCE(g.alg_gebouw_beginuur, -1) alg_gebouw_beginuur"
                   + "     , COALESCE(g.alg_gebouw_einduur, -1) alg_gebouw_einduur"
+                  + "     , mld_vrije_dagen_id"
                   + "  FROM alg_gebouw g"
                   + "     , prs_kostenplaats k"
                   + "     , prs_perslid p"
@@ -340,10 +341,27 @@ alg = {
                        kostenplaats_budgethouder_key: oRs("prs_perslid_key").Value,
                        kostenplaats_budgethouder: oRs("budgethouder").Value,
                        gebouw_beginuur: oRs("alg_gebouw_beginuur").Value,
-                       gebouw_einduur: oRs("alg_gebouw_einduur").Value
+                       gebouw_einduur: oRs("alg_gebouw_einduur").Value,
+                       vrije_dagen: {id: oRs("mld_vrije_dagen_id").Value}
                      };
           }
           oRs.Close();
+          if (result.vrije_dagen.id && result.vrije_dagen.id.toUpperCase() != "DEFAULT")
+          {
+            var vrije_dagen_alt = [];
+            var sql = "SELECT mld_vrije_dagen_datum"
+                    + "  FROM mld_vrije_dagen"
+                    + " WHERE mld_vrije_dagen_id = " + safe.quoted_sql(result.vrije_dagen.id);
+            var oRs = Oracle.Execute(sql);
+            while (!oRs.eof)
+            {
+              vrije_dagen_alt.push((new Date(oRs("mld_vrije_dagen_datum").Value)).getTime());
+              oRs.MoveNext();
+            }
+            oRs.Close();
+            if (vrije_dagen_alt.length)
+              result.vrije_dagen.alt = vrije_dagen_alt;
+          }
 
           return result;
         },
@@ -443,6 +461,124 @@ alg = {
           oRs.Close();
 
           return algm2;
+        },
+
+        alg_onroerendgoed_flex_params: function(p_niveau, p_inlijst)
+        {
+          var sql = "SELECT DISTINCT " + lcl.xsqla("k.alg_kenmerk_omschrijving", "k.alg_kenmerk_key")
+                  + "     , k.alg_kenmerk_kenmerktype"
+                  + "  FROM alg_kenmerk k"
+                  + " WHERE (BITAND(alg_kenmerk_inlijst, " + (p_inlijst? p_inlijst : 1) + ") = " + (p_inlijst? p_inlijst : 1) + ")"
+                  + "   AND (BITAND(alg_kenmerk_systeem, 4) = 0 OR k.alg_kenmerk_systeem IS NULL)"
+                  + "   AND k.alg_kenmerk_niveau = " + safe.quoted_sql_upper(p_niveau)
+                  + "   AND k.alg_kenmerk_verwijder IS NULL";
+          var oRs = Oracle.Execute(sql);
+          var v_flexParams = { anyflex: !oRs.eof};
+
+          if (v_flexParams.anyflex)
+          {
+            var multiflex = false;
+            v_flexParams.bijlageflex = (oRs("alg_kenmerk_kenmerktype").Value == "M");
+            v_flexParams.flexlabel = oRs("alg_kenmerk_omschrijving").Value;
+            oRs.MoveNext();
+            if (!oRs.eof)
+            {
+              multiflex = true;
+              v_flexParams.flexlabel = L("lcl_flexlist_alg_b");
+              while (!oRs.eof)
+              {
+                if (oRs("alg_kenmerk_kenmerktype").Value == "M")
+                  v_flexParams.bijlageflex = true;
+                oRs.MoveNext();
+              }
+            }
+          }
+          oRs.Close();
+
+          var onrgoed_fld = "";
+          switch (p_niveau)
+          {
+            case "D": onrgoed_fld = "d.alg_district_key"; break;
+            case "L": onrgoed_fld = "l.alg_locatie_key"; break;
+            case "T": onrgoed_fld = "g.alg_terreinsector_key"; break;
+            case "G": onrgoed_fld = "g.alg_gebouw_key"; break;
+            case "V": onrgoed_fld = "v.alg_verdieping_key"; break;
+            case "R": onrgoed_fld = "r.alg_ruimte_key"; break;
+          }
+          v_flexParams.sql = (v_flexParams.anyflex
+                             ? ", (SELECT LISTAGG(" + (multiflex
+                                                       ? lcl.xsql("k.alg_kenmerk_omschrijving", "k.alg_kenmerk_key") + " || ':' || chr(160) || "
+                                                       : "")
+                               + "                 CASE WHEN k.alg_kenmerk_kenmerktype = 'R' OR k.alg_kenmerk_kenmerktype = 'r' OR k.alg_kenmerk_kenmerktype = 'S'"
+                               + "                      THEN flx.getdomeinwaarde(k.fac_kenmerkdomein_key, km.alg_onrgoedkenmerk_waarde)"
+                               + "                      WHEN (  (   k.alg_kenmerk_kenmerktype = 'N'"
+                               + "                              AND k.alg_kenmerk_lengte = 1"
+                               + "                              AND k.alg_kenmerk_nmin = 0"
+                               + "                              AND k.alg_kenmerk_nmax = 1"
+                               + "                              AND (k.alg_kenmerk_dec = 0 OR k.alg_kenmerk_dec IS NULL)"
+                               + "                              )"
+                               + "                           OR (k.alg_kenmerk_kenmerktype = 'V')"
+                               + "                           )"
+                               + "                      THEN DECODE( km.alg_onrgoedkenmerk_waarde"
+                               + "                                 , 0, " + safe.qL("lcl_check_0")
+                               + "                                 , 1, " + safe.qL("lcl_check_1")
+                               + "                                 , km.alg_onrgoedkenmerk_waarde"
+                               + "                                 )"
+                               + "                      ELSE km.alg_onrgoedkenmerk_waarde"
+                               + "                 END"
+                               + "               , CHR(13)"
+                               + "               )"
+                               + "        WITHIN GROUP (ORDER BY k.alg_kenmerk_volgnr)"
+                               + "   FROM alg_kenmerk k"
+                               + "      , alg_onrgoedkenmerk km"
+                               + "  WHERE km.alg_onrgoed_key = " + onrgoed_fld
+                               + "    AND km.alg_onrgoed_niveau = " + safe.quoted_sql_upper(p_niveau)
+                               + "    AND k.alg_kenmerk_key = km.alg_kenmerk_key"
+                               + "    AND (BITAND(k.alg_kenmerk_inlijst, " + (p_inlijst? p_inlijst : 1) + ") = " + (p_inlijst? p_inlijst : 1) + ")"
+                               + "    AND (BITAND(k.alg_kenmerk_systeem, 4) = 0 OR k.alg_kenmerk_systeem IS NULL)" //  -- niet als vertrouwelijk
+                               + "    AND k.alg_kenmerk_verwijder IS NULL"
+                               + "    AND km.alg_onrgoedkenmerk_verwijder IS NULL"
+                               + ") algflex"
+                             : ""
+                             )
+          return v_flexParams;
+        },
+
+        alg_onroerendgoed_flex_bijlagen: function(p_niveau, p_alg_key, p_inlijst)
+        {
+          var bijlagen_aantal = 0;
+          var bijlagen_oms = "";
+          var bijlagen_lijst = [];
+          var sql_k = "SELECT k.alg_kenmerk_key"
+                    + "     , " + lcl.xsqla("k.alg_kenmerk_omschrijving", "k.alg_kenmerk_key")
+                    + "  FROM alg_kenmerk k"
+                    + " WHERE BITAND(k.alg_kenmerk_inlijst, " + (p_inlijst? p_inlijst : 1) + ") = " + (p_inlijst? p_inlijst : 1)
+                    + "   AND k.alg_kenmerk_verwijder IS NULL"
+                    + "   AND k.alg_kenmerk_kenmerktype= 'M'"
+                    + "   AND k.alg_kenmerk_niveau = " + safe.quoted_sql_upper(p_niveau);
+          var oRs_k = Oracle.Execute(sql_k);
+          while (!oRs_k.eof)
+          {
+            var kenmerk_key = oRs_k("alg_kenmerk_key").Value;
+            var bijlagen_oms = oRs_k("alg_kenmerk_omschrijving").Value;
+            var bestanden = flexProps("ALG", p_alg_key, kenmerk_key, "A", {getFiles: true});
+            var km_aantal = bestanden.files.length;
+            for (var i=0; i<km_aantal; i++)
+            {
+              bijlagen_lijst.push(bestanden.files[i].name);
+            }
+            bijlagen_aantal += km_aantal;
+
+            oRs_k.MoveNext();
+          }
+          oRs_k.Close();
+
+          return ( bijlagen_aantal > 0
+                 ?  "<span title='" +  safe.htmlattr(bijlagen_lijst.join("\n"))  + "'>"
+                    + safe.html(bijlagen_oms) + ": " + bijlagen_aantal
+                    + "</span>"
+                 : ""
+                 );
         }
   }
 %>

APPL/ALG/alg_district_list.inc

@@ -16,18 +16,6 @@
 <%
 FCLTHeader.Requires({ plugins:["jQuery"] });
 
-function fnrowData(oRs)
-{
-  var parent_key = oRs("alg_regio_key").value;
-  var detail_key = oRs("alg_district_key").value;
-  var key        = oRs("alg_district_key").value;
-  var oms        = oRs("alg_district_omschrijving").value;
-
-  var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
-
-  return JSON.stringify(data);
-}
-
 %>
 <script type="text/javascript">
   var autosearch = 1; // automatisch laden van resultaat op search pagina.
@@ -81,23 +69,6 @@ function district_list(pautfunction, params)
 
   var reg_key = params.reg_key;
   var dis_key = params.dis_key;
-
-  function fnrowActionEnabler(oRs)
-  {
-      var eDelete = false;
-      if (alg.canWriteDistrict(oRs("alg_district_key").value, authparams.mALGwritelevel))
-          eDelete = true;
-      return ({eDelete: eDelete})
-  }
-
-  function fnrowFlexParams(oRs)
-  {
-    var dis_key = oRs("alg_district_key").Value;
-    var this_alg = alg.func_enabled(dis_key, "D");
-
-    var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
-    return flexParams;
-  }
 %>
   <html>
     <head>
@@ -105,15 +76,16 @@ function district_list(pautfunction, params)
     </head>
     <body id="listbody">
 <%
-
-  var sqln = "SELECT   d.alg_district_key, "
-         + "         d.alg_regio_key, "
-         + "         d.alg_district_omschrijving, "
-         + "         r.alg_regio_omschrijving "
-         + "    FROM alg_district d, "
-         + "         alg_regio r "
-         + "   WHERE r.alg_regio_key = d.alg_regio_key "
-         + "         AND d.alg_district_verwijder IS NULL ";
+  var flexParams = alg.alg_onroerendgoed_flex_params("D");
+  var sqln = "SELECT d.alg_district_key"
+         + "       , d.alg_regio_key"
+         + "       , d.alg_district_omschrijving"
+         + "       , r.alg_regio_omschrijving"
+         +       flexParams.sql
+         + "    FROM alg_district d"
+         + "       , alg_regio r"
+         + "   WHERE r.alg_regio_key = d.alg_regio_key"
+         + "     AND d.alg_district_verwijder IS NULL";
 
     if ( authparams.ALGreadlevel > -1 )
     {  // Er is een scope-beperking van kracht
@@ -149,6 +121,50 @@ function district_list(pautfunction, params)
         addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }]
       }
 
+    /**********************************
+    * Callback functies ResultsetTable
+     *********************************/
+    function fnrowData(oRs)
+    {
+      var parent_key = oRs("alg_regio_key").value;
+      var detail_key = oRs("alg_district_key").value;
+      var key        = oRs("alg_district_key").value;
+      var oms        = oRs("alg_district_omschrijving").value;
+      var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
+      return JSON.stringify(data);
+    }
+
+    function fnrowActionEnabler(oRs)
+    {
+      var eDelete = false;
+      if (alg.canWriteDistrict(oRs("alg_district_key").value, authparams.mALGwritelevel))
+          eDelete = true;
+      return ({eDelete: eDelete})
+    }
+
+    function fnrowFlexParams(oRs)
+    {
+      var dis_key = oRs("alg_district_key").Value;
+      var this_alg = alg.func_enabled(dis_key, "D");
+      var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
+      return flexParams;
+    }
+
+    function fncolFlexBijlagen(oRs)
+    {
+      var flexval = oRs("algflex").Value;
+      var alg_key = oRs("alg_district_key").Value;
+      var result = ( flexval
+                   ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
+                   : ""
+                   );
+      if (flexParams.bijlageflex)
+      {
+        result += alg.alg_onroerendgoed_flex_bijlagen("D", alg_key);
+      }
+      return result;
+    }
+
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "alg_district_key",
                                    ID: "algtable",
@@ -165,6 +181,8 @@ function district_list(pautfunction, params)
 
     rst.addColumn(new Column({caption: L("lcl_estate_regio_descr"), content: "alg_regio_omschrijving"}));
     rst.addColumn(new Column({caption: L("lcl_estate_district_man_descr"), content: "alg_district_omschrijving", hasActions: true}));
+    if (flexParams.anyflex)
+      rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
     rst.addAction({ action: "districtEdit", caption: L("lcl_edit"), isDefault:  true});
     rst.addAction({ action: "doDelete", caption: L("lcl_delete"), enabler: "eDelete", multi: true, multiOnce: true});
@@ -176,4 +194,3 @@ function district_list(pautfunction, params)
 </body>
 </html>
 <%}%>
-

APPL/ALG/alg_edit_gebouw.asp

@@ -78,6 +78,7 @@ if (bld_key > 0)
   var vervaldatum   = oRs("alg_gebouw_vervaldatum").Value != null ? new Date(oRs("alg_gebouw_vervaldatum").Value) : null;
   var geb_score1    = oRs("alg_gebouw_mjb_score1").Value;
   var actie_grp_key = oRs("bez_actie_groep_key").Value;
+  var kalender_id   = oRs("mld_vrije_dagen_id").Value;
   oRs.Close();
 }
 else
@@ -198,14 +199,14 @@ else
                             "sgVerantw",
                             { perslidKey: verantw_key,
                               label: L("lcl_alg_verantw"),
-                              readonly: !this_alg.writeuse,
+                              readonly: !this_alg.writeman,
                               autlevel: this_alg.authparams("WEB_ALGMAN") && this_alg.authparams("WEB_ALGMAN").PRSwritelevel
                             });
         FCLTpersoonselector("verantw2",
                             "sgVerantw2",
                             { perslidKey: verantw_key2,
                               label: L("lcl_alg_verantw2"),
-                              readonly: !this_alg.writeuse,
+                              readonly: !this_alg.writeman,
                               autlevel: this_alg.authparams("WEB_ALGMAN") && this_alg.authparams("WEB_ALGMAN").PRSwritelevel
                             });
         manRWFIELD("bld_email",  "fld",     L("lcl_alg_gebouw_email"),       bld_email, {maxlength: 200});
@@ -222,7 +223,7 @@ else
                      { label: L("lcl_mld_dienst_niveau"),
                        initKey: dienstniveau,
                        emptyOption: "",
-                       readonly: !this_alg.writeuse
+                       readonly: !this_alg.writeman
                      });
         FCLTadresselector("mld_adres", "sgAdres",
                     {
@@ -232,6 +233,16 @@ else
                        filtercode: "A",
                        readonly: !this_alg.writeman
                     }) ;
+        var sql = "SELECT DISTINCT mld_vrije_dagen_id, mld_vrije_dagen_id"
+                + "  FROM mld_vrije_dagen";
+        FCLTselector("cal_id"
+                    , sql
+                    , { label: L("lcl_calendar")
+                      , initKey: kalender_id
+                      , emptyOption: ""
+                      , readonly: !this_alg.writeman
+                      }
+                    );
         var times = [];
         for (i=0; i<24; i++)
         {

APPL/ALG/alg_edit_gebouw_multi.asp

@@ -147,6 +147,15 @@ user.auth_required_or_abort(ingesloten.length); // We klagen niet over enkele we
                    initEmpty: true,
                    readonly: !this_alg.writeuse
                  });
+      sql = "SELECT DISTINCT mld_vrije_dagen_id, mld_vrije_dagen_id"
+          + "  FROM mld_vrije_dagen";
+      FCLTselector("cal_id"
+                  , sql
+                  , { label: L("lcl_calendar")
+                    , emptyOption: ""
+                    , initEmpty: true
+                    , readonly: !this_alg.writeman
+                    });
       var times = [];
       for (i=0; i<24; i++)
       {

APPL/ALG/alg_edit_gebouw_multi_save.asp

@@ -49,6 +49,9 @@ if (Request.Form("toon_kenteken").Count == 1 && getFParam("check_toon_kenteken",
 }
 if (Request.Form("dienstniveau").Count == 1 && getFParam("check_dienstniveau", "off") == "on")
     fields.push({ dbs: "mld_dienstniveau_key", typ: "key", frm: "dienstniveau", track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" });
+
+if (Request.Form("cal_id").Count == 1 && getFParam("check_cal_id", "off") == "on")
+    fields.push({ dbs: "mld_vrije_dagen_id", typ: "varchar", frm: "cal_id", track: L("lcl_calendar") });
 if (Request.Form("bld_beginuur").Count == 1 && getFParam("check_bld_beginuur", "off") == "on")
     fields.push({ dbs: "alg_gebouw_beginuur",   typ: "float", frm: "bld_beginuur", track: L("lcl_estate_gebouw_beginuur") });
 if (Request.Form("bld_einduur").Count == 1 && getFParam("check_bld_einduur", "off") == "on")
@@ -112,9 +115,11 @@ for (var i = 0; i < bld_key_arr.length; i++)
                             isNew: false
                           });
 
-        if (flextrack && flextrack.length)
+        if ((algUpd.trackarray && algUpd.trackarray.length) || (flextrack && flextrack.length))
         {
-            var update_string = L("lcl_alg_is_alglup") + "\n" + algUpd.trackarray.join("\n");
+            var update_string = L("lcl_alg_is_alglup") + "\n";
+            if (algUpd.trackarray && algUpd.trackarray.length)
+                update_string += algUpd.trackarray.join("\n");
             if (flextrack && flextrack.length)
                 update_string += flextrack.join("\n");
             shared.trackaction("ALGGUP", alg_key, update_string);

APPL/ALG/alg_edit_gebouw_save.asp

@@ -76,7 +76,8 @@ if (this_alg.writeman)
                 { dbs: "alg_gebouw_mld",            typ: "check",   frm: "bld_mld",       track: L("lcl_estate_gebouw_mld") },
                 { dbs: "alg_gebouw_werkdagen",      typ: "check0",  frm: "bld_werkdagen", track: L("lcl_estate_gebouw_werkdagen") },
                 { dbs: "alg_gebouw_vervaldatum",    typ: "date",    frm: "vervaldatum",   track: L("lcl_alg_vervaldatum") },
-                { dbs: "bez_actie_groep_key",       typ: "key",     frm: "group",         track: L("bez_actie_groep"), foreign: "bez_actie_groep" });
+                { dbs: "bez_actie_groep_key",       typ: "key",     frm: "group",         track: L("bez_actie_groep"), foreign: "bez_actie_groep" },
+                { dbs: "mld_vrije_dagen_id",        typ: "varchar", frm: "cal_id",        track: L("lcl_calendar")});
 
     if (beginuur != -2)
         fields.push({ dbs: "alg_gebouw_beginuur",   typ: "float",   val: beginuur,        track: L("lcl_estate_gebouw_beginuur") });
@@ -160,7 +161,7 @@ if (!warning)
           shared.trackaction("ALGGUP", bld_key, algUpd.trackarray.join("\n"));
     }
     else
-      shared.trackaction("ALGGUP", bld_key, L("lcl_noti_ALGGNE"));  // strikt genomen ALGGNE
+      shared.trackaction("ALGGNE", bld_key);
 
 }
 %>

APPL/ALG/alg_edit_locatie_save.asp

@@ -129,7 +129,7 @@ else
           shared.trackaction("ALGLUP", loc_key, algUpd.trackarray.join("\n"));
     }
     else
-      shared.trackaction("ALGLUP", loc_key, L("lcl_noti_ALGLNE"));  // strikt genomen ALGLNE
+      shared.trackaction("ALGLNE", loc_key);
 
 }
 %>

APPL/ALG/alg_edit_ruimte.asp

@@ -150,18 +150,14 @@ if (!room_exists)
 
           manRWFIELD("room_opp",  "fldshort",     L("lcl_estate_ruimte_bruto_vloeropp"), room_data.grossarea, {maxlength: 10, datatype: "float"});
           ROFIELDTR("fldshort", L("lcl_estate_ruimte_getekendopp"), room_data.cadcontours[0].cadarea, {datatype: "float"});
+          manRWFIELD("room_oppa1",  "fldshort", L("lcl_estate_ruimte_opp_alt1"),       room_data.area1, {maxlength: 10, datatype: "float"});
 
-          if (L("lcl_estate_ruimte_opp_alt1") != "")
-          {
-            manRWFIELD("room_oppa1",  "fldshort", L("lcl_estate_ruimte_opp_alt1"),       room_data.area1, {maxlength: 10, datatype: "float"});
-          }
           if (S("fg_labellayers_alt1")!="" && S("fg_contourlayers_alt1")!="") {
             ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt1"), room_data.cadcontours[0].cadalt1, {datatype: "float"});
           }
-          if (L("lcl_estate_ruimte_opp_alt2") != "")
-          {
-            manRWFIELD("room_oppa2",  "fldshort", L("lcl_estate_ruimte_opp_alt2"),       room_data.area2, {maxlength: 10, datatype: "float"});
-          }
+
+          manRWFIELD("room_oppa2",  "fldshort", L("lcl_estate_ruimte_opp_alt2"),       room_data.area2, {maxlength: 10, datatype: "float"});
+
           if (S("fg_labellayers_alt2")!="" && S("fg_contourlayers_alt2")!="") {
             ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt2"), room_data.cadcontours[0].cadalt2, {datatype: "float"});
           }

APPL/ALG/alg_edit_terreinsector_save.asp

@@ -148,7 +148,7 @@ if (!warning)
           shared.trackaction("ALGTUP", ter_key, algUpd.trackarray.join("\n"));
     }
     else
-      shared.trackaction("ALGTUP", ter_key, L("lcl_noti_ALGTNE"));  // strikt genomen ALGTNE
+      shared.trackaction("ALGTNE", ter_key);
 
 
 }

APPL/ALG/alg_edit_verdieping_save.asp

@@ -117,7 +117,7 @@ if (!warning)
           shared.trackaction("ALGVUP", flr_key, algUpd.trackarray.join("\n"));
     }
     else
-      shared.trackaction("ALGVUP", flr_key, L("lcl_noti_ALGVNE"));  // strikt genomen ALGVNE
+      shared.trackaction("ALGVNE", flr_key);
 
 }
 %>

APPL/ALG/alg_flexkenmerk.inc

@@ -99,7 +99,8 @@ function generateFlexKenmerkBlock(params)
                   mobile: params.mobile,
                   parentKey: onrgoed_key,
                   kenmerk_module: onrgoed_niveau,
-                  hasfilter: hasfilter
+                  hasfilter: hasfilter,
+                  relativeValuesAllowed: params.multi
                 }
                );
 }

APPL/ALG/alg_gebouw_list.inc

@@ -16,51 +16,7 @@
 <%
 FCLTHeader.Requires({ plugins: ["jQuery"] });
 
-function fnrowData(oRs)
-{
-  var parent_key = oRs("alg_locatie_key").value;
-  var detail_key = oRs("alg_gebouw_key").value;
-  var key        = oRs("alg_gebouw_key").value;
-  var oms        = oRs("alg_gebouw_naam").value;
-
-  var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
-
-  return JSON.stringify(data);
-}
-
-var recent = new Date();
-function fnrowClass(oRs)
-{
-  var lclass = "";
-  // Tracking: hoe lang geleden voor het laatst gewijzigd?
-  if (oRs.Fields("recentdatum").Value != null)
-  {
-    var ltrackdate1 = new Date();
-    var ltrackdate10 = new Date();
-    var ltrackdate100 = new Date();
-    var alg_onrgoed_recent = S("alg_onrgoed_recent");
-    ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
-    ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
-    ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
-
-    var fac_recent = new Date(oRs.Fields("recentdatum").Value);
-    if (fac_recent > ltrackdate1)
-    {
-      lclass += " updated";
-    }
-    else if (fac_recent > ltrackdate10)
-    {
-      lclass += " updated10";
-    }
-    else if (fac_recent > ltrackdate100)
-    {
-      lclass += " updated100";
-    }
-  }
-  return lclass;
-}
-
-var cnt_full = getQParamInt("cnt_full", 1);
+  var cnt_full = getQParamInt("cnt_full", 1);
 
   // Fast check to see if any building responsibles have been set
   // If not, we can suppress the column
@@ -84,6 +40,7 @@ var cnt_full = getQParamInt("cnt_full", 1);
     oRs.close()
   }
 
+  var canImport = (user.checkAutorisation("WEB_IMPORT", true) != null);
 %>
 <script type="text/javascript">
 
@@ -106,7 +63,6 @@ var cnt_full = getQParamInt("cnt_full", 1);
   function gebouwEdit(row)
   {
     var algData = JSON.parse(row.getAttribute("ROWDATA"));
-    var v_all_cnt = <%=cnt_full%>;
     var url = "appl/alg/alg_gebouw.asp?mode=viewChange&key=" + algData.key + "&cnt_full=<%=cnt_full%>";
     FcltMgr.openDetail(url, L("lcl_building") + " " + algData.oms);
   }
@@ -149,7 +105,6 @@ var cnt_full = getQParamInt("cnt_full", 1);
     var url = "appl/ins/ins_search.asp?urole=bo&gebouw_key=" + algData.key;
     FcltMgr.openDetail(url, L("lcl_building") + " " + algData.oms);
   }
-
 </script>
 <%
 
@@ -177,34 +132,22 @@ function gebouw_list(pautfunction, params)
   var fitness_score1_from = params.fitness_score1_from;
   var fitness_score1_through = params.fitness_score1_through;
 
+  var transitParam = buildTransitParam(["locatiekey", "urole", "bld_key", "flo_key", "room_key"]);
+  var rstFilters = params.rstFilters;
+  var checkBoxes = [
+    {
+     lcl: L("lcl_alg_gebouw_vervallen_incl"),
+     param: 'expAlgIncl',
+     checked: expalgincl,
+     transitParams: transitParam
+    }
+  ];
+
+  var rstCheckBoxes = rstFilters ? checkBoxes : [];
   var autparamsINSUSE = user.checkAutorisation("WEB_INSUSE", true);
   var autparamsINSMAN = user.checkAutorisation("WEB_INSMAN", true);
   var readuse = autparamsINSUSE && autparamsINSUSE.PRSreadlevel < 9 && autparamsINSUSE.ALGreadlevel < 9; // Wijzigen Afgeronde gegevens.
   var readman = autparamsINSMAN && autparamsINSMAN.PRSreadlevel < 9 && autparamsINSMAN.ALGreadlevel < 9; // Wijzigen Afgeronde gegevens.
-  function fnrowActionEnabler(oRs)
-  {
-    var eDelete = false;
-    var eEditMulti = false;
-    var eObjMan = false;
-    if (alg.canWriteGebouw(oRs("alg_gebouw_key").value, authparams.mALGwritelevel))
-      {
-        eDelete = true;
-        eEditMulti = true;
-      }
-    // Heb ik rechten om het objectenbeheer overzicht te zien?
-    if (readuse || readman)
-      eObjMan = true;
-    return ({eDelete: eDelete, eEditMulti: eEditMulti, eObjMan: eObjMan});
-  }
-
-  function fnrowFlexParams(oRs)
-  {
-    var bld_key = oRs("alg_gebouw_key").Value;
-    var this_alg = alg.func_enabled(bld_key, "G");
-
-    var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
-    return flexParams;
-  }
 %>
 
   <html>
@@ -213,8 +156,8 @@ function gebouw_list(pautfunction, params)
     </head>
     <body id="listbody">
 <%
+  var flexParams = alg.alg_onroerendgoed_flex_params("G");
   var sqln = "SELECT g.alg_gebouw_key"
-           + "     , g.alg_locatie_key"
            + "     , g.alg_locatie_key"
            + "     , g.alg_srtgebouw_key"
            + "     , l.alg_locatie_omschrijving"
@@ -244,6 +187,7 @@ function gebouw_list(pautfunction, params)
            + "           AND t.fac_tracking_refkey = g.alg_gebouw_key"
            + "           AND sn.fac_srtnotificatie_xmlnode = 'gebouw'"
            + "       ) recentdatum"
+           +       flexParams.sql
            + "  FROM alg_gebouw g"
            + "     , alg_locatie l"
            + "     , alg_srtgebouw s"
@@ -301,12 +245,98 @@ function gebouw_list(pautfunction, params)
 
     var addurl = "appl/alg/alg_gebouw.asp";
 
+    var addButton = [];
     if (canAdd)
     {
-      addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }]
+      addButton.push({ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" });
     }
 
-//     addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
+    /**********************************
+    * Callback functies ResultsetTable
+     *********************************/
+    var recent = new Date();
+
+    function fnrowData(oRs)
+    {
+      var parent_key = oRs("alg_locatie_key").value;
+      var detail_key = oRs("alg_gebouw_key").value;
+      var key        = oRs("alg_gebouw_key").value;
+      var oms        = oRs("alg_gebouw_naam").value;
+
+      var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
+      return JSON.stringify(data);
+    }
+
+    function fnrowClass(oRs)
+    {
+      var lclass = "";
+      // Tracking: hoe lang geleden voor het laatst gewijzigd?
+      if (oRs.Fields("recentdatum").Value != null)
+      {
+        var ltrackdate1 = new Date();
+        var ltrackdate10 = new Date();
+        var ltrackdate100 = new Date();
+        var alg_onrgoed_recent = S("alg_onrgoed_recent");
+        ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
+        ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
+        ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
+
+        var fac_recent = new Date(oRs.Fields("recentdatum").Value);
+        if (fac_recent > ltrackdate1)
+        {
+          lclass += " updated";
+        }
+        else if (fac_recent > ltrackdate10)
+        {
+          lclass += " updated10";
+        }
+        else if (fac_recent > ltrackdate100)
+        {
+          lclass += " updated100";
+        }
+      }
+      return lclass;
+    }
+
+    function fnrowActionEnabler(oRs)
+    {
+      var eDelete = false;
+      var eEditMulti = false;
+      var eObjMan = false;
+      if (alg.canWriteGebouw(oRs("alg_gebouw_key").value, authparams.mALGwritelevel))
+      {
+        eDelete = true;
+        eEditMulti = true;
+      }
+      // Heb ik rechten om het objectenbeheer overzicht te zien?
+      if (readuse || readman)
+        eObjMan = true;
+      return ({eDelete: eDelete, eEditMulti: eEditMulti, eObjMan: eObjMan});
+    }
+
+    function fnrowFlexParams(oRs)
+    {
+      var bld_key = oRs("alg_gebouw_key").Value;
+      var this_alg = alg.func_enabled(bld_key, "G");
+
+      var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
+      return flexParams;
+    }
+
+    function fncolFlexBijlagen(oRs)
+    {
+      var flexval = oRs("algflex").Value;
+      var alg_key = oRs("alg_gebouw_key").Value;
+      var result = ( flexval
+                   ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
+                   : ""
+                   );
+      if (flexParams.bijlageflex)
+      {
+        result += alg.alg_onroerendgoed_flex_bijlagen("G", alg_key);
+      }
+      return result;
+    }
 
     var rst = new ResultsetTable({ sql:sqln,
                                    keyColumn: "alg_gebouw_key",
@@ -321,7 +351,9 @@ function gebouw_list(pautfunction, params)
                                    flexParams: fnrowFlexParams,
                                    filterParams: params,
                                    outputmode: outputmode,
-                                   buttons: addButton
+                                   buttons: addButton,
+                                   rstCheckBoxes: rstCheckBoxes,
+                                   roundtripCode: (canImport ? "ONRGOED1" : "")
                                   });
 
     rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_descr"), content: "alg_locatie_omschrijving"}));
@@ -340,7 +372,6 @@ function gebouw_list(pautfunction, params)
     }
     rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_bruto_vloeropp"), content: "alg_gebouw_bruto_vloeropp", datatype: "float", decimals: 2}));
     rst.addColumn(new Column({caption: L("lcl_alg_vervaldatum"), content: "alg_gebouw_vervaldatum", datatype: "date"}));
-
     if (outputmode != 0)
     {
       rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_opmerk"), content: "alg_gebouw_opmerking"}));
@@ -353,6 +384,8 @@ function gebouw_list(pautfunction, params)
     }
     if (ins_score_enabled)
       rst.addColumn(new Column({caption: L("lcl_alg_gebouw_mjb_score1"), content: "alg_gebouw_mjb_score1", datatype: "number"}));
+    if (flexParams.anyflex)
+      rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
     rst.addAction({ action: "gebouwEdit", caption: L("lcl_edit"), isDefault:  true});
     if (S("cnd_gebreken_srtdisc_key") > -1)
@@ -366,4 +399,3 @@ function gebouw_list(pautfunction, params)
   </html>
 <%
 } %>
-

APPL/ALG/alg_gebouw_search_list.asp

@@ -32,6 +32,7 @@ var srtgebouw_key = getQParamInt("srt", -1); // Gebouwfunctie
 var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
 var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
 var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen gebouwen
+var rstFilters = getQParamInt("rst_filters", 0) ;// button vervallen gebouwen
 var cnt_full = getQParamInt("cnt_full", 1);
 var fitness_score1_from = getQParamFloat("fitness_score1_from", -1);       // Conditie score van.
 var fitness_score1_through = getQParamFloat("fitness_score1_through", -1); // Conditie score t/m.
@@ -56,7 +57,8 @@ gebouw_list ( "*",
                  bld_email : bld_email,
                  bld_groep : bld_groep,
                  noref: (noref != -1? noref : null),
-                 expalgincl: expalgincl
+                 expalgincl: expalgincl,
+                 rstFilters: (rstFilters == true ? 1 : 0)
               }
              );
-%><% ASPPAGE_END(); %> 
+%><% ASPPAGE_END(); %>

APPL/ALG/alg_locatie.asp

@@ -84,7 +84,10 @@ else
     if (loc_key > -1)
     {
       var urole = "bo";
-      var page0 = "../alg/alg_gebouw_search_list.asp?urole=" + urole +"&locatiekey="+loc_key;
+      var page0 = "../alg/alg_gebouw_search_list.asp?urole="
+                + urole +"&locatiekey="+loc_key
+                + "&rst_filters=1";
+
       IFRAMER("alggebouwframe", page0, { icon: "fa-list"} );
       var page1 = "../alg/alg_terreinsector_search_list.asp?urole=" + urole +"&locatiekey="+loc_key;
       IFRAMER("algterreinframe", page1, { icon: "fa-list"} );
@@ -100,6 +103,7 @@ else
       {
           var page2 = "../cnt/cnt_search_list.asp?embedded=1&tiny=1&urole=" + curole
                     + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&loc_key=" + loc_key
+                    + "&rst_filters=1"
                     + "&cnt_full="+cnt_full;
           IFRAMER("cntlistframe", page2, { icon: "fa-list" } );
       }

APPL/ALG/alg_locatie_list.inc

@@ -18,50 +18,6 @@ FCLTHeader.Requires({ plugins:["jQuery"],
                       js: []
                     })
 
-function fnrowData(oRs)
-{
-  var parent_key = oRs("alg_district_key").value;
-  var detail_key = oRs("alg_locatie_key").value;
-  var key        = oRs("alg_locatie_key").value;
-  var oms        = oRs("alg_locatie_omschrijving").value;
-
-  var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
-
-  return JSON.stringify(data);
-}
-
-var recent = new Date();
-function fnrowClass(oRs)
-{
-  var lclass = "";
-  // Tracking: hoe lang geleden voor het laatst gewijzigd?
-  if (oRs.Fields("recentdatum").Value != null)
-  {
-    var ltrackdate1 = new Date();
-    var ltrackdate10 = new Date();
-    var ltrackdate100 = new Date();
-    var alg_onrgoed_recent = S("alg_onrgoed_recent");
-    ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
-    ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
-    ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
-
-    var fac_recent = new Date(oRs.Fields("recentdatum").Value);
-    if (fac_recent > ltrackdate1)
-    {
-      lclass += " updated";
-    }
-    else if (fac_recent > ltrackdate10)
-    {
-      lclass += " updated10";
-    }
-    else if (fac_recent > ltrackdate100)
-    {
-      lclass += " updated100";
-    }
-  }
-  return lclass;
-}
-
 var cnt_full = getQParamInt("cnt_full", 1);
 %>
 <script type="text/javascript">
@@ -142,27 +98,6 @@ function locatie_list(pautfunction, params)
   var expalgincl = params.expalgincl;
   var fitness_score1_from = params.fitness_score1_from;
   var fitness_score1_through = params.fitness_score1_through;
-
-  function fnrowActionEnabler(oRs)
-  {
-    var eDelete = false;
-    var eEditMulti = false;
-    if (alg.canWriteLocatie(oRs("alg_locatie_key").value, authparams.mALGwritelevel))
-    {
-        eDelete = true;
-        eEditMulti = true;
-    }
-    return ({eDelete: eDelete, eEditMulti: eEditMulti})
-  }
-
-  function fnrowFlexParams(oRs)
-  {
-    var loc_key = oRs("alg_locatie_key").Value;
-    var this_alg = alg.func_enabled(loc_key, "L");
-
-    var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
-    return flexParams;
-  }
 %>
 
 <html>
@@ -170,7 +105,9 @@ function locatie_list(pautfunction, params)
     <% FCLTHeader.Generate({outputmode:outputmode}) %>
   </head>
   <body id="listbody">
-<%  var sqln = "SELECT l.alg_locatie_key"
+<%
+    var flexParams = alg.alg_onroerendgoed_flex_params("L");
+    var sqln = "SELECT l.alg_locatie_key"
              + "     , l.alg_district_key"
              + "     , l.alg_locatie_code"
              + "     , l.alg_locatie_omschrijving"
@@ -196,6 +133,7 @@ function locatie_list(pautfunction, params)
              + "           AND t.fac_tracking_refkey = l.alg_locatie_key"
              + "           AND sn.fac_srtnotificatie_xmlnode = 'locatie'"
              + "       ) recentdatum"
+             +       flexParams.sql
              + "  FROM alg_v_aanweziglocatie l"
              + "     , alg_district d "
              + " WHERE d.alg_district_key(+) = l.alg_district_key"
@@ -251,6 +189,88 @@ function locatie_list(pautfunction, params)
       addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }]
     }
 
+    /**********************************
+    * Callback functies ResultsetTable
+     *********************************/
+    var recent = new Date();
+
+    function fnrowData(oRs)
+    {
+      var parent_key = oRs("alg_district_key").value;
+      var detail_key = oRs("alg_locatie_key").value;
+      var key        = oRs("alg_locatie_key").value;
+      var oms        = oRs("alg_locatie_omschrijving").value;
+      var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
+      return JSON.stringify(data);
+    }
+
+    function fnrowClass(oRs)
+    {
+      var lclass = "";
+      // Tracking: hoe lang geleden voor het laatst gewijzigd?
+      if (oRs.Fields("recentdatum").Value != null)
+      {
+        var ltrackdate1 = new Date();
+        var ltrackdate10 = new Date();
+        var ltrackdate100 = new Date();
+        var alg_onrgoed_recent = S("alg_onrgoed_recent");
+        ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
+        ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
+        ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
+
+        var fac_recent = new Date(oRs.Fields("recentdatum").Value);
+        if (fac_recent > ltrackdate1)
+        {
+          lclass += " updated";
+        }
+        else if (fac_recent > ltrackdate10)
+        {
+          lclass += " updated10";
+        }
+        else if (fac_recent > ltrackdate100)
+        {
+          lclass += " updated100";
+        }
+      }
+      return lclass;
+    }
+
+    function fnrowActionEnabler(oRs)
+    {
+      var eDelete = false;
+      var eEditMulti = false;
+      if (alg.canWriteLocatie(oRs("alg_locatie_key").value, authparams.mALGwritelevel))
+      {
+        eDelete = true;
+        eEditMulti = true;
+      }
+      return ({eDelete: eDelete, eEditMulti: eEditMulti})
+    }
+
+    function fnrowFlexParams(oRs)
+    {
+      var loc_key = oRs("alg_locatie_key").Value;
+      var this_alg = alg.func_enabled(loc_key, "L");
+
+      var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
+      return flexParams;
+    }
+
+    function fncolFlexBijlagen(oRs)
+    {
+      var flexval = oRs("algflex").Value;
+      var alg_key = oRs("alg_locatie_key").Value;
+      var result = ( flexval
+                   ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
+                   : ""
+                   );
+      if (flexParams.bijlageflex)
+      {
+        result += alg.alg_onroerendgoed_flex_bijlagen("L", alg_key);
+      }
+      return result;
+    }
+
     var rst = new ResultsetTable({ sql:sqln,
                                    keyColumn: "alg_locatie_key",
                                    ID: "algtable",
@@ -285,9 +305,12 @@ function locatie_list(pautfunction, params)
       rst.addColumn(new Column({caption: L("lcl_prs_address_post_plaats"), content: "alg_locatie_post_plaats"}));
       rst.addColumn(new Column({caption: L("lcl_prs_address_post_land"), content: "alg_locatie_post_land"}));
       rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_verantw"), content: "alg_locatie_verantw"}));
+      rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_verantw_tel"), content: "alg_locatie_verantw_tel"}));
       rst.addColumn(new Column({caption: L("lcl_geoxcoord"), content: "alg_locatie_x"}));
       rst.addColumn(new Column({caption: L("lcl_geoycoord"), content: "alg_locatie_y"}));
     }
+    if (flexParams.anyflex)
+      rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
 
     rst.addAction({ action: "locatieEdit", caption: L("lcl_edit"), isDefault:  true});
@@ -306,4 +329,3 @@ function locatie_list(pautfunction, params)
 <%
 }
 %>
-

APPL/ALG/alg_ruimte.asp

@@ -49,6 +49,7 @@ if (room_key > 0)
   var flr_oms = oRs("alg_verdieping_omschrijving").value;
   var room_nr = oRs("alg_ruimte_nr").value;
   var room_name   = " " + bld_code + "-" + flr_oms + "-" + room_nr;
+  oRs.Close();
 }
 else
 {

APPL/ALG/alg_ruimte_list.inc

@@ -23,6 +23,7 @@ function ruimte_list(pautfunction, params)
   var authparams = alg.checkAutorisation();
   // Met ALG* bepaal je wat je ziet (Read), met RUI* en TER* bepaal je wat je kunt wijzigen (Write).
   var canAdd = (authparams.rmALGwritelevel < 9);
+  var canImport = (user.checkAutorisation("WEB_IMPORT", true) != null);
 
   // Voor resulttable de globalen zetten; zou ng anders moeten.
   var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
@@ -110,7 +111,9 @@ function ruimte_list(pautfunction, params)
     </head>
 
     <body id="listbody">
-<%    var sqln = "SELECT r.alg_ruimte_key"
+<%
+    var flexParams = alg.alg_onroerendgoed_flex_params("R");
+    var sqln = "SELECT r.alg_ruimte_key"
                + ",      v.alg_verdieping_key"
                + ",      v.alg_gebouw_key"
                + ",      g.alg_locatie_key"
@@ -130,6 +133,14 @@ function ruimte_list(pautfunction, params)
                + ",      r.alg_ruimte_opp_alt1"
                + ",      r.alg_ruimte_opp_alt2"
                + ",      r.alg_ruimte_verwijder"
+               + "     , (SELECT MAX(t.fac_tracking_datum)"
+               + "          FROM fac_tracking t"
+               + "             , fac_srtnotificatie sn"
+               + "         WHERE t.fac_srtnotificatie_key = sn.fac_srtnotificatie_key"
+               + "           AND t.fac_tracking_refkey = r.alg_ruimte_key"
+               + "           AND sn.fac_srtnotificatie_xmlnode = 'ruimte'"
+               + "       ) recentdatum"
+               +       flexParams.sql
                + "  FROM alg_ruimte r"
                + ",      alg_verdieping v"
                + ",      alg_gebouw g"
@@ -206,6 +217,20 @@ function ruimte_list(pautfunction, params)
             + ",         v.alg_verdieping_volgnr ASC"
             + ",         r.alg_ruimte_upper_nr ASC"
 
+      var addurl = "appl/alg/alg_ruimte.asp?a=1";
+      addurl += buildTransitParam(["locatiekey", "gebouwkey", "verdiepingkey", "ruimtekey"], params)  // TODO: welke allemaal?
+
+      var adButton = [];
+      if (canAdd)
+      {
+        addButton.push({ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" });
+      }
+
+      /**********************************
+      * Callback functies ResultsetTable
+       *********************************/
+      var recent = new Date();
+
       function fnrowData(oRs)
       {
         var parent_key = oRs("alg_verdieping_key").Value;
@@ -217,6 +242,37 @@ function ruimte_list(pautfunction, params)
         return JSON.stringify(data);
       }
 
+      function fnrowClass(oRs) // identiek aan de andere niveaus
+      {
+        var lclass = "";
+        // Tracking: hoe lang geleden voor het laatst gewijzigd?
+        if (oRs.Fields("recentdatum").Value != null)
+        {
+          var ltrackdate1 = new Date();
+          var ltrackdate10 = new Date();
+          var ltrackdate100 = new Date();
+          var alg_onrgoed_recent = S("alg_onrgoed_recent");
+          ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
+          ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
+          ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
+
+          var fac_recent = new Date(oRs.Fields("recentdatum").Value);
+          if (fac_recent > ltrackdate1)
+          {
+            lclass += " updated";
+          }
+          else if (fac_recent > ltrackdate10)
+          {
+            lclass += " updated10";
+          }
+          else if (fac_recent > ltrackdate100)
+          {
+            lclass += " updated100";
+          }
+        }
+        return lclass;
+      }
+
       var floorCache = [];
       // Voor performance bekijken we de rechten per verdieping. In de praktijk nauwkeurig genoeg
       function fnrowActionEnabler(oRs)
@@ -243,12 +299,19 @@ function ruimte_list(pautfunction, params)
         return flexParams;
       }
 
-      var addurl = "appl/alg/alg_ruimte.asp?a=1";
-      addurl += buildTransitParam(["locatiekey", "gebouwkey", "verdiepingkey", "ruimtekey"], params)  // TODO: welke allemaal?
-
-      if (canAdd)
+      function fncolFlexBijlagen(oRs)
       {
-        addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }]
+        var flexval = oRs("algflex").Value;
+        var alg_key = oRs("alg_ruimte_key").Value;
+        var result = ( flexval
+                     ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
+                     : ""
+                     );
+        if (flexParams.bijlageflex)
+        {
+          result += alg.alg_onroerendgoed_flex_bijlagen("R", alg_key);
+        }
+        return result;
       }
 
       var rst = new ResultsetTable({ sql: sqln,
@@ -257,13 +320,15 @@ function ruimte_list(pautfunction, params)
                                      title: L("lcl_menu_alg_ruimte"),
                                      showAll: showall,
                                      rowData: fnrowData,
+                                     rowClass: fnrowClass,
                                      rowActionEnabler: fnrowActionEnabler,
                                      outputmode: outputmode,
                                      flexModule: "ALG",
                                      flexId: "alg_ruimte_key",
                                      flexParams: fnrowFlexParams,
                                      filterParams: params,
-                                     buttons: addButton
+                                     buttons: addButton,
+                                     roundtripCode: (canImport ? "ONRGOED2" : "")
                                    });
 
       rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_descr"), content: "alg_locatie_omschrijving"}));
@@ -277,16 +342,8 @@ function ruimte_list(pautfunction, params)
       rst.addColumn(new Column({caption: L("lcl_estate_ruimte_man_sort"), content: "alg_srtruimte_omschrijving"}));
       rst.addColumn(new Column({caption: L("lcl_estate_ruimte_bruto_vloeropp"), content: "alg_ruimte_bruto_vloeropp", datatype: "float", decimals: 2 }));
 
-      if (L("lcl_estate_ruimte_opp_alt1") != "")
-      {
-        rst.addColumn(new Column({caption: L("lcl_estate_ruimte_opp_alt1"), content: "alg_ruimte_opp_alt1", datatype: "float", decimals: 2 }));
-      }
-
-      if (L("lcl_estate_ruimte_opp_alt1") != "")
-      {
-        rst.addColumn(new Column({caption: L("lcl_estate_ruimte_opp_alt2"), content: "alg_ruimte_opp_alt2", datatype: "float", decimals: 2 }));
-      }
-
+      rst.addColumn(new Column({caption: L("lcl_estate_ruimte_opp_alt1"), content: "alg_ruimte_opp_alt1", datatype: "float", decimals: 2 }));
+      rst.addColumn(new Column({caption: L("lcl_estate_ruimte_opp_alt2"), content: "alg_ruimte_opp_alt2", datatype: "float", decimals: 2 }));
 
       if (outputmode != 0) // to be completed
       {
@@ -296,6 +353,8 @@ function ruimte_list(pautfunction, params)
       }
       if (expalgincl)
         rst.addColumn(new Column({caption: L("lcl_alg_vervaldatum"), content: "alg_ruimte_verwijder", datatype: "date"}));
+      if (flexParams.anyflex)
+        rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
       rst.addAction({ action: "ruimteEdit", caption: L("lcl_edit"), isDefault:  true });
       rst.addAction({ action: "ruimteEditMulti", caption: L("lcl_alg_multi_edit"), multi: true, multiOnce: true, single: false, enabler: "eEditMulti"});
@@ -316,4 +375,3 @@ function ruimte_list(pautfunction, params)
 <%
 }
 %>
-

APPL/ALG/alg_ruimtefunctie_list.inc

@@ -20,7 +20,7 @@ function ruimtefunctie_list(pautfunction, params)
 {
   // De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
   var addButton = [];
-  var authparams = alg.checkAutorisation();
+  var authparams = user.has("WEB_ALGMSU") && alg.checkAutorisation(true);
   var canAdd = (authparams.mALGwritelevel < 9);
 
   // Voor resulttable de globalen zetten; zou ng anders moeten.

APPL/ALG/alg_ruimtefunctie_search.asp

@@ -10,7 +10,10 @@
       locatie_key      key van de locatie
       gebouw_key       key van het gebouw
     Context:           Vanuit menu
-    Note:
+    Note:               
+                        Het menuitem vereist ALGMSU, kennelijk om deze voor het gepeupel te onderdrukken
+                        De feitelijke autorisatie keek hier niet naar en vertrouwde op de ALGMAN/ALGUSE-autorisaties
+                        wat ook goed is. Je moet dus beide hebben.
 */ %>
 
 <!-- #include file="../Shared/common.inc" -->
@@ -25,8 +28,7 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"] });
 var alg_srtruimte_key = getQParamInt("alg_srtruimte_key", -1); // Ruimtefunctie
 var locatie_key = getQParamInt("locatie_key", -1); // Locatie
 var gebouw_key = getQParamInt("gebouw_key", -1); // Gebouw
-
-var authparams = alg.checkAutorisation();
+var authparams = user.has("WEB_ALGMSU") && alg.checkAutorisation(true);  // als je geen scope hebt kun je toch niks
 
 %>
 <html>

APPL/ALG/alg_show_gebouw.asp

@@ -72,6 +72,7 @@ var verantw2    = oRs("prs_perslid_key_verantw2").Value;
 var vervaldatum = oRs("alg_gebouw_vervaldatum").Value;
 var geb_score1 = oRs("alg_gebouw_mjb_score1").Value;
 var actie_grp_key = oRs("bez_actie_groep_key").Value;
+var kalender_id = oRs("mld_vrije_dagen_id").Value;
 oRs.Close();
 %>
 
@@ -239,6 +240,7 @@ oRs.Close();
             }
             oRs.Close();
 
+            ROFIELDTR("fld", L("lcl_calendar"), kalender_id, {suppressEmpty: true});
             ROFIELDTR("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(beginuur), {suppressEmpty:true} );
             ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"), toTimeString(einduur), {suppressEmpty:true} );
             ROCHECKBOXTR("fldalgwerk", L("lcl_estate_gebouw_werkdagen"), werkdagen==1);

APPL/ALG/alg_terreinsector_list.inc

@@ -115,28 +115,6 @@ function terrein_list(pautfunction, params)
   var verantw_key = params.verantw_key;
   var ter_func_key = params.ter_func_key;
   var expalgincl = params.expalgincl;
-
-  function fnrowActionEnabler(oRs) // klopt dit voor terreinsector?
-  {
-      var eDelete = false;
-      var eEditMulti = false;
-
-      if (alg.canWriteLocatie(oRs("alg_locatie_key").Value, authparams.tmALGwritelevel))
-      {
-          eDelete = true;
-          eEditMulti = true;
-      }
-      return ({eDelete: eDelete, eEditMulti: eEditMulti})
-  }
-
-  function fnrowFlexParams(oRs)
-  {
-    var ter_key = oRs("alg_terreinsector_key").Value;
-    var this_alg = alg.func_enabled(ter_key, "T");
-
-    var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
-    return flexParams;
-  }
 %>
 
 <html>
@@ -145,6 +123,7 @@ function terrein_list(pautfunction, params)
   </head>
   <body id="listbody">
 <%
+    var flexParams = alg.alg_onroerendgoed_flex_params("T");
     var sqln = "SELECT g.alg_terreinsector_key"
              + "     , g.alg_locatie_key"
              + "     , l.alg_locatie_omschrijving"
@@ -158,6 +137,14 @@ function terrein_list(pautfunction, params)
              + "     , (SELECT prs_perslid_naam_full FROM prs_v_perslid_fullnames_all WHERE prs_perslid_key = prs_perslid_key_verantw2) perslid_resp2"
              + "     , g.alg_srtterreinsector_key"
              + "     , " + lcl.xsqla('s.alg_srtterreinsec_omschrijving', 's.alg_srtterreinsector_key')
+             + "     , (SELECT MAX(t.fac_tracking_datum)"
+             + "          FROM fac_tracking t"
+             + "             , fac_srtnotificatie sn"
+             + "         WHERE t.fac_srtnotificatie_key = sn.fac_srtnotificatie_key"
+             + "           AND t.fac_tracking_refkey = g.alg_terreinsector_key"
+             + "           AND sn.fac_srtnotificatie_xmlnode = 'terreinsector'"
+             + "       ) recentdatum"
+             +       flexParams.sql
              + "  FROM alg_v_aanwezigterreinsector g"
              + "     , alg_locatie l"
              + "     , alg_srtterreinsector s"
@@ -212,6 +199,79 @@ function terrein_list(pautfunction, params)
         addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }]
     }
 
+    /**********************************
+    * Callback functies ResultsetTable
+     *********************************/
+    var recent = new Date();
+
+    function fnrowActionEnabler(oRs) // klopt dit voor terreinsector?
+    {
+      var eDelete = false;
+      var eEditMulti = false;
+
+      if (alg.canWriteLocatie(oRs("alg_locatie_key").Value, authparams.tmALGwritelevel))
+      {
+        eDelete = true;
+        eEditMulti = true;
+      }
+      return ({eDelete: eDelete, eEditMulti: eEditMulti})
+    }
+
+    function fnrowClass(oRs) // identiek aan de andere niveaus
+    {
+      var lclass = "";
+      // Tracking: hoe lang geleden voor het laatst gewijzigd?
+      if (oRs.Fields("recentdatum").Value != null)
+      {
+        var ltrackdate1 = new Date();
+        var ltrackdate10 = new Date();
+        var ltrackdate100 = new Date();
+        var alg_onrgoed_recent = S("alg_onrgoed_recent");
+        ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
+        ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
+        ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
+
+        var fac_recent = new Date(oRs.Fields("recentdatum").Value);
+        if (fac_recent > ltrackdate1)
+        {
+          lclass += " updated";
+        }
+        else if (fac_recent > ltrackdate10)
+        {
+          lclass += " updated10";
+        }
+        else if (fac_recent > ltrackdate100)
+        {
+          lclass += " updated100";
+        }
+      }
+      return lclass;
+    }
+
+    function fnrowFlexParams(oRs)
+    {
+      var ter_key = oRs("alg_terreinsector_key").Value;
+      var this_alg = alg.func_enabled(ter_key, "T");
+
+      var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
+      return flexParams;
+    }
+
+    function fncolFlexBijlagen(oRs)
+    {
+      var flexval = oRs("algflex").Value;
+      var alg_key = oRs("alg_terreinsector_key").Value;
+      var result = ( flexval
+                   ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
+                   : ""
+                   );
+      if (flexParams.bijlageflex)
+      {
+        result += alg.alg_onroerendgoed_flex_bijlagen("T", alg_key);
+      }
+      return result;
+    }
+
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "alg_terreinsector_key",
                                    ID: "algtable",
@@ -219,6 +279,7 @@ function terrein_list(pautfunction, params)
                                    showAll: showall,
                                    rowActionEnabler: fnrowActionEnabler,
                                    rowData: fnrowData,
+                                   rowClass: fnrowClass,
                                    outputmode: outputmode,
                                    flexModule: "ALG",
                                    flexId: "alg_terreinsector_key",
@@ -241,6 +302,8 @@ function terrein_list(pautfunction, params)
     rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_oppervlak"), content: "alg_terreinsector_oppervlak"}));
     rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_omtrek"), content: "alg_terreinsector_omtrek"}));
     rst.addColumn(new Column({caption: L("lcl_alg_vervaldatum"), content: "alg_terreinsector_vervaldatum", datatype: "date"}));
+    if (flexParams.anyflex)
+      rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
     rst.addAction({ action: "terreinEdit", caption: L("lcl_edit"), isDefault:  true});
     rst.addAction({ action: "terreinEditMulti", caption: L("lcl_alg_multi_edit"), enabler: "eEditMulti", single:false, multi: true, multiOnce: true});
@@ -253,4 +316,3 @@ function terrein_list(pautfunction, params)
   </body>
 </html>
 <%}%>
-

APPL/ALG/alg_verdieping_list.inc

@@ -16,20 +16,8 @@
 <%
 FCLTHeader.Requires({ plugins:["jQuery"] });
 
-
 var cnt_full = getQParamInt("cnt_full", 1);
 
-function fnrowData(oRs)
-{
-  var parent_key = oRs("alg_gebouw_key").value;
-  var detail_key = oRs("alg_verdieping_key").value;
-  var key        = oRs("alg_verdieping_key").value;
-  var oms        = oRs("alg_verdieping_omschrijving").value
-
-  var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
-
-  return JSON.stringify(data);
-}
 %>
 
 <script type="text/javascript">
@@ -96,27 +84,6 @@ function verdiepingen_list(pautfunction, params)
   var bld_key_arr = params.bld_key_arr;
   var lvl_key_arr = params.lvl_key_arr;
   var chkgeb = params.chkgeb;
-
-  function fnrowActionEnabler(oRs)
-  {
-    var eDelete = false;
-    var eEditMulti = false;
-    if (alg.canWriteVerdieping(oRs("alg_verdieping_key").value, authparams.mALGwritelevel))
-    {
-        eDelete = true;
-        eEditMulti = true;
-    }
-    return ({eDelete: eDelete, eEditMulti: eEditMulti})
-  }
-
-  function fnrowFlexParams(oRs)
-  {
-    var ver_key = oRs("alg_verdieping_key").Value;
-    var this_alg = alg.func_enabled(ver_key, "V");
-
-    var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
-    return flexParams;
-  }
 %>
 
   <html>
@@ -125,6 +92,7 @@ function verdiepingen_list(pautfunction, params)
     </head>
     <body id="listbody">
 <%
+  var flexParams = alg.alg_onroerendgoed_flex_params("V");
   var sqln = "SELECT v.alg_verdieping_key, "
        + "       v.alg_gebouw_key, "
        + "       g.alg_locatie_key, "
@@ -133,6 +101,14 @@ function verdiepingen_list(pautfunction, params)
        + "       g.alg_gebouw_naam, "
        + "       v.alg_verdieping_omschrijving, "
        + "       v.alg_verdieping_code  "
+       + "     , (SELECT MAX(t.fac_tracking_datum)"
+       + "          FROM fac_tracking t"
+       + "             , fac_srtnotificatie sn"
+       + "         WHERE t.fac_srtnotificatie_key = sn.fac_srtnotificatie_key"
+       + "           AND t.fac_tracking_refkey = v.alg_verdieping_key"
+       + "           AND sn.fac_srtnotificatie_xmlnode = 'verdieping'"
+       + "       ) recentdatum"
+       +       flexParams.sql
        + "  FROM alg_v_aanwezigverdieping v, "
        + "       alg_gebouw g, "
        + "       alg_locatie l  "
@@ -184,6 +160,90 @@ function verdiepingen_list(pautfunction, params)
         addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }]
         }
 
+    /**********************************
+    * Callback functies ResultsetTable
+     *********************************/
+    var recent = new Date();
+
+    function fnrowData(oRs)
+    {
+      var parent_key = oRs("alg_gebouw_key").value;
+      var detail_key = oRs("alg_verdieping_key").value;
+      var key        = oRs("alg_verdieping_key").value;
+      var oms        = oRs("alg_verdieping_omschrijving").value
+
+      var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
+
+      return JSON.stringify(data);
+    }
+
+    function fnrowClass(oRs) // identiek aan de andere niveaus
+    {
+      var lclass = "";
+      // Tracking: hoe lang geleden voor het laatst gewijzigd?
+      if (oRs.Fields("recentdatum").Value != null)
+      {
+        var ltrackdate1 = new Date();
+        var ltrackdate10 = new Date();
+        var ltrackdate100 = new Date();
+        var alg_onrgoed_recent = S("alg_onrgoed_recent");
+        ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
+        ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
+        ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
+
+        var fac_recent = new Date(oRs.Fields("recentdatum").Value);
+        if (fac_recent > ltrackdate1)
+        {
+          lclass += " updated";
+        }
+        else if (fac_recent > ltrackdate10)
+        {
+          lclass += " updated10";
+        }
+        else if (fac_recent > ltrackdate100)
+        {
+          lclass += " updated100";
+        }
+      }
+      return lclass;
+    }
+
+    function fnrowActionEnabler(oRs)
+    {
+      var eDelete = false;
+      var eEditMulti = false;
+      if (alg.canWriteVerdieping(oRs("alg_verdieping_key").value, authparams.mALGwritelevel))
+      {
+          eDelete = true;
+          eEditMulti = true;
+      }
+      return ({eDelete: eDelete, eEditMulti: eEditMulti})
+    }
+
+    function fnrowFlexParams(oRs)
+    {
+      var ver_key = oRs("alg_verdieping_key").Value;
+      var this_alg = alg.func_enabled(ver_key, "V");
+
+      var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
+      return flexParams;
+    }
+
+    function fncolFlexBijlagen(oRs)
+    {
+      var flexval = oRs("algflex").Value;
+      var alg_key = oRs("alg_verdieping_key").Value;
+      var result = ( flexval
+                   ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
+                   : ""
+                   );
+      if (flexParams.bijlageflex)
+      {
+        result += alg.alg_onroerendgoed_flex_bijlagen("V", alg_key);
+      }
+      return result;
+    }
+
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "alg_verdieping_key",
                                    ID: "algtable",
@@ -195,6 +255,7 @@ function verdiepingen_list(pautfunction, params)
                                    flexParams: fnrowFlexParams,
                                    filterParams: params,
                                    rowData: fnrowData,
+                                   rowClass: fnrowClass,
                                    rowActionEnabler: fnrowActionEnabler,
                                    buttons: addButton
                                   });
@@ -204,6 +265,8 @@ function verdiepingen_list(pautfunction, params)
     rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_name"), content: "alg_gebouw_naam"}));
     rst.addColumn(new Column({caption: L("lcl_estate_verdieping_man_code"), content: "alg_verdieping_code"}));
     rst.addColumn(new Column({caption: L("lcl_estate_verdieping_man_descr"), content: "alg_verdieping_omschrijving" }));
+    if (flexParams.anyflex)
+      rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
     rst.addAction({ action: "verdiepingEdit", caption: L("lcl_edit"), isDefault:  true});
     rst.addAction({ action: "verdiepingEditMulti", caption: L("lcl_alg_multi_edit"), enabler: "eEditMulti", single:false, multi: true, multiOnce: true});
@@ -217,4 +280,3 @@ function verdiepingen_list(pautfunction, params)
     </body>
   </html>
 <%}%>
-

APPL/API/api.inc

@@ -58,10 +58,10 @@ function API_func(APIname)
         file:             oRs("fac_api_filepath").Value,
         prs_perslid_key:  user_key,
         loglevel:         oRs("fac_api_loglevel").Value,
+        errorhandling:    oRs("fac_api_errorhandling").Value,
         usrrap_key:       oRs("fac_usrrap_key").Value,
         stylesheet:       oRs("fac_api_stylesheet").Value,
-        stylesheet_out:   oRs("fac_api_stylesheet_out").Value,
-        import_app_key:   oRs("fac_import_app_key").Value
+        stylesheet_out:   oRs("fac_api_stylesheet_out").Value
     };
 
     if (this.apidata.loglevel > 1) // Zet maar op 3 als je HTML logging wilt
@@ -106,7 +106,7 @@ API_func.prototype.error = function (msg)
         Response.Write(safe.html(msg));
         // Op productie zie je bovenstaande Response.Write ook niet terug in Fiddler omdat
         // 'detailed error messages' uit staat. Daarom ook maar loggen voor het gemak.
-        __DoLog(safe.html(msg), "ff0000");
+        __DoLog(safe.html(msg), "#ff0000");
     }
     Response.End;
 }
@@ -116,11 +116,13 @@ API_func.prototype.error = function (msg)
 function RequestJSON(loglevel)
 {
     var jvraag;
-    if(Request.TotalBytes > 0)
+    if(Request.TotalBytes == 0)
     {
-        var lngBytesCount = Request.TotalBytes;
-        jvraag = BytesToStr(Request.BinaryRead(lngBytesCount));
+        return { error: "Empty body posted" }
     }
+
+    var lngBytesCount = Request.TotalBytes;
+    jvraag = BytesToStr(Request.BinaryRead(lngBytesCount));
     __Log("Vraag: " + jvraag);
     try
     {
@@ -139,13 +141,16 @@ function RequestJSON(loglevel)
 function RequestXML(API)
 {
     var xvraag;
-    if(Request.TotalBytes > 0)
+    if(Request.TotalBytes == 0)
     {
-        var lngBytesCount = Request.TotalBytes;
-        xvraag = BytesToStr(Request.BinaryRead(lngBytesCount));
-        if (API.apidata.loglevel)
-            __Log2File(xvraag, API.APIname + "_IN");
+        return { error: "Empty body posted" }
     }
+
+    var lngBytesCount = Request.TotalBytes;
+    xvraag = BytesToStr(Request.BinaryRead(lngBytesCount));
+    if (API.apidata.loglevel)
+        __Log2File(xvraag, API.APIname + "_IN");
+
     __Log("Request body: " + xvraag);
     try
     {
@@ -170,7 +175,11 @@ function styledRequestXML(API)
     var parsed = RequestXML(API);
     if (parsed.error)
     {
-        __DoLog( "Error loading XML: " + parsed.error, "#ff0000");
+        var method = String(Request.ServerVariables("REQUEST_METHOD"));
+        if (method != "POST") // gebeurt nog wel eens
+        {
+            __DoLog( "Weird: expected method POST, got " + method);
+        }
         API.error("Error loading XML: " + parsed.error);
     }
 

APPL/API/api_gen_import.asp

@@ -28,20 +28,6 @@
 
     var API = new API_func();
 
-    // Mareon specifieke code
-    // In APPL\MARX\export\BCTAdapter.asp zijn mar_queue_key en mar_queue_requestid
-    // aan de callbackurl voor API=FIN_FACTUUR_PDF toegevoegd.
-    // Die gebruiken we hier om te registreren dat de factuur blijkbaar goed ingescand is
-    var mar_queue_requestid = getQParam("mar_queue_requestid", "");
-    if (mar_queue_requestid)
-    {
-        var sql = "UPDATE mar_factuur_queue"
-                + "   SET mar_factuur_queue_replied = SYSDATE"
-                + " WHERE mar_factuur_queue_key = " + getQParamInt("mar_queue_key")
-                + "   AND mar_factuur_queue_requestid = " + safe.quoted_sql(mar_queue_requestid);
-        Oracle.Execute(sql);
-    }
-
     var bytes = Request.TotalBytes;
     if (bytes <= 0) // Chunked encoding geeft -1
     {
@@ -55,7 +41,16 @@
     }
 
     "Error 'Operation not Allowed' op de volgende regel betekent meestal dat de upload te groot is";
-    var xmlResp = api_gen_import(API, Request.BinaryRead(bytes));
+    var result = api_gen_import(API, Request.BinaryRead(bytes));
+    xmlResp = result.xmldom;
+
+    if (API.apidata.errorhandling == 1)
+    {
+        if (result.anyError) // een 'E' in imp_log 
+        {
+            Response.Status = '400 Bad Request';
+        }
+    }
 
     Response.ContentType = "text/xml";
     if (API.apidata.stylesheet_out)
@@ -66,5 +61,6 @@
     else
         Response.Write(xmlResp.xml);
 
+
     ASPPAGE_END();
 %>

APPL/API/api_gen_import.inc

@@ -11,6 +11,7 @@
      Context:       Ook vanuit APPL\MARX\API_mareon_opdracht.asp
 */
 
+// result: { xmldom: object, anyError: boolean }
 function api_gen_import(API, data, charset) //
 {
     var fileStream = Server.CreateObject("ADODB.Stream");
@@ -72,10 +73,12 @@ function api_gen_import(API, data, charset) //
 
     if (import_key > 0)
     {
+        var errorCount = 0; // hoeveel errors?
         var elementDetails = xmlResp.createElement("details");
         var sql = "SELECT imp_log_status,"
                 + "       imp_log_omschrijving,"
-                + "       imp_log_hint"
+                + "       imp_log_hint,"
+                + "       imp_log_status"
                 + "  FROM imp_log"
                 + " WHERE fac_import_key = " + import_key
                 + "   AND imp_log_status <> 'I'";
@@ -101,6 +104,15 @@ function api_gen_import(API, data, charset) //
               elementHint.appendChild(elementHintText);
               elementDetail.appendChild(elementHint);
            }
+           if (oRs("imp_log_status").Value != null )
+           {
+              if (oRs("imp_log_status").Value == 'E' || oRs("imp_log_status").Value == 'F')
+                errorCount ++
+              var elementStatus = xmlResp.createElement("status");
+              var elementStatusText = xmlResp.createTextNode(oRs("imp_log_status").Value);
+              elementStatus.appendChild(elementStatusText);
+              elementDetail.appendChild(elementStatus);
+           }
            elementDetails.appendChild(elementDetail);
            oRs.moveNext();
         }
@@ -132,6 +144,6 @@ function api_gen_import(API, data, charset) //
     }
 
     xmlResp.appendChild(FCLTElement);
-    return xmlResp;
+    return { xmldom: xmlResp, anyError: errorCount > 0 };
 }
 %>

APPL/API/api_hmail.asp

@@ -39,25 +39,35 @@ function abortRejectMail(tekst, maillog, optionalColor)
 function stripHtml(html)
 {
     html = (html||"");
+    html = html.replace(/([=][\n])/g, "");  // Een = en crlf aan het einde is een afgebroken regel. Deze weer aan elkaar zetten.
     html = stripStyle(html);
     // verwijder html-tags
     html = html.replace(/(<br\s*\/?>)/ig,"\n\r");
     html = html.replace(/(<([^>]+)>)/ig,"");
-    // &nbsp; naar spatie
-    html = html.replace(/\&nbsp\;/ig, " ");
-    //verwijder leading spaces and tabs
-    html = html.replace(/^[ \t]+/gm,"");
-    // verwijder lege regels
-    html = html.replace(/(\n\r)+/g,"\n\r");
-    // zet een regel die begint met : maar achter de vorige
-    html = html.replace(/(\n\r:)/g,":");
+    html = stripCharcodes(html);
     return html;
 }
 
 function stripStyle(html)
 {
     html = (html||"");
-    html = html.replace(/<style>[^<]*<\/style>/igm, "");
+    html = html.replace(/(<style[^<]*<\/style>)/igm, "");
+    return html;
+}
+
+function stripCharcodes(html)
+{
+    html = (html||"");
+    // Vervang lettercodes door het teken zelf.
+    html = html.replace(/(&#x(\d|[a-f])+;)/ig
+                    , function(a){
+                            return String.fromCharCode(parseInt(a.substr(3,a.length-4), 16));
+                        }
+                    );
+    html = html.replace(/(&nbsp;)/ig, " "); // &nbsp; naar spatie
+    html = html.replace(/^[ \t]+/gm,"");    // verwijder leading spaces and tabs
+    html = html.replace(/([\n\r])+/g,"\n"); // verwijder lege regels
+    html = html.replace(/([\n\r]:)/g,":");  // zet een regel die begint met : maar achter de vorige
     return html;
 }
 
@@ -188,6 +198,18 @@ function getEmailSetting(xmlReq, xmlParameters)
         return senderResult;
     }
 
+    function checkSubject(xmlParameters)
+    {
+        var v_subject_undeliverable = new RegExp(S("mail_subject_undeliverable")).test(xmlParameters.Subject);
+        var v_subject_ignore = new RegExp(S("mail_subject_ignore")).test(xmlParameters.Subject);
+        var senderResult = null;
+        if (v_subject_undeliverable || v_subject_ignore)
+        {
+            senderResult = ( v_subject_undeliverable ? S("mail_subject_undeliverable") : S("mail_subject_ignore"));
+        }
+        return senderResult;
+    }
+
     function setPath(attachpath)
     {
         var path = attachpath;
@@ -213,6 +235,7 @@ function getEmailSetting(xmlReq, xmlParameters)
             + "       fac_email_setting_attachpath,"
             + "       fac_email_setting_attachext,"
             + "       fac_email_setting_reqattachext,"
+            + "       fac_email_setting_attachmaxkb,"
             + "       fac_email_setting_loglevel,"
             + "       prs_perslid_key_auth"
             + "  FROM fac_email_setting"
@@ -230,6 +253,7 @@ function getEmailSetting(xmlReq, xmlParameters)
     else
     {   // Er bestaat minimaal 1 fac_email_setting record.
         var allowedSetting = {};
+        var rejectedAttach = [];
         var hasRequiredAttachment = false;
         while (!oRs.eof && !hasRequiredAttachment)
         {
@@ -242,6 +266,7 @@ function getEmailSetting(xmlReq, xmlParameters)
                 required_attachext:     oRs("fac_email_setting_reqattachext").Value,
                 prs_perslid_key_auth:   oRs("prs_perslid_key_auth").Value,
                 attachpath:             oRs("fac_email_setting_attachpath").Value,
+                attach_maxkb:           oRs("fac_email_setting_attachmaxkb").Value,
                 fromMode:               oRs("fac_email_setting_frommode").Value,
                 from:                   oRs("fac_email_setting_from").Value,
                 loglevel:               oRs("fac_email_setting_loglevel").Value
@@ -260,7 +285,14 @@ function getEmailSetting(xmlReq, xmlParameters)
                 emlSetting.requiredFound = attachResult.requiredFound;
                 hasRequiredAttachment = attachResult.requiredFound;
                 allowedSetting = emlSetting;
-                delete result.rejectMail;
+                if (attachResult.rejectedFiles.tekst != "")
+                {
+                    result.rejectMail = attachResult.rejectedFiles;
+                }
+                else
+                {
+                    delete result.rejectMail;
+                }
             }
             else
             {
@@ -273,6 +305,7 @@ function getEmailSetting(xmlReq, xmlParameters)
         }
 
         result.emlSetting = allowedSetting;
+        result.silentignoreemail = checkSubject(xmlParameters);
     }
     oRs.Close();
     return result;
@@ -297,11 +330,13 @@ function emailAction(emlSetting, xmlParam, resultParam)
               "BEGIN " + emlSetting.action + " (" + safe.quoted_sql(emlSetting.theFrom)     + ","
                                                   + safe.quoted_sql(xmlParam.toAddr)      + ","
                                                   + safe.quoted_sql(xmlParam.Subject || L("lcl_fac_hmail_no_subject"))  + "," // de actions kunnen slecht tegen lege subject
-                                                  + safe.quoted_sql(v_body, 3990) + "," // HSLE#33588 10 karakters speling
+                                                  + "?, "
                                                   + safe.quoted_sql(xmlParam.sessionId) + ","
                                                   + emlSetting.key + ");"
             + "END;";
-        Oracle.Execute(actionsql);
+
+        var oparams = [ { typ: adLongVarChar, dir: adParamInput, val: v_body.substr(0, S("mld_melding_oms_maxlen")==4000?3990:S("mld_melding_oms_maxlen")) } ];
+        Oracle.ExecuteParam(actionsql, oparams);
 
         // Nog iets specifieks terug te melden voor de logging?
         var sql = "SELECT fac_result_waarde"
@@ -399,6 +434,7 @@ function checkAttach(xmlReq, xmlParameter, emlSetting)
 {
     var requiredFound = false;
     var allowedFiles = [];
+    var rejectedFiles = { tekst: [], maillog: []};
 
     var Attachments = xmlReq.getElementsByTagName("attachment");
     for (var i=0; i < Attachments.length; i++)
@@ -406,6 +442,10 @@ function checkAttach(xmlReq, xmlParameter, emlSetting)
         var safefilename = safe.filename(XMLval(Attachments[i], "filename", i));
         var extension = safefilename.substr(safefilename.lastIndexOf("."));
         var attsize = parseInt(XMLval(Attachments[i], "size", i), 10);
+        if (emlSetting.attach_maxkb && emlSetting.attach_maxkb > 0) {
+            var filesize_MB = (attsize / 1024 / 1024).toFixed(3);           // attsize is in bytes. Maak er MB van.
+            var maxsize_MB = (emlSetting.attach_maxkb / 1024).toFixed(3);   // attach_maxkb in in kB. Maak er MB van.
+        }
         if (safefilename == S("fac_logo_file"))
         {   // Waarschijnlijk een FACILITOR bon gereply'd
             __Log("Bijlage {0} genegeerd.".format(safefilename));
@@ -414,6 +454,13 @@ function checkAttach(xmlReq, xmlParameter, emlSetting)
         {
             __Log("Bijlage {0} genegeerd, te klein met {1} bytes.".format(safefilename, attsize));
         }
+        else if (   emlSetting.attach_maxkb && emlSetting.attach_maxkb > 0  // Er is een maximum bestandsgrootte ingesteld
+                 && parseFloat(filesize_MB) > parseFloat(maxsize_MB))       // En die is overschreden
+        {
+            __Log(L("fac_email_setting_err1").format(safefilename, filesize_MB, maxsize_MB));
+            rejectedFiles.tekst.push(L("fac_email_setting_err1").format(safefilename, filesize_MB, maxsize_MB));
+            rejectedFiles.maillog.push(("Bijlage {0} te groot: {1} bytes").format(safefilename, attsize));
+        }
         else if (!new RegExp(S("flexallowedext"), "ig").test(safefilename))
         {   // Niet ondersteunde bestandstype
             __DoLog("Onbekende extensie e-mail bijlage: {0} ({1} bytes) van {2}. Bestand is niet opgeslagen.".format(safefilename, attsize, emlSetting.theFrom));
@@ -435,7 +482,11 @@ function checkAttach(xmlReq, xmlParameter, emlSetting)
     }
 
     var attachResult = { requiredFound: requiredFound,
-                         allowedFiles: allowedFiles
+                         allowedFiles: allowedFiles,
+                         rejectedFiles: { tekst: rejectedFiles.tekst.join("\n"),
+                                          maillog: rejectedFiles.maillog.join("\n"),
+                                          optionalColor: "#ff4"
+                                        }
                        };
     return attachResult;
 }
@@ -564,7 +615,6 @@ function saveAttachments(xmlReq, emlSetting, xmlParam, resultParam)
         }
         result.attachments = safeFiles;
     }
-__Log(result);
     return result;
 }
 
@@ -611,7 +661,7 @@ var xmlReq = parsed.xml;
 var xmlParameters = getXml(xmlReq);
 var emlResult = getEmailSetting(xmlReq, xmlParameters);
 
-if (emlResult.emlSetting)
+if (emlResult.emlSetting && !emlResult.rejectMail)
 {
     var emlSetting = emlResult.emlSetting;
     if (emlSetting.loglevel > 0)
@@ -629,30 +679,38 @@ if (emlResult.emlSetting)
     __Log("E-mail user ontvankelijk: " + xmlParameters.mailuser);
     __Log("gebruikt email setting: " + emlSetting.volgnr);
 
-    var  result = { success: true,
-                    path: emlSetting.path,
-                    kenmerkpath: "",
-                    attachments: [],
-                    tempfolder: shared.tempFolder(),
-                    loglevel: emlSetting.loglevel || 0
-                   };
-
-    var actionResult = emailAction(emlSetting, xmlParameters, result);
-    if (!actionResult.rejectMail)
+    if (emlResult.silentignoreemail)
     {
-        var saveResult = saveAttachments(xmlReq, emlSetting, xmlParameters, actionResult);
-        if (!saveResult.rejectMail)
-        {
-            saveEml(xmlParameters, saveResult);
-        }
-        else
-        {
-            emlResult.rejectMail = saveResult.rejectMail;
-        }
+        var saveResult = { silentignoreemail : true, maillog: "Ignored because subject matches " + emlResult.silentignoreemail }
+        __Log("Ignored because subject matches " + emlResult.silentignoreemail);
     }
     else
     {
-        emlResult.rejectMail = actionResult.rejectMail;
+        var  result = { success: true,
+                        path: emlSetting.path,
+                        kenmerkpath: "",
+                        attachments: [],
+                        tempfolder: shared.tempFolder(),
+                        loglevel: emlSetting.loglevel || 0
+                       };
+
+        var actionResult = emailAction(emlSetting, xmlParameters, result);
+        if (!actionResult.rejectMail)
+        {
+            var saveResult = saveAttachments(xmlReq, emlSetting, xmlParameters, actionResult);
+            if (!saveResult.rejectMail)
+            {
+                saveEml(xmlParameters, saveResult);
+            }
+            else
+            {
+                emlResult.rejectMail = saveResult.rejectMail;
+            }
+        }
+        else
+        {
+            emlResult.rejectMail = actionResult.rejectMail;
+        }
     }
 }
 

APPL/API/api_mldsoap.asp

@@ -200,7 +200,6 @@ for (i = 0; i < meldingen.length; i++)
       }
       else
       {
-
         if (einddatum != null)
         {
           var mld_datum;
@@ -254,7 +253,7 @@ for (i = 0; i < meldingen.length; i++)
           fields.push({ dbs: "mld_melding_opmerking",     typ: "varchar",   val: meld_opm,       track: L("lcl_mld_inf_Opmerking"),     len: 4000 });
 
         if (meld_onderwerp)
-          fields.push({ dbs: "mld_melding_onderwerp",     typ: "varchar",   val: meld_onderwerp, track: L("lcl_mld_inf_Onderwerp"),     len: 80 });
+          fields.push({ dbs: "mld_melding_onderwerp",     typ: "varchar",   val: meld_onderwerp, track: L("lcl_mld_inf_Onderwerp"),     len: 200 });
 
         if (meld_oms)
           fields.push({ dbs: "mld_melding_omschrijving",  typ: "varchar",   val: meld_oms,       track: L("lcl_mld_inf_Omschrijving"),  len: 4000 });
@@ -273,13 +272,7 @@ for (i = 0; i < meldingen.length; i++)
     } // einde update
     else if (meldaction == "insert")
     {
-
-      tsql = "SELECT 1"
-           + "  FROM mld_stdmelding sm"
-           + " WHERE sm.mld_stdmelding_key = " + (stdmld_key || -1)
-           + "   AND sm.mld_stdmelding_verwijder IS NULL";
-      var oRs = Oracle.Execute(tsql);
-      if (oRs.eof)
+      if (!validStdmld(stdmld_key))
       {
         resultcode = 3;
         resulttekst = "Undefined stdmelding";
@@ -340,52 +333,57 @@ for (i = 0; i < meldingen.length; i++)
         }
 
         tsql = "SELECT alg_locatie_key  "
-            + " FROM alg_v_aanweziglocatie"
-            + " WHERE alg_locatie_code="+ safe.quoted_sql(meldloc);
-        var oRs = Oracle.Execute(tsql);
-        if (!oRs.eof)
+             + "  FROM alg_v_aanweziglocatie"
+             + " WHERE alg_locatie_code="+ safe.quoted_sql(meldloc);
+        var oRs_L = Oracle.Execute(tsql);
+        if (!oRs_L.eof)
         {
           alglevel_ok = alglevel_ok || stdmld_niveau == "L";
-          locatie_key = oRs("alg_locatie_key").Value;
+          locatie_key = oRs_L("alg_locatie_key").Value;
           fields.push({ dbs: "mld_alg_locatie_key", typ: "key", val: locatie_key });
 
           tsql = "SELECT alg_gebouw_key  "
-              + " FROM alg_v_aanweziggebouw"
-              + " WHERE alg_locatie_key ="+ locatie_key
-              + " AND alg_gebouw_code="+ safe.quoted_sql(meldgeb);
-          var oRs = Oracle.Execute(tsql);
-          if (!oRs.eof)
+               + "  FROM alg_v_aanweziggebouw"
+               + " WHERE alg_locatie_key ="+ locatie_key
+               + "   AND alg_gebouw_code="+ safe.quoted_sql(meldgeb);
+          var oRs_G = Oracle.Execute(tsql);
+          if (!oRs_G.eof)
           {
             alglevel_ok = alglevel_ok || stdmld_niveau == "G";
-            plaats_key = oRs("alg_gebouw_key").Value;
+            plaats_key = oRs_G("alg_gebouw_key").Value;
 
             tsql = "SELECT alg_verdieping_key  "
-                + " FROM alg_v_aanwezigverdieping"
-                + " WHERE alg_gebouw_key ="+ plaats_key
-                + " AND alg_verdieping_code="+ safe.quoted_sql(meldver);
-            var oRs = Oracle.Execute(tsql);
-            if (!oRs.eof)
+                 + "  FROM alg_v_aanwezigverdieping"
+                 + " WHERE alg_gebouw_key ="+ plaats_key
+                 + "   AND alg_verdieping_code="+ safe.quoted_sql(meldver);
+            var oRs_V = Oracle.Execute(tsql);
+            if (!oRs_V.eof)
             {
               alglevel_ok = alglevel_ok || stdmld_niveau == "V";
-              plaats_key = oRs("alg_verdieping_key").Value;
+              plaats_key = oRs_V("alg_verdieping_key").Value;
 
               tsql = "SELECT alg_ruimte_key  "
-                  + " FROM alg_v_aanwezigruimte"
-                  + " WHERE alg_verdieping_key ="+ plaats_key
-                  + " AND alg_ruimte_nr="+ safe.quoted_sql(meldrnr);
-              var oRs = Oracle.Execute(tsql);
-              if (!oRs.eof) {
+                   + "  FROM alg_v_aanwezigruimte"
+                   + " WHERE alg_verdieping_key ="+ plaats_key
+                   + "   AND alg_ruimte_nr="+ safe.quoted_sql(meldrnr);
+              var oRs_R = Oracle.Execute(tsql);
+              if (!oRs_R.eof) {
                   alglevel_ok = alglevel_ok || stdmld_niveau == "R";
-                  plaats_key = oRs("alg_ruimte_key").Value;
+                  plaats_key = oRs_R("alg_ruimte_key").Value;
               }
+              oRs_R.Close();
             }
+            oRs_V.Close();
           }
+          oRs_G.Close();
 
           if (plaats_key != -1)
           {
             fields.push({ dbs: "mld_alg_onroerendgoed_keys", typ: "key", val: plaats_key });
           }
         }
+        oRs_L.Close();
+
         if (!alglevel_ok)
         {
           resultcode = 5;
@@ -413,11 +411,10 @@ for (i = 0; i < meldingen.length; i++)
           var ins_srtdiscipline_kk = (ins_srtdisc_kk & 1) == 1;
 
           var kpn_key = user.prs_kostenplaats_key() || -1;
-          if (meld_kpn && meld_kpn != "")
+          if ((kpn_key == -1) || (meld_kpn && meld_kpn != ""))
           {
             var tempKpn = getKpn(meld_kpn);
-            if (tempKpn != -1)
-              kpn_key = tempKpn;
+            kpn_key = (tempKpn != -1 ? tempKpn : stdm_info.kp_key);
           }
 
           if (kpnverplicht && kpn_key < 0)
@@ -444,7 +441,7 @@ for (i = 0; i < meldingen.length; i++)
                             { dbs: "mld_melding_module",         typ: "varchar", val: "MLD" },
                             { dbs: "mld_meldbron_key",           typ: "key",     val: 6 }, // system
                             { dbs: "mld_melding_omschrijving",   typ: "varchar", val: meld_oms, len: 4000 },
-                            { dbs: "mld_melding_onderwerp",      typ: "varchar", val: meld_onderwerp, len: 80 },
+                            { dbs: "mld_melding_onderwerp",      typ: "varchar", val: meld_onderwerp, len: 200 },
                             { dbs: "prs_kostenplaats_key",       typ: "key",     val: kpn_key },
                             { dbs: "prs_afdeling_key",           typ: "key",     val: afd_key },
                             { dbs: "mld_kosten_klant",           typ: "number",  val: kpn_key > 0 && ins_srtdiscipline_kk? 1 : null },
@@ -470,7 +467,10 @@ for (i = 0; i < meldingen.length; i++)
           upsertKenmerk(mldkenmerken, stdmld_key, mld_key);
 
           resultcode = 0; // Ik heb gedaan wat ik moest en mocht doen voor deze melding.
-          // En nog maar even de aanname dat een extern systeem niet aan workflows/ktos doet?
+
+          // Handle workflow actions for new call:
+          // Let wel: alleen initiele stap ondersteund, niet latere vervolgstappen bij statuswijzigingen!
+          mld.nextworkflowstep(mld_key, -1);  // -1 = initial (the originating call)
 
           // Klantspecifieke check functie (hookfunction) voor de invoer
           var pResult = new HookResult();
@@ -513,35 +513,52 @@ for (i = 0; i < meldingen.length; i++)
 } // end for
 // Alle melding-nodes zijn behandeld.
 
+
+function validStdmld(stdmld_key)
+{
+  var tsql = "SELECT COUNT(*) aantal"
+           + "  FROM mld_stdmelding sm"
+           + " WHERE sm.mld_stdmelding_key = " + (stdmld_key || -1)
+           + "   AND sm.mld_stdmelding_verwijder IS NULL";
+  var oRs = Oracle.Execute(tsql);
+  var geldig = (oRs("aantal").Value == 1);
+  oRs.Close();
+  return geldig;
+}
+
 function getKpn(meld_kpn)
 {
+  var kpn_key = -1;
   if (!meld_kpn)
-    return -1;
+  {
+    var temp_sql = "SELECT ''"
+                 + "  FROM prs_perslidkostenplaats pkp"
+                 + " WHERE pkp.prs_perslidkostenplaats_boeken = 1"
+                 + "   AND (pkp.prs_kostenplaats_key = kp.prs_kostenplaats_key"
+                 + "         OR pkp.prs_kostenplaats_key IS NULL)"       // Mandated for all
+                 + "   AND pkp.prs_perslid_key = " + perslid_key;
 
-  var temp_sql = "SELECT ''"
-               + "  FROM prs_perslidkostenplaats pkp"
-               + " WHERE pkp.prs_perslidkostenplaats_boeken = 1"
-               + "   AND (pkp.prs_kostenplaats_key = kp.prs_kostenplaats_key"
-               + "         OR pkp.prs_kostenplaats_key IS NULL)"       // Mandated for all
-               + "   AND pkp.prs_perslid_key = " + perslid_key;
+    temp_sql = "SELECT kp.prs_kostenplaats_key"
+             + "  FROM prs_kostenplaats kp"
+             + " WHERE kp.prs_kostenplaats_verwijder IS NULL"
+             + "   AND (kp.prs_kostenplaats_begin IS NULL"
+             + "         OR kp.prs_kostenplaats_begin < SYSDATE)"
+             + "   AND (kp.prs_kostenplaats_eind IS NULL"
+             + "         OR kp.prs_kostenplaats_eind > SYSDATE)"
+             + "   AND EXISTS ("
+             + temp_sql
+             + "   )"
+             + "   AND kp.prs_kostenplaats_upper = " + safe.quoted_sql_upper(meld_kpn); // Unique
 
-  temp_sql = "SELECT kp.prs_kostenplaats_key"
-           + "  FROM prs_kostenplaats kp"
-           + " WHERE kp.prs_kostenplaats_verwijder IS NULL"
-           + "   AND (kp.prs_kostenplaats_begin IS NULL"
-           + "         OR kp.prs_kostenplaats_begin < SYSDATE)"
-           + "   AND (kp.prs_kostenplaats_eind IS NULL"
-           + "         OR kp.prs_kostenplaats_eind > SYSDATE)"
-           + "   AND EXISTS ("
-           + temp_sql
-           + "   )"
-           + "   AND kp.prs_kostenplaats_upper = " + safe.quoted_sql_upper(meld_kpn); // Unique
+    var oRs = Oracle.Execute(temp_sql);
+    if (!oRs.eof)
+    {
+      kpn_key = oRs("prs_kostenplaats_key").Value;
+    }
+    oRs.Close();
+  }
 
-  var oRs = Oracle.Execute(temp_sql);
-  if (!oRs.EoF)
-    return oRs("prs_kostenplaats_key").Value;
-  oRs.Close();
-  return -1;
+  return kpn_key;
 }
 
 function getAfd(meld_afd)
@@ -716,6 +733,14 @@ function upsertKenmerk(kenmerken, stdmld_key, mld_key)
 
 xmlResp.appendChild(FCLTElement);
 
+if (API.apidata.errorhandling == 1)
+{
+  if (resultcode > 0) // -1 en 0 zijn 'goed'
+  {
+    Response.Status = '400 Bad Request';
+  }
+}
+
 Response.ContentType = "text/xml";
 if (API.apidata.stylesheet)
 {

APPL/API/api_opdrsoap.asp

@@ -494,7 +494,13 @@ for (var i = 0; i < opdrachten.length; i++)
 
     // Dit zijn de wijzigingen, die voeren we alleen uit bij een geldige statuswijziging
     // of geen statuswijziging
-    if (opdropmerking != null)
+    var canOpmChange = opdraction == "insert" ||
+                        this_opdr.canOpmChange &&
+                          (   S("mld_afhandeling_restrict_edit") == 0                 // Hier mag het afhandeling veld altijd aangepast worden
+                           || opdrstatus != null && (oldstatus == 5 || oldstatus == 8) && // En anders alleen bij het afmelden, afwijzen of annuleren
+                                (   opdrstatus == 'ORDAFM' && this_opdr.canClose      // Verifieer dat we gaan (en mogen) afmelden
+                                 || opdrstatus == 'ORDCAN' && this_opdr.canCancel));  // Verifieer dat we gaan (en mogen) annuleren
+    if (opdropmerking != null && canOpmChange)
     { // opmerking bij de opdracht
       var new_opm = opdropmerking;
       if (ORDremark == 5) // Append
@@ -539,11 +545,11 @@ for (var i = 0; i < opdrachten.length; i++)
        }
     }
 
-    if (opdrkosten != null)
+    if (opdrkosten != null && (opdraction == "insert" || this_opdr.canUrenMatChange))
        opdr_fields.push({ dbs: "mld_opdr_kosten",     typ: "float",   val: opdrkosten,     track: L("lcl_total_cost") });
-    if (opdruren != null)
+    if (opdruren != null && (opdraction == "insert" || this_opdr.canUrenMatChange))
        opdr_fields.push({ dbs: "mld_opdr_uren",       typ: "float",   val: opdruren,       track: L("lcl_hours") });
-    if (opdrmateriaal != null)
+    if (opdrmateriaal != null && (opdraction == "insert" || (this_opdr.typeopdr_materiaal < 2 && this_opdr.canUrenMatChange)))
        opdr_fields.push({ dbs: "mld_opdr_materiaal",  typ: "float",   val: opdrmateriaal,  track: L("lcl_mld_material") });
     if (opdruurloon != null)
        opdr_fields.push({ dbs: "mld_opdr_uurloon",    typ: "float",   val: opdruurloon,    track: L("lcl_prs_person_uurloon") });
@@ -552,7 +558,7 @@ for (var i = 0; i < opdrachten.length; i++)
     var formattedID = ins_srtdiscipline_prefix + opdrid;
 
     var orddat_tracking = "";
-    if (opdrgereed != null)
+    if (opdrgereed != null && (opdraction == "insert" || this_opdr.canDatesChange))
     {
       var old_einddatum = mld_opdr.mld_opdr_einddatum;
       var new_einddatum = XMLtoJsDate(opdrgereed);
@@ -567,7 +573,7 @@ for (var i = 0; i < opdrachten.length; i++)
 
     // Plandatum wordt apart getracked want deze heeft zijn eigen tracking code (ORDPLD)
     var ordpld_tracking = "";
-    if (plandatum != null)
+    if (plandatum != null && (opdraction == "insert" || this_opdr.canPlanDatesChange))
     {
       var new_plandatum;
       if (plandatum == "")
@@ -589,7 +595,7 @@ for (var i = 0; i < opdrachten.length; i++)
 
     // Plandatum2 wordt apart getracked want deze heeft zijn eigen tracking code (ORDPL2)
     var ordpl2_tracking = "";
-    if (S("mld_use_plandate2") & 2 && plandatum2 != null)
+    if ((S("mld_use_plandate2") & 2 && plandatum2 != null) && (opdraction == "insert" || this_opdr.canPlanDatesChange))
     {
       var new_plandatum2;
       if (plandatum2 == "")
@@ -822,6 +828,7 @@ for (var i = 0; i < opdrachten.length; i++)
 
       if (newstatus != -1)
       {
+        add_note(); // zodat we note_key hebben
         mld.setopdrachtstatus(opdr_key, newstatus, null, note_key);
         // Hier terugchecken van de status
         tsql = "SELECT mld_statusopdr_key FROM mld_opdr"
@@ -897,8 +904,6 @@ for (var i = 0; i < opdrachten.length; i++)
               // Zodat die bij de FO weer onder Inbehandeling valt.
               mld.setmeldingstatus (mld_key, 4); // Geaccepteerd
           }
-          // else status van de melding niet aanpassen.
-          resultcode = 0;
         }
         else
         {
@@ -911,36 +916,9 @@ for (var i = 0; i < opdrachten.length; i++)
 
   if (resultcode == -1) // Nog steeds geen fouten.
   {
-    if (opdraction == "update" && opdrnote != null)
-    {
-        var fields =  [ { dbs: "mld_opdr_note_key",     typ: "key",     seq: "mld_s_mld_opdr_note_key" },
-                        { dbs: "mld_opdr_key",          typ: "key",     val: opdr_key },
-                        { dbs: "prs_perslid_key",       typ: "key",     val: user_key },
-                        { dbs: "mld_opdr_note_flag",    typ: "number",  val: opdrnoteflag || 4 }, // default alleen uitvoerende, +1 voor FE-zichtbaar
-                        { dbs: "mld_opdr_note_omschrijving", typ: "varchar", val: opdrnote, len: 4000 }
-                      ];
-        var noteIns = buildInsert("mld_opdr_note", fields, { noValidateToken: true });
-        note_key = noteIns.sequences["mld_opdr_note_key"];
-        Oracle.Execute(noteIns.sql);
-        // later registreren we eventueel nog een tracking_key
-    }
 
-    // Registeren bij de laatste notitie
-    if (note_key > 0)
-    {
-        var tracking_key = coalesce(coalesce(status_tracking_key, datum_tracking_key), update_tracking_key); // volgorde van belangrijkheid
-        if (!(tracking_key > 0))
-        { // Er is alleen een losse notitie. De opdracht is niet aangepast.
-          if ((opdrnoteflag & 1) == 1) // voor FE-zichtbaar
-            tracking_key = mld.trackmeldingaddnote(mld_key); // MLDNOT tracking.
-          else
-            tracking_key = mld.trackopdrachtaddnote(opdr_key); // ORDNOB tracking.
-        }
-        var sql = "UPDATE mld_opdr_note"
-                + "   SET fac_tracking_key = " + tracking_key
-                + " WHERE mld_opdr_note_key = " + note_key;
-        Oracle.Execute(sql);
-    }
+    var tracking_key = coalesce(coalesce(status_tracking_key, datum_tracking_key), update_tracking_key); // volgorde van belangrijkheid
+    add_note(tracking_key); // voor als nog niet eerder gebeurd
 
     resultcode = 0; // Ik heb gedaan wat ik moest en mocht doen voor deze opdracht.
   }
@@ -975,6 +953,37 @@ for (var i = 0; i < opdrachten.length; i++)
 } // end for
 // Alle opdracht-nodes zijn behandeld.
 
+// Voeg een notitie toe en koppel hem eventueel direct aan tracking_key
+function add_note(tracking_key)
+{
+    if (/*global*/ note_key > 0)
+      return; // hadden we het al gedaan
+
+    if (opdraction == "update" && opdrnote != null)
+    {
+        var fields =  [ { dbs: "mld_opdr_note_key",     typ: "key",     seq: "mld_s_mld_opdr_note_key" },
+                        { dbs: "mld_opdr_key",          typ: "key",     val: opdr_key },
+                        { dbs: "prs_perslid_key",       typ: "key",     val: user_key },
+                        { dbs: "mld_opdr_note_flag",    typ: "number",  val: opdrnoteflag || 4 }, // default alleen uitvoerende, +1 voor FE-zichtbaar
+                        { dbs: "mld_opdr_note_omschrijving", typ: "varchar", val: opdrnote, len: 4000 }
+                      ];
+        var noteIns = buildInsert("mld_opdr_note", fields, { noValidateToken: true });
+        note_key = noteIns.sequences["mld_opdr_note_key"];
+        Oracle.Execute(noteIns.sql);
+
+        if (!(tracking_key > 0))
+        { // Er is alleen een losse notitie. De opdracht is niet aangepast.
+          if ((opdrnoteflag & 1) == 1) // voor FE-zichtbaar
+            tracking_key = mld.trackmeldingaddnote(mld_key); // MLDNOT tracking.
+          else
+            tracking_key = mld.trackopdrachtaddnote(opdr_key); // ORDNOB tracking.
+        }
+        var sql = "UPDATE mld_opdr_note"
+                + "   SET fac_tracking_key = " + tracking_key
+                + " WHERE mld_opdr_note_key = " + note_key;
+        Oracle.Execute(sql);
+    }
+}
 
 // Als key1 geldig is heeft die de voorkeur, anders keys
 function coalesce(key1, key2)
@@ -1040,6 +1049,7 @@ function upsertKenmerk(kenmerken, topdr_key, opdr_key)
       switch (kenmerk_type)
       {
         case 'R':
+        case 'r':
         case 'S':
         {
           // read reference fields
@@ -1058,7 +1068,7 @@ function upsertKenmerk(kenmerken, topdr_key, opdr_key)
         { // We ondersteunen alleen nog maar karakter- en bestandsnaam-velden.
           // AEG: Maar wat maakt een nummer nu anders dan een karakter ?
           var vnew = kenmerk_waarde;
-          if (kenmerk_type == 'R' || kenmerk_type == 'S')
+          if (kenmerk_type == 'R' || kenmerk_type == 'r' || kenmerk_type == 'S')
           {
             if (vnew)
             {
@@ -1071,7 +1081,7 @@ function upsertKenmerk(kenmerken, topdr_key, opdr_key)
           {
             var kenmerkopdr_key = oRs("mld_kenmerkopdr_key").Value;
             var vold = oRs("mld_kenmerkopdr_waarde").Value; // Voor tracking
-            if (kenmerk_type == 'R' || kenmerk_type == 'S')
+            if (kenmerk_type == 'R' || kenmerk_type == 'r' || kenmerk_type == 'S')
             {
               if (vold)
               {
@@ -1389,6 +1399,14 @@ function upsertOpdrRegels(regels, mld_opdr)
 
 xmlResp.appendChild(FCLTElement);
 
+if (API.apidata.errorhandling == 1)
+{
+  if (resultcode > 0) // -1 en 0 zijn 'goed'
+  {
+    Response.Status = '400 Bad Request';
+  }
+}
+
 Response.ContentType = "text/xml";
 if (API.apidata.stylesheet)
 { // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...

APPL/API/shorturl.asp

@@ -169,7 +169,8 @@ __Log("== Entering shorturl.asp ==");
     }
     else
     {
-        var sql = "SELECT fac_bookmark_path,"
+        var sql = "SELECT fac_bookmark_key,"
+                + "       fac_bookmark_path,"
                 + "       fac_bookmark_query,"        // Ooit was bedacht dat je de parameters apart in fac_bookmark_query stopt.
                 + "       prs_perslid_key_auth,"      // In de praktijk stoppen mensen het ook vaak in fac_bookmark_path
                 + "       fac_bookmark_unauth_url,"   // Dat kunnen we tegenwoordig (2018.1 Gold C) ook wel aan.
@@ -201,6 +202,7 @@ __Log("== Entering shorturl.asp ==");
         }
         var refresher = oRs("fac_bookmark_refreshtime").Value;
         var bookmark_naam = oRs("fac_bookmark_naam").Value;
+        var bookmark_key = oRs("fac_bookmark_key").Value;
 
         if (user_key < 0)
         {
@@ -215,7 +217,9 @@ __Log("== Entering shorturl.asp ==");
                 Session("fallback_user_key") = falluser_key; // wordt opgepikt door loginTry.asp
             }
             else
+            {
                 Session("unauth_url") = oRs("fac_bookmark_unauth_url").Value; // wordt opgepikt door common.asp
+            }
         }
 
         var params = oRs("fac_bookmark_query").Value;
@@ -241,6 +245,9 @@ __Log("== Entering shorturl.asp ==");
         if (oRs("fac_bookmark_flags").Value == 0)
             var url = protectQS.create(url); // prs/pchange_reset.asp, PRS\prs_perslid_qr_confirm.asp en PRS\self_register_confirm.asp verwachten dit
 
+        if (user_key > -1)
+            shared.registeraction("bookmark", {refkey: bookmark_key, info: bookmark_naam, daily: S("fac_gui_counter_menu_daily")});
+
         oRs.Close();
     }
 

APPL/API2/api2.inc

@@ -112,6 +112,7 @@ api2 = {
                     case "color":
                     case "symbol":
                     case "varchar":
+                    case "clob":
                         val = getFParam(formfields[i].frm, null);
                         break;
                     case "processingtime":
@@ -187,6 +188,7 @@ api2 = {
                             filter = "exact";
                             break;
                         case "varchar":
+                        case "clob":
                         case "memo":
                         case "html":
                             filter = "like";
@@ -403,6 +405,7 @@ api2 = {
                             break;
                         case "varchar": // Als fld.match(/^fclt_d_/) dan is het een old-style rapport filterveld
                         case "memo":
+                        case "clob":
                         case "html":
                             if (filterval instanceof Array)
                             { // O.a. multi filter bij rapportages.
@@ -524,7 +527,7 @@ api2 = {
                         else if (typeof operand == "string" && operand != " NOT IN " && operand != " IN ")
                             operand = isNot ? " NOT LIKE " : " LIKE ";
 
-                      if (field.typ == "varchar" || field.typ == "memo" || field.typ == "html")
+                      if (field.typ == "varchar" || field.typ == "memo" || field.typ == "clob" || field.typ == "html")
                       {
                         if (field.islcl)
                             dbs = "lcl.l({0}, 1)".format(dbs);
@@ -533,7 +536,7 @@ api2 = {
                     }
                     if (field.caseinsensitive)
                     {
-                        dbs = "UPPER(" + dbs + ")";
+                        dbs = field.hasupper || "UPPER(" + dbs + ")";
                         if (safe_val instanceof Array)
                             for (var i = 0; i < safe_val.length; i++)
                                 safe_val[i] = safe_val[i].toUpperCase();
@@ -691,6 +694,10 @@ api2 = {
                                  + " WHERE xx." + model.primary + " = " + model.table + "." + model.primary + ")";
                 selects.push(sqleenh + " AS " + fld + "_eenheid");
             }
+            else if (field.typ == "clob" && !params.filter.id)
+            {   // er *kan* een discx3d overheen gaan wat tot een UNION kan leiden wat niet mag met een CLOB
+                selects.push("TO_CHAR(SUBSTR({0}, 1, 4000)) AS {0}".format(field.dbs));
+            }
             else if (dbs)
             {
                 // veldnamen moeten gelijk zijn bij het ophalen. Zie ook: sql2jsonval
@@ -1008,6 +1015,7 @@ api2 = {
             //          object met "name": { field.. } wat daar wel omgezet wordt.
             var newfield = { dbs: field.dbs,
                              typ: field.typ,
+                             withseconds: "withseconds" in field? field.withseconds: fld.indexOf("syncdate") > -1,
                              track: field.track && field.label?field.label:field.track,
                              foreign: field.foreign,
                              val: newval,
@@ -1701,6 +1709,8 @@ function _validateJsondata(jsondata, model)
             case "float":
               if (typeof data === "string" && data.match(/^\d+$/)) // "resroom": "823" staan we nog wel toe
                 data = parseInt(data, 10);
+              if (typeof data === "string" && (type == "float" || type == "currency") && data.match(/^[\.\d]+$/)) // "uren": "123.4" staan we nog wel toe
+                data = parseFloat(data);
               if (typeof data === "number" && isFinite(data))
                 valid = true;
               break;
@@ -1738,6 +1748,7 @@ function _validateJsondata(jsondata, model)
             case "color":
             case "symbol":
             case "varchar":
+            case "clob":
               if (typeof data == "string")
                 valid = true;
               break;
@@ -1983,6 +1994,10 @@ function generic_REST_POST(model, gparams)
             var xxxIns = buildInsert(model.table, dbfields, { noValidateToken: true });
             var the_key = xxxIns.sequences[model.fields.id.dbs];
             // TODO: Generieke tracking?
+            if (params.sqlOnly)
+            {   // Alleen de sql terugsturen
+                return { genIns: xxxIns, newKey: the_key };
+            }
 
             var err = Oracle.Execute(xxxIns.sql, true);
             if (err.friendlyMsg)
@@ -2056,6 +2071,10 @@ function generic_REST_PUT(model, gparams)
                 var xxxUpd = buildTrackingUpdate(model.table, wheres.join(" AND " ), dbfields, tracking_params);
                 var xxxTrack = xxxUpd.trackarray;
                 // TODO: Generieke tracking?
+                if (params.sqlOnly)
+                {   // Alleen de sql terugsturen
+                    return { genUpd: xxxUpd };
+                }
 
                 if (xxxUpd) // Misschien geen velden opgegeven.
                 {

APPL/API2/api2_dispatch.inc

@@ -25,13 +25,10 @@ var api2_mapper = {
     "rooms"                   : { "filename": "appl/api2/api_rooms.asp",                    "module": "ALG" },
     "districts"               : { "filename": "appl/api2/api_districts.asp",                "module": "ALG" },
     "orderdisciplines"        : { "filename": "appl/mgt/bes_discipline.asp" },
-    "ordercatalogues"         : { "filename": "appl/mgt/bes_disciplineprod.asp" },
-    "orderunits"              : { "filename": "appl/mgt/bes_grootheid.asp" },
     "orderlineproperties"     : { "filename": "appl/mgt/bes_kenmerk.asp" },
     "orderproperties"         : { "filename": "appl/mgt/bes_kenmerkbestel.asp" },
     "orderarticlegroups"      : { "filename": "appl/mgt/bes_srtgroep.asp" },
     "orderpropertytypes"      : { "filename": "appl/mgt/bes_srtkenmerk.asp" },
-    "orderproductgroups"      : { "filename": "appl/mgt/bes_srtprodgroep.asp", "lcl_name": "bes_srtgroep_m" },
     "orderpacelisttables"     : { "filename": "appl/mgt/bes_staffeltabel.asp" },
     "visitoractions"          : { "filename": "appl/mgt/bez_actie.asp" },
     "visitorproperties"       : { "filename": "appl/mgt/bez_kenmerk.asp" },
@@ -76,6 +73,7 @@ var api2_mapper = {
     "objectproperties"        : { "filename": "appl/mgt/ins_kenmerk.asp" },
     "recurringtasks"          : { "filename": "appl/mgt/ins_srtcontrole.asp" },
     "objectgroups"            : { "filename": "appl/mgt/ins_srtgroep.asp" },
+    "objecttypes"             : { "filename": "appl/mgt/ins_srtdeel.asp" },
     "objectpropertytypes"     : { "filename": "appl/mgt/ins_srtkenmerk.asp" },
     "alldisciplines"          : { "filename": "appl/mgt/ins_tab_discipline.asp" },
     "kpidefinitions"          : { "filename": "appl/mgt/kpi_definitie.asp",                 "module": "KPI" },
@@ -161,6 +159,7 @@ var api2_mapper = {
 
     "generictables"           : { "filename": "appl/mgt/mgt_generic.asp", "hidden": true },
     "genericselect"           : { "filename": "appl/mgt/mgt_generic_select.asp", "hidden": true },
+    "bestpractices"           : { "filename": "appl/mgt/fac_bestpractices.asp", "hidden": true },
     "systemtables"            : { "filename": "appl/mgt/user_tables.asp", "hidden": true },
     "workflowexpressions"     : { "filename": "appl/mgt/mld_workflow_expression.asp", "hidden": true }  // dit is geen model
 }

APPL/API2/api2_rest.inc

@@ -702,44 +702,53 @@ api2_rest = {
         Response.write(str_antwoord);
     },
 
+    // Merk op dat (onbedoeld) de tabel-kolommen bepaald worden door de velden in het *eerste* record
+    // en niet zozeer door het gedefinieerde fields-object
+    // Ook: verwacht wordt dat de volgorde van velden altijd gelijk is wat JavaScript 'for' niet
+    // garandeert (maar in de praktijk wel goed gaat)
     json2htmltable: function _json2htmltable(data, model, single)
     {
-        var trs = [];
-        if (data.length) // Header maken
+        var ths = [];
+        if (!data.length)
+            return "\n<table>\n</table>"
+
+        // Header maken
+        var ths = [];
+        for (var fld in data[0])
         {
-            var ths = [];
-            for (var fld in data[0])
+            var lbl = fld;
+            if (fld in model.fields)
+                lbl = model.fields[fld].label;
+            else
             {
-                var lbl = fld;
-                if (fld in model.fields)
-                    lbl = model.fields[fld].label;
-                else
+                var val = data[0][fld];
+                if (val && typeof val == "object")
                 {
-                    var val = data[0][fld];
-                    if (val && typeof val == "object")
-                    {
-                        if (model.includes && fld in model.includes)
-                            var lbl = model.includes[fld].model.records_title;
-                        else
-                            lbl = fld; // Attachments/flexfiles
-                    }
+                    if (model.includes && fld in model.includes)
+                        var lbl = model.includes[fld].model.records_title;
+                    else
+                        lbl = fld; // Attachments/flexfiles
                 }
-                ths.push("<th title='{0}'>{1}</th>".format(safe.htmlattr(lbl), fld));
             }
-            trs.push(ths.join(""));
+            ths.push("<th title='{0}'>{1}</th>".format(safe.htmlattr(lbl), fld));
         }
+
+        var trs = [];
         for (var i = 0; i < data.length; i++)
         {
             var rec = data[i];
             var tds = [];
-            for (var fld in rec)
+            for (var fld in data[0]) // Hier dezelfde kolomvolgorde (van eerste record) gebruiken
             {
                 var cls = "";
                 if (model.fields[fld] && model.fields[fld].typ.match(/number|float|currency|key/) && !model.fields[fld].foreign)
                 {
                     cls = " style='text-align:right'";
                 }
-                var val = rec[fld];
+                if (fld in rec)
+                    var val = rec[fld];
+                else
+                    var val = "";
                 var safeval = Server.HTMLEncode(String(val));
                 if (val === null)
                     safeval = '&nbsp;';
@@ -750,7 +759,7 @@ api2_rest = {
                     var naam = val.name||"???";
                     if (typeof naam == 'object' && naam instanceof Date) // Bij appointment
                         naam = toISODateTimeString(naam);
-                    safeval = val.id + " (" + Server.HTMLEncode(naam) + ")";
+                    safeval = val.id + " <em>(" + safe.html(naam) + ")</em>";
                 }
                 else if (val && typeof val == "object" && model.includes && fld in model.includes)
                     safeval = api2_rest.json2htmltable(val, model.includes[fld].model, true); // dereference
@@ -772,7 +781,9 @@ api2_rest = {
             return "\n<table>\n" + html + "\n</table>";
         }
         else
-            return "\n<table>\n<tr>" + trs.join("</tr>\n<tr>") + "</tr></table>";
+            return "\n<table style='border-collapse: separate;'>"
+                 + "\n<thead><tr style='position:sticky;top:0'>" + ths.join("") + "</tr>\n</thead>"
+                 + "\n<tbody>\n<tr>" + trs.join("</tr>\n<tr>") + "</tr>\n</tbody>\n</table>";
     },
 
     json2csv: function _json2csv(data, model, single)

APPL/API2/api2_tools.inc

@@ -13,7 +13,7 @@
 */
 %>
 <%
-    function buildKenmerktypeLOV(kenmerktype, emptyOption)
+    function buildKenmerktypeLOV(kenmerktype, params)
     {
         var kenmerktypeLOV = "";
         switch (kenmerktype)
@@ -32,11 +32,18 @@
                 break;
             case "R":
                 kenmerktypeLOV = "R;" + L("mgt_srtkenmerk_referentie_l") + ";"
+                               + "r;" + L("mgt_srtkenmerk_referentie_r") + ";"
                                + "S;" + L("mgt_srtkenmerk_referentie_s")
                 break;
             case "S":
                 kenmerktypeLOV = "S;" + L("mgt_srtkenmerk_referentie_s") + ";"
-                               + "R;" + L("mgt_srtkenmerk_referentie_l")
+                               + "R;" + L("mgt_srtkenmerk_referentie_l") + ";"
+                               + "r;" + L("mgt_srtkenmerk_referentie_r")
+                break;
+            case "r":
+                kenmerktypeLOV = "r;" + L("mgt_srtkenmerk_referentie_r") + ";"
+                               + "R;" + L("mgt_srtkenmerk_referentie_l") + ";"
+                               + "S;" + L("mgt_srtkenmerk_referentie_s")
                 break;
             case "X":
                 kenmerktypeLOV = "X;" + L("mgt_srtkenmerk_bestandsnaam");
@@ -52,11 +59,18 @@
                 break;
             case "L":
                 kenmerktypeLOV = "L;" + L("mgt_srtkenmerk_label") + ";"
-                               + "l;" + L("mgt_srtkenmerk_label_i")
+                               + "l;" + L("mgt_srtkenmerk_label_i") + ";"
+                               + (params && params.module == "MLD"? "b;" + L("mgt_srtkenmerk_label_ii") : "")
                 break;
             case "l":
                 kenmerktypeLOV = "l;" + L("mgt_srtkenmerk_label_i") + ";"
-                               + "L;" + L("mgt_srtkenmerk_label")
+                               + "L;" + L("mgt_srtkenmerk_label") + ";"
+                               + (params && params.module == "MLD"? "b;" + L("mgt_srtkenmerk_label_ii") : "")
+                break;
+            case "b":
+                kenmerktypeLOV = "b;" + L("mgt_srtkenmerk_label_ii") + ";"
+                               + "L;" + L("mgt_srtkenmerk_label") + ";"
+                               + "l;" + L("mgt_srtkenmerk_label_i")
                 break;
             case "Q":
                 kenmerktypeLOV = "Q;" + L("mgt_srtkenmerk_blanco");
@@ -68,12 +82,13 @@
                 kenmerktypeLOV = "V;" + L("mgt_srtkenmerk_checkbox");
                 break;
             default:
-                kenmerktypeLOV = (emptyOption ? emptyOption + ";" : "")
+                kenmerktypeLOV = (params && params.emptyOption ? params.emptyOption + ";" : "")
                                +  "C;" + L("mgt_srtkenmerk_karakter")
                                + ";N;" + L("mgt_srtkenmerk_numeriek")
                                + ";D;" + L("mgt_srtkenmerk_datum")
                                + ";T;" + L("mgt_srtkenmerk_tijd")
                                + ";R;" + L("mgt_srtkenmerk_referentie_l")
+                               + ";r;" + L("mgt_srtkenmerk_referentie_r")
                                + ";S;" + L("mgt_srtkenmerk_referentie_s")
                                + ";X;" + L("mgt_srtkenmerk_bestandsnaam")
                                + ";F;" + L("mgt_srtkenmerk_bestand")
@@ -81,8 +96,8 @@
                                + ";M;" + L("mgt_srtkenmerk_bestand_f")
                                + ";L;" + L("mgt_srtkenmerk_label")
                                + ";l;" + L("mgt_srtkenmerk_label_i")
+                               + (params && params.module == "MLD"? ";b;" + L("mgt_srtkenmerk_label_ii") : "")
                                + ";Q;" + L("mgt_srtkenmerk_blanco")
-//                               + ";B;" + L("mgt_srtkenmerk_berekening")
                                + ";V;" + L("mgt_srtkenmerk_checkbox");
         }
         return kenmerktypeLOV;

APPL/API2/model_alg_kenmerk.inc

@@ -109,7 +109,23 @@ function model_alg_kenmerk(niveau, params)
         "inlist": {
             "dbs": "alg_kenmerk_inlijst",
             "label": L("mgt_kenmerk_systeem_overview"),
-            "typ": "check0",
+            "typ": "number",
+            "bits": [
+                {
+                    "name": "",
+                    "label": "",
+                    "typ": "check",
+                    "mask": 1,
+                    "radios": [
+                        {
+                            "name": "inplan",
+                            "label": (niveau == "G"? L("mgt_kenmerk_systeem_overview_bui") : ""),
+                            "mask": 1,
+                            "defaultvalue": 0
+                        }
+                    ]
+                }
+            ],
             "multiedit": true
         },
         "length": {
@@ -188,7 +204,15 @@ function model_alg_kenmerk(niveau, params)
         gparams.GET = { wheres: [ "alg_kenmerk.alg_kenmerk_niveau = " + safe.quoted_sql(niveau) ] };
     }
 
-
+    if (niveau == "G")
+    {
+      this.fields.inlist.bits[0].mask = 3;
+      this.fields.inlist.bits[0].radios.push({ "name": "start",
+                                               "label": L("mgt_kenmerk_systeem_overview_mjob"),
+                                               "mask": 2,
+                                               "defaultvalue": 0
+                                             });
+    }
     this.REST_GET    = generic_REST_GET(this, gparams);
     this.REST_POST   = generic_REST_POST(this);
     this.REST_PUT    = generic_REST_PUT(this);

APPL/API2/model_appointments.inc

@@ -214,6 +214,36 @@ function model_appointments()
                 dbfields["action"] = { dbs: "bez_actie_key",  typ: "key", val: default_actie };
             }
         }
+
+        // Zet ook de locatie als S("vis_afspraak_onrgoed_uses_keys")=1 en er onrgoed_keys zijn meegegeven.
+        if (S("vis_afspraak_onrgoed_uses_keys") == 1)
+        {
+            if (!jsondata.location)
+            {
+                var alg_key = -1;
+                if (jsondata.room)
+                    alg_key = jsondata.room;
+                else if (jsondata.floor)
+                    alg_key = jsondata.floor;
+                else if (jsondata.building)
+                    alg_key = jsondata.building;
+
+                if (alg_key > 0) // anders niet meegegeven bij update en/of het is een appointment onder een reservering en er komt nog wel een follow_afspraak
+                {
+                    var sql = "SELECT MAX(alg_locatie_key) loc_key"
+                            + "  FROM alg_v_allonroerendgoed"
+                            + " WHERE alg_onroerendgoed_keys = " + alg_key;
+                    var oRs = Oracle.Execute(sql);
+                    if (!oRs.eof)
+                    {
+                        var loc_key = oRs("loc_key").Value;
+                        dbfields["location"] = { dbs: "alg_locatie_key", typ: "key", foreign: "alg_locatie", val: loc_key};
+                        jsondata.location = loc_key;
+                    }
+                    oRs.Close();
+                }
+            }
+        }
     };
 
     this.REST_PUT = function (params, jsondata, the_key) /* update appointment */
@@ -275,13 +305,13 @@ function model_appointments()
 
     this.REST_DELETE = function (params, the_key) /* delete appointment */
         {
-            var wheres = [" bez_afspraak_key = " + the_key];
-            wheres.push("(bez_afspraak_contact_key = " + user_key // Altijd fe vooralnog
-                               + "     OR bez_afspraak_host_key = " + user_key + ")");
-            var sql = "DELETE FROM bez_afspraak"
-                    + " WHERE " + wheres.join(" AND " );
+            var this_bez = bez.func_enabled_afspraak(the_key);
+            user.auth_required_or_abort(this_bez.canDelete);
 
+            var sql = "DELETE FROM bez_afspraak"
+                    + " WHERE bez_afspraak_key = " + the_key;
             Oracle.Execute(sql);
+
             // Geen tracking (mogelijk) omdat het record echt is verwijderd
         };
 }

APPL/API2/model_aut_idp.inc

@@ -23,6 +23,23 @@ function model_aut_idp(params)
 
     this.askfirst = "type";
 
+    var sqlteller = "(SELECT (SELECT TO_CHAR(COALESCE(SUM (fac_gui_counter_count), 0)) "
+                  + "          FROM fac_gui_counter "
+                  +"         WHERE fac_gui_counter_group = 'IDP_Login' AND fac_gui_counter_refkey = aut_idp.aut_idp_key "
+                  + "           AND fac_gui_counter_date >= TRUNC (SYSDATE)) "
+                  + "       || '/' || "
+                  + "       (SELECT TO_CHAR(COALESCE(SUM (fac_gui_counter_count), 0)) "
+                  + "          FROM fac_gui_counter "
+                  + "         WHERE fac_gui_counter_group = 'IDP_Login' AND fac_gui_counter_refkey = aut_idp.aut_idp_key "
+                  + "           AND fac_gui_counter_date > SYSDATE - 7) "
+                  + "       || '/' || "
+                  + "       (SELECT TO_CHAR(COALESCE(SUM (fac_gui_counter_count), 0)) "
+                  + "          FROM fac_gui_counter "
+                  + "         WHERE fac_gui_counter_group = 'IDP_Login' AND fac_gui_counter_refkey = aut_idp.aut_idp_key "
+                  + "           AND fac_gui_counter_date > SYSDATE - 30) "
+                  + "  FROM DUAL) "
+
+
     this.fields = {
         "id": {
             "dbs": "aut_idp_key",
@@ -167,6 +184,12 @@ function model_aut_idp(params)
             "label": L("aut_idp_aanmaak"),
             "typ": "date",
             "readonly": true
+        },
+        "usage" : {
+            "dbs": "dummy",
+            "label": L("aut_idp_usage"),
+            typ: "varchar",
+            sql: sqlteller
         }
     }
     this.includes = {
@@ -188,7 +211,7 @@ function model_aut_idp(params)
                         fld_hide = ["samlmetaurl"];
                         break;
                 case 5: // saml
-                        fld_hide = "algorithm audience secret timeout duration remoteloginurl remotelogouturl samlmetaurl clockskew".split(" ");
+                        fld_hide = "algorithm audience secret timeout duration remoteloginurl samlmetaurl clockskew".split(" ");
                         break;
             }
             for (var d=0; d<fld_hide.length; d++)

APPL/API2/model_bes_disciplineprod.inc

@@ -1,70 +0,0 @@
-<% /*
-    $Revision$
-    $Id$
-
-    File:           model_bes_disciplineprod.inc
-
-    Description:    Vanuit CodeCharge gegenereerd model voor bes_disciplineprod
-
-    Context:
-
-    Notes:
-*/
-%>
-<%
-
-function model_bes_disciplineprod()
-{
-    this.records_name = "ordercatalogues";
-    this.record_name = "ordercatalogue";
-    this.table = "ins_tab_discipline";
-    this.primary = "ins_discipline_key";
-    this.autfunction = "WEB_PRDMSU";
-    this.record_title = L("ins_tab_discipline");
-    this.records_title = L("ins_tab_discipline_m");
-
-
-    this.fields = {
-        "id": {
-            "dbs": "ins_discipline_key",
-            "label": L("lcl_key"),
-            "typ": "key",
-            "required": true,
-            "seq": "ins_s_ins_discipline_key",
-            "defaultvalue": null
-        },
-        "name": {
-            "dbs": "ins_discipline_omschrijving",
-            "label": L("ins_discipline_omschrijving"),
-            "typ": "varchar",
-            "required": true,
-            "filter": "like"
-        },
-        "module": {
-            "dbs": "ins_discipline_module",
-            "label": L("ins_discipline_module"),
-            "typ": "varchar",
-            "hidden_fld": true,
-            "defaultvalue": "PRD"
-        },
-        "remark": {
-            "dbs": "ins_discipline_opmerking",
-            "label": L("ins_discipline_opmerking"),
-            "typ": "memo"
-        }
-    };
-
-
-    this.REST_GET    = generic_REST_GET(this,
-                                           { "GET": {
-                                               wheres: [ "ins_discipline_verwijder IS NULL",
-                                                         "ins_discipline_module = 'PRD'"
-                                                   ]
-                                               }
-                                           }
-                                       );
-    this.REST_POST   = generic_REST_POST(this);
-    this.REST_PUT    = generic_REST_PUT(this);
-    this.REST_DELETE = generic_REST_DELETE(this, {});
-}
-%>

APPL/API2/model_bes_grootheid.inc

@@ -1,50 +0,0 @@
-<% /*
-    $Revision$
-    $Id$
-
-    File:           model_bes_grootheid.inc
-
-    Description:    Vanuit CodeCharge gegenereerd model voor bes_grootheid
-
-    Context:
-
-    Notes:
-*/
-%>
-<%
-
-function model_bes_grootheid()
-{
-    this.records_name = "orderunits";
-    this.record_name = "orderunit";
-    this.table = "bes_grootheid";
-    this.primary = "bes_grootheid_key";
-    this.soft_delete = "bes_grootheid_verwijder";
-    this.autfunction = "WEB_PRDMSU";
-    this.record_title = L("bes_grootheid");
-    this.records_title = L("bes_grootheid_m");
-
-
-    this.fields = {
-        "id": {
-            "dbs": "bes_grootheid_key",
-            "label": L("lcl_key"),
-            "typ": "key",
-            "required": true,
-            "seq": "bes_s_bes_grootheid_key"
-        },
-        "name": {
-            "dbs": "bes_grootheid_naam",
-            "label": L("bes_grootheid_naam"),
-            "typ": "varchar",
-            "required": true
-        }
-      };
-
-
-    this.REST_GET    = generic_REST_GET(this);
-    this.REST_POST   = generic_REST_POST(this);
-    this.REST_PUT    = generic_REST_PUT(this);
-    this.REST_DELETE = generic_REST_DELETE(this, {});
-}
-%>

APPL/API2/model_bes_kenmerkbestel.inc

@@ -127,7 +127,7 @@ function model_bes_kenmerkbestel()
                     "name": "",
                     "label": "",
                     "typ": "check",
-                    "mask": 3,
+                    "mask": 7,
                     "radios": [
                         {
                             "name": "overview_req",
@@ -140,6 +140,12 @@ function model_bes_kenmerkbestel()
                             "label": L("mgt_kenmerk_systeem_overview_pur"),
                             "mask": 2,
                             "defaultvalue": 0
+                        },
+                        {
+                            "name": "visible_bes_opdr",
+                            "label": L("lcl_bes_opdr_kenmerk_visible"),
+                            "mask": 4,
+                            "defaultvalue": 0
                         }
                     ]
                 }

APPL/API2/model_bes_srtdeel.inc

@@ -227,7 +227,7 @@ function model_bes_srtdeel(disc_key)
             "dbs": "ins_tab_discipline.ins_discipline_key",
             "typ": "key",
             "foreign": {
-                "tbl": "bes_discipline",
+                "tbl": "bes_v_aanwezigdiscipline",
                 "key": "ins_discipline_key",
                 "desc": "(" + lcl.xsql("ins_discipline_omschrijving", "ins_discipline_key") + ")",
                 "where": (disc_key > -1 ? "ins_discipline_key = " + disc_key : "")

APPL/API2/model_bes_srtkenmerk.inc

@@ -74,26 +74,24 @@ function model_bes_srtkenmerk(params)
                             "mask": 1,
                             "defaultvalue": 0
                         },
-                        {
-                            "name": "overview_req",
-                            "label": L("mgt_kenmerk_systeem_overview_req"),
-                            "mask": 2,
-                            "defaultvalue": 0
-                        },
-/*
-                        {
-                            "name": "conf",
-                            "label": L("mgt_kenmerk_systeem_conf"),
-                            "mask": 4,
-                            "defaultvalue": 0
-                        },
+                        // {
+                        //     "name": "conf",
+                        //     "label": L("mgt_kenmerk_systeem_conf"),
+                        //     "mask": 4,
+                        //     "defaultvalue": 0
+                        // },
                         {
                             "name": "ano",
                             "label": L("mgt_kenmerk_systeem_ano"),
                             "mask": 8,
                             "defaultvalue": 0
                         },
-*/
+                        {
+                            "name": "overview_req",
+                            "label": L("mgt_kenmerk_systeem_overview_req"),
+                            "mask": 2,
+                            "defaultvalue": 0
+                        },
                         {
                             "name": "overview_pur",
                             "label": L("mgt_kenmerk_systeem_overview_pur"),

APPL/API2/model_bes_srtprodgroep.inc

@@ -1,71 +0,0 @@
-<% /*
-    $Revision$
-    $Id$
-
-    File:           model_bes_srtprodgroep.inc
-
-    Description:    Vanuit CodeCharge gegenereerd model voor bes_srtprodgroep
-
-    Context:
-
-    Notes:
-*/
-%>
-<%
-
-function model_bes_srtprodgroep()
-{
-    this.records_name = "orderproductgroeps";
-    this.record_name = "orderproductgroep";
-    this.table = "bes_srtgroep";
-    this.primary = "bes_srtgroep_key";
-    this.autfunction = "WEB_PRDMSU";
-    this.record_title = L("bes_srtgroep");
-    this.records_title = L("bes_srtgroep_m");
-
-
-    this.fields = {
-        "id": {
-            "dbs": "bes_srtgroep_key",
-            "label": L("lcl_key"),
-            "typ": "key",
-            "required": true,
-            "seq": "bes_s_bes_srtgroep_key",
-            "defaultvalue": null
-        },
-        "orderdisciplines": {
-            "dbs": "ins_discipline_key",
-            "label": L("bes_ins_discipline_key"),
-            "typ": "key",
-            "required": true,
-            "foreign": {
-                "tbl": "ins_tab_discipline",
-                "key": "ins_discipline_key",
-                "desc": "ins_discipline_omschrijving",
-                "where": "ins_discipline_verwijder IS NULL AND ins_discipline_module = 'PRD'"
-            },
-            "emptyoption": L("mgt_all")
-        },
-        "name": {
-            "dbs": "bes_srtgroep_omschrijving",
-            "label": L("bes_srtgroep_omschrijving"),
-            "typ": "varchar"
-        }
-    };
-
-
-    this.REST_GET    = generic_REST_GET(this,
-                                           { "GET": {
-                                               wheres: [ "ins_discipline_key IN"
-                                                          + "( SELECT ins_discipline_key"
-                                                          + "    FROM ins_tab_discipline"
-                                                          + "   WHERE ins_discipline_module = 'PRD')"
-                                                       ]
-                                               }
-                                           }
-                                       );
-    this.REST_POST   = generic_REST_POST(this);
-    this.REST_PUT    = generic_REST_PUT(this);
-    this.REST_DELETE = generic_REST_DELETE(this, {});
-}
-%>

APPL/API2/model_bestpractices.inc

@@ -0,0 +1,110 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           model_bestpractices.inc
+
+    Description:    bestpractices model.
+    Parameters:     &failonly=1 laat alleen 'problemen' over
+    Context:        Levert data op of de inrichting wel volgens best-practices is
+
+    Notes:          Implementatie als api2-model om eenvoudiger XD queries te kunnen doen
+*/
+
+// 'best' alleen toevoegen als het afwijkt van de default waarde
+// Voeg dan eventueel een remark toe als toelichting
+var check_set = [{ name: "auto_https" },
+                 { name: "fac_html_strictness",
+                   best: "1",
+                   remark: "1=disallow html in messages, res-room description, flex-labels"
+                 },
+                 { name: "allow_framed_facilitor"  },
+                 { name: "fac_api_allow_impersonate" },
+                 { name: "fac_allow_jsonp" },
+                 { name: "prs_password_otp_mode", 
+                   best: 6,
+                   remark: "6=Force everyone to use OTP"
+                 },
+                 { name: "login_remember_days", 
+                   best: 0,
+                   remark: "0=Disable 'remember me'"
+                 },
+                 { name: "csp_header" },
+                 { name: "csp_header_extradata" },
+                 { name: "fac_api_allow_impersonate" },
+                 { name: "fac_api_key_in_url" },
+                 { name: "flexAllowedExt" },
+                 { name: "imgAllowedExt" },
+                 { name: "impAllowedExt" }, // (unused?)
+                 { name: "referrer_policy_header" },
+                 { name: "allowedLinkRegex" },
+                 { name: "fac_emailtoken_auth_expire" },
+                 { name: "fac_tamper_check" },
+                 { name: "hsts_maxage" },
+                 { name: "cookie_samesite" },
+                 { name: "self_register" } // (wil je niet 'per ongeluk' aan laten staan)
+                ];
+
+resultcodes = { ok: "No problem",
+                fatal: "No further checks possible, fix and recheck",
+                error: "Error, fix and recheck",
+                warning: "Warning: Could be more secure",
+                inform: "Information only"
+              }
+
+function model_bestpractices()
+{
+    this.autfunction = "WEB_FACTAB";
+    this.table = "bestpractices";
+    this.primary = "id";
+    this.records_name = "bestpractices";
+    this.record_name = "bestpractice";
+    this.fields = { "settingname"  : { typ: "varchar" },
+                    "defaultvalue" : { typ: "varchar" },
+                    "best"         : { typ: "varchar" },
+                    "remark"       : { typ: "varchar" },
+                    "value"        : { typ: "varchar" },
+                    "result"       : { typ: "varchar" }
+                  };
+
+    this.REST_GET = function _GET(params)
+        {
+            var best_data = [];
+            for (var s in check_set)
+            {
+                var set = check_set[s];
+                var one_data = { "settingname" : set.name,
+                                 "defaultvalue": null,
+                                 "value"       : settings.get_setting(set.name, null, true), // overrules verwarren alleen maar, geen S(set.name)
+                                 "best"        : null,
+                                 "remark"      : null,
+                                 "result"      : null
+                               }
+                var t = Application("SET_T_" + set.name);
+                var v = String(Application("SET_DEFAULT_" + set.name));
+                if (t == 'boolean')
+                  v = (v == "true") || (v == "1") || (v.toLowerCase() == "yes");
+                one_data.defaultvalue = v;
+                if ("best" in set)
+                  one_data.best = set.best;
+                else
+                  one_data.best = one_data.defaultvalue;
+
+                if (one_data.value == one_data.best)
+                {
+                    if (params.filter.failonly == '1')
+                      continue;
+                }
+                else
+                {
+                    one_data.result = resultcodes.warning;
+                    if ("remark" in set)
+                      one_data.remark = set.remark;
+                }
+                best_data.push(one_data);
+            };
+
+            return best_data;
+        }
+}
+%>

APPL/API2/model_bez_actie.inc

@@ -48,9 +48,34 @@ function model_bez_actie()
         "action": {
             "dbs": "bez_actie_flags",
             "label": L("bez_actie_flags"),
-            "typ": "key",
-            "required": true,
-            "LOV": L("bez_actie_flagsLOV")
+            "typ": "number",
+            "bits": [
+                {
+                    "name": "",
+                    "label": "",
+                    "typ": "check",
+                    "mask": 15,
+                    "radios": [ 
+                        {
+                            "name": "flag_oproepen",
+                            "label": L("bez_actie_flag_oproepen"),
+                            "mask": 1,
+                            "defaultvalue": 0
+                        },
+                        {   "name": "flag_badge",
+                            "label": L("bez_actie_flag_badge"),
+                            "mask": 2,
+                            "defaultvalue": 0
+                        },
+                        {
+                            "name": "flag_teams",
+                            "label": L("bez_actie_flag_teams"),
+                            "mask": 4,
+                            "defaultvalue": 0
+                        }
+                    ]
+                }
+            ]
         },
         "group": {
             "dbs": "bez_actie_groep_key",

APPL/API2/model_cad_thema.inc

@@ -79,14 +79,14 @@ function model_cad_thema()
         "position": {
             "dbs": "plaats.waar",
             "label": L("cad_label_type_waar"),
-            "typ": "varchar",
+            "typ": "key",
             "hidden_fld": true,
             "LOV": buildCadPositionLOV()
         },
         "situation": {
             "dbs": "plaats.situatie",
             "label": L("cad_label_type_situatie"),
-            "typ": "varchar",
+            "typ": "key",
             "hidden_fld": true,
             "LOV": buildCadSituationLOV()
         },

APPL/API2/model_cnt_disc_params.inc

@@ -138,8 +138,37 @@ model_cnt_disc_params =
             "label": L("cnt_discipline_huurder"),
             "typ": "check0",
             "defaultvalue": 1
+        },
+        "options": {
+            "dbs": "cnt_disc_params_opties",
+            "label": L("cnt_discipline_verlengbaar"),
+            "typ": "check0",
+            "defaultvalue": 0
         }
-
+/*      // Voor als in cnt_disc_params_opties meerdere bits worden gebruikt om verschillende opties aan te geven:
+        "options": {
+            "dbs": "cnt_disc_params_opties",
+            "label": L("cnt_discipline_optie"),
+            "typ": "number",
+            "bits": [
+                {
+                    "name": "",
+                    "label": "",
+                    "typ": "check",
+                    "mask": 1,
+                    "radios":  [
+                        {
+                            "name": "renewable",
+                            "label": L("cnt_discipline_verlengbaar"),
+                            "mask": 1,
+                            "defaultvalue": 0
+                        }
+                    ]
+                }
+            ],
+            "defaultvalue": 0
+        }
+*/
     }
 }
 

APPL/API2/model_cnt_factuurschema.inc

@@ -50,7 +50,9 @@ function model_cnt_factuurschema()
             "typ": "float",
             "iscurrency": true,
             "required": true,
-            "label": L("lcl_cnt_period_sum")
+            "label": L("lcl_cnt_period_sum"),
+            "total": true,
+            "multiedit": true
         },
         "description": {
             "dbs": "cnt_factuurschema_opmerking",

APPL/API2/model_cnt_kenmerk.inc

@@ -77,7 +77,6 @@ function model_cnt_kenmerk(params)
             "dbs": "cnt_srtcontract_key",
             "label": L("cnt_srtcontract_key"),
             "typ": "key",
-            "required": true,
             "foreign": {
                 "tbl": "(select ins_discipline_key"
                      + "      , ins_discipline_omschrijving"
@@ -124,12 +123,12 @@ function model_cnt_kenmerk(params)
             "label": L("mgt_kenmerk_toonbaar"),
             "typ": "check"
         },
-        "inlist": {
-            "dbs": "cnt_kenmerk_inlijst",
-            "label": L("mgt_kenmerk_systeem_overview"),
-            "typ": "check0",
-            "multiedit": true
-        },
+        // "inlist": {  // Dit werkt nog niet voor [CNT]
+        //     "dbs": "cnt_kenmerk_inlijst",
+        //     "label": L("mgt_kenmerk_systeem_overview"),
+        //     "typ": "check0",
+        //     "multiedit": true
+        // },
         "propertydefault": {
             "dbs": "cnt_kenmerk_default",
             "label": L("mgt_kenmerk_default"),

APPL/API2/model_fac_email_setting.inc

@@ -47,19 +47,22 @@ function model_fac_email_setting()
         "from": {
             "dbs": "fac_email_setting_from",
             "label": L("fac_email_setting_from"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "multiedit": true
         },
         "frommode": {
             "dbs": "fac_email_setting_frommode",
             "label": L("fac_email_setting_frommode"),
             "typ": "number",
             "required": true,
-            "LOV": L("fac_email_setting_frommodeLOV")
+            "LOV": L("fac_email_setting_frommodeLOV"),
+            "multiedit": true
         },
         "action": {
             "dbs": "fac_email_setting_action",
             "label": L("fac_email_setting_action"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "multiedit": true
         },
         "expire": {
             "dbs": "fac_email_setting_expire",
@@ -70,30 +73,41 @@ function model_fac_email_setting()
         "attachmentspath": {
             "dbs": "fac_email_setting_attachpath",
             "label": L("fac_email_setting_attachpath"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "multiedit": true
         },
         "attachext": {
             "dbs": "fac_email_setting_attachext",
             "label": L("fac_email_setting_attachext"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "multiedit": true
         },
         "reqattachext": {
             "dbs": "fac_email_setting_reqattachext",
             "label": L("fac_email_setting_reqattachext"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "multiedit": true
+        },
+        "attachmaxkb": {
+            "dbs": "fac_email_setting_attachmaxkb",
+            "label": L("fac_email_setting_attachmaxkb"),
+            "typ": "number",
+            "multiedit": true
         },
         "loglevel": {
             "dbs": "fac_email_setting_loglevel",
             "label": L("fac_email_setting_loglevel"),
             "typ": "number",
             "required": true,
-            "defaultvalue": 0
+            "defaultvalue": 0,
+            "multiedit": true
         },
         "person": {
             "dbs": "prs_perslid_key_auth",
             "label": L("fac_email_setting_perslid_key"),
             "typ": "key",
-            "foreign": "prs_perslid"
+            "foreign": "prs_perslid",
+            "multiedit": true
         },
         "remark": {
             "dbs": "fac_email_setting_opmerking",

APPL/API2/model_fac_gebruikersgroep.inc

@@ -171,10 +171,10 @@ function model_fac_gebruikersgroep(params)
 
     this.hook_pre_edit = function(obj, fld)
     {
-        if (!fld._fromperson && obj.person)
-        {
+        if (obj.id > 0) { // Bestaand record
             fld.authorizationgroup.readonly = true;
             fld.person.readonly = true;
+            delete this.fields._fromperson;
         }
     }
 

APPL/API2/model_fac_import_app.inc

@@ -132,17 +132,15 @@ function model_fac_import_app()
             "label": L("fac_import_app_prefix"),
             "typ": "varchar"
         },
-        "action": {
-            "dbs": "fac_import_app_action",
-            "label": L("fac_import_app_action"),
-            "typ": "varchar",
-            "required": true,
-            "defaultvalue": "ORACLE"
-        },
         "delimiter": {
             "dbs": "fac_import_app_delimiter",
             "label": L("fac_import_app_delimiter"),
             "typ": "varchar"
+        },
+        "csv": {
+            "dbs": "fac_import_app_csv",
+            "label": L("fac_import_app_csv"),
+            "typ": "check0"
         }
     };
 

APPL/API2/model_fac_notificatie_job.inc

@@ -13,7 +13,7 @@
 %>
 <%
 
-function model_fac_notificatie_job(niveau) // J voor Jobs, S voor Scheduled mail
+function model_fac_notificatie_job(params) // J voor Jobs, S voor Scheduled mail
 {
     this.records_name = "notificationjobs";
     this.record_name = "notificationjob";
@@ -129,10 +129,15 @@ function model_fac_notificatie_job(niveau) // J voor Jobs, S voor Scheduled mail
             "label": L("fac_notificatie_job_queue"),
             "typ": "varchar",
             "defaultvalue": "DEFAULT"
+        },
+        "fac_usrrap_key": {
+            dbs: "fac_usrrap_key",
+            typ: "key",
+            hidden_fld: true
         }
     };
 
-    if (niveau == 'S')
+    if (params.niveau == 'S')
     {
         delete this.fields["flags"];
         delete this.fields["jobmode"];
@@ -151,6 +156,16 @@ function model_fac_notificatie_job(niveau) // J voor Jobs, S voor Scheduled mail
             gparams.GET.wheres.push("prs_perslid_key_receiver = " + user_key); // alleen van jezelf
             this.autfunction = false;
         }
+
+        this.list = {
+            columns: [
+                "person",
+                "receiver",
+                "interval",
+                "lastrun",
+                "nextrun"
+            ]
+        };
     }
     else
     {
@@ -161,14 +176,15 @@ function model_fac_notificatie_job(niveau) // J voor Jobs, S voor Scheduled mail
                     wheres: ["fac_notificatie_job_view IS NOT NULL"]
                 }
             };
+        
+        if (user.has("WEB_PRSSYS"))
+        {
+            this.REST_POST   = generic_REST_POST(this);
+        }
     }
 
     this.REST_GET    = generic_REST_GET(this, gparams);
-    if (user.has("WEB_PRSSYS"))
-    {
-        this.REST_POST   = generic_REST_POST(this);
-    }
-        this.REST_PUT    = generic_REST_PUT(this);
+    this.REST_PUT    = generic_REST_PUT(this);
     this.REST_DELETE = generic_REST_DELETE(this);
 }
 %>

APPL/API2/model_fac_usrdata.inc

@@ -117,7 +117,7 @@ function model_fac_usrdata(tab_key, params)
     { // Is de waarde een verwijzing naar een andere waarde in een eigen tabel?
       if (fld.refdata)
         fld.refdata.foreign.tbl = "(    SELECT fac_usrdata_key"
-                                + "          , " + lcl.xsql("fac_usrdata_omschr", "fac_usrdata_key")
+                                + "          , " + lcl.xsqla("fac_usrdata_omschr", "fac_usrdata_key")
                                 + "          , fac_usrtab_key"
                                 + "          , fac_usrdata_verwijder"
                                 + "       FROM fac_usrdata"
@@ -126,7 +126,7 @@ function model_fac_usrdata(tab_key, params)
                                 + (obj.refdata && obj.refdata.id
                                   ? "   UNION"
                                     + " SELECT fac_usrdata_key"
-                                    + "      , " + lcl.xsql("fac_usrdata_omschr", "fac_usrdata_key") //+ " ||"
+                                    + "      , " + lcl.xsqla("fac_usrdata_omschr", "fac_usrdata_key") //+ " ||"
                                     + "      , fac_usrtab_key"
                                     + "      , fac_usrdata_verwijder"
                                     + "   FROM fac_usrdata"

APPL/API2/model_fin_kenmerk.inc

@@ -96,8 +96,38 @@ function model_fin_kenmerk(params)
         },
         "system": {
             "dbs": "fin_kenmerk_systeem",
-            "label": L("mgt_srtkenmerk_systeem"),
-            "typ": "check0"
+            "label": L("mgt_srtkenmerk_systeem_adv"),
+            "typ": "number",
+            "bits": [
+                {
+                    "name": "",
+                    "label": "",
+                    "typ": "check",
+                    "mask": 15,
+                    "radios": [
+                        {
+                            "name": "ksystem",
+                            "label": L("mgt_kenmerk_systeem"),
+                            "mask": 1,
+                            "defaultvalue": 0
+                        },
+                        // {
+                        //     "name": "conf",
+                        //     "label": L("mgt_kenmerk_systeem_conf"),
+                        //     "mask": 4,
+                        //     "defaultvalue": 0
+                        // },
+                        {
+                            "name": "ano",
+                            "label": L("mgt_kenmerk_systeem_ano"),
+                            "mask": 8,
+                            "defaultvalue": 0
+                        }
+                    ]
+                }
+            ],
+            "defaultvalue": 0,
+            "required": true
         },
         "inlist": {
             "dbs": "fin_kenmerk_inlijst",

APPL/API2/model_floors.inc

@@ -14,6 +14,8 @@
 %>
 <!-- #include file="../Shared/discxalg3d.inc"-->
 <!-- #include file="./model_cad_tekening.inc"-->
+<!-- #include file="./model_alg_kenmerk.inc"-->
+<!-- #include file="./model_custom_fields.inc"-->
 <%
 function model_floors() {
     this.table = "alg_verdieping";
@@ -37,6 +39,11 @@ function model_floors() {
             "model": new model_cad_tekening("V", { internal: true }),
             "joinfield": "floor",
             "enable_update": true
+        },
+        "custom_fields" : {
+            "model": new model_custom_fields(this, new model_alg_kenmerk("V", { internal: true }), { readman: true, readuse: true }),
+            "joinfield": "flexparentkey",
+            "enable_update": true
         }
     };
     this.REST_GET = function _GET(params) {

APPL/API2/model_generic.inc

@@ -129,14 +129,15 @@ function model_generic(table, autfunction)
         model.nrfields++;
         var field = { dbs: oRs.Fields("column_name").Value,
                       label: oRs.Fields("column_name").Value,
-                      typ: "varchar"
+                      typ: "varchar",
+                      ora_type: oRs("data_type").Value
                     };
-        var ora_type = oRs("data_type").Value;
+
         var ora_length = oRs("data_length").Value;
         var ora_precision = oRs("data_precision").Value;
         var ora_scale = oRs("data_scale").Value;
 
-        switch (ora_type)
+        switch (field.ora_type)
         {
             case 'NUMBER':
                 field.typ = 'number';
@@ -207,9 +208,10 @@ function model_generic(table, autfunction)
             case "CLOB":
             case "LONG":
                 field.typ = 'memo';
+                field.istyp = 'memo';
                 break;
             default: // als je hier komt is je view mogelijk niet valid of niet gecompileerd
-                abort_with_warning("Unknown Oracle type '{0}' for field '{1}.{2}'".format(ora_type, table, field.dbs));
+                abort_with_warning("Unknown Oracle type '{0}' for field '{1}.{2}'".format(field.ora_type, table, field.dbs));
         }
 
         var fld = oRs.Fields("column_name").Value;
@@ -238,7 +240,7 @@ function model_generic(table, autfunction)
             fld = "name";
             hasName = true;
         }
-        if (!hasName && fld.match(/(_omschrijving|_oms|_remark)$/))
+        if (!hasName && field.ora_type != 'CLOB' && fld.match(/(_omschrijving|_oms|_remark)$/))
         {
             fld = "name";
             hasName = true;

APPL/API2/model_ins_kenmerk.inc

@@ -6,8 +6,8 @@
 
     Description:    Vanuit CodeCharge gegenereerd model voor ins_kenmerk
 
-    Context:        Met parameter 'niveau' worden alleen de inspectiekenmerken getoond.
-                    Zonder, alle niet-inspectie kenmerken.
+    Context:        paramater: niveau=O:    Object kenmerken (level: D=Discipline, G=Objectgroep, S=Objectsoort)
+                               niveau=T:    Taak kenmerken (level:  T=Alle taken, C=Periodiek taken, E=Taakcategorie)
 
     Notes:
 */
@@ -17,6 +17,8 @@
 
 function model_ins_kenmerk(niveau, params)
 {
+    var isTaakKenmerk = (niveau == "T" || niveau == "E" || niveau == "C");
+
     params = params || {};
     this.records_name = "objectproperties";
     this.record_name = "objectproperty";
@@ -24,8 +26,8 @@ function model_ins_kenmerk(niveau, params)
     this.primary = "ins_kenmerk_key";
     this.soft_delete = "ins_kenmerk_verwijder";
     this.autfunction = params.internal?false:"WEB_INSMGT";
-    this.record_title = L("ins_kenmerk");
-    this.records_title = L("ins_kenmerk_m");
+    this.record_title = (isTaakKenmerk? L("ins_srtcontrole_kenmerk")    : L("ins_kenmerk"));
+    this.records_title = (isTaakKenmerk? L("ins_srtcontrole_kenmerk_m") : L("ins_kenmerk_m"));
     this.module = "INS";
     this.defaultIcon = "fa-table-tree";
 
@@ -99,25 +101,45 @@ function model_ins_kenmerk(niveau, params)
             "showtransit": true,
             "infoPointer": { Url: "appl/ins/ins_srtdeel.asp?srtdeel_key=" }
         },
+        "level": {
+            "dbs": "ins_kenmerk_niveau",
+            "label": L("mgt_kenmerk_niveau"),
+            "typ": "varchar",
+            "LOV": fill_ins_niveau_LOV(),
+            "defaultvalue": "T",
+            "showtransit": true,
+            "insertonly": true
+        },
+        "taskdiscipline": {
+            "dbs": "ctr_v_allsrtinstallatie.ins_discipline_key",
+            "label":  L("ctr_discipline"),
+            "typ": "key",
+            "foreign": { "tbl": "ctr_v_aanwezigdiscipline",
+                         "key": "ins_discipline_key",
+                         "desc": "ins_discipline_omschrijving",
+                         "where": "ins_discipline_verwijder IS NULL"
+                       },
+            "showtransit": true,
+            "insertonly": true,
+            "emptyoption": L("mgt_kenmerk_controle_all")
+        },
+        "task": {
+            "dbs": "ctr_v_allsrtinstallatie.ins_srtcontrole_key",
+            "label": L("ins_srtcontrole"),
+            "typ": "key",
+            "foreign": "ins_srtcontrole",
+            "foreignfiltercode": "PI",
+            "urlAdd": [{urlParam: "ctrdisc_key_arr", field: "taskdiscipline"}],
+            "showtransit": true,
+            "insertonly": true,
+            "emptyoption": " "
+        },
         "objectkey": {
             "dbs": "ins_srtinstallatie_key",
             "label": L("lcl_ins_object"),
             "typ": "key",
             "hidden_fld": true,
-            "required": true,
-            "foreign": {"tbl": "ins_srtcontrole",
-                        "key": "ins_srtcontrole_key",
-                        "desc": "ins_srtcontrole_omschrijving"
-                       }
-        },
-        "level": {
-            "dbs": "ins_kenmerk_niveau",
-            "label": L("mgt_kenmerk_niveau"),
-            "typ": "varchar",
-            "hidden_fld": true,
-            "LOV": fill_ins_niveau_LOV(),
-            "defaultvalue": "C",
-            "showtransit": true
+            "required": true
         },
         "editlevel": {
             "dbs": "ins_kenmerk_bewerkniveau",
@@ -139,9 +161,23 @@ function model_ins_kenmerk(niveau, params)
             "label": L("ins_kenmerk_verplicht"),
             "typ": "key",
             "LOV": fill_verplicht_LOV(),
+            "listfunction": function(oRs) {
+                var val = oRs.Fields("required.name").Value;
+                if (val === null) {
+                    return L("lcl_mld_niet_verplicht");
+                }
+                return val;
+            },
             "emptyoption": L("lcl_mld_niet_verplicht"),
             "multiedit": true
         },
+        "requiredstatus": {
+            "dbs": "ins_kenmerk_verplicht_status",
+            "label": L("ins_kenmerk_verplicht_status"),
+            "typ": "key",
+            "LOV": L("ins_kenmerk_requiredstatusLOV"),
+            "emptyoption": null
+        },
         "group": {
             "dbs": "ins_kenmerk_groep",
             "label": L("ins_kenmerk_groep"),
@@ -160,7 +196,29 @@ function model_ins_kenmerk(niveau, params)
         "inlist": {
             "dbs": "ins_kenmerk_inlijst",
             "label": L("mgt_kenmerk_systeem_overview"),
-            "typ": "check0",
+            "typ": "number",
+            "bits": [
+                {
+                    "name": "",
+                    "label": "",
+                    "typ": "check",
+                    "mask": 3,
+                    "radios": [
+                        {
+                            "name": "inplan",
+                            "label": L("mgt_kenmerk_systeem_overview_obj"),
+                            "mask": 1,
+                            "defaultvalue": 0
+                        },
+                        {
+                            "name": "start",
+                            "label": L("mgt_kenmerk_systeem_overview_mjob"),
+                            "mask": 2,
+                            "defaultvalue": 0
+                        }
+                    ]
+                }
+            ],
             "multiedit": true
         },
         "measurement": {
@@ -246,76 +304,57 @@ function model_ins_kenmerk(niveau, params)
         return result;
     }
 
-    this.list = {
-        "columns": ["id",
-                    "objectpropertydesc",
-                    "objectpropertytype",
-                    "sequence",
-                    "required",
-                    "group"
-                   ]
-    };
-/*
-    this.search = {
-        "autosearch": true,
-        "filters": ["level",
-                    "objectdiscipline",
-                    "objectgroup",
-                    "objecttype",
-                    "objectpropertytype"
-                   ]
-    };
-    this.edit = { modal: true};
-*/
-
     // Server side code!
     //
     // Afhankelijk van niveau:
 
     var gparams = { GET: { } };
-    if (niveau == "C")
+    if (isTaakKenmerk)
     {
-        delete this.fields.objectdiscipline;
-        delete this.fields.objectgroup;
-        delete this.fields.objecttype;
-        delete this.fields.editlevel;
-        delete this.fields.measurement;
-        this.fields.objectkey.label = L("ins_srtcontrole");
-        this.record_title = L("ins_srtcontrole_kenmerk");
-        this.records_title = L("ins_srtcontrole_kenmerk_m");
-        gparams.GET = {wheres: [ "ins_kenmerk.ins_kenmerk_niveau = " + safe.quoted_sql(niveau)
-                               , "ins_kenmerk.ins_kenmerk_verwijder IS NULL"
-                               ]
-                      };
+      delete this.fields.objectdiscipline;
+      delete this.fields.objectgroup;
+      delete this.fields.objecttype;
+      delete this.fields.editlevel;
+      delete this.fields.measurement;
+
+      gparams.GET = {tables: ["ctr_v_allsrtinstallatie"],
+                     wheres: [ "ins_kenmerk.ins_kenmerk_niveau IN ('T', 'E', 'C')" // E=Taakcategorie (discipline), C=Periodiek taak.
+                             , "(ins_kenmerk.ins_srtinstallatie_key = ctr_v_allsrtinstallatie.ctr_srtinstallatie_key OR ins_kenmerk.ins_srtinstallatie_key IS NULL)"
+                             , "ins_kenmerk.ins_kenmerk_niveau = ctr_v_allsrtinstallatie.niveau"
+                             , "ins_kenmerk.ins_kenmerk_verwijder IS NULL"
+                             ]
+                    };
     }
     else
     {   //kenmerk_niveau: D | G | S
-        this.record_title = L("ins_kenmerk");
-        this.records_title = L("ins_kenmerk_m");
-        gparams.GET = {tables: ["ins_v_allsrtinstallatie"],
-                       wheres: [ "ins_kenmerk.ins_kenmerk_niveau <> 'C'",
-                                 "ins_kenmerk.ins_srtinstallatie_key = ins_v_allsrtinstallatie.ins_srtinstallatie_key",
-                                 "ins_kenmerk.ins_kenmerk_niveau = ins_v_allsrtinstallatie.niveau"
-                               ]
-                      };
+      delete this.fields.requiredstatus;
+      delete this.fields.taskdiscipline;
+      delete this.fields.task;
+
+      gparams.GET = {tables: ["ins_v_allsrtinstallatie"],
+                     wheres: [ "ins_kenmerk.ins_kenmerk_niveau IN ('D', 'G', 'S')",
+                               "ins_kenmerk.ins_srtinstallatie_key = ins_v_allsrtinstallatie.ins_srtinstallatie_key",
+                               "ins_kenmerk.ins_kenmerk_niveau = ins_v_allsrtinstallatie.niveau"
+                             ]
+                    };
     }
 
     function fill_verplicht_LOV()
-    {   // Listbox verplicht vullen. Bij het veld is de emptyoption gezet.
-        // Hierdoor is er altijd een waarde geselecteerd.
-        return  "1;" + L("lcl_mld_altijd_verplicht")
-             + ";2;" + L("lcl_mld_groepsverplichting");
+    { // Listbox verplicht vullen. Bij het veld is de emptyoption gezet.
+      // Hierdoor is er altijd een waarde geselecteerd.
+      return  "1;" + L("lcl_mld_altijd_verplicht")
+           + ";2;" + L("lcl_mld_groepsverplichting");
     }
 
     function fill_groepsverplichting_LOV()
-    {   // Listbox groepsverplichting vullen.
-        var groep_array = ["0", "<"+L("lcl_none")+">"];
-        for (i=1; i<=9; i++)
-        {
-            groep_array.push(i)
-            groep_array.push(L("ins_kenmerk_groep")+" "+i);
-        }
-        return groep_array.join(";");
+    { // Listbox groepsverplichting vullen.
+      var groep_array = ["0", "<"+L("lcl_none")+">"];
+      for (i=1; i<=9; i++)
+      {
+        groep_array.push(i)
+        groep_array.push(L("ins_kenmerk_groep")+" "+i);
+      }
+      return groep_array.join(";");
     }
 
     this.REST_GET    = generic_REST_GET(this, gparams);
@@ -326,10 +365,42 @@ function model_ins_kenmerk(niveau, params)
 
     function fill_ins_niveau_LOV()
     {
-        return  "D;"+L("mgt_srtkenmerk_discipline")
-             + ";G;"+L("mgt_srtkenmerk_srtgroep")
-             + ";S;"+L("mgt_srtkenmerk_srtdeel");
+      return  "T;" + L("mgt_kenmerk_controle_all")
+           + ";E;" + L("mgt_kenmerk_ctrdiscipline")
+           + ";C;" + L("mgt_kenmerk_srtcontrole")
+           + ";D;" + L("mgt_srtkenmerk_discipline")
+           + ";G;" + L("mgt_srtkenmerk_srtgroep")
+           + ";S;" + L("mgt_srtkenmerk_srtdeel")
+           + ";O;" + "Objecten";
     }
 
+    this.hook_pre_edit = function (obj, fld)
+    {
+      fld.propertydefault.label = this_model.get_objectpropertytype_srttype(obj).lbl_default;
+      fld.readonly.label = this_model.get_objectpropertytype_srttype(obj).lbl_readonly;
+      if (!obj.level.name)
+      {
+        if (obj.level.id == "O")
+            obj.level.name = L("lcl_ins_objects");
+        else if (obj.level.id == "T")
+            obj.level.name = L("ins_srtcontrole_m");
+        else
+            obj.level.name = obj.level.id;
+      }
+%>
+      <script>
+        var srtinstallatieselector_available = 1; // toon alleen actuele disciplines/groepen en objecten.
+      </script>
+<%
+    }
+
+    this.hook_pre_search = function(fld)
+    {
+%>
+      <script>
+        var srtinstallatieselector_available = 1; // toon alleen actuele disciplines/groepen en objecten.
+      </script>
+<%
+    }
 }
 %>

APPL/API2/model_ins_srtcontrole.inc

@@ -284,6 +284,7 @@ function model_ins_srtcontrole()
             "dbs": "ins_srtcontrole_options",
             "label": L("ins_srtcontrole_options"),
             "typ": "number",
+            "multiedit": true,
             "bits": [
                 {
                     "name": "",
@@ -338,14 +339,18 @@ function model_ins_srtcontrole()
         }
     };
 
-    // Kenmerk *definities* als include is vrij uitzonderlijk
-    this.includes = {
-        "custom_properties": {
-            "model": new model_ins_kenmerk("C", { internal: true }),
-            "joinfield": "objectkey",
-            "enable_update": true
-        }
-    };
+    // Met BAUS#80301 is er een eigen menuitem gekomen waarmee de taakkenmerken aangemaakt kunnen worden op dezelfde manier als bij andere kenmerken.
+    // Taakkenmerken kunnen dan ook aangemaakt worden die voor alle taken gelden of voor een taakcategorie (ctrdiscipline).
+    // Het tabje "Taakkenmerken bij een taak heb je dan niet meer nodig en is daarom hieronder uitgecommentariseerd.
+    //
+    //// Kenmerk *definities* als include is vrij uitzonderlijk
+    //this.includes = {
+    //    "custom_properties": {
+    //        "model": new model_ins_kenmerk("C", { internal: true }),
+    //        "joinfield": "objectkey",
+    //        "enable_update": true
+    //    }
+    //};
 
     this.REST_GET    = generic_REST_GET(this, {
                             "GET": {

APPL/API2/model_ins_srtdeel.inc

@@ -31,23 +31,9 @@ function model_ins_srtdeel()
             "label": L("lcl_key"),
             "typ": "key",
             "required": true,
-            "seq": "ins_s_ins_srtdeel_key",
+            "seq": "ins_s_ins_srtinst_keys",
             "defaultvalue": null
         },
-        "objectdiscipline": {
-            "dbs": "ins_discipline_key",
-            "label": L("lcl_discipline"),
-            "typ": "key",
-            "foreign": {
-                "tbl": "ins_v_aanwezigdiscipline",
-                "key": "ins_discipline_key",
-                "desc": "ins_discipline_omschrijving"
-            },
-            "LOVinit": "",
-            "defaultvalue": null,
-            "showtransit": true,
-            "onchange": "onChangeDiscipline()"
-        },
         "objectgroup": {
             "dbs": "ins_srtgroep_key",
             "label": L("lcl_obj_group"),
@@ -56,7 +42,7 @@ function model_ins_srtdeel()
             "insertonly": true,
             "foreign": {
                 "tbl": "ins_v_aanwezigsrtgroep",
-                "key": "inssrtgroep_key",
+                "key": "ins_srtgroep_key",
                 "desc": "ins_srtgroep_omschrijving"
             },
             "LOVinit": "",

APPL/API2/model_ins_tab_discipline.inc

@@ -50,7 +50,8 @@ function model_ins_tab_discipline(disc_key, params)
             "foreign" : {
               "tbl": "ins_srtdiscipline",
               "key": "ins_srtdiscipline_key",
-              "desc": "ins_srtdiscipline_omschrijving"
+              "desc": "ins_srtdiscipline_omschrijving",
+              "where": "ins_srtdiscipline_verwijder IS NULL"
             }
         },
         "scope": {

APPL/API2/model_issues.inc

@@ -53,10 +53,11 @@ function model_issues(mld_key, params)
              "actiondate" : { dbs: "mld_melding_actiedatum",                       typ: "datetime",                                        label: L("lcl_mld_actiondate"),    track: true},
              "treatmentteam":{dbs: "mld_ins_discipline_key",                       typ: "key",      foreign: "mld_discipline",             label: L("mld_processing_group"),   track: true },
              "issuetype"  : { dbs: "mld_stdmelding_key",                           typ: "key",      foreign: "mld_stdmelding",             label: L("lcl_complain"),          track: true },
-             "description": { dbs: "mld_melding_omschrijving",                     typ: "varchar",                                         label: L("lcl_descr"),             track: true,  filter: "like" },
+             "description": { dbs: "mld_melding_omschrijving",                     typ: "clob",     len: S("mld_melding_oms_maxlen"),      label: L("lcl_descr"),             track: true,  filter: "like" },
              "remark"     : { dbs: "mld_melding_opmerking",                        typ: "varchar",                                         label: L("lcl_remark"),            track: true},
-             "subject"    : { dbs: "mld_melding_onderwerp",                        typ: "varchar",                                         label: L("lcl_mld_subject"),       track: true},
+             "subject"    : { dbs: "mld_melding_onderwerp",                        typ: "varchar",                                         label: L("lcl_mld_subject"),       track: true, len: 200},
              "status"     : { dbs: "mld_melding_status",                           typ: "key",      foreign: mld.getmldstatustext,         label: L("lcl_status"),            track: true,  filter: mld.getStatusSql },
+             "conceptstatus": { dbs: "mld_melding_conceptstatus",                  typ: "number",                                          label: L("lcl_mld_conceptstatus"), track: true},
              "flag"       : { dbs: "mld_melding_flag",                             typ: "key", /* geen echte key, wel key-gedrag */        label: L("lcl_mld_flags"),         track: true },
              "origin"     : { dbs: "mld_meldbron_key",                             typ: "key",      foreign: { tbl: "mld_meldbron",
                                                                                                                key: "mld_meldbron_key",
@@ -75,7 +76,7 @@ function model_issues(mld_key, params)
              "parent"     : { dbs: "mld_melding_parentkey",                        typ: "key",      xforeign: "mld_melding",               label: L("lcl_mld_completion_in"), track: true },
              "continuedfrom": { dbs: "mld_melding_start_key",                      typ: "key",      xforeign: "mld_melding",               label: L("lcl_mld_continue_of"),   track: true },
              "extern_id"  : { dbs: "mld_melding_externnr",                         typ: "varchar",                                         label: L("lcl_mld_externr"),       track: true },
-             "extern_sync": { dbs: "mld_melding_externsyncdate",                   typ: "datetime",                                        label: L("extern_syncdate"),       readonly: !(user.has("WEB_FACTAB") || user.has("WEB_FACXNR")) },
+             "extern_sync": { dbs: "mld_melding_externsyncdate",                   typ: "datetime", "withseconds": true,                   label: L("extern_syncdate"),       readonly: !(user.has("WEB_FACTAB") || user.has("WEB_FACXNR")) },
              "kto_key"    : { dbs: "mld_melding_kto_key",                          typ: "key",                                             label: L("lcl_mld_linktoparent"),  track: true },
              "kto_type"   : { dbs: "mld_melding_kto_type",                         typ: "varchar",                                         label: L("lcl_mld_kto"),           track: true },
              "kto"        : { dbs: "mld_melding_kto",                              typ: "number",                                          label: L("lcl_mld_kto_invite"),    track: true },
@@ -481,7 +482,6 @@ function model_issues(mld_key, params)
         delete_fld(jsondata, "handler",       !this_mld.canAfhandChange);
         delete_fld(jsondata, "public",        !mld_info.canbepublished);
         delete_fld(jsondata, "origin",        true);
-        delete_fld(jsondata, "extern_id",     !inArray(mld_info.meldbron_key, S("mld_meldbron_extern")) );
         delete_fld(jsondata, "indult" ,       !(stdm_info.slabewaken && this_mld.canSLAChange) );
         delete_fld(jsondata, "completed",     !this_mld.canAfrond);
         delete_fld(jsondata, "kto",           !((mld_info.kto_opt & 2) == 2 && mld_info.kto_verstuurd == null && this_mld.canClose) );
@@ -699,7 +699,7 @@ function model_issues(mld_key, params)
                   var wheres = [" mld_melding_key = " + mld_key];
                   var mldUpd = buildTrackingUpdate("mld_melding", wheres.join(" AND " ), dbfields, { noValidateToken: true });
 
-                  var err = Oracle.Execute(mldUpd.sql, true);
+                  var err = Oracle.Execute(mldUpd, true);
                   if (err.friendlyMsg)
                       abort_with_warning(err.friendlyMsg);
               }
@@ -715,10 +715,14 @@ function model_issues(mld_key, params)
 
               if (jsondata.status > 0)
               {
-                mld.setmeldingstatus(mld_key, jsondata.status);
-                if (jsondata.status == 1)  // Afwijzen.
-                  // Handle workflow actions for rejection:
-                  mld.nextworkflowstep(mld_key, 0);  // 0 = rejected.
+                // Alleen als de status WIJZIGT moeten we die ZETTEN. Dat kan een statusverandering zijn
+                // of het einde van de concept-fase waardoor de bestaande status echt wordt.
+                if (jsondata.status != old_mld["status"]["id"] || (jsondata.conceptstatus == 0 && old_mld["conceptstatus"] != 0))
+                {
+                    mld.setmeldingstatus(mld_key, jsondata.status);
+                    if (jsondata.status == 1)  // Afwijzen: Handle workflow actions for rejection:
+                        mld.nextworkflowstep(mld_key, 0);  // 0 = rejected.
+                }
               }
 
               if (saveBehandelaar && jsondata.handler != old_mld["handler"])
@@ -801,13 +805,12 @@ function model_issues(mld_key, params)
 
             var mldIns = buildInsert("mld_melding", dbfields, { noValidateToken: true });
             var new_key = mldIns.sequences["mld_melding_key"];
-            var sql = mldIns.sql;
-            Oracle.Execute(mldIns.sql);
+            Oracle.Execute(mldIns);
+            mld.setmeldingstatus(new_key, (stdm.xmld_directklaar? 0 : 2)); // Zorgt ook voor tracking & daarmee notificatie
 
             params.filter = { id: new_key }; // De nieuwe mld_melding_key.
             var mldtrack = api2.process_includes(params, this, jsondata, new_key);
 
-            mld.setmeldingstatus(new_key, (stdm.xmld_directklaar? 0 : 2)); // Zorgt ook voor tracking & daarmee notificatie
 
             if (jsondata.treatmentteam > 0)
                 mld.notifybehandelteam(new_key, jsondata.treatmentteam);

APPL/API2/model_mld_kenmerk.inc

@@ -170,6 +170,24 @@ function model_mld_kenmerk(niveau, params)
             "label": L("mgt_kenmerk_autorisatie"),
             "typ": "key",
             "foreign": "fac_functie"
+        },
+        "treatmentteam": {
+            "dbs": "ins_discipline_key",
+            "label": L("mld_processing_group_kenm"),
+            "typ": "key",
+            //"foreign": "mld_discipline"
+            "foreign": {
+                "tbl": "(SELECT d.ins_discipline_key"
+                     + "      , d.ins_discipline_omschrijving"
+                     + "   FROM mld_v_aanwezigdiscipline d"
+                     + "      , ins_srtdiscipline sd"
+                     + "      , mld_disc_params dp"
+                     + "  WHERE d.ins_srtdiscipline_key = sd.ins_srtdiscipline_key"
+                     + "    AND dp.mld_ins_discipline_key = d.ins_discipline_key"
+                     + "    AND BITAND(dp.mld_disc_params_srtgroep, 2) = 2)",
+                "key": "ins_discipline_key",
+                "desc": "ins_discipline_omschrijving"
+            }
         }
     };
 
@@ -228,7 +246,7 @@ function model_mld_kenmerk(niveau, params)
             "typ": "varchar",
             "required": true,
             "insertonly": !is_clone,
-            "LOV": buildKenmerktypeLOV()
+            "LOV": buildKenmerktypeLOV(null, { module: "MLD" })
         },
         "code": {
             "dbs": "mld_kenmerk_code",
@@ -251,7 +269,7 @@ function model_mld_kenmerk(niveau, params)
             "emptyoption": L("mld_srtdiscipline_m_all")
         },
         "discipline": {
-            "dbs": "view_mld_kenmerk.ins_discipline_key", //"mld_discipline.ins_discipline_key",
+            "dbs": "view_mld_kenmerk.discipline", //"mld_discipline.ins_discipline_key",
             "label": L("lcl_mld_vakgroep"),
             "typ": "key",
             "foreign": "mld_discipline",
@@ -359,8 +377,8 @@ function model_mld_kenmerk(niveau, params)
                     + " WHERE mld_srtkenmerk_key = " + issuepropertytype;
             var oRs = Oracle.Execute(sql);
             if (!oRs.eof)
-                result.lbl_default  = (oRs("mld_srtkenmerk_kenmerktype").Value == "l" ? L("mgt_kenmerk_icon"): L("mgt_kenmerk_default"));
-                result.lbl_readonly = (oRs("mld_srtkenmerk_kenmerktype").Value == "l" ? L("mgt_kenmerk_collapsed"): mld_opdr_readonly);
+                result.lbl_default  = (oRs("mld_srtkenmerk_kenmerktype").Value == "l" || oRs("mld_srtkenmerk_kenmerktype").Value == "b"? L("mgt_kenmerk_icon") : L("mgt_kenmerk_default"));
+                result.lbl_readonly = (oRs("mld_srtkenmerk_kenmerktype").Value == "l" || oRs("mld_srtkenmerk_kenmerktype").Value == "b"? L("mgt_kenmerk_collapsed") : mld_opdr_readonly);
             oRs.Close();
         }
         return  result;
@@ -371,11 +389,16 @@ function model_mld_kenmerk(niveau, params)
     {
         delete this.fields.filled;
         delete this.fields.issuepropertytypename;
-        delete this.fields.attributetype;
 
-        if (obj.id != -1 && obj.level.id == "D")
+       if (obj.id != -1 && obj.level.id == "D")
             delete this.fields.mld_issuetype;
 
+        // Het behandelteam alleen tonen bij behandelbare bloktitels in de edit-mode.
+        if (obj.id != -1 && obj.attributetype && obj.attributetype.id != "b")
+          delete this.fields.treatmentteam;
+
+       delete this.fields.attributetype;
+
         if (!obj.level.name)
         {
             if (obj.level.id == "M")
@@ -392,6 +415,9 @@ function model_mld_kenmerk(niveau, params)
         var srttype = get_issuepropertytype_srttype(obj);
         fld["default"].label = srttype.lbl_default;
         fld["readonly"].label = srttype.lbl_readonly;
+
+        if (obj.attributetype && (obj.attributetype.id == "b" || obj.attributetype.id == "l"))
+            fld["default"].typ = "icon";
     %>
         <script>
             var module = "MLD";
@@ -400,6 +426,8 @@ function model_mld_kenmerk(niveau, params)
             var ordertype_key = "<%=v_ordertype_key%>";
             var kenmerk_key = <%=kenmerk_key%>;
             var is_clone = <%=v_isclone%>;
+            var attributetype = "<%=( (obj.attributetype && obj.attributetype.id) ? obj.attributetype.id : "")%>";
+            var issuepropertytype = "<%=( (obj.issuepropertytype && obj.issuepropertytype.id) ? obj.issuepropertytype.id : -1)%>";
         </script>
     <%
     }
@@ -429,6 +457,20 @@ function model_mld_kenmerk(niveau, params)
         fld["readonly"].label = srttype.lbl_readonly;
     }
 
+    this.hook_pre_post = function (params, obj)
+    {   // Verwijder eventuele waarde voor treatmentteam (ins_discipline_key) als het geen bloktitel met behandelaar is.
+        var sql = "SELECT mld_srtkenmerk_kenmerktype"
+                + "  FROM mld_srtkenmerk"
+                + " WHERE mld_srtkenmerk_key = " + obj.issuepropertytype;
+        var oRs = Oracle.Execute(sql);
+        var kenmerktype = oRs("mld_srtkenmerk_kenmerktype").Value;
+        oRs.Close();
+        if (kenmerktype != "b")
+        {
+            obj.treatmentteam = null;
+        }
+    }
+
     var gparams = {"GET": {}};
     if (isOpdrachtKenmerk)
     {
@@ -445,7 +487,7 @@ function model_mld_kenmerk(niveau, params)
                         + "     , s.ref_mld_stdmelding_key"
                         + "     , s.mld_stdmelding_key  mld_mld_stdmelding_key"
                         + "     , s.mld_stdmelding_omschrijving"
-                        + "     , s.ins_discipline_key"
+                        + "     , s.ins_discipline_key discipline"
                         + "     , s.ins_srtdiscipline_key"
                         + "     , aantal"
                         + "     , aantal365"

APPL/API2/model_mld_meldbron.inc

@@ -20,7 +20,7 @@ function model_mld_meldbron()
     this.table = "mld_meldbron";
     this.primary = "mld_meldbron_key";
     this.soft_delete = "mld_meldbron_verwijder";
-    this.autfunction = "WEB_PRSSYS";
+    this.autfunction = "WEB_MLDMGT";
     this.record_title = L("mld_meldbron");
     this.records_title = L("mld_meldbron_m");
 
@@ -39,10 +39,45 @@ function model_mld_meldbron()
             "typ": "varchar",
             "required": true
         },
-        "default": {
-            "dbs": "mld_meldbron_default",
-            "label": L("mld_meldbron_default"),
-            "typ": "check"
+        "selectable": {
+            "dbs": "mld_meldbron_kiesbaar",
+            "label": L("mld_meldbron_kiesbaar"),
+            "typ": "number",
+            "bits": [
+                {
+                    "name": "",
+                    "label": "",
+                    "typ": "check",
+                    "mask": 3,
+                    "radios": [
+                        {
+                            "name": "select_fo",
+                            "label": L("mld_meldbron_kiesbaar1"),
+                            "mask": 1,
+                            "defaultvalue": 0
+                        },
+                        {
+                            "name": "edit_ext",
+                            "label": L("mld_meldbron_kiesbaar2"),
+                            "mask": 2,
+                            "defaultvalue": 0
+                        }
+                    ]
+                }
+            ],
+            "defaultvalue": "0"
+        },
+        "selectable_select_fo": {
+            "dbs": "selectable_select_fo",
+            "sql": "CASE WHEN (BITAND(mld_meldbron.mld_meldbron_kiesbaar,1)=1) THEN 1 ELSE 0 END",
+            "label": L("mld_meldbron_kiesbaar1"),
+            "typ": "check0"
+        },
+        "selectable_edit_ext": {
+            "dbs": "selectable_exit_ext",
+            "sql": "CASE WHEN (BITAND(mld_meldbron.mld_meldbron_kiesbaar,2)=2) THEN 1 ELSE 0 END",
+            "label": L("mld_meldbron_kiesbaar2"),
+            "typ": "check0"
         }
     };
 

APPL/API2/model_mld_opdr.inc

@@ -24,6 +24,7 @@ function model_mld_opdr()
     this.records_name = "orders";
     this.record_name = "order";
     this.table = "mld_opdr";
+    this.trackcode = "ORDUPD";
     this.primary = "mld_opdr_key";
     this.record_title = L("lcl_fin_mld_opdr");
     this.records_title = L("lcl_fin_opdrachten");
@@ -168,13 +169,15 @@ function model_mld_opdr()
             "typ": "key",
             "required": true,
             "foreign": bgt_company_foreign(),
-            "showtransit": true
+            "showtransit": true,
+            "track": true
         },
         "reference": {
             "dbs": "mld_opdr_id",
             "label": L("lcl_opdr_id"),
             "typ": "varchar",
-            "showtransit": true
+            "showtransit": true,
+            "track": true
         },
          "ordernr_sort": {
             "dbs": "mld_opdr_ordernr_int",
@@ -187,7 +190,8 @@ function model_mld_opdr()
             "dbs": "mld_opdr_ordernr",
             "label": S("bgt_enabled")? L("bgt_opdr_ordernr") : L("lcl_mld_inf_Ordernr"),
             "typ": (S("bgt_enabled")? "number" : "varchar"),
-            "hidden_fld": true
+            "hidden_fld": true,
+            "track": true
         },
         "sequence": {
             "dbs": "mld_opdr_bedrijfopdr_volgnr",
@@ -201,19 +205,22 @@ function model_mld_opdr()
             "label": S("bgt_enabled")? L("bgt_budget_account") : L("lcl_mld_kosten"),
             "typ": "key",
             "foreign": bgt_account_foreign(),
-            "showtransit": true
+            "showtransit": true,
+            "track": true
         },
         "description": {
             "dbs": "mld_opdr_omschrijving",
             "label": L("lcl_descr"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "track": true
         },
         "startdate": {
             "dbs": "mld_opdr_datumbegin",
             "label": S("bgt_enabled")? L("bgt_contractdatum") : L("lcl_orderdate"),
             "typ": S("bgt_enabled")? "date" : "datetime",
             "filter": (S("bgt_enabled")? "exact" : "range"),
-            "showtransit": (S("bgt_enabled")? true : false)
+            "showtransit": (S("bgt_enabled")? true : false),
+            "track": true
         }
     };
 
@@ -222,25 +229,29 @@ function model_mld_opdr()
             "dbs": "mld_opdr_einddatum",
             "label": L("lcl_opdr_enddate"),
             "typ": "datetime",
-            "filter": "range"
+            "filter": "range",
+            "track": true
         },
         "plandate": {
             "dbs": "mld_opdr_plandatum",
             "label": L("lcl_opdr_plandate"),
             "typ": "datetime",
-            "filter": "range"
+            "filter": "range",
+            "track": true
         },
         "plandate2": {
             "dbs": "mld_opdr_plandatum2",
             "label": L("lcl_opdr_plandate2"),
             "typ": "datetime",
-            "filter": "range"
+            "filter": "range",
+            "track": true
         },
         "contact": {
             "dbs": "prs_contactpersoon_key",
             "label": L("lcl_contact_pers"),
             "typ": "key",
-            "foreign": mld_contact_foreign()
+            "foreign": mld_contact_foreign(),
+            "track": true
         },
         "costtype": {
             "dbs": "prs_kostensoort_key",
@@ -248,24 +259,28 @@ function model_mld_opdr()
             "typ": "key",
             "foreign": "prs_kostensoort",
             "readonly": S("mld_opdr_alt_kostensoort") == 1? false : true,
-            "LOVinit": ""
+            "LOVinit": "",
+            "track": true
         },
         "hours": {
             "dbs": "mld_opdr_uren",
             "label": L("lcl_mld_nrhours"),
-            "typ": "float"
+            "typ": "float",
+            "track": true
         },
         "hourrate": {
             "dbs": "mld_opdr_uurloon",
             "label": L("lcl_hour_rate"),
             "typ": "float",
-            "iscurrency": true
+            "iscurrency": true,
+            "track": true
         },
         "materialcost": {
             "dbs": "mld_opdr_materiaal",
             "label": L("lcl_mater_cost"),
             "typ": "float",
-            "iscurrency": true
+            "iscurrency": true,
+            "track": true
         }
     };
 
@@ -275,14 +290,16 @@ function model_mld_opdr()
             "label": S("bgt_enabled")? L("bgt_gecontracteerd") : L("lcl_total_cost") + " " + L("lcl_valutasign"),
             "typ": "float",
             "iscurrency": true,
-            "total": true
+            "total": true,
+            "track": true
         },
         "vat": {
             "dbs": "mld_opdr_kosten_btw",
             "label": L("lcl_mld_opdr_btw"),
             "typ": "float",
             "iscurrency": true,
-            "total": true
+            "total": true,
+            "track": true
         },
         "amountincl": {
             "dbs": "mld_opdr_kosten_incl",
@@ -297,21 +314,24 @@ function model_mld_opdr()
             "iscurrency": true,
             "total": true,
             "defaultvalue": "0",
-            "clone": false
+            "clone": false,
+            "track": true
         },
         "status": {
             "dbs": "mld_statusopdr_key",
             "label": L("lcl_mld_opdr_status"),
             "typ": "key",
             "foreign": bgt_orderstatus_foreign(),
-            "defaultvalue": 5
+            "defaultvalue": 5,
+            "track": true
         },
         "owner": {
             "dbs": "prs_perslid_key",
             "label": L("lcl_mld_starter"),
             "typ": "key",
             "hidden_fld": true,
-            "foreign": "PRS_PERSLID"
+            "foreign": "prs_perslid",
+            "track": true
         },
         "issueordertype": {
             "dbs": "mld_typeopdr_key",
@@ -321,7 +341,8 @@ function model_mld_opdr()
             "foreign": {"tbl": "mld_typeopdr",
                         "key": "mld_typeopdr_key",
                         "desc": "mld_typeopdr_omschrijving"},
-            "hidden_fld": true
+            "hidden_fld": true,
+            "track": true
         },
         "module": {
             "dbs": "mld_opdr_module",
@@ -339,13 +360,15 @@ function model_mld_opdr()
         "remark": {
             "dbs": "mld_opdr_opmerking",
             "label": L("lcl_remark"),
-            "typ": "memo"
+            "typ": "memo",
+            "track": true
         },
         "contract": {
             "dbs": "cnt_contract_key",
             "label": L("lcl_contract"),
             "typ": "key",
-            "foreign": "cnt_contract"
+            "foreign": "cnt_contract",
+            "track": true
         },
         "_is_clone": { // Wordt alleen gebruikt als hidden kopie veld.
             "dbs": "",
@@ -356,7 +379,8 @@ function model_mld_opdr()
         "offer": {
             "dbs": "mld_opdr_parent_key",
             "label": L("lcl_mld_opdr_parent"),
-            "typ": "key"
+            "typ": "key",
+            "track": true
         },
         "externalnr": {
             "dbs": "mld_opdr_externnr",
@@ -1535,6 +1559,44 @@ obj._is_clone=2 --> nieuwe sub-opdracht
       }
     }
 
+    function _keep_editable_fields(jsondata, opdr_info)
+    { // Verwijder voor PUT wat niet gewijzigd mag worden.
+      function delete_fld(jsondata, field, condition)
+      {
+        if (condition)
+          delete jsondata[field];
+      }
+
+      var this_opdr = mld.func_enabled_opdracht(opdr_info.opdr_key);
+
+      // Nu per veld eventueel verwijderen.
+      delete_fld(jsondata, "remark",         !this_opdr.canOpmChange || S("mld_afhandeling_restrict_edit") != 0);
+      delete_fld(jsondata, "company",        !this_opdr.canUitvChange);
+      delete_fld(jsondata, "contact",        !this_opdr.canVeldChange);
+      delete_fld(jsondata, "contract",       !this_opdr.canContractChange);
+      delete_fld(jsondata, "owner",          !this_opdr.canVeldChange);
+      delete_fld(jsondata, "description",    !this_opdr.canVeldChange);
+      delete_fld(jsondata, "startdate",      !this_opdr.canDatesChange);
+      delete_fld(jsondata, "enddate",        !this_opdr.canDatesChange);
+      delete_fld(jsondata, "plandate",       (!this_opdr.canPlanDatesChange || !(S("mld_ord_edit_plandates") & 1)));
+      delete_fld(jsondata, "plandate2",      (!this_opdr.canPlanDatesChange || !(S("mld_ord_edit_plandates") & 1)));
+      delete_fld(jsondata, "account",        ((!this_opdr.canKostChange || !opdr_info.tonen_totaal) || S("mld_ord_show_kostenplaats") != 1)); // Setting mld_ord_show_kostenplaats: show kostenplaats field for orders {0=do not show | 1=editable | 2=show}
+      delete_fld(jsondata, "costtype",       S("mld_opdr_alt_kostensoort") == 0); // Setting mld_opdr_alt_kostensoort: Enable use of alternative cost category {0|1} default 0
+      delete_fld(jsondata, "ordernr",        !this_opdr.canVeldChange);
+      delete_fld(jsondata, "hours" ,         !this_opdr.canUrenMatChange);
+      delete_fld(jsondata, "hourrate",       !this_opdr.canUrenMatChange);
+      delete_fld(jsondata, "materialcost",   (this_opdr.typeopdr_materiaal >= 2 || !this_opdr.canUrenMatChange));
+      delete_fld(jsondata, "amount",         (!this_opdr.mld_opdr.tonen_correctie || !this_opdr.canUrenMatChange || this_opdr.mld_opdr.correctie_readonly));
+      delete_fld(jsondata, "sequence",       true);
+      if ((S("fac_api2_compatibility") & 1) != 1)
+        delete_fld(jsondata, "issueordertype", true);
+      delete_fld(jsondata, "module", true);
+      delete_fld(jsondata, "additional", true);
+      delete_fld(jsondata, "offer", true);
+      delete_fld(jsondata, "externalnr", true);
+      delete_fld(jsondata, "externalsyncdate", true);
+    }
+
     this.REST_PUT = function (params, jsondata, the_key)
     {
         var x_params = object_merge({}, params, gparams);
@@ -1543,23 +1605,23 @@ obj._is_clone=2 --> nieuwe sub-opdracht
             abort_with_warning(L("lcl_shared_no_auth"));
 
         var old_opdrstatus = -1;
+        var opdr_info = mld.mld_opdr_info(the_key); // Bevat alle info van de opdracht.
+        var mld_key = opdr_info.mld_key; // De melding key (jsondata.issue.id) is wellicht niet altijd aanwezig.
         if (S("bgt_enabled") != 1)  // BGT doet niets met mld_melding; mld_opdr heeft zelfs geen mld_melding_key!
         {                           // Maar voordat wijzigingen worden opgeslagen moet voor niet-BGT worden gecontroleerd of de gebruiker voldoende rechten heeft.
-            // De opdracht key staat in the_key.
-            var mld_opdr = mld.mld_opdr_info(the_key); // Bevat alle info van de opdracht.
-            var mld_key = mld_opdr.mld_key; // De melding key (jsondata.issue.id) is wellicht niet altijd aanwezig.
-            var opdr_type_key = mld_opdr.opdr_type;
-            var this_opdr = mld.func_enabled_opdracht(the_key);
-            old_opdrstatus = mld_opdr.opdr_status;
+          // De opdracht key staat in the_key.
+          var opdr_type_key = opdr_info.opdr_type;
+          var this_opdr = mld.func_enabled_opdracht(the_key);
+          old_opdrstatus = opdr_info.opdr_status;
         }
         else
         {
-            var sqls = "SELECT mld_statusopdr_key"
-                    + "  FROM mld_opdr"
-                    + " WHERE mld_opdr_key = " + the_key;
-            var oRss = Oracle.Execute(sqls);
-            old_opdrstatus = oRss("mld_statusopdr_key").Value;
-            oRss.Close();
+          var sqls = "SELECT mld_statusopdr_key"
+                  + "  FROM mld_opdr"
+                  + " WHERE mld_opdr_key = " + the_key;
+          var oRss = Oracle.Execute(sqls);
+          old_opdrstatus = oRss("mld_statusopdr_key").Value;
+          oRss.Close();
         }
 
         // De status pas na het inserten zetten zodat er ook getrackt kan worden met de functie setopdrachtstatus.
@@ -1573,6 +1635,8 @@ obj._is_clone=2 --> nieuwe sub-opdracht
           setStatus = setopdrstatus != old_opdrstatus;
         }
 
+        if (S("bgt_enabled") != 1)
+          _keep_editable_fields(jsondata, opdr_info);
         var result = generic_REST_PUT(this)(params, jsondata, the_key);
         var opdr_key = result.key;
 

APPL/API2/model_mld_srtdiscipline.inc

@@ -12,6 +12,7 @@
 */
 %>
 <!-- #include file="../api2/model_mld_typeopdr_srtdiscipline.inc" -->
+<!-- #include file="../api2/model_mld_vervolg_beperking.inc" -->
 <!-- #include file="../api2/model_mld_discipline.inc" -->
 <%
 
@@ -70,7 +71,10 @@ function model_mld_srtdiscipline()
         "orderdata": {
             "dbs": "ins_srtdiscipline_bes",
             "label": L("ins_srtdiscipline_bes"),
-            "typ": "check"
+            "typ": "number",
+            "defaultvalue": "0",
+            "LOV": L("ins_srtdiscipline_besLOV"),
+            "emptyoption": null
         },
         "reservationdata": {
             "dbs": "ins_srtdiscipline_res",
@@ -164,6 +168,11 @@ function model_mld_srtdiscipline()
         //    "joinfield": "disciplinetype",
         //    "required": true
         //},
+        "mld_vervolg_beperking": {
+            "model": new model_mld_vervolg_beperking(),
+            "joinfield": "disciplinetype_1",
+            "enable_update": true
+        },
         "mld_opdrtypes": {
             "model": new model_mld_typeopdr_srtdiscipline(),
             "joinfield": "disciplinetype",

APPL/API2/model_mld_srtkenmerk.inc

@@ -47,7 +47,7 @@ function model_mld_srtkenmerk(params)
             "label": L("mgt_srtkenmerk_kenmerktype"),
             "typ": "varchar",
             "required": true,
-            "LOV": buildKenmerktypeLOV(),
+            "LOV": buildKenmerktypeLOV(null, { module: "MLD" }),
             "showtransit": true,
             "multiedit": true
         },
@@ -131,7 +131,7 @@ function model_mld_srtkenmerk(params)
     this.hook_pre_edit = function (obj, fld)
     {
         var kenmerktype = (obj.attributetype ? obj.attributetype.id : "");
-        fld.attributetype.LOV = buildKenmerktypeLOV(kenmerktype);
+        fld.attributetype.LOV = buildKenmerktypeLOV(kenmerktype, { module: "MLD" });
     %>
     <script type="text/javascript">
       var module = "MLD";

APPL/API2/model_mld_stdmelding.inc

@@ -213,7 +213,9 @@ function model_mld_stdmelding()
             "label": L("lcl_mld_subject"),
             "LOV": "0;" + L("lcl_mld_onzichtbaar") + ";"
                  + "1;" + L("lcl_mld_optioneel")   + ";"
-                 + "2;" + L("lcl_mld_verplicht"),
+                 + "2;" + L("lcl_mld_verplicht")
+                 + (S("ai_enabled") & 1 ? ";3;" : ";##DISABLED##;")
+                        + L("lcl_mld_ai_generated"),
             "emptyoption": null,
             "multiedit": true
         },

APPL/API2/model_mld_typeopdr_srtdiscipline.inc

@@ -49,6 +49,7 @@ function model_mld_typeopdr_srtdiscipline()
             "dbs": "ins_srtdiscipline_key",
             "label": L("ins_srtdiscipline"),
             "typ": "key",
+            "hidden_fld": true,
             "foreign": {
                 "tbl": "ins_srtdiscipline",
                 "key": "ins_srtdiscipline_key",

APPL/API2/model_mld_vervolg_beperking.inc

@@ -0,0 +1,76 @@
+<% /*
+    File:           model_mld_vervolg_beperking.inc
+
+    Description:    model voor model_mld_vervolg_beperking
+
+    Context:
+
+    Notes:
+*/
+%>
+<%
+
+function model_mld_vervolg_beperking()
+{
+    var srtdisc = getQParamInt("disciplinetype", -1);
+
+    this.table = "mld_vervolg_beperking";
+    this.primary = "mld_vervolg_beperking_key";
+    this.records_name = "mld_vervolg_beperkings";
+    this.record_name = "mld_vervolg_beperking";
+    this.autfunction = "WEB_PRSSYS";
+    this.record_title = L("mld_vervolg_beperking");
+    this.records_title = L("mld_vervolg_beperking_m");
+    this.defaultIcon = "fa-diagram-nested";
+
+    this.fields = {
+         "id": {
+            "dbs": "mld_vervolg_beperking_key",
+            "label": "Key",
+            "typ": "key",
+            "hidden_fld": true,
+            "required": true,
+            "seq": " mld_s_mld_vervolg_beperking_key"
+        },
+        "disciplinetype_1": {
+            "dbs": "ins_srtdiscipline_key_1",
+            "label": L("ins_srtdiscipline"),
+            "typ": "key",
+            "hidden_fld": true,
+            "foreign": {
+                "tbl": "ins_srtdiscipline",
+                "key": "ins_srtdiscipline_key",
+                "desc": "ins_srtdiscipline_omschrijving"
+            }
+        },
+        "disciplinetype_2": {
+            "dbs": "ins_srtdiscipline_key_2",
+            "label": L("ins_srtdiscipline"),
+            "typ": "key",
+            "foreign": {
+                "tbl": "ins_v_aanwezigsrtdiscipline",
+                "key": "ins_srtdiscipline_key",
+                "desc": "ins_srtdiscipline_omschrijving"
+            }
+        }
+    }
+
+    this.list = {
+        "columns": [
+            "id",
+            "disciplinetype_1",
+            "disciplinetype_2"
+        ]
+    };
+
+    this.edit = {
+        "modal": true
+    };
+
+    this.REST_GET    = generic_REST_GET(this);
+    this.REST_POST   = generic_REST_POST(this);
+    this.REST_PUT    = generic_REST_PUT(this);
+    this.REST_DELETE = generic_REST_DELETE(this);
+}
+
+%>

APPL/API2/model_mld_vrije_dagen.inc

@@ -41,6 +41,39 @@ function model_mld_vrije_dagen()
             "autosize": true,
             "filter": "range",
             "friendlyname": true
+        },
+        "name": {
+            "dbs": "mld_vrije_dagen_id",
+            "label": L("lcl_calendar"),
+            "typ": "varchar",
+            "required": true,
+            "defaultvalue": "Default"
+        },
+        "calendar": {
+            "dbs": "kalender.kalender_id",
+            "label": L("lcl_calendar"),
+            "typ": "varchar",
+            "foreign": {
+                "tbl": "(SELECT DISTINCT"
+                     + "        mld_vrije_dagen_id cl_key"
+                     + "   FROM mld_vrije_dagen"
+                     + ")",
+                "key": "cl_key",
+                "desc": "cl_key"
+            }
+        },
+        "year": {
+            "dbs": "jaren.jaar_key",
+            "label": L("lcl_mld_year"),
+            "typ": "varchar",
+            "foreign": {
+                "tbl": "(SELECT DISTINCT"
+                     + "        TO_CHAR(EXTRACT(YEAR FROM mld_vrije_dagen_datum)) yr_key"
+                     + "   FROM mld_vrije_dagen"
+                     + ")",
+                "key": "yr_key",
+                "desc": "yr_key"
+            }
         }
     };
 
@@ -48,9 +81,46 @@ function model_mld_vrije_dagen()
         "modal": true
     };
 
-    this.REST_GET    = generic_REST_GET(this);
+    this.hook_pre_edit = function(obj, fld)
+    {
+        //fld.calendar.label = " ";
+        fld.calendar.label = L("mld_vrije_dagen_kalender_1");
+        fld.name.label = L("mld_vrije_dagen_kalender_2");
+    }
+
+    function get_tbl_yr()
+    {
+        var sql = "(SELECT DISTINCT"
+                + "        EXTRACT(YEAR FROM mld_vrije_dagen_datum) jaar_key"
+                + "      , mld_vrije_dagen_id cl_key"
+                + "   FROM mld_vrije_dagen" 
+                + ") jaren";
+        return sql;
+    }
+    function get_tbl_cl()
+    {
+        var sql = "(SELECT DISTINCT mld_vrije_dagen_id kalender_id"
+                + "   FROM mld_vrije_dagen"
+                + ") kalender";
+        return sql;
+    }
+    var gparams = { GET: { tables: [ get_tbl_yr()
+                                   , get_tbl_cl()
+                                   ]
+                         , wheres: [ "EXTRACT(YEAR FROM mld_vrije_dagen.mld_vrije_dagen_datum) = jaren.jaar_key"
+                                   , "mld_vrije_dagen.mld_vrije_dagen_id = kalender.kalender_id"
+                                   , "mld_vrije_dagen.mld_vrije_dagen_id = jaren.cl_key"
+                                   ]
+                         , orderbys: ["jaren.jaar_key"
+                                     ,"mld_vrije_dagen.mld_vrije_dagen_id"
+                                     ,"mld_vrije_dagen.mld_vrije_dagen_datum"
+                                     ]
+                         }
+                  };
+
+    this.REST_GET    = generic_REST_GET(this, gparams);
     this.REST_POST   = generic_REST_POST(this);
-    this.REST_PUT    = generic_REST_PUT(this);
+    this.REST_PUT    = generic_REST_PUT(this, gparams);
     this.REST_DELETE = generic_REST_DELETE(this);
 }
 %>

APPL/API2/model_notes.inc

@@ -66,6 +66,8 @@ SELECT 'PRJ'
 
 %>
 <!-- #include file="../mld/mld.inc" -->
+<!-- #include file="../mld/mld_edit_note.inc" -->
+<!-- #include file="../mld/opdr_edit_note.inc" -->
 <%
 
 function model_notes(module)
@@ -118,24 +120,36 @@ function model_notes(module)
     }
     this.table = tabel.naam;
     this.primary = tabel.parent + "_note_key";
+    var sqlbijlagen = "(SELECT COUNT(*) aantal"
+                    + "   FROM fac_bijlagen"
+                    + "  WHERE fac_bijlagen_module = " + safe.quoted_sql((module === "OPDR" ? "ORD" : module) + "N")
+                    + "    AND fac_bijlagen_refkey = " + tabel.naam + "." + tabel.id + ")";
+
     this.fields =
-            { "id"          : { dbs: tabel.id,                     typ: "key",     seq:     tabel.seq },
-              "author"      : { dbs: "prs_perslid_key",            typ: "key",     foreign: "prs_perslid" },
-              "description" : { dbs: tabel.naam + "_omschrijving", typ: "varchar",                         filter: "like"  },
-              "created"     : { dbs: tabel.naam + "_aanmaak",      typ: "datetime", "readonly": true},
-              "parent"      : { dbs: tabel.parent + "_key",        typ: "key" }
+            { "id"            : { dbs: tabel.id,                     typ: "key",     seq:     tabel.seq },
+              "author"        : { dbs: "prs_perslid_key",            typ: "key",     foreign: "prs_perslid" },
+              "description"   : { dbs: tabel.naam + "_omschrijving", typ: "varchar",                         filter: "like"  },
+              "created"       : { dbs: tabel.naam + "_aanmaak",      typ: "datetime", "readonly": true},
+              "parent"        : { dbs: tabel.parent + "_key",        typ: "key" },
+              "nnattachments" : { dbs: "dummy",                      typ: "number", sql: sqlbijlagen }
         };
+
+    var notes_id = getQParamInt("notes_id", -1); // Om een specifieke notitie op te vragen
+    if (notes_id > 0)
+    {
+        this.tablesql = "(SELECT * FROM {0} WHERE {1} = {2}) {0}".format(tabel.naam, tabel.id, parseInt(notes_id))
+    }
     switch (module)
     {
         case "MLD":
         {
-            this.fields["flag"] = { dbs: "mld_melding_note_flag", typ: "number" }; // database default is 0, onzichtbaarFE
+            this.fields["flag"] = { dbs: tabel.parent + "_note_flag", typ: "number" }; // database default is 0, onzichtbaarFE
             this.fields["group"] = { dbs: "fac_note_group_key", typ: "key", foreign: "fac_note_group"};
             break;
         }
         case "ORD":
         {
-            this.fields["flag"] = { dbs: "mld_opdr_note_flag", typ: "number" }; // database default is 4, zichtbaarUITV
+            this.fields["flag"] = { dbs: tabel.parent + "_note_flag", typ: "number" }; // database default is 4, zichtbaarUITV
             this.fields["group"] = { dbs: "fac_note_group_key", typ: "key", foreign: "fac_note_group"};
             break;
         }
@@ -149,6 +163,43 @@ function model_notes(module)
             ]
           };
 
+    // Deze functie wordt na de GET aangeroepen. De bijlagen zijn zo afwijkend
+    // dat ik dat niet fatsoenlijk in 'fields' verwerkt kreeg
+    this.post_get = function (params, record)
+        {
+            record.attachments = [];
+            if (!record.nnattachments) // voorkom sql-statement per notitie
+            {
+                delete record["nnattachments"];
+                return;
+            }
+            delete record["nnattachments"];
+            
+            var fileparams = { getFiles: true, getFileEncoded: params.filter.fileencoding, /* api2name: "notes", */ cacheablehmac: true };
+            var props = flexProps((module === "OPDR" ? "ORD" : module) + "N", record.id, undefined, undefined, fileparams);
+            for (var f in props.files)
+            {
+                var file = props.files[f];
+                var attachment = { name: file.name,
+                                   date: file.date,
+                                   size: file.size };
+                if (file.deepurl) attachment.content_url = file.deepurl;
+                if (file.token)   attachment.token = file.token;
+                if (file.key)     attachment.id = file.key;
+                if (file.digest)  attachment.digest = file.digest;
+                switch (params.filter.fileencoding) // De enige twee encodings die we ondersteunen
+                {
+                    case "base64":
+                        attachment.content_base64 = file.data;
+                        break;
+                    case "hex":
+                        attachment.content_hex = file.data;
+                        break;
+                }
+                record.attachments.push(attachment);
+            };
+        }
+
     function _check_authorization (params, method)
         {
             params.message = "";
@@ -203,14 +254,10 @@ function model_notes(module)
                     switch (method)
                     {
                         case "PUT":
-                            var opdr_key = params.filter.parent_key;
-                            var this_opdr = mld.func_enabled_opdracht(opdr_key);
                             user.auth_required_or_abort(this_opdr.canEditOpdrNote);
                             params.isNew = false;
                             break;
                         case "POST":
-                            var opdr_key = params.filter.parent_key;
-                            var this_opdr = mld.func_enabled_opdracht(opdr_key);
                             user.auth_required_or_abort(this_opdr.canEditOpdrNote);
                             params.isNew = true;
                             break;
@@ -226,6 +273,43 @@ function model_notes(module)
             }
         }
 
+    this._validate_fields = function (params, jsondata) { /* valideer fields, alle constraints die niet door de database worden afgevangen */
+        switch (params.filter.module) {
+            case "MLD": {
+                if (!params.filter.scope) {
+                    params.filter.scope = "fe"; // default scope
+                }
+                break;
+            }
+            case "ORD": {
+                if (S("mld_opdr_actiecode") == 0 || // Dan doen deze niet mee
+                    jsondata.action_to_backoffice && jsondata.action_to_executor) { /* Deze zijn exclusief, als je ze allebei zet, dan weet je vast niet wat je doet, dus doe dan niets */
+                    delete jsondata.action_to_backoffice;
+                    delete jsondata.action_to_executor;
+                }
+                if (params.func_enabled.myRole === 4) { // Ik ben uitvoerder
+                    jsondata.flag = (jsondata.flag || 0) | 4; // *Altijd* ZichtbaarUITV
+                    delete jsondata.notify_executor;
+                    delete jsondata.action_to_executor;
+                    if (jsondata.flag && jsondata.flag & 32 || jsondata.action_to_requestor) {
+                        jsondata.flag = jsondata.flag | 37;
+                        jsondata.notify_requestor = true;
+                        jsondata.action_to_requestor = true;
+                    } else {
+                        delete jsondata.action_to_requestor;
+                    }
+                } else if (params.func_enabled.myRole === 2) { // Ik ben BO
+                    jsondata.flag = ("flag" in jsondata) ? jsondata.flag : 4; // *Default* ZichtbaarUITV
+                    delete jsondata.notify_backoffice;
+                    if (jsondata.action_to_executor) {
+                        jsondata.flag = (jsondata.flag || 0) | 4; // *Altijd* ZichtbaarUITV
+                        jsondata.notify_executor = true;
+                    }
+                }
+            }
+        }
+    };
+
     // Geen standaard REST_GET, dat doe je maar via het hoofdmodel/include
     this.templateREST_GET = function _GET(params)
         {
@@ -267,27 +351,29 @@ function model_notes(module)
             this.REST_GET = this.templateREST_GET; // om het resultaat te kunnen opleveren
             params.filter.parent_key = parseInt(jsondata.parent, 10);
             if (!(params.filter.parent_key > 0))
-                abort_with_warning(L("lcl_invalid_key"))
-            if (!jsondata.author)
-                jsondata.author = user_key;
-            if (!params.filter.scope)
-                params.filter.scope = "fe"; // default scope
-
-            // Is deze note een vraag aan de melder? Maak hem dan ook zichtbaar voor de melder (en uitvoerder zelf)
-            if (jsondata.flag && jsondata.flag & 32)
-                jsondata.flag = jsondata.flag | 5;
+                abort_with_warning(L("lcl_invalid_key"));
 
             _check_authorization(params, "POST");
-            //
+
+            if (!jsondata.author) // Dit werkt niet echt hoor, overal wordt user(_key) gebruikt, bij shared.trackaction, de bepaling van myRole, etc ..
+                jsondata.author = user_key;
+
+            this._validate_fields(params, jsondata);
+
             var dbfields = api2.update_fields(params, this, jsondata); // Build updater
             dbfields["id"] = { dbs: tabel.id, typ: "key", seq: tabel.seq };
 
             var xxxIns = buildInsert(this.table, dbfields, { noValidateToken: true });
-            var new_key = xxxIns.sequences[tabel.id];
+            params.note_key = xxxIns.sequences[tabel.id];
 
             Oracle.Execute(xxxIns.sql);
 
-            return { key: new_key };
+            if (module == "ORD") { // Momenteel alleen hier nog ondersteund
+                _set_actiecode(params, jsondata);
+                _track_and_notify(params, jsondata);
+            }
+
+            return { key: params.note_key };
         }
 
      // REST_DELETE = function (params, the_key) /* delete note doen we niet */

APPL/API2/model_objects.inc

@@ -56,8 +56,8 @@ function model_objects(ins_key, params)
         "dwgx":             { dbs: "ins_deel_dwgx",                             typ: "float",                                 label: L("lcl_ins_deel_dwgx"), track: true},
         "dwgy":             { dbs: "ins_deel_dwgy",                             typ: "float",                                 label: L("lcl_ins_deel_dwgy"), track: true},
         "dwgz":             { dbs: "ins_deel_dwgz",                             typ: "float",                                 label: L("lcl_ins_deel_dwgz"), track: true},
-        "dwgrotation":      { dbs: "ins_deel_dwgrotatie",                       typ: "float",                                 label: "Object rotatie", track: true}, // Vanaf 2024.2 -> L("lcl_ins_deel_dwg_rotatie")
-        "dwgscale":         { dbs: "ins_deel_dwgschaal",                        typ: "float",                                 label: "Object schaal", track: true}, // Vanaf 2024.2 -> L("lcl_ins_deel_dwg_schaal")
+        "dwgrotation":      { dbs: "ins_deel_dwgrotatie",                       typ: "float",                                 label: L("lcl_ins_deel_dwg_rotatie"), track: true},
+        "dwgscale":         { dbs: "ins_deel_dwgschaal",                        typ: "float",                                 label: L("lcl_ins_deel_dwg_schaal"), track: true},
         "externnr":         { dbs: "ins_deel_externnr",                         typ: "varchar",                               label: L("extern_nr"),       readonly: !(user.has("WEB_FACTAB") || user.has("WEB_FACXNR"))},
         "externsyncdate":   { dbs: "ins_deel_externsyncdate",                   typ: "datetime",                              label: L("extern_syncdate"), readonly: !(user.has("WEB_FACTAB") || user.has("WEB_FACXNR"))},
         "flag":             { dbs: "ins_deel_flag",                             typ: "number",  track: true,  LOV:"",         label: L("lcl_ins_flags")}
@@ -257,7 +257,7 @@ function model_objects(ins_key, params)
                 else
                     placeholder.bind_msg.push(L("lcl_obj_bind_r"));
             }
-            if ((bindingBits & BIND_WERKPL) && f.werkplekkey)
+            if (bindingBits & BIND_WERKPL)
             {
                 if (jsondata.workplace && jsondata.workplace > 0)
                 {

APPL/API2/model_orders.inc

@@ -828,6 +828,7 @@ function model_orders(opdr_key, params)
             var pkey = -1;
             if (tot_kosten > opdr_info.t_cost && tot_kosten > 0)
             { // De totale kosten zijn verhoogd.
+              var wasSelfapproved = false;
               // Bepaling oorspronkelijke (laatste) fiatteur, als die er was.
               sql = "SELECT pf.prs_perslid_key"
                   + "  FROM fac_tracking tr"
@@ -849,12 +850,20 @@ function model_orders(opdr_key, params)
               { // Dan waren de opdracht kosten onder het mandaat van mijzelf of de BO-medewerker.
                 // Als de kostenplaats bij de opdracht overruled is dan wordt altijd tegen het profiel van de BO-medewerker getest.
                 if (mld_info.mld_kk == 1 && mld_info.kostenpl_key == kostenplaats_key && S("mld_opdr_ignore_caller_profile") == 0)
-                    pkey = mld_info.melder_key;  // Melder/aanvrager van melding
+                  pkey = mld_info.melder_key;  // Melder/aanvrager van melding
                 else
-                    pkey = user_key; //getFParamInt("behandelaar"); // BO medewerker? dat is gewoon de user
+                  pkey = user_key; //getFParamInt("behandelaar"); // BO medewerker? dat is gewoon de user
+                wasSelfapproved = true;
               }
 
-              if (S("mld_use_order_approval") && (tot_kosten > S("can_selfapprove") || budget.exceeds_profiel(tot_kosten, pkey, this_opdr.mld_opdr.opdr_disc_key)))
+              if (S("mld_use_order_approval") &&
+                  ((tot_kosten > opdr_info.fiatbedrag &&  // Als de totale kosten nog steeds onder het reeds gefiatteerde bedrag blijven, hoeven we niet te herfiatteren.
+                    ((wasSelfapproved && tot_kosten > S("can_selfapprove")) ||
+                      (S("mld_opdr_reapproval_rate") == -1 && budget.exceeds_profiel(tot_kosten, pkey, this_opdr.mld_opdr.opdr_disc_key))
+                     )) ||
+                   (S("mld_opdr_reapproval_rate") >= 0 && tot_kosten > (opdr_info.t_cost * (1 + S("mld_opdr_reapproval_rate") / 100))) // Als de totale kosten een bepaald percentage toeneemt, moet geherfiatteerd worden.
+                  )
+                 )
               { // Er moet (opnieuw) gefiatteerd worden. Is er wel iemand met voldoende mandaat? Indien er niemand gevonden kan worden mag de wijziging niet doorgaan.
                 // Het mandaat is al te hoog voor de melder/aanvrager van de melding.
                 // De melder/aanmaker van de melding mag niet zelf goedkeuren boven het bedrag can_selfapprove.

APPL/API2/model_prs_kostensoortgrp.inc

@@ -24,6 +24,7 @@ function model_prs_kostensoortgrp()
     this.autfunction = (S("bgt_enabled")==1 ? ["WEB_FINMSU", "WEB_BGTMGT"] : ["WEB_FINMSU"]);
     this.record_title = L("prs_kostensoortgrp");
     this.records_title = L("prs_kostensoortgrp_m");
+    this.soft_delete = "prs_kostensoortgrp_verwijder";
 
     var fields_main = {};
     var fields_ext = {};

APPL/API2/model_prs_perslid.inc

@@ -132,7 +132,14 @@ function model_prs_perslid(params)
             "typ": "varchar",
             "len": 30,
             "filter": "exact",
-            "caseinsensitive": true
+            "caseinsensitive": true,
+            "hasupper": "prs_perslid_oslogin"
+        },
+        "lastlogin": {
+            "dbs": "prs_perslid_login",
+            "label": L("lcl_prs_person_lastlogin"),
+            "typ": "date",
+            "readonly": true
         },
         "externallogin": { // SCIM only. Identiek aan prs_perslid_oslogin maar dan niet uppercased of afgekapt
             "dbs": "prs_perslid_externoslogin",

APPL/API2/model_reports.inc

@@ -246,6 +246,7 @@ function model_reports(fac_usrrap_key)
                  , autoGraph: usrrap.graph.id
                  , autoRatio: usrrap.ratio.id
                  , autoCond: usrrap.condition.id
+                 , hasRequiredCalendarFields: 0
                  };
     if (model.styling && (model.styling & 1))
         model.list.fixedColumns = true;
@@ -311,13 +312,16 @@ function model_reports(fac_usrrap_key)
         {
             model.list.canKaart = true;
         }
-        if (usrrap.columns[i].name.toUpperCase() === "VAN" && inArray(usrrap.columns[i].datatype.id, ["date", "datetime"]))
-        {
-            model.list.canKalender = usrrap.columns[i].datatype.id == "date" ? 1 : 2;
+        if (inArray(usrrap.columns[i].visible.id, ["V", "S", "U", "C"])) {
+            if (inArray(usrrap.columns[i].datatype.id, ["date", "datetime"]) && usrrap.columns[i].group.id === "G") {
+                model.list.hasRequiredCalendarFields |= "date" ? 1 : 2;
+            } else if (usrrap.columns[i].datatype.id === "varchar") {
+                model.list.hasRequiredCalendarFields |= 4;
+            }
         }
 
         var fixedlabel = false;
-        if (label && label.substr(0,1) == "!") // Als een label begint met een ! wordt hij niet aangepast bij groepperen
+        if (label && label.substr(0,1) == "!") // Als een label begint met een ! wordt hij niet aangepast bij groeperen
         {
             fixedlabel = true;
             label = label.substr(1);
@@ -430,6 +434,8 @@ function model_reports(fac_usrrap_key)
             model.search.filters.push(fld);
     }
 
+    model.list.canKalender = model.list.hasRequiredCalendarFields > 4; // Ik heb een titel-veld en een datumveld (4 + 1|2)
+
     if ((model.list.autoCount & 2) == 2)
     {
         model.list.columns.push("scf_count");
@@ -577,6 +583,30 @@ function report_GET(params)
       if (hasAggregate) break;
     }
 
+    // CLOB (mld_melding_omschrijving) mag niet in de ORDER BY genoemd worden
+    // TODO: in de toekomst misschien explicieter rapport kolom type 'memo' onderkennen?
+    var sqlc = "SELECT column_name, data_type"
+             + "  FROM user_tab_columns"
+             + " WHERE table_name = " + safe.quoted_sql_upper(model.table);
+    var oRs = Oracle.Execute(sqlc);
+    var isclob = {};
+    while (!oRs.EOF)
+    {
+        isclob[oRs("column_name").Value] = (oRs("data_type") == 'CLOB');
+        oRs.MoveNext();
+    }
+    oRs.Close()
+
+    // CLOB is problematisch in GROUP BY
+    for (var fld in model.fields)
+    {
+      var field = model.fields[fld];
+      if (isclob[field.dbs.toUpperCase()])
+      {
+          field.sql = "TO_CHAR(SUBSTR({0}, 1, 4000))".format(field.dbs);
+      }
+    }
+
     // Controleren of de urllink parameter een &##TRANSIT## heeft. Dan geven wel alle filtervelden door
     if (params.urllink && params.urllink.link && params.urllink.link.match(/&##TRANSIT##/i))
     {
@@ -813,10 +843,15 @@ function report_GET(params)
       if (inselect && field.sorting) // is er niet voor scf_count/scf_ratio
         autosorting = autosorting && (field.sorting.id == 3)
     }
+
     if (autosorting)
     {
         for (var i=0; i < query.selects.length; i++)
-            order.push(i+1);
+        {
+            var colname = query.selects[i].split(".").pop().toUpperCase(); // achterste stuk
+            if (!isclob[colname])
+                order.push(i+1);
+        }
     }
     else
     {
@@ -832,7 +867,7 @@ function report_GET(params)
             if (found && (!params.filter.distinct || (params.filter.distinct && (fld == params.filter.distinct))))
             {
                 var field = this.fields[fld];
-                if (field.sorting)
+                if (field.sorting && !isclob[field.dbs.toUpperCase()])
                 {
                     // Sortering op x-as of y-as gebeurt nu verder op.
                     // TODO: case 1 en 2 kunnen nu samen genomen worden.
@@ -891,7 +926,6 @@ function report_GET(params)
 
     if (groupbys.length && hasAggregate)
         sql += " GROUP BY " + groupbys.join(", ");
-
     if (order.length)
       sql += " ORDER BY " + order.join(", ");
     if (params.filter.limit > 0)

APPL/API2/model_reportsx.inc

@@ -13,6 +13,7 @@
 */
 %>
 <!-- #include file="./model_reportcolumns.inc" -->
+<!-- #include file="./model_fac_notificatie_job.inc" -->
 <%
 
 function model_reportsx(usrrap_key, rapparams)
@@ -257,7 +258,33 @@ function model_reportsx(usrrap_key, rapparams)
                                      }
                   };
 
-    this.list = { columns: ["id", "sequence", "group", "name", "description", "graph_type", "code", "authorization"] };
+    var sqlteller = "(SELECT (SELECT TO_CHAR(COALESCE(SUM (fac_gui_counter_count), 0)) "
+                  + "          FROM fac_gui_counter "
+                  +"         WHERE fac_gui_counter_group = 'report' AND fac_gui_counter_refkey = fac_usrrap.fac_usrrap_key "
+                  + "           AND fac_gui_counter_date > SYSDATE - 7) "
+                  + "       || '/' || "
+                  + "       (SELECT TO_CHAR(COALESCE(SUM (fac_gui_counter_count), 0)) "
+                  + "          FROM fac_gui_counter "
+                  + "         WHERE fac_gui_counter_group = 'report' AND fac_gui_counter_refkey = fac_usrrap.fac_usrrap_key "
+                  + "           AND fac_gui_counter_date > SYSDATE - 30) "
+                  + "       || '/' || "
+                  + "       (SELECT TO_CHAR(COALESCE(SUM (fac_gui_counter_count), 0)) "
+                  + "          FROM fac_gui_counter "
+                  + "         WHERE fac_gui_counter_group = 'report' AND fac_gui_counter_refkey = fac_usrrap.fac_usrrap_key "
+                  + "           AND fac_gui_counter_date > SYSDATE - 365) "
+                  + "  FROM DUAL) "
+
+    // if (user.has("WEB_FACFAC"))
+    {
+        this.fields["usage"] = {
+            "dbs": "dummy",
+            "label": L("fac_usrrap_usage"),
+            typ: "varchar",
+            sql: sqlteller
+        }
+    }
+
+    this.list = { columns: ["id", "sequence", "group", "name", "description", "graph_type", "code", "authorization","usage"] };
     this.search = { autosearch: true,
                     filters: ["name", "code", "group", "description"]
                   };
@@ -267,6 +294,12 @@ function model_reportsx(usrrap_key, rapparams)
             "model": new model_reportcolumns(usrrap_key, { internal: rapparams.internal }),
             "joinfield": "fac_usrrap_key",
             "enable_update": true
+        },
+        "notificationjobs": {
+            "model": new model_fac_notificatie_job({ niveau: "S"}),
+            "joinfield": "fac_usrrap_key",
+            "enable_update": true,
+            "label": L("lcl_schedule_frm_report")
         }
     };
 
@@ -364,7 +397,7 @@ function model_reportsx(usrrap_key, rapparams)
                     + (query.wheres.length ? " WHERE " + query.wheres.join(" AND " ) : "")
                     + " ORDER BY fac_usrrap_volgnr NULLS LAST, fac_usrrap_omschrijving";
 
-            if (params.include && params.include.length)
+            if (params.include && params.include.length && inArray("columns", params.include))
                 sql += ", fac_usrrap_cols_volgnr";
 
             var json = api2.sql2json (params, sql, this);

APPL/API2/model_res_activiteit.inc

@@ -65,6 +65,11 @@ function model_res_activiteit()
             "typ": "varchar",
             "multiedit": true
         },
+        "color": {
+            "dbs": "res_activiteit_color",
+            "label": L("res_activiteit_color"),
+            "typ": "color"
+        },
         "descriptionmandatory": {
             "dbs": "res_activiteit_omsverplicht",
             "label": L("res_activiteit_omsverplicht"),

APPL/API2/model_res_srtactiviteit.inc

@@ -93,8 +93,13 @@ function model_res_srtactiviteit()
         "columns": [
             "id",
             "prefix",
+            "name",
             "manner",
-            "name"
+            "costcentrerequired",
+            "anonymous",
+            "withdescription",
+            "withremark",
+            "withamount"
         ]
     };
     this.search = {

APPL/API2/model_reservationconsumables.inc

@@ -30,11 +30,11 @@ function model_reservationconsumables()
     this.record_name = "reservationconsumable";
 
     this.fields = {
-        "id"         : { dbs: "res_rsv_artikel_key",          typ: "key" , seq:"res_s_res_rsv_artikel_key"},
+        "id"         : { dbs: "res_rsv_artikel_key",          typ: "key", seq:"res_s_res_rsv_artikel_key"},
         "reservation": { dbs: "res_rsv_ruimte_key",           typ: "key", foreign: "res_rsv_ruimte" },
         "consumable" : { dbs: "res_artikel_key",              typ: "key", foreign: "res_artikel" },
         "freename"   : { dbs: "res_rsv_artikel_omschrijving", typ: "varchar" },
-        "amount"     : { dbs: "res_rsv_artikel_aantal",       typ: "number"},
+        "amount"     : { dbs: "res_rsv_artikel_aantal",       typ: "number" },
         "status"     : { dbs: "res_status_bo_key",            typ: "key", foreign: status_bo },
         "from"       : { dbs: "res_rsv_artikel_levering",     typ: "datetime" },
         //"to"       : { dbs: "res_rsv_artikel_tot",          typ: "date"     },
@@ -45,7 +45,7 @@ function model_reservationconsumables()
         "dirtlevel"  : { dbs: "res_rsv_artikel_dirtlevel",    typ: "number"   },
         "delivered"  : { dbs: "res_rsv_artikel_geleverd",     typ: "datetime" },
         "pickup"     : { dbs: "res_rsv_artikel_afhalen",      typ: "datetime" },
-        "externnr"   : { dbs: "res_rsv_artikel_externnr",     typ: "varchar",          readonly: !(user.has("WEB_FACTAB") || user.has("WEB_FACXNR")) },
+        "externnr"   : { dbs: "res_rsv_artikel_externnr",     typ: "varchar",       readonly: !(user.has("WEB_FACTAB") || user.has("WEB_FACXNR")) },
         "externsyncdate": { dbs: "res_rsv_artikel_externsyncdate", typ: "datetime", readonly: !(user.has("WEB_FACTAB") || user.has("WEB_FACXNR")) }
     };
 
@@ -67,6 +67,29 @@ function model_reservationconsumables()
         params.authparams = user.checkAutorisation(this.autfunction, null, null, true); // pessimistisch
     }
 
+    this._check_dirty = function (rsv_ruimte_key, scope, this_res)
+    {
+        var check_fail_sql = "";
+        var set_dirty_sql = "";
+        if (!(S("res_fo_catering_scopeless") && (scope == "fo" || scope == "bo")))
+        {   // Controle of artikelen dirty zijn.
+            set_dirty_sql = " res.set_artikelen_dirty (" + rsv_ruimte_key + ");";
+            if (S("res_fe_allow_dirty") != 1 && this_res.canChangeFEOnly)
+            {
+                check_fail_sql = " if res.dirty_level_all(" + rsv_ruimte_key + ") <> 0 then"
+                               + "    raise_application_error (-20001, " + safe.quoted_sql(L("lcl_res_fe_no_dirty")) + ");"
+                               + " end if;"
+            }
+        }
+        var sql = "BEGIN "
+                +   set_dirty_sql
+                +   check_fail_sql
+                + "END;";
+        var err = Oracle.Execute(sql, true);
+        if (err.friendlyMsg)
+            abort_with_warning(err.friendlyMsg);
+    }
+
     this.REST_GET = function _GET(params)
     {
         this._validate_fields({}, params, {});
@@ -113,15 +136,21 @@ function model_reservationconsumables()
         return json;
     };
 
-    this.REST_POST = function (params, jsondata)    /* new reservable consumable */
+    this.REST_POST = function (params, jsondata, parent_key)    /* new reservable consumable */
     {
+        var rsv_ruimte_key = parent_key;
+        var res_artikel_key = jsondata.consumable.id;
+        var this_res = res.func_enabled(rsv_ruimte_key); // Wat heb ik zoal aan rechten op deze specifieke reservering
         this._validate_fields({}, params, jsondata);
-
         var sql = "SELECT ra.res_artikel_vrije_omschrijving"
+                + "     , res_disc_params_bonotify"
                 + "  FROM res_artikel ra"
-                + " WHERE ra.res_artikel_key = " + jsondata.consumable.id;
+                + "     , res_disc_params rdp"
+                + " WHERE ra.res_discipline_key = rdp.res_ins_discipline_key"
+                + "   AND ra.res_artikel_key = " + res_artikel_key;
         var oRs = Oracle.Execute(sql);
         var hasFreename = (oRs("res_artikel_vrije_omschrijving").Value == 1);
+        var bonotify = oRs("res_disc_params_bonotify").Value == 1;
         oRs.Close();
 
         if (hasFreename)
@@ -138,19 +167,68 @@ function model_reservationconsumables()
         if (jsondata.amount == 0)
             abort_with_warning(L("lcl_res_rsv_art_count"));
 
-        return generic_REST_POST(this)(params, jsondata);
+        params.sqlOnly = true;
+        var gen_result = generic_REST_POST(this)(params, jsondata);
+        var rsv_artikel_key = gen_result.newKey;
+        delete params.sqlOnly;
+
+        // Controle of artikelen dirty zijn.
+        var check_fail_sql = "";
+        var set_dirty_sql = "";
+        var set_noti_sql = "";
+        if (!(S("res_fo_catering_scopeless") && (scope == "fo" || scope == "bo")))
+        {   
+            set_dirty_sql = " res.set_artikelen_dirty (" + rsv_ruimte_key + ");";
+            if (S("res_fe_allow_dirty") != 1 && this_res.canChangeFEOnly)
+            {
+                check_fail_sql = " if res.dirty_level_all(" + rsv_ruimte_key + ") <> 0 then"
+                               + "    raise_application_error (-20001, " + safe.quoted_sql(L("lcl_res_fe_no_dirty")) + ");"
+                               + " end if;"
+            }
+        }
+        if (bonotify)
+            set_noti_sql = " res.notifybackoffice(" + rsv_ruimte_key + ", 'RESNEW', 'C', " + res_artikel_key + ");";
+        var sql = "BEGIN "
+                +   gen_result.genIns.sql + ";"
+                +   set_dirty_sql
+                +   check_fail_sql
+                +   set_noti_sql
+                + "END;";
+        var err = Oracle.Execute(sql, true);
+        if (err.friendlyMsg)
+            abort_with_warning(err.friendlyMsg);
+
+        // NB: parameter "track" in this.fields niet aanwezig, dus ook geen tracking!
+        var trackarray = [res.trackartikel(res_artikel_key, "insert")];
+        if (trackarray.length > 0 && !params.delayTracking)
+            shared.trackaction("RESNEW", rsv_artikel_key, trackarray.join("\n"));
+
+        params.isNew = false; // Voorkom dat een volgende reservationconsumable ook een insert wordt.
+        return { key: rsv_artikel_key };
     }
 
     this.REST_PUT = function (params, jsondata, the_key) /* update reservable consumables */
     {
+        var rsv_artikel_key = the_key;
+        var scope = params.filter.scope || "fe";
         this._validate_fields({}, params, jsondata);
 
+        var sql = "SELECT r.res_rsv_ruimte_key"
+                + "  FROM res_rsv_ruimte r"
+                + "     , res_rsv_artikel a"
+                + " WHERE r.res_rsv_ruimte_key = a.res_rsv_ruimte_key"
+                + "   AND a.res_rsv_artikel_key = " + rsv_artikel_key;
+        var oRs = Oracle.Execute(sql);
+        var rsv_ruimte_key = oRs("res_rsv_ruimte_key").value;
+        oRs.Close();
+        var this_res = res.func_enabled(rsv_ruimte_key); // Wat heb ik zoal aan rechten op deze specifieke reservering
+
         var sql = "SELECT ra.res_artikel_vrije_omschrijving"
                 + "     , rra.res_rsv_artikel_omschrijving"
                 + "  FROM res_artikel ra"
                 + "     , res_rsv_artikel rra"
                 + " WHERE ra.res_artikel_key = rra.res_artikel_key"
-                + "   AND rra.res_rsv_artikel_key = " + the_key;
+                + "   AND rra.res_rsv_artikel_key = " + rsv_artikel_key;
         var oRs = Oracle.Execute(sql);
         var hasFreename = (oRs("res_artikel_vrije_omschrijving").Value == 1);
         var curFreename = oRs("res_rsv_artikel_omschrijving").Value;
@@ -176,7 +254,37 @@ function model_reservationconsumables()
         if (jsondata.amount == 0)
             abort_with_warning(L("lcl_res_rsv_art_count"));
 
-        return generic_REST_PUT(this)(params, jsondata, the_key);
+        params.sqlOnly = true;
+        var gen_result = generic_REST_PUT(this)(params, jsondata, the_key);
+        delete params.sqlOnly;
+         // Controle of artikelen dirty zijn.
+        var check_fail_sql = "";
+        var set_dirty_sql = "";
+        if (!(S("res_fo_catering_scopeless") && (scope == "fo" || scope == "bo")))
+        {  
+            set_dirty_sql = " res.set_artikelen_dirty (" + rsv_ruimte_key + ");";
+            if (S("res_fe_allow_dirty") != 1 && this_res.canChangeFEOnly)
+            {
+                check_fail_sql = " if res.dirty_level_all(" + rsv_ruimte_key + ") <> 0 then"
+                               + "    raise_application_error (-20001, " + safe.quoted_sql(L("lcl_res_fe_no_dirty")) + ");"
+                               + " end if;"
+            }
+        }
+        var sql = "BEGIN "
+                +   gen_result.genUpd.sql + ";"
+                +   set_dirty_sql
+                +   check_fail_sql
+                + "END;";
+        var err = Oracle.Execute(sql, true);
+        if (err.friendlyMsg)
+            abort_with_warning(err.friendlyMsg);
+
+        // NB: parameter "track" in this.fields niet aanwezig, dus ook geen tracking!
+        var trackarray = gen_result.genUpd.trackarray;
+        if (trackarray.length > 0 && !params.delayTracking)
+            shared.trackaction("RESUPD", the_key, L("lcl_updated") + "\n" + trackarray.join("\n"));
+
+        return { key: rsv_artikel_key };
     }
 
     this.REST_DELETE = function (params, the_key) /* delete reservable consumable */

APPL/API2/plugins/scimgroups.wsc

@@ -84,6 +84,10 @@ function error_handler(code, msg, orgHandler)
             code = code + " " + codestr;
     }
     FCLT.DEZE.Response.Status = code;
+
+    FCLT.DEZE.__Log("Aborting with status: " + code);
+    FCLT.DEZE.__Log(data);
+
     FCLT.DEZE.Response.End;
 }
 

APPL/API2/plugins/scimorgunits.wsc

@@ -55,9 +55,6 @@
 /* Globals */
 var FCLT;
 
-// De omschrijving van de objecten in FACILITOR moet FW1, FW2 etc. zijn
-var scimgroups_srtdeel_key = 258418;
-
 function initialize(params)
 {
     FCLT = params;
@@ -86,6 +83,10 @@ function error_handler(code, msg, orgHandler)
             code = code + " " + codestr;
     }
     FCLT.DEZE.Response.Status = code;
+
+    FCLT.DEZE.__Log("Aborting with status: " + code);
+    FCLT.DEZE.__Log(data);
+
     FCLT.DEZE.Response.End;
 }
 
@@ -121,10 +122,21 @@ function transform_incoming(params, data)
     {
         externalid : data["externalId"],
         description: data["code"],
-        name       : data["externalId"],
-        company    : { name: "Schiphol Group" } // mag omdat company "desc_is_unique" heeft
+        name       : data["externalId"]
     };
 
+    if (params.method == "POST") // niet zetten bij een PUT (die misschien alleen kostenplaatsen bijwerkt): dan kan onbedoeld een afdeling naar het default bedrijf gezet raken
+    {
+        if (FCLT.DEZE.S("scim_default_bedrijf") > 0)
+        {
+            department.company = FCLT.DEZE.S("scim_default_bedrijf");
+        }
+        else 
+        {
+            FCLT.DEZE._AiAi("Setting scim_default_bedrijf must have a value");
+        }
+    }
+
     if ("costCenter" in data && data["costCenter"] != "")
     {
         department.costcentre = { name: data["costCenter"] }; // id mag achterwege blijven omdat desc_is_unique

APPL/API2/plugins/scimusers.wsc

@@ -58,6 +58,7 @@ var FCLT;
 function initialize(params)
 {
     FCLT = params;
+    FCLT.DEZE.settings.overrule_setting("prs_dep_string", "d.prs_afdeling_omschrijving"); // om te kunnen updaten zonder al te veel problemen
 }
 
 function error_handler(code, msg, orgHandler)
@@ -313,10 +314,7 @@ FCLT.DEZE.__Log(data);
 
         if (enterprise["department"])
         {
-            if (FCLT.DEZE.S("prs_dep_string") != "d.prs_afdeling_omschrijving")
-            {
-                FCLT.DEZE.api2.error(400, "Facilitor setting prs_dep_string must be 'd.prs_afdeling_omschrijving' when creating departments");
-            }
+            // We hebben S("prs_dep_string") op "d.prs_afdeling_omschrijving" geforceerd. Daarmee werkt het volgende
             if (companyname)
             {
                 var sql = "SELECT prs_bedrijf_key"
@@ -346,8 +344,12 @@ FCLT.DEZE.__Log(data);
                 var bedrijf_key = oRs("prs_bedrijf_key").Value;
                 oRs.Close()
             }
+            else if (FCLT.DEZE.S("scim_default_bedrijf") > 0)
+            {
+                var bedrijf_key = FCLT.DEZE.S("scim_default_bedrijf");
+            }
             else
-            {   // TODO: Kunnen we een default verzinnen?
+            {
                 FCLT.DEZE.api2.error(400, "Missing organization for department");
             }
 
@@ -363,7 +365,7 @@ FCLT.DEZE.__Log(data);
             {
                 oRs.Close();
                 // unieke depnaam verzinnen
-                // Door onze eis dat prs_dep_string op d.prs_afdeling_omschrijving staat wordt
+                // Als je prs_dep_string op d.prs_afdeling_omschrijving zet wordt
                 // deze gegenereerde code grotendeels verborgen
                 var sqls = "SELECT prs_s_prs_afdeling_key.nextval FROM DUAL";
                 var oRs = FCLT.DEZE.Oracle.Execute( sqls );
@@ -490,7 +492,7 @@ function transform_one_person(params, person)
            "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User" :
                {
                    "organization":person.company.name,
-                   "department":person.department.name, // Let op: is bepaald via S("prs_dep_string")
+                   "department":person.department.name, // Let op: we hebben S("prs_dep_string") op "d.prs_afdeling_omschrijving" geforceerd.
                    "employeeNumber":person.employeenumber
                },
            "urn:ietf:params:scim:schemas:extension:facilitor:2.0:User" :

APPL/API2/table.css

@@ -2,14 +2,34 @@ table {
     color: #333;
     font-family: Verdana;
     font-size: smaller;
-    border-collapse:
-    collapse; border-spacing: 0;
+    border-collapse: separate; 
+    border-spacing: 0;
 }
 
-td, th { border: 1px solid #CCC;
+table th {
+    /* Apply both top and bottom borders to the <th> */
+    border-top: 1px solid #CCC;
+    border-bottom: 1px solid #CCC;
+    border-right: 1px solid #CCC;
+  }
+
+ table td {
+    /* For cells, apply the border to one of each side only (right but not left, bottom but not top) */
+    border-bottom: 1px solid #CCC;
+    border-right: 1px solid #CCC;
+  }
+
+td, th { 
          padding-left: .2em;
          padding-right: .2em;
-         height: 1.3em; }
+         height: 1.3em; 
+}
+
+table th:first-child,
+table td:first-child {
+/* Apply a left border on the first <td> or <th> in a row */
+border-left: 1px solid #CCC;
+}
 
 th {
     background: #F3F3F3;

APPL/AUT/Login.inc

@@ -160,7 +160,12 @@ function doLogin(prs_key, params)
     if (!params.noFacSession && !params.stateless && !Session("org_user_key")) // fac_scan_cust genereert er anders te veel, niet bij terugkeer uit impersonation
     {
         if (user.has("WEB_FACFAC"))
-            shared.trackaction("PRSLOG", user_key, L("lcl_logged_on").format(Session("ASPFIXATION").slice(-6), Session("fclt_realuser"), Session("last_ip")));
+        {
+            var tekst = L("lcl_logged_on").format(Session("ASPFIXATION").slice(-6), Session("fclt_realuser"), Session("last_ip"));
+            if (Session("fclt_realuserreason"))
+                tekst += "\n" + Session("fclt_realuserreason");
+            shared.trackaction("PRSLOG", user_key, tekst);
+        }
     }
 
     if (first_login && S("fac_firstlogin_expire") > 0)
@@ -169,12 +174,14 @@ function doLogin(prs_key, params)
                 + " ( fac_menu_altlabel"
                 + " , fac_menu_alturl"
                 + " , fac_menu_altgroep"
+                + " , fac_menu_level"
                 + " , prs_perslid_key"
                 + " , fac_menu_volgnr"
                 + " ) VALUES"
                 + " (" + safe.quoted_sql(L("lcl_firstlogin_url"), 30)
                 + " ," + safe.quoted_sql(S("fac_firstlogin_url"))
                 + " ,5"
+                + " ,2"
                 + " ," + user_key
                 + " ,(SELECT 10 + COALESCE(MAX(fac_menu_volgnr), 0)"
                   + "   FROM fac_menu"
@@ -1170,15 +1177,15 @@ function jwt_decode(token)
   return result;
 };
 
-function jwt_verify(decoded_jwt, secret, skew, duration)
+function jwt_verify(claim, secret, skew, duration)
 {
   skew = skew || 0;
   duration = duration || 0;
-  if (decoded_jwt.header.alg != "HS256")
+  if (claim.header.alg != "HS256")
     return { err:  "Only HS256 is supported" };
 
   var oCrypto = new ActiveXObject("SLNKDWF.Crypto");
-  var sig = oCrypto.hex_hmac_sha256(secret, decoded_jwt.orgheaderSeg + "." + decoded_jwt.orgpayloadSeg);
+  var sig = oCrypto.hex_hmac_sha256(secret, claim.orgheaderSeg + "." + claim.orgpayloadSeg);
   var sig64 = oCrypto.hex2base64(sig, false, true); // no padding, urlsafe
 
   var now = new Date().getTime() / 1000;
@@ -1190,30 +1197,65 @@ function jwt_verify(decoded_jwt, secret, skew, duration)
       return { err:  'Token not yet active' };
     }
 
-    if (claim.payload.exp && now > claim.payload.exp + skew) {
-      return { err:  'Token expired at {0}'.format(toISODateTimeString(new Date(claim.payload.exp * 1000), true)) };
+    if (claim.payload.exp)
+    {
+        if (now > claim.payload.exp + skew) {
+            var txt = 'JWT token for {0} has expired at {1}'.format(claim.payload.username || claim.payload.perslid_key || claim.payload.email, toISODateTimeString(new Date(claim.payload.exp * 1000)))
+            jwt_warn(claim, txt)
+            return { err: txt };
+        }
+        else if (claim.payload.iat)
+        {
+            var dur = Math.floor((claim.payload.exp - claim.payload.iat)  / 3600 / 24); // dagen
+            var now = new Date().getTime() / 1000;
+            var togo = Math.floor((claim.payload.exp - now) / 3600 / 24); // dagen
+            if (dur > 14 && togo < 14)
+            {
+                var txt = "JWT token for {0} will expire soon at {1}".format(claim.payload.username || claim.payload.perslid_key || claim.payload.email, toISODateTimeString(new Date(claim.payload.exp * 1000)));
+                jwt_warn(claim, txt)
+            }
+        }
     }
 
     // Onze eigen duration/expiration controleren we ook nog
     if (claim.payload.iat + duration < now - skew) {
-        __DoLog("Token expired. Now is {0}, got {1}, skew {2}".format(toISODateTimeString(new Date(now * 1000), true),
-                                                                      toISODateTimeString(new Date(claim.payload.iat * 1000), true),
+        __DoLog("Token expired. Now is {0}, got {1}, skew {2}".format(toISODateTimeString(new Date(now * 1000)),
+                                                                      toISODateTimeString(new Date(claim.payload.iat * 1000)),
                                                                       skew));
-      return { err:  'Token expired at {0}'.format(toISODateTimeString(new Date((claim.payload.iat + duration) * 1000), true)) };
+      return { err:  'Token expired at {0}'.format(toISODateTimeString(new Date((claim.payload.iat + duration) * 1000))) };
     }
     if (claim.payload.iat > now + skew) {
-        __DoLog("Token not yet active. Now is {0}, got {1}, skew {2}".format(toISODateTimeString(new Date(now * 1000), true),
-                                                                             toISODateTimeString(new Date(claim.payload.iat * 1000), true),
+        __DoLog("Token not yet active. Now is {0}, got {1}, skew {2}".format(toISODateTimeString(new Date(now * 1000)),
+                                                                             toISODateTimeString(new Date(claim.payload.iat * 1000)),
                                                                       skew));
         return { err:  'Token not yet active' };
     }
   }
-  if (decoded_jwt.signature64 == sig64)
+  if (claim.signature64 == sig64)
     return { success: true }
 
   return { err: "Token signature did not verify" };
 }
 
+// Only warn once per day (or after application pool recycle)
+function jwt_warn(claim, subject)
+{
+    var jwt_warn_name = customerId + "_JWT_WARN_" + claim.payload.jti; // uniek als het goed is
+    if (!Application(jwt_warn_name))
+    {
+        Application.Lock();
+        Application(jwt_warn_name) = toISODateTimeString(new Date(claim.payload.exp * 1000));
+        Application.Unlock();
+
+        var body = JSON.stringify(claim.payload, null, 4);
+        __DoLog(subject, "#FF0080")
+        __DoLog(body);
+        // Naar iedereen met PRSSYS
+        var sql = "BEGIN fac.putsystemnotification({0}, 3); END;".format(safe.quoted_sql(subject + "<br><pre>" + body + "</pre>")); // 3=portal+email
+        Oracle.Execute(sql);
+    }
+}
+
 // Kopie van UTILS\wsf_shared.js
 function getBearerToken(prs_key, idp_code, duration)
 {
@@ -1517,7 +1559,8 @@ function process_claim_update(claim, idp_data, params)
             case  9: persdata["email"]         = val; break;
             case 10: persdata["phone"]         = val; break;
             case 11: persdata["mobile"]        = val; break;
-            case 12: persdata["externalid"]    = val; break;
+            case 12: // externalid, geen break
+            case 13: persdata["externalid"]    = val; break;
             // de foreigns
             case 20: if (val)
                         persdata["function"]   = { name: val }; break; // Kan omdat fields.function.desc_is_unique is gezet

APPL/AUT/SAML/default.asp

@@ -61,6 +61,7 @@ if (DEBUGMODE)
         __Logging = idp_data.loglevel;
         __Log("Logging for this IdP ({0}) is forced on".format(idp_data.name), '#f00');
     }
+    shared.registeraction("IDP_Login", { daily: 2, refkey: idp_data.id }); // Per dag tellen voor de statistieken
 
     var svars = ["<pre>"]; // Voor logging
 

APPL/AUT/getapptoken.asp

@@ -48,11 +48,18 @@ var JSON_Result = true;
                 + "         1)"; // uitvoerende, anders heb je geen technische adressen
         Oracle.Execute(sql);
         var sql = "INSERT INTO prs_bedrijfadres"
-                + "       (prs_bedrijf_key, prs_bedrijfadres_type, prs_bedrijfadres_url, prs_bedrijfadres_password)"
+                + "       (prs_bedrijf_key,"
+                + "        prs_bedrijfadres_type,"
+                + "        prs_bedrijfadres_url,"
+                + "        prs_bedrijfadres_privkey,"
+                + "        prs_bedrijfadres_oa_scope,"
+                + "        prs_bedrijfadres_authmethod)"
                 + " VALUES ({0},".format(bedrijf_key)
                 + "         'N',"
-                + "         {0},".format(safe.quoted_sql(S("puo_app2pushurl"))) // 'https://fcm.googleapis.com/fcm/send'
-                + "         {0})".format(safe.quoted_sql(S("puo_app2secret")));
+                + "         {0},".format(safe.quoted_sql(S("puo_app2pushurl"))) // 'https://fcm.googleapis.com/v1/projects/facilitor-165209/messages:send'
+                + "         {0},".format(safe.quoted_sql(S("puo_app2secret"))) // JSONkey van ons service account
+                + "         'https://www.googleapis.com/auth/firebase.messaging'," // scope
+                + "         5)"; // Authmethod 5 is GoogleAuth
         Oracle.Execute(sql);
         var client_data =
         {

APPL/AUT/loginTry.asp

@@ -201,6 +201,8 @@ if ((user_key < 0 || getQParamInt("jwtforce", 0) == 1) && jwt)
         shared.internal_error("Missing fclt_realuser in claim. It is required for IDP_internal.");
     } else if (claim.payload.fclt_realuser) {
         Session("fclt_realuser") = claim.payload.fclt_realuser; // Komt mooi in eventuele AiAi logging terecht.
+        if (claim.payload.fclt_realuserreason)
+            Session("fclt_realuserreason") = claim.payload.fclt_realuserreason;
     }
 
     // Ok, de claim valideert. Nu kijken of we er iets mee kunnen
@@ -263,6 +265,10 @@ if ((user_key < 0 || getQParamInt("jwtforce", 0) == 1) && jwt)
                    +        safe.quoted_sql(agent, 256) + ", "
                    +        safe.quoted_sql(ip, 64) + ")";
             Oracle.Execute(sql);
+
+			// Lang geldige tokens registeren we niet: die  worden soms (SCIM)  duizenden keren vlak achter elkaar gebruikt
+			// Dan wil ik niet heel veel UPDATE's krijgen
+            shared.registeraction("IDP_Login", { daily: 2, refkey: idp_data.id }); // Per dag tellen voor de statistieken
         }
 
         // Onthouden hoe je bent binnengekomen zodat logout naar logout_url kan leiden

APPL/AUT/pass2mail_save.asp

@@ -53,6 +53,9 @@ else if ((oRs("prs_perslid_flags").Value & 2) == 2)
 else
 {
     var perslid_key = oRs("prs_perslid_key").Value;
+    var person = new Perslid(perslid_key);
+    var params = { ignoreOverrule: person.has("WEB_PRSSYS")};
+
     var email = oRs("prs_perslid_email").Value; // Voor als oslogin opgegeven
     oRs.MoveNext();
     if (!oRs.Eof)
@@ -93,7 +96,7 @@ else
         Oracle.Execute(sql);
 
         fac_send_bookmark(bookmarkId, email, L(mode=="A"?"lcl_password_new":"lcl_tokenmail_subject"),
-                                             L(mode=="A"?"lcl_password_reset":"lcl_tokenmail_body"));
+                                             L(mode=="A"?"lcl_password_reset":"lcl_tokenmail_body"), params);
 
         result.warning = L("lcl_pass2emailsent") + emailOrLogin;
     }

APPL/BES/bes_bestelling.asp

@@ -78,7 +78,9 @@ transitParam = buildTransitParam(["punch", "voorraad", "mld_key", "artikel_key",
           if (!punchwindow)
           {
             FcltMgr.setTitle(L("lcl_mld_new_bestelling"), {hot: true});
+<%        if (act_key === -1) { %>
             FcltMgr.startEdit(window, {nomessage: true});
+<%        } %>
           }
 <%      } %>
       });
@@ -98,7 +100,7 @@ transitParam = buildTransitParam(["punch", "voorraad", "mld_key", "artikel_key",
             if (params.bes_key > 0)
             {
               FcltMgr.stopEdit(window);
-              $("#besFrame")[0].src = "bes_show_bestelling.asp?urole=<%=urole%>&bes_key=" + params.bes_key;
+              $("#besframe")[0].src = "bes_show_bestelling.asp?urole=<%=urole%>&bes_key=" + params.bes_key;
             }
             else
               window.location.href = "bes_bestelling.asp?verynew=1&urole=<%=urole%>&bes_key=" + params.bes_key;
@@ -111,7 +113,7 @@ transitParam = buildTransitParam(["punch", "voorraad", "mld_key", "artikel_key",
           else if (!params.keepForm)
           {
             FcltMgr.setTitle(L("lcl_bes_bestelling") + " " + "<%=S("bes_bestelling_prefix")%>" + params.bes_key);
-            $("#besFrame")[0].src = "bes_show_bestelling.asp?urole=<%=urole%>&bes_key=" + params.bes_key + "&embedded=1";
+            $("#besframe")[0].src = "bes_show_bestelling.asp?urole=<%=urole%>&bes_key=" + params.bes_key + "&embedded=1";
           }
 <%      } %>
       }
@@ -144,16 +146,22 @@ transitParam = buildTransitParam(["punch", "voorraad", "mld_key", "artikel_key",
         {
 %>
         <script type="text/javascript" >
-         var disc_url = "bes_select_discipline.asp" + ("<%=correctie%>" == "1" ? "?intern=1" : "");
+         var disc_url = "../bes/bes_select_discipline.asp" + ("<%=correctie%>" == "1" ? "?intern=1" : "");
          FcltMgr.openModalDetail(disc_url, "<%=L("lcl_bes_fac_select_cat")%>",
                   { nomessage: true,
                     callback: function (data)
                       {
                         if (!data)
                             FcltMgr.closeDetail(window, { cancel: true } );
-                        var page="bes_bestelling.asp?urole=<%=urole%><%=transitParam%>&dis_key=" + data.disc_key; // Maak een nieuw
+<%                      if (act_key > 0) { %>
+                        var page = "bes_edit_bestelling.asp";
+<%                      } else { %>
+                        var page = "bes_bestelling.asp";
+<%                      } %>
+                        page += "?urole=<%=urole%><%=transitParam%>&dis_key=" + data.disc_key; // Maak een nieuw
                         window.location.href = page;
-                      }
+                      },
+                    noClose: <%=(act_key > 0 ? "true" : "false")%>
                   });
         </script>
 <%
@@ -231,7 +239,7 @@ transitParam = buildTransitParam(["punch", "voorraad", "mld_key", "artikel_key",
     }
     if (page != "")
     {
-        IFRAMER("besFrame", page, { FcltClose: "besClose", title: L("lcl_bes_frame_algemeen")} );
+        IFRAMER("besframe", page, { FcltClose: "besClose", title: L("lcl_bes_frame_algemeen")} );
     }
     if (bes_key > -1)
     {

APPL/BES/bes_edit_bestelling.asp

@@ -202,8 +202,8 @@ else // nieuwe bestelling. Defaults bepalen
   else  // fronto
   {
     bes_bestelling.kostenplaats_key = -1;
-    bes_bestelling.perslid_key = S("bes_fo_default_user") ? user_key : -1;
-    bes_bestelling.perslid_key_voor = S("bes_fo_default_user") ? user_key : -1;
+    bes_bestelling.perslid_key = (S("bes_fo_default_user") & 1) ? user_key : -1;
+    bes_bestelling.perslid_key_voor = (S("bes_fo_default_user") & 1) ? user_key : -1;
     if (psrt_keys.length)
     {
       var sql = "SELECT sd.prs_bedrijf_key"
@@ -247,6 +247,7 @@ else // nieuwe bestelling. Defaults bepalen
         + ",      m.prs_kostenplaats_key"
         + ",      sd.ins_srtdiscipline_prefix mld_prefix"
         + ",      m.mld_adres_key"
+        + ",      m.mld_alg_locatie_key"
         + "  FROM mld_melding m"
         + ",      prs_perslid p"
         + ",      mld_stdmelding sm"
@@ -262,8 +263,11 @@ else // nieuwe bestelling. Defaults bepalen
 
       bes_bestelling.mld_prefix = oRs("mld_prefix").value;
       bes_bestelling.mld_adres_key = oRs("mld_adres_key").value;
-      bes_bestelling.perslid_key = oRs("prs_perslid_key").value;
-      bes_bestelling.perslid_key_voor = oRs("prs_perslid_key").value;
+      bes_bestelling.alg_locatie_key = oRs("mld_alg_locatie_key").Value || -1;
+      if (S("bes_fo_default_user") & 2) {
+        bes_bestelling.perslid_key = S("bes_fo_default_user") ? oRs("prs_perslid_key").value : -1;
+        bes_bestelling.perslid_key_voor = S("bes_fo_default_user") ? oRs("prs_perslid_key").value : -1;
+      }
       bes_bestelling.kostenplaats_key = oRs("prs_kostenplaats_key").value || -1;
       oRs.close();
   }
@@ -457,8 +461,7 @@ oRs.Close();
     else
       buttons.push({title: L("lcl_submit"), icon: "fa-fclt-save", action: "MakeOrder(1)",  singlepress: true, id: "btn_bes_submit"});
 
-    if (bes_bestelling.fac_activiteit_key == -1)
-    {
+    if (bes_key > 0 || bes_bestelling.fac_activiteit_key == -1) {
       buttons.push({title: L("lcl_cancel"), icon: "fa-fclt-cancel", action: "bes_cancel()" });
     }
 
@@ -828,6 +831,7 @@ oRs.Close();
                             { trid: "deliveryaddress",
                               label: L("lcl_delivery_address"),
                               adresKey:  bes_bestelling.mld_adres_key,
+                              locKey: bes_bestelling.alg_locatie_key,
                               emptyOption: "",
                               filtercode: "A",
                               autlevel: ALGreadlevel,
@@ -840,6 +844,7 @@ oRs.Close();
                      + "     , m.mld_adres_naam"
                      + "  FROM mld_adres m"
                      + " WHERE mld_adres_verwijder IS NULL"
+                     + (bes_bestelling.alg_locatie_key > -1 ? " AND m.alg_locatie_key = " + bes_bestelling.alg_locatie_key : "")
                      + filtClause
                      + " ORDER BY m.mld_adres_key";
           var oRs = Oracle.Execute(sql_ad);

APPL/BES/bes_edit_opdr.asp

@@ -19,6 +19,7 @@
 <!-- #include file="../Shared/adresselector.inc" -->
 <!-- #include file="../shared/save2db.inc" -->
 <!-- #include file="bes.inc" -->
+<!-- #include file="bes_flexkenmerk.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins: ["jQuery"] })
@@ -29,7 +30,10 @@ var opdr_key = getQParamInt("opdr_key");
 
 var bes_bestelopdr = bes.bestelopdracht_info(opdr_key); // Globale variabele met alle bes_bestelopdr informatie
 var bes_bestelling = bes.bestelling_info(bes_bestelopdr.bes_key_str[0]);
+
 var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
+var this_bestelling = bes.func_enabled_bestelling(bes_bestelling)
+
 %>
 
 <html>
@@ -237,6 +241,10 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
                         }) ;
         RWTEXTAREATR("opmerk", "fldtxt", L("lcl_remark"), bes_bestelopdr.opmerking, {html: "rows='3'", suppressEmpty: true}); // Afhandeling, reden niet akkoord
         ROTEXTAREATR("fldtxt", L("lcl_bes_comment"), bes_bestelopdr.delivery_opmerk, {suppressEmpty: true});
+        // Hieronder 2 velden van de bestelaanvraag
+        if (S("bes_afleverruimte_verplicht") < 2) {
+            ROFIELDTR ("fld", L("lcl_bes_del_room"), bes_bestelling.afleverruimte);
+        }
         ROTEXTAREATR("fldtxt", L("lcl_bes_bestelling_lev_opm"), bes_bestelling.lev_opm, {suppressEmpty: true} );
 
         BLOCK_END();
@@ -267,6 +275,15 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
         }
 
         BLOCK_END();
+
+        generateFlexKenmerkCode ({ urole: urole,
+                                   bes_key: bes_bestelling.bes_key, // Bestelling key
+                                   disc_key: bes_bestelling.dis_key,
+                                   kenmerktype: "B",
+                                   bestelopdracht: true,
+                                   reado: true
+                                 });
+
         BLOCK_START("besOpdrItems", L("lcl_bes_geselecteerd"), { wide: true, nopadding: true, icon: "fa-list" });
 
         /* is magazijnlocatie gevuld bij een artikel dan tonen we die ook */
@@ -347,7 +364,7 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
 <%
         BLOCK_END();
 %>
-        
+
 <% IFACE.FORM_END(); %>
       </form>
     <% SUBFRAME_END(); %>

APPL/BES/bes_flexkenmerk.inc

@@ -34,6 +34,7 @@ function generateFlexKenmerkCode(params)
       var srtgroup_key = params.srtgroup_key; // Groep
       var srtdeel_key = params.srtdeel_key; // Item
       var kenmerktype = params.kenmerktype; // Kenmerktype
+      var bestelopdracht = params.bestelopdracht; // Bestelopdracht
       var ord = params.ord; // Via ORD binnengekomen
       var reado = params.reado; // Readonly
       var advanced = params.advanced; // Geavanceerd
@@ -66,7 +67,8 @@ function generateFlexKenmerkCode(params)
       if (besman_authparams)
         besman = true;
 
-      if (kenmerktype != "B" && kenmerktype != "I")
+      if (kenmerktype != "B" && kenmerktype != "I" ||
+          kenmerktype != "B" && bestelopdracht)
       {
         %><p><%=L("lcl_internal_error")%></p><%
         Response.End();
@@ -139,6 +141,9 @@ function generateFlexKenmerkCode(params)
               + "   OR k.bes_srtinstallatie_key = " + srtgroup_key + " AND k.bes_kenmerk_niveau LIKE 'G'"
               + "   OR k.bes_srtinstallatie_key = " + srtdeel_key + " AND k.bes_kenmerk_niveau LIKE 'S')"
             : " WHERE " + (has_disc ? "k.bes_srtinstallatie_key IN (" + disc_key + ")" : "(1=1)") )
+          + (bestelopdracht
+            ? " AND BITAND(k.bes_kenmerk_inlijst, 4) = 4"
+            : "")
           + "  AND k.bes_kenmerk_verwijder IS NULL"
           + "  AND k.bes_srtkenmerk_key = sk.bes_srtkenmerk_key"
           + "  AND sk.bes_srtkenmerk_verwijder IS NULL"

APPL/BES/bes_list.inc

@@ -1780,11 +1780,11 @@ function bes_list (pautfunction, params)
             + "                    || CHR(160)"
             + "                    || CASE"
             + "                           WHEN sk.bes_srtkenmerk_kenmerktype = 'R'"
+            + "                             OR sk.bes_srtkenmerk_kenmerktype = 'r'"
             + "                             OR sk.bes_srtkenmerk_kenmerktype = 'S'"
             + "                           THEN"
             + "                               flx.getdomeinwaarde(sk.fac_kenmerkdomein_key, kbl.bes_kenmerkbestell_waarde)"
-            + "                           WHEN (sk.bes_srtkenmerk_kenmerktype = 'N'"
-            + "                              OR sk.bes_srtkenmerk_kenmerktype = 'B')"
+            + "                           WHEN sk.bes_srtkenmerk_kenmerktype = 'N'"
             + "                            AND sk.bes_srtkenmerk_lengte = 1"
             + "                            AND sk.bes_srtkenmerk_nmin = 0"
             + "                            AND sk.bes_srtkenmerk_nmax = 1"

APPL/BES/bes_show_bestelling.asp

@@ -31,9 +31,10 @@ FCLTHeader.Requires({plugins:["suggest", "jQuery"],
                                "./sel_items_tab.js" ] })
 
 // AUTORISATIEPARAMETERS
-   var urole = getQParamSafe("urole");
-   var bes_key = getQParamInt("bes_key");
+  var urole = getQParamSafe("urole");
+  var bes_key = getQParamInt("bes_key");
 
+  /* ??? */
    fronto=true;
    backo=false;
    frontend=false;
@@ -43,6 +44,11 @@ FCLTHeader.Requires({plugins:["suggest", "jQuery"],
   var this_bes = bes.func_enabled_bestelling(bes_bestelling);
 
   user.auth_required_or_abort(this_bes.canReadAny);
+  if (urole == "xx") { // Vanuit geplande taak
+    var authparamsBESFOF = user.checkAutorisation("WEB_BESFOF", true, bes_bestelling.dis_key);
+    urole = authparamsBESFOF ? "fo" : "fe";
+  }
+
   var subjectMail = L("lcl_bes_RFO") + S("bes_bestelling_prefix") + bes_key;
   var hasFOBOread = this_bes.canReadFOF || this_bes.canReadBOF;
   var urlMail = "../shared/queuemail.asp?pcode=BESMAI&defemail_key=" + bes_bestelling.perslid_key

APPL/BES/bes_show_opdr.asp

@@ -15,6 +15,7 @@
 <!-- #include file="../Shared/iface.inc" -->
 <!--#include file="../Shared/persoonselector.inc" -->
 <!-- #include file="bes.inc" -->
+<!-- #include file="bes_flexkenmerk.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins: ["jQuery"] })
@@ -177,6 +178,9 @@ user.auth_required_or_abort(this_bestelopdr.canReadAny || this_bestelling.isVera
         oRs1 = Oracle.Execute( sql );
 
         ROFIELDTR("fld", L("lcl_bes_adres_lev"),  !oRs1.eof ? oRs1("mld_adres_naam").value : '?');
+        if (S("bes_afleverruimte_verplicht") < 2) {
+            ROFIELDTR ("fld", L("lcl_bes_del_room"), bes_bestelling.afleverruimte);
+        }
 
         sql = "SELECT mld_adres_naam "
             + " FROM mld_adres"
@@ -237,6 +241,15 @@ user.auth_required_or_abort(this_bestelopdr.canReadAny || this_bestelling.isVera
             ROFIELDTR("fld", L("lcl_bestelopdr_flags"), L("lcl_bestelopdr_flag" + bes_bestelopdr.flag), { icon: "fa-fclt-flag", iconclass: "besopdrflag" + bes_bestelopdr.flag });
         }
     BLOCK_END();
+
+    generateFlexKenmerkCode ({ urole: urole,
+                               bes_key: bes_bestelling.bes_key, // Bestelling key
+                               disc_key: bes_bestelling.dis_key,
+                               kenmerktype: "B",
+                               bestelopdracht: true,
+                               reado: true
+                             });
+
     BLOCK_START("besOpdrItems", L("lcl_bes_geselecteerd"), { wide: true, nopadding: true, icon: "fa-list" });
 
         /* is magazijnlocatie gevuld bij een artikel dan tonen we die ook */
@@ -301,7 +314,7 @@ user.auth_required_or_abort(this_bestelopdr.canReadAny || this_bestelling.isVera
         if (bes_bestelopdr.levkosten > 0)
         { %>
           <tr>
-              <td align="left" colspan="4"><label><%=L("lcl_bes_tpcosts")%></label></td>
+              <td align="left" colspan="5"><label><%=L("lcl_bes_tpcosts")%></label></td>
               <td align="right">
                   <span><%=safe.curr(bes_bestelopdr.levkosten)%></span>
               </td>

APPL/BES/opdr_list.inc

@@ -46,6 +46,8 @@ function opdr_list (pautfunction, params)
   // params.urole         : the usuals two-letter lowercase string
   // params.outputmode    : print to 0 = screen, 1 = printer, 2 = excel, etc.
   // params.showall       : boolean (true | false)
+  // params.datefrom      : date
+  // params.dateto        : date
   // params.catalogus_key : key
   // params.besgroep_key  : key
   // params.item_key      : key
@@ -78,6 +80,8 @@ function opdr_list (pautfunction, params)
   var excel = (outputmode == 2 || outputmode == 6);
   var showall = params.showall;
 
+  var datefrom = params.datefrom;
+  var dateto = params.dateto;
   var opdr_id = params.opdr_id;
   var catalogus_key = params.catalogus_key;
   var besgroep_key = params.besgroep_key;
@@ -156,8 +160,8 @@ function opdr_list (pautfunction, params)
 <%
       // Distinct omdat een bes_bestelopdr over meerdere bes_bestelling_items kan gaan
       sql = "SELECT DISTINCT b.bes_bestelopdr_key"
-          + "     , bes_bestelopdr_datum datum"
-          + "     , bes_bestelling_retourvan_key"
+          + "     , b.bes_bestelopdr_datum datum"
+          + "     , bst.bes_bestelling_retourvan_key"
           + "     , be.prs_bedrijf_naam prs_bedrijf_naam"
           // straks + ",      bes.bestelopdr_tooltip(b.bes_bestelopdr_key) tooltip" // TODO JGL: Dit is een dure tooltip!
           + "     , b.bes_bestelopdr_status"
@@ -189,11 +193,11 @@ function opdr_list (pautfunction, params)
           + "                    || CHR(160)"
           + "                    || CASE"
           + "                           WHEN sk.bes_srtkenmerk_kenmerktype = 'R'"
+          + "                             OR sk.bes_srtkenmerk_kenmerktype = 'r'"
           + "                             OR sk.bes_srtkenmerk_kenmerktype = 'S'"
           + "                           THEN"
           + "                               flx.getdomeinwaarde(sk.fac_kenmerkdomein_key, kbl.bes_kenmerkbestell_waarde)"
-          + "                           WHEN (sk.bes_srtkenmerk_kenmerktype = 'N'"
-          + "                              OR sk.bes_srtkenmerk_kenmerktype = 'B')"
+          + "                           WHEN sk.bes_srtkenmerk_kenmerktype = 'N'"
           + "                            AND sk.bes_srtkenmerk_lengte = 1"
           + "                            AND sk.bes_srtkenmerk_nmin = 0"
           + "                            AND sk.bes_srtkenmerk_nmax = 1"
@@ -255,6 +259,23 @@ function opdr_list (pautfunction, params)
       }
       else // Niet op opdrachtnummer gezocht, maar op andere criteria
       {
+        if (datefrom && dateto)
+        {
+          var ora_date1 = datefrom.toSQL(true);
+          var ora_date2 = dateto.toSQL(true);
+          sql += " AND b.bes_bestelopdr_datum BETWEEN " + ora_date1 + " AND " + ora_date2;
+        }
+        else if (datefrom)
+        {
+          var ora_date1 = datefrom.beginToSQL();
+          sql += " AND b.bes_bestelopdr_datum >= " + ora_date1;
+        }
+        else if (dateto)
+        {
+          var ora_date2 = dateto.endToSQL();
+          sql += " AND b.bes_bestelopdr_datum < " + ora_date2;
+        }
+
         if (requestor_key) // opdracht behorende bij aanvrager van bestelling
           sql += " AND p.prs_perslid_key = " + requestor_key;
 
@@ -344,7 +365,7 @@ function opdr_list (pautfunction, params)
       // bes.bestelopdr_tooltip pas helemaal aan de buitenkant voor performance
       sql = "SELECT xx.*, bes.bestelopdr_tooltip (xx.bes_bestelopdr_key) tooltip"
           + "  FROM (" + sql + ") xx"
-          + " ORDER BY bes_bestelopdr_status, prs_bedrijf_naam, bes_bestelopdr_key DESC";
+          + " ORDER BY xx.bes_bestelopdr_status, xx.prs_bedrijf_naam, xx.bes_bestelopdr_key DESC";
 
       /**********************************
        * Callback functies ResultsetTable

APPL/BES/opdr_search.asp

@@ -16,6 +16,7 @@
 <!-- #include file="../Shared/disciplineselector.inc" -->
 <!-- #include file="../Shared/srtgroepselector.inc" -->
 <!-- #include file="../Shared/srtdeelselector.inc" -->
+<!-- #include file="../Shared/calendar.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"],
@@ -29,6 +30,8 @@ var backo = (urole == "bo" || urole == "br");
 var minfo = (urole == "mi");
 var frontend = (urole == "fe" || (!fronto && !backo && !minfo));
 
+var date_from = getQParamDate("date_from", null);
+var date_to = getQParamDate("date_to", null);
 var prs_key = getQParamInt("prs_key", -1); // Requestor_key
 var disc = getQParamInt("disc", -1); // catalogus
 var srtgroup = getQParamInt("srtgroup", -1); // groep
@@ -159,9 +162,25 @@ oRs.Close();
                     RWCHECKBOXTR("flag" + flagkey, "fldcheck", (flagkey == 0 ? L("lcl_bestelopdr_flags") : ""), 1, { twocols: true, posthtml: label });
                 }
             }
- SEARCH_BLOCK_END(); 
- SEARCH_BLOCK_START(); 
+ SEARCH_BLOCK_END();
+ SEARCH_BLOCK_START();
 
+              // Datum van
+              FCLTcalendar("date_from",
+                           { label : L("lcl_period_from"),
+                             datum: date_from,
+                             initEmpty: date_from? false : true,
+                             trclass: "primsearch",
+                             volgnr: 1
+                           });
+              // Datum tot
+              FCLTcalendar("date_to",
+                           { label: L("lcl_period_to"),
+                             datum: date_to,
+                             initEmpty: date_to? false : true,
+                             trclass: "primsearch",
+                             volgnr: 2
+                           });
               // Catalogus
               FCLTdisciplineselector("disc",
                                      "sgDisc",
@@ -217,7 +236,7 @@ oRs.Close();
               <td class="label"><label for="opm"><%=L("lcl_bes_item_comment")%></label></td>
               <td><input type="text" class="fld wildcard" name="opm" value="<%=safe.htmlattr(opm)%>"></td>
             </tr>
-<% SEARCH_BLOCK_END(); 
+<% SEARCH_BLOCK_END();
 SEARCH_BLOCK_START({wide: true}); %>
         <!-- Statuses -->
         <tr class="primsearch">
@@ -236,7 +255,7 @@ SEARCH_BLOCK_START({wide: true}); %>
             </nobr>
           </td>
         </tr>
-<%    SEARCH_BLOCK_END(); 
+<%    SEARCH_BLOCK_END();
       SIMPLE_BLOCK_START();
       var buttons = [{ title: L("lcl_overview_list"), action: "document.forms.u2.submit();", importance: 1, icon: "fa-clipboard-list"}];
       if (!frontend)
@@ -257,4 +276,4 @@ SEARCH_BLOCK_START({wide: true}); %>
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 
+<% ASPPAGE_END(); %>

APPL/BES/opdr_search_list.asp

@@ -38,6 +38,8 @@ if (opdr_id > 0)
 }
 else
 { // Alleen als opdr_id (bestelopdracht key) niet opgegeven is, zijn de resterende parameters van belang!
+  var datefrom = getQParamDate("date_from", null); // Periode van.
+  var dateto = getQParamDate("date_to", null); // Perdiode tot.
   var catalogus_key = getQParamInt("disc", -1); // catalogus
   var besgroep_key = getQParamInt("srtgroep", -1); // groep
   var item_key = getQParamInt("srtdeel", -1); // item
@@ -53,6 +55,8 @@ else
   var adr_key = getQParamInt("adr_key", -1);
   var loc_key = getQParamInt("loc_key", -1);
 
+  params.datefrom      = datefrom;
+  params.dateto        = dateto;
   params.catalogus_key = (catalogus_key != -1? catalogus_key : null);
   params.besgroep_key  = (besgroep_key != -1? besgroep_key : null);
   params.item_key      = (item_key != -1? item_key : null);
@@ -117,4 +121,4 @@ switch(urole)
 }
 
 opdr_list(autfunction, params);
-%><% ASPPAGE_END(); %> 
+%><% ASPPAGE_END(); %>

APPL/BES/sel_items_tab.js

@@ -644,9 +644,8 @@ function checkInput()
 function makeorder_callback(json)
 {
   iface.button.enable("btn_bes_submit");
-  if (json.success)
-  {
-    FcltMgr.closeDetail(window, { bes_key: json.bes_key, cancel: false });
+  if (json.success) {
+    FcltMgr.closeDetail(window, json);
   }
 }