AQQA#52750 - tmpl_logo.gif aangepast

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

APPL/ALG/alg.inc

@@ -118,8 +118,6 @@ alg = {
 
                 if (onrgoedlvl != "T")
                   rresult.writeuse = rresult.canWrite(autfunctionUSE);
-                else
-                  rresult.writeuse = false;
             }
             else // iets meer werk
             {
@@ -156,7 +154,6 @@ alg = {
                 rresult.readuse = rresult.authparams("WEB_ALGUSE").ALGreadlevel <= level;
                 rresult.writeuse = rresult.authparams("WEB_ALGUSE").ALGwritelevel <= level;
             }
-            rresult.canCndAggr = rresult.writeuse;
             return rresult;
         },
 
@@ -284,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"
@@ -315,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,

APPL/ALG/alg_cnd_aggregate.asp

@@ -1,64 +0,0 @@
-<%@ LANGUAGE = JavaScript %>
-<% /*
-    $Revision$
-    $Id$
-
-    File:           alg_cnd_aggregate.asp
-    Description:    Laten berekenen van de geaggregeerde conditiescores
-
-    Parameters:     keys (van het onroerend goed)
-                    level: "L", "G"
-    Context:        Vanuit show-schermen en of vanuit overzichten
-    Result:         JSON object
-    Note:
-
-*/
-var JSON_Result = true;
-%>
-<!--#include file="../Shared/common.inc"-->
-<!--#include file="alg.inc" -->
-<%
-protectRequest.validateToken();
-
-var level = getFParam("level");
-var alg_key_arr = getFParamIntArray("key");
-
-var autfunction = "WEB_ALGUSE"; // of iets met CND?
-
-var authParams = user.checkAutorisation(autfunction);
-
-var result = {};
-var tobecndaggr = 0;
-var ingesloten = [];
-for (var i = 0; i < alg_key_arr.length; i++)
-{
-  var this_alg = alg.func_enabled(alg_key_arr[i], level);
-  if (this_alg.canCndAggr)
-  {
-    ingesloten.push(alg_key_arr[i]);
-    tobecndaggr++;
-  }
-}
-user.anything_todo_or_abort(tobecndaggr > 0); // We klagen niet over enkele wel en enkele niet.
-
-for (var i = 0; i < ingesloten.length; i++)
-{
-  switch (level)
-  {
-    case "L":
-       sql = "BEGIN cnd.update_aggr_scores(" + ingesloten[i] + "); END;";
-       break;
-    case "G":
-       sql = "BEGIN cnd.update_aggr_scores(NULL," + ingesloten[i] + "); END;";
-       break
-  }
-
-  var err = Oracle.Execute(sql, true);
-  if (err.friendlyMsg)
-    abort_with_warning(err.friendlyMsg);
-
-  result.success = true;
-}
-
-Response.Write(JSON.stringify(result));
-%><% ASPPAGE_END(); %>

APPL/ALG/alg_delete.asp

@@ -16,6 +16,7 @@
 var JSON_Result = true;
 %>
 <!--#include file="../Shared/common.inc"-->
+<!--#include file="../Shared/json2.js" -->
 <!--#include file="alg.inc" -->
 <%
 protectRequest.validateToken();
@@ -139,4 +140,4 @@ for (var i = 0; i < ingesloten.length; i++)
 }
 
 Response.Write(JSON.stringify(result));
-%><% ASPPAGE_END(); %> 
+%>

APPL/ALG/alg_district.asp

@@ -80,4 +80,3 @@ else
 %>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

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" -->
@@ -34,19 +35,19 @@ function fnrowData(oRs)
 
   function gotoDetails(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_locatie_search.asp?district_key=" + algData.detail_key + "&autosearch=" + autosearch;
     FcltMgr.openDetail(url, "<%=L("lcl_location")%>");
   }
   function gotoParent(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_regio_search.asp?regio_key=" + algData.parent_key + "&autosearch=" + autosearch;
     FcltMgr.openDetail(url, "<%=L("lcl_region")%>");
   }
     function districtEdit(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_district.asp?mode=viewUpdate&key=" + algData.key;
     FcltMgr.openDetail(url, "<%=L("lcl_district")%>" + ' ' + algData.oms);
   }

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">
@@ -66,8 +66,8 @@ var authparams = alg.checkAutorisation();
             </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>
 
@@ -82,4 +82,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_district_search_list.asp

@@ -33,4 +33,4 @@ district_list ( "*",
                  distr_descr: distr_descr
               }
              );
-%><% ASPPAGE_END(); %> 
+%>

APPL/ALG/alg_edit_district.asp

@@ -110,4 +110,3 @@ IFACE.FORM_END();
 </div>
 </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_district_save.asp

@@ -21,20 +21,21 @@ var onrgoedlvl = "D";
 var this_alg = alg.func_enabled(dis_key, onrgoedlvl);
 user.auth_required_or_abort(this_alg.readman || this_alg.readuse);
 
-var fields =  [ { dbs: "alg_district_omschrijving", typ: "varchar",  frm: "dis_oms",  track: L("lcl_district")  },
-                { dbs: "alg_regio_key",             typ: "number",   frm: "regiokey", track: L("lcl_region"), foreign: "alg_regio" }
-              ];
+var fields =  [ { dbs: "alg_district_omschrijving", typ: "varchar",  frm: "dis_oms" },
+                { dbs: "alg_regio_key",            typ: "number",    frm: "regiokey" }];
 
 var warning = "";
 if (dis_key > 0)
-{
-    var algUpd = buildTrackingUpdate("alg_district", " alg_district_key = " + dis_key, fields);
-    var err = Oracle.Execute(algUpd.sql, true);
+  {
+    sql = buildUpdate("alg_district", fields)
+        + "     alg_district_key = " + dis_key;
+
+    var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
         warning = err.friendlyMsg;
-}
+   }
 else
-{
+  {
      fields.push({  dbs: "alg_district_key",         typ: "key",      seq: "alg_s_alg_district_key" });
      var regIns = buildInsert("alg_district", fields);
      var dis_key = regIns.sequences["alg_district_key"];
@@ -43,29 +44,22 @@ else
     var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
         warning = err.friendlyMsg;
-}
+  }
 
   if (!warning)
   {
-      if (algUpd && algUpd.trackarray.length)
-      { // Tracking alleen op wijzigingen
-        shared.trackaction("ALGDUP", dis_key, algUpd.trackarray.join("\n"));
-      }
-      currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                          + "     , ok.alg_onrgoedkenmerk_waarde"
-                          + "     , k.alg_kenmerk_toonbaar"
-                          + "  FROM alg_onrgoedkenmerk ok"
-                          + "     , alg_kenmerk k"
-                          + " WHERE k.alg_kenmerk_key = ok.alg_kenmerk_key"
-                          + "   AND alg_onrgoedkenmerk_verwijder IS NULL"
-                          + "   AND alg_onrgoed_niveau = 'D'"
-                          + "   AND alg_onrgoed_key = " + dis_key;
+      currentKenmerkenSQL = " SELECT k.ALG_kenmerk_key " +
+                            "      , ok.alg_onrgoedkenmerk_waarde" +
+                            "   FROM ALG_ONRGOEDKENMERK ok, ALG_KENMERK k " +
+                            "  WHERE  k.ALG_KENMERK_KEY = ok.ALG_KENMERK_KEY " +
+                            "    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",
-                          kenmerkToonbaar: "alg_kenmerk_toonbaar",
                           currentKenmerkenSQL: currentKenmerkenSQL,
                           requestQF: Request.Form,
                           flexPath: "ALG/D",
@@ -80,16 +74,13 @@ else
   <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>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_gebouw.asp

@@ -7,6 +7,10 @@
     Description:  edit of toevoegen van een gebouw
     Parameters:   bld_key
 
+
+    Context:
+    Note:
+
 */ %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
@@ -16,7 +20,6 @@
 <!-- #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" -->
 
@@ -39,47 +42,36 @@ if (bld_key > 0)
   if (oRs.Eof)
     shared.record_not_found("<!--"+bld_key+"-->");
 
-  var bld_srtkey    = oRs("alg_srtgebouw_key").Value;
-  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_image     = oRs("alg_gebouw_image").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;
-  var bld_inhoud    = oRs("alg_gebouw_inhoud").Value;
-  var bld_opmerk    = oRs("alg_gebouw_opmerking").Value;
-  var mld_adres     = oRs("mld_adres_key").Value;
-  var prs_kstpl     = oRs("prs_kostenplaats_key").Value;
-  var bld_ordrnr    = oRs("alg_gebouw_ordernr").Value;
-  var bld_dwgx      = oRs("alg_gebouw_dwgx").Value;
-  var bld_dwgy      = oRs("alg_gebouw_dwgy").Value;
-  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_groep     = oRs("alg_gebouw_groep").Value;
+  var bld_srtkey = oRs("alg_srtgebouw_key").Value;
+  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;
+  var bld_inhoud = oRs("alg_gebouw_inhoud").Value;
+  var bld_opmerk = oRs("alg_gebouw_opmerking").Value;
+  var mld_adres  = oRs("mld_adres_key").Value;
+  var prs_kstpl  = oRs("prs_kostenplaats_key").Value;
+  var bld_ordrnr = oRs("alg_gebouw_ordernr").Value;
+  var bld_dwgx   = oRs("alg_gebouw_dwgx").Value;
+  var bld_dwgy   = oRs("alg_gebouw_dwgy").Value;
+  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 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_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;
+  var beginuur   = oRs("alg_gebouw_beginuur").Value;
+  var einduur    = oRs("alg_gebouw_einduur").Value;
+  var werkdagen  = oRs("alg_gebouw_werkdagen").Value;
+  var verantw_key    = oRs("prs_perslid_key_verantw").Value;
+  var verantw_key2   = oRs("prs_perslid_key_verantw2").Value;
+  var vervaldatum = oRs("alg_gebouw_vervaldatum").Value != null ? new Date(oRs("alg_gebouw_vervaldatum").Value) : null;
   oRs.Close();
 }
 else
-{
-  var werkdagen      = 1;
-  var toon_telefoon  = 0;
-  var toon_email     = 0;
-  var toon_kenteken  = 0;
-}
+  var werkdagen = 1;
 %>
 
 <html>
@@ -95,22 +87,10 @@ else
               return false;
           document.forms.u2.submit();
       }
-
       function alg_cancel()
       {
           FcltMgr.closeDetail(window, { cancel: true } );
       }
-
-      function UploadImage()
-      {
-        url = "<%=protectQS.create("../shared/BijlagenForm.asp?module=ALGPHG")%>";
-        FcltMgr.openModalDetail(url, L("lcl_change"),
-                    { callback: function (data)
-                                {
-                                  if (data.filenaam)
-                                  $("#bld_image").val(data.filenaam); }
-                                } );
-      }
     </script>
   </head>
 
@@ -127,12 +107,12 @@ else
             target="hidFrameSubmit"
             onSubmit="alg_submit();">
 <%
-    if (this_alg.writeman)
-      manRWFIELD = RWFIELDTR;
-    else
-      manRWFIELD = function (a,b,c,d,e) { ROFIELDTR(b,c,d,e) }; // als geen USE of <self> dan zijn er veel readonly
+        if (this_alg.writeman)
+          manRWFIELD = RWFIELDTR;
+        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", L("lcl_alg_gebouw_algemeen"));
+        BLOCK_START("algLoc1", "&nbsp;");
         FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel,
                            { gebouwkey: bld_key,
                              startlevel: 2, //Locatie
@@ -140,8 +120,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_code",  "fld",          L("lcl_estate_gebouw_man_code"),        bld_code, {required: true, maxlength: 12});
+        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 "
@@ -154,36 +133,8 @@ else
                        emptyOption: "",
                        readonly: !this_alg.writeman
                      });
+        manRWFIELD("bld_code",  "fld",          L("lcl_estate_gebouw_man_code"),        bld_code, {required: true, maxlength: 12});
         manRWFIELD("bld_opmerk",  "fld",          L("lcl_estate_gebouw_man_opmerk"),        bld_opmerk, {maxlength: 50});
-        manRWFIELD("bld_groep",   "fld",          L("lcl_estate_gebouw_groepkenmerk"),      bld_groep,  {maxlength: 60});
-
-        FCLTcalendar("vervaldatum",
-                     { datum: vervaldatum,
-                       initEmpty: vervaldatum==null,
-                       label: L("lcl_alg_vervaldatum"),
-                       readonly: !this_alg.writeman
-                     });
-    BLOCK_END();
-
-    BLOCK_START("algLoc2", L("lcl_alg_gebouw_fysiek"));
-        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});
-        manRWFIELD("bld_x",  "fldshort",          L("lcl_geoxcoord"),        bld_x, {maxlength: 25});
-        manRWFIELD("bld_y",  "fldshort",          L("lcl_geoycoord"),        bld_y, {maxlength: 25});
-
-        ROFIELDTR("fld", L("lcl_alg_gebouw_mjb_score1"), geb_score1, {suppressEmpty: true});
-    BLOCK_END();
-
-    BLOCK_START("algLoc3", L("lcl_alg_gebouw_administr"));
-
         FCLTkostenplaatsselector(  "prs_kstpl",
                                    "prs_kstpl",
                                    user_key,
@@ -193,6 +144,17 @@ else
                                    readonly: !this_alg.writeman
                                   });
         manRWFIELD("bld_ordrnr",  "fld",          L("lcl_estate_gebouw_ordernr"),        bld_ordrnr, {maxlength: 30});
+        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: dienstniveau,
+                       emptyOption: "",
+                       readonly: !this_alg.writeuse
+                     });
         FCLTpersoonselector("verantw",
                             "sgVerantw",
                             { perslidKey: verantw_key,
@@ -208,26 +170,19 @@ else
                               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();
 
-        manRWFIELD("bld_image", "fld",  L("lcl_alg_gebouw_image"), bld_image,  {maxlength: 255});
-        var params = { type: "button",
-                       html: "title='" + L("lcl_alg_symbol_upload") + "' onclick='UploadImage()'"
-                     }
-        ROFIELDTR("image_button", L("lcl_alg_gebouw_image_upload"), L("lcl_fg_upload"), params);
-    BLOCK_END();
-
-    BLOCK_START("algLoc4", L("lcl_alg_gebouw_facilitair"));
-	        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: dienstniveau,
-                       emptyOption: "",
-                       readonly: !this_alg.writeuse
-                     });
+        BLOCK_START("algLoc2", "&nbsp;");
+        if (bld_key > 0)
+        {
+          var calcopp = alg.calc_algm2(bld_key, onrgoedlvl);
+          ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
+        }
+        manRWFIELD("bld_opp",  "fld float",          L("lcl_estate_gebouw_man_bruto_vloeropp"),        bld_opp, {datatype:"float", maxlength: 15});
+        manRWFIELD("bld_omtrek",  "fld",          L("lcl_estate_gebouw_man_omtrek"),        bld_omtrek, {maxlength: 15});
+        manRWFIELD("bld_inhoud",  "fld",          L("lcl_estate_gebouw_man_inhoud"),        bld_inhoud, {maxlength: 15});
         FCLTadresselector("mld_adres", "sgAdres",
                     {
                        label: L("lcl_delivery_address"),
@@ -236,6 +191,18 @@ else
                        filtercode: "A",
                        readonly: !this_alg.writeman
                     }) ;
+        manRWFIELD("bld_x",  "fld",          L("lcl_geoxcoord"),        bld_x, {maxlength: 25});
+        manRWFIELD("bld_y",  "fld",          L("lcl_geoycoord"),        bld_y, {maxlength: 25});
+
+        FCLTcalendar("vervaldatum",
+                     { datum: vervaldatum,
+                       initEmpty: vervaldatum==null,
+                       label: L("lcl_alg_vervaldatum"),
+                       readonly: !this_alg.writeman
+                     });
+
+        if (this_alg.writeman)
+          CHECKBOXTR(L("lcl_estate_gebouw_bez"), "fldalgbez", "bld_bez", bld_bez==1)
         var times = [];
         for (i=0; i<24; i++)
         {
@@ -261,49 +228,18 @@ else
                       );
         if (this_alg.writeman)
           CHECKBOXTR(L("lcl_estate_gebouw_werkdagen"), "fldalgwerk", "bld_werkdagen", werkdagen==1)
-    BLOCK_END();
-
-    if (user.checkAutorisation("WEB_BEZMGT", true))
-    {
-
-        BLOCK_START("algLoc5", L("lcl_alg_gebouw_bezoek"));
-          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,
-                                flexcolumns    : S("alg_flexcolumns"),
-                                this_alg       : this_alg
-                               });
-    IFACE.FORM_END();
+        generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,
+                                    onrgoed_niveau : onrgoedlvl,
+                                    reado          : false,
+                                    flexcolumns    : S("alg_flexcolumns"),
+                                    this_alg       : this_alg
+                                   });
+        IFACE.FORM_END();
 %>
       </form>
       <iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_gebouw_multi.asp

@@ -1,316 +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("groep").Count == 1 && getFParam("check_groep", "off") == "on")
-        fields.push({ dbs: "alg_gebouw_groep", typ: "varchar", frm: "groep", track: L("lcl_estate_gebouw_groepkenmerk") });
-      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"
-                            + "     , k.alg_kenmerk_toonbaar"
-                            + "  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",
-                            kenmerkToonbaar: "alg_kenmerk_toonbaar",
-                            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
-                          });
-      RWFIELDTR("groep", "fld", L("lcl_estate_gebouw_groepkenmerk"), "", {maxlength: 60});
-      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>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_gebouw_save.asp

