DJIN#37002: Verkeerde notificatiecode

svn path=/Website/branches/v2015.2/; revision=29872

APPL/ALG/alg.inc

@@ -281,9 +281,6 @@ alg = {
         alg_gebouwinfo: function _alg_gebouw(alg_gebouw_key)
         {
           var sql = "SELECT g.alg_gebouw_naam"
-                  + "     , g.alg_gebouw_toon_telefoon"
-                  + "     , g.alg_gebouw_toon_email"
-                  + "     , g.alg_gebouw_toon_kenteken"
                   + "     , g.alg_gebouw_code"
                   + "     , g.alg_gebouw_omschrijving"
                   + "     , g.alg_srtgebouw_key"
@@ -312,9 +309,6 @@ alg = {
           {
             result = { alg_gebouw_key: alg_gebouw_key,
                        alg_gebouw_naam: oRs("alg_gebouw_naam").Value,
-                       alg_gebouw_toon_telefoon: oRs("alg_gebouw_toon_telefoon").Value,
-                       alg_gebouw_toon_email: oRs("alg_gebouw_toon_email").Value,
-                       alg_gebouw_toon_kenteken: oRs("alg_gebouw_toon_kenteken").Value,
                        alg_gebouw_code: oRs("alg_gebouw_code").Value,
                        alg_gebouw_omschrijving: oRs("alg_gebouw_omschrijving").Value,
                        alg_srtgebouw_key: oRs("alg_srtgebouw_key").Value,
@@ -394,34 +388,6 @@ 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

@@ -16,7 +16,7 @@
 var JSON_Result = true;
 %>
 <!--#include file="../Shared/common.inc"-->
-<!--#include file="alg.inc" -->
+<!--#include file="../Shared/json2.js" -->
 <%
 protectRequest.validateToken();
 
@@ -35,61 +35,6 @@ 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",
@@ -101,41 +46,41 @@ var table = {D : "ALG_DISTRICT",
              PW: "PRS_PERSLIDWERKPLEK"}[level];
 
 result = { success: true, deleted: true };
-for (var i = 0; i < ingesloten.length; i++)
+for (var i = 0; i < dis_key_arr.length; i++)
 {
-  // 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)
+    // W en WP hebben geen verwijderveld (meer), die gaan echt weg.
+    if (level == "W" || level == "PW")
     {
-      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);
+        // 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] + ")";
     }
-    // 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);
+    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);
 }
 
 Response.Write(JSON.stringify(result));

APPL/ALG/alg_district_list.inc

@@ -9,6 +9,7 @@
     Note:
 */ %>
 
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
 <!-- #include file="alg.inc" -->
@@ -53,18 +54,19 @@ function fnrowData(oRs)
 
   function doDelete(rowArray, isMulti)
   {
-    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");
-      }
-    );
+    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");
+    }
   }
-
 </script>
 <%
 
@@ -130,11 +132,6 @@ 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

@@ -28,16 +28,16 @@ var authparams = alg.checkAutorisation();
           // Submitten met kenmerken
           doSubmitWithKenmerken();
       }
-        function myModal(init)
+        function myModal()
         {
           var lvl = "D";
           var key = 0;
           var bld_key = "";
           var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" +bld_key + "&onrgoed_niveau=" + lvl;
           var titel = "<%=L("lcl_properties")%>";
-          showKenmerkModal(url, titel, init)
+          showKenmerkModal(url, titel)
         }
-            $(function() {<% if (autosearch) { %> document.forms.u2.submit();<%}%>});
+            $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit();<%}%>});
         </script>
 </head>
   <body id="searchbody">
@@ -52,22 +52,18 @@ var authparams = alg.checkAutorisation();
                                                                   regiokey: regio_key,
                                                                   districtkey: district_key,
                                                                   startlevel: 0, // Regio
-                                                                  eindlevel: 0, // Regio
+                                                                  eindlevel: 1, // District
                                                                   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">
             </td><!-- end column 1 -->
           </tr>
 <%    BLOCK_END();
-  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch", importance: 1 },
-                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced", importance: 3 } ];
+  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
+                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
   CreateButtons(buttons, { entersubmit: true }); %>
     </form>
 

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,14 +23,12 @@ 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),
-                 distr_descr: distr_descr
+                 dis_key: (dis_key != -1? dis_key : null)
               }
              );
 %>

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", "&nbsp;");
+  BLOCK_START("algInfo", "");
       FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel, {
             districtkey: dis_key,
             startlevel: 0, // Regio

APPL/ALG/alg_edit_district_save.asp

@@ -55,32 +55,22 @@ else
                             "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                             "    AND ALG_ONRGOED_NIVEAU = 'D' " +
                             "    AND ALG_ONRGOED_KEY = " + dis_key;
-      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
-                        });
+      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")
 }
   %>
 <html>
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(function ()
-        {
-          FcltMgr.closeDetail(window, { dis_key: <%=dis_key%>,
-                                        warning: "<%=safe.jsstring(warning)%>",
-                                        keepForm: <%=warning?"true":"false"%>
-                                      });
-        });
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { dis_key: <%=dis_key%>,
+                                          warning: "<%=safe.jsstring(warning)%>",
+                                          keepForm: <%=warning?"true":"false"%>
+                                         }); } );
     </script>
   </head>
   <body>

APPL/ALG/alg_edit_gebouw.asp

@@ -14,20 +14,17 @@
 */ %>
 <!-- #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" -->
-<!-- #include file="../API2/api2.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
 <!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({plugins:["suggest","jQuery", "kenmerk"], js: []})
 
-var ins_score_enabled = S("ins_score_enabled") == 1;
 var bld_key  = getQParamInt("bld_key");
 
 var onrgoedlvl = "G";
@@ -49,7 +46,6 @@ 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;
@@ -67,22 +63,11 @@ if (bld_key > 0)
   var beginuur   = oRs("alg_gebouw_beginuur").Value;
   var einduur    = oRs("alg_gebouw_einduur").Value;
   var werkdagen  = oRs("alg_gebouw_werkdagen").Value;
-  var toon_telefoon  = oRs("alg_gebouw_toon_telefoon").Value;
-  var toon_email     = oRs("alg_gebouw_toon_email").Value;
-  var toon_kenteken  = oRs("alg_gebouw_toon_kenteken").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;
-  var geb_score1 = oRs("alg_gebouw_mjb_score1").value;
   oRs.Close();
 }
 else
-{
   var werkdagen = 1;
-  var toon_telefoon  = 0;
-  var toon_email     = 0;
-  var toon_kenteken  = 0;
-}
 %>
 
 <html>
@@ -123,7 +108,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", "&nbsp;");
+        BLOCK_START("algLoc1", "");
         FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel,
                            { gebouwkey: bld_key,
                              startlevel: 2, //Locatie
@@ -131,7 +116,7 @@ else
                              readonly: bld_key > 0,
                              required: true
                            });
-        manRWFIELD("bld_naam",  "fld",          L("lcl_estate_gebouw_man_name"),        bld_naam, {required: true, maxlength: 60});
+        manRWFIELD("bld_naam",  "fld",          L("lcl_estate_gebouw_man_name"),        bld_naam, {required: true, maxlength: 30});
         sql = "SELECT   alg_srtgebouw_key, "
             + "         "+lcl.xsqla('alg_srtgebouw_omschrijving', 'alg_srtgebouw_key')
             + "    FROM alg_srtgebouw "
@@ -173,45 +158,27 @@ 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", "&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, datatype: "float"});
-          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true, datatype: "float"});
-          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true, datatype: "float"});
-        }
-        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, {datatype: "float", maxlength: 15});
-        manRWFIELD("bld_inhoud",  "fld",          L("lcl_estate_gebouw_man_inhoud"),        bld_inhoud, {datatype: "float", maxlength: 15});
-        FCLTadresselector("mld_adres", "sgAdres",
-                    {
-                       label: L("lcl_delivery_address"),
-                       adresKey:  mld_adres,
+        BLOCK_START("algLoc2", "");
+        manRWFIELD("bld_opp",  "fld",          L("lcl_estate_gebouw_man_bruto_vloeropp"),        bld_opp, {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,
                        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
                      });
-
+        manRWFIELD("bld_x",  "fld",          L("lcl_geoxcoord"),        bld_x, {maxlength: 25});
+        manRWFIELD("bld_y",  "fld",          L("lcl_geoycoord"),        bld_y, {maxlength: 25});
+        if (this_alg.writeman)
+          CHECKBOXTR(L("lcl_estate_gebouw_bez"), "fldalgbez", "bld_bez", bld_bez==1)
         var times = [];
         for (i=0; i<24; i++)
         {
@@ -237,41 +204,8 @@ else
                       );
         if (this_alg.writeman)
           CHECKBOXTR(L("lcl_estate_gebouw_werkdagen"), "fldalgwerk", "bld_werkdagen", werkdagen==1)
-        if (ins_score_enabled)
-          ROFIELDTR("fld", L("lcl_alg_gebouw_mjb_score1"), geb_score1, {suppressEmpty: true});
-
         BLOCK_END();
 
-        if (user.checkAutorisation("WEB_BEZMGT", true))
-        {
-          BLOCK_START("algLoc3", L("lcl_vis_Details"), { extraclass: "clear-both" });
-
-          if (this_alg.writeman)
-            CHECKBOXTR(L("lcl_estate_gebouw_bez"), "fldalgbez", "bld_bez", bld_bez==1);
-          var sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toontelfLOV"));
-          FCLTselector("toon_telefoon",
-                       sql,
-                       { label: L("lcl_estate_gebouw_toon_telefoon"),
-                         initKey: toon_telefoon,
-                         extraclass: "notmulti"
-                       });
-          sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonmailLOV"));
-          FCLTselector("toon_email",
-                      sql,
-                      { label: L("lcl_estate_gebouw_toon_email"),
-                        initKey: toon_email,
-                        extraclass: "notmulti"
-                      });
-          sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonkentLOV"));
-          FCLTselector("toon_kenteken",
-                      sql,
-                      { label: L("lcl_estate_gebouw_toon_kenteken"),
-                        initKey: toon_kenteken,
-                        extraclass: "notmulti"
-                      });
-          BLOCK_END();
-        }
-
         generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,
                                     onrgoed_niveau : onrgoedlvl,
                                     reado          : false,

APPL/ALG/alg_edit_gebouw_multi.asp

@@ -1,310 +0,0 @@
-<%@language = "javascript" %>
-<% /*
-     $Revision$
-     $Id$
-
-    File:               alg_edit_gebouw_multi.asp
-    Description:        Multi editten van gebouwen
-    Parameters:         key
-
-    Context:            alg_gebouw_search_list.asp
-    Note:               De minimale multi-edit velden
-
-*/ %>
-<!-- #include file="../Shared/common.inc" -->
-<!-- #include file="../Shared/iface.inc" -->
-<!-- #include file="../Shared/calendar.inc" -->
-<!-- #include file="../Shared/selector.inc" -->
-<!-- #include file="../Shared/save2db.inc" -->
-<!-- #include file="../Shared/persoonselector.inc" -->
-<!-- #include file="../Shared/kostenplaatsselector.inc" -->
-<!-- #include file="../Shared/kenmerk_common.inc" -->
-<!-- #include file="../API2/api2.inc" -->
-<!-- #include file="./alg_flexkenmerk.inc" -->
-<!-- #include file="alg.inc" -->
-
-<%
-FCLTHeader.Requires({ plugins:["suggest", "jQuery", "kenmerk"] });
-
-var bld_key_arr = getQParamIntArray("bld_keys");
-var submitting = getQParamInt("submit", 0) == 1;
-
-var warning = "";
-var result = {};
-var tobeedited = 0;
-var ingesloten = [];
-// Bepaal de gebouwen in de selectie die
-// ook echt gewijzigd kunnen of mogen worden.
-var onrgoedlvl = "G";
-for (var i = 0; i < bld_key_arr.length; i++)
-{
-  var this_alg = alg.func_enabled(bld_key_arr[i], onrgoedlvl);
-  if (this_alg.writeman || this_alg.writeuse)
-  {
-    ingesloten.push(bld_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(ingesloten.length); // We klagen niet over enkele wel en enkele niet
-%>
-
-<html>
-  <head>
-<%  FCLTHeader.Generate(); %>
-<%
-    if (submitting)
-    {
-      var fields = [];
-      if (Request.Form("prs_kstpl").Count == 1 && getFParam("check_prs_kstpl", "off") == "on")
-        fields.push({ dbs: "prs_kostenplaats_key",  typ: "key",   frm: "prs_kstpl",  track: L("lcl_prs_dept_kosten"),  foreign: "prs_kostenplaats" });
-      if (Request.Form("verantw").Count == 1 && getFParam("check_verantw", "off") == "on")
-        fields.push({ dbs: "prs_perslid_key_verantw",  typ: "key",   frm: "verantw",  track: L("lcl_alg_verantw"),  foreign: "prs_perslid" });
-      if (Request.Form("verantw2").Count == 1 && getFParam("check_verantw2", "off") == "on")
-        fields.push({ dbs: "prs_perslid_key_verantw2",  typ: "key",   frm: "verantw2", track: L("lcl_alg_verantw2"), foreign: "prs_perslid" });
-      if (Request.Form("vervaldatum").Count == 1 && getFParam("check_vervaldatum", "off") == "on")
-        fields.push({ dbs: "alg_gebouw_vervaldatum",  typ: "date",   frm: "vervaldatum", track: L("lcl_alg_vervaldatum") });
-      if (Request.Form("toon_telefoon").Count == 1 && getFParam("check_toon_telefoon", "off") == "on")
-        fields.push({ dbs: "alg_gebouw_toon_telefoon",  typ: "number",   frm: "toon_telefoon", track: L("lcl_estate_gebouw_toon_telefoon") });
-      if (Request.Form("toon_email").Count == 1 && getFParam("check_toon_email", "off") == "on")
-        fields.push({ dbs: "alg_gebouw_toon_email",  typ: "number",   frm: "toon_email", track: L("lcl_estate_gebouw_toon_email") });
-      if (Request.Form("toon_kenteken").Count == 1 && getFParam("check_toon_kenteken", "off") == "on")
-        fields.push({ dbs: "alg_gebouw_toon_kenteken",  typ: "number",   frm: "toon_kenteken", track: L("lcl_estate_gebouw_toon_kenteken") });
-
-      for (var i = 0; i < ingesloten.length; i++)
-      { // Ik mag het object wijzigen dus voer wijziging uit
-        if (fields.length)
-        {
-            var algUpd = buildTrackingUpdate("alg_gebouw", " alg_gebouw_key = " + ingesloten[i], fields);
-            // Submit the changed data
-            var err = Oracle.Execute(algUpd.sql, true);
-            if (err.friendlyMsg)
-                warning = err.friendlyMsg;
-        }
-        else
-            algUpd = { trackarray: [] };
-
-        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 = 'G'"
-                            + "   AND ok.alg_onrgoed_key = " + ingesloten[i];
-
-        allKenmerkenSQL     = "SELECT " + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key') + " kenmerk_omschrijving"
-                            + ",      k.alg_kenmerk_kenmerktype kenmerk_kenmerktype"
-                            + ",      k.alg_kenmerk_systeem     kenmerk_systeem"
-                            + ",      k.alg_kenmerk_toonbaar    kenmerk_readonly"
-                            + ",      k.alg_kenmerk_uniek       kenmerk_uniek"
-                            + ",      fac_kenmerkdomein_key"
-                            + "  FROM alg_kenmerk k"
-                            + " WHERE k.alg_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
-
-        var flextrack = saveFlexKenmerken(ingesloten[i],
-                          { kenmerkTable: "alg_onrgoedkenmerk",
-                            kenmerkParentKey : "alg_onrgoed_key",
-                            kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
-                            kenmerkKey: "alg_kenmerk_key",
-                            currentKenmerkenSQL: currentKenmerkenSQL,
-                            allKenmerkenSQL: allKenmerkenSQL,
-                            requestQF: Request.Form,
-                            flexPath: "ALG/G",
-                            multiMode: true,
-                            tracking: true,
-                            module: "ALG",
-                            moduleName: "alg_onrgoed_niveau",
-                            moduleVal: "G",
-                            isNew: false
-                          });
-
-//        /* flextrackarray = */ ins.updateKenmerkdeel(ingesloten[i], {multimode: true});
-
-        var update_string = L("lcl_alg_is_alggup") + "\n" + algUpd.trackarray.join("\n");
-        if (flextrack && flextrack.length)
-          update_string += flextrack.join("\n");
-        shared.trackaction("ALGGUP", ingesloten[i], update_string);
-      }
-
-%>    <script type="text/javascript">
-        $(function()
-        {
-          FcltMgr.closeDetail(window, { success: true } )
-        });
-      </script>
-<%    Response.End();
-    }
-%>
-
-    <script type="text/javascript">
-      function alg_submit()
-      { // Invoer van velden wordt realtime gevalideerd.
-        document.forms.u2.submit();
-        return true; // disable button
-      }
-
-      function alg_cancel()
-      {
-        FcltMgr.closeDetail(window, { cancel: true } );
-      }
-    </script>
-  </head>
-
-  <body class="modal" id="mod_algmultiedit">
-    <form name="u2" action="alg_edit_gebouw_multi.asp?submit=1&bld_keys=<%=ingesloten.join(",")%>" method="post">
-<%
-      BLOCK_START("algGebouw", L("lcl_alg_gebouw_frame"));
-      FCLTkostenplaatsselector(  "prs_kstpl",
-                                 "prs_kstpl",
-                                 user_key,
-                                { kostenplaatsKey: -1,
-                                 label: L("lcl_prs_dept_kosten"),
-                                 filtercode: "G",
-                                 readonly: !last_this_alg.writeman
-                                });
-      FCLTpersoonselector("verantw",
-                          "sgVerantw",
-                          { perslidKey: -1,
-                            label: L("lcl_alg_verantw"),
-                            readonly: !last_this_alg.writeuse,
-                            autlevel: last_this_alg.authparams("WEB_ALGMAN") && last_this_alg.authparams("WEB_ALGMAN").PRSwritelevel
-                          });
-      FCLTpersoonselector("verantw2",
-                          "sgVerantw2",
-                          { perslidKey: -1,
-                            label: L("lcl_alg_verantw2"),
-                            readonly: !last_this_alg.writeuse,
-                            autlevel: last_this_alg.authparams("WEB_ALGMAN") && last_this_alg.authparams("WEB_ALGMAN").PRSwritelevel
-                          });
-      FCLTcalendar("vervaldatum",
-                   { initEmpty: true,
-                     label: L("lcl_alg_vervaldatum"),
-                     volgnr: 1,
-                     onChange: "DateChangedVerval()",
-                     readonly: !last_this_alg.writeman
-                   });
-
-      var sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toontelfLOV"));
-      FCLTselector("toon_telefoon",
-                  sql,
-                  { label: L("lcl_estate_gebouw_toon_telefoon"),
-                    initEmpty: true
-                  });
-      sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonmailLOV"));
-      FCLTselector("toon_email",
-                 sql,
-                 { label: L("lcl_estate_gebouw_toon_email"),
-                   initEmpty: true
-                 });
-      sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonkentLOV"));
-      FCLTselector("toon_kenteken",
-                 sql,
-                 { label: L("lcl_estate_gebouw_toon_kenteken"),
-                   initEmpty: true
-                 });
-      BLOCK_END();
-
-      generateFlexKenmerkBlock({
-          fnpre: function () {BLOCK_START("algMultiEdit", L("lcl_flexible_properties"));},
-          fnpost: BLOCK_END,
-          onrgoed_niveau: "G",
-          onrgoed_key: -1,
-          this_alg: last_this_alg,
-          reado: false,
-          multi: true,
-          flexcolumns: 1 // altijd want popup
-        });
-%>
-      <script type="text/javascript">
-
-        function DateChangedVerval()
-        {
-          if ($("#show_vervaldatum").is(":checkbox"))
-            var isgevuld = $("#show_vervaldatum").is(":checked")
-          else
-            var isgevuld = $("#show_vervaldatum").val();
-          $("input[type=checkbox][name=check_vervaldatum]").prop("checked", isgevuld);
-        }
-
-        function putCheckmarkSuggest(prs_key, prs_txt, obj)
-        {
-          thisobj = $("#"+obj.suggestid);
-          if (thisobj.is(":checkbox"))
-            var isgevuld = thisobj.is(":checked")
-          else
-            var isgevuld = thisobj.val();
-
-          if (thisobj.hasClass("flddate"))
-            var cb_name = "check_" + thisobj.attr("id").substr("show_".length);
-          else if (thisobj.hasClass("suggest"))
-            var cb_name = "check_" + thisobj.attr("id").substr(0, thisobj.attr("id").length-5);
-          else
-            var cb_name = "check_" + thisobj.attr("name");
-          $("input[type=checkbox][name=" + cb_name + "]").prop("checked", isgevuld);
-          // Eventuele andere onChange acties van een selecter hieronder toevoegen.
-        };
-
-        $(function()
-        { // Een vinkboxje voor de invoer velden toevoegen.
-          // Niet een vinkboxje toevoegen voor de flexkenmerken. Dat doet generateFlexKenmerkBlock.listKenmerk wel.
-          $("input[type=text],input[type=checkbox],input[type=number],input:not([type]),select, textarea").not(".fldtime").not("[class^='fldflex']").not("[class^='fldSflex']").not("[name^='check_']").each(
-            function() {
-                         if ($(this).hasClass("flddate"))
-                           var cb_name = "check_" + $(this).attr("id").substr("show_".length);
-                         else if ($(this).hasClass("suggest"))
-                           var cb_name = "check_" + $(this).attr("id").substr(0, $(this).attr("id").length-5);
-                         else
-                           var cb_name = "check_" + $(this).attr("name");
-                         var cb = $("<input type='checkbox'>").attr("name", cb_name);
-                         var td = $("<td class='multi_cb'></td>").append(cb);
-                         $(this).closest("tr").find("        td.label").before(td);
-
-                         // Zetten vinkje als je waarde invult
-                         if ($(this).hasClass('suggest'))
-                         { // Suggest veld: Functie putCheckmarkSuggest() aan sgonchange koppelen.
-                           this.setAttribute("sgonchange", "putCheckmarkSuggest");
-                         }
-                         else if ($(this).hasClass("flddate"))
-                         {
-                           // De FCLTcalendar vervaldatum heeft zijn eigen onChange functie die wordt aangeroepen.
-                           // Geen change functie aan het datum veld koppelen.
-                         }
-                         else
-                         { // Andere velden dan suggest veld.
-                           $(this).change(function()
-                                          {
-                                            if ($(this).is(":checkbox"))
-                                              var isgevuld = $(this).is(":checked")
-                                            else
-                                              var isgevuld = $(this).val();
-                                            $("input[type=checkbox][name=" + cb_name + "]").prop("checked", isgevuld);
-                                          });
-                                 }
-
-                         // Wissen waarde als je vinkje weghaalt
-                         cb.change(function(deze) {
-                                                    return function() {
-                                                                        if (!$(this).is(":checked"))
-                                                                          $(deze).val("");
-                                                                        else if ($(deze).hasClass("required"))
-                                                                          // Vinkje is aangevinkt en waarde is leeg.
-                                                                          // Als het veld verplicht is het vinkje er weer afhalen.
-                                                                          $(this).prop("checked", false);
-                                                                      }
-                                                  }(this));
-                       });
-        });
-
-      </script>
-<%
-      var buttons =  [];
-      buttons.push({title: L("lcl_submit"), action:"alg_submit()", singlepress: true, id: "btn_edit_submit", importance: 1})
-      buttons.push({title: L("lcl_cancel"),  action:"alg_cancel()", importance: 3})
-      CreateButtons(buttons)
-      IFACE.FORM_END();
-%>
-    </form>
-  </body>
-</html>

APPL/ALG/alg_edit_gebouw_save.asp

@@ -34,11 +34,10 @@ 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: "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_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_opmerking",      typ: "varchar", frm: "bld_opmerk" },
                   { dbs: "mld_adres_key",             typ: "key",     frm: "mld_adres" },
                   { dbs: "prs_kostenplaats_key",      typ: "key",     frm: "prs_kstpl" },
@@ -50,12 +49,7 @@ 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: "alg_gebouw_toon_telefoon",  typ: "number",  frm: "toon_telefoon" },
-                  { dbs: "alg_gebouw_toon_email",     typ: "number",  frm: "toon_email" },
-                  { dbs: "alg_gebouw_toon_kenteken",  typ: "number",  frm: "toon_kenteken" },
-                  { 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" }];
+                  { dbs: "prs_perslid_key_verantw",   typ: "key",     frm: "verantw" }];
 
   if (beginuur != -2)
     fields.push({ dbs: "alg_gebouw_beginuur",       typ: "float",   val: beginuur });
@@ -93,19 +87,11 @@ 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,
-                        { 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
-                        });
+      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")
   }
 %>
 
@@ -113,13 +99,11 @@ user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse))
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(function ()
-        {
-          FcltMgr.closeDetail(window, { bld_key: <%=bld_key%>,
-                                        warning: "<%=safe.jsstring(warning)%>",
-                                        keepForm: <%=warning?"true":"false"%>
-                                      });
-        });
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { bld_key: <%=bld_key%>,
+                                          warning: "<%=safe.jsstring(warning)%>",
+                                          keepForm: <%=warning?"true":"false"%>
+                                         }); } );
     </script>
   </head>
   <body>

