AQQA#52750 - tmpl_logo.gif aangepast

svn path=/Website/branches/v2017.2/; revision=37492

APPL/ALG/alg.inc

@@ -388,6 +388,34 @@ alg = {
             aresult.canPRSBOFwrite  = aresult.canWrite("WEB_PRSBOF"); // werkplekbeheer
 
             return aresult;
+          },
+
+        calc_algm2:  function _calc_algm2(alg_key, lvl)
+        {
+          var sql = "SELECT   SUM (alg_ruimte_bruto_vloeropp) opp1, "
+                  + "         SUM (alg_ruimte_opp_alt1) opp2, "
+                  + "         SUM (alg_ruimte_opp_alt2) opp3 "
+                  + "  FROM   alg_ruimte r, alg_verdieping v "
+                  + " WHERE   v.alg_verdieping_key = r.alg_verdieping_key "
+                  + "         AND r.alg_ruimte_verwijder IS NULL";
+
+          if (lvl == "G")
+          {
+            sql += " AND alg_gebouw_key = " + alg_key;
           }
-      }
+
+          if (lvl == "V")
+          {
+            sql += " AND r.alg_verdieping_key = " + alg_key;
+          }
+
+          var oRs = Oracle.Execute(sql);
+
+          var algm2 = { oppbruto: oRs("opp1").Value, oppalt1: oRs("opp2").Value, oppalt2: oRs("opp3").Value }
+
+          oRs.Close();
+
+          return algm2;
+        }
+  }
 %>

APPL/ALG/alg_delete.asp

@@ -17,6 +17,7 @@ var JSON_Result = true;
 %>
 <!--#include file="../Shared/common.inc"-->
 <!--#include file="../Shared/json2.js" -->
+<!--#include file="alg.inc" -->
 <%
 protectRequest.validateToken();
 
@@ -35,6 +36,61 @@ var autfunction = {D : "WEB_ALGMAN",
 
 var authParams = user.checkAutorisation(autfunction);
 
+var authparamsAlg = alg.checkAutorisation();
+
+var tobedeleted = 0;
+var ingesloten = [];
+// Bepaal de opdrachten in de selectie die
+// ook echt geaccepteerd kunnen of mogen worden.
+for (var i = 0; i < dis_key_arr.length; i++)
+{
+  var canDelete = false;
+  switch (level)
+  {
+    case "RE": canDelete = alg.canWriteRegio(dis_key_arr[i], authparamsAlg.mALGwritelevel);
+               break;
+    case "D":  canDelete = alg.canWriteDistrict(dis_key_arr[i], authparamsAlg.mALGwritelevel);
+               break;
+    case "L":  canDelete = alg.canWriteLocatie(dis_key_arr[i], authparamsAlg.mALGwritelevel);
+               break;
+    case "T":  var sql = "SELECT alg_locatie_key"
+                       + "  FROM alg_v_aanwezigterreinsector"
+                       + " WHERE alg_terreinsector_key = " + dis_key_arr[i];
+               oRs = Oracle.Execute(sql);
+               canDelete = alg.canWriteLocatie(oRs("alg_locatie_key").Value, authparamsAlg.mALGwritelevel);
+               oRs.Close()
+               break;
+    case "G":  canDelete = alg.canWriteGebouw(dis_key_arr[i], authparamsAlg.mALGwritelevel);
+               break;
+    case "V":  canDelete = alg.canWriteVerdieping(dis_key_arr[i], authparamsAlg.mALGwritelevel);
+               break;
+    case "R":  canDelete = alg.canWriteRuimte(dis_key_arr[i], authparamsAlg.mALGwritelevel);
+               break;
+    case "W":  var sql = "SELECT alg_ruimte_key"
+                       + "  FROM prs_v_werkplek_gegevens"
+                       + " WHERE prs_werkplek_key = " + dis_key_arr[i];
+               oRs = Oracle.Execute(sql);
+               canDelete = alg.canWriteRuimte(oRs("alg_ruimte_key").Value, authparamsAlg.mALGwritelevel);
+               oRs.Close()
+               break;
+    case "PW": var sql = "SELECT alg_ruimte_key"
+                       + "  FROM prs_v_werkplek_gegevens w, prs_perslidwerkplek pw"
+                       + " WHERE pw.prs_werkplek_key = w.prs_werkplek_key"
+                       + "   AND prs_perslidwerkplek_key = " + dis_key_arr[i];
+               oRs = Oracle.Execute(sql);
+               canDelete = alg.func_enabled_ruimte(oRs("alg_ruimte_key").Value).canPRSBOFwrite;
+               oRs.Close()
+               break;
+  }
+
+  if (canDelete)
+  {
+    ingesloten.push(dis_key_arr[i]);
+    tobedeleted++;
+  }
+}
+user.auth_required_or_abort(tobedeleted > 0); // We klagen niet over enkele wel en enkele niet
+
 var table = {D : "ALG_DISTRICT",
              RE: "ALG_REGIO",
              L : "ALG_LOCATIE",
@@ -46,41 +102,41 @@ var table = {D : "ALG_DISTRICT",
              PW: "PRS_PERSLIDWERKPLEK"}[level];
 
 result = { success: true, deleted: true };
-for (var i = 0; i < dis_key_arr.length; i++)
+for (var i = 0; i < ingesloten.length; i++)
 {
-    // W en WP hebben geen verwijderveld (meer), die gaan echt weg.
-    if (level == "W" || level == "PW")
+  // W en WP hebben geen verwijderveld (meer), die gaan echt weg.
+  if (level == "W" || level == "PW")
+  {
+    // Een WP gooit via de cascade zijn bezetting mee weg.
+    // Een bezetting verwijderen doet niets extra
+    // Bij impliciet verwijderen van wp-bezetting dus ook de werkplek weggooien
+    // die nu (per definitie) leeg wordt. Dit moet eerst, want straks weet
+    // ik niet meer genoeg
+    if (level == "PW" && S("prs_werkplek_implicit") == 1)
     {
-        // Een WP gooit via de cascade zijn bezetting mee weg.
-        // Een bezetting verwijderen doet niets extra
-        // Bij impliciet verwijderen van wp-bezetting dus ook de werkplek weggooien
-        // die nu (per definitie) leeg wordt. Dit moet eerst, want straks weet
-        // ik niet meer genoeg
-        if (level == "PW" && S("prs_werkplek_implicit") == 1)
-        {
-            sql = "DELETE FROM prs_werkplek"
-                + " WHERE prs_werkplek_key IN "
-                + "     (SELECT prs_werkplek_key "
-                + "        FROM prs_perslidwerkplek"
-                + "        WHERE prs_perslidwerkplek_key IN (" + dis_key_arr[i] + "))"
-            var err = Oracle.Execute(sql, true);
-            if (err.friendlyMsg)
-              abort_with_warning(err.friendlyMsg);
-        }
-        // En dit moet ongeacht impliciet of expliciet.
-        // Alleen bij PW&implicit zal dit niets meer verwijderen vanwege de cascade hiervoor
-        sql = "DELETE FROM " + table
-            + " WHERE " + table + "_key IN (" + dis_key_arr[i] + ")";
+      sql = "DELETE FROM prs_werkplek"
+          + " WHERE prs_werkplek_key IN "
+          + "     (SELECT prs_werkplek_key "
+          + "        FROM prs_perslidwerkplek"
+          + "        WHERE prs_perslidwerkplek_key IN (" + ingesloten[i] + "))"
+      var err = Oracle.Execute(sql, true);
+      if (err.friendlyMsg)
+        abort_with_warning(err.friendlyMsg);
     }
-    else
-    {
-        sql = "UPDATE " + table
-            + "   SET " + table + "_VERWIJDER = " + "SYSDATE"
-            + " WHERE " + table + "_key IN (" + dis_key_arr[i] + ")";
-    }
-    var err = Oracle.Execute(sql, true);
-    if (err.friendlyMsg)
-      abort_with_warning(err.friendlyMsg);
+    // En dit moet ongeacht impliciet of expliciet.
+    // Alleen bij PW&implicit zal dit niets meer verwijderen vanwege de cascade hiervoor
+    sql = "DELETE FROM " + table
+        + " WHERE " + table + "_key IN (" + ingesloten[i] + ")";
+  }
+  else
+  {
+    sql = "UPDATE " + table
+        + "   SET " + table + "_VERWIJDER = " + "SYSDATE"
+        + " WHERE " + table + "_key IN (" + ingesloten[i] + ")";
+  }
+  var err = Oracle.Execute(sql, true);
+  if (err.friendlyMsg)
+    abort_with_warning(err.friendlyMsg);
 }
 
 Response.Write(JSON.stringify(result));

APPL/ALG/alg_district_list.inc

@@ -54,19 +54,18 @@ function fnrowData(oRs)
 
   function doDelete(rowArray, isMulti)
   {
-    var disKeyString = getKeyString(rowArray);
-    if (isMulti || confirm(L("lcl_alg_del_txt_district")))
-    {
-      var data = { key: disKeyString,
-                   level: "D"
-                 };
-      <% protectRequest.dataToken("data"); %>
-      $.post("alg_delete.asp",
-             data,
-             FcltCallbackRefresh,
-             "json");
-    }
+    FcltMgr.confirm(L("lcl_alg_del_txt_district"), { autoconfirm: isMulti },
+      function() {
+        var disKeyString = getKeyString(rowArray);
+        var data = { key: disKeyString,
+                     level: "D"
+                   };
+        <% protectRequest.dataToken("data"); %>+
+        $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+      }
+    );
   }
+
 </script>
 <%
 
@@ -132,6 +131,11 @@ function district_list(pautfunction, params)
       sqln += " AND d.alg_district_key = " + dis_key;
       }
 
+   if (params.distr_descr)
+      {
+        sqln += " AND UPPER(d.alg_district_omschrijving) LIKE " + safe.quoted_sql_wild(params.distr_descr + "%");
+      }
+
    else if (reg_key)
       {
       sqln += " AND d.alg_regio_key = " + reg_key;

APPL/ALG/alg_district_search.asp

@@ -52,10 +52,14 @@ var authparams = alg.checkAutorisation();
                                                                   regiokey: regio_key,
                                                                   districtkey: district_key,
                                                                   startlevel: 0, // Regio
-                                                                  eindlevel: 1, // District
+                                                                  eindlevel: 0, // Regio
                                                                   whenEmpty: L("lcl_search_generic")
                                                                 });
 %>
+              <tr class="primsearch">
+                <td class="label"><label><%=L("lcl_estate_district_man_descr")%>:</label></td>
+                <td><input type="text" class="wildcard" id="distr_descr" name="distr_descr" value=""></td>
+              </tr>
               </table>
             </td><!-- end column 1 -->
             <td class="searchkolom2">

APPL/ALG/alg_district_search_list.asp

@@ -4,9 +4,9 @@
      $Id$
 
     File:        alg_district_search_list.asp
-    Description: 
-    Parameters: 
-    Context:     
+    Description:
+    Parameters:
+    Context:
     Note:
 */ %>
 
@@ -23,12 +23,14 @@ var outputmode = getQParamInt("outputmode", 0); //  0 = screen, 1 = print, 2 = e
 var showall = getQParamInt("showall", 0) == 1;
 var reg_key = getQParamInt("regiokey", -1); // Regio
 var dis_key = getQParamInt("districtkey", -1); // District
+var distr_descr = getQParam("distr_descr", ""); // Districtomschrijving
 
 district_list ( "*",
               {  outputmode: outputmode,
                  showall: showall,
                  reg_key: (reg_key != -1? reg_key : null),
-                 dis_key: (dis_key != -1? dis_key : null)
+                 dis_key: (dis_key != -1? dis_key : null),
+                 distr_descr: distr_descr
               }
              );
 %>

APPL/ALG/alg_edit_district.asp

@@ -83,7 +83,7 @@ if (this_alg.writeman)
 else
     manRWFIELD = function (a,b,c,d,e) { ROFIELDTR(b,c,d,e) }; // als geen USE of <self> dan zijn er veel readonly
 
-  BLOCK_START("algInfo", "");
+  BLOCK_START("algInfo", "&nbsp;");
       FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel, {
             districtkey: dis_key,
             startlevel: 0, // Regio

APPL/ALG/alg_edit_district_save.asp

@@ -55,11 +55,19 @@ else
                             "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                             "    AND ALG_ONRGOED_NIVEAU = 'D' " +
                             "    AND ALG_ONRGOED_KEY = " + dis_key;
-      saveFlexKenmerken(dis_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
-                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
-                                currentKenmerkenSQL, false,  //QueryForm, rest QueryString
-                                "ALG_ONRGOED_NIVEAU", "D",
-                                (dis_key<0),"ALG/D")
+      saveFlexKenmerken(dis_key,
+                        { kenmerkTable: "alg_onrgoedkenmerk",
+                          kenmerkParentKey : "alg_onrgoed_key",
+                          kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
+                          kenmerkKey: "alg_kenmerk_key",
+                          currentKenmerkenSQL: currentKenmerkenSQL,
+                          requestQF: Request.Form,
+                          flexPath: "ALG/D",
+                          module: "ALG",
+                          moduleName: "alg_onrgoed_niveau",
+                          moduleVal: "D",
+                          isNew: dis_key < 0
+                        });
 }
   %>
 <html>

APPL/ALG/alg_edit_gebouw.asp

@@ -14,8 +14,9 @@
 */ %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
+<!-- #include file="../Shared/calendar.inc" -->
 <!-- #include file="../Shared/selector.inc" -->
-
+<!-- #include file="../Shared/adresselector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
 <!-- #include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="../Shared/persoonselector.inc" -->
@@ -46,6 +47,7 @@ if (bld_key > 0)
   var bld_code   = oRs("alg_gebouw_code").Value;
   var bld_descr  = oRs("alg_gebouw_omschrijving").Value;
   var bld_maak   = oRs("alg_gebouw_aanmaak").Value;
+  var bld_email  = oRs("alg_gebouw_email").Value;
   var bld_teken  = oRs("alg_gebouw_getekend").Value;
   var bld_opp    = oRs("alg_gebouw_bruto_vloeropp").Value;
   var bld_omtrek = oRs("alg_gebouw_omtrek").Value;
@@ -64,6 +66,8 @@ if (bld_key > 0)
   var einduur    = oRs("alg_gebouw_einduur").Value;
   var werkdagen  = oRs("alg_gebouw_werkdagen").Value;
   var verantw_key    = oRs("prs_perslid_key_verantw").Value;
+  var verantw_key2   = oRs("prs_perslid_key_verantw2").Value;
+  var vervaldatum = oRs("alg_gebouw_vervaldatum").Value != null ? new Date(oRs("alg_gebouw_vervaldatum").Value) : null;
   oRs.Close();
 }
 else
@@ -108,7 +112,7 @@ else
         else
           manRWFIELD = function (a,b,c,d,e) { ROFIELDTR(b,c,d,e) }; // als geen USE of <self> dan zijn er veel readonly
 
-        BLOCK_START("algLoc1", "");
+        BLOCK_START("algLoc1", "&nbsp;");
         FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel,
                            { gebouwkey: bld_key,
                              startlevel: 2, //Locatie
@@ -158,25 +162,45 @@ else
                               readonly: !this_alg.writeuse,
                               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,
+                              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});
         BLOCK_END();
 
-        BLOCK_START("algLoc2", "");
-        manRWFIELD("bld_opp",  "fld",          L("lcl_estate_gebouw_man_bruto_vloeropp"),        bld_opp, {maxlength: 15});
+        BLOCK_START("algLoc2", "&nbsp;");
+        if (bld_key > 0)
+        {
+          var calcopp = alg.calc_algm2(bld_key, onrgoedlvl);
+          ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
+        }
+        manRWFIELD("bld_opp",  "fld float",          L("lcl_estate_gebouw_man_bruto_vloeropp"),        bld_opp, {datatype:"float", maxlength: 15});
         manRWFIELD("bld_omtrek",  "fld",          L("lcl_estate_gebouw_man_omtrek"),        bld_omtrek, {maxlength: 15});
         manRWFIELD("bld_inhoud",  "fld",          L("lcl_estate_gebouw_man_inhoud"),        bld_inhoud, {maxlength: 15});
-        sql = "SELECT mld_adres_key"
-            + "     , mld_adres_naam "
-            + "  FROM mld_v_afleveradres"
-            + " ORDER BY mld_adres_naam ";
-        FCLTselector("mld_adres",
-                     sql,
-                     { label: L("lcl_delivery_address"),
-                       initKey: mld_adres,
+        FCLTadresselector("mld_adres", "sgAdres",
+                    {
+                       label: L("lcl_delivery_address"),
+                       adresKey:  mld_adres,
                        emptyOption: "",
+                       filtercode: "A",
                        readonly: !this_alg.writeman
-                     });
+                    }) ;
         manRWFIELD("bld_x",  "fld",          L("lcl_geoxcoord"),        bld_x, {maxlength: 25});
         manRWFIELD("bld_y",  "fld",          L("lcl_geoycoord"),        bld_y, {maxlength: 25});
+
+        FCLTcalendar("vervaldatum",
+                     { datum: vervaldatum,
+                       initEmpty: vervaldatum==null,
+                       label: L("lcl_alg_vervaldatum"),
+                       readonly: !this_alg.writeman
+                     });
+
         if (this_alg.writeman)
           CHECKBOXTR(L("lcl_estate_gebouw_bez"), "fldalgbez", "bld_bez", bld_bez==1)
         var times = [];

APPL/ALG/alg_edit_gebouw_save.asp

@@ -34,10 +34,11 @@ user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse))
                   { dbs: "alg_gebouw_naam",           typ: "varchar", frm: "bld_naam" },
                   { dbs: "alg_gebouw_code",           typ: "varchar", frm: "bld_code" },
                   { dbs: "alg_gebouw_omschrijving",   typ: "varchar", frm: "bld_descr" },
+                  { dbs: "alg_gebouw_email",          typ: "varchar", frm: "bld_email" },
                   { dbs: "alg_gebouw_getekend",       typ: "date",    frm: "bld_teken" },
-                  { dbs: "alg_gebouw_bruto_vloeropp", typ: "number",  frm: "bld_opp" },
-                  { dbs: "alg_gebouw_omtrek",         typ: "number",  frm: "bld_omtrek" },
-                  { dbs: "alg_gebouw_inhoud",         typ: "number",  frm: "bld_inhoud" },
+                  { dbs: "alg_gebouw_bruto_vloeropp", typ: "float",   frm: "bld_opp" },
+                  { dbs: "alg_gebouw_omtrek",         typ: "float",   frm: "bld_omtrek" },
+                  { dbs: "alg_gebouw_inhoud",         typ: "float",   frm: "bld_inhoud" },
                   { dbs: "alg_gebouw_opmerking",      typ: "varchar", frm: "bld_opmerk" },
                   { dbs: "mld_adres_key",             typ: "key",     frm: "mld_adres" },
                   { dbs: "prs_kostenplaats_key",      typ: "key",     frm: "prs_kstpl" },
@@ -49,7 +50,9 @@ user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse))
                   { dbs: "alg_gebouw_y",              typ: "float",   frm: "bld_y" },
                   { dbs: "alg_gebouw_bez",            typ: "check",   frm: "bld_bez" },
                   { dbs: "alg_gebouw_werkdagen",      typ: "check0",  frm: "bld_werkdagen" },
-                  { dbs: "prs_perslid_key_verantw",   typ: "key",     frm: "verantw" }];
+                  { dbs: "alg_gebouw_vervaldatum",    typ: "date",    frm: "vervaldatum",  track: L("lcl_alg_vervaldatum") },
+                  { dbs: "prs_perslid_key_verantw",   typ: "key",     frm: "verantw" },
+                  { dbs: "prs_perslid_key_verantw2",  typ: "key",     frm: "verantw2" }];
 
   if (beginuur != -2)
     fields.push({ dbs: "alg_gebouw_beginuur",       typ: "float",   val: beginuur });
@@ -87,11 +90,19 @@ user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse))
                             "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                             "    AND ALG_ONRGOED_NIVEAU = 'G' " +
                             "    AND ALG_ONRGOED_KEY = " + bld_key;
-      saveFlexKenmerken(bld_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
-                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
-                                currentKenmerkenSQL, false,  //QueryForm, rest QueryString
-                                "ALG_ONRGOED_NIVEAU", "G",
-                                (bld_key<0),"ALG/G")
+      saveFlexKenmerken(bld_key,
+                        { kenmerkTable: "alg_onrgoedkenmerk",
+                          kenmerkParentKey : "alg_onrgoed_key",
+                          kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
+                          kenmerkKey: "alg_kenmerk_key",
+                          currentKenmerkenSQL: currentKenmerkenSQL,
+                          requestQF: Request.Form,
+                          flexPath: "ALG/G",
+                          module: "ALG",
+                          moduleName: "alg_onrgoed_niveau",
+                          moduleVal: "G",
+                          isNew: bld_key < 0
+                        });
   }
 %>
 

APPL/ALG/alg_edit_locatie.asp

@@ -97,7 +97,7 @@ if (this_alg.writeman)
 else
     manRWFIELD = function (a,b,c,d,e) { ROFIELDTR(b,c,d,e) }; // als geen USE of <self> dan zijn er veel readonly
 
-BLOCK_START("algLoc1", "");
+BLOCK_START("algLoc1", "&nbsp;");
       FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel, {
           districtkey: dis_key,
           locatiekey: loc_key,
@@ -129,7 +129,7 @@ manRWFIELD("loc_x",  "fld",          L("lcl_geoxcoord"),        loc_x, {maxlengt
 manRWFIELD("loc_y",  "fld",          L("lcl_geoycoord"),        loc_y, {maxlength: 25});
 
 BLOCK_END();
-BLOCK_START("algLoc2", "");
+BLOCK_START("algLoc2", "&nbsp;");
 
 manRWFIELD("pst_adres",  "fld",          L("lcl_prs_address_post_adres"),        pst_adres, {maxlength: 50});
 manRWFIELD("pst_postc",  "fld",          L("lcl_prs_address_post_postcode"),        pst_postc, {maxlength: 12});

APPL/ALG/alg_edit_locatie_save.asp

@@ -70,11 +70,19 @@ else
                             "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                             "    AND ALG_ONRGOED_NIVEAU = 'L' " +
                             "    AND ALG_ONRGOED_KEY = " + loc_key;
-      saveFlexKenmerken(loc_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
-                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
-                                currentKenmerkenSQL, false,
-                                "ALG_ONRGOED_NIVEAU", "L",
-                                (loc_key<0),"ALG/L")
+      saveFlexKenmerken(loc_key,
+                        { kenmerkTable: "alg_onrgoedkenmerk",
+                          kenmerkParentKey : "alg_onrgoed_key",
+                          kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
+                          kenmerkKey: "alg_kenmerk_key",
+                          currentKenmerkenSQL: currentKenmerkenSQL,
+                          requestQF: Request.Form,
+                          flexPath: "ALG/L",
+                          module: "ALG",
+                          moduleName: "alg_onrgoed_niveau",
+                          moduleVal: "L",
+                          isNew: loc_key < 0
+                        });
 }
   %>
 

APPL/ALG/alg_edit_regio.asp

@@ -76,7 +76,7 @@ var action = (regio_key == -1 ? "I" : "U");
         else
             manRWFIELD = function (a,b,c,d,e) { ROFIELDTR(b,c,d,e) }; // als geen USE dan zijn er veel readonly
 
-        BLOCK_START("algInfo", "");
+        BLOCK_START("algInfo", " ");
 
           manRWFIELD("reg_oms", "fld", L("lcl_region"), regio_data.name, {required: true, maxlength: 30});
 

APPL/ALG/alg_edit_ruimte.asp

@@ -118,7 +118,7 @@ if (!room_exists)
         else
             useRWFIELD = manRWFIELD
 
-        BLOCK_START("algLoc1", "");
+        BLOCK_START("algLoc1", " ");
 
           FCLTplaatsselector( this_alg.authparams("WEB_RUIMAN").ALGwritelevel,
                               { locatiekey: loc_key,
@@ -161,7 +161,7 @@ if (!room_exists)
                         });
 
         BLOCK_END();
-        BLOCK_START("algLoc2", "");
+        BLOCK_START("algLoc2", " ");
 
           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);
@@ -194,6 +194,7 @@ if (!room_exists)
                           readonly: !this_alg.writeman
                         }
                       );
+          times.push(" SELECT 24, '24:00' FROM DUAL");
           FCLTselector( "room_einduur",
                         times.join(" UNION ALL "),
                         { label: L("lcl_estate_gebouw_einduur"),

APPL/ALG/alg_edit_ruimte_multi.asp

@@ -0,0 +1,212 @@
+<%@language = "javascript" %>
+<% /*
+     $Revision$
+     $Id$
+
+    File:               alg_edit_ruimte_multi.asp
+    Description:        Multi editten van de flexkenmerken van ruimtes
+    Parameters:         alg_keys
+
+    Context:
+    Note:
+
+*/ %>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/iface.inc" -->
+<!-- #include file="../Shared/save2db.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="../Shared/selector.inc" -->
+<!-- #include file="../Shared/kenmerk_common.inc" -->
+<!-- #include file="./alg_flexkenmerk.inc" -->
+<!-- #include file="./alg.inc" -->
+
+<%
+FCLTHeader.Requires({ plugins:["suggest", "jQuery", "kenmerk"] });
+
+var alg_key_arr = getQParamIntArray("alg_keys");
+var alg_level = getQParam("alg_level");
+
+var warning = "";
+var result = {};
+var tobeedited = 0;
+var ingesloten = [];
+// Bepaal de ruimtes in de selectie die
+// ook echt bewerkt kunnen of mogen worden.
+for (var i = 0; i < alg_key_arr.length; i++)
+{
+    var this_alg = alg.func_enabled(alg_key_arr[i], "R");
+    if (this_alg.writeman || this_alg.writeuse)
+    {
+        ingesloten.push(alg_key_arr[i]);
+        tobeedited++;
+        var last_this_alg = this_alg; // deze gebruiken we voor rechtencontrole. Niet 100% zuiver maar goed genoeg
+    }
+}
+user.auth_required_or_abort(tobeedited > 0); // We klagen niet over enkele wel en enkele niet
+
+/*
+var sql = "SELECT alg_srtruimte_key"
+        + "     , mld_dienstniveau_key"
+        + "     , alg_ruimte_omschrijving"
+        + "     , alg_ruimte_opmerking"
+        + "     , alg_ruimte_beginuur"
+        + "     , alg_ruimte_einduur"
+        + "     , alg_ruimte_werkdagen"
+        + "  FROM alg_ruimte"
+        + " WHERE alg_ruimte_key in (" + ingesloten.join(",") + ")";
+var oRs = Oracle.Execute(sql);
+if (!oRs.eof)
+{
+    var diff = { srtruimte_key:    oRs("alg_srtruimte_key").Value,
+                 dienstniveau_key: oRs("mld_dienstniveau_key").Value,
+                 omschrijving:     oRs("alg_ruimte_omschrijving").Value,
+                 opmerking:        oRs("alg_ruimte_opmerking").Value,
+                 beginuur:         oRs("alg_ruimte_beginuur").Value,
+                 einduur:          oRs("alg_ruimte_einduur").Value,
+                 werkdagen:        oRs("alg_ruimte_werkdagen").Value
+               };
+    var i = 0;
+    while (!oRs.eof)
+    {
+        i++;
+        if (diff.srtruimte_key    != oRs("alg_srtruimte_key").Value)       diff.srtruimte_key = null;
+        if (diff.dienstniveau_key != oRs("mld_dienstniveau_key").Value)    diff.dienstniveau_key = null;
+        if (diff.omschrijving     != oRs("alg_ruimte_omschrijving").Value) diff.omschrijving = null;
+        if (diff.opmerking        != oRs("alg_ruimte_opmerking").Value)    diff.opmerking = null;
+        if (diff.beginuur         != oRs("alg_ruimte_beginuur").Value)     diff.beginuur = null;
+        if (diff.einduur          != oRs("alg_ruimte_einduur").Value)      diff.einduur = null;
+        if (diff.werkdagen        != oRs("alg_ruimte_werkdagen").Value)    diff.werkdagen = null;
+        oRs.MoveNext();
+    }
+}
+oRs.Close();
+*/
+%>
+
+<html>
+  <head>
+<%  FCLTHeader.Generate(); %>
+    <script type="text/javascript">
+        function alg_submit()
+        {
+            $.post($("form[name=u2]")[0].action,
+                   $("[name=u2]").serialize(),
+                   FcltCallbackAndThenAlways(alg_submit_callback),
+                   "json");
+            return true; // disable button
+        }
+
+        function alg_submit_callback(json)
+        {
+            iface.button.enable("btn_alg_submit");
+            if (json.success)
+                FcltMgr.closeDetail(window, json);
+        }
+
+        function alg_cancel()
+        {
+            FcltMgr.closeDetail(window, { cancel: true } );
+        }
+
+    </script>
+  </head>
+
+  <body class="modal" id="mod_algmultiedit">
+    <form name="u2" action="alg_edit_ruimte_multi_save.asp?alg_level=<%=safe.htmlattr(alg_level)%>&alg_keys=<%=ingesloten.join(",")%>" method="post">
+<%
+/*
+        if (last_this_alg.writeman || last_this_alg.writeuse)
+        {
+            BLOCK_START("algFlex", L("lcl_ins_meta_data"));
+            // ruimte specifieke velden
+                if (last_this_alg.writeman)
+                {
+                    sql = "SELECT alg_srtruimte_key"
+                        + "     , " + lcl.xsqla("alg_srtruimte_omschrijving", "alg_srtruimte_key")
+                        + "  FROM alg_v_aanwezigsrtruimte"
+                        + " ORDER BY UPPER("+lcl.xsql("alg_srtruimte_omschrijving", "alg_srtruimte_key")+")";
+                    FCLTselector( "room_srt",
+                                  sql,
+                                  { label: L("lcl_estate_ruimte_man_sort"),
+                                    initKey: (diff.srtruimte_key ? diff.srtruimte_key : -1),
+                                    emptyOption: ""
+                                  });
+               }
+
+               if (last_this_alg.writeuse)
+               {
+                   sql = "SELECT mld_dienstniveau_key"
+                       + "     , " + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
+                       + "  FROM mld_dienstniveau"
+                       + " ORDER BY UPPER("+lcl.xsql("mld_dienstniveau_omschr", "mld_dienstniveau_key")+")";
+                   FCLTselector( "dienstniveau",
+                                 sql,
+                                 { label: L("lcl_mld_dienst_niveau"),
+                                   initKey: (diff.dienstniveau_key ? diff.dienstniveau_key : -1),
+                                   emptyOption: ""
+                                 });
+
+                    RWFIELDTR("room_oms",  "fld", L("lcl_estate_ruimte_man_descr"),  diff.omschrijving, {maxlength: 30});
+                }
+
+                if (last_this_alg.writeman)
+                {
+                    RWFIELDTR("room_opm",  "fld", L("lcl_estate_ruimte_man_opmerk"), diff.opmerking,    {maxlength: 50});
+
+                    var times = [];
+                    for (i=0; i<24; i++)
+                    {
+                      sql = "           SELECT " + String(i+0/4) + ", '" + String(i) + ":00' FROM DUAL"
+                          + " UNION ALL SELECT " + String(i+1/4) + ", '" + String(i) + ":15' FROM DUAL"
+                          + " UNION ALL SELECT " + String(i+2/4) + ", '" + String(i) + ":30' FROM DUAL"
+                          + " UNION ALL SELECT " + String(i+3/4) + ", '" + String(i) + ":45' FROM DUAL"
+                      times.push(sql);
+                    }
+                    FCLTselector( "room_beginuur",
+                                  times.join(" UNION ALL "),
+                                  { label: L("lcl_estate_gebouw_beginuur"),
+                                    initKey: diff.beginuur,
+                                    emptyOption: ""
+                                  }
+                                );
+                    FCLTselector( "room_einduur",
+                                  times.join(" UNION ALL "),
+                                  { label: L("lcl_estate_gebouw_einduur"),
+                                    initKey: diff.einduur,
+                                    emptyOption: ""
+                                  }
+                                );
+
+                    sql = "           SELECT null, " + safe.quoted_sql(L("lcl_alg_ruimte_volgens_gebouw")) + " FROM DUAL"
+                        + " UNION ALL SELECT 0, "    + safe.quoted_sql(L("lcl_No"))  + " FROM DUAL"
+                        + " UNION ALL SELECT 1, "    + safe.quoted_sql(L("lcl_Yes")) + " FROM DUAL";
+                    FCLTselector( "room_werkdagen",
+                                  sql,
+                                  { label: L("lcl_estate_gebouw_werkdagen"),
+                                    initKey: diff.werkdagen
+                                  }
+                                );
+                }
+            BLOCK_END();
+        }
+*/
+        generateFlexKenmerkBlock({
+            fnpre: function () {BLOCK_START("algMultiEdit", L("lcl_flexible_properties"));},
+            fnpost: BLOCK_END,
+            onrgoed_niveau: "R",
+            onrgoed_key: -1,
+            this_alg: last_this_alg,
+            reado: false,
+            multi: true,
+            flexcolumns: 1 // altijd want popup
+          });
+
+    var buttons =  [];
+    buttons.push({title: L("lcl_submit"), action: "alg_submit()", singlepress: true, id: "btn_alg_submit"});
+    buttons.push({title: L("lcl_cancel"), action: "alg_cancel()"});
+    CreateButtons(buttons);
+IFACE.FORM_END();
+%>
+    </form>
+  </body>
+</html>

APPL/ALG/alg_edit_ruimte_multi_save.asp

@@ -0,0 +1,88 @@
+<%@ language = "JavaScript" %>
+<% /*
+    $Revision$
+    $Id$
+
+    File:               alg_edit_ruimte_multi_save.asp
+    Description:        save script van alg_edit_ruimte_multi.asp
+    Globalen:
+    Context:
+    Note:
+*/
+var JSON_Result = true;
+%>
+
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="../Shared/save2db.inc" -->
+<!-- #include file="../Shared/kenmerk_common.inc" -->
+<!-- #include file="./alg.inc" -->
+
+<%
+//protectRequest.validateToken();
+var alg_key_arr = getQParamIntArray("alg_keys");
+var alg_level = getQParam("alg_level");
+
+var warning = "";
+var result = {};
+var nr_edited = 0;
+
+for (var i = 0; i < alg_key_arr.length; i++)
+{
+    var alg_key = alg_key_arr[i];
+    var this_alg = alg.func_enabled(alg_key, "R");
+    if (this_alg.writeman || this_alg.writeuse)
+    {
+        // Ik mag de ruimte wijzigen dus voer wijziging uit
+        var fields = [];
+        var algUpd = buildTrackingUpdate("alg_ruimte", " alg_ruimte_key = " + alg_key, fields);
+    //    // Submit the changed data
+    //    var err = Oracle.Execute(algUpd.sql, true);
+    //    if (err.friendlyMsg)
+    //        warning = err.friendlyMsg;
+
+        currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
+                            + "     , ok.alg_onrgoedkenmerk_waarde"
+                            + "  FROM alg_onrgoedkenmerk ok"
+                            + "     , alg_kenmerk k"
+                            + " WHERE ok.alg_kenmerk_key = k.alg_kenmerk_key"
+                            + "   AND ok.alg_onrgoedkenmerk_verwijder IS NULL"
+                            + "   AND ok.alg_onrgoed_niveau = " + safe.quoted_sql(alg_level)
+                            + "   AND ok.alg_onrgoed_key = " + alg_key;
+
+
+        allKenmerkenSQL     = "SELECT " + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key') + " kenmerk_omschrijving"
+                            + ",      fac_kenmerkdomein_key"
+                            + "  FROM alg_kenmerk k"
+                            + " WHERE k.alg_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
+
+        var flextrack = saveFlexKenmerken(alg_key,
+                                          { kenmerkTable: "alg_onrgoedkenmerk",
+                                            kenmerkParentKey : "alg_onrgoed_key",
+                                            kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
+                                            kenmerkKey: "alg_kenmerk_key",
+                                            currentKenmerkenSQL: currentKenmerkenSQL,
+                                            allKenmerkenSQL: allKenmerkenSQL,
+                                            requestQF: Request.Form,
+                                            flexPath: "ALG/R",
+                                            multiMode: true,
+                                            tracking: true,
+                                            module: "ALG",
+                                            moduleName: "alg_onrgoed_niveau",
+                                            moduleVal: alg_level
+                                          });
+
+        if (flextrack && flextrack.length)
+        {
+            var update_string = L("lcl_alg_is_algrup") + "\n" + flextrack.join("\n");
+            shared.trackaction("ALGRUP", alg_key, update_string);
+            nr_edited++;
+        }
+    }
+}
+
+result = { success : true, refresh: true };
+
+Response.Write(JSON.stringify(result));
+Response.End;
+%>

APPL/ALG/alg_edit_terreinsector_save.asp

@@ -88,11 +88,19 @@ else
                             "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                             "    AND ALG_ONRGOED_NIVEAU = 'T' " +
                             "    AND ALG_ONRGOED_KEY = " + ter_key;
-      saveFlexKenmerken(ter_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
-                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
-                                currentKenmerkenSQL, false,  //QueryForm, rest QueryString
-                                "ALG_ONRGOED_NIVEAU", "T",
-                                (ter_key<0),"ALG/T")
+      saveFlexKenmerken(ter_key,
+                        { kenmerkTable: "alg_onrgoedkenmerk",
+                          kenmerkParentKey : "alg_onrgoed_key",
+                          kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
+                          kenmerkKey: "alg_kenmerk_key",
+                          currentKenmerkenSQL: currentKenmerkenSQL,
+                          requestQF: Request.Form,
+                          flexPath: "ALG/T",
+                          module: "ALG",
+                          moduleName: "alg_onrgoed_niveau",
+                          moduleVal: "T",
+                          isNew: ter_key < 0
+                        });
 }
   %>
 

APPL/ALG/alg_edit_verdieping.asp

@@ -85,7 +85,7 @@ if (this_alg.writeman)
 else
     manRWFIELD = function (a,b,c,d,e) { ROFIELDTR(b,c,d,e) }; // als geen USE of <self> dan zijn er veel readonly
 
-BLOCK_START("algLoc1", "");
+BLOCK_START("algLoc1", "&nbsp;");
       FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel, {
               locatiekey: loc_key,
               gebouwkey: bld_key,
@@ -113,6 +113,16 @@ BLOCK_START("algLoc1", "");
 
 BLOCK_END();
 
+BLOCK_START("algLoc2", "&nbsp;");
+if (flr_key > 0)
+{
+  var calcopp = alg.calc_algm2(flr_key, onrgoedlvl); 
+  ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
+  ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
+  ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
+}  
+BLOCK_END();
+
 generateFlexKenmerkBlock ({
      onrgoed_key    : flr_key,
      onrgoed_niveau : onrgoedlvl,

APPL/ALG/alg_edit_verdieping_save.asp

@@ -59,11 +59,19 @@ else
                             "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                             "    AND ALG_ONRGOED_NIVEAU = 'V' " +
                             "    AND ALG_ONRGOED_KEY = " + flr_key;
-      saveFlexKenmerken(flr_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
-                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
-                                currentKenmerkenSQL, false,  //QueryForm, rest QueryString
-                                "ALG_ONRGOED_NIVEAU", "V",
-                                (flr_key<0),"ALG/V")
+      saveFlexKenmerken(flr_key,
+                        { kenmerkTable: "alg_onrgoedkenmerk",
+                          kenmerkParentKey : "alg_onrgoed_key",
+                          kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
+                          kenmerkKey: "alg_kenmerk_key",
+                          currentKenmerkenSQL: currentKenmerkenSQL,
+                          requestQF: Request.Form,
+                          flexPath: "ALG/V",
+                          module: "ALG",
+                          moduleName: "alg_onrgoed_niveau",
+                          moduleVal: "V",
+                          isNew: flr_key < 0
+                        });
   }
   %>
 

APPL/ALG/alg_edit_wp.asp

@@ -27,6 +27,9 @@ FCLTHeader.Requires({plugins:["jQuery"], js: []})
 
    var authparams = alg.checkAutorisation();
 
+   var canAdd = (authparams.ALGwritelevel < 9); // TODO: fijner, ik denk 3. Ik moet voor deze locatie, dit district of deze regio schrijfrechten hebben.
+   readonly = !canAdd;
+
 if (wp_key > 0)
 {
     sql = " select * "
@@ -72,7 +75,7 @@ else if (S("prs_werkplek_implicit") == 1)
     }
     function alg_next()
     {
-        alert("TODO: Next nog niet ondersteund")
+        FcltMgr.alert("TODO: Next nog niet ondersteund")
     }
 
 function process_host_info(data)
@@ -118,7 +121,7 @@ BLOCK_START("algInfo", "");
                     onRuiChange: "onChangeRoom(key)",
                     startlevel: 2, // Regio
                     eindlevel: 5, // District
-                    readonly: (wp_key > 0),
+                    readonlylevel: 2, // Locatie niet readonly
                     filtercode: "INCVR",
                     required: true });
 

APPL/ALG/alg_edit_wp_save.asp

@@ -8,6 +8,7 @@
 
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
+<!-- #include file="../Shared/WPFunctions.inc" -->
 <!-- #include file="../Shared/save2db.inc" -->
 <!-- #include file="alg.inc" -->
 
@@ -45,7 +46,22 @@ if (wp_key > 0)
 
     var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
-        warning = err.friendlyMsg;
+      warning = err.friendlyMsg;
+
+    // Is de ruimte aangepast?
+    var room_key_new = getFParamInt("ruimtekey");
+    var sql = "SELECT prs_alg_ruimte_key"
+            + "  FROM prs_werkplek"
+            + " WHERE prs_werkplek_key = " + wp_key;
+    var oRs = Oracle.Execute(sql);
+    var room_key_old = oRs("prs_alg_ruimte_key").Value;
+    oRs.Close();
+
+    if (room_key_old != room_key_new)
+    { // Werkplek verplaatsen
+      wp_key = WPMove_PRS_WERKPLEK(wp_key, room_key_new);
+    }
+
   }
 else
   {

APPL/ALG/alg_flexkenmerk.inc

@@ -49,6 +49,12 @@ function generateFlexKenmerkBlock(params)
             return true;
     }
 