@@ -30,46 +30,42 @@ var this_alg = alg.func_enabled(bld_key, onrgoedlvl);
 user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse));
 
   var fields =  [ { dbs: "alg_locatie_key",           typ: "key",     frm: "locatiekey" },
-                  { dbs: "alg_srtgebouw_key",         typ: "key",     frm: "bld_srtkey",    track: L("alg_srtgebouw"), foreign: {tbl: "alg_srtgebouw", key: "alg_srtgebouw_key", desc: "alg_srtgebouw_omschrijving"} },
-                  { dbs: "alg_gebouw_naam",           typ: "varchar", frm: "bld_naam",      track: L("lcl_estate_gebouw_man_name") },
-                  { dbs: "alg_gebouw_code",           typ: "varchar", frm: "bld_code",      track: L("lcl_estate_gebouw_man_code") },
-                  { dbs: "alg_gebouw_omschrijving",   typ: "varchar", frm: "bld_descr" },   // wordt samengesteld uit code en naam
-                  { dbs: "alg_gebouw_email",          typ: "varchar", frm: "bld_email",     track: L("lcl_alg_gebouw_email") },
-                  { dbs: "alg_gebouw_image",          typ: "varchar", frm: "bld_image",     track: L("lcl_alg_gebouw_image") },
-                  { dbs: "alg_gebouw_getekend",       typ: "date",    frm: "bld_teken" },   //
-                  { dbs: "alg_gebouw_bruto_vloeropp", typ: "float",   frm: "bld_opp",       track: L("lcl_estate_gebouw_man_bruto_vloeropp") },
-                  { dbs: "alg_gebouw_omtrek",         typ: "float",   frm: "bld_omtrek",    track: L("lcl_estate_gebouw_man_omtrek") },
-                  { dbs: "alg_gebouw_inhoud",         typ: "float",   frm: "bld_inhoud",    track: L("lcl_estate_gebouw_man_inhoud") },
-                  { dbs: "alg_gebouw_opmerking",      typ: "varchar", frm: "bld_opmerk",    track: L("lcl_estate_gebouw_man_opmerk") },
-                  { dbs: "alg_gebouw_groep",          typ: "varchar", frm: "bld_groep",     track: L("lcl_estate_gebouw_groepkenmerk") },
-                  { dbs: "mld_adres_key",             typ: "key",     frm: "mld_adres",     track: L("lcl_delivery_address"),  foreign: "mld_v_factuuradres" },
-                  { dbs: "prs_kostenplaats_key",      typ: "key",     frm: "prs_kstpl",     track: L("lcl_prs_dept_kosten"),   foreign: "prs_kostenplaats" },
-                  { dbs: "mld_dienstniveau_key",      typ: "key",     frm: "dienstniveau",  track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" },
-                  { dbs: "alg_gebouw_ordernr",        typ: "varchar", frm: "bld_ordrnr",    track: L("lcl_estate_gebouw_ordernr") },
-                  { dbs: "alg_gebouw_dwgx",           typ: "float",   frm: "bld_dwgx" },    //
-                  { dbs: "alg_gebouw_dwgy",           typ: "float",   frm: "bld_dwgy" },    //
-                  { dbs: "alg_gebouw_x",              typ: "float",   frm: "bld_x",         track: L("lcl_geoxcoord") },
-                  { dbs: "alg_gebouw_y",              typ: "float",   frm: "bld_y",         track: L("lcl_geoycoord") },
-                  { dbs: "alg_gebouw_bez",            typ: "check",   frm: "bld_bez",       track: L("lcl_estate_gebouw_bez") },
-                  { dbs: "alg_gebouw_werkdagen",      typ: "check0",  frm: "bld_werkdagen", track: L("lcl_estate_gebouw_werkdagen") },
-                  { dbs: "alg_gebouw_toon_telefoon",  typ: "number",  frm: "toon_telefoon", track: L("lcl_estate_gebouw_toon_telefoon") },
-                  { dbs: "alg_gebouw_toon_email",     typ: "number",  frm: "toon_email",    track: L("lcl_estate_gebouw_toon_email") },
-                  { dbs: "alg_gebouw_toon_kenteken",  typ: "number",  frm: "toon_kenteken", track: L("lcl_estate_gebouw_toon_kenteken") },
-                  { dbs: "alg_gebouw_vervaldatum",    typ: "date",    frm: "vervaldatum",   track: L("lcl_alg_vervaldatum") },
-                  { dbs: "prs_perslid_key_verantw",   typ: "key",     frm: "verantw",       track: L("lcl_alg_verantw"),  foreign: "prs_perslid" },
-                  { dbs: "prs_perslid_key_verantw2",  typ: "key",     frm: "verantw2",      track: L("lcl_alg_verantw2"), foreign: "prs_perslid" }
-                ];
+                  { dbs: "alg_srtgebouw_key",         typ: "key",     frm: "bld_srtkey" },
+                  { 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_opmerking",      typ: "varchar", frm: "bld_opmerk" },
+                  { dbs: "mld_adres_key",             typ: "key",     frm: "mld_adres" },
+                  { dbs: "prs_kostenplaats_key",      typ: "key",     frm: "prs_kstpl" },
+                  { dbs: "mld_dienstniveau_key",      typ: "key",     frm: "dienstniveau" },
+                  { dbs: "alg_gebouw_ordernr",        typ: "varchar", frm: "bld_ordrnr" },
+                  { dbs: "alg_gebouw_dwgx",           typ: "float",   frm: "bld_dwgx" },
+                  { dbs: "alg_gebouw_dwgy",           typ: "float",   frm: "bld_dwgy" },
+                  { dbs: "alg_gebouw_x",              typ: "float",   frm: "bld_x" },
+                  { 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_vervaldatum",    typ: "date",    frm: "vervaldatum",  track: L("lcl_alg_vervaldatum") },
+                  { dbs: "prs_perslid_key_verantw",   typ: "key",     frm: "verantw" },
+                  { dbs: "prs_perslid_key_verantw2",  typ: "key",     frm: "verantw2" }];
 
   if (beginuur != -2)
-    fields.push({ dbs: "alg_gebouw_beginuur",       typ: "float",   val: beginuur, track: L("lcl_estate_gebouw_beginuur") });
+    fields.push({ dbs: "alg_gebouw_beginuur",       typ: "float",   val: beginuur });
   if (einduur != -2)
-    fields.push({ dbs: "alg_gebouw_einduur",        typ: "float",   val: einduur,  track: L("lcl_estate_gebouw_einduur") });
+    fields.push({ dbs: "alg_gebouw_einduur",        typ: "float",   val: einduur });
 
   var warning = "";
   if (bld_key > 0)
   {
-    var algUpd = buildTrackingUpdate("alg_gebouw", " alg_gebouw_key = " + bld_key, fields);
-    var err = Oracle.Execute(algUpd.sql, true);
+    sql = buildUpdate("alg_gebouw", fields)
+        + "     alg_gebouw_key = " + bld_key;
+
+    var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
         warning = err.friendlyMsg;
   }
@@ -87,25 +83,18 @@ user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse))
 
   if (!warning)
   {
-      if (algUpd && algUpd.trackarray.length)
-      { // Tracking alleen op wijzigingen
-        shared.trackaction("ALGGUP", bld_key, algUpd.trackarray.join("\n"));
-      }
-      currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                          + "     , ok.alg_onrgoedkenmerk_waarde"
-                          + "     , k.alg_kenmerk_toonbaar"
-                          + "  FROM alg_onrgoedkenmerk ok"
-                          + "     , alg_kenmerk k"
-                          + " WHERE k.alg_kenmerk_key = ok.alg_kenmerk_key"
-                          + "   AND alg_onrgoedkenmerk_verwijder IS NULL"
-                          + "   AND alg_onrgoed_niveau = 'G'"
-                          + "   AND alg_onrgoed_key = " + bld_key;
+      currentKenmerkenSQL = " SELECT k.ALG_kenmerk_key " +
+                            "      , ok.alg_onrgoedkenmerk_waarde" +
+                            "   FROM ALG_ONRGOEDKENMERK ok, ALG_KENMERK k " +
+                            "  WHERE  k.ALG_KENMERK_KEY = ok.ALG_KENMERK_KEY " +
+                            "    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",
-                          kenmerkToonbaar: "alg_kenmerk_toonbaar",
                           currentKenmerkenSQL: currentKenmerkenSQL,
                           requestQF: Request.Form,
                           flexPath: "ALG/G",
@@ -121,16 +110,13 @@ 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>
   </body>
 </html>
-<% ASPPAGE_END(); %>

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" -->
@@ -21,9 +20,8 @@
 <!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest", "jQuery", "kenmerk"], js: []})
+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
 
@@ -33,32 +31,29 @@ user.auth_required_or_abort(this_alg.writeman || (loc_key>0&&this_alg.writeuse))
 
 if (loc_key > 0)
 {
-    sql = " SELECT * "
+    sql = " select * "
         + "  FROM ALG_LOCATIE "
         + " WHERE alg_locatie_key = " + loc_key;
 
     oRs = Oracle.Execute(sql);
 
-    var loc_omsch  = oRs("alg_locatie_omschrijving").Value;
-    var loc_code   = oRs("alg_locatie_code").Value;
-    var bez_adres  = oRs("alg_locatie_adres").Value;
-    var bez_postc  = oRs("alg_locatie_postcode").Value;
-    var bez_plaats = oRs("alg_locatie_plaats").Value
-    var bez_land   = oRs("alg_locatie_land").Value;
-    var loc_vw     = oRs("alg_locatie_verantw").Value;
-    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_image  = oRs("alg_locatie_image").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 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 loc_omsch  = oRs("alg_locatie_omschrijving").value;
+    var loc_code   = oRs("alg_locatie_code").value;
+    var bez_adres  = oRs("alg_locatie_adres").value;
+    var bez_postc  = oRs("alg_locatie_postcode").value;
+    var bez_plaats = oRs("alg_locatie_plaats").value
+    var bez_land   = oRs("alg_locatie_land").value;
+    var loc_vw     = oRs("alg_locatie_verantw").value;
+    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 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 dienstniveau  = oRs("mld_dienstniveau_key").value;
 
     oRs.Close();
 }
@@ -77,22 +72,10 @@ if (loc_key > 0)
             return false;
         document.forms.u2.submit();
     }
-
     function alg_cancel()
     {
         FcltMgr.closeDetail(window, { cancel: true } );
     }
-
-    function UploadImage()
-    {
-      url = "<%=protectQS.create("../shared/BijlagenForm.asp?module=ALGPHL")%>";
-      FcltMgr.openModalDetail(url, L("lcl_change"),
-                  { callback: function (data)
-                              {
-                                if (data.filenaam)
-                                $("#loc_image").val(data.filenaam); }
-                              } );
-    }
 </script>
 </head>
 
@@ -123,12 +106,12 @@ BLOCK_START("algLoc1", "&nbsp;");
           readonly: !this_alg.writeman,
           required: true });
 
-manRWFIELD("loc_omsch",  "fld", L("lcl_estate_locatie_man_descr"),    loc_omsch, {required: true, maxlength: 60});
-manRWFIELD("loc_code",   "fld", L("lcl_estate_locatie_man_code"),     loc_code, {required: true, maxlength: 10});
-manRWFIELD("bez_adres",  "fld", L("lcl_prs_address_bezoek_adres"),    bez_adres, {maxlength: 50});
-manRWFIELD("bez_postc",  "fld", L("lcl_prs_address_bezoek_postcode"), bez_postc, {maxlength: 12});
-manRWFIELD("bez_plaats", "fld", L("lcl_prs_address_bezoek_plaats"),   bez_plaats, {maxlength: 30});
-manRWFIELD("bez_land",   "fld", L("lcl_prs_address_bezoek_land"),     bez_land, {maxlength: 30});
+manRWFIELD("loc_omsch",  "fld",          L("lcl_estate_locatie_man_descr"),        loc_omsch, {required: true, maxlength: 60});
+manRWFIELD("loc_code",  "fld",          L("lcl_estate_locatie_man_code"),        loc_code, {required: true, maxlength: 10});
+manRWFIELD("bez_adres",  "fld",          L("lcl_prs_address_bezoek_adres"),        bez_adres, {maxlength: 50});
+manRWFIELD("bez_postc",  "fld",          L("lcl_prs_address_bezoek_postcode"),        bez_postc, {maxlength: 12});
+manRWFIELD("bez_plaats",  "fld",          L("lcl_prs_address_bezoek_plaats"),        bez_plaats, {maxlength: 30});
+manRWFIELD("bez_land",  "fld",          L("lcl_prs_address_bezoek_land"),        bez_land, {maxlength: 30});
 
   sql  = "SELECT   mld_dienstniveau_key, "
        + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
@@ -142,35 +125,19 @@ manRWFIELD("bez_land",   "fld", L("lcl_prs_address_bezoek_land"),     bez_land,
                  readonly: !this_alg.writeuse
               });
 
-manRWFIELD("loc_x",  "fld", L("lcl_geoxcoord"), loc_x, {maxlength: 25});
-manRWFIELD("loc_y",  "fld", L("lcl_geoycoord"), loc_y, {maxlength: 25});
+manRWFIELD("loc_x",  "fld",          L("lcl_geoxcoord"),        loc_x, {maxlength: 25});
+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
-             });
-
-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});
-manRWFIELD("pst_plaats", "fld", L("lcl_prs_address_post_plaats"),        pst_plaats, {maxlength: 30});
-manRWFIELD("pst_land",   "fld", L("lcl_prs_address_post_land"),          pst_land,   {maxlength: 30});
-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});
-
-manRWFIELD("loc_image", "fld",  L("lcl_alg_locatie_image"),                      loc_image,  {maxlength: 255});
-var params = { type: "button",
-               html: "title='" + L("lcl_alg_symbol_upload") + "' onclick='UploadImage()'"
-             }
-ROFIELDTR("image_button", L("lcl_alg_locatie_image_upload"), L("lcl_fg_upload"), params);
-
-if (ins_score_enabled)
-  ROFIELDTR("fld",          L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
+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});
+manRWFIELD("pst_plaats",  "fld",          L("lcl_prs_address_post_plaats"),        pst_plaats, {maxlength: 30});
+manRWFIELD("pst_land",  "fld",          L("lcl_prs_address_post_land"),        pst_land, {maxlength: 30});
+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});
 
 BLOCK_END();
 
@@ -188,4 +155,3 @@ IFACE.FORM_END();
 </div>
 </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_locatie_save.asp

@@ -21,32 +21,31 @@ var onrgoedlvl = "L";
 var this_alg = alg.func_enabled(loc_key, onrgoedlvl);
 user.auth_required_or_abort(this_alg.writeman || (loc_key>0&&this_alg.writeuse));
 
-  var fields =  [ { dbs: "alg_district_key",          typ: "number",  frm: "districtkey" },
-                  { dbs: "alg_locatie_code",          typ: "varchar", frm: "loc_code",     track: L("lcl_estate_locatie_man_code") },
-                  { dbs: "alg_locatie_omschrijving",  typ: "varchar", frm: "loc_omsch",    track: L("lcl_estate_locatie_man_descr") },
-                  { dbs: "alg_locatie_adres",         typ: "varchar", frm: "bez_adres",    track: L("lcl_prs_address_bezoek_adres") },
-                  { dbs: "alg_locatie_postcode",      typ: "varchar", frm: "bez_postc",    track: L("lcl_prs_address_bezoek_postcode") },
-                  { dbs: "alg_locatie_plaats",        typ: "varchar", frm: "bez_plaats",   track: L("lcl_prs_address_bezoek_plaats") },
-                  { dbs: "alg_locatie_land",          typ: "varchar", frm: "bez_land",     track: L("lcl_prs_address_bezoek_land") },
-                  { dbs: "alg_locatie_post_adres",    typ: "varchar", frm: "pst_adres",    track: L("lcl_prs_address_post_adres") },
-                  { dbs: "alg_locatie_post_postcode", typ: "varchar", frm: "pst_postc",    track: L("lcl_prs_address_post_postcode") },
-                  { dbs: "alg_locatie_post_plaats",   typ: "varchar", frm: "pst_plaats",   track: L("lcl_prs_address_post_plaats") },
-                  { dbs: "alg_locatie_post_land",     typ: "varchar", frm: "pst_land",     track: L("lcl_prs_address_post_land") },
-                  { dbs: "alg_locatie_verantw",       typ: "varchar", frm: "loc_vw",       track: L("lcl_estate_locatie_man_verantw") },
-                  { dbs: "alg_locatie_verantw_tel",   typ: "varchar", frm: "loc_vwtel",    track: L("lcl_estate_locatie_man_verantw_tel") },
-                  { dbs: "mld_dienstniveau_key",      typ: "key",     frm: "dienstniveau", track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" },
-                  { dbs: "alg_locatie_x",             typ: "float",   frm: "loc_x",        track: L("lcl_geoxcoord") },
-                  { dbs: "alg_locatie_y",             typ: "float",   frm: "loc_y",        track: L("lcl_geoycoord") },
-                  { dbs: "alg_locatie_vervaldatum",   typ: "date",    frm: "vervaldatum",  track: L("lcl_alg_vervaldatum") },
-                  { dbs: "alg_locatie_email",         typ: "varchar", frm: "loc_mail",     track: L("lcl_noti_email") },
-                  { dbs: "alg_locatie_image",         typ: "varchar", frm: "loc_image",    track: L("lcl_alg_locatie_image") }
-                ];
+  var fields =  [ { dbs: "alg_district_key", typ: "number",  frm: "districtkey" },
+                  { dbs: "alg_locatie_code", typ: "varchar",  frm: "loc_code" },
+                  { dbs: "alg_locatie_omschrijving", typ: "varchar",  frm: "loc_omsch" },
+                  { dbs: "alg_locatie_adres", typ: "varchar",  frm: "bez_adres" },
+                  { dbs: "alg_locatie_postcode", typ: "varchar",  frm: "bez_postc" },
+                  { dbs: "alg_locatie_plaats", typ: "varchar",  frm: "bez_plaats" },
+                  { dbs: "alg_locatie_land", typ: "varchar",  frm: "bez_land" },
+                  { dbs: "alg_locatie_post_adres", typ: "varchar",  frm: "pst_adres" },
+                  { dbs: "alg_locatie_post_postcode", typ: "varchar",  frm: "pst_postc" },
+                  { dbs: "alg_locatie_post_plaats", typ: "varchar",  frm: "pst_plaats" },
+                  { dbs: "alg_locatie_post_land", typ: "varchar",  frm: "pst_land" },
+                  { dbs: "alg_locatie_verantw", typ: "varchar",  frm: "loc_vw" },
+                  { dbs: "alg_locatie_verantw_tel", typ: "varchar",  frm: "loc_vwtel" },
+                  { 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_email", typ: "varchar",  frm: "loc_mail" }];
 
 var warning = "";
 if (loc_key > 0)
   {
-    var algUpd = buildTrackingUpdate("alg_locatie", " alg_locatie_key = " + loc_key, fields);
-    var err = Oracle.Execute(algUpd.sql, true);
+    sql = buildUpdate("alg_locatie", fields)
+        + "     alg_locatie_key = " + loc_key;
+
+    var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
         warning = err.friendlyMsg;
   }
@@ -64,25 +63,18 @@ else
 
   if (!warning)
   {
-      if (algUpd && algUpd.trackarray.length)
-      { // Tracking alleen op wijzigingen
-        shared.trackaction("ALGLUP", loc_key, algUpd.trackarray.join("\n"));
-      }
-      currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                          + "     , ok.alg_onrgoedkenmerk_waarde"
-                          + "     , k.alg_kenmerk_toonbaar"
-                          + "  FROM alg_onrgoedkenmerk ok"
-                          + "     , alg_kenmerk k"
-                          + " WHERE k.alg_kenmerk_key = ok.alg_kenmerk_key"
-                          + "   AND alg_onrgoedkenmerk_verwijder IS NULL"
-                          + "   AND alg_onrgoed_niveau = 'L'"
-                          + "   AND alg_onrgoed_key = " + loc_key;
+      currentKenmerkenSQL = " SELECT k.ALG_kenmerk_key " +
+                            "      , ok.alg_onrgoedkenmerk_waarde" +
+                            "   FROM ALG_ONRGOEDKENMERK ok, ALG_KENMERK k " +
+                            "  WHERE  k.ALG_KENMERK_KEY = ok.ALG_KENMERK_KEY " +
+                            "    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",
-                          kenmerkToonbaar: "alg_kenmerk_toonbaar",
                           currentKenmerkenSQL: currentKenmerkenSQL,
                           requestQF: Request.Form,
                           flexPath: "ALG/L",
@@ -98,16 +90,13 @@ 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>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_regio.asp

@@ -87,4 +87,3 @@ var action = (regio_key == -1 ? "I" : "U");
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

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" );
@@ -46,4 +47,4 @@ var result = { regio_key: regio_key,
                keepForm: !!warning,
                success: true };
 Response.Write(JSON.stringify(result));
-%><% ASPPAGE_END(); %> 
+%>

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" -->
@@ -163,14 +164,14 @@ if (!room_exists)
         BLOCK_START("algLoc2", "&nbsp;");
 
           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"});
@@ -229,4 +230,3 @@ if (!room_exists)
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_ruimte_multi.asp

@@ -14,6 +14,7 @@
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../Shared/save2db.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/kenmerk_common.inc" -->
 <!-- #include file="./alg_flexkenmerk.inc" -->
@@ -86,7 +87,6 @@ oRs.Close();
   <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,
@@ -202,12 +202,11 @@ oRs.Close();
           });
 
     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});