APPL/ALG/alg_edit_locatie.asp

@@ -13,7 +13,6 @@
 */ %>
 <!--#include file="../Shared/common.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!-- #include file="../Shared/calendar.inc" -->
 
 <!--#include file="../Shared/selector.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
@@ -23,7 +22,6 @@
 <%
 FCLTHeader.Requires({plugins:["suggest","jQuery","kenmerk"], js: []})
 
-var ins_score_enabled = S("ins_score_enabled") == 1;
 var loc_key  = getQParamInt("loc_key", -1);
 var dis_key
 
@@ -55,9 +53,7 @@ if (loc_key > 0)
     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 dienstniveau  = oRs("mld_dienstniveau_key").value;
-    var loc_score1 = oRs("alg_locatie_mjb_score1").value;
-    var vervaldatum = oRs("alg_locatie_vervaldatum").Value != null ? new Date(oRs("alg_locatie_vervaldatum").Value) : null;
+  var dienstniveau  = oRs("mld_dienstniveau_key").value;
 
     oRs.Close();
 }
@@ -101,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", "&nbsp;");
+BLOCK_START("algLoc1", "");
       FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel, {
           districtkey: dis_key,
           locatiekey: loc_key,
@@ -133,14 +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", "&nbsp;");
-
-FCLTcalendar("vervaldatum",
-             { datum: vervaldatum,
-               initEmpty: vervaldatum==null,
-               label: L("lcl_alg_vervaldatum"),
-               readonly: !this_alg.writeman
-             });
+BLOCK_START("algLoc2", "");
 
 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});
@@ -149,8 +138,6 @@ manRWFIELD("pst_land",  "fld",          L("lcl_prs_address_post_land"),        p
 manRWFIELD("loc_vw",  "fld",          L("lcl_estate_locatie_man_verantw"),        loc_vw, {maxlength: 30});
 manRWFIELD("loc_vwtel",  "fld",          L("lcl_estate_locatie_man_verantw_tel"),        loc_vwtel, {maxlength: 15});
 manRWFIELD("loc_mail",  "fld",          L("lcl_noti_email"),        loc_mail, {maxlength: 200});
-if (ins_score_enabled)
-  ROFIELDTR("fld",                        L("lcl_alg_locatie_mjb_score1"),        loc_score1, {suppressEmpty: true});
 
 BLOCK_END();
 

APPL/ALG/alg_edit_locatie_save.asp

@@ -37,7 +37,6 @@ user.auth_required_or_abort(this_alg.writeman || (loc_key>0&&this_alg.writeuse))
                   { dbs: "MLD_DIENSTNIVEAU_KEY",          typ: "key",      frm: "dienstniveau" },
                   { dbs: "alg_locatie_x", typ: "float",  frm: "loc_x" },
                   { dbs: "alg_locatie_y", typ: "float",  frm: "loc_y" },
-                  { dbs: "alg_locatie_vervaldatum", typ: "date", frm: "vervaldatum",  track: L("lcl_alg_vervaldatum") },
                   { dbs: "alg_locatie_email", typ: "varchar",  frm: "loc_mail" }];
 
 var warning = "";
@@ -71,19 +70,11 @@ else
                             "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                             "    AND ALG_ONRGOED_NIVEAU = 'L' " +
                             "    AND ALG_ONRGOED_KEY = " + loc_key;
-      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
-                        });
+      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")
 }
   %>
 
@@ -91,13 +82,11 @@ else
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(function ()
-        {
-          FcltMgr.closeDetail(window, { loc_key: <%=loc_key%>,
-                                        warning: "<%=safe.jsstring(warning)%>",
-                                        keepForm: <%=warning?"true":"false"%>
-                                      });
-        });
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { loc_key: <%=loc_key%>,
+                                          warning: "<%=safe.jsstring(warning)%>",
+                                          keepForm: <%=warning?"true":"false"%>
+                                         }); } );
     </script>
   </head>
   <body>

APPL/ALG/alg_edit_regio.asp

@@ -23,10 +23,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: []})
 
 var regio_key = getQParamInt("regio_key");
 
-var params = { filter:  { id: regio_key,
-                          isNew: (regio_key == -1 ? true : false)
-                        }
-             };
+var params = { filter:  { id: regio_key }};
 var regio_array = model_regions.REST_GET(params);              // Roep de API2 GET aan
 var regio_data = (regio_array[0] ? regio_array[0] : {id: -1}); // GET kan meerdere records opleveren, maar we verwachten hier maar 1.
 var this_alg = params.func_enabled;                            // params bevat nu ook waarden die in API2 zijn bepaald.
@@ -76,7 +73,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_regio_save.asp

@@ -12,6 +12,7 @@ var JSON_Result = true;
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../API2/api2.inc" -->
 <!-- #include file="../API2/model_regions.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <%
 protectRequest.validateToken();
 var regio_key = getQParamInt( "regio_key" );

APPL/ALG/alg_edit_ruimte.asp

@@ -15,6 +15,7 @@
 <!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
 <!-- #include file="../API2/api2.inc" -->
 <!-- #include file="../API2/model_rooms.inc" -->
@@ -117,7 +118,7 @@ if (!room_exists)
         else
             useRWFIELD = manRWFIELD
 
-        BLOCK_START("algLoc1", "&nbsp;");
+        BLOCK_START("algLoc1", "");
 
           FCLTplaatsselector( this_alg.authparams("WEB_RUIMAN").ALGwritelevel,
                               { locatiekey: loc_key,
@@ -160,17 +161,17 @@ if (!room_exists)
                         });
 
         BLOCK_END();
-        BLOCK_START("algLoc2", "&nbsp;");
+        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, {datatype: "float"});
+          ROFIELDTR("fldshort", L("lcl_estate_ruimte_getekendopp"), room_data.cadcontours[0].cadarea);
           if (S("fg_contourlayers_alt1")!="" && S("fg_labellayers_alt1")!="") {
             manRWFIELD("room_oppa1",  "fldshort", L("lcl_estate_ruimte_opp_alt1"),       room_data.area1, {maxlength: 10, datatype: "float"});
-            ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt1"), room_data.cadcontours[0].cadalt1, {datatype: "float"});
+            ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt1"), room_data.cadcontours[0].cadalt1);
           }
           if (S("fg_contourlayers_alt2")!="" && S("fg_labellayers_alt2")!="") {
             manRWFIELD("room_oppa2",  "fldshort", L("lcl_estate_ruimte_opp_alt2"),       room_data.area2, {maxlength: 10, datatype: "float"});
-            ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt2"), room_data.cadcontours[0].cadalt2, {datatype: "float"});
+            ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt2"), room_data.cadcontours[0].cadalt2);
           }
           manRWFIELD("room_omt",  "fldshort",     L("lcl_estate_ruimte_man_omtrek"),     room_data.perimeter, {maxlength: 10, datatype: "float"});
           manRWFIELD("room_inh",  "fldshort",     L("lcl_estate_ruimte_man_inhoud"),     room_data.volume,  {maxlength: 13, datatype: "float"});
@@ -193,7 +194,6 @@ 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

@@ -1,212 +0,0 @@
-<%@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/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 () { $("select option[value=-1]").val(""); }); // prevents removal of values from listboxes
-        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", importance: 1});
-    buttons.push({title: L("lcl_cancel"), action: "alg_cancel()", importance: 3});
-    CreateButtons(buttons);
-IFACE.FORM_END();
-%>
-    </form>
-  </body>
-</html>

APPL/ALG/alg_edit_ruimte_multi_save.asp

@@ -1,91 +0,0 @@
-<%@ 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/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"
-                            + ",      k.alg_kenmerk_kenmerktype kenmerk_kenmerktype"
-                            + ",      k.alg_kenmerk_systeem     kenmerk_systeem"
-                            + ",      k.alg_kenmerk_toonbaar    kenmerk_readonly"
-                            + ",      k.alg_kenmerk_uniek       kenmerk_uniek"
-                            + ",      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_ruimte_save.asp

@@ -13,6 +13,7 @@ var JSON_Result = true;
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../API2/api2.inc" -->
 <!-- #include file="../API2/model_rooms.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 
 <%
 protectRequest.validateToken();

APPL/ALG/alg_edit_ruimtefunctie.asp

@@ -63,7 +63,7 @@ if (srtruimte_lg_key > -1)
 <html>
   <head>
 <%  FCLTHeader.Generate(); %>
-    <script type="text/javascript">
+    <script  type="text/javascript" >
       function ruimtefunctie_submit()
       {
         document.activeElement.blur(); // trigger laatste onChanges
@@ -79,10 +79,10 @@ if (srtruimte_lg_key > -1)
         FcltMgr.closeDetail(window, { cancel: true } );
       }
 
-      $(function()
-      {
-        FcltMgr.resized(window);
-      });
+      jQuery(document).ready(function()
+                             {
+                               FcltMgr.resized(window);
+                             });
     </script>
   </head>
 

APPL/ALG/alg_edit_ruimtefunctie_save.asp

@@ -90,12 +90,11 @@ __Log("srtruimte_lg_key = " + srtruimte_lg_key);
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(function ()
-        {
-          FcltMgr.closeDetail(window, { warning: "<%=safe.jsstring(warning)%>",
-                                        refresh: true
-                                      });
-        });
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { warning: "<%=safe.jsstring(warning)%>",
+                                          refresh: true
+                                         });
+         } );
     </script>
   </head>
   <body>

APPL/ALG/alg_edit_terreinsector.asp

@@ -14,12 +14,10 @@
 <!--#include file="../Shared/common.inc" -->
 <!--#include file="../Shared/iface.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!-- #include file="../Shared/calendar.inc" -->
 
 <!--#include file="../Shared/plaatsselector.inc" -->
 <!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!--#include file="../Shared/afdelingselector.inc" -->
-<!-- #include file="../API2/api2.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
 <!-- #include file="alg.inc" -->
 
@@ -44,10 +42,6 @@ if (ter_key > 0)
         + ", alg_terreinsector_omtrek"
         + ", alg_terreinsector_aanmaak"
         + ", alg_terreinsector_ordernr"
-        + ", alg_terreinsector_toon_telef"
-        + ", alg_terreinsector_toon_email"
-        + ", alg_terreinsector_toon_kentk"
-        + ", alg_terreinsector_vervaldatum"
         + ", prs_kostenplaats_key"
         + ", prs_afdeling_key"
         + "  FROM alg_terreinsector "
@@ -66,19 +60,9 @@ if (ter_key > 0)
       var ter_ordnr = oRs("ALG_TERREINSECTOR_ORDERNR").value;
       var prs_kstn  = oRs("PRS_KOSTENPLAATS_KEY").value;
       var prs_afd   = oRs("PRS_AFDELING_KEY").value;
-      var toon_telefoon  = oRs("ALG_TERREINSECTOR_TOON_TELEF").Value;
-      var toon_email     = oRs("ALG_TERREINSECTOR_TOON_EMAIL").Value;
-      var toon_kenteken  = oRs("ALG_TERREINSECTOR_TOON_KENTK").Value;
-      var vervaldatum = oRs("ALG_TERREINSECTOR_VERVALDATUM").Value != null ? new Date(oRs("ALG_TERREINSECTOR_VERVALDATUM").Value) : null;
 
     oRs.Close();
 }
-else
-{
-  var toon_telefoon  = 0;
-  var toon_email     = 0;
-  var toon_kenteken  = 0;
-}
 %>
 
 <html>
@@ -163,35 +147,6 @@ BLOCK_START("algInfo", "");
   RWFIELDTR("ter_opp", "fld", L("lcl_estate_terreinsector_man_oppervlak"), ter_opp, {maxlength: 15});
   RWFIELDTR("ter_omt", "fld", L("lcl_estate_terreinsector_man_omtrek"), ter_omt, {maxlength: 15});
 
-  FCLTcalendar("vervaldatum",
-               { datum: vervaldatum,
-                 initEmpty: vervaldatum==null,
-                 label: L("lcl_alg_vervaldatum"),
-                 readonly: !this_alg.writeman
-               });
-
-  var sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toontelfLOV"));
-  FCLTselector("toon_telefoon",
-              sql,
-              { label: L("lcl_estate_gebouw_toon_telefoon"),
-                initKey: toon_telefoon,
-                extraclass: "notmulti"
-              });
-  sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonmailLOV"));
-  FCLTselector("toon_email",
-             sql,
-             { label: L("lcl_estate_gebouw_toon_email"),
-               initKey: toon_email,
-               extraclass: "notmulti"
-             });
-  sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonkentLOV"));
-  FCLTselector("toon_kenteken",
-             sql,
-             { label: L("lcl_estate_gebouw_toon_kenteken"),
-               initKey: toon_kenteken,
-               extraclass: "notmulti"
-             });
-
 BLOCK_END();
 
 generateFlexKenmerkBlock ({

APPL/ALG/alg_edit_terreinsector_save.asp

@@ -29,10 +29,6 @@ user.auth_required_or_abort(this_alg.writeman || (ter_key>0&&this_alg.writeuse))
                   { dbs: "ALG_TERREINSECTOR_OPPERVLAK", typ: "float",  frm: "ter_opp" },
                   { dbs: "ALG_TERREINSECTOR_OMTREK", typ: "float",  frm: "ter_omt" },
                   { dbs: "ALG_TERREINSECTOR_ORDERNR", typ: "varchar",  frm: "ter_ordnr" },
-                  { dbs: "ALG_TERREINSECTOR_VERVALDATUM", typ: "date", frm: "vervaldatum",  track: L("lcl_alg_vervaldatum") },
-                  { dbs: "ALG_TERREINSECTOR_TOON_TELEF",  typ: "number",  frm: "toon_telefoon" },
-                  { dbs: "ALG_TERREINSECTOR_TOON_EMAIL",  typ: "number",  frm: "toon_email" },
-                  { dbs: "ALG_TERREINSECTOR_TOON_KENTK",  typ: "number",  frm: "toon_kenteken" },
                   { dbs: "PRS_KOSTENPLAATS_KEY", typ: "key",  frm: "prs_kstn" },
                   { dbs: "PRS_AFDELING_KEY", typ: "key", frm: "prs_afd" }];
 
@@ -92,19 +88,11 @@ else
                             "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                             "    AND ALG_ONRGOED_NIVEAU = 'T' " +
                             "    AND ALG_ONRGOED_KEY = " + ter_key;
-      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
-                        });
+      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")
 }
   %>
 
@@ -112,13 +100,11 @@ else
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(function ()
-        {
-          FcltMgr.closeDetail(window, { ter_key: <%=ter_key%>,
-                                        warning: "<%=safe.jsstring(warning)%>",
-                                        keepForm: <%=warning?"true":"false"%>
-                                      });
-        });
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { ter_key: <%=ter_key%>,
+                                          warning: "<%=safe.jsstring(warning)%>",
+                                          keepForm: <%=warning?"true":"false"%>
+                                         }); } );
     </script>
   </head>
   <body>

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", "&nbsp;");
+BLOCK_START("algLoc1", "");
       FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel, {
               locatiekey: loc_key,
               gebouwkey: bld_key,
@@ -113,16 +113,6 @@ BLOCK_START("algLoc1", "&nbsp;");
 
 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, datatype: "float"});
-  ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true, datatype: "float"});
-  ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true, datatype: "float"});
-}
-BLOCK_END();
-
 generateFlexKenmerkBlock ({
      onrgoed_key    : flr_key,
      onrgoed_niveau : onrgoedlvl,

APPL/ALG/alg_edit_verdieping_save.asp

@@ -59,19 +59,11 @@ else
                             "    AND ALG_ONRGOEDKENMERK_VERWIJDER IS NULL " +
                             "    AND ALG_ONRGOED_NIVEAU = 'V' " +
                             "    AND ALG_ONRGOED_KEY = " + flr_key;
-      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
-                        });
+      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")
   }
   %>
 
@@ -79,13 +71,10 @@ else
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(function ()
-        {
-          FcltMgr.closeDetail(window, { flr_key: <%=flr_key%>,
-                                        warning: "<%=safe.jsstring(warning)%>",
-                                        keepForm: <%=warning?"true":"false"%>
-                                      });
-        });
+        $(document).ready(function ()
+          { FcltMgr.closeDetail(window, { flr_key: <%=flr_key%>,
+                                          warning: "<%=safe.jsstring(warning)%>",
+                                          keepForm: <%=warning?"true":"false"%> }); } );
     </script>
   </head>
   <body>

APPL/ALG/alg_edit_wp.asp

@@ -16,6 +16,7 @@
 <!--#include file="../Shared/iface.inc" -->
 <!--#include file="../Shared/selector.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
+<!--#include file="../Shared/json2.js" -->
 <!-- #include file="alg.inc" -->
 
 <%
@@ -26,9 +27,6 @@ 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 * "
@@ -74,7 +72,7 @@ else if (S("prs_werkplek_implicit") == 1)
     }
     function alg_next()
     {
-        FcltMgr.alert("TODO: Next nog niet ondersteund")
+        alert("TODO: Next nog niet ondersteund")
     }
 
 function process_host_info(data)
@@ -94,7 +92,7 @@ function onChangeVolgnr()
 }
 
 <% if (wp_key<0) { %>
-$(function(){ onChangeRoom(<%=room_key%>)});
+$(document).ready(function(){ onChangeRoom(<%=room_key%>)});
 <% } %>
 
 </script>
@@ -120,7 +118,7 @@ BLOCK_START("algInfo", "");
                     onRuiChange: "onChangeRoom(key)",
                     startlevel: 2, // Regio
                     eindlevel: 5, // District
-                    readonlylevel: 2, // Locatie niet readonly
+                    readonly: (wp_key > 0),
                     filtercode: "INCVR",
                     required: true });
 
@@ -144,8 +142,7 @@ BLOCK_START("algInfo", "");
 <%
   RWFIELDTR("wp_opp",  "fld",          L("lcl_estate_wp_area"),        wp_opp, {maxlength: 10, float: true});  //TODO: in de toekomst ook kijken naar tussen 0 en 99999.99 ?
 
-  if (S("prs_werkplek_implicit")==0)
-      CHECKBOXTR(L("lcl_estate_wp_virt"), "fldalgbez", "wp_virt", wp_virt==1);
+  CHECKBOXTR(L("lcl_estate_wp_virt"), "fldalgbez", "wp_virt", wp_virt==1);
 
   sql = "SELECT 0, "+safe.quoted_sql(L("lcl_wptype_0"))+ " FROM DUAL"
      + " UNION SELECT 1, " + safe.quoted_sql(L("lcl_wptype_1")) + " FROM DUAL";

APPL/ALG/alg_edit_wp_save.asp

@@ -8,7 +8,6 @@
 
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
-<!-- #include file="../Shared/WPFunctions.inc" -->
 <!-- #include file="../Shared/save2db.inc" -->
 <!-- #include file="alg.inc" -->
 
@@ -46,22 +45,7 @@ if (wp_key > 0)
 
     var err = Oracle.Execute(sql, true);
     if (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);
-    }
-
+        warning = err.friendlyMsg;
   }
 else
   {
@@ -80,13 +64,11 @@ else
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(function ()
-        {
-          FcltMgr.closeDetail(window, { wp_key: <%=wp_key%>,
-                                        warning: "<%=safe.jsstring(warning)%>",
-                                        keepForm: <%=warning? "true" : "false"%>
-                                      });
-        });
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { wp_key: <%=wp_key%>,
+                                          warning: "<%=safe.jsstring(warning)%>",
+                                          keepForm: <%=warning? "true" : "false"%>
+                                          }); } );
     </script>
   </head>
   <body>

APPL/ALG/alg_flexkenmerk.inc

@@ -49,12 +49,6 @@ 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, "
@@ -63,24 +57,19 @@ function generateFlexKenmerkBlock(params)
              + "         k.alg_kenmerk_dec              kenmerk_dec, "
              + "         k.alg_kenmerk_nmin             kenmerk_nmin, "
              + "         k.alg_kenmerk_nmax             kenmerk_nmax, "
-             + "         k.alg_kenmerk_systeem          kenmerk_systeem, "
              + (onrgoed_key > 0
-               ? "     (SELECT MAX(CASE WHEN k.alg_kenmerk_kenmerktype = 'M'"
-                 + "                    THEN NULL"
-                 + "                    ELSE v.alg_onrgoedkenmerk_waarde"
-                 + "                    END)"
+               ? "     (SELECT v.alg_onrgoedkenmerk_waarde "
                  + "      FROM alg_onrgoedkenmerk v "
-                 + "     WHERE v.alg_onrgoed_key = " + onrgoed_key
-                 + "       AND v.alg_onrgoed_niveau = " + safe.quoted_sql(onrgoed_niveau)
-                 + "       AND v.alg_kenmerk_key = k.alg_kenmerk_key"
-                 + "       AND v.alg_onrgoedkenmerk_verwijder IS NULL)"
+                 + "      WHERE v.alg_onrgoed_key = " + onrgoed_key
+                 + "      AND v.alg_onrgoed_niveau = " + safe.quoted_sql(onrgoed_niveau)
+                 + "      AND v.alg_kenmerk_key = k.alg_kenmerk_key"
+                 + "      AND v.alg_onrgoedkenmerk_verwijder IS NULL)"
                : lcl.xsql('k.alg_kenmerk_default', 'k.alg_kenmerk_key')
                ) + "                                    kenmerk_waarde, "
              + "         k.alg_kenmerk_volgnr           kenmerk_volgnr, "
              + lcl.xsql('k.alg_kenmerk_dimensie', 'k.alg_kenmerk_key') +" kenmerk_dimensie, "
              + lcl.xsql('k.alg_kenmerk_hint', 'k.alg_kenmerk_key') +" kenmerk_hint, "
              + lcl.xsql('k.alg_kenmerk_default', 'k.alg_kenmerk_key') +" kenmerk_default, "
-             + "         k.alg_kenmerk_show_expr        kenmerk_show_expr, "
              + "         k.alg_kenmerk_verplicht        kenmerk_verplicht, "
              + "         k.alg_kenmerk_groep            kenmerk_groep, "
              + "         NULL otherpath, "
@@ -106,8 +95,6 @@ function generateFlexKenmerkBlock(params)
                   hideVervallen: onrgoed_key<0,
                   fnpre: params.fnpre,
                   fnpost: params.fnpost,
-                  fnIsInvisible: isInvisible,
-                  multiMode: params.multi,
                   mobile: params.mobile,
                   parentKey: onrgoed_key,
                   kenmerk_module: onrgoed_niveau }

APPL/ALG/alg_gebouw.asp

@@ -20,25 +20,21 @@
 FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jquery-ui.js"]})
 
 var bld_key = getQParamInt("key", -1);
-var cnt_full = getQParamInt("cnt_full", 0) == 1;
 
 if (bld_key > 0)
 {
-      sql = " select alg_gebouw_code, alg_locatie_key "
+      sql = " select alg_gebouw_code "
           + "  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 loc_key = -1;
+  var bld_name = ""
 }
-
 %>
 
 <html>
@@ -80,23 +76,6 @@ 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
-          page1 += (cnt_full ? "&cnt_full=1" : "");
-          IFRAMER("cntFrame", page1, { initHide: true } );
-      }
-    }
 %>
   </body>
 </html>

APPL/ALG/alg_gebouw_list.inc