+    function isInvisible(volgnummer, ktype)
+    {
+        if (params.multi)
+            return (ktype == 'M' || ktype == 'F' || ktype == 'E'); // onzichtbaar bij multi
+    }
+
     var sql = "SELECT    k.alg_kenmerk_key              kenmerk_key, "
              + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key') +" kenmerk_omschrijving, "
              + "         k.alg_kenmerk_kenmerktype      kenmerk_kenmerktype, "
@@ -95,6 +101,7 @@ function generateFlexKenmerkBlock(params)
                   hideVervallen: onrgoed_key<0,
                   fnpre: params.fnpre,
                   fnpost: params.fnpost,
+                  fnIsInvisible: isInvisible,
                   mobile: params.mobile,
                   parentKey: onrgoed_key,
                   kenmerk_module: onrgoed_niveau }

APPL/ALG/alg_gebouw.asp

@@ -23,18 +23,21 @@ var bld_key = getQParamInt("key", -1);
 
 if (bld_key > 0)
 {
-      sql = " select alg_gebouw_code "
+      sql = " select alg_gebouw_code, alg_locatie_key "
           + "  FROM alg_gebouw "
           + "  WHERE alg_gebouw_key = " + bld_key;
 
    oRs = Oracle.Execute(sql);
 
    var bld_name   = " " + oRs("alg_gebouw_code").value;
+   var loc_key = oRs("alg_locatie_key").value;
 }
 else
 {
-  var bld_name = ""
+  var bld_name = "";
+  var loc_key = -1;
 }
+
 %>
 
 <html>
@@ -76,6 +79,22 @@ else
     IFRAMER("algFrame", page, { title: L("lcl_alg_gebouw_frame"),
                                 initHeight: "450px",
                                 FcltClose: "algClose" } );
+
+    if (bld_key > -1)
+    {
+      var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true);
+      var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true);
+      var curole = "bo";
+
+      if (!authparamsCNTMAN && authparamsCNTUSE)
+        curole = "fe";
+
+      if (authparamsCNTMAN || authparamsCNTUSE)
+      {
+          var page1="../cnt/cnt_search_list.asp?embedded=1&tiny=1&collapsed=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&bld_key=" + bld_key
+          IFRAMER("cntFrame", page1, { initHide: true } );
+      }
+    }
 %>
   </body>
 </html>

APPL/ALG/alg_gebouw_list.inc

@@ -28,6 +28,38 @@ function fnrowData(oRs)
 
   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;
+}
 %>
 <script type="text/javascript">
 
@@ -36,7 +68,7 @@ function fnrowData(oRs)
   function gotoDetails(row)
   {
     var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var url = "appl/ALG/alg_verdieping_search.asp?gebouw_key=" + algData.detail_key + "&autosearch=" + autosearch;
+    var url = "appl/ALG/alg_verdieping_search.asp?gebouw_key=" + algData.detail_key + "&autosearch=" + autosearch + "&chkgeb=1";
     FcltMgr.openDetail(url, "<%=L("lcl_floor")%>");
   }
   function gotoParent(row)
@@ -54,18 +86,14 @@ function fnrowData(oRs)
 
 function doDelete(rowArray, isMulti)
 {
-  var bldKeyString = getKeyString(rowArray);
-  if (isMulti || confirm(L("lcl_alg_del_txt_gebouw")))
-  {
+  FcltMgr.confirm(L("lcl_alg_del_txt_gebouw"), { autoconfirm: isMulti }, function() {
+    var bldKeyString = getKeyString(rowArray);
     var data = { key: bldKeyString,
                  level: "G"
                };
     <% protectRequest.dataToken("data"); %>
-    $.post("alg_delete.asp",
-           data,
-           FcltCallbackRefresh,
-           "json");
-  }
+    $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+  });
 }
 </script>
 <%
@@ -89,6 +117,7 @@ function gebouw_list(pautfunction, params)
   var bld_key = params.bld_key;
   var srtgebouw_key = params.srtgebouw_key;
   var verantw_key = params.verantw_key;
+  var expalgincl = params.expalgincl;
 
   function fnrowActionEnabler(oRs)
   {
@@ -128,7 +157,15 @@ function gebouw_list(pautfunction, params)
            + "     , g.alg_gebouw_inhoud"
            + "     , g.alg_gebouw_x"
            + "     , g.alg_gebouw_y"
-           + "  FROM alg_v_aanweziggebouw g"
+           + "     , g.alg_gebouw_vervaldatum"
+           + "     , (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_gebouw_key"
+           + "           AND sn.fac_srtnotificatie_xmlnode = 'gebouw'"
+           + "       ) recentdatum"
+           + "  FROM alg_gebouw g"
            + "     , alg_locatie l"
            + "     , alg_srtgebouw s"
            + " WHERE l.alg_locatie_key(+) = g.alg_locatie_key"
@@ -153,11 +190,19 @@ function gebouw_list(pautfunction, params)
     else if (reg_key)
       sqln += " AND l.alg_district_key IN (SELECT alg_district_key FROM alg_district WHERE alg_regio_key = " + reg_key+")";
 
+    if (params.bld_code)
+        sqln += " AND UPPER(g.alg_gebouw_code) LIKE " + safe.quoted_sql_wild(params.bld_code + "%");
+    if (params.bld_name)
+        sqln += " AND UPPER(g.alg_gebouw_naam) LIKE " + safe.quoted_sql_wild(params.bld_name + "%");
+
     if (srtgebouw_key)
       sqln += " AND g.alg_srtgebouw_key = " + srtgebouw_key;
 
     if (verantw_key)
-      sqln += " AND g.prs_perslid_key_verantw = " + verantw_key;
+      sqln += " AND (g.prs_perslid_key_verantw = " + verantw_key + " OR g.prs_perslid_key_verantw2 = " + verantw_key + ")";
+
+    if (!expalgincl)
+      sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";
 
     sqln += " ORDER BY l.alg_locatie_upper ASC, "
           +  "          g.alg_gebouw_upper ASC  ";
@@ -177,6 +222,7 @@ function gebouw_list(pautfunction, params)
                                    title: L("lcl_menu_alg_gebouw"),
                                    showAll: showall,
                                    rowData: fnrowData,
+                                   rowClass: fnrowClass,
                                    rowActionEnabler: fnrowActionEnabler,
                                    flexModule: "ALG",
                                    flexId: "alg_gebouw_key",
@@ -190,7 +236,8 @@ function gebouw_list(pautfunction, params)
     rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_code"), content: "alg_gebouw_code"}));
     rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_name"), content: "alg_gebouw_naam" }));
     rst.addColumn(new Column({caption: L("lcl_estate_gebouw_srtgebouw"), content: "alg_srtgebouw_omschrijving"}));
-    rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_bruto_vloeropp"), content: "alg_gebouw_bruto_vloeropp"}));
+    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)
     {

APPL/ALG/alg_gebouw_search.asp

@@ -18,6 +18,7 @@ var locatie_key = getQParamInt("locatie_key", -1); // Locatie
 var gebouw_key = getQParamInt("gebouw_key", -1); // Gebouw
 var srtgebouw_key = getQParamInt("gebouw_func", -1); // Gebouwfunctie
 var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
+var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
 var autosearch = getQParamInt("autosearch", 0) == 1;
 var authparams = alg.checkAutorisation();
 var this_alg = alg.func_enabled(gebouw_key);
@@ -59,10 +60,26 @@ var this_alg = alg.func_enabled(gebouw_key);
                                                                 locatiekey: locatie_key,
                                                                 gebouwkey: gebouw_key,
                                                                 startlevel: 2, // locatie
-                                                                eindlevel: 3, // gebouw
+                                                                eindlevel: 2, // locatie
                                                                 whenEmpty: L("lcl_search_generic")
                                                               });
 %>
+              <tr class="primsearch">
+                <td class="label"><label><%=L("lcl_estate_gebouw_man_code")%>:</label></td>
+                <td><input type="text" class="wildcard" id="bld_code" name="bld_code" value=""></td>
+              </tr>
+              <tr class="primsearch">
+                <td class="label"><label><%=L("lcl_estate_gebouw_man_name")%>:</label></td>
+                <td><input type="text" class="wildcard" id="bld_name" name="bld_name" value=""></td>
+              </tr>
+              <!-- Vervallen objecten -->
+              <tr class="primsearch">
+                <td></td>
+                <td align=left>
+                  <input type="checkbox" class="fldexpalgincl" name="expAlgIncl" id="expAlgIncl" value="1" >
+                  <label for="expAlgIncl"><%=L("lcl_alg_gebouw_vervallen_incl")%></label>
+                </td>
+              </tr>
             </table>
           </td><!-- end column 1 -->
 

APPL/ALG/alg_gebouw_search_list.asp

@@ -26,19 +26,27 @@ var reg_key = getQParamInt("regiokey", -1); // Regio
 var dis_key = getQParamInt("districtkey", -1); // District
 var loc_key = getQParamInt("locatiekey", -1); // Locatie
 var bld_key = getQParamInt("gebouwkey", -1); // Gebouw
+var bld_code = getQParam("bld_code", ""); // Gebouwcode
+var bld_name = getQParam("bld_name", ""); // Gebouwnaam
 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
 
 gebouw_list ( "*",
               { outputmode: outputmode,
                  showall: showall,
                  srtgebouw_key: (srtgebouw_key != -1? srtgebouw_key: null),
                  verantw_key: (verantw_key != -1? verantw_key: null),
+                 verantw_key2: (verantw_key2 != -1? verantw_key2: null),
                  reg_key: (reg_key != -1? reg_key : null),
                  dis_key: (dis_key != -1? dis_key : null),
                  loc_key: (loc_key != -1? loc_key : null),
                  bld_key: (bld_key != -1? bld_key : null),
-                 noref: (noref != -1? noref : null)
+                 bld_code: bld_code,
+                 bld_name: bld_name,
+                 noref: (noref != -1? noref : null),
+                 expalgincl: expalgincl
               }
              );
 %>

APPL/ALG/alg_locatie.asp

@@ -76,6 +76,22 @@ else
     IFRAMER("algFrame", page, { title: L("lcl_alg_locatie_frame"),
                                 initHeight: "450px",
                                 FcltClose: "algClose" } );
+                                
+    if (loc_key > -1)
+    {
+      var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true);
+      var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true);
+      var curole = "bo";
+      
+      if (!authparamsCNTMAN && authparamsCNTUSE)
+        curole = "fe";
+            
+      if (authparamsCNTMAN || authparamsCNTUSE)
+      {
+          var page1="../cnt/cnt_search_list.asp?embedded=1&tiny=1&collapsed=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&loc_key=" + loc_key
+          IFRAMER("cntFrame", page1, { initHeight: "450px" } );
+      }
+    }                                  
 %>
   </body>
 </html>

APPL/ALG/alg_locatie_list.inc

@@ -31,6 +31,37 @@ function fnrowData(oRs)
   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;
+}
 %>
 <script type="text/javascript">
   var autosearch = 1; //automatisch laden van resultaat op search pagina
@@ -62,18 +93,14 @@ function fnrowData(oRs)
 
   function doDelete(rowArray, isMulti)
   {
-    var locKeyString = getKeyString(rowArray);
-    if (isMulti || confirm(L("lcl_alg_del_txt_locatie")))
-    {
-      var data = { key: locKeyString,
-                   level: "L"
-                 };
-      <% protectRequest.dataToken("data"); %>
-      $.post("alg_delete.asp",
-             data,
-             FcltCallbackRefresh,
-             "json");
-    }
+    FcltMgr.confirm(L("lcl_alg_del_txt_locatie"), { autoconfirm: isMulti }, function() {
+        var locKeyString = getKeyString(rowArray);
+        var data = { key: locKeyString,
+                     level: "L"
+                   };
+        <% protectRequest.dataToken("data"); %>
+        $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+    });
   }
 </script>
 <%
@@ -117,27 +144,34 @@ function locatie_list(pautfunction, params)
     <% FCLTHeader.Generate({outputmode:outputmode}) %>
   </head>
   <body id="listbody">
-<%  var sqln = "SELECT   l.alg_locatie_key, "
-             + "         l.alg_district_key, "
-             + "         l.alg_locatie_code, "
-             + "         l.alg_locatie_omschrijving, "
-             + "         d.alg_district_omschrijving, "
-             + "         l.alg_locatie_adres, "
-             + "         l.alg_locatie_post_adres, "
-             + "         l.alg_locatie_postcode, "
-             + "         l.alg_locatie_post_postcode, "
-             + "         l.alg_locatie_plaats, "
-             + "         l.alg_locatie_post_plaats, "
-             + "         l.alg_locatie_land, "
-             + "         l.alg_locatie_post_land, "
-             + "         l.alg_locatie_verantw, "
-             + "         l.alg_locatie_verantw_tel, "
-             + "         l.alg_locatie_x, "
-             + "         l.alg_locatie_y "
-             + "    FROM alg_v_aanweziglocatie l, "
-             + "         alg_district d "
-             + "   WHERE d.alg_district_key(+) = l.alg_district_key "
-             + "     AND l.alg_locatie_verwijder IS NULL ";
+<%  var sqln = "SELECT l.alg_locatie_key"
+             + "     , l.alg_district_key"
+             + "     , l.alg_locatie_code"
+             + "     , l.alg_locatie_omschrijving"
+             + "     , d.alg_district_omschrijving"
+             + "     , l.alg_locatie_adres"
+             + "     , l.alg_locatie_post_adres"
+             + "     , l.alg_locatie_postcode"
+             + "     , l.alg_locatie_post_postcode"
+             + "     , l.alg_locatie_plaats"
+             + "     , l.alg_locatie_post_plaats"
+             + "     , l.alg_locatie_land"
+             + "     , l.alg_locatie_post_land"
+             + "     , l.alg_locatie_verantw"
+             + "     , l.alg_locatie_verantw_tel"
+             + "     , l.alg_locatie_x"
+             + "     , l.alg_locatie_y"
+             + "     , (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 = l.alg_locatie_key"
+             + "           AND sn.fac_srtnotificatie_xmlnode = 'locatie'"
+             + "       ) recentdatum"
+             + "  FROM alg_v_aanweziglocatie l"
+             + "     , alg_district d "
+             + " WHERE d.alg_district_key(+) = l.alg_district_key"
+             + "   AND l.alg_locatie_verwijder IS NULL";
 
     if (authparams.ALGreadlevel > -1)
     { // Er is een scope-beperking van kracht
@@ -162,7 +196,12 @@ function locatie_list(pautfunction, params)
       sqln += " AND d.alg_regio_key = " + reg_key;
     }
 
-    sqln += " ORDER BY l.alg_locatie_upper ASC "
+    if (params.loc_code)
+        sqln += " AND UPPER(l.alg_locatie_code) LIKE " + safe.quoted_sql_wild(params.loc_code + "%");
+    if (params.loc_descr)
+        sqln += " AND UPPER(l.alg_locatie_omschrijving) LIKE " + safe.quoted_sql_wild(params.loc_descr + "%");
+
+    sqln += " ORDER BY UPPER(alg_district_omschrijving), UPPER(alg_locatie_code)";
 
     var addurl = "appl/alg/alg_locatie.asp";
 //  addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
@@ -178,6 +217,7 @@ function locatie_list(pautfunction, params)
                                    title: L("lcl_menu_alg_locatie"),
                                    showAll: showall,
                                    rowData: fnrowData,
+                                   rowClass: fnrowClass,
                                    rowActionEnabler: fnrowActionEnabler,
                                    outputmode: outputmode,
                                    flexModule: "ALG",

APPL/ALG/alg_locatie_search.asp

@@ -53,10 +53,18 @@ var authparams = alg.checkAutorisation();
                                                                   districtkey: district_key,
                                                                   locatiekey: locatie_key,
                                                                   startlevel: 1, // District
-                                                                  eindlevel: 2, // locatie
+                                                                  eindlevel: 2, // Locatie
                                                                   whenEmpty: L("lcl_search_generic")  // want filter
                                                                 });
 %>
+              <tr class="primsearch">
+                <td class="label"><label><%=L("lcl_estate_locatie_man_code")%>:</label></td>
+                <td><input type="text" class="wildcard" id="loc_code" name="loc_code" value=""></td>
+              </tr>
+              <tr class="primsearch">
+                <td class="label"><label><%=L("lcl_estate_locatie_man_descr")%>:</label></td>
+                <td><input type="text" class="wildcard" id="loc_descr" name="loc_descr" value=""></td>
+              </tr>
               </table>
             </td><!-- end column 1 -->
 

APPL/ALG/alg_locatie_search_list.asp

@@ -3,10 +3,10 @@
      $Revision$
      $Id$
 
-    File:       
-    Description: 
-    Parameters:  
-    Context:     
+    File:
+    Description:
+    Parameters:
+    Context:
     Note:
 */ %>
 
@@ -25,6 +25,8 @@ var noref = getQParamInt("noref", -1); // (voor onderdrukken horizontale verwijz
 var reg_key = getQParamInt("regiokey", -1); // Regio
 var dis_key = getQParamInt("districtkey", -1); // District
 var loc_key = getQParamInt("locatiekey", -1); // Locatie
+var loc_code = getQParam("loc_code", ""); // Locatiecode
+var loc_descr = getQParam("loc_descr", ""); // Locatienaam
 
 locatie_list ( "*",
               {  outputmode: outputmode,
@@ -32,6 +34,8 @@ locatie_list ( "*",
                  reg_key: (reg_key != -1? reg_key : null),
                  dis_key: (dis_key != -1? dis_key : null),
                  loc_key: (loc_key != -1? loc_key : null),
+                 loc_code: loc_code,
+                 loc_descr: loc_descr,
                  noref: (noref != -1? noref : null)
               }
              );

APPL/ALG/alg_regio_list.inc

@@ -52,18 +52,14 @@ function fnrowData(oRs)
 
   function doDelete(rowArray, isMulti)
   {
-    var regKeyString = getKeyString(rowArray);
-    if (isMulti || confirm(L("lcl_alg_del_txt_regio")))
-    {
+    FcltMgr.confirm(L("lcl_alg_del_txt_regio"), { autoconfirm: isMulti }, function() {
+      var regKeyString = getKeyString(rowArray);
       var data = { key: regKeyString,
                    level: "RE"
                  };
       <% protectRequest.dataToken("data"); %>
-      $.post("alg_delete.asp",
-             data,
-             FcltCallbackRefresh,
-             "json");
-    }
+      $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+    });
   }
     </script>
 <%

APPL/ALG/alg_ruimte.asp

@@ -114,9 +114,19 @@ else
       var insman_read = authparamsINSMAN;
       if (insman_read)
       {
-          var page4="../INS/ins_list.asp?embedded=1&tiny=1&ruimtekey=" + room_key
+          var page4="../INS/ins_list.asp?embedded=1&tiny=1&inacObjIncl=1&ruimtekey=" + room_key
           IFRAMER("insdeel", page4, { initHeight: "450px" } );
       }
+      var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true);
+      var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true);
+      var curole = "bo";
+      if (!authparamsCNTMAN && authparamsCNTUSE)
+        curole = "fe";
+      if (authparamsCNTMAN || authparamsCNTUSE)
+      {
+          var page5="../cnt/cnt_search_list.asp?embedded=1&tiny=1&collapsed=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&room_key="+ room_key
+          IFRAMER("cntFrame", page5, { initHide: true } );
+      }
     }
 %>
   </body>

APPL/ALG/alg_ruimte_list.inc

@@ -30,13 +30,17 @@ function ruimte_list(pautfunction, params)
   var showall = params.showall;
 
   var noref = params.noref;
+  var reg_key = params.reg_key;
+  var dis_key = params.dis_key;
   var loc_key = params.loc_key;
   var bld_key = params.bld_key;
   var lvl_key = params.lvl_key;
   var room_key = params.room_key;
   var area_nr = params.area_nr;
   var area_descr = params.area_descr;
-  var area_use = params.area_use
+  var srtruimte_key = params.srtruimte_key
+  var dept_key = params.dept_key;
+  var chkgeb = params.chkgeb;
 %>
 
   <html>
@@ -66,6 +70,14 @@ function ruimte_list(pautfunction, params)
           FcltMgr.openDetail(url, "<%=L("lcl_room")%>" + ' ' + algData.oms);
         }
 
+        function ruimteEditMulti(rowArray)
+        {
+          var algKeyString = getKeyString(rowArray);
+          var subject = L("lcl_alg_multi_edit");
+          var url = "../alg/alg_edit_ruimte_multi.asp?alg_level=R&alg_keys=" + algKeyString;
+          FcltMgr.openModalDetail(url, subject, {callback: FcltCallbackRefresh});
+        }
+
         function doRuimteAfdeling(rowArray)
         {
           var ruimteArr = [];
@@ -76,21 +88,27 @@ function ruimte_list(pautfunction, params)
           FcltMgr.openModalDetail("alg_ruimteafdeling.asp?ruimte_keys=" + ruimteArr.join(","), L("lcl_alg_ruimte_bezetting"));
         }
 
+        function doRESScope(rowArray)
+        {
+          var ruimteArr = [];
+          for (var i = 0; i < rowArray.length; i++)
+          {
+            ruimteArr.push(rowArray[i].getAttribute("ROWKEY"))
+          }
+          FcltMgr.openModalDetail("alg_ruimteresscope.asp?ruimte_keys=" + ruimteArr.join(","), L("res_srtartikel_onrgoed"));
+        }
+
         function doDelete(row, isMulti)
         {
-          $(row).addClass('dirty');
-          var room_key = row.getAttribute("ROWKEY");
-          if (isMulti || confirm(L("lcl_alg_del_txt_ruimte")))
-          {
+          FcltMgr.confirm(L("lcl_alg_del_txt_ruimte"), { autoconfirm: isMulti }, function() {
+            $(row).addClass('dirty');
+            var room_key = row.getAttribute("ROWKEY");
             var data = { key: room_key,
                          level: "R"
                        };
             <% protectRequest.dataToken("data"); %>
-            $.post("alg_delete.asp",
-                   data,
-                   FcltCallbackRefresh,
-                   "json");
-          }
+            $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+          });
         }
       </script>
     </head>
@@ -151,10 +169,14 @@ function ruimte_list(pautfunction, params)
       {
         sqln += " AND g.alg_locatie_key = " + loc_key;
       }
+      else if (dis_key)
+        sqln += " AND l.alg_district_key = " + dis_key;
+      else if (reg_key)
+        sqln += " AND l.alg_district_key IN (SELECT alg_district_key FROM alg_district WHERE alg_regio_key = " + reg_key+")";
 
-      if (area_use)
+      if (srtruimte_key)
       {
-        sqln += " AND r.alg_srtruimte_key = " + area_use;
+        sqln += " AND r.alg_srtruimte_key = " + srtruimte_key;
       }
 
       if (area_nr)
@@ -167,6 +189,18 @@ function ruimte_list(pautfunction, params)
         sqln += " AND UPPER(r.alg_ruimte_omschrijving) LIKE " + safe.quoted_sql_wild("%" + area_descr + "%");
       }
 
+      if (dept_key)
+      {
+        sqln += " AND r.alg_ruimte_key in "
+             +  "                    (SELECT alg_ruimte_key "
+             +  "                      FROM prs_ruimteafdeling "
+             +  "                     WHERE prs_ruimteafdeling_verwijder IS NULL "
+             +  "                       AND prs_afdeling_key = " + dept_key + ")";
+      }
+
+      if (!chkgeb)
+        sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";
+
       sqln += " ORDER BY l.alg_locatie_upper ASC"
             + ",         g.alg_gebouw_upper ASC"
             + ",         v.alg_verdieping_volgnr ASC"
@@ -189,14 +223,15 @@ function ruimte_list(pautfunction, params)
       {
         if (!floorCache[oRs("alg_verdieping_key").Value])
         {
+          eEditMulti = false;  // TODO: write op ALGMAN
             floorCache[oRs("alg_verdieping_key").Value] =
                 {
                     eDelete: alg.canWriteVerdieping(oRs("alg_verdieping_key").Value, authparams.rmALGwritelevel),
                     // Bezetting moet per regel en is afhankelijk van WEB_PRSBOF (werkplekbeheer)
-                    eBezetting: alg.func_enabled_ruimte(oRs("alg_verdieping_key").Value).canPRSBOFwrite
+                    eBezetting: alg.func_enabled_ruimte(oRs("alg_verdieping_key").Value).canPRSBOFwrite,
+                    eEditMulti: eEditMulti
                 }
         }
-
         return (floorCache[oRs("alg_verdieping_key").Value]);
       }
 
@@ -261,8 +296,11 @@ function ruimte_list(pautfunction, params)
       }
 
       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"});
       rst.addAction({ action: "doDelete", caption: L("lcl_delete"), multi: true, single: !noref, enabler: "eDelete" });
       rst.addAction({ action: "doRuimteAfdeling", caption: L("lcl_alg_bezetting"), multi: true, multiOnce: true, enabler: "eBezetting" });
+      if (user.has("WEB_RESMSU"))
+        rst.addAction({ action: "doRESScope", caption: L("res_srtartikel_onrgoed"), multi: true, single: false, multiOnce: true });
       if (!noref)
       {
         if (S("prs_werkplek_implicit") == 0)

APPL/ALG/alg_ruimte_search.asp

@@ -9,6 +9,7 @@
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
 <!-- #include file="alg.inc" -->
+<!-- #include file="../Shared/afdelingselector.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });
@@ -21,6 +22,7 @@ var ruimte_nr = getQParam("ruimte_nr", "");
 var ruimte_use = getQParamInt("ruimte_use", -1); // Ruimtefunctie
 var ruimte_descr = getQParam("ruimte_descr", "");
 var autosearch = getQParamInt("autosearch", 0) == 1;
+var chkgeb = getQParamInt("chkgeb", 0) == 1;
 var authparams = alg.checkAutorisation();
 
 %>
@@ -50,6 +52,7 @@ var authparams = alg.checkAutorisation();
   <body id="searchbody">
     <div id="search">
       <form name="u2" target="workFrame" action="alg_ruimte_search_list.asp" method="get">
+        <input type="hidden" id="chkgeb" name="chkgeb" value="<%=(chkgeb?1:0)%>">
 <%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
           <tr>
             <td class="searchkolom1">
@@ -96,6 +99,20 @@ var authparams = alg.checkAutorisation();
                              emptyOption: ""
                            });
 
+            sql= "SELECT 1 FROM prs_ruimteafdeling WHERE prs_ruimteafdeling_verwijder is null AND ROWNUM = 1";
+            oRs = Oracle.Execute(sql);
+            var anyruimteafd = !oRs.eof;
+            oRs.close();
+            if (anyruimteafd)
+            {
+            FCLTafdelingselector("dept",
+                               "dept",
+                               { label: L("lcl_prs_organisatie"),
+                                 autlevel: authparams.PRSreadlevel, // Was voorheen niet aanwezig
+                                 whenEmpty: L("lcl_search_generic"),
+                                 filtercode: "AR"
+                               });
+            }
 %>              </table>
             </td><!-- end column 1 -->
           </tr>

APPL/ALG/alg_ruimte_search_list.asp

@@ -22,25 +22,33 @@
 var outputmode = getQParamInt("outputmode", 0) //  0 = screen, 1 = print, 2 = excel etc
 var showall = getQParamInt("showall", 0) == 1;
 var noref = getQParamInt("noref", -1); // (voor onderdrukken horizontale verwijzingen)
+var reg_key = getQParamInt("regiokey", -1); // Regio
+var dis_key = getQParamInt("districtkey", -1); // District
 var loc_key = getQParamInt("locatiekey", -1); // Locatie
 var bld_key = getQParamInt("gebouwkey", -1); // Gebouw
 var lvl_key = getQParamInt("verdiepingkey", -1); // Verdieping
 var room_key = getQParamInt("ruimtekey", -1); // Ruimte
 var area_nr = getQParam("nr", null); // Ruimte nr
 var area_descr = getQParam("descr", null); // Ruimte omschrijving
-var area_use = getQParamInt("srt", null); // Ruimtefunctie
+var srtruimte_key = getQParamInt("srt", null); // Ruimtefunctie
+var dept_key = getQParamInt("dept", -1); // Afdeling
+var chkgeb  = getQParamInt("chkgeb", 0) == 1; //Controleer tegen de vervallenstatus van het gebouw (vertrouw lvl_key/geb_key niet)
 
 ruimte_list ( "*",
               {  outputmode: outputmode,
                  showall: showall,
+                 reg_key: (reg_key != -1? reg_key : null),
+                 dis_key: (dis_key != -1? dis_key : null),
                  loc_key: (loc_key != -1? loc_key : null),
                  bld_key: (bld_key != -1? bld_key : null),
                  lvl_key: (lvl_key != -1? lvl_key : null),
                  room_key: (room_key != -1? room_key : null),
                  area_nr: (area_nr != -1? area_nr : null),
                  area_descr: (area_descr != ""? area_descr : null),
-                 area_use: (area_use != -1? area_use : null),
-                 noref: (noref != -1? noref : null)
+                 srtruimte_key: (srtruimte_key != -1? srtruimte_key : null),
+                 dept_key: (dept_key !=-1? dept_key : null),
+                 noref: (noref != -1? noref : null),
+                 chkgeb: chkgeb
               }
              );
 %>

APPL/ALG/alg_ruimteafdeling.asp

@@ -20,7 +20,7 @@ k
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["./alg_ruimteafdeling.js", "num2curr.js"]
+                      js: ["./alg_ruimteafdeling.js" ]
                     });
 
 // TODO: Autorisatie controle "WEB_PRSBOF" op ruimte_keys

APPL/ALG/alg_ruimteafdeling.js

@@ -39,7 +39,7 @@ function CreateRow(afd_key, afd_name, bezetting, oppervlak, bruto)
   cell = tr.insertCell(-1);
   cell.className = "result";
   cell.align = "center";
-  cell.innerHTML = "<img src='../Pictures/order_cancel.gif' OnClick='delRow(this)' style='cursor:pointer'>";
+  cell.innerHTML = "<i class='fa fa-fw fa-times' OnClick='delRow(this)' style='cursor:pointer'></i>";
 
   // innerHTML opent een htmlparser die overbodige spaties en line breaks verwijderd in IE, daarom met innerText oplossen
   // Input velden moeten wel met innerHTML of outerHTML anders wordt het text