+    buttons.push({title: L("lcl_submit"), action: "alg_submit()", singlepress: true, id: "btn_alg_submit"});
+    buttons.push({title: L("lcl_cancel"), action: "alg_cancel()"});
     CreateButtons(buttons);
 IFACE.FORM_END();
 %>
     </form>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_ruimte_multi_save.asp

@@ -13,6 +13,7 @@ var JSON_Result = true;
 %>
 
 <!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/save2db.inc" -->
 <!-- #include file="../Shared/kenmerk_common.inc" -->
 <!-- #include file="./alg.inc" -->
@@ -42,7 +43,6 @@ for (var i = 0; i < alg_key_arr.length; i++)
 
         currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
                             + "     , ok.alg_onrgoedkenmerk_waarde"
-                            + "     , k.alg_kenmerk_toonbaar"
                             + "  FROM alg_onrgoedkenmerk ok"
                             + "     , alg_kenmerk k"
                             + " WHERE ok.alg_kenmerk_key = k.alg_kenmerk_key"
@@ -52,11 +52,7 @@ for (var i = 0; i < alg_key_arr.length; 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"
+                            + ",      fac_kenmerkdomein_key"
                             + "  FROM alg_kenmerk k"
                             + " WHERE k.alg_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
 
@@ -65,7 +61,6 @@ for (var i = 0; i < alg_key_arr.length; i++)
                                             kenmerkParentKey : "alg_onrgoed_key",
                                             kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
                                             kenmerkKey: "alg_kenmerk_key",
-                                            kenmerkToonbaar: "alg_kenmerk_toonbaar",
                                             currentKenmerkenSQL: currentKenmerkenSQL,
                                             allKenmerkenSQL: allKenmerkenSQL,
                                             requestQF: Request.Form,
@@ -90,4 +85,4 @@ result = { success : true, refresh: true };
 
 Response.Write(JSON.stringify(result));
 Response.End;
-%><% ASPPAGE_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();
@@ -69,4 +70,3 @@ var result = { room_key: room_key,
                success: true };
 Response.Write(JSON.stringify(result));
 %>
-<% ASPPAGE_END(); %> 

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>
 
@@ -135,4 +135,3 @@ IFACE.FORM_END();
   </div>
 </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_ruimtefunctie_save.asp

@@ -90,15 +90,13 @@ __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>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_terreinsector.asp

@@ -11,16 +11,13 @@
     Note:
 
 */ %>
-<!-- #include file="../Shared/common.inc" -->
-<!-- #include file="../Shared/iface.inc" -->
-<!-- #include file="../Shared/selector.inc" -->
-<!-- #include file="../Shared/calendar.inc" -->
+<!--#include file="../Shared/common.inc" -->
+<!--#include file="../Shared/iface.inc" -->
+<!--#include file="../Shared/selector.inc" -->
 
-<!-- #include file="../Shared/plaatsselector.inc" -->
-<!-- #include file="../Shared/kostenplaatsselector.inc" -->
-<!-- #include file="../Shared/afdelingselector.inc" -->
-<!-- #include file="../Shared/persoonselector.inc" -->
-<!-- #include file="../API2/api2.inc" -->
+<!--#include file="../Shared/plaatsselector.inc" -->
+<!--#include file="../Shared/kostenplaatsselector.inc" -->
+<!--#include file="../Shared/afdelingselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
 <!-- #include file="alg.inc" -->
 
@@ -45,47 +42,27 @@ if (ter_key > 0)
         + ", alg_terreinsector_omtrek"
         + ", alg_terreinsector_aanmaak"
         + ", alg_terreinsector_ordernr"
-        + ", alg_terreinsector_image"
-        + ", alg_terreinsector_toon_telef"
-        + ", alg_terreinsector_toon_email"
-        + ", alg_terreinsector_toon_kentk"
-        + ", alg_terreinsector_vervaldatum"
         + ", prs_kostenplaats_key"
         + ", prs_afdeling_key"
-        + ", prs_perslid_key_verantw"
-        + ", prs_perslid_key_verantw2"
         + "  FROM alg_terreinsector "
         + " WHERE alg_terreinsector_key = " + ter_key;
 
     oRs = Oracle.Execute(sql);
 
-      var loc_key   = oRs("alg_locatie_key").Value;
-      var ter_oms   = oRs("alg_terreinsector_omschrijving").Value;
-      var ter_code  = oRs("alg_terreinsector_code").Value;
-      var ter_naam  = oRs("alg_terreinsector_naam").Value;
-      var ter_srkey = oRs("alg_srtterreinsector_key").Value;
-      var ter_opp   = oRs("alg_terreinsector_oppervlak").Value;
-      var ter_omt   = oRs("alg_terreinsector_omtrek").Value;
-      var ter_aanmk = oRs("alg_terreinsector_aanmaak").Value;
-      var ter_ordnr = oRs("alg_terreinsector_ordernr").Value;
-      var ter_image = oRs("alg_terreinsector_image").Value;
-      var prs_kstn  = oRs("prs_kostenplaats_key").Value;
-      var prs_afd   = oRs("prs_afdeling_key").Value;
-      var verantw_key    = oRs("prs_perslid_key_verantw").Value
-      var verantw_key2   = oRs("prs_perslid_key_verantw2").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;
+      var loc_key   = oRs("ALG_LOCATIE_KEY").value;
+      var ter_oms   = oRs("ALG_TERREINSECTOR_OMSCHRIJVING").value;
+      var ter_code  = oRs("ALG_TERREINSECTOR_CODE").value;
+      var ter_naam  = oRs("ALG_TERREINSECTOR_NAAM").value;
+      var ter_srkey = oRs("ALG_SRTTERREINSECTOR_KEY").value;
+      var ter_opp   = oRs("ALG_TERREINSECTOR_OPPERVLAK").value;
+      var ter_omt   = oRs("ALG_TERREINSECTOR_OMTREK").value;
+      var ter_aanmk = oRs("ALG_TERREINSECTOR_AANMAAK").value;
+      var ter_ordnr = oRs("ALG_TERREINSECTOR_ORDERNR").value;
+      var prs_kstn  = oRs("PRS_KOSTENPLAATS_KEY").value;
+      var prs_afd   = oRs("PRS_AFDELING_KEY").value;
 
     oRs.Close();
 }
-else
-{
-  var toon_telefoon  = 0;
-  var toon_email     = 0;
-  var toon_kenteken  = 0;
-}
 %>
 
 <html>
@@ -106,17 +83,6 @@ else
     {
         FcltMgr.closeDetail(window, { cancel: true } );
     }
-
-    function UploadImage()
-    {
-      url = "<%=protectQS.create("../shared/BijlagenForm.asp?module=ALGPHT")%>";
-      FcltMgr.openModalDetail(url, L("lcl_change"),
-                  { callback: function (data)
-                              {
-                                if (data.filenaam)
-                                $("#ter_image").val(data.filenaam); }
-                              } );
-    }
 </script>
 </head>
 
@@ -139,7 +105,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", L("lcl_alg_gebouw_algemeen"));
+BLOCK_START("algInfo", "");
 
   FCLTplaatsselector(this_alg.authparams("WEB_TERMAN").ALGwritelevel, {
                     locatiekey: loc_key,
@@ -162,33 +128,7 @@ BLOCK_START("algLoc1", L("lcl_alg_gebouw_algemeen"));
 
   RWFIELDTR("ter_code", "fld", L("lcl_estate_terreinsector_man_code"), ter_code, {maxlength: 12, required: true});
   RWFIELDTR("ter_naam", "fld", L("lcl_estate_terreinsector_man_name"), ter_naam, {maxlength: 30, required: true});
-BLOCK_END();
 
-BLOCK_START("algLoc2", L("lcl_alg_gebouw_bezoek"));
-  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();
-
-BLOCK_START("algLoc3", L("lcl_alg_gebouw_administr"));
   FCLTkostenplaatsselector( "prs_kstn",
                           "prs_kstn",
                           user_key,
@@ -202,41 +142,13 @@ BLOCK_START("algLoc3", L("lcl_alg_gebouw_administr"));
                           //autlevel: authparams.PRSreadlevel,
                           whenEmpty: L("lcl_search_generic")
                         });
-  FCLTpersoonselector("verantw",
-                      "sgVerantw",
-                      { perslidKey: verantw_key,
-                        label: L("lcl_alg_verantw"),
-                        autlevel: this_alg.authparams("WEB_ALGMAN") && this_alg.authparams("WEB_ALGMAN").PRSwritelevel
-                      });
-  FCLTpersoonselector("verantw2",
-                      "sgVerantw2",
-                      { perslidKey: verantw_key2,
-                        label: L("lcl_alg_verantw2"),
-                        autlevel: this_alg.authparams("WEB_ALGMAN") && this_alg.authparams("WEB_ALGMAN").PRSwritelevel
-                      });
 
   RWFIELDTR("ter_ordnr", "fld", L("lcl_estate_terreinsector_ordernr"), ter_ordnr, {maxlength: 30});
-
-  manRWFIELD("ter_image", "fld",  L("lcl_alg_terreinsector_image"), ter_image,  {maxlength: 255});
-  var params = { type: "button",
-                 html: "title='" + L("lcl_alg_symbol_upload") + "' onclick='UploadImage()'"
-               }
-  ROFIELDTR("image_button", L("lcl_alg_terreinsector_image_upload"), L("lcl_fg_upload"), params);
-BLOCK_END();
-
-BLOCK_START("algLoc4", L("lcl_alg_gebouw_fysiek"));
   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
-               });
 BLOCK_END();
 
-
 generateFlexKenmerkBlock ({
      onrgoed_key    : ter_key,
      onrgoed_niveau : onrgoedlvl,
@@ -252,4 +164,3 @@ IFACE.FORM_END();
 </div>
 </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_terreinsector_save.asp

@@ -21,28 +21,20 @@ var onrgoedlvl = "T";
 var this_alg = alg.func_enabled(ter_key, onrgoedlvl);
 user.auth_required_or_abort(this_alg.writeman || (ter_key>0&&this_alg.writeuse));
 
-  var fields =  [ { dbs: "alg_locatie_key",                typ: "key",     frm: "locatiekey",    track: true /* afzonderlijke tracking, wel oldjsval */ },
-                  { dbs: "alg_terreinsector_omschrijving", typ: "varchar", frm: "ter_oms"},
-                  { dbs: "alg_terreinsector_code",         typ: "varchar", frm: "ter_code",      track: L("lcl_estate_terreinsector_man_code") },
-                  { dbs: "alg_terreinsector_naam",         typ: "varchar", frm: "ter_naam",      track: L("lcl_estate_terreinsector_man_name") },
-                  { dbs: "alg_srtterreinsector_key",       typ: "key",     frm: "ter_srkey",     track: L("lcl_estate_terreinsector_man_sort"), foreign: "ALG_SRTTERREINSECTOR" },
-                  { dbs: "alg_terreinsector_oppervlak",    typ: "float",   frm: "ter_opp",       track: L("lcl_estate_terreinsector_man_oppervlak") },
-                  { dbs: "alg_terreinsector_omtrek",       typ: "float",   frm: "ter_omt",       track: L("lcl_estate_terreinsector_man_omtrek") },
-                  { dbs: "alg_terreinsector_ordernr",      typ: "varchar", frm: "ter_ordnr",     track: L("lcl_estate_terreinsector_ordernr") },
-                  { dbs: "alg_terreinsector_image",        typ: "varchar", frm: "ter_image",     track: L("lcl_alg_terreinsector_image") },
-                  { dbs: "alg_terreinsector_vervaldatum",  typ: "date",    frm: "vervaldatum",   track: L("lcl_alg_vervaldatum") },
-                  { dbs: "alg_terreinsector_toon_telef",   typ: "number",  frm: "toon_telefoon", track: L("lcl_estate_gebouw_toon_telefoon") },
-                  { dbs: "alg_terreinsector_toon_email",   typ: "number",  frm: "toon_email",    track: L("lcl_estate_gebouw_toon_email") },
-                  { dbs: "alg_terreinsector_toon_kentk",   typ: "number",  frm: "toon_kenteken", track: L("lcl_estate_gebouw_toon_kenteken") },
-                  { dbs: "prs_kostenplaats_key",           typ: "key",     frm: "prs_kstn",      track: L("lcl_prs_dept_kosten"), foreign: "PRS_KOSTENPLAATS" },
-                  { dbs: "prs_afdeling_key",               typ: "key",     frm: "prs_afd",       track: L("lcl_dep_name_level2"), foreign: "PRS_AFDELING" },
-                  { dbs: "prs_perslid_key_verantw",        typ: "key",     frm: "verantw",       track: L("lcl_alg_verantw"),  foreign: "PRS_PERSLID" },
-                  { dbs: "prs_perslid_key_verantw2",       typ: "key",     frm: "verantw2",      track: L("lcl_alg_verantw2"), foreign: "PRS_PERSLID" }
-                ];
+  var fields =  [ { dbs: "alg_locatie_key", typ: "key",  frm: "locatiekey", track: true /* afzonderlijke tracking, wel oldjsval */ },
+                  { dbs: "ALG_TERREINSECTOR_OMSCHRIJVING", typ: "varchar",  frm: "ter_oms" },
+                  { dbs: "ALG_TERREINSECTOR_CODE", typ: "varchar",  frm: "ter_code" },
+                  { dbs: "ALG_TERREINSECTOR_NAAM", typ: "varchar",  frm: "ter_naam" },
+                  { dbs: "ALG_SRTTERREINSECTOR_KEY", typ: "key",  frm: "ter_srkey" },
+                  { 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: "PRS_KOSTENPLAATS_KEY", typ: "key",  frm: "prs_kstn" },
+                  { dbs: "PRS_AFDELING_KEY", typ: "key", frm: "prs_afd" }];
 
 var warning = "";
 if (ter_key > 0)
-{
+  {
     var terUpd = buildTrackingUpdate("alg_terreinsector", "alg_terreinsector_key = " + ter_key, fields);
 
     var err = Oracle.Execute(terUpd.sql, true);
@@ -74,40 +66,33 @@ if (ter_key > 0)
             }
         }
     }
-}
+  }
 else