@@ -9,6 +9,7 @@
     Note:
 */ %>
 
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
 <!-- #include file="alg.inc" -->
@@ -27,63 +28,6 @@ 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;
-}
-
-var all_cnt = getQParamInt("cnt_full", 0);
-
-  // Fast check to see if any building responsibles have been set
-  // If not, we can suppress the column
-  sql = "SELECT 1 FROM alg_gebouw"
-      + " WHERE prs_perslid_key_verantw IS NOT NULL"
-      + " AND alg_gebouw_verwijder IS NULL AND ROWNUM = 1";
-  oRs = Oracle.Execute(sql);
-  var anybldresp = !oRs.eof;
-  oRs.close()
-
-  // We gaan er vanuit dat verwantw2 niet is gezet als nergens verantw1 wordt getoond.
-  // Als dat wel zo is, jammer maar dan tonen we die niet in de lijst.
-  var anybldresp2 = false;
-  if (anybldresp)
-  {
-    sql = "SELECT 1 FROM alg_gebouw"
-      + " WHERE prs_perslid_key_verantw2 IS NOT NULL"
-      + " AND alg_gebouw_verwijder IS NULL AND ROWNUM = 1";
-    oRs = Oracle.Execute(sql);
-    anybldresp2 = !oRs.eof;
-    oRs.close()
-  }
-
 %>
 <script type="text/javascript">
 
@@ -92,50 +36,37 @@ var all_cnt = getQParamInt("cnt_full", 0);
   function gotoDetails(row)
   {
     var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var url = "appl/alg/alg_verdieping_search.asp?gebouw_key=" + algData.detail_key + "&autosearch=" + autosearch + "&chkgeb=1";
+    var url = "appl/ALG/alg_verdieping_search.asp?gebouw_key=" + algData.detail_key + "&autosearch=" + autosearch;
     FcltMgr.openDetail(url, "<%=L("lcl_floor")%>");
   }
   function gotoParent(row)
   {
     var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var url = "appl/alg/alg_locatie_search.asp?locatie_key=" + algData.parent_key + "&autosearch=" + autosearch;
+    var url = "appl/ALG/alg_locatie_search.asp?locatie_key=" + algData.parent_key + "&autosearch=" + autosearch;
     FcltMgr.openDetail(url, "<%=L("lcl_location")%>");
   }
-  function gebouwEdit(row)
+    function gebouwEdit(row)
   {
     var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var v_all_cnt = <%=all_cnt%>;
-    var url = "appl/alg/alg_gebouw.asp?mode=viewChange&key=" + algData.key + (v_all_cnt == 1 ? "&cnt_full=1" : "");
+    var url = "appl/ALG/alg_gebouw.asp?mode=viewUpdate&key=" + algData.key;
     FcltMgr.openDetail(url, "<%=L("lcl_building")%>" + ' ' + algData.oms);
   }
 
-  function doChange(rowArray, isMulti)
-  {
-      var bldKeyString = getKeyString(rowArray);
-      var subject = L("lcl_alg_multi_edit");
-      var url = "../alg/alg_edit_gebouw_multi.asp?bld_keys=" + bldKeyString;
-      FcltMgr.openModalDetail(url, subject, {callback: FcltCallbackRefresh});
-  }
-
-  function doDelete(rowArray, isMulti)
-  {
-    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");
-    });
-  }
-
-function toObjMan(row)
+function doDelete(rowArray, isMulti)
 {
-  var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-  var url = "appl/ins/ins_search.asp?urole=bo&gebouw_key=" + algData.key;
-  FcltMgr.openDetail(url, "<%=L("lcl_building")%>" + ' ' + algData.oms);
+  var bldKeyString = getKeyString(rowArray);
+  if (isMulti || confirm(L("lcl_alg_del_txt_gebouw")))
+  {
+    var data = { key: bldKeyString,
+                 level: "G"
+               };
+    <% protectRequest.dataToken("data"); %>
+    $.post("alg_delete.asp",
+           data,
+           FcltCallbackRefresh,
+           "json");
+  }
 }
-
 </script>
 <%
 
@@ -152,35 +83,19 @@ function gebouw_list(pautfunction, params)
 
   var noref = params.noref;
 
-  var ins_score_enabled = S("ins_score_enabled") == 1;
   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 srtgebouw_key = params.srtgebouw_key;
   var verantw_key = params.verantw_key;
-  var expalgincl = params.expalgincl;
-  var fitness_score1_from = params.fitness_score1_from;
-  var fitness_score1_through = params.fitness_score1_through;
 
-  var autparamsINSUSE = user.checkAutorisation("WEB_INSUSE", true);
-  var autparamsINSMAN = user.checkAutorisation("WEB_INSMAN", true);
-  var readuse = autparamsINSUSE && autparamsINSUSE.PRSreadlevel < 9 && autparamsINSUSE.ALGreadlevel < 9; // Wijzigen Afgeronde gegevens.
-  var readman = autparamsINSMAN && autparamsINSMAN.PRSreadlevel < 9 && autparamsINSMAN.ALGreadlevel < 9; // Wijzigen Afgeronde gegevens.
   function fnrowActionEnabler(oRs)
   {
     var eDelete = false;
-    var eChange = false;
-    var eObjMan = false;
     if (alg.canWriteGebouw(oRs("alg_gebouw_key").value, authparams.mALGwritelevel))
-      {
-        eDelete = true;
-        eChange = true;
-      }
-    // Heb ik rechten om het objectenbeheer overzicht te zien?
-    if (readuse || readman)
-      eObjMan = true;
-    return ({eDelete: eDelete, eChange: eChange, eObjMan: eObjMan});
+      eDelete = true;
+    return ({eDelete: eDelete})
   }
 
   function fnrowFlexParams(oRs)
@@ -213,20 +128,7 @@ function gebouw_list(pautfunction, params)
            + "     , g.alg_gebouw_inhoud"
            + "     , g.alg_gebouw_x"
            + "     , g.alg_gebouw_y"
-           + "     , g.alg_gebouw_vervaldatum"
-           + "     , g.alg_gebouw_mjb_score1"
-           + "     , (SELECT prs_perslid_naam_full FROM prs_v_perslid_fullnames_all WHERE prs_perslid_key = prs_perslid_key_verantw) perslid_resp"
-           + "     , (SELECT prs_perslid_naam_full FROM prs_v_perslid_fullnames_all WHERE prs_perslid_key = prs_perslid_key_verantw2) perslid_resp2"
-           + "     , g.alg_gebouw_email"
-           + "     , (SELECT mld_adres_naam FROM mld_adres ma WHERE ma.mld_adres_key = g.mld_adres_key) delivery_adr"
-           + "     , (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"
+           + "  FROM alg_v_aanweziggebouw g"
            + "     , alg_locatie l"
            + "     , alg_srtgebouw s"
            + " WHERE l.alg_locatie_key(+) = g.alg_locatie_key"
@@ -251,28 +153,11 @@ 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 + " 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)) ";
-
-    if (ins_score_enabled)
-    { // Conditiescore.
-      // Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
-      if (fitness_score1_from > 0)
-        sqln += " AND alg_gebouw_mjb_score1 >= " + fitness_score1_from;
-      if (fitness_score1_through > 0)
-        sqln += " AND alg_gebouw_mjb_score1 <= " + fitness_score1_through;
-    }
+      sqln += " AND g.prs_perslid_key_verantw = " + verantw_key;
 
     sqln += " ORDER BY l.alg_locatie_upper ASC, "
           +  "          g.alg_gebouw_upper ASC  ";
@@ -292,7 +177,6 @@ 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",
@@ -306,32 +190,24 @@ 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"}));
-    if (anybldresp)
-    {
-      rst.addColumn(new Column({caption: L("lcl_alg_verantw"), content: "perslid_resp"}));
-      if (anybldresp2)
-        rst.addColumn(new Column({caption: L("lcl_alg_verantw2"), content: "perslid_resp2", combine: true}));
-    }
-    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"}));
+    rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_bruto_vloeropp"), content: "alg_gebouw_bruto_vloeropp"}));
 
     if (outputmode != 0)
     {
       rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_opmerk"), content: "alg_gebouw_opmerking"}));
-      rst.addColumn(new Column({caption: L("lcl_alg_gebouw_email"), content: "alg_gebouw_email"}));
       rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_omtrek"), content: "alg_gebouw_omtrek"}));
       rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_inhoud"), content: "alg_gebouw_inhoud"}));
-      rst.addColumn(new Column({caption: L("lcl_delivery_address"), content: "delivery_adr"}));
       rst.addColumn(new Column({caption: L("lcl_geoxcoord"), content: "alg_gebouw_x"}));
       rst.addColumn(new Column({caption: L("lcl_geoycoord"), content: "alg_gebouw_y"}));
     }
-    if (ins_score_enabled)
-      rst.addColumn(new Column({caption: L("lcl_alg_gebouw_mjb_score1"), content: "alg_gebouw_mjb_score1", datatype: "number"}));
 
     rst.addAction({ action: "gebouwEdit", caption: L("lcl_edit"), isDefault:  true});
-    rst.addAction({ action: "doChange", caption: L("lcl_change"), enabler: "eChange", single:!noref, multi: true, multiOnce: true});
     rst.addAction({ action: "doDelete", caption: L("lcl_delete"), enabler: "eDelete", single:!noref, multi: true, multiOnce: true});
-    rst.addAction({ action: "toObjMan", caption: L("lcl_ins_object_management"), enabler: "eObjMan"});
+    if (!noref)
+    {
+      rst.addAction({ action: "gotoDetails", caption: L("lcl_goto_verdieping_list")});
+      rst.addAction({ action: "gotoParent", caption: L("lcl_goto_locatie_list")});
+    }
     var cnt = rst.processResultset();
 %>
     </body>

APPL/ALG/alg_gebouw_search.asp

@@ -14,14 +14,11 @@
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });
 
-var ins_score_enabled = S("ins_score_enabled") == 1;
 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 cnt_full = getQParamInt("cnt_full", 0) == 1;
 var authparams = alg.checkAutorisation();
 var this_alg = alg.func_enabled(gebouw_key);
 %>
@@ -36,25 +33,22 @@ var this_alg = alg.func_enabled(gebouw_key);
                 doSubmitWithKenmerken();
             }
 
-        function myModal(init)
+        function myModal()
         {
           var lvl = "G";
           var key = 0;
           var bld_key = "";
           var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
           var titel = "<%=L("lcl_properties")%>";
-          showKenmerkModal(url, titel, init)
+          showKenmerkModal(url, titel)
         }
 
-          $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+          $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
       </script>
   </head>
   <body id="searchbody">
     <div id="search">
       <form name="u2" target="workFrame" action="alg_gebouw_search_list.asp" method="get">
-<%      if (cnt_full) { %>
-            <input type="hidden" id="cnt_full" name="cnt_full" value="1">
-<%      } %>
 <%      BLOCK_START("searchtable", L("lcl_filterblok"));%>
         <tr>
           <td class="searchkolom1">
@@ -65,26 +59,10 @@ var this_alg = alg.func_enabled(gebouw_key);
                                                                 locatiekey: locatie_key,
                                                                 gebouwkey: gebouw_key,
                                                                 startlevel: 2, // locatie
-                                                                eindlevel: 2, // locatie
+                                                                eindlevel: 3, // gebouw
                                                                 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 -->
 
@@ -96,69 +74,33 @@ var this_alg = alg.func_enabled(gebouw_key);
                 + "  FROM alg_srtgebouw"
                 + " WHERE alg_srtgebouw_verwijder IS NULL"
                 + " ORDER BY UPPER("+lcl.xsql('alg_srtgebouw_omschrijving', 'alg_srtgebouw_key')+")";
-              FCLTselector("srt",
-                           sql,
-                           { initKey: srtgebouw_key,
-                             label: L("lcl_estate_gebouw_srtgebouw"),
-                             trclass: "primsearch",
-                             emptyOption: ""
-                           });
+            FCLTselector("srt",
+                         sql,
+                         { initKey: srtgebouw_key,
+                           label: L("lcl_estate_gebouw_srtgebouw"),
+                           trclass: "primsearch",
+                           emptyOption: ""
+                         });
+%>
+            <!-- Gebouw verantwoordelijke -->
+<%          // Dit veld is alleen zichtbaar indien er minimaal <20><>n gebouwverantwoordelijke geconfigureerd is (suppressNoValues).
+            FCLTpersoonselector("verantw",
+                                "sgVerantw",
+                                { perslidKey: verantw_key,
+                                  label: L("lcl_alg_bld_verantw"),
+                                  filtercode: "GV", // Gebouw Verantwoordelijke
+                                  trclass: "primsearch",
+                                  suppressNoValues: true,
+                                  whenEmpty: L("lcl_search_generic")  // want filter
+                                });
 %>
-              <!-- Gebouw verantwoordelijke -->
-<%            // Dit veld is alleen zichtbaar indien er minimaal <20><>n gebouwverantwoordelijke geconfigureerd is (suppressNoValues).
-              FCLTpersoonselector("verantw",
-                                  "sgVerantw",
-                                  { perslidKey: verantw_key,
-                                    label: L("lcl_alg_bld_verantw"),
-                                    filtercode: "GV", // Gebouw Verantwoordelijke
-                                    trclass: "primsearch",
-                                    suppressNoValues: true,
-                                    whenEmpty: L("lcl_search_generic")  // want filter
-                                  });
-
-              if (ins_score_enabled)
-              { // Conditiescore
-%>              <tr class="primsearch fldfitness_score" id="fitness_score">
-                  <td>
-                    <table width="100%">
-                      <tr>
-                        <td class="label">
-                        <label for="show_fitness_score_from"><%=L("lcl_mjb_fitness_score")%>:</label>
-                        </td>
-                        <td style="text-align: right">
-                          <%=L("lcl_mjb_from")%>
-                        </td>
-                      </tr>
-                    </table>
-                  </td>
-                  <td class="score">
-                    <input type="text"
-                           onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
-                           onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
-                           id="fitness_score1_from"
-                           name="fitness_score1_from"
-                           class="fldflexN  number "
-                           value=""
-                           maxlength="1">
-                    &nbsp;<%=L("lcl_mjb_through")%>&nbsp;
-                    <input type="text"
-                           onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
-                           onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
-                           id="fitness_score1_through"
-                           name="fitness_score1_through"
-                           class="fldflexN  number "
-                           value=""
-                           maxlength="1">
-                  </td>
-                </tr>
-<%            } %>
             </table>
           </td><!-- end column 1 -->
         </tr>
 <%      BLOCK_END();
 
-        var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch", importance: 1 },
-                         {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced", importance: 3 } ];
+        var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
+                         {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
         CreateButtons(buttons, { entersubmit: true });
 %>
       </form>

APPL/ALG/alg_gebouw_search_list.asp

@@ -26,33 +26,19 @@ 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
-var cnt_full = getQParamInt("cnt_full", 0) == 1;
-var fitness_score1_from = getQParamInt("fitness_score1_from", -1);       // Conditie score van.
-var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
 
 gebouw_list ( "*",
               { outputmode: outputmode,
                  showall: showall,
-                 cnt_full: cnt_full,
                  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),
-                 bld_code: bld_code,
-                 bld_name: bld_name,
-                 fitness_score1_from : fitness_score1_from,
-                 fitness_score1_through : fitness_score1_through,
-                 noref: (noref != -1? noref : null),
-                 expalgincl: expalgincl
+                 noref: (noref != -1? noref : null)
               }
              );
 %>

APPL/ALG/alg_locatie.asp

@@ -20,7 +20,6 @@ FCLTHeader.Requires({ plugins: ["suggest", "jQuery"],
                       js: ["jquery-ui.js"]})
 
 var loc_key = getQParamInt("key", -1);
-var cnt_full = getQParamInt("cnt_full", 0) == 1;
 
 if (loc_key > 0)
 {
@@ -77,23 +76,6 @@ 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
-          page1 += (cnt_full ? "&cnt_full=1" : "");
-          IFRAMER("cntFrame", page1, { initHeight: "450px" } );
-      }
-    }
 %>
   </body>
 </html>

APPL/ALG/alg_locatie_list.inc

@@ -9,6 +9,7 @@
     Note:
 */ %>
 
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
 <!-- #include file="alg.inc" -->
@@ -30,39 +31,6 @@ 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;
-}
-
-var all_cnt = getQParamInt("cnt_full", 0);
 %>
 <script type="text/javascript">
   var autosearch = 1; //automatisch laden van resultaat op search pagina
@@ -72,6 +40,12 @@ var all_cnt = getQParamInt("cnt_full", 0);
     var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_gebouw_search.asp?locatie_key="+algData.detail_key+"&autosearch="+autosearch;
     FcltMgr.openDetail(url, "<%=L("lcl_building")%>");
+  }
+    function gotoDetails2(row)
+  {
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
+    var url = "appl/ALG/alg_terreinsector_search.asp?locatie_key="+algData.detail_key+"&autosearch="+autosearch;
+    FcltMgr.openDetail(url, "<%=L("lcl_terra")%>");
   }
   function gotoParent(row)
   {
@@ -81,22 +55,25 @@ var all_cnt = getQParamInt("cnt_full", 0);
   }
     function locatieEdit(row)
   {
-    var v_all_cnt = <%=all_cnt%>;
     var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var url = "appl/ALG/alg_locatie.asp?key="+algData.key + (v_all_cnt == 1 ? "&cnt_full=1" : "");
+    var url = "appl/ALG/alg_locatie.asp?key="+algData.key;
     FcltMgr.openDetail(url, "<%=L("lcl_location")%>" + ' ' + algData.oms);
   }
 
   function doDelete(rowArray, isMulti)
   {
-    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");
-    });
+    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");
+    }
   }
 </script>
 <%
@@ -113,13 +90,9 @@ function locatie_list(pautfunction, params)
 
   var noref = params.noref;
 
-  var ins_score_enabled = S("ins_score_enabled") == 1;
   var reg_key = params.reg_key;
   var dis_key = params.dis_key;
   var loc_key = params.loc_key;
-  var expalgincl = params.expalgincl;
-  var fitness_score1_from = params.fitness_score1_from;
-  var fitness_score1_through = params.fitness_score1_through;
 
   function fnrowActionEnabler(oRs)
   {
@@ -144,36 +117,27 @@ 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_vervaldatum"
-             + "     , l.alg_locatie_x"
-             + "     , l.alg_locatie_y"
-             + "     , l.alg_locatie_mjb_score1"
-             + "     , (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";
+<%  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 ";
 
     if (authparams.ALGreadlevel > -1)
     { // Er is een scope-beperking van kracht
@@ -198,24 +162,7 @@ function locatie_list(pautfunction, params)
       sqln += " AND d.alg_regio_key = " + reg_key;
     }
 
-    if (!expalgincl)
-      sqln += " AND (l.alg_locatie_vervaldatum IS NULL OR l.alg_locatie_vervaldatum > TRUNC(SYSDATE)) ";
-
-    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 + "%");
-
-    if (ins_score_enabled)
-    { // Conditiescore.
-      // Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
-      if (fitness_score1_from > 0)
-        sqln += " AND alg_locatie_mjb_score1 >= " + fitness_score1_from;
-      if (fitness_score1_through > 0)
-        sqln += " AND alg_locatie_mjb_score1 <= " + fitness_score1_through;
-    }
-
-    sqln += " ORDER BY UPPER(alg_district_omschrijving), UPPER(alg_locatie_code)";
+    sqln += " ORDER BY l.alg_locatie_upper ASC "
 
     var addurl = "appl/alg/alg_locatie.asp";
 //  addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
@@ -231,7 +178,6 @@ function locatie_list(pautfunction, params)
                                    title: L("lcl_menu_alg_locatie"),
                                    showAll: showall,
                                    rowData: fnrowData,
-                                   rowClass: fnrowClass,
                                    rowActionEnabler: fnrowActionEnabler,
                                    outputmode: outputmode,
                                    flexModule: "ALG",
@@ -247,9 +193,6 @@ function locatie_list(pautfunction, params)
     rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_adres"), content: "alg_locatie_adres"}));
     rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_postcode"), content: "alg_locatie_postcode"}));
     rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_plaats"), content: "alg_locatie_plaats"}));
-    rst.addColumn(new Column({caption: L("lcl_alg_vervaldatum"), content: "alg_locatie_vervaldatum", datatype: "date"}));
-    if (ins_score_enabled)
-      rst.addColumn(new Column({caption: L("lcl_alg_locatie_mjb_score1"), content: "alg_locatie_mjb_score1", datatype: "number"}));
 
     if (outputmode != 0)
     {
@@ -268,6 +211,7 @@ function locatie_list(pautfunction, params)
     rst.addAction({ action: "doDelete", caption: L("lcl_delete"), enabler: "eDelete", single:!noref, multi: true, multiOnce: true});
     if (!noref) {
         rst.addAction({ action: "gotoDetails", caption: L("lcl_goto_gebouw_list")});
+        rst.addAction({ action: "gotoDetails2", caption: L("lcl_goto_terreinsector_list")});
         rst.addAction({ action: "gotoParent", caption: L("lcl_goto_district_list")});
     }
     var cnt = rst.processResultset();

APPL/ALG/alg_locatie_search.asp

@@ -12,11 +12,9 @@
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });
 
-var ins_score_enabled = S("ins_score_enabled") == 1;
 var district_key = getQParamInt("district_key", -1); //district
 var locatie_key = getQParamInt("locatie_key", -1); //locatie
 var autosearch = getQParamInt("autosearch", 0) == 1;
-var cnt_full = getQParamInt("cnt_full", 0) == 1;
 var authparams = alg.checkAutorisation();
 %>
 
@@ -30,26 +28,23 @@ var authparams = alg.checkAutorisation();
               doSubmitWithKenmerken();
           }
 
-        function myModal(init)
+        function myModal()
         {
           var lvl = "L";
           var key = 0;
           var bld_key = "";
           var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
           var titel = "<%=L("lcl_properties")%>";
-          showKenmerkModal(url, titel, init)
+          showKenmerkModal(url, titel)
         }
 
-        $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+        $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
     </script>
   </head>
   <body id="searchbody">
     <div id="search">
       <form name="u2" target="workFrame" action="alg_locatie_search_list.asp" method="get">
-<%      if (cnt_full) { %>
-            <input type="hidden" id="cnt_full" name="cnt_full" value="1">
-<%      } %>
-<%      BLOCK_START("searchtable", L("lcl_filterblok"));%>
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
           <tr>
             <td class="searchkolom1">
               <table><!-- x rijen, 2 kolommen: label + veld -->
@@ -58,75 +53,20 @@ 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>
-              <!-- 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_locatie_vervallen_incl")%></label>
-                </td>
-              </tr>
               </table>
             </td><!-- end column 1 -->
 
-            <!-- Second column -->
             <td class="searchkolom2">
-              <table><!-- x rijen, 2 kolommen: label + veld -->
-<%              if (ins_score_enabled)
-                { // Conditiescore
-%>                <tr class="primsearch fldfitness_score" id="fitness_score">
-                    <td>
-                      <table width="100%">
-                        <tr>
-                          <td class="label">
-                            <label for="show_fitness_score_from"><%=L("lcl_mjb_fitness_score")%>:</label>
-                          </td>
-                          <td style="text-align: right">
-                            <%=L("lcl_mjb_from")%>
-                          </td>
-                        </tr>
-                      </table>
-                    </td>
-                    <td class="score">
-                      <input type="text"
-                             onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
-                             onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
-                             id="fitness_score1_from"
-                             name="fitness_score1_from"
-                             class="fldflexN  number "
-                             value=""
-                             maxlength="1">
-                      &nbsp;<%=L("lcl_mjb_through")%>&nbsp;
-                      <input type="text"
-                             onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
-                             onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
-                             id="fitness_score1_through"
-                             name="fitness_score1_through"
-                             class="fldflexN  number "
-                             value=""
-                             maxlength="1">
-                    </td>
-                  </tr>
-<%              } %>
-              </table>
-            </td><!-- end column 2 -->
+            </td><!-- end column 1 -->
           </tr>
-<%      BLOCK_END();
+<%    BLOCK_END();
 
-  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch", importance: 1 },
-                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced", importance: 3 } ];
+  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
+                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
   CreateButtons(buttons, { entersubmit: true });
 %>
       </form>