@@ -73,18 +73,22 @@ function CreateRow(afd_key, afd_name, bezetting, oppervlak, bruto)
 function delRow(img)
 {
   // Verwijder de aangeklikte afdeling uit de lijst (de regel)
-  if (!confirm(L("lcl_alg_cancelDepartment")))
-    return;
-  var tr = $(img).closest("tr")[0];
-  if (tr.myData.afd_key != null)
-  {
-    document.getElementById("afdbezettingtable").deleteRow(tr.rowIndex);
-  }
+  FcltMgr.confirm(L("lcl_alg_cancelDepartment"), function() {
+      var tr = $(img).closest("tr")[0];
+      if (tr.myData.afd_key != null) {
+          document.getElementById("afdbezettingtable").deleteRow(tr.rowIndex);
+      }
+  });
 }
 
 function alg_submit()
 {
-	var percValid = true;
+  if ($(document).has('span.bad').length)
+  {
+    FcltMgr.alert(L("lcl_shared_validator_invalid"));
+    return false;
+  }
+  var percValid = true;
   var i=0;
   while (percValid && (i<=rowIndex))
   {
@@ -94,7 +98,7 @@ function alg_submit()
      	  if (oppPerc > 100)
     	  {
     	  	percValid = false;
-          alert(L("lcl_alg_bezetting_ongeldig"));
+          FcltMgr.alert(L("lcl_alg_bezetting_ongeldig"));
           $("#bez"+i).select();
           $("#bez"+i).focus();
         }
@@ -129,49 +133,41 @@ function alg_add(oppervlak)
 
 function changeOppervlak(prowIndex)
 {
-	var bereken = true;
-	if (!isGoodNumber($("#bezopp"+prowIndex).val(), false,false,8,2))
-	{
-	  bereken = false;
-    alert(L("lcl_alg_bezetting_ongeldig"));
-    $("#bezopp"+prowIndex).select();
-    $("#bezopp"+prowIndex).focus();
-	}
-	if (bereken && (!isGoodNumber($("#totaalopp"+prowIndex).val(), false,false,8,2)))
-	  $("#totaalopp"+prowIndex).val($("#bezopp"+prowIndex).val());
+    var $thisObj = $("#bezopp"+prowIndex);
+    var valid = isGoodNumber($thisObj.val(), false,false,8,2);
+    validateField($thisObj, valid, L("lcl_alg_bezetting_ongeldig"))
 
-	if (bereken)
-	{
-	  var oppBezet = parseFloat($("#bezopp"   +prowIndex).val().replace(',', '.'));
-	  var oppBruto = parseFloat($("#totaalopp"+prowIndex).val().replace(',', '.'));
-	  if (oppBruto > 0)
-	  {
-	    var oppPercF = (oppBezet * 100) / oppBruto;
-	    var oppPerc  = num2currEditable(oppPercF);
-      $("#bez" + prowIndex).val(oppPerc);
-  	}
-  }
+    if (valid)
+    {
+        if (!isGoodNumber($("#totaalopp"+prowIndex).val(), false,false,8,2))
+            $("#totaalopp"+prowIndex).val($thisObj.val());
+        var oppBezet = parseFloat($thisObj.val().replace(',', '.'));
+        var oppBruto = parseFloat($("#totaalopp"+prowIndex).val().replace(',', '.'));
+        if (oppBruto > 0)
+        {
+            var oppPercF = (oppBezet * 100) / oppBruto;
+            var oppPerc  = num2currEditable(oppPercF);
+            $("#bez" + prowIndex).val(oppPerc);
+      	}
+    }
 }
 
 function changeBezetting(prowIndex)
 {
-  if (!isGoodNumber($("#bez"+prowIndex).val(), false,false,8,2) || parseFloat($("#bez"+prowIndex).val().replace(',', '.')) > 100)
-  {
-    alert(L("lcl_alg_bezetting_ongeldig"));
-    $("#bez"+prowIndex).select();
-    $("#bez"+prowIndex).focus();
-  }
-  else
-  {
-  	if (!multiRuimte)
-  	{
-      var oppPerc  = parseFloat($("#bez"      +prowIndex).val().replace(',', '.'));
-      if (isGoodNumber($("#totaalopp"+prowIndex).val(), false,false,8,2))
-      {
-        var oppBruto = parseFloat($("#totaalopp"+prowIndex).val().replace(',', '.'));
-        var oppBezet = num2currEditable( ((oppPerc * oppBruto) / 100)	);
-        $("#bezopp" + prowIndex).val(oppBezet);
-      }
+    var $thisObj = $("#bez"+prowIndex);
+    var valid = isGoodNumber($thisObj.val(), false,false,8,2) &&
+                parseFloat($thisObj.val().replace(',', '.')) <= 100 &&
+                parseFloat($thisObj.val().replace(',', '.')) >= 0;
+    validateField($thisObj, valid, L("lcl_alg_bezetting_ongeldig"));
+
+    if (valid && !multiRuimte)
+    {
+        var oppPerc = parseFloat($thisObj.val().replace(',', '.'));
+        if (isGoodNumber($("#totaalopp"+prowIndex).val(), false,false,8,2))
+        {
+            var oppBruto = parseFloat($("#totaalopp"+prowIndex).val().replace(',', '.'));
+            var oppBezet = num2currEditable( ((oppPerc * oppBruto) / 100)	);
+            $("#bezopp" + prowIndex).val(oppBezet);
+        }
     }
-  }
 }

APPL/ALG/alg_ruimtefunctie_delete.asp

@@ -13,7 +13,7 @@
     Note:
 
 */
-DOCTYPE_Disable = 1;
+var JSON_Result = true;
 %>
 <!--#include file="../Shared/common.inc"-->
 <!--#include file="../Shared/json2.js" -->

APPL/ALG/alg_ruimtefunctie_list.inc

@@ -53,18 +53,14 @@ function ruimtefunctie_list(pautfunction, params)
 
         function ruimtefunctie_delete(row, isMulti)
         {
-          $(row).addClass('dirty');
-          var srtruimte_lg_key = row.getAttribute("ROWKEY");
-          if (isMulti || confirm(L("lcl_alg_del_txt_ruimtefunctie")))
-          {
+          FcltMgr.confirm(L("lcl_alg_del_txt_ruimtefunctie"), { autoconfirm: isMulti }, function() {
+            $(row).addClass('dirty');
+            var srtruimte_lg_key = row.getAttribute("ROWKEY");
             var data = { key: srtruimte_lg_key
                        };
             <% protectRequest.dataToken("data"); %>
-            $.post("alg_ruimtefunctie_delete.asp",
-                   data,
-                   FcltCallbackRefresh,
-                   "json");
-          }
+            $.post("alg_ruimtefunctie_delete.asp", data, FcltCallbackRefresh, "json");
+          });
         }
       </script>
     </head>

APPL/ALG/alg_ruimteresscope.asp

@@ -0,0 +1,72 @@
+<%@language = "javascript"%>
+<% /*
+     $Revision$
+     $Id$
+
+     File:           alg_ruimteresscope.asp
+     Description:    Laat een ruimtes x res_catalogus kiezen bulk kiezen
+     Parameters:     ruimte_keys: komma separated lijst met alg_ruimte_keys
+     Context:
+     Note:
+
+k
+*/ %>
+
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/iface.inc" -->
+<!-- #include file="../Shared/selector.inc" -->
+<!-- #include file="alg.inc" -->
+
+<%
+FCLTHeader.Requires({ plugins:["jQuery"]
+                    });
+
+user.checkAutorisation('WEB_RESMSU');
+
+var ruimte_key_arr = getQParamIntArray("ruimte_keys");
+%>
+<html>
+<head>
+<%    FCLTHeader.Generate(); %>
+    <script>
+        function alg_submit(scopemode)
+        {
+            if ($('select#objcatmulti option:selected').length == 0)
+                return;
+            FcltMgr.confirm(L(scopemode == "A" ? "lcl_add" : "lcl_delete") + "\n" + L("lcl_R_U_sure"), function() {
+                $('input#scopemode').val(scopemode);
+                $.post($("form[name=u2]")[0].action, $("[name=u2]").serialize(), FcltCallbackClose, "json");;
+            });
+        }
+    </script>
+</head>
+
+<body class="modal" id="mod_ruimteresscope">
+    <form name="u2" method="post" action="alg_ruimteresscope_save.asp?ruimte_keys=<%=ruimte_key_arr.join(",")%>">
+        <input type='hidden' name='scopemode' id='scopemode'>
+<%  BLOCK_START("alg_ruimteresscope", L("lcl_alg_geselecteerde_ruimten") + ": " + ruimte_key_arr.length);
+        var sql = "SELECT rd.ins_discipline_key"
+                + ", "+ lcl.xsql('rd.ins_discipline_omschrijving','rd.ins_discipline_key') +" omschrijving"
+                + "  FROM res_v_aanwezigdiscipline rd"
+                + " WHERE rd.ins_discipline_min_level = 2"
+                + " ORDER BY ins_discipline_volgnr, 2";
+
+        FCLTselector("objcatmulti",
+                     sql,
+                     {
+                       label: L("lcl_res_objcat"),
+                       size: 10,
+                       multi: true,
+                       startmulti: true
+                     });
+    BLOCK_END();
+    var buttons =  [ {title: L("lcl_add"),    action: "alg_submit('A')" },
+                     {title: L("lcl_delete"), action: "alg_submit('D')" },
+                     {title: L("lcl_cancel"), action: "gen_cancel()"} ];
+    CreateButtons(buttons);
+
+    IFACE.FORM_END();
+%>
+      </form>
+  </body>
+</html>

APPL/ALG/alg_ruimteresscope_save.asp

@@ -0,0 +1,59 @@
+<%@language = "javascript" %>
+<% /*
+     $Revision$
+     $Id$
+
+     SUBMIT-form
+*/ %>
+<%
+var JSON_Result = true;
+%>
+
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../API2/api2.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<%
+protectRequest.validateToken();
+
+user.checkAutorisation('WEB_RESMSU');
+
+var ruimte_key_arr = getQParamIntArray("ruimte_keys");
+var scope_key_arr = getFParamIntArray("objcatmulti");
+var scopemode = getFParamSafe("scopemode"); // A=Add, D=Delete
+
+var toaster;
+if (scopemode == 'A')
+{
+    var sql = "INSERT INTO res_srtartikel_onrgoed"
+            + "  (alg_onrgoed_niveau, alg_onrgoed_key, res_discipline_key)"
+            + " SELECT 'R', alg_ruimte_key, ins_discipline_key"
+            + "  FROM alg_ruimte,"
+            + "       res_discipline"
+            + " WHERE alg_ruimte_key IN ({0})".format(ruimte_key_arr.join(", "))
+            + "   AND ins_discipline_key IN ({0})".format(scope_key_arr.join(", "))
+            + "   AND NOT EXISTS ("
+            + "       SELECT 1 FROM res_srtartikel_onrgoed"
+            + "        WHERE res_srtartikel_og_verwijder IS NULL"
+            + "          AND alg_onrgoed_niveau = 'R'"
+            + "          AND alg_onrgoed_key = alg_ruimte_key"
+            + "          AND res_discipline_key = ins_discipline_key"
+            + "       )";
+    Oracle.Execute(sql);
+    //var toaster = L("lcl_scf_is_added").format(L("res_srtartikel_onrgoed_m"));
+}
+else if (scopemode == 'D')
+{
+    var sql = "UPDATE res_srtartikel_onrgoed"
+            + "   SET res_srtartikel_og_verwijder = SYSDATE"
+            + " WHERE res_srtartikel_og_verwijder IS NULL"
+            + "   AND alg_onrgoed_niveau = 'R'"
+            + "   AND alg_onrgoed_key IN ({0})".format(ruimte_key_arr.join(", "))
+            + "   AND res_discipline_key IN ({0})".format(scope_key_arr.join(", "));
+    Oracle.Execute(sql);
+    var toaster = L("lcl_scf_is_deleted").format(L("res_srtartikel_onrgoed_m"));
+}
+
+var result = { toaster: toaster,
+               success: true };
+Response.Write(JSON.stringify(result));
+%>

APPL/ALG/alg_search.asp

@@ -49,8 +49,8 @@ var authparams = alg.checkAutorisation();
   </head>
   <body id="searchbody">
     <div id="search">
-<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
       <form name="u2" id="algform" target="workFrame" action="dynamischbepaald" method="get">
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
           <tr>
             <td class="searchkolom1">
               <table>
@@ -68,10 +68,9 @@ var authparams = alg.checkAutorisation();
 %>
               </table>
             </td><!-- end column 1 -->
-            <td class="searchkolom2"><input type="hidden" name="noref" value="1">
-            </td><!-- end column 1 -->
+            <td class="searchkolom2"><input type="hidden" name="noref" value="1"><input type="hidden" name="chkgeb" value="1">
+           </td><!-- end column 1 -->
           </tr>
-      </form>
 <%    BLOCK_END();
 
   var buttons =  [
@@ -82,7 +81,9 @@ var authparams = alg.checkAutorisation();
      {title: L("lcl_menu_alg_terreinsector"), action: "doSubmit('T')"}
     ];
   CreateButtons(buttons, { entersubmit: true });
-%></div> <!-- search -->
+%>
+      </form>
+</div> <!-- search -->
 
     <div id="result">
       <iframe width="100%" height="100%"

APPL/ALG/alg_show_district.asp

@@ -47,17 +47,17 @@ oRs.Close();
       }
       function dis_delete()
       {
-        if (confirm(L("lcl_alg_del_txt_district")))
-        {
-            var data = { key: <%=dis_key%>,
-                         level: "D"
-                       };
+        FcltMgr.confirm(L("lcl_alg_del_txt_district"), function() {
+            var data = {
+                key: <%=dis_key%>,
+                level: "D"
+            };
             <% protectRequest.dataToken("data"); %>
             $.post("alg_delete.asp",
-                   data,
-                   FcltCallbackClose,
-                   "json");
-        }
+                data,
+                FcltCallbackClose,
+                "json");
+        });
       }
     </script>
   </head>
@@ -81,7 +81,7 @@ oRs.Close();
       }
 %>
       <form name=u2 onSubmit="return false;">
-<%      BLOCK_START("algInfo", "");
+<%      BLOCK_START("algInfo", "&nbsp;");
         FCLTplaatsselector(-1,
                            { regiokey: reg_key,
                              districtkey: dis_key,

APPL/ALG/alg_show_gebouw.asp

@@ -38,6 +38,7 @@ var bld_naam    = oRs("alg_gebouw_naam").Value;
 var bld_code    = oRs("alg_gebouw_code").Value;
 var bld_descr   = oRs("alg_gebouw_omschrijving").Value;
 var bld_maak    = oRs("alg_gebouw_aanmaak").Value;
+var bld_email  = oRs("alg_gebouw_email").Value;
 var bld_teken   = oRs("alg_gebouw_getekend").Value;
 var bld_opp     = oRs("alg_gebouw_bruto_vloeropp").Value;
 var bld_omtrek  = oRs("alg_gebouw_omtrek").Value;
@@ -52,11 +53,13 @@ var bld_x       = oRs("alg_gebouw_x").Value;
 var bld_y       = oRs("alg_gebouw_y").Value;
 var bld_bez     = oRs("alg_gebouw_bez").Value;
 var bld_deleted = oRs("alg_gebouw_verwijder").Value != null;
-var dienstniveau = oRs("mld_dienstniveau_key").Value;
+var dienstniveau_key = oRs("mld_dienstniveau_key").Value;
 var beginuur   = oRs("alg_gebouw_beginuur").Value;
 var einduur    = oRs("alg_gebouw_einduur").Value;
 var werkdagen  = oRs("alg_gebouw_werkdagen").Value;
 var verantw    = oRs("prs_perslid_key_verantw").Value;
+var verantw2    = oRs("prs_perslid_key_verantw2").Value;
+var vervaldatum = oRs("alg_gebouw_vervaldatum").Value;
 oRs.Close();
 %>
 
@@ -71,23 +74,37 @@ oRs.Close();
       }
       function bld_delete()
       {
-        if (confirm(L("lcl_alg_del_txt_gebouw")))
-        {
-          var data = { key: <%=bld_key%>,
-                       level: "G"
-                     };
-          <% protectRequest.dataToken("data"); %>
-          $.post("alg_delete.asp",
-                 data,
-                 FcltCallbackClose,
-                 "json");
-        }
+        FcltMgr.confirm(L("lcl_alg_del_txt_gebouw"), function() {
+            var data = {
+                key: <%=bld_key%>,
+                level: "G"
+            };
+            <% protectRequest.dataToken("data"); %>
+            $.post("alg_delete.asp",
+                data,
+                FcltCallbackClose,
+                "json");
+        });
       }
+<%  if (S("alg_fg_remote_maps") != "" && bld_x && bld_y) { %>
+      function openMaps(bldKey)
+      {
+          FcltMgr.windowopen('../cad/ShowGoogleMap.asp?bld_key=' + bldKey, 'FGShow',
+                             "width=800, height=600, directories=no, location=no, menubar=no,"
+                           + "resizable=yes, status=no, titlebar=yes, toolbar=no");
+          return;
+      }
+<%  } %>
     </script>
   </head>
 
   <body id="showbody">
 <%  var buttons = [];
+
+    if (S("alg_fg_remote_maps") != "" && bld_x && bld_y) {
+         buttons.push({title: L("lcl_maps"), action:"openMaps("+bld_key+")", icon: "map.png" });
+    }
+
     if (!bld_deleted)
     {
       if (this_alg.writeman || this_alg.writeuse)
@@ -106,11 +123,12 @@ oRs.Close();
 %>
     <div id="show">
       <form name=u2 onSubmit="return false;">
-<%      BLOCK_START("algLoc1", "");
+<%      BLOCK_START("algLoc1", "&nbsp;");
         FCLTplaatsselector(-1,
                            { gebouwkey: bld_key,
                              startlevel: 2, //Locatie
                              eindlevel: 3, // Gebouw
+                             moreinfo: true,  // wel beetje suf om door te linken naar jezelf
                              readonly: true
                            });
         sql = "SELECT alg_srtgebouw_key"
@@ -123,9 +141,14 @@ oRs.Close();
                      { label: L("lcl_estate_gebouw_srtgebouw"),
                        initKey: bld_srtkey,
                        emptyOption: "",
+                       suppressEmpty: true,
                        readonly: true
                      });
-        ROFIELDTR("fld", L("lcl_estate_gebouw_man_code"), bld_code, {suppressEmpty:true});
+        params = { infoPointer: { Url: "appl/shared/status_info.asp?bld_key=" + bld_key,
+                                  Title: L("lcl_status_details") + " " + bld_naam
+                                }
+                 }
+        ROFIELDTR("fld", L("lcl_estate_gebouw_man_code"), bld_code, params);
         ROFIELDTR("fld", L("lcl_estate_gebouw_man_opmerk"), bld_opmerk, {suppressEmpty:true});
         sql = "SELECT prs_kostenplaats_key"
             + "     , k.prs_kostenplaats_nr || ' ' || k.prs_kostenplaats_omschrijving"
@@ -137,15 +160,16 @@ oRs.Close();
                      { label: L("lcl_prs_dept_kosten"),
                        initKey: prs_kstpl,
                        emptyOption: "",
+                       suppressEmpty: true,
                        readonly: true
                      });
         ROFIELDTR("fld", L("lcl_estate_gebouw_ordernr"), bld_ordrnr, {suppressEmpty:true});
-        if (dienstniveau)
+        if (dienstniveau_key)
         {
           sql = "SELECT mld_dienstniveau_key"
               + "     , " + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
               + "  FROM mld_dienstniveau"
-              + " WHERE mld_dienstniveau_key = " + dienstniveau;
+              + " WHERE mld_dienstniveau_key = " + dienstniveau_key;
           oRs = Oracle.Execute(sql);
           ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
           oRs.Close();
@@ -158,25 +182,42 @@ oRs.Close();
                               suppressEmpty: true,
                               moreinfo: this_alg.readman
                             });
+        FCLTpersoonselector("verantw2",
+                            "sgVerantw2",
+                            { perslidKey: verantw2,
+                              label: L("lcl_alg_verantw2"),
+                              readonly: true,
+                              suppressEmpty: true,
+                              moreinfo: this_alg.readman
+                            });
+
+        AFIELDTR('fldmailto details', L("lcl_alg_gebouw_email"), "mailto:" + bld_email, bld_email, { suppressEmpty: true });
         BLOCK_END();
 
-        BLOCK_START("algLoc2", "");
+        BLOCK_START("algLoc2", "&nbsp;");
+        var calcopp = alg.calc_algm2(bld_key, onrgoedlvl);
+        ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
+
         ROFIELDTR("fld", L("lcl_estate_gebouw_man_bruto_vloeropp"), bld_opp, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_estate_gebouw_man_omtrek"), bld_omtrek, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_estate_gebouw_man_inhoud"), bld_inhoud, {suppressEmpty: true});
-        sql = "SELECT mld_adres_key"
-            + "     , mld_adres_naam"
-            + "  FROM mld_v_afleveradres"
-            + " ORDER BY mld_adres_naam";
-        FCLTselector("del_address",
-                     sql,
-                     {  label: L("lcl_delivery_address"),
-                        initKey: mld_adres,
-                        emptyOption: "",
-                        readonly: true
-                     });
+        sql = "SELECT mld_adres_naam"
+            + "  FROM mld_adres"
+            + " WHERE mld_adres_key = " + mld_adres;
+        oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        {
+            ROFIELDTR("fld", L("lcl_delivery_address"), oRs("mld_adres_naam").value, {suppressEmpty: true});
+        }
+        oRs.Close();
         ROFIELDTR("fld", L("lcl_geoxcoord"), bld_x, {suppressEmpty:true});
         ROFIELDTR("fld", L("lcl_geoycoord"), bld_y, {suppressEmpty:true});