-{
+  {
     fields.push({  dbs: "alg_terreinsector_key",         typ: "key",      seq: "alg_s_alg_onroerendgoed_keys" });
-    var regIns = buildInsert("alg_terreinsector", fields);
-    var ter_key = regIns.sequences["alg_terreinsector_key"];
+  var regIns = buildInsert("alg_terreinsector", fields);
+  var ter_key = regIns.sequences["alg_terreinsector_key"];
 
-    sql = regIns.sql;
+  sql = regIns.sql;
     var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
         warning = err.friendlyMsg;
-}
+  }
 
   if (!warning)
   {
-      if (terUpd && terUpd.trackarray.length)
-      { // Tracking alleen op wijzigingen
-        shared.trackaction("ALGTUP", ter_key, terUpd.trackarray.join("\n"));
-      }
-      currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                          + "     , ok.alg_onrgoedkenmerk_waarde"
-                          + "     , k.alg_kenmerk_toonbaar"
-                          + "  FROM alg_onrgoedkenmerk ok"
-                          + "     , alg_kenmerk k"
-                          + " WHERE k.alg_kenmerk_key = ok.alg_kenmerk_key"
-                          + "   AND alg_onrgoedkenmerk_verwijder IS NULL"
-                          + "   AND alg_onrgoed_niveau = 'T'"
-                          + "   AND alg_onrgoed_key = " + ter_key;
+      currentKenmerkenSQL = " SELECT k.ALG_kenmerk_key " +
+                            "      , ok.alg_onrgoedkenmerk_waarde" +
+                            "   FROM ALG_ONRGOEDKENMERK ok, ALG_KENMERK k " +
+                            "  WHERE  k.ALG_KENMERK_KEY = ok.ALG_KENMERK_KEY " +
+                            "    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",
-                          kenmerkToonbaar: "alg_kenmerk_toonbaar",
                           currentKenmerkenSQL: currentKenmerkenSQL,
                           requestQF: Request.Form,
                           flexPath: "ALG/T",
@@ -123,16 +108,13 @@ 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>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_verdieping.asp

@@ -116,11 +116,11 @@ BLOCK_END();
 BLOCK_START("algLoc2", " ");
 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"});
-}
+  var calcopp = alg.calc_algm2(flr_key, onrgoedlvl); 
+  ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
+  ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
+  ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
+}  
 BLOCK_END();
 
 generateFlexKenmerkBlock ({
@@ -138,4 +138,3 @@ IFACE.FORM_END();
 </div>
 </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_verdieping_save.asp

@@ -21,17 +21,19 @@ var onrgoedlvl = "V";
 var this_alg = alg.func_enabled(flr_key, onrgoedlvl);
 user.auth_required_or_abort(this_alg.writeman || (flr_key>0&&this_alg.writeuse));
 
-  var fields =  [ { dbs: "alg_verdieping_omschrijving", typ: "varchar", frm: "flr_omschr",   track: L("lcl_estate_verdieping_man_descr") },
-                  { dbs: "alg_verdieping_volgnr",       typ: "number",  frm: "flr_volgnr",   track: L("lcl_estate_verdieping_man_volgnr") },
-                  { dbs: "alg_verdieping_code",         typ: "varchar", frm: "flr_code",     track: L("lcl_estate_verdieping_man_code") },
+  var fields =  [ { dbs: "alg_verdieping_omschrijving", typ: "varchar", frm: "flr_omschr" },
+                  { dbs: "alg_verdieping_volgnr",       typ: "number",  frm: "flr_volgnr" },
+                  { dbs: "alg_verdieping_code",         typ: "varchar", frm: "flr_code" },
                   { dbs: "alg_gebouw_key",              typ: "key",     frm: "gebouwkey" },
-                  { dbs: "mld_dienstniveau_key",        typ: "key",     frm: "dienstniveau", track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" }
+                  { dbs: "MLD_DIENSTNIVEAU_KEY",        typ: "key",     frm: "dienstniveau" }
                 ];
 
 var warning = "";
 if (flr_key > 0)
   {
-    var algUpd = buildTrackingUpdate("alg_verdieping", " alg_verdieping_key = " + flr_key, fields);
+    sql = buildUpdate("alg_verdieping", fields)
+        + "     alg_verdieping_key = " + flr_key;
+
     var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
         warning = err.friendlyMsg;
@@ -50,25 +52,18 @@ else
 
   if (!warning)
   {
-      if (algUpd && algUpd.trackarray.length)
-      { // Tracking alleen op wijzigingen
-        shared.trackaction("ALGVUP", flr_key, algUpd.trackarray.join("\n"));
-      }
-      currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                          + "     , ok.alg_onrgoedkenmerk_waarde"
-                          + "     , k.alg_kenmerk_toonbaar"
-                          + "  FROM alg_onrgoedkenmerk ok"
-                          + "     , alg_kenmerk k"
-                          + " WHERE k.alg_kenmerk_key = ok.alg_kenmerk_key"
-                          + "   AND alg_onrgoedkenmerk_verwijder IS NULL"
-                          + "   AND alg_onrgoed_niveau = 'V'"
-                          + "   AND alg_onrgoed_key = " + flr_key;
+      currentKenmerkenSQL = " SELECT k.ALG_kenmerk_key " +
+                            "      , ok.alg_onrgoedkenmerk_waarde" +
+                            "   FROM ALG_ONRGOEDKENMERK ok, ALG_KENMERK k " +
+                            "  WHERE  k.ALG_KENMERK_KEY = ok.ALG_KENMERK_KEY " +
+                            "    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",
-                          kenmerkToonbaar: "alg_kenmerk_toonbaar",
                           currentKenmerkenSQL: currentKenmerkenSQL,
                           requestQF: Request.Form,
                           flexPath: "ALG/V",
@@ -84,16 +79,12 @@ 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>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

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" -->
 
 <%
@@ -94,7 +95,7 @@ function onChangeVolgnr()
 }
 
 <% if (wp_key<0) { %>
-$(function(){ onChangeRoom(<%=room_key%>)});
+$(document).ready(function(){ onChangeRoom(<%=room_key%>)});
 <% } %>
 
 </script>
@@ -144,8 +145,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";
@@ -163,4 +163,3 @@ IFACE.FORM_END();
 </div>
 </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_edit_wp_save.asp

@@ -23,28 +23,26 @@ var wp_type = (S("prs_werkplek_implicit") == 1)?1:getFParamInt("wp_type");
 
 var authparams = alg.checkAutorisation();
 
-var fields =  [ { dbs: "prs_werkplek_volgnr",       typ: "number",  frm: "wp_volgnr",       track: L("lcl_estate_wp_seq") },
-                { dbs: "prs_werkplek_omschrijving", typ: "varchar", frm: "wp_oms",          track: L("lcl_workplace") },
-                { dbs: "prs_werkplek_vastopp",      typ: "number",  frm: "wp_vstopp_v",     track: L("lcl_estate_wp_fixed_v") },
-                { dbs: "prs_werkplek_opp",          typ: "number",  frm: "wp_opp",          track: L("lcl_estate_wp_area")},
-                { dbs: "prs_werkplek_virtueel",     typ: "number",  val: (virtueel? 1 : 0), track: L("lcl_estate_wp_virt") },
-                { dbs: "prs_werkplek_type",         typ: "number",  val: wp_type,           track: L("lcl_wptype") },
-                { dbs: "prs_alg_ruimte_key",        typ: "key",     frm: "ruimtekey"}
-                /*
-                { dbs: "PRS_WERKPLEK_MODULE",     typ: "varchar", frm: "" },
+var fields =  [// { dbs: "PRS_WERKPLEK_MODULE", typ: "varchar",  frm: "" },
+                { dbs: "PRS_WERKPLEK_VOLGNR", typ: "number",  frm: "wp_volgnr" },
+                { dbs: "PRS_WERKPLEK_OMSCHRIJVING", typ: "varchar",  frm: "wp_oms" },
+                { dbs: "PRS_WERKPLEK_VASTOPP", typ: "number",  frm: "wp_vstopp_v" },
+                { dbs: "PRS_WERKPLEK_OPP", typ: "number",  frm: "wp_opp" },
+                { dbs: "PRS_WERKPLEK_VIRTUEEL", typ: "number",  val: (virtueel? 1 : 0) },
+                { dbs: "PRS_WERKPLEK_TYPE", typ: "number",  val: wp_type },
+                { dbs: "PRS_ALG_RUIMTE_KEY", typ: "key",  frm: "ruimtekey" } /*,
                 { dbs: "PRS_WERKPLEK_GETEKEND", typ: "date",  frm: "" },
                 { dbs: "PRS_WERKPLEK_DWGX", typ: "number",  frm: "" },
                 { dbs: "PRS_WERKPLEK_DWGY", typ: "number",  frm: "" },
                 { dbs: "PRS_WERKPLEK_DWGZ", typ: "number",  frm: "" },
                 { dbs: "PRS_WERKPLEK_DWGROTATIE", typ: "number",  frm: "" },
-                { dbs: "PRS_WERKPLEK_DWGSCHAAL", typ: "number",  frm: "" }
-                */
-              ];
+                { dbs: "PRS_WERKPLEK_DWGSCHAAL", typ: "number",  frm: "" }*/ ];
 
 var warning = "";
 if (wp_key > 0)
   {
-    var algUpd = buildTrackingUpdate("prs_werkplek", " prs_werkplek_key = " + wp_key, fields);
+    sql = buildUpdate("prs_werkplek", fields)
+        + "     prs_werkplek_key = " + wp_key;
 
     var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
@@ -64,10 +62,6 @@ if (wp_key > 0)
       wp_key = WPMove_PRS_WERKPLEK(wp_key, room_key_new);
     }
 
-    if (algUpd && algUpd.trackarray.length)
-    {   // Tracking alleen op wijzigingen
-        shared.trackaction("ALGWUP", wp_key, algUpd.trackarray.join("\n"));
-    }
   }
 else
   {
@@ -86,16 +80,13 @@ 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>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_flexkenmerk.inc

@@ -56,8 +56,6 @@ function generateFlexKenmerkBlock(params)
     }
 
     var sql = "SELECT    k.alg_kenmerk_key              kenmerk_key, "
-             + "         1                              kenmerk_key_count, "
-             + "         NULL                           srtkenmerk_key, "
              + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key') +" kenmerk_omschrijving, "
              + "         k.alg_kenmerk_kenmerktype      kenmerk_kenmerktype, "
              + "         k.fac_kenmerkdomein_key        kenmerkdomein_key, "
@@ -65,24 +63,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,11 +99,9 @@ function generateFlexKenmerkBlock(params)
                   kenmerk_search: advanced,
                   fnIsReadonly: isReadonly,
                   hideVervallen: onrgoed_key<0,
-                  reado: reado,
                   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,7 +20,6 @@
 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)
 {
@@ -93,11 +92,9 @@ else
       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>
-<% ASPPAGE_END(); %> 

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" -->
@@ -59,31 +60,6 @@ function fnrowClass(oRs)
   }
   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">
 
@@ -91,65 +67,34 @@ var all_cnt = getQParamInt("cnt_full", 0);
 
   function gotoDetails(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
-    var url = "appl/alg/alg_verdieping_search.asp?gebouw_key=" + algData.detail_key + "&autosearch=" + autosearch + "&chkgeb=1";
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
+    var url = "appl/ALG/alg_verdieping_search.asp?gebouw_key=" + algData.detail_key + "&autosearch=" + autosearch + "&chkgeb=1";
     FcltMgr.openDetail(url, "<%=L("lcl_floor")%>");
   }
-
   function gotoParent(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
-    var url = "appl/alg/alg_locatie_search.asp?locatie_key=" + algData.parent_key + "&autosearch=" + autosearch;
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
+    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 = JSON.parse(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" : "");
-    FcltMgr.openDetail(url, "<%=L("lcl_building")%>" + ' ' + algData.oms);
-  }
-
-  function aggregateCNDscores(rowArray, isMulti)
-  {
-    FcltMgr.confirm(L("cnd_aggregate_confirm"), { autoconfirm: isMulti }, function() {
-        var locKeyString = getKeyString(rowArray);
-        var data = { key: locKeyString,
-                     level: "G"
-                   };
-        <% protectRequest.dataToken("data"); %>
-        $.post("alg_cnd_aggregate.asp", data, FcltCallbackRefresh, "json");
-    });
-  }
-
-  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)
-  {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
-    var url = "appl/ins/ins_search.asp?urole=bo&gebouw_key=" + algData.key;
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
+    var url = "appl/ALG/alg_gebouw.asp?mode=viewUpdate&key=" + algData.key;
     FcltMgr.openDetail(url, "<%=L("lcl_building")%>" + ' ' + algData.oms);
   }
 
+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");
+  });
+}
 </script>
 <%
 
@@ -166,7 +111,6 @@ 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;
@@ -174,27 +118,13 @@ function gebouw_list(pautfunction, params)
   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)
@@ -228,11 +158,6 @@ function gebouw_list(pautfunction, params)
            + "     , 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"
@@ -269,10 +194,6 @@ function gebouw_list(pautfunction, params)
         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 (params.bld_email)
-        sqln += " AND UPPER(g.alg_gebouw_email) LIKE " + safe.quoted_sql_wild("%" + params.bld_email + "%");
-    if (params.bld_groep)
-        sqln += " AND UPPER(g.alg_gebouw_groep) LIKE " + safe.quoted_sql_wild("%" + params.bld_groep + "%");
 
     if (srtgebouw_key)
       sqln += " AND g.alg_srtgebouw_key = " + srtgebouw_key;
@@ -283,15 +204,6 @@ function gebouw_list(pautfunction, params)
     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 += " ORDER BY l.alg_locatie_upper ASC, "
           +  "          g.alg_gebouw_upper ASC  ";
 
@@ -324,34 +236,25 @@ 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"}));
 
     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});
-    if (S("cnd_gebreken_srtdisc_key") > -1)
-        rst.addAction({ action: "aggregateCNDscores", caption: L("cnd_aggr_conditiescores"), multi: true, multiOnce: 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,12 @@
 <%
 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 +34,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">
@@ -96,79 +91,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: ""
-                           });
-%>            <!-- gebouw groeperingskenmerk -->
-                <tr class="primsearch">
-                  <td class="label"><label><%=L("lcl_estate_gebouw_groepkenmerk")%>:</label></td>
-                  <td><input type="text" class="wildcard" id="bld_groep" name="bld_groep" value=""></td>
-                </tr>
-
-              <!-- 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
-                                  });
+            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
+                                });
 %>
-                <tr class="primsearch">
-                  <td class="label"><label><%=L("lcl_alg_gebouw_email")%>:</label></td>
-                  <td><input type="text" class="wildcard" id="bld_email" name="bld_email" value=""></td>
-                </tr>
-<%
-              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, 1, 1, 6)"
-                           onBlur="checkKenmerk(this, true, 'N', 1, 1, 1, 6)"
-                           id="fitness_score1_from"
-                           name="fitness_score1_from"
-                           class="fldflexN  number "
-                           value=""
-                           maxlength="3">
-                    &nbsp;<%=L("lcl_mjb_through")%>&nbsp;
-                    <input type="text"
-                           onChange="fvalid=checkKenmerk(this, false, 'N', 1, 1, 1, 6)"
-                           onBlur="checkKenmerk(this, true, 'N', 1, 1, 1, 6)"
-                           id="fitness_score1_through"
-                           name="fitness_score1_through"
-                           class="fldflexN  number "
-                           value=""
-                           maxlength="3">
-                  </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>
@@ -184,4 +133,3 @@ var this_alg = alg.func_enabled(gebouw_key);
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_gebouw_search_list.asp

@@ -32,16 +32,10 @@ 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 = getQParamFloat("fitness_score1_from", -1);       // Conditie score van.
-var fitness_score1_through = getQParamFloat("fitness_score1_through", -1); // Conditie score t/m.
-var bld_email = getQParam("bld_email", ""); // Gebouw email.
-var bld_groep = getQParam("bld_groep", ""); // Gebouw groeperingskenmerk
 
 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),
@@ -51,12 +45,8 @@ gebouw_list ( "*",
                  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,
-                 bld_email : bld_email,
-                 bld_groep : bld_groep,
                  noref: (noref != -1? noref : null),
                  expalgincl: expalgincl
               }
              );
-%><% ASPPAGE_END(); %> 
+%>

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

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" -->
@@ -25,7 +26,7 @@ function fnrowData(oRs)
   var key        = oRs("alg_locatie_key").value;
   var oms        = oRs("alg_locatie_omschrijving").value;
 
-  var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
+  var data = {parent_key:parent_key, detail_key:detail_key, key:key, oms:oms};
 
   return JSON.stringify(data);
 }
@@ -61,46 +62,35 @@ function fnrowClass(oRs)
   }
   return lclass;
 }
-
-var all_cnt = getQParamInt("cnt_full", 0);
 %>
 <script type="text/javascript">
   var autosearch = 1; //automatisch laden van resultaat op search pagina
 
   function gotoDetails(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    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)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_district_search.asp?district_key="+algData.parent_key+"&autosearch="+autosearch;
     FcltMgr.openDetail(url, "<%=L("lcl_district")%>");
   }
-
-  function locatieEdit(row)
+    function locatieEdit(row)
   {
-    var v_all_cnt = <%=all_cnt%>;
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
-    var url = "appl/ALG/alg_locatie.asp?key="+algData.key + (v_all_cnt == 1 ? "&cnt_full=1" : "");
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
+    var url = "appl/ALG/alg_locatie.asp?key="+algData.key;
     FcltMgr.openDetail(url, "<%=L("lcl_location")%>" + ' ' + algData.oms);
   }
 
-  function aggregateCNDscores(rowArray, isMulti)
-  {
-    FcltMgr.confirm(L("cnd_aggregate_confirm"), { autoconfirm: isMulti }, function() {
-        var locKeyString = getKeyString(rowArray);
-        var data = { key: locKeyString,
-                     level: "L"
-                   };
-        <% protectRequest.dataToken("data"); %>
-        $.post("alg_cnd_aggregate.asp", data, FcltCallbackRefresh, "json");
-    });
-  }
-
   function doDelete(rowArray, isMulti)
   {
     FcltMgr.confirm(L("lcl_alg_del_txt_locatie"), { autoconfirm: isMulti }, function() {
@@ -127,13 +117,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)
   {
@@ -173,10 +159,8 @@ function locatie_list(pautfunction, params)
              + "     , 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"
@@ -212,23 +196,11 @@ 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)";
 
     var addurl = "appl/alg/alg_locatie.asp";
@@ -261,9 +233,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)
     {
@@ -279,11 +248,10 @@ function locatie_list(pautfunction, params)
 
 
     rst.addAction({ action: "locatieEdit", caption: L("lcl_edit"), isDefault:  true});
-    if (S("cnd_gebreken_srtdisc_key") > -1)
-        rst.addAction({ action: "aggregateCNDscores", caption: L("cnd_aggr_conditiescores"), multi: true, multiOnce: true});
     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 -->
@@ -70,63 +65,16 @@ var authparams = alg.checkAutorisation();
                 <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, 1, 1, 6)"
-                             onBlur="checkKenmerk(this, true, 'N', 1, 1, 1, 6)"
-                             id="fitness_score1_from"
-                             name="fitness_score1_from"
-                             class="fldflexN  number "
-                             value=""
-                             maxlength="3">
-                      &nbsp;<%=L("lcl_mjb_through")%>&nbsp;
-                      <input type="text"
-                             onChange="fvalid=checkKenmerk(this, false, 'N', 1, 1, 1, 6)"
-                             onBlur="checkKenmerk(this, true, 'N', 1, 1, 1, 6)"
-                             id="fitness_score1_through"
-                             name="fitness_score1_through"
-                             class="fldflexN  number "
-                             value=""
-                             maxlength="3">
-                    </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>
@@ -142,4 +90,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_locatie_search_list.asp

@@ -27,24 +27,16 @@ 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 = getQParamFloat("fitness_score1_from", -1);       // Conditie score van.
-var fitness_score1_through = getQParamFloat("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)
               }
              );
-%><% ASPPAGE_END(); %> 
+%>

APPL/ALG/alg_regio.asp

@@ -59,4 +59,3 @@ var reg_key = getQParamInt("key", -1);
  %>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

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" -->
@@ -37,14 +38,14 @@ function fnrowData(oRs)
 
   function gotoDetails(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_district_search.asp?regio_key=" + algData.detail_key + "&autosearch=" + autosearch;
     FcltMgr.openDetail(url, "<%=L("lcl_district")%>");
   }
 
     function districtEdit(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_regio.asp?mode=viewUpdate&key=" + algData.key;
     FcltMgr.openDetail(url, "<%=L("lcl_region")%>" + ' ' + algData.oms);
   }

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">
@@ -67,4 +67,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_regio_search_list.asp

@@ -29,4 +29,4 @@ regio_list ( "*",
                  reg_key: (reg_key != -1? reg_key : null)
               }
              );
-%><% ASPPAGE_END(); %> 
+%>

APPL/ALG/alg_ruimte.asp

@@ -131,4 +131,3 @@ else
 %>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

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,17 +28,18 @@ 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 reg_key = params.reg_key;
+  var dis_key = params.dis_key;
+  var loc_key = params.loc_key;
+  var bld_key = params.bld_key;
+  var lvl_key = params.lvl_key;
+  var room_key = params.room_key;
   var area_nr = params.area_nr;
   var area_descr = params.area_descr;
   var srtruimte_key = params.srtruimte_key
-  var dept_key_arr = params.dept_key_arr;
+  var dept_key = params.dept_key;
   var chkgeb = params.chkgeb;
 %>
 