APPL/ALG/alg_locatie_search_list.asp

@@ -3,10 +3,10 @@
      $Revision$
      $Id$
 
-    File:
-    Description:
-    Parameters:
-    Context:
+    File:       
+    Description: 
+    Parameters:  
+    Context:     
     Note:
 */ %>
 
@@ -25,25 +25,13 @@ 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
-var cnt_full = getQParamInt("cnt_full", 0) == 1;
-var expalgincl = getQParamInt("expalgincl", 0) == 1;
-var fitness_score1_from = getQParamInt("fitness_score1_from", -1);       // Conditie score van.
-var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
 
 locatie_list ( "*",
               {  outputmode: outputmode,
                  showall: showall,
-                 cnt_full: cnt_full,
                  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,
-                 expalgincl: expalgincl,
-                 fitness_score1_from : fitness_score1_from,
-                 fitness_score1_through : fitness_score1_through,
                  noref: (noref != -1? noref : null)
               }
              );

APPL/ALG/alg_regio_list.inc

@@ -9,6 +9,7 @@
     Note:
 */ %>
 
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../shared/data_recordset.inc" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
@@ -51,14 +52,18 @@ function fnrowData(oRs)
 
   function doDelete(rowArray, isMulti)
   {
-    FcltMgr.confirm(L("lcl_alg_del_txt_regio"), { autoconfirm: isMulti }, function() {
-      var regKeyString = getKeyString(rowArray);
+    var regKeyString = getKeyString(rowArray);
+    if (isMulti || confirm(L("lcl_alg_del_txt_regio")))
+    {
       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_regio_search.asp

@@ -23,7 +23,7 @@ var authparams = alg.checkAutorisation();
   <head>
     <%  FCLTHeader.Generate(); %>
     <script type="text/javascript">
-    $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+    $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
     </script>
   </head>
   <body id="searchbody">

APPL/ALG/alg_ruimte.asp

@@ -109,24 +109,6 @@ else
 
       var page3 ="../prs/prs_afdeling_search_list.asp?tiny=1&room_key=" + room_key;// Alle afdelingen van alle niveau's (1 en hoger) laten zien dus afd_niveau=nr niet meegegeven
       IFRAMER("wpFrame", page3, { initHeight: "450px" } );
-
-      var authparamsINSMAN = user.checkAutorisation("WEB_INSMAN", true);
-      var insman_read = authparamsINSMAN;
-      if (insman_read)
-      {
-          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

@@ -9,6 +9,7 @@
     Note:
 */ %>
 
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
 <!-- #include file="alg.inc" -->
@@ -27,18 +28,15 @@ function ruimte_list(pautfunction, params)
   // Voor resulttable de globalen zetten; zou ng anders moeten.
   var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
   var showall = params.showall;
+
   var noref = params.noref;
-  var reg_key_arr = params.reg_key_arr;
-  var dis_key_arr = params.dis_key_arr;
-  var loc_key_arr = params.loc_key_arr;
-  var bld_key_arr = params.bld_key_arr;
-  var flr_key_arr = params.flr_key_arr;
-  var room_key_arr = params.room_key_arr;
+  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 srtruimte_key = params.srtruimte_key
-  var dept_key_arr = params.dept_key_arr;
-  var chkgeb = params.chkgeb;
+  var area_use = params.area_use
 %>
 
   <html>
@@ -50,32 +48,24 @@ function ruimte_list(pautfunction, params)
         function gotoDetails(row)
         {
           var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-          var url = "appl/alg/alg_werkplek_search.asp?ruimte_key="+algData.detail_key+"&autosearch="+autosearch;
+          var url = "appl/ALG/alg_werkplek_search.asp?ruimte_key="+algData.detail_key+"&autosearch="+autosearch;
           FcltMgr.openDetail(url, "<%=L("lcl_workspace")%>");
         }
 
         function gotoParent(row)
         {
           var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-          var url = "appl/alg/alg_verdieping_search.asp?verdieping_key="+algData.parent_key+"&autosearch="+autosearch;
+          var url = "appl/ALG/alg_verdieping_search.asp?verdieping_key="+algData.parent_key+"&autosearch="+autosearch;
           FcltMgr.openDetail(url, "<%=L("lcl_floor")%>");
         }
 
         function ruimteEdit(row)
         {
           var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-          var url = "appl/alg/alg_ruimte.asp?mode=viewUpdate&key="+algData.key;
+          var url = "appl/ALG/alg_ruimte.asp?mode=viewUpdate&key="+algData.key;
           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 = [];
@@ -86,27 +76,21 @@ 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)
         {
-          FcltMgr.confirm(L("lcl_alg_del_txt_ruimte"), { autoconfirm: isMulti }, function() {
-            $(row).addClass('dirty');
-            var room_key = row.getAttribute("ROWKEY");
+          $(row).addClass('dirty');
+          var room_key = row.getAttribute("ROWKEY");
+          if (isMulti || confirm(L("lcl_alg_del_txt_ruimte")))
+          {
             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,30 +135,26 @@ function ruimte_list(pautfunction, params)
 
       sqln += getKenmerkSql("ALG", "r.alg_ruimte_key");
 
-      if (room_key_arr && room_key_arr.length)
+      if (room_key)
       {
-        sqln += " AND r.alg_ruimte_key IN (" + room_key_arr.join(",") + ")";
+        sqln += " AND r.alg_ruimte_key = " + room_key;
       }
-      else if (flr_key_arr && flr_key_arr.length)
+      else if (lvl_key)
       {
-        sqln += " AND v.alg_verdieping_key IN (" + flr_key_arr.join(",") + ")";
+        sqln += " AND v.alg_verdieping_key = " + lvl_key;
       }
-      else if (bld_key_arr && bld_key_arr.length)
+      else if (bld_key)
       {
-        sqln += " AND v.alg_gebouw_key IN (" + bld_key_arr.join(",") + ")";
+        sqln += " AND v.alg_gebouw_key = " + bld_key;
       }
-      else if (loc_key_arr && loc_key_arr.length)
+      else if (loc_key)
       {
-        sqln += " AND g.alg_locatie_key IN (" + loc_key_arr.join(",") + ")";
+        sqln += " AND g.alg_locatie_key = " + loc_key;
       }
-      else if (dis_key_arr && dis_key_arr.length)
-        sqln += " AND l.alg_district_key IN (" + dis_key_arr.join(",") + ")";
-      else if (reg_key_arr && reg_key_arr.length)
-        sqln += " AND l.alg_district_key IN (SELECT alg_district_key FROM alg_district WHERE alg_regio_key IN (" + reg_key_arr.join(",") + "))";
 
-      if (srtruimte_key)
+      if (area_use)
       {
-        sqln += " AND r.alg_srtruimte_key = " + srtruimte_key;
+        sqln += " AND r.alg_srtruimte_key = " + area_use;
       }
 
       if (area_nr)
@@ -187,18 +167,6 @@ function ruimte_list(pautfunction, params)
         sqln += " AND UPPER(r.alg_ruimte_omschrijving) LIKE " + safe.quoted_sql_wild("%" + area_descr + "%");
       }
 
-      if (dept_key_arr && dept_key_arr.length)
-      {
-        sqln += " AND r.alg_ruimte_key in "
-             +  "                    (SELECT alg_ruimte_key "
-             +  "                      FROM prs_ruimteafdeling "
-             +  "                     WHERE prs_ruimteafdeling_verwijder IS NULL "
-             +  "                       AND prs_afdeling_key IN (" + dept_key_arr.join(",") + "))";
-      }
-
-      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"
@@ -221,21 +189,21 @@ 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,
-                    eEditMulti: eEditMulti
+                    eBezetting: alg.func_enabled_ruimte(oRs("alg_verdieping_key").Value).canPRSBOFwrite
                 }
         }
+
         return (floorCache[oRs("alg_verdieping_key").Value]);
       }
 
       function fnrowFlexParams(oRs)
       {
-        var this_alg = alg.func_enabled(oRs("alg_ruimte_key").Value, "R");
+        var room_key = oRs("alg_ruimte_key").Value;
+        var this_alg = alg.func_enabled(room_key, "R");
 
         var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
         return flexParams;
@@ -293,11 +261,8 @@ 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,7 +9,6 @@
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
 <!-- #include file="alg.inc" -->
-<!-- #include file="../Shared/afdelingselector.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });
@@ -22,7 +21,6 @@ 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();
 
 %>
@@ -36,23 +34,22 @@ var authparams = alg.checkAutorisation();
           doSubmitWithKenmerken();
       }
 
-        function myModal(init)
+        function myModal()
         {
           var lvl = "R";
           var key = 0;
           var bld_key = "";
           var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
           var titel = "<%=L("lcl_properties")%>";
-          showKenmerkModal(url, titel, init)
+          showKenmerkModal(url, titel)
         }
 
-        $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+        $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
     </script>
   </head>
   <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">
@@ -64,12 +61,12 @@ var authparams = alg.checkAutorisation();
                                                                   gebouwkey: gebouw_key,
                                                                   verdiepingkey: verdieping_key,
                                                                   ruimtekey: ruimte_key,
-                                                                  multitoggle: 6, // true|false (=all) or till alg_level_# (0-6)
                                                                   startlevel: 2, // locatie
                                                                   eindlevel: 5, // ruimte
                                                                   filtercode: "INCVR",
                                                                   whenEmpty: L("lcl_search_generic")  // want filter
                                                                 });
+
 %>
               </table>
             </td><!-- end column 1 -->
@@ -99,28 +96,13 @@ 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
-                                 multitoggle: true,
-                                 whenEmpty: L("lcl_search_generic"),
-                                 filtercode: "AR"
-                               });
-            }
 %>              </table>
             </td><!-- end column 1 -->
           </tr>
 <%    BLOCK_END();
 
-  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch", importance: 1 },
-                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced", importance: 3 } ];
+  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
+                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
   CreateButtons(buttons, { entersubmit: true });
 %>
       </form>

APPL/ALG/alg_ruimte_search_list.asp

@@ -22,33 +22,25 @@
 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_arr = getQParamIntArray("regiokey", []);      // Regio
-var dis_key_arr = getQParamIntArray("districtkey", []);   // District
-var loc_key_arr = getQParamIntArray("locatiekey", []);    // Locatie
-var bld_key_arr = getQParamIntArray("gebouwkey", []);     // Gebouw
-var flr_key_arr = getQParamIntArray("verdiepingkey", []); // Verdieping
-var room_key_arr = getQParamIntArray("ruimtekey", []);    // Ruimte
+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 srtruimte_key = getQParamInt("srt", null); // Ruimtefunctie
-var dept_key_arr = getQParamIntArray("dept", []); // Afdeling
-var chkgeb  = getQParamInt("chkgeb", 0) == 1; //Controleer tegen de vervallenstatus van het gebouw (vertrouw lvl_key/geb_key niet)
+var area_use = getQParamInt("srt", null); // Ruimtefunctie
 
 ruimte_list ( "*",
               {  outputmode: outputmode,
                  showall: showall,
-                 reg_key_arr: reg_key_arr,
-                 dis_key_arr: dis_key_arr,
-                 loc_key_arr: loc_key_arr,
-                 bld_key_arr: bld_key_arr,
-                 flr_key_arr: flr_key_arr,
-                 room_key_arr: room_key_arr,
+                 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),
-                 srtruimte_key: (srtruimte_key != -1? srtruimte_key : null),
-                 dept_key_arr: dept_key_arr,
-                 noref: (noref != -1? noref : null),
-                 chkgeb: chkgeb
+                 area_use: (area_use != -1? area_use : null),
+                 noref: (noref != -1? noref : null)
               }
              );
 %>

APPL/ALG/alg_ruimteafdeling.asp

@@ -20,7 +20,7 @@ k
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["./alg_ruimteafdeling.js" ]
+                      js: ["./alg_ruimteafdeling.js", "num2curr.js"]
                     });
 
 // TODO: Autorisatie controle "WEB_PRSBOF" op ruimte_keys
@@ -37,19 +37,8 @@ if (submitting)
 
   var afdeling_key = -1;
   var bezetting = -1;
-  var bezettingen = new Array();
-  var afdeling_keys = new Array();
-  var afdeling_names = [];
-
-  function shorttxt(txt, len)
-  {
-      len = len || S("max_tracking_length");
-      if  (txt.length < len)
-          return txt;
-      else
-          return txt.substr(0, len-4) + "...";
-  }
-
+  var afdeling_keys = [];
+  var bezetting_keys = [];
   for (var i = 0; i < nrRows; i++)
   {
     afdeling_key = getFParamInt("afd" + i, 0);
@@ -58,47 +47,10 @@ if (submitting)
     if (afdeling_key > 0 && bezetting >= 0)
     {
       afdeling_keys.push(afdeling_key);
-      bezettingen.push(bezetting);
+      bezetting_keys.push(bezetting);
     }
   }
 
-  if (afdeling_keys.length)
-  {
-      var sql = "SELECT prs_afdeling_key, prs_afdeling_omschrijving"
-              + "  FROM prs_afdeling a"
-              + " WHERE prs_afdeling_key IN (" + afdeling_keys.join(",") + ")"
-              + "   AND prs_afdeling_verwijder IS NULL";
-      var oRs = Oracle.Execute(sql);
-      while (!oRs.Eof)
-      {
-          afdeling_names[oRs("prs_afdeling_key").value] = oRs("prs_afdeling_omschrijving").value;
-          oRs.MoveNext();
-      }
-  }
-
-  var oldvals = [];
-  var sql = "SELECT ra.alg_ruimte_key, ra.prs_afdeling_key, a.prs_afdeling_omschrijving, ra.prs_ruimteafdeling_bezetting"
-          + "  FROM prs_ruimteafdeling ra, prs_afdeling a"
-          + " WHERE ra.alg_ruimte_key IN (" + ruimte_key_arr.join(",") + ")"
-          + "   AND ra.prs_afdeling_key = a.prs_afdeling_key"
-          + "   AND ra.prs_ruimteafdeling_verwijder IS NULL"
-          + "   AND a.prs_afdeling_verwijder IS NULL";
-
-
-  var oRs = Oracle.Execute(sql);
-  while (!oRs.Eof)
-  {
-      var tempTuple = { afd_key: oRs("prs_afdeling_key").value, bez: oRs("prs_ruimteafdeling_bezetting").value };
-      if (typeof oldvals[oRs("alg_ruimte_key").value] === 'undefined') // New ruimte
-          oldvals[oRs("alg_ruimte_key").value] = [tempTuple];
-      else
-          oldvals[oRs("alg_ruimte_key").value].push(tempTuple);
-
-      if (typeof afdeling_names[oRs("prs_afdeling_key").value] === 'undefined')
-          afdeling_names[oRs("prs_afdeling_key").value] = oRs("prs_afdeling_omschrijving").value;
-      oRs.MoveNext();
-  }
-
   for (var j = 0; j < ruimte_key_arr.length; j++)
   { // Verwijderen
     var sql = "DELETE prs_ruimteafdeling"
@@ -121,7 +73,7 @@ if (submitting)
       if (!oRs.eof)
       { // Update
         var sql = "UPDATE prs_ruimteafdeling SET"
-                + "       prs_ruimteafdeling_bezetting = " + bezettingen[i]
+                + "       prs_ruimteafdeling_bezetting = " + bezetting_keys[i]
                 + " WHERE prs_ruimteafdeling_key = " + oRs("prs_ruimteafdeling_key").Value;
         Oracle.Execute(sql);
       }
@@ -131,60 +83,11 @@ if (submitting)
                 + "        (alg_ruimte_key, prs_afdeling_key, prs_ruimteafdeling_bezetting)"
                 + " VALUES (" + ruimte_key_arr[j] + ","
                 +               afdeling_keys[i] + ","
-                +               bezettingen[i] + ")";
+                +               bezetting_keys[i] + ")";
         Oracle.Execute(sql);
       }
-      oRs.Close();
     }
   }
-
-  var trackingArr = new Object();
-  var fromLbl = "";
-  var toLbl = "";
-  var rowNr = -1;
-  var doneAfdeling = new Array();
-
-  for (var i = 0; i < ruimte_key_arr.length; i++)
-  {
-      if (typeof oldvals[ruimte_key_arr[i]] !== 'undefined')
-          for (var x = 0; x < oldvals[ruimte_key_arr[i]].length; x++)
-          {
-              fromLbl = shorttxt(afdeling_names[oldvals[ruimte_key_arr[i]][x].afd_key]) + " (" + oldvals[ruimte_key_arr[i]][x].bez + "%) ";
-
-              rowNr = sharedIndexOf(oldvals[ruimte_key_arr[i]][x].afd_key, afdeling_keys);
-              if (rowNr > -1) // Update
-              {
-                  doneAfdeling[rowNr] = true;
-                  if (oldvals[ruimte_key_arr[i]][x].bez == bezettingen[rowNr]) // No change
-                      continue;
-                  toLbl = " " + shorttxt(afdeling_names[afdeling_keys[rowNr]]) + " (" + bezettingen[rowNr] + "%)";
-              }
-              else // Delete
-                  toLbl = " " + L("lcl_tracktoempty");
-
-              if (typeof trackingArr[ruimte_key_arr[i]] === 'undefined')
-                  trackingArr[ruimte_key_arr[i]] = new Array();
-              trackingArr[ruimte_key_arr[i]].push(fromLbl + L("lcl_trackto") + toLbl);
-          }
-
-        for (var y = 0; y < afdeling_keys.length; y++)
-        {
-            if (doneAfdeling[y])
-                continue;
-            else if (typeof trackingArr[ruimte_key_arr[i]] === 'undefined')
-                trackingArr[ruimte_key_arr[i]] = new Array();
-            // Insert
-            fromLbl = L("lcl_trackfromempty") + " ";
-            toLbl = " " + shorttxt(afdeling_names[afdeling_keys[y]]) + " (" + bezettingen[y] + "%)";
-            trackingArr[ruimte_key_arr[i]].push(fromLbl + L("lcl_trackto") + toLbl);
-        }
-  }
-
-  for (var i = 0; i < ruimte_key_arr.length; i++)
-  {
-      if (typeof trackingArr[ruimte_key_arr[i]] !== 'undefined')
-          shared.trackaction("ALGRUP", ruimte_key_arr[i], L("lcl_alg_is_algrup") + "\n" + trackingArr[ruimte_key_arr[i]].join("\n"));
-  }
 %>
   <script type="text/javascript">
     FcltMgr.closeDetail(window, { success: true });
@@ -282,9 +185,8 @@ else
           </tr>
 
 <%        BLOCK_END();
-          /* deze Add is niet fraai zo, maar soi. Of: er is geen cancel ook */
-          var buttons =  [ {title: L("lcl_add"),    icon: "submit.png", action: "alg_add('"+ safe.displayfloat(tot_oppervlak, 2) +"')", importance: 1 },
-                           {title: L("lcl_submit"), icon: "undo.png",   action: "alg_submit()", importance: 1 } ];
+          var buttons =  [ {title: L("lcl_add"),    icon: "submit.png", action: "alg_add('"+ safe.displayfloat(tot_oppervlak, 2) +"')" },
+                           {title: L("lcl_submit"), icon: "undo.png",   action: "alg_submit()" } ];
           CreateButtons(buttons);
 IFACE.FORM_END();
 %>

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 = "<i class='fa fa-fw fa-times' OnClick='delRow(this)' style='cursor:pointer'></i>";
+  cell.innerHTML = "<img src='../Pictures/order_cancel.gif' OnClick='delRow(this)' style='cursor:pointer'>";
 
   // 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,22 +73,18 @@ function CreateRow(afd_key, afd_name, bezetting, oppervlak, bruto)
 function delRow(img)
 {
   // Verwijder de aangeklikte afdeling uit de lijst (de regel)
-  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);
-      }
-  });
+  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);
+  }
 }
 
 function alg_submit()
 {
-  if ($(document).has('span.bad').length)
-  {
-    FcltMgr.alert(L("lcl_shared_validator_invalid"));
-    return false;
-  }
-  var percValid = true;
+	var percValid = true;
   var i=0;
   while (percValid && (i<=rowIndex))
   {
@@ -98,7 +94,7 @@ function alg_submit()
      	  if (oppPerc > 100)
     	  {
     	  	percValid = false;
-          FcltMgr.alert(L("lcl_alg_bezetting_ongeldig"));
+          alert(L("lcl_alg_bezetting_ongeldig"));
           $("#bez"+i).select();
           $("#bez"+i).focus();
         }
@@ -133,41 +129,49 @@ function alg_add(oppervlak)
 
 function changeOppervlak(prowIndex)
 {
-    var $thisObj = $("#bezopp"+prowIndex);
-    var valid = isGoodNumber($thisObj.val(), false,false,8,2);
-    validateField($thisObj, valid, L("lcl_alg_bezetting_ongeldig"))
+	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());
 
-    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);
-      	}
-    }
+	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);
+  	}
+  }
 }
 
 function changeBezetting(prowIndex)
 {
-    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);
-        }
+  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);
+      }
     }
+  }
 }

APPL/ALG/alg_ruimtefunctie.asp

@@ -51,7 +51,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jQuery-ui.js"]})
     </script>
   </head>
 
-<body class="modal" id="mod_ruimtefunctie">
+  <body>
 <%
     var page="alg_edit_ruimtefunctie.asp?srtruimte_lg_key=" + srtruimte_lg_key; // Edit
     //if (srtruimte_lg_key == -1)
@@ -59,7 +59,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jQuery-ui.js"]})
     //else
     //    var page="alg_show_ruimtefunctie.asp?srtruimte_lg_key=" + srtruimte_lg_key ;
 