+        var fldcls = "fld";
+        if (vervaldatum <= new Date())
+            fldcls += " expired2";
+        ROFIELDTR(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
         ROCHECKBOXTR("fldalgbez", L("lcl_estate_gebouw_bez"), bld_bez==1);
         ROFIELDTR("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(beginuur), {suppressEmpty:true} );
         ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"), toTimeString(einduur), {suppressEmpty:true} );

APPL/ALG/alg_show_locatie.asp

@@ -46,7 +46,7 @@ var pst_adres  = oRs("alg_locatie_post_adres").value;
 var pst_plaats = oRs("alg_locatie_post_plaats").value;
 var pst_land   = oRs("alg_locatie_post_land").value;
 var loc_deleted = oRs("alg_locatie_verwijder").value != null;
-var dienstniveau = oRs("mld_dienstniveau_key").value;
+var dienstniveau_key = oRs("mld_dienstniveau_key").value;
 oRs.Close();
 %>
 <html>
@@ -71,24 +71,38 @@ oRs.Close();
 
       function loc_delete()
       {
-        if (confirm(L("lcl_alg_del_txt_locatie")))
-        {
-          var data = { key: <%=loc_key%>,
-                       level: "L"
-                     };
-          <% protectRequest.dataToken("data"); %>
-          $.post("alg_delete.asp",
-                 data,
-                 FcltCallbackClose,
-                 "json");
-         }
+        FcltMgr.confirm(L("lcl_alg_del_txt_locatie"), function() {
+            var data = {
+                key: <%=loc_key%>,
+                level: "L"
+            };
+            <% protectRequest.dataToken("data"); %>
+            $.post("alg_delete.asp",
+                data,
+                FcltCallbackClose,
+                "json");
+        });
       }
+<%  if (S("alg_fg_remote_maps") != "" && loc_x && loc_y) {  %>
+      function openMaps(locKey)
+      {
+          FcltMgr.windowopen('../cad/ShowGoogleMap.asp?loc_key=' + locKey, 'FGShow',
+                             "width=800, height=600, directories=no, location=no, menubar=no,"
+                           + "resizable=yes, status=no, titlebar=yes, toolbar=no");
+          return;
+      }
+<%  } %>
     </script>
   </head>
 
   <body id="showbody">
 <%  var buttons = [];
     buttons.push({title: L("lcl_photos"),  icon: "camera.png", action: "alg_showphotos()"});
+
+    if (S("alg_fg_remote_maps") != "" && loc_x && loc_y) {
+         buttons.push({title: L("lcl_maps"), action:"openMaps("+loc_key+")", icon: "map.png" });
+    }
+
     if (!loc_deleted)
     {
       if (this_alg.writeman || this_alg.writeuse)
@@ -106,7 +120,7 @@ oRs.Close();
       }
 %>
       <form name=u2 onSubmit="return false;">
-<%      BLOCK_START("algLoc1", "");
+<%      BLOCK_START("algLoc1", "&nbsp;");
         FCLTplaatsselector(-1,
                            { locatiekey: loc_key,
                              startlevel: 1, //District
@@ -118,12 +132,12 @@ oRs.Close();
         ROFIELDTR("fld", L("lcl_prs_address_bezoek_postcode"), bez_postc, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_prs_address_bezoek_plaats"), bez_plaats, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_prs_address_bezoek_land"), bez_land, {suppressEmpty: true});
-        if (dienstniveau)
+        if (dienstniveau_key)
         {
             sql  = "SELECT   mld_dienstniveau_key, "
                  + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
                  + "    FROM mld_dienstniveau "
-                 + "   WHERE mld_dienstniveau_key = " + dienstniveau;
+                 + "   WHERE mld_dienstniveau_key = " + dienstniveau_key;
             oRs = Oracle.Execute(sql);
             ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
             oRs.Close();
@@ -132,7 +146,7 @@ oRs.Close();
         ROFIELDTR("fld", L("lcl_geoycoord"), loc_y, {suppressEmpty: true});
 
         BLOCK_END();
-        BLOCK_START("algLoc2", "");
+        BLOCK_START("algLoc2", "&nbsp;");
 
         ROFIELDTR("fld", L("lcl_prs_address_post_adres"), pst_adres, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_prs_address_post_postcode"), pst_postc, {suppressEmpty: true});

APPL/ALG/alg_show_regio.asp

@@ -49,15 +49,16 @@ var regio_deleted = regio_exists && !!regio_data.deleted;
 
       function reg_delete()
       {
-        if (confirm(L("lcl_alg_del_txt_regio")))
-        {
-            var data = { action: "D" };
+        FcltMgr.confirm(L("lcl_alg_del_txt_regio"), function() {
+            var data = {
+                action: "D"
+            };
             <% protectRequest.dataToken("data"); %>
             $.post($("form[name=u2]")[0].action,
-                   data,
-                   FcltCallbackClose,
-                   "json");
-        }
+                data,
+                FcltCallbackClose,
+                "json");
+        });
       }
     </script>
   </head>
@@ -83,7 +84,7 @@ var regio_deleted = regio_exists && !!regio_data.deleted;
       <form name=u2
             action="alg_edit_regio_save.asp?regio_key=<%=regio_data.id%>"
             onSubmit="return false">
-<%      BLOCK_START("algInfo", "");
+<%      BLOCK_START("algInfo", "&nbsp;");
         FCLTplaatsselector(-1,
                            { regiokey: regio_data.id,
                              startlevel: 0, // Regio

APPL/ALG/alg_show_ruimte.asp

@@ -54,15 +54,16 @@ if (!room_data.cadcontours.length)
         }
         function room_delete()
         {
-            if (confirm(L("lcl_alg_del_txt_ruimte")))
-            {
-                var data = { room_action: "D" };
+            FcltMgr.confirm(L("lcl_alg_del_txt_ruimte"), function() {
+                var data = {
+                    room_action: "D"
+                };
                 <% protectRequest.dataToken("data"); %>
                 $.post($("form[name=u2]")[0].action,
-                       data,
-                       FcltCallbackClose,
-                       "json");
-            }
+                    data,
+                    FcltCallbackClose,
+                    "json");
+            });
         }
         function openFG()
         {
@@ -99,7 +100,7 @@ if (!room_data.cadcontours.length)
             action="alg_edit_ruimte_save.asp?room_key=<%=room_data.id%>"
             onSubmit="return false">
 <%
-        BLOCK_START("algLoc1", "");
+        BLOCK_START("algLoc1", "&nbsp;");
 
           FCLTplaatsselector(-1, {
                             ruimtekey: room_key,
@@ -119,7 +120,7 @@ if (!room_data.cadcontours.length)
           ROFIELDTR("fld",      L("lcl_mld_dienst_niveau"),      (room_data.servicelevel ? room_data.servicelevel.name : ""), {suppressEmpty:true});
 
         BLOCK_END();
-        BLOCK_START("algLoc2", "");
+        BLOCK_START("algLoc2", "&nbsp;");
 
           ROFIELDTR("fldshort",     L("lcl_estate_ruimte_bruto_vloeropp"), room_data.grossarea, {suppressEmpty:true});
           if (room_data.grossarea != room_data.cadcontours[0].cadarea)
@@ -135,7 +136,7 @@ if (!room_data.cadcontours.length)
           ROFIELDTR("fld",          L("lcl_estate_ruimte_man_opmerk"),     room_data.remark,    {suppressEmpty:true});
 
           ROFIELDTR("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(room_data.openfrom),   {suppressEmpty:true});
-          ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"),  toTimeString(room_data.opento),     {suppressEmpty:true});
+          ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"),  room_data.opento==24?"24:00":toTimeString(room_data.opento),     {suppressEmpty:true});
 
           switch (room_data.workdays)
           {

APPL/ALG/alg_show_terreinsector.asp

@@ -87,18 +87,18 @@ oRs.Close();
       }
       function ter_delete()
       {
-          if (confirm(L("lcl_alg_del_txt_terreinsector")))
-          {
-            var data = { key: <%=ter_key%>,
-                         level: "T"
-                       };
+        FcltMgr.confirm(L("lcl_alg_del_txt_terreinsector"), function() {
+            var data = {
+                key: <%=ter_key%>,
+                level: "T"
+            };
             <% protectRequest.dataToken("data"); %>
             var ter_key = <%=ter_key%>
             $.post("alg_delete.asp",
-                   data,
-                   FcltCallbackClose,
-                   "json");
-          }
+                data,
+                FcltCallbackClose,
+                "json");
+        });
       }
     </script>
   </head>
@@ -131,14 +131,14 @@ oRs.Close();
                              readonly: true
                            });
 
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_sort"), ter_sroms);
+        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_sort"), ter_sroms, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_estate_terreinsector_man_code"), ter_code);
         ROFIELDTR("fld", L("lcl_estate_terreinsector_man_name"), ter_naam);
-        ROFIELDTR("fld", L("lcl_prs_dept_kosten"), prs_kstpl);
+        ROFIELDTR("fld", L("lcl_prs_dept_kosten"), prs_kstpl, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_dep_name_level2"), prs_afd);
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_ordernr"), ter_ordnr);
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_oppervlak"), ter_opp);
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_omtrek"), ter_omt);
+        ROFIELDTR("fld", L("lcl_estate_terreinsector_ordernr"), ter_ordnr, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_oppervlak"), ter_opp, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_omtrek"), ter_omt, {suppressEmpty: true});
 
         BLOCK_END();
 

APPL/ALG/alg_show_verdieping.asp

@@ -36,7 +36,7 @@ var flr_omschr = oRs("alg_verdieping_omschrijving").value;
 var flr_volgnr = oRs("alg_verdieping_volgnr").value;
 var flr_code   = oRs("alg_verdieping_code").value;
 var flr_deleted = oRs("alg_verdieping_verwijder").value != null;
-var dienstniveau = oRs("mld_dienstniveau_key").value;
+var dienstniveau_key = oRs("mld_dienstniveau_key").value;
 oRs.Close();
 %>
 
@@ -52,17 +52,17 @@ oRs.Close();
 
       function flr_delete()
       {
-        if (confirm(L("lcl_alg_del_txt_verdieping")))
-        {
-          var data = { key: <%=flr_key%>,
-                       level: "V"
-                     };
-          <% protectRequest.dataToken("data"); %>
-          $.post("alg_delete.asp",
-                 data,
-                 FcltCallbackClose,
-                 "json");
-        }
+        FcltMgr.confirm(L("lcl_alg_del_txt_verdieping"), function() {
+            var data = {
+                key: <%=flr_key%>,
+                level: "V"
+            };
+            <% protectRequest.dataToken("data"); %>
+            $.post("alg_delete.asp",
+                data,
+                FcltCallbackClose,
+                "json");
+        });
       }
     </script>
   </head>
@@ -86,27 +86,35 @@ oRs.Close();
       }
 %>
       <form name=u2 onSubmit="return false;">
-<%      BLOCK_START("algLoc1", "");
+<%      BLOCK_START("algLoc1", "&nbsp;");
         FCLTplaatsselector(-1, {
                             verdiepingkey: flr_key,
                             startlevel: 2, //locatie
                             eindlevel: 4, // Verdieping
+                            moreinfo: true,
                             readonly: true });
 
         ROFIELDTR("fld", L("lcl_estate_verdieping_man_code"), flr_code);
         ROFIELDTR("fld", L("lcl_estate_verdieping_man_volgnr"), flr_volgnr);
-        if (dienstniveau)
+        if (dienstniveau_key)
         {
             sql  = "SELECT   mld_dienstniveau_key, "
                  + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
                  + "    FROM mld_dienstniveau "
-                 + "   WHERE mld_dienstniveau_key = " + dienstniveau;
+                 + "   WHERE mld_dienstniveau_key = " + dienstniveau_key;
             oRs = Oracle.Execute(sql);
             ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
             oRs.Close();
         }
         BLOCK_END();
 
+        BLOCK_START("algLoc2", "&nbsp;");
+          var calcopp = alg.calc_algm2(flr_key, onrgoedlvl);
+          ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
+        BLOCK_END();
+
         generateFlexKenmerkBlock ({
            onrgoed_key    : flr_key,
            onrgoed_niveau : onrgoedlvl,

APPL/ALG/alg_show_wp.asp

@@ -58,17 +58,17 @@ var wp_typ_str = (wp_type == 1 ? L("lcl_wptype_1") : L("lcl_wptype_0"));
       function wp_delete()
       {
          var wp_key = <%=wp_key%>;
-         if (confirm(L("lcl_alg_del_txt_werkplek")))
-         {
-           var data = { key: <%=wp_key%>,
-                        level: "W"
-                      };
-           <% protectRequest.dataToken("data"); %>
-           $.post("alg_delete.asp",
-                  data,
-                  FcltCallbackClose,
-                  "json");
-         }
+         FcltMgr.confirm(L("lcl_alg_del_txt_werkplek"), function() {
+             var data = {
+                 key: <%=wp_key%>,
+                 level: "W"
+             };
+             <% protectRequest.dataToken("data"); %>
+             $.post("alg_delete.asp",
+                 data,
+                 FcltCallbackClose,
+                 "json");
+         });
       }
     </script>
   </head>

APPL/ALG/alg_srtruimte.asp

@@ -119,7 +119,7 @@ if (mode == "save")
     {
 %>
         <script>
-            alert("<%=safe.jsstring(err.friendlyMsg)%>");
+            FcltMgr.alert("<%=safe.jsstring(err.friendlyMsg)%>");
         </script>
 <%
     }
@@ -171,8 +171,10 @@ else if (srtruimte_key > 0 && mode == "delete")
 
     function alg_delete()
     {
-        if (confirm("<%=safe.jsstring(L("lcl_R_U_sure"))%>"))
-            window.location.href = "alg_srtruimte.asp?mode=delete&alg_srtruimte_key=<%=srtruimte_key%>";
+        FcltMgr.confirm("<%=safe.jsstring(L("lcl_R_U_sure"))%>",
+            function() {
+                window.location.href = "../alg/alg_srtruimte.asp?mode=delete&alg_srtruimte_key=<%=srtruimte_key%>";
+            });
     }
 
     function alg_cancel()
@@ -287,10 +289,10 @@ else if (srtruimte_key > 0 && mode == "delete")
             target="hidFrameSubmit"
             onSubmit="alg_submit()">
 <%
-        BLOCK_START("algInfo", safe.html(L("lcl_general_properties")));
+        BLOCK_START("algInfo", L("lcl_general_properties"));
 
             ROFIELDTR(                  "fld",      L("lcl_key"),                     srtruimte_key);
-            myFIELD("omschrijving",     "fld",      L("lcl_descr"),                   srtr_info.alg_srtruimte_omschrijving);
+            myFIELD("omschrijving",     "fld",      L("lcl_descr"),                   srtr_info.alg_srtruimte_omschrijving, { translate: {fld: "mld_afmeldtekst_naam", key: srtruimte_key} });
             myFIELD("prijs",            "fld",      L("lcl_alg_alg_tarief")+" (m2)",  safe.editablefloat(srtr_info.alg_srtruimte_prijs),  {datatype: "float", suppressEmpty: true} );
             myFIELD("prijs2",           "fld",      L("lcl_alg_alg_tariefA")+" (m2)", safe.editablefloat(srtr_info.alg_srtruimte_prijs2), {datatype: "float", suppressEmpty: true} );
             myFIELD("prijs3",           "fld",      L("lcl_alg_alg_tariefB")+" (m2)", safe.editablefloat(srtr_info.alg_srtruimte_prijs3), {datatype: "float", suppressEmpty: true} );
@@ -312,8 +314,8 @@ else if (srtruimte_key > 0 && mode == "delete")
                                            disable: !srtr_info.tijd_uitvoertijd
                                          }
                                }
-            myFIELD("uitvoertijd", "fldalg_uitvtijd", L("lcl_mld_stduitvoertijd"), srtr_info.tijd_uitvoertijd? Math.round(srtr_info.tijd_uitvoertijd * 100) / 100 : ""
-                   , {maxlength: 4, datatype: "float", html: "onChange='onChangeUitvoertijd();'", suppressEmpty: true, selector: selectparams});
+            myFIELD("uitvoertijd", "fldalg_uitvtijd", L("lcl_mld_stduitvoertijd"), srtr_info.tijd_uitvoertijd? Math.round(srtr_info.tijd_uitvoertijd * 100000) / 100000 : ""
+                   , {maxlength: 8, datatype: "float", html: "onChange='onChangeUitvoertijd();'", suppressEmpty: true, selector: selectparams});
 
         BLOCK_END();
 

APPL/ALG/alg_srtruimte_search.asp

@@ -44,8 +44,8 @@ FCLTHeader.Generate();
 
   <body id="searchbody">
     <div id="search">
-<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
       <form name="u2" target="workFrame" action="alg_srtruimte_search_list.asp" method="get">
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
           <tr>
             <td class="searchkolom1">
               <table><!-- x rijen, 2 kolommen: label + veld -->

APPL/ALG/alg_terreinsector_list.inc

@@ -49,18 +49,14 @@ function fnrowData(oRs)
 
   function doDelete(rowArray, isMulti)
   {
-    var terKeyString = getKeyString(rowArray);
-    if (isMulti || confirm(L("lcl_alg_del_txt_terreinsector")))
-    {
+    FcltMgr.confirm(L("lcl_alg_del_txt_terreinsector"), { autoconfirm: isMulti }, function() {
+      var terKeyString = getKeyString(rowArray);
       var data = { key: terKeyString,
                    level: "T"
                  };
       <% protectRequest.dataToken("data"); %>
-      $.post("alg_delete.asp",
-             data,
-             FcltCallbackRefresh,
-             "json");
-    }
+      $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+    });
   }
 </script>
 <%
@@ -79,9 +75,11 @@ function terrein_list(pautfunction, params)
 
   var noref = params.noref;
 
+  var reg_key = params.reg_key;
+  var dis_key = params.dis_key;
   var loc_key = params.loc_key;
   var ter_code = params.ter_code;
-  var ter_func = params.ter_func;
+  var ter_func_key = params.ter_func_key;
 
   function fnrowActionEnabler(oRs) // klopt dit voor terreinsector?
   {
@@ -138,15 +136,19 @@ function terrein_list(pautfunction, params)
       {
       sqln += " AND g.alg_locatie_key = " + loc_key;
       }
+      else if (dis_key)
+        sqln += " AND l.alg_district_key = " + dis_key;
+      else if (reg_key)
+        sqln += " AND l.alg_district_key IN (SELECT alg_district_key FROM alg_district WHERE alg_regio_key = " + reg_key+")";
 
-   if (ter_func)
+   if (ter_func_key)
       {
-       sqln += " AND g.ALG_SRTTERREINSECTOR_KEY = " + ter_func;
+       sqln += " AND g.alg_srtterreinsector_key = " + ter_func_key;
       }
 
    if (ter_code)
      {
-     sqln += " AND UPPER(g.ALG_TERREINSECTOR_CODE) LIKE " + safe.quoted_sql_wild("%" + ter_code + "%");
+     sqln += " AND UPPER(g.alg_terreinsector_code) LIKE " + safe.quoted_sql_wild("%" + ter_code + "%");
      }
 
      sqln += " ORDER BY g.alg_terreinsector_upper ASC "

APPL/ALG/alg_terreinsector_search.asp

@@ -15,7 +15,7 @@ FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });
 
 var locatie_key = getQParamInt("locatie_key", -1); // locatie
 var vak_code = getQParam("vak_code", "");
-var ter_func = getQParamInt("ter_func", -1);
+var ter_func_key = getQParamInt("ter_func_key", -1);
 var autosearch = getQParamInt("autosearch", 0) == 1;
 var authparams = alg.checkAutorisation();
 
@@ -64,7 +64,7 @@ var authparams = alg.checkAutorisation();
 
               FCLTselector("srt",
                            sql,
-                           { initKey: ter_func,
+                           { initKey: ter_func_key,
                              label: L("lcl_estate_terreinsector_man_sort"),
                              emptyOption: "",
                              trclass: "primsearch",

APPL/ALG/alg_terreinsector_search_list.asp

@@ -22,16 +22,20 @@
 var outputmode = getQParamInt("outputmode", 0) //  0 = screen, 1 = print, 2 = excel etc
 var showall = getQParamInt("showall", 0) == 1;
 var noref = getQParamInt("noref", -1); // (voor onderdrukken horizontale verwijzingen)
+var reg_key = getQParamInt("regiokey", -1); // Regio
+var dis_key = getQParamInt("districtkey", -1); // District
 var loc_key = getQParamInt("locatiekey", -1); // Locatie
 var ter_code = getQParam("descr", null);
-var ter_func = getQParamInt("srt", -1);
+var ter_func_key = getQParamInt("srt", -1);
 
 terrein_list ( "*",
               {  outputmode: outputmode,
                  showall: showall,
+                 reg_key: (reg_key != -1? reg_key : null),
+                 dis_key: (dis_key != -1? dis_key : null),
                  loc_key: (loc_key != -1? loc_key : null),
                  ter_code: (ter_code != ""? ter_code : null),
-                 ter_func: (ter_func != -1? ter_func : null),
+                 ter_func_key: (ter_func_key != -1? ter_func_key : null),
                  noref: (noref != -1? noref : null)
               }
              );

APPL/ALG/alg_verdieping.asp

@@ -76,15 +76,26 @@ else
   </head>
 
   <body>
-<%  if (flr_key == -1)
+<%    if (flr_key == -1)
         var page="alg_edit_verdieping.asp"; // Maak een nieuw
-    else
+      else
         var page="alg_show_verdieping.asp";
-    page += "?flr_key="+flr_key;
+      page += "?flr_key="+flr_key;
 
-    IFRAMER("algFrame", page, { title: L("lcl_alg_verdieping_frame"),
+      IFRAMER("algFrame", page, { title: L("lcl_alg_verdieping_frame"),
                                 initHeight: "450px",
                                 FcltClose: "algClose" } );
+
+      var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true);
+      var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true);
+      var curole = "bo";
+      if (!authparamsCNTMAN && authparamsCNTUSE)
+        curole = "fe";
+      if (authparamsCNTMAN || authparamsCNTUSE)
+      {
+          var page2="../cnt/cnt_search_list.asp?embedded=1&tiny=1&collapsed=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&flr_key="+ flr_key
+          IFRAMER("cntFrame", page2, { initHide: true } );
+      }
 %>
   </body>
 </html>

APPL/ALG/alg_verdieping_list.inc

@@ -36,7 +36,7 @@ function fnrowData(oRs)
   function gotoDetails(row)
   {
     var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var url = "appl/ALG/alg_ruimte_search.asp?verdieping_key=" + algData.detail_key + "&autosearch=" + autosearch;
+    var url = "appl/ALG/alg_ruimte_search.asp?verdieping_key=" + algData.detail_key + "&autosearch=" + autosearch + "&chkgeb=1";
     FcltMgr.openDetail(url, "<%=L("lcl_room")%>");
   }
   function gotoParent(row)
@@ -54,18 +54,14 @@ function fnrowData(oRs)
 
   function doDelete(rowArray, isMulti)
   {
-    var flrKeyString = getKeyString(rowArray);
-    if (isMulti || confirm(L("lcl_alg_del_txt_verdieping")))
-    {
+    FcltMgr.confirm(L("lcl_alg_del_txt_verdieping"), { autoconfirm: isMulti }, function() {
+      var flrKeyString = getKeyString(rowArray);
       var data = { key: flrKeyString,
                    level: "V"
                  };
       <% protectRequest.dataToken("data"); %>
-      $.post("alg_delete.asp",
-             data,
-             FcltCallbackRefresh,
-             "json");
-    }
+      $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+    });
   }
 
 </script>
@@ -84,9 +80,12 @@ function verdiepingen_list(pautfunction, params)
 
   var noref = params.noref;
 
+  var reg_key = params.reg_key;
+  var dis_key = params.dis_key;
   var loc_key = params.loc_key;
   var bld_key = params.bld_key;
   var lvl_key = params.lvl_key;
+  var chkgeb = params.chkgeb;
 
   function fnrowActionEnabler(oRs)
   {
@@ -124,7 +123,7 @@ function verdiepingen_list(pautfunction, params)
        + "       alg_locatie l  "
        + " WHERE g.alg_gebouw_key = v.alg_gebouw_key "
        + "   AND l.alg_locatie_key(+) = g.alg_locatie_key "
-       + "   AND v.alg_verdieping_verwijder IS NULL "
+       + "   AND v.alg_verdieping_verwijder IS NULL ";
 
     if ( authparams.ALGreadlevel > -1 )
     {  // Er is een scope-beperking van kracht
@@ -150,7 +149,13 @@ function verdiepingen_list(pautfunction, params)
       {
       sqln += " AND g.alg_locatie_key = " + loc_key;
       }
+    else if (dis_key)
+      sqln += " AND l.alg_district_key = " + dis_key;
+    else if (reg_key)
+      sqln += " AND l.alg_district_key IN (SELECT alg_district_key FROM alg_district WHERE alg_regio_key = " + reg_key+")";
 
+    if (!chkgeb)
+      sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";
 
      sqln += " ORDER BY l.alg_locatie_upper ASC, "
           +  "          g.alg_gebouw_upper ASC, "

APPL/ALG/alg_verdieping_search.asp

@@ -17,6 +17,7 @@ var locatie_key = getQParamInt("locatie_key", -1); // Locatie
 var gebouw_key = getQParamInt("gebouw_key", -1); // Gebouw
 var verdieping_key = getQParamInt("verdieping_key", -1); // Verdieping
 var autosearch = getQParamInt("autosearch", 0) == 1;
+var chkgeb = getQParamInt("chkgeb", 0) == 1;
 var authparams = alg.checkAutorisation();
 %>
 
@@ -47,6 +48,7 @@ var authparams = alg.checkAutorisation();
   <body id="searchbody">
     <div id="search">
       <form name="u2" target="workFrame" action="alg_verdieping_search_list.asp" method="get">
+        <input type="hidden" id="chkgeb" name="chkgeb" value="<%=(chkgeb?1:0)%>">
 <%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
           <td valign=top>
             <table>

APPL/ALG/alg_verdieping_search_list.asp

@@ -22,17 +22,24 @@
 var outputmode = getQParamInt("outputmode", 0) //  0 = screen, 1 = print, 2 = excel etc
 var showall = getQParamInt("showall", 0) == 1;
 var noref = getQParamInt("noref", -1); // (voor onderdrukken horizontale verwijzingen)
+var reg_key = getQParamInt("regiokey", -1); // Regio
+var dis_key = getQParamInt("districtkey", -1); // District
 var loc_key = getQParamInt("locatiekey", -1); // Locatie
 var bld_key = getQParamInt("gebouwkey", -1); // Gebouw
 var lvl_key = getQParamInt("verdiepingkey", -1); // Verdieping
+var chkgeb  = getQParamInt("chkgeb", 0) == 1; //Controleer tegen de vervallenstatus van het gebouw (vertrouw geb_key niet)
+
 
 verdiepingen_list ( "*",
               {  outputmode: outputmode,
                  showall: showall,
+                 reg_key: (reg_key != -1? reg_key : null),
+                 dis_key: (dis_key != -1? dis_key : null),
                  loc_key: (loc_key != -1? loc_key : null),
                  bld_key: (bld_key != -1? bld_key : null),
                  lvl_key: (lvl_key != -1? lvl_key : null),
-                 noref: (noref != -1? noref : null)
+                 noref: (noref != -1? noref : null),
+                 chkgeb: chkgeb
               }
              );
 %>

APPL/ALG/alg_werkplek_list.inc

@@ -67,18 +67,14 @@ FCLTHeader.Requires({ plugins:["jQuery"],
 
     function doDelete(rowArray, isMulti)
     {
-    var wpKeyString = getKeyString(rowArray);
-      if (isMulti || confirm(L("lcl_alg_del_txt_werkplek")))
-      {
+      FcltMgr.confirm(L("lcl_alg_del_txt_werkplek"), { autoconfirm: isMulti }, function() {
+        var wpKeyString = getKeyString(rowArray);
         var data = { key: wpKeyString,
                      level: "W"
                    };
         <% protectRequest.dataToken("data"); %>
-        $.post("alg_delete.asp",
-               data,
-               FcltCallbackRefresh,
-               "json");
-      }
+        $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+      });
     }
 
     function doAddWP(room_key) // als impliciet==0
@@ -252,6 +248,7 @@ function werkplek_list(pautfunction, params)
 
     rst.addColumn(new Column({caption: L("lcl_room"), content: "Samengesteld", nowrap: true}));
     rst.addColumn(new Column({caption: L("lcl_estate_ruimte_man_descr"), content: "alg_ruimte_omschrijving"}));
+    rst.addColumn(new Column({caption: L("lcl_estate_wp_seq"), content: "prs_werkplek_volgnr"}));
     if (S("prs_werkplek_implicit")==0)
     {
         rst.addColumn(new Column({caption: L("lcl_workplace"), content: "prs_werkplek_omschrijving" }));

APPL/ALG/alg_wp.asp

@@ -76,8 +76,11 @@ if (wp_key > 0)
                                 FcltClose: "algClose" } );
     if (wp_key > -1)
     {
-      var page2 ="../prs/prs_perslidwerkplek_search_list.asp?embedded=1&wp_key=" + wp_key
+      var page2 ="../prs/prs_perslidwerkplek_search_list.asp?embedded=1&wp_key=" + wp_key;
       IFRAMER("algFrame", page2, { initHeight: "450px" } );
+
+      var page3 ="../ins/ins_search_list.asp?urole=bo&tiny=1&werkplekkey=" + wp_key;
+      IFRAMER("algFrame", page3, { initHeight: "450px" } );
     }
 %>
   </body>

APPL/ALG/get_alg_info_ajax.asp

@@ -15,7 +15,7 @@
 */ %>
 
 <%
-DOCTYPE_Disable = 1;
+var JSON_Result = true;
 %>
 
 <!-- #include file="../Shared/common.inc"-->

APPL/ALG/get_volgnr_ajax.asp

@@ -11,7 +11,7 @@
 
 */ %>
 <%
-    DOCTYPE_Disable = 1;
+var JSON_Result = true;
 %>
 <!--#include file="../Shared/common.inc"-->
 <!--#include file="../Shared/json2.js" -->

APPL/API/.gitignore

@@ -0,0 +1 @@
+TESTER

APPL/API/api.inc

@@ -62,6 +62,9 @@ function API_func()
         import_app_key:   oRs("fac_import_app_key").Value
     };
 
+    if (this.apidata.loglevel > 1) // Zet maar op 3 als je HTML logging wilt
+        __Logging = this.apidata.loglevel || __Logging || 0; // Voor de rest van dit bestand
+
     try
     {
         this.apidata.options = eval("("+oRs("fac_api_options_json").Value+")");

APPL/API/api_SOAP.asp

@@ -36,7 +36,7 @@
     LCL_Disable = 1
     THIS_FILE = "appl/api/api_soap.asp";
 
-//    Session("logging")=1;
+//    __Logging = 1;
 %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/xml_converter.inc" -->

APPL/API/api_XMLNode.asp

@@ -41,8 +41,6 @@
         ts.Close();
     }
 
-    Session("logging") = API.apidata.loglevel||0;
-
     var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
     xmlReq.load(Request);
 

APPL/API/api_bessoap.asp

@@ -122,6 +122,7 @@
 
                var bes_info = bes.bestelling_info(bes_bestelling_key); // Globale variabele met alle bes_bestelling informatie
           	   var this_bes = bes.func_enabled_bestelling(bes_info); // Wat heb ik zoal aan rechten op deze specifieke reservering
+          	   var bes_disc_info = bes.disc_info(bes_info.dis_key); // alle discipline informatie
           	   if(!this_bes.canChange) {
                   resultcode = 9;
                   resulttekst = "Niet geautoriseerd voor bestelling "+besid;
@@ -129,8 +130,10 @@
                else {
              	   if (nwStatus != null) { // Bij update optioneel
                      // statusdiagram afdwingen:
-                     // * BESFIT alleen vanuit status 2
-                     // * BESREJ alleen vanuit status 2 en 3
+                     // * BESFIT alleen vanuit status 2 als bes_disc_info.disc_params_fiatflow == 0.
+                     //                 vanuit sattus 4 als bes_disc_info.disc_params_fiatflow == 1.
+                     // * BESREJ alleen vanuit status 2 en 3 als bes_disc_info.disc_params_fiatflow == 0.
+                     //                 vanuit status 2 en 4 als bes_disc_info.disc_params_fiatflow == 1.
                      sql = "SELECT bes_bestelling_status"
                          + "  FROM bes_bestelling"
                          + " WHERE bes_bestelling_key="+bestelling_key;
@@ -139,9 +142,12 @@
                         curStatus = oRs("bes_bestelling_status").value;
 
                         // Feitelijke UPDATE status.
-                        // BESFIT: alleen vanuit status 2
+                        // BESFIT: alleen vanuit status 2 als bes_disc_info.disc_params_fiatflow == 0.
+                        //                vanuit sattus 4 als bes_disc_info.disc_params_fiatflow == 1.
                         if (nwStatus == "BESFIT") {
-                           if (curStatus == 2) {
+                           if ((bes_disc_info.disc_params_fiatflow == 0 && curStatus == 2) ||
+                               (bes_disc_info.disc_params_fiatflow == 1 && curStatus == 4))
+                           {
                               bes.setbestellingstatus(bes_bestelling_key, 3);  // Gefiatteerd
                               sql = "SELECT bes_bestelling_status"
                                   + "  FROM bes_bestelling"
@@ -172,9 +178,12 @@
                               resultcode = 305;
                            }
                         }
-                        // BESREJ: alleen vanuit status 2 en 3
+                        // BESREJ: alleen vanuit status 2 en 3 als bes_disc_info.disc_params_fiatflow == 0.
+                        //                vanuit status 2 en 4 als bes_disc_info.disc_params_fiatflow == 1.
                         else if (nwStatus == "BESREJ") {
-                           if (curStatus == 2 || curStatus == 3) {
+                           if ((bes_disc_info.disc_params_fiatflow == 0 && (curStatus == 2 || curStatus == 3)) ||
+                               (bes_disc_info.disc_params_fiatflow == 1 && (curStatus == 2 || curStatus == 4)))
+                           {
                               bes.setbestellingstatus(bes_bestelling_key, 1);  // Afgewezen
                               sql = "SELECT bes_bestelling_status"
                                   + "  FROM bes_bestelling"

APPL/API/api_cntsoap.asp

@@ -108,8 +108,15 @@
                 if (this_cnt.canChange) {
                     // Bepaal de door te voeren wijzigingen.
                     if (van_datum != null) {
+try {
                         var looptijd_van = XMLtoJsDate(van_datum);
                         var looptijd_tot = XMLtoJsDate(tot_datum);
+}
+catch (e)
+{
+    __Log2File(xmlReq.xml, API.APIname + "_IN");
+    Response.End;
+}
                         if (looptijd_van <= looptijd_tot) {
                             fields.push({ dbs: "cnt_contract_looptijd_van", typ: "date",  val: looptijd_van,   track: L("lcl_cnt_date_start") });
                         }

APPL/API/api_flex.asp

@@ -0,0 +1,44 @@
+<%@ language = "JavaScript" %>
+<% /*
+     $Revision$
+     $Id$
+
+     File:          api_flex.asp
+     Description:   API voor opvragen van flexfiles
+
+     Parameters:    Een xml
+     Status:
+     Context:       (alleen) door Putorders
+     Notes:         Zie flexfiles.inc/flexProps2 voor ondersteunde coderingen
+*/
+    JSON_Result = true;
+    THIS_FILE = "appl/api/api_flex.asp";
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="../Shared/flexfiles.inc" -->
+<!-- #include file="../api/api.inc" -->
+<%
+
+var API = new API_func();
+
+// TODO checkAuthorization("WEB_PUOxxx") ?
+
+var flexcode = getQParam("flexcode");
+if (flexcode.match(/^M=CAD/))
+{
+    // <xsl:element name="img">
+    //   <xsl:attribute name="frc">M=CAD&amp;labelPos=2&amp;vKey=<xsl:value-of select="//afspraak/plaats/regio/district/locatie/gebouw/verdieping/key"/>&amp;highlight=<xsl:value-of select="//afspraak/plaats/regio/district/locatie/gebouw/verdieping/ruimte/key"/>&amp;mode=0&amp;discs=981&amp;sizeX=700&amp;sizeY=400&amp;offsetX=10&amp;offsetY=10&amp;scale=950&amp;paperColor=16777215
+    //   </xsl:attribute>
+    // </xsl:element>
+   Server.Transfer(rooturl + "/APPL/CAD/mySlnk2IMG.asp"); // Die kan het ook wel oplossen
+}
+
+// Else gewone flexfiles
+var props = flexProps2(flexcode);
+
+__Log(props);
+
+Response.Write(JSON.stringify(props));
+Response.End;
+%>

APPL/API/api_gen_import.asp

@@ -1,4 +1,5 @@
 <%@ language = "JavaScript" %>
+<%  Server.ScriptTimeout=6000; %>
 <% /*
      $Revision$
      $Id$
@@ -48,8 +49,11 @@
                                               customerId: customerId,
                                               keep_old: 300, // Parallelle import 300 seconden ondersteunen
                                               user_key: user_key,
+                                              stylesheet: API.apidata.stylesheet,
                                               keep_backup: true // mits fac_import_app_folder gezet
                                             });
+    var import_key = res.import_key;
+
     if (res.success)
     {
         var warn = L("lcl_imp_read_lines") + res.read_lines;
@@ -57,7 +61,11 @@
                                                      user_key: user_key });
     }
     else
+    {
         var warn = res.warning;
+        __DoLog("Import (app_key={0}) mislukt: {1}".format(import_app_key, warn), "#ffff00");
+        API.error(warn); // Abort met 500-status
+    }
 
     var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0");
     xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\""));
@@ -69,6 +77,46 @@
     var elementResultText = xmlResp.createTextNode(warn);
     elementResult.appendChild(elementResultText);
     FCLTElement.appendChild(elementResult);
+
+    if (import_key > 0)
+    {
+        var elementDetails = xmlResp.createElement("details");
+        var sql = "SELECT imp_log_status,"
+                + "       imp_log_omschrijving,"
+                + "       imp_log_hint"
+                + "  FROM imp_log"
+                + " WHERE fac_import_key = " + import_key
+                + "   AND imp_log_status <> 'I'";
+        var oRs = Oracle.Execute(sql);
+        while (!oRs.Eof)
+        {
+           var elementDetail = xmlResp.createElement("detail");
+           var elementStatus = xmlResp.createElement("status");
+           var elementStatusText = xmlResp.createTextNode(oRs("imp_log_status").Value);
+           elementStatus.appendChild(elementStatusText);
+           elementDetail.appendChild(elementStatus);
+           if (oRs("imp_log_omschrijving").Value != null )
+           {
+              var elementOms = xmlResp.createElement("omschrijving");
+              var elementOmsText = xmlResp.createTextNode(oRs("imp_log_omschrijving").Value);
+              elementOms.appendChild(elementOmsText);
+              elementDetail.appendChild(elementOms);
+           }
+           if (oRs("imp_log_hint").Value != null )
+           {
+              var elementHint = xmlResp.createElement("hint");
+              var elementHintText = xmlResp.createTextNode(oRs("imp_log_hint").Value);
+              elementHint.appendChild(elementHintText);
+              elementDetail.appendChild(elementHint);
+           }
+           elementDetails.appendChild(elementDetail);
+           oRs.moveNext();
+        }
+        oRs.Close();
+
+        FCLTElement.appendChild(elementDetails);
+    }
+
     xmlResp.appendChild(FCLTElement);
 
     Response.ContentType = "text/xml";

APPL/API/api_hmail.asp

@@ -25,11 +25,13 @@
 
 var API = new API_func();
 
-function abortRejectMail(tekst)
+function abortRejectMail(tekst, maillog)
 {
     var result = { success: false,
-                   message: tekst
+                   message: tekst,
+                   maillog: maillog||tekst
                  }
+    __Log(result.maillog); // komt altijd ook in hmail log
     Response.Write(JSON.stringify(result));
     Response.End;
 }
@@ -60,22 +62,25 @@ if (API.apidata.loglevel)
     __Log2File(xmlReq.xml, API.APIname + "_IN");
 
 var Subject  = XMLval(xmlReq, "subject");
-var fromAddr = XMLval(xmlReq, "from");
+var fromAddr = XMLval(xmlReq, "fromaddr"); // "Returns the address that the sender gave in the MAIL FROM SMTP-command."
+var from     = XMLval(xmlReq, "from");     // "This property returns the content of the From MIME-header of the email."
 var toAddr   = XMLval(xmlReq, "to");
 var htmlBody = XMLval(xmlReq, "htmlbody");
 var Body     = XMLval(xmlReq, "body");
 
-__Log("Subject: " + Subject);
-__Log("From: " + fromAddr);
-__Log("To: " + toAddr);
+__Log("Subject: "  + Subject);
+__Log("From: "     + fromAddr);
+__Log("FromAddr: " + from);
+__Log("To: "       + toAddr);
 __Log("htmlBody: " + htmlBody);
-__Log("body: " + Body);
+__Log("body: "     + Body);
 
 var mailuser = toAddr.split("@")[0];
 
 sql = "SELECT fac_email_setting_action,"
     + "       fac_email_setting_expire,"
     + "       fac_email_setting_from,"
+    + "       fac_email_setting_frommode,"
     + "       fac_email_setting_attachpath"
     + "  FROM fac_email_setting"
     + " WHERE upper(fac_email_setting_user) = upper("+safe.quoted_sql(mailuser)+")";
@@ -83,8 +88,7 @@ sql = "SELECT fac_email_setting_action,"
 var oRs = Oracle.Execute(sql);
 if (oRs.Eof)
 {
-    __Log("E-mail user niet ontvankelijk: " + mailuser);
-    abortRejectMail("Database-fout");
+    abortRejectMail(L("lcl_fac_hmail_unknown_user"), "E-mail user niet ontvankelijk: " + mailuser);
 }
 __Log("E-mail user ontvankelijk: " + mailuser);
 if (oRs("fac_email_setting_expire").Value != null)
@@ -92,21 +96,27 @@ if (oRs("fac_email_setting_expire").Value != null)
     var expire = new Date(oRs("fac_email_setting_expire").Value);
     if (expire.getTime() < (new Date).getTime())
     {
-        __Log("Te laat: " + expire);
-        abortRejectMail("Te laat");
+        abortRejectMail(L("lcl_fac_hmail_expired"), "Te laat, moest voor: " + expire);
     }
 }
+var theFrom = fromAddr; // SMTP communicatie, werkt matig bij forwards
+if (oRs("fac_email_setting_frommode").Value == 1)
+    theFrom = from; // uit email MIME-header
+
 var shouldFrom = oRs("fac_email_setting_from").Value;
 if (shouldFrom)
 {
-    if (String(shouldFrom).toUpperCase() != String(fromAddr).toUpperCase())
+    if (String(shouldFrom).toUpperCase() != String(theFrom).toUpperCase())
     {
-        __Log("Foute afzender. Verwacht: " + shouldFrom + ", kreeg: " + fromAddr);
-        abortRejectMail("Foute afzender");
+        abortRejectMail(L("lcl_fac_hmail_wrong_sender"), "Foute afzender. Verwacht: " + shouldFrom + ", kreeg: " + theFrom);
     }
 }
 var action = oRs("fac_email_setting_action").Value; // Package aanroep
 var path = oRs("fac_email_setting_attachpath").Value;
+if (path && path.substr(0, 1) == "*") // Bijvoorbeeld '*flexfilespath' or '*fg_dwf_path_concept'
+{
+    path = S(path.substr(1)) + "/";
+}
 oRs.Close();
 
 var result = { success: true, path: path, attachments: [] };
@@ -120,23 +130,21 @@ if (action) // Bijv "fac.processemail" of "uwva.closeorder-sample"
 {
     if (!Body || Body == "") // Voorkeur voor plaintekst
     {
-        var v_body = "Mail body is leeg. HTML inhoud:\n" + stripHtml(htmlBody);
+        var v_body = L("lcl_fac_hmail_empty_body") + stripHtml(htmlBody);
     }
     else
     {
         var v_body = Body;
     }
-    sql = "BEGIN " + action + " (" + safe.quoted_sql(fromAddr)    + ","
+    sql = "BEGIN " + action + " (" + safe.quoted_sql(theFrom)     + ","
                                    + safe.quoted_sql(toAddr)      + ","
-                                   + safe.quoted_sql(Subject || "<geen onderwerp>")  + "," // de actions kunnen slecht tegen lege subject
+                                   + safe.quoted_sql(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(psession_id) + ","
                                    + user_key + ");"
         + "END;";
     Oracle.Execute(sql);
-    // TODO: Is er ook een resultaat om terug te melden? Melding-key bijvoorbeeld?
 
-    // TODO: Dit is niet multi-mail-safe
     sql = "SELECT fac_result_waarde"
         + "  FROM fac_result"
         + " WHERE fac_result_naam = 'errormsg'"
@@ -144,7 +152,6 @@ if (action) // Bijv "fac.processemail" of "uwva.closeorder-sample"
     var oRs = Oracle.Execute(sql);
     if (!oRs.Eof)
     {
-        __Log(oRs("fac_result_waarde").Value);
         abortRejectMail(oRs("fac_result_waarde").Value);
     }
     oRs.Close();
@@ -159,7 +166,26 @@ if (action) // Bijv "fac.processemail" of "uwva.closeorder-sample"
        result.path = result.path + oRs("fac_result_waarde").Value;
     }
     oRs.Close();
+
+    // Nog iets specifieks terug te melden voor de logging?
+    sql = "SELECT fac_result_waarde"
+        + "  FROM fac_result"
+        + " WHERE fac_result_naam = 'maillog'"
+        + "   AND fac_result_sessionid = " + safe.quoted_sql(psession_id);
+    var oRs = Oracle.Execute(sql);
+    if (!oRs.Eof)
+    {
+       result.maillog = oRs("fac_result_waarde").Value;
+    }
+    else
+       result.maillog = "E-mail afgehandeld via: " + action;
+    oRs.Close();
 }
+else
+    result.maillog = "Verder geen e-mail action gedefinieerd";
+
+__Log(result.maillog);
+
 // opruimen
 var sql = "DELETE fac_result WHERE fac_result_sessionid = " + safe.quoted_sql(psession_id);
 Oracle.Execute(sql);
@@ -182,7 +208,7 @@ if (result.path)
        else if (!new RegExp(S("flexallowedext"), "ig").test(safefilename))
        {
          // TODO: Misschien ook terugkoppelen aan zender?
-         __DoLog("Onbekende extensie e-mail bijlage: {0} ({1} bytes). Bestand is niet opgeslagen.".format(safefilename, attsize));
+         __DoLog("Onbekende extensie e-mail bijlage: {0} ({1} bytes) van {2}. Bestand is niet opgeslagen.".format(safefilename, attsize, theFrom));
        }
        else
        {
@@ -193,8 +219,6 @@ if (result.path)
                                  })
        }
     }
-    // TODO: Is er ook een resultaat om terug te melden? 'Geslaagd' bijvoorbeeld?
-    // Of: adm_tracking: fromAddr + ' stuurt per e-mail ' + oMessage.Attachments.Item(i).fileName
 }
 
 Response.Write(JSON.stringify(result));

APPL/API/api_inssoap.asp

@@ -209,6 +209,7 @@
 
                             // Object is ingenomen
                             shared.trackaction("INSINN", deel_key, L("lcl_obj_is_ingenomen"));
+                            shared.trackaction("INSIN2", deel_key, L("lcl_obj_is_ingenomen2").format(deel_oms));
                         }
                         break;
                     default:

APPL/API/api_mldsoap.asp

@@ -5,7 +5,7 @@
 
      File:              api_mld_soap.asp
      Description:       API voor mld-soap berichten
-                        Interpreteert melding-bericht zodanig dat een melding wordt
+                        Interpreteert melding-bericht zodanig dat een melding  wordt
                         aangemaakt.
 
      Parameters:        Een xml
@@ -17,6 +17,7 @@
     THIS_FILE = "appl/api/api_mldsoap.asp";
 %>
 <!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/kenmerk_common.inc" -->
 <!-- #include file="../Shared/xml_converter.inc" -->
 <!-- #include file="../Shared/save2db.inc" -->
 <!-- #include file="../Shared/flexfiles.inc" -->
@@ -38,6 +39,7 @@ var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
 if (API.apidata.stylesheet)
 {
     var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0");
+    iXsl.resolveExternals = true; // XSL kan includes hebben
     if( ! iXsl.load(Server.MapPath(API.apidata.stylesheet)) )
     {
         API.error("Could not load XSL " + API.apidata.stylesheet + "\n" + iXsl.parseError.reason);
@@ -85,6 +87,8 @@ var detected ="?";
 var meldingen = xmlReq.getElementsByTagName("melding");
 for (i = 0; i < meldingen.length; i++)
 {
+  resultcode = -1;
+  resulttekst = "";
   // Lees per node de (optionele) tags en waarden.
   var fields = []; // Bij te werken velden.
   var ext_id        = meldingen[i].getAttribute("key");
@@ -96,282 +100,367 @@ for (i = 0; i < meldingen.length; i++)
   var stdmld_sla    = -1;   // Normale uitvoertijd (prio door melder nog unsupported)
   //var meldprio      = XMLval(meldingen[i], "prioriteit");               // Unsupported yet
   //var meldobj_id    = XMLval(meldingen[i], "object");                   // Unsupported yet
+  var voor_email    = XMLval(meldingen[i], "voor_email"); // NEW
+  var voor_login    = XMLval(meldingen[i], "voor_login"); // NEW
   var meldloc       = XMLval(meldingen[i], "locatiecode");
   var meldgeb       = XMLval(meldingen[i], "gebouwcode");
   var meldver       = XMLval(meldingen[i], "verdiepingcode");
   var meldrnr       = XMLval(meldingen[i], "ruimtecode");
   var locatie_key   = -1;   // Bepaald op basis van meldloc
   var plaats_key    = -1;   // Bepaald op basis van meldgeb/meldver/meldrnr
+  var meld_kpn      = XMLval(meldingen[i], "kostenplaats");
   var meld_oms      = XMLval(meldingen[i], "omschrijving");
+  var meld_opm      = XMLval(meldingen[i], "opmerking");
+
   //var mldkenmerken  = (meldingen[i].getElementsByTagName("kenmerk"))[0].childNodes[0].nodeValue; // Unsupported yet
   var mldkenmerken  = meldingen[i].getElementsByTagName("kenmerk");
   var mld_key       = -1;   // Bepaald na insert
 
   user.checkAutorisation("WEB_MLDUSE"); // Dit is nog ongeacht de melding
 
+  if (meldaction == "unknown")
+  {
+     // Kijk of er een melding bestaat met dit externe nummer.
+     // Ben je bang dat het nummer vaker voorkomt dan kun je deze prefixen in de xsl
+     tsql = "SELECT MIN(mld_melding_key) mld_melding_key, COUNT(*) aantal"
+            + "  FROM mld_melding"
+            + " WHERE mld_melding_externnr ="+ safe.quoted_sql(ext_id);
+     var oRs = Oracle.Execute(tsql);
+     if (oRs("aantal").value == 1)
+     {
+        mld_key = oRs("mld_melding_key").value;
+        meldaction = "update";
+     }
+     else
+     {
+        meldaction = "insert";
+     }
+  }
+  else if (meldaction == "update")
+  {
+     // Kijk of er een melding bestaat met dit externe nummer.
+     // Ben je bang dat het nummer vaker voorkomt dan kun je deze prefixen in de xsl
+     tsql = "SELECT MIN(mld_melding_key) mld_melding_key, COUNT(*) aantal"
+            + "  FROM mld_melding"
+            + " WHERE mld_melding_externnr ="+ safe.quoted_sql(ext_id);
+     var oRs = Oracle.Execute(tsql);
+     if (oRs("aantal").value == 1)
+     {
+        mld_key = oRs("mld_melding_key").value;
+     }
+  }
+
   if (ext_id == null)
   {
     resultcode = 1;
     resulttekst = "Undefined external ID (key)";
   }
-  else if (meldaction != 'insert')
+  else if (meldaction != "insert" && meldaction != "update")
   {
     resultcode = 2;
     resulttekst = "Undefined operation (type)";
   }
   else
   {
-    tsql = "SELECT sm.mld_stdmelding_t_uitvoertijd.tijdsduur tijdsduur"
-         + "     , sm.mld_stdmelding_t_uitvoertijd.eenheid eenheid"
-         + "  FROM mld_stdmelding sm"
-         + " WHERE sm.mld_stdmelding_key = " + stdmld_key
-         + "   AND sm.mld_stdmelding_verwijder IS NULL";
-    var oRs = Oracle.Execute(tsql);
-    if (oRs.eof)
+    // voor zowel insert als update:
+
+    var voor_key = -1;
+    var perslid_key = -1;
+    if (voor_login != null)
     {
-      resultcode = 3;
-      resulttekst = "Undefined stdmelding";
-    }
-    else
-    { // Hier heb ik een geldige mld_stdmelding_key.
-      stdmld_sla_tijdsduur = oRs("tijdsduur").value;
-      stdmld_sla_eenheid = oRs("eenheid").value;
-
-      fields.push({ dbs: "mld_stdmelding_key", typ: "key", val: stdmld_key });
-      fields.push({ dbs: "mld_melding_t_uitvoertijd.tijdsduur", typ: "number",  val: stdmld_sla_tijdsduur, obj: "MLD_T_UITVOERTIJD" });
-      fields.push({ dbs: "mld_melding_t_uitvoertijd.eenheid",   typ: "varchar", val: stdmld_sla_eenheid,   obj: "MLD_T_UITVOERTIJD" });
-      if (melddatum != null)
-      {
-        try
-        {
-          var meldaanmaakdate = XMLtoJsDate(melddatum);
-          fields.push({ dbs: "mld_melding_datum", typ: "datetime", val: meldaanmaakdate });
-        }
-        catch (e)
-        { // Verkeerde datum-formaat, volgens spec. dan now gebruiken!
-          __DoLog("Formaat ontvangen XML-datum incorrect: "+ melddatum, "#00FF00");
-          meldaanmaakdate = now;
-          fields.push({ dbs: "mld_melding_datum", typ: "datetime", val: meldaanmaakdate });
-        }
-      }
-      else
-      {
-        fields.push({ dbs: "mld_melding_datum", typ: "datetime", val: now });
-      }
-      // De einddatum is de meegegeven einddatum, maar als die niet wordt meegegeven is het
-      // gewoon enddate_std en dat regelt de trigger wel, dus DAN MOET IK HEM NIET MEEGEVEN
-      if (einddatum != null)
-      {
-        try
-        {
-          var meldeinddate = XMLtoJsDate(einddatum);
-          if (meldeinddate > meldaanmaakdate)
-          {
-            fields.push({ dbs: "mld_melding_einddatum", typ: "datetime", val: meldeinddate });
-          }
-          else
-          {
-            // Ontvangen XML-einddatum voor begindatum, dan later volgens SLA zetten!
-            __DoLog("Ontvangen XML-einddatum voor begindatum: "+ einddatum, "#00FF00");
-          }
-        }
-        catch (e)
-        {
-          // Verkeerde datum-formaat, dan later volgens SLA zetten!
-          __DoLog("Formaat ontvangen XML-einddatum incorrect: "+ einddatum, "#00FF00");
-        }
-      }
-
-      tsql = "SELECT alg_locatie_key  "
-          + " FROM alg_v_aanweziglocatie"
-          + " WHERE alg_locatie_code="+ safe.quoted_sql(meldloc);
+      // Zoek de voorkey op aan de hand van het emailadres
+      tsql = "SELECT prs_perslid_key "
+           + "  FROM prs_v_aanwezigperslid "
+           + " WHERE prs_perslid_oslogin = UPPER(" + safe.quoted_sql(voor_login) + ")";
       var oRs = Oracle.Execute(tsql);
       if (!oRs.eof)
       {
-        locatie_key = oRs("alg_locatie_key").value;
-        fields.push({ dbs: "mld_alg_locatie_key", typ: "key", val: locatie_key });
+         voor_key = oRs("prs_perslid_key").value;
+      }
+    }
+    if (voor_email != null && voor_key == -1)
+    {
+      // Zoek de voorkey op aan de hand van het emailadres
+      tsql = "SELECT prs_perslid_key "
+           + "  FROM prs_v_aanwezigperslid "
+           + " WHERE UPPER(prs_perslid_email) = UPPER(" + safe.quoted_sql(voor_email) + ")";
+      var oRs = Oracle.Execute(tsql);
+      if (!oRs.eof)
+      {
+         voor_key = oRs("prs_perslid_key").value;
+      }
+    }
+    if (voor_key == -1)
+    {
+      voor_key = user_key;
+      perslid_key = user_key;
+    }
+    else
+    {
+       if (S("mld_allow_for_others") == 1)
+       {
+          perslid_key = user_key;
+       }
+       else
+       {
+          perslid_key = voor_key;
+       }
+    }
+    // einde gezamelijke data (insert && update)
+    if (meldaction == "update")
+    {
+      if (mld_key == -1)
+      {
+          resultcode = 4;
+          resulttekst = "Undefined melding_key";
+      }
+      else
+      {
 
-        tsql = "SELECT alg_gebouw_key  "
-            + " FROM alg_v_aanweziggebouw"
-            + " WHERE alg_locatie_key ="+ locatie_key
-            + " AND alg_gebouw_code="+ safe.quoted_sql(meldgeb);
+        if (einddatum != null)
+        {
+          var mld_datum;
+          tsql = "SELECT mld_melding_datum"
+               + "     , mld_stdmelding_key"
+               + "  FROM mld_melding"
+               + " WHERE mld_melding_key = " + mld_key;
+          oRs = Oracle.Execute(tsql);
+          if (!oRs.EOF)
+          {
+            mld_datum = oRs("mld_melding_datum").value;
+            stdmld_key = oRs("mld_stdmelding_key").value; // overwrite de xml-node
+          }
+          oRs.Close();
+
+          try
+          {
+            var meldeinddate = XMLtoJsDate(einddatum);
+            if (meldeinddate > mld_datum)
+            {
+              fields.push({ dbs: "mld_melding_einddatum", typ: "datetime", val: meldeinddate, track: L("lcl_mld_enddate") });
+            }
+            else
+            {
+              // Ontvangen XML-einddatum voor begindatum, dan later volgens SLA zetten!
+              __DoLog("Ontvangen XML-einddatum voor begindatum: "+ einddatum, "#00FF00");
+            }
+          }
+          catch (e)
+          {
+            // Verkeerde datum-formaat, dan later volgens SLA zetten!
+            __DoLog("Formaat ontvangen XML-einddatum incorrect: "+ einddatum, "#00FF00");
+          }
+        }
+
+        if (meld_kpn && meld_kpn != "")
+        {
+          var kpn_key = getKpn(meld_kpn);
+          if (kpn_key != -1)
+            fields.push({ dbs: "prs_kostenplaats_key", typ: "key", val: kpn_key, track: L("lcl_mld_inf_Kostenplaats"), foreign: "prs_kostenplaats"});
+        }
+
+        if (meld_opm)
+          fields.push({ dbs: "mld_melding_opmerking",     typ: "varchar",   val: meld_opm,     track: L("lcl_mld_inf_Opmerking"),     len: 4000 });
+
+        if (meld_oms)
+          fields.push({ dbs: "mld_melding_omschrijving",  typ: "varchar",   val: meld_oms,     track: L("lcl_mld_inf_Omschrijving"),  len: 4000 });
+
+        if (fields.length>0)
+        {
+            var mldUpd = buildTrackingUpdate("mld_melding", "mld_melding_key = " + mld_key, fields, { noValidateToken: true });
+            Oracle.Execute(mldUpd.sql);
+            mld.trackmeldingupdate(mld_key, L("lcl_mld_is_updatedbysoap").format(mld_key) + "\n" + mldUpd.trackarray.join("\n"));
+        }
+
+        // De kenmerken.
+        upsertKenmerk(mldkenmerken, stdmld_key, mld_key);
+      }
+      resultcode = 0; // Ik heb gedaan wat ik moest en mocht doen voor deze melding.
+    } // 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)
+      {
+        resultcode = 3;
+        resulttekst = "Undefined stdmelding";
+      }
+      else
+      { // vanaf hier heb ik een geldige stdmld_key
+
+        var stdm_info = mld.mld_stdmeldinginfo(stdmld_key);
+
+        var stdmld_sla_tijdsduur = stdm_info.prioriteiten[3].uitvoertijd;
+        var stdmld_sla_eenheid = stdm_info.prioriteiten[3].eenheid;
+        var stdmld_niveau = stdm_info.alg_onrgoed_niveau; // required niveau
+        var alglevel_ok = !stdm_info.ins_srtdiscipline_alg || !stdmld_niveau; // Zonder niveau altijd goed
+
+        fields.push({ dbs: "mld_stdmelding_key", typ: "key", val: stdmld_key });
+        fields.push({ dbs: "mld_melding_t_uitvoertijd.tijdsduur", typ: "number",  val: stdmld_sla_tijdsduur, obj: "MLD_T_UITVOERTIJD" });
+        fields.push({ dbs: "mld_melding_t_uitvoertijd.eenheid",   typ: "varchar", val: stdmld_sla_eenheid,   obj: "MLD_T_UITVOERTIJD" });
+        if (melddatum != null)
+        {
+          try
+          {
+            var meldaanmaakdate = XMLtoJsDate(melddatum);
+            fields.push({ dbs: "mld_melding_datum", typ: "datetime", val: meldaanmaakdate });
+          }
+          catch (e)
+          { // Verkeerde datum-formaat, volgens spec. dan now gebruiken!
+            __DoLog("Formaat ontvangen XML-datum incorrect: "+ melddatum, "#00FF00");
+            meldaanmaakdate = now;
+            fields.push({ dbs: "mld_melding_datum", typ: "datetime", val: meldaanmaakdate });
+          }
+        }
+        else
+        {
+          fields.push({ dbs: "mld_melding_datum", typ: "datetime", val: now });
+        }
+        // De einddatum is de meegegeven einddatum, maar als die niet wordt meegegeven is het
+        // gewoon enddate_std en dat regelt de trigger wel, dus DAN MOET IK HEM NIET MEEGEVEN
+        if (einddatum != null)
+        {
+          try
+          {
+            var meldeinddate = XMLtoJsDate(einddatum);
+            if (meldeinddate > meldaanmaakdate)
+            {
+              fields.push({ dbs: "mld_melding_einddatum", typ: "datetime", val: meldeinddate });
+            }
+            else
+            {
+              // Ontvangen XML-einddatum voor begindatum, dan later volgens SLA zetten!
+              __DoLog("Ontvangen XML-einddatum voor begindatum: "+ einddatum, "#00FF00");
+            }
+          }
+          catch (e)
+          {
+            // Verkeerde datum-formaat, dan later volgens SLA zetten!
+            __DoLog("Formaat ontvangen XML-einddatum incorrect: "+ einddatum, "#00FF00");
+          }
+        }
+
+        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)
         {
-          plaats_key = oRs("alg_gebouw_key").value;
+          alglevel_ok = alglevel_ok || stdmld_niveau == "L";
+          locatie_key = oRs("alg_locatie_key").value;
+          fields.push({ dbs: "mld_alg_locatie_key", typ: "key", val: locatie_key });
 
-          tsql = "SELECT alg_verdieping_key  "
-              + " FROM alg_v_aanwezigverdieping"
-              + " WHERE alg_gebouw_key ="+ plaats_key
-              + " AND alg_verdieping_code="+ safe.quoted_sql(meldver);
+          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)
           {
-            plaats_key = oRs("alg_verdieping_key").value;
+            alglevel_ok = alglevel_ok || stdmld_niveau == "G";
+            plaats_key = oRs("alg_gebouw_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);
+            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) {
-                plaats_key = oRs("alg_ruimte_key").value;
-            }
-          }
-        }
-
-        if (plaats_key != -1)
-        {
-          fields.push({ dbs: "mld_alg_onroerendgoed_keys", typ: "key", val: plaats_key });
-        }
-      }
-
-      fields = fields.concat(
-                      [ { dbs: "mld_melding_key",            typ: "key",     seq: "mld_s_mld_melding_key" },
-                        { 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: "prs_kostenplaats_key",       typ: "key",     val: user.afdeling().prs_kostenplaats_key() },
-                        { dbs: "prs_perslid_key",            typ: "key",     val: user_key },
-                        { dbs: "prs_perslid_key_voor",       typ: "key",     val: user_key },
-                        { dbs: "mld_melding_spoed",          typ: "key",     val: 3 }, // default (frontend) = 3
-                        { dbs: "mld_melding_externnr",       typ: "varchar", val: ext_id, len: 30 }
-                      ]);
-
-      // We weten wat te inserten, nu nog uitvoeren; rechten voldoende afgedekt via MLDUSE-check hierboven?
-
-      if (resultcode == -1)
-      {  // nog steeds geen fouten
-        var mldIns = buildInsert("mld_melding", fields, { noValidateToken: true });
-        mld_key = mldIns.sequences["mld_melding_key"];
-
-        sql = mldIns.sql;
-        oRs = Oracle.Execute(sql);
-
-        // Zetten van de status op ingevoerd en afhandelen van de tracking.
-        mld.setmeldingstatus(mld_key, 2); // Zorgt ook voor tracking & daarmee notificatie.
-
-        // Eventuele (gewijzigde) objecten zijn nu ook opgeslagen. Nu kan de definitieve mld_melding.mld_melding_einddatum_std bepaald en gezet worden.
-        //mld.updatestdeinddatum(mld_key); // Unsupported yet. So update of mld_melding_einddatum_std not needed yet.
-
-        // De kenmerken.
-        for (j=0; j < mldkenmerken.length; j++)
-        {
-          var kenmerk_naam = mldkenmerken[j].getAttribute("naam");
-          if (mldkenmerken[j].childNodes.length > 0)
-            var kenmerk_waarde = mldkenmerken[j].childNodes[0].nodeValue;
-          else
-            var kenmerk_waarde = "";
-          //Response.Write(kenmerk_naam);
-          //Response.Write(kenmerk_waarde);
-          // Zoek het kenmerk op naam terug
-          ksql = "SELECT k.mld_kenmerk_key, sk.mld_srtkenmerk_kenmerktype, sk.mld_srtkenmerk_lengte "
-               + "  FROM mld_kenmerk k"
-               + "     , mld_srtkenmerk sk"
-               + "     , mld_stdmelding s"
-               + "     , mld_discipline d"
-               + " WHERE s.mld_ins_discipline_key = d.ins_discipline_key"
-               + "   AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key "
-               + "   AND k.mld_kenmerk_verwijder IS NULL "
-               + "   AND sk.mld_srtkenmerk_upper = " + safe.quoted_sql_upper(kenmerk_naam)
-               + "   AND s.mld_ins_discipline_key = d.ins_discipline_key"
-               + "   AND s.mld_stdmelding_key = " + stdmld_key
-               + "   AND ((k.mld_stdmelding_key = s.mld_stdmelding_key     AND k.mld_kenmerk_niveau = 'S')"
-               + "     OR (k.mld_stdmelding_key = s.mld_ins_discipline_key AND k.mld_kenmerk_niveau = 'D')"
-               + "     OR (k.mld_stdmelding_key = d.ins_srtdiscipline_key  AND k.mld_kenmerk_niveau = 'T'))";
-
-          var oRs = Oracle.Execute(ksql);
-
-          if (!oRs.eof)
-          {
-            var kenmerk_key = oRs("mld_kenmerk_key").value;
-            var kenmerk_type = oRs("mld_srtkenmerk_kenmerktype").value;
-            var kenmerk_lengte = oRs("mld_srtkenmerk_lengte").value;
-
-            ksql = "SELECT km.mld_kenmerkmelding_key "
-                 + "  FROM mld_kenmerkmelding km "
-                 + " WHERE km.mld_melding_key =  " + mld_key
-                 + "   AND km.mld_kenmerk_key = " + kenmerk_key;
-            var oRs = Oracle.Execute(ksql);
-
-            switch (kenmerk_type)
+            if (!oRs.eof)
             {
-              case 'C':
-              {
-                // we ondersteunen alleen nog maar karakter velden.
-                if (!oRs.eof)
-                {
-                  var kenmerkmelding_key = oRs("mld_kenmerkmelding_key").value;
-                  ksql = "UPDATE mld_kenmerkmelding"
-                       + "   SET mld_kenmerkmelding_waarde = " + safe.quoted_sql(kenmerk_waarde)
-                       + " WHERE mld_kenmerkmelding_key = " + kenmerkmelding_key;
-                }
-                else
-                {
-                  ksql = "INSERT INTO mld_kenmerkmelding (mld_kenmerk_key, mld_melding_key, mld_kenmerkmelding_waarde) "
-                       + "VALUES (" + kenmerk_key + ", " + mld_key + ", " + safe.quoted_sql(kenmerk_waarde) + ")";
-                }
-                Oracle.Execute(ksql);
-                break;
-              }
-              case 'N':
-              {
-                // we ondersteunen alleen nog maar karakter velden.
-                if (!oRs.eof)
-                {
-                  var kenmerkmelding_key = oRs("mld_kenmerkmelding_key").value;
-                  ksql = "UPDATE mld_kenmerkmelding"
-                       + "   SET mld_kenmerkmelding_waarde = " + safe.quoted_sql(kenmerk_waarde)
-                       + " WHERE mld_kenmerkmelding_key = " + kenmerkmelding_key;
-                }
-                else
-                {
-                  ksql = "INSERT INTO mld_kenmerkmelding (mld_kenmerk_key, mld_melding_key, mld_kenmerkmelding_waarde) "
-                       + "VALUES (" + kenmerk_key + ", " + mld_key + ", " + safe.quoted_sql(kenmerk_waarde) + ")";
-                }
-                Oracle.Execute(ksql);
-                break;
-              }
-              case "M": // Folder met bijlagen
-              {
-                //Response.Write(kenmerk_naam);
-                var bijlagen = mldkenmerken[j].getElementsByTagName("bijlage");
-                var bi;
-                for (bi = 0; bi < bijlagen.length; bi++)
-                {
-                  var Attachment = XMLval(bijlagen[bi], "attachment");
-                  var Name = XMLval(bijlagen[bi], "name");
-                  var Size = XMLval(bijlagen[bi], "size");
-                  //Response.Write("Name: " + Name + " size: " + Size);
-                  if (Attachment && Name && Size)
-                  {
-                    var SafeName = safe.filename(Name);
-                    var params = flexProps("MLD", mld_key, String(kenmerk_key), "M");
-                    if (!params.isAllowedName(SafeName))
-                    {
-                      __DoLog("Unsafe SOAP file '{0}' ignored.".format(SafeName), "#FFFF00");
-                    }
-                    else
-                    {
-                      __Log("Start saving: " + params.AttachPath + SafeName);
-                      CreateFullPath(params.AttachPath);
-                      encodedString2File(params.AttachPath + SafeName, Attachment, "bin.hex");
-                      __Log("Done saving: " + params.AttachPath + SafeName);
-                                                   }
-                  }
-                }
+              alglevel_ok = alglevel_ok || stdmld_niveau == "V";
+              plaats_key = oRs("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) {
+                  alglevel_ok = alglevel_ok || stdmld_niveau == "R";
+                  plaats_key = oRs("alg_ruimte_key").value;
               }
             }
-            oRs.Close();
+          }
+
+          if (plaats_key != -1)
+          {
+            fields.push({ dbs: "mld_alg_onroerendgoed_keys", typ: "key", val: plaats_key });
           }
         }
+        if (!alglevel_ok)
+        {
+          resultcode = 5;
+          resulttekst = "Location not found";
+          __DoLog(resulttekst, "#00FF00");
+        }
 
-        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?
-      }
-    } // end geldige stdmld_key
+        var kpn_key = user.afdeling().prs_kostenplaats_key();
+        if (meld_kpn && meld_kpn != "")
+        {
+          var tempKpn = getKpn(meld_kpn);
+          if (tempKpn != -1)
+            kpn_key = tempKpn;
+        }
+
+        fields = fields.concat(
+                        [ { dbs: "mld_melding_key",            typ: "key",     seq: "mld_s_mld_melding_key" },
+                          { 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: "prs_kostenplaats_key",       typ: "key",     val: kpn_key },
+                          { dbs: "prs_perslid_key",            typ: "key",     val: perslid_key },
+                          { dbs: "prs_perslid_key_voor",       typ: "key",     val: voor_key },
+                          { dbs: "mld_melding_spoed",          typ: "key",     val: 3 }, // default (frontend) = 3
+                          { dbs: "mld_melding_externnr",       typ: "varchar", val: ext_id, len: 30 }
+                        ]);
+
+        // We weten wat te inserten, nu nog uitvoeren; rechten voldoende afgedekt via MLDUSE-check hierboven?
+
+        if (resultcode == -1)
+        {  // nog steeds geen fouten
+          var mldIns = buildInsert("mld_melding", fields, { noValidateToken: true });
+          mld_key = mldIns.sequences["mld_melding_key"];
+
+          sql = mldIns.sql;
+          oRs = Oracle.Execute(sql);
+
+          // Zetten van de status op ingevoerd en afhandelen van de tracking.
+          mld.setmeldingstatus(mld_key, 2); // Zorgt ook voor tracking & daarmee notificatie.
+
+          // Eventuele (gewijzigde) objecten zijn nu ook opgeslagen. Nu kan de definitieve mld_melding.mld_melding_einddatum_std bepaald en gezet worden.
+          //mld.updatestdeinddatum(mld_key); // Unsupported yet. So update of mld_melding_einddatum_std not needed yet.
+
+          // De kenmerken.
+          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?
+
+          // Klantspecifieke check functie (hookfunction) voor de invoer
+          var pResult = new HookResult();
+          if (!custfunc.mld_postsave(mld_key, pResult))
+          {
+             __DoLog(pResult.errmsg, "#00FF00");
+          }
+          // De hookfunctie kan de stdmelding aanpassen.
+          if (pResult.stdmld_key)
+          {
+             // check de paden van de flexfiles als de stdmeldingkey aangepast is
+             mld.keepFlexDocuments(mld_key, stdmld_key, pResult.stdmld_key);
+          }
+        }
+      } // end geldige stdmld_key
+    } // end insert
   } // end geldige ext_id
 
+  if (resultcode > 0)
+    __DoLog("api_mldsoap fail.\nResultcode: {0}\nReturntekst: {1}".format(resultcode, resulttekst), "#00FF00");
+
   var binfo = {returncode: resultcode,
                returntekst: resulttekst,
                // executed:sql,   // debug
@@ -393,6 +482,134 @@ for (i = 0; i < meldingen.length; i++)
 } // end for
 // Alle melding-nodes zijn behandeld.
 
+function getKpn(meld_kpn)
+{
+  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;
+
+  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)
+    return oRs("prs_kostenplaats_key").Value;
+  oRs.Close();
+  return -1;
+}
+
+function upsertKenmerk(kenmerken, stdmld_key, mld_key)
+{
+  for (j=0; j < kenmerken.length; j++)
+  {
+    var kenmerk_naam = kenmerken[j].getAttribute("naam");
+    if (kenmerken[j].childNodes.length > 0)
+      var kenmerk_waarde = kenmerken[j].childNodes[0].nodeValue;
+    else
+      var kenmerk_waarde = "";
+
+    // Zoek het kenmerk op naam terug
+    ksql = "SELECT k.mld_kenmerk_key, sk.mld_srtkenmerk_kenmerktype, sk.mld_srtkenmerk_lengte "
+         + "  FROM mld_kenmerk k"
+         + "     , mld_srtkenmerk sk"
+         + "     , mld_stdmelding s"
+         + "     , mld_discipline d"
+         + " WHERE s.mld_ins_discipline_key = d.ins_discipline_key"
+         + "   AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key "
+         + "   AND k.mld_kenmerk_verwijder IS NULL "
+         + "   AND sk.mld_srtkenmerk_upper = " + safe.quoted_sql_upper(kenmerk_naam)
+         + "   AND s.mld_ins_discipline_key = d.ins_discipline_key"
+         + "   AND s.mld_stdmelding_key = " + stdmld_key
+         + "   AND ((k.mld_stdmelding_key = s.mld_stdmelding_key     AND k.mld_kenmerk_niveau = 'S')"
+         + "     OR (k.mld_stdmelding_key = s.mld_ins_discipline_key AND k.mld_kenmerk_niveau = 'D')"
+         + "     OR (k.mld_stdmelding_key = d.ins_srtdiscipline_key  AND k.mld_kenmerk_niveau = 'T'))";
+
+    var oRs = Oracle.Execute(ksql);
+
+    if (!oRs.eof)
+    {
+      var kenmerk_key = oRs("mld_kenmerk_key").value;
+      var kenmerk_type = oRs("mld_srtkenmerk_kenmerktype").value;
+      // var kenmerk_lengte = oRs("mld_srtkenmerk_lengte").value; // unsupported yet?
+
+      var temp_sql = "SELECT km.mld_kenmerkmelding_key "
+                   + "  FROM mld_kenmerkmelding km "
+                   + " WHERE km.mld_melding_key =  " + mld_key
+                   + "   AND km.mld_kenmerk_key = " + kenmerk_key;
+      var oRs = Oracle.Execute(temp_sql);
+
+      switch (kenmerk_type)
+      {
+        case 'C':
+        case 'X':
+        case 'N':
+        {
+          // we ondersteunen alleen nog maar karakter velden.
+          if (!oRs.eof)
+          {
+            var kenmerkmelding_key = oRs("mld_kenmerkmelding_key").value;
+            ksql = "UPDATE mld_kenmerkmelding"
+                 + "   SET mld_kenmerkmelding_waarde = " + safe.quoted_sql(kenmerk_waarde)
+                 + " WHERE mld_kenmerkmelding_key = " + kenmerkmelding_key;
+          }
+          else
+          {
+            ksql = "INSERT INTO mld_kenmerkmelding (mld_kenmerk_key, mld_melding_key, mld_kenmerkmelding_waarde) "
+                 + "VALUES (" + kenmerk_key + ", " + mld_key + ", " + safe.quoted_sql(kenmerk_waarde) + ")";
+          }
+          Oracle.Execute(ksql);
+          break;
+        }
+        case "M": // Folder met bijlagen
+        {
+          //Response.Write(kenmerk_naam);
+          var bijlagen = kenmerken[j].getElementsByTagName("bijlage");
+          var bi;
+          for (bi = 0; bi < bijlagen.length; bi++)
+          {
+            var Attachment = XMLval(bijlagen[bi], "attachment");
+            var Name = XMLval(bijlagen[bi], "name");
+            var Size = XMLval(bijlagen[bi], "size");
+            //Response.Write("Name: " + Name + " size: " + Size);
+            if (Attachment && Name && Size)
+            {
+              var SafeName = safe.filename(Name);
+              var params = flexProps("MLD", mld_key, String(kenmerk_key), "M");
+              if (!params.isAllowedName(SafeName))
+              {
+                __DoLog("Unsafe SOAP file '{0}' ignored.".format(SafeName), "#FFFF00");
+              }
+              else
+              {
+                __Log("Start saving: " + params.AttachPath + SafeName);
+                CreateFullPath(params.AttachPath);
+                encodedString2File(params.AttachPath + SafeName, Attachment, "bin.hex");
+                __Log("Done saving: " + params.AttachPath + SafeName);
+              }
+            }
+          }
+        }
+      }
+      oRs.Close();
+    }
+  }
+}
+
 xmlResp.appendChild(FCLTElement);
 
 if (API.apidata.stylesheet)

APPL/API/api_opdrsoap.asp

@@ -50,17 +50,19 @@ if ("MLDremark" in API.apidata.options)
 if ("ORDremark" in API.apidata.options)
     ORDremark = API.apidata.options["ORDremark"];
 
-if (API.apidata.loglevel > 1) // Zet maar op 3 als je HTML logging wilt
-    Session("logging") = API.apidata.loglevel||0;
-
 //user.checkAutorisation("WEB_MLDUSE"); // Dit is nog ongeacht de melding.
 
 var tsql = "-";     // Voor tijdelijke statement.
 var sql = "-";      // De uiteindelijke insert/update-sql.
 var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
+
+//if (API.apidata.loglevel) __Log2File(Request, API.APIname + "_IN1");
+
 if (API.apidata.stylesheet)
 {
   var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0");
+  iXsl.resolveExternals = true; // XSL kan includes hebben
+
   if( ! iXsl.load(Server.MapPath(API.apidata.stylesheet)) )
   {
       API.error("Could not load XSL " + API.apidata.stylesheet + "\n" + iXsl.parseError.reason);
@@ -82,7 +84,18 @@ if (API.apidata.stylesheet)
   inputXML.transformNodeToObject(iXsl, xmlReq);
 }
 else
+{
   xmlReq.load(Request);
+  if (xmlReq.parseError.errorCode != 0)
+  {
+    __DoLog( "Error loading XML: "
+                 + xmlReq.parseError.errorCode
+                 + "\n" + xmlReq.parseError.reason
+                 + " regel " + xmlReq.parseError.line
+                 + "(" + xmlReq.parseError.linepos + ")"
+             , "#ff0000");
+  }
+}
 
 if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_TUSSEN");
 
@@ -132,12 +145,18 @@ for (i=0; i < opdrachten.length; i++)
   var opdraction      = opdrachten[i].getAttribute("type").toLowerCase(); // NEW/UPD
 
   var externnr        = XMLval(opdrachten[i], "externnr"); // NEW
+  var externopdrnr    = XMLval(opdrachten[i], "externopdrnr");
   var plandatum       = XMLval(opdrachten[i], "plandatum");
   var voor_key        = parseInt(XMLval(opdrachten[i], "voor"), 10); // NEW
+  var voor_email      = XMLval(opdrachten[i], "voor_email"); // NEW
   var stdm_key        = parseInt(XMLval(opdrachten[i], "stdmelding_key"), 10); // NEW
   var topdr_key       = parseInt(XMLval(opdrachten[i], "typeopdr_key"), 10); // NEW
   var uitv_key        = parseInt(XMLval(opdrachten[i], "bedrijf_key"), 10); // NEW
   var opdrachttekst   = XMLval(opdrachten[i], "opdrachttekst"); // NEW
+  var meldingtekst    = XMLval(opdrachten[i], "meldingtekst"); // NEW
+  var onderwerp       = XMLval(opdrachten[i], "onderwerp"); // NEW
+  var opdr_kpn        = XMLval(opdrachten[i], "kostenplaats");
+  var flag            = parseInt(XMLval(opdrachten[i], "flag"), 10);
 
   var txt_mut_datum   = XMLval(opdrachten[i], "mut_datum"); // UPD
   var opdrstatus      = XMLval(opdrachten[i], "status"); // UPD
@@ -163,6 +182,43 @@ for (i=0; i < opdrachten.length; i++)
   { // Voorkom problemen als externnr-node ontbreekt/leeg!
     externnr = '';
   }
+  if (externopdrnr == null)
+  { // Voorkom problemen als externopdrnr-node ontbreekt/leeg!
+    externopdrnr = '';
+  }
+  if (voor_email == null)
+  { // Voorkom problemen als het emailadres ontbreekt/leeg!
+    voor_email = '';
+  }
+
+  // Zoek de voorkey op aan de hand van het emailadres
+  tsql = "SELECT prs_perslid_key "
+       + "  FROM prs_v_aanwezigperslid "
+       + " WHERE UPPER(prs_perslid_email) = UPPER(" + safe.quoted_sql(voor_email) + ")";
+  var oRs = Oracle.Execute(tsql);
+  if (!oRs.eof)
+  {
+     voor_key = oRs("prs_perslid_key").value;
+  }
+  oRs.Close();
+
+  // Kijk of er een opdracht bestaat met dit externe opdracht nummer.
+  // Ben je bang dat het nummer vaker voorkomt dan kun je deze prefixen in de xsl
+  tsql = "SELECT MIN(mld_opdr_key) mld_opdr_key, COUNT(*) aantal"
+         + "  FROM mld_opdr"
+         + " WHERE mld_opdr_id ="+ safe.quoted_sql(externopdrnr);
+  var oRs = Oracle.Execute(tsql);
+  if (oRs("aantal").value == 1)
+  {
+     tsql = "SELECT mld_melding_key || '/' || mld_opdr_bedrijfopdr_volgnr mld_opdr_nr"
+         + "  FROM mld_opdr"
+         + " WHERE mld_opdr_key ="+ oRs("mld_opdr_key").value;
+     var oRs = Oracle.Execute(tsql);
+     opdrid = oRs("mld_opdr_nr").value;
+     // Als het externe opdracht nummer al bestaat weten we zeker dat het om een update gaat.
+     opdraction = "update";
+  }
+  oRs.Close();
 
   if (opdraction == "insert")
   {
@@ -194,6 +250,12 @@ for (i=0; i < opdrachten.length; i++)
               resulttekst = "Undefined stdmelding " + stdm_key;
             }
 
+            if (isNaN(voor_key))
+            {
+              resultcode = 3;
+              resulttekst = "Undefined 'voor': " + voor_email;
+            }
+
             // Hier heb ik een geldige stdm_key.
             if (resultcode == -1) // Nog steeds geen fouten.
             { // Bepaal kostenplaats via voor-user
@@ -221,15 +283,49 @@ for (i=0; i < opdrachten.length; i++)
                     __Log("Uitsluitend gemandateerd voor kostenplaats: " + kpn_nr);
               }
             }
+
+            if (opdr_kpn && opdr_kpn != "")
+            {
+                tsql = "SELECT prs_kostenplaats_key"
+                     + "  FROM prs_kostenplaats"
+                     + " WHERE prs_kostenplaats_verwijder IS NULL"
+                     + "   AND (prs_kostenplaats_begin IS NULL"
+                     + "         OR prs_kostenplaats_begin < SYSDATE)"
+                     + "   AND (prs_kostenplaats_eind IS NULL"
+                     + "         OR prs_kostenplaats_eind > SYSDATE)"
+                     + "   AND prs_kostenplaats_upper = " + safe.quoted_sql_upper(opdr_kpn); // Unique
+                oRs = Oracle.Execute(tsql);
+                if (!oRs.EoF)
+                {
+                  var opdr_kpn_key = oRs("prs_kostenplaats_key").Value;
+
+                  tsql = "SELECT ''"
+                       + "  FROM prs_perslidkostenplaats"
+                       + " WHERE prs_perslidkostenplaats_boeken = 1"
+                       + "   AND (prs_kostenplaats_key = " + opdr_kpn_key
+                       + "         OR prs_kostenplaats_key IS NULL)"       // Mandated for all
+                       + "   AND prs_perslid_key = " + voor_key;
+                  oRs = Oracle.Execute(tsql);
+
+                  if (!oRs.EoF) // persoon gemandateerd voor gegeven kostenplaats
+                      kpn_key = opdr_kpn_key;
+                }
+            }
+
             if (resultcode == -1) // Nog steeds geen fouten.
             {
               var meld_oms = "Automatisch aangemaakte melding tbv. werkzaamheden ge<67>nitieerd in extern systeem met referentie: "+ externnr;
+              if (meldingtekst != null)
+              {
+                 meld_oms = meld_oms + "\n" + meldingtekst;
+              }
               mld_key = mld.insertmelding(stdm_key,
                       {
                           kostenplaats_key: kpn_key,
                           perslid_key: voor_key,
                           fields: [{ dbs: "mld_melding_externnr",     typ: "varchar",  val: externnr },
-                                   { dbs: "mld_melding_omschrijving", typ: "varchar",  val: meld_oms }
+                                   { dbs: "mld_melding_omschrijving", typ: "varchar",  val: meld_oms },
+                                   { dbs: "mld_melding_onderwerp",    typ: "varchar",  val: onderwerp }
                                   ]
                       });
 
@@ -313,6 +409,12 @@ for (i=0; i < opdrachten.length; i++)
         fields.push({ dbs: "mld_opdr_omschrijving",      typ: "varchar",  val: opdrachttekst, len: 4000 });
       }
 
+      // Flag, ignore if invalid
+      if (!isNaN(flag) && flag >= 0 && flag < S("mld_opdracht_flags"))
+      {
+        fields.push({ dbs: "mld_opdr_flag",      typ: "number",  val: flag });
+      }
+
       var mldIns = buildInsert("mld_opdr", fields, { noValidateToken: true });
       var sql = mldIns.sql;
       var err = Oracle.Execute(sql, true);
@@ -323,11 +425,17 @@ for (i=0; i < opdrachten.length; i++)
       }
 
       opdr_key = mldIns.sequences["mld_opdr_key"]; // Hier heb ik de geldige opdr_key (igv. insert).
+
+      tsql = "UPDATE mld_opdr"
+          + "    SET mld_opdr_id = " + safe.quoted_sql(externopdrnr)
+          + "  WHERE mld_opdr_key=" + opdr_key;
+      Oracle.Execute(tsql);
+
       mld.setopdrachtstatus (opdr_key, 5);
       mld.updatemeldingstatus (mld_key, 0);
     }
   }
-  else if (opdraction == "update")
+  else if (opdraction == "update" || opdraction == "note")
   {   // Bestaande opdracht zoeken
     var idarr = opdrid.split('/');
     mld_key = parseInt(idarr[0], 10);
@@ -356,6 +464,13 @@ for (i=0; i < opdrachten.length; i++)
       }
       oRs.Close();
     }
+    if (opdraction == "note" && resultcode == -1) // Nog steeds geen fouten.
+    {
+       tsql = "INSERT INTO mld_opdr_note(mld_opdr_key, prs_perslid_key, mld_opdr_note_omschrijving)"
+            + " VALUES (" + opdr_key + "," + user_key + "," + safe.quoted_sql(opdropmerking) + ")";
+       Oracle.Execute(tsql);
+       resultcode = 0;   // we zijn klaar.
+    }
   }
   else
   {
@@ -396,7 +511,7 @@ for (i=0; i < opdrachten.length; i++)
       var maxmarge = new Date();
       maxmarge.setDate(maxmarge.getDate() - mld_opdr.typeopdr_afmeldmarge);
       if (mut_datum < maxmarge)
-          mut_datum = new Date(); // te lang geleden
+          mut_datum = maxmarge; // te lang geleden
     }
 
     // Dit zijn de wijzigingen, die voeren we alleen uit bij een geldige statuswijziging
@@ -453,6 +568,13 @@ for (i=0; i < opdrachten.length; i++)
       if (autoorder) // Ooit: net als appendRemark via json configureerbaar maken?
         mld_fields.push({ dbs: "mld_melding_einddatum",  typ: "date",    val: opdrgereeddate, track: L("lcl_mld_enddate") });
     }
+
+    // Flag, ignore if invalid
+    if (!isNaN(flag) && flag >= 0 && flag < S("mld_opdracht_flags"))
+    {
+      opdr_fields.push({ dbs: "mld_opdr_flag",  typ: "number",    val: flag });
+    }
+
     // We weten nu de updates, straks voeren we deze pas uit
     // Eerst de eventuele statuswijzigingen
     var newstatus = -1;
@@ -704,6 +826,10 @@ for (i=0; i < opdrachten.length; i++)
   {
     resultcode = 0; // Ik heb gedaan wat ik moest en mocht doen voor deze opdracht.
   }
+  else if (resultcode > 0)
+  {
+    __DoLog("api_opdrsoap fail.\nResultcode: {0}\nReturntekst: {1}".format(resultcode, resulttekst), "#00FF00");
+  }
 
   var binfo = {
                returncode: resultcode,

APPL/API/api_ressoap_info.asp

@@ -15,7 +15,7 @@
     LCL_Disable = 1
     THIS_FILE = "appl/api/api_ressoap_info.asp";
 
-//    Session("logging")=1;
+//    __Logging = 1;
 
 %>
 <!-- #include file="../Shared/common.inc" -->

APPL/API/get_phonebook_info.asp

@@ -11,7 +11,8 @@
     Note:           LET OP: Alle data is/moet HTML-safe zijn!
 
 */ %>
-<%  DOCTYPE_Disable = 1;
+<%
+var JSON_Result = true;
 %>
 <!--#include file="../Shared/common.inc"-->
 <!--#include file="../Shared/json2.js" -->
@@ -52,7 +53,10 @@
     }
 
     if (callback)
+    {
+        Response.ContentType = "application/javascript";
         Response.Write(callback + "(" + JSON.stringify(result) + ")");
+    }
     else
         Response.Write(JSON.stringify(result));
 %>

APPL/API/phonebook_js.asp

@@ -24,6 +24,7 @@ var EXPIRED_PASSWORD_OK = true; // performance
     var API = new API_func();
 
     var nojQuery = getQParam("nojQuery", 0)==1;
+    var suggesticon = getQParam("suggesticon", "");
 
     var transitParam = "&fac_id="+Session("customerId") + buildTransitParam(["API", "APIKEY", "charset"]);
 
@@ -31,6 +32,7 @@ var EXPIRED_PASSWORD_OK = true; // performance
     var sitenoroot = proto + "://" + Request.ServerVariables("SERVER_NAME");
     var site = sitenoroot + rooturl;
 
+    Response.ContentType = "application/javascript";
     //lcl.buildClientLCL();
     // LET OP: Geen FcltMgr.js en dus niet (clientside) zelflerend
 %>
@@ -76,7 +78,7 @@ function L(p_lcl)
     {
         if (key > 0)
             jQuery.ajax({ type: "GET",
-                url: "<%=site%>/appl/api/get_phonebook_info.asp?req_info=prs_perslid&prs_perslid_key=" + key + "<%=transitParam%>",
+                url: "<%=safe.jsstring(site)%>/appl/api/get_phonebook_info.asp?req_info=prs_perslid&prs_perslid_key=" + key + "<%=transitParam%>",
                 dataType: "jsonp",
                 success: window.facilitor.show_phonebook
             });
@@ -89,7 +91,7 @@ function L(p_lcl)
         { detailWidth : 450,
           toonFoto: true,
           detailurl: "appl/fac/fac_user_info.asp",
-          deeplinkurl: "<%=site%>/?nomenu=1&noheader=1&ihatetabs=1&JumpTo=",
+          deeplinkurl: "<%=safe.jsstring(site)%>/?nomenu=1&noheader=1&ihatetabs=1&JumpTo=",
           fields: [ { lbl: "<%=L("lcl_prs_email")%>",   val: "prs_perslid_email" },
                     { lbl: "<%=L("lcl_pb_phone")%>",    val: "prs_perslid_telefoonnr" },
                     { lbl: "<%=L("lcl_pb_mobile")%>",   val: "prs_perslid_mobiel" },
@@ -126,7 +128,7 @@ function L(p_lcl)
         var trs = "";
         if (window.facilitor.phonebook_options.toonFoto && data.photopath)
         {
-            trs += "<tr><td></td><td></td><td rowspan='50'><img src='<%=sitenoroot%>" + data.photopaththumb.replace(/\'/g,'&#39;').replace(/\"/g,'&quot;') +"'></td></tr>";
+            trs += "<tr><td></td><td></td><td rowspan='50'><img src='<%=safe.jsstring(sitenoroot)%>" + data.photopaththumb.replace(/\'/g,'&#39;').replace(/\"/g,'&quot;') +"'></td></tr>";
         }
         var fld;
         for (fld in window.facilitor.phonebook_options.fields)
@@ -186,12 +188,14 @@ function L(p_lcl)
 
             sgPerson = new Suggest({ objectName: "sgPerson",
                                     queryField: $("#sName_key_show")[0],
-                                    queryUrl: "<%=site%>/appl/shared/suggest/SuggestPerslid.asp?filtcode=PHB<%=transitParam%>",
+                                    queryUrl: "<%=safe.jsstring(site)%>/appl/shared/suggest/SuggestPerslid.asp?filtcode=PHB<%=transitParam%>",
                                     initKey: -1,
                                     noJustOne: true,
                                     keyField: $("#sName_key")[0],
                                     JSONP: true,
-                                    embedded: true
+                                    embedded: true,
+                                    suggesticon: "<%=safe.jsstring(suggesticon)%>",
+                                    site: "<%=safe.jsstring(site)%>"
                                   });
         };
 })();

APPL/API/shorturl.asp

@@ -23,6 +23,8 @@
 <!-- #include file="../shared/useragent.inc" -->
 
 <%
+__Log("== Entering shorturl.asp ==");
+
     var u = getQParam("u");
     var known_bookmarks =
     {
@@ -36,7 +38,10 @@
         'locatie':      { gui: 'appl/alg/alg_locatie.asp?key='                  },
         'melding':      { gui: 'appl/mld/mld_melding.asp?mld_key=',             mob: 'appl/pda/melding.asp?mld_key=' },
         'message':      { gui: 'appl/msg/msg_message.asp?message_key='          },
-        'opdracht':     { gui: 'appl/mld/mld_opdr.asp?opdr_key=',               mob: 'appl/pda/order.asp?opdr_key=' },
+        'opdracht':     { gui: 'appl/mld/mld_opdr.asp?opdr_key=',
+                          mob: 'appl/pda/order.asp?opdr_key=',
+                          lckgui: 'appl/mld/mld_opdr_actions.asp?opdr_key=',
+                          lckmob: 'appl/mld/mld_opdr_actions.asp?opdr_key=' },
         'perslid':      { gui: 'appl/prs/prs_perslid.asp?prs_key=',             mob: 'appl/pda/user_info.asp?prs_key=' },
         'reservering':  { gui: 'appl/res/res_reservering.asp?rsv_ruimte_key=',  mob: 'appl/pda/reservering.asp?rsv_ruimte_key=' },
         'ruimte':       { gui: 'appl/alg/alg_ruimte.asp?key=',                  mob: 'appl/pda/ruimte.asp?ruimte_key=' },
@@ -45,20 +50,74 @@
     }
 
     var keyparam = getQParamInt("k", -1);
+
+    var locked_bdradr_key = getQParamInt("lbdr", -1);
+    if (locked_bdradr_key > 0)
+    {   // Eerst: hmac controleren
+        var sql = "SELECT prs_bedrijfadres_locksecret,"
+                + "       prs_bedrijfadres_lockuser_key,"
+                + "       prs_bedrijfadres_lockexpire"
+                + "  FROM prs_bedrijfadres"
+                + " WHERE prs_bedrijfadres_key = " + locked_bdradr_key
+                + "   AND prs_bedrijfadres_locksecret IS NOT NULL"
+                + "   AND prs_bedrijfadres_lockuser_key IS NOT NULL";
+        var oRs = Oracle.Execute(sql);
+        var locksecret = oRs("prs_bedrijfadres_locksecret").Value;
+        var lockuser_key = oRs("prs_bedrijfadres_lockuser_key").Value;
+        var lockexpire = oRs("prs_bedrijfadres_lockexpire").Value;
+        oRs.Close()
+        __Log("Checking locked bdradr {0} expire {1} days".format(locked_bdradr_key, lockexpire));
+        protectQS.verify({ sleutel: locksecret,
+                           expire: lockexpire * 24 * 60,
+                           checkpath: "/", // altijd tegen de root zonder default.asp
+                           no_user_key: true }); // tamper check
+
+        var user_allowed = Session("locked_user_allowed") || []; // Array voor als je meerdere tabjes open hebt
+        var found = false;
+        for (var i = 0; i < user_allowed.length; i++)
+        {
+            if (user_allowed[i].locked_user_key == lockuser_key &&
+                user_allowed[i].xmlnode == u &&
+                user_allowed[i].key == keyparam)
+            {
+                found = true;
+                break;
+            }
+        }
+        if (!found)
+        {
+            user_allowed.push({ locked_user_key: lockuser_key,
+                                xmlnode: u,
+                                key: keyparam
+                              })
+            Session("locked_user_allowed") = user_allowed;
+        }
+    }
+
     // For flexiblity reasons: Literal or runtime parameter(s), just pass through...
     var rest = String(Request.ServerVariables("QUERY_STRING")); // Request.ServerVariables("QUERY_STRING") is url-encoded,
                                                                 // dat is hier safer dan Request.QueryString
     // Strip eventuele leading &fac_id=XXXX er ook af.
     rest = rest.substring(rest.indexOf("u=")).substring(("u="+u).length+1);
 
+    var isKnownBookmark = false;
+    var isMobile = false;
     if (u in known_bookmarks)
     {
+        isKnownBookmark = true;
         checkUserAgent(); // devicebits waren anders mogelijk nog niet gezet
         if (device.test(device.isDesktop) || device.test(device.isTouch))
-            url = known_bookmarks[u].gui;
+        {
+            url = locked_bdradr_key > 0? known_bookmarks[u].lckgui : known_bookmarks[u].gui;
+        }
         else
-            url = known_bookmarks[u].mob || known_bookmarks[u].gui;
-        url = rooturl + "/" + url + keyparam;
+        {
+            url = locked_bdradr_key > 0? known_bookmarks[u].lckmob || known_bookmarks[u].lckgui
+                                       : known_bookmarks[u].mob || known_bookmarks[u].gui;
+            isMobile = true;
+        }
+
+        url = url + keyparam;
 
         if (keyparam > -1)
         {
@@ -74,7 +133,8 @@
                 + "       prs_perslid_key_auth,"
                 + "       fac_bookmark_unauth_url,"
                 + "       fac_bookmark_expire,"
-                + "       fac_bookmark_refreshtime"
+                + "       fac_bookmark_refreshtime,"
+                + "       fac_bookmark_naam"
                 + "  FROM fac_bookmark"
                 + " WHERE fac_bookmark_id = " + safe.quoted_sql(u);
         var oRs = Oracle.Execute(sql);
@@ -92,14 +152,29 @@
         }
 
         var url = oRs("fac_bookmark_path").Value;
-        var refresher = oRs("fac_bookmark_refreshtime").Value;
-
-        if (oRs("prs_perslid_key_auth").Value)
+        if (url.indexOf("{$*}") > 0) // default.asp?Jumpto=cust/uwva/pacta.asp{$*}
         {
-            Session("fallback_user_key") = oRs("prs_perslid_key_auth").Value; // wordt opgepikt door loginTry.asp
+            url = url.replace("{$*}", safe.url("?" + rest));
+            rest = "";
+        }
+        var refresher = oRs("fac_bookmark_refreshtime").Value;
+        var bookmark_naam = oRs("fac_bookmark_naam").Value;
+
+        if (user_key < 0)
+        {
+            if (oRs("prs_perslid_key_auth").Value)
+            {
+                var falluser_key = oRs("prs_perslid_key_auth").Value;
+                if (bookmark_naam != 'faclikedeeplink' && new Perslid(falluser_key).checkAutorisation("WEB_PRSSYS", true))
+                {
+                    INTERNAL_ERROR_FALLBACK_CANNOT_HAVE_PRSSYS;
+                    // fac_like_deep.asp staan we wel toe, die heeft een Session.Abandon();
+                }
+                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
         }
-        else
-            Session("unauth_url") = oRs("fac_bookmark_unauth_url").Value; // wordt opgepikt door common.asp
 
         var params = oRs("fac_bookmark_query").Value;
         if (params)
@@ -135,6 +210,12 @@
     else
         var theURL = protectQS.create(url);
 
+    if (locked_bdradr_key < 0 && isKnownBookmark && !isMobile && getQParamInt("internal", 0) == 0)
+    {
+        Session("FirstPage") = theURL;
+        theURL = rooturl + "/";
+    }
+
     var no302 = getQParamInt("no302", 0) == 1;
     if (no302)
     {

APPL/API2/TESTER/api2_tester.asp

@@ -7,12 +7,16 @@
 ANONYMOUS_Allowed = 1;
 %>
 <!-- #include file="../../Shared/common.inc" -->
+<%
+var fac_id = Request.QueryString("fac_id").Count > 0&&String(Request.QueryString("fac_id"))||"";
+%>
 <!DOCTYPE html>
 <html>
 
     <head>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-        <script src="jquery-1.11.0.min.js"></script>
+        <title>API2 Tester</title>
+        <script src="jquery-1.11.3.min.js"></script>
         <script src="tester.js"></script>
         <script src="jquery.iecors.js"></script>
         <script>
@@ -21,6 +25,7 @@ ANONYMOUS_Allowed = 1;
                     $(doInit);
                     $(doBuild);
                 });
+            var RVT_token = "<%=safe.jsstring(protectRequest.theToken())%>";
         </script>
         <style>
             pre { font-size: 1.2em;
@@ -34,7 +39,7 @@ ANONYMOUS_Allowed = 1;
     <body style='background-color:#E5EAF1; font-family: Helvetica; font-size: 0.8em;'>
         <form method="post" onsubmit="doSubmit();return false;">
           <table>
-            <th colspan="2">FACILITOR API2 tester  -  FOR INTERNAL USE ONLY [ <a href="http://facws001/trunk/api2/">API reference</a> ]</th>
+            <th colspan="2">FACILITOR API2 tester  -  FOR INTERNAL USE ONLY [ <a href="<%=safe.htmlattr(HTTP.urlzelf())%>/api2/" target="_blank" rel="noopener noreferrer">API reference</a> ]</th>
             <tr><td><label>Format</label></td>
                 <td><input type='radio' id='format' name='format' value='json' checked='1'>json</input>
                     <input type='radio' id='format' name='format' value='xml'>xml</input>
@@ -43,11 +48,15 @@ ANONYMOUS_Allowed = 1;
                 </td>
             </tr>
             <tr><td><label>fac_id</label></td>
-                <td><input id="facid" type="text" style="width:100px" value="">
+                <td><input id="facid" type="text" style="width:100px" value="<%=safe.htmlattr(fac_id)%>">
                 </td>
             </tr>
             <tr><td><label>APIKEY</label></td>
-                <td><input id="apikey" type="text" style="width:250px" value="APIPFO">
+                <td><input id="apikey" type="text" style="width:250px" value="APIPFO">&nbsp;
+                            <%
+                            if (user_key > 0) { %>
+                                Herkend als: <%= safe.html(user.oslogin()) %>
+                            <% } %>
                 </td>
             </tr>
             <tr><td><label>API2</label></td>
@@ -56,7 +65,6 @@ ANONYMOUS_Allowed = 1;
                 </td>
             </tr>
             <tr><td><label>Website</label></td>
-<!--                <td><input id="urlbase" type="text" style="width:250px" value="http://uwva.5iwork/Facilitor5iwork"> -->
                 <td><input id="urlbase" type="text" style="width:250px" value="<%=safe.htmlattr(HTTP.urlzelf())%>">
                 </td>
             </tr>
@@ -84,10 +92,10 @@ ANONYMOUS_Allowed = 1;
                 </td>
             </tr>
             <tr><td><label>Method</label></td>
-                <td><input type='radio' id='method' name='method' value='GET' checked='1'>GET</input>
-                    <input type='radio' id='method' name='method' value='PUT'>PUT (update)</input>
-                    <input type='radio' id='method' name='method' value='POST'>POST (insert)</input>
-                    <input type='radio' id='method' name='method' value='DELETE'>DELETE</input>
+                <td><label><input type='radio' id='method' name='method' value='GET' checked='1'>GET</label>
+                    <label><input type='radio' id='method' name='method' value='PUT'>PUT (update)</label>
+                    <label><input type='radio' id='method' name='method' value='POST'>POST (insert)</label>
+                    <label><input type='radio' id='method' name='method' value='DELETE'>DELETE</label>
                 </td>
             </tr>
             <tr><td><label>Request body</label></td>
@@ -125,7 +133,8 @@ ANONYMOUS_Allowed = 1;
             <tr><td>StatusText:</td><td><span id="StatusText"></span></td></tr>
             <tr><td>Duration:</td><td><span id="Duration"></span></td></tr>
             <tr><td>Records:</td><td><span id="Records"></span></td></tr>
-            <tr><td>Result:<button onclick='$("#xml").val($("#Result").text().replace("\r\n", "\n"))'>^^^</button></td>
+            <tr><td>Size:</td><td><span id="ResultSize"></span></td></tr>
+            <tr><td>Result:<button onclick='$("#xml").val($("#Result").text())'>^^^</button></td>
                 <td style='border:1px solid #666;font-size:0.8em;background-color:#fafafa;min-width:800px;'>
                     <pre id="Result" style="padding:0 8px 0 2px;"></pre>
                 </td>

APPL/API2/TESTER/api2_tester.html

@@ -3,7 +3,7 @@
 
     <head>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-        <script src="jquery-1.11.0.min.js"></script>
+        <script src="jquery-1.11.3.min.js"></script>
         <script src="tester.js"></script>
         <script src="jquery.iecors.js"></script>
         <script>
@@ -43,7 +43,7 @@
             </tr>
             <tr><td><label>Website</label></td>
 <!--                <td><input id="urlbase" type="text" style="width:250px" value="http://uwva.5iwork/Facilitor5iwork"> -->
-                <td><input id="urlbase" type="text" style="width:250px" value="http://sgf12/Facilitor5iwork">
+                <td><input id="urlbase" type="text" style="width:250px" value="http://uwva.facws001/branch20163/">
                 </td>
             </tr>
             <tr><td><label>Pretty JSON</label></td>

APPL/API2/TESTER/get_apinames.asp

@@ -1,49 +0,0 @@
-<%@language = "javascript" %>
-<% /*
-     $Revision$
-     $Id$
-
-     File:               get_apinames.asp
-     Description:        Levert de bestanden in in de aangegeven map staan op de server.
-     Parameters:
-         -               -
-*/
-%>
-
-<%
-ANONYMOUS_Allowed = 1;
-var JSON_Result = true;
-%>
-
-<!-- #include file="../../Shared/json2.js" -->
-
-<%
-/***** Get webform parameters *****/
-//var searchfolder = getQParam("folder", "appl/api2");
-// Geen autorisatie check nodig
-/***** End get webform parameters *****/
-//var fullpath = (Server.MapPath(searchfolder));
-var fullpath = Server.MapPath("../");
-var api2_names = [];
-
-var objFso = new ActiveXObject("Scripting.FileSystemObject");
-var objFiles = objFso.GetFolder(fullpath);
-var allFiles = new Enumerator(objFiles.files);
-for (; !allFiles.atEnd(); allFiles.moveNext())
-{
-    var attFile = allFiles.item();
-
-    var ext = objFso.GetExtensionName(attFile);
-    if ((attFile.name.indexOf("api_") == 0) && (ext == "asp"))
-    {
-        var name = attFile.name.substring(4, attFile.name.indexOf(".asp"))
-        api2_names.push(name);
-    }
-
-}
-api2_names.sort();
-var result = { success: true
-             , apinames: api2_names
-             };
-Response.Write(JSON.stringify(result));
-%>

APPL/API2/TESTER/testall.js

@@ -0,0 +1,444 @@
+/*
+    $Id$
+
+    File:           testall.js
+
+    Description:    Test script voor API2
+    Gebruik:        Aanroepen met CScript testall.js
+
+    Dit script gebruikt /api2/apis om een lijst met API's op te halen en doet op allemaal een keer
+    - een GET voor 'alle' records
+    - een GET voor het eerste record daarvan
+    - Op dat eerste record ook een keer elke include
+
+    Voorwaarden:
+    - APIPFO moet gedefinieerd zijn bij een persoon
+    - Die persoon moet *heel veel* rechten hebben (stop hem in alle groepen)
+    - Er treden nu nog wel enkele fouten op die ik nog niet zo snel weg krijg
+*/
+
+// Zie achteraan voor de echte code
+
+if (!this.JSON) {
+    JSON = {};
+}
+
+(function () {
+
+    function f(n) {
+        // Format integers to have at least two digits.
+        return n < 10 ? '0' + n : n;
+    }
+
+    if (typeof Date.prototype.toJSON !== 'function') {
+
+        Date.prototype.toJSON = function (key) {
+
+            return isFinite(this.valueOf()) ?
+                   this.getUTCFullYear()   + '-' +
+                 f(this.getUTCMonth() + 1) + '-' +
+                 f(this.getUTCDate())      + 'T' +
+                 f(this.getUTCHours())     + ':' +
+                 f(this.getUTCMinutes())   + ':' +
+                 f(this.getUTCSeconds())   + 'Z' : null;
+        };
+
+        String.prototype.toJSON =
+        Number.prototype.toJSON =
+        Boolean.prototype.toJSON = function (key) {
+            return this.valueOf();
+        };
+    }
+
+    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        gap,
+        indent,
+        meta = {    // table of character substitutions
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
+        },
+        rep;
+
+
+    function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+        escapable.lastIndex = 0;
+        return escapable.test(string) ?
+            '"' + string.replace(escapable, function (a) {
+                var c = meta[a];
+                return typeof c === 'string' ? c :
+                    '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+            }) + '"' :
+            '"' + string + '"';
+    }
+
+
+    function str(key, holder) {
+
+// Produce a string from holder[key].
+
+        var i,          // The loop counter.
+            k,          // The member key.
+            v,          // The member value.
+            length,
+            mind = gap,
+            partial,
+            value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+        if (value && typeof value === 'object' &&
+                typeof value.toJSON === 'function') {
+            value = value.toJSON(key);
+        }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+        if (typeof rep === 'function') {
+            value = rep.call(holder, key, value);
+        }
+
+// What happens next depends on the value's type.
+
+        switch (typeof value) {
+        case 'string':
+            return quote(value);
+
+        case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+            return isFinite(value) ? String(value) : 'null';
+
+        case 'boolean':
+        case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+            return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+        case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+            if (!value) {
+                return 'null';
+            }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+            gap += indent;
+            partial = [];
+
+// Is the value an array?
+
+            if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+                length = value.length;
+                for (i = 0; i < length; i += 1) {
+                    partial[i] = str(i, value) || 'null';
+                }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+                v = partial.length === 0 ? '[]' :
+                    gap ? '[\n' + gap +
+                            partial.join(',\n' + gap) + '\n' +
+                                mind + ']' :
+                          '[' + partial.join(',') + ']';
+                gap = mind;
+                return v;
+            }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+            if (rep && typeof rep === 'object') {
+                length = rep.length;
+                for (i = 0; i < length; i += 1) {
+                    k = rep[i];
+                    if (typeof k === 'string') {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+                for (k in value) {
+                    if (Object.hasOwnProperty.call(value, k)) {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+            v = partial.length === 0 ? '{}' :
+                gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
+                        mind + '}' : '{' + partial.join(',') + '}';
+            gap = mind;
+            return v;
+        }
+    }
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+    if (typeof JSON.stringify !== 'function') {
+        JSON.stringify = function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+            var i;
+            gap = '';
+            indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+            if (typeof space === 'number') {
+                for (i = 0; i < space; i += 1) {
+                    indent += ' ';
+                }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+            } else if (typeof space === 'string') {
+                indent = space;
+            }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+            rep = replacer;
+            if (replacer && typeof replacer !== 'function' &&
+                    (typeof replacer !== 'object' ||
+                     typeof replacer.length !== 'number')) {
+                throw new Error('JSON.stringify');
+            }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+            return str('', {'': value});
+        };
+    }
+
+
+// If the JSON object does not yet have a parse method, give it one.
+
+    if (typeof JSON.parse !== 'function') {
+        JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+            var j;
+
+            function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+                var k, v, value = holder[key];
+                if (value && typeof value === 'object') {
+                    for (k in value) {
+                        if (Object.hasOwnProperty.call(value, k)) {
+                            v = walk(value, k);
+                            if (v !== undefined) {
+                                value[k] = v;
+                            } else {
+                                delete value[k];
+                            }
+                        }
+                    }
+                }
+                return reviver.call(holder, key, value);
+            }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+            cx.lastIndex = 0;
+            if (cx.test(text)) {
+                text = text.replace(cx, function (a) {
+                    return '\\u' +
+                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+                });
+            }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+            if (/^[\],:{}\s]*$/.
+test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+                j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+                return typeof reviver === 'function' ?
+                    walk({'': j}, '') : j;
+            }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+            throw new SyntaxError('JSON.parse');
+        };
+    }
+}());
+String.prototype.format = function()
+{
+    var formatted = this;
+    for (var i = 0; i < arguments.length; i++)
+    {
+        var regexp = new RegExp('\\{'+i+'\\}', 'gi');
+        formatted = formatted.replace(regexp, arguments[i]);
+    }
+    return formatted;
+};
+
+
+
+
+
+
+
+
+
+
+// include=reservableequipment lijkt een 404 te geven maar de volgende werkt wel?
+// http://uwva.facws001/branch20171/api2/reservablerooms/10802.html?include=reservableequipment
+
+
+
+
+
+WScript.Echo("Zorg dat je Fiddler open hebt staan");
+
+var G_fclt_url = 'http://uwva.facws001/trunk/';
+var G_fclt_url = 'http://uwva.lokalhost/trunk/';
+var G_fclt_url = 'http://uwva.facws001/branch20171/';
+var G_fclt_apikey = 'APIPFO';
+
+var apis = getAPI2JSON("GET", "apis");
+for (var api in apis.apis)
+{
+    testOne(apis.apis[api].id, apis.apis[api].docparam);
+}
+
+
+function testOne(api2_name, docparam)
+{
+    var url = "{0}".format(api2_name);
+    var data = getAPI2JSON("GET", url + (docparam?"?x=1"+docparam:""));
+    if (!data)
+        return;
+    if (api2_name in data)
+    {
+        if (data[api2_name].length && data[api2_name] instanceof Array)
+        {
+            var model = getAPI2JSON("GET", api2_name + ".api" + (docparam?"?x=1"+docparam:""));
+
+            url += "/" + data[api2_name][0]["id"];
+            var data = getAPI2JSON("GET", url + (docparam?"?x=1"+docparam:""));
+            if (!(model.record_name in data))
+            {
+                WScript.echo("Data niet gevonden?");
+                return;
+            }
+
+            if ("includes" in model)
+            {
+                for (var inc in model.includes)
+                var data = getAPI2JSON("GET", url + "?include=" + model.includes[inc]);
+                if (!(model.record_name in data))
+                {
+                    WScript.echo("Data niet gevonden als include toegevoegd?");
+                    WScript.Quit();
+                }
+            }
+        }
+    }
+}
+
+function getAPI2JSON(method, url, data)
+{
+    var url = G_fclt_url + "api2/" + url;
+    WScript.Echo("Getting: " + url);
+    var objXMLHTTP = FcltAPI2("GET", url);
+    if (objXMLHTTP)
+    {
+        return eval ("(" + objXMLHTTP.responseText + ")");
+    }
+}
+
+function FcltAPI2(method, url, data)
+{
+    var objXMLHTTP = new ActiveXObject("MSXML2.ServerXMLHTTP.6.0");
+    var SXH_PROXY_SET_PROXY = 2;
+    objXMLHTTP.setProxy(SXH_PROXY_SET_PROXY, "127.0.0.1:8888");
+
+    objXMLHTTP.open(method, url, false);
+    objXMLHTTP.setRequestHeader ("X-FACILITOR-API-Key", G_fclt_apikey);
+    objXMLHTTP.send(data);
+    if (objXMLHTTP.status >= 200 && objXMLHTTP.status <= 299)
+    {
+        return objXMLHTTP;
+    }
+    WScript.Echo(objXMLHTTP.responseText);
+    WScript.Echo(objXMLHTTP.status);
+    return null;
+}

APPL/API2/TESTER/tester.js

@@ -6,8 +6,8 @@ function callbackDone(data, textStatus, jqXHR)
     $("#StatusText").text(textStatus);
     $("#Duration").text(Math.floor(new Date - tm) + "ms");
     var txt = String(jqXHR.responseText);
-    txt = txt.replace(/\012/ig, "\n\r"); // beter in IE
     $("#Result").text(txt);
+    $("#ResultSize").text(txt.length);
 
     var objects_count = 1;
     if (jqXHR.responseText.indexOf("[") > 0)
@@ -19,11 +19,10 @@ function callbackDone(data, textStatus, jqXHR)
 }
 function callbackFail(jqXHR, textStatus, errorThrown)
 {
-    // alert("FAIL: " + (typeof errorThrown == "string"?errorThrown:errorThrown.message));
+    // FcltMgr.alert("FAIL: " + (typeof errorThrown == "string"?errorThrown:errorThrown.message));
     $("#Status").text(jqXHR.status + " " + (typeof errorThrown == "string"?errorThrown:errorThrown.message)).css("background-color", "red");
     $("#StatusText").text(textStatus);
     var txt = String(jqXHR.responseText);
-    txt = txt.replace(/\012/ig, "\n\r"); // beter in IE
     $("#Result").text(txt);
 }
 function doSubmit()
@@ -42,7 +41,9 @@ function doSubmit()
     tm = new Date;
     $.ajax(url, { type: method,
                   data: data,
-                  headers: { "X-FACILITOR-API-Key": apikey }
+                  headers: { "X-FACILITOR-API-Key": apikey,
+                             "X-CSRF-TOKEN": RVT_token
+                           }
                   // dan werkt de header niet dataType: "jsonp"
                 }
           ).done(callbackDone).fail(callbackFail);
@@ -73,17 +74,30 @@ function doBuild()
 
 function doInit()
 {
-    var path = "appl/api2";
-    $.getJSON("get_apinames.asp?3", process_api_list);
+    var apikey = $("#apikey").val();
+    //jQuery.support.cors = true; // in IE niet al te moeilijk doen over cross-domain.
+    var url = $("#urlbase").val() + "/api2/apis.json";
+    $.ajax(url, { type: "GET",
+                  //data: data,
+                  headers: { "X-FACILITOR-API-Key": apikey,
+                             "X-CSRF-TOKEN": RVT_token
+                           }
+                  // dan werkt de header niet dataType: "jsonp"
+                }
+          ).done(process_api_list).fail(callbackFail);
 }
 
 function process_api_list(data)
 {
     $("#api").empty();
-    $.each( data.apinames
+    var lastmodule = "";
+    $.each( data.apis
           , function (index, value)
             {
-                apiname = data.apinames[index];
+                if (lastmodule != this.modulecode)
+                    $("#api").append("<optgroup label='" + this.modulecode + ": " + this.module + "'></option>");
+                lastmodule = this.modulecode;
+                var apiname = this.id;
                 $("#api").append("<option value="+ apiname +">" + apiname + "</option>");
             }
           );

APPL/API2/api2_dispatch.inc

@@ -0,0 +1,164 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           api2_dispatch.inc
+    Description:    Mapping tussen externe API-naam en interne bestandnaam
+    Notes:
+
+    Status:
+
+*/
+
+var api2_mapper = {
+    // De 'name' moet hier gelijk zijn aan model.records_name
+
+    "swagger"                 : { "filename": "appl/api2/api_swagger.asp" },
+
+    "realestateproperties"    : { "filename": "appl/mgt/alg_kenmerk.asp", "docparam": "&level=R" },
+    "buildingfunctions"       : { "filename": "appl/mgt/alg_srtgebouw.asp" },
+    "terrainfunctions"        : { "filename": "appl/mgt/alg_srtterreinsector.asp" },
+    "regions"                 : { "filename": "appl/api2/api_regions.asp",                  "module": "ALG" },
+    "buildings"               : { "filename": "appl/api2/api_buildings.asp",                "module": "ALG" },
+    "floors"                  : { "filename": "appl/api2/api_floors.asp",                   "module": "ALG" },
+    "locations"               : { "filename": "appl/api2/api_locations.asp",                "module": "ALG" },
+    "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" },
+    "appointments"            : { "filename": "appl/api2/api_appointments.asp",             "module": "BEZ" },
+    "visitors"                : { "filename": "appl/api2/api_visitors.asp",                 "module": "BEZ" },
+    "budget"                  : { "filename": "appl/bgt/bgt_budget.asp" },
+    "budgetmutations"         : { "filename": "appl/bgt/bgt_budgetmutatie.asp"},
+    "budgetdisciplines"       : { "filename": "appl/bgt/bgt_discipline.asp" },
+    "budgetcostcategories"    : { "filename": "appl/bgt/bgt_kostenrubriek.asp" },
+    "budgetprojects"          : { "filename": "appl/bgt/bgt_project.asp" },
+    "graphiclabels"           : { "filename": "appl/mgt/cad_label.asp" },
+    "graphiclegends"          : { "filename": "appl/mgt/cad_legenda.asp" },
+    "graphiclegendvalues"     : { "filename": "appl/mgt/cad_legendawaarde.asp" },
+    "graphicthemes"           : { "filename": "appl/mgt/cad_thema.asp" },
+    "contractdisciplines"     : { "filename": "appl/mgt/cnt_discipline.asp" },
+    "contractproperties"      : { "filename": "appl/mgt/cnt_kenmerk.asp" },
+    "contractpropertytypes"   : { "filename": "appl/mgt/cnt_srtkenmerk.asp" },
+    "contractperiods"         : { "filename": "appl/mgt/cnt_termijn.asp" },
+    "taskdisciplines"         : { "filename": "appl/mgt/ctr_discipline.asp" },
+    "audits"                  : { "filename": "appl/mgt/fac_audit.asp" },
+    "emailsettings"           : { "filename": "appl/mgt/fac_email_setting.asp" },
+    "exportfunctions"         : { "filename": "appl/mgt/fac_export_app.asp" },
+    "authorizationfunctions"  : { "filename": "appl/mgt/fac_functie.asp" },
+    "authorizationgroups"     : { "filename": "appl/api2/api_authorizationgroups.asp" },
+    "authorizations"          : { "filename": "appl/mgt/fac_groeprechten.asp", "nodoc": true },
+    "identityproviders"       : { "filename": "appl/mgt/aut_idp.asp" },
+    "importfunctions"         : { "filename": "appl/mgt/fac_import_app.asp" },
+    "notificationjobs"        : { "filename": "appl/mgt/fac_notificatie_job.asp" },
+    "profiles"                : { "filename": "appl/mgt/fac_profiel.asp" },
+    "profilevalues"           : { "filename": "appl/mgt/fac_profielwaarde.asp" },
+    "notificationtypes"       : { "filename": "appl/mgt/fac_srtnotificatie.asp" },
+    "customgraphs"            : { "filename": "appl/mgt/fac_usrgraph.asp", "nodoc": true },
+    "customtables"            : { "filename": "appl/mgt/fac_usrtab.asp" },
+    "widgets"                 : { "filename": "appl/mgt/fac_widget.asp" },
+    "knowledgeproperties"     : { "filename": "appl/mgt/faq_kenmerk.asp" },
+    "vattables"               : { "filename": "appl/mgt/fin_btwtabel.asp" },
+    "invoiceproperties"       : { "filename": "appl/mgt/fin_kenmerk.asp" },
+//    "saleinvoicelines"        : { "filename": "appl/mgt/fin_verkoopfactuur.asp", "nodoc": true },
+    "taskhandlings"           : { "filename": "appl/mgt/ins_controlemode.asp" },
+    "objectdisciplines"       : { "filename": "appl/mgt/ins_discipline.asp" },
+    "objectproperties"        : { "filename": "appl/mgt/ins_kenmerk.asp" },
+    "recurringtasks"          : { "filename": "appl/mgt/ins_srtcontrole.asp" },
+    "objectgroups"            : { "filename": "appl/mgt/ins_srtgroep.asp" },
+    "objectpropertytypes"     : { "filename": "appl/mgt/ins_srtkenmerk.asp" },
+    "alldisciplines"          : { "filename": "appl/mgt/ins_tab_discipline.asp" },
+    "issueclosingtexts"       : { "filename": "appl/mgt/mld_afmeldtekst.asp" },
+    "backofficegroups"        : { "filename": "appl/mgt/mld_behandelgroep.asp" },
+    "servicelevels"           : { "filename": "appl/mgt/mld_dienstniveau.asp" },
+    "issuedisciplines"        : { "filename": "appl/mgt/mld_discipline.asp" },
+    "unproductivetimes"       : { "filename": "appl/mgt/mld_impropdr.asp" },
+    "issueproperties"         : { "filename": "appl/mgt/mld_mld_kenmerk.asp" },
+    "issueorderproperties"    : { "filename": "appl/mgt/mld_kenmerk.asp" },
+    "expenses"                : { "filename": "appl/mgt/mld_kosten.asp" },
+    "callsources"             : { "filename": "appl/mgt/mld_meldbron.asp" },
+    "disciplinetypes"         : { "filename": "appl/mgt/mld_srtdiscipline.asp" },
+    "issuepropertytypes"      : { "filename": "appl/mgt/mld_srtkenmerk.asp" },
+    "callgroups"              : { "filename": "appl/mgt/mld_stdmeldinggroep.asp" },
+    "issueordertypes"         : { "filename": "appl/mgt/mld_typeopdr.asp" },
+    "daysoff"                 : { "filename": "appl/mgt/mld_vrije_dagen.asp" },
+    "workflows"               : { "filename": "appl/mgt/mld_workflow.asp" },
+    "workflowsteps"           : { "filename": "appl/mgt/mld_workflowstep.asp", "nodoc": true },
+    "workflowexpressions"     : { "filename": "appl/mgt/mld_workflow_expression.asp" },
+    "issuedisciplines"        : { "filename": "appl/api2/api_issuedisciplines.asp",         "module": "MLD" },
+//    "orders"                  : { "filename": "appl/api2/api_orders.asp",                   "module": "MLD" },
+    "orders"                  : { "filename": "appl/bgt/mld_opdr.asp",                      "module": "MLD" },
+    "issues"                  : { "filename": "appl/api2/api_issues.asp",                   "module": "MLD" },
+    "issuetypes"              : { "filename": "appl/api2/api_issuetypes.asp",               "module": "MLD" },
+    "pinboardcategories"      : { "filename": "appl/mgt/mrk_discipline.asp" },
+    "services"                : { "filename": "appl/mgt/prs_dienst.asp" },
+    "basisproperties"         : { "filename": "appl/mgt/prs_kenmerk.asp",                   "docparam": "&level=P" },
+    "combinationvalidations"  : { "filename": "appl/mgt/prs_kostencombinatie.asp" },
+    "costtypes"               : { "filename": "appl/mgt/prs_kostensoort.asp" },
+    "costtypegroups"          : { "filename": "appl/mgt/prs_kostensoortgrp.asp" },
+    "costcentregroups"        : { "filename": "appl/mgt/prs_kostenplaatsgrp.asp" },
+    "costcentres"             : { "filename": "appl/mgt/prs_kostenplaats.asp" },
+    "persons"                 : { "filename": "appl/api2/api_persons.asp", "nodoc": true },
+    "mandates"                : { "filename": "appl/mgt/prs_perslidkostenplaats.asp" },
+    "relationtypes"           : { "filename": "appl/mgt/prs_relatietype.asp" },
+    "employeefunctions"       : { "filename": "appl/mgt/prs_srtperslid.asp" },
+    "basispacelists"          : { "filename": "appl/mgt/prs_staffel.asp" },
+    "bookingactivities"       : { "filename": "appl/mgt/res_activiteit.asp" },
+    "bookingconsumables"      : { "filename": "appl/mgt/res_artikel.asp" },
+    "bookingcycles"           : { "filename": "appl/mgt/res_cyclus.asp" },
+    "bookingitems"            : { "filename": "appl/mgt/res_deel.asp" },
+    "bookingdisciplines"      : { "filename": "appl/mgt/res_discipline.asp" },
+    "bookingproperties"       : { "filename": "appl/mgt/res_kenmerk.asp" },
+    "bookingconfigurations"   : { "filename": "appl/mgt/res_opstelling.asp" },
+    "bookingrooms"            : { "filename": "appl/mgt/res_ruimte.asp" },
+    "bookingactivitytypes"    : { "filename": "appl/mgt/res_srtactiviteit.asp" },
+    "bookingconsumablescopes" : { "filename": "appl/mgt/res_srtartikel_onrgoed.asp" },
+    "bookingpropertytypes"    : { "filename": "appl/mgt/res_srtkenmerk.asp" },
+    "reservationequipment"    : { "filename": "appl/api2/api_reservationequipment.asp",     "module": "RES" },
+    "reservations"            : { "filename": "appl/api2/api_reservations.asp",             "module": "RES" },
+    "reservablerooms"         : { "filename": "appl/api2/api_reservablerooms.asp",          "module": "RES" },
+    "reservableconsumables"   : { "filename": "appl/api2/api_reservableconsumables.asp",    "module": "RES" },
+    "reservationconsumables"  : { "filename": "appl/api2/api_reservationconsumables.asp",   "module": "RES" },
+    "reservableequipment"     : { "filename": "appl/api2/api_reservableequipment.asp",      "module": "RES" },
+    "reservablecatalog"       : { "filename": "appl/api2/api_reservablecatalog.asp",        "module": "RES" },
+    "res_ruimtes"             : { "filename": "appl/api2/api_res_ruimtes.asp",              "module": "RES" },
+
+    "attachments"             : { "filename": "appl/api2/api_attachments.asp",              "module": "API", "nodoc": true },
+    "doc"                     : { "filename": "appl/api2/api_doc.asp",                      "module": "API" },
+    "apis"                    : { "filename": "appl/api2/api_apis.asp",                     "module": "API" },
+    "about"                   : { "filename": "appl/api2/api_about.asp",                    "module": "API" },
+    "cadcontours"             : { "filename": "appl/api2/api_cadcontours.asp",              "module": "CAD" },
+    "contracts"               : { "filename": "appl/api2/api_contracts.asp",                "module": "CNT" },
+    "notes"                   : { "filename": "appl/api2/api_notes.asp",                    "module": "FAC", "docparam": "&module=MLD" },
+    "approvals"               : { "filename": "appl/api2/api_approvals.asp",                "module": "FAC" },
+    "settings"                : { "filename": "appl/api2/api_settings.asp",                 "module": "FAC" },
+    "reportsx"                : { "filename": "appl/api2/api_reportsx.asp",                 "module": "FAC" },
+    "reports"                 : { "filename": "appl/api2/api_reports.asp",                  "module": "FAC", "nodoc": true },
+    "invoices"                : { "filename": "appl/api2/api_invoices.asp",                 "module": "FIN" },
+    "objects"                 : { "filename": "appl/api2/api_objects.asp",                  "module": "INS" },
+    "inspections"             : { "filename": "appl/api2/api_ins_deelsrtcontrole.asp",      "module": "INS" },
+    "statehistory"            : { "filename": "appl/mgt/ins_deel_state_history.asp",        "module": "INS" },
+    "companies"               : { "filename": "appl/api2/api_companies.asp",                "module": "PRS" },
+    "departments"             : { "filename": "appl/mgt/prs_afdeling.asp",                  "module": "PRS" },
+
+    "generictables"           : { "filename": "appl/mgt/mgt_generic.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
+}
+
+function api2_dispatch(api2_name)
+{
+    api2_name = api2_name.toLowerCase();
+    if (api2_name in api2_mapper)
+        return api2_mapper[api2_name].filename;
+}
+%>

APPL/API2/api2_rest.inc

@@ -11,45 +11,29 @@
 */
 %>
 <!-- #include file="api2.inc" -->
+<!-- #include file="api2_swagger.inc" -->
 <!-- #include file="../scf/scaffolding_common.inc" -->
 <%
-
+var DEZE = this;
 api2_rest = {
-    authenticate: function _authenticate(model)
+    authenticate: function _authenticate()
     {
-        var APIKEY;
-        if (S("fac_api_key_in_url"))
-            APIKEY = getQParam("APIKEY", "");
-        if (!APIKEY && Request.ServerVariables("HTTP_X_FACILITOR_API_KEY").Count)
-            APIKEY = String(Request.ServerVariables("HTTP_X_FACILITOR_API_KEY")); // Meegegeven als X-FACILITOR-API-Key
-
-        if (!APIKEY && Session("user_key") > 0)
+        var method = String(Request.ServerVariables("REQUEST_METHOD"));
+        if (method != "GET" && Session("stateless") != 1) // Vereis dan wel het CSRF token
         {
-            user_key = Session("user_key"); // Hierdoor is de API intern te gebruiken zonder authenticatie
+            var token = Request.ServerVariables("HTTP_X_CSRF_TOKEN").Count   // Meegegeven als X-CSRF-TOKEN
+                            ? String(Request.ServerVariables("HTTP_X_CSRF_TOKEN"))
+                            : "";
+            protectRequest.validateToken(token);
         }
-        else
+        if (user_key < 0)
         {
-            if (Session("user_key") > 0)
-                {} // Tijdens ontwikkeling heb je soms in tweede tab de GUI open. Laat dat ongemoeid.
-            else
-                Session.Abandon(); // Altijd, voor de zekerheid
-
-            var sql = "SELECT prs_perslid_key, prs_perslid_naam"
-                    + "  FROM prs_perslid"
-                    + " WHERE prs_perslid_verwijder IS NULL"
-                    + "   AND prs_perslid_apikey = " + safe.quoted_sql(APIKEY);
-            var oRs = Oracle.Execute(sql);
-            if (oRs.Eof || !APIKEY)
-            {
-                Response.Status = "401 Unauthorized";
-                // Sommige applicaties kunnen in reactie hierop een b64 encoded username:password sturen
-                // Die onderscheppen wij in LoginTry.asp uiteindelijk
-                if (S("basic_auth_realm"))
-                    Response.AddHeader("WWW-Authenticate", "Basic realm=\"" + S("basic_auth_realm") + "\"");
-                Response.End;
-            };
-            __Log("API2 User is: " + oRs("prs_perslid_naam").Value);
-            /* global */ user_key = oRs("prs_perslid_key").Value;
+            Response.Status = "401 Unauthorized";
+            // Sommige applicaties kunnen in reactie hierop een b64 encoded username:password sturen
+            // Die onderscheppen wij in LoginTry.asp uiteindelijk
+            if (S("basic_auth_realm"))
+                Response.AddHeader("WWW-Authenticate", "Basic realm=\"" + S("basic_auth_realm") + "\"");
+            Response.End;
 
             if (typeof NO_ADDHEADER == "undefined" && Request.Servervariables("HTTP_FCLT_VERSION").Count > 0)
             {   // wordt opgepikt door FCLTAPI.DLL voor in de logging en daarna gestript. Niet in Fiddler dus
@@ -84,55 +68,85 @@ api2_rest = {
             oRs.Close()
         }
 
+        CheckForLogging(Request.QueryString("logging")); // Nu pas kan autorisatie via user gecontroleerd worden
+    },
 
+    impersonate: function _impersonate(model)
+    {
         // Impersonate? (anno jan-2016 in de praktijk nergens gebruikt, kan mogelijk vervallen)
+        if (!S("fac_api_allow_impersonate") || !model.impersonate_auth)
+            return;
+
         var IMPERS;
         if (S("fac_api_key_in_url"))
             IMPERS = getQParam("SWITCHUSER", "");
         if (!IMPERS && Request.ServerVariables("HTTP_X_FACILITOR_SWITCH_USER").Count)
             IMPERS = String(Request.ServerVariables("HTTP_X_FACILITOR_SWITCH_USER")); // Meegegeven als X-FACILITOR-SWITCH-USER
-        if (IMPERS && S("fac_api_allow_impersonate"))
-        {
-           var sql = "SELECT prs_perslid_key, prs_perslid_naam"
-                   + "  FROM prs_perslid"
-                   + " WHERE prs_perslid_verwijder IS NULL"
-                    + "   AND prs_perslid_oslogin = " + safe.quoted_sql_upper(IMPERS);
-            var oRs = Oracle.Execute(sql);
-            if (oRs.Eof)
-            {
-                Response.Status = "412 Invalid X-Facilitor-Switch-User header";
-                Response.End;
-            };
-            __Log("IMPERS User is: " + oRs("prs_perslid_naam").Value);
-            var other_user_key = oRs("prs_perslid_key").Value;
-            oRs.Close();
-            if (model.impersonate_auth)
-            {
-                var xfunc = user.func_enabled2(model.module, { prs_key: other_user_key, isOptional: true });
-                var can = (xfunc && xfunc.canRead(model.impersonate_auth));
-                if (can)
-                    /* global */ user_key = other_user_key;
-            }
-            if (user_key != other_user_key)
-            {
-                Response.Status = "412 Unauthorized X-Facilitor-Switch-User header";
-                Response.End;
-            }
-        }
+        if (!IMPERS)
+            return;
 
-        /* global */ user = new Perslid(user_key);
-        CheckForLogging(Request.QueryString("logging")); // Nu pas kan autorisatie via user gecontroleerd worden
+        var sql = "SELECT prs_perslid_key, prs_perslid_naam"
+               + "  FROM prs_perslid"
+               + " WHERE prs_perslid_verwijder IS NULL"
+                + "   AND prs_perslid_oslogin = " + safe.quoted_sql_upper(IMPERS);
+        var oRs = Oracle.Execute(sql);
+        if (oRs.Eof)
+        {
+            Response.Status = "412 Invalid X-Facilitor-Switch-User header";
+            Response.End;
+        };
+        __Log("IMPERS User is: " + oRs("prs_perslid_naam").Value);
+        var other_user_key = oRs("prs_perslid_key").Value;
+        oRs.Close();
+
+        var xfunc = user.func_enabled2(model.module, { prs_key: other_user_key, isOptional: true });
+        var can = (xfunc && xfunc.canRead(model.impersonate_auth));
+        if (can)
+        {
+            /* global */ user_key = other_user_key;
+            /* global */ user = new Perslid(user_key);
+        }
+        else
+        {
+            Response.Status = "412 Unauthorized X-Facilitor-Switch-User header";
+            Response.End;
+        }
     },
     process: function _process(model)
     {
         var wasCodePage = Session.Codepage;
         Session.Codepage = 65001; // We doen *uitsluitend* utf-8
         Response.Charset = 'utf-8';
+        var inputformat = outputformat = getQParamSafe("format", "invalid").toLowerCase();
+        if (outputformat == "auto")
+        {
+            var accept = String(Request.ServerVariables("HTTP_ACCEPT")).split(",")[0]; // Altijd alleen eerste bekijken
+            switch (accept.toLowerCase())
+            {
+                case "application/xml":    outputformat = "xml";  break;
+                case "application/json":   outputformat = "json"; break;
+                case "text/html":          outputformat = "html"; break; // vanuit browser?
+                default: outputformat = "json";
+            }
+        }
 
+        if (outputformat == "json")
+            /* global */ JSON_Result = true; // Zelf doen we er niets mee maar
+                                             // shared.simple_page kijkt er naar
+
+        var orgError = api2.error;
+        api2.error = function (code, msg)
+        {
+            api2_rest.plugin.error_handler(code, msg, orgError);
+        }
+
+        api2_rest.authenticate();
+        // Kip-ei: de omzetting naar new model() mag pas als je geauthenticeerd bent
+        // Hierboven willen we het echter al wel meegeven
         if (typeof model == "function") // Nieuwe stijl is het een function. Even compatible.
             model = new model();
 
-        api2_rest.authenticate(model);
+        api2_rest.impersonate(model);
 
         var method = String(Request.ServerVariables("REQUEST_METHOD"));
 
@@ -141,74 +155,124 @@ api2_rest = {
             Response.Status = "405 Method not allowed";
             Response.End;
         }
-        if (!("REST_" + method in model))
+
+        var key = getQParamInt("id", -1); // Voor POST/PUT/DELETE
+
+        var jsondata = {};
+        var filter = shared.qs2json(model);
+        filter = api2_rest.plugin.transform_filter(filter);
+        var requestparams = { filter: filter, include: getQParamArray("include", []) };
+        if (filter.mode == "attachment" && !("includes" in model && "custom_fields" in model.includes))
+            api2.error(400, "Attachment not supported for this model");
+
+        if (filter.mode == "attachment")
+        {
+            if (key > 0 && method == "POST") // het bestand mag dan wel nieuw zijn (POST is van toepassing),
+                method = "PUT";              // intern is het een update van een bestaand record, dus PUT
+        }
+
+        if (!("REST_" + method in model) || !model["REST_" + method])
         {
             Response.Status = "501 Not Implemented";
             // TODO The response MUST include an Allow header containing a list of valid methods for the requested resource.
             Response.End;
         }
-        var jsondata = {};
-        var filter = shared.qs2json(model);
-        filter = api2_rest.plugin.transform_filter(filter);
-        var requestparams = { filter: filter, include: getQParamArray("include", []) };
 
         if (/PUT|POST/.test(method)) // Dan is er in de body data meegestuurd
         {
-            switch (getQParamSafe("format", "invalid").toLowerCase())
+            if (filter.mode == "attachment")
             {
-                case "json":
-                {
-                    var parsed = RequestJSON();
-                    if (parsed.error)
-                        api2.error(500, "Error parsing input JSON: " + parsed.error);
-                    jsondata = api2_rest.plugin.transform_incoming(requestparams, parsed.json);
-                    if (!jsondata)
-                        api2.error(500, "Error parsing input JSON: Empty");
-                    break;
-                }
-                case "xml":
-                {
-                    var parsed = RequestXML();
-                    if (parsed.error)
-                        api2.error(500, "Error parsing input XML: " + parsed.error);
-                    jsondata = api2_rest.xml2json(parsed.xml);
-                    if (!jsondata)
-                        api2.error(500, "Error parsing input XML: Empty");
-                    break;
-                }
-                default:
-                    UNKNOWN_FORMAT_TYPE;
+                // Body bevat application/octet-stream, dat lezen we later wel uit
             }
-            if (!jsondata || !(model.record_name in jsondata || (model.multi_update && model.records_name in jsondata)))
+            else
             {
-                api2.error(500,  "No '{0}' found in input".format(model.record_name));
+                if (inputformat == "auto")
+                {
+                    var contenttype = String(Request.ServerVariables("HTTP_CONTENT_TYPE")).split(",")[0]; // Altijd alleen eerste bekijken
+                    switch (contenttype.toLowerCase())
+                    {
+                        case "application/xml":
+                            inputformat = "xml";
+                            break;
+                        case "application/json":
+                            inputformat = "json";
+                            break;
+                        case "application/x-www-form-urlencoded":
+                            inputformat = "form";
+                            break;
+                        default:
+                            inputformat = outputformat;
+                    }
+                }
+
+                switch (inputformat)
+                {
+                    case "json":
+                    {
+                        var parsed = RequestJSON();
+                        if (parsed.error)
+                            api2.error(400, "Error parsing input JSON: " + parsed.error);
+                        jsondata = api2_rest.plugin.transform_incoming(requestparams, parsed.json);
+                        if (!jsondata)
+                            api2.error(400, "Error parsing input JSON: Empty");
+                        break;
+                    }
+                    case "xml":
+                    {
+                        var parsed = RequestXML();
+                        if (parsed.error)
+                            api2.error(400, "Error parsing input XML: " + parsed.error);
+                        jsondata = api2_rest.xml2json(parsed.xml);
+                        if (!jsondata)
+                            api2.error(400, "Error parsing input XML: Empty");
+                        break;
+                    }
+                    //case "form":
+                    //{
+                    //    jsondata = { };
+                    //    jsondata[model.recordname] = shared.form2json(model); // of api2.form2JSONdata inzetten?
+                    //}
+                    default:
+                        UNKNOWN_CONTENT_TYPE;
+                }
+                if (!jsondata || !(model.record_name in jsondata || (model.multi_update && model.records_name in jsondata)))
+                {
+                    api2.error(400,  "No '{0}' found in input".format(model.record_name));
+                }
             }
         }
 
-        var key = getQParamInt("id", -1); // Voor POST/PUT/DELETE
         var isSingle = /PUT|POST|DELETE/.test(method) || (key > 0);  // PUT, POST en DELETE altijd single
 
-        if (getQParamSafe("format", "json") == "doc")
+        if (outputformat == "doc")
         {
-            // Dan hoeven we verder niets te doen
+            // Dan hoeven we verder bijna niets te doen
+            if ("autfunction" in model)
+                model.autfunctionname = L("lcl_" + model.autfunction);
+            // TODO: velden strippen waar je niets mee te maken hebt?
         }
-        else if (getQParamSafe("format", "json") == "api")
+        else if (outputformat == "api" && getQParamInt("swagger", 0) == 0)
         {
             // TODO: Onderstaande in een of ander standaardformaat opleveren?
             var result = { id: model.records_name,
+                           "name": model.record_title,
+                           "names": model.records_title,
+                           "records_name": model.records_name,
+                           "record_name": model.record_name,
+                           "authorization": model.autfunction,
                            methods: [],
                            includes: [],
                            fields: []
                          };
             for (var i in model.includes)
                 result.includes.push(i);
-            if ("REST_GET" in model)
+            if (model["REST_GET"])
                 result.methods.push("GET");
-            if ("REST_PUT" in model)
+            if (model["REST_PUT"])
                 result.methods.push("PUT");
-            if ("REST_POST" in model)
+            if (model["REST_POST"])
                 result.methods.push("POST");
-            if ("REST_DELETE" in model)
+            if (model["REST_DELETE"])
                 result.methods.push("DELETE");
 
             for (var fld in model.fields)
@@ -217,18 +281,27 @@ api2_rest = {
                     result.fields.push({ id: fld,
                                           filter: model.fields[fld].filter,
                                           type: model.fields[fld].typ,
-                                          label: model.fields[fld].label
+                                          label: model.fields[fld].label,
+                                          required: model.fields[fld].required,
+                                          valuelist: model.fields[fld].LOV && api2.splitLOV(model.fields[fld].LOV)
                                         });
             }
         }
+        else if (outputformat == "api" && getQParamInt("swagger", 0) == 1)
+        {
+            result = swaggermodel(model);
+        }
         else
         {
             if (method == "DELETE")
             {
+                if (!(key > 0))
+                    api2.error(400, "Missing id");
                 var result = model["REST_" + method]( requestparams, key );
             }
-            else if (method == "GET" && filter.mode == "attachment" && "custom_fields" in model.includes)
-            {
+            else if (filter.mode == "attachment")
+            {   // GET/PUT/POST https://xxxx.facilitor.nl/api2/visitors/99685/attachments/1040/testfile.jpg" bestaande folder
+                // POST https://xxxx.facilitor.nl/api2/issues/0/attachments/1040/testfile.jpg" nieuw object, maakt TEMP aan
                 if (wasCodePage != 65001)
                 {
                     // Door de IIS rewriter is de filenaam in de url utf-8 encoded
@@ -246,12 +319,67 @@ api2_rest = {
 
                 requestparams.filter.id = key; // Die kan er maar beter wel zijn!
                 requestparams.include = ["custom_fields"];
-                var data = model.REST_GET(requestparams);
-                if (!data.length) // mogelijk not authorized op hele record
-                    Response.Status = "404 Not Found";
+                var jsondata = { "custom_fields": [
+                                   {
+                                     "propertyid": parseInt(filter.subfolder, 10),
+                                     "value": filter.filename, // Gaat de database in bij "F"
+                                     "attachments": [
+                                       {
+                                         "name": filter.filename // Zo gaat hij heten op het filesysteem
+                                       }
+                                     ]
+                                   }
+                                 ]
+                               };
+                if (method == "PUT" || method == "POST")
+                {
+                    var bytes = Request.TotalBytes;
+                    if (bytes == 0)
+                        api2.error(400, "Empty file");
+
+                    var fileStream = Server.CreateObject("ADODB.Stream");
+                    fileStream.Type = 1; // adTypeBinary eerst nog
+                    fileStream.Open();
+                    try
+                    {
+                        fileStream.Write(Request.BinaryRead(bytes));
+                    }
+                    catch(e)
+                    {
+                        var msg = L("lcl_shared_upload_error_start") + e.description + L("lcl_shared_upload_error_end");
+                        api2.error(400, msg);
+                    }
+                    jsondata["custom_fields"][0]["attachments"][0].datastream = fileStream;
+                    if (key == 0) // new record
+                    {
+                        var token = model.includes["custom_fields"].model.REST_POST(requestparams, jsondata.custom_fields[0], -1);
+                        var record = { xflexparentkey: -1, propertyid: jsondata.custom_fields[0].propertyid};
+                        var fileparams = { getFiles: true, api2name: null, tmpfolder: token };
+                    }
+                    else
+                    {
+                        requestparams.custom_fields_only = true; // Voorkom bij nieuwe bijlage onnodige update vam hele issue
+                        model["REST_" + method](requestparams, jsondata, key); // via het hoofdmodel met authorisatie controle en alles
+                        var record = { xflexparentkey: key, propertyid: jsondata.custom_fields[0].propertyid};
+                        var fileparams = { getFiles: true, api2name: model.records_name };
+                    }
+                    var data = model.includes["custom_fields"].model.get_file_info(requestparams, record, fileparams );
+
+                    api2_rest.deliver(data, /* dummy model */ { record_name: "attachment" }, outputformat, true);
+                    return;
+                }
+                // Geen atachment dus door met de reguliere code
+                var data = model["REST_" + method](requestparams, jsondata, key);
+                if (method == "GET")
+                {
+                    if (!data.length) // mogelijk not authorized op hele record
+                        Response.Status = "404 Not Found";
+                    else
+                        model.includes["custom_fields"].model.streamattachment(filter, data[0].custom_fields);
+                    Response.End;
+                }
                 else
-                    model.includes["custom_fields"].model.streamattachment(filter, data[0].custom_fields);
-                Response.End;
+                    result = data;
             }
             else if (method == "GET")
             {
@@ -259,6 +387,11 @@ api2_rest = {
             }
             else if (model.record_name in jsondata) // een enkel record
             {
+                if (!(key > 0))
+                    api2.error(400, "Missing id");
+                if (jsondata[model.record_name] instanceof Array)
+                    api2.error(400, "{0} should be single record only.".format(method))
+
                 var result = model["REST_" + method]( requestparams, jsondata[model.record_name], key );
             }
             else
@@ -288,7 +421,7 @@ api2_rest = {
             case "POST":
             {
                 var key = result.key;
-                if (key)
+                if (key > 0)
                 {
                     var params = { filter: shared.qs2json(model), include: getQParamArray("include", []) }, jsondata, key
                     // requestparams.include is mogelijk uitgebreid met wat er in de body stond
@@ -303,7 +436,7 @@ api2_rest = {
             }
         }
 
-        api2_rest.deliver(data, model, getQParamSafe("format", "json"), isSingle);
+        api2_rest.deliver(data, model, outputformat, isSingle);
 
     },
     // Data is een array met 'records'
@@ -315,16 +448,18 @@ api2_rest = {
             Response.End;
         }
 
-        if (format == "html" || format == "json")
+        if (format == "html" || format == "json" || format == "table")
         {
             var result = { };
-            if (single)
+            if (model.formatted_get)
+                result = data;
+            else if (single)
                 result[model.record_name] = data[0];
             else
             {
                 result.total_count = model.total_count;
                 result.limit = model.limit;
-                result.offset = 0;
+                result.offset = model.offset;
                 result[model.records_name] = data;
             }
 
@@ -347,22 +482,41 @@ api2_rest = {
                     var lcl2fld = {};
                     for (var fld in model.fields)
                     {
+                        if (fld.substring(0,1) == "_")
+                        {
+                            delete model.fields[fld];
+                            continue;
+                        }
+
+                        for (var prop in model.fields[fld])
+                        {
+                            if (typeof model.fields[fld][prop] == "function") // Bijvoorbeeld model_issues.filter
+                                model.fields[fld][prop] = "<<function>>";
+                        }
+
+                        if (model.fields[fld].LOV)
+                            model.fields[fld].valuelist = api2.splitLOV(model.fields[fld].LOV, "lov_");
+
                         var lclname = "{0}.{1}.hint".format(model.records_name, fld);
                         lcl2fld[lclname] = fld;
                         safefieldnames.push(safe.quoted_sql(lclname));
                     }
-                    //model.fields[fld].hint = "Hallo";
-                    var sql = "SELECT fac_locale_xsl_label, "
-                            + "       COALESCE(fac_locale_xsl_cust, fac_locale_xsl_tekst) fac_locale_xsl_tekst"
-                            + "  FROM fac_locale_xsl xsl"
-                            + " WHERE fac_locale_xsl_lang = " + safe.quoted_sql(user_lang)
-                            + "   AND fac_locale_xsl_module = 'ASP'"
-                            + "   AND fac_locale_xsl_label IN (" + safefieldnames.join(", ") + ")";
-                    var oRs = Oracle.Execute(sql);
-                    while (!oRs.Eof)
+                    if (safefieldnames.length)
                     {
-                        model.fields(lcl2fld[oRs("fac_locale_xsl_label").Value]) = oRs("fac_locale_xsl_tekst").value;
-                        oRs.MoveNext();
+                        //model.fields[fld].hint = "Hallo";
+                        var sql = "SELECT fac_locale_xsl_label, "
+                                + "       COALESCE(fac_locale_xsl_cust, fac_locale_xsl_tekst) fac_locale_xsl_tekst"
+                                + "  FROM fac_locale_xsl xsl"
+                                + " WHERE fac_locale_xsl_lang = " + safe.quoted_sql(user_lang)
+                                + "   AND fac_locale_xsl_module = 'ASP'"
+                                + "   AND fac_locale_xsl_label IN (" + safefieldnames.join(", ") + ")";
+                        var oRs = Oracle.Execute(sql);
+                        while (!oRs.Eof)
+                        {
+                            model.fields(lcl2fld[oRs("fac_locale_xsl_label").Value]) = oRs("fac_locale_xsl_tekst").value;
+                            oRs.MoveNext();
+                        }
+                        oRs.Close();
                     }
                 }
                 Response.ContentType = "text/html";
@@ -376,7 +530,8 @@ api2_rest = {
 
                 var style = new ActiveXObject("MSXML2.DOMDocument.6.0");
                 style.async = false;
-                style.resolveExternals = false;
+                style.resolveExternals = true; // XSL kan includes hebben
+                style.validateOnParse = true; // en moet correct zijn
                 if (Request.QueryString("debug").Count == 0)
                 {
                     var xslname = model.xslname || "reference.xsl";
@@ -385,6 +540,8 @@ api2_rest = {
                 }
                 else
                 {
+                    // Het kan zijn dat de stylesheet bepaalde informatie verbergt.
+                    // Daarom niet zo maar aanbieden
                     if (Application("otap_environment") != "O")
                         ONLY_ON_OTAP_O;
 
@@ -411,10 +568,32 @@ api2_rest = {
             case "html":
                 Response.ContentType = "text/html";
                 var antwoord = JSON.stringify(resultdata, null, 2);
-                var str_antwoord = "<!DOCTYPE html><html><head></head><body><pre>"
+                var str_antwoord = "<!DOCTYPE html><html><head>"
+                                 +     "<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>"
+                                 +     "<meta name='viewport' content='width=device-width, initial-scale=1.0, user-scalable=yes'>"
+                                 +     "<title>{0}</title>".format(single?model.record_name:model.records_name)
+                                 + "</head>"
+                                 + "<body><pre>"
                                  +      Server.HTMLEncode(antwoord)
                                  + "</pre></body></html>";
                 break;
+            case "table":
+                Response.ContentType = "text/html";
+                if (single)
+                    var antwoord = api2_rest.json2htmltable([resultdata[model.record_name]], model, single);
+                else
+                    var antwoord = api2_rest.json2htmltable(resultdata[model.records_name], model, single);
+                var str_antwoord = "<!DOCTYPE html>"
+                                 + "<html>"
+                                 + "<head>"
+                                 + "     <title>{0}</title>".format(single?model.record_name:model.records_name)
+                                 + " <link rel=stylesheet type='text/css' href='" + rooturl + "/appl/api2/table.css'>"
+                                 + "</head>"
+                                 + "<body>"
+                                 +      antwoord
+                                 + "</body>"
+                                 + "</html>";
+                break;
             case "xml":
                 Response.ContentType = "text/xml";
                 var xml_antwoord = api2_rest.json2xml(data, model, single);
@@ -453,8 +632,12 @@ api2_rest = {
 
         // str_antwoord heeft nu het te versturen antwoord
         // Bepaal eTag
-        var oCrypto = new ActiveXObject("SLNKDWF.Crypto");
-        var eTag = '"' + oCrypto.hex_sha1(String(S("cache_changecounter")) + "_" + str_antwoord).toLowerCase() + '"';
+        var eTag = api2_rest.plugin.get_eTag({}, resultdata);
+        if (!eTag)
+        {
+            var oCrypto = new ActiveXObject("SLNKDWF.Crypto");
+            var eTag = '"' + oCrypto.hex_sha1(String(S("cache_changecounter")) + "_" + str_antwoord).toLowerCase() + '"';
+        }
         Response.AddHeader("ETag", eTag);
         if (Request.ServerVariables("HTTP_IF_NONE_MATCH") == eTag)
         {   // We hebben een match! Effectief besparen wel alleen op dataverkeer, de queries zijn al geweest
@@ -466,6 +649,63 @@ api2_rest = {
         Response.write(str_antwoord);
     },
 
+    json2htmltable: function _json2htmltable(data, model, single)
+    {
+        var trs = [];
+        if (data.length) // Header maken
+        {
+            var tds = [];
+            for (var fld in data[0])
+            {
+                var lbl = fld;
+                if (fld in model.fields)
+                    lbl = model.fields[fld].label;
+                else
+                {
+                    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
+                    }
+                }
+                tds.push("<th title='{0}'>{1}</th>".format(safe.htmlattr(lbl), fld));
+            }
+            trs.push(tds.join(""));
+        }
+        for (var i = 0; i < data.length; i++)
+        {
+            var rec = data[i];
+            var tds = [];
+            for (var fld in rec)
+            {
+                var val = rec[fld];
+                var safeval = Server.HTMLEncode(String(val));
+                if (val === null)
+                    safeval = '&nbsp;';
+                else if (typeof val == 'object' && val instanceof Date)
+                    safeval = toISODateTimeString(val);
+                else if (val && typeof val == "object" && "id" in val)
+                {
+                    var naam = val.name||"???";
+                    if (typeof naam == 'object' && naam instanceof Date) // Bij appointment
+                        naam = toISODateTimeString(naam);
+                    safeval = val.id + " (" + Server.HTMLEncode(naam) + ")";
+                }
+                else if (val && typeof val == "object" && model.includes && fld in model.includes)
+                    safeval = api2_rest.json2htmltable(val, model.includes[fld].model, single); // dereference
+                else if (val instanceof Array) // attachments array
+                    safeval = api2_rest.json2htmltable(val, model, single);
+
+                tds.push(safeval);
+            }
+            trs.push("<td>" + tds.join("</td><td>") + "</td>");
+        }
+        return "\n<table border='1'>\n<tr>" + trs.join("</tr>\n<tr>") + "</tr></table>";
+    },
+
     // TODO: Wanneer attributes gebruiken en wanneer (sub)-elements?
     // Streven: data == xml2json(json2xml(data))
     json2xml: function _json2xml(data, model, single)
@@ -530,6 +770,10 @@ api2_rest = {
         else
         {
             var arrayElement = xmlDoc.createElement(rootname);
+            arrayElement.setAttribute("total_count", model.total_count);
+            arrayElement.setAttribute("limit", model.limit);
+            arrayElement.setAttribute("offset", model.offset);
+
             for (var i = 0; i < data.length; i++)
                 arrayElement.appendChild(record2json(data[i], record_name));
             xmlDoc.appendChild(arrayElement);
@@ -616,7 +860,9 @@ api2_rest = {
                 {
                     api2.error(500, "Loading {0} failed: {1}".format(ppath, e.description));
                 }
-                hook.initialize({ S: S, Oracle: Oracle, customerId: customerId, safe: safe });
+				// Via DEZE kan de aanroeper eigenlijk alle globale functies benaderen
+                // zoals __Log
+                hook.initialize({ S: S, Oracle: Oracle, customerId: customerId, safe: safe, DEZE: DEZE });
                 return hook;
             }
         }
@@ -634,6 +880,16 @@ api2_rest = {
             hook = null;
             return outdata;
         },
+        error_handler: function(code, msg, orgHandler)
+        {
+            var hook = api2_rest.find_plugin();
+            if ("error_handler" in hook)
+                outdata = hook.error_handler(code, msg, orgHandler);
+            else
+                outdata = orgHandler(code, msg);
+            hook = null;
+            return outdata;
+        },
         transform_incoming: function(params, data)
         {
             var outdata = data;
@@ -653,6 +909,15 @@ api2_rest = {
                 outdata = hook.transform_outgoing(params, data);
             hook = null;
             return outdata;
+        },
+        get_eTag: function(params, data)
+        {
+            var outdata = null;
+            var hook = api2_rest.find_plugin();
+            if ("get_eTag" in hook)
+                outdata = hook.get_eTag(params, data);
+            hook = null;
+            return outdata;
         }
     }
 }
@@ -674,8 +939,9 @@ function RequestJSON()
     }
     catch (e)
     {
-        __DoLog("JSON eval faalt met: {0}<br>{1}".format(e.description, jvraag), "ffff00");
-        return { error: e.description };
+        result = { error: e.description || (e.message + ": " + e.name) };
+        __DoLog("JSON eval faalt met: '{0}'\n{1}".format(result.error, jvraag), "ffff00");
+        return result ;
     }
     return { json: vraag };
 }
@@ -708,7 +974,13 @@ function BytesToStr(bytes)
     stream.type = 2; // Text
     stream.charset = "utf-8";
 
-    var sOut = stream.readtext();
+    // Als onverhoopt toch windows-1252 is gestuurd met diacrieten gaf
+    // stream.readtext() een 'The parameter is incorrect'
+    // Vreemd genoeg lijkt het expliciet meegeven van een lengte dat te voorkomen.
+    // Die mag zelfs gewoon veel 'te lang' zijn.
+    // Merk op dat we windows-1252 niet ondersteunen, je moet echt utf-8 sturen
+    // (we hadden waarschijnlijk ook 99999999 kunnen kiezen)
+    var sOut = stream.readtext(stream.Size * 2);
     stream.close;
     return sOut;
 }
@@ -754,6 +1026,8 @@ var simple_json2xml = (function (undefined) {
             if (obj.hasOwnProperty(i)) {
                 var value = obj[i],
                     type = typeof value;
+                if (value === obj) // bij merged_model zouden we hier oneindige recursie krijgen
+                    continue;
                 if (value instanceof Array && type == 'object') {
                     for (var sub in value) {
                         xml += simple_json2xml(value[sub]);

APPL/API2/api2_swagger.inc

@@ -0,0 +1,363 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           api2_swagger.inc
+    Description:    Genereer OpenAPI compatible documentatie
+                    zodat swagger ui die kan lezen
+    Notes:
+    Status:
+
+*/
+%>
+<%
+    function swaggerschema(model)
+    {
+        var schema = {
+         "type":"object",
+         "properties":{},
+         "required": [],
+         "xml":{
+            "name": model.record_name
+         }
+        }
+        for (var fld in model.fields)
+        {
+            if (fld.substring(0,1) == "_")
+                continue;
+            var field = model.fields[fld];
+            if (field.hidden)
+                continue;
+            if (field.required)
+                schema.required.push(fld);
+            switch (field.typ)
+            {
+                case "key":
+                    var prop = {
+                       "type":"integer",
+                       "format":"int64"
+                    };
+                    if (fld == "id")
+                        prop["readOnly"] = true; // Wordt nog genegeerd door Swagger-ui 2.0
+                    break;
+                case "float":
+                case "currency":
+                    var prop = {
+                       "type":"float",
+                       "format":"float"
+                    };
+                    break;
+                case "number":
+                    var prop = {
+                       "type":"integer",
+                       "format":"int64"
+                    };
+                    break;
+                case "check":
+                case "check0":
+                    var prop = {
+                       "type":"integer",
+                       "format":"int64",
+                       "enum":[0, 1]
+                    };
+                    break;
+                case "varchar":
+                case "memo":
+                    var prop = {
+                       "type":"string",
+                       "format":"string"
+                    };
+                    break;
+                case "date":
+                    var prop = {
+                       "type":"date",
+                       "format":"date"
+                    };
+                    break;
+                case "datetime":
+                    var prop = {
+                       "type":"dateTime",
+                       "format":"date-time"
+                    };
+                    break;
+                    break;
+                default:
+                    continue;
+            }
+            prop.description = field.label;
+            //prop["default"] = field.defaultvalue;
+            if ("LOV" in field)
+            {
+                var spl = api2.splitLOV(field.LOV);
+                var enums = [];
+                for (var l in spl)
+                {
+                    enums.push(l);
+                }
+                prop["enum"] = enums;
+            }
+            schema["properties"][fld] = prop;
+        }
+        return schema;
+    };
+
+    function swaggermodel (model)
+    {
+        //if ("autfunction" in model && !user.has(model.autfunction))
+        //    return {};
+        var auttext = "";
+        if (model.autfunction)
+            auttext = "Requires authorization `{0}` ({1})".format(model.autfunction, L("lcl_" + model.autfunction));
+        model.records_title = model.records_title || model.records_name;
+        model.record_title  = model.record_title || model.record_name;
+        var result = {
+            "schema": { "fields": {} },
+            "get": {
+              "tags":[
+                 getQParamSafe("module", "XXX")
+              ],
+              "summary": "Get all `{0}`".format(model.records_title),
+              "description": "Returns all `{0}` from the system that the user has access to.".format(model.records_title) + "<br>" + auttext,
+              "responses": {
+                "200": {
+                  "description": "A list of `{0}`".format(model.records_title),
+                  "schema":  {
+                        "$ref": "#/schema/{0}".format(model.records_name)
+                    }
+                },
+                "403": {
+                  "description": "Forbidden"
+                }
+              },
+            "security":[
+               {
+                  "api_key":[
+                  ]
+               }
+            ],
+            "parameters": []
+            }
+        };
+
+        if (model.includes)
+        {
+            var enums = [];
+            for (var i in model.includes)
+                enums.push(i);
+            var inc = model.includes[i];
+            result["get"].parameters.push(
+                {
+                  "name": "include",
+                  "in": "query",
+                  "description": "Include all `{0}`".format("model" in inc?(inc.model.records_title||inc.model.records_name):i),
+                  "required": false,
+                  "type": "array",
+                  "enum": enums
+                });
+        };
+
+        result["schema"]["fields"][model.record_name + "fields"] = swaggerschema(model);
+        result["schema"][model.records_name] =
+                       {
+                       "type": "object",
+                       "properties": {
+                            "total_count": {
+                                   "type":"integer",
+                                   "format":"int64",
+                                   "example": 10,
+                                   "xml": {
+                                     "attribute": true
+                                   }
+                            },
+                            "limit": {
+                                   "type":"integer",
+                                   "format":"int64",
+                                   "example": S("qp_maxrows"),
+                                   "xml": {
+                                     "attribute": true
+                                   }
+                            },
+                            "offset": {
+                                   "type":"integer",
+                                   "format":"int64",
+                                   "example": 0,  // Doen we altijd nog
+                                   "xml": {
+                                     "attribute": true
+                                   }
+                            }
+                       }
+                    }
+        result["schema"][model.records_name]["properties"][model.records_name] =
+                      {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/schema/fields/" + model.record_name + "fields"
+                        }
+                      };
+
+        result["schema"][model.record_name] = {
+                        "type": "object",
+                        "properties": {}
+                    };
+        result["schema"][model.record_name ]["properties"][model.record_name] =
+                        {
+                            "$ref": "#/schema/fields/" + model.record_name + "fields"
+                        }
+
+        if (getQParamInt("single", 0) == 1)
+        {
+            result["get"].summary = "Get one `{0}`".format(model.record_title);
+            result["get"].description = "Returns the `{0}`.".format(model.record_title) + "<br>" + auttext,
+
+            result["get"].parameters.push(
+               {
+                  "name":"id",
+                  "in":"path",
+                  "description":"ID of `{0}` to return".format(model.record_title),
+                  "required":true,
+                  "type":"integer",
+                  "format":"int64"
+               }
+            );
+            result["get"]["responses"]["200"] =
+              {
+                "description": "A `{0}`".format(model.record_title),
+                "schema": {
+                    "$ref": "#/schema/" + model.record_name
+                }
+              };
+        }
+        if (getQParamInt("single", 0) == 0 && model["REST_POST"])
+        {
+            result["post"] = {
+                    "tags":[
+                       getQParamSafe("module", "XXX")
+                    ],
+                    "summary":"Add a new `{0}`".format(model.record_title),
+                    "description": auttext,
+                    "operationId":"add" + model.records_name,
+                    "parameters":[
+                       {
+                          "in":"body",
+                          "name":"body",
+                          "description":"`{0}` object that needs to be added".format(model.record_title),
+                          "required":true,
+                          "xxxschema":{
+                             "$ref":"#/definitions/Pet"
+                          },
+                          "schema": {
+                            "$ref": "#/schema/" + model.record_name
+                          }
+                       }
+                    ],
+                    "responses":{
+                        "200": {
+                            "description": "A `{0}`".format(model.record_title),
+                            "schema": {
+                                "$ref": "#/schema/" + model.record_name
+                            }
+                        },
+                       "400":{
+                          "description":"Bad request"
+                       },
+                       "403": {
+                          "description": "Forbidden"
+                       }
+                    },
+                    "security":[
+                       {
+                          "api_key":[]
+                       }
+                    ]
+                 }
+        }
+        if (getQParamInt("single", 0) == 1 && model["REST_PUT"])
+        {
+            result["put"] = {
+                    "tags":[
+                       getQParamSafe("module", "XXX")
+                    ],
+                    "summary":"Update one `{0}`".format(model.record_title),
+                    "description": "Update an existing `{0}`".format(model.record_title) + "<br>" + auttext,
+                    "operationId":"add" + model.records_name,
+                    "parameters":[
+                       {
+                          "name":"id",
+                          "in":"path",
+                          "description":"ID of `{0}` to update".format(model.record_title),
+                          "required":true,
+                          "type":"integer",
+                          "format":"int64"
+                       },
+                       {
+                          "in":"body",
+                          "name":"body",
+                          "description":"`{0}` object that needs to be updated".format(model.record_title),
+                          "required":true,
+                          "xxxschema":{
+                             "$ref":"#/definitions/Pet"
+                          },
+                          "schema": {
+                            "$ref": "#/schema/" + model.record_name
+                          }
+                        }
+                    ],
+                    "responses":{
+                        "200": {
+                            "description": "A `{0}`".format(model.record_title),
+                            "schema": {
+                                "$ref": "#/schema/" + model.record_name
+                            }
+                        },
+                       "403": {
+                          "description": "Forbidden"
+                       },
+                       "400":{
+                          "description":"Bad request"
+                       }
+                    },
+                    "security":[
+                       {
+                          "api_key":[ ]
+                       }
+                    ]
+                 }
+        }
+        if (getQParamInt("single", 0) == 1 && model["REST_DELETE"])
+        {
+            result["delete"] = {
+                    "tags":[
+                       getQParamSafe("module", "XXX")
+                    ],
+                    "summary":"Delete one `{0}`".format(model.record_title),
+                    "description": auttext,
+                    "operationId":"add" + model.records_name,
+                    "parameters":[
+                       {
+                          "name":"id",
+                          "in":"path",
+                          "description":"ID of `{0}` to delete".format(model.record_title),
+                          "required":true,
+                          "type":"integer",
+                          "format":"int64"
+                       }
+                    ],
+                    "responses":{
+                       "204":{
+                          "description":"No content (delete succesfull or record not found)"
+                       },
+                       "403": {
+                          "description": "Forbidden"
+                       }
+                    },
+                    "security":[
+                       {
+                          "api_key":[ ]
+                       }
+                    ]
+                 }
+        }
+        return result;
+    }
+
+%>

APPL/API2/api2_tools.inc

@@ -0,0 +1,336 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           api2_tools.inc
+
+    Description:
+
+    Context:
+
+    Notes:          voorheen mgt/mgt_tools.inc maar de functies zijn essentieel
+                    voor vele modellen dus moet het in api2_tools.inc
+*/
+%>
+<%
+    function buildKenmerktypeLOV(kenmerktype, emptyOption)
+    {
+        var kenmerktypeLOV = "";
+        switch (kenmerktype)
+        {
+            case "C":
+                kenmerktypeLOV = "C;" + L("mgt_srtkenmerk_karakter");
+                break;
+            case "N":
+                kenmerktypeLOV = "N;" + L("mgt_srtkenmerk_numeriek");
+                break;
+            case "D":
+                kenmerktypeLOV = "D;" + L("mgt_srtkenmerk_datum");
+                break;
+            case "R":
+                kenmerktypeLOV = "R;" + L("mgt_srtkenmerk_referentie_l") + ";"
+                               + "S;" + L("mgt_srtkenmerk_referentie_s")
+                break;
+            case "S":
+                kenmerktypeLOV = "S;" + L("mgt_srtkenmerk_referentie_s") + ";"
+                               + "R;" + L("mgt_srtkenmerk_referentie_l")
+                break;
+            case "X":
+                kenmerktypeLOV = "X;" + L("mgt_srtkenmerk_bestandsnaam");
+                break;
+            case "F":
+                kenmerktypeLOV = "F;" + L("mgt_srtkenmerk_bestand");
+                break;
+            case "E":
+                kenmerktypeLOV = "E;" + L("mgt_srtkenmerk_bestand_e");
+                break;
+            case "M":
+                kenmerktypeLOV = "M;" + L("mgt_srtkenmerk_bestand_f");
+                break;
+            case "L":
+                kenmerktypeLOV = "L;" + L("mgt_srtkenmerk_label") + ";"
+                               + "l;" + L("mgt_srtkenmerk_label_i")
+                break;
+            case "l":
+                kenmerktypeLOV = "l;" + L("mgt_srtkenmerk_label_i") + ";"
+                               + "L;" + L("mgt_srtkenmerk_label")
+                break;
+            case "Q":
+                kenmerktypeLOV = "Q;" + L("mgt_srtkenmerk_blanco");
+                break;
+//            case "B":
+//                kenmerktypeLOV = "B;" + L("mgt_srtkenmerk_berekening");
+//                break;
+            default:
+                kenmerktypeLOV = (emptyOption ? emptyOption + ";" : "")
+                               +  "C;" + L("mgt_srtkenmerk_karakter")
+                               + ";N;" + L("mgt_srtkenmerk_numeriek")
+                               + ";D;" + L("mgt_srtkenmerk_datum")
+                               + ";R;" + L("mgt_srtkenmerk_referentie_l")
+                               + ";S;" + L("mgt_srtkenmerk_referentie_s")
+                               + ";X;" + L("mgt_srtkenmerk_bestandsnaam")
+                               + ";F;" + L("mgt_srtkenmerk_bestand")
+                               + ";E;" + L("mgt_srtkenmerk_bestand_e")
+                               + ";M;" + L("mgt_srtkenmerk_bestand_f")
+                               + ";L;" + L("mgt_srtkenmerk_label")
+                               + ";l;" + L("mgt_srtkenmerk_label_i")
+                               + ";Q;" + L("mgt_srtkenmerk_blanco")
+//                               + ";B;" + L("mgt_srtkenmerk_berekening");
+        }
+        return kenmerktypeLOV;
+    }
+
+    function buildVerplichtingList()
+    {   // LOV waarden voor xxx_kenmerk_verplicht.
+        var s = ";"   + L("mgt_kenmerk_verplicht_0")
+              + ";1;" + L("mgt_kenmerk_verplicht_1")
+              + ";2;" + L("mgt_kenmerk_verplicht_2");
+        return s;
+    }
+
+    function buildGroepsverplichtingList()
+    {   // LOV waarden voor xxx_kenmerk_groep.
+        var s = "0;<" + L("lcl_none") + ">";
+        for (var i=1; i<=9; i++)
+        {
+            s = s + ";" + i + ";" + L("mgt_kenmerk_groep") + " " + i;
+        }
+        return s;
+    }
+
+    function buildKenmerkNiveauList()
+    {   // LOV waarde voor xxx_kenmerk_niveau
+        var s = "D;"  + L("mgt_srtkenmerk_discipline")
+              + ";G;" + L("mgt_srtkenmerk_srtgroep")
+              + ";S;" + L("mgt_srtkenmerk_srtdeel");
+        return s;
+    }
+
+    function buildSrtcontroletypeList()
+    {   // LOV waarden voor srtcontrole_type
+        var s =  "1;" + L("lcl_ins_srtcontrole_insp")
+              + ";2;" + L("lcl_ins_srtcontrole_repl")
+              + ";3;" + L("lcl_ins_srtcontrole_cert");
+        return s;
+    }
+
+    function fac_kenmerkdomein_foreign(module)
+    {
+        return {
+            "tbl": "(select fac_kenmerkdomein_key"
+                 + "      , fac_kenmerkdomein_omschrijving"
+                 + "   from fac_kenmerkdomein"
+                 + "  where fac_kenmerkdomein_verwijder is null"
+                 + "    and fac_kenmerkdomein_module = " + safe.quoted_sql(module)
+                 + "  order by fac_kenmerkdomein_upper asc)",
+            "key": "fac_kenmerkdomein_key",
+            "desc": "fac_kenmerkdomein_omschrijving"
+        };
+    }
+
+function checkSrtkenmerkValue(params)
+{
+    // params: module      IN      module (ALG, BES, ...).
+    //         srtkenmerk  IN      Is het een srtkenmerk (true) of kenmerk (false).
+    //         key         IN      (srt)kenmerk_key van de te controleren waarde.
+    //         value       IN/OUT  De te controleren waarde. Kan hier gewijzigd worden.
+    //         err         OUT     Foutmelding bij ongeldige waarde voor "value", anders lege string.
+    //
+    var prefix = params.module + "_" + (params.srtkenmerk ? "srt" : "");
+    var sql = "SELECT *"
+            + "  FROM " + prefix + "kenmerk"
+            + " WHERE " + prefix + "kenmerk_key = " + params.key;
+    var oRs = Oracle.Execute(sql);
+    var ktyp = oRs(prefix + "kenmerk_kenmerktype").Value;
+    var klen = oRs(prefix + "kenmerk_lengte").Value;
+    var kdec = oRs(prefix + "kenmerk_dec").Value;
+    var kmin = oRs(prefix + "kenmerk_nmin").Value;
+    var kmax = oRs(prefix + "kenmerk_nmax").Value;
+    oRs.Close();
+
+    var valid = true;
+    var value = params.value;
+    var err = ""; //L("lcl_mld_invalid_kenmerk_format");
+
+    if (value != "")
+    {
+        if (ktyp == "D")
+        {
+            // Test of er nu een geldig datumformaat staat.
+            var arr = /^(\d{1,2})[-](\d{1,2})[-](\d{1,4})$/.exec(value);
+            if (arr)
+            {
+                var dt = new Date( arr[3], arr[2] -1, arr[1] );
+                if ((arr[1] != dt.getDate()) ||
+                    (arr[2] != dt.getMonth() + 1) ||
+                    (arr[3] != dt.getYear() && arr[3] != dt.getFullYear()))
+                {
+                    valid = false;
+                }
+                else
+                {
+                    value = ("0" + dt.getDate()).slice(-2) + "-"
+                          + ("0" + (dt.getMonth()+1)).slice(-2) + "-"
+                          + dt.getFullYear();
+                }
+            }
+            else valid = false;
+
+            if (!valid) err = L("mgt_srtkenmerk_err_datum");
+        }
+        else if (ktyp == "C")
+        { // newlines verdubbelen naar %0D%0A dus aantal regels bijtellen
+            if (value.length + (value.split("\n").length-1) > klen)
+            {
+                valid = false;
+                err = L("mgt_srtkenmerk_err_string").format(klen)+ "\n";
+            }
+        }
+        else if (ktyp == "N")
+        {
+            var t;
+            if (kdec)
+            {
+                var l1 = klen-kdec;
+                var l2 = kdec;
+                // Als een punt <20>n een komma in een getal behouden we alleen de laatste
+                if (value.lastIndexOf(".") > value.lastIndexOf(","))
+                {
+                    value = value.replace(/\,/ig, "");
+                }
+                if (value.lastIndexOf(",") > value.lastIndexOf("."))
+                {
+                    value = value.replace(/\./ig, "");
+                }
+                var s = "^\\-?(\\d{1," + l1 + "}[.,]?|\\d{0," + l1 + "}[.,]\\d{1," + l2 + "})$";
+                valid = value.match(new RegExp(s)) && valid;
+                if (valid)
+                {
+                    t = parseFloat(value.replace(",","."));
+                }
+                else
+                {
+                    err = L("mgt_srtkenmerk_err_float") + "\n";
+
+                    var aantal_decimalen = value.length - value.replace(",",".").indexOf(".");
+                    var aantal_helen = value.slice(0, value.replace(",",".").indexOf("."));
+                    if (aantal_decimalen > kdec)
+                    {
+                        valid = false;
+                        err += L("mgt_srtkenmerk_err_fl_dec").format(kdec) + "\n";
+                    }
+                    if (aantal_helen > (klen - kdec))
+                    {
+                        valid = false;
+                        err += L("mgt_srtkenmerk_err_fl_pre").format(klen - kdec) + "\n";
+                    }
+                }
+            }
+            else
+            {
+                if (klen == 1 && kmin == 0 && kmax == 1)
+                {
+                    // Checkbox; waarde in checked is altijd true of false, dus altijd valid.
+                    valid = true;
+                    t = (field.checked?1:0);
+                }
+                else
+                {
+                    var s = "^\\-?\\d{1," + klen + "}[.,]?$";
+                    valid = value.match(new RegExp(s)) && valid;
+                    if (valid)
+                    {
+                        t = parseInt(value);
+                    }
+                    else
+                    {
+                        err = L("mgt_srtkenmerk_err_integer") + "\n";
+                        if (value.length > klen)
+                        {
+                            valid = false;
+                            err += L("mgt_srtkenmerk_err_int_len").format(klen) + "\n";
+                        }
+                    }
+                }
+            }
+            if (valid)
+            {
+                if ( (kmin !== null) && (kmax !== null))
+                {
+                    if ( (t < kmin) || (t > kmax))
+                    {
+                        valid = false;
+                        err += L("mgt_srtkenmerk_err_range").format(kmin, kmax) + "\n";
+                    }
+                }
+                else
+                {
+                    if ((kmin !== null) && (t < kmin))
+                    {
+                        valid = false;
+                        err += L("mgt_srtkenmerk_err_min").format(kmin);
+                    }
+                    if ((kmax !== null) && (t > kmax))
+                    {
+                        valid = false;
+                        err += L("mgt_srtkenmerk_err_max").format(kmax);
+                    }
+                }
+            }
+        }
+    }
+    params.value = (valid ? value : "");
+    params.err = (valid ? "" :err);
+}
+
+// Deze functie vertaalt het positie autorisatieniveau naar tekst
+function buildAlgLevelLOV()
+{
+    AlgLevelLOV = "-1;" + L("lcl_all")
+                + ";0;" + L("lcl_region")
+                + ";1;" + L("lcl_district")
+                + ";2;" + L("lcl_location")
+                + ";3;" + L("lcl_building")
+                + ";4;" + L("lcl_floor")
+                + ";5;" + L("lcl_room")
+                + ";9;" + L("fac_functie_auth_none");
+    return AlgLevelLOV;
+}
+
+function buildPrsLevelLOV()
+{
+    PrsLevelLOV = "-1;" + L("lcl_all")
+                + ";0;" + L("lcl_company")
+                + ";1;" + L("lcl_dep_name_level1")
+                + ";2;" + L("lcl_dep_name_level2")
+                + ";3;" + L("lcl_dep_name_level3")
+                + ";4;" + L("lcl_dep_name_level4")
+                + ";5;" + L("lcl_dep_name_level5")
+                + ";9;" + L("fac_functie_auth_none");
+    return PrsLevelLOV;
+}
+
+function buildStatusList()
+{
+    var statusList = "-1;"
+                   + ";1;" + L("lcl_mld_afgewezen")
+                   + ";6;" + L("lcl_mld_afgemeld");
+    return statusList;
+}
+
+function buildCadPositionLOV()
+    {
+        return "1;"  + L("cad_label_type_bi_rui")
+            + ";9;"  + L("cad_label_type_bi_wp")
+            + ";17;" + L("cad_label_type_bi_obj")
+            + ";2;"  + L("cad_label_type_bu_ts")
+            + ";18;" + L("cad_label_type_bu_obj");
+    }
+
+function buildCadSituationLOV()
+    {
+        return "0;" + L("cad_label_type_si_act")
+            + ";4;" + L("cad_label_type_si_sce");
+    }
+
+%>

APPL/API2/api_about.asp

@@ -0,0 +1,25 @@
+<%@ language = "JavaScript" %>
+<% /*
+    $Revision$
+    $Id$
+
+    File:           api_about.asp
+
+    Description:
+    Parameters:
+    Context:
+
+    Notes:
+*/
+    DOCTYPE_Disable = true;
+    ANONYMOUS_Allowed = 1; // Eigenlijk niet waar. We regelen echter alles zelf
+    THIS_FILE = "appl/api/api_about.asp";
+
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="./api2_rest.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="./model_about.inc" -->
+<%
+    api2_rest.process(model_about);
+%>

APPL/API2/api_authorizationgroups.asp

@@ -0,0 +1,26 @@
+<%@ language = "JavaScript" %>
+<% /*
+    $Revision$
+    $Id$
+
+    File:           api_authorizationgroups.asp
+
+    Description:    ALG_GEBOUW API
+    Parameters:
+    Context:        Door een remote systeem (geen persoon) om info uit FACILITOR te halen aan te roepen
+
+    Notes:          Eigen bestand zodat we internal: true kunnen meegeven
+*/
+    DOCTYPE_Disable = true;
+    ANONYMOUS_Allowed = 1; // Eigenlijk niet waar. We regelen echter alles zelf
+    THIS_FILE = "appl/api/api_authorizationgroups.asp";
+
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="./api2_rest.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="./model_fac_groep.inc" -->
+<%
+    var groep = new model_fac_groep(null, { internal: true }); // internal zodat PUT/POST/DELETE ook kunnen
+    api2_rest.process(groep);
+%>

APPL/API2/api_ins_deelsrtcontrole.asp

@@ -0,0 +1,25 @@
+<%@ language = "JavaScript" %>
+<% /*
+    $Revision$
+    $Id$
+
+    File:           api_ins_deelsrtcontrole.asp
+
+    Description:    Inspecties model
+    Parameters:
+    Context:        Door een remote systeem (geen persoon) om info uit FACILITOR te halen aan te roepen
+
+    Notes:
+*/
+    DOCTYPE_Disable = true;
+    ANONYMOUS_Allowed = 1; // Eigenlijk niet waar. We regelen echter alles zelf
+    THIS_FILE = "appl/api/api_ins_deelsrtcontrole.asp";
+
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="./api2_rest.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="./model_ins_deelsrtcontrole.inc" -->
+<%
+    api2_rest.process(model_ins_deelsrtcontrole);
+%>

APPL/API2/api_locations.asp

@@ -21,5 +21,5 @@
 <!-- #include file="../Shared/json2.js" -->
 <!-- #include file="./model_locations.inc" -->
 <%
-    api2_rest.process(model_locations);
+    api2_rest.process(model_alg_locatie);
 %>

APPL/API2/api_notes.asp

@@ -22,4 +22,5 @@
 <!-- #include file="./model_notes.inc" -->
 <%
     api2_rest.process(new model_notes(getQParam("module", "").toUpperCase()));
+
 %>

APPL/API2/api_orders.asp

@@ -13,7 +13,7 @@
 */
     DOCTYPE_Disable = true;
     ANONYMOUS_Allowed = 1; // Eigenlijk niet waar. We regelen echter alles zelf
-    THIS_FILE = "appl/api/api_orders.asp";
+    THIS_FILE = "appl/api2/api_orders.asp";
 
 %>
 <!-- #include file="../Shared/common.inc" -->

APPL/API2/api_persons.asp

@@ -5,11 +5,11 @@
 
     File:           api_persons.asp
 
-    Description:    PRS_PERSLID API
+    Description:    ALG_GEBOUW API
     Parameters:
     Context:        Door een remote systeem (geen persoon) om info uit FACILITOR te halen aan te roepen
 
-    Notes:
+    Notes:          Eigen bestand zodat we internal: true kunnen meegeven
 */
     DOCTYPE_Disable = true;
     ANONYMOUS_Allowed = 1; // Eigenlijk niet waar. We regelen echter alles zelf
@@ -19,7 +19,8 @@
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="./api2_rest.inc" -->
 <!-- #include file="../Shared/json2.js" -->
-<!-- #include file="./model_persons.inc" -->
+<!-- #include file="./model_prs_perslid.inc" -->
 <%
-    api2_rest.process(model_persons);
+    var perslid = new model_prs_perslid({ internal: true }); // internal zodat PUT/POST/DELETE ook kunnen
+    api2_rest.process(perslid);
 %>

APPL/API2/api_reports.asp

@@ -22,7 +22,9 @@
 <!-- #include file="./model_reports.inc" -->
 <%
     var usrrap_key = getQParamInt("usrrap_key");
-    var model = model_reports(usrrap_key);
 
-    api2_rest.process(model);
+    // Deferred omdat anders de authenticatie te vroeg is
+    var fnmodel = function () { return model_reports(usrrap_key) };
+
+    api2_rest.process(fnmodel);
 %>

APPL/API2/api_settings.asp

@@ -0,0 +1,25 @@
+<%@ language = "JavaScript" %>
+<% /*
+    $Revision$
+    $Id$
+
+    File:           api_settings.asp
+
+    Description:    FAC_SETTING API
+    Parameters:
+    Context:        Door een remote systeem (geen persoon) om info uit FACILITOR te halen aan te roepen
+
+    Notes:
+*/
+    DOCTYPE_Disable = true;
+    ANONYMOUS_Allowed = 1; // Eigenlijk niet waar. We regelen echter alles zelf
+    THIS_FILE = "appl/api2/api_settings.asp";
+
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="./api2_rest.inc" -->
+<!-- #include file="./model_fac_setting.inc" -->
+<%
+    api2_rest.process(model_fac_setting);
+%>

APPL/API2/api_swagger.asp

@@ -0,0 +1,25 @@
+<%@ language = "JavaScript" %>
+<% /*
+    $Revision$
+    $Id$
+
+    File:           api_swagger.asp
+
+    Description:    META API
+    Parameters:
+    Context:
+
+    Notes:
+*/
+    DOCTYPE_Disable = true;
+    ANONYMOUS_Allowed = 1; // Eigenlijk niet waar. We regelen echter alles zelf
+    THIS_FILE = "appl/api/api_swagger.asp";
+
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="./api2_rest.inc" -->
+<!-- #include file="../Shared/json2.js" -->
+<!-- #include file="./model_swagger.inc" -->
+<%
+    api2_rest.process(model_apis);
+%>