@@ -49,21 +51,21 @@ function ruimte_list(pautfunction, params)
 
         function gotoDetails(row)
         {
-          var algData = JSON.parse(row.getAttribute("ROWDATA"));
+          var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
           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 = JSON.parse(row.getAttribute("ROWDATA"));
+          var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
           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 = JSON.parse(row.getAttribute("ROWDATA"));
+          var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
           var url = "appl/alg/alg_ruimte.asp?mode=viewUpdate&key="+algData.key;
           FcltMgr.openDetail(url, "<%=L("lcl_room")%>" + ' ' + algData.oms);
         }
@@ -151,26 +153,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(",") + "))";
+      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 (srtruimte_key)
       {
@@ -187,13 +189,13 @@ 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)
+      if (dept_key)
       {
         sqln += " AND r.alg_ruimte_key in "
              +  "                    (SELECT alg_ruimte_key "
              +  "                      FROM prs_ruimteafdeling "
              +  "                     WHERE prs_ruimteafdeling_verwijder IS NULL "
-             +  "                       AND prs_afdeling_key IN (" + dept_key_arr.join(",") + "))";
+             +  "                       AND prs_afdeling_key = " + dept_key + ")";
       }
 
       if (!chkgeb)
@@ -235,7 +237,8 @@ function ruimte_list(pautfunction, params)
 
       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;

APPL/ALG/alg_ruimte_search.asp

@@ -36,17 +36,17 @@ 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">
@@ -64,12 +64,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 -->
@@ -109,7 +109,6 @@ var authparams = alg.checkAutorisation();
                                "dept",
                                { label: L("lcl_prs_organisatie"),
                                  autlevel: authparams.PRSreadlevel, // Was voorheen niet aanwezig
-                                 multitoggle: true,
                                  whenEmpty: L("lcl_search_generic"),
                                  filtercode: "AR"
                                });
@@ -119,8 +118,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>
@@ -136,4 +135,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_ruimte_search_list.asp

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

APPL/ALG/alg_ruimteafdeling.asp

@@ -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();
 %>
@@ -294,4 +196,4 @@ IFACE.FORM_END();
   </html>
 <%
 }
-%><% ASPPAGE_END(); %> 
+%>

APPL/ALG/alg_ruimtefunctie.asp

@@ -65,4 +65,3 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jQuery-ui.js"]})
 %>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_ruimtefunctie_delete.asp

@@ -16,6 +16,7 @@
 var JSON_Result = true;
 %>
 <!--#include file="../Shared/common.inc"-->
+<!--#include file="../Shared/json2.js" -->
 <%
 protectRequest.validateToken();
 
@@ -39,4 +40,4 @@ var sql = "DELETE FROM alg_srtruimte_locatiegebouw"
     }
 
     Response.Write(JSON.stringify(result));
-%><% ASPPAGE_END(); %> 
+%>

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" -->
@@ -43,7 +44,7 @@ function ruimtefunctie_list(pautfunction, params)
         function ruimtefunctie_edit(row)
         {
           var srtruimte_lg_key = row.getAttribute("ROWKEY");
-          var algData = JSON.parse(row.getAttribute("ROWDATA"));
+          var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
 
           var subject = "<%=L("lcl_estate_ruimte_man_sort")%>" + ' ' + algData.oms;
           var url = "alg_ruimtefunctie.asp?srtruimte_lg_key=" + srtruimte_lg_key;

APPL/ALG/alg_ruimtefunctie_search.asp

@@ -92,4 +92,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_ruimtefunctie_search_list.asp

@@ -33,4 +33,4 @@ ruimtefunctie_list ( "*",
                        bld_key: (bld_key != -1? bld_key : null)
                      }
                    );
-%><% ASPPAGE_END(); %> 
+%>

APPL/ALG/alg_ruimteresscope.asp

@@ -60,9 +60,9 @@ var ruimte_key_arr = getQParamIntArray("ruimte_keys");
                        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} ];
+    var buttons =  [ {title: L("lcl_add"),    action: "alg_submit('A')" },
+                     {title: L("lcl_delete"), action: "alg_submit('D')" },
+                     {title: L("lcl_cancel"), action: "gen_cancel()"} ];
     CreateButtons(buttons);
 
     IFACE.FORM_END();
@@ -70,4 +70,3 @@ var ruimte_key_arr = getQParamIntArray("ruimte_keys");
       </form>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_ruimteresscope_save.asp

@@ -11,6 +11,7 @@ var JSON_Result = true;
 
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../API2/api2.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <%
 protectRequest.validateToken();
 
@@ -55,4 +56,4 @@ else if (scopemode == 'D')
 var result = { toaster: toaster,
                success: true };
 Response.Write(JSON.stringify(result));
-%><% ASPPAGE_END(); %> 
+%>

APPL/ALG/alg_search.asp

@@ -49,7 +49,7 @@ 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;">
+      <form name="u2" id="algform" target="workFrame" action="dynamischbepaald" method="get">
 <%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
           <tr>
             <td class="searchkolom1">
@@ -95,4 +95,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_show_district.asp

@@ -22,21 +22,16 @@
 FCLTHeader.Requires({plugins:["jQuery"], js: []})
 
 var dis_key  = getQParamInt("dis_key")
+var reg_key
 
 var onrgoedlvl = "D";
 var this_alg = alg.func_enabled(dis_key, onrgoedlvl);
 user.auth_required_or_abort(this_alg.readman || this_alg.readuse);
 
-var sql = "SELECT r.alg_regio_omschrijving"
-        + "     , d.alg_district_omschrijving"
-        + "     , d.alg_district_verwijder"
-        + "  FROM alg_regio r"
-        + "     , alg_district d"
-        + " WHERE r.alg_regio_key = d.alg_regio_key"
-        + "   AND d.alg_district_key = " + dis_key;
+var sql = "SELECT * "
+        + "  FROM alg_district"
+        + " WHERE alg_district_key = " + dis_key;
 var oRs = Oracle.Execute(sql);
-var reg_naam = oRs("alg_regio_omschrijving").Value;
-var dis_naam = oRs("alg_district_omschrijving").Value;
 var dis_deleted = oRs("alg_district_verwijder").value != null;
 oRs.Close();
 %>
@@ -87,12 +82,12 @@ oRs.Close();
 %>
       <form name=u2 onSubmit="return false;">
 <%      BLOCK_START("algInfo", "&nbsp;");
-            params = { infoPointer: { Url: "appl/shared/status_info.asp?dis_key=" + dis_key,
-                                      Title: L("lcl_status_details") + " " + dis_naam
-                                    }
-                     };
-            ROFIELDTR("fld", L("lcl_region"), reg_naam);
-            ROFIELDTR("fld", L("lcl_district"), dis_naam, params);
+        FCLTplaatsselector(-1,
+                           { regiokey: reg_key,
+                             districtkey: dis_key,
+                             startlevel: 0, // Regio
+                             eindlevel: 1, // District
+                             readonly: true });
         BLOCK_END();
 
         generateFlexKenmerkBlock ({ onrgoed_key    : dis_key,
@@ -105,4 +100,3 @@ oRs.Close();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

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,8 +38,7 @@ var bld_naam    = oRs("alg_gebouw_naam").Value;
 var bld_code    = oRs("alg_gebouw_code").Value;
 var bld_descr   = oRs("alg_gebouw_omschrijving").Value;
 var bld_maak    = oRs("alg_gebouw_aanmaak").Value;
-var bld_email   = oRs("alg_gebouw_email").Value;
-var bld_image   = oRs("alg_gebouw_image").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;
@@ -56,18 +53,13 @@ var bld_x       = oRs("alg_gebouw_x").Value;
 var bld_y       = oRs("alg_gebouw_y").Value;
 var bld_bez     = oRs("alg_gebouw_bez").Value;
 var bld_deleted = oRs("alg_gebouw_verwijder").Value != null;
-var bld_groep   = oRs("alg_gebouw_groep").Value;
 var dienstniveau_key = oRs("mld_dienstniveau_key").Value;
 var beginuur   = oRs("alg_gebouw_beginuur").Value;
 var einduur    = oRs("alg_gebouw_einduur").Value;
 var werkdagen  = oRs("alg_gebouw_werkdagen").Value;
-var 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();
 %>
 
@@ -131,7 +123,7 @@ oRs.Close();
 %>
     <div id="show">
       <form name=u2 onSubmit="return false;">
-<%      BLOCK_START("algLoc1", L("lcl_alg_gebouw_algemeen"));
+<%      BLOCK_START("algLoc1", "&nbsp;");
         FCLTplaatsselector(-1,
                            { gebouwkey: bld_key,
                              startlevel: 2, //Locatie
@@ -139,11 +131,6 @@ oRs.Close();
                              moreinfo: true,  // wel beetje suf om door te linken naar jezelf
                              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);
         sql = "SELECT alg_srtgebouw_key"
             + "     , " + lcl.xsqla('alg_srtgebouw_omschrijving', 'alg_srtgebouw_key')
             + "  FROM alg_srtgebouw"
@@ -157,144 +144,94 @@ oRs.Close();
                        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_opmerk"), bld_opmerk, {suppressEmpty:true});
-        ROFIELDTR("fld", L("lcl_estate_gebouw_groepkenmerk"), bld_groep, {suppressEmpty:true});
-
         sql = "SELECT prs_kostenplaats_key"
             + "     , k.prs_kostenplaats_nr || ' ' || k.prs_kostenplaats_omschrijving"
             + "  FROM prs_kostenplaats k"
             + " WHERE k.prs_kostenplaats_module = 'ALG'"
             + " ORDER BY prs_kostenplaats_upper";
+        FCLTselector("prs_kstpl",
+                     sql,
+                     { 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)
+        {
+          sql = "SELECT mld_dienstniveau_key"
+              + "     , " + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
+              + "  FROM mld_dienstniveau"
+              + " WHERE mld_dienstniveau_key = " + dienstniveau_key;
+          oRs = Oracle.Execute(sql);
+          ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
+          oRs.Close();
+        }
+        FCLTpersoonselector("verantw",
+                            "sgVerantw",
+                            { perslidKey: verantw,
+                              label: L("lcl_alg_verantw"),
+                              readonly: true,
+                              suppressEmpty: true,
+                              moreinfo: this_alg.readman
+                            });
+        FCLTpersoonselector("verantw2",
+                            "sgVerantw2",
+                            { perslidKey: verantw2,
+                              label: L("lcl_alg_verantw2"),
+                              readonly: true,
+                              suppressEmpty: true,
+                              moreinfo: this_alg.readman
+                            });
+
+        AFIELDTR('fldmailto details', L("lcl_alg_gebouw_email"), "mailto:" + bld_email, bld_email, { suppressEmpty: true });
+        BLOCK_END();
+
+        BLOCK_START("algLoc2", "&nbsp;");
+        var calcopp = alg.calc_algm2(bld_key, onrgoedlvl);
+        ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
+
+        ROFIELDTR("fld", L("lcl_estate_gebouw_man_bruto_vloeropp"), bld_opp, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_estate_gebouw_man_omtrek"), bld_omtrek, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_estate_gebouw_man_inhoud"), bld_inhoud, {suppressEmpty: true});
+        sql = "SELECT mld_adres_naam"
+            + "  FROM mld_adres"
+            + " WHERE mld_adres_key = " + mld_adres;
+        oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        {
+            ROFIELDTR("fld", L("lcl_delivery_address"), oRs("mld_adres_naam").value, {suppressEmpty: true});
+        }
+        oRs.Close();
+        ROFIELDTR("fld", L("lcl_geoxcoord"), bld_x, {suppressEmpty:true});
+        ROFIELDTR("fld", L("lcl_geoycoord"), bld_y, {suppressEmpty:true});
         var fldcls = "fld";
         if (vervaldatum <= new Date())
             fldcls += " expired2";
         ROFIELDTR(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
-
-    BLOCK_END();
-
-    BLOCK_START("algLoc2", L("lcl_alg_gebouw_fysiek"));
-        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"});
-        ROFIELDTR("fld", L("lcl_geoxcoord"), bld_x, {suppressEmpty:true});
-        ROFIELDTR("fld", L("lcl_geoycoord"), bld_y, {suppressEmpty:true});
-        ROFIELDTR("fld", L("lcl_alg_gebouw_mjb_score1"), geb_score1, {suppressEmpty: true});
-    BLOCK_END();
-
-    // suppressempty explicits
-    if (!(prs_kstpl==null && bld_ordrnr == null && verantw==null && verantw2 == null && bld_email == null && bld_image == null))
-    {
-        BLOCK_START("algLoc3", L("lcl_alg_gebouw_administr"));
-            FCLTselector("prs_kstpl",
-                         sql,
-                         { 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});
-            FCLTpersoonselector("verantw",
-                                "sgVerantw",
-                                { perslidKey: verantw,
-                                  label: L("lcl_alg_verantw"),
-                                  readonly: true,
-                                  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" });
-            ROFIELDTR("fld", L("lcl_alg_gebouw_image"), bld_image, { 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 (!(dienstniveau_key == null && mld_adres == null && beginuur == null && einduur == null && werkdagen == 0))
-    {
-        BLOCK_START("algLoc4", L("lcl_alg_gebouw_facilitair"));
 
-            if (dienstniveau_key)
-            {
-              sql = "SELECT mld_dienstniveau_key"
-                  + "     , " + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
-                  + "  FROM mld_dienstniveau"
-                  + " WHERE mld_dienstniveau_key = " + dienstniveau_key;
-              oRs = Oracle.Execute(sql);
-              ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
-              oRs.Close();
-            }
-
-            sql = "SELECT mld_adres_naam"
-                + "  FROM mld_adres"
-                + " WHERE mld_adres_key = " + mld_adres;
-            oRs = Oracle.Execute(sql);
-            if (!oRs.eof)
-            {
-                ROFIELDTR("fld", L("lcl_delivery_address"), oRs("mld_adres_naam").value, {suppressEmpty: true});
-            }
-            oRs.Close();
-
-            ROFIELDTR("fld", L("lcl_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) && bld_bez==1)
-    {
-        BLOCK_START("algLoc5", L("lcl_alg_gebouw_bezoek"));
-
-          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"
-                      });
-          BLOCK_END();
-    }
-
-    generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,
-                                onrgoed_niveau : onrgoedlvl,
-                                reado          : true,
-                                flexcolumns    : S("alg_flexcolumns"),
-                                this_alg       : this_alg
-                              });
+        generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,
+                                    onrgoed_niveau : onrgoedlvl,
+                                    reado          : true,
+                                    flexcolumns    : S("alg_flexcolumns"),
+                                    this_alg       : this_alg
+                                  });
 %>
       </form>
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

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);
@@ -31,37 +30,32 @@ var sql = "SELECT *"
         + "  FROM alg_locatie"
         + " WHERE alg_locatie_key = " + loc_key;
 var oRs = Oracle.Execute(sql);
-var loc_code         = oRs("alg_locatie_code").Value;
-var loc_naam         = oRs("alg_locatie_omschrijving").Value;
-var bez_adres        = oRs("alg_locatie_adres").Value;
-var bez_postc        = oRs("alg_locatie_postcode").Value;
-var bez_plaats       = oRs("alg_locatie_plaats").Value
-var bez_land         = oRs("alg_locatie_land").Value;
-var loc_vw           = oRs("alg_locatie_verantw").Value;
-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_image        = oRs("alg_locatie_image").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 loc_code   = oRs("alg_locatie_code").value;
+var bez_adres  = oRs("alg_locatie_adres").value;
+var bez_postc  = oRs("alg_locatie_postcode").value;
+var bez_plaats = oRs("alg_locatie_plaats").value
+var bez_land   = oRs("alg_locatie_land").value;
+var loc_vw     = oRs("alg_locatie_verantw").value;
+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 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 dienstniveau_key = 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()
@@ -133,11 +127,7 @@ oRs.Close();
                              eindlevel: 2, // Locatie
                              readonly: true });
 
-        params = { infoPointer: { Url: "appl/shared/status_info.asp?loc_key=" + loc_key,
-                                  Title: L("lcl_status_details") + " " + loc_naam
-                                }
-                 };
-        ROFIELDTR("fld", L("lcl_estate_locatie_man_code"), loc_code, params);
+        ROFIELDTR("fld", L("lcl_estate_locatie_man_code"), loc_code, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_prs_address_bezoek_adres"), bez_adres, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_prs_address_bezoek_postcode"), bez_postc, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_prs_address_bezoek_plaats"), bez_plaats, {suppressEmpty: true});
@@ -149,7 +139,7 @@ oRs.Close();
                  + "    FROM mld_dienstniveau "
                  + "   WHERE mld_dienstniveau_key = " + dienstniveau_key;
             oRs = Oracle.Execute(sql);
-            ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").Value);
+            ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
             oRs.Close();
         }
         ROFIELDTR("fld", L("lcl_geoxcoord"), loc_x, {suppressEmpty: true});
@@ -158,20 +148,13 @@ oRs.Close();
         BLOCK_END();
         BLOCK_START("algLoc2", "&nbsp;");
 
-        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" });
-        ROFIELDTR("fld", L("lcl_alg_locatie_image"), loc_image, { suppressEmpty: true });
-        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();
 
@@ -186,4 +169,3 @@ oRs.Close();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_show_regio.asp

@@ -85,15 +85,14 @@ var regio_deleted = regio_exists && !!regio_data.deleted;
             action="alg_edit_regio_save.asp?regio_key=<%=regio_data.id%>"
             onSubmit="return false">
 <%      BLOCK_START("algInfo", "&nbsp;");
-            params = { infoPointer: { Url: "appl/shared/status_info.asp?reg_key=" + regio_data.id,
-                                      Title: L("lcl_status_details") + " " + regio_data.name
-                                    }
-                     };
-            ROFIELDTR("fld", L("lcl_region"), regio_data.name, params);
+        FCLTplaatsselector(-1,
+                           { regiokey: regio_data.id,
+                             startlevel: 0, // Regio
+                             eindlevel: 0, // Regio
+                             readonly: true });
         BLOCK_END();
 %>
       </form>
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

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"],
@@ -121,17 +122,17 @@ if (!room_data.cadcontours.length)
         BLOCK_END();
         BLOCK_START("algLoc2", "&nbsp;");
 
-          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});
@@ -159,4 +160,3 @@ if (!room_data.cadcontours.length)
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_show_terreinsector.asp

@@ -16,8 +16,6 @@
 <!-- #include file="../Shared/iface.inc" -->
 <!-- #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" -->
 
@@ -43,10 +41,6 @@ var sql = "SELECT ts.alg_locatie_key"
         + "     , ts.alg_terreinsector_aanmaak"
         + "     , ts.alg_terreinsector_omschrijving"
         + "     , ts.alg_terreinsector_ordernr"