-    IFRAMER("algrfFrame", page, { title: L("lcl_prs_dienst_frame"),
+    IFRAMER("prsFrame", page, { title: L("lcl_prs_dienst_frame"),
                                 initHeight: "450px",
                                 FcltClose: "algClose" } );
 %>

APPL/ALG/alg_ruimtefunctie_delete.asp

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

APPL/ALG/alg_ruimtefunctie_list.inc

@@ -9,6 +9,7 @@
     Note:
 */ %>
 
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
 <!-- #include file="alg.inc" -->
@@ -47,19 +48,23 @@ function ruimtefunctie_list(pautfunction, params)
 
           var subject = "<%=L("lcl_estate_ruimte_man_sort")%>" + ' ' + algData.oms;
           var url = "alg_ruimtefunctie.asp?srtruimte_lg_key=" + srtruimte_lg_key;
-          FcltMgr.openModalDetail(url, subject, { width: 650, callback: FcltMgr.reload });
+          FcltMgr.openModalDetail(url, subject, { width: 700, callback: FcltMgr.reload });
         }
 
         function ruimtefunctie_delete(row, isMulti)
         {
-          FcltMgr.confirm(L("lcl_alg_del_txt_ruimtefunctie"), { autoconfirm: isMulti }, function() {
-            $(row).addClass('dirty');
-            var srtruimte_lg_key = row.getAttribute("ROWKEY");
+          $(row).addClass('dirty');
+          var srtruimte_lg_key = row.getAttribute("ROWKEY");
+          if (isMulti || confirm(L("lcl_alg_del_txt_ruimtefunctie")))
+          {
             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

@@ -1,72 +0,0 @@
-<%@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')", importance: 1 },
-                     {title: L("lcl_delete"), action: "alg_submit('D')", importance: 1 },
-                     {title: L("lcl_cancel"), action: "gen_cancel()", importance: 3} ];
-    CreateButtons(buttons);
-
-    IFACE.FORM_END();
-%>
-      </form>
-  </body>
-</html>

APPL/ALG/alg_ruimteresscope_save.asp

@@ -1,58 +0,0 @@
-<%@language = "javascript" %>
-<% /*
-     $Revision$
-     $Id$
-
-     SUBMIT-form
-*/ %>
-<%
-var JSON_Result = true;
-%>
-
-<!-- #include file="../Shared/common.inc" -->
-<!-- #include file="../API2/api2.inc" -->
-<%
-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">
-      <form name="u2" id="algform" target="workFrame" action="dynamischbepaald" method="get" onsubmit="return false;">
 <%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
+      <form name="u2" id="algform" target="workFrame" action="dynamischbepaald" method="get">
           <tr>
             <td class="searchkolom1">
               <table>
@@ -68,9 +68,10 @@ var authparams = alg.checkAutorisation();
 %>
               </table>
             </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 -->
+            <td class="searchkolom2"><input type="hidden" name="noref" value="1">
+            </td><!-- end column 1 -->
           </tr>
+      </form>
 <%    BLOCK_END();
 
   var buttons =  [
@@ -81,9 +82,7 @@ var authparams = alg.checkAutorisation();
      {title: L("lcl_menu_alg_terreinsector"), action: "doSubmit('T')"}
     ];
   CreateButtons(buttons, { entersubmit: true });
-%>
-      </form>
-</div> <!-- search -->
+%></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()
       {
-        FcltMgr.confirm(L("lcl_alg_del_txt_district"), function() {
-            var data = {
-                key: <%=dis_key%>,
-                level: "D"
-            };
+        if (confirm(L("lcl_alg_del_txt_district")))
+        {
+            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", "&nbsp;");
+<%      BLOCK_START("algInfo", "");
         FCLTplaatsselector(-1,
                            { regiokey: reg_key,
                              districtkey: dis_key,

APPL/ALG/alg_show_gebouw.asp

@@ -17,7 +17,6 @@
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
 <!-- #include file="../Shared/persoonselector.inc" -->
-<!-- #include file="../API2/api2.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
 <!-- #include file="alg.inc" -->
 
@@ -25,7 +24,6 @@
 FCLTHeader.Requires({ plugins:["jQuery"],
                       js: [] })
 
-var ins_score_enabled = S("ins_score_enabled") == 1;
 var bld_key  = getQParamInt("bld_key");
 var onrgoedlvl = "G";
 var this_alg = alg.func_enabled(bld_key, onrgoedlvl);
@@ -40,7 +38,6 @@ 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;
@@ -55,17 +52,11 @@ 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_key = oRs("mld_dienstniveau_key").Value;
+var dienstniveau = 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 toon_telefoon  = oRs("alg_gebouw_toon_telefoon").Value;
-var toon_email     = oRs("alg_gebouw_toon_email").Value;
-var toon_kenteken  = oRs("alg_gebouw_toon_kenteken").Value;
 var verantw    = oRs("prs_perslid_key_verantw").Value;
-var verantw2    = oRs("prs_perslid_key_verantw2").Value;
-var vervaldatum = oRs("alg_gebouw_vervaldatum").Value;
-var geb_score1 = oRs("alg_gebouw_mjb_score1").value;
 oRs.Close();
 %>
 
@@ -80,37 +71,23 @@ oRs.Close();
       }
       function bld_delete()
       {
-        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 (confirm(L("lcl_alg_del_txt_gebouw")))
+        {
+          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)
@@ -129,12 +106,11 @@ oRs.Close();
 %>
     <div id="show">
       <form name=u2 onSubmit="return false;">
-<%      BLOCK_START("algLoc1", "&nbsp;");
+<%      BLOCK_START("algLoc1", "");
         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"
@@ -147,14 +123,9 @@ oRs.Close();
                      { label: L("lcl_estate_gebouw_srtgebouw"),
                        initKey: bld_srtkey,
                        emptyOption: "",
-                       suppressEmpty: true,
                        readonly: 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_code"), bld_code, {suppressEmpty:true});
         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"
@@ -166,16 +137,15 @@ 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_key)
+        if (dienstniveau)
         {
           sql = "SELECT mld_dienstniveau_key"
               + "     , " + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
               + "  FROM mld_dienstniveau"
-              + " WHERE mld_dienstniveau_key = " + dienstniveau_key;
+              + " WHERE mld_dienstniveau_key = " + dienstniveau;
           oRs = Oracle.Execute(sql);
           ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
           oRs.Close();
@@ -188,84 +158,31 @@ 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
-                            });
-
-        ROFIELDTR("fld", L("lcl_alg_gebouw_email"), bld_email, { suppressEmpty: true, type: "email" });
         BLOCK_END();
 
-        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, datatype: "float"});
-        ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true, datatype: "float"});
-        ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true, datatype: "float"});
-
-        ROFIELDTR("fld", L("lcl_estate_gebouw_man_bruto_vloeropp"), bld_opp, {suppressEmpty: true, datatype: "float"});
-        ROFIELDTR("fld", L("lcl_estate_gebouw_man_omtrek"), bld_omtrek, {suppressEmpty: true, datatype: "float"});
-        ROFIELDTR("fld", L("lcl_estate_gebouw_man_inhoud"), bld_inhoud, {suppressEmpty: true, datatype: "float"});
-        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();
+        BLOCK_START("algLoc2", "");
+        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
+                     });
         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} );
         ROCHECKBOXTR("fldalgwerk", L("lcl_estate_gebouw_werkdagen"), werkdagen==1);
         BLOCK_END();
 
-        if (user.checkAutorisation("WEB_BEZMGT", true))
-        {
-          BLOCK_START("algLoc3", L("lcl_vis_Details"), { extraclass: "clear-both" });
-
-          ROCHECKBOXTR("fldalgbez", L("lcl_estate_gebouw_bez"), bld_bez==1);
-          var sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toontelfLOV"));
-          FCLTselector("toon_telefoon",
-                       sql,
-                       { label: L("lcl_estate_gebouw_toon_telefoon"),
-                         initKey: toon_telefoon,
-                         readonly: true,
-                         suppressEmpty: true,
-                         extraclass: "notmulti"
-                       });
-          sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonmailLOV"));
-          FCLTselector("toon_email",
-                      sql,
-                      { label: L("lcl_estate_gebouw_toon_email"),
-                        initKey: toon_email,
-                        readonly: true,
-                        suppressEmpty: true,
-                        extraclass: "notmulti"
-                      });
-          sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonkentLOV"));
-          FCLTselector("toon_kenteken",
-                      sql,
-                      { label: L("lcl_estate_gebouw_toon_kenteken"),
-                        initKey: toon_kenteken,
-                        readonly: true,
-                        suppressEmpty: true,
-                        extraclass: "notmulti"
-                      });
-          if (ins_score_enabled)
-            ROFIELDTR("fld", L("lcl_alg_gebouw_mjb_score1"), geb_score1, {suppressEmpty: true});
-          BLOCK_END();
-        }
-
         generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,
                                     onrgoed_niveau : onrgoedlvl,
                                     reado          : true,

APPL/ALG/alg_show_locatie.asp

@@ -21,7 +21,6 @@
 <%
 FCLTHeader.Requires({plugins:["jQuery"], js: []})
 
-var ins_score_enabled = S("ins_score_enabled") == 1;
 var loc_key  = getQParamInt("loc_key");
 var onrgoedlvl = "L";
 var this_alg = alg.func_enabled(loc_key, onrgoedlvl);
@@ -41,25 +40,22 @@ var loc_vwtel  = oRs("alg_locatie_verantw_tel").value;
 var loc_x      = oRs("alg_locatie_x").value;
 var loc_y      = oRs("alg_locatie_y").value;
 var loc_mail   = oRs("alg_locatie_email").value;
-var loc_score1 = oRs("alg_locatie_mjb_score1").value;
 var pst_adres  = oRs("alg_locatie_post_adres").value;
 var pst_postc  = oRs("alg_locatie_post_postcode").value;
 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 vervaldatum = oRs("alg_locatie_vervaldatum").Value;
-var dienstniveau_key = oRs("mld_dienstniveau_key").value;
+var dienstniveau = oRs("mld_dienstniveau_key").value;
 oRs.Close();
 %>
 <html>
   <head>
 <%  FCLTHeader.Generate(); %>
     <script  type="text/javascript" >
-      $(function()
-      {
-        $('textarea').resize(function () { FcltMgr.resized(window) } );
-        $('textarea').autogrow();
+      jQuery(document).ready(function() {
+           $('textarea').resize(function () { FcltMgr.resized(window) } );
+           $('textarea').autogrow();
       });
 
       function alg_showphotos()
@@ -75,38 +71,24 @@ oRs.Close();
 
       function loc_delete()
       {
-        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 (confirm(L("lcl_alg_del_txt_locatie")))
+        {
+          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)
@@ -124,7 +106,7 @@ oRs.Close();
       }
 %>
       <form name=u2 onSubmit="return false;">
-<%      BLOCK_START("algLoc1", "&nbsp;");
+<%      BLOCK_START("algLoc1", "");
         FCLTplaatsselector(-1,
                            { locatiekey: loc_key,
                              startlevel: 1, //District
@@ -136,12 +118,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_key)
+        if (dienstniveau)
         {
             sql  = "SELECT   mld_dienstniveau_key, "
                  + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
                  + "    FROM mld_dienstniveau "
-                 + "   WHERE mld_dienstniveau_key = " + dienstniveau_key;
+                 + "   WHERE mld_dienstniveau_key = " + dienstniveau;
             oRs = Oracle.Execute(sql);
             ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
             oRs.Close();
@@ -150,21 +132,15 @@ oRs.Close();
         ROFIELDTR("fld", L("lcl_geoycoord"), loc_y, {suppressEmpty: true});
 
         BLOCK_END();
-        BLOCK_START("algLoc2", "&nbsp;");
+        BLOCK_START("algLoc2", "");
 
-        var fldcls = "fld";
-        if (vervaldatum <= new Date())
-            fldcls += " expired2";
-        ROFIELDTR(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_prs_address_post_adres"), pst_adres, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_prs_address_post_postcode"), pst_postc, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_prs_address_post_plaats"), pst_plaats, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_prs_address_post_land"), pst_land, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw"), loc_vw, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {suppressEmpty: true});
-        ROFIELDTR("fld", L("lcl_noti_email"), loc_mail, { suppressEmpty: true, type: "email" });
-        if (ins_score_enabled)
-          ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
+        AFIELDTR('fldmailto details', L("lcl_noti_email"), "mailto:" + loc_mail, loc_mail, { suppressEmpty: true });
 
         BLOCK_END();
 

APPL/ALG/alg_show_regio.asp

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

APPL/ALG/alg_show_ruimte.asp

@@ -18,6 +18,7 @@
 <!-- #include file="alg_flexkenmerk.inc" -->
 <!-- #include file="../API2/api2.inc" -->
 <!-- #include file="../API2/model_rooms.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
@@ -53,16 +54,15 @@ if (!room_data.cadcontours.length)
         }
         function room_delete()
         {
-            FcltMgr.confirm(L("lcl_alg_del_txt_ruimte"), function() {
-                var data = {
-                    room_action: "D"
-                };
+            if (confirm(L("lcl_alg_del_txt_ruimte")))
+            {
+                var data = { room_action: "D" };
                 <% protectRequest.dataToken("data"); %>
                 $.post($("form[name=u2]")[0].action,
-                    data,
-                    FcltCallbackClose,
-                    "json");
-            });
+                       data,
+                       FcltCallbackClose,
+                       "json");
+            }
         }
         function openFG()
         {
@@ -99,7 +99,7 @@ if (!room_data.cadcontours.length)
             action="alg_edit_ruimte_save.asp?room_key=<%=room_data.id%>"
             onSubmit="return false">
 <%
-        BLOCK_START("algLoc1", "&nbsp;");
+        BLOCK_START("algLoc1", "");
 
           FCLTplaatsselector(-1, {
                             ruimtekey: room_key,
@@ -119,23 +119,23 @@ 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", "&nbsp;");
+        BLOCK_START("algLoc2", "");
 
-          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_bruto_vloeropp"), room_data.grossarea, {suppressEmpty:true, datatype: "float"});
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_bruto_vloeropp"), room_data.grossarea, {suppressEmpty:true});
           if (room_data.grossarea != room_data.cadcontours[0].cadarea)
-              ROFIELDTR("fldshort", L("lcl_estate_ruimte_getekendopp"),    room_data.cadcontours[0].cadarea,   {suppressEmpty:true, datatype: "float"});
-          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_opp_alt1"),       room_data.area1,     {suppressEmpty:true, datatype: "float"});
+              ROFIELDTR("fldshort", L("lcl_estate_ruimte_getekendopp"),    room_data.cadcontours[0].cadarea,   {suppressEmpty:true});
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_opp_alt1"),       room_data.area1,     {suppressEmpty:true});
           if (room_data.area1 != room_data.cadcontours[0].cadalt1)
-              ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt1"),       room_data.cadcontours[0].cadalt1,   {suppressEmpty:true, datatype: "float"});
-          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_opp_alt2"),       room_data.area2,     {suppressEmpty:true, datatype: "float"});
+              ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt1"),       room_data.cadcontours[0].cadalt1,   {suppressEmpty:true});
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_opp_alt2"),       room_data.area2,     {suppressEmpty:true});
           if (room_data.area2 != room_data.cadcontours[0].cadalt2)
-              ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt2"),       room_data.cadcontours[0].cadalt2,   {suppressEmpty:true, datatype: "float"});
-          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_man_omtrek"),     room_data.perimeter, {suppressEmpty:true, datatype: "float"});
-          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_man_inhoud"),     room_data.volume,    {suppressEmpty:true, datatype: "float"});
+              ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt2"),       room_data.cadcontours[0].cadalt2,   {suppressEmpty:true});
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_man_omtrek"),     room_data.perimeter, {suppressEmpty:true});
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_man_inhoud"),     room_data.volume,    {suppressEmpty:true});
           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"),  room_data.opento==24?"24:00":toTimeString(room_data.opento),     {suppressEmpty:true});
+          ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"),  toTimeString(room_data.opento),     {suppressEmpty:true});
 
           switch (room_data.workdays)
           {

APPL/ALG/alg_show_terreinsector.asp

@@ -16,7 +16,6 @@
 <!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
-<!-- #include file="../API2/api2.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
 <!-- #include file="alg.inc" -->
 
@@ -42,9 +41,6 @@ var sql = "SELECT ts.alg_locatie_key"
         + "     , ts.alg_terreinsector_aanmaak"
         + "     , ts.alg_terreinsector_omschrijving"
         + "     , ts.alg_terreinsector_ordernr"
-        + "     , ts.alg_terreinsector_toon_telef"
-        + "     , ts.alg_terreinsector_toon_email"
-        + "     , ts.alg_terreinsector_toon_kentk"
         + "     , ts.prs_kostenplaats_key"
         + "     ,(SELECT " + S("prs_kpn_string") + " kpstring"
           + "       FROM prs_kostenplaats k"
@@ -53,7 +49,6 @@ var sql = "SELECT ts.alg_locatie_key"
         + "     , (SELECT prs_afdeling_omschrijving"
           + "        FROM prs_afdeling a"
           + "       WHERE a.prs_afdeling_key = ts.prs_afdeling_key) afdeling_oms"
-        + "     , ts.alg_terreinsector_vervaldatum"
         + "     , ts.alg_terreinsector_verwijder"
         + "  FROM alg_terreinsector ts"
         + " WHERE ts.alg_terreinsector_key = " + ter_key;
@@ -69,50 +64,42 @@ var ter_omt   = oRs("alg_terreinsector_omtrek").value;
 var ter_aanmk = oRs("alg_terreinsector_aanmaak").value;
 var ter_oms   = oRs("alg_terreinsector_omschrijving").value;
 var ter_ordnr = oRs("alg_terreinsector_ordernr").value;
-var toon_telefoon  = oRs("alg_terreinsector_toon_telef").Value;
-var toon_email     = oRs("alg_terreinsector_toon_email").Value;
-var toon_kenteken  = oRs("alg_terreinsector_toon_kentk").Value;
 var prs_kstn  = oRs("prs_kostenplaats_key").value;
 var prs_kstpl = oRs("kostenplaats_oms").value;
 var prs_afd   = oRs("afdeling_oms").value;
 var ter_deleted = oRs("alg_terreinsector_verwijder").value != null;
-var vervaldatum = oRs("alg_terreinsector_vervaldatum").Value;
 oRs.Close();
 %>
 
 <html>
   <head>
 <%  FCLTHeader.Generate(); %>
-    <script type="text/javascript">
-
-      $(function()
-      {
-        $('textarea').resize(function () { FcltMgr.resized(window) } );
-        $('textarea').autogrow();
+    <script  type="text/javascript" >
+      jQuery(document).ready(function() {
+            $('textarea').resize(function () { FcltMgr.resized(window) } );
+            $('textarea').autogrow();
       });
 
       function ter_change()
       {
-        if (FcltMgr.startEdit(window))
-            window.location.href = "alg_edit_terreinsector.asp?ter_key=<%=ter_key%>"
+          if (FcltMgr.startEdit(window))
+              window.location.href = "alg_edit_terreinsector.asp?ter_key=<%=ter_key%>"
       }
-
       function ter_delete()
       {
-        FcltMgr.confirm(L("lcl_alg_del_txt_terreinsector"), function() {
-            var data = {
-                key: <%=ter_key%>,
-                level: "T"
-            };
+          if (confirm(L("lcl_alg_del_txt_terreinsector")))
+          {
+            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>
 
@@ -144,45 +131,14 @@ oRs.Close();
                              readonly: true
                            });
 
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_sort"), ter_sroms, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_sort"), ter_sroms);
         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, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_prs_dept_kosten"), prs_kstpl);
         ROFIELDTR("fld", L("lcl_dep_name_level2"), prs_afd);
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_ordernr"), ter_ordnr, {suppressEmpty: true});
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_oppervlak"), ter_opp, {suppressEmpty: true, datatype: "float"});
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_omtrek"), ter_omt, {suppressEmpty: true, datatype: "float"});
-        var fldcls = "fld";
-        if (vervaldatum <= new Date())
-            fldcls += " expired2";
-        ROFIELDTR(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
-        var sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toontelfLOV"));
-        FCLTselector("toon_telefoon",
-                     sql,
-                     { label: L("lcl_estate_gebouw_toon_telefoon"),
-                       initKey: toon_telefoon,
-                       readonly: true,
-                       suppressEmpty: true,
-                       extraclass: "notmulti"
-                     });
-        sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonmailLOV"));
-        FCLTselector("toon_email",
-                    sql,
-                    { label: L("lcl_estate_gebouw_toon_email"),
-                      initKey: toon_email,
-                      readonly: true,
-                      suppressEmpty: true,
-                      extraclass: "notmulti"
-                    });
-        sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonkentLOV"));
-        FCLTselector("toon_kenteken",
-                    sql,
-                    { label: L("lcl_estate_gebouw_toon_kenteken"),
-                      initKey: toon_kenteken,
-                      readonly: true,
-                      suppressEmpty: true,
-                      extraclass: "notmulti"
-                    });
+        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);
 
         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_key = oRs("mld_dienstniveau_key").value;
+var dienstniveau = oRs("mld_dienstniveau_key").value;
 oRs.Close();
 %>
 
@@ -52,17 +52,17 @@ oRs.Close();
 
       function flr_delete()
       {
-        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");
-        });
+        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");
+        }
       }
     </script>
   </head>
@@ -86,35 +86,27 @@ oRs.Close();
       }
 %>
       <form name=u2 onSubmit="return false;">
-<%      BLOCK_START("algLoc1", "&nbsp;");
+<%      BLOCK_START("algLoc1", "");
         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_key)
+        if (dienstniveau)
         {
             sql  = "SELECT   mld_dienstniveau_key, "
                  + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
                  + "    FROM mld_dienstniveau "
-                 + "   WHERE mld_dienstniveau_key = " + dienstniveau_key;
+                 + "   WHERE mld_dienstniveau_key = " + dienstniveau;
             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, datatype: "float"});
-          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true, datatype: "float"});
-          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true, datatype: "float"});
-        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%>;
-         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");
-         });
+         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");
+         }
       }
     </script>
   </head>
@@ -106,7 +106,7 @@ var wp_typ_str = (wp_type == 1 ? L("lcl_wptype_1") : L("lcl_wptype_0"));
             </label>
           </td>
         </tr>
-<%      ROFIELDTR("fld", L("lcl_estate_wp_area"), wp_opp, {suppressEmpty:true, datatype: "float"});
+<%      ROFIELDTR("fld", L("lcl_estate_wp_area"), wp_opp, {suppressEmpty:true});
         if (wp_virt==1)
             CHECKBOXTR(L("lcl_estate_wp_virt"), "fldalgbez", "wp_virt", wp_virt, { suppressEmpty:true, html: " disabled" });
         ROFIELDTR("wp_type",      L("lcl_wptype"),     wp_typ_str);

APPL/ALG/alg_srtruimte.asp

@@ -11,6 +11,7 @@
 
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/save2db.inc" -->
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/disciplineselector.inc" -->
@@ -118,7 +119,7 @@ if (mode == "save")
     {
 %>
         <script>
-            FcltMgr.alert("<%=safe.jsstring(err.friendlyMsg)%>");
+            alert("<%=safe.jsstring(err.friendlyMsg)%>");
         </script>
 <%
     }
@@ -126,7 +127,7 @@ if (mode == "save")
     {
 %>
         <script>
-            $(function () {parent.window.location.href="alg_srtruimte.asp?mode=show&alg_srtruimte_key=<%=srtruimte_key%>";} );
+            $(document).ready(function () {parent.window.location.href="alg_srtruimte.asp?mode=show&alg_srtruimte_key=<%=srtruimte_key%>";} );
         </script>
 <%
     }
@@ -141,13 +142,12 @@ else if (srtruimte_key > 0 && mode == "delete")
     var err = Oracle.Execute(sql, true);
 %>
     <script>
-        $(function ()
-        {
-          FcltMgr.closeDetail(window, { alg_srtruimte_key: <%=srtruimte_key%>,
-                                        warning: "<%=safe.jsstring(err.friendlyMsg)%>",
-                                        keepForm: <%=err.friendlyMsg? "true" : "false"%>
-                                      });
-        });
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { alg_srtruimte_key: <%=srtruimte_key%>,
+                                          warning: "<%=safe.jsstring(err.friendlyMsg)%>",
+                                          keepForm: <%=err.friendlyMsg? "true" : "false"%>
+                                        });
+        } );
     </script>
 <%
     Response.End;
@@ -171,10 +171,8 @@ else if (srtruimte_key > 0 && mode == "delete")
 
     function alg_delete()
     {
-        FcltMgr.confirm("<%=safe.jsstring(L("lcl_R_U_sure"))%>",
-            function() {
-                window.location.href = "../alg/alg_srtruimte.asp?mode=delete&alg_srtruimte_key=<%=srtruimte_key%>";
-            });
+        if (confirm("<%=safe.jsstring(L("lcl_R_U_sure"))%>"))
+            window.location.href = "alg_srtruimte.asp?mode=delete&alg_srtruimte_key=<%=srtruimte_key%>";
     }
 
     function alg_cancel()
@@ -236,12 +234,11 @@ else if (srtruimte_key > 0 && mode == "delete")
           $("#dayshours_urg").prop("disabled", false);
     }
 
-    $(function()
-    {
-        $('textarea').resize(function () { FcltMgr.resized(window) } );
-        $('textarea').autogrow();
-    });
-
+    jQuery(document).ready(function()
+                           {
+                               $('textarea').resize(function () { FcltMgr.resized(window) } );
+                               $('textarea').autogrow();
+                           });
 </script>
   </head>
 
@@ -290,10 +287,10 @@ else if (srtruimte_key > 0 && mode == "delete")
             target="hidFrameSubmit"
             onSubmit="alg_submit()">
 <%
-        BLOCK_START("algInfo", L("lcl_general_properties"));
+        BLOCK_START("algInfo", safe.html(L("lcl_general_properties")));
 
             ROFIELDTR(                  "fld",      L("lcl_key"),                     srtruimte_key);
-            myFIELD("omschrijving",     "fld",      L("lcl_descr"),                   srtr_info.alg_srtruimte_omschrijving, { translate: {fld: "mld_afmeldtekst_naam", key: srtruimte_key} });
+            myFIELD("omschrijving",     "fld",      L("lcl_descr"),                   srtr_info.alg_srtruimte_omschrijving);
             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} );
@@ -315,8 +312,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 * 100000) / 100000 : ""
-                   , {maxlength: 8, 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 * 100) / 100 : ""
+                   , {maxlength: 4, datatype: "float", html: "onChange='onChangeUitvoertijd();'", suppressEmpty: true, selector: selectparams});
 
         BLOCK_END();
 

APPL/ALG/alg_srtruimte_search.asp

@@ -29,13 +29,12 @@ FCLTHeader.Generate();
 %>
 
 <script type="text/javascript">
-
     function doSubmit()
     {
-      document.forms.u2.submit();
+        document.forms.u2.submit();
     }
 
