FSN#52706 revert, verkeerde branch

svn path=/Website/branches/v2016.3/; revision=37444

APPL/ALG/alg.inc

@@ -99,6 +99,13 @@ alg = {
 
                 var autfunctionMAN = "WEB_ALGMAN";
                 var autfunctionUSE = "WEB_ALGUSE";
+
+                // Met ALG* bepaal je wat je ziet (Read).
+                rresult.readman  = rresult.canRead (autfunctionMAN);
+                if (onrgoedlvl != "T")
+                  rresult.readuse  = rresult.canRead (autfunctionUSE);
+
+                // Met RUI* en TER* bepaal je wat je kunt wijzigen (Write).
                 switch (onrgoedlvl)
                 {
                     case "T": autfunctionMAN = "WEB_TERMAN";
@@ -107,15 +114,10 @@ alg = {
                               autfunctionUSE = "WEB_RUIUSE";
                               break;
                 }
-
-                // Met ALG* bepaal je wat je ziet (Read).
-                rresult.readman  = rresult.canRead (autfunctionMAN);
-                rresult.readuse = rresult.canRead (autfunctionUSE);
-                // Met RUI* en TER* bepaal je wat je kunt wijzigen (Write).
-                rresult.readmgt = rresult.canRead("WEB_ALGMGT");
-                rresult.writemgt = rresult.canWrite("WEB_ALGMGT");
                 rresult.writeman = rresult.canWrite(autfunctionMAN);
-                rresult.writeuse = rresult.canWrite(autfunctionUSE);
+
+                if (onrgoedlvl != "T")
+                  rresult.writeuse = rresult.canWrite(autfunctionUSE);
             }
             else // iets meer werk
             {
@@ -137,7 +139,7 @@ alg = {
                                 + "WHERE prs_perslid_key = " + user_key
                                 + " AND alg_district_key = " + alg_key;
                             break;
-                    case "E":
+                    case "RG":
                             sql = "SELECT MAX(niveau) FROM fac_v_my_regions "
                                 + "WHERE prs_perslid_key = " + user_key
                                 + " AND alg_regio_key = " + alg_key;
@@ -147,16 +149,11 @@ alg = {
                 var level = (oRs(0).Value==null)?-1:oRs(0).Value;
                 oRs.Close();
 
-                rresult.readmgt = rresult.authparams("WEB_ALGMGT").ALGreadlevel <= level;
-                rresult.writemgt = rresult.authparams("WEB_ALGMGT").ALGwritelevel <= level;
                 rresult.readman = rresult.authparams("WEB_ALGMAN").ALGreadlevel <= level;
                 rresult.writeman = rresult.authparams("WEB_ALGMAN").ALGwritelevel <= level;
                 rresult.readuse = rresult.authparams("WEB_ALGUSE").ALGreadlevel <= level;
                 rresult.writeuse = rresult.authparams("WEB_ALGUSE").ALGwritelevel <= level;
             }
-            rresult.canCndAggr = rresult.writeuse;
-            rresult.canReadNotes = (rresult.readuse || rresult.readman);
-            rresult.canWriteNotes = rresult.canReadNotes;
             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"
@@ -295,7 +289,6 @@ alg = {
                   + "     , g.alg_gebouw_opmerking"
                   + "     , g.alg_gebouw_ordernr"
                   + "     , g.alg_gebouw_bez"
-                  + "     , g.alg_gebouw_mld"
                   + "     , g.alg_locatie_key"
                   + "     , k.prs_kostenplaats_module"
                   + "     , " + S("prs_kpn_string") + " kpstring"
@@ -303,7 +296,6 @@ alg = {
                   + "     , p.prs_perslid_key"
                   + "     , COALESCE(g.alg_gebouw_beginuur, -1) alg_gebouw_beginuur"
                   + "     , COALESCE(g.alg_gebouw_einduur, -1) alg_gebouw_einduur"
-                  + "     , mld_vrije_dagen_id"
                   + "  FROM alg_gebouw g"
                   + "     , prs_kostenplaats k"
                   + "     , prs_perslid p"
@@ -317,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,
@@ -328,34 +317,16 @@ alg = {
                        alg_gebouw_opmerking: oRs("alg_gebouw_opmerking").Value,
                        alg_gebouw_ordernr: oRs("alg_gebouw_ordernr").Value,
                        alg_gebouw_bez: oRs("alg_gebouw_bez").Value == "1",
-                       alg_gebouw_mld: oRs("alg_gebouw_mld").Value == "1",
                        alg_locatie_key: oRs("alg_locatie_key").Value,
                        kostenplaats_omschrijving: oRs("kpstring").Value,
                        kostenplaats_module: oRs("prs_kostenplaats_module").Value,
                        kostenplaats_budgethouder_key: oRs("prs_perslid_key").Value,
                        kostenplaats_budgethouder: oRs("budgethouder").Value,
                        gebouw_beginuur: oRs("alg_gebouw_beginuur").Value,
-                       gebouw_einduur: oRs("alg_gebouw_einduur").Value,
-                       vrije_dagen: {id: oRs("mld_vrije_dagen_id").Value}
+                       gebouw_einduur: oRs("alg_gebouw_einduur").Value
                      };
           }
           oRs.Close();
-          if (result.vrije_dagen.id && result.vrije_dagen.id.toUpperCase() != "DEFAULT")
-          {
-            var vrije_dagen_alt = [];
-            var sql = "SELECT mld_vrije_dagen_datum"
-                    + "  FROM mld_vrije_dagen"
-                    + " WHERE mld_vrije_dagen_id = " + safe.quoted_sql(result.vrije_dagen.id);
-            var oRs = Oracle.Execute(sql);
-            while (!oRs.eof)
-            {
-              vrije_dagen_alt.push((new Date(oRs("mld_vrije_dagen_datum").Value)).getTime());
-              oRs.MoveNext();
-            }
-            oRs.Close();
-            if (vrije_dagen_alt.length)
-              result.vrije_dagen.alt = vrije_dagen_alt;
-          }
 
           return result;
         },
@@ -418,162 +389,33 @@ alg = {
 
             return aresult;
           },
-
+          
         calc_algm2:  function _calc_algm2(alg_key, lvl)
-        {
-          var sql = "SELECT SUM (alg_ruimte_bruto_vloeropp) opp1, "
-                  + "       MAX(alg_verdieping_bruto_vloeropp) opp_bruto, "
-                  + "       SUM (alg_ruimte_opp_alt1) opp2, "
-                  + "       SUM (alg_ruimte_opp_alt2) opp3 "
-                  + "  FROM alg_v_aanwezigruimte r, alg_verdieping v "
-                  + " WHERE v.alg_verdieping_key = r.alg_verdieping_key(+)";
-
-          if (lvl == "G") {
-            sql += "   AND alg_gebouw_key = " + alg_key
-          } else if (lvl == "V") {
-            sql += "   AND v.alg_verdieping_key = " + alg_key
+        {                  
+          var sql = "SELECT   SUM (alg_ruimte_bruto_vloeropp) opp1, "
+                  + "         SUM (alg_ruimte_opp_alt1) opp2, "
+                  + "         SUM (alg_ruimte_opp_alt2) opp3 "
+                  + "  FROM   alg_ruimte r, alg_verdieping v "
+                  + " WHERE   v.alg_verdieping_key = r.alg_verdieping_key "
+                  + "         AND r.alg_ruimte_verwijder IS NULL";
+              
+          if (lvl == "G")
+          {
+            sql += " AND alg_gebouw_key = " + alg_key;
           }
-          sql += " GROUP BY v.alg_verdieping_key";
-
-          if (lvl == "G") {
-            sql = "SELECT SUM(opp1) opp1"
-                + "     , SUM(opp_bruto) opp_floors"
-                + "     , SUM(opp2) opp2"
-                + "     , SUM(opp3) opp3"
-                + "  FROM (" + sql + ")";
+          
+          if (lvl == "V") 
+          {   
+            sql += " AND r.alg_verdieping_key = " + alg_key;
           }
+            
           var oRs = Oracle.Execute(sql);
-
-          var algm2 = { opprooms: oRs("opp1").Value, oppalt1: oRs("opp2").Value, oppalt2: oRs("opp3").Value }
-
-          if (lvl == "V") {
-            algm2.oppfloor = oRs("opp_bruto").Value;
-          } else if (lvl == "G") {
-            algm2.oppfloors = oRs("opp_floors").Value;
-          }
+          
+          var algm2 = { oppbruto: oRs("opp1").Value, oppalt1: oRs("opp2").Value, oppalt2: oRs("opp3").Value } 
 
           oRs.Close();
-
-          return algm2;
-        },
-
-        alg_onroerendgoed_flex_params: function(p_niveau, p_inlijst)
-        {
-          var sql = "SELECT DISTINCT " + lcl.xsqla("k.alg_kenmerk_omschrijving", "k.alg_kenmerk_key")
-                  + "     , k.alg_kenmerk_kenmerktype"
-                  + "  FROM alg_kenmerk k"
-                  + " WHERE (BITAND(alg_kenmerk_inlijst, " + (p_inlijst? p_inlijst : 1) + ") = " + (p_inlijst? p_inlijst : 1) + ")"
-                  + "   AND (BITAND(alg_kenmerk_systeem, 4) = 0 OR k.alg_kenmerk_systeem IS NULL)"
-                  + "   AND k.alg_kenmerk_niveau = " + safe.quoted_sql_upper(p_niveau)
-                  + "   AND k.alg_kenmerk_verwijder IS NULL";
-          var oRs = Oracle.Execute(sql);
-          var v_flexParams = { anyflex: !oRs.eof};
-
-          if (v_flexParams.anyflex)
-          {
-            var multiflex = false;
-            v_flexParams.bijlageflex = (oRs("alg_kenmerk_kenmerktype").Value == "M");
-            v_flexParams.flexlabel = oRs("alg_kenmerk_omschrijving").Value;
-            oRs.MoveNext();
-            if (!oRs.eof)
-            {
-              multiflex = true;
-              v_flexParams.flexlabel = L("lcl_flexlist_alg_" + p_niveau.toLowerCase());
-              while (!oRs.eof)
-              {
-                if (oRs("alg_kenmerk_kenmerktype").Value == "M")
-                  v_flexParams.bijlageflex = true;
-                oRs.MoveNext();
-              }
-            }
-          }
-          oRs.Close();
-
-          var onrgoed_fld = "";
-          switch (p_niveau)
-          {
-            case "E": onrgoed_fld = "e.alg_regio_key"; break;
-            case "D": onrgoed_fld = "d.alg_district_key"; break;
-            case "L": onrgoed_fld = "l.alg_locatie_key"; break;
-            case "T": onrgoed_fld = "g.alg_terreinsector_key"; break;
-            case "G": onrgoed_fld = "g.alg_gebouw_key"; break;
-            case "V": onrgoed_fld = "v.alg_verdieping_key"; break;
-            case "R": onrgoed_fld = "r.alg_ruimte_key"; break;
-          }
-          v_flexParams.sql = (v_flexParams.anyflex
-                             ? ", (SELECT LISTAGG(" + (multiflex
-                                                       ? lcl.xsql("k.alg_kenmerk_omschrijving", "k.alg_kenmerk_key") + " || ':' || chr(160) || "
-                                                       : "")
-                               + "                 CASE WHEN k.alg_kenmerk_kenmerktype = 'R' OR k.alg_kenmerk_kenmerktype = 'r' OR k.alg_kenmerk_kenmerktype = 'S'"
-                               + "                      THEN flx.getdomeinwaarde(k.fac_kenmerkdomein_key, km.alg_onrgoedkenmerk_waarde)"
-                               + "                      WHEN (  (   k.alg_kenmerk_kenmerktype = 'N'"
-                               + "                              AND k.alg_kenmerk_lengte = 1"
-                               + "                              AND k.alg_kenmerk_nmin = 0"
-                               + "                              AND k.alg_kenmerk_nmax = 1"
-                               + "                              AND (k.alg_kenmerk_dec = 0 OR k.alg_kenmerk_dec IS NULL)"
-                               + "                              )"
-                               + "                           OR (k.alg_kenmerk_kenmerktype = 'V')"
-                               + "                           )"
-                               + "                      THEN DECODE( km.alg_onrgoedkenmerk_waarde"
-                               + "                                 , 0, " + safe.qL("lcl_check_0")
-                               + "                                 , 1, " + safe.qL("lcl_check_1")
-                               + "                                 , km.alg_onrgoedkenmerk_waarde"
-                               + "                                 )"
-                               + "                      ELSE km.alg_onrgoedkenmerk_waarde"
-                               + "                 END"
-                               + "               , CHR(13)"
-                               + "               )"
-                               + "        WITHIN GROUP (ORDER BY k.alg_kenmerk_volgnr)"
-                               + "   FROM alg_kenmerk k"
-                               + "      , alg_onrgoedkenmerk km"
-                               + "  WHERE km.alg_onrgoed_key = " + onrgoed_fld
-                               + "    AND km.alg_onrgoed_niveau = " + safe.quoted_sql_upper(p_niveau)
-                               + "    AND k.alg_kenmerk_key = km.alg_kenmerk_key"
-                               + "    AND (BITAND(k.alg_kenmerk_inlijst, " + (p_inlijst? p_inlijst : 1) + ") = " + (p_inlijst? p_inlijst : 1) + ")"
-                               + "    AND (BITAND(k.alg_kenmerk_systeem, 4) = 0 OR k.alg_kenmerk_systeem IS NULL)" //  -- niet als vertrouwelijk
-                               + "    AND k.alg_kenmerk_verwijder IS NULL"
-                               + "    AND km.alg_onrgoedkenmerk_verwijder IS NULL"
-                               + ") algflex"
-                             : ""
-                             )
-          return v_flexParams;
-        },
-
-        alg_onroerendgoed_flex_bijlagen: function(p_niveau, p_alg_key, p_inlijst)
-        {
-          var bijlagen_aantal = 0;
-          var bijlagen_oms = "";
-          var bijlagen_lijst = [];
-          var sql_k = "SELECT k.alg_kenmerk_key"
-                    + "     , " + lcl.xsqla("k.alg_kenmerk_omschrijving", "k.alg_kenmerk_key")
-                    + "  FROM alg_kenmerk k"
-                    + " WHERE BITAND(k.alg_kenmerk_inlijst, " + (p_inlijst? p_inlijst : 1) + ") = " + (p_inlijst? p_inlijst : 1)
-                    + "   AND k.alg_kenmerk_verwijder IS NULL"
-                    + "   AND k.alg_kenmerk_kenmerktype= 'M'"
-                    + "   AND k.alg_kenmerk_niveau = " + safe.quoted_sql_upper(p_niveau);
-          var oRs_k = Oracle.Execute(sql_k);
-          while (!oRs_k.eof)
-          {
-            var kenmerk_key = oRs_k("alg_kenmerk_key").Value;
-            var bijlagen_oms = oRs_k("alg_kenmerk_omschrijving").Value;
-            var bestanden = flexProps("ALG", p_alg_key, kenmerk_key, "A", {getFiles: true});
-            var km_aantal = bestanden.files.length;
-            for (var i=0; i<km_aantal; i++)
-            {
-              bijlagen_lijst.push(bestanden.files[i].name);
-            }
-            bijlagen_aantal += km_aantal;
-
-            oRs_k.MoveNext();
-          }
-          oRs_k.Close();
-
-          return ( bijlagen_aantal > 0
-                 ?  "<span title='" +  safe.htmlattr(bijlagen_lijst.join("\n"))  + "'>"
-                    + safe.html(bijlagen_oms) + ": " + bijlagen_aantal
-                    + "</span>"
-                 : ""
-                 );
+                
+          return algm2;  
         }
-  }
+  }        
 %>

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

APPL/ALG/alg_district.asp

@@ -1,10 +1,17 @@
 <%@language = "javascript" %>
-<%
+<%  // testing: bes_key=1251054
+
 /*  $Revision$
     $Id$
 
     File:           alg_district.asp
-    Description:    Maintain district
+    Status:
+    Description:
+
+    Parameters:
+
+    Context:
+    Note:
 
 */ %>
 <!--#include file="../Shared/common.inc" -->
@@ -17,7 +24,7 @@ var dis_key = getQParamInt("key", -1);
 
 if (dis_key > 0)
 {
-  sql = " SELECT alg_district_omschrijving "
+  sql = " select alg_district_omschrijving "
       + "  FROM alg_district "
       + "  WHERE alg_district_key = " + dis_key;
 
@@ -54,41 +61,22 @@ else
                 FcltMgr.closeDetail(window, { close: true})
               }
               if (!params.keepForm)
-                  $("#algframe")[0].src = "alg_show_district.asp?dis_key=<%=dis_key%>";
+                  $("#algFrame")[0].src = "alg_show_district.asp?dis_key=<%=dis_key%>";
           <% } %>
       }
     </script>
   </head>
 
   <body>
-<%
-    PAGE_START();
-    if (dis_key == -1)
+<%  if (dis_key == -1)
       var page="alg_edit_district.asp"; // Maak een nieuw
     else
       var page="alg_show_district.asp";
     page += "?dis_key="+dis_key;
 
-    IFRAMER("algframe", page, { title: L("lcl_alg_district_frame"),
+    IFRAMER("algFrame", page, { title: L("lcl_alg_district_frame"),
+                                initHeight: "450px",
                                 FcltClose: "algClose" } );
-
-    if (dis_key > -1)
-    {
-      page0 = "../alg/alg_locatie_search_list.asp?districtkey="+dis_key;
-      IFRAMER("alglocatieframe", page0, { icon: "fa-list" } );
-
-      var autfunction = ["WEB_ALGUSE", "WEB_ALGMAN"];
-      var authparams = user.checkAutorisation(autfunction, true);
-      if (authparams && authparams.ALGreadlevel <= 1 && authparams.PRSreadlevel < 9)
-      {
-        // tracking naar subframe :-)
-        page1 = protectQS.create("../shared/status_info.asp?dis_key=" + dis_key);
-        IFRAMER("alghistoryframe", page1, { icon: "fa-list", title: L("lcl_tracking")} );
-      }
-    }
-
-    PAGE_END();
 %>
   </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" -->
@@ -16,27 +17,39 @@
 <%
 FCLTHeader.Requires({ plugins:["jQuery"] });
 
+function fnrowData(oRs)
+{
+  var parent_key = oRs("alg_regio_key").value;
+  var detail_key = oRs("alg_district_key").value;
+  var key        = oRs("alg_district_key").value;
+  var oms        = oRs("alg_district_omschrijving").value;
+
+  var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
+
+  return JSON.stringify(data);
+}
+
 %>
 <script type="text/javascript">
   var autosearch = 1; // automatisch laden van resultaat op search pagina.
 
   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"));
+    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"));
+    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);
+    FcltMgr.openDetail(url, "<%=L("lcl_district")%>" + ' ' + algData.oms);
   }
 
   function doDelete(rowArray, isMulti)
@@ -69,6 +82,23 @@ function district_list(pautfunction, params)
 
   var reg_key = params.reg_key;
   var dis_key = params.dis_key;
+
+  function fnrowActionEnabler(oRs)
+  {
+      var eDelete = false;
+      if (alg.canWriteDistrict(oRs("alg_district_key").value, authparams.mALGwritelevel))
+          eDelete = true;
+      return ({eDelete: eDelete})
+  }
+
+  function fnrowFlexParams(oRs)
+  {
+    var dis_key = oRs("alg_district_key").Value;
+    var this_alg = alg.func_enabled(dis_key, "D");
+
+    var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
+    return flexParams;
+  }
 %>
   <html>
     <head>
@@ -76,16 +106,15 @@ function district_list(pautfunction, params)
     </head>
     <body id="listbody">
 <%
-  var flexParams = alg.alg_onroerendgoed_flex_params("D");
-  var sqln = "SELECT d.alg_district_key"
-         + "       , d.alg_regio_key"
-         + "       , d.alg_district_omschrijving"
-         + "       , r.alg_regio_omschrijving"
-         +       flexParams.sql
-         + "    FROM alg_district d"
-         + "       , alg_regio r"
-         + "   WHERE r.alg_regio_key = d.alg_regio_key"
-         + "     AND d.alg_district_verwijder IS NULL";
+
+  var sqln = "SELECT   d.alg_district_key, "
+         + "         d.alg_regio_key, "
+         + "         d.alg_district_omschrijving, "
+         + "         r.alg_regio_omschrijving "
+         + "    FROM alg_district d, "
+         + "         alg_regio r "
+         + "   WHERE r.alg_regio_key = d.alg_regio_key "
+         + "         AND d.alg_district_verwijder IS NULL ";
 
     if ( authparams.ALGreadlevel > -1 )
     {  // Er is een scope-beperking van kracht
@@ -102,11 +131,6 @@ function district_list(pautfunction, params)
       sqln += " AND d.alg_district_key = " + dis_key;
       }
 
-   if (params.distr_descr)
-      {
-        sqln += " AND UPPER(d.alg_district_omschrijving) LIKE " + safe.quoted_sql_wild(params.distr_descr + "%");
-      }
-
    else if (reg_key)
       {
       sqln += " AND d.alg_regio_key = " + reg_key;
@@ -118,53 +142,9 @@ function district_list(pautfunction, params)
 
     if (canAdd)
       {
-        addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }]
+        addButton = [{ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" }]
       }
 
-    /**********************************
-    * Callback functies ResultsetTable
-     *********************************/
-    function fnrowData(oRs)
-    {
-      var parent_key = oRs("alg_regio_key").value;
-      var detail_key = oRs("alg_district_key").value;
-      var key        = oRs("alg_district_key").value;
-      var oms        = oRs("alg_district_omschrijving").value;
-      var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
-      return JSON.stringify(data);
-    }
-
-    function fnrowActionEnabler(oRs)
-    {
-      var eDelete = false;
-      if (alg.canWriteDistrict(oRs("alg_district_key").value, authparams.mALGwritelevel))
-          eDelete = true;
-      return ({eDelete: eDelete})
-    }
-
-    function fnrowFlexParams(oRs)
-    {
-      var dis_key = oRs("alg_district_key").Value;
-      var this_alg = alg.func_enabled(dis_key, "D");
-      var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
-      return flexParams;
-    }
-
-    function fncolFlexBijlagen(oRs)
-    {
-      var flexval = oRs("algflex").Value;
-      var alg_key = oRs("alg_district_key").Value;
-      var result = ( flexval
-                   ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
-                   : ""
-                   );
-      if (flexParams.bijlageflex)
-      {
-        result += alg.alg_onroerendgoed_flex_bijlagen("D", alg_key);
-      }
-      return result;
-    }
-
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "alg_district_key",
                                    ID: "algtable",
@@ -181,8 +161,6 @@ function district_list(pautfunction, params)
 
     rst.addColumn(new Column({caption: L("lcl_estate_regio_descr"), content: "alg_regio_omschrijving"}));
     rst.addColumn(new Column({caption: L("lcl_estate_district_man_descr"), content: "alg_district_omschrijving", hasActions: true}));
-    if (flexParams.anyflex)
-      rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
     rst.addAction({ action: "districtEdit", caption: L("lcl_edit"), isDefault:  true});
     rst.addAction({ action: "doDelete", caption: L("lcl_delete"), enabler: "eDelete", multi: true, multiOnce: true});
@@ -194,3 +172,4 @@ function district_list(pautfunction, params)
 </body>
 </html>
 <%}%>
+

APPL/ALG/alg_district_search.asp

@@ -15,7 +15,6 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"] });
 var regio_key = getQParamInt("regio_key", -1);
 var district_key = getQParamInt("district_key", -1);
 var autosearch = getQParamInt("autosearch", 0) == 1;
-var alg_startlevel = getQParamInt("alg_startlevel", 0); // Startlevel van plaatsselector, default Regio
 var authparams = alg.checkAutorisation();
 %>
 
@@ -29,50 +28,46 @@ var authparams = alg.checkAutorisation();
           // Submitten met kenmerken
           doSubmitWithKenmerken();
       }
-        async function myModal(init)
+        function myModal()
         {
           var lvl = "D";
           var key = 0;
           var bld_key = "";
-          var url = "load_kenmerk.asp?disc="
-                                  + "&urole=bo"
-                                  + "&advanced=1"
-                                  + "&hasFilter=1"
-                                  + "&onrgoed_key=" +bld_key
-                                  + "&onrgoed_niveau=" + lvl;
-          var titel = L("lcl_properties");
-          await showKenmerkModal(url, titel, init)
+          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)
         }
-            $(function() {<% if (autosearch) { %> document.forms.u2.submit();<%}%>});
+            $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit();<%}%>});
         </script>
 </head>
   <body id="searchbody">
-    <form name="u2" target="workFrame" action="alg_district_search_list.asp" method="get">
-      <% SEARCH_PAGE_START({ header: L("lcl_filterblok") }); %>
-        <% SEARCH_BLOCK_START();%>
+    <div id="search">
+      <form name="u2" target="workFrame" action="alg_district_search_list.asp" method="get">
+<%     BLOCK_START("searchtable", L("lcl_filterblok"));%>
+          <tr>
+            <td class="searchkolom1">
+              <table><!-- x rijen, 2 kolommen: label + veld -->
 <%
                     FCLTplaatsselector(authparams.ALGreadlevel, {
                                                                   regiokey: regio_key,
                                                                   districtkey: district_key,
-                                                                  startlevel: alg_startlevel, // Regio
-                                                                  eindlevel: 0, // Regio
+                                                                  startlevel: 0, // Regio
+                                                                  eindlevel: 1, // District
                                                                   whenEmpty: L("lcl_search_generic")
                                                                 });
 %>
-              <tr class="primsearch">
-                <td class="label"><label for="distr_descr"><%=L("lcl_estate_district_man_descr")%></label></td>
-                <td><input type="text" class="fld" id="distr_descr" name="distr_descr" value=""></td>
-              </tr>
-          <% SEARCH_BLOCK_END();
-            SIMPLE_BLOCK_START();
-              var buttons = [ {title: L("lcl_overview_list"), action: "doSubmit()", id: "bSearch", importance: 1, icon: "fa-clipboard-list" }
-                            , {title: L("lcl_shared_advanced"), action: "myModal()", id: "bAdvanced", importance: 3, icon: "fa-filter" }
-                            ];
-              CreateButtons(buttons, { entersubmit: true, showIcons: true });
-            SIMPLE_BLOCK_END();
-%>
-      <% SEARCH_PAGE_END(); %>
+              </table>
+            </td><!-- end column 1 -->
+            <td class="searchkolom2">
+            </td><!-- end column 1 -->
+          </tr>
+<%    BLOCK_END();
+  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
+                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
+  CreateButtons(buttons, { entersubmit: true }); %>
     </form>
+
+    </div> <!-- search -->
     <div id="result">
       <iframe width="100%" height="100%"
               src="../Shared/empty.asp"
@@ -83,4 +78,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_district_search_list.asp

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

APPL/ALG/alg_edit_district.asp

@@ -7,6 +7,9 @@
     Description:  edit screen voor districten
     Parameters:   dis_key
 
+    Context:
+    Note:
+
 */ %>
 <!--#include file="../Shared/common.inc" -->
 <!--#include file="../Shared/iface.inc" -->
@@ -23,7 +26,7 @@ var dis_key  = getQParamInt("dis_key");
 var onrgoedlvl = "D";
 
 var this_alg = alg.func_enabled(dis_key, onrgoedlvl);
-user.auth_required_or_abort(this_alg.writeman || (dis_key > 0 && this_alg.writeuse));
+user.auth_required_or_abort(this_alg.readman || this_alg.readuse);
 
 if (dis_key > 0)
 {
@@ -45,11 +48,11 @@ if (dis_key > 0)
    FCLTHeader.Generate();
 %>
 <script>
-    async function alg_submit()
+    function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
 
-        if (!await validateForm("u2"))
+        if (!validateForm("u2"))
             return false;
 
         document.forms.u2.submit();
@@ -62,13 +65,13 @@ if (dis_key > 0)
 </script>
 </head>
 
-<body class="editmode">
-<%SUBFRAME_START();%>
+<body id="editbody">
 <%
-  var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "fa-fclt-save" },
-                   {title: L("lcl_cancel"), action:"alg_cancel()", icon: "fa-fclt-cancel" } ];
+  var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "opslaan.png" },
+                   {title: L("lcl_cancel"), action:"alg_cancel()", icon: "undo.png" } ];
   IFRAMER_HEADER(L("lcl_alg_district_frame"), buttons);
 %>
+<div id="edit">
 <form name="u2"
       action="alg_edit_district_save.asp?dis_key=<%=dis_key%>"
       method="post"
@@ -80,7 +83,7 @@ if (this_alg.writeman)
 else
     manRWFIELD = function (a,b,c,d,e) { ROFIELDTR(b,c,d,e) }; // als geen USE of <self> dan zijn er veel readonly
 
-  BLOCK_START("algInfo", L("lcl_district"), {icon: "fa-map"});
+  BLOCK_START("algInfo", "&nbsp;");
       FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel, {
             districtkey: dis_key,
             startlevel: 0, // Regio
@@ -89,7 +92,7 @@ else
             readonly: !this_alg.writeman
           });
 
-  manRWFIELD("dis_oms",  "fld required", L("lcl_name"),  dis_oms);
+  manRWFIELD("dis_oms",  "fld required", L("lcl_district"),           dis_oms);
 
   BLOCK_END();
 
@@ -97,13 +100,13 @@ generateFlexKenmerkBlock ({
      onrgoed_key    : dis_key,
      onrgoed_niveau : onrgoedlvl,
      reado          : false,
+     flexcolumns    : S("alg_flexcolumns"),
      this_alg       : this_alg
 });
 IFACE.FORM_END();
 %>
 </form>
-<% SUBFRAME_END(); %>
 <iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
+</div>
 </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_district_save.asp

@@ -15,31 +15,27 @@
                       js: []
                     }) %>
 <%
-var dis_key = getQParamInt("dis_key");
-var reg_key = getFParamInt("regiokey", -1);
+var dis_key = getQParamInt( "dis_key" );
 
 var onrgoedlvl = "D";
 var this_alg = alg.func_enabled(dis_key, onrgoedlvl);
-user.auth_required_or_abort(this_alg.writeman || (dis_key > 0 && this_alg.writeuse));
+user.auth_required_or_abort(this_alg.readman || this_alg.readuse);
 
-var fields = [];
-if (this_alg.writeman)
-{
-    fields.push({ dbs: "alg_district_omschrijving", typ: "varchar",  frm: "dis_oms",  track: L("lcl_district")  });
-    if (alg.canWriteRegio(reg_key, this_alg.authparams("WEB_ALGMAN").ALGwritelevel))
-        fields.push({ dbs: "alg_regio_key",         typ: "key",   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"];
@@ -48,30 +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"
-                          + "     , k.fac_functie_key"
-                          + "  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",
@@ -86,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" -->
 
@@ -31,64 +34,44 @@ user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse))
 
 if (bld_key > 0)
 {
-  var sql = " SELECT g.*, alg_locatie_adres, alg_locatie_postcode"
-          + "   FROM alg_gebouw g, alg_locatie l"
-          + "  WHERE g.alg_locatie_key = l.alg_locatie_key"
-          + "    AND alg_gebouw_key = " + bld_key;
+  var sql = " SELECT *"
+          + "   FROM alg_gebouw"
+          + "  WHERE alg_gebouw_key = " + bld_key;
 
   oRs = Oracle.Execute(sql);
   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_adres     = oRs("alg_gebouw_adres").Value;
-  var loc_adres     = oRs("alg_locatie_adres").Value;     // optische default
-  var bld_postcode  = oRs("alg_gebouw_postcode").Value;
-  var loc_postcode  = oRs("alg_locatie_postcode").Value;  // optische default
-  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_mld       = oRs("alg_gebouw_mld").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 actie_grp_key = oRs("bez_actie_groep_key").Value;
-  var kalender_id   = oRs("mld_vrije_dagen_id").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 bld_mld        = 1;
-  var werkdagen      = 1;
-  var toon_telefoon  = 0;
-  var toon_email     = 0;
-  var toon_kenteken  = 0;
-}
+  var werkdagen = 1;
 %>
 
 <html>
@@ -97,14 +80,13 @@ else
    FCLTHeader.Generate();
 %>
     <script>
-      async function alg_submit()
+      function alg_submit()
       {
           document.activeElement.blur(); // trigger laatste onChanges
-          if (!await validateForm("u2"))
+          if (!validateForm("u2"))
               return false;
           document.forms.u2.submit();
       }
-
       function alg_cancel()
       {
           FcltMgr.closeDetail(window, { cancel: true } );
@@ -112,25 +94,25 @@ else
     </script>
   </head>
 
-  <body class="editmode">
-  <% SUBFRAME_START(); %>
+  <body id="editbody">
 <%
-    var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "fa-fclt-save" },
-                     {title: L("lcl_cancel"), action:"alg_cancel()", icon: "fa-fclt-cancel" } ];
+    var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "opslaan.png" },
+                     {title: L("lcl_cancel"), action:"alg_cancel()", icon: "undo.png" } ];
     IFRAMER_HEADER(L("lcl_alg_gebouw_frame"), buttons);
 %>
+    <div id="edit">
       <form name="u2"
             action="alg_edit_gebouw_save.asp?bld_key=<%=bld_key%>"
             method="post"
             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_building"), {icon: "fa-building"});
+        BLOCK_START("algLoc1", "&nbsp;");
         FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel,
                            { gebouwkey: bld_key,
                              startlevel: 2, //Locatie
@@ -138,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 "
@@ -152,40 +133,8 @@ else
                        emptyOption: "",
                        readonly: !this_alg.writeman
                      });
-        manRWFIELD("bld_descr",    "fld",          L("lcl_estate_gebouw_man_descr"),         bld_descr, {maxlength: 60});
-        manRWFIELD("bld_adres",    "fld",          L("lcl_estate_gebouw_man_adres"),         bld_adres, {maxlength: 50, placeholder: loc_adres});
-        manRWFIELD("bld_postcode", "fld",          L("lcl_estate_gebouw_man_postcode"),      bld_postcode, {maxlength: 12, placeholder: loc_postcode});
-        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});
-
-    BLOCK_END();
-
-    BLOCK_START("algLoc2", L("lcl_alg_gebouw_fysiek"), {icon: "fa-ruler-combined"});
-        if (bld_key > 0)
-        {
-          var calcopp = alg.calc_algm2(bld_key, onrgoedlvl);
-          ROFIELDTR("fld", L("lcl_estate_gebouw_floors_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppfloors, {suppressEmpty: true, datatype: "float"});
-          ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.opprooms, {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"), {icon: "fa-clipboard"});
-        FCLTcalendar("vervaldatum",
-                     { datum: vervaldatum,
-                       initEmpty: vervaldatum==null,
-                       label: L("lcl_alg_vervaldatum"),
-                       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});
         FCLTkostenplaatsselector(  "prs_kstpl",
                                    "prs_kstpl",
                                    user_key,
@@ -195,26 +144,7 @@ else
                                    readonly: !this_alg.writeman
                                   });
         manRWFIELD("bld_ordrnr",  "fld",          L("lcl_estate_gebouw_ordernr"),        bld_ordrnr, {maxlength: 30});
-        FCLTpersoonselector("verantw",
-                            "sgVerantw",
-                            { perslidKey: verantw_key,
-                              label: L("lcl_alg_verantw"),
-                              readonly: !this_alg.writeman,
-                              autlevel: this_alg.authparams("WEB_ALGMAN") && this_alg.authparams("WEB_ALGMAN").PRSwritelevel
-                            });
-        FCLTpersoonselector("verantw2",
-                            "sgVerantw2",
-                            { perslidKey: verantw_key2,
-                              label: L("lcl_alg_verantw2"),
-                              readonly: !this_alg.writeman,
-                              autlevel: this_alg.authparams("WEB_ALGMAN") && this_alg.authparams("WEB_ALGMAN").PRSwritelevel
-                            });
-        manRWFIELD("bld_email",  "fld",     L("lcl_alg_gebouw_email"),       bld_email, {maxlength: 200});
-        FILEPICKERTR("bld_image", L("lcl_alg_gebouw_image"), bld_image, { "key": bld_key, "module": "ALGPHG", "readonly": !this_alg.writeman });
-    BLOCK_END();
-
-    BLOCK_START("algLoc4", L("lcl_alg_gebouw_facilitair"), {icon: "fa-users-cog"});
-	        sql = "SELECT mld_dienstniveau_key"
+        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") + ")";
@@ -223,27 +153,56 @@ else
                      { label: L("lcl_mld_dienst_niveau"),
                        initKey: dienstniveau,
                        emptyOption: "",
-                       readonly: !this_alg.writeman
+                       readonly: !this_alg.writeuse
                      });
+        FCLTpersoonselector("verantw",
+                            "sgVerantw",
+                            { perslidKey: verantw_key,
+                              label: L("lcl_alg_verantw"),
+                              readonly: !this_alg.writeuse,
+                              autlevel: this_alg.authparams("WEB_ALGMAN") && this_alg.authparams("WEB_ALGMAN").PRSwritelevel
+                            });
+        FCLTpersoonselector("verantw2",
+                            "sgVerantw2",
+                            { perslidKey: verantw_key2,
+                              label: L("lcl_alg_verantw2"),
+                              readonly: !this_alg.writeuse,
+                              autlevel: this_alg.authparams("WEB_ALGMAN") && this_alg.authparams("WEB_ALGMAN").PRSwritelevel
+                            });
+        manRWFIELD("bld_email",  "fld",     L("lcl_alg_gebouw_email"),       bld_email, {maxlength: 200});
+        BLOCK_END();
+
+        BLOCK_START("algLoc2", "&nbsp;");
+        if (bld_key > 0)
+        {
+          var calcopp = alg.calc_algm2(bld_key, onrgoedlvl);
+          ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
+          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"),
                        adresKey:  mld_adres,
                        emptyOption: "",
-                       filtercode: "A",
+                       filtcode: "A",
                        readonly: !this_alg.writeman
                     }) ;
-        var sql = "SELECT DISTINCT mld_vrije_dagen_id, mld_vrije_dagen_id"
-                + "  FROM mld_vrije_dagen";
-        FCLTselector("cal_id"
-                    , sql
-                    , { label: L("lcl_calendar")
-                      , initKey: kalender_id
-                      , emptyOption: ""
-                      , emptyKey: ""
-                      , 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++)
         {
@@ -268,63 +227,19 @@ else
                         }
                       );
         if (this_alg.writeman)
-        {
-          CHECKBOXTR(L("lcl_estate_gebouw_werkdagen"), "fldalgwerk", "bld_werkdagen", werkdagen==1);
-          CHECKBOXTR(L("lcl_estate_gebouw_mld"), "fldalgmld", "bld_mld", bld_mld==1);
-        }
-    BLOCK_END();
-
-    if (user.checkAutorisation("WEB_BEZMGT", true))
-    {
-
-        BLOCK_START("algLoc5", L("lcl_alg_gebouw_bezoek"), {icon: "fa-user-tag"});
-          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"
-                      });
-        var sql = "SELECT bez_actie_groep_key"
-                + "     , bez_actie_groep_omschrijving"
-                + "  FROM bez_actie_groep"
-                + " WHERE bez_actie_groep_verwijder IS NULL"
-        FCLTselector( "group"
-                    , sql
-                    , { label: L("bez_actie_groep")
-                      , initKey: actie_grp_key
-                      , emptyOption: ""
-                      }
-                    );
+          CHECKBOXTR(L("lcl_estate_gebouw_werkdagen"), "fldalgwerk", "bld_werkdagen", werkdagen==1)
         BLOCK_END();
-    }
 
-    generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,
-                                onrgoed_niveau : onrgoedlvl,
-                                reado          : false,
-                                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>
-    <% SUBFRAME_END(); %>
+    </div>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_gebouw_multi.asp

@@ -1,226 +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"],
-                      js: ["multi.js"] });
-
-var bld_key_arr = getQParamIntArray("bld_keys");
-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(); %>
-    <script type="text/javascript">
-        $(function () { $("select option[value=-1]").val(""); }); // prevents removal of values from listboxes
-        function alg_submit()
-        {
-            $.post($("form[name=u2]")[0].action,
-                   $("[name=u2]").serialize(),
-                   FcltCallbackAndThenAlways(alg_submit_callback),
-                   "json");
-            return true; // disable button
-        }
-
-        function alg_submit_callback(json)
-        {
-            iface.button.enable("btn_alg_submit");
-            if (json.success)
-                FcltMgr.closeDetail(window, json);
-        }
-
-        function alg_cancel()
-        {
-            FcltMgr.closeDetail(window, { cancel: true } );
-        }
-    </script>
-  </head>
-
-  <body class="fclt-modal" id="mod_algmultiedit">
-  <% MODAL_START(); %>
-    <form name="u2" action="alg_edit_gebouw_multi_save.asp?bld_keys=<%=ingesloten.join(",")%>" method="post">
-<%
-      MODAL_BLOCK_START("algGebouw", L("lcl_alg_gebouw_frame"), { icon: "fa-building" });
-      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
-                   });
-
-      CHECKBOXTR(L("lcl_estate_gebouw_bez"), "fldalgbez", "bld_bez");
-      CHECKBOXTR(L("lcl_estate_gebouw_mld"), "fldalgmld", "bld_mld");
-      var sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toontelfLOV"));
-      FCLTselector("toon_telefoon",
-                  sql,
-                  { label: L("lcl_estate_gebouw_toon_telefoon"),
-                    initEmpty: true,
-                    emptyOption: ""
-                  });
-      sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonmailLOV"));
-      FCLTselector("toon_email",
-                 sql,
-                 { label: L("lcl_estate_gebouw_toon_email"),
-                   initEmpty: true,
-                   emptyOption: ""
-                 });
-      sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonkentLOV"));
-      FCLTselector("toon_kenteken",
-                 sql,
-                 { label: L("lcl_estate_gebouw_toon_kenteken"),
-                   initEmpty: true,
-                   emptyOption: ""
-                 });
-      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"),
-                   emptyOption: "",
-                   initEmpty: true,
-                   readonly: !this_alg.writeuse
-                 });
-      sql = "SELECT DISTINCT mld_vrije_dagen_id, mld_vrije_dagen_id"
-          + "  FROM mld_vrije_dagen";
-      FCLTselector("cal_id"
-                  , sql
-                  , { label: L("lcl_calendar")
-                    , emptyOption: ""
-                    , initEmpty: true
-                    , readonly: !this_alg.writeman
-                    });
-      var times = [];
-      for (i=0; i<24; i++)
-      {
-        sql = "           SELECT " + String(i+0/4) + ", '" + String(i) + ":00' FROM DUAL"
-            + " UNION ALL SELECT " + String(i+1/4) + ", '" + String(i) + ":15' FROM DUAL"
-            + " UNION ALL SELECT " + String(i+2/4) + ", '" + String(i) + ":30' FROM DUAL"
-            + " UNION ALL SELECT " + String(i+3/4) + ", '" + String(i) + ":45' FROM DUAL"
-        times.push(sql);
-      }
-      FCLTselector("bld_beginuur", times.join(" UNION ALL "),
-                      {  label: L("lcl_estate_gebouw_beginuur"),
-                         emptyOption: "",
-                         initEmpty: true,
-                         readonly: !this_alg.writeman
-                      }
-                    );
-      FCLTselector("bld_einduur", times.join(" UNION ALL "),
-                      {  label: L("lcl_estate_gebouw_einduur"),
-                         emptyOption: "",
-                         initEmpty: true,
-                         readonly: !this_alg.writeman
-                      }
-                    );
-      CHECKBOXTR(L("lcl_estate_gebouw_werkdagen"), "fldalgwerk", "bld_werkdagen");
-
-      var sql = "SELECT bez_actie_groep_key"
-              + "     , bez_actie_groep_omschrijving"
-              + "  FROM bez_actie_groep"
-              + " WHERE bez_actie_groep_verwijder IS NULL"
-      FCLTselector( "group",
-                    sql,
-                    { label: L("bez_actie_groep"),
-                      emptyOption: "",
-                      initEmpty: true
-                    }
-                  );
-
-      MODAL_BLOCK_END();
-
-      generateFlexKenmerkBlock({
-          onrgoed_niveau: "G",
-          onrgoed_key: -1,
-          this_alg: last_this_alg,
-          reado: false,
-          multi: true
-        });
-
-%>
-      <script type="text/javascript">
-        $(function()
-          {
-            init_multi();
-          });
-      </script>
-<%
-      var buttons =  [];
-      buttons.push({title: L("lcl_submit"), action:"alg_submit()", singlepress: true, id: "btn_edit_submit", importance: 1, icon: "fa-fclt-save"});
-      buttons.push({title: L("lcl_cancel"),  action:"alg_cancel()", importance: 3, icon: "fa-fclt-cancel"});
-      SIMPLE_BLOCK_START();
-      CreateButtons(buttons);
-      SIMPLE_BLOCK_END();
-      IFACE.FORM_END();
-%>
-    </form>
-    <% MODAL_END(); %>
-  </body>
-</html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_gebouw_multi_save.asp

@@ -1,135 +0,0 @@
-<%@ language = "JavaScript" %>
-<% /*
-    $Revision$
-    $Id$
-
-    File:               alg_edit_gebouw_multi_save.asp
-    Description:        save script van alg_edit_gebouw_multi.asp
-    Globalen:
-    Context:
-    Note:
-*/
-var JSON_Result = true;
-%>
-
-<!-- #include file="../Shared/common.inc" -->
-<!-- #include file="../Shared/save2db.inc" -->
-<!-- #include file="../Shared/kenmerk_common.inc" -->
-<!-- #include file="./alg.inc" -->
-
-<%
-protectRequest.validateToken();
-var bld_key_arr = getQParamIntArray("bld_keys");
-var warning = "";
-var result = {};
-var nr_edited = 0;
-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")
-{   var toon_t = (getFParam("toon_telefoon") ? getFParam("toon_telefoon") : 0);
-    fields.push({ dbs: "alg_gebouw_toon_telefoon", typ: "number", val: toon_t, track: L("lcl_estate_gebouw_toon_telefoon") });
-}
-if (Request.Form("toon_email").Count == 1 && getFParam("check_toon_email", "off") == "on")
-{   var toon_e = (getFParam("toon_email") ? getFParam("toon_email") : 0);
-    fields.push({ dbs: "alg_gebouw_toon_email", typ: "number", val: toon_e, track: L("lcl_estate_gebouw_toon_email") });
-}
-if (Request.Form("toon_kenteken").Count == 1 && getFParam("check_toon_kenteken", "off") == "on")
-{   var toon_k = (getFParam("toon_kenteken") ? getFParam("toon_kenteken") : 0);
-    fields.push({ dbs: "alg_gebouw_toon_kenteken", typ: "number", val: toon_k, track: L("lcl_estate_gebouw_toon_kenteken") });
-}
-if (Request.Form("dienstniveau").Count == 1 && getFParam("check_dienstniveau", "off") == "on")
-    fields.push({ dbs: "mld_dienstniveau_key", typ: "key", frm: "dienstniveau", track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" });
-
-if (Request.Form("cal_id").Count == 1 && getFParam("check_cal_id", "off") == "on")
-    fields.push({ dbs: "mld_vrije_dagen_id", typ: "varchar", frm: "cal_id", track: L("lcl_calendar") });
-if (Request.Form("bld_beginuur").Count == 1 && getFParam("check_bld_beginuur", "off") == "on")
-    fields.push({ dbs: "alg_gebouw_beginuur",   typ: "float", frm: "bld_beginuur", track: L("lcl_estate_gebouw_beginuur") });
-if (Request.Form("bld_einduur").Count == 1 && getFParam("check_bld_einduur", "off") == "on")
-    fields.push({ dbs: "alg_gebouw_einduur",    typ: "float", frm: "bld_einduur", track: L("lcl_estate_gebouw_einduur") });
-if (getFParam("check_bld_werkdagen", "off") == "on")
-    fields.push({ dbs: "alg_gebouw_werkdagen",  typ: "check0", val: Request.Form("bld_werkdagen").Count });
-if (getFParam("check_bld_bez", "off") == "on")
-    fields.push({ dbs: "alg_gebouw_bez",  typ: "check", val: Request.Form("bld_bez").Count });
-if (getFParam("check_bld_mld", "off") == "on")
-    fields.push({ dbs: "alg_gebouw_mld",  typ: "check", val: Request.Form("bld_mld").Count });
-if (getFParam("check_group", "off") == "on")
-    fields.push({ dbs: "bez_actie_groep_key", typ: "key", frm: "group", track: L("bez_actie_groep"), foreign: "bez_actie_groep" });
-
-for (var i = 0; i < bld_key_arr.length; i++)
-{
-    var alg_key = bld_key_arr[i];
-    var this_alg = alg.func_enabled(alg_key, "G");
-    if (this_alg.writeman || this_alg.writeuse)
-    {
-        var algUpd = buildTrackingUpdate("alg_gebouw", " alg_gebouw_key = " + alg_key, fields);
-        // Submit the changed data
-        var err = Oracle.Execute(algUpd.sql, true);
-        if (err.friendlyMsg)
-            warning = err.friendlyMsg;
-
-        currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                            + "     , ok.alg_onrgoedkenmerk_waarde"
-                            + "     , k.alg_kenmerk_toonbaar"
-                            + "     , k.fac_functie_key"
-                            + "  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 = " + alg_key;
-
-        allKenmerkenSQL     = "SELECT " + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key') + " kenmerk_omschrijving"
-                            + "     , k.alg_kenmerk_kenmerktype kenmerk_kenmerktype"
-                            + "     , k.alg_kenmerk_systeem     kenmerk_systeem"
-                            + "     , k.alg_kenmerk_toonbaar    kenmerk_readonly"
-                            + "     , k.alg_kenmerk_uniek       kenmerk_uniek"
-                            + "     , fac_kenmerkdomein_key"
-                            + "  FROM alg_kenmerk k"
-                            + " WHERE k.alg_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
-
-        var flextrack = saveFlexKenmerken(alg_key,
-                          { kenmerkTable: "alg_onrgoedkenmerk",
-                            kenmerkParentKey : "alg_onrgoed_key",
-                            kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
-                            kenmerkKey: "alg_kenmerk_key",
-                            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
-                          });
-
-        if ((algUpd.trackarray && algUpd.trackarray.length) || (flextrack && flextrack.length))
-        {
-            var update_string = L("lcl_alg_is_alglup") + "\n";
-            if (algUpd.trackarray && algUpd.trackarray.length)
-                update_string += algUpd.trackarray.join("\n");
-            if (flextrack && flextrack.length)
-                update_string += flextrack.join("\n");
-            shared.trackaction("ALGGUP", alg_key, update_string);
-        }
-    }
-}
-
-result = { success : true, refresh: true };
-
-Response.Write(JSON.stringify(result));
-
-ASPPAGE_END();
-%>

APPL/ALG/alg_edit_gebouw_save.asp

@@ -15,86 +15,63 @@
                       js: []
                     }) %>
 <%
-var bld_key = getQParamInt("bld_key");
-var loc_key = getFParamInt("locatiekey", -1);
+  var bld_key = getQParamInt( "bld_key" );;
 
-var isNew = (bld_key < 0);
-
-var beginuur = getFParamFloat("bld_beginuur", -2);
-if (beginuur == -1)
+  var beginuur = getFParamFloat("bld_beginuur", -2);
+  if (beginuur == -1)
     beginuur = "";
 
-var einduur = getFParamFloat("bld_einduur", -2);
-if (einduur == -1)
+  var einduur = getFParamFloat("bld_einduur", -2);
+  if (einduur == -1)
     einduur = "";
 
 var onrgoedlvl = "G";
 var this_alg = alg.func_enabled(bld_key, onrgoedlvl);
-user.auth_required_or_abort(this_alg.writeman || (bld_key > 0 && this_alg.writeuse));
+user.auth_required_or_abort(this_alg.writeman || (bld_key>0&&this_alg.writeuse));
 
-var fields =  [ /* { dbs: "alg_gebouw_getekend",       typ: "date",    frm: "bld_teken" },
-                   { dbs: "alg_gebouw_dwgx",           typ: "float",   frm: "bld_dwgx" },
-                   { dbs: "alg_gebouw_dwgy",           typ: "float",   frm: "bld_dwgy" },   Deze 3 velden worden nergens meegegeven? */
-              ];
+  var fields =  [ { dbs: "alg_locatie_key",           typ: "key",     frm: "locatiekey" },
+                  { 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 (user.checkAutorisation("WEB_BEZMGT", true))
-{
-    fields.push({ 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") });
-}
+  if (beginuur != -2)
+    fields.push({ dbs: "alg_gebouw_beginuur",       typ: "float",   val: beginuur });
+  if (einduur != -2)
+    fields.push({ dbs: "alg_gebouw_einduur",        typ: "float",   val: einduur });
 
-if (this_alg.writeman)
-{
-    fields.push({ dbs: "alg_gebouw_omschrijving",   typ: "varchar", frm: "bld_descr",     track: L("lcl_estate_gebouw_man_descr")  },
-                { 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_adres",          typ: "varchar", frm: "bld_adres",     track: L("lcl_estate_gebouw_man_adres") },
-                { dbs: "alg_gebouw_postcode",       typ: "varchar", frm: "bld_postcode",  track: L("lcl_estate_gebouw_man_postcode") },
-                { 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_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: "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_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_ordernr",        typ: "varchar", frm: "bld_ordrnr",    track: L("lcl_estate_gebouw_ordernr") },
-                { 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: "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_bez",            typ: "check",   frm: "bld_bez",       track: L("lcl_estate_gebouw_bez") },
-                { dbs: "alg_gebouw_mld",            typ: "check",   frm: "bld_mld",       track: L("lcl_estate_gebouw_mld") },
-                { dbs: "alg_gebouw_werkdagen",      typ: "check0",  frm: "bld_werkdagen", track: L("lcl_estate_gebouw_werkdagen") },
-                { dbs: "alg_gebouw_vervaldatum",    typ: "date",    frm: "vervaldatum",   track: L("lcl_alg_vervaldatum") },
-                { dbs: "bez_actie_groep_key",       typ: "key",     frm: "group",         track: L("bez_actie_groep"), foreign: "bez_actie_groep" },
-                { dbs: "mld_vrije_dagen_id",        typ: "varchar", frm: "cal_id",        track: L("lcl_calendar")},
-                // De gebouwverantwoordelijke(n) moeten eigenlijk nog een PRS-scope test ondergaan alvorens opgeslagen te worden, maar dat is voor nu teveel eer
-                { 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 warning = "";
+  if (bld_key > 0)
+  {
+    sql = buildUpdate("alg_gebouw", fields)
+        + "     alg_gebouw_key = " + bld_key;
 
-    if (beginuur != -2)
-        fields.push({ dbs: "alg_gebouw_beginuur",   typ: "float",   val: beginuur,        track: L("lcl_estate_gebouw_beginuur") });
-    if (einduur != -2)
-        fields.push({ dbs: "alg_gebouw_einduur",    typ: "float",   val: einduur,         track: L("lcl_estate_gebouw_einduur") });
-
-    if (bld_key == -1 && alg.canWriteLocatie(loc_key, this_alg.authparams("WEB_ALGMAN").ALGwritelevel))
-        fields.push({ dbs: "alg_locatie_key",       typ: "key",     val: loc_key });
-}
-
-var warning = "";
-if (bld_key > 0)
-{
-    var algUpd = buildTrackingUpdate("alg_gebouw", " alg_gebouw_key = " + bld_key, fields);
-    var err = Oracle.Execute(algUpd.sql, true);
+    var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
         warning = err.friendlyMsg;
-}
-else
-{
-    fields.push({ dbs: "alg_gebouw_key",            typ: "key",     seq: "alg_s_alg_onroerendgoed_keys" });
+  }
+  else
+  {
+    fields.push({  dbs: "alg_gebouw_key",         typ: "key",      seq: "alg_s_alg_onroerendgoed_keys" });
     var regIns = buildInsert("alg_gebouw", fields);
     var bld_key = regIns.sequences["alg_gebouw_key"];
 
@@ -102,80 +79,44 @@ else
     var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
         warning = err.friendlyMsg;
-}
+  }
 
-var flextrack = [];
-if (!warning)
-{
-    currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                        + "     , ok.alg_onrgoedkenmerk_waarde"
-                        + "     , k.alg_kenmerk_toonbaar"
-                        + "     , k.fac_functie_key"
-                        + "  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;
-
-    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 */
-
-    flextrack = saveFlexKenmerken(bld_key,
-                      { 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",
-                        module: "ALG",
-                        tracking: true,
-                        moduleName: "alg_onrgoed_niveau",
-                        moduleVal: "G",
-                        isNew: isNew
-                      });
-
-    if (!isNew)
-    {
-      if (flextrack && flextrack.length)
-      {
-        if (algUpd && algUpd.trackarray.length)
-          algUpd.trackarray = algUpd.trackarray.concat(flextrack);
-        else
-          algUpd.trackarray = flextrack;
-      }
-      if (algUpd && algUpd.trackarray.length)
-          shared.trackaction("ALGGUP", bld_key, algUpd.trackarray.join("\n"));
-    }
-    else
-      shared.trackaction("ALGGNE", bld_key);
-
-}
+  if (!warning)
+  {
+      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",
+                          currentKenmerkenSQL: currentKenmerkenSQL,
+                          requestQF: Request.Form,
+                          flexPath: "ALG/G",
+                          module: "ALG",
+                          moduleName: "alg_onrgoed_niveau",
+                          moduleVal: "G",
+                          isNew: bld_key < 0
+                        });
+  }
 %>
 
 <html>
   <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,10 +20,10 @@
 <!-- #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
 
 var onrgoedlvl = "L";
 var this_alg = alg.func_enabled(loc_key, onrgoedlvl);
@@ -32,33 +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 loc_volgnr = oRs("alg_locatie_volgnr").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();
 }
@@ -70,14 +65,13 @@ if (loc_key > 0)
    FCLTHeader.Generate();
 %>
 <script>
-    async function alg_submit()
+    function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
-        if (!await validateForm("u2"))
+        if (!validateForm("u2"))
             return false;
         document.forms.u2.submit();
     }
-
     function alg_cancel()
     {
         FcltMgr.closeDetail(window, { cancel: true } );
@@ -85,13 +79,13 @@ if (loc_key > 0)
 </script>
 </head>
 
-<body class="editmode">
-<% SUBFRAME_START(); %>
+<body id="editbody">
 <%
-  var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "fa-fclt-save" },
-                   {title: L("lcl_cancel"), action:"alg_cancel()", icon: "fa-fclt-cancel" } ];
+  var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "opslaan.png" },
+                   {title: L("lcl_cancel"), action:"alg_cancel()", icon: "undo.png" } ];
   IFRAMER_HEADER(L("lcl_alg_locatie_frame"), buttons);
 %>
+<div id="edit">
 <form name="u2"
       action="alg_edit_locatie_save.asp?loc_key=<%=loc_key%>"
       method="post"
@@ -103,40 +97,21 @@ 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_location"), {icon: "fa-location-arrow"});
-
+BLOCK_START("algLoc1", "&nbsp;");
       FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel, {
+          districtkey: dis_key,
           locatiekey: loc_key,
           startlevel: 1, //District
           eindlevel: 1, // District
           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_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", L("lcl_fac_adres_postblock"), {icon: "fa-envelope-open"});
-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});
-BLOCK_END();
-
-BLOCK_START("facFM", L("lcl_operations_block"), {icon: "fa-users-cog"});
-manRWFIELD("loc_volgnr", "fld", L("lcl_alg_locatie_volgnr"), loc_volgnr, {maxlength: 3});
-FCLTcalendar("vervaldatum",
-             { datum: vervaldatum,
-               initEmpty: vervaldatum==null,
-               label: L("lcl_alg_vervaldatum"),
-               readonly: !this_alg.writeman
-             });
+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")
@@ -150,13 +125,19 @@ FCLTcalendar("vervaldatum",
                  readonly: !this_alg.writeuse
               });
 
-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: 20});
-manRWFIELD("loc_mail",   "fld", L("lcl_alg_locatie_email"), loc_mail,   {maxlength: 200});
-FILEPICKERTR("loc_image", L("lcl_alg_locatie_image"), loc_image, { "key": loc_key, "module": "ALGPHL", "readonly": !this_alg.writeman });
+manRWFIELD("loc_x",  "fld",          L("lcl_geoxcoord"),        loc_x, {maxlength: 25});
+manRWFIELD("loc_y",  "fld",          L("lcl_geoycoord"),        loc_y, {maxlength: 25});
 
-if (ins_score_enabled)
-  ROFIELDTR("fld",          L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
+BLOCK_END();
+BLOCK_START("algLoc2", "&nbsp;");
+
+manRWFIELD("pst_adres",  "fld",          L("lcl_prs_address_post_adres"),        pst_adres, {maxlength: 50});
+manRWFIELD("pst_postc",  "fld",          L("lcl_prs_address_post_postcode"),        pst_postc, {maxlength: 12});
+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();
 
@@ -164,13 +145,13 @@ generateFlexKenmerkBlock ({
      onrgoed_key    : loc_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>
-<% SUBFRAME_END(); %>
+</div>
 </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_locatie_multi.asp

@@ -1,134 +0,0 @@
-<%@language = "javascript" %>
-<% /*
-     $Revision$
-     $Id$
-
-    File:               alg_edit_locatie_multi.asp
-    Description:        Multi editten van locaties
-    Parameters:         key
-
-    Context:            alg_locatie_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/kenmerk_common.inc" -->
-<!-- #include file="../API2/api2.inc" -->
-<!-- #include file="./alg_flexkenmerk.inc" -->
-<!-- #include file="alg.inc" -->
-
-<%
-FCLTHeader.Requires({ plugins: ["suggest", "jQuery", "kenmerk"],
-                      js: ["multi.js"] });
-
-var loc_key_arr = getQParamIntArray("loc_keys");
-var warning = "";
-var result = {};
-var tobeedited = 0;
-var ingesloten = [];
-// Bepaal de locaties in de selectie die
-// ook echt gewijzigd kunnen of mogen worden.
-var onrgoedlvl = "L";
-for (var i = 0; i < loc_key_arr.length; i++)
-{
-  var this_alg = alg.func_enabled(loc_key_arr[i], onrgoedlvl);
-  if (this_alg.writeman || this_alg.writeuse)
-  {
-    ingesloten.push(loc_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(); %>
-    <script type="text/javascript">
-        function alg_submit()
-        {   // Invoer van velden wordt realtime gevalideerd.
-            $.post($("form[name=u2]")[0].action,
-                   $("[name=u2]").serialize(),
-                   FcltCallbackAndThenAlways(alg_submit_callback),
-                   "json");
-            return true; // disable button
-        }
-
-        function alg_submit_callback(json)
-        {
-            iface.button.enable("btn_alg_submit");
-            if (json.success)
-                FcltMgr.closeDetail(window, json);
-        }
-
-        function alg_cancel()
-        {
-            FcltMgr.closeDetail(window, { cancel: true } );
-        }
-    </script>
-  </head>
-
-  <body class="fclt-modal" id="mod_algmultiedit">
-  <% MODAL_START(); %>
-    <form name="u2" action="alg_edit_locatie_multi_save.asp?loc_keys=<%=ingesloten.join(",")%>" method="post">
-<%
-      MODAL_BLOCK_START("algLoc1", L("lcl_location"), { icon: "fa-location-arrow" });
-
-        FCLTcalendar("vervaldatum",
-                     { initEmpty: true,
-                       label: L("lcl_alg_vervaldatum"),
-                       volgnr: 1,
-                       onChange: "DateChangedVerval()",
-                       readonly: !last_this_alg.writeman
-                     });
-        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"),
-                     emptyOption: "",
-                     initEmpty: true,
-                     readonly: !this_alg.writeuse,required: true
-                   });
-        RWFIELDTR("loc_vw",    "fld", L("lcl_estate_locatie_man_verantw"),     "", {maxlength: 30});
-        RWFIELDTR("loc_vwtel", "fld", L("lcl_estate_locatie_man_verantw_tel"), "", {maxlength: 20});
-
-      MODAL_BLOCK_END();
-
-      generateFlexKenmerkBlock({
-          onrgoed_niveau: "L",
-          onrgoed_key: -1,
-          this_alg: last_this_alg,
-          reado: false,
-          multi: true
-        });
-
-%>
-      <script type="text/javascript">
-        $(function()
-          {
-            init_multi();
-          });
-      </script>
-<%
-      var buttons =  [];
-      buttons.push({title: L("lcl_submit"), action:"alg_submit()", singlepress: true, id: "btn_edit_submit", importance: 1, icon: "fa-fclt-save"});
-      buttons.push({title: L("lcl_cancel"),  action:"alg_cancel()", importance: 3, icon: "fa-fclt-cancel"});
-      SIMPLE_BLOCK_START();
-      CreateButtons(buttons);
-      SIMPLE_BLOCK_END();
-      IFACE.FORM_END();
-%>
-    </form>
-    <% MODAL_END(); %>
-  </body>
-</html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_locatie_multi_save.asp

@@ -1,102 +0,0 @@
-<%@ language = "JavaScript" %>
-<% /*
-    $Revision$
-    $Id$
-
-    File:               alg_edit_locatie_multi_save.asp
-    Description:        save script van alg_edit_locatie_multi.asp
-    Globalen:
-    Context:
-    Note:
-*/
-var JSON_Result = true;
-%>
-
-<!-- #include file="../Shared/common.inc" -->
-<!-- #include file="../Shared/save2db.inc" -->
-<!-- #include file="../Shared/kenmerk_common.inc" -->
-<!-- #include file="./alg.inc" -->
-
-<%
-protectRequest.validateToken();
-var loc_key_arr = getQParamIntArray("loc_keys");
-var warning = "";
-var result = {};
-var nr_edited = 0;
-var fields = [];
-
-if (Request.Form("vervaldatum").Count == 1 && getFParam("check_vervaldatum", "off") == "on")
-    fields.push({ dbs: "alg_locatie_vervaldatum",  typ: "date",   frm: "vervaldatum", track: L("lcl_alg_vervaldatum") });
-if (Request.Form("dienstniveau").Count == 1 && getFParam("check_dienstniveau", "off") == "on")
-    fields.push({ dbs: "mld_dienstniveau_key", typ: "key", frm: "dienstniveau", track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" });
-if (Request.Form("loc_vw").Count == 1 && getFParam("check_loc_vw", "off") == "on")
-    fields.push({ dbs: "alg_locatie_verantw", typ: "varchar", frm: "loc_vw", track: L("lcl_estate_locatie_man_verantw") });
-if (Request.Form("loc_vwtel").Count == 1 && getFParam("check_loc_vwtel", "off") == "on")
-    fields.push({ dbs: "alg_locatie_verantw_tel", typ: "varchar", frm: "loc_vwtel", track: L("lcl_estate_locatie_man_verantw_tel") });
-
-for (var i = 0; i < loc_key_arr.length; i++)
-{
-    var alg_key = loc_key_arr[i];
-    var this_alg = alg.func_enabled(alg_key, "L");
-    if (this_alg.writeman || this_alg.writeuse)
-    {
-        var algUpd = buildTrackingUpdate("alg_locatie", " alg_locatie_key = " + alg_key, fields);
-        // Submit the changed data
-        var err = Oracle.Execute(algUpd.sql, true);
-        if (err.friendlyMsg)
-            warning = err.friendlyMsg;
-
-        currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                            + "     , ok.alg_onrgoedkenmerk_waarde"
-                            + "     , k.alg_kenmerk_toonbaar"
-                            + "     , k.fac_functie_key"
-                            + "  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 = 'L'"
-                            + "   AND ok.alg_onrgoed_key = " + alg_key;
-
-        allKenmerkenSQL     = "SELECT " + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key') + " kenmerk_omschrijving"
-                            + "     , k.alg_kenmerk_kenmerktype kenmerk_kenmerktype"
-                            + "     , k.alg_kenmerk_systeem     kenmerk_systeem"
-                            + "     , k.alg_kenmerk_toonbaar    kenmerk_readonly"
-                            + "     , k.alg_kenmerk_uniek       kenmerk_uniek"
-                            + "     , fac_kenmerkdomein_key"
-                            + "  FROM alg_kenmerk k"
-                            + " WHERE k.alg_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
-
-        var flextrack = saveFlexKenmerken(alg_key,
-                          { kenmerkTable: "alg_onrgoedkenmerk",
-                            kenmerkParentKey : "alg_onrgoed_key",
-                            kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
-                            kenmerkKey: "alg_kenmerk_key",
-                            kenmerkToonbaar: "alg_kenmerk_toonbaar",
-                            currentKenmerkenSQL: currentKenmerkenSQL,
-                            allKenmerkenSQL: allKenmerkenSQL,
-                            requestQF: Request.Form,
-                            flexPath: "ALG/L",
-                            multiMode: true,
-                            tracking: true,
-                            module: "ALG",
-                            moduleName: "alg_onrgoed_niveau",
-                            moduleVal: "L",
-                            isNew: false
-                          });
-
-        if (flextrack && flextrack.length)
-        {
-            var update_string = L("lcl_alg_is_alglup") + "\n" + algUpd.trackarray.join("\n");
-            if (flextrack && flextrack.length)
-                update_string += flextrack.join("\n");
-            shared.trackaction("ALGLUP", alg_key, update_string);
-        }
-    }
-}
-
-result = { success : true, refresh: true };
-
-Response.Write(JSON.stringify(result));
-
-ASPPAGE_END();
-%>

APPL/ALG/alg_edit_locatie_save.asp

@@ -15,51 +15,37 @@
                       js: []
                     }) %>
 <%
-var loc_key = getQParamInt("loc_key");
-var dis_key = getFParamInt("districtkey");
-
-var isNew = (loc_key < 0);
+  var loc_key = getQParamInt( "loc_key" );
 
 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));
+user.auth_required_or_abort(this_alg.writeman || (loc_key>0&&this_alg.writeuse));
 
-var fields = [];
-if (this_alg.writeuse)
-{
-    fields.push({ dbs: "mld_dienstniveau_key",      typ: "key",     frm: "dienstniveau", track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" });
-}
-
-if (this_alg.writeman)
-{
-    fields.push({ 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: "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") },
-                { dbs: "alg_locatie_volgnr",        typ: "number",  frm: "loc_volgnr",   track: L("lcl_alg_locatie_volgnr") });
-
-    if (alg.canWriteDistrict(dis_key, this_alg.authparams("WEB_ALGMAN").ALGwritelevel))
-        fields.push({ dbs: "alg_district_key", typ: "key", val: dis_key });
-}
+  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;
   }
@@ -75,79 +61,42 @@ else
         warning = err.friendlyMsg;
   }
 
-  var flextrack = [];
   if (!warning)
   {
-      currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                          + "     , ok.alg_onrgoedkenmerk_waarde"
-                          + "     , k.alg_kenmerk_toonbaar"
-                          + "     , k.fac_functie_key"
-                          + "  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;
-
-    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 */
-
-    flextrack = saveFlexKenmerken(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,
-                          allKenmerkenSQL: allKenmerkenSQL,
                           requestQF: Request.Form,
                           flexPath: "ALG/L",
                           module: "ALG",
-                          tracking: true,
                           moduleName: "alg_onrgoed_niveau",
                           moduleVal: "L",
-                          isNew: isNew
+                          isNew: loc_key < 0
                         });
-
-    if ( !isNew )
-    {
-      if (flextrack.length)
-      {
-        if (algUpd && algUpd.trackarray.length)
-          algUpd.trackarray = algUpd.trackarray.concat(flextrack);
-        else
-          algUpd.trackarray = flextrack;
-      }
-
-      if (algUpd && algUpd.trackarray.length)
-          shared.trackaction("ALGLUP", loc_key, algUpd.trackarray.join("\n"));
-    }
-    else
-      shared.trackaction("ALGLNE", loc_key);
-
 }
-%>
+  %>
 
 <html>
   <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_note_save.asp

@@ -1,47 +0,0 @@
-<%@language = "javascript"%>
-<% /*
-     $Revision$
-     $Id$
-
-    File:               alg/alg_edit_note.asp
-    Description:        Bekijken en/of aanvullen van een notitie behorende bij een onroerendgoed
-                        in een apart blokje
-    Parameters:         fronto/backo
-    Context:            vanuit onroerendgoed-detail
-    Note:
-*/
-var JSON_Result = true; %>
-
-<!-- #include file="../Shared/common.inc" -->
-<!-- #include file="../Shared/save2db.inc" -->
-<!-- #include file="./alg.inc" -->
-<!-- #include file="../Shared/notes.inc" -->
-
-<%
-var alg_key = getQParamInt("alg_key");
-var alg_typ = getQParamSafe("alg_typ").toUpperCase();
-var note_key = getQParamInt("note_key", -1);
-var note = getFParam("note");
-
-var this_alg = alg.func_enabled(alg_key, alg_typ); // Wat mag ik zoal op dit onroerendgoed.
-user.auth_required_or_abort(this_alg.canWriteNotes);
-
-var saved_note_key = notes.note_save( alg_key
-                                    , { note: note
-                                      , note_key: note_key
-                                      , module: "ALG"
-                                      , typ: alg_typ
-                                      , table: "alg_onroerendgoed"
-                                      }
-                                    );
-
-var result = { success: true,
-               alg_key: alg_key,
-               alg_typ: alg_typ,
-               note_key: saved_note_key
-             };
-
-Response.Write(JSON.stringify(result));
-
-ASPPAGE_END();
-%>

APPL/ALG/alg_edit_regio.asp

@@ -7,6 +7,10 @@
     Description:  scherm om regio gegevens te wijzigen.
     Parameters:   regio_key
 
+
+    Context:
+    Note:
+
 */ %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
@@ -18,14 +22,12 @@
 FCLTHeader.Requires({plugins:["suggest","jQuery"], js: []})
 
 var regio_key = getQParamInt("regio_key");
-var onrgoedlvl = "E";
 
 var params = { filter:  { id: regio_key,
                           isNew: (regio_key == -1 ? true : false)
                         }
              };
-var model = new model_regions();
-var regio_array = model.REST_GET(params);              // Roep de API2 GET aan
+var regio_array = model_regions.REST_GET(params);              // Roep de API2 GET aan
 var regio_data = (regio_array[0] ? regio_array[0] : {id: -1}); // GET kan meerdere records opleveren, maar we verwachten hier maar 1.
 var this_alg = params.func_enabled;                            // params bevat nu ook waarden die in API2 zijn bepaald.
 var action = (regio_key == -1 ? "I" : "U");
@@ -37,12 +39,13 @@ var action = (regio_key == -1 ? "I" : "U");
     FCLTHeader.Generate();
 %>
     <script>
-        async function alg_submit()
+        function alg_submit()
         {
-            if (!await validateForm("u2"))
+            if (!validateForm("u2"))
                 return false;
 
             var data = $("[name=u2]").serialize();
+            <% protectRequest.dataToken("data"); %>
             $.post($("form[name=u2]")[0].action,
                    data,
                    FcltCallbackClose,
@@ -56,13 +59,13 @@ var action = (regio_key == -1 ? "I" : "U");
     </script>
   </head>
 
-  <body class="editmode">
-  <% SUBFRAME_START(); %>
+  <body id="editbody">
 <%
-    var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "fa-fclt-save" },
-                     {title: L("lcl_cancel"), action:"alg_cancel()", icon: "fa-fclt-cancel" } ];
+    var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "opslaan.png" },
+                     {title: L("lcl_cancel"), action:"alg_cancel()", icon: "undo.png" } ];
     IFRAMER_HEADER(L("lcl_alg_regio_frame"), buttons);
 %>
+    <div id="edit">
       <form name="u2"
             action="alg_edit_regio_save.asp?regio_key=<%=regio_data.id%>&action=<%=action%>"
             method="post"
@@ -73,23 +76,14 @@ var action = (regio_key == -1 ? "I" : "U");
         else
             manRWFIELD = function (a,b,c,d,e) { ROFIELDTR(b,c,d,e) }; // als geen USE dan zijn er veel readonly
 
-        BLOCK_START("algInfo", L("lcl_region"), {icon: "fa-globe"});
+        BLOCK_START("algInfo", "&nbsp;");
 
-          manRWFIELD("reg_oms", "fld", L("lcl_name"), regio_data.name, {required: true, maxlength: 30});
+          manRWFIELD("reg_oms", "fld", L("lcl_region"), regio_data.name, {required: true, maxlength: 30});
 
         BLOCK_END();
-
-        generateFlexKenmerkBlock ({
-            onrgoed_key    : regio_key,
-            onrgoed_niveau : onrgoedlvl,
-            reado          : false,
-            this_alg       : this_alg
-        });
-
         IFACE.FORM_END();
 %>
       </form>
-      <% SUBFRAME_END(); %>
+    </div>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_regio_save.asp

@@ -12,74 +12,39 @@ var JSON_Result = true;
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../API2/api2.inc" -->
 <!-- #include file="../API2/model_regions.inc" -->
-<!-- #include file="alg.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <%
 protectRequest.validateToken();
-var regio_key = getQParamInt("regio_key");
-var action = getQParam("action", "");
+var regio_key = getQParamInt( "regio_key" );
+var action = getQParam( "action", "" );
 
-var onrgoedlvl = "E";
-var this_alg = alg.func_enabled(regio_key, onrgoedlvl);
-user.auth_required_or_abort(this_alg.writeman || (regio_key > 0 && this_alg.writeuse));
-
-var formfields = [];
-if (this_alg.writeman)
-    formfields.push({ name: "name", frm: "reg_oms" });
+var formfields = [ {name: "name", frm: "reg_oms" }];
 var params = { filter: { "id": regio_key }};
-var model = new model_regions();
-var jsondata = api2.form2JSONdata(model, params, formfields);
+var jsondata = api2.form2JSONdata(model_regions, params, formfields);
 
 switch (action)
 {
     case "I":
-        var regio_array = model.REST_POST(params, jsondata);
+        var regio_array = model_regions.REST_POST(params, jsondata);
         regio_key = regio_array.key;
         break;
     case "U":
         if (regio_key > 0)
-            var regio_array = model.REST_PUT(params, jsondata, params.filter.id);
+            var regio_array = model_regions.REST_PUT(params, jsondata, params.filter.id);
         break;
     case "D":
         if (regio_key > 0)
-            var regio_array = model.REST_DELETE(params, params.filter.id);
+            var regio_array = model_regions.REST_DELETE(params, params.filter.id);
         break;
     default :
         var regio_array = {warning: L("lcl_cnt_Del_Fails_Auth")};
 }
 var warning = regio_array.warning;
 
+
 var result = { regio_key: regio_key,
                warning: warning,
                keepForm: !!warning,
                success: true };
-
-if (!warning)
-{
-    currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                        + "     , ok.alg_onrgoedkenmerk_waarde"
-                        + "     , k.alg_kenmerk_toonbaar"
-                        + "     , k.fac_functie_key"
-                        + "  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 = 'E'"
-                        + "   AND alg_onrgoed_key = " + regio_key;
-    saveFlexKenmerken(regio_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/E",
-                          module: "ALG",
-                          moduleName: "alg_onrgoed_niveau",
-                          moduleVal: "E",
-                          isNew: regio_key < 0
-                        });
-}
-
 Response.Write(JSON.stringify(result));
-%><% ASPPAGE_END(); %>
+%>

APPL/ALG/alg_edit_ruimte.asp

@@ -7,11 +7,15 @@
     Description:  wijzigen of toevoegen van een ruimte
     Parameters:   room_key
 
+    Context:
+    Note:
+
 */ %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #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" -->
@@ -67,13 +71,14 @@ if (!room_exists)
     FCLTHeader.Generate();
 %>
     <script>
-        async function alg_submit()
+        function alg_submit()
         {
             document.activeElement.blur(); // trigger laatste onChanges
-            if (!await validateForm("u2"))
+            if (!validateForm("u2"))
                 return false;
 
             var data = $("[name=u2]").serialize();
+            <% protectRequest.dataToken("data"); %>
             $.post($("form[name=u2]")[0].action,
                    data,
                    FcltCallbackClose,
@@ -87,19 +92,19 @@ if (!room_exists)
     </script>
   </head>
 
-  <body class="editmode">
-  <% SUBFRAME_START(); %>
+  <body id="editbody">
 <%
-    var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "fa-fclt-save" },
-                     {title: L("lcl_cancel"), action:"alg_cancel()", icon: "fa-fclt-cancel" } ];
+    var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "opslaan.png" },
+                     {title: L("lcl_cancel"), action:"alg_cancel()", icon: "undo.png" } ];
     IFRAMER_HEADER(L("lcl_alg_ruimte_frame"), buttons);
 %>
+    <div id="edit">
       <form name="u2"
             action="alg_edit_ruimte_save.asp?room_key=<%=room_data.id%>"
             method="post"
             onSubmit="return false">
 
-
+        <input type="hidden" id="room_action" name="room_action" value="<%=room_action%>">
 
 
 <%
@@ -113,8 +118,7 @@ if (!room_exists)
         else
             useRWFIELD = manRWFIELD
 
-        BLOCK_START("algrui1", L("lcl_room"), { icon: "fa-map-marker"});
-        %><input type="hidden" id="room_action" name="room_action" value="<%=room_action%>"><%
+        BLOCK_START("algLoc1", "&nbsp;");
 
           FCLTplaatsselector( this_alg.authparams("WEB_RUIMAN").ALGwritelevel,
                               { locatiekey: loc_key,
@@ -129,7 +133,7 @@ if (!room_exists)
                               });
 
           // alguse mag deze twee ook als S("alg_ruimtenr_aut_use")==1
-          useRWFIELD("room_nr",  "fld",      L("lcl_estate_ruimte_man_nr"),    room_data.name,        {required: true, maxlength: 20});
+          useRWFIELD("room_nr",  "fldshort", L("lcl_estate_ruimte_man_nr"),    room_data.name,        {required: true, maxlength: 10});
           useRWFIELD("room_oms", "fld",      L("lcl_estate_ruimte_man_descr"), room_data.description, {maxlength: 30});
 
           sql = "SELECT alg_srtruimte_key"
@@ -143,29 +147,7 @@ if (!room_exists)
                           emptyOption: "",
                           readonly: !this_alg.writeman
                         });
-          manRWFIELD("room_opm",  "fld",          L("lcl_estate_ruimte_man_opmerk"),     room_data.remark,  {maxlength: 50});
 
-        BLOCK_END();
-        BLOCK_START("algrui2", L("lcl_alg_gebouw_fysiek"), { icon: "fa-ruler-combined" });
-
-          manRWFIELD("room_opp",  "fldshort",     L("lcl_estate_ruimte_bruto_vloeropp"), room_data.grossarea, {maxlength: 10, datatype: "float"});
-          ROFIELDTR("fldshort", L("lcl_estate_ruimte_getekendopp"), room_data.cadcontours[0].cadarea, {datatype: "float"});
-          manRWFIELD("room_oppa1",  "fldshort", L("lcl_estate_ruimte_opp_alt1"),       room_data.area1, {maxlength: 10, datatype: "float"});
-
-          if (S("fg_labellayers_alt1")!="" && S("fg_contourlayers_alt1")!="") {
-            ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt1"), room_data.cadcontours[0].cadalt1, {datatype: "float"});
-          }
-
-          manRWFIELD("room_oppa2",  "fldshort", L("lcl_estate_ruimte_opp_alt2"),       room_data.area2, {maxlength: 10, datatype: "float"});
-
-          if (S("fg_labellayers_alt2")!="" && S("fg_contourlayers_alt2")!="") {
-            ROFIELDTR("fldshort", L("lcl_fg_tek_room_opp_g_alt2"), room_data.cadcontours[0].cadalt2, {datatype: "float"});
-          }
-          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"});
-
-        BLOCK_END();
-        BLOCK_START("algrui3", L("lcl_alg_gebouw_facilitair"), {icon: "fa-users-cog"});
           sql = "SELECT mld_dienstniveau_key"
               + "     , " + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
               + "  FROM mld_dienstniveau"
@@ -178,6 +160,23 @@ if (!room_exists)
                           readonly: !this_alg.writeuse
                         });
 
+        BLOCK_END();
+        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);
+          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);
+          }
+          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);
+          }
+          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"});
+          manRWFIELD("room_opm",  "fld",          L("lcl_estate_ruimte_man_opmerk"),     room_data.remark,  {maxlength: 50});
+
           var times = [];
           for (i=0; i<24; i++)
           {
@@ -192,7 +191,6 @@ if (!room_exists)
                         { label: L("lcl_estate_gebouw_beginuur"),
                           initKey: room_data.openfrom,
                           emptyOption: "",
-                          extraclass: "fldshort",
                           readonly: !this_alg.writeman
                         }
                       );
@@ -202,7 +200,6 @@ if (!room_exists)
                         { label: L("lcl_estate_gebouw_einduur"),
                           initKey: room_data.opento,
                           emptyOption: "",
-                          extraclass: "fldshort",
                           readonly: !this_alg.writeman
                         }
                       );
@@ -223,13 +220,13 @@ if (!room_exists)
             onrgoed_key    : room_key,
             onrgoed_niveau : rooms.defaults.onrgoedlvl,
             reado          : false,
+            flexcolumns    : S("alg_flexcolumns"),
             this_alg       : this_alg
             });
 
         IFACE.FORM_END();
 %>
       </form>
-<% SUBFRAME_END(); %>
+    </div>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_ruimte_multi.asp

@@ -14,14 +14,14 @@
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../Shared/save2db.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/kenmerk_common.inc" -->
 <!-- #include file="./alg_flexkenmerk.inc" -->
 <!-- #include file="./alg.inc" -->
 
 <%
-FCLTHeader.Requires({ plugins: ["suggest", "jQuery", "kenmerk"],
-                      js: ["multi.js"] });
+FCLTHeader.Requires({ plugins:["suggest", "jQuery", "kenmerk"] });
 
 var alg_key_arr = getQParamIntArray("alg_keys");
 var alg_level = getQParam("alg_level");
@@ -44,6 +44,7 @@ for (var i = 0; i < alg_key_arr.length; i++)
 }
 user.auth_required_or_abort(tobeedited > 0); // We klagen niet over enkele wel en enkele niet
 
+/*
 var sql = "SELECT alg_srtruimte_key"
         + "     , mld_dienstniveau_key"
         + "     , alg_ruimte_omschrijving"
@@ -79,14 +80,13 @@ if (!oRs.eof)
     }
 }
 oRs.Close();
-
+*/
 %>
 
 <html>
   <head>
 <%  FCLTHeader.Generate(); %>
     <script type="text/javascript">
-        $(function () { $("select option[value=-1]").val(""); }); // prevents removal of values from listboxes
         function alg_submit()
         {
             $.post($("form[name=u2]")[0].action,
@@ -111,14 +111,14 @@ oRs.Close();
     </script>
   </head>
 
-  <body class="fclt-modal" id="mod_algmultiedit">
-  <% MODAL_START(); %>
+  <body class="modal" id="mod_algmultiedit">
     <form name="u2" action="alg_edit_ruimte_multi_save.asp?alg_level=<%=safe.htmlattr(alg_level)%>&alg_keys=<%=ingesloten.join(",")%>" method="post">
 <%
+/*
         if (last_this_alg.writeman || last_this_alg.writeuse)
         {
-            MODAL_BLOCK_START("algFlex", L("lcl_ins_meta_data"), { icon: "fa-map-marker" });
-                // ruimte specifieke velden
+            BLOCK_START("algFlex", L("lcl_ins_meta_data"));
+            // ruimte specifieke velden
                 if (last_this_alg.writeman)
                 {
                     sql = "SELECT alg_srtruimte_key"
@@ -128,30 +128,30 @@ oRs.Close();
                     FCLTselector( "room_srt",
                                   sql,
                                   { label: L("lcl_estate_ruimte_man_sort"),
-                                    emptyOption: "",
-                                    initEmpty: true
+                                    initKey: (diff.srtruimte_key ? diff.srtruimte_key : -1),
+                                    emptyOption: ""
                                   });
-                }
+               }
 
-                if (last_this_alg.writeuse)
-                {
-                    sql = "SELECT mld_dienstniveau_key"
-                        + "     , " + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
-                        + "  FROM mld_dienstniveau"
-                        + " ORDER BY UPPER("+lcl.xsql("mld_dienstniveau_omschr", "mld_dienstniveau_key")+")";
-                    FCLTselector( "dienstniveau",
-                                  sql,
-                                  { label: L("lcl_mld_dienst_niveau"),
-                                    emptyOption: "",
-                                    initEmpty: true
-                                  });
+               if (last_this_alg.writeuse)
+               {
+                   sql = "SELECT mld_dienstniveau_key"
+                       + "     , " + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
+                       + "  FROM mld_dienstniveau"
+                       + " ORDER BY UPPER("+lcl.xsql("mld_dienstniveau_omschr", "mld_dienstniveau_key")+")";
+                   FCLTselector( "dienstniveau",
+                                 sql,
+                                 { label: L("lcl_mld_dienst_niveau"),
+                                   initKey: (diff.dienstniveau_key ? diff.dienstniveau_key : -1),
+                                   emptyOption: ""
+                                 });
 
                     RWFIELDTR("room_oms",  "fld", L("lcl_estate_ruimte_man_descr"),  diff.omschrijving, {maxlength: 30});
                 }
 
                 if (last_this_alg.writeman)
                 {
-                    //RWFIELDTR("room_opm",  "fld", L("lcl_estate_ruimte_man_opmerk"), diff.opmerking,    {maxlength: 50});
+                    RWFIELDTR("room_opm",  "fld", L("lcl_estate_ruimte_man_opmerk"), diff.opmerking,    {maxlength: 50});
 
                     var times = [];
                     for (i=0; i<24; i++)
@@ -165,15 +165,15 @@ oRs.Close();
                     FCLTselector( "room_beginuur",
                                   times.join(" UNION ALL "),
                                   { label: L("lcl_estate_gebouw_beginuur"),
-                                    emptyOption: "",
-                                    initEmpty: true
+                                    initKey: diff.beginuur,
+                                    emptyOption: ""
                                   }
                                 );
                     FCLTselector( "room_einduur",
                                   times.join(" UNION ALL "),
                                   { label: L("lcl_estate_gebouw_einduur"),
-                                    emptyOption: "",
-                                    initEmpty: true
+                                    initKey: diff.einduur,
+                                    emptyOption: ""
                                   }
                                 );
 
@@ -183,41 +183,30 @@ oRs.Close();
                     FCLTselector( "room_werkdagen",
                                   sql,
                                   { label: L("lcl_estate_gebouw_werkdagen"),
-                                    emptyOption: "",
-                                    initEmpty: true
+                                    initKey: diff.werkdagen
                                   }
                                 );
                 }
-            MODAL_BLOCK_END();
+            BLOCK_END();
         }
-
+*/
         generateFlexKenmerkBlock({
+            fnpre: function () {BLOCK_START("algMultiEdit", L("lcl_flexible_properties"));},
+            fnpost: BLOCK_END,
             onrgoed_niveau: "R",
             onrgoed_key: -1,
             this_alg: last_this_alg,
             reado: false,
-            multi: true
+            multi: true,
+            flexcolumns: 1 // altijd want popup
           });
 
-%>
-    <script>
-      $(function()
-        {
-          init_multi();
-        });
-    </script>
-<%
-
     var buttons =  [];
-    buttons.push({title: L("lcl_submit"), action: "alg_submit()", singlepress: true, id: "btn_alg_submit", importance: 1, icon: "fa-fclt-save"});
-    buttons.push({title: L("lcl_cancel"), action: "alg_cancel()", importance: 3, icon: "fa-fclt-cancel"});
-    SIMPLE_BLOCK_START();
+    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);
-    SIMPLE_BLOCK_END();
 IFACE.FORM_END();
 %>
     </form>
-    <% MODAL_END(); %>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_ruimte_multi_save.asp

@@ -13,30 +13,19 @@ var JSON_Result = true;
 %>
 
 <!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/save2db.inc" -->
 <!-- #include file="../Shared/kenmerk_common.inc" -->
 <!-- #include file="./alg.inc" -->
 
 <%
-protectRequest.validateToken();
+//protectRequest.validateToken();
 var alg_key_arr = getQParamIntArray("alg_keys");
+var alg_level = getQParam("alg_level");
+
 var warning = "";
 var result = {};
 var nr_edited = 0;
-var fields = [];
-
-if (Request.Form("room_srt").Count == 1 && getFParam("check_room_srt", "off") == "on")
-    fields.push({ dbs: "alg_srtruimte_key",  typ: "key",  frm: "room_srt" });
-if (Request.Form("dienstniveau").Count == 1 && getFParam("check_dienstniveau", "off") == "on")
-    fields.push({ dbs: "mld_dienstniveau_key", typ: "key", frm: "dienstniveau", track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" });
-if (Request.Form("room_oms").Count == 1 && getFParam("check_room_oms", "off") == "on")
-    fields.push({ dbs: "alg_ruimte_omschrijving", typ: "varchar", frm: "room_oms", track: L("lcl_estate_ruimte_man_descr") });
-if (Request.Form("room_beginuur").Count == 1 && getFParam("check_room_beginuur", "off") == "on")
-    fields.push({ dbs: "alg_ruimte_beginuur", typ: "float", frm: "room_beginuur", track: L("lcl_estate_gebouw_beginuur") });
-if (Request.Form("room_einduur").Count == 1 && getFParam("check_room_einduur", "off") == "on")
-    fields.push({ dbs: "alg_ruimte_einduur", typ: "float", frm: "room_einduur", track: L("lcl_estate_gebouw_einduur") });
-if (Request.Form("room_werkdagen").Count == 1 && getFParam("check_room_werkdagen", "off") == "on")
-    fields.push({ dbs: "alg_ruimte_werkdagen",  typ: "key",  frm: "room_werkdagen" });
 
 for (var i = 0; i < alg_key_arr.length; i++)
 {
@@ -45,30 +34,25 @@ for (var i = 0; i < alg_key_arr.length; i++)
     if (this_alg.writeman || this_alg.writeuse)
     {
         // Ik mag de ruimte wijzigen dus voer wijziging uit
+        var fields = [];
         var algUpd = buildTrackingUpdate("alg_ruimte", " alg_ruimte_key = " + alg_key, fields);
-        // Submit the changed data
-        var err = Oracle.Execute(algUpd.sql, true);
-        if (err.friendlyMsg)
-            warning = err.friendlyMsg;
+    //    // Submit the changed data
+    //    var err = Oracle.Execute(algUpd.sql, true);
+    //    if (err.friendlyMsg)
+    //        warning = err.friendlyMsg;
 
         currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
                             + "     , ok.alg_onrgoedkenmerk_waarde"
-                            + "     , k.alg_kenmerk_toonbaar"
-                            + "     , k.fac_functie_key"
                             + "  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 = 'R'"
+                            + "   AND ok.alg_onrgoed_niveau = " + safe.quoted_sql(alg_level)
                             + "   AND ok.alg_onrgoed_key = " + alg_key;
 
 
         allKenmerkenSQL     = "SELECT " + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key') + " kenmerk_omschrijving"
-                            + "     , k.alg_kenmerk_kenmerktype kenmerk_kenmerktype"
-                            + "     , k.alg_kenmerk_systeem     kenmerk_systeem"
-                            + "     , k.alg_kenmerk_toonbaar    kenmerk_readonly"
-                            + "     , k.alg_kenmerk_uniek       kenmerk_uniek"
-                            + "     , fac_kenmerkdomein_key"
+                            + ",      fac_kenmerkdomein_key"
                             + "  FROM alg_kenmerk k"
                             + " WHERE k.alg_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
 
@@ -77,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,
@@ -86,21 +69,17 @@ for (var i = 0; i < alg_key_arr.length; i++)
                                             tracking: true,
                                             module: "ALG",
                                             moduleName: "alg_onrgoed_niveau",
-                                            moduleVal: "R"
+                                            moduleVal: alg_level
                                           });
 
-        if (flextrack && flextrack.length)
-        {
-            var update_string = L("lcl_alg_is_algrup") + "\n" + flextrack.join("\n");
-            shared.trackaction("ALGRUP", alg_key, update_string);
-            nr_edited++;
-        }
+        var update_string = L("lcl_alg_is_algrup") + "\n" + algUpd.trackarray.join("\n");
+        shared.trackaction("ALGRUP", alg_key, update_string);
+        nr_edited++;
     }
 }
 
 result = { success : true, refresh: true };
 
 Response.Write(JSON.stringify(result));
-
-ASPPAGE_END();
-%>
+Response.End;
+%>

APPL/ALG/alg_edit_ruimte_save.asp

@@ -13,6 +13,7 @@ var JSON_Result = true;
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../API2/api2.inc" -->
 <!-- #include file="../API2/model_rooms.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 
 <%
 protectRequest.validateToken();
@@ -38,13 +39,12 @@ var params = { filter: { id: room_key,
                          scope: "fe"
                        },
                properties: { extraserie: false,
-                             nameprefix: "k",
-                             returnArray: true
+                             nameprefix: "k"
                            }
              };
 var rooms = new model_rooms();
 var jsondata = api2.form2JSONdata(rooms, params, formfields);
-jsondata.custom_fields = flexkenmerken2jsondata(params.properties);
+jsondata.properties = flexkenmerken2jsondata(params.properties);
 
 switch (room_action)
 {
@@ -70,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,12 +63,12 @@ if (srtruimte_lg_key > -1)
 <html>
   <head>
 <%  FCLTHeader.Generate(); %>
-    <script type="text/javascript">
-      async function ruimtefunctie_submit()
+    <script  type="text/javascript" >
+      function ruimtefunctie_submit()
       {
         document.activeElement.blur(); // trigger laatste onChanges
         // Standaard checks op verplichte velden, datum formaat, numeriek en float formaat, currency formaat.
-        if (!await validateForm("u2"))
+        if (!validateForm("u2"))
             return false;
 
         document.forms.u2.submit();
@@ -79,28 +79,28 @@ if (srtruimte_lg_key > -1)
         FcltMgr.closeDetail(window, { cancel: true } );
       }
 
-      $(function()
-      {
-        FcltMgr.resized(window);
-      });
+      jQuery(document).ready(function()
+                             {
+                               FcltMgr.resized(window);
+                             });
     </script>
   </head>
 
-  <body class="editmode">
-  <% SUBFRAME_START(); %>
+  <body id="editbody">
 <%
-    var buttons =  [ {title: L("lcl_submit"), action:"ruimtefunctie_submit()", icon: "fa-fclt-save" },
-                     {title: L("lcl_cancel"), action:"ruimtefunctie_cancel()", icon: "fa-fclt-cancel" }];
+    var buttons =  [ {title: L("lcl_submit"), action:"ruimtefunctie_submit()", icon: "opslaan.png" },
+                     {title: L("lcl_cancel"), action:"ruimtefunctie_cancel()", icon: "undo.png" }];
 
     IFRAMER_HEADER(L("lcl_alg_srtruimte_frame"), buttons);
 %>
+    <div id="edit">
     <form name="u2"
           action="alg_edit_ruimtefunctie_save.asp?srtruimte_lg_key=<%=srtruimte_lg_key%>"
           method="post"
           target="hidFrameSubmit"
           onSubmit="ruimtefunctie_submit();">
 <%
-      BLOCK_START("algRuimtefunctieLg", L("lcl_prs_basisblok"), {icon: "fa-info-square"});
+      BLOCK_START("algRuimtefunctieLg", L("lcl_prs_basisblok"));
 
       <!-- Ruimtesoort -->
   sql  = "SELECT   alg_srtruimte_key, "
@@ -121,18 +121,17 @@ if (srtruimte_lg_key > -1)
                                                     eindlevel: 3 // gebouw
                                                   });
 
-      RWFIELDTR("prijs", "fldalgprijs fldshort", L("lcl_alg_alg_tarief"), safe.editablefloat(prijs, 5), {maxlength: 17, datatype: "float"});
-      RWFIELDTR("prijs2", "fldalgprijs fldshort", L("lcl_alg_alg_tariefA"), safe.editablefloat(prijs2, 5), {maxlength: 17, datatype: "float"});
-      RWFIELDTR("prijs3", "fldalgprijs fldshort", L("lcl_alg_alg_tariefB"), safe.editablefloat(prijs3, 5), {maxlength: 17, datatype: "float"});
-      RWFIELDTR("prijs4", "fldalgprijs fldshort", L("lcl_alg_alg_tariefC"), safe.editablefloat(prijs4, 5), {maxlength: 17, datatype: "float"});
-      RWFIELDTR("prijs5", "fldalgprijs fldshort", L("lcl_alg_alg_tariefD"), safe.editablefloat(prijs5, 5), {maxlength: 17, datatype: "float"});
+      RWFIELDTR("prijs", "fldalgprijs", L("lcl_alg_alg_tarief"), safe.editablefloat(prijs, 5), {maxlength: 17, datatype: "float"});
+      RWFIELDTR("prijs2", "fldalgprijs", L("lcl_alg_alg_tariefA"), safe.editablefloat(prijs2, 5), {maxlength: 17, datatype: "float"});
+      RWFIELDTR("prijs3", "fldalgprijs", L("lcl_alg_alg_tariefB"), safe.editablefloat(prijs3, 5), {maxlength: 17, datatype: "float"});
+      RWFIELDTR("prijs4", "fldalgprijs", L("lcl_alg_alg_tariefC"), safe.editablefloat(prijs4, 5), {maxlength: 17, datatype: "float"});
+      RWFIELDTR("prijs5", "fldalgprijs", L("lcl_alg_alg_tariefD"), safe.editablefloat(prijs5, 5), {maxlength: 17, datatype: "float"});
 
       BLOCK_END();
 IFACE.FORM_END();
 %>
     </form>
     <iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
-<% SUBFRAME_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,27 +11,24 @@
     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" -->
 
 <%
-FCLTHeader.Requires({ plugins:["suggest", "jQuery", "kenmerk"], js: [] })
+FCLTHeader.Requires({plugins:["suggest","jQuery", "kenmerk"], js: []})
 
 var ter_key  = getQParamInt("ter_key", -1);
 
 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));
+user.auth_required_or_abort(this_alg.writeman || (ter_key>0&&this_alg.writeuse));
 
 if (ter_key > 0)
 {
@@ -45,59 +42,39 @@ 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>
 <head>
 <%
-    FCLTHeader.Generate();
+   FCLTHeader.Generate();
 %>
 <script>
-    async function alg_submit()
+    function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
-        if (!await validateForm("u2"))
+        if (!validateForm("u2"))
             return false;
         document.forms.u2.submit();
     }
@@ -109,13 +86,13 @@ else
 </script>
 </head>
 
-<body class="editmode">
-<% SUBFRAME_START(); %>
+<body id="editbody">
 <%
-  var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "fa-fclt-save" },
-                   {title: L("lcl_cancel"), action:"alg_cancel()", icon: "fa-fclt-cancel" } ];
+  var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "opslaan.png" },
+                   {title: L("lcl_cancel"), action:"alg_cancel()", icon: "undo.png" } ];
   IFRAMER_HEADER(L("lcl_alg_terreinsector_frame"), buttons);
 %>
+<div id="edit">
 <form name="u2"
       action="alg_edit_terreinsector_save.asp?ter_key=<%=ter_key%>"
       method="post"
@@ -128,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("algter1", L("lcl_alg_terreinsector_frame"), {icon : "fa-draw-polygon"});
+BLOCK_START("algInfo", "");
 
   FCLTplaatsselector(this_alg.authparams("WEB_TERMAN").ALGwritelevel, {
                     locatiekey: loc_key,
@@ -137,8 +114,6 @@ BLOCK_START("algter1", L("lcl_alg_terreinsector_frame"), {icon : "fa-draw-polygo
                     readonly: false, //ter_key > 0,
                     required: true });
 
-  RWFIELDTR("ter_naam", "fld", L("lcl_estate_terreinsector_man_name"), ter_naam, {maxlength: 30, required: true});
-  RWFIELDTR("ter_code", "fld", L("lcl_estate_terreinsector_man_code"), ter_code, {maxlength: 12, required: true});
   sql = "SELECT   alg_srtterreinsector_key, "
       + lcl.xsqla('alg_srtterreinsec_omschrijving', 'alg_srtterreinsector_key')
       + "    FROM alg_v_aanwezigsrtterreinsector "
@@ -150,81 +125,35 @@ BLOCK_START("algter1", L("lcl_alg_terreinsector_frame"), {icon : "fa-draw-polygo
                  emptyOption: "",
                  readonly: false
               });
-  RWFIELDTR("ter_oms", "fld", L("lcl_estate_terreinsector_man_descr"), ter_oms, {maxlength: 60});
-BLOCK_END();
 
-  BLOCK_START("algLoc5", L("lcl_alg_gebouw_bezoek"), {icon: "fa-user-tag"});
-  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("algter3", L("lcl_alg_gebouw_administr"), {icon: "fa-clipboard"});
-  FCLTcalendar("vervaldatum",
-               { datum: vervaldatum,
-                 initEmpty: vervaldatum==null,
-                 label: L("lcl_alg_vervaldatum"),
-                 readonly: !this_alg.writeman
-               });
+  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});
 
   FCLTkostenplaatsselector( "prs_kstn",
                           "prs_kstn",
                           user_key,
                           { kostenplaatsKey: prs_kstn,
                             label: L("lcl_prs_dept_kosten") });
-  RWFIELDTR("ter_ordnr", "fld", L("lcl_estate_gebouw_ordernr"), ter_ordnr, {maxlength: 30});
 
-  FCLTpersoonselector("verantw",
-                      "sgVerantw",
-                      { perslidKey: verantw_key,
-                        label: L("lcl_alg_verantw"),
-                        autlevel: this_alg.authparams("WEB_TERMAN") && this_alg.authparams("WEB_TERMAN").PRSwritelevel
-                      });
-  FCLTpersoonselector("verantw2",
-                      "sgVerantw2",
-                      { perslidKey: verantw_key2,
-                        label: L("lcl_alg_verantw2"),
-                        autlevel: this_alg.authparams("WEB_TERMAN") && this_alg.authparams("WEB_TERMAN").PRSwritelevel
-                      });
-  FCLTafdelingselector("prs_afd",  // geen idee eigenlijk wat die hier doet? Als huurder? Parkeerders.
+  FCLTafdelingselector("prs_afd",
                        "sgDept",
                         { label: L("lcl_dep_name_level2"),
-                          departmentKey: prs_afd
-                          //autlevel: authparams.PRSreadlevel
+                          departmentKey: prs_afd,
+                          //autlevel: authparams.PRSreadlevel,
+                          whenEmpty: L("lcl_search_generic")
                         });
-  FILEPICKERTR("ter_image", L("lcl_alg_terreinsector_image"), ter_image, { "key": ter_key, "module": "ALGPHT", "readonly": !this_alg.writeman });
-BLOCK_END();
 
-BLOCK_START("algter4", L("lcl_alg_gebouw_fysiek"), {icon: "fa-ruler-combined"});
-
-  RWFIELDTR("ter_opp", "fldshort", L("lcl_estate_terreinsector_man_oppervlak"), ter_opp, {maxlength: 15});
-  RWFIELDTR("ter_omt", "fldshort", L("lcl_estate_terreinsector_man_omtrek"), ter_omt, {maxlength: 15});
+  RWFIELDTR("ter_ordnr", "fld", L("lcl_estate_terreinsector_ordernr"), ter_ordnr, {maxlength: 30});
+  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});
 
 BLOCK_END();
 
-
 generateFlexKenmerkBlock ({
      onrgoed_key    : ter_key,
      onrgoed_niveau : onrgoedlvl,
      reado          : false,
+     flexcolumns    : S("alg_flexcolumns"),
      this_alg       : this_alg
 });
 
@@ -232,7 +161,6 @@ IFACE.FORM_END();
 %>
 </form>
 <iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
-<% SUBFRAME_END(); %>
+</div>
 </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_terreinsector_multi.asp

@@ -1,180 +0,0 @@
-<%@language = "javascript" %>
-<% /*
-     $Revision$
-     $Id$
-
-    File:               alg_edit_terreinsector_multi.asp
-    Description:        Multi editten van terreinsectoren
-    Parameters:         alg_keys
-
-    Context:
-    Note:
-
-*/ %>
-<!-- #include file="../Shared/common.inc" -->
-<!-- #include file="../Shared/iface.inc" -->
-<!-- #include file="../Shared/save2db.inc" -->
-<!-- #include file="../Shared/calendar.inc" -->
-<!-- #include file="../Shared/selector.inc" -->
-<!-- #include file="../Shared/kostenplaatsselector.inc" -->
-<!-- #include file="../Shared/afdelingselector.inc" -->
-<!-- #include file="../Shared/persoonselector.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"],
-                      js: ["multi.js"] });
-
-var ter_key_arr = getQParamIntArray("ter_keys");
-var warning = "";
-var result = {};
-var tobeedited = 0;
-var ingesloten = [];
-// Bepaal de terreinsectoren in de selectie die
-// ook echt bewerkt kunnen of mogen worden.
-for (var i = 0; i < ter_key_arr.length; i++)
-{
-    var this_alg = alg.func_enabled(ter_key_arr[i], "T");
-    if (this_alg.writeman || this_alg.writeuse)
-    {
-        ingesloten.push(ter_key_arr[i]);
-        tobeedited++;
-        var last_this_alg = this_alg; // deze gebruiken we voor rechtencontrole. Niet 100% zuiver maar goed genoeg
-    }
-}
-user.auth_required_or_abort(tobeedited > 0); // We klagen niet over enkele wel en enkele niet
-%>
-
-<html>
-  <head>
-<%  FCLTHeader.Generate(); %>
-    <script type="text/javascript">
-
-        $(function () { $("select option[value=-1]").val(""); }); // prevents removal of values from listboxes
-        function alg_submit()
-        {
-            $.post($("form[name=u2]")[0].action,
-                   $("[name=u2]").serialize(),
-                   FcltCallbackAndThenAlways(alg_submit_callback),
-                   "json");
-            return true; // disable button
-        }
-
-        function alg_submit_callback(json)
-        {
-            iface.button.enable("btn_alg_submit");
-            if (json.success)
-                FcltMgr.closeDetail(window, json);
-        }
-
-        function alg_cancel()
-        {
-            FcltMgr.closeDetail(window, { cancel: true } );
-        }
-
-    </script>
-  </head>
-
-  <body class="fclt-modal" id="mod_algmultiedit">
-  <% MODAL_START(); %>
-    <form name="u2" action="alg_edit_terreinsector_multi_save.asp?ter_keys=<%=ingesloten.join(",")%>" method="post">
-<%
-        MODAL_BLOCK_START("algFlex", L("lcl_ins_meta_data"), { icon: "fa-draw-polygon" });
-            // terreinsector specifieke velden
-            sql = "SELECT   alg_srtterreinsector_key,"
-                + lcl.xsqla('alg_srtterreinsec_omschrijving', 'alg_srtterreinsector_key')
-                + "  FROM alg_v_aanwezigsrtterreinsector"
-                + " ORDER BY UPPER("+lcl.xsql('alg_srtterreinsec_omschrijving', 'alg_srtterreinsector_key')+")";
-            FCLTselector( "ter_srt",
-                           sql,
-                           { label: L("lcl_estate_ruimte_man_sort"),
-                             emptyOption: "",
-                             initEmpty: true
-                           });
-            FCLTcalendar("vervaldatum",
-                         { initEmpty: true,
-                           label: L("lcl_alg_vervaldatum"),
-                           onChange: "DateChangedVerval()",
-                           readonly: !this_alg.writeman
-                         });
-            FCLTkostenplaatsselector("prs_kstn",
-                                     "prs_kstn",
-                                     user_key,
-                                     { //kostenplaatsKey: prs_kstn,
-                                       label: L("lcl_prs_dept_kosten")
-                                     });
-            FCLTpersoonselector("verantw",
-                                "sgVerantw",
-                                { //perslidKey: verantw_key,
-                                  label: L("lcl_alg_verantw"),
-                                  autlevel: this_alg.authparams("WEB_TERMAN") && this_alg.authparams("WEB_TERMAN").PRSwritelevel
-                                });
-            FCLTpersoonselector("verantw2",
-                                "sgVerantw2",
-                                { //perslidKey: verantw_key2,
-                                  label: L("lcl_alg_verantw2"),
-                                  autlevel: this_alg.authparams("WEB_TERMAN") && this_alg.authparams("WEB_TERMAN").PRSwritelevel
-                                });
-            FCLTafdelingselector("prs_afd",
-                                 "sgDept",
-                                 { label: L("lcl_dep_name_level2")
-                                   //departmentKey: prs_afd
-                                   //autlevel: authparams.PRSreadlevel
-                                 });
-            var sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toontelfLOV"));
-            FCLTselector("toon_telefoon",
-                        sql,
-                        { label: L("lcl_estate_gebouw_toon_telefoon"),
-                          emptyOption: "",
-                          initEmpty: true
-                        });
-            sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonmailLOV"));
-            FCLTselector("toon_email",
-                       sql,
-                       { label: L("lcl_estate_gebouw_toon_email"),
-                         emptyOption: "",
-                         initEmpty: true
-                       });
-            sql = api2.splitLOV2sql(L("lcl_estate_gebouw_toonkentLOV"));
-            FCLTselector("toon_kenteken",
-                       sql,
-                       { label: L("lcl_estate_gebouw_toon_kenteken"),
-                         emptyOption: "",
-                         initEmpty: true
-                       });
-        MODAL_BLOCK_END();
-
-
-        generateFlexKenmerkBlock({
-            onrgoed_niveau: "T",
-            onrgoed_key: -1,
-            this_alg: last_this_alg,
-            reado: false,
-            multi: true
-          });
-
-%>
-    <script>
-        $(function()
-          {
-            init_multi();
-          });
-    </script>
-<%
-
-    var buttons =  [];
-    buttons.push({title: L("lcl_submit"), action: "alg_submit()", singlepress: true, id: "btn_alg_submit", importance: 1, icon: "fa-fclt-save"});
-    buttons.push({title: L("lcl_cancel"), action: "alg_cancel()", importance: 3, icon: "fa-fclt-cancel"});
-    SIMPLE_BLOCK_START();
-    CreateButtons(buttons);
-    SIMPLE_BLOCK_END();
-IFACE.FORM_END();
-%>
-    </form>
-    <% MODAL_END(); %>
-  </body>
-</html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_terreinsector_multi_save.asp

@@ -1,117 +0,0 @@
-<%@ language = "JavaScript" %>
-<% /*
-    $Revision$
-    $Id$
-
-    File:               alg_edit_terreinsector_multi_save.asp
-    Description:        save script van alg_edit_terreinsector_multi.asp
-    Globalen:
-    Context:
-    Note:
-*/
-var JSON_Result = true;
-%>
-
-<!-- #include file="../Shared/common.inc" -->
-<!-- #include file="../Shared/save2db.inc" -->
-<!-- #include file="../Shared/kenmerk_common.inc" -->
-<!-- #include file="./alg.inc" -->
-
-<%
-protectRequest.validateToken();
-var ter_key_arr = getQParamIntArray("ter_keys");
-var warning = "";
-var result = {};
-var nr_edited = 0;
-var fields = [];
-
-if (Request.Form("ter_srt").Count == 1 && getFParam("check_ter_srt", "off") == "on")
-    fields.push({ dbs: "alg_srtterreinsector_key", typ: "key", frm: "ter_srt", track: L("lcl_estate_terreinsector_man_sort"), foreign: "ALG_SRTTERREINSECTOR" });
-if (Request.Form("vervaldatum").Count == 1 && getFParam("check_vervaldatum", "off") == "on")
-    fields.push({ dbs: "alg_terreinsector_vervaldatum", typ: "date", frm: "vervaldatum", track: L("lcl_alg_vervaldatum") });
-if (Request.Form("prs_kstn").Count == 1 && getFParam("check_prs_kstn", "off") == "on")
-    fields.push({ dbs: "prs_kostenplaats_key", typ: "key", frm: "prs_kstn", 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("prs_afd").Count == 1 && getFParam("check_prs_afd", "off") == "on")
-    fields.push({ dbs: "prs_afdeling_key",  typ: "key",  frm: "prs_afd", track: L("lcl_dep_name_level2"), foreign: "PRS_AFDELING"});
-if (Request.Form("toon_telefoon").Count == 1 && getFParam("check_toon_telefoon", "off") == "on")
-{   var toon_t = (getFParam("toon_telefoon") ? getFParam("toon_telefoon") : 0);
-    fields.push({ dbs: "alg_terreinsector_toon_telef",   typ: "number", val: toon_t, track: L("lcl_estate_gebouw_toon_telefoon")});
-}
-if (Request.Form("toon_email").Count == 1 && getFParam("check_toon_email", "off") == "on")
-{   var toon_e = (getFParam("toon_email") ? getFParam("toon_email") : 0);
-    fields.push({ dbs: "alg_terreinsector_toon_email",   typ: "number", val: toon_e, track: L("lcl_estate_gebouw_toon_email")});
-}
-if (Request.Form("toon_kenteken").Count == 1 && getFParam("check_toon_kenteken", "off") == "on")
-{   var toon_k = (getFParam("toon_kenteken") ? getFParam("toon_kenteken") : 0);
-    fields.push({ dbs: "alg_terreinsector_toon_kentk",   typ: "number", val: toon_k, track: L("lcl_estate_gebouw_toon_kenteken")});
-}
-
-
-for (var i = 0; i < ter_key_arr.length; i++)
-{
-    var alg_key = ter_key_arr[i];
-    var this_alg = alg.func_enabled(alg_key, "T");
-    if (this_alg.writeman || this_alg.writeuse)
-    {
-        var algUpd = buildTrackingUpdate("alg_terreinsector", " alg_terreinsector_key = " + alg_key, fields);
-        // Submit the changed data
-        var err = Oracle.Execute(algUpd.sql, true);
-        if (err.friendlyMsg)
-            warning = err.friendlyMsg;
-
-        currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                            + "     , ok.alg_onrgoedkenmerk_waarde"
-                            + "     , k.alg_kenmerk_toonbaar"
-                            + "     , k.fac_functie_key"
-                            + "  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 = 'T'"
-                            + "   AND ok.alg_onrgoed_key = " + alg_key;
-
-        allKenmerkenSQL     = "SELECT " + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key') + " kenmerk_omschrijving"
-                            + "     , k.alg_kenmerk_kenmerktype kenmerk_kenmerktype"
-                            + "     , k.alg_kenmerk_systeem     kenmerk_systeem"
-                            + "     , k.alg_kenmerk_toonbaar    kenmerk_readonly"
-                            + "     , k.alg_kenmerk_uniek       kenmerk_uniek"
-                            + "     , fac_kenmerkdomein_key"
-                            + "  FROM alg_kenmerk k"
-                            + " WHERE k.alg_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
-
-        var flextrack = saveFlexKenmerken(alg_key,
-                                          { kenmerkTable: "alg_onrgoedkenmerk",
-                                            kenmerkParentKey : "alg_onrgoed_key",
-                                            kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
-                                            kenmerkKey: "alg_kenmerk_key",
-                                            kenmerkToonbaar: "alg_kenmerk_toonbaar",
-                                            currentKenmerkenSQL: currentKenmerkenSQL,
-                                            allKenmerkenSQL: allKenmerkenSQL,
-                                            requestQF: Request.Form,
-                                            flexPath: "ALG/T",
-                                            multiMode: true,
-                                            tracking: true,
-                                            module: "ALG",
-                                            moduleName: "alg_onrgoed_niveau",
-                                            moduleVal: "T"
-                                          });
-
-        if (flextrack && flextrack.length)
-        {
-            var update_string = L("lcl_alg_is_algrup") + "\n" + flextrack.join("\n");
-            shared.trackaction("ALGTUP", alg_key, update_string);
-            nr_edited++;
-        }
-    }
-}
-
-result = { success : true, refresh: true };
-
-Response.Write(JSON.stringify(result));
-
-ASPPAGE_END();
-%>

APPL/ALG/alg_edit_terreinsector_save.asp

@@ -15,45 +15,29 @@
                       js: []
                     }) %>
 <%
-var ter_key = getQParamInt("ter_key");
-var loc_key = getFParamInt("locatiekey", -1);
-
-var isNew = (ter_key < 0);
+var ter_key = getQParamInt( "ter_key" );
 
 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));
+user.auth_required_or_abort(this_alg.writeman || (ter_key>0&&this_alg.writeuse));
 
-var fields = [{ dbs: "alg_terreinsector_omschrijving", typ: "varchar", frm: "ter_oms",       track: L("lcl_estate_terreinsector_man_descr") },
-              { 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_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" }];
-
-if (this_alg.writeman)
-{
-    fields.push({ 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") });
-
-    if (alg.canWriteLocatie(loc_key, this_alg.authparams("WEB_TERMAN").ALGwritelevel))
-        fields.push({ dbs: "alg_locatie_key",            typ: "key",     val: loc_key,       track: true /* afzonderlijke tracking, wel oldjsval */ });
-}
+  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 algUpd = buildTrackingUpdate("alg_terreinsector", "alg_terreinsector_key = " + ter_key, fields);
+  {
+    var terUpd = buildTrackingUpdate("alg_terreinsector", "alg_terreinsector_key = " + ter_key, fields);
 
-    var err = Oracle.Execute(algUpd.sql, true);
+    var err = Oracle.Execute(terUpd.sql, true);
     if (err.friendlyMsg)
     {
         warning = err.friendlyMsg;
@@ -62,7 +46,7 @@ if (ter_key > 0)
     {
         // We staan locatiewijziging toe. Wel zorgen dat redundante velden blijven kloppen
         var loc_key = getFParamInt("locatiekey");
-        if (loc_key != algUpd.oldjsvals["alg_locatie_key"])
+        if (loc_key != terUpd.oldjsvals["alg_locatie_key"])
         {
             sql = "UPDATE mld_melding"
                 + "   SET mld_alg_locatie_key = " + loc_key
@@ -82,92 +66,55 @@ 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;
-}
+  }
 
-var flextrack = [];
-if (!warning)
-{
-      currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                          + "     , ok.alg_onrgoedkenmerk_waarde"
-                          + "     , k.alg_kenmerk_toonbaar"
-                          + "     , k.fac_functie_key"
-                          + "  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;
-
-    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 */
-
-      flextrack = saveFlexKenmerken(ter_key,
+  if (!warning)
+  {
+      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,
-                          allKenmerkenSQL: allKenmerkenSQL,
                           requestQF: Request.Form,
                           flexPath: "ALG/T",
                           module: "ALG",
-                          tracking: true,
                           moduleName: "alg_onrgoed_niveau",
                           moduleVal: "T",
-                          isNew: isNew
+                          isNew: ter_key < 0
                         });
-
-    if (!isNew)
-    {
-      if (flextrack && flextrack.length)
-      {
-        if (algUpd && algUpd.trackarray.length)
-          algUpd.trackarray = algUpd.trackarray.concat(flextrack);
-        else
-          algUpd.trackarray = flextrack;
-      }
-      if (algUpd && algUpd.trackarray.length)
-          shared.trackaction("ALGTUP", ter_key, algUpd.trackarray.join("\n"));
-    }
-    else
-      shared.trackaction("ALGTNE", ter_key);
-
-
 }
-%>
+  %>
 
 <html>
   <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

@@ -7,6 +7,9 @@
     Description:  wijzigen of toevoegen verdieping
     Parameters:   flr_key
 
+    Context:
+    Note:
+
 */ %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
@@ -19,8 +22,9 @@
 <%
 FCLTHeader.Requires({plugins:["suggest","jQuery"], js: []})
 
-var flr_key = getQParamInt("flr_key", -1);
-var bld_key, loc_key, flr_dwgz;
+var flr_key  = getQParamInt("flr_key", -1);
+var bld_key
+var loc_key
 
 var onrgoedlvl = "V";
 var this_alg = alg.func_enabled(flr_key, onrgoedlvl);
@@ -28,20 +32,16 @@ user.auth_required_or_abort(this_alg.writeman || (flr_key>0&&this_alg.writeuse))
 
 if (flr_key > 0)
 {
-    var sql = "SELECT alg_verdieping_omschrijving"
-            + "     , alg_verdieping_volgnr"
-            + "     , alg_verdieping_code"
-            + "     , mld_dienstniveau_key"
-            + "     , alg_verdieping_dwgz"
-            + "  FROM alg_verdieping "
-            + "       WHERE alg_verdieping_key = " + flr_key;
-    var oRs = Oracle.Execute(sql);
+    sql = " select * "
+        + "  FROM ALG_VERDIEPING "
+        + "       WHERE alg_verdieping_key = " + flr_key;
 
-    var flr_omschr = oRs("alg_verdieping_omschrijving").Value;
-    var flr_volgnr = oRs("alg_verdieping_volgnr").Value;
-    var flr_code   = oRs("alg_verdieping_code").Value;
-    var dienstniveau  = oRs("mld_dienstniveau_key").Value;
-    var flr_dwgz = oRs("alg_verdieping_dwgz").Value;
+    oRs = Oracle.Execute(sql);
+
+    var flr_omschr = oRs("ALG_VERDIEPING_OMSCHRIJVING").value;
+    var flr_volgnr = oRs("ALG_VERDIEPING_VOLGNR").value;
+    var flr_code   = oRs("ALG_VERDIEPING_CODE").value;
+    var dienstniveau  = oRs("mld_dienstniveau_key").value;
     oRs.Close();
 }
 %>
@@ -52,10 +52,10 @@ if (flr_key > 0)
    FCLTHeader.Generate();
 %>
 <script>
-    async function alg_submit()
+    function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
-        if (!await validateForm("u2"))
+        if (!validateForm("u2"))
             return false;
 
         document.forms.u2.submit();
@@ -67,13 +67,13 @@ if (flr_key > 0)
 </script>
 </head>
 
-<body class="editmode">
-<% SUBFRAME_START(); %>
+<body id="editbody">
 <%
-  var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "fa-fclt-save" },
-                   {title: L("lcl_cancel"), action:"alg_cancel()", icon: "fa-fclt-cancel" } ];
+  var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "opslaan.png" },
+                   {title: L("lcl_cancel"), action:"alg_cancel()", icon: "undo.png" } ];
   IFRAMER_HEADER(L("lcl_alg_verdieping_frame"), buttons);
 %>
+<div id="edit">
 <form name="u2"
       action="alg_edit_verdieping_save.asp?urole=bo&flr_key=<%=flr_key%>"
       method="post"
@@ -85,7 +85,7 @@ if (this_alg.writeman)
 else
     manRWFIELD = function (a,b,c,d,e) { ROFIELDTR(b,c,d,e) }; // als geen USE of <self> dan zijn er veel readonly
 
-BLOCK_START("algflr1", L("lcl_floor"), {icon: "fa-layer-group"});
+BLOCK_START("algLoc1", "&nbsp;");
       FCLTplaatsselector(this_alg.authparams("WEB_ALGMAN").ALGwritelevel, {
               locatiekey: loc_key,
               gebouwkey: bld_key,
@@ -113,22 +113,21 @@ BLOCK_START("algflr1", L("lcl_floor"), {icon: "fa-layer-group"});
 
 BLOCK_END();
 
-BLOCK_START("algflr2", L("lcl_alg_gebouw_fysiek"), {icon: "fa-ruler-combined"});
+BLOCK_START("algLoc2", "&nbsp;");
 if (flr_key > 0)
 {
-  var calcopp = alg.calc_algm2(flr_key, onrgoedlvl);
-  ROFIELDTR("fld", L("lcl_estate_verdieping_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppfloor, {suppressEmpty: true, datatype: "float"});
-  ROFIELDTR("fld", L("lcl_estate_verdieping_netto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.opprooms, {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("flr_dwgz", "fld", L("lcl_estate_verdieping_man_dwgz"), flr_dwgz, {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 ({
      onrgoed_key    : flr_key,
      onrgoed_niveau : onrgoedlvl,
      reado          : false,
+     flexcolumns    : S("alg_flexcolumns"),
      this_alg       : this_alg
 });
 
@@ -136,7 +135,6 @@ IFACE.FORM_END();
 %>
 </form>
 <iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
-<% SUBFRAME_END(); %>
+</div>
 </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_verdieping_multi.asp

@@ -1,125 +0,0 @@
-<%@language = "javascript" %>
-<% /*
-     $Revision$
-     $Id$
-
-    File:               alg_edit_verdieping_multi.asp
-    Description:        Multi editten van verdiepingen
-    Parameters:         key
-
-    Context:            alg_verdieping_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/kenmerk_common.inc" -->
-<!-- #include file="../API2/api2.inc" -->
-<!-- #include file="./alg_flexkenmerk.inc" -->
-<!-- #include file="alg.inc" -->
-
-<%
-FCLTHeader.Requires({ plugins: ["suggest", "jQuery", "kenmerk"],
-                      js: ["multi.js"] });
-
-var flr_key_arr = getQParamIntArray("flr_keys");
-var warning = "";
-var result = {};
-var tobeedited = 0;
-var ingesloten = [];
-// Bepaal de verdiepingen in de selectie die
-// ook echt gewijzigd kunnen of mogen worden.
-var onrgoedlvl = "V";
-for (var i = 0; i < flr_key_arr.length; i++)
-{
-  var this_alg = alg.func_enabled(flr_key_arr[i], onrgoedlvl);
-  if (this_alg.writeman || this_alg.writeuse)
-  {
-    ingesloten.push(flr_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(); %>
-    <script type="text/javascript">
-        function alg_submit()
-        {   // Invoer van velden wordt realtime gevalideerd.
-            $.post($("form[name=u2]")[0].action,
-                   $("[name=u2]").serialize(),
-                   FcltCallbackAndThenAlways(alg_submit_callback),
-                   "json");
-            return true; // disable button
-        }
-
-        function alg_submit_callback(json)
-        {
-            iface.button.enable("btn_alg_submit");
-            if (json.success)
-                FcltMgr.closeDetail(window, json);
-        }
-
-        function alg_cancel()
-        {
-            FcltMgr.closeDetail(window, { cancel: true } );
-        }
-    </script>
-  </head>
-
-  <body class="fclt-modal" id="mod_algmultiedit">
-  <% MODAL_START(); %>
-    <form name="u2" action="alg_edit_verdieping_multi_save.asp?flr_keys=<%=ingesloten.join(",")%>" method="post">
-<%
-      MODAL_BLOCK_START("algflr1", L("lcl_floor"), { icon: "fa-layer-group" });
-
-        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"),
-                     emptyOption: "",
-                     initEmpty: true,
-                     readonly: !this_alg.writeuse
-                   });
-
-      MODAL_BLOCK_END();
-
-      generateFlexKenmerkBlock({
-          onrgoed_niveau: "V",
-          onrgoed_key: -1,
-          this_alg: last_this_alg,
-          reado: false,
-          multi: true
-        });
-
-%>
-      <script type="text/javascript">
-        $(function()
-          {
-            init_multi();
-          });
-      </script>
-<%
-      var buttons =  [];
-      buttons.push({title: L("lcl_submit"), action:"alg_submit()", singlepress: true, id: "btn_edit_submit", importance: 1, icon: "fa-fclt-save"});
-      buttons.push({title: L("lcl_cancel"),  action:"alg_cancel()", importance: 3, icon: "fa-fclt-cancel"});
-      SIMPLE_BLOCK_START();
-      CreateButtons(buttons);
-      SIMPLE_BLOCK_END();
-      IFACE.FORM_END();
-%>
-    </form>
-    <% MODAL_END(); %>
-  </body>
-</html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_verdieping_multi_save.asp

@@ -1,98 +0,0 @@
-<%@ language = "JavaScript" %>
-<% /*
-    $Revision$
-    $Id$
-
-    File:               alg_edit_verdieping_multi_save.asp
-    Description:        save script van alg_edit_verdieping_multi.asp
-    Globalen:
-    Context:
-    Note:
-*/
-var JSON_Result = true;
-%>
-
-<!-- #include file="../Shared/common.inc" -->
-<!-- #include file="../Shared/save2db.inc" -->
-<!-- #include file="../Shared/kenmerk_common.inc" -->
-<!-- #include file="./alg.inc" -->
-
-<%
-protectRequest.validateToken();
-var flr_key_arr = getQParamIntArray("flr_keys");
-var warning = "";
-var result = {};
-var nr_edited = 0;
-var fields = [];
-
-if (Request.Form("vervaldatum").Count == 1 && getFParam("check_vervaldatum", "off") == "on")
-    fields.push({ dbs: "alg_locatie_vervaldatum",  typ: "date",   frm: "vervaldatum", track: L("lcl_alg_vervaldatum") });
-if (Request.Form("dienstniveau").Count == 1 && getFParam("check_dienstniveau", "off") == "on")
-    fields.push({ dbs: "mld_dienstniveau_key", typ: "key", frm: "dienstniveau", track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" });
-
-for (var i = 0; i < flr_key_arr.length; i++)
-{
-    var alg_key = flr_key_arr[i];
-    var this_alg = alg.func_enabled(alg_key, "V");
-    if (this_alg.writeman || this_alg.writeuse)
-    {
-        var algUpd = buildTrackingUpdate("alg_verdieping", " alg_verdieping_key = " + alg_key, fields);
-        // Submit the changed data
-        var err = Oracle.Execute(algUpd.sql, true);
-        if (err.friendlyMsg)
-            warning = err.friendlyMsg;
-
-        currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                            + "     , ok.alg_onrgoedkenmerk_waarde"
-                            + "     , k.alg_kenmerk_toonbaar"
-                            + "     , k.fac_functie_key"
-                            + "  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 = 'V'"
-                            + "   AND ok.alg_onrgoed_key = " + alg_key;
-
-        allKenmerkenSQL     = "SELECT " + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key') + " kenmerk_omschrijving"
-                            + "     , k.alg_kenmerk_kenmerktype kenmerk_kenmerktype"
-                            + "     , k.alg_kenmerk_systeem     kenmerk_systeem"
-                            + "     , k.alg_kenmerk_toonbaar    kenmerk_readonly"
-                            + "     , k.alg_kenmerk_uniek       kenmerk_uniek"
-                            + "     , fac_kenmerkdomein_key"
-                            + "  FROM alg_kenmerk k"
-                            + " WHERE k.alg_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
-
-        var flextrack = saveFlexKenmerken(alg_key,
-                          { kenmerkTable: "alg_onrgoedkenmerk",
-                            kenmerkParentKey : "alg_onrgoed_key",
-                            kenmerkWaarde: "alg_onrgoedkenmerk_waarde",
-                            kenmerkKey: "alg_kenmerk_key",
-                            kenmerkToonbaar: "alg_kenmerk_toonbaar",
-                            currentKenmerkenSQL: currentKenmerkenSQL,
-                            allKenmerkenSQL: allKenmerkenSQL,
-                            requestQF: Request.Form,
-                            flexPath: "ALG/V",
-                            multiMode: true,
-                            tracking: true,
-                            module: "ALG",
-                            moduleName: "alg_onrgoed_niveau",
-                            moduleVal: "V",
-                            isNew: false
-                          });
-
-        if (flextrack && flextrack.length)
-        {
-            var update_string = L("lcl_alg_is_alglup") + "\n" + algUpd.trackarray.join("\n");
-            if (flextrack && flextrack.length)
-                update_string += flextrack.join("\n");
-            shared.trackaction("ALGVUP", alg_key, update_string);
-        }
-    }
-}
-
-result = { success : true, refresh: true };
-
-Response.Write(JSON.stringify(result));
-
-ASPPAGE_END();
-%>

APPL/ALG/alg_edit_verdieping_save.asp

@@ -15,127 +15,76 @@
                       js: []
                     }) %>
 <%
-var flr_key = getQParamInt("flr_key");
-var geb_key = getFParamInt("gebouwkey", -1);
-
-var isNew = (flr_key < 0);
+var flr_key = getQParamInt( "flr_key" );
 
 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));
+user.auth_required_or_abort(this_alg.writeman || (flr_key>0&&this_alg.writeuse));
 
-var fields = [];
-if (this_alg.writeuse)
-{
-    fields.push({ dbs: "mld_dienstniveau_key",        typ: "key",     frm: "dienstniveau", track: L("lcl_mld_dienst_niveau"), foreign: "mld_dienstniveau" });
-}
-
-if (this_alg.writeman)
-{
-    fields.push(
-        { 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") },
-        { dbs: "alg_verdieping_dwgz",         typ: "float",   frm: "flr_dwgz",     track: L("lcl_estate_verdieping_man_dwgz") }
-    );
-    if (flr_key == -1 && alg.canWriteGebouw(geb_key, this_alg.authparams("WEB_ALGMAN").ALGwritelevel))
-        fields.push({ dbs: "alg_gebouw_key",  typ: "key",     val: geb_key });
-}
+  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" }
+                ];
 
 var warning = "";
 if (flr_key > 0)
-{
-    var algUpd = buildTrackingUpdate("alg_verdieping", " alg_verdieping_key = " + flr_key, fields);
-    sql = algUpd.sql;
+  {
+    sql = buildUpdate("alg_verdieping", fields)
+        + "     alg_verdieping_key = " + flr_key;
+
     var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
         warning = err.friendlyMsg;
-}
+  }
 else
-{
+  {
     fields.push({  dbs: "alg_verdieping_key",         typ: "key",      seq: "alg_s_alg_onroerendgoed_keys" });
-    var regIns  = buildInsert("alg_verdieping", fields);
+    var regIns = buildInsert("alg_verdieping", fields);
     var flr_key = regIns.sequences["alg_verdieping_key"];
 
     sql = regIns.sql;
     var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
         warning = err.friendlyMsg;
-}
+  }
 
-var flextrack = [];
-if (!warning)
-{
-    currentKenmerkenSQL = "SELECT k.alg_kenmerk_key"
-                          + "     , ok.alg_onrgoedkenmerk_waarde"
-                          + "     , k.alg_kenmerk_toonbaar"
-                          + "     , k.fac_functie_key"
-                          + "  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;
-
-    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 */
-
-    flextrack = saveFlexKenmerken(flr_key,
+  if (!warning)
+  {
+      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,
-                          allKenmerkenSQL: allKenmerkenSQL,
                           requestQF: Request.Form,
                           flexPath: "ALG/V",
                           module: "ALG",
-                          tracking: true,
                           moduleName: "alg_onrgoed_niveau",
                           moduleVal: "V",
-                          isNew: isNew
+                          isNew: flr_key < 0
                         });
-
-    if ( !isNew )
-    {
-      if (flextrack.length)
-      {
-        if (algUpd && algUpd.trackarray.length)
-          algUpd.trackarray = algUpd.trackarray.concat(flextrack);
-        else
-          algUpd.trackarray = flextrack;
-      }
-
-      if (algUpd && algUpd.trackarray.length)
-          shared.trackaction("ALGVUP", flr_key, algUpd.trackarray.join("\n"));
-    }
-    else
-      shared.trackaction("ALGVNE", flr_key);
-
-}
-%>
+  }
+  %>
 
 <html>
   <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" -->
 
 <%
@@ -60,10 +61,10 @@ else if (S("prs_werkplek_implicit") == 1)
    FCLTHeader.Generate();
 %>
 <script>
-    async function alg_submit()
+    function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
-        if (!await validateForm("u2"))
+        if (!validateForm("u2"))
             return false;
         document.forms.u2.submit();
 
@@ -94,43 +95,44 @@ function onChangeVolgnr()
 }
 
 <% if (wp_key<0) { %>
-$(function(){ onChangeRoom(<%=room_key%>)});
+$(document).ready(function(){ onChangeRoom(<%=room_key%>)});
 <% } %>
 
 </script>
 </head>
 
-<body class="editmode">
-<% SUBFRAME_START(); %>
+<body id="editbody">
 <%
-  var buttons =  [ {title: L("lcl_submit"), action:"alg_submit()", icon: "fa-fclt-save" },
-                   {title: L("lcl_cancel"), action:"alg_cancel()", icon: "fa-fclt-cancel" } ];
+  var buttons =  [ //{title: L("lcl_submit"), action:"alg_next()",   icon: "opslaan.png" },
+                   {title: L("lcl_submit"), action:"alg_submit()", icon: "opslaan.png" },
+                   {title: L("lcl_cancel"), action:"alg_cancel()", icon: "undo.png" } ];
   IFRAMER_HEADER(L("lcl_alg_wp_frame"), buttons);
 %>
+<div id="edit">
 <form name="u2"
       action="alg_edit_wp_save.asp?wp_key=<%=wp_key%>"
       method="post"
       target="hidFrameSubmit"
       onSubmit="alg_submit();">
 <%
-      BLOCK_START("algInfo", L("lcl_alg_wp_frame"), {icon: "fa-map-pin"});
+BLOCK_START("algInfo", "");
   FCLTplaatsselector(authparams.uALGwritelevel, { // ALGUSE schrijfscope bepaalt wat je mag bewerken
                     ruimtekey: room_key,
                     onRuiChange: "onChangeRoom(key)",
-                    startlevel: 2, // Locatie
-                    eindlevel: 5, // Ruimte
-                    readonlylevel: wp_key > 0 ? 2 : -1, // Locatie niet readonly
+                    startlevel: 2, // Regio
+                    eindlevel: 5, // District
+                    readonlylevel: 2, // Locatie niet readonly
                     filtercode: "INCVR",
                     required: true });
 
   RWFIELDTR("wp_volgnr",  "fldshort", L("lcl_estate_wp_seq"), wp_volgnr, {required: true,
                                                                      html: 'onChange="onChangeVolgnr()"',
                                                                      datatype: "number",
-                                                                     maxlength: 8});
+                                                                     maxlength: 3});
   RWFIELDTR("wp_oms",     "fld",      L("lcl_workplace"),     wp_oms,    {maxlength: 30});
 %>
 <tr>
-<td class="label"><label for="wp_vstopp_v"><%=L("lcl_estate_wp_fixed")%></label></td>
+<td class="label"><label><%=L("lcl_estate_wp_fixed")%>:</label></td>
                     <td>
                       <label for="wp_vstopp_v">
                         <input type="radio" name="wp_vstopp_v" id="wp_vstopp_v" value="" <%= wp_vstopp==null ? " checked " : "" %>><%=L("lcl_estate_wp_fixed_v")%>
@@ -143,8 +145,7 @@ $(function(){ onChangeRoom(<%=room_key%>)});
 <%
   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";
@@ -159,7 +160,6 @@ IFACE.FORM_END();
 %>
 </form>
 <iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
-<% SUBFRAME_END(); %>
+</div>
 </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_edit_wp_save.asp

@@ -23,30 +23,28 @@ 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(algUpd.sql, true);
+    var err = Oracle.Execute(sql, true);
     if (err.friendlyMsg)
       warning = 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

@@ -7,6 +7,7 @@
      Parameters:         urole                Rol van de gebruiker (frontend, frontoffice, backoffice, management info)
                          onrgoed_niveau       Onroerendgoed niveua
                          reado                Readonly
+                         flexcolumns          aantal kolommen voor flexkenmerken
                          this_alg             { readman, readuse     Voor tonen
                                                 writeman, writeuse }  (voor als niet reado)
                          advanced             Geadvanceerd
@@ -19,94 +20,91 @@
 <%
 function generateFlexKenmerkBlock(params)
 {
+    if (!params.fnpre) // Mobile geeft die zelf mee
+    {
+        if (params.advanced) // Simpel houden
+        {
+            params.fnpre = function () { Response.Write('<table id="flextable" cellpadding="0" cellspacing="0">'); };
+            params.fnpost = function () { Response.Write('</table>'); };
+        }
+        else
+        {
+            params.fnpre = function () { BLOCK_START("algFlex"+(S("alg_flexcolumns")!=1?"2":""), L("lcl_alg_flexblok")); }
+            params.fnpost = BLOCK_END;
+        }
+    }
     var onrgoed_key = params.onrgoed_key; // Onroerendgoed key
     var onrgoed_niveau = params.onrgoed_niveau; // Onroerendgoed niveau
     var reado = params.reado; // Readonly
+    var flexcolumns = params.flexcolumns? params.flexcolumns : 1;
     var advanced = params.advanced; // Geavanceerd
-    var hasfilter = params.hasfilter? params.hasfilter : null;
 
-    function isReadonly (oRs)
+    function isReadonly (volgnummer)
     {
         if (reado)
             return true;
-        var rolcode = oRs("kenmerk_rolcode").value;
-        var canWrite = (params.this_alg.writeman && (rolcode&1)) || (params.this_alg.writeuse && (rolcode&2));
-
-        return !canWrite;  // readonly
+        if (volgnummer < 100 && !params.this_alg.writeman)
+            return true;
+        if (volgnummer > 100 && !params.this_alg.writeuse)
+            return true;
     }
 
-    function isInvisible(oRs)
+    function isInvisible(volgnummer, ktype)
     {
-        var ktype = oRs("kenmerk_kenmerktype").value;
         if (params.multi)
             return (ktype == 'M' || ktype == 'F' || ktype == 'E'); // onzichtbaar bij multi
     }
 
-    // Wat mag ik op  basis van mijn autorisatie (potentieel) zien, bepaal mijn rolcode-masker
-    var myreadrolcode = 0 + (params.this_alg.readman ? 1 : 0)
-                          + (params.this_alg.readuse ? 2 : 0);
+    var sql = "SELECT    k.alg_kenmerk_key              kenmerk_key, "
+             + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key') +" kenmerk_omschrijving, "
+             + "         k.alg_kenmerk_kenmerktype      kenmerk_kenmerktype, "
+             + "         k.fac_kenmerkdomein_key        kenmerkdomein_key, "
+             + "         k.alg_kenmerk_lengte           kenmerk_lengte, "
+             + "         k.alg_kenmerk_dec              kenmerk_dec, "
+             + "         k.alg_kenmerk_nmin             kenmerk_nmin, "
+             + "         k.alg_kenmerk_nmax             kenmerk_nmax, "
+             + (onrgoed_key > 0
+               ? "     (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)"
+               : 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_verplicht        kenmerk_verplicht, "
+             + "         k.alg_kenmerk_groep            kenmerk_groep, "
+             + "         NULL otherpath, "
+             + "         k.alg_kenmerk_toonbaar         kenmerk_toonbaar,"
+             + "         k.alg_kenmerk_uniek            kenmerk_uniek,"
+             + "         k.alg_kenmerk_regexp           kenmerk_regexp"
+             + "    FROM alg_kenmerk k "
+             + "   WHERE k.alg_kenmerk_niveau = " + safe.quoted_sql(onrgoed_niveau)
+             + "     AND k.alg_kenmerk_verwijder IS NULL "
+             + (!params.this_alg.readman? " AND alg_kenmerk_volgnr >= 100":"")
+             + (!params.this_alg.readuse? " AND alg_kenmerk_volgnr <= 100":"")
+             + "ORDER BY k.alg_kenmerk_volgnr, "
+             + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key');
 
-    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"
-            + "     , k.alg_kenmerk_lengte           kenmerk_lengte"
-            + "     , 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)"
-                + "      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)"
-              : "   , " + lcl.xsql("k.alg_kenmerk_default", "k.alg_kenmerk_key")
-              ) + "                                  kenmerk_waarde"
-            + "     , k.alg_kenmerk_volgnr           kenmerk_volgnr"
-            + "     , k.alg_kenmerk_rolcode          kenmerk_rolcode"
-            + "     , " + 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"
-            + "     , k.alg_kenmerk_toonbaar         kenmerk_toonbaar"
-            + "     , k.alg_kenmerk_uniek            kenmerk_uniek"
-            + "     , k.alg_kenmerk_regexp           kenmerk_regexp"
-            + "     , k.fac_functie_key"
-            + "    FROM alg_kenmerk k "
-            + "   WHERE k.alg_kenmerk_niveau = " + safe.quoted_sql(onrgoed_niveau)
-            + "     AND k.alg_kenmerk_verwijder IS NULL "
-            + "     AND BITAND(alg_kenmerk_rolcode, " + myreadrolcode + ") > 0 "
-            + " ORDER BY k.alg_kenmerk_volgnr"
-            + "        , " + lcl.xsql("k.alg_kenmerk_omschrijving", "k.alg_kenmerk_key");
-
-    var trn = 0;  // fijn, maar waarom?
+    var trn = 0;
 
     listKenmerk(sql,
                 "ALG", //module
                 onrgoed_key,
-                {
+                { flexcolumns: (!advanced ? flexcolumns : 1), // advanced is een popup. Dan passen twee kolommen slecht
                   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,
-                  hasfilter: hasfilter,
-                  relativeValuesAllowed: params.multi
-                }
+                  kenmerk_module: onrgoed_niveau }
                );
 }
 %>

APPL/ALG/alg_fm_stats.asp

@@ -1,410 +0,0 @@
-<%@ language = "JavaScript" %>
-<% /*
-     $Revision$
-     $Id$
-
-    Description: Statistics mbt vastgoed en harde faciliteiten
-                 Is als een soort actueel jaaroverzicht van de assets
-                 Gaat er van uitdat er "netjes" geconfigureerd is, en anders is dit een incentive om dat te doen.
-                 Werkt dan ook als een soort verify. Je komt bijvoorbeeld te specifieke groeperingen constateren
-                 bij de srtgebouw en srtruimte
-                 Is onafhankelijk van organsatie(structuur), het zijn zuiver harde, fysieke assets
-                 Uitzondering voor de reserveerare zaken, die dubbelen met het fysieke maar geven
-                 een beeld van de dienstverlening.
-                 Kan ongetwijfeld nog uitgebreid worden en eigenlijk nog een paar verse lcl's
-
-*/ %>
-<!-- #include file="../Shared/common.inc" -->
-<!-- #include file="../Shared/iface.inc" -->
-<%
-FCLTHeader.Requires({ plugins:["jQuery"], js: ["jquery-ui.js"] });
-%>
-<html>
-  <head>
-<%  FCLTHeader.Generate();
-    var autfunction = "WEB_PRSSYS";  // of later WEB_ALGMSU?
-    var authparams = user.checkAutorisation(autfunction);
-
-facts = new Array;
-
-function add2facts (oRs)
-{
-    while (!oRs.eof)
-    {
-      facts.push({id: oRs("id").value, lbl: oRs("lbl").value, cnt: oRs("val").value, det: oRs("det").value})
-      oRs.moveNext();
-    }
-}
-
-
-%>
-  </head>
-  <body class="showmode">
-<% SUBFRAME_START();
-
-// Gebouwen
-var sql = "SELECT 1 id, "+safe.quoted_sql(L('frm_alggebouwframe'))+" lbl, COUNT (*) val, SUM (alg_gebouw_bruto_vloeropp) det"
-        + "  FROM alg_gebouw "
-        + " WHERE alg_gebouw_verwijder IS NULL "
-        + "   AND (alg_gebouw_vervaldatum IS NULL OR alg_gebouw_vervaldatum > SYSDATE)";
-var oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-sql = "  SELECT 1 id, '> '||" + lcl.xsql ('s.alg_srtgebouw_omschrijving', 's.alg_srtgebouw_key') + " lbl, COUNT (*) val, SUM (g.alg_gebouw_bruto_vloeropp) det "
-         + "    FROM alg_gebouw g, alg_srtgebouw s "
-         + "   WHERE     s.alg_srtgebouw_key(+) = g.alg_srtgebouw_key "
-         + "         AND g.alg_gebouw_verwijder IS NULL "
-         + "         AND (alg_gebouw_vervaldatum IS NULL OR alg_gebouw_vervaldatum > SYSDATE) "
-         + "GROUP BY s.alg_srtgebouw_omschrijving "
-         + "ORDER BY 3 desc, 2 ";
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-sql = "SELECT 1 id, "+safe.quoted_sql(L('lcl_alg_fmstats_nrloc'))+" lbl, COUNT (*) val, '' det"
-         + "  FROM (SELECT DISTINCT alg_locatie_plaats "
-         + "          FROM alg_locatie l "
-         + "         WHERE     l.alg_locatie_verwijder IS NULL "
-         + "               AND (alg_locatie_vervaldatum IS NULL OR alg_locatie_vervaldatum > SYSDATE)"
-         + "               AND EXISTS (SELECT '' FROM alg_gebouw g WHERE g.alg_locatie_key = l.alg_locatie_key"
-         + "                                      AND g.alg_gebouw_verwijder IS NULL "
-         + "                                      AND (alg_gebouw_vervaldatum IS NULL OR alg_gebouw_vervaldatum > SYSDATE)))";
-
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-// Terreinen
-sql = "SELECT 2 id, "+safe.quoted_sql(L('frm_algterreinframe'))+" lbl, COUNT (*) val, SUM (alg_terreinsector_oppervlak) det"
-    + "  FROM alg_terreinsector "
-    + " WHERE alg_terreinsector_verwijder IS NULL "
-    + "   AND (alg_terreinsector_vervaldatum IS NULL OR alg_terreinsector_vervaldatum > SYSDATE)";
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-sql = "  SELECT 2 id, '> '||" + lcl.xsql ('s.alg_srtterreinsec_omschrijving', 's.alg_srtterreinsector_key') + " lbl, COUNT (*) val, SUM (t.alg_terreinsector_oppervlak) det "
-         + "    FROM alg_terreinsector t, alg_srtterreinsector s "
-         + "   WHERE     s.alg_srtterreinsector_key(+) = t.alg_srtterreinsector_key "
-         + "         AND t.alg_terreinsector_verwijder IS NULL "
-         + "         AND (alg_terreinsector_vervaldatum IS NULL OR alg_terreinsector_vervaldatum > SYSDATE) "
-         + "GROUP BY s.alg_srtterreinsec_omschrijving "
-         + "ORDER BY 3 desc, 2 ";
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-sql = "SELECT 2 id, "+safe.quoted_sql(L('lcl_alg_fmstats_nrloc'))+" lbl, COUNT (*) val, '' det"
-         + "  FROM (SELECT DISTINCT alg_locatie_plaats "
-         + "          FROM alg_locatie l "
-         + "         WHERE     l.alg_locatie_verwijder IS NULL "
-         + "               AND (alg_locatie_vervaldatum IS NULL OR alg_locatie_vervaldatum > SYSDATE)"
-         + "               AND EXISTS (SELECT '' FROM alg_terreinsector g WHERE g.alg_locatie_key = l.alg_locatie_key"
-         + "                                      AND g.alg_terreinsector_verwijder IS NULL "
-         + "                                      AND (alg_terreinsector_vervaldatum IS NULL OR alg_terreinsector_vervaldatum > SYSDATE)))";
-
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-
-// Ruimtes
-sql = "SELECT 3 id, "+safe.quoted_sql(L('frm_algruimteframe'))+" lbl, COUNT (*) val,  SUM (alg_ruimte_bruto_vloeropp) det  "
-    + "  FROM alg_ruimte "
-    + " WHERE alg_ruimte_verwijder IS NULL";
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-sql = "  SELECT 3 id, '> '||" + lcl.xsql ('s.alg_srtruimte_omschrijving', 's.alg_srtruimte_key') + " lbl, COUNT (*) val, SUM (r.alg_ruimte_bruto_vloeropp) det "
-         + "    FROM alg_ruimte r, alg_srtruimte s "
-         + "   WHERE     s.alg_srtruimte_key(+) = r.alg_srtruimte_key "
-         + "         AND r.alg_ruimte_verwijder IS NULL "
-         + "GROUP BY s.alg_srtruimte_omschrijving "
-         + "ORDER BY 3 desc, 2 ";
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-
-// Niet reserveerbare assets
-sql0 = "SELECT {0}         id, "  // 1 query voor beide
-         + "       '{2}'  lbl, "
-         + "       COUNT (*) val, "
-         + "       ''        det "
-         + "  FROM ins_deel i, ins_srtdeel sd "
-         + " WHERE     i.ins_deel_verwijder IS NULL "
-         + "       AND i.ins_srtdeel_key = sd.ins_srtdeel_key"
-         + "       AND sd.ins_srtdeel_verwijder IS NULL "
-         + "       AND (i.ins_deel_vervaldatum IS NULL OR i.ins_deel_vervaldatum > SYSDATE) "
-         + "       AND sd.ins_srtdeel_sensortype {1}"  // 1 query voor beide
-         + "       AND NOT EXISTS "
-         + "               (SELECT '' "
-         + "                  FROM res_deel r "
-         + "                 WHERE     res_deel_verwijder IS NULL "
-         + "                       AND (res_deel_vervaldatum IS NULL OR res_deel_vervaldatum > SYSDATE) "
-         + "                       AND r.res_ins_deel_key = i.ins_deel_key) ";
-
-sql1 = "SELECT {0} id, '> ' || ins_discipline_omschrijving lbl, COUNT (*) val, '' det "
-         + "    FROM ins_deel i, ins_discipline rd, ins_srtdeel sd "
-         + "   WHERE     i.ins_discipline_key = rd.ins_discipline_key "
-         + "         AND i.ins_deel_verwijder IS NULL "
-         + "         AND sd.ins_srtdeel_verwijder IS NULL "
-         + "         AND i.ins_srtdeel_key = sd.ins_srtdeel_key"
-         + "         AND sd.ins_srtdeel_sensortype {1}"
-         + "         AND ins_discipline_verwijder IS NULL "
-         + "         AND (i.ins_deel_vervaldatum IS NULL OR i.ins_deel_vervaldatum > SYSDATE) "
-         + "         AND NOT EXISTS "
-         + "                 (SELECT '' "
-         + "                    FROM res_deel r "
-         + "                   WHERE     res_deel_verwijder IS NULL "
-         + "                         AND (res_deel_vervaldatum IS NULL OR res_deel_vervaldatum > SYSDATE) "
-         + "                         AND r.res_ins_deel_key = i.ins_deel_key) "
-         + "GROUP BY ins_discipline_omschrijving "
-         + "ORDER BY 3 DESC, 2 ";
-sql = sql0.format(4, '= 0', L('lcl_alg_fmstats_assets'));
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-sql = sql1.format(4, '= 0');
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-
-sql = sql0.format(5, '<> 0', L('lcl_alg_fmstats_sensors'));
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-sql = sql1.format(5, '<> 0');
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-
-// Reserveerbare ruimtes (reken maar na :-))
-sql = "SELECT 6 id,"
-    + "       'Reserveerbare ruimtes' lbl,"
-    + "       COUNT (*) val,"
-    + "       SUM (r.alg_ruimte_bruto_vloeropp) det"
-    + "  FROM alg_ruimte r"
-    + " WHERE r.alg_ruimte_verwijder IS NULL"
-    + "   AND r.alg_ruimte_key IN (SELECT alg_ruimte_key"
-                            + "      FROM res_alg_ruimte rag, res_ruimte rr"
-                            + "     WHERE res_alg_ruimte_verwijder IS NULL"
-                            + "       AND rr.res_ruimte_key = rag.res_ruimte_key"
-                            + "       AND (rr.res_ruimte_startdatum  IS NULL OR rr.res_ruimte_startdatum <= SYSDATE)"
-                            + "       AND (rr.res_ruimte_vervaldatum IS NULL OR rr.res_ruimte_vervaldatum > SYSDATE)"
-                            + "   )"
-    + " ORDER BY 3 DESC, 2";
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-
-sql = "SELECT 6 id,"
-    + "       '> ' || ins_discipline_omschrijving lbl,"
-    + "       COUNT (*)                         val,"
-    + "       SUM (r.alg_ruimte_bruto_vloeropp) det"
-    + "  FROM alg_ruimte    r,"
-    + "       res_ruimte    rr,"
-    + "       res_discipline rd,"
-    + "       res_alg_ruimte rag"
-    + " WHERE rr.res_discipline_key = rd.ins_discipline_key"
-    + "   AND r.alg_ruimte_verwijder IS NULL"
-    + "   AND rd.ins_discipline_verwijder IS NULL"
-    + "   AND rag.res_ruimte_key = rr.res_ruimte_key"
-    + "   AND rag.alg_ruimte_key = r.alg_ruimte_key"
-    + "   AND rag.res_alg_ruimte_verwijder IS NULL"
-    + "   AND rr.res_ruimte_verwijder IS NULL"
-    + "   AND (rr.res_ruimte_startdatum  IS NULL OR rr.res_ruimte_startdatum <= SYSDATE)"
-    + "   AND (rr.res_ruimte_vervaldatum IS NULL OR rr.res_ruimte_vervaldatum > SYSDATE)"
-    + " GROUP BY ins_discipline_omschrijving"
-    + " ORDER BY 3 DESC, 2";
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-
-//Reserveerbare faciliteiten
-var sql0 = "SELECT {0} id, '{2}' lbl, COUNT (*) val, '' det "
-         + "    FROM ins_deel i "
-         + "   WHERE     i.ins_deel_verwijder IS NULL "
-         + "         AND EXISTS "
-         + "                 (SELECT ins_deel_key "
-         + "                    FROM res_deel r, res_discipline rd "
-         + "                   WHERE     res_deel_verwijder IS NULL "
-         + "                         AND r.res_discipline_key = rd.ins_discipline_key "
-         + "                         AND ins_discipline_min_level = {1} "
-         + "                         AND (res_deel_vervaldatum IS NULL OR res_deel_vervaldatum > SYSDATE) "
-         + "                         AND r.res_ins_deel_key = i.ins_deel_key) ";
-// ins_discipline_min_level /* 1; Reserveerbaar object; 2; Verbruiksartikel; 3; Ruimte 4; Personenresource; 5; Werkplek;*/
-var sql1 = "SELECT {0} id, '> ' || ins_discipline_omschrijving lbl, COUNT (*) val, '' det "
-         + "    FROM res_deel rr, res_discipline rd "
-         + "   WHERE     rr.res_discipline_key = rd.ins_discipline_key "
-         + "         AND rr.res_deel_verwijder IS NULL "
-         + "         AND ins_discipline_min_level = {1} "
-         + "         AND ins_discipline_verwijder IS NULL "
-         + "         AND (rr.res_deel_vervaldatum IS NULL OR rr.res_deel_vervaldatum > SYSDATE) "
-         + "GROUP BY ins_discipline_omschrijving "
-         + "ORDER BY 3 DESC, 2 ";
-sql = sql0.format(7, '1', L('lcl_res_objcat'));
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-sql = sql1.format(7, '1');
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-sql = sql0.format(8, '4', L('lcl_res_persons'));
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-sql = sql1.format(8, '4');
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-sql = sql0.format(9, '5', L('lcl_res_wpcat'));
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-sql = sql1.format(9, '5');
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-
-// Werkplekken
-sql = "  SELECT 10 id, "+safe.quoted_sql(L('frm_wplistframe'))+" lbl, COUNT (*) val, '' det "
-         + "    FROM prs_werkplek  wp, "
-         + "         alg_ruimte    r, "
-         + "         alg_verdieping v, "
-         + "         alg_gebouw    g, "
-         + "         alg_locatie   l "
-         + "   WHERE     prs_werkplek_virtueel = 0 "
-         + "         AND r.alg_ruimte_key = wp.prs_alg_ruimte_key "
-         + "         AND r.alg_verdieping_key = v.alg_verdieping_key "
-         + "         AND v.alg_gebouw_key = g.alg_gebouw_key "
-         + "         AND g.alg_locatie_key = l.alg_locatie_key "
-         + "         AND g.alg_gebouw_verwijder IS NULL "
-         + "         AND v.alg_verdieping_verwijder IS NULL "
-         + "         AND r.alg_ruimte_verwijder IS NULL "
-         + "         AND (alg_gebouw_vervaldatum IS NULL OR alg_gebouw_vervaldatum > SYSDATE) ";
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-
-sql = "  SELECT 10 id, '> ' || l.alg_locatie_plaats lbl, COUNT (*) val, '' det"
-         + "    FROM prs_werkplek  wp, "
-         + "         alg_ruimte    r, "
-         + "         alg_verdieping v, "
-         + "         alg_gebouw    g, "
-         + "         alg_locatie   l "
-         + "   WHERE     prs_werkplek_virtueel = 0 "
-         + "         AND r.alg_ruimte_key = wp.prs_alg_ruimte_key "
-         + "         AND r.alg_verdieping_key = v.alg_verdieping_key "
-         + "         AND v.alg_gebouw_key = g.alg_gebouw_key "
-         + "         AND g.alg_locatie_key = l.alg_locatie_key "
-         + "         AND g.alg_gebouw_verwijder IS NULL "
-         + "         AND v.alg_verdieping_verwijder IS NULL "
-         + "         AND r.alg_ruimte_verwijder IS NULL "
-         + "         AND (alg_gebouw_vervaldatum IS NULL OR alg_gebouw_vervaldatum > SYSDATE) "
-         + "GROUP BY l.alg_locatie_plaats "
-         + "ORDER BY 3 DESC, 2 ";
-oRs = Oracle.Execute(sql);
-add2facts (oRs);
-oRs.Close();
-
-    var buttons = [];
-    IFRAMER_HEADER(L("lcl_alg_fmstats")+" / "+L("lcl_estate_ruimte_bruto_vloeropp"), buttons);
-%>
-    <form name=u2 onSubmit="return false;">
-<%
-    var i = 0;
-    var currid = 1;
-
-    // Luiheid en eenmaligheid is de reden om dit niet met een loopje te doen, verschillen alleen in icon en presentatie van det(ails).
-    // Zou ze best collapsible willen, maar dat werkt alleen nog maar voor flexkenmerkblokken; ingeklapt kan wel, maar dan kun je niet meer uitklappen.
-
-    BLOCK_START("fm1", facts[i].lbl+" "+safe.showFloat(facts[i].cnt,0) + "  /  " + safe.showFloat(facts[i].det||'-',0)+ " m2", {icon: "fa-building"});
-    i+=1;
-    for (i=i; i<facts.length; i++)
-    {
-      if (facts[i].id && facts[i].id != currid) { currid += 1; break; }
-      ROFIELDTR("fld", facts[i].lbl, safe.showFloat(facts[i].cnt,0) + (facts[i].det ? ("  /  " + safe.showFloat(facts[i].det||'-',0) + " m2") : ""));
-    }
-    BLOCK_END();
-
-    BLOCK_START("fm2", facts[i].lbl+" "+safe.showFloat(facts[i].cnt,0) + "  /  " + safe.showFloat(facts[i].det||'-',0)+ " m2", {icon: "fa-layer-group"});
-    i+=1;
-    for (i=i; i<facts.length; i++)
-    {
-      if (facts[i].id && facts[i].id != currid) { currid += 1; break; }
-      ROFIELDTR("fld", facts[i].lbl, safe.showFloat(facts[i].cnt,0) + (facts[i].det ? ("  /  " + safe.showFloat(facts[i].det||'-',0) + " m2") : ""));
-    }
-    BLOCK_END();
-
-    BLOCK_START("fm3", facts[i].lbl+" "+safe.showFloat(facts[i].cnt,0) + "  /  " + safe.showFloat(facts[i].det||'-',0)+ " m2", {icon: "fa-map-marker-alt"});
-    i+=1;
-    for (i=i; i<facts.length; i++)
-    {
-      if (facts[i].id && facts[i].id != currid) { currid += 1; break; }
-      ROFIELDTR("fld", facts[i].lbl, safe.showFloat(facts[i].cnt,0) + (facts[i].det ? ("  /  " + safe.showFloat(facts[i].det||'-',0) + " m2") : ""));
-    }
-    BLOCK_END();
-
-    BLOCK_START("fm4", facts[i].lbl+" "+safe.showFloat(facts[i].cnt,0), {icon: "fa-cubes"});
-    i+=1;
-    for (i=i; i<facts.length; i++)
-    {
-      if (facts[i].id && facts[i].id != currid) { currid += 1; break; }
-      ROFIELDTR("fld", facts[i].lbl, safe.showFloat(facts[i].cnt,0) );
-    }
-    BLOCK_END();
-
-    BLOCK_START("fm5", facts[i].lbl+" "+safe.showFloat(facts[i].cnt,0), {icon: "fa-sensor"});
-    i+=1;
-    for (i=i; i<facts.length; i++)
-    {
-      if (facts[i].id && facts[i].id != currid) { currid += 1; break; }
-      ROFIELDTR("fld", facts[i].lbl, safe.showFloat(facts[i].cnt,0) );
-    }
-    BLOCK_END();
-
-    BLOCK_START("fm6", facts[i].lbl+" "+safe.showFloat(facts[i].cnt,0) + "  /  " + safe.showFloat(facts[i].det||'-',0)+ " m2", {icon: "fa-users"});
-    i+=1;
-    for (i=i; i<facts.length; i++)
-    {
-      if (facts[i].id && facts[i].id != currid) { currid += 1; break; }
-      ROFIELDTR("fld", facts[i].lbl, safe.showFloat(facts[i].cnt,0) + (facts[i].det ? ("  /  " + safe.showFloat(facts[i].det||'-',0) + " m2") : ""));
-    }
-    BLOCK_END();
-
-    BLOCK_START("fm7", facts[i].lbl+" "+safe.showFloat(facts[i].cnt,0), {icon: "fa-projector"});
-    i+=1;
-    for (i=i; i<facts.length; i++)
-    {
-      if (facts[i].id && facts[i].id != currid) { currid += 1; break; }
-      ROFIELDTR("fld", facts[i].lbl, safe.showFloat(facts[i].cnt,0) );
-    }
-    BLOCK_END();
-    BLOCK_START("fm8", facts[i].lbl+" "+safe.showFloat(facts[i].cnt,0), {icon: "fa-user"});
-    i+=1;
-    for (i=i; i<facts.length; i++)
-    {
-      if (facts[i].id && facts[i].id != currid) { currid += 1; break; }
-      ROFIELDTR("fld", facts[i].lbl, safe.showFloat(facts[i].cnt,0) );
-    }
-    BLOCK_END();
-    BLOCK_START("fm9", facts[i].lbl+" "+safe.showFloat(facts[i].cnt,0), {icon: "fa-desktop"});
-    i+=1;
-    for (i=i; i<facts.length; i++)
-    {
-      if (facts[i].id && facts[i].id != currid) { currid += 1; break; }
-      ROFIELDTR("fld", facts[i].lbl, safe.showFloat(facts[i].cnt,0) );
-    }
-    BLOCK_END();
-
-    BLOCK_START("fm10", facts[i].lbl+" "+safe.showFloat(facts[i].cnt,0), {icon: "fa-chair-office"});
-    i+=1;
-    for (i=i; i<facts.length; i++)
-    {
-      if (facts[i].id && facts[i].id != currid) { currid += 1; break; }
-      ROFIELDTR("fld", facts[i].lbl, safe.showFloat(facts[i].cnt,0) );
-    }
-    BLOCK_END();
-
-%>
-    </form>
-<% SUBFRAME_END(); %>
-  </body>
-</html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_gebouw.asp

@@ -7,6 +7,10 @@
     Status:
     Description:
 
+    Parameters:
+
+    Context:
+    Note:
 
 */ %>
 <!--#include file="../Shared/common.inc" -->
@@ -16,19 +20,17 @@
 FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jquery-ui.js"]})
 
 var bld_key = getQParamInt("key", -1);
-var cnt_full = getQParamInt("cnt_full", 1);
 
 if (bld_key > 0)
 {
-  var sql = "SELECT alg_gebouw_code, alg_locatie_key, alg_gebouw_x, alg_gebouw_y "
+      sql = " select alg_gebouw_code, alg_locatie_key "
           + "  FROM alg_gebouw "
-          + " WHERE alg_gebouw_key = " + bld_key;
-  var oRs = Oracle.Execute(sql);
-  var bld_name = " " + oRs("alg_gebouw_code").Value;
-  var loc_key = oRs("alg_locatie_key").Value;
-  var bld_x = oRs("alg_gebouw_x").Value;
-  var bld_y = oRs("alg_gebouw_y").Value;
-  oRs.Close();
+          + "  WHERE alg_gebouw_key = " + bld_key;
+
+   oRs = Oracle.Execute(sql);
+
+   var bld_name   = " " + oRs("alg_gebouw_code").value;
+   var loc_key = oRs("alg_locatie_key").value;
 }
 else
 {
@@ -42,8 +44,7 @@ else
   <head>
 <%  FCLTHeader.Generate(); %>
     <script  type="text/javascript" >
-      FcltMgr.setTitle(L("lcl_building")+" "+"<%=safe.jsstring(bld_name)%>", {hot:false});
-
+      FcltMgr.setTitle("<%=L("lcl_building")%> <%=safe.jsstring(bld_name)%>", {hot:false});
 <%    if (bld_key == -1) { %>FcltMgr.startEdit(window);<% } %>
       function algClose(params)
       {
@@ -62,63 +63,38 @@ else
                 FcltMgr.closeDetail(window, { close: true})
               }
               if (!params.keepForm)
-                  $("#algframe")[0].src = "alg_show_gebouw.asp?bld_key=<%=bld_key%>";
+                  $("#algFrame")[0].src = "alg_show_gebouw.asp?bld_key=<%=bld_key%>";
           <% } %>
       }
     </script>
   </head>
 
   <body>
-  <% PAGE_START(); %>
 <%  if (bld_key == -1)
         var page="alg_edit_gebouw.asp"; // Maak een nieuw
     else
         var page="alg_show_gebouw.asp";
     page += "?bld_key="+bld_key;
 
-    IFRAMER("algframe", page, { title: L("lcl_alg_gebouw_frame"),
+    IFRAMER("algFrame", page, { title: L("lcl_alg_gebouw_frame"),
+                                initHeight: "450px",
                                 FcltClose: "algClose" } );
-
+                                
     if (bld_key > -1)
     {
-      page0 = "../alg/alg_verdieping_search_list.asp?chkgeb=1&gebouwkey="+bld_key;
-      IFRAMER("algverdiepingframe", page0, { icon: "fa-list" } );
-
       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&urole=" + curole
-                    + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&bld_key=" + bld_key
-                    + "&cnt_full="+cnt_full;
-          IFRAMER("cntlistframe", page1, { icon: "fa-list"} );
+          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 + "&bld_key=" + bld_key
+          IFRAMER("cntFrame", page1, { initHide: true } );
       }
-
-      if (S("alg_fg_remote_maps") != "" && bld_x && bld_y)
-      {
-          var page2 = "../cad/ShowGoogleMap.asp?bld_key=" + bld_key;
-          IFRAMER("mapsframe", page2, { title: L("lcl_maps"), icon: "fa-map-marker-alt" } );
-      }
-      // tracking naar subframe :-)
-      var autfunction = ["WEB_ALGUSE", "WEB_ALGMAN"];
-      var authparams = user.checkAutorisation(autfunction, true);
-      if (authparams && authparams.ALGreadlevel <= 3 && authparams.PRSreadlevel < 9)
-      {
-        page3 = protectQS.create("../shared/status_info.asp?bld_key=" + bld_key);
-        IFRAMER("alghistoryframe", page3, { icon: "fa-list", title: L("lcl_tracking")} );
-      }
-
-      page4 = "alg_show_note2.asp?alg_key=" + bld_key + "&alg_typ=G";
-      IFRAMER("algnoteframe", page4, { refreshOnClose: true, sidebar: true } ); // sidebar heeft geen icon/title nodig
-
-    }
+    }                                
 %>
-<% PAGE_END(); %>
   </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" -->
@@ -16,31 +17,49 @@
 <%
 FCLTHeader.Requires({ plugins: ["jQuery"] });
 
-  var cnt_full = getQParamInt("cnt_full", 1);
+function fnrowData(oRs)
+{
+  var parent_key = oRs("alg_locatie_key").value;
+  var detail_key = oRs("alg_gebouw_key").value;
+  var key        = oRs("alg_gebouw_key").value;
+  var oms        = oRs("alg_gebouw_naam").value;
 
-  // 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()
+  var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
 
-  // 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)
+  return JSON.stringify(data);
+}
+
+var recent = new Date();
+function fnrowClass(oRs)
+{
+  var lclass = "";
+  // Tracking: hoe lang geleden voor het laatst gewijzigd?
+  if (oRs.Fields("recentdatum").Value != null)
   {
-    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()
-  }
+    var ltrackdate1 = new Date();
+    var ltrackdate10 = new Date();
+    var ltrackdate100 = new Date();
+    var alg_onrgoed_recent = S("alg_onrgoed_recent");
+    ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
+    ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
+    ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
 
-  var canImport = (user.checkAutorisation("WEB_IMPORT", true) != null);
+    var fac_recent = new Date(oRs.Fields("recentdatum").Value);
+    if (fac_recent > ltrackdate1)
+    {
+      lclass += " updated";
+    }
+    else if (fac_recent > ltrackdate10)
+    {
+      lclass += " updated10";
+    }
+    else if (fac_recent > ltrackdate100)
+    {
+      lclass += " updated100";
+    }
+  }
+  return lclass;
+}
 %>
 <script type="text/javascript">
 
@@ -48,63 +67,34 @@ FCLTHeader.Requires({ plugins: ["jQuery"] });
 
   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";
-    FcltMgr.openDetail(url, L("lcl_floor"));
+    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;
-    FcltMgr.openDetail(url, L("lcl_location"));
+    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)
+  {
+    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 gebouwEdit(row)
-  {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
-    var url = "appl/alg/alg_gebouw.asp?mode=viewChange&key=" + algData.key + "&cnt_full=<%=cnt_full%>";
-    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 gebouwEditMulti(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;
-    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>
 <%
 
@@ -121,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;
@@ -129,25 +118,23 @@ 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 transitParam = buildTransitParam(["locatiekey", "urole", "bld_key", "flo_key", "room_key"]);
-  var rstFilters = params.rstFilters;
-  var checkBoxes = [
-    {
-     lcl: L("lcl_alg_gebouw_vervallen_incl"),
-     param: 'expAlgIncl',
-     checked: expalgincl,
-     transitParams: transitParam
-    }
-  ];
+  function fnrowActionEnabler(oRs)
+  {
+    var eDelete = false;
+    if (alg.canWriteGebouw(oRs("alg_gebouw_key").value, authparams.mALGwritelevel))
+      eDelete = true;
+    return ({eDelete: eDelete})
+  }
 
-  var rstCheckBoxes = rstFilters ? checkBoxes : [];
-  var autparamsINSUSE = user.checkAutorisation("WEB_INSUSE", true);
-  var autparamsINSMAN = user.checkAutorisation("WEB_INSMAN", true);
-  var readuse = autparamsINSUSE && autparamsINSUSE.PRSreadlevel < 9 && autparamsINSUSE.ALGreadlevel < 9; // Wijzigen Afgeronde gegevens.
-  var readman = autparamsINSMAN && autparamsINSMAN.PRSreadlevel < 9 && autparamsINSMAN.ALGreadlevel < 9; // Wijzigen Afgeronde gegevens.
+  function fnrowFlexParams(oRs)
+  {
+    var bld_key = oRs("alg_gebouw_key").Value;
+    var this_alg = alg.func_enabled(bld_key, "G");
+
+    var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
+    return flexParams;
+  }
 %>
 
   <html>
@@ -156,18 +143,14 @@ function gebouw_list(pautfunction, params)
     </head>
     <body id="listbody">
 <%
-  var flexParams = alg.alg_onroerendgoed_flex_params("G");
   var sqln = "SELECT g.alg_gebouw_key"
+           + "     , g.alg_locatie_key"
            + "     , g.alg_locatie_key"
            + "     , g.alg_srtgebouw_key"
            + "     , l.alg_locatie_omschrijving"
            + "     , " + lcl.xsqla('s.alg_srtgebouw_omschrijving', 's.alg_srtgebouw_key')
            + "     , g.alg_gebouw_code"
            + "     , g.alg_gebouw_naam"
-           + "     , COALESCE(g.alg_gebouw_adres, l.alg_locatie_adres) adres"
-           + "     , COALESCE(g.alg_gebouw_postcode, l.alg_locatie_postcode) postcode"
-           + "     , l.alg_locatie_plaats"
-           + "     , g.alg_gebouw_omschrijving"
            + "     , g.alg_gebouw_opmerking"
            + "     , g.alg_gebouw_bruto_vloeropp"
            + "     , g.alg_gebouw_omtrek"
@@ -175,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"
@@ -187,7 +165,6 @@ function gebouw_list(pautfunction, params)
            + "           AND t.fac_tracking_refkey = g.alg_gebouw_key"
            + "           AND sn.fac_srtnotificatie_xmlnode = 'gebouw'"
            + "       ) recentdatum"
-           +       flexParams.sql
            + "  FROM alg_gebouw g"
            + "     , alg_locatie l"
            + "     , alg_srtgebouw s"
@@ -217,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;
@@ -231,112 +204,17 @@ 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  ";
 
     var addurl = "appl/alg/alg_gebouw.asp";
 
-    var addButton = [];
     if (canAdd)
     {
-      addButton.push({ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" });
+      addButton = [{ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" }]
     }
 
-    /**********************************
-    * Callback functies ResultsetTable
-     *********************************/
-    var recent = new Date();
-
-    function fnrowData(oRs)
-    {
-      var parent_key = oRs("alg_locatie_key").value;
-      var detail_key = oRs("alg_gebouw_key").value;
-      var key        = oRs("alg_gebouw_key").value;
-      var oms        = oRs("alg_gebouw_naam").value;
-
-      var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
-      return JSON.stringify(data);
-    }
-
-    function fnrowClass(oRs)
-    {
-      var lclass = "";
-      // Tracking: hoe lang geleden voor het laatst gewijzigd?
-      if (oRs.Fields("recentdatum").Value != null)
-      {
-        var ltrackdate1 = new Date();
-        var ltrackdate10 = new Date();
-        var ltrackdate100 = new Date();
-        var alg_onrgoed_recent = S("alg_onrgoed_recent");
-        ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
-        ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
-        ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
-
-        var fac_recent = new Date(oRs.Fields("recentdatum").Value);
-        if (fac_recent > ltrackdate1)
-        {
-          lclass += " updated";
-        }
-        else if (fac_recent > ltrackdate10)
-        {
-          lclass += " updated10";
-        }
-        else if (fac_recent > ltrackdate100)
-        {
-          lclass += " updated100";
-        }
-      }
-      return lclass;
-    }
-
-    function fnrowActionEnabler(oRs)
-    {
-      var eDelete = false;
-      var eEditMulti = false;
-      var eObjMan = false;
-      if (alg.canWriteGebouw(oRs("alg_gebouw_key").value, authparams.mALGwritelevel))
-      {
-        eDelete = true;
-        eEditMulti = true;
-      }
-      // Heb ik rechten om het objectenbeheer overzicht te zien?
-      if (readuse || readman)
-        eObjMan = true;
-      return ({eDelete: eDelete, eEditMulti: eEditMulti, eObjMan: eObjMan});
-    }
-
-    function fnrowFlexParams(oRs)
-    {
-      var bld_key = oRs("alg_gebouw_key").Value;
-      var this_alg = alg.func_enabled(bld_key, "G");
-
-      var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
-      return flexParams;
-    }
-
-    function fncolFlexBijlagen(oRs)
-    {
-      var flexval = oRs("algflex").Value;
-      var alg_key = oRs("alg_gebouw_key").Value;
-      var result = ( flexval
-                   ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
-                   : ""
-                   );
-      if (flexParams.bijlageflex)
-      {
-        result += alg.alg_onroerendgoed_flex_bijlagen("G", alg_key);
-      }
-      return result;
-    }
+//     addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
 
     var rst = new ResultsetTable({ sql:sqln,
                                    keyColumn: "alg_gebouw_key",
@@ -351,51 +229,36 @@ function gebouw_list(pautfunction, params)
                                    flexParams: fnrowFlexParams,
                                    filterParams: params,
                                    outputmode: outputmode,
-                                   buttons: addButton,
-                                   rstCheckBoxes: rstCheckBoxes,
-                                   roundtripCode: (canImport ? "ONRGOED1" : "")
+                                   buttons: addButton
                                   });
 
     rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_descr"), content: "alg_locatie_omschrijving"}));
     rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_code"), content: "alg_gebouw_code"}));
     rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_name"), content: "alg_gebouw_naam" }));
     rst.addColumn(new Column({caption: L("lcl_estate_gebouw_srtgebouw"), content: "alg_srtgebouw_omschrijving"}));
-    rst.addColumn(new Column({caption: L("lcl_estate_gebouw_man_descr"), content: "alg_gebouw_omschrijving" }));
-    rst.addColumn(new Column({caption: L("lcl_adress"), content: "adres" }));  // gebouwadres anders locatieadres
-    rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_postcode"), content: "postcode"}));
-    rst.addColumn(new Column({caption: L("lcl_alg_loc_plaats"), content: "alg_locatie_plaats"}));
-    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"}));
-    if (flexParams.anyflex)
-      rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
     rst.addAction({ action: "gebouwEdit", caption: L("lcl_edit"), isDefault:  true});
-    if (S("cnd_gebreken_srtdisc_key") > -1)
-        rst.addAction({ action: "aggregateCNDscores", caption: L("cnd_aggr_conditiescores"), multi: true, multiOnce: true});
-    rst.addAction({ action: "gebouwEditMulti", caption: L("lcl_alg_multi_edit"), enabler: "eEditMulti", single:false, 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>
   </html>
 <%
 } %>
+

APPL/ALG/alg_gebouw_search.asp

@@ -14,15 +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 alg_startlevel = getQParamInt("alg_startlevel", 2); // Startlevel van plaatsselector, default Locatie
-var cnt_full = getQParamInt("cnt_full", 1);
 var authparams = alg.checkAutorisation();
 var this_alg = alg.func_enabled(gebouw_key);
 %>
@@ -37,137 +34,94 @@ var this_alg = alg.func_enabled(gebouw_key);
                 doSubmitWithKenmerken();
             }
 
-        async function myModal(init)
+        function myModal()
         {
           var lvl = "G";
           var key = 0;
           var bld_key = "";
-          var url = "load_kenmerk.asp?disc="
-                                  + "&urole=bo"
-                                  + "&advanced=1"
-                                  + "&hasFilter=1"
-                                  + "&onrgoed_key=" + bld_key
-                                  + "&onrgoed_niveau=" + lvl;
-          var titel = L("lcl_properties");
-          await showKenmerkModal(url, titel, init)
+          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)
         }
 
-          $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
+          $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
       </script>
   </head>
   <body id="searchbody">
-    <form name="u2" target="workFrame" action="alg_gebouw_search_list.asp" method="get">
-      <% SEARCH_PAGE_START({ header: L("lcl_filterblok") });
-      SEARCH_BLOCK_START();
-%>
-          <input type="hidden" id="cnt_full" name="cnt_full" value="<%=cnt_full%>">
-<%
+    <div id="search">
+      <form name="u2" target="workFrame" action="alg_gebouw_search_list.asp" method="get">
+<%      BLOCK_START("searchtable", L("lcl_filterblok"));%>
+        <tr>
+          <td class="searchkolom1">
+            <table><!-- x rijen, 2 kolommen: label + veld -->
+
+<%             <!-- Locatie, gebouw en verdieping -->
                   FCLTplaatsselector(authparams.ALGreadlevel, {
                                                                 locatiekey: locatie_key,
                                                                 gebouwkey: gebouw_key,
-                                                                startlevel: alg_startlevel, // locatie
+                                                                startlevel: 2, // locatie
                                                                 eindlevel: 2, // locatie
                                                                 whenEmpty: L("lcl_search_generic")
                                                               });
 %>
               <tr class="primsearch">
-                <td class="label"><label for="bld_code"><%=L("lcl_estate_gebouw_man_code")%></label></td>
-                <td><input type="text" class="fld" id="bld_code" name="bld_code" value=""></td>
+                <td class="label"><label><%=L("lcl_estate_gebouw_man_code")%>:</label></td>
+                <td><input type="text" class="wildcard" id="bld_code" name="bld_code" value=""></td>
               </tr>
               <tr class="primsearch">
-                <td class="label"><label for="bld_name"><%=L("lcl_estate_gebouw_man_name")%></label></td>
-                <td><input type="text" class="fld" id="bld_name" name="bld_name" value=""></td>
+                <td class="label"><label><%=L("lcl_estate_gebouw_man_name")%>:</label></td>
+                <td><input type="text" class="wildcard" id="bld_name" name="bld_name" value=""></td>
               </tr>
               <!-- Vervallen objecten -->
               <tr class="primsearch">
                 <td></td>
                 <td align=left>
-                  <input type="checkbox" class="fld" name="expAlgIncl" id="expAlgIncl" value="1" >
+                  <input type="checkbox" class="fldexpalgincl" name="expAlgIncl" id="expAlgIncl" value="1" >
                   <label for="expAlgIncl"><%=L("lcl_alg_gebouw_vervallen_incl")%></label>
                 </td>
               </tr>
-          <% SEARCH_BLOCK_END();
-          SEARCH_BLOCK_START();
-          sql = "SELECT alg_srtgebouw_key"
+            </table>
+          </td><!-- end column 1 -->
+
+          <td class="searchkolom2">
+            <table><!-- x rijen, 2 kolommen: label + veld -->
+              <!-- Zoektekst -->
+<%            sql = "SELECT alg_srtgebouw_key"
                 + ", "+lcl.xsqla('alg_srtgebouw_omschrijving', 'alg_srtgebouw_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 for="bld_groep"><%=L("lcl_estate_gebouw_groepkenmerk")%></label></td>
-                  <td><input type="text" class="fld" 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
+                                });
+%>
+            </table>
+          </td><!-- end column 1 -->
+        </tr>
+<%      BLOCK_END();
+
+        var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
+                         {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
+        CreateButtons(buttons, { entersubmit: true });
 %>
-                <tr class="primsearch">
-                  <td class="label"><label for="bld_email"><%=L("lcl_alg_gebouw_email")%></label></td>
-                  <td><input type="text" class="fld" 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="fldshort 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="fldshort number "
-                           value=""
-                           maxlength="3">
-                  </td>
-                </tr>
-<%            } %>
-<%      SEARCH_BLOCK_END();
-        SIMPLE_BLOCK_START();
-          var buttons = [ {title: L("lcl_overview_list"), action: "doSubmit()", id: "bSearch", importance: 1, icon: "fa-clipboard-list" }
-                        , {title: L("lcl_shared_advanced"), action: "myModal()", id: "bAdvanced", importance: 3, icon: "fa-filter" }
-                        ];
-          CreateButtons(buttons, { entersubmit: true, showIcons: true });
-        SIMPLE_BLOCK_END();
-        SEARCH_PAGE_END(); %>
       </form>
+    </div> <!-- search -->
 
     <div id="result">
       <iframe width="100%" height="100%"
@@ -179,4 +133,3 @@ var this_alg = alg.func_enabled(gebouw_key);
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_gebouw_search_list.asp

@@ -32,17 +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 rstFilters = getQParamInt("rst_filters", 0) ;// button vervallen gebouwen
-var cnt_full = getQParamInt("cnt_full", 1);
-var fitness_score1_from = getQParamFloat("fitness_score1_from", -1);       // Conditie score van.
-var fitness_score1_through = getQParamFloat("fitness_score1_through", -1); // Conditie score t/m.
-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),
@@ -52,13 +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,
-                 rstFilters: (rstFilters == true ? 1 : 0)
+                 expalgincl: expalgincl
               }
              );
-%><% ASPPAGE_END(); %>
+%>

APPL/ALG/alg_locatie.asp

@@ -6,8 +6,7 @@
     File:           alg_locatie.asp
     Description:
 
-    Parameters:     key
-                    cnt_full
+    Parameters:
 
     Context:
     Note:
@@ -21,18 +20,15 @@ FCLTHeader.Requires({ plugins: ["suggest", "jQuery"],
                       js: ["jquery-ui.js"]})
 
 var loc_key = getQParamInt("key", -1);
-var cnt_full = getQParamInt("cnt_full", 1);
 
 if (loc_key > 0)
 {
-  sql = "SELECT alg_locatie_code, alg_locatie_x, alg_locatie_y "
+  sql = "SELECT alg_locatie_code "
       + "  FROM alg_locatie "
       + " WHERE alg_locatie_key = " + loc_key;
   oRs = Oracle.Execute(sql);
 
   var loc_name = oRs("alg_locatie_code").value;
-  var loc_x = oRs("alg_locatie_x").value;
-  var loc_y = oRs("alg_locatie_y").value;
 }
 else
 {
@@ -45,7 +41,7 @@ else
   <head>
 <%  FCLTHeader.Generate(); %>
     <script  type="text/javascript" >
-      FcltMgr.setTitle(L("lcl_location")+" "+ "<%=safe.jsstring(loc_name)%>", {hot: false});
+      FcltMgr.setTitle("<%=L("lcl_location")+' '+safe.jsstring(loc_name)%> ", {hot: false});
 <%    if (loc_key == -1) { %>FcltMgr.startEdit(window);<% } %>
       function algClose(params)
       {
@@ -64,13 +60,12 @@ else
                 FcltMgr.closeDetail(window, { close: true})
               }
               if (!params.keepForm)
-                  $("#algframe")[0].src = "alg_show_locatie.asp?loc_key=<%=loc_key%>";
+                  $("#algFrame")[0].src = "alg_show_locatie.asp?loc_key=<%=loc_key%>";
           <% } %>
       }
     </script>
   </head>
   <body>
-  <% PAGE_START(); %>
 <%
     if (loc_key == -1)
       var page="alg_edit_locatie.asp"; // Maak een nieuw
@@ -78,56 +73,25 @@ else
       var page="alg_show_locatie.asp";
     page += "?loc_key=" + loc_key;
 
-    IFRAMER("algframe", page, { title: L("lcl_alg_locatie_frame"),
+    IFRAMER("algFrame", page, { title: L("lcl_alg_locatie_frame"),
+                                initHeight: "450px",
                                 FcltClose: "algClose" } );
-
+                                
     if (loc_key > -1)
     {
-      var urole = "bo";
-      var page0 = "../alg/alg_gebouw_search_list.asp?urole="
-                + urole +"&locatiekey="+loc_key
-                + "&rst_filters=1";
-
-      IFRAMER("alggebouwframe", page0, { icon: "fa-list"} );
-      var page1 = "../alg/alg_terreinsector_search_list.asp?urole=" + urole +"&locatiekey="+loc_key;
-      IFRAMER("algterreinframe", page1, { icon: "fa-list"} );
-
       var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true);
       var authparamsCNTMAN = user.checkAutorisation("WEB_CNTMAN", true);
       var curole = "bo";
-
+      
       if (!authparamsCNTMAN && authparamsCNTUSE)
         curole = "fe";
-
+            
       if (authparamsCNTMAN || authparamsCNTUSE)
       {
-          var page2 = "../cnt/cnt_search_list.asp?embedded=1&tiny=1&urole=" + curole
-                    + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&loc_key=" + loc_key
-                    + "&rst_filters=1"
-                    + "&cnt_full="+cnt_full;
-          IFRAMER("cntlistframe", page2, { icon: "fa-list" } );
+          var page1="../cnt/cnt_search_list.asp?embedded=1&tiny=1&collapsed=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&loc_key=" + loc_key
+          IFRAMER("cntFrame", page1, { initHeight: "450px" } );
       }
-
-      if (S("alg_fg_remote_maps") != "" && loc_x && loc_y)
-      {
-        var page4 = "../cad/ShowGoogleMap.asp?loc_key=" + loc_key;
-        IFRAMER("mapsframe", page4, { title: L("lcl_maps"), icon: "fa-map-marker-alt" } );
-      }
-      // tracking naar subframe :-)
-      var autfunction = ["WEB_ALGUSE", "WEB_ALGMAN"];
-      var authparams = user.checkAutorisation(autfunction, true);
-      if (authparams && authparams.ALGreadlevel <= 2 && authparams.PRSreadlevel < 9)
-      {
-        page5 = protectQS.create("../shared/status_info.asp?loc_key=" + loc_key);
-        IFRAMER("alghistoryframe", page5, { icon: "fa-list", title: L("lcl_tracking")} );
-      }
-
-      page6 = "alg_show_note2.asp?alg_key=" + loc_key + "&alg_typ=L";
-      IFRAMER("algnoteframe", page6, { refreshOnClose: true, sidebar: true } ); // sidebar heeft geen icon/title nodig
-
-    }
+    }                                  
 %>
-<% PAGE_END(); %>
   </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" -->
@@ -18,51 +19,76 @@ FCLTHeader.Requires({ plugins:["jQuery"],
                       js: []
                     })
 
-var cnt_full = getQParamInt("cnt_full", 1);
+function fnrowData(oRs)
+{
+  var parent_key = oRs("alg_district_key").value;
+  var detail_key = oRs("alg_locatie_key").value;
+  var key        = oRs("alg_locatie_key").value;
+  var oms        = oRs("alg_locatie_omschrijving").value;
+
+  var data = {parent_key:parent_key, detail_key:detail_key, key:key, oms:oms};
+
+  return JSON.stringify(data);
+}
+
+var recent = new Date();
+function fnrowClass(oRs)
+{
+  var lclass = "";
+  // Tracking: hoe lang geleden voor het laatst gewijzigd?
+  if (oRs.Fields("recentdatum").Value != null)
+  {
+    var ltrackdate1 = new Date();
+    var ltrackdate10 = new Date();
+    var ltrackdate100 = new Date();
+    var alg_onrgoed_recent = S("alg_onrgoed_recent");
+    ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
+    ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
+    ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
+
+    var fac_recent = new Date(oRs.Fields("recentdatum").Value);
+    if (fac_recent > ltrackdate1)
+    {
+      lclass += " updated";
+    }
+    else if (fac_recent > ltrackdate10)
+    {
+      lclass += " updated10";
+    }
+    else if (fac_recent > ltrackdate100)
+    {
+      lclass += " updated100";
+    }
+  }
+  return lclass;
+}
 %>
 <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"));
+    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"));
+    FcltMgr.openDetail(url, "<%=L("lcl_district")%>");
   }
-
-  function locatieEdit(row)
+    function locatieEdit(row)
   {
-    var v_all_cnt = <%=cnt_full%>;
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
-    var url = "appl/ALG/alg_locatie.asp?key="+algData.key + "&cnt_full=<%=cnt_full%>";
-    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 locatieEditMulti(rowArray, isMulti)
-  {
-      var locKeyString = getKeyString(rowArray);
-      var subject = L("lcl_alg_multi_edit");
-      var url = "../alg/alg_edit_locatie_multi.asp?loc_keys=" + locKeyString;
-      FcltMgr.openModalDetail(url, subject, {callback: FcltCallbackRefresh});
+    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 doDelete(rowArray, isMulti)
@@ -91,13 +117,26 @@ 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)
+  {
+    var eDelete = false;
+    if (alg.canWriteLocatie(oRs("alg_locatie_key").value, authparams.mALGwritelevel))
+        eDelete = true;
+    return ({eDelete: eDelete})
+  }
+
+  function fnrowFlexParams(oRs)
+  {
+    var loc_key = oRs("alg_locatie_key").Value;
+    var this_alg = alg.func_enabled(loc_key, "L");
+
+    var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
+    return flexParams;
+  }
 %>
 
 <html>
@@ -105,9 +144,7 @@ function locatie_list(pautfunction, params)
     <% FCLTHeader.Generate({outputmode:outputmode}) %>
   </head>
   <body id="listbody">
-<%
-    var flexParams = alg.alg_onroerendgoed_flex_params("L");
-    var sqln = "SELECT l.alg_locatie_key"
+<%  var sqln = "SELECT l.alg_locatie_key"
              + "     , l.alg_district_key"
              + "     , l.alg_locatie_code"
              + "     , l.alg_locatie_omschrijving"
@@ -122,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"
@@ -133,7 +168,6 @@ function locatie_list(pautfunction, params)
              + "           AND t.fac_tracking_refkey = l.alg_locatie_key"
              + "           AND sn.fac_srtnotificatie_xmlnode = 'locatie'"
              + "       ) recentdatum"
-             +       flexParams.sql
              + "  FROM alg_v_aanweziglocatie l"
              + "     , alg_district d "
              + " WHERE d.alg_district_key(+) = l.alg_district_key"
@@ -161,114 +195,18 @@ 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 + "%");
+        sqln += " AND UPPER(l.alg_locatie_code) LIKE " + safe.quoted_sql_wild(params.loc_code + "%");    
 
-    if (ins_score_enabled)
-    { // Conditiescore.
-      // Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
-      if (fitness_score1_from > 0)
-        sqln += " AND alg_locatie_mjb_score1 >= " + fitness_score1_from;
-      if (fitness_score1_through > 0)
-        sqln += " AND alg_locatie_mjb_score1 <= " + fitness_score1_through;
-    }
-
-    sqln += " ORDER BY UPPER(alg_district_omschrijving), UPPER(alg_locatie_code)";
+    sqln += " ORDER BY l.alg_locatie_upper ASC "
 
     var addurl = "appl/alg/alg_locatie.asp";
 //  addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
 
     if (canAdd)
     {
-      addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }]
-    }
-
-    /**********************************
-    * Callback functies ResultsetTable
-     *********************************/
-    var recent = new Date();
-
-    function fnrowData(oRs)
-    {
-      var parent_key = oRs("alg_district_key").value;
-      var detail_key = oRs("alg_locatie_key").value;
-      var key        = oRs("alg_locatie_key").value;
-      var oms        = oRs("alg_locatie_omschrijving").value;
-      var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
-      return JSON.stringify(data);
-    }
-
-    function fnrowClass(oRs)
-    {
-      var lclass = "";
-      // Tracking: hoe lang geleden voor het laatst gewijzigd?
-      if (oRs.Fields("recentdatum").Value != null)
-      {
-        var ltrackdate1 = new Date();
-        var ltrackdate10 = new Date();
-        var ltrackdate100 = new Date();
-        var alg_onrgoed_recent = S("alg_onrgoed_recent");
-        ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
-        ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
-        ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
-
-        var fac_recent = new Date(oRs.Fields("recentdatum").Value);
-        if (fac_recent > ltrackdate1)
-        {
-          lclass += " updated";
-        }
-        else if (fac_recent > ltrackdate10)
-        {
-          lclass += " updated10";
-        }
-        else if (fac_recent > ltrackdate100)
-        {
-          lclass += " updated100";
-        }
-      }
-      return lclass;
-    }
-
-    function fnrowActionEnabler(oRs)
-    {
-      var eDelete = false;
-      var eEditMulti = false;
-      if (alg.canWriteLocatie(oRs("alg_locatie_key").value, authparams.mALGwritelevel))
-      {
-        eDelete = true;
-        eEditMulti = true;
-      }
-      return ({eDelete: eDelete, eEditMulti: eEditMulti})
-    }
-
-    function fnrowFlexParams(oRs)
-    {
-      var loc_key = oRs("alg_locatie_key").Value;
-      var this_alg = alg.func_enabled(loc_key, "L");
-
-      var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
-      return flexParams;
-    }
-
-    function fncolFlexBijlagen(oRs)
-    {
-      var flexval = oRs("algflex").Value;
-      var alg_key = oRs("alg_locatie_key").Value;
-      var result = ( flexval
-                   ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
-                   : ""
-                   );
-      if (flexParams.bijlageflex)
-      {
-        result += alg.alg_onroerendgoed_flex_bijlagen("L", alg_key);
-      }
-      return result;
+      addButton = [{ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" }]
     }
 
     var rst = new ResultsetTable({ sql:sqln,
@@ -293,9 +231,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)
     {
@@ -305,21 +240,16 @@ function locatie_list(pautfunction, params)
       rst.addColumn(new Column({caption: L("lcl_prs_address_post_plaats"), content: "alg_locatie_post_plaats"}));
       rst.addColumn(new Column({caption: L("lcl_prs_address_post_land"), content: "alg_locatie_post_land"}));
       rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_verantw"), content: "alg_locatie_verantw"}));
-      rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_verantw_tel"), content: "alg_locatie_verantw_tel"}));
       rst.addColumn(new Column({caption: L("lcl_geoxcoord"), content: "alg_locatie_x"}));
       rst.addColumn(new Column({caption: L("lcl_geoycoord"), content: "alg_locatie_y"}));
     }
-    if (flexParams.anyflex)
-      rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
 
     rst.addAction({ action: "locatieEdit", caption: L("lcl_edit"), isDefault:  true});
-    if (S("cnd_gebreken_srtdisc_key") > -1)
-        rst.addAction({ action: "aggregateCNDscores", caption: L("cnd_aggr_conditiescores"), multi: true, multiOnce: true});
-    rst.addAction({ action: "locatieEditMulti", caption: L("lcl_alg_multi_edit"), enabler: "eEditMulti", single:false, 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();
@@ -329,3 +259,4 @@ function locatie_list(pautfunction, params)
 <%
 }
 %>
+

APPL/ALG/alg_locatie_search.asp

@@ -12,12 +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", 1);
-var alg_startlevel = getQParamInt("alg_startlevel", 0); // Startlevel van plaatsselector, default Regio
 var authparams = alg.checkAutorisation();
 %>
 
@@ -31,100 +28,53 @@ var authparams = alg.checkAutorisation();
               doSubmitWithKenmerken();
           }
 
-        async function myModal(init)
+        function myModal()
         {
           var lvl = "L";
           var key = 0;
           var bld_key = "";
-          var url = "load_kenmerk.asp?disc="
-                                  + "&urole=bo"
-                                  + "&advanced=1"
-                                  + "&hasFilter=1"
-                                  + "&onrgoed_key=" + bld_key
-                                  + "&onrgoed_niveau=" + lvl;
-          var titel = L("lcl_properties");
-          await showKenmerkModal(url, titel, init)
+          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)
         }
 
-        $(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">
-<%    SEARCH_PAGE_START({ header: L("lcl_filterblok") });
-      SEARCH_BLOCK_START();
-%>
-              <input type="hidden" id="cnt_full" name="cnt_full" value="<%=cnt_full%>">
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
+          <tr>
+            <td class="searchkolom1">
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+              <!-- Locatie, gebouw en verdieping -->
 <%                  FCLTplaatsselector(authparams.ALGreadlevel, {
                                                                   districtkey: district_key,
                                                                   locatiekey: locatie_key,
-                                                                  startlevel: alg_startlevel, // regio
-                                                                  eindlevel: 2, // Locatie
+                                                                  startlevel: 1, // District
+                                                                  eindlevel: 2, // locatie
                                                                   whenEmpty: L("lcl_search_generic")  // want filter
                                                                 });
 %>
               <tr class="primsearch">
-                <td class="label"><label for="loc_code"><%=L("lcl_estate_locatie_man_code")%></label></td>
-                <td><input type="text" class="fldshort wildcard" id="loc_code" name="loc_code" value=""></td>
-              </tr>
-              <tr class="primsearch">
-                <td class="label"><label for="loc_descr"><%=L("lcl_estate_locatie_man_descr")%></label></td>
-                <td><input type="text" class="fld wildcard" id="loc_descr" name="loc_descr" value=""></td>
-              </tr>
-              <!-- Vervallen objecten -->
-              <tr class="primsearch">
-                <td></td>
-                <td align="left">
-                  <input type="checkbox" class="fld" name="expAlgIncl" id="expAlgIncl" value="1" >
-                  <label for="expAlgIncl"><%=L("lcl_alg_locatie_vervallen_incl")%></label>
-                </td>
+                <td class="label"><label><%=L("lcl_estate_locatie_man_code")%>:</label></td>
+                <td><input type="text" class="wildcard" id="loc_code" name="loc_code" value=""></td>
               </tr>
+              </table>
+            </td><!-- end column 1 -->
 
-<%              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="fldshort 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="fldshort number "
-                             value=""
-                             maxlength="3">
-                    </td>
-                  </tr>
-<%              } %>
-<%      SEARCH_BLOCK_END();
-        SIMPLE_BLOCK_START();
-          var buttons = [ {title: L("lcl_overview_list"), action: "doSubmit()", id: "bSearch", importance: 1, icon: "fa-clipboard-list" }
-                        , {title: L("lcl_shared_advanced"), action: "myModal()", id: "bAdvanced", importance: 3, icon: "fa-filter" }
-                        ];
-          CreateButtons(buttons, { entersubmit: true, showIcons: true });
-        SIMPLE_BLOCK_END();
-        SEARCH_PAGE_END(); %>
+            <td class="searchkolom2">
+            </td><!-- end column 1 -->
+          </tr>
+<%    BLOCK_END();
+
+  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
+                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
+  CreateButtons(buttons, { entersubmit: true });
+%>
       </form>
+    </div> <!-- search -->
 
     <div id="result">
       <iframe width="100%" height="100%"
@@ -136,4 +86,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_locatie_search_list.asp

@@ -3,10 +3,10 @@
      $Revision$
      $Id$
 
-    File:
-    Description:
-    Parameters:
-    Context:
+    File:       
+    Description: 
+    Parameters:  
+    Context:     
     Note:
 */ %>
 
@@ -26,25 +26,15 @@ var reg_key = getQParamInt("regiokey", -1); // Regio
 var dis_key = getQParamInt("districtkey", -1); // District
 var loc_key = getQParamInt("locatiekey", -1); // Locatie
 var loc_code = getQParam("loc_code", ""); // Locatiecode
-var loc_descr = getQParam("loc_descr", ""); // Locatienaam
-var cnt_full = getQParamInt("cnt_full", 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,
+                 loc_code: loc_code,                 
                  noref: (noref != -1? noref : null)
               }
              );
-%><% ASPPAGE_END(); %> 
+%>

APPL/ALG/alg_regio.asp

@@ -7,16 +7,20 @@
     Status:
     Description:
 
+    Parameters:
+
+    Context:
+    Note:
+
 */ %>
 <!--#include file="../Shared/common.inc" -->
 <!--#include file="../Shared/iface.inc" -->
 <%
-FCLTHeader.Requires({plugins:["jQuery"],
-                         js: ["jquery-ui.js"]
-                    })
+FCLTHeader.Requires({plugins:["jQuery"], js: []})
 
 var reg_key = getQParamInt("key", -1);
 %>
+
 <html>
   <head>
 <%  FCLTHeader.Generate();
@@ -32,45 +36,26 @@ var reg_key = getQParamInt("key", -1);
                   FcltMgr.closeDetail(window, params );
                   return true;
               }
-              FcltMgr.setTitle(L("lcl_region") +" "+ params.regio_key, {hot: false});
+              FcltMgr.setTitle("<%=L("lcl_region")%> " + params.regio_key, {hot: false});
               if (!params.keepForm)
                   window.location.href = "alg_regio.asp?verynew=1&key=" + params.regio_key;
           <% } else { /* Bestaande regio bewerkt, switch naar show-mode */ %>
               if (!params.keepForm)
-                  $("#algframe")[0].src = "alg_show_regio.asp?regio_key=<%=reg_key%>";
+                  $("#algFrame")[0].src = "alg_show_regio.asp?regio_key=<%=reg_key%>";
           <% } %>
       }
     </script>
   </head>
   <body>
-  <%
-    PAGE_START();
-    if (reg_key == -1)
+<%  if (reg_key == -1)
         var page="alg_edit_regio.asp"; // Maak een nieuw
     else
         var page="alg_show_regio.asp";
     page += "?regio_key="+reg_key;
 
-    IFRAMER("algframe", page, { title: L("lcl_alg_regio_frame"),
+  IFRAMER("algFrame", page, { title: L("lcl_alg_regio_frame"),
+                              initHeight: "450px",
                               FcltClose: "algClose" } );
-
-    if (reg_key > -1)
-    {
-      page0 = "../alg/alg_district_search_list.asp?regiokey="+reg_key;
-      IFRAMER("algdistrictframe", page0, { icon: "fa-list" } );
-
-      var autfunction = ["WEB_ALGUSE", "WEB_ALGMAN"];
-      var authparams = user.checkAutorisation(autfunction, true);
-      if (authparams && authparams.ALGreadlevel <= 0 && authparams.PRSreadlevel < 9)
-      {
-        // tracking naar subframe :-)
-        page1 = protectQS.create("../shared/status_info.asp?reg_key=" + reg_key);
-        IFRAMER("alghistoryframe", page1, { icon: "fa-list", title: L("lcl_tracking")} );
-      }
-    }
-
-    PAGE_END();
-%>
+ %>
   </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" -->
@@ -17,6 +18,19 @@
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"] });
+
+
+function fnrowData(oRs)
+{
+    var detail_key = oRs.Fields("id").Value;
+    var key        = oRs.Fields("id").Value;
+    var oms        = oRs.Fields("name").Value;
+
+    var data = {detail_key: detail_key, key: key, oms: oms};
+
+    return JSON.stringify(data);
+}
+
 %>
 <script type="text/javascript">
 
@@ -24,16 +38,16 @@ FCLTHeader.Requires({ plugins:["jQuery"] });
 
   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"));
+    FcltMgr.openDetail(url, "<%=L("lcl_district")%>");
   }
 
-  function districtEdit(row)
+    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);
+    FcltMgr.openDetail(url, "<%=L("lcl_region")%>" + ' ' + algData.oms);
   }
 
   function doDelete(rowArray, isMulti)
@@ -41,13 +55,13 @@ FCLTHeader.Requires({ plugins:["jQuery"] });
     FcltMgr.confirm(L("lcl_alg_del_txt_regio"), { autoconfirm: isMulti }, function() {
       var regKeyString = getKeyString(rowArray);
       var data = { key: regKeyString,
-                   level: "E"
+                   level: "RE"
                  };
       <% protectRequest.dataToken("data"); %>
       $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
     });
   }
-</script>
+    </script>
 <%
 
 function regio_list(pautfunction, params)
@@ -62,45 +76,13 @@ function regio_list(pautfunction, params)
   var showall    = params.showall;
   var reg_key    = params.reg_key;
 
-  function fnrowData(oRs)
-  {
-    var detail_key = oRs.Fields("id").Value;
-    var key        = oRs.Fields("id").Value;
-    var oms        = oRs.Fields("name").Value;
-    var data = {detail_key: detail_key, key: key, oms: oms};
-    return JSON.stringify(data);
-  }
   function fnrowActionEnabler(oRs)
   {
-    var eDelete = false;
-    if (alg.canWriteRegio(oRs.Fields("id").Value, authparams.mALGwritelevel))
-      eDelete = true;
-    return ({eDelete: eDelete});
+      var eDelete = false;
+      if (alg.canWriteRegio(oRs.Fields("id").Value, authparams.mALGwritelevel))
+          eDelete = true;
+      return ({eDelete: eDelete})
   }
-
-  function fnrowFlexParams(oRs)
-  {
-    var reg_key = oRs.Fields("id").Value;
-    var this_alg = alg.func_enabled(reg_key, "E");
-    var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
-    return flexParams;
-  }
-
-  function fncolFlexBijlagen(oRs)
-  {
-    var flexval = oRs.Fields("algflex").Value;
-    var alg_key = oRs.Fields("id").Value;
-    var result = ( flexval
-                 ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
-                 : ""
-                 );
-    if (flexParams.bijlageflex)
-    {
-        result += alg.alg_onroerendgoed_flex_bijlagen("E", alg_key);
-    }
-    return result;
-  }
-
 %>
   <html>
     <head>
@@ -109,34 +91,20 @@ function regio_list(pautfunction, params)
     <body id="listbody">
 <%
     // Ophalen regio`s
-    var flexParams = alg.alg_onroerendgoed_flex_params("E");
     var regio_key = getQParamInt("regiokey");
     var filter = {};
     if (regio_key > -1)
-        filter = {id: regio_key};
-    else
-    {
-      var kenmerk_sql = getKenmerkSql("ALG", "alg_regio.alg_regio_key");
-      if (kenmerk_sql)
-        filter = {kenmerk_sql: kenmerk_sql.substr(4)}; // De "AND" aan het begin eraf halen.
-    }
-      
-    var params = { filter: filter // Alle regio`s ophalen, behalve de verwijderde.
-                 , flexparams: { anyflex: flexParams.anyflex
-                               , bijlageflex: flexParams.bijlageflex
-                               , sql: flexParams.sql.substr(1).replace("e.", "alg_regio.")
-                               , algflex: {"dbs": "algflex", "typ": "varchar"}
-                               }
-                 };
-    var model = new model_regions();
-    var regio_array = model.REST_GET(params);       // Roep de API2 GET aan
+        var filter = {id: regio_key};
+    var params = { filter: filter };  // Alle regio`s ophalen, behalve de verwijderde.
+    var regio_array = model_regions.REST_GET(params);       // Roep de API2 GET aan
     //
 
     var addurl = "appl/alg/alg_regio.asp";
+    //  addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
 
     if (canAdd)
     {
-        addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }]
+        addButton = [{ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" }]
     }
 
     var rst = new ResultsetTable({ dataset: regio_array,
@@ -145,17 +113,13 @@ function regio_list(pautfunction, params)
                                    showAll: showall,
                                    rowData: fnrowData,
                                    rowActionEnabler: fnrowActionEnabler,
-                                   flexModule: "ALG",
-                                   flexId: "alg_regio_key",
-                                   flexParams: fnrowFlexParams,
                                    outputmode: outputmode,
                                    filterParams: params,
                                    buttons: addButton
                                  });
 
+
     rst.addColumn(new Column({caption: L("lcl_estate_regio_descr"), content: "name"}));
-    if (flexParams.anyflex)
-      rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
     rst.addAction({ action: "districtEdit", caption: L("lcl_edit"), isDefault:  true});
     rst.addAction({ action: "doDelete", caption: L("lcl_delete"), enabler: "eDelete", multi: true, multiOnce: true});

APPL/ALG/alg_regio_search.asp

@@ -16,7 +16,6 @@ FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });
 
 var regio_key = getQParamInt("regio_key", -1); //regio
 var autosearch = getQParamInt("autosearch", 0) == 1;
-var alg_startlevel = getQParamInt("alg_startlevel", 0); // Startlevel van plaatsselector, default Regio
 var authparams = alg.checkAutorisation();
 %>
 
@@ -24,53 +23,39 @@ var authparams = alg.checkAutorisation();
   <head>
     <%  FCLTHeader.Generate(); %>
     <script type="text/javascript">
-      function doSubmit()
-      {
-          // Submitten met kenmerken
-          doSubmitWithKenmerken();
-      }
-      async function myModal(init)
-      {
-        var lvl = "E";
-        var key = 0;
-        var bld_key = "";
-        var url = "load_kenmerk.asp?disc="
-                                + "&urole=bo"
-                                + "&advanced=1"
-                                + "&hasFilter=1"
-                                + "&onrgoed_key=" +bld_key
-                                + "&onrgoed_niveau=" + lvl;
-        var titel = L("lcl_properties");
-        await showKenmerkModal(url, titel, init);
-      }
-
-      $(function() {
-          <% if (autosearch) { %>
-            document.forms.u2.submit(); 
-          <% } %> 
-          });
+    $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
     </script>
   </head>
   <body id="searchbody">
-    <form name="u2" target="workFrame" action="alg_regio_search_list.asp" method="get">
-      <% SEARCH_PAGE_START({ header: L("lcl_filterblok") });
-      SEARCH_BLOCK_START();
-      //               <!-- Locatie, gebouw en verdieping -->
+    <div id="search">
+      <form name="u2" target="workFrame" action="alg_regio_search_list.asp" method="get">
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
+          <tr>
+            <td class="searchkolom1">
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+
+<% //               <!-- Locatie, gebouw en verdieping -->
                     FCLTplaatsselector(authparams.ALGreadlevel, {
                                                                   regiokey: regio_key,
-                                                                  startlevel: alg_startlevel, // Regio
+                                                                  startlevel: 0, // Regio
                                                                   eindlevel: 0, // District
                                                                   whenEmpty: L("lcl_search_generic")
                                                                 });
-  SEARCH_BLOCK_END();
-  SIMPLE_BLOCK_START();
-    var buttons = [ {title: L("lcl_overview_list"), action: "doSubmit();", id: "bSearch", icon: "fa-clipboard-list" }
-                  , {title: L("lcl_shared_advanced"), action: "myModal()", id: "bAdvanced", importance: 3, icon: "fa-filter" }
-                  ];
-    CreateButtons(buttons, { entersubmit: true, showIcons: true });
-  SIMPLE_BLOCK_END();
-  SEARCH_PAGE_END(); %>
+%>
+              </table>
+            </td><!-- end column 1 -->
+
+            <td class="searchkolom2">
+            </td><!-- end column 1 -->
+          </tr>
+
+<%    BLOCK_END(); %>
+<%
+  var buttons =  [{title: L("lcl_search"), action: "document.forms.u2.submit();", id: "bSearch" }];
+  CreateButtons(buttons, { entersubmit: true });
+%>
       </form>
+    </div> <!-- search -->
 
     <div id="result">
       <iframe width="100%" height="100%"
@@ -82,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

@@ -27,7 +27,6 @@ var geb_key = getQParamInt("gebouwkey", -1);
 var ver_key = getQParamInt("verdiepingkey", -1);
 var cad_ruimte_nr = getQParam("cad_ruimte_nr", null);
 //var rui_key = getQParamInt("ruimtekey", -1); Ruimte bestaat al en kan ik niet opnieuw aanmaken.
-var cnt_full = getQParamInt("cnt_full", 1);
 
 var addString = "";
 
@@ -49,7 +48,6 @@ if (room_key > 0)
   var flr_oms = oRs("alg_verdieping_omschrijving").value;
   var room_nr = oRs("alg_ruimte_nr").value;
   var room_name   = " " + bld_code + "-" + flr_oms + "-" + room_nr;
-  oRs.Close();
 }
 else
 {
@@ -72,7 +70,7 @@ else
     FCLTHeader.Generate();
   %>
     <script  type="text/javascript" >
-      FcltMgr.setTitle(L("lcl_room")+" "+"<%=safe.jsstring(room_name)%>", {hot: false});
+      FcltMgr.setTitle("<%=L("lcl_room")%> <%=safe.jsstring(room_name)%>", {hot: false});
 <%    if (room_key == -1) { %>FcltMgr.startEdit(window);<% } %>
       function algClose(params)
       {
@@ -87,62 +85,39 @@ else
                   window.location.href = "alg_ruimte.asp?verynew=1&key=" + params.room_key;
           <% } else { /* Bestaande ruimte bewerkt, switch naar show-mode */ %>
               if (!params.keepForm)
-                  $("#algruimteframe")[0].src = "alg_show_ruimte.asp?room_key=<%=room_key%>";
+                  $("#algFrame")[0].src = "alg_show_ruimte.asp?room_key=<%=room_key%>";
 
           <% } %>
       }
     </script>
   </head>
   <body>
-  <% PAGE_START(); %>
 <%
     if (room_key == -1)
         var page="alg_edit_ruimte.asp?room_key=" + room_key + addString; // Maak een nieuw
     else
         var page="alg_show_ruimte.asp?room_key=" + room_key;
 
-    IFRAMER("algruimteframe", page, { FcltClose: "algClose" } );
+    IFRAMER("algFrame", page, { initHeight: "450px",
+                                FcltClose: "algClose" } );
 
 
     if (room_key > -1)
     {
       var page2 ="alg_werkplek_search_list.asp?tiny=1&ruimtekey=" + room_key;
-      IFRAMER("wplistframe", page2, { icon: "fa-list" } );
+      IFRAMER("wpFrame", page2, { initHeight: "450px" } );
 
-      var page3 = "../mgt/prs_ruimteafdeling.asp?tiny=1&mode=list&room=" + room_key;
-      IFRAMER("afdlistframe", page3, { icon: "fa-list" } );
+      var page3 ="../prs/prs_afdeling_search_list.asp?tiny=1&room_key=" + room_key;// Alle afdelingen van alle niveau's (1 en hoger) laten zien dus afd_niveau=nr niet meegegeven
+      IFRAMER("wpFrame", page3, { initHeight: "450px" } );
 
       var authparamsINSMAN = user.checkAutorisation("WEB_INSMAN", true);
       var insman_read = authparamsINSMAN;
       if (insman_read)
       {
-          var page4="../INS/ins_list.asp?embedded=1&tiny=1&inacObjIncl=1&ruimtekey=" + room_key
-          IFRAMER("deellistframe", page4, { icon: "fa-list" } );
-      }
-      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)
-      {
-          // vind dit dubieus maar ga het nu niet uitzoeken: we geven statusflags mee, cnt_search_list heeft zelf defaults en cnt_full overruled
-          // dat. Die statusparameters kunnen vast weggemanaged worden, maar met cnt_full=0 hebben ze wel (gewenst) effect.
-          var page5="../cnt/cnt_search_list.asp?tiny=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&room_key="+ room_key;
-          page5 += "&cnt_full="+cnt_full;
-          IFRAMER("cntlistframe", page5, { icon: "fa-list" } );
-      }
-      // tracking naar subframe :-)
-      var autfunction = ["WEB_ALGUSE", "WEB_ALGMAN"];
-      var authparams = user.checkAutorisation(autfunction, true);
-      if (authparams && authparams.ALGreadlevel <= 5 && authparams.PRSreadlevel < 9)
-      {
-        page = protectQS.create("../shared/status_info.asp?room_key=" + room_key);
-        IFRAMER("alghistoryframe", page, { icon: "fa-list", title: L("lcl_tracking")} );
+          var page4="../INS/ins_list.asp?embedded=1&tiny=1&ruimtekey=" + room_key
+          IFRAMER("insdeel", page4, { initHeight: "450px" } );
       }
     }
 %>
-<% PAGE_END(); %>
   </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" -->
@@ -23,25 +24,23 @@ function ruimte_list(pautfunction, params)
   var authparams = alg.checkAutorisation();
   // Met ALG* bepaal je wat je ziet (Read), met RUI* en TER* bepaal je wat je kunt wijzigen (Write).
   var canAdd = (authparams.rmALGwritelevel < 9);
-  var canImport = (user.checkAutorisation("WEB_IMPORT", true) != null);
 
   // Voor resulttable de globalen zetten; zou ng anders moeten.
   var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
   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 expalgincl = params.expalgincl;
+  var dept_key = params.dept_key;
   var chkgeb = params.chkgeb;
-  var cnt_full = params.cnt_full;
 %>
 
   <html>
@@ -52,23 +51,23 @@ 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"));
+          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"));
+          FcltMgr.openDetail(url, "<%=L("lcl_floor")%>");
         }
 
         function ruimteEdit(row)
         {
-          var algData = JSON.parse(row.getAttribute("ROWDATA"));
-          var url = "appl/alg/alg_ruimte.asp?mode=viewUpdate&key="+algData.key + "&cnt_full=<%=cnt_full%>";
-          FcltMgr.openDetail(url, L("lcl_room") + " " + algData.oms);
+          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);
         }
 
         function ruimteEditMulti(rowArray)
@@ -79,10 +78,14 @@ function ruimte_list(pautfunction, params)
           FcltMgr.openModalDetail(url, subject, {callback: FcltCallbackRefresh});
         }
 
-        function doRuimteAfdeling(row)
+        function doRuimteAfdeling(rowArray)
         {
-          var algData = JSON.parse(row.getAttribute("ROWDATA"));
-          FcltMgr.openModalDetail("alg_ruimteafdeling.asp?ruimte_keys=" + algData.key, L("lcl_alg_ruimte_bezetting"));
+          var ruimteArr = [];
+          for (var i = 0; i < rowArray.length; i++)
+          {
+            ruimteArr.push(rowArray[i].getAttribute("ROWKEY"))
+          }
+          FcltMgr.openModalDetail("alg_ruimteafdeling.asp?ruimte_keys=" + ruimteArr.join(","), L("lcl_alg_ruimte_bezetting"));
         }
 
         function doRESScope(rowArray)
@@ -111,15 +114,12 @@ function ruimte_list(pautfunction, params)
     </head>
 
     <body id="listbody">
-<%
-    var flexParams = alg.alg_onroerendgoed_flex_params("R");
-    var sqln = "SELECT r.alg_ruimte_key"
+<%    var sqln = "SELECT r.alg_ruimte_key"
                + ",      v.alg_verdieping_key"
                + ",      v.alg_gebouw_key"
                + ",      g.alg_locatie_key"
                + ",      l.alg_locatie_omschrijving"
-               + ",      g.alg_gebouw_code"
-               + ",      g.alg_gebouw_naam"
+               + ",      g.alg_gebouw_omschrijving"
                + ",      v.alg_verdieping_omschrijving"
                + ",      r.alg_srtruimte_key"
                + ", "+lcl.xsqla("s.alg_srtruimte_omschrijving", "s.alg_srtruimte_key")
@@ -132,16 +132,7 @@ function ruimte_list(pautfunction, params)
                + ",      v.alg_verdieping_code"
                + ",      r.alg_ruimte_opp_alt1"
                + ",      r.alg_ruimte_opp_alt2"
-               + ",      r.alg_ruimte_verwijder"
-               + "     , (SELECT MAX(t.fac_tracking_datum)"
-               + "          FROM fac_tracking t"
-               + "             , fac_srtnotificatie sn"
-               + "         WHERE t.fac_srtnotificatie_key = sn.fac_srtnotificatie_key"
-               + "           AND t.fac_tracking_refkey = r.alg_ruimte_key"
-               + "           AND sn.fac_srtnotificatie_xmlnode = 'ruimte'"
-               + "       ) recentdatum"
-               +       flexParams.sql
-               + "  FROM alg_ruimte r"
+               + "  FROM alg_v_aanwezigruimte r"
                + ",      alg_verdieping v"
                + ",      alg_gebouw g"
                + ",      alg_locatie l"
@@ -162,26 +153,26 @@ function ruimte_list(pautfunction, params)
 
       sqln += getKenmerkSql("ALG", "r.alg_ruimte_key");
 
-      if (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.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.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.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.length)
-        sqln += " AND l.alg_district_key IN (" + dis_key_arr.join(",") + ")";
-      else if (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)
       {
@@ -198,17 +189,15 @@ function ruimte_list(pautfunction, params)
         sqln += " AND UPPER(r.alg_ruimte_omschrijving) LIKE " + safe.quoted_sql_wild("%" + area_descr + "%");
       }
 
-      if (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 (!expalgincl)
-        sqln += " AND r.alg_ruimte_verwijder IS NULL";
       if (!chkgeb)
         sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";
 
@@ -217,20 +206,6 @@ function ruimte_list(pautfunction, params)
             + ",         v.alg_verdieping_volgnr ASC"
             + ",         r.alg_ruimte_upper_nr ASC"
 
-      var addurl = "appl/alg/alg_ruimte.asp?a=1";
-      addurl += buildTransitParam(["locatiekey", "gebouwkey", "verdiepingkey", "ruimtekey"], params)  // TODO: welke allemaal?
-
-      var adButton = [];
-      if (canAdd)
-      {
-        addButton.push({ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" });
-      }
-
-      /**********************************
-      * Callback functies ResultsetTable
-       *********************************/
-      var recent = new Date();
-
       function fnrowData(oRs)
       {
         var parent_key = oRs("alg_verdieping_key").Value;
@@ -242,44 +217,13 @@ function ruimte_list(pautfunction, params)
         return JSON.stringify(data);
       }
 
-      function fnrowClass(oRs) // identiek aan de andere niveaus
-      {
-        var lclass = "";
-        // Tracking: hoe lang geleden voor het laatst gewijzigd?
-        if (oRs.Fields("recentdatum").Value != null)
-        {
-          var ltrackdate1 = new Date();
-          var ltrackdate10 = new Date();
-          var ltrackdate100 = new Date();
-          var alg_onrgoed_recent = S("alg_onrgoed_recent");
-          ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
-          ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
-          ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
-
-          var fac_recent = new Date(oRs.Fields("recentdatum").Value);
-          if (fac_recent > ltrackdate1)
-          {
-            lclass += " updated";
-          }
-          else if (fac_recent > ltrackdate10)
-          {
-            lclass += " updated10";
-          }
-          else if (fac_recent > ltrackdate100)
-          {
-            lclass += " updated100";
-          }
-        }
-        return lclass;
-      }
-
       var floorCache = [];
       // Voor performance bekijken we de rechten per verdieping. In de praktijk nauwkeurig genoeg
       function fnrowActionEnabler(oRs)
       {
         if (!floorCache[oRs("alg_verdieping_key").Value])
         {
-          eEditMulti = false;  // TODO: write op ALGMAN
+          eEditMulti = true;
             floorCache[oRs("alg_verdieping_key").Value] =
                 {
                     eDelete: alg.canWriteVerdieping(oRs("alg_verdieping_key").Value, authparams.rmALGwritelevel),
@@ -293,25 +237,19 @@ 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;
       }
 
-      function fncolFlexBijlagen(oRs)
+      var addurl = "appl/alg/alg_ruimte.asp?a=1";
+      addurl += buildTransitParam(["locatiekey", "gebouwkey", "verdiepingkey", "ruimtekey"], params)  // TODO: welke allemaal?
+
+      if (canAdd)
       {
-        var flexval = oRs("algflex").Value;
-        var alg_key = oRs("alg_ruimte_key").Value;
-        var result = ( flexval
-                     ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
-                     : ""
-                     );
-        if (flexParams.bijlageflex)
-        {
-          result += alg.alg_onroerendgoed_flex_bijlagen("R", alg_key);
-        }
-        return result;
+        addButton = [{ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" }]
       }
 
       var rst = new ResultsetTable({ sql: sqln,
@@ -320,20 +258,17 @@ function ruimte_list(pautfunction, params)
                                      title: L("lcl_menu_alg_ruimte"),
                                      showAll: showall,
                                      rowData: fnrowData,
-                                     rowClass: fnrowClass,
                                      rowActionEnabler: fnrowActionEnabler,
                                      outputmode: outputmode,
                                      flexModule: "ALG",
                                      flexId: "alg_ruimte_key",
                                      flexParams: fnrowFlexParams,
                                      filterParams: params,
-                                     buttons: addButton,
-                                     roundtripCode: (canImport ? "ONRGOED2" : "")
+                                     buttons: addButton
                                    });
 
       rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_descr"), content: "alg_locatie_omschrijving"}));
-      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_man_descr"), content: "alg_gebouw_omschrijving"}));
       rst.addColumn(new Column({caption: L("lcl_estate_verdieping_man_descr"), content: "alg_verdieping_omschrijving"}));
 
       rst.addColumn(new Column({caption: L("lcl_estate_ruimte_man_nr"), content: "alg_ruimte_nr"}));
@@ -342,8 +277,16 @@ function ruimte_list(pautfunction, params)
       rst.addColumn(new Column({caption: L("lcl_estate_ruimte_man_sort"), content: "alg_srtruimte_omschrijving"}));
       rst.addColumn(new Column({caption: L("lcl_estate_ruimte_bruto_vloeropp"), content: "alg_ruimte_bruto_vloeropp", datatype: "float", decimals: 2 }));
 
-      rst.addColumn(new Column({caption: L("lcl_estate_ruimte_opp_alt1"), content: "alg_ruimte_opp_alt1", datatype: "float", decimals: 2 }));
-      rst.addColumn(new Column({caption: L("lcl_estate_ruimte_opp_alt2"), content: "alg_ruimte_opp_alt2", datatype: "float", decimals: 2 }));
+      if (S("fg_contourlayers_alt1") != "" && S("fg_labellayers_alt1") != "")
+      {
+        rst.addColumn(new Column({caption: L("lcl_estate_ruimte_opp_alt1"), content: "alg_ruimte_opp_alt1", datatype: "float", decimals: 2 }));
+      }
+
+      if (S("fg_contourlayers_alt2") != "" && S("fg_labellayers_alt2") != "")
+      {
+        rst.addColumn(new Column({caption: L("lcl_estate_ruimte_opp_alt2"), content: "alg_ruimte_opp_alt2", datatype: "float", decimals: 2 }));
+      }
+
 
       if (outputmode != 0) // to be completed
       {
@@ -351,15 +294,11 @@ function ruimte_list(pautfunction, params)
         rst.addColumn(new Column({caption: L("lcl_estate_ruimte_man_omtrek"), content: "alg_ruimte_omtrek"}));
         rst.addColumn(new Column({caption: L("lcl_estate_ruimte_man_inhoud"), content: "alg_ruimte_inhoud"}));
       }
-      if (expalgincl)
-        rst.addColumn(new Column({caption: L("lcl_alg_vervaldatum"), content: "alg_ruimte_verwijder", datatype: "date"}));
-      if (flexParams.anyflex)
-        rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
       rst.addAction({ action: "ruimteEdit", caption: L("lcl_edit"), isDefault:  true });
       rst.addAction({ action: "ruimteEditMulti", caption: L("lcl_alg_multi_edit"), multi: true, multiOnce: true, single: false, enabler: "eEditMulti"});
       rst.addAction({ action: "doDelete", caption: L("lcl_delete"), multi: true, single: !noref, enabler: "eDelete" });
-      rst.addAction({ action: "doRuimteAfdeling", caption: L("lcl_alg_bezetting"), multi: false, enabler: "eBezetting" });
+      rst.addAction({ action: "doRuimteAfdeling", caption: L("lcl_alg_bezetting"), multi: true, multiOnce: true, enabler: "eBezetting" });
       if (user.has("WEB_RESMSU"))
         rst.addAction({ action: "doRESScope", caption: L("res_srtartikel_onrgoed"), multi: true, single: false, multiOnce: true });
       if (!noref)
@@ -375,3 +314,4 @@ function ruimte_list(pautfunction, params)
 <%
 }
 %>
+

APPL/ALG/alg_ruimte_search.asp

@@ -22,9 +22,7 @@ var ruimte_nr = getQParam("ruimte_nr", "");
 var ruimte_use = getQParamInt("ruimte_use", -1); // Ruimtefunctie
 var ruimte_descr = getQParam("ruimte_descr", "");
 var autosearch = getQParamInt("autosearch", 0) == 1;
-var alg_startlevel = getQParamInt("alg_startlevel", 2); // Startlevel van plaatsselector, default Locatie
 var chkgeb = getQParamInt("chkgeb", 0) == 1;
-var cnt_full = getQParamInt("cnt_full", 1);
 var authparams = alg.checkAutorisation();
 
 %>
@@ -32,114 +30,100 @@ var authparams = alg.checkAutorisation();
   <head>
 <%  FCLTHeader.Generate(); %>
     <script type="text/javascript">
-      function doSubmit()
+    function doSubmit()
       {
           // Submitten met kenmerken
           doSubmitWithKenmerken();
       }
 
-      async function myModal(init)
-      {
+        function myModal()
+        {
           var lvl = "R";
           var key = 0;
           var bld_key = "";
-          var url = "load_kenmerk.asp?disc="
-                                  + "&urole=bo"
-                                  + "&advanced=1"
-                                  + "&hasFilter=1"
-                                  + "&onrgoed_key=" + bld_key
-                                  + "&onrgoed_niveau=" + lvl;
-          var titel = L("lcl_properties");
-          await showKenmerkModal(url, titel, init);
-      }
+          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)
+        }
 
-      $(function()
-      {
-          <% if (autosearch) { %> document.forms.u2.submit(); <%}%>
-      });
+        $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
     </script>
   </head>
   <body id="searchbody">
-    <form name="u2" target="workFrame" action="alg_ruimte_search_list.asp" method="get">
-<%
-    SEARCH_PAGE_START({ header: L("lcl_filterblok") });
-      SEARCH_BLOCK_START();
-%>
-        <input type="hidden" id="cnt_full" name="cnt_full" value="<%=cnt_full%>">
+    <div id="search">
+      <form name="u2" target="workFrame" action="alg_ruimte_search_list.asp" method="get">
         <input type="hidden" id="chkgeb" name="chkgeb" value="<%=(chkgeb?1:0)%>">
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
+          <tr>
+            <td class="searchkolom1">
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+              <!-- Locatie, gebouw en verdieping -->
 <%
-        FCLTplaatsselector( authparams.ALGreadlevel
-                          , { locatiekey: locatie_key,
-                              gebouwkey: gebouw_key,
-                              verdiepingkey: verdieping_key,
-                              ruimtekey: ruimte_key,
-                              multitoggle: 6, // true|false (=all) or till alg_level_# (0-6)
-                              startlevel: alg_startlevel, // locatie
-                              eindlevel: 5, // ruimte
-                              filtercode: "INCVR",
-                              whenEmpty: L("lcl_search_generic")  // want filter
-                             });
-      SEARCH_BLOCK_END();
-      SEARCH_BLOCK_START();
+                    FCLTplaatsselector(authparams.ALGreadlevel, {
+                                                                  locatiekey: locatie_key,
+                                                                  gebouwkey: gebouw_key,
+                                                                  verdiepingkey: verdieping_key,
+                                                                  ruimtekey: ruimte_key,
+                                                                  startlevel: 2, // locatie
+                                                                  eindlevel: 5, // ruimte
+                                                                  filtercode: "INCVR",
+                                                                  whenEmpty: L("lcl_search_generic")  // want filter
+                                                                });
+
 %>
-        <tr class="primsearch">
-          <td class="label"><label for="nr"><%=L("lcl_estate_ruimte_man_nr")%></label></td>
-          <td><input type="text" class="fldsrch fldshort" name="nr" value="<%=safe.htmlattr(ruimte_nr)%>"></td>
-        </tr>
-        <tr class="primsearch">
-          <td class="label"><label for="descr"><%=L("lcl_estate_ruimte_man_descr")%></label></td>
-          <td><input type="text" class="fldsrch fldshort" name="descr" value="<%=safe.htmlattr(ruimte_descr)%>"></td>
-        </tr>
+              </table>
+            </td><!-- end column 1 -->
 
+            <td class="searchkolom2">
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+              <!-- Zoektekst -->
+                <tr class="primsearch">
+                  <td class="label"><label for="nr"><%=L("lcl_estate_ruimte_man_nr")%>:</label></td>
+                  <td><input type="text" class="fldsrch" name="nr" value="<%=safe.htmlattr(ruimte_nr)%>"></td>
+                </tr>
+                <tr class="primsearch">
+                  <td class="label"><label for="descr"><%=L("lcl_estate_ruimte_man_descr")%>:</label></td>
+                  <td><input type="text" class="fldsrch" name="descr" value="<%=safe.htmlattr(ruimte_descr)%>"></td>
+                </tr>
 <%
-        sql = "SELECT   alg_srtruimte_key, "
-            + lcl.xsqla("alg_srtruimte_omschrijving", "alg_srtruimte_key")
-            + "    FROM alg_srtruimte "
-            + "   WHERE alg_srtruimte_verwijder IS NULL "
-            + "ORDER BY UPPER("+lcl.xsql("alg_srtruimte_omschrijving", "alg_srtruimte_key")+")";
-        FCLTselector("srt",
-                     sql,
-                     { initKey: ruimte_use,
-                       trclass: "primsearch",
-                       label: L("lcl_estate_ruimte_man_sort"),
-                       emptyOption: ""
-                     });
+           sql = "SELECT   alg_srtruimte_key, "
+               + lcl.xsqla("alg_srtruimte_omschrijving", "alg_srtruimte_key")
+               + "    FROM alg_srtruimte "
+               + "   WHERE alg_srtruimte_verwijder IS NULL "
+               + "ORDER BY UPPER("+lcl.xsql("alg_srtruimte_omschrijving", "alg_srtruimte_key")+")";
+              FCLTselector("srt",
+                           sql,
+                           { initKey: ruimte_use,
+                             trclass: "primsearch",
+                             label: L("lcl_estate_ruimte_man_sort"),
+                             emptyOption: ""
+                           });
 
-        sql= "SELECT 1 FROM prs_ruimteafdeling WHERE prs_ruimteafdeling_verwijder is null AND ROWNUM = 1";
-        oRs = Oracle.Execute(sql);
-        var anyruimteafd = !oRs.eof;
-        oRs.close();
-        if (anyruimteafd)
-        {
+            sql= "SELECT 1 FROM prs_ruimteafdeling WHERE prs_ruimteafdeling_verwijder is null AND ROWNUM = 1";
+            oRs = Oracle.Execute(sql);
+            var anyruimteafd = !oRs.eof;
+            oRs.close();
+            if (anyruimteafd)
+            {
             FCLTafdelingselector("dept",
-                                 "dept",
-                                 { label: L("lcl_prs_organisatie"),
-                                   autlevel: authparams.PRSreadlevel, // Was voorheen niet aanwezig
-                                   multitoggle: true,
-                                   whenEmpty: L("lcl_search_generic"),
-                                   filtercode: "AR"
-                                 });
-        }
-%>
-        <!-- Vervallen ruimten -->
-        <tr class="primsearch">
-          <td></td>
-          <td align=left>
-            <input type="checkbox" class="fld" name="expAlgIncl" id="expAlgIncl" value="1" >
-            <label for="expAlgIncl"><%=L("lcl_alg_ruimte_vervallen_incl")%></label>
-          </td>
-        </tr>
-<%
-      SEARCH_BLOCK_END();
+                               "dept",
+                               { label: L("lcl_prs_organisatie"),
+                                 autlevel: authparams.PRSreadlevel, // Was voorheen niet aanwezig
+                                 whenEmpty: L("lcl_search_generic"),
+                                 filtercode: "AR"
+                               });
+            }
+%>              </table>
+            </td><!-- end column 1 -->
+          </tr>
+<%    BLOCK_END();
 
-      SIMPLE_BLOCK_START();
-        var buttons = [ {title: L("lcl_overview_list"), action: "doSubmit()", id: "bSearch", importance: 1, icon: "fa-clipboard-list" }
-                      , {title: L("lcl_shared_advanced"), action: "myModal()", id: "bAdvanced", importance: 3, icon: "fa-filter" }
-                      ];
-        CreateButtons(buttons, { entersubmit: true, showIcons: true });
-      SIMPLE_BLOCK_END();
-    SEARCH_PAGE_END(); %>
-    </form>
+  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
+                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
+  CreateButtons(buttons, { entersubmit: true });
+%>
+      </form>
+    </div> <!-- search -->
 
     <div id="result">
       <iframe width="100%" height="100%"
@@ -151,4 +135,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_ruimte_search_list.asp

@@ -22,38 +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 = getQParamKeyArray("regiokey", []);      // Regio
-var dis_key_arr = getQParamKeyArray("districtkey", []);   // District
-var loc_key_arr = getQParamKeyArray("locatiekey", []);    // Locatie
-var bld_key_arr = getQParamKeyArray("gebouwkey", []);     // Gebouw
-var flr_key_arr = getQParamKeyArray("verdiepingkey", []); // Verdieping
-var room_key_arr = getQParamKeyArray("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 = getQParamKeyArray("dept", []); // Afdeling
-var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen ruimten
+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)
-var cnt_full = getQParamInt("cnt_full", 1);
 
 ruimte_list ( "*",
               {  outputmode: outputmode,
                  showall: showall,
-                 cnt_full: cnt_full,
-                 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),
-                 expalgincl: expalgincl,
                  chkgeb: chkgeb
               }
              );
-ASPPAGE_END(); 
-%>
+%>

APPL/ALG/alg_ruimteafdeling.asp

@@ -20,7 +20,7 @@ k
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["./alg_ruimteafdeling.js" ]
+                      js: ["./alg_ruimteafdeling.js", "num2curr.js"]
                     });
 
 // TODO: Autorisatie controle "WEB_PRSBOF" op ruimte_keys
@@ -37,19 +37,8 @@ if (submitting)
 
   var afdeling_key = -1;
   var bezetting = -1;
-  var bezettingen = new Array();
-  var afdeling_keys = new Array();
-  var afdeling_names = [];
-
-  function shorttxt(txt, len)
-  {
-      len = len || S("max_tracking_length");
-      if  (txt.length < len)
-          return txt;
-      else
-          return txt.substr(0, len-4) + "...";
-  }
-
+  var afdeling_keys = [];
+  var bezetting_keys = [];
   for (var i = 0; i < nrRows; i++)
   {
     afdeling_key = getFParamInt("afd" + i, 0);
@@ -58,47 +47,10 @@ if (submitting)
     if (afdeling_key > 0 && bezetting >= 0)
     {
       afdeling_keys.push(afdeling_key);
-      bezettingen.push(bezetting);
+      bezetting_keys.push(bezetting);
     }
   }
 
-  if (afdeling_keys.length)
-  {
-      var sql = "SELECT prs_afdeling_key, prs_afdeling_omschrijving"
-              + "  FROM prs_afdeling a"
-              + " WHERE prs_afdeling_key IN (" + afdeling_keys.join(",") + ")"
-              + "   AND prs_afdeling_verwijder IS NULL";
-      var oRs = Oracle.Execute(sql);
-      while (!oRs.Eof)
-      {
-          afdeling_names[oRs("prs_afdeling_key").value] = oRs("prs_afdeling_omschrijving").value;
-          oRs.MoveNext();
-      }
-  }
-
-  var oldvals = [];
-  var sql = "SELECT ra.alg_ruimte_key, ra.prs_afdeling_key, a.prs_afdeling_omschrijving, ra.prs_ruimteafdeling_bezetting"
-          + "  FROM prs_ruimteafdeling ra, prs_afdeling a"
-          + " WHERE ra.alg_ruimte_key IN (" + ruimte_key_arr.join(",") + ")"
-          + "   AND ra.prs_afdeling_key = a.prs_afdeling_key"
-          + "   AND ra.prs_ruimteafdeling_verwijder IS NULL"
-          + "   AND a.prs_afdeling_verwijder IS NULL";
-
-
-  var oRs = Oracle.Execute(sql);
-  while (!oRs.Eof)
-  {
-      var tempTuple = { afd_key: oRs("prs_afdeling_key").value, bez: oRs("prs_ruimteafdeling_bezetting").value };
-      if (typeof oldvals[oRs("alg_ruimte_key").value] === 'undefined') // New ruimte
-          oldvals[oRs("alg_ruimte_key").value] = [tempTuple];
-      else
-          oldvals[oRs("alg_ruimte_key").value].push(tempTuple);
-
-      if (typeof afdeling_names[oRs("prs_afdeling_key").value] === 'undefined')
-          afdeling_names[oRs("prs_afdeling_key").value] = oRs("prs_afdeling_omschrijving").value;
-      oRs.MoveNext();
-  }
-
   for (var j = 0; j < ruimte_key_arr.length; j++)
   { // Verwijderen
     var sql = "DELETE prs_ruimteafdeling"
@@ -121,7 +73,7 @@ if (submitting)
       if (!oRs.eof)
       { // Update
         var sql = "UPDATE prs_ruimteafdeling SET"
-                + "       prs_ruimteafdeling_bezetting = " + bezettingen[i]
+                + "       prs_ruimteafdeling_bezetting = " + bezetting_keys[i]
                 + " WHERE prs_ruimteafdeling_key = " + oRs("prs_ruimteafdeling_key").Value;
         Oracle.Execute(sql);
       }
@@ -131,60 +83,11 @@ if (submitting)
                 + "        (alg_ruimte_key, prs_afdeling_key, prs_ruimteafdeling_bezetting)"
                 + " VALUES (" + ruimte_key_arr[j] + ","
                 +               afdeling_keys[i] + ","
-                +               bezettingen[i] + ")";
+                +               bezetting_keys[i] + ")";
         Oracle.Execute(sql);
       }
-      oRs.Close();
     }
   }
-
-  var trackingArr = new Object();
-  var fromLbl = "";
-  var toLbl = "";
-  var rowNr = -1;
-  var doneAfdeling = new Array();
-
-  for (var i = 0; i < ruimte_key_arr.length; i++)
-  {
-      if (typeof oldvals[ruimte_key_arr[i]] !== 'undefined')
-          for (var x = 0; x < oldvals[ruimte_key_arr[i]].length; x++)
-          {
-              fromLbl = shorttxt(afdeling_names[oldvals[ruimte_key_arr[i]][x].afd_key]) + " (" + oldvals[ruimte_key_arr[i]][x].bez + "%) ";
-
-              rowNr = sharedIndexOf(oldvals[ruimte_key_arr[i]][x].afd_key, afdeling_keys);
-              if (rowNr > -1) // Update
-              {
-                  doneAfdeling[rowNr] = true;
-                  if (oldvals[ruimte_key_arr[i]][x].bez == bezettingen[rowNr]) // No change
-                      continue;
-                  toLbl = " " + shorttxt(afdeling_names[afdeling_keys[rowNr]]) + " (" + bezettingen[rowNr] + "%)";
-              }
-              else // Delete
-                  toLbl = " " + L("lcl_tracktoempty");
-
-              if (typeof trackingArr[ruimte_key_arr[i]] === 'undefined')
-                  trackingArr[ruimte_key_arr[i]] = new Array();
-              trackingArr[ruimte_key_arr[i]].push(fromLbl + L("lcl_trackto") + toLbl);
-          }
-
-        for (var y = 0; y < afdeling_keys.length; y++)
-        {
-            if (doneAfdeling[y])
-                continue;
-            else if (typeof trackingArr[ruimte_key_arr[i]] === 'undefined')
-                trackingArr[ruimte_key_arr[i]] = new Array();
-            // Insert
-            fromLbl = L("lcl_trackfromempty") + " ";
-            toLbl = " " + shorttxt(afdeling_names[afdeling_keys[y]]) + " (" + bezettingen[y] + "%)";
-            trackingArr[ruimte_key_arr[i]].push(fromLbl + L("lcl_trackto") + toLbl);
-        }
-  }
-
-  for (var i = 0; i < ruimte_key_arr.length; i++)
-  {
-      if (typeof trackingArr[ruimte_key_arr[i]] !== 'undefined')
-          shared.trackaction("ALGRUP", ruimte_key_arr[i], L("lcl_alg_is_algrup") + "\n" + trackingArr[ruimte_key_arr[i]].join("\n"));
-  }
 %>
   <script type="text/javascript">
     FcltMgr.closeDetail(window, { success: true });
@@ -201,12 +104,11 @@ else
           </script>
     </head>
 
-    <body class="fclt-modal" id="mod_ruimteafdeling">
-    <% MODAL_START(); %>
+    <body class="modal" id="mod_ruimteafdeling">
+      <div id="email">
         <form name="u2" method="post" action="alg_ruimteafdeling.asp?submit=1&ruimte_keys=<%=ruimte_key_arr.join(",")%>">
-<%        MODAL_BLOCK_START("alg_ruimteafdeling", L("lcl_alg_geselecteerde_ruimten") + ": " + ruimte_key_arr.length, { icon: "fa-map-marker" }); %>
           <input type="hidden" id="nrRows" name="nrRows" value="0">
-<%
+<%        BLOCK_START("alg_ruimteafdeling", L("lcl_alg_geselecteerde_ruimten") + ": " + ruimte_key_arr.length);
           // <!-- Toevoegen -->
           FCLTafdelingselector("afdeling_key",
                                "sgDept",
@@ -217,10 +119,10 @@ else
 %>
           <tr>
             <td class="label">
-              <label for="afdbezettingtable" class="nowrap"><%=L("lcl_alg_te_koppelen_afd")%></label>
+              <label for="afdbezettingtable" style="white-space: nowrap"><%=L("lcl_alg_te_koppelen_afd")%>:&nbsp;</label>
             </td>
             <td>
-              <table id="afdbezettingtable" cellspacing="0" cellpadding="0" class="rstable">
+              <table id="afdbezettingtable" cellspacing=0 cellpadding=0 class="rstable">
               <thead>
               <tr>
                 <th style='width:15px'></th>
@@ -282,20 +184,16 @@ else
             </td>
           </tr>
 
-<%        MODAL_BLOCK_END();
-          SIMPLE_BLOCK_START();
-              /* deze Add is niet fraai zo, maar soi. Of: er is geen cancel ook */
-              var buttons =  [ {title: L("lcl_add"),    icon: "fa-plus", action: "alg_add('"+ safe.displayfloat(tot_oppervlak, 2) +"')", importance: 1 },
-                              {title: L("lcl_submit"), icon: "fa-fclt-save",   action: "alg_submit()", importance: 1 } ];
-
-              CreateButtons(buttons);
-          SIMPLE_BLOCK_END();
+<%        BLOCK_END();
+          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();
 %>
         </form>
-      <% MODAL_END(); %>
+      </div>
     </body>
   </html>
 <%
 }
-ASPPAGE_END(); %>
+%>

APPL/ALG/alg_ruimteafdeling.js

@@ -39,7 +39,7 @@ function CreateRow(afd_key, afd_name, bezetting, oppervlak, bruto)
   cell = tr.insertCell(-1);
   cell.className = "result";
   cell.align = "center";
-  cell.innerHTML = "<span OnClick='delRow(this)' style='cursor:pointer'>" + I("fa-times") + "</span>";
+  cell.innerHTML = "<i class='fa fa-fw fa-times' OnClick='delRow(this)' style='cursor:pointer'></i>";
 
   // innerHTML opent een htmlparser die overbodige spaties en line breaks verwijderd in IE, daarom met innerText oplossen
   // Input velden moeten wel met innerHTML of outerHTML anders wordt het text
@@ -54,8 +54,8 @@ function CreateRow(afd_key, afd_name, bezetting, oppervlak, bruto)
   // Bezetting input veld
   cell = tr.insertCell(-1);
   cell.className = "result";
-  cell.innerHTML = "<input type='text' class='fldshort' id='bez" + rowIndex + "' name='bez" + rowIndex + "' value='" + bezetting + "' maxlength='6' onchange='changeBezetting("+rowIndex+")'>"
-                 + "<input type='hidden' id='afd" + rowIndex + "' name='afd" + rowIndex + "' value='" + afd_key + "'>";
+  cell.innerHTML = "<input type='text' class='fldshort' id='bez" + rowIndex + "' name='bez" + rowIndex + "' value='" + bezetting + "' maxlength='6' onchange='changeBezetting("+rowIndex+")'></input>"
+                 + "<input type='hidden' id='afd" + rowIndex + "' name='afd" + rowIndex + "' value='" + afd_key + "'></input>";
   cell.align = 'left';
 
   if (!multiRuimte)
@@ -63,8 +63,8 @@ function CreateRow(afd_key, afd_name, bezetting, oppervlak, bruto)
   // Bezetting input veld m2
   cell = tr.insertCell(-1);
   cell.className = "result";
-  cell.innerHTML = "<input type='text' class='fldshort' id='bezopp" + rowIndex + "' name='bezopp" + rowIndex + "' value='" + oppervlak + "' maxlength='8' onchange='changeOppervlak("+rowIndex+")'>"
-                 + "<input type='hidden' id='totaalopp" + rowIndex + "' name='totaalopp" + rowIndex + "' value='" + bruto + "'>";
+  cell.innerHTML = "<input type='text' class='fldshort' id='bezopp" + rowIndex + "' name='bezopp" + rowIndex + "' value='" + oppervlak + "' maxlength='8' onchange='changeOppervlak("+rowIndex+")'></input>"
+                 + "<input type='hidden' id='totaalopp" + rowIndex + "' name='totaalopp" + rowIndex + "' value='" + bruto + "'></input>";
   cell.align = 'left';
   }
   document.getElementById("nrRows").value = parseInt(rowIndex) + 1;
@@ -83,12 +83,7 @@ function delRow(img)
 
 function alg_submit()
 {
-  if ($(document).has('span.bad').length)
-  {
-    FcltMgr.alert(L("lcl_shared_validator_invalid"));
-    return false;
-  }
-  var percValid = true;
+	var percValid = true;
   var i=0;
   while (percValid && (i<=rowIndex))
   {
@@ -133,41 +128,49 @@ function alg_add(oppervlak)
 
 function changeOppervlak(prowIndex)
 {
-    var $thisObj = $("#bezopp"+prowIndex);
-    var valid = isGoodNumber($thisObj.val(), false,false,8,2);
-    validateField($thisObj, valid, L("lcl_alg_bezetting_ongeldig"))
+	var bereken = true;
+	if (!isGoodNumber($("#bezopp"+prowIndex).val(), false,false,8,2))
+	{
+	  bereken = false;
+    FcltMgr.alert(L("lcl_alg_bezetting_ongeldig"));
+    $("#bezopp"+prowIndex).select();
+    $("#bezopp"+prowIndex).focus();
+	}
+	if (bereken && (!isGoodNumber($("#totaalopp"+prowIndex).val(), false,false,8,2)))
+	  $("#totaalopp"+prowIndex).val($("#bezopp"+prowIndex).val());
 
-    if (valid)
-    {
-        if (!isGoodNumber($("#totaalopp"+prowIndex).val(), false,false,8,2))
-            $("#totaalopp"+prowIndex).val($thisObj.val());
-        var oppBezet = parseFloat($thisObj.val().replace(',', '.'));
-        var oppBruto = parseFloat($("#totaalopp"+prowIndex).val().replace(',', '.'));
-        if (oppBruto > 0)
-        {
-            var oppPercF = (oppBezet * 100) / oppBruto;
-            var oppPerc  = num2currEditable(oppPercF);
-            $("#bez" + prowIndex).val(oppPerc);
-      	}
-    }
+	if (bereken)
+	{
+	  var oppBezet = parseFloat($("#bezopp"   +prowIndex).val().replace(',', '.'));
+	  var oppBruto = parseFloat($("#totaalopp"+prowIndex).val().replace(',', '.'));
+	  if (oppBruto > 0)
+	  {
+	    var oppPercF = (oppBezet * 100) / oppBruto;
+	    var oppPerc  = num2currEditable(oppPercF);
+      $("#bez" + prowIndex).val(oppPerc);
+  	}
+  }
 }
 
 function changeBezetting(prowIndex)
 {
-    var $thisObj = $("#bez"+prowIndex);
-    var valid = isGoodNumber($thisObj.val(), false,false,8,2) &&
-                parseFloat($thisObj.val().replace(',', '.')) <= 100 &&
-                parseFloat($thisObj.val().replace(',', '.')) >= 0;
-    validateField($thisObj, valid, L("lcl_alg_bezetting_ongeldig"));
-
-    if (valid && !multiRuimte)
-    {
-        var oppPerc = parseFloat($thisObj.val().replace(',', '.'));
-        if (isGoodNumber($("#totaalopp"+prowIndex).val(), false,false,8,2))
-        {
-            var oppBruto = parseFloat($("#totaalopp"+prowIndex).val().replace(',', '.'));
-            var oppBezet = num2currEditable( ((oppPerc * oppBruto) / 100)	);
-            $("#bezopp" + prowIndex).val(oppBezet);
-        }
+  if (!isGoodNumber($("#bez"+prowIndex).val(), false,false,8,2) || parseFloat($("#bez"+prowIndex).val().replace(',', '.')) > 100)
+  {
+    FcltMgr.alert(L("lcl_alg_bezetting_ongeldig"));
+    $("#bez"+prowIndex).select();
+    $("#bez"+prowIndex).focus();
+  }
+  else
+  {
+  	if (!multiRuimte)
+  	{
+      var oppPerc  = parseFloat($("#bez"      +prowIndex).val().replace(',', '.'));
+      if (isGoodNumber($("#totaalopp"+prowIndex).val(), false,false,8,2))
+      {
+        var oppBruto = parseFloat($("#totaalopp"+prowIndex).val().replace(',', '.'));
+        var oppBezet = num2currEditable( ((oppPerc * oppBruto) / 100)	);
+        $("#bezopp" + prowIndex).val(oppBezet);
+      }
     }
+  }
 }

APPL/ALG/alg_ruimtefunctie.asp

@@ -51,8 +51,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jQuery-ui.js"]})
     </script>
   </head>
 
-<body class="fclt-modal" id="mod_ruimtefunctie">
-<% MODAL_START(); %>
+<body class="modal" id="mod_ruimtefunctie">
 <%
     var page="alg_edit_ruimtefunctie.asp?srtruimte_lg_key=" + srtruimte_lg_key; // Edit
     //if (srtruimte_lg_key == -1)
@@ -60,9 +59,9 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jQuery-ui.js"]})
     //else
     //    var page="alg_show_ruimtefunctie.asp?srtruimte_lg_key=" + srtruimte_lg_key ;
 
-    IFRAMER("algrfFrame", page, { FcltClose: "algClose", title: L("lcl_prs_dienst_frame")} );
+    IFRAMER("algrfFrame", page, { title: L("lcl_prs_dienst_frame"),
+                                initHeight: "450px",
+                                FcltClose: "algClose" } );
 %>
-<% MODAL_END(); %>
   </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" -->
@@ -20,7 +21,7 @@ function ruimtefunctie_list(pautfunction, params)
 {
   // De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
   var addButton = [];
-  var authparams = user.has("WEB_ALGMSU") && alg.checkAutorisation(true);
+  var authparams = alg.checkAutorisation();
   var canAdd = (authparams.mALGwritelevel < 9);
 
   // Voor resulttable de globalen zetten; zou ng anders moeten.
@@ -43,9 +44,9 @@ 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 subject = "<%=L("lcl_estate_ruimte_man_sort")%>" + ' ' + algData.oms;
           var url = "alg_ruimtefunctie.asp?srtruimte_lg_key=" + srtruimte_lg_key;
           FcltMgr.openModalDetail(url, subject, { width: 650, callback: FcltMgr.reload });
         }
@@ -79,8 +80,7 @@ function ruimtefunctie_list(pautfunction, params)
                + "     , l.alg_locatie_key"
                + "     , g.alg_gebouw_key"
                + "     , l.alg_locatie_omschrijving"
-               + "     , g.alg_gebouw_code"
-               + "     , g.alg_gebouw_naam"
+               + "     , g.alg_gebouw_omschrijving"
                + "  FROM alg_srtruimte sr"
                + "     , alg_srtruimte_locatiegebouw srlg"
                + "     , alg_locatie l"
@@ -132,7 +132,7 @@ function ruimtefunctie_list(pautfunction, params)
 
       if (canAdd)
       {
-        addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openModalDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "', { width: 700, callback: FcltMgr.reload })" }]
+        addButton = [{ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openModalDetail('" + addurl + "', '" + L("lcl_add") + "', { width: 700, callback: FcltMgr.reload })" }]
       }
 
       var rst = new ResultsetTable({ sql: sqln,
@@ -148,9 +148,8 @@ function ruimtefunctie_list(pautfunction, params)
                                    });
 
       rst.addColumn(new Column({caption: L("lcl_estate_ruimte_man_sort"), content: "alg_srtruimte_omschrijving"}));
-      rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_descr"), content: "alg_locatie_omschrijving"}));
-      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_location"), content: "alg_locatie_omschrijving"}));
+      rst.addColumn(new Column({caption: L("lcl_building"), content: "alg_gebouw_omschrijving"}));
       rst.addColumn(new Column({caption: L("lcl_alg_alg_tarief"), content: "alg_srtruimte_prijs", datatype: "float", decimals: 5 }));
       rst.addColumn(new Column({caption: L("lcl_alg_alg_tariefA"), content: "alg_srtruimte_prijs2", datatype: "float", decimals: 5 }));
       rst.addColumn(new Column({caption: L("lcl_alg_alg_tariefB"), content: "alg_srtruimte_prijs3", datatype: "float", decimals: 5 }));

APPL/ALG/alg_ruimtefunctie_search.asp

@@ -10,10 +10,7 @@
       locatie_key      key van de locatie
       gebouw_key       key van het gebouw
     Context:           Vanuit menu
-    Note:               
-                        Het menuitem vereist ALGMSU, kennelijk om deze voor het gepeupel te onderdrukken
-                        De feitelijke autorisatie keek hier niet naar en vertrouwde op de ALGMAN/ALGUSE-autorisaties
-                        wat ook goed is. Je moet dus beide hebben.
+    Note:
 */ %>
 
 <!-- #include file="../Shared/common.inc" -->
@@ -28,7 +25,8 @@ FCLTHeader.Requires({ plugins: ["jQuery", "kenmerk"] });
 var alg_srtruimte_key = getQParamInt("alg_srtruimte_key", -1); // Ruimtefunctie
 var locatie_key = getQParamInt("locatie_key", -1); // Locatie
 var gebouw_key = getQParamInt("gebouw_key", -1); // Gebouw
-var authparams = user.has("WEB_ALGMSU") && alg.checkAutorisation(true);  // als je geen scope hebt kun je toch niks
+
+var authparams = alg.checkAutorisation();
 
 %>
 <html>
@@ -42,37 +40,47 @@ var authparams = user.has("WEB_ALGMSU") && alg.checkAutorisation(true);  // als
     </script>
   </head>
   <body id="searchbody">
-    <form name="u2" target="workFrame" action="alg_ruimtefunctie_search_list.asp" method="get">
-      <% SEARCH_PAGE_START({ header: L("lcl_filterblok") }); %>
-        <% SEARCH_BLOCK_START();%>
+    <div id="search">
+      <form name="u2" target="workFrame" action="alg_ruimtefunctie_search_list.asp" method="get">
+<%      BLOCK_START("searchtable", L("lcl_filterblok"));%>
+        <tr>
+          <td class="searchkolom1">
+            <table><!-- x rijen, 2 kolommen: label + veld -->
               <!-- Ruimtesoort -->
 <%
-          sql  = "SELECT   alg_srtruimte_key, "
+              sql  = "SELECT   alg_srtruimte_key, "
                    + lcl.xsqla("alg_srtruimte_omschrijving", "alg_srtruimte_key")
                    + "    FROM alg_v_aanwezigsrtruimte "
                    + "ORDER BY UPPER("+lcl.xsql("alg_srtruimte_omschrijving", "alg_srtruimte_key")+")";
-          FCLTselector("srtruimte",
+              FCLTselector("srtruimte",
                            sql,
                            { initKey: alg_srtruimte_key,
                              trclass: "primsearch",
                              label: L("lcl_estate_ruimte_man_sort"),
                              emptyOption: ""
                            });
-SEARCH_BLOCK_END();
-SEARCH_BLOCK_START(); 
-        FCLTplaatsselector(authparams.ALGreadlevel, { locatiekey: locatie_key,
+%>
+            </table>
+          </td><!-- end column 1 -->
+
+          <td class="searchkolom2">
+            <table><!-- x rijen, 2 kolommen: label + veld -->
+              <!-- Locatie, gebouw -->
+<%            FCLTplaatsselector(authparams.ALGreadlevel, { locatiekey: locatie_key,
                                                             gebouwkey: gebouw_key,
                                                             startlevel: 2, // locatie
                                                             eindlevel: 3, // gebouw
                                                             whenEmpty: L("lcl_search_generic")  // want filter
                                                           });
-SEARCH_BLOCK_END();
-var buttons =  [ {title: L("lcl_overview_list"), action: "doSubmit()", id: "bSearch", icon: "fa-clipboard-list"} ];
-SIMPLE_BLOCK_START();
-  CreateButtons(buttons, { entersubmit: true, showIcons: true});
-SIMPLE_BLOCK_END();
-SEARCH_PAGE_END(); %>
+%>          </table>
+          </td><!-- end column 1 -->
+        </tr>
+<%      BLOCK_END();
+        var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch"} ];
+        CreateButtons(buttons, { entersubmit: true});
+%>
       </form>
+    </div> <!-- search -->
 
     <div id="result">
       <iframe width="100%" height="100%"
@@ -84,4 +92,3 @@ SEARCH_PAGE_END(); %>
     </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

@@ -41,12 +41,11 @@ var ruimte_key_arr = getQParamIntArray("ruimte_keys");
     </script>
 </head>
 
-<body class="fclt-modal" id="mod_ruimteresscope">
-<% MODAL_START(); %>
+<body class="modal" id="mod_ruimteresscope">
     <form name="u2" method="post" action="alg_ruimteresscope_save.asp?ruimte_keys=<%=ruimte_key_arr.join(",")%>">
-    <% MODAL_BLOCK_START("alg_ruimteresscope", L("lcl_alg_geselecteerde_ruimten") + ": " + ruimte_key_arr.length, { icon: "fa-map-marker" }); %>
         <input type='hidden' name='scopemode' id='scopemode'>
-<%       var sql = "SELECT rd.ins_discipline_key"
+<%  BLOCK_START("alg_ruimteresscope", L("lcl_alg_geselecteerde_ruimten") + ": " + ruimte_key_arr.length);
+        var sql = "SELECT rd.ins_discipline_key"
                 + ", "+ lcl.xsql('rd.ins_discipline_omschrijving','rd.ins_discipline_key') +" omschrijving"
                 + "  FROM res_v_aanwezigdiscipline rd"
                 + " WHERE rd.ins_discipline_min_level = 2"
@@ -60,18 +59,14 @@ var ruimte_key_arr = getQParamIntArray("ruimte_keys");
                        multi: true,
                        startmulti: true
                      });
-    MODAL_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} ];
-    SIMPLE_BLOCK_START();
-        CreateButtons(buttons);
-    SIMPLE_BLOCK_END();
+    BLOCK_END();
+    var buttons =  [ {title: L("lcl_add"),    action: "alg_submit('A')" },
+                     {title: L("lcl_delete"), action: "alg_submit('D')" },
+                     {title: L("lcl_cancel"), action: "gen_cancel()"} ];
+    CreateButtons(buttons);
 
     IFACE.FORM_END();
 %>
       </form>
-      <% MODAL_END(); %>
   </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

@@ -25,7 +25,6 @@ var locatie_key = getQParamInt("locatie_key", -1); // Locatie
 var gebouw_key = getQParamInt("gebouw_key", -1); // Gebouw
 var verdieping_key = getQParamInt("verdieping_key", -1); // Verdieping
 var ruimte_key = getQParamInt("ruimte_key", -1); // ruimte
-var alg_startlevel = getQParamInt("alg_startlevel", 0); // Startlevel van plaatsselector, default Regio
 var authparams = alg.checkAutorisation();
 
 %>
@@ -49,40 +48,42 @@ var authparams = alg.checkAutorisation();
     </script>
   </head>
   <body id="searchbody">
-      <form name="u2" id="algform" target="workFrame" action="dynamischbepaald" method="get" onsubmit="return false;">
-      <% SEARCH_PAGE_START({ header: L("lcl_filterblok") });
-         SEARCH_BLOCK_START();
+    <div id="search">
+      <form name="u2" id="algform" target="workFrame" action="dynamischbepaald" method="get">
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
+          <tr>
+            <td class="searchkolom1">
+              <table>
+<%
                     FCLTplaatsselector(authparams.ALGreadlevel, {
                                                                   districtkey: district_key,
                                                                   locatiekey: locatie_key,
                                                                   gebouwkey: gebouw_key,
                                                                   verdiepingkey: verdieping_key,
                                                                   ruimtekey: ruimte_key,
-                                                                  startlevel: alg_startlevel, // regio
+                                                                  startlevel: 0, // regio
                                                                   eindlevel: 5, // ruimte
                                                                   whenEmpty: L("lcl_search_generic")  // want filter
                                                                 });
 %>
-<%    SEARCH_BLOCK_END();
-      SEARCH_BLOCK_START(); %>
-          <input type="hidden" name="noref" value="1">
-          <input type="hidden" name="chkgeb" value="1">
-<%    SEARCH_BLOCK_END(); %>
+              </table>
+            </td><!-- end column 1 -->
+            <td class="searchkolom2"><input type="hidden" name="noref" value="1"><input type="hidden" name="chkgeb" value="1">
+           </td><!-- end column 1 -->
+          </tr>
+<%    BLOCK_END();
 
-<%
   var buttons =  [
-     {title: L("lcl_menu_alg_locatie"),       action: "doSubmit('L')", icon: "fa-location-arrow"},
-     {title: L("lcl_menu_alg_gebouw"),        action: "doSubmit('G')", icon: "fa-building"},
-     {title: L("lcl_menu_alg_verdieping"),    action: "doSubmit('V')", icon: "fa-layer-group"},
-     {title: L("lcl_menu_alg_ruimte"),        action: "doSubmit('R')", icon: "fa-map-marker"},
-     {title: L("lcl_menu_alg_terreinsector"), action: "doSubmit('T')", icon: "fa-draw-polygon"}
+     {title: L("lcl_menu_alg_locatie"),       action: "doSubmit('L')"},
+     {title: L("lcl_menu_alg_gebouw"),        action: "doSubmit('G')"},
+     {title: L("lcl_menu_alg_verdieping"),    action: "doSubmit('V')"},
+     {title: L("lcl_menu_alg_ruimte"),        action: "doSubmit('R')"},
+     {title: L("lcl_menu_alg_terreinsector"), action: "doSubmit('T')"}
     ];
-  SIMPLE_BLOCK_START();
-    CreateButtons(buttons, { entersubmit: true, showIcons: true });
-  SIMPLE_BLOCK_END();
+  CreateButtons(buttons, { entersubmit: true });
 %>
-<% SEARCH_PAGE_END(); %>
       </form>
+</div> <!-- search -->
 
     <div id="result">
       <iframe width="100%" height="100%"
@@ -94,4 +95,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_show_district.asp

@@ -7,6 +7,10 @@
     Description:  show mode voor het districten scherm
     Parameters:   dis_key
 
+
+    Context:
+    Note:
+
 */ %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
@@ -18,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();
 %>
@@ -63,39 +62,41 @@ oRs.Close();
     </script>
   </head>
 
-  <body class="showmode">
-  <% SUBFRAME_START();
-    var buttons = [];
+  <body id="showbody">
+<%  var buttons = [];
     if (!dis_deleted)
     {
       if (this_alg.writeuse || this_alg.writeman)
-        buttons.push({title: L("lcl_change"), action:"dis_change()", icon: "fa-fclt-edit" });
+        buttons.push({title: L("lcl_change"), action:"dis_change()", icon: "wijzigen.png" });
       if (this_alg.writeman) // ALGMAN nodig
-        buttons.push({title: L("lcl_delete"), action:"dis_delete()", icon: "fa-trash-alt" });
+        buttons.push({title: L("lcl_delete"), action:"dis_delete()", icon: "delete.png" });
     }
 
     IFRAMER_HEADER(L("lcl_alg_district_frame"), buttons);
 %>
-    <form name="u2" onSubmit="return false;">
+    <div id="show">
 <%    if (dis_deleted == 1)
       {
-        SIMPLE_BLOCK_START(); %>
-          <div class="alg_deleted"><%=L("lcl_record_is_deleted")%></div>
-<%      SIMPLE_BLOCK_END();
+%>      <div class="alg_deleted"><%=L("lcl_record_is_deleted")%></div><%
       }
-
-        BLOCK_START("algInfo", L("lcl_district"), {icon: "fa-map"}); 
-            ROFIELDTR("fld", L("lcl_region"), reg_naam);
-            ROFIELDTR("fld", L("lcl_name"), dis_naam);
+%>
+      <form name=u2 onSubmit="return false;">
+<%      BLOCK_START("algInfo", "&nbsp;");
+        FCLTplaatsselector(-1,
+                           { regiokey: reg_key,
+                             districtkey: dis_key,
+                             startlevel: 0, // Regio
+                             eindlevel: 1, // District
+                             readonly: true });
         BLOCK_END();
 
         generateFlexKenmerkBlock ({ onrgoed_key    : dis_key,
                                    onrgoed_niveau : onrgoedlvl,
                                    reado          : true,
+                                   flexcolumns    : S("alg_flexcolumns"),
                                    this_alg       : this_alg });
 %>
       </form>
-      <% SUBFRAME_END(); %>
+    </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);
@@ -39,11 +37,8 @@ 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_adres    = oRs("alg_gebouw_adres").Value;
-var bld_postcode = oRs("alg_gebouw_postcode").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;
@@ -57,22 +52,14 @@ 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_mld     = oRs("alg_gebouw_mld").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 dienstniveau = oRs("mld_dienstniveau_key").Value;
 var beginuur   = oRs("alg_gebouw_beginuur").Value;
 var einduur    = oRs("alg_gebouw_einduur").Value;
 var werkdagen  = oRs("alg_gebouw_werkdagen").Value;
-var toon_telefoon  = oRs("alg_gebouw_toon_telefoon").Value;
-var toon_email     = oRs("alg_gebouw_toon_email").Value;
-var toon_kenteken  = oRs("alg_gebouw_toon_kenteken").Value;
 var verantw    = oRs("prs_perslid_key_verantw").Value;
 var verantw2    = oRs("prs_perslid_key_verantw2").Value;
 var vervaldatum = oRs("alg_gebouw_vervaldatum").Value;
-var geb_score1 = oRs("alg_gebouw_mjb_score1").Value;
-var actie_grp_key = oRs("bez_actie_groep_key").Value;
-var kalender_id = oRs("mld_vrije_dagen_id").Value;
 oRs.Close();
 %>
 
@@ -99,42 +86,52 @@ oRs.Close();
                 "json");
         });
       }
+<%  if (S("alg_fg_remote_maps") != "" && bld_x && bld_y) { %>
+      function openMaps(bldKey)
+      {
+          fwnd = window.open('../cad/ShowGoogleMap.asp?bld_key=' + bldKey, 'FGShow',
+                             "width=640, height=480, directories=no, location=no, menubar=no,"
+                           + "resizable=yes, status=no, titlebar=yes, toolbar=no");
+          fwnd.focus()
+          return;
+      }
+<%  } %>
     </script>
   </head>
 
-  <body class="showmode">
-  <% SUBFRAME_START(); %>
+  <body id="showbody">
 <%  var buttons = [];
 
+    if (S("alg_fg_remote_maps") != "" && bld_x && bld_y) {
+         buttons.push({title: L("lcl_maps"), action:"openMaps("+bld_key+")", icon: "map.png" });
+    }
 
     if (!bld_deleted)
     {
       if (this_alg.writeman || this_alg.writeuse)
-        buttons.push({title: L("lcl_change"), action:"bld_change()", icon: "fa-fclt-edit" });
-    }
-    if (!bld_deleted)
-    {
+        buttons.push({title: L("lcl_change"), action:"bld_change()", icon: "wijzigen.png" });
       if (this_alg.writeman) // ALGMAN nodig
-        buttons.push({title: L("lcl_delete"), action:"bld_delete()", icon: "fa-trash-alt" });
+        buttons.push({title: L("lcl_delete"), action:"bld_delete()", icon: "delete.png" });
     }
 
     IFRAMER_HEADER(L("lcl_alg_gebouw_frame"), buttons);
-    if (bld_deleted)
+%>
+    <div id="show">
+<%    if (bld_deleted)
       {
-        SIMPLE_BLOCK_START();
 %>      <div class="alg_deleted"><%=L("lcl_record_is_deleted")%></div><%
-        SIMPLE_BLOCK_END();
       }
-      %><form name=u2 onSubmit="return false;">
-<%      BLOCK_START("algLoc1", L("lcl_building"), {icon: "fa-building"});
+%>
+    <div id="show">
+      <form name=u2 onSubmit="return false;">
+<%      BLOCK_START("algLoc1", "&nbsp;");
         FCLTplaatsselector(-1,
                            { gebouwkey: bld_key,
                              startlevel: 2, //Locatie
                              eindlevel: 3, // Gebouw
-                             moreinfo: true,  // wel beetje suf om door te linken naar jezelf
+                             moreinfo: true,
                              readonly: true
                            });
-        ROFIELDTR("fld", L("lcl_estate_gebouw_man_code"), bld_code);
         sql = "SELECT alg_srtgebouw_key"
             + "     , " + lcl.xsqla('alg_srtgebouw_omschrijving', 'alg_srtgebouw_key')
             + "  FROM alg_srtgebouw"
@@ -148,157 +145,90 @@ oRs.Close();
                        suppressEmpty: true,
                        readonly: true
                      });
-        ROFIELDTR("fld", L("lcl_estate_gebouw_man_descr"),    bld_descr, {suppressEmpty:true});
-        ROFIELDTR("fld", L("lcl_estate_gebouw_man_adres"),    bld_adres, {suppressEmpty:true});
-        ROFIELDTR("fld", L("lcl_estate_gebouw_man_postcode"), bld_postcode, {suppressEmpty:true});
-        ROFIELDTR("fld", L("lcl_estate_gebouw_man_opmerk"),   bld_opmerk, {suppressEmpty:true});
-        ROFIELDTR("fld", L("lcl_estate_gebouw_groepkenmerk"), bld_groep, {suppressEmpty:true});
-
+        ROFIELDTR("fld", L("lcl_estate_gebouw_man_code"), bld_code, {suppressEmpty:true});
+        ROFIELDTR("fld", L("lcl_estate_gebouw_man_opmerk"), bld_opmerk, {suppressEmpty:true});
         sql = "SELECT prs_kostenplaats_key"
             + "     , k.prs_kostenplaats_nr || ' ' || k.prs_kostenplaats_omschrijving"
             + "  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)
+        {
+          sql = "SELECT mld_dienstniveau_key"
+              + "     , " + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
+              + "  FROM mld_dienstniveau"
+              + " WHERE mld_dienstniveau_key = " + dienstniveau;
+          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
+                            });
 
-    BLOCK_END();
+        AFIELDTR('fldmailto details', L("lcl_alg_gebouw_email"), "mailto:" + bld_email, bld_email, { suppressEmpty: true });
+        BLOCK_END();
 
-    BLOCK_START("algLoc2", L("lcl_alg_gebouw_fysiek"), {icon: "fa-ruler-combined"});
+        BLOCK_START("algLoc2", "&nbsp;");
         var calcopp = alg.calc_algm2(bld_key, onrgoedlvl);
-        ROFIELDTR("fld", L("lcl_estate_gebouw_floors_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppfloors, {suppressEmpty: true, datatype: "float"});
-        ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.opprooms, {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});
 
-        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_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});
-        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 && vervaldatum == null))
-    {
-        BLOCK_START("algLoc3", L("lcl_alg_gebouw_administr"), {icon: "fa-clipboard"});
         var fldcls = "fld";
         if (vervaldatum <= new Date())
             fldcls += " expired2";
         ROFIELDTR(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
-            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" });
-            FILEPICKERTR("bld_image", L("lcl_alg_gebouw_image"), bld_image, { "key": bld_key, "module": "ALGPHG", "readonly": 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"), {icon: "fa-users-cog"});
 
-            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_calendar"), kalender_id, {suppressEmpty: true});
-            ROFIELDTR("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(beginuur), {suppressEmpty:true} );
-            ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"), toTimeString(einduur), {suppressEmpty:true} );
-            ROCHECKBOXTR("fldalgwerk", L("lcl_estate_gebouw_werkdagen"), werkdagen==1);
-            ROCHECKBOXTR("fldalgmld", L("lcl_estate_gebouw_mld"), bld_mld==1);
-        BLOCK_END();
-    }
-
-    if (user.checkAutorisation("WEB_BEZMGT", true) && bld_bez==1)
-    {
-        BLOCK_START("algLoc5", L("lcl_alg_gebouw_bezoek"), {icon: "fa-user-tag"});
-
-          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"
-                      });
-            var sql = "SELECT bez_actie_groep_omschrijving"
-                    + "  FROM bez_actie_groep"
-                    + " WHERE bez_actie_groep_key = "+ actie_grp_key;
-            var oRs = Oracle.Execute(sql);
-            if (!oRs.eof) {
-                ROFIELDTR("fld", L("bez_actie_groep"), oRs("bez_actie_groep_omschrijving").Value);
-            }
-            oRs.Close();
-          BLOCK_END();
-    }
-
-    generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,
-                                onrgoed_niveau : onrgoedlvl,
-                                reado          : true,
-                                this_alg       : this_alg
-                              });
+        generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,
+                                    onrgoed_niveau : onrgoedlvl,
+                                    reado          : true,
+                                    flexcolumns    : S("alg_flexcolumns"),
+                                    this_alg       : this_alg
+                                  });
 %>
       </form>
-    <% SUBFRAME_END(); %>
+    </div>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_show_locatie.asp

@@ -7,6 +7,10 @@
     Description:  show de details van een locatie
     Parameters:   loc_key
 
+
+    Context:
+    Note:
+
 */ %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
@@ -17,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);
@@ -27,40 +30,39 @@ 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 loc_volgnr       = oRs("alg_locatie_volgnr").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 = 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()
+      {
+        FcltMgr.openDetail("appl/shared/show_foto.asp?urole=bo&loc_key=<%=loc_key%>", "<%=L("lcl_photos")%>");
+      }
+
       function loc_change()
       {
           if (FcltMgr.startEdit(window))
@@ -81,92 +83,90 @@ oRs.Close();
                 "json");
         });
       }
+<%  if (S("alg_fg_remote_maps") != "" && loc_x && loc_y) {  %>
+      function openMaps(locKey)
+      {
+          fwnd = window.open('../cad/ShowGoogleMap.asp?loc_key=' + locKey, 'FGShow',
+                             "width=640, height=480, directories=no, location=no, menubar=no,"
+                           + "resizable=yes, status=no, titlebar=yes, toolbar=no");
+          fwnd.focus()
+          return;
+      }
+<%  } %>
     </script>
   </head>
 
-  <body class="showmode">
-  <% SUBFRAME_START(); %>
+  <body id="showbody">
 <%  var buttons = [];
+    buttons.push({title: L("lcl_photos"),  icon: "camera.png", action: "alg_showphotos()"});
+
+    if (S("alg_fg_remote_maps") != "" && loc_x && loc_y) {
+         buttons.push({title: L("lcl_maps"), action:"openMaps("+loc_key+")", icon: "map.png" });
+    }
 
     if (!loc_deleted)
     {
       if (this_alg.writeman || this_alg.writeuse)
-        buttons.push({title: L("lcl_change"), action: "loc_change()",  icon: "fa-fclt-edit"});
-    }
-
-    if (!loc_deleted)
-    {
+        buttons.push({title: L("lcl_change"), action: "loc_change()",  icon: "wijzigen.png"});
       if (this_alg.writeman) // ALGMAN nodig
-        buttons.push({title: L("lcl_delete"), action: "loc_delete()",  icon: "fa-trash-alt"});
+        buttons.push({title: L("lcl_delete"), action: "loc_delete()",  icon: "delete.png"});
     }
 
     IFRAMER_HEADER(L("lcl_alg_locatie_frame"), buttons);
-    if (loc_deleted)
+%>
+    <div id="show">
+<%    if (loc_deleted)
       {
-        SIMPLE_BLOCK_START();
 %>      <div class="alg_deleted"><%=L("lcl_record_is_deleted")%></div><%
-        SIMPLE_BLOCK_END();
       }
 %>
       <form name=u2 onSubmit="return false;">
-<%
-        BLOCK_START("algLoc1", L("lcl_location"), {icon: "fa-location-arrow"});
+<%      BLOCK_START("algLoc1", "&nbsp;");
         FCLTplaatsselector(-1,
                            { locatiekey: loc_key,
                              startlevel: 1, //District
                              eindlevel: 2, // Locatie
                              readonly: true });
 
-        ROFIELDTR("fld", L("lcl_estate_locatie_man_code"), loc_code);
+        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});
         ROFIELDTR("fld", L("lcl_prs_address_bezoek_land"), bez_land, {suppressEmpty: true});
-        ROFIELDTR("fld", L("lcl_geoxcoord"), loc_x, {suppressEmpty: true});
-        ROFIELDTR("fld", L("lcl_geoycoord"), loc_y, {suppressEmpty: true});
-        BLOCK_END();
-
-
-        BLOCK_START("algloc2", L("lcl_fac_adres_postblock"), {icon: "fa-envelope-open"});
-        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});
-        BLOCK_END();
-
-        BLOCK_START("facFM", L("lcl_operations_block"), {icon: "fa-users-cog"});
-        ROFIELDTR("fld", L("lcl_alg_locatie_volgnr"), loc_volgnr, {suppressEmpty: true});
-        var fldcls = "fld";
-        if (vervaldatum <= new Date())
-            fldcls += " expired2";
-        ROFIELDTR(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
-        if (dienstniveau_key)
+        if (dienstniveau)
         {
             sql  = "SELECT   mld_dienstniveau_key, "
                  + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
                  + "    FROM mld_dienstniveau "
-                 + "   WHERE mld_dienstniveau_key = " + dienstniveau_key;
+                 + "   WHERE mld_dienstniveau_key = " + dienstniveau;
             oRs = Oracle.Execute(sql);
-            ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").Value);
+            ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
             oRs.Close();
         }
+        ROFIELDTR("fld", L("lcl_geoxcoord"), loc_x, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_geoycoord"), loc_y, {suppressEmpty: true});
+
+        BLOCK_END();
+        BLOCK_START("algLoc2", "&nbsp;");
+
+        ROFIELDTR("fld", L("lcl_prs_address_post_adres"), pst_adres, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_prs_address_post_postcode"), pst_postc, {suppressEmpty: true});
+        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, {type: "telefoon", suppressEmpty: true});
-        ROFIELDTR("fld", L("lcl_alg_locatie_email"), loc_mail, { suppressEmpty: true, type: "email" });
-        FILEPICKERTR("loc_image", L("lcl_alg_locatie_image"), loc_image, { "key": loc_key, "module": "ALGPHL", "readonly": true });
-        if (ins_score_enabled)
-          ROFIELDTR("fld", L("lcl_alg_locatie_mjb_score1"), loc_score1, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {suppressEmpty: true});
+        AFIELDTR('fldmailto details', L("lcl_noti_email"), "mailto:" + loc_mail, loc_mail, { suppressEmpty: true });
 
         BLOCK_END();
 
         generateFlexKenmerkBlock ({onrgoed_key    : loc_key,
                                   onrgoed_niveau : onrgoedlvl,
                                   reado          : true,
+                                  flexcolumns    : S("alg_flexcolumns"),
                                   this_alg       : this_alg });
 
 %>
       </form>
-    <% SUBFRAME_END(); %>
+    </div>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_show_note2.asp

@@ -1,81 +0,0 @@
-<%@ language="javascript"%>
-<% /*
-     $Revision$
-     $Id$
-
-    File:               alg_show_note2.asp
-    Description:        Nieuwe notities versie.
-                        Betere layout, altijd een invulveld
-    Parameters:         alg_key (altijd verplicht hier)
-
-    Note:               Nu kan iedereen hier zijn, FE of FOBO. FE mag de interne notes niet zien, let daarop.
-
-*/
-
-var alg_key = getQParamInt("alg_key"); // Altijd verplicht alg_key.
-var alg_typ = getQParamSafe("alg_typ").toUpperCase();
-var xmlnode = "";
-switch (alg_typ)
-{
-    case "R": "ruimte"; break;
-    case "V": "verdieping"; break;
-    case "G": "gebouw"; break;
-    case "T": "terreinsector"; break;
-    case "L": "locatie"; break;
-    case "D": "district"; break;
-}
-var LOCKED_USER_OK = { "xmlnode" : xmlnode, "key": alg_key };
-%>
-
-<!-- #include file="../Shared/common.inc" -->
-<!-- #include file="../Shared/iface.inc" -->
-<!-- #include file="../Shared/status.inc"-->
-<!-- #include file="./alg.inc" -->
-<!-- #include file="../Shared/resultset_table_v2.inc" -->
-<!-- #include file="../Shared/discx3d.inc" -->
-<!-- #include file="../Shared/notes.inc" -->
-<%
-FCLTHeader.Requires({js: ["notes.js"]});
-
-var outputmode = getQParamInt("outputmode", 0);
-
-var this_alg = alg.func_enabled(alg_key, alg_typ); // Wat mag ik zoal op dit onroerendgoed.
-user.auth_required_or_abort(this_alg.canReadNotes);
-
-var afgehandeld = false;
-
-var kenmerk_key = -1;
-if (alg_key > 0)
-{
-  // Als ik canReadNotes heb dan heb ik canUSEread en/of canMANread rechten.
-  // Wat mag ik op  basis van mijn autorisatie (potentieel) zien, bepaal mijn rolcode-masker
-  var myreadrolcode = 0 + (this_alg.canMANread ? 1 : 0)
-                        + (this_alg.canUSEread ? 2 : 0);
-  // Is er een bijlage kenmerk?
-  var sql = "SELECT k.alg_kenmerk_key"
-          + "  FROM alg_kenmerk k"
-          + " WHERE k.alg_kenmerk_niveau IN ('R','V','G','T','L')"
-          + "   AND k.alg_kenmerk_verwijder IS NULL"
-          + "   AND BITAND(k.alg_kenmerk_rolcode, " + myreadrolcode + ") > 0 "
-          + "   AND (  k.alg_kenmerk_verplicht IS NULL"
-          + "       OR k.alg_kenmerk_verplicht = 0)"
-          + "   AND k.alg_kenmerk_kenmerktype = 'M'"
-          + "   AND k.alg_kenmerk_toonbaar IS NULL"
-          + "   AND k.alg_kenmerk_niveau = " + safe.quoted_sql_upper(alg_typ)
-          + " ORDER BY k.alg_kenmerk_volgnr"
-          + "        , k.alg_kenmerk_niveau";
-
-  var oRs = Oracle.Execute(sql);
-  if (!oRs.eof)
-  {
-    kenmerk_key = oRs("alg_kenmerk_key").Value;
-  }
-  oRs.Close();
-
-  var upload_url = protectQS.create("../Shared/BijlagenForm.asp?module=ALG&multi=1&key=" + alg_key + "&kenmerk_key=" + kenmerk_key);
-}
-
-    notes.show_note2("ALG", alg_key, kenmerk_key, this_alg, afgehandeld, upload_url, {alg_typ: alg_typ});
-
-%>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_show_regio.asp

@@ -3,10 +3,14 @@
 /*  $Revision$
     $Id$
 
-    File:           alg_show_regio.asp
+    File:           alg_show_ruimte.asp
     Status:
-    Description:  
-    Parameters: regio_key
+    Description:
+    Parameters:
+
+
+    Context:
+    Note:
 
 */ %>
 <!-- #include file="../Shared/common.inc" -->
@@ -21,14 +25,11 @@
 FCLTHeader.Requires({plugins:["jQuery"], js: []})
 
 var regio_key  = getQParamInt("regio_key");
-var onrgoedlvl = "E";
 
 var regio_params = { filter: { id: regio_key
                              , show_deleted: true // Ook indien verwijderd ophalen.
                              }};
-//var regio_array = model_regions.REST_GET(regio_params);         // Roep de API2 GET aan
-var model = new model_regions();
-var regio_array = model.REST_GET(regio_params);
+var regio_array = model_regions.REST_GET(regio_params);         // Roep de API2 GET aan
 var regio_data  = (regio_array[0] ? regio_array[0] : {id: -1}); // GET kan meerdere records opleveren, maar we verwachten hier maar 1.
 var this_alg    = regio_params.func_enabled;                    // regio_params bevat nu ook waarden die in API2 zijn bepaald.
 
@@ -62,40 +63,36 @@ var regio_deleted = regio_exists && !!regio_data.deleted;
     </script>
   </head>
 
-  <body class="showmode">
-<%  
-    SUBFRAME_START(); 
-    var buttons = [];
+  <body id="showbody">
+<%  var buttons = [];
     if (!regio_deleted)
     {
       if (this_alg.writeman || this_alg.writeuse)
-        buttons.push({title: L("lcl_change"), action:"reg_change()", icon: "fa-fclt-edit" });
+        buttons.push({title: L("lcl_change"), action:"reg_change()", icon: "wijzigen.png" });
       if (this_alg.writeman) // ALGMAN nodig
-        buttons.push({title: L("lcl_delete"), action:"reg_delete()", icon: "fa-trash-alt" });
+        buttons.push({title: L("lcl_delete"), action:"reg_delete()", icon: "delete.png" });
     }
 
     IFRAMER_HEADER(L("lcl_alg_regio_frame"), buttons);
-    if (regio_deleted)
+%>
+    <div id="show">
+<%    if (regio_deleted)
       {
-        SIMPLE_BLOCK_START();
 %>      <div class="alg_deleted"><%=L("lcl_record_is_deleted")%></div><%
-        SIMPLE_BLOCK_END();
       }
 %>
       <form name=u2
             action="alg_edit_regio_save.asp?regio_key=<%=regio_data.id%>"
             onSubmit="return false">
-<%      BLOCK_START("algInfo", L("lcl_region"), {icon: "fa-globe"});
-            ROFIELDTR("fld", L("lcl_name"), regio_data.name);
+<%      BLOCK_START("algInfo", "&nbsp;");
+        FCLTplaatsselector(-1,
+                           { regiokey: regio_data.id,
+                             startlevel: 0, // Regio
+                             eindlevel: 0, // Regio
+                             readonly: true });
         BLOCK_END();
-
-        generateFlexKenmerkBlock ({ onrgoed_key    : regio_key,
-                                    onrgoed_niveau : onrgoedlvl,
-                                    reado          : true,
-                                    this_alg       : this_alg });
 %>
       </form>
-    <% SUBFRAME_END(); %>
+    </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"],
@@ -69,49 +70,37 @@ if (!room_data.cadcontours.length)
             var url = '../cad/ShowRoom.asp?rKey=' + <%=room_key%>;
             FcltMgr.openModalDetail(url, { titel: L("lcl_prs_wp_fgraph" ) + ": <%=safe.jsstring(room_data.name) %>"});
         }
-<%      if (this_alg.readmgt) {
-          var sql = "SELECT alg_plaatsaanduiding FROM alg_v_onroerendgoed_gegevens WHERE alg_onroerendgoed_keys = " + room_key;
-          var oRs = Oracle.Execute(sql); %>
-        function qrcode() {
-            var url = "../fac/fac_print_qrcode.asp?title=<%=safe.jsstring(safe.url(oRs("alg_plaatsaanduiding").Value))%>"
-                                                + "&text=<%=safe.jsstring(safe.url("/?u=alg_ruimte&k=" + room_key))%>";
-            FcltMgr.openModalDetail(url, { titel: L("lcl_make_qrc_title2") });
-        }
-<%        oRs.Close();
-        } %>
     </script>
   </head>
 
-  <body class="showmode">
-  <% SUBFRAME_START(); %>
+  <body id="showbody">
 <%  var buttons = [];
     if (!room_deleted)
     {
       if (this_alg.writeman || this_alg.writeuse)
-        buttons.push({ title: L("lcl_change"), action:"room_change()", icon: "fa-fclt-edit" });
+        buttons.push({title: L("lcl_change"), action:"room_change()", icon: "wijzigen.png" });
 
       var xfunc = user.func_enabled2("CAD", { isOptional: true });
       if (xfunc && xfunc.canRead("WEB_CADUSE"))
-        buttons.push({ title: L("lcl_prs_wp_fgraph"), action:"openFG()", icon: "fa-map-marker" });
-      if (this_alg.readmgt)
-        buttons.push({ title: L("lcl_make_qrc"), tooltip: L("lcl_make_qrc_title"), action: "qrcode()", icon: "fa-qrcode" });
+        buttons.push({title: L("lcl_prs_wp_fgraph"), action:"openFG()", icon: "zone.png" });
       if (this_alg.writeman) // RUIMAN nodig
-        buttons.push({ title: L("lcl_delete"), action:"room_delete()", icon: "fa-trash-alt" });
+        buttons.push({title: L("lcl_delete"), action:"room_delete()", icon: "delete.png" });
     }
 
     IFRAMER_HEADER(L("lcl_alg_ruimte_frame"), buttons);
+%>
+    <div id="show">
+<%
       if (room_deleted)
       {
-        SIMPLE_BLOCK_START();
 %>      <div class="alg_deleted"><%=L("lcl_record_is_deleted")%></div><%
-        SIMPLE_BLOCK_END();
       }
 %>
       <form name=u2
             action="alg_edit_ruimte_save.asp?room_key=<%=room_data.id%>"
             onSubmit="return false">
 <%
-        BLOCK_START("algrui1", L("lcl_room"), { icon: "fa-map-marker"});
+        BLOCK_START("algLoc1", "&nbsp;");
 
           FCLTplaatsselector(-1, {
                             ruimtekey: room_key,
@@ -120,30 +109,32 @@ if (!room_data.cadcontours.length)
                             moreinfo: true,
                             readonly: true });
 
-          ROFIELDTR("fldshort", L("lcl_estate_ruimte_man_nr"),    room_data.name);
+          var params = { infoPointer: { Url: "appl/shared/status_info.asp?room_key=" + room_key + "&urole=bo",
+                                        Title: L("lcl_status_details") + " " + room_data.name
+                                      }
+                       }
+
+          ROFIELDTR("fldshort", L("lcl_estate_ruimte_man_nr"),    room_data.name, params);
           ROFIELDTR("fld",      L("lcl_estate_ruimte_man_descr"), room_data.description);
           ROFIELDTR("fld",      L("lcl_estate_ruimte_man_sort"), (room_data.roomtype ?     room_data.roomtype.name : ""),     {suppressEmpty:true});
-
-          ROFIELDTR("fld",          L("lcl_estate_ruimte_man_opmerk"),     room_data.remark,    {suppressEmpty:true});
-
-        BLOCK_END();
-        BLOCK_START("algrui2", L("lcl_alg_gebouw_fysiek"), { icon: "fa-ruler-combined" });
-
-          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_bruto_vloeropp"), room_data.grossarea, {suppressEmpty:true, datatype: "float"});
-          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"});
-          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"});
-          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"});
-        BLOCK_END();
-        BLOCK_START("algrui3", L("lcl_alg_gebouw_facilitair"), {icon: "fa-users-cog"});
           ROFIELDTR("fld",      L("lcl_mld_dienst_niveau"),      (room_data.servicelevel ? room_data.servicelevel.name : ""), {suppressEmpty:true});
 
+        BLOCK_END();
+        BLOCK_START("algLoc2", "&nbsp;");
+
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_bruto_vloeropp"), room_data.grossarea, {suppressEmpty:true});
+          if (room_data.grossarea != room_data.cadcontours[0].cadarea)
+              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});
+          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});
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_man_omtrek"),     room_data.perimeter, {suppressEmpty:true});
+          ROFIELDTR("fldshort",     L("lcl_estate_ruimte_man_inhoud"),     room_data.volume,    {suppressEmpty:true});
+          ROFIELDTR("fld",          L("lcl_estate_ruimte_man_opmerk"),     room_data.remark,    {suppressEmpty:true});
+
           ROFIELDTR("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(room_data.openfrom),   {suppressEmpty:true});
           ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"),  room_data.opento==24?"24:00":toTimeString(room_data.opento),     {suppressEmpty:true});
 
@@ -161,11 +152,11 @@ if (!room_data.cadcontours.length)
             onrgoed_key    : room_key,
             onrgoed_niveau : rooms.defaults.onrgoedlvl,
             reado          : true,
+            flexcolumns    : S("alg_flexcolumns"),
             this_alg       : this_alg
             });
 %>
       </form>
-    <% SUBFRAME_END(); %>
+    </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,56 +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 kp_key  = oRs("prs_kostenplaats_key").Value;
-var prs_kstpl = oRs("kostenplaats_oms").Value;
-var afd_key   = oRs("prs_afdeling_key").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() {
@@ -120,119 +100,57 @@ oRs.Close();
                 "json");
         });
       }
-
     </script>
   </head>
 
-  <body class="showmode">
-  <% SUBFRAME_START(); %>
+  <body id="showbody">
 <%  var buttons = [];
     if (!ter_deleted)
     {
       if (this_alg.writeman || this_alg.writeuse)
-        buttons.push({title: L("lcl_change"), action:"ter_change()", icon: "fa-fclt-edit" });
+        buttons.push({title: L("lcl_change"), action:"ter_change()", icon: "wijzigen.png" });
       if (this_alg.writeman) // ALGMAN nodig
-        buttons.push({title: L("lcl_delete"), action:"ter_delete()", icon: "fa-trash-alt" });
+        buttons.push({title: L("lcl_delete"), action:"ter_delete()", icon: "delete.png" });
     }
 
     IFRAMER_HEADER(L("lcl_alg_terreinsector_frame"), buttons);
 %>
+    <div id="show">
 <%    if (ter_deleted == 1)
       {
-        SIMPLE_BLOCK_START();
 %>      <div class="alg_deleted"><%=L("lcl_record_is_deleted")%></div><%
-        SIMPLE_BLOCK_END();
       }
 %>
       <form name=u2 onSubmit="return false;">
 <%
-    BLOCK_START("algter1", L("lcl_alg_terreinsector_frame"), {icon : "fa-draw-polygon"});
+        BLOCK_START("algInfo", "");
         FCLTplaatsselector(-1,
                            { locatiekey: loc_key,
                              startlevel: 2, // Locatie
                              eindlevel: 2, // Locatie
-                             readonly: true,
-                             moreinfo: true
+                             readonly: true
                            });
 
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_name"), ter_naam);
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_code"), ter_code);
         ROFIELDTR("fld", L("lcl_estate_terreinsector_man_sort"), ter_sroms, {suppressEmpty: true});
-        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_descr"), ter_oms);
-    BLOCK_END();
-
-    BLOCK_START("algLoc5", L("lcl_alg_gebouw_bezoek"), {icon: "fa-user-tag"});
-        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("algter3", L("lcl_alg_gebouw_administr"), {icon: "fa-clipboard"});
-        if (vervaldatum <= new Date())
-                fldcls += " expired2";
-        ROFIELDTR(fldcls, L("lcl_alg_vervaldatum"), toDateString(vervaldatum), {suppressEmpty: true});
-        ROFIELDTR("fld", L("lcl_prs_dept_kosten"), prs_kstpl, { suppressEmpty: true, infoPointer: { Url: "appl/mgt/prs_kostenplaats.asp?mode=show&id=" + kp_key}});
-
-        ROFIELDTR("fld", L("lcl_dep_name_level2"), prs_afd, { infoPointer: { Url: "appl/prs/prs_afdeling.asp?key=" + afd_key }});
-        FCLTpersoonselector("verantw",
-                            "sgVerantw",
-                            { perslidKey: verantw_key,
-                              label: L("lcl_alg_verantw"),
-                              readonly: true,
-                              moreinfo: true,
-                              suppressEmpty: true
-                            });
-        FCLTpersoonselector("verantw2",
-                            "sgVerantw2",
-                            { perslidKey: verantw2_key,
-                              label: L("lcl_alg_verantw2"),
-                              readonly: true,
-                              moreinfo: true,
-                              suppressEmpty: true
-                            });
+        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_code"), ter_code);
+        ROFIELDTR("fld", L("lcl_estate_terreinsector_man_name"), ter_naam);
+        ROFIELDTR("fld", L("lcl_prs_dept_kosten"), prs_kstpl, {suppressEmpty: true});
+        ROFIELDTR("fld", L("lcl_dep_name_level2"), prs_afd);
         ROFIELDTR("fld", L("lcl_estate_terreinsector_ordernr"), ter_ordnr, {suppressEmpty: true});
-        FILEPICKERTR("ter_image", L("lcl_alg_terreinsector_image"), ter_image, { "key": ter_key, "module": "ALGPHT", "readonly": 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("algter4", L("lcl_alg_gebouw_fysiek"), {icon: "fa-ruler-combined"});
-            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";
         BLOCK_END();
-    }
 
         generateFlexKenmerkBlock({onrgoed_key    : ter_key,
                                  onrgoed_niveau : onrgoedlvl,
                                  reado          : true,
+                                 flexcolumns    : S("alg_flexcolumns"),
                                  this_alg       : this_alg
                                 });
 
 %>
       </form>
-    <% SUBFRAME_END(); %>
+    </div> <!-- edit -->
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_show_verdieping.asp

@@ -28,21 +28,15 @@ var onrgoedlvl = "V";
 var this_alg = alg.func_enabled(flr_key, onrgoedlvl);
 user.auth_required_or_abort(this_alg.readman || this_alg.readuse);
 
-var sql = " SELECT alg_verdieping_omschrijving"
-        + "      , alg_verdieping_volgnr"
-        + "      , alg_verdieping_code"
-        + "      , alg_verdieping_verwijder"
-        + "      , mld_dienstniveau_key"
-        + "      , alg_verdieping_dwgz"
+var sql = " SELECT * "
         + "   FROM alg_verdieping "
         + "  WHERE alg_verdieping_key = " + flr_key;
 var oRs = Oracle.Execute(sql);
-var flr_omschr = oRs("alg_verdieping_omschrijving").Value;
-var flr_volgnr = oRs("alg_verdieping_volgnr").Value;
-var flr_code   = oRs("alg_verdieping_code").Value;
-var flr_deleted = oRs("alg_verdieping_verwijder").Value != null;
-var flr_dwgz = oRs("alg_verdieping_dwgz").Value;
-var dienstniveau_key = oRs("mld_dienstniveau_key").Value;
+var flr_omschr = oRs("alg_verdieping_omschrijving").value;
+var flr_volgnr = oRs("alg_verdieping_volgnr").value;
+var flr_code   = oRs("alg_verdieping_code").value;
+var flr_deleted = oRs("alg_verdieping_verwijder").value != null;
+var dienstniveau = oRs("mld_dienstniveau_key").value;
 oRs.Close();
 %>
 
@@ -70,91 +64,66 @@ oRs.Close();
                 "json");
         });
       }
-      function openFG()
-      {
-          var url = '../cad/ShowRoom.asp?vKey=' + <%=flr_key%>;
-          FcltMgr.openModalDetail(url, { titel: L("lcl_prs_wp_fgraph" ) + ": <%=safe.jsstring(flr_omschr) %>"});
-      }
-      function openEvictionPlan()
-      {
-          var url = 'appl/cad/EvictionPlan.asp?floor_key=' + <%=flr_key%>;
-          FcltMgr.openDetail(url, { titel: L("lcl_eviction_plan_h" ) + ": <%=safe.jsstring(flr_omschr) %>"});
-      }
     </script>
   </head>
 
-  <body class="showmode">
-  <% SUBFRAME_START(); %>
+  <body id="showbody">
 <%  var buttons = [];
     if (!flr_deleted)
     {
       if (this_alg.writeman || this_alg.writeuse)
-        buttons.push({title: L("lcl_change"), action:"flr_change()", icon: "fa-fclt-edit" });
-      var xfunc = user.func_enabled2("CAD", { isOptional: true });
-      if (xfunc && xfunc.canRead("WEB_CADUSE"))
-      {
-        buttons.push({title: L("lcl_prs_wp_fgraph"), action:"openFG()", icon: "fa-map-marker" });
-        var pathName = S("flexfilespath") + "/cad/vlucht/" + "V" + flr_key;
-        var fso = new ActiveXObject("Scripting.FileSystemObject");
-        if (fso.FolderExists(pathName)) {
-          buttons.push({title: L("lcl_eviction_plan_h"), action:"openEvictionPlan()", icon: "fa-ufo-beam" });
-        }
-
-      }
+        buttons.push({title: L("lcl_change"), action:"flr_change()", icon: "wijzigen.png" });
       if (this_alg.writeman) // ALGMAN nodig
-        buttons.push({title: L("lcl_delete"), action:"flr_delete()", icon: "fa-trash-alt" });
+        buttons.push({title: L("lcl_delete"), action:"flr_delete()", icon: "delete.png" });
     }
 
     IFRAMER_HEADER(L("lcl_alg_verdieping_frame"), buttons);
 %>
+    <div id="show">
 <%    if (flr_deleted)
       {
-        SIMPLE_BLOCK_START();
 %>      <div class="alg_deleted"><%=L("lcl_record_is_deleted")%></div><%
-        SIMPLE_BLOCK_END();
       }
 %>
       <form name=u2 onSubmit="return false;">
-<%      BLOCK_START("algflr1", L("lcl_floor"), {icon: "fa-layer-group"});
+<%      BLOCK_START("algLoc1", "&nbsp;");
         FCLTplaatsselector(-1, {
                             verdiepingkey: flr_key,
                             startlevel: 2, //locatie
-                            eindlevel: 4, // Verdieping (klikt naar zichzelf door, verbeterpuntje)
+                            eindlevel: 4, // Verdieping
                             moreinfo: true,
                             readonly: true });
 
         ROFIELDTR("fld", L("lcl_estate_verdieping_man_code"), flr_code);
         ROFIELDTR("fld", L("lcl_estate_verdieping_man_volgnr"), flr_volgnr);
-        if (dienstniveau_key)
+        if (dienstniveau)
         {
             sql  = "SELECT   mld_dienstniveau_key, "
                  + lcl.xsqla("mld_dienstniveau_omschr", "mld_dienstniveau_key")
                  + "    FROM mld_dienstniveau "
-                 + "   WHERE mld_dienstniveau_key = " + dienstniveau_key;
+                 + "   WHERE mld_dienstniveau_key = " + dienstniveau;
             oRs = Oracle.Execute(sql);
-            ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").Value);
+            ROFIELDTR("fld", L("lcl_mld_dienst_niveau"), oRs("mld_dienstniveau_omschr").value);
             oRs.Close();
         }
         BLOCK_END();
 
-        BLOCK_START("algflr2", L("lcl_alg_gebouw_fysiek"), {icon: "fa-ruler-combined"});
+        BLOCK_START("algLoc2", "&nbsp;");
           var calcopp = alg.calc_algm2(flr_key, onrgoedlvl);
-          ROFIELDTR("fld", L("lcl_estate_verdieping_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppfloor, {suppressEmpty: true, datatype: "float"});
-          ROFIELDTR("fld", L("lcl_estate_verdieping_netto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.opprooms, {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_verdieping_man_dwgz"), safe.displayfloat(flr_dwgz, 3, true), {suppressEmpty: true});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_bruto_vloeropp") + L("lcl_estate_calc_vloeropp"), calcopp.oppbruto, {suppressEmpty: true});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt1") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt1, {suppressEmpty: true});
+          ROFIELDTR("fld", L("lcl_estate_ruimte_opp_alt2") + L("lcl_estate_calc_vloeropp"), calcopp.oppalt2, {suppressEmpty: true});
         BLOCK_END();
 
         generateFlexKenmerkBlock ({
            onrgoed_key    : flr_key,
            onrgoed_niveau : onrgoedlvl,
            reado          : true,
+           flexcolumns    : S("alg_flexcolumns"),
            this_alg       : this_alg
         });
 %>
       </form>
-    <% SUBFRAME_END(); %>
+    </div>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_show_wp.asp

@@ -73,18 +73,18 @@ var wp_typ_str = (wp_type == 1 ? L("lcl_wptype_1") : L("lcl_wptype_0"));
     </script>
   </head>
 
-  <body class="showmode">
-  <% SUBFRAME_START(); %>
+  <body id="showbody">
 <%  var buttons = [];
     if (alg.canWriteRuimte(room_key, authparams.rmALGwritelevel)) // ALGUSE schrijfrechten nodig
     {
-    var buttons =  [ {title: L("lcl_change"), action:"wp_change()", icon: "fa-fclt-edit" },
-                     {title: L("lcl_delete"), action:"wp_delete()", icon: "fa-trash-alt" } ];
+    var buttons =  [ {title: L("lcl_change"), action:"wp_change()", icon: "wijzigen.png" },
+                     {title: L("lcl_delete"), action:"wp_delete()", icon: "delete.png" } ];
     }
     IFRAMER_HEADER(L("lcl_alg_wp_frame"), buttons);
 %>
+    <div id="show">
       <form name=u2 onSubmit="return false;">
-<%      BLOCK_START("algInfo", L("lcl_alg_wp_frame"), {icon: "fa-map-pin"});
+<%      BLOCK_START("algInfo", "");
         FCLTplaatsselector(authparams.ALGreadlevel,
                            { locatie: loc_key,
                              gebouwkey: bld_key,
@@ -96,7 +96,7 @@ var wp_typ_str = (wp_type == 1 ? L("lcl_wptype_1") : L("lcl_wptype_0"));
         ROFIELDTR("fld", L("lcl_estate_wp_seq"), wp_volgnr, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_workplace"), wp_oms, {suppressEmpty: true});
 %>      <tr>
-          <td class="label"><label for="wp_vstopp_v"><%=L("lcl_estate_wp_fixed")%></label></td>
+          <td class="label"><label><%=L("lcl_estate_wp_fixed")%>:</label></td>
           <td>
             <label for="wp_vstopp_v">
               <input type="radio" name="wp_vstopp_v" id="wp_vstopp_v" value="" <%= wp_vstopp==null ? " checked " : "" %> disabled><%=L("lcl_estate_wp_fixed_v")%>
@@ -106,17 +106,15 @@ var wp_typ_str = (wp_type == 1 ? L("lcl_wptype_1") : L("lcl_wptype_0"));
             </label>
           </td>
         </tr>
-<%      ROFIELDTR("fld", L("lcl_estate_wp_area"), wp_opp, {suppressEmpty:true, datatype: "float"});
+<%      ROFIELDTR("fld", L("lcl_estate_wp_area"), wp_opp, {suppressEmpty:true});
         if (wp_virt==1)
             CHECKBOXTR(L("lcl_estate_wp_virt"), "fldalgbez", "wp_virt", wp_virt, { suppressEmpty:true, html: " disabled" });
-
         ROFIELDTR("wp_type",      L("lcl_wptype"),     wp_typ_str);
 %>
         </table>
 <%      BLOCK_END();
 %>
       </form>
-    <% SUBFRAME_END(); %>
+    </div>
   </body>
 </html>
-<% ASPPAGE_END(); %> 

APPL/ALG/alg_srtruimte.asp

@@ -0,0 +1,337 @@
+<%@language = "javascript" %>
+<% /*
+     $Revision$
+     $Id$
+
+     File:          alg_srtruimte.asp
+     Description:   Wijzigen van srtruimte gegevens
+     Parameters:
+     Context:
+*/ %>
+
+<!-- #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" -->
+<!-- #include file="../Shared/stdmeldingselector.inc" -->
+<!-- #include file="../Shared/selector.inc" -->
+
+<%
+FCLTHeader.Requires({js: ["jquery-ui.js"]});
+
+var srtruimte_key = getQParamInt("alg_srtruimte_key", -1); // default is nieuwe
+var mode          = getQParam("mode", "show");
+
+if (srtruimte_key == -1 && mode == "show")
+    mode = "new";
+
+var authparams = user.checkAutorisation("WEB_ALGMSU");
+
+var srtr_info = {};
+
+if (srtruimte_key > 0)
+{   // bestaande ruimtesoort
+    var sql = "SELECT r.alg_srtruimte_key"
+            + "     , r.alg_srtruimte_omschrijving"
+            + "     , r.alg_srtruimte_prijs"
+            + "     , r.alg_srtruimte_prijs2"
+            + "     , r.alg_srtruimte_prijs3"
+            + "     , r.alg_srtruimte_prijs4"
+            + "     , r.alg_srtruimte_prijs5"
+            + "     , r.alg_srtruimte_code"
+            + "     , r.prs_bevat_werkplek"
+            + "     , r.prs_verhuurbaar"
+            + "     , r.alg_srtruimte_t_uitvoertijd.tijdsduur uitvoertijd_t"
+            + "     , r.alg_srtruimte_t_uitvoertijd.eenheid uitvoertijd_e"
+            + "     , r.alg_srtruimte_verwijder"
+            + "  FROM alg_srtruimte r"
+            + " WHERE alg_srtruimte_key = " + srtruimte_key;
+    oRs = Oracle.Execute(sql);
+    if (!oRs.eof)
+    {
+      var srtr_info = { alg_srtruimte_omschrijving: oRs("alg_srtruimte_omschrijving").Value,
+                        alg_srtruimte_prijs:        oRs("alg_srtruimte_prijs").Value,
+                        alg_srtruimte_prijs2:       oRs("alg_srtruimte_prijs2").Value,
+                        alg_srtruimte_prijs3:       oRs("alg_srtruimte_prijs3").Value,
+                        alg_srtruimte_prijs4:       oRs("alg_srtruimte_prijs4").Value,
+                        alg_srtruimte_prijs5:       oRs("alg_srtruimte_prijs5").Value,
+                        alg_srtruimte_code:         oRs("alg_srtruimte_code").Value,
+                        prs_bevat_werkplek:         oRs("prs_bevat_werkplek").Value,
+                        prs_verhuurbaar:            oRs("prs_verhuurbaar").Value,
+                        tijd_uitvoertijd:           oRs("uitvoertijd_t").Value,
+                        eenh_uitvoertijd:           oRs("uitvoertijd_e").Value
+                      };
+      var srtruimte_deleted = oRs("alg_srtruimte_verwijder").value != null;
+    }
+    oRs.close();
+}
+else
+{   // nieuwe ruimtesoort
+    var srtr_info = { alg_srtruimte_omschrijving: "",
+                      alg_srtruimte_code:         "",
+                      tijd_uitvoertijd: null,
+                      eenh_uitvoertijd: null
+                    };
+}
+
+%>
+<html>
+  <head>
+<%
+FCLTHeader.Generate();
+
+if (mode == "save")
+{
+    var fields = [ { dbs: "alg_srtruimte_omschrijving",            typ: "varchar", frm: "omschrijving" },
+                   { dbs: "alg_srtruimte_prijs",                   typ: "float",   frm: "prijs" },
+                   { dbs: "alg_srtruimte_prijs2",                  typ: "float",   frm: "prijs2" },
+                   { dbs: "alg_srtruimte_prijs3",                  typ: "float",   frm: "prijs3" },
+                   { dbs: "alg_srtruimte_prijs4",                  typ: "float",   frm: "prijs4" },
+                   { dbs: "alg_srtruimte_prijs5",                  typ: "float",   frm: "prijs5" },
+                   { dbs: "alg_srtruimte_code",                    typ: "varchar", frm: "code" },
+                   { dbs: "prs_bevat_werkplek",                    typ: "check",   frm: "bevatwerkplek" },
+                   { dbs: "prs_verhuurbaar",                       typ: "check",   frm: "verhuurbaar" }
+                 ];
+
+    // Checken of het eenheden selectveld met dagen/uren bij "Uitvoertijd" niet readonly was en wel is meegegeven.
+    // Als dit eenheden selectieveld readonly was dan is er geen waarde voor uitvoertijd ingevuld en moeten beide waarden null worden.
+    fields = shared.add_time_field(fields, "alg_srtruimte_t_uitvoertijd",   "uitvoertijd",   "dayshours_urg");
+
+    // Update, delete of insert uitvoeren.
+    if (srtruimte_key > 0)
+    {
+        var sql = buildUpdate("alg_srtruimte", fields)
+                + " alg_srtruimte_key = " + srtruimte_key;
+        var err = Oracle.Execute(sql, true);
+    }
+    else
+    {
+        fields.push( { dbs: "alg_srtruimte_key", typ: "key", seq: "alg_s_alg_srtruimte_key" } );
+        var algIns = buildInsert("alg_srtruimte", fields);
+        var alg_srtruimte_key = algIns.sequences["alg_srtruimte_key"];
+        var err = Oracle.Execute(algIns.sql, true);
+        srtruimte_key = alg_srtruimte_key;
+    }
+
+    if (err.friendlyMsg)
+    {
+%>
+        <script>
+            FcltMgr.alert("<%=safe.jsstring(err.friendlyMsg)%>");
+        </script>
+<%
+    }
+    else
+    {
+%>
+        <script>
+            $(document).ready(function () {parent.window.location.href="alg_srtruimte.asp?mode=show&alg_srtruimte_key=<%=srtruimte_key%>";} );
+        </script>
+<%
+    }
+    Response.End;
+}
+else if (srtruimte_key > 0 && mode == "delete")
+{
+    var sql = "UPDATE alg_srtruimte"
+            + "   SET alg_srtruimte_verwijder = SYSDATE"
+            + " WHERE alg_srtruimte_verwijder IS NULL"
+            + "   AND alg_srtruimte_key = " + srtruimte_key;
+    var err = Oracle.Execute(sql, true);
+%>
+    <script>
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { alg_srtruimte_key: <%=srtruimte_key%>,
+                                          warning: "<%=safe.jsstring(err.friendlyMsg)%>",
+                                          keepForm: <%=err.friendlyMsg? "true" : "false"%>
+                                        });
+        } );
+    </script>
+<%
+    Response.End;
+}
+%>
+<script type="text/javascript" >
+
+    function alg_submit()
+    {
+        $("#verhuurbaar").prop("disabled", false); // Weer enabled zodat waarde ook gesubmit wordt.
+        if (!validateForm("u2"))
+            return false;
+
+        document.forms.u2.submit();
+    }
+
+    function alg_edit()
+    {
+        window.location.href = "alg_srtruimte.asp?mode=edit&alg_srtruimte_key=<%=srtruimte_key%>";
+    }
+
+    function alg_delete()
+    {
+        FcltMgr.confirm("<%=safe.jsstring(L("lcl_R_U_sure"))%>",
+            function() {
+                window.location.href = "../alg/alg_srtruimte.asp?mode=delete&alg_srtruimte_key=<%=srtruimte_key%>";
+            });
+    }
+
+    function alg_cancel()
+    {
+        if (<%=srtruimte_key%> > 0)
+        {
+            window.location.href = "alg_srtruimte.asp?mode=show&alg_srtruimte_key=<%=srtruimte_key%>";
+        }
+        else
+        {
+            FcltMgr.closeDetail(window, { cancel: true });
+        }
+    }
+
+    function alg_close(params)
+    {
+<%      if (srtruimte_key == -1)
+        {
+%>
+          if (params.cancel)
+          {
+            FcltMgr.closeDetail(window, params);
+            return true;
+          }
+<%      }
+        else
+        { // Bestaand ruimtesoort bewerkt, switch naar show-mode
+%>
+          if (params.close)
+          {
+            FcltMgr.closeDetail(window, { close: true})
+          }
+<%      }
+%>
+        if (!params.keepForm)
+          window.location.href = "alg_srtruimte.asp?mode=show&alg_srtruimte_key=" + params.srtruimte_key;
+    }
+
+    function onChangeBevatWerkplek()
+    {
+        // Als bevat_werkplek is aangevinkt, moet verhuurbaar ook aangevinkt worden (constraint ALG_C_PRS_WERKPLEK_VERHUURBAAR)
+        if ($("#bevatwerkplek").is(":checked"))
+        {
+          $("#verhuurbaar").prop("checked", "checked");
+          $("#verhuurbaar").prop("disabled", true);
+        }
+        else
+        {
+          $("#verhuurbaar").prop("disabled", false);
+        }
+
+    }
+
+    function onChangeUitvoertijd()
+    {
+        if (isNaN(parseFloat($("#uitvoertijd").val())))
+          $("#dayshours_urg").prop("disabled", true);
+        else
+          $("#dayshours_urg").prop("disabled", false);
+    }
+
+    jQuery(document).ready(function()
+                           {
+                               $('textarea').resize(function () { FcltMgr.resized(window) } );
+                               $('textarea').autogrow();
+                           });
+</script>
+  </head>
+
+  <body id="<%=((mode == "show")? "showbody" : "editbody")%>">
+<%
+    var buttons = [];
+
+    if (!srtruimte_deleted)
+    {
+        if (mode == "show")
+        {
+            buttons.push( {title: L("lcl_change"), action:"alg_edit()",   icon: "wijzigen.png" } );
+            buttons.push( {title: L("lcl_delete"), action:"alg_delete()", icon: "delete.png" } );
+        }
+        else
+        {
+            buttons.push( {title: L("lcl_submit"), action:"alg_submit()", icon: "opslaan.png" } );
+            buttons.push( {title: L("lcl_cancel"), action:"alg_cancel()", icon: "undo.png" } );
+        }
+    }
+    IFRAMER_HEADER(L("lcl_alg_srtruimte_details"), buttons);
+
+    if (mode == "show")
+    {
+        myFIELD = function (a, b, c, d, e) { ROFIELDTR(b, c, d, e) };
+        myTEXTAREA = function (a, b, c, d, e) { ROTEXTAREATR(b, c, d, e) };
+        myCHECKBOX = function (a, b, c, d, e) { ROCHECKBOXTR(b, c, d, e) };
+    }
+    else
+    {
+        myFIELD = RWFIELDTR;
+        myTEXTAREA = RWTEXTAREATR;
+        myCHECKBOX = RWCHECKBOXTR;
+    }
+
+    if (srtruimte_deleted)
+    {
+%>      <div class="alg_deleted"><%=L("lcl_record_is_deleted")%></div><%
+    }
+
+%>
+    <div id="show">
+      <form name="u2"
+            action="alg_srtruimte.asp?mode=save&alg_srtruimte_key=<%=srtruimte_key%>"
+            method="post"
+            target="hidFrameSubmit"
+            onSubmit="alg_submit()">
+<%
+        BLOCK_START("algInfo", safe.html(L("lcl_general_properties")));
+
+            ROFIELDTR(                  "fld",      L("lcl_key"),                     srtruimte_key);
+            myFIELD("omschrijving",     "fld",      L("lcl_descr"),                   srtr_info.alg_srtruimte_omschrijving, { translate: {fld: "mld_afmeldtekst_naam", key: srtruimte_key} });
+            myFIELD("prijs",            "fld",      L("lcl_alg_alg_tarief")+" (m2)",  safe.editablefloat(srtr_info.alg_srtruimte_prijs),  {datatype: "float", suppressEmpty: true} );
+            myFIELD("prijs2",           "fld",      L("lcl_alg_alg_tariefA")+" (m2)", safe.editablefloat(srtr_info.alg_srtruimte_prijs2), {datatype: "float", suppressEmpty: true} );
+            myFIELD("prijs3",           "fld",      L("lcl_alg_alg_tariefB")+" (m2)", safe.editablefloat(srtr_info.alg_srtruimte_prijs3), {datatype: "float", suppressEmpty: true} );
+            myFIELD("prijs4",           "fld",      L("lcl_alg_alg_tariefC")+" (m2)", safe.editablefloat(srtr_info.alg_srtruimte_prijs4), {datatype: "float", suppressEmpty: true} );
+            myFIELD("prijs5",           "fld",      L("lcl_alg_alg_tariefD")+" (m2)", safe.editablefloat(srtr_info.alg_srtruimte_prijs5), {datatype: "float", suppressEmpty: true} );
+            myFIELD("code",             "fld",      L("lcl_alg_srtruimte_code"),      srtr_info.alg_srtruimte_code);
+            myCHECKBOX("bevatwerkplek", "fldcheck", L("lcl_prs_has_workplace"),       srtr_info.prs_bevat_werkplek, {html: "onChange='onChangeBevatWerkplek();'"});
+            myCHECKBOX("verhuurbaar",   "fldcheck", L("lcl_prs_rentable"),            srtr_info.prs_verhuurbaar);
+
+            sql = "SELECT  'U', " + safe.quoted_sql(L("lcl_mld_hours")) + " FROM DUAL"
+                + " UNION "
+                + "SELECT  'D', " + safe.quoted_sql(L("lcl_mld_days"))  + " FROM DUAL"
+                + " ORDER BY 2";
+            var selectparams = { fieldName: "dayshours_urg",
+                                 sql: sql,
+                                 params: { id: "dayshours_urg",
+                                           initKey: srtr_info.eenh_uitvoertijd,
+                                           readonly: (mode == "show"),
+                                           disable: !srtr_info.tijd_uitvoertijd
+                                         }
+                               }
+            myFIELD("uitvoertijd", "fldalg_uitvtijd", L("lcl_mld_stduitvoertijd"), srtr_info.tijd_uitvoertijd? Math.round(srtr_info.tijd_uitvoertijd * 100) / 100 : ""
+                   , {maxlength: 4, datatype: "float", html: "onChange='onChangeUitvoertijd();'", suppressEmpty: true, selector: selectparams});
+
+        BLOCK_END();
+
+    IFACE.FORM_END();
+
+    if (srtruimte_key > -1 && (user.checkAutorisation("WEB_MLDMGT", true)))
+    { // 2. De overruling van de SLA (acceptatietijd en uitvoertijd)
+      page = "../mld/mld_stdmsrtruimte_search_list.asp?embedded=1&srtruimte_key=" + srtruimte_key;
+      IFRAMER("mldstdmsrtruimte", page, { refreshOnClose: true, initHide: false } );
+    }
+%>
+      </form>
+    </div>
+    <iframe src="../Shared/empty.html"
+            name="hidFrameSubmit"
+            FcltClose="alg_close"
+            style="display:none"></iframe>
+  </body>
+</html>

APPL/ALG/alg_srtruimte_search.asp

@@ -0,0 +1,83 @@
+<%@ LANGUAGE = JavaScript %>
+<% /*
+     $Revision$
+     $Id$
+
+    File:        alg_srtruimte_search.asp
+    Description: Zoekscherm ruimtesoort
+    Parameters:
+    Context:
+    Note:
+
+*/ %>
+
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/iface.inc" -->
+
+<%
+FCLTHeader.Requires({ plugins:["jQuery"]});
+
+var autosearch = getQParamInt("autosearch", 0) == 1;
+
+var authparams = user.checkAutorisation("WEB_ALGMSU");
+%>
+
+<html>
+  <head>
+<%
+FCLTHeader.Generate();
+%>
+
+<script type="text/javascript">
+    function doSubmit()
+    {
+        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_srtruimte_search_list.asp" method="get">
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
+          <tr>
+            <td class="searchkolom1">
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+                <tr class="primsearch">
+                  <td class="label"><label for="searchtext"><%=L("lcl_descr")%>:</label></td>
+                  <td><input type="text" class="fldsrch wildcard" name="searchtext" id="searchtext"></td>
+                </tr>
+              </table>
+            </td><!-- end column 1 -->
+
+            <td class="searchkolom2">
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+<%
+%>
+              </table>
+            </td><!-- end column 2 -->
+          </tr>
+<%    BLOCK_END();
+
+      var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" } ];
+      CreateButtons(buttons, { entersubmit: true});
+%>
+      </form>
+    </div> <!-- search -->
+
+    <div id="result">
+      <iframe width="100%" height="100%"
+              src="../Shared/empty.asp"
+              name="workFrame" id="workFrame"
+              onload="FcltMgr.iframeLoaded(this)"
+              frameborder="0" scrolling="no">
+      </iframe>
+    </div>
+  </body>
+</html>

APPL/ALG/alg_srtruimte_search_list.asp

@@ -0,0 +1,114 @@
+<%@language = "javascript" %>
+<% /*
+     $Revision$
+     $Id$
+
+    File:        alg_srtruimte_search_list.asp
+    Description: Vangt de parameters van alg_srtruimte_search op en verwerkt die tot een lijst
+    Parameters:
+    Context:     Vanuit alg_srtruimte_search.asp
+    Note:
+*/ %>
+
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/resultset_table_v2.inc" -->
+
+<%
+var searchtext = getQParam("searchtext", null);
+//var fkdmodule = getQParamSafe("fkdmodule", -1);
+
+var outputmode = getQParamInt("outputmode", 0); //  0 = screen, 1 = print, 2 = excel etc
+var showall = getQParamInt("showall", 0) == 1;
+
+var authparams = user.checkAutorisation("WEB_ALGMSU");
+
+%>
+<html>
+  <head>
+<%
+FCLTHeader.Generate({outputmode: outputmode});
+%>
+
+<script>
+    function fkd_edit(row)
+    {
+        var srtruimte_key = row.getAttribute("ROWKEY");
+        var url = "appl/alg/alg_srtruimte.asp?alg_srtruimte_key="+srtruimte_key;
+        FcltMgr.openDetail(url, "<%=L("lcl_alg_srtruimte_details")%>", {callback: FcltMgr.reload } );
+    }
+</script>
+  </head>
+
+  <body>
+<%
+
+    var sql = "SELECT sr.alg_srtruimte_key"
+            + "     , sr.alg_srtruimte_omschrijving"
+            + "     , sr.alg_srtruimte_prijs"
+            + "     , sr.alg_srtruimte_prijs2"
+            + "     , sr.alg_srtruimte_prijs3"
+            + "     , sr.alg_srtruimte_prijs4"
+            + "     , sr.alg_srtruimte_prijs5"
+            + "     , sr.alg_srtruimte_code"
+            + "     , CASE  WHEN sr.prs_bevat_werkplek = 1"
+                        + " THEN " + safe.quoted_sql(L("lcl_yes"))
+                        + " ELSE " + safe.quoted_sql(L("lcl_no"))
+                        + " END bevat_werkplek"
+            + "     , CASE  WHEN sr.prs_verhuurbaar = 1"
+                        + " THEN " + safe.quoted_sql(L("lcl_yes"))
+                        + " ELSE " + safe.quoted_sql(L("lcl_no"))
+                        + " END verhuurbaar"
+            + "     , sr.alg_srtruimte_t_uitvoertijd.tijdsduur tijdsduur"
+            + "     , sr.alg_srtruimte_t_uitvoertijd.eenheid   eenheid"
+            + "  FROM alg_srtruimte sr"
+            + " WHERE sr.alg_srtruimte_verwijder IS NULL"
+            + (searchtext
+              ? "  AND sr.alg_srtruimte_upper LIKE " + safe.quoted_sql_wild("%" + searchtext + "%")
+              : ""
+              )
+            + " ORDER BY sr.alg_srtruimte_omschrijving";
+
+    function fnUitvoertijdKolom(oRs)
+    {
+        var tmp = "";
+        if (oRs("tijdsduur").Value)
+          tmp = oRs("tijdsduur").Value + " " + (oRs("eenheid").Value == "U" ? L("lcl_mld_hours") : L("lcl_mld_days"))
+
+        return tmp;
+    }
+
+    buttons = {};
+    //if (canAdd)
+    {
+      var addurl = "appl/alg/alg_srtruimte.asp?mode=edit";
+      buttons = [{ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "', {callback: FcltMgr.reload })" }]
+    }
+
+    var rst = new ResultsetTable({ sql: sql,
+                                   keyColumn: "alg_srtruimte_key",
+                                   ID: "algsrtruimtetable",
+                                   showAll: showall,
+                                   outputmode: outputmode,
+                                   title: L("lcl_menu_alg_ruimtefuncties"),
+                                   buttons: buttons
+                                 });
+
+    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"}));
+    rst.addColumn(new Column({caption: L("lcl_alg_alg_tariefB"),    content: "alg_srtruimte_prijs3", datatype: "currency"}));
+    rst.addColumn(new Column({caption: L("lcl_alg_alg_tariefC"),    content: "alg_srtruimte_prijs4", datatype: "currency"}));
+    rst.addColumn(new Column({caption: L("lcl_alg_alg_tariefD"),    content: "alg_srtruimte_prijs5", datatype: "currency"}));
+    rst.addColumn(new Column({caption: L("lcl_alg_srtruimte_code"), content: "alg_srtruimte_code"}));
+    rst.addColumn(new Column({caption: L("lcl_prs_has_workplace"),  content: "bevat_werkplek"}));
+    rst.addColumn(new Column({caption: L("lcl_prs_rentable"),       content: "verhuurbaar"}));
+    rst.addColumn(new Column({caption: L("lcl_mld_stduitvoertijd"), content: fnUitvoertijdKolom}));
+
+    rst.addAction({ action: "fkd_edit", caption: L("lcl_edit"), isDefault: true});
+
+    var cnt = rst.processResultset();
+
+%>
+  </body>
+</html>

APPL/ALG/alg_terreinsector.asp

@@ -6,15 +6,18 @@
     File:           alg_terreinsector
     Description:    Terreinsector wrapper
 
+    Parameters:
+
+    Context:
+    Note:
+
 */ %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["jQuery", "suggest"],
-                         js: ["jquery-ui.js"],
-                         css: [] // css voor plaatselector in alg_edit_verdieping
-                    })
+FCLTHeader.Requires({plugins:["jQuery", "suggest"], // suggest voor alg_edit_terreinsector.asp
+                     js: []})
 
 var ter_key = getQParamInt("ter_key", -1);
 
@@ -43,7 +46,7 @@ else
   <head>
 <%  FCLTHeader.Generate(); %>
     <script  type="text/javascript" >
-      FcltMgr.setTitle(L("lcl_terra")+" "+"<%=safe.jsstring(ter_naam)%>", {hot: false});
+      FcltMgr.setTitle("<%=L("lcl_terra")%> <%=safe.jsstring(ter_naam)%> ", {hot: false});
 <%    if (ter_key == -1) { %>FcltMgr.startEdit(window);<% } %>
       function algClose(params)
       {
@@ -69,30 +72,15 @@ else
   </head>
 
   <body>
-<%
-  PAGE_START();
-  if (ter_key == -1)
+<%  if (ter_key == -1)
       var page = "alg_edit_terreinsector.asp"; // Maak een nieuw
-  else
+    else
       var page = "alg_show_terreinsector.asp";
-  page += "?ter_key=" + ter_key;
+    page += "?ter_key=" + ter_key;
 
-  IFRAMER("algFrame", page, { title: L("lcl_alg_terreinsector_frame"),
+    IFRAMER("algFrame", page, { title: L("lcl_alg_terreinsector_frame"),
+                                initHeight: "450px",
                                 FcltClose: "algClose" } );
-  if (ter_key > -1)
-  {
-      // tracking naar subframe :-)
-      var autfunction = ["WEB_ALGUSE", "WEB_ALGMAN"];
-      var authparams = user.checkAutorisation(autfunction, true);
-      if (authparams && authparams.ALGreadlevel <= 3 && authparams.PRSreadlevel < 9)
-      {
-        page = protectQS.create("../shared/status_info.asp?ter_key=" + ter_key);
-        IFRAMER("alghistoryframe", page, { icon: "fa-list", title: L("lcl_tracking")} );
-      }
-  }
-
-  PAGE_END();
 %>
   </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,37 +18,11 @@
 <%
 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;
   var key        = oRs("alg_terreinsector_key").Value;
-  var oms        = oRs("alg_terreinsector_naam").Value;
+  var oms        = oRs("alg_terreinsector_omschrijving").Value;
 
   var data = {parent_key: parent_key, key: key, oms: oms};
 
@@ -60,24 +35,16 @@ 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"));
+    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);
-  }
-
-  function terreinEditMulti(rowArray, isMulti)
-  {
-      var flrKeyString = getKeyString(rowArray);
-      var subject = L("lcl_alg_multi_edit");
-      var url = "../alg/alg_edit_terreinsector_multi.asp?ter_keys=" + flrKeyString;
-      FcltMgr.openModalDetail(url, subject, {callback: FcltCallbackRefresh});
+    FcltMgr.openDetail(url, "<%=L("lcl_terra")%>" + ' ' + algData.oms);
   }
 
   function doDelete(rowArray, isMulti)
@@ -100,7 +67,7 @@ function terrein_list(pautfunction, params)
   var addButton = [];
   var authparams = alg.checkAutorisation();
   // Met ALG* bepaal je wat je ziet (Read), met RUI* en TER* bepaal je wat je kunt wijzigen (Write).
-  var canAdd = (authparams.tmALGwritelevel < 4);
+  var canAdd = (authparams.tmALGwritelevel < 9);  //wat moet het zijn voor terriensector
 
   // Voor resulttable de globalen zetten; zou ng anders moeten.
   var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
@@ -112,9 +79,24 @@ 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?
+  {
+      var eDelete = false;
+      if (alg.canWriteLocatie(oRs("alg_locatie_key").Value, authparams.tmALGwritelevel))
+          eDelete = true;
+      return ({eDelete: eDelete})
+  }
+
+  function fnrowFlexParams(oRs)
+  {
+    var ter_key = oRs("alg_terreinsector_key").Value;
+    var this_alg = alg.func_enabled(ter_key, "T");
+
+    var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
+    return flexParams;
+  }
 %>
 
 <html>
@@ -123,154 +105,60 @@ function terrein_list(pautfunction, params)
   </head>
   <body id="listbody">
 <%
-    var flexParams = alg.alg_onroerendgoed_flex_params("T");
-    var sqln = "SELECT g.alg_terreinsector_key"
-             + "     , g.alg_locatie_key"
-             + "     , l.alg_locatie_omschrijving"
-             + "     , 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')
-             + "     , (SELECT MAX(t.fac_tracking_datum)"
-             + "          FROM fac_tracking t"
-             + "             , fac_srtnotificatie sn"
-             + "         WHERE t.fac_srtnotificatie_key = sn.fac_srtnotificatie_key"
-             + "           AND t.fac_tracking_refkey = g.alg_terreinsector_key"
-             + "           AND sn.fac_srtnotificatie_xmlnode = 'terreinsector'"
-             + "       ) recentdatum"
-             +       flexParams.sql
-             + "  FROM alg_v_aanwezigterreinsector g"
-             + "     , alg_locatie l"
-             + "     , alg_srtterreinsector s"
-             + " 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)
-    {
-        addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }]
-    }
-
-    /**********************************
-    * Callback functies ResultsetTable
-     *********************************/
-    var recent = new Date();
-
-    function fnrowActionEnabler(oRs) // klopt dit voor terreinsector?
-    {
-      var eDelete = false;
-      var eEditMulti = false;
-
-      if (alg.canWriteLocatie(oRs("alg_locatie_key").Value, authparams.tmALGwritelevel))
-      {
-        eDelete = true;
-        eEditMulti = true;
-      }
-      return ({eDelete: eDelete, eEditMulti: eEditMulti})
-    }
-
-    function fnrowClass(oRs) // identiek aan de andere niveaus
-    {
-      var lclass = "";
-      // Tracking: hoe lang geleden voor het laatst gewijzigd?
-      if (oRs.Fields("recentdatum").Value != null)
-      {
-        var ltrackdate1 = new Date();
-        var ltrackdate10 = new Date();
-        var ltrackdate100 = new Date();
-        var alg_onrgoed_recent = S("alg_onrgoed_recent");
-        ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
-        ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
-        ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
-
-        var fac_recent = new Date(oRs.Fields("recentdatum").Value);
-        if (fac_recent > ltrackdate1)
+      if (canAdd)
         {
-          lclass += " updated";
+        addButton = [{ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" }]
         }
-        else if (fac_recent > ltrackdate10)
-        {
-          lclass += " updated10";
-        }
-        else if (fac_recent > ltrackdate100)
-        {
-          lclass += " updated100";
-        }
-      }
-      return lclass;
-    }
-
-    function fnrowFlexParams(oRs)
-    {
-      var ter_key = oRs("alg_terreinsector_key").Value;
-      var this_alg = alg.func_enabled(ter_key, "T");
-
-      var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
-      return flexParams;
-    }
-
-    function fncolFlexBijlagen(oRs)
-    {
-      var flexval = oRs("algflex").Value;
-      var alg_key = oRs("alg_terreinsector_key").Value;
-      var result = ( flexval
-                   ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
-                   : ""
-                   );
-      if (flexParams.bijlageflex)
-      {
-        result += alg.alg_onroerendgoed_flex_bijlagen("T", alg_key);
-      }
-      return result;
-    }
 
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "alg_terreinsector_key",
@@ -279,7 +167,6 @@ function terrein_list(pautfunction, params)
                                    showAll: showall,
                                    rowActionEnabler: fnrowActionEnabler,
                                    rowData: fnrowData,
-                                   rowClass: fnrowClass,
                                    outputmode: outputmode,
                                    flexModule: "ALG",
                                    flexId: "alg_terreinsector_key",
@@ -292,21 +179,10 @@ 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"}));
-    rst.addColumn(new Column({caption: L("lcl_estate_terreinsector_man_descr"), content: "alg_terreinsector_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"}));
-    if (flexParams.anyflex)
-      rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
     rst.addAction({ action: "terreinEdit", caption: L("lcl_edit"), isDefault:  true});
-    rst.addAction({ action: "terreinEditMulti", caption: L("lcl_alg_multi_edit"), enabler: "eEditMulti", single:false, multi: true, multiOnce: true});
     rst.addAction({ action: "doDelete", caption: L("lcl_delete"), enabler: "eDelete", single: !noref, multi: true, multiOnce: true});
     if (!noref)
         rst.addAction({ action: "gotoParent", caption: L("lcl_goto_locatie_list")});
@@ -316,3 +192,4 @@ function terrein_list(pautfunction, params)
   </body>
 </html>
 <%}%>
+

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,9 +16,7 @@ FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });
 var locatie_key = getQParamInt("locatie_key", -1); // locatie
 var vak_code = getQParam("vak_code", "");
 var ter_func_key = getQParamInt("ter_func_key", -1);
-var verantw_key  = getQParamInt("verantw",  -1); // Terrein verantwoordelijke
 var autosearch = getQParamInt("autosearch", 0) == 1;
-var alg_startlevel = getQParamInt("alg_startlevel", 2); // Startlevel van plaatsselector, default Locatie
 var authparams = alg.checkAutorisation();
 
 %>
@@ -27,100 +24,75 @@ var authparams = alg.checkAutorisation();
   <head>
 <%  FCLTHeader.Generate(); %>
     <script type="text/javascript">
-
-      function doSubmit()
+    function doSubmit()
       {
           // Submitten met kenmerken
           doSubmitWithKenmerken();
       }
 
-      async function myModal(init)
-      {
+        function myModal()
+        {
           var lvl = "T";
           var key = 0;
           var bld_key = "";
-          var url = "load_kenmerk.asp?disc="
-                                  + "&urole=bo"
-                                  + "&advanced=1"
-                                  + "&hasFilter=1"
-                                  + "&onrgoed_key=" + bld_key
-                                  + "&onrgoed_niveau=" + lvl;
-          var titel = L("lcl_properties");
-          await showKenmerkModal(url, titel, init);
-      }
-
-      $(function()
-      {
-          <% if (autosearch) { %> document.forms.u2.submit();<%}%>
-      });
+          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)
+        }
+        $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit();<%}%>});
     </script>
   </head>
   <body id="searchbody">
-    <form name="u2" target="workFrame" action="alg_terreinsector_search_list.asp" method="get">
+    <div id="search">
+      <form name="u2" target="workFrame" action="alg_terreinsector_search_list.asp" method="get">
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
+          <tr>
+            <td class="searchkolom1">
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+
+<% //               <!-- Locatie, gebouw en verdieping -->
+                    FCLTplaatsselector(authparams.ALGreadlevel, {
+                                                                  locatiekey: locatie_key,
+                                                                  startlevel: 2, // locatie
+                                                                  eindlevel: 2, // locatie
+                                                                  whenEmpty: L("lcl_search_generic")
+                                                                });
+              sql = "SELECT   alg_srtterreinsector_key, "
+                  + lcl.xsqla('alg_srtterreinsec_omschrijving', 'alg_srtterreinsector_key')
+                  + "    FROM alg_v_aanwezigsrtterreinsector "
+                  + "ORDER BY UPPER("+lcl.xsql('alg_srtterreinsec_omschrijving', 'alg_srtterreinsector_key')+")";
+
+              FCLTselector("srt",
+                           sql,
+                           { initKey: ter_func_key,
+                             label: L("lcl_estate_terreinsector_man_sort"),
+                             emptyOption: "",
+                             trclass: "primsearch",
+                             initEmpty: true
+                           });
+                           %>
+                </tr>
+              </table>
+            </td><!-- end column 1 -->
+
+            <td class="searchkolom2">
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+              <!-- Zoektekst -->
+                <tr class="primsearch">
+                  <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>
+              </table>
+            </td><!-- end column 1 -->
+          </tr>
+<%    BLOCK_END(); %>
 <%
-    SEARCH_PAGE_START({ header: L("lcl_filterblok") });
-      SEARCH_BLOCK_START();
-        //               <!-- Locatie, gebouw en verdieping -->
-        FCLTplaatsselector( authparams.ALGreadlevel
-                          , { locatiekey: locatie_key,
-                              startlevel: alg_startlevel, // locatie
-                              eindlevel: 2, // locatie
-                              whenEmpty: L("lcl_search_generic")
-                            });
-        sql = "SELECT   alg_srtterreinsector_key, "
-            + lcl.xsqla('alg_srtterreinsec_omschrijving', 'alg_srtterreinsector_key')
-            + "    FROM alg_v_aanwezigsrtterreinsector "
-            + "ORDER BY UPPER("+lcl.xsql('alg_srtterreinsec_omschrijving', 'alg_srtterreinsector_key')+")";
-
-        FCLTselector("srt",
-                     sql,
-                     { initKey: ter_func_key,
-                       label: L("lcl_estate_terreinsector_man_sort"),
-                       emptyOption: "",
-                       trclass: "primsearch",
-                       initEmpty: true
-                     });
+  var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
+                   {title: L("lcl_obj_advanced"), action: "myModal()", id:"bAdvanced" } ];
+  CreateButtons(buttons, { entersubmit: true });
 %>
-        </tr>
-        <!-- Vervallen terreinen -->
-        <tr class="primsearch">
-          <td></td>
-          <td align=left>
-            <input type="checkbox" class="fld" name="expAlgIncl" id="expAlgIncl" value="1" >
-            <label for="expAlgIncl"><%=L("lcl_alg_terreinsector_vervallen_incl")%></label>
-          </td>
-        </tr>
-<%
-      SEARCH_BLOCK_END();
-      SEARCH_BLOCK_START();
-%>
-        <!-- Zoektekst -->
-        <tr class="primsearch">
-          <td class="label"><label for="descr"><%=L("lcl_estate_terreinsector_man_code")%></label></td>
-          <td><input type="text" class="fld" 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
-                            });
-      SEARCH_BLOCK_END();
-
-      SIMPLE_BLOCK_START();
-        var buttons = [ {title: L("lcl_overview_list"), action: "doSubmit()", id: "bSearch", importance: 1, icon: "fa-clipboard-list" }
-                      , {title: L("lcl_shared_advanced"), action: "myModal()", id:"bAdvanced", importance: 3, icon: "fa-filter" }
-                      ];
-        CreateButtons(buttons, { entersubmit: true, showIcons: true });
-      SIMPLE_BLOCK_END();
-    SEARCH_PAGE_END(); %>
-    </form>
+      </form>
+    </div> <!-- search -->
 
     <div id="result">
       <iframe width="100%" height="100%"
@@ -132,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

@@ -22,7 +22,6 @@ FCLTHeader.Requires({plugins:["jQuery", "suggest"],
                     })
 
 var flr_key = getQParamInt("key", -1);
-var cnt_full = getQParamInt("cnt_full", 1);
 
 if (flr_key > 0)
 {
@@ -51,7 +50,7 @@ else
 <%  FCLTHeader.Generate();
 %>
     <script  type="text/javascript" >
-      FcltMgr.setTitle(L("lcl_floor")+" "+"<%=safe.jsstring(floor_name)%>", {hot: false});
+      FcltMgr.setTitle("<%=L("lcl_floor")%> <%=safe.jsstring(floor_name)%>", {hot: false});
 <%    if (flr_key == -1) { %>FcltMgr.startEdit(window);<% } %>
       function algClose(params)
       {
@@ -70,53 +69,22 @@ else
                 FcltMgr.closeDetail(window, { close: true})
               }
               if (!params.keepForm)
-                $("#algverdframe")[0].src = "alg_show_verdieping.asp?flr_key=<%=flr_key%>";
+                $("#algFrame")[0].src = "alg_show_verdieping.asp?flr_key=<%=flr_key%>";
           <% } %>
       }
     </script>
   </head>
 
   <body>
-<%
-  PAGE_START();
-  if (flr_key == -1)
-    var page="alg_edit_verdieping.asp"; // Maak een nieuw
-  else
-    var page="alg_show_verdieping.asp";
-  page += "?flr_key="+flr_key;
+<%  if (flr_key == -1)
+        var page="alg_edit_verdieping.asp"; // Maak een nieuw
+    else
+        var page="alg_show_verdieping.asp";
+    page += "?flr_key="+flr_key;
 
-  IFRAMER("algverdframe", page, { FcltClose: "algClose" } );
-
-  if (flr_key > -1)
-  {
-    page0 = "../alg/alg_ruimte_search_list.asp?chkgeb=1&verdiepingkey="+flr_key;
-    IFRAMER("algruimteframe", page0, { icon: "fa-list" } );
-
-    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)
-    {
-      // vind dit dubieus maar ga het nu niet uitzoeken: we geven statusflags mee, cnt_search_list heeft zelf defaults en cnt_full overruled
-      // dat. Die statusparameters kunnen vast weggemanaged worden, maar met cnt_full=0 hebben ze wel (gewenst) effect.
-      var page2="../cnt/cnt_search_list.asp?tiny=1&urole=" + curole + "&ffutu=1&fact=1&frap=1&fopz=1&sact=1&flr_key="+ flr_key;
-      page2 += "&cnt_full="+cnt_full;
-      IFRAMER("cntlistframe", page2, { icon: "fa-list" } );
-    }
-    // tracking naar subframe :-)
-    var autfunction = ["WEB_ALGUSE", "WEB_ALGMAN"];
-    var authparams = user.checkAutorisation(autfunction, true);
-    if (authparams && authparams.ALGreadlevel <= 4 && authparams.PRSreadlevel < 9)
-    {
-      page3 = protectQS.create("../shared/status_info.asp?flr_key=" + flr_key);
-      IFRAMER("alghistoryframe", page3, { icon: "fa-list", title: L("lcl_tracking")} );
-    }
-  }
-
-  PAGE_END();
+    IFRAMER("algFrame", page, { title: L("lcl_alg_verdieping_frame"),
+                                initHeight: "450px",
+                                FcltClose: "algClose" } );
 %>
   </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" -->
@@ -16,8 +17,17 @@
 <%
 FCLTHeader.Requires({ plugins:["jQuery"] });
 
-var cnt_full = getQParamInt("cnt_full", 1);
+function fnrowData(oRs)
+{
+  var parent_key = oRs("alg_gebouw_key").value;
+  var detail_key = oRs("alg_verdieping_key").value;
+  var key        = oRs("alg_verdieping_key").value;
+  var oms        = oRs("alg_verdieping_omschrijving").value
 
+  var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
+
+  return JSON.stringify(data);
+}
 %>
 
 <script type="text/javascript">
@@ -25,29 +35,21 @@ var cnt_full = getQParamInt("cnt_full", 1);
 
   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"));
+    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"));
+    FcltMgr.openDetail(url, "<%=L("lcl_building")%>");
   }
     function verdiepingEdit(row)
   {
-    var algData = JSON.parse(row.getAttribute("ROWDATA"));
-    var url = "appl/ALG/alg_verdieping.asp?mode=viewUpdate&key=" + algData.key + "&cnt_full=<%=cnt_full%>";
-    FcltMgr.openDetail(url, L("lcl_floor") +" "+ algData.oms);
-  }
-
-  function verdiepingEditMulti(rowArray, isMulti)
-  {
-      var flrKeyString = getKeyString(rowArray);
-      var subject = L("lcl_alg_multi_edit");
-      var url = "../alg/alg_edit_verdieping_multi.asp?flr_keys=" + flrKeyString;
-      FcltMgr.openModalDetail(url, subject, {callback: FcltCallbackRefresh});
+    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);
   }
 
   function doDelete(rowArray, isMulti)
@@ -78,12 +80,29 @@ function verdiepingen_list(pautfunction, params)
 
   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 lvl_key_arr = params.lvl_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 chkgeb = params.chkgeb;
+
+  function fnrowActionEnabler(oRs)
+  {
+    var eDelete = false;
+    if (alg.canWriteVerdieping(oRs("alg_verdieping_key").value, authparams.mALGwritelevel))
+        eDelete = true;
+    return ({eDelete: eDelete})
+  }
+
+  function fnrowFlexParams(oRs)
+  {
+    var ver_key = oRs("alg_verdieping_key").Value;
+    var this_alg = alg.func_enabled(ver_key, "V");
+
+    var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
+    return flexParams;
+  }
 %>
 
   <html>
@@ -92,23 +111,13 @@ function verdiepingen_list(pautfunction, params)
     </head>
     <body id="listbody">
 <%
-  var flexParams = alg.alg_onroerendgoed_flex_params("V");
   var sqln = "SELECT v.alg_verdieping_key, "
        + "       v.alg_gebouw_key, "
        + "       g.alg_locatie_key, "
        + "       l.alg_locatie_omschrijving, "
-       + "       g.alg_gebouw_code, "
-       + "       g.alg_gebouw_naam, "
+       + "       g.alg_gebouw_omschrijving, "
        + "       v.alg_verdieping_omschrijving, "
        + "       v.alg_verdieping_code  "
-       + "     , (SELECT MAX(t.fac_tracking_datum)"
-       + "          FROM fac_tracking t"
-       + "             , fac_srtnotificatie sn"
-       + "         WHERE t.fac_srtnotificatie_key = sn.fac_srtnotificatie_key"
-       + "           AND t.fac_tracking_refkey = v.alg_verdieping_key"
-       + "           AND sn.fac_srtnotificatie_xmlnode = 'verdieping'"
-       + "       ) recentdatum"
-       +       flexParams.sql
        + "  FROM alg_v_aanwezigverdieping v, "
        + "       alg_gebouw g, "
        + "       alg_locatie l  "
@@ -126,24 +135,24 @@ function verdiepingen_list(pautfunction, params)
 
    sqln += getKenmerkSql("ALG", "v.alg_verdieping_key");
 
-   if (lvl_key_arr.length)
+   if (lvl_key)
       {
-      sqln += " AND v.alg_verdieping_key IN (" + lvl_key_arr.join(",") + ")";
+      sqln += " AND v.alg_verdieping_key = " + lvl_key;
       }
 
-   else if (bld_key_arr.length)
+   else if (bld_key)
       {
-      sqln += " AND g.alg_gebouw_key IN (" + bld_key_arr.join(",") + ")";
+      sqln += " AND g.alg_gebouw_key = " + bld_key;
       }
 
-   else if (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.length)
-      sqln += " AND l.alg_district_key IN (" + dis_key_arr.join(",") + ")";
-    else if (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 (!chkgeb)
       sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";
@@ -153,97 +162,13 @@ function verdiepingen_list(pautfunction, params)
           +  "          v.alg_verdieping_volgnr ASC ";
 
     var addurl = "appl/alg/alg_verdieping.asp";
-//    addurl += buildTransitParam(["loc_key_arr", "bld_key_arr", "flo_key", "room_key"], params)  // TODO: welke allemaal?
+//    addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
 
       if (canAdd)
         {
-        addButton = [{ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + safe.jsstring(L("lcl_add")) + "')" }]
+        addButton = [{ icon: "plus.png", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" }]
         }
 
-    /**********************************
-    * Callback functies ResultsetTable
-     *********************************/
-    var recent = new Date();
-
-    function fnrowData(oRs)
-    {
-      var parent_key = oRs("alg_gebouw_key").value;
-      var detail_key = oRs("alg_verdieping_key").value;
-      var key        = oRs("alg_verdieping_key").value;
-      var oms        = oRs("alg_verdieping_omschrijving").value
-
-      var data = {parent_key: parent_key, detail_key: detail_key, key: key, oms: oms};
-
-      return JSON.stringify(data);
-    }
-
-    function fnrowClass(oRs) // identiek aan de andere niveaus
-    {
-      var lclass = "";
-      // Tracking: hoe lang geleden voor het laatst gewijzigd?
-      if (oRs.Fields("recentdatum").Value != null)
-      {
-        var ltrackdate1 = new Date();
-        var ltrackdate10 = new Date();
-        var ltrackdate100 = new Date();
-        var alg_onrgoed_recent = S("alg_onrgoed_recent");
-        ltrackdate1.setMinutes(recent.getMinutes() - alg_onrgoed_recent);
-        ltrackdate10.setMinutes(recent.getMinutes() - alg_onrgoed_recent * 12);
-        ltrackdate100.setMinutes(recent.getMinutes() - alg_onrgoed_recent*12*2);
-
-        var fac_recent = new Date(oRs.Fields("recentdatum").Value);
-        if (fac_recent > ltrackdate1)
-        {
-          lclass += " updated";
-        }
-        else if (fac_recent > ltrackdate10)
-        {
-          lclass += " updated10";
-        }
-        else if (fac_recent > ltrackdate100)
-        {
-          lclass += " updated100";
-        }
-      }
-      return lclass;
-    }
-
-    function fnrowActionEnabler(oRs)
-    {
-      var eDelete = false;
-      var eEditMulti = false;
-      if (alg.canWriteVerdieping(oRs("alg_verdieping_key").value, authparams.mALGwritelevel))
-      {
-          eDelete = true;
-          eEditMulti = true;
-      }
-      return ({eDelete: eDelete, eEditMulti: eEditMulti})
-    }
-
-    function fnrowFlexParams(oRs)
-    {
-      var ver_key = oRs("alg_verdieping_key").Value;
-      var this_alg = alg.func_enabled(ver_key, "V");
-
-      var flexParams = { readman: this_alg.readman, readuse: this_alg.readuse};
-      return flexParams;
-    }
-
-    function fncolFlexBijlagen(oRs)
-    {
-      var flexval = oRs("algflex").Value;
-      var alg_key = oRs("alg_verdieping_key").Value;
-      var result = ( flexval
-                   ? safe.html(flexval.replace(/\r/g, "\n")+ "\n")
-                   : ""
-                   );
-      if (flexParams.bijlageflex)
-      {
-        result += alg.alg_onroerendgoed_flex_bijlagen("V", alg_key);
-      }
-      return result;
-    }
-
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "alg_verdieping_key",
                                    ID: "algtable",
@@ -255,21 +180,16 @@ function verdiepingen_list(pautfunction, params)
                                    flexParams: fnrowFlexParams,
                                    filterParams: params,
                                    rowData: fnrowData,
-                                   rowClass: fnrowClass,
                                    rowActionEnabler: fnrowActionEnabler,
                                    buttons: addButton
                                   });
 
     rst.addColumn(new Column({caption: L("lcl_estate_locatie_man_descr"), content: "alg_locatie_omschrijving"}));
-    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_man_descr"), content: "alg_gebouw_omschrijving"}));
     rst.addColumn(new Column({caption: L("lcl_estate_verdieping_man_code"), content: "alg_verdieping_code"}));
     rst.addColumn(new Column({caption: L("lcl_estate_verdieping_man_descr"), content: "alg_verdieping_omschrijving" }));
-    if (flexParams.anyflex)
-      rst.addColumn(new Column({caption: flexParams.flexlabel, content: fncolFlexBijlagen, colName: "fncolFlexBijlagen"}));
 
     rst.addAction({ action: "verdiepingEdit", caption: L("lcl_edit"), isDefault:  true});
-    rst.addAction({ action: "verdiepingEditMulti", caption: L("lcl_alg_multi_edit"), enabler: "eEditMulti", single:false, multi: true, multiOnce: true});
     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_ruimte_list")});
@@ -280,3 +200,4 @@ function verdiepingen_list(pautfunction, params)
     </body>
   </html>
 <%}%>
+

APPL/ALG/alg_verdieping_search.asp

@@ -17,72 +17,63 @@ var locatie_key = getQParamInt("locatie_key", -1); // Locatie
 var gebouw_key = getQParamInt("gebouw_key", -1); // Gebouw
 var verdieping_key = getQParamInt("verdieping_key", -1); // Verdieping
 var autosearch = getQParamInt("autosearch", 0) == 1;
-var alg_startlevel = getQParamInt("alg_startlevel", 2); // Startlevel van plaatsselector, default Locatie
 var chkgeb = getQParamInt("chkgeb", 0) == 1;
-var cnt_full = getQParamInt("cnt_full", 1);
 var authparams = alg.checkAutorisation();
 %>
 
 <html>
   <head>
 <%  FCLTHeader.Generate(); %>
-    <script type="text/javascript">
-
+    <script>
       function doSubmit()
       {
           // Submitten met kenmerken
           doSubmitWithKenmerken();
       }
 
-      async function myModal(init)
+      function myModal()
       {
         var lvl = "V";
         var key = 0;
         var bld_key = "";
-        var url = "load_kenmerk.asp?disc="
-                                + "&urole=bo"
-                                + "&advanced=1"
-                                + "&hasFilter=1"
-                                + "&onrgoed_key=" + bld_key
-                                + "&onrgoed_niveau=" + lvl;
-        var titel = L("lcl_properties");
-        await showKenmerkModal(url, titel, init)
+        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)
       }
 
-      $(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
-
+      $(document).ready(function() {<% if (autosearch) { %> document.forms.u2.submit(); <%}%> });
     </script>
   </head>
 
   <body id="searchbody">
-    <form name="u2" target="workFrame" action="alg_verdieping_search_list.asp" method="get">
-<%    SEARCH_PAGE_START({ header: L("lcl_filterblok") });
-      SEARCH_BLOCK_START();
-%>
-        <input type="hidden" id="cnt_full" name="cnt_full" value="<%=cnt_full%>">
+    <div id="search">
+      <form name="u2" target="workFrame" action="alg_verdieping_search_list.asp" method="get">
         <input type="hidden" id="chkgeb" name="chkgeb" value="<%=(chkgeb?1:0)%>">
-<%
-      FCLTplaatsselector(authparams.ALGreadlevel, {
-            locatiekey: locatie_key,
-            gebouwkey: gebouw_key,
-            verdiepingkey: verdieping_key,
-            multitoggle: 4,
-            startlevel: alg_startlevel, // locatie
-            eindlevel: 4, // verdieping
-            whenEmpty: L("lcl_search_generic")  // want filter
-          });
-
-      SEARCH_BLOCK_END();
-
-      SIMPLE_BLOCK_START();
-          var buttons = [ {title: L("lcl_overview_list"), action: "doSubmit();", id: "bSearch", importance: 1, icon: "fa-clipboard-list" }
-                        , {title: L("lcl_shared_advanced"), action: "myModal()", id: "bAdvanced", importance: 3, icon: "fa-filter" }
-                        ];
-          CreateButtons(buttons, { entersubmit: true , showIcons: true});
-      SIMPLE_BLOCK_END();
-      SEARCH_PAGE_END();
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
+          <td valign=top>
+            <table>
+<% //              <!-- Locatie, gebouw en verdieping -->
+              FCLTplaatsselector(authparams.ALGreadlevel, {
+                                                            locatiekey: locatie_key,
+                                                            gebouwkey: gebouw_key,
+                                                            verdiepingkey: verdieping_key,
+                                                            startlevel: 2, // locatie
+                                                            eindlevel: 4, // verdieping
+                                                            whenEmpty: L("lcl_search_generic")  // want filter
+                                                          });
 %>
-    </form>
+            </table>
+          </td>
+        </tr>
+        </table>
+<%    BLOCK_END();
+
+  var buttons =  [ {title: L("lcl_search"), action: "doSubmit();", id: "bSearch" },
+                   {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];
+  CreateButtons(buttons, { entersubmit: true });
+%>
+      </form>
+    </div> <!-- search -->
 
     <div id="result">
       <iframe width="100%" height="100%"
@@ -92,7 +83,5 @@ var authparams = alg.checkAutorisation();
               frameborder="0" scrolling="no">
       </iframe>
     </div>
-
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_verdieping_search_list.asp

@@ -22,27 +22,24 @@
 var outputmode = getQParamInt("outputmode", 0) //  0 = screen, 1 = print, 2 = excel etc
 var showall = getQParamInt("showall", 0) == 1;
 var noref = getQParamInt("noref", -1); // (voor onderdrukken horizontale verwijzingen)
-var reg_key_arr = getQParamKeyArray("regiokey", []); // Regio
-var dis_key_arr = getQParamKeyArray("districtkey", []); // District
-var loc_key_arr = getQParamKeyArray("locatiekey", []); // Locatie
-var bld_key_arr = getQParamKeyArray("gebouwkey", []); // Gebouw
-var lvl_key_arr = getQParamKeyArray("verdiepingkey", []); // Verdieping
+var reg_key = getQParamInt("regiokey", -1); // Regio
+var dis_key = getQParamInt("districtkey", -1); // District
+var loc_key = getQParamInt("locatiekey", -1); // Locatie
+var bld_key = getQParamInt("gebouwkey", -1); // Gebouw
+var lvl_key = getQParamInt("verdiepingkey", -1); // Verdieping
 var chkgeb  = getQParamInt("chkgeb", 0) == 1; //Controleer tegen de vervallenstatus van het gebouw (vertrouw geb_key niet)
-var cnt_full = getQParamInt("cnt_full", 1);
 
 
 verdiepingen_list ( "*",
               {  outputmode: outputmode,
                  showall: showall,
-                 cnt_full: cnt_full,
-                 reg_key_arr: reg_key_arr,
-                 dis_key_arr: dis_key_arr,
-                 loc_key_arr: loc_key_arr,
-                 bld_key_arr: bld_key_arr,
-                 lvl_key_arr: lvl_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),
                  noref: (noref != -1? noref : null),
                  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,25 +37,25 @@ 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"));
+    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
     {
         var url = "../prs/prs_edit_perslidwerkplek.asp?wp_key=" + algData.key;
-        FcltMgr.openModalDetail(url, L("lcl_change"), {callback: refreshall });
+        FcltMgr.openModalDetail(url, "<%=L("lcl_change")%>", {callback: refreshall });
     }
     else
 <% } %>
     {
         var url = "appl/ALG/alg_wp.asp?mode=viewUpdate&key="+algData.key;
-        FcltMgr.openDetail(url, L("lcl_workspace") + " " + algData.oms);
+        FcltMgr.openDetail(url, "<%=L("lcl_workspace")%>" + ' ' + algData.oms);
     }
   }
 
@@ -79,13 +80,13 @@ FCLTHeader.Requires({ plugins:["jQuery"],
     function doAddWP(room_key) // als impliciet==0
     {
         addurl = "appl/alg/alg_wp.asp?room_key=" + room_key;
-        FcltMgr.openDetail(addurl, L("lcl_add"));
+        FcltMgr.openDetail(addurl, "<%=L("lcl_add")%>");
     }
 
     function doAddWPBezeting(room_key) // als impliciet==1
     {
         var addurl = "../prs/prs_edit_perslidwerkplek.asp?room_key=" + room_key;
-        FcltMgr.openModalDetail(addurl, L("lcl_add"), {callback: refreshall });
+        FcltMgr.openModalDetail(addurl, "<%=L("lcl_add")%>", {callback: refreshall });
     }
 
 </script>
@@ -96,31 +97,19 @@ function werkplek_list(pautfunction, params)
   // De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
   var buttons = [];
   var authparams = alg.checkAutorisation();
+  var canAdd = (authparams.rmALGwritelevel < 6); // TODO: fijner, ik denk 3. Ik moet voor deze locatie, dit district of deze regio schrijfrechten hebben
 
   // 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 loc_key_arr = params.loc_key_arr;
-  var bld_key_arr = params.bld_key_arr;
-  var lvl_key_arr = params.lvl_key_arr;
+  var loc_key = params.loc_key;
+  var bld_key = params.bld_key;
+  var lvl_key = params.lvl_key;
   var room_key = params.room_key;
   var wp_descr = params.wp_descr;
   var tiny = params.tiny;
 
-  var deleted_room = false;
-  if (room_key > 0)
-  {
-    var sql = "SELECT alg_ruimte_verwijder"
-            + "  FROM alg_ruimte"
-            + " WHERE alg_ruimte_key = " + room_key;
-    var oRs = Oracle.Execute(sql);
-    deleted_room = oRs("alg_ruimte_verwijder").Value != null;
-    oRs.Close();
-  }
-
-  var canAdd = (authparams.rmALGwritelevel < 6) && !deleted_room; // TODO: fijner, ik denk 3. Ik moet voor deze locatie, dit district of deze regio schrijfrechten hebben
-
   function fnrowActionEnabler(oRs)
     {
         var eDelete = false;
@@ -148,6 +137,7 @@ function werkplek_list(pautfunction, params)
        + "         || p.alg_verdieping_code "
        + "         || '-' "
        + "         || p.alg_ruimte_nr samengesteld, "
+       + "         p.alg_gebouw_omschrijving, "
        + "         p.alg_verdieping_omschrijving, "
        + "         p.alg_verdieping_code, "
        + "         p.alg_ruimte_nr, "
@@ -183,19 +173,19 @@ function werkplek_list(pautfunction, params)
       sqln += " AND p.alg_ruimte_key = " + room_key;
       }
 
-   else if (lvl_key_arr && lvl_key_arr.length > 0)
+   else if (lvl_key)
       {
-      sqln += " AND p.alg_verdieping_key IN (" + lvl_key_arr.join(",") + ")";
+      sqln += " AND p.alg_verdieping_key = " + lvl_key;
       }
 
-   else if (bld_key_arr && bld_key_arr.length > 0)
+   else if (bld_key)
       {
-      sqln += " AND p.alg_gebouw_key IN (" + bld_key_arr.join(",") + ")";
+      sqln += " AND p.alg_gebouw_key = " + bld_key;
       }
 
-   else if (loc_key_arr && loc_key_arr.length > 0)
+   else if (loc_key)
       {
-      sqln += " AND p.alg_locatie_key IN (" + loc_key_arr.join(",") + ")";
+      sqln += " AND p.alg_locatie_key = " + loc_key;
       }
 
   if (wp_descr)
@@ -212,33 +202,33 @@ function werkplek_list(pautfunction, params)
 
 
     //
-//    addurl += buildTransitParam(["loc_key_arr", "bld_key_arr", "lvl_key_arr", "room_key"], params)  // TODO: welke allemaal?
+//    addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
 
-    if (canAdd)
-    {
-      buttons.push({ icon: "fa-fclt-refresh", title: L("lcl_refresh"), action: "FcltMgr.reload()" });
-      if (S("prs_werkplek_implicit") == 1)
-      {
-        buttons.push({ icon: "fa-plus", title: L("lcl_add")+  " " + L("lcl_occupation"), action:  "doAddWPBezeting("+room_key+")"});
-        buttons.push({ icon: "fa-plus", title: L("lcl_add") + " " + L("lcl_prs_workplace"), action:  "doAddWP("+room_key+")"});
-      }
-      else // Altijd werkplek knop
-        buttons.push({ icon: "fa-plus", title: L("lcl_add"), action:  "doAddWP("+room_key+")"});
-    }
+      if (canAdd)
+        {
+          buttons.push({ icon: "page_refresh.png", title: L("lcl_refresh"), action: "FcltMgr.reload()" });
+          if (S("prs_werkplek_implicit") == 1)
+          {
+            buttons.push({ icon: "plus.png", title: L("lcl_add")+  " " + L("lcl_occupation"), action:  "doAddWPBezeting("+room_key+")"});
+            buttons.push({ icon: "plus.png", title: L("lcl_add") + " " + L("lcl_prs_workplace"), action:  "doAddWP("+room_key+")"});
+          }
+          else // Altijd werkplek knop
+            buttons.push({ icon: "plus.png", title: L("lcl_add"), action:  "doAddWP("+room_key+")"});
+        }
 
     function fnWPType(oRs)
     {
         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 "";
         };
     }
@@ -258,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

@@ -27,7 +27,6 @@ var verdieping_key = getQParamInt("verdieping_key", -1); // Verdieping
 var ruimte_key = getQParamInt("ruimte_key", -1); // ruimte
 var descr = getQParam("werkplek", "");
 var autosearch = getQParamInt("autosearch", 0) == 1;
-var alg_startlevel = getQParamInt("alg_startlevel", 2); // Startlevel van plaatsselector, default Locatie
 var authparams = alg.checkAutorisation();
 
 %>
@@ -35,36 +34,49 @@ 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">
-    <form name="u2" target="workFrame" action="alg_werkplek_search_list.asp" method="get">
-      <% SEARCH_PAGE_START({ header: L("lcl_filterblok") });
-      SEARCH_BLOCK_START();
-        FCLTplaatsselector(authparams.ALGreadlevel, {
+    <div id="search">
+      <form name="u2" target="workFrame" action="alg_werkplek_search_list.asp" method="get">
+<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
+          <tr>
+            <td class="searchkolom1">
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+              <!-- Locatie, gebouw en verdieping -->
+<%
+                    FCLTplaatsselector(authparams.ALGreadlevel, {
                                                                   locatiekey: locatie_key,
                                                                   gebouwkey: gebouw_key,
                                                                   ruimtekey: ruimte_key,
-                                                                  multitoggle: 4,
-                                                                  startlevel: alg_startlevel, // locatie
+                                                                  startlevel: 2, // locatie
                                                                   eindlevel: 5, // ruimte
                                                                   whenEmpty: L("lcl_search_generic")  // want filter
                                                                 });
-        SEARCH_BLOCK_END();
-        SEARCH_BLOCK_START();%>
-          <tr class="primsearch">
-            <td class="label"><label for="nr"><%=L("lcl_workplace")%></label></td>
-            <td><input type="text" class="fld" name="descr" value="<%=safe.htmlattr(descr)%>"></td>
+%>
+
+              </table>
+            </td><!-- end column 1 -->
+
+            <td class="searchkolom2">
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+              <!-- Zoektekst -->
+                <tr class="primsearch">
+                  <td class="label"><label for="nr"><%=L("lcl_workplace")%>:</label></td>
+                  <td><input type="text" class="fldsrch" name="descr" value="<%=safe.htmlattr(descr)%>"></td>
+                </tr>
+              </table>
+            </td><!-- end column 1 -->
           </tr>
-        <% SEARCH_BLOCK_END();
-          var buttons =  [ {title: L("lcl_overview_list"), action: "document.forms.u2.submit();", id: "bSearch", icon: "fa-clipboard-list" } ];
-        SIMPLE_BLOCK_START();
-          CreateButtons(buttons, { entersubmit: true, showIcons: true });
-        SIMPLE_BLOCK_END();
-        %>
-      <% SEARCH_PAGE_END(); %>
-    </form>
+<%    BLOCK_END();
+
+  var buttons =  [ {title: L("lcl_search"), action: "document.forms.u2.submit();", id: "bSearch" } ];
+  CreateButtons(buttons, { entersubmit: true });
+%>
+      </form>
+    </div> <!-- search -->
+
     <div id="result">
       <iframe width="100%" height="100%"
               src="../Shared/empty.asp"
@@ -75,4 +87,3 @@ var authparams = alg.checkAutorisation();
     </div>
   </body>
 </html>
-<% ASPPAGE_END(); %>

APPL/ALG/alg_werkplek_search_list.asp

@@ -3,10 +3,10 @@
      $Revision$
      $Id$
 
-    File:
-    Description:
-    Parameters:
-    Context:
+    File:        
+    Description: 
+    Parameters:  
+    Context:     
     Note:
 */ %>
 
@@ -22,9 +22,9 @@
 
 var outputmode = getQParamInt("outputmode", 0); //  0 = screen, 1 = print, 2 = excel etc
 var showall = getQParamInt("showall", 0) == 1;
-var loc_key_arr = getQParamKeyArray("locatiekey", []); // Locatie
-var bld_key_arr = getQParamKeyArray("gebouwkey", []); // Gebouw
-var lvl_key_arr = getQParamKeyArray("verdiepingkey", []); // Verdieping
+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 wp_descr = getQParam("descr", null);
 var tiny = getQParamInt("tiny", 0) == 1;
@@ -32,12 +32,12 @@ var tiny = getQParamInt("tiny", 0) == 1;
 werkplek_list ( "*",
               {  outputmode: outputmode,
                  showall: showall,
-                 loc_key_arr: loc_key_arr,
-                 bld_key_arr: bld_key_arr,
-                 lvl_key_arr: lvl_key_arr,
+                 loc_key: (loc_key != -1? loc_key : null),
+                 bld_key: (bld_key != -1? bld_key : null),
+                 lvl_key: (lvl_key != -1? lvl_key : null),
                  room_key: (room_key != -1? room_key : -1),
                  tiny: tiny,
                  wp_descr: (wp_descr != ""? wp_descr : null)
               }
              );
-%><% ASPPAGE_END(); %>
+%>

APPL/ALG/alg_wp.asp

@@ -39,7 +39,7 @@ if (wp_key > 0)
 <%  FCLTHeader.Generate();
 %>
     <script  type="text/javascript" >
-      FcltMgr.setTitle(L("lcl_workplace")+" "+"<%=safe.jsstring(wp_naam)%>", {hot: false});
+      FcltMgr.setTitle("<%=L("lcl_workplace")+' '+safe.jsstring(wp_naam)%>", {hot: false});
 <%    if (wp_key == -1) { %>FcltMgr.startEdit(window);<% } %>
       function algClose(params)
       {
@@ -58,41 +58,30 @@ if (wp_key > 0)
                 FcltMgr.closeDetail(window, { close: true})
               }
               if (!params.keepForm && !params.deleted)
-                  $("#algframe")[0].src = "alg_show_wp.asp?wp_key=<%=wp_key%>";
+                  $("#algFrame")[0].src = "alg_show_wp.asp?wp_key=<%=wp_key%>";
           <% } %>
       }
     </script>
   </head>
 
   <body>
-  <% PAGE_START(); %>
 <%  if (wp_key == -1)
         var page="alg_edit_wp.asp"; // Maak een nieuw
     else
         var page="alg_show_wp.asp";
     page += "?wp_key="+wp_key+"&room_key="+room_key;
 
-    IFRAMER("algframe", page, { title: L("lcl_alg_wp_frame"),
+    IFRAMER("algFrame", page, { title: L("lcl_alg_wp_frame"),
+                                initHeight: "450px",
                                 FcltClose: "algClose" } );
     if (wp_key > -1)
     {
       var page2 ="../prs/prs_perslidwerkplek_search_list.asp?embedded=1&wp_key=" + wp_key;
-      IFRAMER("perslistframe", page2, { icon: "fa-list" } );
+      IFRAMER("algFrame", page2, { initHeight: "450px" } );
 
       var page3 ="../ins/ins_search_list.asp?urole=bo&tiny=1&werkplekkey=" + wp_key;
-      IFRAMER("deellistframe", page3, {  icon: "fa-list" } );
-
-      // tracking naar subframe :-)
-      var autfunction = ["WEB_ALGUSE", "WEB_ALGMAN"];
-      var authparams = user.checkAutorisation(autfunction, true);
-      if (authparams && authparams.ALGreadlevel <= 6 && authparams.PRSreadlevel < 9)
-      {
-        page = protectQS.create("../shared/status_info.asp?wp_key=" + wp_key);
-        IFRAMER("alghistoryframe", page, { icon: "fa-list", title: L("lcl_tracking")} );
-      }
+      IFRAMER("algFrame", page3, { initHeight: "450px" } );
     }
 %>
-<% PAGE_END(); %>
   </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" -->
 
 <%
@@ -38,27 +39,7 @@ switch (req_info)
         result = alg.alg_terreinsectorinfo(alg_terreinsector_key);
         break;
     }
-    case "locatie_gebouwen":
-    {
-        var alg_locatie_key = getQParamInt("alg_locatie_key", -1);
-        var result = [];
-        var sql = "SELECT g.alg_gebouw_key"
-                + ", "  + S("alg_geb_string") + " gebouw_naam"
-                + "  FROM alg_gebouw g"
-                + " WHERE g.alg_locatie_key = " + alg_locatie_key
-                + "   AND g.alg_gebouw_verwijder IS NULL"
-                + "   AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE))";
-        var oRs = Oracle.Execute(sql);
-        while (!oRs.eof)
-        {
-            result.push( {key: oRs("alg_gebouw_key").Value, name: oRs("gebouw_naam").Value});
-            oRs.MoveNext();
-        }
-        oRs.Close();
-        break;
-    }
 }
 
 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

@@ -9,6 +9,7 @@
                          onrgoed_key          Onroerendgoed key
                          onrgoed_niveau       Onroerendgoed niveau
                          reado                Readonly
+                         flexcolumns          aantal kolommen voor flexkenmerken
                          advanced             Geadvanceerd
      Context:            alg_xxx_search.asp en cnt_edit.asp: Clientside wordt de gegenereerde html code m.b.v. $('div#xxx').load binnen een div geplaatst.
                          De functie is gedefinieerd in alg_flexkenmerk.inc
@@ -29,9 +30,8 @@ generateFlexKenmerkBlock ({ urole: getQParamSafe("urole"),
                            onrgoed_key: getQParamInt("onrgoed_key", -1), // Onroerendgoed key
                            onrgoed_niveau: getQParam("onrgoed_niveau", ""), // Onroerendgoed niveau
                            reado: getQParam("reado", 0) == 1, // Readonly
+                           flexcolumns   : getQParamInt("advanced", 0) == 1?1:S("alg_flexcolumns"),
                            this_alg : alg.func_enabled(-1, getQParam("onrgoed_niveau", "")),
-                           advanced: getQParam("advanced", 0) == 1, // Geavanceerd
-                           hasfilter: getQParamInt("hasFilter", 0) == 1 // kenmerken filteren op naam
+                           advanced: getQParam("advanced", 0) == 1 // Geavanceerd
                          });
 %>
-<% ASPPAGE_END(); %>

APPL/API/.gitignore

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

APPL/API/Exchange/default.asp

@@ -1,148 +0,0 @@
-<%@ language = "JavaScript" %>
-<% /*
-     $Revision$
-     $Id$
-
-     File:          default.asp
-     Description:   Test-pagina om in Exchange te kunnen kijken
-
-     Parameters:
-     Status:
-     Context:
-     Notes:
-*/
-    THIS_FILE = "../api/default.asp";
-%>
-<!-- #include file="../../Shared/common.inc" -->
-<!-- #include file="../../Shared/iface.inc" -->
-<!-- #include file="../../Shared/calendar.inc" -->
-<%
-
-FCLTHeader.Requires({
-    plugins: ["jQuery"]
-});
-
-user.checkAutorisation("WEB_FACTAB");
-%>
-
-<html>
-  <head>
-<%  FCLTHeader.Generate(); %>
-    <style>
-        html, body {
-            height: 100%;
-            margin: 0;
-            padding: 0;
-        }
-        body, #result {
-            display: grid;
-            grid-template-rows: auto 1fr;
-            font-size: 13px;
-        }
-
-        .captions, .content {
-            display: flex;
-            flex-wrap: wrap;
-        }
-
-        .attention-bar {
-            flex-basis: 100%;
-            font-size: 1.25em;
-            font-weight: bold;
-            text-align: center;
-        }
-        .inform {
-            background-color: orange;
-            color: white;
-        }
-
-        .captions > span {
-            height: 2em;
-            flex-basis: 50%;
-            text-align: center;
-        }
-        textarea {
-            overflow: auto;
-            white-space: pre;
-            padding: .5em;
-            flex-basis: 50%;
-        }
-
-    </style>
-    <script>
-        function doSubmit() {
-            $.post(
-                "get_exchange_info.asp",
-                $("[name=exchange]").serialize(),
-                FcltCallbackAndThenAlways(exc_submit_callback),
-                "json"
-            );
-        }
-
-        function exc_submit_callback(json) {
-            $(".host, .room").val("");
-            $(".attention-bar").remove();
-            if (json.success) {
-                if (json.info?.length) { // Als json.success === false, dan wordt de json.info al in een popup weergegeven
-                    for (var i = 0; i < json.info.length; i++) {
-                        $(".captions > .host").before("<div class='attention-bar inform'>" + I("fa-circle-info fa-lg") + " " + safe.html(json.info) + "</div>");
-                    }
-                }
-                $(".host").val(json.host ? JSON.stringify(json.host, null, 4) : "N/A");
-                $(".room").val(json.room ? JSON.stringify(json.room, null, 4) : "N/A");
-            }
-        }
-    </script>
-  </head>
-  <body id="searchbody">
-    <form name="exchange" onsubmit="doSubmit(); return false;">
-<%  SEARCH_PAGE_START({ header: L("lcl_filterblok") });
-
-        SEARCH_BLOCK_START();
-
-            RWFIELDTR("reservering", null, L("lcl_res_number"));
-            RWCHECKBOXTR("compact", null, "Compact", true);
-
-        SEARCH_BLOCK_END();
-
-        SEARCH_BLOCK_START();
-
-            RWFIELDTR("userPrincipalName", null, "Eigenaar van de Exchange agenda", null, { "placeholder": "prs_perslid_email of res_ruimte_extern_id" });
-
-            FCLTcalendar("date_from", {
-                label: L("lcl_period_from"),
-                initEmpty: true,
-                volgnr: 1
-            });
-
-            FCLTcalendar("date_to", {
-                label: L("lcl_period_to"),
-                initEmpty: true,
-                volgnr: 2
-            });
-
-        SEARCH_BLOCK_END();
-
-        var buttons = [{ title: L("lcl_search"), action: "doSubmit()", importance: 1, icon: "fa-search" }];
-        SIMPLE_BLOCK_START();
-            CreateButtons(buttons, { "entersubmit": true });
-        SIMPLE_BLOCK_END();
-
-    SEARCH_PAGE_END();
-    IFACE.FORM_END();
-%>  </form>
-    <div id="result">
-        <div class="captions">
-            <span class="host">Hieronder het Exchange event uit de agenda van de <i>Gastheer</i></span>
-            <span class="room">Hieronder het Exchange event uit de agenda van de <i>Ruimte</i></span>
-        </div>
-        <div class="content">
-            <textarea class="host"></textarea>
-            <textarea class="room"></textarea>
-        </div>
-    </div>
-  </body>
-</html>
-<%
-ASPPAGE_END();
-%>

APPL/API/Exchange/get_exchange_info.asp

@@ -1,243 +0,0 @@
-<%@language = "javascript" %>
-<% /*
-    $Revision$
-    $Id$
-
-    File:           get_exchange_info.asp
-    Description:    Haalt events uit Exchange op en geeft deze terug
-    Parameters:
-    Context:
-    Note:
-
-*/
-var JSON_Result = true;
-%>
-<!-- #include file="../../Shared/common.inc" -->
-<%
-    Session.Codepage = 65001; // We doen *uitsluitend* utf-8
-    Response.Charset = "UTF-8";
-
-    protectRequest.validateToken();
-
-    user.checkAutorisation("WEB_FACTAB");
-
-    function early_exit(err) {
-        result.success = false;
-        result.warning = err;
-        ASPPAGE_END();
-        Response.Write(JSON.stringify(result));
-        Response.End;
-    }
-
-    function verifyMSGraphResult(response) {
-        if (response === false || response === null) {
-            early_exit("MS Graph [Generic Error] - Zie Logging voor details");
-        }
-    }
-
-    // Minimaliseer het resultaat door alleen zeer relevante velden over te nemen
-    function strip(result) {
-        function _minify(event) {
-            return {
-                "createdDateTime": event.createdDateTime,
-                "id": event.id,
-                "iCalUId": event.iCalUId,
-                "subject": event.subject,
-                "isCancelled": event.isCancelled,
-                "sensitivity": event.sensitivity,
-                "isOnlineMeeting": event.isOnlineMeeting,
-                "responseStatus": event.responseStatus,
-                "start": event.start,
-                "end": event.end,
-                // "locations": event.locations,
-                "attendees": event.attendees
-            }
-        }
-        if (result.host) {
-            if (result.host instanceof Array) {
-                for (var i = 0; i < result.host.length; i++) {
-                    result.host[i] = _minify(result.host[i]);
-                }
-            } else {
-                result.host = _minify(result.host);
-            }
-        }
-        if (result.room) {
-            if (result.room instanceof Array) {
-                for (var i = 0; i < result.room.length; i++) {
-                    result.room[i] = _minify(result.room[i]);
-                }
-            } else {
-                result.room = _minify(result.room);
-            }
-        }
-        return result;
-    }
-
-    // Polyfill
-    if (!Date.prototype.toISOString) {
-        Date.prototype.toISOString = function () {
-            function pad(n) { return n < 10 ? '0' + n : n }
-            return this.getUTCFullYear() + '-'
-                + pad(this.getUTCMonth() + 1) + '-'
-                + pad(this.getUTCDate()) + 'T'
-                + pad(this.getUTCHours()) + ':'
-                + pad(this.getUTCMinutes()) + ':'
-                + pad(this.getUTCSeconds()) + 'Z';
-        };
-    }
-
-    var result = {
-        info: []
-    };
-
-    if (!(S("msgraph_sync_level") > 0)) {
-        result.info = ["S(\"msgraph_sync_level\") staat op '0'"];
-    }
-
-    // Initialize hook
-    var hook = hookfunc.gethook("UTILS/Exchange/res_to_graph.wsc");
-    var DEZE = this;
-    try {
-        var init = hook.initialize({
-            DEZE: DEZE,
-            custabspath: Server.MapPath(custpath)
-        });
-        if (init === null) { // Is alleen null als de exchange.config ontbreekt
-            early_exit("Geen exchange.config aangetroffen");
-        }
-    } catch (e) {
-        early_exit("Hook error: " + e.description);
-    }
-
-    var host_id = null;
-    var room_id = null;
-    var host_email = null;
-    var room_email = null;
-    var res_rsv_ruimte_key = null;
-    var fallback_user = false;
-
-    var compact = getFParam("compact", "off") == "on";
-    var reservering_nr = getFParam("reservering", "");
-    var userPrincipalName = getFParam("userPrincipalName", null);
-    var date_from = getFParamDate("date_from", null);
-    var date_to = getFParamDate("date_to", null);
-    if (reservering_nr != "") {
-        // We gaan het event ophalen met een reserveringsnr als informatie
-        var res_reservering_key = parseInt(reservering_nr.split("/")[0], 10);
-        var res_rsv_ruimte_volgnr = parseInt((reservering_nr.split("/")[1] || 1), 10);
-        if (isNaN(res_reservering_key) || isNaN(res_rsv_ruimte_volgnr)) {
-            early_exit("Ongeldig reserveringsnr, verwachte formaat; 12345/1");
-        }
-        var sql = "SELECT rrr.res_rsv_ruimte_externnr2     host_id,"
-                + "       rrr.res_rsv_ruimte_externnr      room_id,"
-                + "       p_host.prs_perslid_email         host_email,"
-                + "       rr.res_ruimte_extern_id          room_email,"
-                + "       rrr.res_rsv_ruimte_key           res_rsv_ruimte_key,"
-                + "       p_host.prs_perslid_oslogin       host_login"
-                + "  FROM res_rsv_ruimte  rrr"
-                + "       JOIN prs_perslid p_host"
-                + "           ON p_host.prs_perslid_key = rrr.res_rsv_ruimte_host_key"
-                + "       JOIN res_ruimte_opstelling rro"
-                + "           ON rro.res_ruimte_opstel_key = rrr.res_ruimte_opstel_key"
-                + "       JOIN res_ruimte rr ON rr.res_ruimte_key = rro.res_ruimte_key"
-                + " WHERE rrr.res_reservering_key = " + res_reservering_key
-                + "   AND rrr.res_rsv_ruimte_volgnr = " + res_rsv_ruimte_volgnr;
-        var oRs = Oracle.Execute(sql);
-        if (!oRs.EoF) {
-            host_id = oRs("host_id").Value;
-            room_id = oRs("room_id").Value;
-            host_email = oRs("host_email").Value;
-            room_email = oRs("room_email").Value;
-            res_rsv_ruimte_key = oRs("res_rsv_ruimte_key").Value;
-            fallback_user = oRs("host_login").Value === null ? false : !!oRs("host_login").Value.match(/^_MSGRAPH_FALLBACK_/);
-        } else {
-            early_exit("Reservering niet in Facilitor gevonden");
-        }
-        oRs.Close();
-
-        // Wat error-handling
-        if (host_id === null && room_id === null) {
-            if (room_email === null) {
-                early_exit("Ruimte is geen Exchange-gekoppelde ruimte");
-            } else {
-                early_exit("Reservering is niet aan Exchange gekoppeld");
-            }
-        } else if (fallback_user) {
-            early_exit("Deze reservering is geboekt op een fallback user, we kunnen hiervan niets uitlezen op basis van de reservering. Probeer de reservering zelf op te zoeken mbv een datum bereik");
-        }
-
-        // Haal nu de eigenlijke Exchange-events op
-        if (host_id && host_id != "##PENDING##" && host_email) {
-            var method = host_id.match(/^##iCalUId##/) ? "iCalUId" : "id";
-            result.host = hook.getCalendarEvent(method, host_email, host_id);
-            verifyMSGraphResult(result.host);
-        }
-        if (room_id && room_email) {
-            room_id = room_id.split("|")[1] || room_id.split("|")[0];
-            var method = room_id.match(/^##iCalUId##/) ? "iCalUId" : "id";
-            if (method == "iCalUId") {
-                room_id = room_id.slice(11); // Strip de '##iCalUId##'
-            }
-            result.room = hook.getCalendarEvent(method, room_email, room_id);
-            verifyMSGraphResult(result.room);
-        }
-
-        // Niet gevonden, nog eens proberen obv res_rsv_ruimte_key
-        if (!result.host && !result.room) {
-            if (host_id == "##PENDING##" && host_email) {
-                result.info.push("Deze reservering heeft nog geen antwoord van MSGraph ontvangen");
-                result.host = hook.getCalendarEvent("res_rsv_ruimte_key", host_email, res_rsv_ruimte_key);
-                verifyMSGraphResult(result.host);
-                if (!result.host) {
-                    early_exit("Reservering niet in Exchange gevonden op basis van res_rsv_ruimte_key");
-                }
-            } else {
-                result.info.push("Reservering niet in Exchange gevonden");
-            }
-            if (!result.host) {
-                early_exit("Reservering niet in Exchange gevonden");
-            }
-        }
-        // Klaar
-    } else if (userPrincipalName && date_from != null && date_to != null) {
-        // We gaan het event ophalen met een (ruimte of gastheer)email en een datum bereik
-        var id = date_from.toISOString() + "##" + date_to.toISOString();
-        var response = hook.getCalendarEvent("date", userPrincipalName, id);
-        verifyMSGraphResult(response);
-
-        // Verwerk het resultaat
-        if (response.value) {
-            // Convert een javascript Array naar een JSON Array
-            var events = [];
-            for (var x in response.value) {
-                events.push(response.value[x]);
-            }
-            if (events.length != 1) {
-                result.info.push("Er zijn " + events.length + " events gevonden");
-            }
-            var sql = "SELECT 1"
-                    + "  FROM res_ruimte"
-                    + " WHERE UPPER(res_ruimte_extern_id) = " + safe.quoted_sql_upper(userPrincipalName);
-            var oRs = Oracle.Execute(sql);
-            if (oRs.EoF) {
-                result.host = events;
-            } else {
-                result.room = events;
-            }
-            oRs.Close();
-        }
-    } else {
-        early_exit("Onvoldoende parameters meegegeven; zoek op reserveringsnr, of de combinatie; email/datum-van/datum-tot");
-    }
-
-    result.success = true;
-    // Strip onnodige velden
-    if (compact) {
-        result = strip(result);
-    };
-
-    Response.Write(JSON.stringify(result));
-    Response.End;
-%>
-<% 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

@@ -8,9 +8,9 @@
 
 */
 
-function API_func(APIname)
+function API_func()
 {
-    this.APIname = APIname || getQParam("API");
+    this.APIname = getQParam("API");
     var sql = "SELECT *"
             + " FROM fac_api"
             + " WHERE fac_api_name = " + safe.quoted_sql(this.APIname);
@@ -44,8 +44,7 @@ function API_func(APIname)
                 oRs2.Close();
                 Response.End;
             };
-            __Log("API User is: " + oRs2("prs_perslid_naam").Value);
-            // JGL: komen we hier ooit? Gebeurt nu ooit dit: /* global */ user = new Perslid(user_key);
+            __Log("API User is: " + oRs2("prs_perslid_naam"));
             user_key = oRs2("prs_perslid_key").Value;
             oRs2.Close();
         }
@@ -58,22 +57,14 @@ function API_func(APIname)
         file:             oRs("fac_api_filepath").Value,
         prs_perslid_key:  user_key,
         loglevel:         oRs("fac_api_loglevel").Value,
-        errorhandling:    oRs("fac_api_errorhandling").Value,
         usrrap_key:       oRs("fac_usrrap_key").Value,
         stylesheet:       oRs("fac_api_stylesheet").Value,
-        stylesheet_out:   oRs("fac_api_stylesheet_out").Value
+        import_app_key:   oRs("fac_import_app_key").Value
     };
 
-    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)
     {
@@ -82,8 +73,7 @@ function API_func(APIname)
     }
     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)
     {
@@ -106,29 +96,25 @@ API_func.prototype.error = function (msg)
         Response.Write(safe.html(msg));
         // Op productie zie je bovenstaande Response.Write ook niet terug in Fiddler omdat
         // 'detailed error messages' uit staat. Daarom ook maar loggen voor het gemak.
-        __DoLog(safe.html(msg), "#ff0000");
+        __DoLog(safe.html(msg), "ff0000");
     }
     Response.End;
 }
 
 // LET OP: Verwacht wordt dat de JSON-code in de body utf-8 encoded is, niet windows-1252!
 // (in de praktijk moet je *moeite* doen om windows-1252 te krijgen dus dit is handiger)
-function RequestJSON(loglevel)
+function RequestJSON()
 {
     var jvraag;
-    if(Request.TotalBytes == 0)
+    if(Request.TotalBytes > 0)
     {
-        return { error: "Empty body posted" }
+        var lngBytesCount = Request.TotalBytes;
+        jvraag = BytesToStr(Request.BinaryRead(lngBytesCount));
     }
-
-    var lngBytesCount = Request.TotalBytes;
-    jvraag = BytesToStr(Request.BinaryRead(lngBytesCount));
     __Log("Vraag: " + jvraag);
     try
     {
         var vraag = myJSON.parse(jvraag);
-        if (loglevel)
-            __Log2File(JSON.stringify(vraag, null, 2), API.APIname + "_IN", ".json");
     }
     catch (e)
     {
@@ -138,70 +124,6 @@ function RequestJSON(loglevel)
     return vraag;
 }
 
-function RequestXML(API)
-{
-    var xvraag;
-    if(Request.TotalBytes == 0)
-    {
-        return { error: "Empty body posted" }
-    }
-
-    var lngBytesCount = Request.TotalBytes;
-    xvraag = BytesToStr(Request.BinaryRead(lngBytesCount));
-    if (API.apidata.loglevel)
-        __Log2File(xvraag, API.APIname + "_IN");
-
-    __Log("Request body: " + xvraag);
-    try
-    {
-        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)
-    {
-        var method = String(Request.ServerVariables("REQUEST_METHOD"));
-        if (method != "POST") // gebeurt nog wel eens
-        {
-            __DoLog( "Weird: expected method POST, got " + method);
-        }
-        API.error("Error loading XML: " + parsed.error);
-    }
-
-    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");
@@ -212,24 +134,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

@@ -36,10 +36,11 @@
     LCL_Disable = 1
     THIS_FILE = "appl/api/api_soap.asp";
 
-//    __Logging = 1;
+//    Session("logging")=1;
 %>
 <!-- #include file="../Shared/common.inc" -->
 <!-- #include file="../Shared/xml_converter.inc" -->
+<!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../api/api.inc" -->
 <%
     Session.Codepage = 65001;
@@ -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",
@@ -227,26 +226,17 @@ try
     oRs.Close();
     if (any3D)
     {
-        if (autfunction)
-            var authparams = user.checkAutorisation(autfunction);
+        if (!autfunction)
+            API.error("3d yet autfunction undefined"); // Strict genomen niet nodig voor FCLT_3D_USER_KEY
 
+        var authparams = user.checkAutorisation(autfunction);
         // 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)
         {
@@ -300,12 +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));
+    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");
 
@@ -367,6 +365,4 @@ catch (e)
 {
     API.error(typeof e == "string"? e : e.description);
 }
-
-ASPPAGE_END();
 %>

APPL/API/api_XMLNode.asp

@@ -0,0 +1,142 @@
+<%@ language = "JavaScript" %>
+<% /*
+     $Revision$
+     $Id$
+
+    File:           api_SOAP.asp
+    Description:    API om een SOAP-achtige service te bieden
+    Parameters:
+    Context:
+    Notes:          Zie UWVA/KASPRS voor voorbeeld gebruik
+    TODO:           Parameters uit Request-SOAP bericht ook via een XSL er uit vogelen
+
+*/
+    DOCTYPE_Disable = 1;
+    THIS_FILE = "appl/api/api_soap.asp";
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/xml_converter.inc" -->
+<!-- #include file="../api/api.inc" -->
+
+<%
+    var API = new API_func();
+
+    Session.Codepage = 65001;
+    Response.Charset = 'utf-8';
+
+    // Zet de loglevel in de API op 1 om de xml te loggen naar de TEMP folder
+    function XML2TEMP(xml, postfix)
+    {
+        if (!API.apidata.loglevel) return;
+        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())
+        in_file = in_file + s + ".xml";
+        //Response.Write(in_file);Response.End;
+
+        var fs  = Server.CreateObject("Scripting.FileSystemObject");
+        var ts  = fs.CreateTextFile(in_file, true, -1); // -1 voor de Unicode
+        ts.WriteLine (xml);                             // Anders hier Invalid procedure call or argument
+        ts.Close();
+    }
+
+    Session("logging") = API.apidata.loglevel||0;
+
+    var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
+    xmlReq.load(Request);
+
+    XML2TEMP(xmlReq.xml, "IN");
+
+    var xmlnode = xmlReq.getElementsByTagName("xmlnode")[0].text;
+    var beginTag = xmlReq.getElementsByTagName("begindatumtijd")[0].text;
+    var eindTag = xmlReq.getElementsByTagName("einddatumtijd")[0].text;
+    //var ekey = xmlReq.getElementsByTagName("key")[0].text;
+    __Log("xmlnode: " + xmlnode);
+    __Log("From: " + beginTag);
+    __Log("To: " + eindTag);
+
+    var key = -1;
+    var xtrakey = -1;
+    var stylesheet = API.apidata.stylesheet;
+    var srtnotificatie = "";
+
+    // TODO: View configureerbaar maken
+    var whichSQL = "SELECT DISTINCT fac_srtnotificatie_xmlnode xmlnode, fac_tracking_refkey "
+                 + "  FROM fac_tracking ft, fac_srtnotificatie fs "
+                 + " WHERE     ft.fac_srtnotificatie_key = fs.fac_srtnotificatie_key "
+                 + "       AND fs.fac_srtnotificatie_xmlnode = " + safe.quoted_sql(xmlnode)
+                 + "       AND fac_tracking_datum BETWEEN TO_DATE("+safe.quoted_sql(beginTag)+", 'YYYY-MM-DD HH24:MI:SS')"
+                 + "                                  AND TO_DATE("+safe.quoted_sql(eindTag)+", 'YYYY-MM-DD HH24:MI:SS')"
+// UWVA sneller                 + "       AND fac_tracking_key >= 11376454"
+                 + " GROUP BY fac_srtnotificatie_xmlnode, fac_tracking_refkey";
+    // whichSQL = "SELECT * FROM (" + whichSQL + ") WHERE ROWNUM < 5";
+
+    var oRsW = Oracle.Execute(whichSQL);
+    var xml_nodes_arr = [];
+    var xml_nodes_dom = new ActiveXObject("MSXML2.DOMDocument.6.0");
+
+    var FCLTElement = xml_nodes_dom.createElement("facilitor");
+    var headerDone = false;
+    where = "";
+    while (!oRsW.Eof)
+    {
+        var xml_content = make_xml({ xmlnode: oRsW("xmlnode").Value,
+                                     key: oRsW("fac_tracking_refkey").Value,
+                                     xtrakey: xtrakey,
+                                     where: where
+                                   });
+        // Loggen van de individuele XMLNODE's
+        // XML2TEMP(xml_content, "XML_" +  oRsW("xmlnode").Value + "_" + oRsW("fac_tracking_refkey").Value);
+
+        __Log("XML '" + oRsW("xmlnode").Value + "' voor key " + oRsW("fac_tracking_refkey").Value + " is " + xml_content.length + " karakters");
+
+        xml_nodes_arr.push(xml_content); // E<>n node
+        var xmldoc = new ActiveXObject("Msxml2.DOMDocument.6.0");
+        xmldoc.async = false;
+        xmldoc.loadXML(xml_content);
+        xmldoc.setProperty("SelectionLanguage", "XPath");
+        if (!headerDone)
+        {
+            node = xmlReq.selectSingleNode("facilitor/getinfo");
+            //var FCLTElement = xml_nodes_dom.createElement("begintimestamp");
+            var sql = "SELECT (TO_DATE("+safe.quoted_sql(beginTag)+", 'YYYY-MM-DD HH24:MI:SS')"
+                    +              " - TO_DATE ('01-01-1970', 'DD-MM-YYYY')) * 86400 FROM DUAL"
+            var ts = Oracle.Execute(sql);
+            var tNode = xml_nodes_dom.createTextNode(ts(0).value);
+            bnode = xml_nodes_dom.createElement("begintimestamp");
+            bnode.appendChild(tNode)
+            node.appendChild(bnode);
+            FCLTElement.appendChild(node);
+
+            sql = "SELECT (TO_DATE("+safe.quoted_sql(eindTag)+", 'YYYY-MM-DD HH24:MI:SS')"
+                    +              " - TO_DATE ('01-01-1970', 'DD-MM-YYYY')) * 86400 FROM DUAL"
+            ts = Oracle.Execute(sql);
+            tNode = xml_nodes_dom.createTextNode(ts(0).value);
+            bnode = xml_nodes_dom.createElement("eindtimestamp");
+            bnode.appendChild(tNode)
+            node.appendChild(bnode);
+            FCLTElement.appendChild(node);
+
+            node = xmldoc.selectSingleNode("facilitor/header");
+            FCLTElement.appendChild(node);
+            node = xmldoc.selectSingleNode("facilitor/lcl"); // TODO: Eigenlijk wil je deze mergen over alle xmlNodes heen
+            FCLTElement.appendChild(node);
+            headerDone = true;
+        }
+        node = xmldoc.selectSingleNode("facilitor/" + oRsW("xmlnode").Value);
+        FCLTElement.appendChild(node);
+
+        oRsW.moveNext();
+    }
+    oRsW.Close();
+    xml_nodes_dom.appendChild(FCLTElement);
+
+    XML2TEMP(xml_nodes_dom.xml, "DATAXML");
+
+    Response.ContentType = "text/xml";
+    mode = xmlnode; // is dit logisch? PF: volgens mij helemaal niet
+    STR2Stream(xml_nodes_dom.xml, stylesheet, Response, mode, srtnotificatie);
+
+    Session.Abandon(); // Voor de zekerheid
+%>

APPL/API/api_algsoap.asp

@@ -0,0 +1,27 @@
+<%@ language = "JavaScript" %>
+<% /*
+     $Revision$
+     $Id$
+
+     File:              api_algsoap.asp
+     Description:       API voor ALG-soap berichten
+
+     Parameters:        Een xml
+     Status:
+     Context:
+     Notes:
+*/
+    DOCTYPE_Disable = 1;
+    THIS_FILE = "appl/api/api_algsoap.asp";
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/xml_converter.inc" -->
+<!-- #include file="../Shared/save2db.inc" -->
+<!-- #include file="../api/api.inc" -->
+<%
+    // We sturen het antwoord in UTF-8.
+    Session.Codepage = 65001;
+    Response.Charset = 'utf-8';
+
+    var API = new API_func();
+%>

APPL/API/api_besordsoap.asp

@@ -0,0 +1,418 @@
+<%@ language = "JavaScript" %>
+<% /*
+     $Revision$
+     $Id$
+
+     File:              api_besordsoap.asp
+     Description:       API voor besord-soap berichten (bestelopdrachten)!
+                        Interpreteert een bericht zodanig dat bestelopdracht wordt aangepast.
+                        Dat is: qua status (bevesting/afwijzing en levering).
+                        Als een status wordt meegegeven, dan is ook vereist dat dat een
+                        geldige statusovergang is, anders wordt het hele bericht genegeerd.
+
+     Parameters:        Een xml
+     Status:
+     Context:
+     Notes:
+*/
+    DOCTYPE_Disable = 1;
+    THIS_FILE = "appl/api/api_besordsoap.asp";
+%>
+<!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/xml_converter.inc" -->
+<!-- #include file="../Shared/save2db.inc" -->
+<!-- #include file="../api/api.inc" -->
+<!-- #include file="../bes/bes.inc" -->
+<%
+    // We sturen het antwoord in UTF-8.
+    Session.Codepage = 65001;
+    Response.Charset = 'utf-8';
+
+    var API = new API_func();
+    var tsql = "-";        // Voor tijdelijke statement(s)
+    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);
+
+    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\""))
+
+    // The response
+    var FCLTElement = xmlResp.createElement("facilitor");
+    // The response header
+    var now = new Date();
+    var nowtxt = now.getFullYear()+'-'+padout(now.getMonth()+1) +'-'+padout(now.getDate()) +' '
+                           +padout(now.getHours()) +':'+padout(now.getMinutes())+':'+padout(now.getSeconds());
+    var elmHeader = xmlResp.createElement("header");
+    var headerinfo = {
+//                      file: String(Request.ServerVariables("SCRIPT_NAME")).toLowerCase(),
+                      datum: nowtxt,
+                      naam: user.naam(),
+                      custId: customerId,
+                      language: user.lang()
+                     }
+    for (param in headerinfo)
+    {
+        var FCLTdata = xmlResp.createElement(param);
+        FCLTdata.appendChild(xmlResp.createTextNode(headerinfo[param]));
+        elmHeader.appendChild(FCLTdata);
+    }
+    FCLTElement.appendChild(elmHeader);
+
+    // Hier zou het echte werk moeten gebeuren nav. xmlReq
+    // en FCLTElement moeten we uitbreiden met antwoorden.
+    var detected ="?";
+//    xmlReq.setProperty("SelectionLanguage", "XPath");   // Weet niet of noodzakelijk
+
+    // Is hiermee voldoende gecheckt op rechten?
+    var authparams = user.checkAutorisation("WEB_BESBOR");
+
+    // Dit is de opdrachtenloop (mochten er ooit nog anderen gaan volgen).
+    var opdrachten = xmlReq.getElementsByTagName("bestelopdracht");
+    for (i=0; i < opdrachten.length; i++)
+    {
+        // Lees per node de (optionele) tags en waarden.
+        var opdrid     = opdrachten[i].getAttribute("key");
+        var opdraction = opdrachten[i].getAttribute("type").toLowerCase();
+        var opdrstatus = XMLval(opdrachten[i], "status");
+        var opdropm    = XMLval(opdrachten[i], "opmerking");
+        var opdr_key   = -1;   // Bepaald op basis van opdrid
+        var lev_key    = -1;
+        var curstatus  = -1;
+
+        var idarr      = opdrid.split('/');
+        var bes_key    = parseInt(idarr[0], 10);
+        var opdrvolgnr = parseInt(idarr[1], 10);
+
+        if (isNaN (bes_key) || isNaN (opdrvolgnr))
+        {
+            resultcode = 2;
+            resulttekst = "Invalid ID (key="+ opdrid +")";
+        }
+        else if (opdraction != "update")
+        {
+            resultcode = 2;
+            resulttekst = "Invalid action (type="+ opdraction +")";
+        }
+        else
+        {
+            tsql = "SELECT bes_bestelopdr_key, prs_bedrijf_key, bes_bestelopdr_status "
+                + " FROM bes_bestelopdr"
+                + " WHERE bes_bestelopdr_id="+ safe.quoted_sql(opdrid);
+            var oRs = Oracle.Execute(tsql);
+            if (!oRs.eof)
+            {
+                opdr_key = oRs("bes_bestelopdr_key").value;
+                lev_key = oRs("prs_bedrijf_key").value;
+                curstatus = oRs("bes_bestelopdr_status").value;
+            }
+
+            if (opdr_key == -1)
+            {
+                resultcode = 3;
+                resulttekst = "Unknown order";
+            }
+            else
+            {   // Hier heb ik een geldige bes_bestelling_key + bes_bestelopdr_key.
+                // Bericht bevat statuswijziging of artikellijst; nooit beide!
+                if (opdrstatus != null)
+                {   // Hier is dus een status meegegeven; evt. artikellijst wordt genegeerd!
+                    switch (opdrstatus)
+                    {
+                        case 'BES2CO':
+                        case 'BES2RE':
+                            var opdropm_kolom = "BES_BESTELOPDR_OPMERKING";
+
+                            // Check of vinkje bij leverancier "buitenom" bevestiging toestaat.
+                            tsql = "SELECT prs_bedrijf_order_confirm "
+                                + " FROM prs_bedrijf"
+                                + " WHERE prs_bedrijf_key="+ lev_key;
+                            oRs = Oracle.Execute(tsql);
+                            if (oRs("prs_bedrijf_order_confirm").value == 1)
+                            {
+                                if (curstatus == 5) { // Ter bevestiging
+                                    if (opdrstatus == 'BES2CO')
+                                    {
+                                        tsql = "BEGIN BES.acceptopdracht(" + opdr_key + ", " + user_key +", ''); END;";
+                                        Oracle.Execute(tsql);
+                                    }
+                                    else
+                                    {
+                                        tsql = "BEGIN BES.rejectopdracht(" + opdr_key + ", " + user_key +", ''); END;";
+                                        Oracle.Execute(tsql);
+                                    }
+                                }
+                                else
+                                {
+                                    resultcode = 5;
+                                    resulttekst = "Invalid status change";
+                                }
+                            }
+                            else
+                            {
+                                resultcode = 4;
+                                resulttekst = "Remote confirmation not enabled";
+                            }
+                            break;
+                        case 'BES2AF':
+                            var opdropm_kolom = "BES_BESTELOPDR_DELIVERY_OPMERK";
+
+                            // Check of vinkje bij catalogus registratie van levering toestaat.
+                            tsql = "SELECT MAX(dp.bes_disc_params_remoteconfirm) bes_disc_params_remoteconfirm "
+                                + " FROM bes_bestelling_item bi, bes_srtdeel sd, bes_srtgroep sg, bes_disc_params dp"
+                                + " WHERE bi.bes_bestelling_key="+ bes_key
+                                + " AND bi.bes_srtdeel_key=sd.bes_srtdeel_key"
+                                + " AND sd.bes_srtgroep_key=sg.bes_srtgroep_key"
+                                + " AND sg.ins_discipline_key=dp.bes_ins_discipline_key";
+                            oRs = Oracle.Execute(tsql);
+                            if (oRs("bes_disc_params_remoteconfirm").value == 1)
+                            {
+                                if (curstatus == 4 )
+                                {   // In bestelling
+                                    // Zeg dat alles geleverd is wat besteld is.
+                                    tsql = "UPDATE bes_bestelopdr_item "
+                                        + " SET bes_bestelopdr_item_aantalontv=bes_bestelopdr_item_aantal"
+                                        + "   , bes_bestelopdr_item_ontvangen=SYSDATE"
+                                        + " WHERE bes_bestelopdr_key="+ opdr_key;
+                                    Oracle.Execute(tsql);
+                                    bes.updatebestelopdrstatus(opdr_key, user_key);
+
+                                    // Sluit alle aanvraagregels af die nu geheel geleverd zijn.
+                                    tsql = "UPDATE bes_bestelling_item "
+                                        + " SET bes_bestelling_item_aantalontv = bes_bestelling_item_aantal"
+                                        + " WHERE bes_bestelling_item_key IN"
+                                        + " (SELECT bi.bes_bestelling_item_key "
+                                        + "  FROM bes_bestelling b, bes_bestelling_item bi, bes_bestelopdr_item boi"
+                                        + "  WHERE b.bes_bestelling_key="+ bes_key
+                                        + "  AND b.bes_bestelling_status=5" // Besteld
+                                        + "  AND b.bes_bestelling_key=bi.bes_bestelling_key"
+                                        + "  AND bi.bes_bestelopdr_item_key=boi.bes_bestelopdr_item_key"
+                                        + "  AND boi.bes_bestelopdr_key="+ opdr_key
+                                        + "  AND boi.bes_bestelopdr_item_aantal=boi.bes_bestelopdr_item_aantalontv)";
+                                    Oracle.Execute(tsql);
+                                    bes.updatebestellingstatus (bes_key, user_key);
+                                }
+                                else
+                                {
+                                    resultcode = 5;
+                                    resulttekst = "Invalid status change";
+                                }
+                            }
+                            else
+                            {
+                                resultcode = 4;
+                                resulttekst = "Remote delivery not enabled";
+                            }
+                            break;
+                        default:
+                            resultcode = 2;
+                            resulttekst = "Invalid status";
+                    } // switch
+                }
+                else
+                {   // Hier is dus een artikellijst meegegeven (prijswijzigingen, aantallen en/of alleen opmerking)!
+                    var artikelen = opdrachten[i].getElementsByTagName("artikel");
+                    if (artikelen.length > 0)
+                    {   // Loop door artikelen.
+                        if (curstatus == 4 )
+                        {   // In bestelling; alleen in deze toestand mogen - via API - artikelen worden bijgewerkt!
+                            var opdropm_kolom = "BES_BESTELOPDR_DELIVERY_OPMERK";
+
+                            for (i=0; i < artikelen.length && resultcode == -1; i++)
+                            {   // Lees per node weer de tags en waarden.
+                                var artikelnr = artikelen[i].getAttribute("nummer");
+                                var newprijs = XMLval(artikelen[i], "prijs");
+                                var newprijsval = parseFloat(XMLval(artikelen[i], "prijs"));
+                                var newink = XMLval(artikelen[i], "inkprijs");
+                                var newinkval = parseFloat(XMLval(artikelen[i], "inkprijs"));
+                                var newbruto = XMLval(artikelen[i], "brutoprijs");
+                                var newbrutoval = parseFloat(XMLval(artikelen[i], "brutoprijs"));
+                                var newontv = XMLval(artikelen[i], "aantalontv");
+                                var newontvval = parseInt(XMLval(artikelen[i], "aantalontv"), 10);
+
+                                // Bepaal item-keys plus huidige aantallen besteld/geleverd voor artikel.
+                                tsql = "SELECT bi.bes_bestelling_item_key, bi.bes_bestelopdr_item_key, "
+                                    + "        boi.bes_bestelopdr_item_aantal curaant, "
+                                    + "        COALESCE(boi.bes_bestelopdr_item_aantalontv, 0) curontv "
+                                    + " FROM bes_bestelopdr_item boi, bes_bestelling_item bi, bes_srtdeel sd"
+                                    + " WHERE boi.bes_bestelopdr_key="+ opdr_key
+                                    + " AND boi.bes_bestelopdr_item_key=bi.bes_bestelopdr_item_key"
+                                    + " AND bi.bes_srtdeel_key=sd.bes_srtdeel_key"
+                                    + " AND sd.bes_srtdeel_nr="+ safe.quoted_sql(artikelnr);
+                                oRs = Oracle.Execute(tsql);
+                                if (!oRs.eof)
+                                {
+                                    var bi_key = oRs("bes_bestelling_item_key").value;
+                                    var boi_key = oRs("bes_bestelopdr_item_key").value;
+                                    var curaant = oRs("curaant").value;
+                                    var curontv = oRs("curontv").value;
+
+                                    if ((newprijs && (isNaN (newprijsval) || newprijsval < 0)) ||
+                                        (newink && (isNaN (newinkval) || newinkval < 0)) ||
+                                        (newbruto && (isNaN (newbrutoval) || newbrutoval < 0)))
+                                    {
+                                        resultcode = 8;
+                                        resulttekst = "Invalid price(s)";
+                                    }
+                                    else if (newprijs || newink || newbruto)
+                                    {   // Werk de eventuele prijzen bij; zover meegegeven zijn die geldig.
+                                        // In de bestelaanvraag!
+                                        tsql = "UPDATE bes_bestelling_item "
+                                            + " SET bes_srtdeel_key=bes_srtdeel_key"
+                                            + (newprijs ? ", bes_bestelling_item_prijs="+ newprijsval : "")
+                                            + (newink ?   ", bes_bestelling_item_inkprijs="+ newinkval : "")
+                                            + (newbruto ? ", bes_bestelling_item_brutoprijs="+ newbrutoval : "")
+                                            + " WHERE bes_bestelling_item_key="+ bi_key;
+                                        Oracle.Execute(tsql);
+                                        shared.trackaction("BESUPD", bes_key, L("lcl_bes_is_besupdtrackprice").format(S("bes_bestelling_prefix") + bes_key, safe.curr(newprijsval)));
+
+                                        // En de bestelopdracht!
+                                        tsql = "UPDATE bes_bestelopdr_item "
+                                            + " SET bes_bestelopdr_item_posnr=bes_bestelopdr_item_posnr"
+                                            + (newprijs ? ", bes_bestelopdr_item_prijs="+ newprijsval : "")
+                                            + (newink ?   ", bes_bestelopdr_item_inkprijs="+ newinkval : "")
+                                            + (newbruto ? ", bes_bestelopdr_item_brutoprijs="+ newbrutoval : "")
+                                            + " WHERE bes_bestelopdr_item_key="+ boi_key;
+                                        Oracle.Execute(tsql);
+                                        shared.trackaction("BES2UP", opdr_key, L("lcl_bes_is_bes2uptrackprice").format(S("bes_bestelopdr_prefix") + opdrid, safe.curr(newprijsval)));
+                                    }
+
+                                    if (newontv && resultcode == -1)
+                                    {   // Nieuw aantal ontvangen en nog steeds geen fouten.
+                                        // Check of vinkje bij catalogus registratie van levering toestaat.
+                                        tsql = "SELECT MAX(dp.bes_disc_params_remoteconfirm) bes_disc_params_remoteconfirm "
+                                            + " FROM bes_bestelling_item bi, bes_srtdeel sd, bes_srtgroep sg, bes_disc_params dp"
+                                            + " WHERE bi.bes_bestelling_key="+ bes_key
+                                            + " AND bi.bes_srtdeel_key=sd.bes_srtdeel_key"
+                                            + " AND sd.bes_srtgroep_key=sg.bes_srtgroep_key"
+                                            + " AND sg.ins_discipline_key=dp.bes_ins_discipline_key";
+                                        oRs = Oracle.Execute(tsql);
+                                        if (oRs("bes_disc_params_remoteconfirm").value == 1)
+                                        {   // Correcties of (deel)registratie retouren met negatieve <aantalontv> niet toegestaan; wel via BES2AF!
+                                            if (isNaN (newontvval) || newontvval < 0 || (curontv + newontvval) > curaant)
+                                            {
+                                                resultcode = 8;
+                                                resulttekst = "Invalid delivery count";
+                                            }
+                                            else
+                                            {   // Werk het geleverde aantal bij.
+                                                tsql = "UPDATE bes_bestelopdr_item "
+                                                    + " SET bes_bestelopdr_item_ontvangen=SYSDATE"
+                                                    + "   , bes_bestelopdr_item_aantalontv=COALESCE(bes_bestelopdr_item_aantalontv,0)+"+ newontvval
+                                                    + " WHERE bes_bestelopdr_item_key="+ boi_key;
+                                                Oracle.Execute(tsql);
+                                                bes.updatebestelopdrstatus(opdr_key, user_key);
+                                            }
+                                        }
+                                        else
+                                        {
+                                            resultcode = 4;
+                                            resulttekst = "Remote delivery not enabled";
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    resultcode = 7;
+                                    resulttekst = "Unknown article number";
+                                }
+                            }
+
+                            // Sluit alle aanvraagregels af die - mogelijk - nu geheel geleverd zijn.
+                            tsql = "UPDATE bes_bestelling_item "
+                                + " SET bes_bestelling_item_aantalontv = bes_bestelling_item_aantal"
+                                + " WHERE bes_bestelling_item_key IN"
+                                + " (SELECT bi.bes_bestelling_item_key "
+                                + "  FROM bes_bestelling b, bes_bestelling_item bi, bes_bestelopdr_item boi"
+                                + "  WHERE b.bes_bestelling_key="+ bes_key
+                                + "  AND b.bes_bestelling_status=5" // Besteld
+                                + "  AND b.bes_bestelling_key=bi.bes_bestelling_key"
+                                + "  AND bi.bes_bestelopdr_item_key=boi.bes_bestelopdr_item_key"
+                                + "  AND boi.bes_bestelopdr_key="+ opdr_key
+                                + "  AND boi.bes_bestelopdr_item_aantal=boi.bes_bestelopdr_item_aantalontv)";
+                            Oracle.Execute(tsql);
+                            bes.updatebestellingstatus (bes_key, user_key);
+                        }
+                        else
+                        {
+                            resultcode = 6;
+                            resulttekst = "Invalid update timing";
+                        }
+                    }
+                    else
+                    {   // Raar, alleen opmerking, heeft dan vast niets met levering te maken?
+                        var opdropm_kolom = "BES_BESTELOPDR_OPMERKING";
+                    }
+                }
+
+                // Dit zijn de overige wijzigingen (alleen opmerking), die voeren we alleen uit
+                // bij geen of een geldige statuswijziging.
+                if (resultcode == -1)
+                {   // Nog steeds geen fouten.
+                    if (opdropm != null )
+                    {
+                        tsql = "UPDATE bes_bestelopdr "
+                            + " SET "+ opdropm_kolom
+                            + "=DECODE ("+ opdropm_kolom
+                            + "       , 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);
+                    }
+
+                    resultcode = 0; // Ik heb gedaan wat ik moest en mocht doen voor deze bestelopdracht.
+                }
+            } // end geldige opdrachtkey
+            oRs.Close();
+        } // end geldige opdrid
+
+        var binfo = {
+                     returncode: resultcode,
+                     returntekst: resulttekst,
+                     // executed:sql,   // debug
+                     datum: nowtxt
+                    }
+
+        var FCLTBody = xmlResp.createElement("bestelopdracht");   // type=response
+        FCLTBody.setAttribute('key', opdrid);
+        FCLTBody.setAttribute('type', 'response');
+        for (param in binfo)
+        {
+            var FCLTdata = xmlResp.createElement(param);
+            FCLTdata.appendChild(xmlResp.createTextNode(binfo[param]));
+            FCLTBody.appendChild(FCLTdata);
+        }
+
+        FCLTElement.appendChild(FCLTBody);
+    } // end for
+    // Alle bestelopdracht-nodes zijn behandeld.
+
+    xmlResp.appendChild(FCLTElement);
+
+    if (API.apidata.stylesheet)
+    {
+        // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
+        STR2Stream(xmlResp.xml, API.apidata.stylesheet, Response, {});
+    }
+    else
+    {
+        Response.ContentType = "text/xml";
+        Response.Write(xmlResp.xml)
+    }
+%>