-        + "     , ts.alg_terreinsector_image"
-        + "     , 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"
@@ -55,55 +49,42 @@ 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"
-        + "     , prs_perslid_key_verantw"
-        + "     , prs_perslid_key_verantw2"
-        + "     , ts.alg_terreinsector_vervaldatum"
         + "     , ts.alg_terreinsector_verwijder"
         + "  FROM alg_terreinsector ts"
         + " WHERE ts.alg_terreinsector_key = " + ter_key;
 var oRs = Oracle.Execute(sql);
-var loc_key   = oRs("alg_locatie_key").Value;
-var ter_oms   = oRs("alg_terreinsector_omschrijving").Value;
-var ter_code  = oRs("alg_terreinsector_code").Value;
-var ter_naam  = oRs("alg_terreinsector_naam").Value;
-var ter_srkey = oRs("alg_srtterreinsector_key").Value;
-var ter_sroms = oRs("srtterreinsector_oms").Value;
-var ter_opp   = oRs("alg_terreinsector_oppervlak").Value;
-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 ter_image = oRs("alg_terreinsector_image").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 verantw_key  = oRs("prs_perslid_key_verantw").Value;
-var verantw2_key = oRs("prs_perslid_key_verantw2").Value;
-var ter_deleted = oRs("alg_terreinsector_verwijder").Value != null;
-var vervaldatum = oRs("alg_terreinsector_vervaldatum").Value;
+var loc_key   = oRs("alg_locatie_key").value;
+var ter_oms   = oRs("alg_terreinsector_omschrijving").value;
+var ter_code  = oRs("alg_terreinsector_code").value;
+var ter_naam  = oRs("alg_terreinsector_naam").value;
+var ter_srkey = oRs("alg_srtterreinsector_key").value;
+var ter_sroms = oRs("srtterreinsector_oms").value;
+var ter_opp   = oRs("alg_terreinsector_oppervlak").value;
+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 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;
 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() {
@@ -119,7 +100,6 @@ oRs.Close();
                 "json");
         });
       }
-
     </script>
   </head>
 
@@ -143,7 +123,7 @@ oRs.Close();
 %>
       <form name=u2 onSubmit="return false;">
 <%
-    BLOCK_START("algLoc1", L("lcl_alg_gebouw_algemeen"));
+        BLOCK_START("algInfo", "");
         FCLTplaatsselector(-1,
                            { locatiekey: loc_key,
                              startlevel: 2, // Locatie
@@ -151,74 +131,16 @@ oRs.Close();
                              readonly: true
                            });
 
-        params = { infoPointer: { Url: "appl/shared/status_info.asp?ter_key=" + ter_key,
-                                  Title: L("lcl_status_details") + " " + ter_naam
-                                }
-                 };
         ROFIELDTR("fld", L("lcl_estate_terreinsector_man_sort"), ter_sroms, {suppressEmpty: true});
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_code"), ter_code, params);
+        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_code"), ter_code);
         ROFIELDTR("fld", L("lcl_estate_terreinsector_man_name"), ter_naam);
-    BLOCK_END();
-
-    BLOCK_START("algLoc2", L("lcl_alg_gebouw_bezoek"));
-        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,
-                       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,
-                      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,
-                      extraclass: "notmulti"
-                    });
-    BLOCK_END();
-
-    BLOCK_START("algLoc3", L("lcl_alg_gebouw_administr"));
         ROFIELDTR("fld", L("lcl_prs_dept_kosten"), prs_kstpl, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_dep_name_level2"), prs_afd);
-        FCLTpersoonselector("verantw",
-                            "sgVerantw",
-                            { perslidKey: verantw_key,
-                              label: L("lcl_alg_verantw"),
-                              readonly: true,
-                              suppressEmpty: true
-                            });
-        FCLTpersoonselector("verantw2",
-                            "sgVerantw2",
-                            { perslidKey: verantw2_key,
-                              label: L("lcl_alg_verantw2"),
-                              readonly: true,
-                              suppressEmpty: true
-                            });
         ROFIELDTR("fld", L("lcl_estate_terreinsector_ordernr"), ter_ordnr, {suppressEmpty: true});
-        ROFIELDTR("fld", L("lcl_alg_terreinsector_image"), ter_image, { suppressEmpty: true });
-    BLOCK_END();
+        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_oppervlak"), ter_opp, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_omtrek"), ter_omt, {suppressEmpty: true});
 
-    if (!(ter_opp == null && ter_omt == null && vervaldatum == null))
-    {
-        BLOCK_START("algLoc4", L("lcl_alg_gebouw_fysiek"));
-            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});
         BLOCK_END();
-    }
 
         generateFlexKenmerkBlock({onrgoed_key    : ter_key,
                                  onrgoed_niveau : onrgoedlvl,
@@ -232,4 +154,3 @@ oRs.Close();
     </div> <!-- edit -->
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_show_verdieping.asp

@@ -94,11 +94,7 @@ oRs.Close();
                             moreinfo: true,
                             readonly: true });
 
-        params = { infoPointer: { Url: "appl/shared/status_info.asp?flr_key=" + flr_key,
-                                  Title: L("lcl_status_details") + " " + flr_code
-                                }
-                 };
-        ROFIELDTR("fld", L("lcl_estate_verdieping_man_code"), flr_code, params);
+        ROFIELDTR("fld", L("lcl_estate_verdieping_man_code"), flr_code);
         ROFIELDTR("fld", L("lcl_estate_verdieping_man_volgnr"), flr_volgnr);
         if (dienstniveau_key)
         {
@@ -114,9 +110,9 @@ oRs.Close();
 
         BLOCK_START("algLoc2", " ");
           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"});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
         BLOCK_END();
 
         generateFlexKenmerkBlock ({
@@ -131,4 +127,3 @@ oRs.Close();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_show_wp.asp

@@ -106,15 +106,10 @@ 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" });
-
-        params = { infoPointer: { Url: "appl/shared/status_info.asp?wp_key=" + wp_key,
-                                  Title: L("lcl_status_details") + " " + wp_oms
-                                }
-                 };
-        ROFIELDTR("wp_type",      L("lcl_wptype"),     wp_typ_str, params);
+        ROFIELDTR("wp_type",      L("lcl_wptype"),     wp_typ_str);
 %>
         </table>
 <%      BLOCK_END();
@@ -123,4 +118,3 @@ var wp_typ_str = (wp_type == 1 ? L("lcl_wptype_1") : L("lcl_wptype_0"));
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

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" -->
@@ -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;
@@ -236,12 +236,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>
 
@@ -336,4 +335,3 @@ else if (srtruimte_key > 0 && mode == "delete")
             style="display:none"></iframe>
   </body>
 </html>
-<% ASPPAGE_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();<%}%>
     });
@@ -82,4 +81,3 @@ FCLTHeader.Generate();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

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"}));
@@ -112,4 +112,3 @@ FCLTHeader.Generate({outputmode: outputmode});
 %>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_terreinsector.asp

@@ -84,4 +84,3 @@ else
 %>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

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" -->
@@ -17,32 +18,6 @@
 <%
 FCLTHeader.Requires({ plugins:["jQuery"] });
 
-// Fast check to see if any terrain responsibles have been set
-// If not, we can suppress the column
-sql = "SELECT 1"
-    + "  FROM alg_terreinsector"
-    + " WHERE prs_perslid_key_verantw IS NOT NULL"
-    + "   AND alg_terreinsector_verwijder IS NULL"
-    + "   AND ROWNUM = 1";
-oRs = Oracle.Execute(sql);
-var anyterrainresp = !oRs.eof;
-oRs.close();
-
-// We gaan er vanuit dat verantw2 niet is gezet als nergens verantw1 wordt getoond.
-// Als dat wel zo is, jammer maar dan tonen we die niet in de lijst.
-var anyterrainresp2 = false;
-if (anyterrainresp)
-{
-    sql = "SELECT 1"
-        + "  FROM alg_terreinsector"
-        + " WHERE prs_perslid_key_verantw2 IS NOT NULL"
-        + "   AND alg_terreinsector_verwijder IS NULL"
-        + "   AND ROWNUM = 1";
-    oRs = Oracle.Execute(sql);
-    anyterrainresp2 = !oRs.eof;
-    oRs.close();
-}
-
 function fnrowData(oRs)
 {
   var parent_key = oRs("alg_locatie_key").Value;
@@ -60,14 +35,14 @@ function fnrowData(oRs)
 
   function gotoParent(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_locatie_search.asp?locatie_key=" + algData.parent_key + "&autosearch=" + autosearch;
     FcltMgr.openDetail(url, "<%=L("lcl_location")%>");
   }
 
   function terreinEdit(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_terreinsector.asp?mode=viewUpdate&ter_key="+algData.key;
     FcltMgr.openDetail(url, "<%=L("lcl_terra")%>" + ' ' + algData.oms);
   }
@@ -104,9 +79,7 @@ function terrein_list(pautfunction, params)
   var dis_key = params.dis_key;
   var loc_key = params.loc_key;
   var ter_code = params.ter_code;
-  var verantw_key = params.verantw_key;
   var ter_func_key = params.ter_func_key;
-  var expalgincl = params.expalgincl;
 
   function fnrowActionEnabler(oRs) // klopt dit voor terreinsector?
   {
@@ -132,72 +105,60 @@ function terrein_list(pautfunction, params)
   </head>
   <body id="listbody">
 <%
-    var sqln = "SELECT g.alg_terreinsector_key"
-             + "     , g.alg_locatie_key"
-             + "     , l.alg_locatie_omschrijving"
-             + "     , g.alg_terreinsector_naam"
-             + "     , g.alg_terreinsector_omschrijving"
-             + "     , g.alg_terreinsector_code"
-             + "     , g.alg_terreinsector_oppervlak"
-             + "     , g.alg_terreinsector_omtrek"
-             + "     , g.alg_terreinsector_vervaldatum"
-             + "     , (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_srtterreinsector_key"
-             + "     , " + lcl.xsqla('s.alg_srtterreinsec_omschrijving', 's.alg_srtterreinsector_key')
-             + "  FROM alg_v_aanwezigterreinsector g"
-             + "     , alg_locatie l"
-             + "     , alg_srtterreinsector s"
-             + " WHERE l.alg_locatie_key(+) = g.alg_locatie_key"
-             + "   AND s.alg_srtterreinsector_key(+) = g.alg_srtterreinsector_key"
-             + "   AND g.alg_terreinsector_verwijder IS NULL"
+   var sqln = "SELECT   g.alg_terreinsector_key, "
+       + "         g.alg_locatie_key, "
+       + "         l.alg_locatie_omschrijving, "
+       + "         g.alg_terreinsector_naam, "
+       + "         g.alg_terreinsector_omschrijving, "
+       + "         g.alg_terreinsector_code, "
+       + "         g.alg_terreinsector_oppervlak, "
+       + "         g.alg_terreinsector_omtrek, "
+       + "         g.alg_srtterreinsector_key, "
+       + lcl.xsqla('s.alg_srtterreinsec_omschrijving', 's.alg_srtterreinsector_key')
+       + "    FROM alg_v_aanwezigterreinsector g, "
+       + "         alg_locatie l, "
+       + "         alg_srtterreinsector s "
+       + "   WHERE l.alg_locatie_key(+) = g.alg_locatie_key "
+       + "     AND s.alg_srtterreinsector_key(+) = g.alg_srtterreinsector_key "
+       + "     AND g.alg_terreinsector_verwijder IS NULL "
 
-    if ( authparams.ALGreadlevel > -1 )
-    {   // Er is een scope-beperking van kracht
-        sqln += " AND g.alg_locatie_key IN"
-              + " (SELECT alg_locatie_key"
-              + "    FROM fac_v_my_locations"
-              + "   WHERE prs_perslid_key="+user_key
-              + "     AND niveau=" + authparams.ALGreadlevel
-              + " )";
-    }
+   if ( authparams.ALGreadlevel > -1 )
+      {  // Er is een scope-beperking van kracht
+          sqln += " AND g.alg_locatie_key IN "
+               + "(SELECT alg_locatie_key FROM fac_v_my_locations "
+               +   "WHERE prs_perslid_key="+user_key
+               +    " AND niveau=" + authparams.ALGreadlevel + ")";
+      }
 
-    sqln += getKenmerkSql("ALG", "g.alg_terreinsector_key");
+      sqln += getKenmerkSql("ALG", "g.alg_terreinsector_key");
 
-    if (loc_key)
-    {
-        sqln += " AND g.alg_locatie_key = " + loc_key;
-    }
-    else if (dis_key)
+   if (loc_key)
+      {
+      sqln += " AND g.alg_locatie_key = " + loc_key;
+      }
+      else if (dis_key)
         sqln += " AND l.alg_district_key = " + dis_key;
-    else if (reg_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)
-    {
-        sqln += " AND g.alg_srtterreinsector_key = " + ter_func_key;
-    }
+   if (ter_func_key)
+      {
+       sqln += " AND g.alg_srtterreinsector_key = " + ter_func_key;
+      }
 
-    if (ter_code)
-    {
-        sqln += " AND UPPER(g.alg_terreinsector_code) LIKE " + safe.quoted_sql_wild("%" + ter_code + "%");
-    }
+   if (ter_code)
+     {
+     sqln += " AND UPPER(g.alg_terreinsector_code) LIKE " + safe.quoted_sql_wild("%" + ter_code + "%");
+     }
 
-    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_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";
 
-    if (canAdd)
-    {
+      if (canAdd)
+        {
         addButton = [{ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" }]
-    }
+        }
 
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "alg_terreinsector_key",
@@ -218,15 +179,8 @@ function terrein_list(pautfunction, params)
     rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_code"), content: "alg_terreinsector_code"}));
     rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_name"), content: "alg_terreinsector_naam"}));
     rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_sort"), content: "alg_srtterreinsec_omschrijving"}));
-    if (anyterrainresp)
-    {
-        rst.addColumn(new Column({caption: L("lcl_alg_verantw"), content: "perslid_resp"}));
-        if (anyterrainresp2)
-            rst.addColumn(new Column({caption: L("lcl_alg_verantw2"), content: "perslid_resp2", combine: true}));
-    }
     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

@@ -8,7 +8,6 @@
 <!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
-<!-- #include file="../Shared/persoonselector.inc" -->
 <!-- #include file="alg.inc" -->
 
 <%
@@ -17,7 +16,6 @@ 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 verantw_key  = getQParamInt("verantw",  -1); // Terrein verantwoordelijke
 var autosearch = getQParamInt("autosearch", 0) == 1;
 var authparams = alg.checkAutorisation();
 
@@ -26,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">
@@ -77,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 -->
 
@@ -95,26 +82,13 @@ var authparams = alg.checkAutorisation();
                   <td class="label"><label for="descr"><%=L("lcl_estate_terreinsector_man_code")%>:</label></td>
                   <td><input type="text" class="fldsrch" name="descr" value="<%=safe.htmlattr(vak_code)%>"></td>
                 </tr>
-
-              <!-- Terrein beheerder -->
-<%            // Dit veld is alleen zichtbaar indien er minimaal <20><>n terreinbeheerder geconfigureerd is (suppressNoValues).
-              FCLTpersoonselector("verantw",
-                                  "sgVerantw",
-                                  { perslidKey: verantw_key,
-                                    label: L("lcl_alg_ter_verantw"),
-                                    filtercode: "TV", // Terrein Verantwoordelijke
-                                    trclass: "primsearch",
-                                    suppressNoValues: true,
-                                    whenEmpty: L("lcl_search_generic")  // want filter
-                                  });
-%>
               </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>
@@ -130,4 +104,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_terreinsector_search_list.asp

@@ -26,8 +26,6 @@ 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 verantw_key = getQParamInt("verantw", -1); // Terrein verantwoordelijke
-var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen terreinen
 var ter_func_key = getQParamInt("srt", -1);
 
 terrein_list ( "*",
@@ -37,10 +35,8 @@ terrein_list ( "*",
                  dis_key: (dis_key != -1? dis_key : null),
                  loc_key: (loc_key != -1? loc_key : null),
                  ter_code: (ter_code != ""? ter_code : null),
-                 verantw_key: (verantw_key != -1? verantw_key: null),
                  ter_func_key: (ter_func_key != -1? ter_func_key : null),
-                 noref: (noref != -1? noref : null),
-                 expalgincl: expalgincl
+                 noref: (noref != -1? noref : null)
               }
              );
-%><% ASPPAGE_END(); %> 
+%>

APPL/ALG/alg_verdieping.asp

@@ -99,4 +99,3 @@ else
 %>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

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" -->
@@ -34,19 +35,19 @@ function fnrowData(oRs)
 
   function gotoDetails(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_ruimte_search.asp?verdieping_key=" + algData.detail_key + "&autosearch=" + autosearch + "&chkgeb=1";
     FcltMgr.openDetail(url, "<%=L("lcl_room")%>");
   }
   function gotoParent(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_gebouw_search.asp?gebouw_key=" + algData.parent_key + "&autosearch=" + autosearch;
     FcltMgr.openDetail(url, "<%=L("lcl_building")%>");
   }
     function verdiepingEdit(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_verdieping.asp?mode=viewUpdate&key=" + algData.key;
     FcltMgr.openDetail(url, "<%=L("lcl_floor")%>" + ' ' + algData.oms);
   }

APPL/ALG/alg_verdieping_search.asp

@@ -25,25 +25,23 @@ 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>
 
@@ -70,8 +68,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>
@@ -87,4 +85,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_verdieping_search_list.asp

@@ -42,4 +42,4 @@ verdiepingen_list ( "*",
                  chkgeb: chkgeb
               }
              );
-%><% ASPPAGE_END(); %> 
+%>

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" -->
 
@@ -36,14 +37,14 @@ FCLTHeader.Requires({ plugins:["jQuery"],
 
   function gotoParent(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
     var url = "appl/ALG/alg_ruimte_search.asp?ruimte_key="+algData.parent_key+"&autosearch="+autosearch;
     FcltMgr.openDetail(url, "<%=L("lcl_room")%>");
   }
 
   function werkplekEdit(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
+    var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
 <% if (S("prs_werkplek_implicit") == 1) { %>
     if (algData.wp_type == 0) // Een vaste. Bewerk de bezetting van de ene persoon erop
     {
@@ -220,14 +221,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 +248,7 @@ function werkplek_list(pautfunction, params)
 
     rst.addColumn(new Column({caption: L("lcl_room"), content: "Samengesteld", nowrap: true}));
     rst.addColumn(new Column({caption: L("lcl_estate_ruimte_man_descr"), content: "alg_ruimte_omschrijving"}));
-    rst.addColumn(new Column({caption: L("lcl_estate_wp_seq"), content: "prs_werkplek_volgnr", datatype: "number"}));
+    rst.addColumn(new Column({caption: L("lcl_estate_wp_seq"), content: "prs_werkplek_volgnr"}));
     if (S("prs_werkplek_implicit")==0)
     {
         rst.addColumn(new Column({caption: L("lcl_workplace"), content: "prs_werkplek_omschrijving" }));

APPL/ALG/alg_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">
@@ -87,4 +87,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_werkplek_search_list.asp

@@ -40,4 +40,4 @@ werkplek_list ( "*",
                  wp_descr: (wp_descr != ""? wp_descr : null)
               }
              );
-%><% ASPPAGE_END(); %> 
+%>

APPL/ALG/alg_wp.asp

@@ -85,4 +85,3 @@ if (wp_key > 0)
 %>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/get_alg_info_ajax.asp

@@ -19,6 +19,7 @@ var JSON_Result = true;
 %>
 
 <!-- #include file="../Shared/common.inc"-->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="./alg.inc" -->
 
 <%
@@ -42,4 +43,3 @@ switch (req_info)
 
 Response.Write(JSON.stringify(result));
 %>
-<% ASPPAGE_END(); %> 

APPL/ALG/get_volgnr_ajax.asp

@@ -14,6 +14,7 @@
 var JSON_Result = true;
 %>
 <!--#include file="../Shared/common.inc"-->
+<!--#include file="../Shared/json2.js" -->
 <%
 
     var room_key = getQParamInt("room_key");
@@ -26,4 +27,4 @@ var JSON_Result = true;
     oRs.Close()
 
     Response.Write(JSON.stringify(result));
-%><% ASPPAGE_END(); %> 
+%>

APPL/ALG/load_kenmerk.asp

@@ -35,4 +35,3 @@ generateFlexKenmerkBlock ({ urole: getQParamSafe("urole"),
                            advanced: getQParam("advanced", 0) == 1 // Geavanceerd
                          });
 %>
-<% ASPPAGE_END(); %> 

APPL/API/api.asp

@@ -24,4 +24,4 @@ var EXPIRED_PASSWORD_OK = true; // performance
 
     __Log("Transferring to: " + API.apidata.file);
     Server.Transfer(API.apidata.file);
-%><% ASPPAGE_END(); %> 
+%>

APPL/API/api.inc

@@ -59,20 +59,15 @@ 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
     {
-        if (oRs("fac_api_options_json").Value)
-            this.apidata.options = JSON.parse(oRs("fac_api_options_json").Value);
+        this.apidata.options = eval("("+oRs("fac_api_options_json").Value+")");
     }
     catch (e)
     {
@@ -81,8 +76,7 @@ function API_func()
     }
     try
     {
-        if (oRs("fac_api_viewmapping_json").Value)
-            this.apidata.viewmapping = JSON.parse(oRs("fac_api_viewmapping_json").Value);
+        this.apidata.viewmapping = eval("("+oRs("fac_api_viewmapping_json").Value+")");
     }
     catch (e)
     {
@@ -133,63 +127,6 @@ function RequestJSON()
     return vraag;
 }
 
-function RequestXML(API)
-{
-    var xvraag;
-    if(Request.TotalBytes > 0)
-    {
-        var lngBytesCount = Request.TotalBytes;
-        xvraag = BytesToStr(Request.BinaryRead(lngBytesCount));
-        if (API.apidata.loglevel)
-            __Log2File(xvraag, API.APIname + "_IN");
-    }
-    __Log("Request body: " + xvraag);
-    try
-    {
-        var inputXML = Server.CreateObject("MSXML2.DOMDocument.6.0");
-        inputXML.loadXML(xvraag); // inputXML.load(Request) zou nog niet vertalen naar Windows-1252
-    }
-    catch (e)
-    {
-        return { error: e.description };
-    }
-    if (inputXML.parseError.errorCode)
-    {
-        return { error: inputXML.parseError.reason + " @ " + inputXML.parseError.line + "." + inputXML.parseError.linepos };
-    }
-    return { xml: inputXML };
-}
-
-// Eventuele input stylesheet is er overheen
-function styledRequestXML(API)
-{
-    var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
-    var parsed = RequestXML(API);
-    if (parsed.error)
-    {
-        __DoLog( "Error loading XML: " + parsed.error, "#ff0000");
-        API.error("Error loading XML: " + parsed.error);
-    }
-
-    if (API.apidata.stylesheet)
-    {
-        var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0");
-        iXsl.resolveExternals = true; // XSL kan includes hebben (MARX#51709)
-        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 = parsed.xml;
-        inputXML.transformNodeToObject(iXsl, xmlReq);
-        if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_TUSSEN");
-    }
-    else
-        var xmlReq = parsed.xml;
-
-    return xmlReq;
-}
-
 function BytesToStr(bytes)
 {
     var stream = Server.CreateObject("ADODB.STREAM");
@@ -200,24 +137,8 @@ function BytesToStr(bytes)
     stream.type = 2; // Text
     stream.charset = "utf-8";
 
-    // Mogelijk was het nog utf-8. Dat is riskant met unicode quotes (FCLT#60591)
-    // Daarom expliciete conversie
-    var win1252Stream = new ActiveXObject("ADODB.Stream");
-    win1252Stream.Open();
-    win1252Stream.CharSet = "Windows-1252"; // het doel
-    stream.copyTo(win1252Stream);
+    var sOut = stream.readtext();
     stream.close;
-
-    win1252Stream.position = 0;
-
-    var ReadBytes = 131072; // optimaal volgens https://docs.microsoft.com/en-us/sql/ado/reference/ado-api/readtext-method?view=sql-server-ver15
-    var sOut = "";
-    while (!win1252Stream.EOS)
-    {
-        sOut = sOut + win1252Stream.ReadText(ReadBytes);
-    }
-    win1252Stream.close;
-
     return sOut;
 }
 

APPL/API/api_SOAP.asp

@@ -40,6 +40,7 @@
 %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/xml_converter.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../api/api.inc" -->
 <%
     Session.Codepage = 65001;
@@ -52,12 +53,10 @@ try
 
     var asJSON = getQParam("json","0")!="0";
 
-    var parsed = RequestXML(API);
-    if (parsed.error)
-    {
-         __DoLog("Error " + parsed.error);
-    }
-    var xmlReq = parsed.xml;
+    var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
+    xmlReq.load(Request);
+
+    if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_IN");
 
     if (xmlReq.documentElement.firstChild.prefix)
         var soapns = xmlReq.documentElement.firstChild.prefix + ":";
@@ -106,7 +105,7 @@ try
             "bestelopdracht": "WEB_BESUSE",
             "afspraak":       "WEB_BEZUSE",
             "contract":       "WEB_CNTUSE",
-            "factuur":        "WEB_EXTFIN",
+            "factuur":        "WEB_FINUSE",
             "deel":           "WEB_INSUSE",
             "melding":        "WEB_MLDUSE",
             "opdracht":       "WEB_MLDUSE",
@@ -234,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)
         {
@@ -301,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");
 
@@ -369,6 +365,4 @@ catch (e)
 {
     API.error(typeof e == "string"? e : e.description);
 }
-
-ASPPAGE_END();
 %>

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,12 +41,8 @@
         ts.Close();
     }
 
-	var parsed = RequestXML(API);
-	if (parsed.error)
-	{
-     	__DoLog("Error " + xmlReq.parseError.reason);
-	}
-	var xmlReq = parsed.xml;
+    var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
+    xmlReq.load(Request);
 
     XML2TEMP(xmlReq.xml, "IN");
 
@@ -141,4 +137,4 @@
     STR2Stream(xml_nodes_dom.xml, stylesheet, Response, mode, srtnotificatie);
 
     Session.Abandon(); // Voor de zekerheid
-%><% ASPPAGE_END(); %> 
+%>

APPL/API/api_algsoap.asp

@@ -24,4 +24,4 @@
     Response.Charset = 'utf-8';
 
     var API = new API_func();
-%><% ASPPAGE_END(); %> 
+%>

APPL/API/api_besordsoap.asp

@@ -33,8 +33,22 @@
     var sql = "-";         // De uiteindelijke update-sql
     var resultcode = -1;   /* Zolang deze -1 is, is het nog goed. Uiteindelijk eindigt het met 0 (als goed). */
     var resulttekst = "";
+    var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
+    if (API.apidata.stylesheet)
+    {
+        var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0");
+        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);
+        inputXML.transformNodeToObject(iXsl, xmlReq);
+    }
+    else
+        xmlReq.load(Request);
 
-    var xmlReq = styledRequestXML(API);
+    if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_TUSSEN");
 
     var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0");
     xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\""))
@@ -356,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);
                     }
@@ -391,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...
@@ -399,7 +412,7 @@
     }
     else
     {
+        Response.ContentType = "text/xml";
         Response.Write(xmlResp.xml)
     }
 %>
-<% ASPPAGE_END(); %> 

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" -->
@@ -30,8 +31,20 @@
     var API = new API_func();
     var tsql = "-";        // Voor tijdelijke statement(s)
     var sql = "-";         // De uiteindelijke insert/update-sql
-
-    var xmlReq = styledRequestXML(API);
+    var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
+    if (API.apidata.stylesheet)
+    {
+        var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0");
+        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);
+        inputXML.transformNodeToObject(iXsl, xmlReq);
+    }
+    else
+        xmlReq.load(Request);
 
     var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0");
     xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\""))