-    $(function()
+    $(document).ready(function()
     {
       <% if (autosearch) { %> document.forms.u2.submit();<%}%>
     });
@@ -45,8 +44,8 @@ FCLTHeader.Generate();
 
   <body id="searchbody">
     <div id="search">
-      <form name="u2" target="workFrame" action="alg_srtruimte_search_list.asp" method="get">
 <%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
+      <form name="u2" target="workFrame" action="alg_srtruimte_search_list.asp" method="get">
           <tr>
             <td class="searchkolom1">
               <table><!-- x rijen, 2 kolommen: label + veld -->

APPL/ALG/alg_srtruimte_search_list.asp

@@ -93,7 +93,7 @@ FCLTHeader.Generate({outputmode: outputmode});
                                    buttons: buttons
                                  });
 
-    rst.addColumn(new Column({caption: "Key",                       content: "alg_srtruimte_key",  datatype: "number"}));
+    rst.addColumn(new Column({caption: "Key",                       content: "alg_srtruimte_key"}));
     rst.addColumn(new Column({caption: L("lcl_descr"),              content: "alg_srtruimte_omschrijving"}));
     rst.addColumn(new Column({caption: L("lcl_alg_alg_tarief"),     content: "alg_srtruimte_prijs",  datatype: "currency"}));
     rst.addColumn(new Column({caption: L("lcl_alg_alg_tariefA"),    content: "alg_srtruimte_prijs2", datatype: "currency"}));

APPL/ALG/alg_terreinsector_list.inc

@@ -10,6 +10,7 @@
 */
 %>
 
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
 <!-- #include file="alg.inc" -->
@@ -48,14 +49,18 @@ function fnrowData(oRs)
 
   function doDelete(rowArray, isMulti)
   {
-    FcltMgr.confirm(L("lcl_alg_del_txt_terreinsector"), { autoconfirm: isMulti }, function() {
-      var terKeyString = getKeyString(rowArray);
+    var terKeyString = getKeyString(rowArray);
+    if (isMulti || confirm(L("lcl_alg_del_txt_terreinsector")))
+    {
       var data = { key: terKeyString,
                    level: "T"
                  };
       <% protectRequest.dataToken("data"); %>
-      $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
-    });
+      $.post("alg_delete.asp",
+             data,
+             FcltCallbackRefresh,
+             "json");
+    }
   }
 </script>
 <%
@@ -74,12 +79,9 @@ 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_key = params.ter_func_key;
-  var expalgincl = params.expalgincl;
+  var ter_func = params.ter_func;
 
   function fnrowActionEnabler(oRs) // klopt dit voor terreinsector?
   {
@@ -113,7 +115,6 @@ function terrein_list(pautfunction, params)
        + "         g.alg_terreinsector_code, "
        + "         g.alg_terreinsector_oppervlak, "
        + "         g.alg_terreinsector_omtrek, "
-       + "         g.alg_terreinsector_vervaldatum, "
        + "         g.alg_srtterreinsector_key, "
        + lcl.xsqla('s.alg_srtterreinsec_omschrijving', 's.alg_srtterreinsector_key')
        + "    FROM alg_v_aanwezigterreinsector g, "
@@ -137,25 +138,18 @@ 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_key)
+   if (ter_func)
       {
-       sqln += " AND g.alg_srtterreinsector_key = " + ter_func_key;
+       sqln += " AND g.ALG_SRTTERREINSECTOR_KEY = " + ter_func;
       }
 
    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 + "%");
      }
 
-   if (!expalgincl)
-     sqln += " AND (g.alg_terreinsector_vervaldatum IS NULL OR g.alg_terreinsector_vervaldatum > TRUNC(SYSDATE)) ";
-
-   sqln += " ORDER BY g.alg_terreinsector_upper ASC "
+     sqln += " ORDER BY g.alg_terreinsector_upper ASC "
 
     var addurl = "appl/alg/alg_terreinsector.asp";
 
@@ -185,7 +179,6 @@ function terrein_list(pautfunction, params)
     rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_sort"), content: "alg_srtterreinsec_omschrijving"}));
     rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_oppervlak"), content: "alg_terreinsector_oppervlak"}));
     rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_omtrek"), content: "alg_terreinsector_omtrek"}));
-    rst.addColumn(new Column({caption: L("lcl_alg_vervaldatum"), content: "alg_terreinsector_vervaldatum", datatype: "date"}));
 
     rst.addAction({ action: "terreinEdit", caption: L("lcl_edit"), isDefault:  true});
     rst.addAction({ action: "doDelete", caption: L("lcl_delete"), enabler: "eDelete", single: !noref, multi: true, multiOnce: true});

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_key = getQParamInt("ter_func_key", -1);
+var ter_func = getQParamInt("ter_func", -1);
 var autosearch = getQParamInt("autosearch", 0) == 1;
 var authparams = alg.checkAutorisation();
 
@@ -24,25 +24,22 @@ var authparams = alg.checkAutorisation();
   <head>
 <%  FCLTHeader.Generate(); %>
     <script type="text/javascript">
-
-        function doSubmit()
-        {
+    function doSubmit()
+      {
           // Submitten met kenmerken
           doSubmitWithKenmerken();
-        }
+      }
 
-        function myModal(init)
+        function myModal()
         {
           var lvl = "T";
           var key = 0;
           var bld_key = "";
           var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
           var titel = "<%=L("lcl_properties")%>";
-          showKenmerkModal(url, titel, init)
+          showKenmerkModal(url, titel)
         }
-
-        $(function() {<% if (autosearch) { %> document.forms.u2.submit();<%}%>});
-
+        $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit();<%}%>});
     </script>
   </head>
   <body id="searchbody">
@@ -67,7 +64,7 @@ var authparams = alg.checkAutorisation();
 
               FCLTselector("srt",
                            sql,
-                           { initKey: ter_func_key,
+                           { initKey: ter_func,
                              label: L("lcl_estate_terreinsector_man_sort"),
                              emptyOption: "",
                              trclass: "primsearch",
@@ -75,14 +72,6 @@ var authparams = alg.checkAutorisation();
                            });
                            %>
                 </tr>
-                <!-- Vervallen terreinen -->
-                <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_terreinsector_vervallen_incl")%></label>
-                  </td>
-                </tr>
               </table>
             </td><!-- end column 1 -->
 
@@ -98,8 +87,8 @@ var authparams = alg.checkAutorisation();
           </tr>
 <%    BLOCK_END(); %>
 <%
-  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch", importance: 1 },
-                   {title: L("lcl_obj_advanced"), action: "myModal()", id:"bAdvanced", importance: 3 } ];
+  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
+                   {title: L("lcl_obj_advanced"), action: "myModal()", id:"bAdvanced" } ];
   CreateButtons(buttons, { entersubmit: true });
 %>
       </form>

APPL/ALG/alg_terreinsector_search_list.asp

@@ -22,23 +22,17 @@
 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 expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen terreinen
-var ter_func_key = getQParamInt("srt", -1);
+var ter_func = 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_key: (ter_func_key != -1? ter_func_key : null),
-                 noref: (noref != -1? noref : null),
-                 expalgincl: expalgincl
+                 ter_func: (ter_func != -1? ter_func : null),
+                 noref: (noref != -1? noref : null)
               }
              );
 %>

APPL/ALG/alg_verdieping.asp

@@ -76,26 +76,15 @@ 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

@@ -9,6 +9,7 @@
     Note:
 */ %>
 
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
 <!-- #include file="alg.inc" -->
@@ -35,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 + "&chkgeb=1";
+    var url = "appl/ALG/alg_ruimte_search.asp?verdieping_key=" + algData.detail_key + "&autosearch=" + autosearch;
     FcltMgr.openDetail(url, "<%=L("lcl_room")%>");
   }
   function gotoParent(row)
@@ -53,14 +54,18 @@ function fnrowData(oRs)
 
   function doDelete(rowArray, isMulti)
   {
-    FcltMgr.confirm(L("lcl_alg_del_txt_verdieping"), { autoconfirm: isMulti }, function() {
-      var flrKeyString = getKeyString(rowArray);
+    var flrKeyString = getKeyString(rowArray);
+    if (isMulti || confirm(L("lcl_alg_del_txt_verdieping")))
+    {
       var data = { key: flrKeyString,
                    level: "V"
                  };
       <% protectRequest.dataToken("data"); %>
-      $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
-    });
+      $.post("alg_delete.asp",
+             data,
+             FcltCallbackRefresh,
+             "json");
+    }
   }
 
 </script>
@@ -79,12 +84,9 @@ 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)
   {
@@ -122,7 +124,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
@@ -148,13 +150,7 @@ 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,7 +17,6 @@ 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();
 %>
 
@@ -25,32 +24,29 @@ var authparams = alg.checkAutorisation();
   <head>
 <%  FCLTHeader.Generate(); %>
     <script>
-
       function doSubmit()
       {
           // Submitten met kenmerken
           doSubmitWithKenmerken();
       }
 
-      function myModal(init)
+      function myModal()
       {
         var lvl = "V";
         var key = 0;
         var bld_key = "";
         var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
         var titel = "<%=L("lcl_properties")%>";
-        showKenmerkModal(url, titel, init)
+        showKenmerkModal(url, titel)
       }
 
-      $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
-
+      $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
     </script>
   </head>
 
   <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>
@@ -70,8 +66,8 @@ var authparams = alg.checkAutorisation();
         </table>
 <%    BLOCK_END();
 
-  var buttons =  [ {title: L("lcl_search"), action: "doSubmit();", id: "bSearch", importance: 1 },
-                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced", importance: 3 } ];
+  var buttons =  [ {title: L("lcl_search"), action: "doSubmit();", id: "bSearch" },
+                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
   CreateButtons(buttons, { entersubmit: true });
 %>
       </form>

APPL/ALG/alg_verdieping_search_list.asp

@@ -22,24 +22,17 @@
 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),
-                 chkgeb: chkgeb
+                 noref: (noref != -1? noref : null)
               }
              );
 %>

APPL/ALG/alg_werkplek_list.inc

@@ -10,6 +10,7 @@
     Note:
 */
 %>
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="alg.inc" -->
 