@@ -270,4 +283,3 @@
       Response.Write(xmlResp.xml)
    }
 %>
-<% ASPPAGE_END(); %> 

APPL/API/api_bezsoap.asp

@@ -110,7 +110,7 @@ user.checkAutorisation("WEB_BEZUSE"); // Dit is nog ongeacht de bestelling
 var resultcode = -1;   /* Zolang deze -1 is, is het nog goed. Uiteindelijk eindigt het met 0 (als goed). */
 var resulttekst = "";
 var json_txt = Request.Form;
-var json_data = JSON.parse(json_txt);
+var json_data = eval("(" + json_txt + ")");
 
 
 SaveOneAfspraak(json_data); // The one and only
@@ -289,4 +289,4 @@ xmlResp.appendChild(FCLTElement);
 
 Response.ContentType = "text/xml";
 Response.Write(xmlResp.xml)
-%><% ASPPAGE_END(); %> 
+%>

APPL/API/api_cntsoap.asp

@@ -30,8 +30,8 @@
     var sql = "-";         // De uiteindelijke insert/update-sql
     var resultcode = -1;   /* Zolang deze -1 is, is het nog goed. Uiteindelijk eindigt het met 0 (als goed). */
     var resulttekst = "";
-
-    var xmlReq = styledRequestXML(API);
+    var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
+    xmlReq.load(Request);
 
     var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0");
     xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\""))
@@ -178,4 +178,3 @@ catch (e)
     Response.ContentType = "text/xml";
     Response.Write(xmlResp.xml)
 %>
-<% ASPPAGE_END(); %> 

APPL/API/api_fetchXML.asp

@@ -33,4 +33,4 @@
                         stylesheet: stylesheet});
 
     Session.Abandon(); // Voor de zekerheid
-%><% ASPPAGE_END(); %> 
+%>

APPL/API/api_finsoap.asp

@@ -24,4 +24,4 @@
     Response.Charset = 'utf-8';
 
     var API = new API_func();
-%><% ASPPAGE_END(); %> 
+%>

APPL/API/api_flex.asp

@@ -15,6 +15,7 @@
     THIS_FILE = "appl/api/api_flex.asp";
 %>
 <!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/flexfiles.inc" -->
 <!-- #include file="../api/api.inc" -->
 <%
@@ -41,4 +42,3 @@ __Log(props);
 Response.Write(JSON.stringify(props));
 Response.End;
 %>
-<% ASPPAGE_END(); %> 

APPL/API/api_gen_import.asp

@@ -18,7 +18,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 +40,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 + "/") + "/",
@@ -119,41 +114,11 @@
         }
         oRs.Close();
 
-        // De import database procedure mag in fac_result onder sessionid IMPORT_<importkey)
-        // een aantal naam/waarde records aanmaken die als <naam>waarde</naam> in de xml terecht komen
-        var sql = "SELECT fac_result_naam,"
-                + "       fac_result_waarde"
-                + "  FROM fac_result"
-                + " WHERE fac_result_sessionid = 'IMPORT_{0}'".format(import_key);
-        var oRs = Oracle.Execute(sql);
-        if (!oRs.Eof)
-        {
-           var elementResults = xmlResp.createElement("result");
-            while (!oRs.Eof)
-            {
-                var elementResult = xmlResp.createElement(oRs("fac_result_naam").Value);
-                var elementResultText = xmlResp.createTextNode(oRs("fac_result_waarde").Value);
-                elementResult.appendChild(elementResultText);
-                elementResults.appendChild(elementResult);
-                oRs.moveNext();
-            }
-            oRs.Close();
-            elementDetails.appendChild(elementResults);
-        }
-
         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);
-
-    ASPPAGE_END();
+    Response.Write(xmlResp.xml);
 %>

APPL/API/api_hmail.asp

@@ -16,12 +16,13 @@
     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 authparams = user.checkAutorisation("WEB_FACHML");
 var API = new API_func();
 
 function abortRejectMail(tekst, maillog)
@@ -36,10 +37,8 @@ function abortRejectMail(tekst, maillog)
 }
 function stripHtml(html)
 {
-    html = (html||"");
-    html = stripStyle(html);
     // verwijder html-tags
-    html = html.replace(/(<([^>]+)>)/ig,"");
+    html = (html||"").replace(/(<([^>]+)>)/ig,"");
     // &nbsp; naar spatie
     html = html.replace(/\&nbsp\;/ig, " ");
     //verwijder leading spaces and tabs
@@ -51,89 +50,46 @@ function stripHtml(html)
     return html;
 }
 
-function stripStyle(html)
-{
-    html = (html||"");
-    html = html.replace(/<style>[^<]*<\/style>/igm, "");
-    return html;
-}
-
-function get_XMLval(psessionid, pxml, ptag, pindex)
-{
-    var tag_value = XMLval(pxml, ptag);
-    var sql_ins = "INSERT INTO fac_result"
-                + " (fac_result_sessionid, fac_result_naam, fac_result_waarde)"
-                + " VALUES"
-                + " (" + safe.quoted_sql(psessionid)
-                + " ," + safe.quoted_sql(ptag + (pindex ? "_"+pindex : ""), 30) // Een mail kan meerdere bijlagen bevatten. Voor elke bijlage is er dan een filename en size.
-                + " ," + safe.quoted_sql(tag_value, 4000)
-                + " )";
-    Oracle.Execute(sql_ins);
-    return tag_value;
-}
-
 // puur intern gebruik dus geen stylesheet conversie nodig
-var parsed = RequestXML(API);
-if (parsed.error)
+var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
+xmlReq.load(Request);
+if (xmlReq.parseError.errorCode != 0)
 {
-     abortRejectMail("Error " + parsed.error);
+     abortRejectMail("Error " + xmlReq.parseError.reason);
 }
-var xmlReq = parsed.xml;
 
-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);
-Oracle.Execute(sql);
+if (API.apidata.loglevel)
+    __Log2File(xmlReq.xml, API.APIname + "_IN");
 
-var Subject     = get_XMLval(psession_id, xmlReq, "subject");
-var fromAddr    = get_XMLval(psession_id, xmlReq, "fromaddr"); // "Returns the address that the sender gave in the MAIL FROM SMTP-command."
-var from        = get_XMLval(psession_id, xmlReq, "from");     // "This property returns the content of the From MIME-header of the email."
-var toAddr      = get_XMLval(psession_id, xmlReq, "to");
-var RecipientNr = get_XMLval(psession_id, xmlReq, "RecipientNr"); // 0 voor 1e recipient, soms 1 voor tweede
-var htmlBody    = get_XMLval(psession_id, xmlReq, "htmlbody");
-var Body        = get_XMLval(psession_id, xmlReq, "body");
-var CC          = get_XMLval(psession_id, xmlReq, "CC");
-//htmlBody = stripStyle(htmlBody);
-//Body     = stripStyle(Body);
+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 toAddr   = XMLval(xmlReq, "to");
+var htmlBody = XMLval(xmlReq, "htmlbody");
+var Body     = XMLval(xmlReq, "body");
 
-// functie om velden in fac_result te zetten
+__Log("Subject: "  + Subject);
+__Log("From: "     + fromAddr);
+__Log("FromAddr: " + from);
 __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);
+    abortRejectMail(L("lcl_fac_hmail_unknown_user"), "E-mail user niet ontvankelijk: " + mailuser);
 }
-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)
 {
@@ -146,45 +102,29 @@ if (oRs("fac_email_setting_expire").Value != null)
 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())
     {
-        abortRejectMail(L("lcl_fac_hmail_wrong_sender").format(theFrom), "Foute afzender. Verwacht: " + shouldFrom + ", kreeg: " + theFrom);
+        abortRejectMail(L("lcl_fac_hmail_wrong_sender"), "Foute afzender. Verwacht: " + shouldFrom + ", kreeg: " + theFrom);
     }
 }
 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'
+var path = oRs("fac_email_setting_attachpath").Value;
+if (path && path.substr(0, 1) == "*") // Bijvoorbeeld '*flexfilespath' or '*fg_dwf_path_concept'
 {
     path = S(path.substr(1)) + "/";
 }
 oRs.Close();
 
-var result = { success: true
-             , path: path
-             , attachments: []
-             , 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);
+Oracle.Execute(sql);
 
 if (action) // Bijv "fac.processemail" of "uwva.closeorder-sample"
 {
@@ -196,16 +136,37 @@ if (action) // Bijv "fac.processemail" of "uwva.closeorder-sample"
     {
         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 + ");"
+                                   + user_key + ");"
         + "END;";
     Oracle.Execute(sql);
 
+    sql = "SELECT fac_result_waarde"
+        + "  FROM fac_result"
+        + " WHERE fac_result_naam = 'errormsg'"
+        + "   AND fac_result_sessionid = " + safe.quoted_sql(psession_id);
+    var oRs = Oracle.Execute(sql);
+    if (!oRs.Eof)
+    {
+        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);
+    var oRs = Oracle.Execute(sql);
+    if (!oRs.Eof)
+    {
+       result.path = result.path + oRs("fac_result_waarde").Value;
+    }
+    oRs.Close();
+
     // Nog iets specifieks terug te melden voor de logging?
     sql = "SELECT fac_result_waarde"
         + "  FROM fac_result"
@@ -219,50 +180,12 @@ if (action) // Bijv "fac.processemail" of "uwva.closeorder-sample"
     else
        result.maillog = "E-mail afgehandeld via: " + action;
     oRs.Close();
-
-    sql = "SELECT fac_result_waarde"
-        + "  FROM fac_result"
-        + " WHERE fac_result_naam = 'errormsg'"
-        + "   AND fac_result_sessionid = " + safe.quoted_sql(psession_id);
-    var oRs = Oracle.Execute(sql);
-    if (!oRs.Eof)
-    {
-        abortRejectMail(oRs("fac_result_waarde").Value, result.maillog);
-    }
-    oRs.Close();
-
-    sql = "SELECT fac_result_waarde"
-        + "  FROM fac_result"
-        + " WHERE fac_result_naam = 'kenmerkpath'"
-        + "   AND fac_result_sessionid = " + safe.quoted_sql(psession_id);
-    var oRs = Oracle.Execute(sql);
-    if (!oRs.Eof)
-    {
-       kenmerkpath = oRs("fac_result_waarde").Value;
-       result.path = result.path + kenmerkpath;
-    }
-    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);
@@ -272,8 +195,8 @@ if (result.path)
     var Attachments = xmlReq.getElementsByTagName("attachment");
     for (i=0; i < Attachments.length; i++)
     {
-       var safefilename = safe.filename(XMLval(Attachments[i], "filename", i));
-       var attsize = parseInt(XMLval(Attachments[i], "size", i), 10);
+       var safefilename = safe.filename(XMLval(Attachments[i], "filename"));
+       var attsize = parseInt(XMLval(Attachments[i], "size"), 10);
        if (safefilename == 'tmpl_logo.gif')
        { // Waarschijnlijk een FACILITOR bon gereply'd
          __Log("Bijlage {0} genegeerd.".format(safefilename));
@@ -287,55 +210,8 @@ if (result.path)
          // 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?
-                                 })
-       }
        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,
@@ -343,16 +219,8 @@ 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");
-    }
 }
 
-__Log(result);
 Response.Write(JSON.stringify(result));
 Response.End;
 %>
-<% ASPPAGE_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.
@@ -41,7 +42,22 @@
 
     var tsql = "-";        // Voor tijdelijke statement(s)
     var sql = "-";         // De uiteindelijke insert/update-sql
-    var xmlReq = styledRequestXML(API);
+    var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
+    if (API.apidata.stylesheet)
+    {
+        var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0");
+        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);
+        inputXML.transformNodeToObject(iXsl, xmlReq);
+    }
+    else
+        xmlReq.load(Request);
+
+    if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_TUSSEN");
 
     var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0");
     xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\""))
@@ -242,7 +258,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
@@ -259,4 +274,3 @@
         Response.Write(antwoord);
     }
 %>
-<% ASPPAGE_END(); %> 

APPL/API/api_marknotisent.asp

@@ -1,112 +0,0 @@
-<%@ language = "JavaScript" %>
-<% /*
-     $Revision$
-     $Id$
-
-     File:          api_marknotisent.asp
-     Description:   API om custom notificatie queue te manipuleren
-
-     Parameters:    noti_key een fac_notificatie_key
-                    resultcode als die >= 0 is wordt het bitje 64 van de notificatie gereset
-                    track_text wordt getrackt bij de xmlnode van de notificatie
-     Context:       Wordt door de MARX adapter gebruikt
-     Notes:         Voor notificaties waar bitje 64 van fac_notificatie_status is gezet
-                    Er is een database procedure fac.marknotiassent die min of meer hetzelfde doet
-                    maar (nog) ongebruikt is.
-*/
-    JSON_Result = true;
-    THIS_FILE = "appl/api/api_marknotisent.asp";
-%>
-<!-- #include file="../Shared/common.inc" -->
-<!-- #include file="../api/api.inc" -->
-<%
-
-// TODO: Welke autorisatie is logisch?
-// APIKEY is van een leverancier waarvan de opdracht bijgewerkt gaat worden in AX
-///       Die leverancier moet wijzigrechten op de opdracht (/factuur/melding/contract/xxx) hebben?
-
-// var authparams = user.checkAutorisation("WEB_FACHML");
-var API = new API_func();
-
-var result = { success: true };
-
-var noti_key = getQParamInt("noti_key");
-var resultcode = getQParamInt("resultcode");
-var track_text = getQParam("track_text", "");
-
-var sql = "SELECT fac_notificatie_refkey"
-        + "     , fac_notificatie_status"
-        + "     , fac_notificatie_datum"
-        + "     , fac_notificatie_notbefore"
-        + "     , fac_notificatie_failcount"
-        + "     , fac_srtnotificatie_xmlnode"
-        + "  FROM fac_notificatie fs"
-        + "     , fac_srtnotificatie fsn"
-        + " WHERE fs.fac_srtnotificatie_key = fsn.fac_srtnotificatie_key"
-        + "   AND fs.fac_notificatie_key = " + noti_key;
-var oRs = Oracle.Execute(sql);
-if (oRs.EOF)
-    API.error("Notification key {0} not found".format(noti_key));
-var ref_key = oRs("fac_notificatie_refkey").Value;
-var noti_status = oRs("fac_notificatie_status").Value;
-var xmlnode = oRs("fac_srtnotificatie_xmlnode").Value;
-var noti_datum = new Date(oRs("fac_notificatie_datum").Value);
-var notbefore = new Date(oRs("fac_notificatie_notbefore").Value);
-var failcount = oRs("fac_notificatie_failcount").Value;
-oRs.Close();
-
-if ((noti_status & 64) == 0)
-    API.error("Notification key {0} status {1} does not have bit 64 set".format(noti_key, noti_status));
-
-if (track_text)
-{
-    var trackcode = { "opdracht":   "ORDTRK",
-                      "melding":    "MLDTRK",
-                      "bestelopdr": "BESTRK",
-                      "contract":   "CNTTRK",
-                      "factuur":    "FINTRK"
-                     }[xmlnode];
-    if (!trackcode)
-        API.error("Tracking for xmlnode {0} unknown".format(xmlnode));
-
-    shared.trackaction (trackcode, ref_key, track_text);
-}
-
-if (resultcode >= 0)
-{
-    var sql = "UPDATE fac_notificatie"
-            + "   SET fac_notificatie_status = BITAND (fac_notificatie_status, 255 - 64)"
-            + " WHERE fac_notificatie_key = " + noti_key;
-    Oracle.Execute(sql);
-}
-else
-{
-    failcount ++;
-    // Interval tussen pogingen steeds 10 minuten langer, max 120 minuten
-    var backofminutes = Math.min(S("puo_faildelaymax"), failcount * S("puo_faildelayincrement"));
-    var nextdate = new Date();
-    nextdate.setMinutes(nextdate.getMinutes() + backofminutes);
-    var sql = "UPDATE fac_notificatie"
-            + "   SET fac_notificatie_failcount = " + failcount
-            + "     , fac_notificatie_notbefore = " + nextdate.toSQL(true)
-            + " WHERE fac_notificatie_key = " + noti_key;
-    Oracle.Execute(sql);
-
-    // Let op dat er latere notificaties over dezelfde xmlnode kunnen zijn of kunnen komen
-    // Als je wilt dat ze nooit out-of-order worden verwerkt moet de custom-queue
-    // processor zelf zo slim zijn om ook te stoppen met deze opdracht zodra hij 
-    // *een* notbefore in de toekomst tegenkomt.
-    // Als de aanroeper nog een cursor op fac_v_notifyqueue open heeft staan ziet
-    // die cursor bovenstaande wijziging nog niet!
-
-    result.failcount = failcount;
-    result.nextdate = nextdate;
-    __DoLog("Notification key {0} xmlnode {1} refkey {2} failed {3} time(s) since {4} , delaying until {5}".format(noti_key, xmlnode, ref_key,
-                                                                              failcount, toDateTimeString(noti_datum), toDateTimeString(nextdate)));
-}
-
-__Log(result);
-Response.Write(JSON.stringify(result));
-Response.End;
-%>
-<% ASPPAGE_END(); %>

APPL/API/api_mldsoap.asp

@@ -20,6 +20,8 @@
 <!-- #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" -->
 <%
@@ -33,7 +35,23 @@ var sql = "-";         // De uiteindelijke insert/update-sql
 var resultcode = -1;   /* Zolang deze -1 is, is het nog goed. Uiteindelijk eindigt het met 0 (als goed). */
 var resulttekst = "";
 
-var xmlReq = styledRequestXML(API);
+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);
+    inputXML.transformNodeToObject(iXsl, xmlReq);
+}
+else
+    xmlReq.load(Request);
+
+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\""))
@@ -91,10 +109,8 @@ for (i = 0; i < meldingen.length; i++)
   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_afd      = XMLval(meldingen[i], "afdeling");
   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");
@@ -110,9 +126,9 @@ for (i = 0; i < meldingen.length; i++)
             + "  FROM mld_melding"
             + " WHERE mld_melding_externnr ="+ safe.quoted_sql(ext_id);
      var oRs = Oracle.Execute(tsql);
-     if (oRs("aantal").Value == 1)
+     if (oRs("aantal").value == 1)
      {
-        mld_key = oRs("mld_melding_key").Value;
+        mld_key = oRs("mld_melding_key").value;
         meldaction = "update";
      }
      else
@@ -128,9 +144,9 @@ for (i = 0; i < meldingen.length; i++)
             + "  FROM mld_melding"
             + " WHERE mld_melding_externnr ="+ safe.quoted_sql(ext_id);
      var oRs = Oracle.Execute(tsql);
-     if (oRs("aantal").Value == 1)
+     if (oRs("aantal").value == 1)
      {
-        mld_key = oRs("mld_melding_key").Value;
+        mld_key = oRs("mld_melding_key").value;
      }
   }
 
@@ -159,7 +175,7 @@ for (i = 0; i < meldingen.length; i++)
       var oRs = Oracle.Execute(tsql);
       if (!oRs.eof)
       {
-         voor_key = oRs("prs_perslid_key").Value;
+         voor_key = oRs("prs_perslid_key").value;
       }
     }
     if (voor_email != null && voor_key == -1)
@@ -171,7 +187,7 @@ for (i = 0; i < meldingen.length; i++)
       var oRs = Oracle.Execute(tsql);
       if (!oRs.eof)
       {
-         voor_key = oRs("prs_perslid_key").Value;
+         voor_key = oRs("prs_perslid_key").value;
       }
     }
     if (voor_key == -1)
@@ -211,8 +227,8 @@ for (i = 0; i < meldingen.length; i++)
           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
+            mld_datum = oRs("mld_melding_datum").value;
+            stdmld_key = oRs("mld_stdmelding_key").value; // overwrite de xml-node
           }
           oRs.Close();
 
@@ -243,21 +259,11 @@ for (i = 0; i < meldingen.length; i++)
             fields.push({ dbs: "prs_kostenplaats_key", typ: "key", val: kpn_key, track: L("lcl_mld_inf_Kostenplaats"), foreign: "prs_kostenplaats"});
         }
 
-        if (meld_afd && meld_afd != "")
-        {
-          var afd_key = getAfd(meld_afd);
-          if (afd_key != -1)
-            fields.push({ dbs: "prs_afdeling_key", typ: "key", val: afd_key, track: L("lcl_mld_afdeling"), foreign: "prs_afdeling"});
-        }
-
         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 });
+          fields.push({ dbs: "mld_melding_opmerking",     typ: "varchar",   val: meld_opm,     track: L("lcl_mld_inf_Opmerking"),     len: 4000 });
 
         if (meld_oms)
-          fields.push({ dbs: "mld_melding_omschrijving",  typ: "varchar",   val: meld_oms,       track: L("lcl_mld_inf_Omschrijving"),  len: 4000 });
+          fields.push({ dbs: "mld_melding_omschrijving",  typ: "varchar",   val: meld_oms,     track: L("lcl_mld_inf_Omschrijving"),  len: 4000 });
 
         if (fields.length>0)
         {
@@ -346,7 +352,7 @@ for (i = 0; i < meldingen.length; i++)
         if (!oRs.eof)
         {
           alglevel_ok = alglevel_ok || stdmld_niveau == "L";
-          locatie_key = oRs("alg_locatie_key").Value;
+          locatie_key = oRs("alg_locatie_key").value;
           fields.push({ dbs: "mld_alg_locatie_key", typ: "key", val: locatie_key });
 
           tsql = "SELECT alg_gebouw_key  "
@@ -357,7 +363,7 @@ for (i = 0; i < meldingen.length; i++)
           if (!oRs.eof)
           {
             alglevel_ok = alglevel_ok || stdmld_niveau == "G";
-            plaats_key = oRs("alg_gebouw_key").Value;
+            plaats_key = oRs("alg_gebouw_key").value;
 
             tsql = "SELECT alg_verdieping_key  "
                 + " FROM alg_v_aanwezigverdieping"
@@ -367,7 +373,7 @@ for (i = 0; i < meldingen.length; i++)
             if (!oRs.eof)
             {
               alglevel_ok = alglevel_ok || stdmld_niveau == "V";
-              plaats_key = oRs("alg_verdieping_key").Value;
+              plaats_key = oRs("alg_verdieping_key").value;
 
               tsql = "SELECT alg_ruimte_key  "
                   + " FROM alg_v_aanwezigruimte"
@@ -376,7 +382,7 @@ for (i = 0; i < meldingen.length; i++)
               var oRs = Oracle.Execute(tsql);
               if (!oRs.eof) {
                   alglevel_ok = alglevel_ok || stdmld_niveau == "R";
-                  plaats_key = oRs("alg_ruimte_key").Value;
+                  plaats_key = oRs("alg_ruimte_key").value;
               }
             }
           }
@@ -393,67 +399,30 @@ for (i = 0; i < meldingen.length; i++)
           __DoLog(resulttekst, "#00FF00");
         }
 
-        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();
-
-          // 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;
-
-          var kpn_key = user.afdeling().prs_kostenplaats_key() || -1;
-          if (meld_kpn && meld_kpn != "")
-          {
-            var tempKpn = getKpn(meld_kpn);
-            if (tempKpn != -1)
-              kpn_key = tempKpn;
-          }
-
-          if (kpnverplicht && kpn_key < 0)
-          {
-            resultcode = 6;
-            resulttekst = "Cost centre not found while mandatory";
-          }
-        }
-
-        if (resultcode == -1)
+        var kpn_key = user.afdeling().prs_kostenplaats_key();
+        if (meld_kpn && meld_kpn != "")
         {
-           var afd_key = -1;
-           if (meld_afd && meld_afd != "")
-           {
-             afd_key = getAfd(meld_afd);
-           }
+          var tempKpn = getKpn(meld_kpn);
+          if (tempKpn != -1)
+            kpn_key = tempKpn;
         }
 
-        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: "prs_afdeling_key",           typ: "key",     val: afd_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: 1000 }
-                          ]);
+        fields = fields.concat(
+                        [ { dbs: "mld_melding_key",            typ: "key",     seq: "mld_s_mld_melding_key" },
+                          { dbs: "mld_melding_module",         typ: "varchar", val: "MLD" },
+                          { dbs: "mld_meldbron_key",           typ: "key",     val: 6 }, // system
+                          { dbs: "mld_melding_omschrijving",   typ: "varchar", val: meld_oms, len: 4000 },
+                          { dbs: "prs_kostenplaats_key",       typ: "key",     val: kpn_key },
+                          { dbs: "prs_perslid_key",            typ: "key",     val: perslid_key },
+                          { dbs: "prs_perslid_key_voor",       typ: "key",     val: voor_key },
+                          { dbs: "mld_melding_spoed",          typ: "key",     val: 3 }, // default (frontend) = 3
+                          { dbs: "mld_melding_externnr",       typ: "varchar", val: ext_id, len: 30 }
+                        ]);
 
+        // We weten wat te inserten, nu nog uitvoeren; rechten voldoende afgedekt via MLDUSE-check hierboven?
+
+        if (resultcode == -1)
+        {  // nog steeds geen fouten
           var mldIns = buildInsert("mld_melding", fields, { noValidateToken: true });
           mld_key = mldIns.sequences["mld_melding_key"];
 
@@ -544,43 +513,18 @@ function getKpn(meld_kpn)
   return -1;
 }
 
-function getAfd(meld_afd)
-{
-  if (!meld_afd)
-    return -1;
-
-  var temp_sql = "SELECT prs_afdeling_key"
-               + "  FROM prs_afdeling a"
-               + " WHERE a.prs_afdeling_verwijder IS NULL"
-               + "   AND a.prs_afdeling_upper = " + safe.quoted_sql_upper(meld_afd);
-
-  var oRs = Oracle.Execute(temp_sql);
-  if (!oRs.EoF)
-    return oRs("prs_afdeling_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  "
+    ksql = "SELECT k.mld_kenmerk_key, sk.mld_srtkenmerk_kenmerktype, sk.mld_srtkenmerk_lengte "
          + "  FROM mld_kenmerk k"
          + "     , mld_srtkenmerk sk"
          + "     , mld_stdmelding s"
@@ -588,11 +532,10 @@ function upsertKenmerk(kenmerken, stdmld_key, mld_key)
          + " 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 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 IS NULL                    AND k.mld_kenmerk_niveau = 'A')"
-         + "     OR (k.mld_stdmelding_key = s.mld_stdmelding_key     AND k.mld_kenmerk_niveau = 'S')"
+         + "   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'))";
 
@@ -600,10 +543,9 @@ function upsertKenmerk(kenmerken, stdmld_key, mld_key)
 
     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 kenmerk_key = oRs("mld_kenmerk_key").value;
+      var kenmerk_type = oRs("mld_srtkenmerk_kenmerktype").value;
+      // var kenmerk_lengte = oRs("mld_srtkenmerk_lengte").value; // unsupported yet?
 
       var temp_sql = "SELECT km.mld_kenmerkmelding_key "
                    + "  FROM mld_kenmerkmelding km "
@@ -613,45 +555,24 @@ function upsertKenmerk(kenmerken, stdmld_key, mld_key)
 
       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);
+            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
           {
-            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);
-            }
+            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
@@ -664,7 +585,6 @@ function upsertKenmerk(kenmerken, stdmld_key, mld_key)
             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)
             {
@@ -678,31 +598,7 @@ function upsertKenmerk(kenmerken, stdmld_key, mld_key)
               {
                 __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);
-
+                encodedString2File(params.AttachPath + SafeName, Attachment, "bin.hex");
                 __Log("Done saving: " + params.AttachPath + SafeName);
               }
             }
@@ -716,7 +612,6 @@ function upsertKenmerk(kenmerken, stdmld_key, mld_key)
 
 xmlResp.appendChild(FCLTElement);
 
-Response.ContentType = "text/xml";
 if (API.apidata.stylesheet)
 {
   // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
@@ -724,7 +619,7 @@ if (API.apidata.stylesheet)
 }
 else
 {
+  Response.ContentType = "text/xml";
   Response.Write(xmlResp.xml)
 }
 %>
-<% ASPPAGE_END(); %> 

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;
@@ -168,4 +167,4 @@ catch (e)
 {
     API.error(typeof e == "string"? e : "API_error: " + e.description);
 }
-%><% ASPPAGE_END(); %> 
+%>

APPL/API/api_prssoap.asp

@@ -24,4 +24,4 @@
     Response.Charset = 'utf-8';
 
     var API = new API_func();
-%><% ASPPAGE_END(); %> 
+%>