@@ -66,14 +67,18 @@ FCLTHeader.Requires({ plugins:["jQuery"],
 
     function doDelete(rowArray, isMulti)
     {
-      FcltMgr.confirm(L("lcl_alg_del_txt_werkplek"), { autoconfirm: isMulti }, function() {
-        var wpKeyString = getKeyString(rowArray);
+    var wpKeyString = getKeyString(rowArray);
+      if (isMulti || confirm(L("lcl_alg_del_txt_werkplek")))
+      {
         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
@@ -220,14 +225,14 @@ function werkplek_list(pautfunction, params)
         switch (oRs("prs_werkplek_type").Value)
         {
             case 0: return L("lcl_wptype_0");
-            case 1: return L("lcl_wptype_1") + (S("prs_werkplek_implicit")==1?" "+safe.html(oRs("prs_werkplek_omschrijving").Value):""); // Impliciet flex de code erachter
+            case 1: return L("lcl_wptype_1") + (S("prs_werkplek_implicit")==1?" "+safe.html(oRs("prs_werkplek_omschrijving")):""); // Impliciet flex de code erachter
         };
     }
     function fnBezetting(oRs)
     {
         switch (oRs("prs_werkplek_type").Value)
         {
-            case 0: return oRs("prs_perslidwerkplek_bezetting").Value;
+            case 0: return oRs("prs_perslidwerkplek_bezetting");
             case 1: return "";
         };
     }
@@ -247,7 +252,6 @@ 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", datatype: "number"}));
     if (S("prs_werkplek_implicit")==0)
     {
         rst.addColumn(new Column({caption: L("lcl_workplace"), content: "prs_werkplek_omschrijving" }));

APPL/ALG/alg_werkplek_search.asp

@@ -34,7 +34,7 @@ var authparams = alg.checkAutorisation();
   <head>
 <%  FCLTHeader.Generate(); %>
     <script>
-      $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+      $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
     </script>
   </head>
   <body id="searchbody">

APPL/ALG/alg_wp.asp

@@ -76,11 +76,8 @@ 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,10 +15,11 @@
 */ %>
 
 <%
-var JSON_Result = true;
+DOCTYPE_Disable = 1;
 %>
 
 <!-- #include file="../Shared/common.inc"-->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="./alg.inc" -->
 
 <%

APPL/ALG/get_volgnr_ajax.asp

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

APPL/API/.gitignore

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

APPL/API/api.inc

@@ -59,16 +59,9 @@ function API_func()
         loglevel:         oRs("fac_api_loglevel").Value,
         usrrap_key:       oRs("fac_usrrap_key").Value,
         stylesheet:       oRs("fac_api_stylesheet").Value,
-        stylesheet_out:   oRs("fac_api_stylesheet_out").Value,
         import_app_key:   oRs("fac_import_app_key").Value
     };
 
-    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
-        __Log("Logging for this API ({0}) is forced on".format(this.APIname), '#f00');
-    }
-
     try
     {
         this.apidata.options = eval("("+oRs("fac_api_options_json").Value+")");

APPL/API/api_SOAP.asp

@@ -36,10 +36,11 @@
     LCL_Disable = 1
     THIS_FILE = "appl/api/api_soap.asp";
 
-//    __Logging = 1;
+//    Session("logging")=1;
 %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/xml_converter.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../api/api.inc" -->
 <%
     Session.Codepage = 65001;
@@ -54,15 +55,6 @@ try
 
     var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
     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 + "_IN");
 
@@ -241,20 +233,10 @@ try
         // TODO: Onderstaande code gaan delen met fac_usrrap.inc?
         if (has3D["FCLT_3D_DISCIPLINE_KEY"])
         {
-            var disc_3d = " FCLT_3D_DISCIPLINE_KEY IN"
+            wheres.push(" FCLT_3D_DISCIPLINE_KEY IN"
                         + " (SELECT ins_discipline_key FROM fac_v_webgebruiker "
-                        + "   WHERE fac_functie_key = " + authparams.autfunctionkey
-                        + "     AND prs_perslid_key = " + user_key + ")";
-
-            if (has3D["FCLT_3D_DISCIPLINE2_KEY"])
-                disc_3d = " (" + disc_3d + " OR "
-                        + " FCLT_3D_DISCIPLINE2_KEY IN"
-                        + " (SELECT ins_discipline_key FROM fac_v_webgebruiker "
-                        + "   WHERE fac_functie_key = " + authparams.autfunctionkey
-                        + "     AND prs_perslid_key = " + user_key + ")"
-                        + ")";
-
-            wheres.push(disc_3d);
+                        +   "  WHERE fac_functie_key = " + authparams.autfunctionkey
+                        +   "    AND prs_perslid_key="+user_key + ")");
         }
         if (has3D["FCLT_3D_LOCATIE_KEY"] && authparams.ALGreadlevel > -1)
         {
@@ -308,13 +290,20 @@ try
                    + safe.quoted_sql(where)
                    + ", " + safe.quoted_sql(resultnode)
                    + ", " + safe.quoted_sql(resnodename);
-
-    var sql = "SELECT xml.make_view_xml2(" + sql_params + ") xml_blob FROM dual";
-    var oRs = Oracle.Execute(sql);
-    var xml_content = oRs("xml_blob").Value;
-	oRs.Close();
-    __Log("XML blob is {0} karakters.".format(xml_content.length));
-    Oracle.Execute("BEGIN DBMS_SESSION.free_unused_user_memory; END;");
+    if (String(Oracle.RealConnection.Properties("Provider Name")).match(/OraOLEDB/i))
+    {
+        var sql = "SELECT xml.make_view_xml2(" + sql_params + ") xml_blob FROM dual";
+        var oRs = Oracle.Execute(sql);
+        var xml_content = oRs("xml_blob").Value;
+		oRs.Close();
+        __Log("XML blob is {0} karakters.".format(xml_content.length));
+    }
+    else // MSDAORA kan niet rechtstreeks BLOB's ophalen
+    {
+        sql = "BEGIN xml.make_view_xml(" + sql_params + "); END;";
+        Oracle.Execute(sql);
+        var xml_content = get_fac_xml('$AspSession$');
+    }
 
     if (API.apidata.loglevel) __Log2File(xml_content, API.APIname + "_DATA");
 

APPL/API/api_XMLNode.asp

@@ -28,7 +28,7 @@
     function XML2TEMP(xml, postfix)
     {
         if (!API.apidata.loglevel) return;
-        var in_file = shared.tempFolder() + "/" + customerId + "_" + API.APIname + "_" + postfix + "_";
+        var in_file = Server.MapPath("./temp") + "/" + customerId + "_" + API.APIname + "_" + postfix + "_";
         var jsDate = new Date();
         var s = String(jsDate.getFullYear()) + padout(jsDate.getMonth() + 1) + padout(jsDate.getDate())
               + padout(jsDate.getHours()) + padout(jsDate.getMinutes()) + padout(jsDate.getSeconds())
@@ -41,6 +41,8 @@
         ts.Close();
     }
 
+    Session("logging") = API.apidata.loglevel||0;
+
     var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
     xmlReq.load(Request);
 

APPL/API/api_besordsoap.asp

@@ -370,8 +370,8 @@
                         tsql = "UPDATE bes_bestelopdr "
                             + " SET "+ opdropm_kolom
                             + "=DECODE ("+ opdropm_kolom
-                            + "       , NULL, "+ safe.quoted_sql(opdropm, 320)
-                            + "       , SUBSTR ("+ opdropm_kolom +"||CHR(13)||CHR(10)||"+ safe.quoted_sql(opdropm, 320) +", 1, 320))"
+                            + "       , NULL, "+ safe.quoted_sql(opdropm)
+                            + "       , SUBSTR ("+ opdropm_kolom +"||CHR(13)||CHR(10)||"+ safe.quoted_sql(opdropm) +", 1, 4000))"
                             + " WHERE bes_bestelopdr_key="+ opdr_key;
                         Oracle.Execute(tsql);
                     }
@@ -405,7 +405,6 @@
 
     xmlResp.appendChild(FCLTElement);
 
-    Response.ContentType = "text/xml";
     if (API.apidata.stylesheet)
     {
         // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
@@ -413,6 +412,7 @@
     }
     else
     {
+        Response.ContentType = "text/xml";
         Response.Write(xmlResp.xml)
     }
 %>

APPL/API/api_bessoap.asp

@@ -19,6 +19,7 @@
 <!-- #include file="../Shared/xml_converter.inc" -->
 <!-- #include file="../Shared/save2db.inc" -->
 <!-- #include file="../Shared/flexfiles.inc" -->
+<!-- #include file="../Shared/upload.inc" -->
 <!-- #include file="../api/api.inc" -->
 <!-- #include file="../shared/kpl_ksrt_validate.inc" -->
 <!-- #include file="../bes/bes.inc" -->
@@ -121,7 +122,6 @@
 
                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,10 +129,8 @@
                else {
              	   if (nwStatus != null) { // Bij update optioneel
                      // statusdiagram afdwingen:
-                     // * 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.
+                     // * BESFIT alleen vanuit status 2
+                     // * BESREJ alleen vanuit status 2 en 3
                      sql = "SELECT bes_bestelling_status"
                          + "  FROM bes_bestelling"
                          + " WHERE bes_bestelling_key="+bestelling_key;
@@ -141,12 +139,9 @@
                         curStatus = oRs("bes_bestelling_status").value;
 
                         // Feitelijke UPDATE status.
-                        // BESFIT: alleen vanuit status 2 als bes_disc_info.disc_params_fiatflow == 0.
-                        //                vanuit sattus 4 als bes_disc_info.disc_params_fiatflow == 1.
+                        // BESFIT: alleen vanuit status 2
                         if (nwStatus == "BESFIT") {
-                           if ((bes_disc_info.disc_params_fiatflow == 0 && curStatus == 2) ||
-                               (bes_disc_info.disc_params_fiatflow == 1 && curStatus == 4))
-                           {
+                           if (curStatus == 2) {
                               bes.setbestellingstatus(bes_bestelling_key, 3);  // Gefiatteerd
                               sql = "SELECT bes_bestelling_status"
                                   + "  FROM bes_bestelling"
@@ -177,12 +172,9 @@
                               resultcode = 305;
                            }
                         }
-                        // 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.
+                        // BESREJ: alleen vanuit status 2 en 3
                         else if (nwStatus == "BESREJ") {
-                           if ((bes_disc_info.disc_params_fiatflow == 0 && (curStatus == 2 || curStatus == 3)) ||
-                               (bes_disc_info.disc_params_fiatflow == 1 && (curStatus == 2 || curStatus == 4)))
-                           {
+                           if (curStatus == 2 || curStatus == 3) {
                               bes.setbestellingstatus(bes_bestelling_key, 1);  // Afgewezen
                               sql = "SELECT bes_bestelling_status"
                                   + "  FROM bes_bestelling"

APPL/API/api_cntsoap.asp

@@ -108,15 +108,8 @@
                 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

@@ -1,43 +0,0 @@
-<%@ 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/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,5 +1,4 @@
 <%@ language = "JavaScript" %>
-<%  Server.ScriptTimeout=6000; %>
 <% /*
      $Revision$
      $Id$
@@ -18,7 +17,6 @@
 <!-- #include file="../../appl/Shared/common.inc" -->
 <!-- #include file="../../appl/api/api.inc" -->
 <!-- #include file="../../appl/shared/FlexFiles.inc" -->
-<!-- #include file="../Shared/xml_converter.inc" -->
 <script language="javascript" src="../imp/imp_shared.js" runat="server"></script>
 <%
     // We sturen het antwoord in UTF-8.
@@ -41,12 +39,8 @@
     fileStream.Open();
     fileStream.Write(Request.BinaryRead(bytes));
 
-    if (API.apidata.loglevel & 1 || __Logging > 0)
-    {
-        var savename = __Log2FileName("{0}_{1}".format(API.APIname, user_key));
-        fileStream.SaveToFile(savename, 2); //  2=adSaveCreateOverWrite
-        __DoLog("Import file was saved in {0}".format(savename), "#ff4");
-    }
+    if (API.apidata.loglevel & 1)
+        fileStream.SaveToFile(Server.MapPath(rooturl + "/temp/") + "/" + customerId + "_" + API.APIname + ".tmp", 2); //  2=create
 
     var res = impReadStream(fileStream, import_app_key,
                                             { fac_home: Server.MapPath(rooturl + "/") + "/",
@@ -54,11 +48,8 @@
                                               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;
@@ -66,11 +57,7 @@
                                                      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\""));
@@ -82,55 +69,8 @@
     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";
-    if (API.apidata.stylesheet_out)
-    {
-        var params = {};
-        STR2Stream(xmlResp.xml, API.apidata.stylesheet_out, Response, params);
-    }
-    else
-        Response.Write(xmlResp.xml);
-
+    Response.Write(xmlResp.xml);
 %>

APPL/API/api_hmail.asp

@@ -16,20 +16,20 @@
     THIS_FILE = "appl/api/api_hmail.asp";
 %>
 <!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/xml_converter.inc" -->
 <!-- #include file="../Shared/flexfiles.inc" -->
+<!-- #include file="../Shared/upload.inc" -->
 <!-- #include file="../api/api.inc" -->
 <%
 
 var API = new API_func();
 
-function abortRejectMail(tekst, maillog)
+function abortRejectMail(tekst)
 {
     var result = { success: false,
-                   message: tekst,
-                   maillog: maillog||tekst
+                   message: tekst
                  }
-    __Log(result.maillog); // komt altijd ook in hmail log
     Response.Write(JSON.stringify(result));
     Response.End;
 }
@@ -60,186 +60,104 @@ if (API.apidata.loglevel)
     __Log2File(xmlReq.xml, API.APIname + "_IN");
 
 var Subject  = XMLval(xmlReq, "subject");
-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 fromAddr = XMLval(xmlReq, "from");
 var toAddr   = XMLval(xmlReq, "to");
-var RecipientNr = XMLval(xmlReq, "RecipientNr"); // 0 voor 1e recipient, soms 1 voor tweede
 var htmlBody = XMLval(xmlReq, "htmlbody");
 var Body     = XMLval(xmlReq, "body");
 
-__Log("To: "       + toAddr);
+__Log("Subject: " + Subject);
+__Log("From: " + fromAddr);
+__Log("To: " + toAddr);
+__Log("htmlBody: " + htmlBody);
+__Log("body: " + Body);
 
 var mailuser = toAddr.split("@")[0];
 
-sql = "SELECT fac_email_setting_key,"
-    + "       fac_email_setting_action,"
+sql = "SELECT fac_email_setting_action,"
     + "       fac_email_setting_expire,"
     + "       fac_email_setting_from,"
-    + "       fac_email_setting_frommode,"
-    + "       fac_email_setting_attachpath,"
-    + "       fac_email_setting_attachext,"
-    + "       fac_email_setting_loglevel,"
-    + "       prs_perslid_key_auth"
+    + "       fac_email_setting_attachpath"
     + "  FROM fac_email_setting"
     + " WHERE upper(fac_email_setting_user) = upper("+safe.quoted_sql(mailuser)+")";
 
 var oRs = Oracle.Execute(sql);
 if (oRs.Eof)
 {
-    abortRejectMail(L("lcl_fac_hmail_unknown_user").format(mailuser), "E-mail user niet ontvankelijk: " + mailuser);
+    __Log("E-mail user niet ontvankelijk: " + mailuser);
+    abortRejectMail("Database-fout");
 }
-var allowed_attachext = oRs("fac_email_setting_attachext").Value;
-var email_setting_key = oRs("fac_email_setting_key").Value;
-var prs_perslid_key_auth = oRs("prs_perslid_key_auth").Value;
-var email_setting_loglevel = oRs("fac_email_setting_loglevel").Value;
-
-if (email_setting_loglevel > 0)
-/* global */ __Logging = email_setting_loglevel || __Logging || 0; // Voor de rest van dit bestand
-
-__Log("Subject: "  + Subject);
-__Log("From: "     + from);
-__Log("FromAddr: " + fromAddr);
-__Log("To: "       + toAddr);
-__Log("RecipientNr: " + RecipientNr);
-__Log("htmlBody: " + htmlBody);
-__Log("body: "     + Body);
-
 __Log("E-mail user ontvankelijk: " + mailuser);
 if (oRs("fac_email_setting_expire").Value != null)
 {
     var expire = new Date(oRs("fac_email_setting_expire").Value);
     if (expire.getTime() < (new Date).getTime())
     {
-        abortRejectMail(L("lcl_fac_hmail_expired"), "Te laat, moest voor: " + expire);
+        __Log("Te laat: " + expire);
+        abortRejectMail("Te laat");
     }
 }
-var theFrom = fromAddr; // SMTP communicatie, werkt matig bij forwards
-if (oRs("fac_email_setting_frommode").Value == 1)
-    theFrom = from; // uit email MIME-header
-else if (oRs("fac_email_setting_frommode").Value == 2)
-{
-  // example srs address: servicedesk+SRS=kWNyq=RW=manutan.nl=Paul.Gozeling@hsleiden.nl
-  // output groups of RegExp:  1.	servicedesk 2.	kWNyq 3.	manutan.nl 4.	Paul.Gozeling
-  // from e-mail address when SRS is detected: Paul.Gozeling@manutan.nl
-  var regExpr  = RegExp("(.+)[+]SRS=(.+)[=].+=(.+)=(.+)[@]");
-  if (regExpr.test(fromAddr)) // test whether the fromAddr is a SRS address
-    theFrom = regExpr.exec(fromAddr)[4] + "@" + regExpr.exec(fromAddr)[3]; // concat (group-4 @ group-3) as the fromAddr
-}
 var shouldFrom = oRs("fac_email_setting_from").Value;
 if (shouldFrom)
 {
-    if (String(shouldFrom).toUpperCase() != String(theFrom).toUpperCase())
+    if (String(shouldFrom).toUpperCase() != String(fromAddr).toUpperCase())
     {
-        abortRejectMail(L("lcl_fac_hmail_wrong_sender").format(theFrom), "Foute afzender. Verwacht: " + shouldFrom + ", kreeg: " + theFrom);
+        __Log("Foute afzender. Verwacht: " + shouldFrom + ", kreeg: " + fromAddr);
+        abortRejectMail("Foute afzender");
     }
 }
 var action = oRs("fac_email_setting_action").Value; // Package aanroep
-var setting_attachpath = oRs("fac_email_setting_attachpath").Value;
-var path = setting_attachpath;
-if (path && path.substr(0,1) == "@") // @/?API=OPDR_VO&APIKEY=**** zet automatisch de huidige url ervoor
-{
-    path = HTTP.urlzelf() + path.substr(1);
-}
-
-if (path && path.substr(0, 1) == "*") // Bijvoorbeeld '*flexfilespath'
-{
-    path = S(path.substr(1)) + "/";
-}
+var path = oRs("fac_email_setting_attachpath").Value;
 oRs.Close();
 
-var result = { success: true
-             , path: path
-             , attachments: []
-             , tempfolder: shared.tempFolder()
-             , loglevel: email_setting_loglevel || 0
-             };
+var result = { success: true, path: path, attachments: [] };
 
-var kenmerkpath = "";
-
-var psession_id = Session.SessionID;
 // verwijder entries in de FAC_RESULT table zodat de action nieuwe resultaten kan schrijven
-var sql = "DELETE fac_result WHERE fac_result_sessionid = " + safe.quoted_sql(psession_id);
+var sql = "DELETE fac_result WHERE fac_result_sessionid = 'hMailServer'";
 Oracle.Execute(sql);
 
 if (action) // Bijv "fac.processemail" of "uwva.closeorder-sample"
 {
     if (!Body || Body == "") // Voorkeur voor plaintekst
     {
-        var v_body = L("lcl_fac_hmail_empty_body") + stripHtml(htmlBody);
+        var v_body = "Mail body is leeg. HTML inhoud:\n" + stripHtml(htmlBody);
     }
     else
     {
         var v_body = Body;
     }
-    sql = "BEGIN " + action + " (" + safe.quoted_sql(theFrom)     + ","
-                                   + safe.quoted_sql(toAddr)      + ","
-                                   + 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) + ","
-                                   + email_setting_key + ");"
+    sql = "BEGIN " + action + " (" + safe.quoted_sql(fromAddr) + ","
+                                   + safe.quoted_sql(toAddr)   + ","
+                                   + safe.quoted_sql(Subject || "<geen onderwerp>")  + "," // de actions kunnen slecht tegen lege subject
+                                   + safe.quoted_sql(v_body)   + ","
+                                   + "'hMailServer');" // psession_id
         + "END;";
     Oracle.Execute(sql);
+    // TODO: Is er ook een resultaat om terug te melden? Melding-key bijvoorbeeld?
 
-    // 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();
-
+    // TODO: Dit is niet multi-mail-safe
     sql = "SELECT fac_result_waarde"
         + "  FROM fac_result"
         + " WHERE fac_result_naam = 'errormsg'"
-        + "   AND fac_result_sessionid = " + safe.quoted_sql(psession_id);
+        + "   AND fac_result_sessionid = 'hMailServer'";
     var oRs = Oracle.Execute(sql);
     if (!oRs.Eof)
     {
-        abortRejectMail(oRs("fac_result_waarde").Value, result.maillog);
+        __Log(oRs("fac_result_waarde").Value);
+        abortRejectMail(oRs("fac_result_waarde").Value);
     }
     oRs.Close();
 
     sql = "SELECT fac_result_waarde"
         + "  FROM fac_result"
         + " WHERE fac_result_naam = 'kenmerkpath'"
-        + "   AND fac_result_sessionid = " + safe.quoted_sql(psession_id);
+        + "   AND fac_result_sessionid = 'hMailServer'";
     var oRs = Oracle.Execute(sql);
     if (!oRs.Eof)
     {
-       kenmerkpath = oRs("fac_result_waarde").Value;
-       result.path = result.path + kenmerkpath;
+       result.path = result.path + oRs("fac_result_waarde").Value;
     }
     oRs.Close();
 }
-else
-    result.maillog = "Verder geen e-mail action gedefinieerd";
-
-// debug
-//kenmerkpath = "MLD\\M1180___\\M1180706\\2803\\";
-//result.path = result.path + kenmerkpath;
-
-__Log(result.maillog);
-
-var isUrl = false;
-if (result.path && (result.path.substr(0,5) == "http:" || result.path.substr(0,6) == "https:"))
-{
-    isUrl = true;
-    result.path = result.path.format(safe.url(theFrom), safe.url(toAddr), safe.url(Subject)); // supports &from={0}&to={1}&subject={2}
-                                                                                              // bij de echte aanroep wordt &filename={filename} nog ingevuld met de echte filenaam
-    var fso = Server.CreateObject("Scripting.FileSystemObject");
-    if (!fso.FolderExists(result.tempfolder))
-        fso.CreateFolder(result.tempfolder);
-}
-
-// opruimen
-var sql = "DELETE fac_result WHERE fac_result_sessionid = " + safe.quoted_sql(psession_id);
-Oracle.Execute(sql);
 
 if (result.path)
 {
@@ -259,57 +177,10 @@ 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) van {2}. Bestand is niet opgeslagen.".format(safefilename, attsize, theFrom));
-       }
-       else if (allowed_attachext && !new RegExp(allowed_attachext, "ig").test(safefilename))
-       {
-         __Log("Ongewenste extensie e-mail bijlage: {0} ({1} bytes) van {2}. Bestand is niet opgeslagen.".format(safefilename, attsize, theFrom));
-       }
-       else if (isUrl)
-       {
-         __Log('{0} bijlage ({1} bytes) verwerken met {2}'.format(safefilename, attsize, result.path));
-         var tempfilename = result.tempfolder + "\\" + shared.random(32);
-         __Log('Tijdelijk bewaard onder {0}'.format(tempfilename));
-         result.attachments.push ({ sequence: i,
-                                    safefilename: safefilename,
-                                    tempfilename: tempfilename,
-                                    safeurl: result.path,
-                                    headers: { "Content-Type": "application/json" } // meer extensies her/onderkennen?
-                                 })
+         __DoLog("Onbekende extensie e-mail bijlage: {0} ({1} bytes). Bestand is niet opgeslagen.".format(safefilename, attsize));
        }
        else
        {
-        if (setting_attachpath == "*flexfilespath" && kenmerkpath)
-        {   // Dan ook alvast registreren in fac_bijlagen.
-            // kenmerkpath zal iets zijn met MLD\M1180___\M1180707\2803\, helaas hier weer terugparsen
-            // naar module, kenmerkkey en melding_key
-            kenmerkpath = kenmerkpath.replace(/\\/g, "/"); // altijd forward slashed
-            kenmerkpath = kenmerkpath.replace(/\/$/, ""); // laatste er af
-            // Nu MLD/M1180___/M1180707/2803
-            var mm = kenmerkpath.match(/(.*)\/.*\/([A-Z])(\d+)\/(\d+)/);
-            __Log(mm);
-            if (mm && mm.length == 5)
-            {
-                var module = mm[1];
-                var niveau = mm[2];
-                var key = mm[3];
-                var kenmerk_key = mm[4];
-                var sql = "BEGIN "
-                        + "  flx.setflexbijlage"
-                                + "(" + safe.quoted_sql(module) 
-                                + ", " + kenmerk_key
-                                + ", " + key
-                                + ", " + safe.quoted_sql(kenmerkpath)
-                                + ", " + "NULL"
-                                + ", " + safe.quoted_sql(safefilename)
-                                + ", " + attsize
-                                + ", " + "SYSDATE"
-                                + ", " + "NULL" // Helaas (nog) zonder digest omdat we het bestand nog niet hebben
-                                + ");"
-                        + " END;";
-                Oracle.Execute(sql);
-            }
-        }
          __Log('{0} bijlage ({1} bytes) mag naar {2}'.format(safefilename, attsize, result.path));
          CreateFullPath(result.path); // Hoeft hMailserver dat niet meer te doen. Eist wel dat hMail op 'onze' webserver draait
          result.attachments.push ({ sequence: i,
@@ -317,15 +188,10 @@ if (result.path)
                                  })
        }
     }
-    // Strikt genomen filtert allowed_attachext alleen maar. In de praktijk zetten we hem echter op XML
-    // als we een XML-bijlage ter importeren verwachten dan kan er maar beter ook eentje zijn ook!
-    if (allowed_attachext && !result.attachments.length)
-    {
-        __DoLog("Vreemd: ik had eigenlijk een '{0}' bijlage verwacht van {1}".format(allowed_attachext, theFrom), "#ff4");
-    }
+    // 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
 }
 
-__Log(result);
 Response.Write(JSON.stringify(result));
 Response.End;
 %>

APPL/API/api_inssoap.asp

@@ -29,6 +29,7 @@
 %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/xml_converter.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../api/api.inc" -->
 <%
     // We sturen het antwoord in UTF-8.
@@ -208,7 +209,6 @@
 
                             // 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:
@@ -257,7 +257,6 @@
     if (API.apidata.stylesheet)
     {
         // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
-        Response.ContentType = "text/xml";
         STR2Stream(xmlResp.xml, API.apidata.stylesheet, Response, {});
     }
     else

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,9 +17,10 @@
     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" -->
+<!-- #include file="../Shared/upload.inc" -->
 <!-- #include file="../api/api.inc" -->
 <!-- #include file="../mld/mld.inc" -->
 <%
@@ -37,31 +38,18 @@ 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);
     }
     var inputXML = Server.CreateObject("MSXML2.DOMDocument.6.0");
     inputXML.load(Request);
-
-    if (inputXML.parseError.errorCode != 0)
-    {
-      __DoLog( "Error loading XML: "
-                   + inputXML.parseError.errorCode
-                   + "\n" + inputXML.parseError.reason
-                   + " regel " + inputXML.parseError.line
-                   + "(" + inputXML.parseError.linepos + ")"
-               , "#ff0000");
-    }
-    if (API.apidata.loglevel) __Log2File(inputXML.xml, API.APIname + "_IN");
-
     inputXML.transformNodeToObject(iXsl, xmlReq);
 }
 else
     xmlReq.load(Request);
 
-if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_TUSSEN");
+if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_IN");
 
 var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0");
 xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\""))
@@ -97,8 +85,6 @@ 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");
@@ -110,398 +96,282 @@ 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 meld_onderwerp= XMLval(meldingen[i], "onderwerp");
-
   //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" && meldaction != "update")
+  else if (meldaction != 'insert')
   {
     resultcode = 2;
     resulttekst = "Undefined operation (type)";
   }
   else
   {
-    // voor zowel insert als update:
-
-    var voor_key = -1;
-    var perslid_key = -1;
-    if (voor_login != null)
+    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)
     {
-      // 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)
-      {
-         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;
+      resultcode = 3;
+      resulttekst = "Undefined stdmelding";
     }
     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)
+    { // 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)
       {
-          resultcode = 4;
-          resulttekst = "Undefined melding_key";
+        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
       {
-
-        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_onderwerp)
-          fields.push({ dbs: "mld_melding_onderwerp",     typ: "varchar",   val: meld_onderwerp, track: L("lcl_mld_inf_Onderwerp"),     len: 80 });
-
-        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);
+        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");
+        }
       }
-      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";
+      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)
+      if (!oRs.eof)
       {
-        resultcode = 3;
-        resulttekst = "Undefined stdmelding";
-      }
-      else
-      { // vanaf hier heb ik een geldige stdmld_key
+        locatie_key = oRs("alg_locatie_key").value;
+        fields.push({ dbs: "mld_alg_locatie_key", typ: "key", val: locatie_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);
+        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)
         {
-          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 });
+          plaats_key = oRs("alg_gebouw_key").value;
 
-          tsql = "SELECT alg_gebouw_key  "
-              + " FROM alg_v_aanweziggebouw"
-              + " WHERE alg_locatie_key ="+ locatie_key
-              + " AND alg_gebouw_code="+ safe.quoted_sql(meldgeb);
+          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)
           {
-            alglevel_ok = alglevel_ok || stdmld_niveau == "G";
-            plaats_key = oRs("alg_gebouw_key").Value;
+            plaats_key = oRs("alg_verdieping_key").value;
 
-            tsql = "SELECT alg_verdieping_key  "
-                + " FROM alg_v_aanwezigverdieping"
-                + " WHERE alg_gebouw_key ="+ plaats_key
-                + " AND alg_verdieping_code="+ safe.quoted_sql(meldver);
+            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 == "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;
-              }
+            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 });
-          }
         }
-        if (!alglevel_ok)
+
+        if (plaats_key != -1)
         {
-          resultcode = 5;
-          resulttekst = "Location not found";
-          __DoLog(resulttekst, "#00FF00");
+          fields.push({ dbs: "mld_alg_onroerendgoed_keys", typ: "key", val: plaats_key });
         }
+      }
 
-        if (resultcode == -1)
-        { // nog steeds geen fouten
-          var sql = "SELECT isd.ins_srtdiscipline_kostenklant"
-                  + "     , id.ins_discipline_kpnverplicht"
-                  + "  FROM mld_stdmelding msm"
-                  + "     , ins_tab_discipline id"
-                  + "     , ins_srtdiscipline isd"
-                  + " WHERE msm.mld_ins_discipline_key = id.ins_discipline_key"
-                  + "   AND id.ins_srtdiscipline_key = isd.ins_srtdiscipline_key"
-                  + "   AND msm.mld_stdmelding_key = " + stdmld_key;
-          var oRs = Oracle.Execute(sql);
-          // Er is altijd een srtdiscipline gekoppeld aan de melding.
-          var ins_srtdisc_kk = oRs("ins_srtdiscipline_kostenklant").Value;
-          var kpnverplicht = oRs("ins_discipline_kpnverplicht").Value > 0;
-          oRs.Close();
+      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 }
+                      ]);
 
-          // Met "WEB_MLDUSE" autorisatie check maak ik deze melding aan. Dan kijk ik hier ook naar de FE setting "FE Defaultwaarde kosten klant aan".
-          var ins_srtdiscipline_kk = (ins_srtdisc_kk & 1) == 1;
+      // We weten wat te inserten, nu nog uitvoeren; rechten voldoende afgedekt via MLDUSE-check hierboven?
 
-          var kpn_key = user.afdeling().prs_kostenplaats_key() || -1;
-          if (meld_kpn && meld_kpn != "")
+      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 tempKpn = getKpn(meld_kpn);
-            if (tempKpn != -1)
-              kpn_key = tempKpn;
-          }
+            var kenmerk_key = oRs("mld_kenmerk_key").value;
+            var kenmerk_type = oRs("mld_srtkenmerk_kenmerktype").value;
+            var kenmerk_lengte = oRs("mld_srtkenmerk_lengte").value;
 
-          if (kpnverplicht && kpn_key < 0)
-          {
-            resultcode = 6;
-            resulttekst = "Cost centre not found while mandatory";
+            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)
+            {
+              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);
+                                                   }
+                  }
+                }
+              }
+            }
+            oRs.Close();
           }
         }
 
-        if (resultcode == -1)
-        { // nog steeds geen fouten
-          // We weten wat te inserten, nu nog uitvoeren; rechten voldoende afgedekt via MLDUSE-check hierboven?
-          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: "mld_melding_onderwerp",      typ: "varchar", val: meld_onderwerp, len: 80 },
-                            { dbs: "prs_kostenplaats_key",       typ: "key",     val: kpn_key },
-                            { dbs: "mld_kosten_klant",           typ: "number",  val: kpn_key > 0 && ins_srtdiscipline_kk? 1 : null },
-                            { 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 }
-                          ]);
-
-          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
+        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
   } // 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
@@ -523,193 +393,8 @@ 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_attr_key = parseInt(kenmerken[j].getAttribute("key"), 10);
-    var kenmerk_attr_code = kenmerken[j].getAttribute("code");
-    var kenmerk_naam = kenmerken[j].getAttribute("naam");
-    // default srtkenmerk on name
-    var srtkenmerk_key_code_omschr = "   AND sk.mld_srtkenmerk_upper = " + safe.quoted_sql_upper(kenmerk_naam);
-    if (kenmerk_attr_key > 0)
-      srtkenmerk_key_code_omschr = "   AND sk.mld_srtkenmerk_key = " + kenmerk_attr_key;
-    else if (kenmerk_attr_code)
-      srtkenmerk_key_code_omschr = "   AND  UPPER(sk.mld_srtkenmerk_code) = " + safe.quoted_sql_upper(kenmerk_attr_code);
-    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, sk.fac_kenmerkdomein_key  "
-         + "  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 "
-         + srtkenmerk_key_code_omschr
-         + "   AND s.mld_ins_discipline_key = d.ins_discipline_key"
-         + "   AND s.mld_stdmelding_key = " + stdmld_key
-         + "   AND ((k.mld_stdmelding_key IS NULL                    AND k.mld_kenmerk_niveau = 'A')"
-         + "     OR (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 kenmerkdomein_key = oRs("fac_kenmerkdomein_key").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 'R':
-        case 'S':
-        {
-          // read reference fields
-          if (kenmerk_waarde != "") {
-            var kenmerk_ref = kenmerken[j].getAttribute("ref");
-            if (kenmerk_ref) {
-              kenmerk_waarde = getKenmerkKeyByRef(kenmerkdomein_key, kenmerk_ref, kenmerk_waarde);
-            }
-          }
-        }
-        case 'C':
-        case 'X':
-        case 'N':
-        case 'V':
-        {
-          // we ondersteunen alleen nog maar karakter velden.
-          if (!oRs.eof)
-          {
-            var kenmerkmelding_key = oRs("mld_kenmerkmelding_key").Value;
-            if (kenmerk_waarde == "") {
-              // delete characteristic when empty
-              ksql = "DELETE FROM mld_kenmerkmelding WHERE mld_kenmerkmelding_key = " + kenmerkmelding_key;
-            } else {
-              ksql = "UPDATE mld_kenmerkmelding"
-                   + "   SET mld_kenmerkmelding_waarde = " + safe.quoted_sql(kenmerk_waarde)
-                   + " WHERE mld_kenmerkmelding_key = " + kenmerkmelding_key;
-            }
-            Oracle.Execute(ksql);
-          }
-          else
-          {
-            if (kenmerk_waarde != "") {
-              // write a new characteristic with a value only
-              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");
-            var Encoding = XMLval(bijlagen[bi], "encoding", true);
-            //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);
-                if (Encoding == 'base64')
-                {
-                   encodedString2File(params.AttachPath + SafeName, Attachment, "bin.base64");
-                }
-                else
-                {
-                   encodedString2File(params.AttachPath + SafeName, Attachment, "bin.hex");
-                }
-
-                var oCrypto = new ActiveXObject("SLNKDWF.Crypto");
-                var sql = "BEGIN "
-                        + "  flx.setflexbijlage"
-                                + "(" + safe.quoted_sql("MLD")    // MLD | RES | ....
-                                + ", " + kenmerk_key
-                                + ", " + mld_key
-                                + ", " + safe.quoted_sql(params.AttachSubPath)
-                                + ", " + "NULL" // diskfilename
-                                + ", " + safe.quoted_sql(SafeName)
-                                + ", " + fso.GetFile(params.AttachPath + SafeName).Size
-                                + ", " + "SYSDATE"
-                                + ", " + safe.quoted_sql(oCrypto.hex_sha1_file(params.AttachPath + SafeName))
-                                + ");"
-                        + " END;";
-                Oracle.Execute(sql);
-
-                __Log("Done saving: " + params.AttachPath + SafeName);
-              }
-            }
-          }
-        }
-      }
-      oRs.Close();
-    }
-  }
-}
-
 xmlResp.appendChild(FCLTElement);
 
-Response.ContentType = "text/xml";
 if (API.apidata.stylesheet)
 {
   // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
@@ -717,6 +402,7 @@ if (API.apidata.stylesheet)
 }
 else
 {
+  Response.ContentType = "text/xml";
   Response.Write(xmlResp.xml)
 }
 %>

APPL/API/api_perslid.asp

@@ -16,11 +16,10 @@
     DOCTYPE_Disable = 1;
     LCL_Disable = 1
     THIS_FILE = "appl/api/api_perslid.asp";
-
-    INTERNAL_ERROR_api_perslid_ISUNSAFE; // abort abort.....
 %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../api/api.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/save2db.inc"-->
 <%
     Session.Codepage = 65001;

APPL/API/api_ressoap.asp

@@ -20,6 +20,7 @@
 <!-- #include file="../Shared/xml_converter.inc" -->
 <!-- #include file="../Shared/save2db.inc" -->
 <!-- #include file="../Shared/flexfiles.inc" -->
+<!-- #include file="../Shared/upload.inc" -->
 <!-- #include file="../api/api.inc" -->
 <!-- #include file="../shared/kpl_ksrt_validate.inc" -->
 <!-- #include file="../res/res.inc" -->
@@ -440,7 +441,6 @@
 
     xmlResp.appendChild(FCLTElement);
 
-    Response.ContentType = "text/xml";
     if (API.apidata.stylesheet)
     {
         // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
@@ -448,6 +448,7 @@
     }
     else
     {
+        Response.ContentType = "text/xml";
         Response.Write(xmlResp.xml)
     }
 %>

APPL/API/api_ressoap_info.asp

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

APPL/API/get_phonebook_info.asp

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

APPL/API/phonebook_js.asp

@@ -17,13 +17,13 @@ THIS_FILE = "appl/api/phonebook_js.asp";
 var EXPIRED_PASSWORD_OK = true; // performance
 %>
 <!-- #include file="../Shared/common.inc"-->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../api/api.inc" -->
 
 <%
     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,7 +31,6 @@ 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
 %>
@@ -65,7 +64,7 @@ function L(p_lcl)
   getCSS("appl/api/api.css");
 
   <% if (!nojQuery) { /* kan conflicteren */ %>
-        getScript("appl/localscripts/jquery.min.js");
+        getScript("appl/localscripts/<%=_jqueryver%>.min.js");
   <% } %>
   getScript("appl/shared/suggest/suggest.js");
 
@@ -77,7 +76,7 @@ function L(p_lcl)
     {
         if (key > 0)
             jQuery.ajax({ type: "GET",
-                url: "<%=safe.jsstring(site)%>/appl/api/get_phonebook_info.asp?req_info=prs_perslid&prs_perslid_key=" + key + "<%=transitParam%>",
+                url: "<%=site%>/appl/api/get_phonebook_info.asp?req_info=prs_perslid&prs_perslid_key=" + key + "<%=transitParam%>",
                 dataType: "jsonp",
                 success: window.facilitor.show_phonebook
             });
@@ -90,7 +89,7 @@ function L(p_lcl)
         { detailWidth : 450,
           toonFoto: true,
           detailurl: "appl/fac/fac_user_info.asp",
-          deeplinkurl: "<%=safe.jsstring(site)%>/?nomenu=1&noheader=1&ihatetabs=1&JumpTo=",
+          deeplinkurl: "<%=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" },
@@ -110,7 +109,7 @@ function L(p_lcl)
     window.facilitor.show_phonebook = function(data, textStatus)
     {
         // Alle styling moet nog via classes
-        var closer = "<span onclick='$(\"#phonebookdetails\").hide()' style='float: right; cursor: pointer' title='<%=L("lcl_close_window")%>'>x</span>"
+        var closer = "<span onclick='$(\"#phonebookdetails\").hide()' style='float: right; cursor: hand' title='<%=L("lcl_close_window")%>'>x</span>"
         if (window.facilitor.phonebook_options.detailurl)
         {
             var jumpto = window.facilitor.phonebook_options.detailurl;
@@ -127,7 +126,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='<%=safe.jsstring(sitenoroot)%>" + data.photopaththumb.replace(/\'/g,'&#39;').replace(/\"/g,'&quot;') +"'></td></tr>";
+            trs += "<tr><td></td><td></td><td rowspan='50'><img src='<%=sitenoroot%>" + data.photopaththumb.replace(/\'/g,'&#39;').replace(/\"/g,'&quot;') +"'></td></tr>";
         }
         var fld;
         for (fld in window.facilitor.phonebook_options.fields)
@@ -187,14 +186,12 @@ function L(p_lcl)
 
             sgPerson = new Suggest({ objectName: "sgPerson",
                                     queryField: $("#sName_key_show")[0],
-                                    queryUrl: "<%=safe.jsstring(site)%>/appl/shared/suggest/SuggestPerslid.asp?filtcode=PHB<%=transitParam%>",
+                                    queryUrl: "<%=site%>/appl/shared/suggest/SuggestPerslid.asp?filtcode=PHB<%=transitParam%>",
                                     initKey: -1,
                                     noJustOne: true,
                                     keyField: $("#sName_key")[0],
                                     JSONP: true,
-                                    embedded: true,
-                                    suggesticon: "<%=safe.jsstring(suggesticon)%>",
-                                    site: "<%=safe.jsstring(site)%>"
+                                    embedded: true
                                   });
         };
 })();

APPL/API/shorturl.asp

@@ -23,8 +23,6 @@
 <!-- #include file="../shared/useragent.inc" -->
 
 <%
-__Log("== Entering shorturl.asp ==");
-
     var u = getQParam("u");
     var known_bookmarks =
     {
@@ -32,18 +30,13 @@ __Log("== Entering shorturl.asp ==");
         'bestelling':   { gui: 'appl/bes/bes_bestelling.asp?bes_key=',          mob: 'appl/pda/bestelling.asp?bes_key=' },
         'bestelopdr':   { gui: 'appl/bes/bes_opdr.asp?ordernr='                 },
         'contract':     { gui: 'appl/cnt/cnt_contract.asp?cnt_key=',            mob: 'appl/pda/contract.asp?cnt_key=' },
-/*deprecated*/'deel':         { gui: 'appl/ins/ins_deel.asp?ins_key=',                mob: 'appl/pda/ins_deel.asp?ins_key=' },
-        'object':       { gui: 'appl/ins/ins_deel.asp?ins_key=',                mob: 'appl/pda/ins_deel.asp?ins_key=' },
+        'deel':         { gui: 'appl/ins/ins_deel.asp?ins_key=',                mob: 'appl/pda/ins_deel.asp?ins_key=' },
         'factuur':      { gui: 'appl/fin/fin_factuur.asp?fin_key=',             mob: 'appl/pda/factuur.asp?fin_key=' },
         'gebouw':       { gui: 'appl/alg/alg_gebouw.asp?key='                   },
-        'faq':          { gui: 'appl/fac/fac_faq.asp?faq_key='                  },
         '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=',
-                          lckgui: 'appl/mld/mld_opdr_actions.asp?opdr_key=',
-                          lckmob: 'appl/mld/mld_opdr_actions.asp?opdr_key=' },
+        'opdracht':     { gui: 'appl/mld/mld_opdr.asp?opdr_key=',               mob: 'appl/pda/order.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=' },
@@ -52,77 +45,20 @@ __Log("== Entering shorturl.asp ==");
     }
 
     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);
-        if (oRs.EOF)
-            shared.simpel_page("Fixed user for company '{0}' is not or no longer valid.".format(locked_bdradr_key));
-
-        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 = locked_bdradr_key > 0? known_bookmarks[u].lckgui : known_bookmarks[u].gui;
-        }
+            url = known_bookmarks[u].gui;
         else
-        {
-            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;
+            url = known_bookmarks[u].mob || known_bookmarks[u].gui;
+        url = rooturl + "/" + url + keyparam;
 
         if (keyparam > -1)
         {
@@ -134,13 +70,11 @@ __Log("== Entering shorturl.asp ==");
     else
     {
         var sql = "SELECT fac_bookmark_path,"
-                + "       fac_bookmark_query,"        // Ooit was bedacht dat je de parameters apart in fac_bookmark_query stopt.
-                + "       prs_perslid_key_auth,"      // In de praktijk stoppen mensen het ook vaak in fac_bookmark_path
-                + "       fac_bookmark_unauth_url,"   // Dat kunnen we tegenwoordig (2018.1 Gold C) ook wel aan.
+                + "       fac_bookmark_query,"
+                + "       prs_perslid_key_auth,"
+                + "       fac_bookmark_unauth_url,"
                 + "       fac_bookmark_expire,"
-                + "       fac_bookmark_refreshtime,"
-                + "       fac_bookmark_naam,"
-                + "       fac_bookmark_flags"
+                + "       fac_bookmark_refreshtime"
                 + "  FROM fac_bookmark"
                 + " WHERE fac_bookmark_id = " + safe.quoted_sql(u);
         var oRs = Oracle.Execute(sql);
@@ -158,29 +92,14 @@ __Log("== Entering shorturl.asp ==");
         }
 
         var url = oRs("fac_bookmark_path").Value;
-        if (url.indexOf("{$*}") > 0) // default.asp?Jumpto=cust/uwva/pacta.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)
         {
-            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
+            Session("fallback_user_key") = oRs("prs_perslid_key_auth").Value; // wordt opgepikt door loginTry.asp
         }
+        else
+            Session("unauth_url") = oRs("fac_bookmark_unauth_url").Value; // wordt opgepikt door common.asp
 
         var params = oRs("fac_bookmark_query").Value;
         if (params)
@@ -198,14 +117,10 @@ __Log("== Entering shorturl.asp ==");
             if (rest)
                 params = rest;
         }
+        oRs.Close();
 
         if (params)
-            url = url + (url.indexOf('?') > -1?"&":"?") + params;
-
-        if (oRs("fac_bookmark_flags").Value == 0)
-            var url = protectQS.create(url); // prs/pchange_reset.asp, PRS\prs_perslid_qr_confirm.asp en PRS\self_register_confirm.asp verwachten dit
-
-        oRs.Close();
+            url = url + "?" + params;
     }
 
     // Als de bookmark een refreshrate heeft ingesteld wordt automatisch gerefreshed
@@ -218,33 +133,7 @@ __Log("== Entering shorturl.asp ==");
         theURL = "appl/shared/refresher.asp?url=" + Server.URLencode("/?norefresh=1" + transitQS()) + "&refreshrate=" + refresher;
     }
     else
-    {
-        var theURL = url;
-    }
-
-    if (locked_bdradr_key < 0 && isKnownBookmark && !isMobile && getQParamInt("internal", 0) == 0)
-    {
-        Session("FirstPage") = theURL;
-        theURL = rooturl + "/";
-    }
-
-    var no302 = getQParamInt("no302", 0) == 1;
-    // locked_bdradr_key wordt nogal eens vanuit e-mails geopend.
-    // Dan wil je ook een gewone redirect (Melding 56152)
-    if (no302 || locked_bdradr_key > 0)
-    {
-        %>  <html>
-              <head>
-                <title>Facilitor</title>
-                <META http-equiv="refresh" content="0;URL=<%=safe.htmlattr(theURL)%>">
-              </head>
-              <body bgcolor="#ffffff">
-                <a href="<%=safe.htmlattr(theURL)%>">Auto redirect</a>
-              </body>
-            </html>
-        <%
-    }
-    else
-        Response.Redirect(theURL);
+        var theURL = protectQS.create(url);
+    Response.Redirect(theURL);
 %>
 

APPL/API2/TESTER/api2_tester.asp

@@ -7,26 +7,20 @@
 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">
-        <title>API2 Tester</title>
-        <script src="jquery-1.11.3.min.js"></script>
+        <script src="jquery-1.11.0.min.js"></script>
         <script src="tester.js"></script>
         <script src="jquery.iecors.js"></script>
         <script>
-            var tester_rooturl = "<%=rooturl%>";
             $(document).ready(function()
                 {
                     $(doInit);
                     $(doBuild);
                 });
-            var RVT_token = "<%=safe.jsstring(protectRequest.theToken())%>";
         </script>
         <style>
             pre { font-size: 1.2em;
@@ -40,7 +34,7 @@ var fac_id = Request.QueryString("fac_id").Count > 0&&String(Request.QueryString
     <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="<%=safe.htmlattr(HTTP.urlzelf())%>/api2/" target="_blank" rel="noopener noreferrer">API reference</a> ]</th>
+            <th colspan="2">FACILITOR API2 tester  -  FOR INTERNAL USE ONLY [ <a href="http://facws001/trunk/api2/">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>
@@ -49,15 +43,11 @@ var fac_id = Request.QueryString("fac_id").Count > 0&&String(Request.QueryString
                 </td>
             </tr>
             <tr><td><label>fac_id</label></td>
-                <td><input id="facid" type="text" style="width:100px" value="<%=safe.htmlattr(fac_id)%>">
+                <td><input id="facid" type="text" style="width:100px" value="">
                 </td>
             </tr>
             <tr><td><label>APIKEY</label></td>
-                <td><input id="apikey" type="text" style="width:250px" value="APIPFO">&nbsp;
-                            <%
-                            if (user_key > 0) { %>
-                                Herkend als: <%= safe.html(user.oslogin()) %>
-                            <% } %>
+                <td><input id="apikey" type="text" style="width:250px" value="APIPFO">
                 </td>
             </tr>
             <tr><td><label>API2</label></td>
@@ -66,6 +56,7 @@ var fac_id = Request.QueryString("fac_id").Count > 0&&String(Request.QueryString
                 </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>
@@ -93,10 +84,10 @@ var fac_id = Request.QueryString("fac_id").Count > 0&&String(Request.QueryString
                 </td>
             </tr>
             <tr><td><label>Method</label></td>
-                <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><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>
             </tr>
             <tr><td><label>Request body</label></td>
@@ -134,8 +125,7 @@ var fac_id = Request.QueryString("fac_id").Count > 0&&String(Request.QueryString
             <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>Size:</td><td><span id="ResultSize"></span></td></tr>
-            <tr><td>Result:<button onclick='$("#xml").val($("#Result").text())'>^^^</button></td>
+            <tr><td>Result:<button onclick='$("#xml").val($("#Result").text().replace("\r\n", "\n"))'>^^^</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.3.min.js"></script>
+        <script src="jquery-1.11.0.min.js"></script>
         <script src="tester.js"></script>
         <script src="jquery.iecors.js"></script>
         <script>
@@ -25,7 +25,7 @@
     <body style='background-color:#CEE3F6; font-family: Helvetica; font-size: 0.8em;'>
         <form method="post" onsubmit="doSubmit();return false;">
           <table>
-            <th colspan="2">Facilitor API2 Tester</th>
+            <th colspan="2">FACILITOR API2 Tester</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,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://uwva.facws001/trunk/">
+                <td><input id="urlbase" type="text" style="width:250px" value="http://sgf12/Facilitor5iwork">
                 </td>
             </tr>
             <tr><td><label>Pretty JSON</label></td>

APPL/API2/TESTER/get_apinames.asp

@@ -0,0 +1,49 @@
+<%@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

@@ -1,460 +0,0 @@
-/*
-    $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++)
-    {
-        if (typeof arguments[i] == "string")
-          arguments[i] = arguments[i].replace(/\$/g, '$$$$');
-        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.sg.nl/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:""));
-            if (!model)
-            {
-                WScript.echo("GET van api2_name + ".api + " werkt niet?");
-                return;
-            }
-
-            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)
-                {
-                    WScript.echo("GET van " + url + "?include=" + model.includes[inc] + " werkt niet?");
-                    return;
-                }
-                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 + ")");
-    }
-    else
-        return null;
-}
-
-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.setRequestHeader ("Accept", "application/json");
-    objXMLHTTP.send(data);
-    if (objXMLHTTP.status >= 200 && objXMLHTTP.status <= 299)
-    {
-        return objXMLHTTP;
-    }
-    WScript.Echo(objXMLHTTP.responseText);
-    WScript.Echo(objXMLHTTP.status);
-    WScript.Echo(objXMLHTTP.statusText);
-    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,10 +19,11 @@ function callbackDone(data, textStatus, jqXHR)
 }
 function callbackFail(jqXHR, textStatus, errorThrown)
 {
-    // FcltMgr.alert("FAIL: " + (typeof errorThrown == "string"?errorThrown:errorThrown.message));
+    // 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()
@@ -39,23 +40,9 @@ function doSubmit()
     var apikey = $("#apikey").val();
     //jQuery.support.cors = true; // in IE niet al te moeilijk doen over cross-domain.
     tm = new Date;
-    var cust_data = getCustBase($("#facid").val());
-    if (cust_data.ApiHost != "")
-    {
-        var header = { "Authorization": cust_data.key
-                     , "Accept": "application/json"
-                     };
-    }
-    else
-    {
-        var header = { "X-FACILITOR-API-Key": apikey,
-                       "X-CSRF-TOKEN": RVT_token,
-                       "Content-type": "application/json"
-                     };
-    }
     $.ajax(url, { type: method,
                   data: data,
-                  headers: header
+                  headers: { "X-FACILITOR-API-Key": apikey }
                   // dan werkt de header niet dataType: "jsonp"
                 }
           ).done(callbackDone).fail(callbackFail);
@@ -63,179 +50,41 @@ function doSubmit()
 }
 function doBuild()
 {
-    var facid = $("#facid").val() || "UWVA";
-    var pretty = $("#pretty:checked").val() == "on";
-    var logging= $("#log:checked").val() == "on";
     var urlbase = $("#urlbase").val();
     var api = $("#api").val();
-
-    var cust_data = getCustBase(facid);
-    if (cust_data.url)
-    {
-        if (cust_data.ApiHost != "")
-        {
-            var url = urlbase + "/tas/api/" + api;
-            url += "?fac_id="+facid;
-            if (pretty)
-                url += "&pretty=1";
-            if (logging)
-                url += "&logging=1";
-            $("#urltest").html(url);
-        }
-        else
-        {
-            var apikey = $("#apikey").val();
-            var scope = $("#scope").val();
-            var format = $("[name=format]:checked").val();
-            var url = urlbase + "/api2/" + api + "." + format;
-            url += "?fac_id="+facid;
-            if (scope)
-                url += "&scope="+scope;
-            if (pretty)
-                url += "&pretty=1";
-            if (logging)
-                url += "&logging=1";
-            $("#urltest").html(url + (pretty?"&":"?") + "apikey=" + apikey);
-        }
-    }
-    else
-    {
-        var url = urlbase + "/api2/";
-    }
-
+    var format = $("[name=format]:checked").val();
+    var pretty = $("#pretty:checked").val() == "on";
+    var logging= $("#log:checked").val() == "on";
+    var apikey = $("#apikey").val();
+    var scope = $("#scope").val();
+    var facid = $("#facid").val() || "UWVA";
+    var url = urlbase + "/api2/" + api + "." + format;
+    url += "?fac_id="+facid;
+    if (scope)
+        url += "&scope="+scope;
+    if (pretty)
+        url += "&pretty=1";
+//        url += "?pretty=1";
+    if (logging)
+        url += "&logging=1";
     $("#url").val(url);
+    $("#urltest").html(url + (pretty?"&":"?") + "apikey=" + apikey);
 }
 
 function doInit()
 {
-    $("#facid").change( change_facid );
-    change_facid();
+    var path = "appl/api2";
+    $.getJSON("get_apinames.asp?3", process_api_list);
 }
 
 function process_api_list(data)
 {
     $("#api").empty();
-    var lastmodule = "";
-    $.each( data.apis
+    $.each( data.apinames
           , function (index, value)
             {
-                if (lastmodule != this.module)
-                    $("#api").append("<optgroup label='" + this.modulecode + ": " + this.module + "'></option>");
-                lastmodule = this.module;
-                var apiname = this.id;
+                apiname = data.apinames[index];
                 $("#api").append("<option value="+ apiname +">" + apiname + "</option>");
             }
           );
-}
-
-function change_facid()
-{
-    var cust_data = getCustBase($("#facid").val());
-
-    if (cust_data.url)
-    {
-        if (cust_data.ApiHost != "")
-        {
-            process_api_list(hosts[cust_data.ApiHost].data);
-            $("#urlbase").val(cust_data.url);
-        }
-        else
-        {
-            var apikey = $("#apikey").val();
-            $("#urlbase").val(cust_data.url);
-            //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);
-        }
-    }
-    else
-    {
-        process_api_list({}); // ongldige fac_id bij api_host
-    }
-}
-
-function getCustBase(fac_id)
-{
-    var custid = fac_id.slice(fac_id.length-4).toUpperCase();
-    var api_host = (fac_id.length > 4 ? fac_id.slice(0, -5) : "");
-
-    var base = {};
-
-    if (api_host)
-    {
-        var host_data = hosts[api_host];
-        for (i=0; i<host_data.cust.length; i++)
-        {
-            if (host_data.cust[i].id == custid)
-            {
-                base = { ApiHost: api_host
-                       , url: host_data.cust[i].adr
-                       , key: host_data.cust[i].key
-                       };
-            }
-        }
-    }
-    else
-    {
-        base = { ApiHost: ""
-               , url: "http://" + custid.toLowerCase() + ".facws001.sg.nl" + tester_rooturl
-               };
-    }
-    return base;
-};
-
-var hosts = { topdesk: { cust: [ { id: "TWYN"
-                                 , usr: "FACILITOR-API"
-                                 , adr: "https://myservicedesk-ont.twyn.nl"
-                                 , key: "Basic uterwobxhistijd=="
-                                 }
-                               , { id: "STAM"
-                                 , usr: "FACILITOR-API"
-                                 , adr: "https://myservicedesk-ont.simac.nl"
-                                 , key: "Basic RkFDSUxJVE9SLUFQSTpvYzdocS16YzJ2by1nZ3Bpdy1ldXh2aS1obm1pdA=="
-                                 }
-                               , { id: "UWVA"
-                                 , usr: "FACILITOR-API"
-                                 , adr: "https://myservicedesk-ont.uwva.nl"
-                                 , key: "Basic lmnfglkdvngbd=="
-                                 }
-                               ]
-                       , data: { apis: [ { modulecode: "MLD", module: "Incidenten", name: "Incidenten",       id: "incidents" }
-                                       , { modulecode: "MLD", module: "Incidenten", name: "Soort melding",    id: "incidents/call_types" }
-                                       , { modulecode: "MLD", module: "Incidenten", name: "Categorie",        id: "incidents/categories" }
-                                       , { modulecode: "MLD", module: "Incidenten", name: "Subcategorie",     id: "incidents/subcategories" }
-                                       , { modulecode: "MLD", module: "General",    name: "Personen",         id: "persons" }
-                                       , { modulecode: "MLD", module: "Change",     name: "Alle templates",   id: "applicableChangeTemplates"}
-                                       , { modulecode: "MLD", module: "Change",     name: "Toevoegen Change", id: "operatorChanges"}
-                                       ]
-                               }
-                       }
-            , zendesk: { cust: [ { id: "TWYN"
-                                 , usr: "FACILITOR-API"
-                                 , adr: "https://myzendesk-ont.twyn.nl"
-                                 , key: "Basic uterwobxhistijd=="
-                                 }
-                               , { id: "UWVA"
-                                 , usr: "FACILITOR-API"
-                                 , adr: "https://myzendesk-ont.uwva.nl"
-                                 , key: "Basic lmnfglkdvngbd=="
-                                 }
-                               ]
-                       , data: { apis: [ { modulecode: "MLD", module: "Incidenten", name: "ZIncidenten",       id: "Zincidents" }
-                                       , { modulecode: "MLD", module: "Incidenten", name: "ZSoort melding",    id: "Zincidents/call_types" }
-                                       , { modulecode: "MLD", module: "Incidenten", name: "ZCategorie",        id: "Zincidents/categories" }
-                                       , { modulecode: "MLD", module: "Incidenten", name: "ZSubcategorie",     id: "Zincidents/subcategories" }
-                                       , { modulecode: "MLD", module: "General",    name: "ZPersonen",         id: "Zpersons" }
-                                       , { modulecode: "MLD", module: "Change",     name: "ZAlle templates",   id: "ZapplicableChangeTemplates"}
-                                       , { modulecode: "MLD", module: "Change",     name: "ZToevoegen Change", id: "ZoperatorChanges"}
-                                       ]
-                               }
-                       }
-            };
+}

APPL/API2/TESTER/voorb_jquery.iecors.js

@@ -14,7 +14,8 @@
   if ( jQuery.support.iecors ) {
 
     jQuery.ajaxTransport(function( s ) {
-      var xdr = s.xdr();
+      var callback,
+        xdr = s.xdr();
 
       return {
         send: function( headers, complete ) {
@@ -22,7 +23,7 @@
             var headers = { 'Content-Type': xdr.contentType };
             complete(200, 'OK', { text: xdr.responseText }, headers);
           };
-
+          
           // Apply custom fields if provided
 					if ( s.xhrFields ) {
             xhr.onerror = s.xhrFields.error;

APPL/API2/TESTER/voorb_timepicker.js

@@ -969,6 +969,9 @@ function _time2int(timeString, settings)
   }
   return timeInt
 }
+function _pad2(n) {
+return ("0" + n).slice(-2);
+}
 // Plugin entry
 $.fn.timepicker = function(method)
 {