diff --git a/APPL/ALG/alg_district.asp b/APPL/ALG/alg_district.asp
index 8d1100f4df..cf86eed597 100644
--- a/APPL/ALG/alg_district.asp
+++ b/APPL/ALG/alg_district.asp
@@ -1,29 +1,27 @@
 <%@language = "javascript" %>
 <%  // testing: bes_key=1251054
 
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 2:58p $
+/*  $Revision: 3 $
+    $Modtime: 10/14/09 3:18p $
+
+    File:
+    Status:
+    Description:
+
+    Parameters:
 
-    File:               bes_edit.asp
-    Status:             40% (new style)
-    Description:        Muteerscherm voor bestellingen
-                        dit is de grote 'wrapper' voor de diverse andere schermen
-    Parameters:         urole
-                        bes_key
     Context:
     Note:
 
 */ %>
-<% Response.Expires = -1; %>
 <!--#include file="../../cust/install.inc" -->
-<!--#include file="../Shared/funcodes.inc" -->
 
 <!--#include file="../Shared/iface.inc" -->
 
 <!--#include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/cmenuFn.inc"-->
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jquery-ui.js"]})
+FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js"]})
 
   var autfunction = "WEB_ALGMAN";
   var authparams = user.checkAutorisation(autfunction);   //Wat weet ik dan nou van disciplines???
@@ -31,6 +29,21 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
 
   // dit lijkt mij de enige gehele readonlyverklaring, de rest is localer
   var readonly = !(authparams.PRSwritelevel< 9 || authparams.ALGwritelevel < 9);
+
+  if (dis_key > 0)
+  {
+    sql = " select alg_district_omschrijving "
+        + "  FROM alg_district "
+        + "  WHERE alg_district_key = " + dis_key;
+
+     oRsMes = Oracle.Execute(sql);
+
+     var dis_name   = " " + oRsMes("alg_district_omschrijving").value;
+  }
+  else
+  {
+    var dis_name = "";
+  }
 %>
 
 
@@ -40,6 +53,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
    FCLTHeader.Generate();
 %>
   <script  type="text/javascript" >
+      FcltMgr.setTitle("<%=lcl_district%> <%=dis_name%> ", {hot:false});
       function algClose(params)
       {
           <% if (dis_key == -1)
@@ -49,10 +63,15 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
                   FcltMgr.closeDetail(window, params );
                   return true;
               }
-              FcltMgr.setTitle("<%=lcl_district%> " + params.dis_key, {hot:false});
-              window.location.href = "alg_district.asp?verynew=1&key=" + params.dis_key;
+              if (!params.keepForm)
+                  window.location.href = "alg_district.asp?verynew=1&key=" + params.dis_key;
           <% } else { // Bestaande melding bewerkt, switch naar show-mode %>
-              $("#algFrame")[0].src = "alg_show_district.asp?dis_key=<%=dis_key%>";
+              if (params.close)
+              {
+                FcltMgr.closeDetail(window, { close: true})
+              }
+              if (!params.keepForm)
+                  $("#algFrame")[0].src = "alg_show_district.asp?dis_key=<%=dis_key%>";
           <% } %>
       }
     </script>
@@ -69,21 +88,7 @@ page += "?dis_key="+dis_key;
 IFRAMER("algFrame", page, { title: lcl_alg_district_frame,
                             initHeight: "450px",
                             FcltClose: "algClose" } );
-
-// AKZA#88 don not allow printing if call isn't saved yet.
-// UWVA#427 also print for FE
-if (dis_key>-1 ) {
-
-  add_str ='huh?';
-  menuArray = new Array();
-  menuArray[0] = lcl_print_report;
-  menuArray[1] = lcl_noti_vis_email;
-  onClickArray = new Array();
-  onClickArray[0] = 'print_test(0)';
-  onClickArray[1] = 'print_test(1)';
-
-// TODO: ik denk niet hier:  generateCmenu("c_menu")
-} %>
+%>
 
 </body>
 </html>
diff --git a/APPL/ALG/alg_district_list.inc b/APPL/ALG/alg_district_list.inc
index c2247a0809..56e48a4836 100644
--- a/APPL/ALG/alg_district_list.inc
+++ b/APPL/ALG/alg_district_list.inc
@@ -1,6 +1,6 @@
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 23:39 $
+     $Revision: 2 $
+     $Modtime: 10/14/09 2:44p $
     File:               alg_district.inc
     Description:        Show an overview of district items in list-form,
                         which meets with the given requirements
@@ -14,11 +14,11 @@
 <!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
-
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     })
 
  function fnrowData(oRs)
@@ -34,15 +34,7 @@ FCLTHeader.Requires({ plugins:["jQuery"],
         }
 
 %>
-<script>
- dtable = "ALG_DISTRICT";
-</script>
-
 <script type="text/javascript">
-
-  var lcl_row_delete_failed1 = "<%=lcl_row_delete_failed1%>";
-  var lcl_row_delete_failed2 = "<%=lcl_row_delete_failed2%>";
-
   var autosearch = 1; // automatisch laden van resultaat op search pagina.
 
   function gotoDetails(row)
@@ -57,48 +49,33 @@ FCLTHeader.Requires({ plugins:["jQuery"],
     var url = "appl/ALG/alg_regio_search.asp?regio_key="+algData.parent_key+"&autosearch="+autosearch;
     FcltMgr.openDetail(url, "<%=lcl_region%>");
   }
-    function gebouwEdit(row)
+    function districtEdit(row)
   {
     var algData = eval('(' + row.ROWDATA + ')');
     var url = "appl/ALG/alg_district.asp?mode=viewUpdate&key="+algData.key;
     FcltMgr.openDetail(url, "<%=lcl_district%>" + ' ' + algData.oms);
   }
-    function doDelete(row)
+
+  function doDelete(row, isMulti)
   {
-   if (confirm('<%=lcl_row_delete_confirm%>')) {
-
-        var algData = eval('(' + row.ROWDATA + ')');
-        parent.document.body.style.cursor = "wait";
-        document.body.style.cursor = "wait";
-        hiddenFrame.navigate("setAlgVerwijder.asp?key=" + algData.key + "&table=" + dtable);
-      }
+    $(row).addClass('dirty');
+    var dis_key = row.ROWKEY;
+      if (isMulti || confirm("<%=lcl_alg_del_txt_district%>"))
+           $.post("alg_delete.asp",
+                   { key: dis_key,
+                     level: "D" },
+                     FcltCallback,
+                     "json");
   }
-
-  function DeleteFailed(result)
-{
-  if (result == 1 ) {
-    alert(lcl_row_delete_failed1);
-  } else if ( result == 2 ) {
-    alert(lcl_row_delete_failed2);
-  }
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
-
-function Deleted()
-{
-  algtable.deleteSelectedRows();
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
 </script>
 <%
 
-function gebouw_list(pautfunction, params)
+function district_list(pautfunction, params)
 {
   // De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
-  var authparams = user.checkAutorisation(pautfunction);
-  var canWrite = (authparams.ALGwritelevel < 9);  // TODO: fijner, ik denk 3. Ik moet voor deze locatie, dit district of deze regio schrijfrechten hebben
+  var authparams = alg.checkAutorisation();
+  var canAdd = (authparams.mALGwritelevel < 2);
+  var addButton = [];
 
   // Voor resulttable de globalen zetten; zou ng anders moeten.
   var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
@@ -106,6 +83,14 @@ function gebouw_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})
+    }
 %>
   <html>
     <head>
@@ -153,31 +138,35 @@ function gebouw_list(pautfunction, params)
      sqln += " ORDER BY d.alg_district_upper ASC "
 
     var addurl = "appl/alg/alg_district.asp";
-//    addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
+
+    if (canAdd)
+      {
+        addButton = [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+      }
 
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "alg_district_key",
                                    ID: "algtable",
+                                   showAll: showall,
                                    rowData: fnrowData,
+                                   rowActionEnabler: fnrowActionEnabler,
                                    flexModule: "ALG",
                                    flexId: "alg_district_key",
                                    filterParams: params,
                                    outputmode: outputmode,
-                                   buttons: [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+                                   buttons: addButton
                                   });
 
     rst.addColumn(new Column({caption: lcl_estate_regio_descr, content: "alg_regio_omschrijving"}));
     rst.addColumn(new Column({caption: lcl_estate_district_man_descr, content: "alg_district_omschrijving", hasActions: true}));
 
-    rst.addAction({ action: "gebouwEdit", caption: lcl_edit, isDefault:  true});
-    if (canWrite )
-      rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true});
+    rst.addAction({ action: "districtEdit", caption: lcl_edit, isDefault:  true});
+    rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true, enabler: "eDelete"});
     rst.addAction({ action: "gotoDetails", caption: lcl_goto_locatie_list});
     rst.addAction({ action: "gotoParent", caption: lcl_goto_regio_list});
 
     var cnt = rst.processResultset();
 %>
-<iframe src="../Shared/empty.asp" id=hiddenFrame name=hiddenFrame style="display:none"></iframe>
 </body>
 </html>
 <%}%>
diff --git a/APPL/ALG/alg_district_search.asp b/APPL/ALG/alg_district_search.asp
index b74f2c4357..e3c8585058 100644
--- a/APPL/ALG/alg_district_search.asp
+++ b/APPL/ALG/alg_district_search.asp
@@ -1,7 +1,7 @@
 <%@ LANGUAGE = JavaScript %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 23:39 $
+     $Revision: 2 $
+     $Modtime: 10/20/09 9:40a $
 */ %>
 
 <% Response.Expires = 0 %>
@@ -9,6 +9,7 @@
 <!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../Shared/escape.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"],
@@ -20,8 +21,7 @@ var district_key = getQParamInt("district_key", -1);
 
 var autosearch = getQParam("autosearch", -1);
 
-autfunction = "WEB_ALGMAN"; //todo WEB_ALGUSE
-var authparams = user.checkAutorisation(autfunction);
+var authparams = alg.checkAutorisation();
 
 var lcl_bld_kenmerken = "TODO lcl_gebouw_kenmerken";
 
@@ -42,7 +42,7 @@ var lcl_bld_kenmerken = "TODO lcl_gebouw_kenmerken";
           var lvl = "'D'";
           var key = 0;
           var bld_key = "";
-          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&bld_key=" +bld_key + "&onrgoedlvl=" + lvl;
+          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" +bld_key + "&onrgoed_niveau=" + lvl;
           var titel = "<%=lcl_bld_kenmerken%>";
           showKenmerkModal(key, url, titel)
         }
diff --git a/APPL/ALG/alg_district_search_list.asp b/APPL/ALG/alg_district_search_list.asp
index f26d867e54..ef65892292 100644
--- a/APPL/ALG/alg_district_search_list.asp
+++ b/APPL/ALG/alg_district_search_list.asp
@@ -1,12 +1,12 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 27-08-09 12:02 $
+     $Revision: 2 $
+     $Modtime: 10/12/09 10:02a $
 
     File:        alg_district_search_list.asp
-    Description: Vangt de parameters van msg_search op en verwerkt die in een aanroep van msg_list
-    Parameters:  urole
-    Context:     Vanuit alg_district.asp
+    Description: 
+    Parameters: 
+    Context:     
     Note:
 */ %>
 
@@ -17,12 +17,6 @@
 <!-- #include file="alg_district_list.inc" -->
 
 <%
-var urole = getQParam("urole", "");   // Indien niet meegegeven, veronderstel dan frontend gebruik
-var fronto = (urole == "fo");
-var backo = (urole == "bo");
-var minfo = (urole == "mi");
-var frontend = (urole == "fe" || (!fronto & !backo & !minfo));
-
 // FORM parameters: de waarde indien aanwezig, anders null
 // Vaak is een lege selectie ook een -1, dus dan is-ie wel aanwezig, maar hoeft niet
 // als filter te worden toegepast. Dan is null dus gelijk aan -1, qua betekenis,
@@ -34,11 +28,8 @@ var showall = getQParam("showall", "0") == "1";
 var reg_key = getQParamInt("regiokey", -1); // Regio
 var dis_key = getQParamInt("districtkey", -1); // District
 
-var autfunction = "WEB_ALGMAN";
-
-gebouw_list ( autfunction,
-              { urole : urole,
-                outputmode: outputmode,
+district_list ( "*",
+              {  outputmode: outputmode,
                  showall: showall,
                  reg_key: (reg_key != -1? reg_key : null),
                  dis_key: (dis_key != -1? dis_key : null)
diff --git a/APPL/ALG/alg_edit_district.asp b/APPL/ALG/alg_edit_district.asp
index a3f8d199a7..96d0b99bc5 100644
--- a/APPL/ALG/alg_edit_district.asp
+++ b/APPL/ALG/alg_edit_district.asp
@@ -1,57 +1,48 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 10:07a $
+/*  $Revision: 3 $
+    $Modtime: 10/20/09 9:53a $
+
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
-<!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery", "kenmerk"], js: ["expand_frame.js", "date.js", "FcltMgr.js"]})
+FCLTHeader.Requires({plugins:["jQuery", "kenmerk"], js: []})
+
+   var dis_key  = getQParamInt("dis_key");
 
-   var dis_key  = parseInt(getQParam("dis_key", "-1"), 10);
-   var reg_key
-   
    var onrgoedlvl = "'D'";
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-   var readonly = !(authparams.PRSwritelevel< 9 || authparams.ALGwritelevel < 9);
+
+   var authparams = alg.checkAutorisation();
+
+   if (!alg.canWriteDistrict(dis_key, authparams.uALGwritelevel))
+     user.auth_required_or_abort(false);
 
 if (dis_key > 0)
-{   
+{
     sql = " select * "
-        + "  FROM alg_district " 
+        + "  FROM alg_district "
         + "  WHERE alg_district_key = " + dis_key;
-   
+
      oRsMes = Oracle.Execute(sql);
 
-  if (!oRsMes.eof ) {
    var dis_oms   = oRsMes("alg_district_omschrijving").value;
 
-  } else {
-    Response.write("internal error or message deleted");
-    Response.End;
-  }
-  oRsMes.Close();
+   oRsMes.Close();
 }
 %>
 
@@ -64,6 +55,10 @@ if (dis_key > 0)
     function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
+
+        if (!validateForm("u2"))
+            return false;
+
         document.forms.u2.submit();
 
     }
@@ -76,48 +71,43 @@ if (dis_key > 0)
 
 <body id="showbody">
 <div id="show">
-<form name="u2" action="alg_edit_district_save.asp?dis_key=<%=dis_key%>" method=post onSubmit="alg_submit();">
+<form name="u2"
+      action="alg_edit_district_save.asp?dis_key=<%=dis_key%>"
+      method="post"
+      target="hidFrameSubmit"
+      onSubmit="alg_submit();">
 <%
 
-  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png", id:"bsubmit_alg_distrcit" },
-                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png", id:"bcancel_alg_district" } ];
+  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png" },
+                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png" } ];
 IFRAMER_HEADER(lcl_alg_district_frame, buttons);
 
 BLOCK_START("algInfo", "");
-%>
-<table>
-<%
-                    FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  regiokey: reg_key, 
-                                                                  districtkey: dis_key,
-                                                                  startlevel: 0, // Regio
-                                                                  eindlevel: 0 // District
-                                                                });
+    FCLTplaatsselector(authparams.ALGreadlevel, {
+          districtkey: dis_key,
+          startlevel: 0, // Regio
+          eindlevel: 0, // Regio
+          required: true
+        });
 %>
   <tr>
     <td class="label"><label><%=lcl_district%>:</label></td>
-    <td><input class="fldmsgsubj" type="text" id="dis_oms" name="dis_oms" value="<%=dis_oms%>"></td>
+    <td><input class="flddis required" type="text" id="dis_oms" name="dis_oms" value="<%=dis_oms%>"></td>
   </tr>
-</table>
-<%                                                                
+<%
 BLOCK_END();
-    BLOCK_START("algFlex", lcl_mld_flexblok);
- %>
-<!-- theText indicates flexkenmerken will follow on the next row -->
-<% //<tr id="theText"><td> %>
-<%
-  generateFlexKenmerkCode ({
-     bld_key    : dis_key,
-     onrgoedlvl : onrgoedlvl,
-     reado      : false
-     //mldman     : false // TODO: => MGE: Niet meer nodig. Wordt in generateFlexKenmerkCode bepaald.
+
+    BLOCK_START("algFlex", lcl_alg_flexblok);
+
+    generateFlexKenmerkCode ({
+     onrgoed_key    : dis_key,
+     onrgoed_niveau : onrgoedlvl,
+     reado          : false
 });
-%>
-<% // </td></tr> %>
-<%
    BLOCK_END();
 %>
 </form>
+<iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
 </div> <!-- edit -->
 </body>
 </html>
diff --git a/APPL/ALG/alg_edit_district_save.asp b/APPL/ALG/alg_edit_district_save.asp
index 009c23396b..0a6776bbd3 100644
--- a/APPL/ALG/alg_edit_district_save.asp
+++ b/APPL/ALG/alg_edit_district_save.asp
@@ -1,66 +1,70 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 2 $
-     $Modtime: 10/05/09 10:12a $
+     $Revision: 3 $
+     $Modtime: 10/14/09 5:07p $
 
      SUBMIT-form
 */ %>
 
 <!-- #include file="../../cust/install.inc" -->
-<!-- #include file="../Shared/funcodes.inc" -->
 <!-- #include file="../Shared/escape.inc" -->
-<!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../shared/save2db.inc" -->
-<!-- #include file="../shared/calendar.inc" -->
-<!-- #include file="../Shared/disCxprs3d.inc" -->
-<!-- #include file="../Shared/json2.js" -->
-<!-- #include file="../Shared/date_sql.inc" -->
+<!-- #include file="../Shared/kenmerk_common.inc"-->
 
 <% FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     }) %>
 <%
   var dis_key = getQParamInt( "dis_key" );
-  var dis_oms =getFParam("dis_oms", ""); 
-  
-     
-  
+
   var fields =  [ { dbs: "alg_district_omschrijving", typ: "varchar",  frm: "dis_oms" },
-                  { dbs: "alg_regio_key",            typ: "number",    frm: "regiokey" }];                     
+                  { dbs: "alg_regio_key",            typ: "number",    frm: "regiokey" }];
+
+var warning = "";
 if (dis_key > 0)
-  {  
+  {
     sql = buildUpdate("alg_district", fields)
         + "     alg_district_key = " + dis_key;
-                 
-    oRs = Oracle.Execute(sql);
-      /*    TODO : FLEXKENMERKEN OPSLAAN... HOE?
-            saveFlexKenmerken(dis_key, "ALG_KENMERK", "ALG_KENMERK_KEY",
-                                     "MLD_KENMERKMELDING_WAARDE", "mld_kenmerk_key",
-                                     null, // ??? Geen keys nodig, we hebben alles al opgeruimd
-                                     false, // geen QueryString maar Form
-                                     "D",null,
-                                     false, null);
-                                     
-                             function saveFlexKenmerken(parentKey, kenmerkTable, kenmerkParentKey,
-                           kenmerkWaarde, kenmerkKey, currentKenmerkenSQL, RequestQ,
-                           moduleName, moduleVal,
-                           isNew, flexPath)*/
+
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
    }
 else
   {
      fields.push({  dbs: "alg_district_key",         typ: "key",      seq: "alg_s_alg_district_key" });
      var regIns = buildInsert("alg_district", fields);
-     var reg_key = regIns.sequences["alg_district_key"];
+     var dis_key = regIns.sequences["alg_district_key"];
 
      sql = regIns.sql;
-     oRs = Oracle.Execute( sql );
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
-  %>  
+
+  if (!warning)
+  {
+      currentKenmerkenSQL = " SELECT k.ALG_kenmerk_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_KEY = " + dis_key;
+      saveFlexKenmerken(dis_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
+                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
+                                currentKenmerkenSQL, false,  //QueryForm, rest QueryString
+                                "ALG_ONRGOED_NIVEAU", "D",
+                                (dis_key<0),"ALG/D")
+}
+  %>
 <html>
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(document).ready(function () { FcltMgr.closeDetail(window, { district_key: <%=dis_key%> }); } );
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { dis_key: <%=dis_key%>,
+                                          warning: "<%=warning%>",
+                                          keepForm: <%=warning?"true":"false"%>
+                                         }); } );
     </script>
   </head>
   <body>
diff --git a/APPL/ALG/alg_edit_gebouw.asp b/APPL/ALG/alg_edit_gebouw.asp
index 2c50ed1e37..fcd6a9aefc 100644
--- a/APPL/ALG/alg_edit_gebouw.asp
+++ b/APPL/ALG/alg_edit_gebouw.asp
@@ -1,53 +1,46 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 1:37p $
+/*  $Revision: 3 $
+    $Modtime: 10/22/09 4:07p $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
-<% Response.Expires = -1; %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
 <!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery", "kenmerk"], js: ["expand_frame.js", "date.js", "FcltMgr.js"]})
+FCLTHeader.Requires({plugins:["suggest","jQuery", "kenmerk"], js: []})
+
+   var bld_key  = getQParamInt("bld_key");
 
-   var bld_key  = parseInt(getQParam("bld_key", "-1"), 10);
-   var loc_key
-  
-   
    var onrgoedlvl = "'G'";
-   
-   var read = false;
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
+
+   var authparams = alg.checkAutorisation();
+
+   if (!alg.canWriteGebouw(bld_key, authparams.uALGwritelevel))
+     user.auth_required_or_abort(false);
 
 if (bld_key > 0)
-{   
-    var read = true;
-    
+{
     sql =    " select * "
-    + "  FROM ALG_GEBOUW " 
+    + "  FROM ALG_GEBOUW "
     + "       WHERE alg_gebouw_key = " + bld_key;
-    
-    
+
+
     oRsMes = Oracle.Execute(sql);
 
     if (!oRsMes.eof ) {
@@ -69,14 +62,14 @@ if (bld_key > 0)
       var bld_dwgy   = oRsMes("ALG_GEBOUW_DWGY").value;
       var bld_x      = oRsMes("ALG_GEBOUW_X").value;
       var bld_y      = oRsMes("ALG_GEBOUW_Y").value;
-      var bld_bez    = oRsMes("ALG_GEBOUW_BEZ").value;       
-    } 
+      var bld_bez    = oRsMes("ALG_GEBOUW_BEZ").value;
+    }
     else {
        Response.write("internal error or message deleted");
         Response.End;
     }
     oRsMes.Close();
-}   
+}
 %>
 
 <html>
@@ -88,8 +81,9 @@ if (bld_key > 0)
     function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
+        if (!validateForm("u2"))
+            return false;
         document.forms.u2.submit();
-
     }
     function alg_cancel()
     {
@@ -98,31 +92,35 @@ if (bld_key > 0)
 </script>
 </head>
 
-<body id="showbody">
-<div id="show">
-<form name="u2" action="alg_edit_gebouw_save.asp?urole=bo&bld_key=<%=bld_key%>" method=post onSubmit="alg_submit();">
+<body id="editbody">
+<div id="edit">
+<form name="u2"
+      action="alg_edit_gebouw_save.asp?bld_key=<%=bld_key%>"
+      method="post"
+      target="hidFrameSubmit"
+      onSubmit="alg_submit();">
 <%
-  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png", id:"bsubmit_alg_distrcit" },
-                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png", id:"bcancel_alg_district" } ];
+  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png" },
+                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png" } ];
 IFRAMER_HEADER(lcl_alg_gebouw_frame, buttons);
 
 BLOCK_START("algLoc1", "");
+
+      FCLTplaatsselector(authparams.ALGreadlevel, {
+              gebouwkey: bld_key,
+              startlevel: 2, //Locatie
+              eindlevel: 2, // Locatie
+              readonly: bld_key > 0,
+              required: true });
 %>
-<table>
-<%
-          FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  locatiekey: loc_key, 
-                                                                  gebouwkey: bld_key,
-                                                                  startlevel: 2, //Locatie
-                                                                  eindlevel: 2, // Locatie
-                                                                  readonly: read }); %>
 
 <tr>
     <td class="label"><label><%=lcl_estate_gebouw_man_name%>:</label></td>
-    <td><input class="fldbld" type="text" id="bld_naam" name="bld_naam" value="<%=bld_naam%>"></td>
+    <td><input class="fldbld required" type="text" id="bld_naam" name="bld_naam" value="<%=bld_naam%>"></td>
 </tr>
 <tr>
     <%
+
     sql = "SELECT   alg_srtgebouw_key, "
         + "         alg_srtgebouw_omschrijving "
         + "    FROM alg_srtgebouw "
@@ -135,39 +133,34 @@ BLOCK_START("algLoc1", "");
                        readonly: false
                     }
                   );
+                  
 %>
 
 </tr>
 <tr>
     <td class="label"><label><%=lcl_estate_gebouw_man_code%>:</label></td>
-    <td><input class="fldbld" type="text" id="bld_code" name="bld_code" value="<%=bld_code%>"></td>
+    <td><input class="fldbld required" type="text" id="bld_code" name="bld_code" value="<%=bld_code%>"></td>
 </tr>
 <tr>
     <td class="label"><label><%=lcl_estate_gebouw_man_opmerk%>:</label></td>
     <td><input class="fldbld" type="text" id="bld_opmerk" name="bld_opmerk" value="<%=bld_opmerk%>"></td>
 </tr>
      <%
-    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: lcl_prs_dept_kosten,
-                       initKey: prs_kstpl,
-                       emptyOption: "",
-                       readonly: false
-                    }
-                  );
+         FCLTkostenplaatsselector(  "prs_kstpl",
+               "prs_kstpl",
+               user_key,
+              { kostenplaatsKey: 3,
+               label: lcl_prs_dept_kosten
+             });
 %>
 <tr>
     <td class="label"><label><%=lcl_estate_gebouw_ordernr%>:</label></td>
     <td><input class="fldbld" type="text" id="bld_ordrnr" name="bld_ordrnr" value="<%=bld_ordrnr%>"></td>
 </tr>
-</table>
+
 <% BLOCK_END();
+
 BLOCK_START("algLoc2", ""); %>
-<table>
 <tr>
     <td class="label"><label><%=lcl_estate_gebouw_man_bruto_vloeropp%>:</label></td>
     <td><input class="fldbld" type="text" id="bld_opp" name="bld_opp" value="<%=bld_opp%>"></td>
@@ -187,7 +180,7 @@ BLOCK_START("algLoc2", ""); %>
         + "         mld_adres_naam "
         + "    FROM mld_v_afleveradres "
         + "ORDER BY mld_adres_naam ";
-    FCLTselector("srt", sql,
+    FCLTselector("mld_adres", sql,
                     {  label: lcl_delivery_address,
                        initKey: mld_adres,
                        emptyOption: "",
@@ -195,7 +188,6 @@ BLOCK_START("algLoc2", ""); %>
                     }
                   );
 %>
-
 </tr>
 <tr>
     <td class="label"><label><%=lcl_geoxcoord%>:</label></td>
@@ -209,25 +201,18 @@ BLOCK_START("algLoc2", ""); %>
     <td class="label"><label><%=lcl_estate_gebouw_bez%>:</label></td>
     <td><input class="fldalgbez" type="checkbox" id="bld_bez" name="bld_bez" value="<%=bld_bez%>" <%= bld_bez==1 ? " checked " : "" %>></td>
 </tr>
-</table>
 <% BLOCK_END();
-BLOCK_START("mldFlex", lcl_mld_flexblok);
- %>
-<!-- theText indicates flexkenmerken will follow on the next row -->
-<% //<tr id="theText"><td> %>
-<%
+BLOCK_START("algFlex", lcl_alg_flexblok);
+
   generateFlexKenmerkCode ({
-     bld_key    : bld_key,
-     onrgoedlvl : onrgoedlvl,
-     reado      : false
-     //mldman     : false // TODO: => MGE: Niet meer nodig. Wordt in generateFlexKenmerkCode bepaald.
+     onrgoed_key    : bld_key,
+     onrgoed_niveau : onrgoedlvl,
+     reado          : false
 });
-%>
-<% // </td></tr> %>
-<%
    BLOCK_END();
 %>
 </form>
-</div> <!-- edit -->
+<iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
+</div> 
 </body>
 </html>
diff --git a/APPL/ALG/alg_edit_gebouw_save.asp b/APPL/ALG/alg_edit_gebouw_save.asp
index 5e3a601b84..7194c28758 100644
--- a/APPL/ALG/alg_edit_gebouw_save.asp
+++ b/APPL/ALG/alg_edit_gebouw_save.asp
@@ -1,20 +1,15 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 2 $
-     $Modtime: 10/05/09 1:44p $
+     $Revision: 3 $
+     $Modtime: 10/14/09 5:07p $
 
      SUBMIT-form
 */ %>
 
 <!-- #include file="../../cust/install.inc" -->
-<!-- #include file="../Shared/funcodes.inc" -->
 <!-- #include file="../Shared/escape.inc" -->
-<!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../shared/save2db.inc" -->
-<!-- #include file="../shared/calendar.inc" -->
-<!-- #include file="../Shared/disCxprs3d.inc" -->
-<!-- #include file="../Shared/json2.js" -->
-<!-- #include file="../Shared/date_sql.inc" -->
+<!-- #include file="../Shared/kenmerk_common.inc"-->
 
 <% FCLTHeader.Requires({ plugins:["jQuery"],
                       js: []
@@ -42,12 +37,15 @@
                   { dbs: "ALG_GEBOUW_Y", typ: "number",  frm: "bld_y" },
                   { dbs: "ALG_GEBOUW_BEZ", typ: "number",  frm: "bld_bez" }];
 
+var warning = "";
 if (bld_key > 0)
   {
     sql = buildUpdate("alg_gebouw", fields)
         + "     alg_gebouw_key = " + bld_key;
 
-    oRs = Oracle.Execute(sql);
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
 else
   {
@@ -56,15 +54,35 @@ else
   var bld_key = regIns.sequences["alg_gebouw_key"];
 
   sql = regIns.sql;
-  oRs = Oracle.Execute( sql );
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
-  %>
+
+  if (!warning)
+  {
+      currentKenmerkenSQL = " SELECT k.ALG_kenmerk_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_KEY = " + bld_key;
+      saveFlexKenmerken(bld_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
+                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
+                                currentKenmerkenSQL, false,  //QueryForm, rest QueryString
+                                "ALG_ONRGOED_NIVEAU", "G",
+                                (bld_key<0),"ALG/G")
+  }
+%>
 
 <html>
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(document).ready(function () { FcltMgr.closeDetail(window, { bld_key: <%=bld_key%> }); } );
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { bld_key: <%=bld_key%>,
+                                          warning: "<%=warning%>",
+                                          keepForm: <%=warning?"true":"false"%>
+                                         }); } );
     </script>
   </head>
   <body>
diff --git a/APPL/ALG/alg_edit_locatie.asp b/APPL/ALG/alg_edit_locatie.asp
index ca69b7a764..549d050705 100644
--- a/APPL/ALG/alg_edit_locatie.asp
+++ b/APPL/ALG/alg_edit_locatie.asp
@@ -1,51 +1,48 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 11:06a $
+/*  $Revision: 3 $
+    $Modtime: 10/20/09 9:51a $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
 <!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery","kenmerk"], js: ["expand_frame.js", "date.js", "FcltMgr.js"]})
+FCLTHeader.Requires({plugins:["suggest","jQuery","kenmerk"], js: ["expand_frame.js"]})
 
-// AUTORISATIEPARAMETERS
    var loc_key  = parseInt(getQParam("loc_key", "-1"), 10);
    var dis_key
-   
+
    var onrgoedlvl = "'L'";
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-   var readonly = !(authparams.PRSwritelevel< 9 || authparams.ALGwritelevel < 9);
+
+   var authparams = alg.checkAutorisation();
+
+   if (!alg.canWriteLocatie(loc_key, authparams.uALGwritelevel))
+     user.auth_required_or_abort(false);
 
 if (loc_key > 0)
-{  
-    sql =    " select * "
-    + "  FROM ALG_LOCATIE " 
-    + "       WHERE alg_locatie_key = " + loc_key;
-       
+{
+    sql = " select * "
+        + "  FROM ALG_LOCATIE "
+        + " WHERE alg_locatie_key = " + loc_key;
+
     oRsMes = Oracle.Execute(sql);
 
-    if (!oRsMes.eof ) {
       var loc_omsch  = oRsMes("alg_locatie_omschrijving").value;
       var loc_code   = oRsMes("alg_locatie_code").value;
       var bez_adres  = oRsMes("alg_locatie_adres").value;
@@ -62,13 +59,9 @@ if (loc_key > 0)
       var pst_adres  = oRsMes("alg_locatie_post_adres").value;
       var pst_plaats = oRsMes("alg_locatie_post_plaats").value;
       var pst_land   = oRsMes("alg_locatie_post_land").value;
-    } 
-    else {
-       Response.write("internal error or message deleted");
-        Response.End;
-    }
+
     oRsMes.Close();
-}   
+}
 %>
 
 <html>
@@ -80,8 +73,9 @@ if (loc_key > 0)
     function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
+        if (!validateForm("u2"))
+            return false;
         document.forms.u2.submit();
-
     }
     function alg_cancel()
     {
@@ -92,30 +86,33 @@ if (loc_key > 0)
 
 <body id="editbody">
 <div id="edit">
-<form name="u2" action="alg_edit_locatie_save.asp?loc_key=<%=loc_key%>" method=post onSubmit="alg_submit();">
+<form name="u2"
+      action="alg_edit_locatie_save.asp?loc_key=<%=loc_key%>"
+      method="post"
+      target="hidFrameSubmit"
+      onSubmit="alg_submit();">
 <%
 
-  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png", id:"bsubmit_alg_locatie" },
-                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png", id:"bcancel_alg_locatie" } ];
+  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png" },
+                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png" } ];
 IFRAMER_HEADER(lcl_alg_locatie_frame, buttons);
 
 BLOCK_START("algLoc1", "");
+      FCLTplaatsselector(authparams.ALGreadlevel, {
+          districtkey: dis_key,
+          locatiekey: loc_key,
+          startlevel: 1, //District
+          eindlevel: 1, // District
+          readonly: false,
+          required: true });
 %>
-<table>
-<%
-          FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  districtkey: dis_key, 
-                                                                  locatiekey: loc_key,
-                                                                  startlevel: 1, //District
-                                                                  eindlevel: 1, // District
-                                                                  readonly: false }); %>
 <tr>
     <td class="label"><label><%=lcl_estate_locatie_man_descr%>:</label></td>
-    <td><input class="fldloc" type="text" id="loc_code" name="loc_omsch" value="<%=loc_omsch%>" </td>
+    <td><input class="fldloc required" type="text" id="loc_code" name="loc_omsch" value="<%=loc_omsch%>" </td>
 </tr>
 <tr>
     <td class="label"><label><%=lcl_estate_locatie_man_code%>:</label></td>
-    <td><input class="fldloc" type="text" id="loc_code" name="loc_code" value="<%=loc_code%>" </td>
+    <td><input class="fldloc required" type="text" id="loc_code" name="loc_code" value="<%=loc_code%>" </td>
 </tr>
 <tr>
     <td class="label"><label><%=lcl_prs_address_bezoek_adres%>:</label></td>
@@ -175,22 +172,16 @@ BLOCK_START("algLoc2", ""); %>
 </tr>
 </table>
 <% BLOCK_END();
-BLOCK_START("mldFlex", lcl_mld_flexblok);
- %>
-<!-- theText indicates flexkenmerken will follow on the next row -->
-<% //<tr id="theText"><td> %>
-<%
+BLOCK_START("algFlex", lcl_alg_flexblok);
+
   generateFlexKenmerkCode ({
-     bld_key    : loc_key,
-     onrgoedlvl : onrgoedlvl,
-     reado      : false
-});
-%>
-<% // </td></tr> %>
-<%
-   BLOCK_END();
+     onrgoed_key    : loc_key,
+     onrgoed_niveau : onrgoedlvl,
+     reado          : false
+}); 
 %>
 </form>
-</div> <!-- edit -->
+<iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
+</div>
 </body>
 </html>
diff --git a/APPL/ALG/alg_edit_locatie_save.asp b/APPL/ALG/alg_edit_locatie_save.asp
index 55a7e0b957..9925dfc2ac 100644
--- a/APPL/ALG/alg_edit_locatie_save.asp
+++ b/APPL/ALG/alg_edit_locatie_save.asp
@@ -1,23 +1,18 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 2 $
-     $Modtime: 10/05/09 11:11a $
+     $Revision: 3 $
+     $Modtime: 10/14/09 5:08p $
 
      SUBMIT-form
 */ %>
 
 <!-- #include file="../../cust/install.inc" -->
-<!-- #include file="../Shared/funcodes.inc" -->
 <!-- #include file="../Shared/escape.inc" -->
-<!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../shared/save2db.inc" -->
-<!-- #include file="../shared/calendar.inc" -->
-<!-- #include file="../Shared/disCxprs3d.inc" -->
-<!-- #include file="../Shared/json2.js" -->
-<!-- #include file="../Shared/date_sql.inc" -->
+<!-- #include file="../Shared/kenmerk_common.inc"-->
 
 <% FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     }) %>
 <%
   var loc_key = getQParamInt( "loc_key" );
@@ -39,30 +34,52 @@
                   { dbs: "alg_locatie_y", typ: "number",  frm: "loc_y" },
                   { dbs: "alg_locatie_email", typ: "varchar",  frm: "loc_mail" }];
 
+var warning = "";
 if (loc_key > 0)
   {
     sql = buildUpdate("alg_locatie", fields)
         + "     alg_locatie_key = " + loc_key;
 
-    oRs = Oracle.Execute(sql);
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
 else
   {
     fields.push({  dbs: "alg_locatie_key",         typ: "key",      seq: "alg_s_alg_locatie_key" });
     var regIns = buildInsert("alg_locatie", fields);
-    var reg_key = regIns.sequences["alg_locatie_key"];
+    var loc_key = regIns.sequences["alg_locatie_key"];
 
-  sql = regIns.sql;
-  oRs = Oracle.Execute( sql );
+    sql = regIns.sql;
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
-  //TODO FLEXKENMERKEN SAVE. HOE?!
+
+  if (!warning)
+  {
+      currentKenmerkenSQL = " SELECT k.ALG_kenmerk_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_KEY = " + loc_key;
+      saveFlexKenmerken(loc_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
+                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
+                                currentKenmerkenSQL, false,
+                                "ALG_ONRGOED_NIVEAU", "L",
+                                (loc_key<0),"ALG/L")
+}
   %>
 
 <html>
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(document).ready(function () { FcltMgr.closeDetail(window, { locatie_key: <%=loc_key%> }); } );
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { loc_key: <%=loc_key%>,
+                                          warning: "<%=warning%>",
+                                          keepForm: <%=warning?"true":"false"%>
+                                         }); } );
     </script>
   </head>
   <body>
diff --git a/APPL/ALG/alg_edit_regio.asp b/APPL/ALG/alg_edit_regio.asp
index d29af9bc94..9336b63557 100644
--- a/APPL/ALG/alg_edit_regio.asp
+++ b/APPL/ALG/alg_edit_regio.asp
@@ -1,54 +1,47 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 1 $
-    $Modtime: 30-09-09 16:11 $
+/*  $Revision: 2 $
+    $Modtime: 10/14/09 5:13p $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
-<!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
+
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date.js", "FcltMgr.js"]})
+FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js"]})
 
-// AUTORISATIEPARAMETERS
    var reg_key  = parseInt(getQParam("regio_key", "-1"), 10);
 
+   var authparams = alg.checkAutorisation();
+
+   if (!alg.canWriteRegio(reg_key, authparams.uALGwritelevel))
+     user.auth_required_or_abort(false);
+
 if (reg_key > 0)
 {
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-   
     sql = " select * "
-        + "  FROM alg_regio " 
+        + "  FROM alg_regio "
         + "  WHERE alg_regio_key = " + reg_key;
-   
+
      oRsMes = Oracle.Execute(sql);
+     var reg_oms   = oRsMes("alg_regio_omschrijving").value;
 
-  if (!oRsMes.eof ) {
-   var reg_oms   = oRsMes("alg_regio_omschrijving").value;
-
-  } else {
-    Response.write("internal error or message deleted");
-    Response.End;
-  }
-  oRsMes.Close();
+     oRsMes.Close();
 }
 %>
 
@@ -61,8 +54,9 @@ if (reg_key > 0)
     function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
+        if (!validateForm("u2"))
+            return false;
         document.forms.u2.submit();
-
     }
     function alg_cancel()
     {
@@ -71,9 +65,13 @@ if (reg_key > 0)
 </script>
 </head>
 
-<body id="showbody">
-<div id="show">
-<form name="u2" action="alg_edit_regio_save.asp?regio_key=<%=reg_key%>" method=post onSubmit="alg_submit();">
+<body id="editbody">
+<div id="edit">
+<form name="u2"
+      action="alg_edit_regio_save.asp?regio_key=<%=reg_key%>"
+      method="post"
+      target="hidFrameSubmit"
+      onSubmit="alg_submit();">
 <%
 
   var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png", id:"bsubmit_alg_distrcit" },
@@ -84,13 +82,14 @@ BLOCK_START("algInfo", "");
 <table>
   <tr>
     <td class="label"><label><%=lcl_region%>:</label></td>
-    <td><input class="fldloc" type="text" id="reg_oms" name="reg_oms" value="<%=reg_oms%>"></td>
+    <td><input class="fldloc required" type="text" id="reg_oms" name="reg_oms" value="<%=reg_oms%>"></td>
   </tr>
 </table>
-<%                                                                
+<%
 BLOCK_END();
 %>
 </form>
-</div> <!-- edit -->
+<iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
+</div>
 </body>
 </html>
diff --git a/APPL/ALG/alg_edit_regio_save.asp b/APPL/ALG/alg_edit_regio_save.asp
index aa8ee4b9a7..9770479043 100644
--- a/APPL/ALG/alg_edit_regio_save.asp
+++ b/APPL/ALG/alg_edit_regio_save.asp
@@ -1,35 +1,32 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 30-09-09 9:44 $
+     $Revision: 2 $
+     $Modtime: 10/14/09 5:36p $
 
      SUBMIT-form
 */ %>
 
 <!-- #include file="../../cust/install.inc" -->
-<!-- #include file="../Shared/funcodes.inc" -->
 <!-- #include file="../Shared/escape.inc" -->
-<!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../shared/save2db.inc" -->
-<!-- #include file="../shared/calendar.inc" -->
-<!-- #include file="../Shared/disCxprs3d.inc" -->
-<!-- #include file="../Shared/json2.js" -->
-<!-- #include file="../Shared/date_sql.inc" -->
 
 <% FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     }) %>
 <%
   var reg_key = getQParamInt( "regio_key" );
 
   var fields =  [ { dbs: "alg_regio_omschrijving", typ: "varchar",  frm: "reg_oms" }];
 
+var warning = "";
 if (reg_key > 0)
   {
     sql = buildUpdate("alg_regio", fields)
         + "     alg_regio_key = " + reg_key;
 
-    oRs = Oracle.Execute(sql);
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
 else
   {
@@ -38,7 +35,9 @@ else
   var reg_key = regIns.sequences["alg_regio_key"];
 
   sql = regIns.sql;
-  oRs = Oracle.Execute( sql );
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
   %>
 
@@ -46,7 +45,12 @@ else
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(document).ready(function () { FcltMgr.closeDetail(window, { regio_key: <%=reg_key%> }); } );
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { regio_key: <%=reg_key%>,
+                                          warning: "<%=warning%>",
+                                          keepForm: <%=warning?"true":"false"%>
+                                         });
+         } );
     </script>
   </head>
   <body>
diff --git a/APPL/ALG/alg_edit_ruimte.asp b/APPL/ALG/alg_edit_ruimte.asp
index 558c516077..673325ea5a 100644
--- a/APPL/ALG/alg_edit_ruimte.asp
+++ b/APPL/ALG/alg_edit_ruimte.asp
@@ -1,55 +1,51 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 3 $
-    $Modtime: 10/05/09 3:27p $
+/*  $Revision: 4 $
+    $Modtime: 10/20/09 9:47a $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
 <!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date.js"]})
+FCLTHeader.Requires({plugins:["suggest","jQuery", "kenmerk"], js: ["expand_frame.js"]})
 
    var room_key  = parseInt(getQParam("room_key", "-1"), 10);
    var loc_key
    var bld_key
    var flr_key
-   
-   var onrgoedlvl = "'R'";
-   
-   var read = false;
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-   
-if  (room_key > 0)
-{ 
-    var read = true;
 
-    sql =    " select * "
-    + "  FROM ALG_RUIMTE " 
-    + "       WHERE alg_ruimte_key = " + room_key;
-        
+   var onrgoedlvl = "'R'";
+
+   var authparams = alg.checkAutorisation();
+
+   if (!alg.canWriteRuimte(room_key, authparams.mALGwritelevel))
+     user.auth_required_or_abort(false);
+
+if  (room_key > 0)
+{
+    sql = "select * "
+        + "  FROM ALG_RUIMTE "
+        + " WHERE alg_ruimte_key = " + room_key;
+
+
     oRsMes = Oracle.Execute(sql);
 
-    if (!oRsMes.eof ) {
       var room_srt   = oRsMes("ALG_SRTRUIMTE_KEY").value;
       var room_nr    = oRsMes("ALG_RUIMTE_NR").value;
       var room_ackey = oRsMes("ALG_RUIMTE_ACADKEY").value;
@@ -65,13 +61,9 @@ if  (room_key > 0)
       var room_gebe  = oRsMes("ALG_RUIMTE_OPP_GEVELBEKLEDING").value;
       var room_oppa1 = oRsMes("ALG_RUIMTE_OPP_ALT1").value;
       var room_oppa2 = oRsMes("ALG_RUIMTE_OPP_ALT2").value;
-    } 
-    else {
-       Response.write("internal error or message deleted");
-        Response.End;
-    }
+
     oRsMes.Close();
-}      
+}
 %>
 
 <html>
@@ -83,6 +75,10 @@ if  (room_key > 0)
     function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
+
+        if (!validateForm("u2"))
+            return false;
+
         document.forms.u2.submit();
 
     }
@@ -95,44 +91,60 @@ if  (room_key > 0)
 
 <body id="editbody">
 <div id="edit">
-<form name="u2" action="alg_edit_ruimte_save.asp?room_key=<%=room_key%>" method=post onSubmit="alg_submit();">
+<form name="u2" action="alg_edit_ruimte_save.asp?room_key=<%=room_key%>"
+      method="post"
+      target="hidFrameSubmit"
+      onSubmit="alg_submit();">
 <%
 
-  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png", id:"bsubmit_alg_locatie" },
-                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png", id:"bcancel_alg_locatie" } ];
+  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png" },
+                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png" } ];
 IFRAMER_HEADER(lcl_alg_ruimte_frame, buttons);
 
 BLOCK_START("algLoc1", "");
+
+          FCLTplaatsselector(authparams.ALGreadlevel, {
+                  locatiekey: loc_key,
+                  gebouwkey: bld_key,
+                  verdiepingkey: flr_key,
+                  ruimtekey: room_key,
+                  startlevel: 2, //Locatie
+                  eindlevel: 4, //verdieping
+                  readonly: (room_key > 0),
+                  required: true });
 %>
-<table>
-<%
-          FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  locatiekey: loc_key, 
-                                                                  gebouwkey: bld_key,
-                                                                  verdiepingkey: flr_key,
-                                                                  ruimtekey: room_key,
-                                                                  startlevel: 2, //Locatie
-                                                                  eindlevel: 4, //verdieping
-                                                                  readonly: read }); %>
 <tr>
     <td class="label"><label><%=lcl_estate_ruimte_man_descr%>:</label></td>
     <td><input class="fldroom" type="text" id="room_oms" name="room_oms" value="<%=room_oms%>"></td>
-</tr>  
+</tr>
 <tr>
     <td class="label"><label><%=lcl_estate_ruimte_man_nr%>:</label></td>
-    <td><input class="fldroom" type="text" id="room_nr" name="room_nr" value="<%=room_nr%>"></td>
+    <td><input class="fldroom required" type="text" id="room_nr" name="room_nr" value="<%=room_nr%>"></td>
 </tr>
 <tr>
-    <td class="label"><label><%=lcl_estate_ruimte_man_sort%>:</label></td>
-    <td><input class="fldroom"" type="text" id="room_srt" name="room_srt" value="<%=room_srt%>"></td>
+    <%
+     sql  = "SELECT   alg_srtruimte_key, "
+          + "         alg_srtruimte_omschrijving "
+          + "    FROM alg_v_aanwezigsrtruimte "
+          + "ORDER BY alg_srtruimte_upper "
+     FCLTselector("room_srt", sql,
+                    {  label: lcl_estate_ruimte_man_sort,
+                       initKey: room_srt,
+                       emptyOption: "",
+                       readonly: false
+                    }
+                  );
+%>
 </tr>
+<% BLOCK_END();
+BLOCK_START("algLoc2", ""); %>
 <tr>
     <td class="label"><label><%=lcl_estate_ruimte_bruto_vloeropp%>:</label></td>
     <td><input class="fldroom" type="text" id="room_opp" name="room_opp" value="<%=room_opp%>"></td>
 </tr>
 <tr>
     <td class="label"><label><%=lcl_estate_ruimte_getekendopp%>:</label></td>
-    <td><input class="fldroom"" type="text" id="room_ackey" name="room_ackey" value="<%=room_ackey%>"></td>
+    <td><input class="fldroom"" type="text" id="room_ackey" name="room_ackey" value="<%=room_ackey%>" readonly></td>
 </tr>
 <tr>
     <td class="label"><label><%=lcl_estate_ruimte_opp_alt1%>:</label></td>
@@ -140,7 +152,7 @@ BLOCK_START("algLoc1", "");
 </tr>
 <tr>
     <td class="label"><label><%=lcl_estate_ruimte_opp_alt2%>:</label></td>
-    <td><input class="fldroom" type="text" id="room_oppa2" name="room_oppa2" value="<%=room_oppa2%>"></td>
+    <td><input class="fldroom" type="text" id="room_oppa2" name="room_oppa2" value="<%=room_oppa2%>" readonly></td>
 </tr>
 <tr>
     <td class="label"><label><%=lcl_estate_ruimte_man_omtrek%>:</label></td>
@@ -154,24 +166,19 @@ BLOCK_START("algLoc1", "");
     <td class="label"><label><%=lcl_estate_ruimte_man_opmerk%>:</label></td>
     <td><input class="fldroom" type="text" id="room_opm" name="room_opm" value="<%=room_opm%>"></td>
 </tr>
-</table>
 <% BLOCK_END();
-BLOCK_START("mldFlex", lcl_mld_flexblok);
- %>
-<!-- theText indicates flexkenmerken will follow on the next row -->
-<% //<tr id="theText"><td> %>
-<%
+
+BLOCK_START("algFlex", lcl_alg_flexblok);
+
   generateFlexKenmerkCode ({
-     bld_key    : room_key,
-     onrgoedlvl : onrgoedlvl,
-     reado      : false
+     onrgoed_key    : room_key,
+     onrgoed_niveau : onrgoedlvl,
+     reado          : false
 });
-%>
-<% // </td></tr> %>
-<%
    BLOCK_END();
 %>
 </form>
-</div> <!-- edit -->
+<iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
+</div>
 </body>
 </html>
diff --git a/APPL/ALG/alg_edit_ruimte_save.asp b/APPL/ALG/alg_edit_ruimte_save.asp
index b16a83ba24..c220c1f6b0 100644
--- a/APPL/ALG/alg_edit_ruimte_save.asp
+++ b/APPL/ALG/alg_edit_ruimte_save.asp
@@ -1,20 +1,15 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 2 $
-     $Modtime: 10/05/09 3:34p $
+     $Revision: 3 $
+     $Modtime: 10/14/09 5:08p $
 
      SUBMIT-form
 */ %>
 
 <!-- #include file="../../cust/install.inc" -->
-<!-- #include file="../Shared/funcodes.inc" -->
 <!-- #include file="../Shared/escape.inc" -->
-<!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../shared/save2db.inc" -->
-<!-- #include file="../shared/calendar.inc" -->
-<!-- #include file="../Shared/disCxprs3d.inc" -->
-<!-- #include file="../Shared/json2.js" -->
-<!-- #include file="../Shared/date_sql.inc" -->
+<!-- #include file="../Shared/kenmerk_common.inc"-->
 
 <% FCLTHeader.Requires({ plugins:["jQuery"],
                       js: []
@@ -22,29 +17,32 @@
 <%
   var room_key = getQParamInt( "room_key" );
 
-  var fields =  [ { dbs: "ALG_VERDIEPING_KEY", typ: "key",  frm: "verdiepingkey" },
-                  { dbs: "ALG_SRTRUIMTE_KEY", typ: "key",  frm: "room_srt" },
-                  { dbs: "ALG_RUIMTE_NR", typ: "varchar",  frm: "room_nr" },
-                  { dbs: "ALG_RUIMTE_ACADKEY", typ: "varchar",  frm: "room_ackey" },
-                  { dbs: "ALG_RUIMTE_OMSCHRIJVING", typ: "varchar",  frm: "room_oms" },
-                  { dbs: "ALG_RUIMTE_GETEKEND", typ: "date",  frm: "room_tek" },
-                  { dbs: "ALG_RUIMTE_BRUTO_VLOEROPP", typ: "number",  frm: "room_opp" },
-                  { dbs: "ALG_RUIMTE_OMTREK", typ: "number",  frm: "room_omt" },
-                  { dbs: "ALG_RUIMTE_INHOUD", typ: "number",  frm: "room_inh" },
-                  { dbs: "ALG_RUIMTE_OPMERKING", typ: "varchar",  frm: "room_opm" },
+  var fields =  [ { dbs: "ALG_VERDIEPING_KEY",            typ: "key",  frm: "verdiepingkey" },
+                  { dbs: "ALG_SRTRUIMTE_KEY",             typ: "key",  frm: "room_srt" },
+                  { dbs: "ALG_RUIMTE_NR",                 typ: "varchar",  frm: "room_nr" },
+                  { dbs: "ALG_RUIMTE_ACADKEY",            typ: "varchar",  frm: "room_ackey" },
+                  { dbs: "ALG_RUIMTE_OMSCHRIJVING",       typ: "varchar",  frm: "room_oms" },
+                  { dbs: "ALG_RUIMTE_GETEKEND",           typ: "date",  frm: "room_tek" },
+                  { dbs: "ALG_RUIMTE_BRUTO_VLOEROPP",     typ: "number",  frm: "room_opp" },
+                  { dbs: "ALG_RUIMTE_OMTREK",             typ: "number",  frm: "room_omt" },
+                  { dbs: "ALG_RUIMTE_INHOUD",             typ: "number",  frm: "room_inh" },
+                  { dbs: "ALG_RUIMTE_OPMERKING",          typ: "varchar",  frm: "room_opm" },
                   { dbs: "ALG_RUIMTE_VLOER_OMSCHRIJVING", typ: "varchar",  frm: "room_flrom" },
-                  { dbs: "ALG_RUIMTE_OPP_GEVELGLAS", typ: "number",  frm: "room_gegl" },
-                  { dbs: "ALG_RUIMTE_OPP_SEPARATIEGLAS", typ: "number",  frm: "room_segl" },
+                  { dbs: "ALG_RUIMTE_OPP_GEVELGLAS",      typ: "number",  frm: "room_gegl" },
+                  { dbs: "ALG_RUIMTE_OPP_SEPARATIEGLAS",  typ: "number",  frm: "room_segl" },
                   { dbs: "ALG_RUIMTE_OPP_GEVELBEKLEDING", typ: "number",  frm: "room_gebe" },
-                  { dbs: "ALG_RUIMTE_OPP_ALT1", typ: "number",  frm: "room_oppa1" },
-                  { dbs: "ALG_RUIMTE_OPP_ALT2", typ: "varchar",  frm: "room_oppa2" }];
+                  { dbs: "ALG_RUIMTE_OPP_ALT1",           typ: "number",  frm: "room_oppa1" },
+                  { dbs: "ALG_RUIMTE_OPP_ALT2",           typ: "varchar",  frm: "room_oppa2" }];
 
+var warning="";
 if (room_key > 0)
   {
     sql = buildUpdate("alg_ruimte", fields)
         + "     alg_ruimte_key = " + room_key;
 
-    oRs = Oracle.Execute(sql);
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
 else
   {
@@ -53,15 +51,36 @@ else
     var room_key = regIns.sequences["alg_ruimte_key"];
 
     sql = regIns.sql;
-    oRs = Oracle.Execute( sql );
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
+
+  if (!warning)
+  {
+      currentKenmerkenSQL = " SELECT k.ALG_kenmerk_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_KEY = " + room_key;
+      saveFlexKenmerken(room_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
+                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
+                                currentKenmerkenSQL, false,  //QueryForm, rest QueryString
+                                "ALG_ONRGOED_NIVEAU", "R",
+                                (room_key<0),"ALG/R")
+}
   %>
 
 <html>
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(document).ready(function () { FcltMgr.closeDetail(window, { room_key: <%=room_key%> }); } );
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { room_key: <%=room_key%>,
+                                          warning: "<%=warning%>",
+                                          keepForm: <%=warning?"true":"false"%>
+                                        });
+        } );
     </script>
   </head>
   <body>
diff --git a/APPL/ALG/alg_edit_terreinsector.asp b/APPL/ALG/alg_edit_terreinsector.asp
index 11e3008a62..f28909bbc5 100644
--- a/APPL/ALG/alg_edit_terreinsector.asp
+++ b/APPL/ALG/alg_edit_terreinsector.asp
@@ -1,50 +1,44 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 3 $
-    $Modtime: 10/05/09 2:36p $
+/*  $Revision: 4 $
+    $Modtime: 10/20/09 9:44a $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
 <!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery", "kenmerk"], js: ["expand_frame.js", "date.js", "FcltMgr.js"]})
+FCLTHeader.Requires({plugins:["suggest","jQuery", "kenmerk"], js: ["expand_frame.js"]})
 
    var ter_key  = parseInt(getQParam("ter_key", "-1"), 10);
-   
+
    var onrgoedlvl = "'T'";
-   var read = false;
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-  
+
+   var authparams = alg.checkAutorisation();
+
 if (ter_key > 0)
-{   
-    var read = true;
-    sql =    " select * "
-    + "  FROM alg_terreinsector " 
-    + "       WHERE alg_terreinsector_key = " + ter_key;
-    
+{
+    sql = "select * "
+        + "  FROM alg_terreinsector "
+        + " WHERE alg_terreinsector_key = " + ter_key;
+
     oRsMes = Oracle.Execute(sql);
 
-    if (!oRsMes.eof ) {
       var loc_key   = oRsMes("ALG_LOCATIE_KEY").value;
       var ter_oms   = oRsMes("ALG_TERREINSECTOR_OMSCHRIJVING").value;
       var ter_code  = oRsMes("ALG_TERREINSECTOR_CODE").value;
@@ -54,12 +48,8 @@ if (ter_key > 0)
       var ter_omt   = oRsMes("ALG_TERREINSECTOR_OMTREK").value;
       var ter_aanmk = oRsMes("ALG_TERREINSECTOR_AANMAAK").value;
       var ter_ordnr = oRsMes("ALG_TERREINSECTOR_ORDERNR").value;
-      var prs_kstn  = oRsMes("PRS_KOSTENPLAATS_KEY").value;       
-    } 
-    else {
-       Response.write("internal error or message deleted");
-        Response.End;
-    }
+      var prs_kstn  = oRsMes("PRS_KOSTENPLAATS_KEY").value;
+
     oRsMes.Close();
 }
 %>
@@ -73,9 +63,11 @@ if (ter_key > 0)
     function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
+        if (!validateForm("u2"))
+            return false;
         document.forms.u2.submit();
-
     }
+
     function alg_cancel()
     {
         FcltMgr.closeDetail(window, { cancel: true } );
@@ -85,29 +77,31 @@ if (ter_key > 0)
 
 <body id="editbody">
 <div id="edit">
-<form name="u2" action="alg_edit_terreinsector_save.asp?ter_key=<%=ter_key%>" method=post onSubmit="alg_submit();">
+<form name="u2"
+      action="alg_edit_terreinsector_save.asp?ter_key=<%=ter_key%>"
+      method="post"
+      target="hidFrameSubmit"
+      onSubmit="alg_submit();">
 
 <%
-  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png", id:"bsubmit_alg_distrcit" },
-                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png", id:"bcancel_alg_district" } ];
+  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png" },
+                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png" } ];
 IFRAMER_HEADER(lcl_alg_terreinsector_frame, buttons);
 
-BLOCK_START("test", "");
-%>
-<table>
-<%
-                    FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  locatiekey: loc_key, 
-                                                                  startlevel: 2, // Locatie
-                                                                  eindlevel: 2, // Locatie
-                                                                  readonly: read
-                                                               });%>                                                             
+BLOCK_START("algInfo", "");
+    FCLTplaatsselector(authparams.ALGreadlevel, {
+          locatiekey: loc_key,
+          startlevel: 2, // Locatie
+          eindlevel: 2, // Locatie
+          readonly: ter_key > 0,
+          required: true
+       });%>
 <tr>
  <% sql = "SELECT   alg_srtterreinsector_key, "
         + "         alg_srtterreinsec_omschrijving "
         + "    FROM alg_v_aanwezigsrtterreinsector "
         + "ORDER BY alg_srtterreinsector_upper "
-       
+
         FCLTselector("ter_srkey", sql,
                     {  label: lcl_estate_terreinsector_man_sort,
                        initKey: ter_srkey,
@@ -118,62 +112,52 @@ BLOCK_START("test", "");
 </tr>
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_man_code%>:</label></td>
-    <td><input class="fldbld" type="text" id="ter_code" name="ter_code" value="<%=ter_code%>"></td>
-</tr> 
+    <td><input class="fldbld required" type="text" id="ter_code" name="ter_code" value="<%=ter_code%>"></td>
+</tr>
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_man_name%>:</label></td>
-    <td><input class="fldbld" type="text" id="ter_naam" name="ter_naam" value="<%=ter_naam%>"></td>
-</tr> 
+    <td><input class="fldbld required" type="text" id="ter_naam" name="ter_naam" value="<%=ter_naam%>"></td>
+</tr>
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_man_descr%>:</label></td>
     <td><input class="fldbld" type="text" id="ter_oms" name="ter_oms" value="<%=ter_oms%>"></td>
-</tr> 
+</tr>
 <tr>
     <%
-        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("bprs_kstn", sql,
-                    {  label: lcl_prs_dept_kosten,
-                       initKey: prs_kstn,
-                       emptyOption: "",
-                       readonly: false
-                    }
-                  ); %>
-</tr> 
+   FCLTkostenplaatsselector(  "prs_kstn",
+          "prs_kstn",
+          user_key,
+          { kostenplaatsKey: prs_kstn,
+          label: lcl_prs_dept_kosten   });
+   %>
+</tr>
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_ordernr%>:</label></td>
     <td><input class="fldbld" type="text" id="ter_ordnr" name="ter_ordnr" value="<%=ter_ordnr%>"></td>
-</tr> 
+</tr>
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_man_oppervlak%>:</label></td>
     <td><input class="fldbld" type="text" id="ter_opp" name="ter_opp" value="<%=ter_opp%>"></td>
-</tr> 
+</tr>
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_man_omtrek%>:</label></td>
     <td><input class="fldbld" type="text" id="ter_omt" name="ter_omt" value="<%=ter_omt%>"></td>
 </tr>
-</table>                                                                                                               
-<%                                                                
+<%
 BLOCK_END();
-    BLOCK_START("mldFlex", lcl_mld_flexblok);
- %>
-<!-- theText indicates flexkenmerken will follow on the next row -->
-<% //<tr id="theText"><td> %>
-<%
+
+BLOCK_START("algFlex", lcl_alg_flexblok);
+
   generateFlexKenmerkCode ({
-     bld_key    : ter_key,
-     onrgoedlvl : onrgoedlvl,
-     reado      : false
+     onrgoed_key    : ter_key,
+     onrgoed_niveau : onrgoedlvl,
+     reado          : false
 });
-%>
-<% // </td></tr> %>
-<%
+
    BLOCK_END();
 %>
 </form>
-</div> <!-- edit -->
+<iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
+</div>
 </body>
 </html>
diff --git a/APPL/ALG/alg_edit_terreinsector_save.asp b/APPL/ALG/alg_edit_terreinsector_save.asp
index bf0714defb..89e769a7f3 100644
--- a/APPL/ALG/alg_edit_terreinsector_save.asp
+++ b/APPL/ALG/alg_edit_terreinsector_save.asp
@@ -1,26 +1,21 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 2 $
-     $Modtime: 10/05/09 2:37p $
+     $Revision: 3 $
+     $Modtime: 10/14/09 5:08p $
 
      SUBMIT-form
 */ %>
 
 <!-- #include file="../../cust/install.inc" -->
-<!-- #include file="../Shared/funcodes.inc" -->
 <!-- #include file="../Shared/escape.inc" -->
-<!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../shared/save2db.inc" -->
-<!-- #include file="../shared/calendar.inc" -->
-<!-- #include file="../Shared/disCxprs3d.inc" -->
-<!-- #include file="../Shared/json2.js" -->
-<!-- #include file="../Shared/date_sql.inc" -->
+<!-- #include file="../Shared/kenmerk_common.inc"-->
 
 <% FCLTHeader.Requires({ plugins:["jQuery"],
                       js: []
                     }) %>
 <%
-  var ter_key = getQParamInt( "ter_key" );;
+  var ter_key = getQParamInt( "ter_key" );
 
   var fields =  [ { dbs: "alg_locatie_key", typ: "key",  frm: "locatiekey" },
                   { dbs: "ALG_TERREINSECTOR_OMSCHRIJVING", typ: "varchar",  frm: "ter_oms" },
@@ -30,14 +25,17 @@
                   { dbs: "ALG_TERREINSECTOR_OPPERVLAK", typ: "number",  frm: "ter_opp" },
                   { dbs: "ALG_TERREINSECTOR_OMTREK", typ: "number",  frm: "ter_omt" },
                   { dbs: "ALG_TERREINSECTOR_ORDERNR", typ: "varchar",  frm: "ter_ordnr" },
-                  { dbs: "PRS_KOSTENPLAATS_KEY", typ: "key",  frm: "prs_kstn" }];                                                     
+                  { dbs: "PRS_KOSTENPLAATS_KEY", typ: "key",  frm: "prs_kstn" }];
 
+var warning = "";
 if (ter_key > 0)
   {
     sql = buildUpdate("alg_terreinsector", fields)
         + "     alg_terreinsector_key = " + ter_key;
 
-    oRs = Oracle.Execute(sql);
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
 else
   {
@@ -46,15 +44,35 @@ else
   var ter_key = regIns.sequences["alg_terreinsector_key"];
 
   sql = regIns.sql;
-  oRs = Oracle.Execute( sql );
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
+
+  if (!warning)
+  {
+      currentKenmerkenSQL = " SELECT k.ALG_kenmerk_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_KEY = " + ter_key;
+      saveFlexKenmerken(ter_key, "ALG_ONRGOEDKENMERK", "ALG_ONRGOED_KEY",
+                                "ALG_ONRGOEDKENMERK_WAARDE", "ALG_KENMERK_KEY",
+                                currentKenmerkenSQL, false,  //QueryForm, rest QueryString
+                                "ALG_ONRGOED_NIVEAU", "T",
+                                (ter_key<0),"ALG/T")
+}
   %>
 
 <html>
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(document).ready(function () { FcltMgr.closeDetail(window, { ter_key: <%=ter_key%> }); } );
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { ter_key: <%=ter_key%>,
+                                          warning: "<%=warning%>",
+                                          keepForm: <%=warning?"true":"false"%>
+                                         }); } );
     </script>
   </head>
   <body>
diff --git a/APPL/ALG/alg_edit_verdieping.asp b/APPL/ALG/alg_edit_verdieping.asp
index c99487e4d5..f1c4e9b262 100644
--- a/APPL/ALG/alg_edit_verdieping.asp
+++ b/APPL/ALG/alg_edit_verdieping.asp
@@ -1,66 +1,53 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 1 $
-    $Modtime: 30-09-09 15:52 $
+/*  $Revision: 2 $
+    $Modtime: 10/14/09 12:50p $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
 <!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date.js", "FcltMgr.js"]})
+FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js"]})
 
-// AUTORISATIEPARAMETERS
    var flr_key  = parseInt(getQParam("flr_key", "-1"), 10);
    var bld_key
    var loc_key
-   
-   var onrgoedlvl = "'L'";
-   
-   var read = false;
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
+
+   var authparams = alg.checkAutorisation();
+
+   if (!alg.canWriteVerdieping(flr_key, authparams.uALGwritelevel))
+     user.auth_required_or_abort(false);
 
 if (flr_key > 0)
 {
-    var read = true;
-    
-    sql =    " select * "
-    + "  FROM ALG_VERDIEPING " 
-    + "       WHERE alg_verdieping_key = " + flr_key;
-    
-    
+    sql = " select * "
+        + "  FROM ALG_VERDIEPING "
+        + "       WHERE alg_verdieping_key = " + flr_key;
+
+
     oRsMes = Oracle.Execute(sql);
 
-    if (!oRsMes.eof ) {
-      var flr_omschr = oRsMes("ALG_VERDIEPING_OMSCHRIJVING").value;
-      var flr_volgnr = oRsMes("ALG_VERDIEPING_VOLGNR").value;
-      var flr_code   = oRsMes("ALG_VERDIEPING_CODE").value;
-    } 
-    else {
-       Response.write("internal error or message deleted");
-        Response.End;
-    }
+    var flr_omschr = oRsMes("ALG_VERDIEPING_OMSCHRIJVING").value;
+    var flr_volgnr = oRsMes("ALG_VERDIEPING_VOLGNR").value;
+    var flr_code   = oRsMes("ALG_VERDIEPING_CODE").value;
     oRsMes.Close();
-}   
+}
 %>
 
 <html>
@@ -72,8 +59,10 @@ if (flr_key > 0)
     function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
-        document.forms.u2.submit();
+        if (!validateForm("u2"))
+            return false;
 
+        document.forms.u2.submit();
     }
     function alg_cancel()
     {
@@ -84,42 +73,45 @@ if (flr_key > 0)
 
 <body id="showbody">
 <div id="show">
-<form name="u2" action="alg_edit_verdieping_save.asp?urole=bo&flr_key=<%=flr_key%>" method=post onSubmit="alg_submit();">
+<form name="u2"
+      action="alg_edit_verdieping_save.asp?urole=bo&flr_key=<%=flr_key%>"
+      method="post"
+      target="hidFrameSubmit"
+      onSubmit="alg_submit();">
 <%
-  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png", id:"bsubmit_alg_distrcit" },
-                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png", id:"bcancel_alg_district" } ];
+  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png" },
+                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png" } ];
 IFRAMER_HEADER(lcl_alg_verdieping_frame, buttons);
+
 BLOCK_START("algLoc1", "");
+      FCLTplaatsselector(authparams.ALGreadlevel, {
+              locatiekey: loc_key,
+              gebouwkey: bld_key,
+              verdiepingkey: flr_key,
+              startlevel: 2, //locatie
+              eindlevel: 3, // gebouw
+              readonly: (flr_key > 0),
+              required: true });
 %>
-<table>
-<%
-
-          FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  locatiekey: loc_key,
-                                                                  gebouwkey: bld_key,
-                                                                  verdiepingkey: flr_key,
-                                                                  startlevel: 2, //locatie
-                                                                  eindlevel: 3, // gebouw
-                                                                  readonly: read }); %>
-
 
 <tr>
     <td class="label"><label><%=lcl_estate_verdieping_man_descr%>:</label></td>
-    <td><input class="fldloc" type="text" id="flr_omschr" name="flr_omschr" value="<%=flr_omschr%>"></td>
+    <td><input class="fldflr required" type="text" id="flr_omschr" name="flr_omschr" value="<%=flr_omschr%>"></td>
 </tr>
+
 <tr>
     <td class="label"><label><%=lcl_estate_verdieping_man_code%>:</label></td>
-    <td><input class="fldloc" type="text" id="flr_volgnr" name="flr_volgnr" value="<%=flr_volgnr%>"></td>
+    <td><input class="fldflr required" type="text" id="flr_code" name="flr_code" value="<%=flr_code%>"></td>
 </tr>
 <tr>
     <td class="label"><label><%=lcl_estate_verdieping_man_volgnr%>:</label></td>
-    <td><input class="fldloc" type="text" id="flr_code" name="flr_code" value="<%=flr_code%>"></td>
+    <td><input class="fldflrnum required number" type="text" id="flr_volgnr" name="flr_volgnr" value="<%=flr_volgnr%>"></td>
 </tr>
-</table>
 <%
    BLOCK_END();
 %>
 </form>
-</div> <!-- edit -->
+<iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
+</div>
 </body>
 </html>
diff --git a/APPL/ALG/alg_edit_verdieping_save.asp b/APPL/ALG/alg_edit_verdieping_save.asp
index d35940466c..77df17e531 100644
--- a/APPL/ALG/alg_edit_verdieping_save.asp
+++ b/APPL/ALG/alg_edit_verdieping_save.asp
@@ -1,48 +1,47 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 30-09-09 15:43 $
+     $Revision: 2 $
+     $Modtime: 10/14/09 11:31a $
 
      SUBMIT-form
 */ %>
 
 <!-- #include file="../../cust/install.inc" -->
-<!-- #include file="../Shared/funcodes.inc" -->
 <!-- #include file="../Shared/escape.inc" -->
-<!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../shared/save2db.inc" -->
-<!-- #include file="../shared/calendar.inc" -->
-<!-- #include file="../Shared/disCxprs3d.inc" -->
-<!-- #include file="../Shared/json2.js" -->
-<!-- #include file="../Shared/date_sql.inc" -->
 
 <% FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     }) %>
 <%
   var flr_key = getQParamInt( "flr_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: "number",    frm: "bld_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" }
                 ];
 
+var warning = "";
 if (flr_key > 0)
   {
     sql = buildUpdate("alg_verdieping", fields)
         + "     alg_verdieping_key = " + flr_key;
 
-    oRs = Oracle.Execute(sql);
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
 else
   {
     fields.push({  dbs: "alg_verdieping_key",         typ: "key",      seq: "alg_s_alg_onroerendgoed_keys" });
-  var regIns = buildInsert("alg_verdieping", fields);
-  var flr_key = regIns.sequences["alg_verdieping_key"];
+    var regIns = buildInsert("alg_verdieping", fields);
+    var flr_key = regIns.sequences["alg_verdieping_key"];
 
-  sql = regIns.sql;
-  oRs = Oracle.Execute( sql );
+    sql = regIns.sql;
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
   %>
 
@@ -50,7 +49,10 @@ else
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(document).ready(function () { FcltMgr.closeDetail(window, { flr_key: <%=flr_key%> }); } );
+        $(document).ready(function ()
+          { FcltMgr.closeDetail(window, { flr_key: <%=flr_key%>,
+                                          warning: "<%=warning%>",
+                                          keepForm: <%=warning?"true":"false"%> }); } );
     </script>
   </head>
   <body>
diff --git a/APPL/ALG/alg_edit_wp.asp b/APPL/ALG/alg_edit_wp.asp
index a12060b850..9dbdf25c4f 100644
--- a/APPL/ALG/alg_edit_wp.asp
+++ b/APPL/ALG/alg_edit_wp.asp
@@ -1,68 +1,54 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 1 $
-    $Modtime: 30-09-09 16:01 $
+/*  $Revision: 2 $
+    $Modtime: 10/14/09 5:39p $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
 <!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
-<%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date.js", "FcltMgr.js"]})
+<!--#include file="../Shared/json2.js" -->
+<!-- #include file="alg.inc" -->
 
-// AUTORISATIEPARAMETERS
-   var wp_key  = parseInt(getQParam("wp_key", "-1"), 10);
-   var loc_key
-   var bld_key
-   var flr_key
-   var room_key
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-   
-   var read = false;   
+<%
+FCLTHeader.Requires({plugins:["jQuery"], js: [ "date.js"]})
+
+   var wp_key  = getQParamInt("wp_key");
+   var room_key = getQParamInt("room_key", -1); // ruimte
+
+   var authparams = alg.checkAutorisation();
 
 if (wp_key > 0)
-{  
-    var read = true;
-    
-    sql =    " select * "
-    + "  FROM PRS_WERKPLEK " 
-    + "       WHERE prs_werkplek_key = " + wp_key;
-    
+{
+    sql = " select * "
+        + "  FROM PRS_WERKPLEK "
+        + " WHERE prs_werkplek_key = " + wp_key;
+
     oRsMes = Oracle.Execute(sql);
 
-    if (!oRsMes.eof ) {
       var wp_volgnr = oRsMes("PRS_WERKPLEK_VOLGNR").value;
-      var wp_oms    = oRsMes("PRS_WERKPLEK_VOLGNR").value;
+      var wp_oms    = oRsMes("PRS_WERKPLEK_OMSCHRIJVING").value;
       var wp_vstopp = oRsMes("PRS_WERKPLEK_VASTOPP").value;
       var wp_opp    = oRsMes("PRS_WERKPLEK_OPP").value;
       var wp_vstopp = oRsMes("PRS_WERKPLEK_VASTOPP").value;
       var wp_virt   = oRsMes("PRS_WERKPLEK_VIRTUEEL").value;
-      var room_key  = oRsMes("PRS_ALG_RUIMTE_KEY").value;       
-    } 
-    else {
-       Response.write("internal error or message deleted");
-        Response.End;
-    }
+      var room_key  = oRsMes("PRS_ALG_RUIMTE_KEY").value;
+
     oRsMes.Close();
-}    
+}
 %>
 
 <html>
@@ -74,6 +60,8 @@ if (wp_key > 0)
     function alg_submit()
     {
         document.activeElement.blur(); // trigger laatste onChanges
+        if (!validateForm("u2"))
+            return false;
         document.forms.u2.submit();
 
     }
@@ -81,60 +69,88 @@ if (wp_key > 0)
     {
         FcltMgr.closeDetail(window, { cancel: true } );
     }
+    function alg_next()
+    {
+        alert("TODO: Next nog niet ondersteund")
+    }
+
+function process_host_info(data)
+{
+
+    $("#wp_volgnr").val(data.volgnr);
+    $("#wp_oms").val($("#ruimte").val() + "/" + data.volgnr)
+
+}
+
+function onChangeRoom(room_key)
+{
+  $.getJSON("../alg/get_volgnr_ajax.asp?room_key=" + room_key, process_host_info);
+}
+
+function onChangeVolgnr()
+{
+    $("#wp_oms").val($("#ruimte").val() + "/" + $("#wp_volgnr").val())
+}
+
+//onChangeRoom(<%=room_key%>);
+
 </script>
 </head>
 
 <body id="editbody">
-<div id="show">
-<form name="u2" action="alg_edit_wp_save.asp?wp_key=<%=wp_key%>" method=post onSubmit="alg_submit();">
+<div id="edit">
+<form name="u2"
+      action="alg_edit_wp_save.asp?wp_key=<%=wp_key%>"
+      method="post"
+      target="hidFrameSubmit"
+      onSubmit="alg_submit();">
 <%
-  var buttons =  [ {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png", id:"bsubmit_alg_distrcit" },
-                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png", id:"bcancel_alg_district" } ];
-IFRAMER_HEADER(lcl_alg_gebouw_frame, buttons);
+  var buttons =  [ {title: lcl_submit, action:"alg_next()",   icon: "opslaan.png" },
+                   {title: lcl_submit, action:"alg_submit()", icon: "opslaan.png" },
+                   {title: lcl_cancel, action:"alg_cancel()", icon: "undo.png" } ];
+IFRAMER_HEADER(lcl_alg_wp_frame, buttons);
 
-BLOCK_START("test", "");
+BLOCK_START("algInfo", "");
+    FCLTplaatsselector(authparams.ALGreadlevel, {
+              ruimtekey: room_key,
+              onRuiChange: "onChangeRoom(key)",
+              startlevel: 2, // Regio
+              eindlevel: 5, // District
+              readonly: (wp_key > 0),
+              required: true });
 %>
-<table>
-<%
-                    FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  locatie: loc_key, 
-                                                                  gebouwkey: bld_key,
-                                                                  verdiepingkey: flr_key,
-                                                                  ruimtekey: room_key,
-                                                                  startlevel: 2, // Regio
-                                                                  eindlevel: 5, // District
-                                                                  readonly: read   });
-%>                                                                  
 <tr>
     <td class="label"><label><%=lcl_estate_wp_seq%>:</label></td>
-    <td><input class="fldbld" type="text" id="wp_volgnr" name="wp_volgnr" value="<%=wp_volgnr%>"></td>
+    <td><input class="fldwp required number" type="text" id="wp_volgnr" name="wp_volgnr" onChange="onChangeVolgnr()" value="<%=wp_volgnr%>"></td>
 </tr>
 <tr>
     <td class="label"><label><%=lcl_workplace%>:</label></td>
-    <td><input class="fldbld" type="text" id="wp_oms" name="wp_oms" value="<%=wp_oms%>"></td>
+    <td><input class="fldwp" type="text" id="wp_oms" name="wp_oms" value="<%=wp_oms%>"></td>
 </tr>
 <tr>
 <td class="label"><label><%=lcl_estate_wp_fixed%>:</label></td>
                     <td>
                       <label for="wp_vstopp_v">
-                        <input type="radio" name="wp_vstopp_v" id="wp_vstopp_v" value="0" <%= wp_vstopp==0 ? " checked " : "" %>><%=lcl_estate_wp_fixed_v%>
+                        <input type="radio" name="wp_vstopp_v" id="wp_vstopp_v" value="" <%= wp_vstopp==null ? " checked " : "" %>><%=lcl_estate_wp_fixed_v%>
                       </label>
                       <label for="wp_vstopp_f">
-                        <input type="radio" name="wp_vstopp_f" id="wp_vstopp_f" value="1"<%= wp_vstopp==1 ? " checked " : "" %>><%=lcl_estate_wp_fixed_f%>
+                        <input type="radio" name="wp_vstopp_v" id="wp_vstopp_f" value="1" <%= wp_vstopp==1 ? " checked " : "" %>><%=lcl_estate_wp_fixed_f%>
                       </label>
                    </td>
+
 </tr>
     <td class="label"><label><%=lcl_estate_wp_area%>:</label></td>
-    <td><input class="fldbld" type="text" id="wp_opp" name="wp_opp" value="<%=wp_opp%>"></td>
+    <td><input class="fldwp float" type="text" id="wp_opp" name="wp_opp" value="<%=wp_opp%>"></td>
 <tr>
     <td class="label"><label><%=lcl_estate_wp_virt%>:</label></td>
     <td><input class="fldalgbez" type="checkbox" id="wp_virt" name="wp_virt" value="<%=wp_virt%>" <%= wp_virt==1 ? " checked " : "" %>></td>
 </tr>
-</table> 
+</table>
 <%
 BLOCK_END();
 %>
 </form>
-</div> <!-- edit -->
+<iframe src="../Shared/empty.html" name="hidFrameSubmit" style="display:none"></iframe>
+</div>
 </body>
 </html>
diff --git a/APPL/ALG/alg_edit_wp_save.asp b/APPL/ALG/alg_edit_wp_save.asp
index db3e5571a9..2c57600ef5 100644
--- a/APPL/ALG/alg_edit_wp_save.asp
+++ b/APPL/ALG/alg_edit_wp_save.asp
@@ -1,20 +1,15 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 2 $
-     $Modtime: 10/05/09 4:29p $
+     $Revision: 3 $
+     $Modtime: 10/16/09 2:24p $
 
      SUBMIT-form
 */ %>
 
 <!-- #include file="../../cust/install.inc" -->
-<!-- #include file="../Shared/funcodes.inc" -->
 <!-- #include file="../Shared/escape.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../shared/save2db.inc" -->
-<!-- #include file="../shared/calendar.inc" -->
-<!-- #include file="../Shared/disCxprs3d.inc" -->
-<!-- #include file="../Shared/json2.js" -->
-<!-- #include file="../Shared/date_sql.inc" -->
 
 <% FCLTHeader.Requires({ plugins:["jQuery"],
                       js: []
@@ -22,43 +17,52 @@
 <%
   var wp_key = getQParamInt( "wp_key" );
 
-  var fields =  [ { 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" },
-                  { dbs: "PRS_WERKPLEK_OPP", typ: "number",  frm: "wp_opp" },
+                  { 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",  frm: "wp_virt" },
-                  { dbs: "PRS_ALG_RUIMTE_KEY", typ: "key",  frm: "ruimtekey" },
+                  { 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)
   {
     sql = buildUpdate("prs_werkplek", fields)
         + "     prs_werkplek_key = " + wp_key;
 
-    oRs = Oracle.Execute(sql);
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
 else
   {
     fields.push({  dbs: "prs_werkplek_key",         typ: "key",      seq: "prs_s_prs_werkplek_key" });
     var regIns = buildInsert("prs_werkplek", fields);
-    var reg_key = regIns.sequences["prs_werkplek_key"];
+    var wp_key = regIns.sequences["prs_werkplek_key"];
 
     sql = regIns.sql;
-    oRs = Oracle.Execute( sql );
+    var err = Oracle.Execute(sql, true);
+    if (err.friendlyMsg_js)
+        warning = err.friendlyMsg_js;
   }
   %>
-
+// TODO: checkboxen ook saven? Jos?
 <html>
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(document).ready(function () { FcltMgr.closeDetail(window, { wp_key: <%=wp_key%> }); } );
+        $(document).ready(function () {
+            FcltMgr.closeDetail(window, { wp_key: <%=wp_key%>,
+                                          warning: "<%=warning%>",
+                                          keepForm: <%=warning?"true":"false"%>
+                                          }); } );
     </script>
   </head>
   <body>
diff --git a/APPL/ALG/alg_flexkenmerk.inc b/APPL/ALG/alg_flexkenmerk.inc
index 6965020df5..c67504c328 100644
--- a/APPL/ALG/alg_flexkenmerk.inc
+++ b/APPL/ALG/alg_flexkenmerk.inc
@@ -1,26 +1,23 @@
 <% /*
-     $Revision: 1 $
-     $Modtime: 22-09-09 10:56 $
+     $Revision: 2 $
+     $Modtime: 10/20/09 9:34a $
 
-     File:               ALG@/load_kenmerk.asp
-     Status:             60%
-     Description:        cnt_search.asp: Genereert html code voor de presentatie van de flexvelden voor cnt overzichten
-                         cnt.asp: Genereert javascript code om de flexkenmerken in het cnt_edit popup scherm dynamisch bij te werken
+     File:               ALG/alg_flexkenmerk.inc
+     Status:             95%
+     Description:        Functie die html code genereert voor de presentatie van de flexvelden
      Parameters:         urole                Rol van de gebruiker (frontend, frontoffice, backoffice, management info)
-                         cnt_key              Contract key
-                         disc_key             Contractsoort key
+                         onrgoed_niveau       Onroerendgoed niveua
                          reado                Readonly
                          advanced             Geadvanceerd
-     Context:            cnt_search.asp: Deze gegenereerde html code wordt in modal div geplaats van cnt_search.asp
-                         cnt.asp: Of submits naar/via cnt.asp!
-     Note:               cnt.asp: Het formulier van cnt.asp wordt dynamisch gewijzigd met onze flexvelden
-
-     TODO:               Aanpassen voor gebruik door cnt.asp
+                         reqId                Perslid key
+     Context:            Functie wordt aangeroepen door
+                         1) load_kenmerk.asp
+                         2) alg_edit_xxx.asp die initieel serverside deze html code invoegd.
+     Note:               
 */ %>
 
 <%
 var DOCTYPE_Disable = true;
-Response.Expires = -1;
 var fp = new Object(); // dummy, moet er nog uitgewerkt worden TODO:
 %>
 
@@ -40,15 +37,13 @@ function generateFlexKenmerkCode(params)
     var minfo = (urole == "mi");
     var frontend = (urole == "fe" || (!fronto & !backo & !minfo));
 
-//    var bld_key = getQParamInt("bld_key", -1); // Contract key
-    var bld_key = params.bld_key;
-    var advanced = getQParam("advanced", 0) == 1; // Geavanceerd
-    var reqId = getQParamInt("reqId", -1); // Perslid key (!search && multiMode)
-    var onrgoedlvl = getQParam("onrgoedlvl", -1);
-    var onrgoedlvl = params.onrgoedlvl;
-    var reado = params.reado;
+    var onrgoed_key = params.onrgoed_key; // Onroerendgoed key
+    var onrgoed_niveau = params.onrgoed_niveau; // Onroerendgoed niveau
+    var reado = params.reado; // Readonly
+    var advanced = params.advanced; // Geavanceerd
+    var reqId = params.reqId; // Perslid key (!search && multiMode)
 
-    __Log(onrgoedlvl);
+    __Log(onrgoed_niveau);
 
     var autfunction = "";
     switch(urole)
@@ -79,11 +74,11 @@ sql = "SELECT   k.alg_kenmerk_key, "
      + "         k.alg_kenmerk_dec, "
      + "         k.alg_kenmerk_nmin, "
      + "         k.alg_kenmerk_nmax, "
-     +           (bld_key > 0
+     +           (onrgoed_key > 0
      ? "         (SELECT v.alg_onrgoedkenmerk_waarde "
      + "            FROM alg_onrgoedkenmerk v "
-     + "            WHERE v.alg_onrgoed_key = " + bld_key
-     + "            AND v.alg_onrgoed_niveau = " + onrgoedlvl
+     + "            WHERE v.alg_onrgoed_key = " + onrgoed_key
+     + "            AND v.alg_onrgoed_niveau = " + onrgoed_niveau
      + "            AND v.alg_kenmerk_key = k.alg_kenmerk_key) waarde, "
      : "         k.alg_kenmerk_default, " )
      + "         COALESCE (k.alg_kenmerk_volgnr, 0), "
@@ -93,7 +88,7 @@ sql = "SELECT   k.alg_kenmerk_key, "
      + "         0 "
      + "    FROM alg_kenmerk k, "
      + "         alg_refkenmerk r "
-     + "   WHERE k.alg_kenmerk_niveau = " + onrgoedlvl
+     + "   WHERE k.alg_kenmerk_niveau = " + onrgoed_niveau
      + "     AND k.alg_refkenmerk_key = r.alg_refkenmerk_key(+) "
      + "     AND k.alg_kenmerk_verwijder IS NULL "
      + "ORDER BY k.alg_kenmerk_volgnr, "
@@ -105,12 +100,12 @@ sql = "SELECT   k.alg_kenmerk_key, "
 
     listKenmerk(sql,
                 "ALG", //module
-                "A" + (bld_key > 0? bld_key : tmp_folder), //foldername?
-                { kenmerk_2col: (advanced? true : false), // In edit mode kenmerken onder elkaar en niet in 2 kolommen.
+                "A" + (onrgoed_key > 0? onrgoed_key : tmp_folder), //foldername?
+                { kenmerk_2col: true, //PF: ik denk: in ALG passen er altijd wel 2 naast elkaar (advanced? true : false), // In edit mode kenmerken onder elkaar en niet in 2 kolommen.
                   kenmerk_search: advanced,
                   kenmerk_colspan: false,
                   fnIsReadonly: isReadonly,
-                  parentKey: bld_key }
+                  parentKey: onrgoed_key }
                );
 %>
   </table>
diff --git a/APPL/ALG/alg_gebouw.asp b/APPL/ALG/alg_gebouw.asp
index d99a883c3b..afdd1f86e5 100644
--- a/APPL/ALG/alg_gebouw.asp
+++ b/APPL/ALG/alg_gebouw.asp
@@ -1,29 +1,23 @@
 <%@language = "javascript" %>
-<%  // testing: bes_key=1251054
+<%
+/*  $Revision: 3 $
+    $Modtime: 10/14/09 4:53p $
 
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 1:33p $
+    File:
+    Status:
+    Description:
+
+    Parameters:
 
-    File:               bes_edit.asp
-    Status:             40% (new style)
-    Description:        Muteerscherm voor bestellingen
-                        dit is de grote 'wrapper' voor de diverse andere schermen
-    Parameters:         urole
-                        bes_key
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
-<!--#include file="../Shared/funcodes.inc" -->
-
 <!--#include file="../Shared/iface.inc" -->
 
-<!--#include file="../Shared/algautlevel.inc" -->
-<!--#include file="../Shared/cmenuFn.inc"-->
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jquery-ui.js"]})
-
+FCLTHeader.Requires({plugins:["suggest","jQuery"], js: []})
 
   var autfunction = "WEB_ALGMAN";
   var authparams = user.checkAutorisation(autfunction);   //Wat weet ik dan nou van disciplines???
@@ -31,6 +25,21 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
 
   // dit lijkt mij de enige gehele readonlyverklaring, de rest is localer
   var readonly = !(authparams.PRSwritelevel< 9 || authparams.ALGwritelevel < 9);
+
+  if (bld_key > 0)
+  {
+        sql = " select alg_gebouw_code "
+            + "  FROM alg_gebouw "
+            + "  WHERE alg_gebouw_key = " + bld_key;
+
+     oRsMes = Oracle.Execute(sql);
+
+     var bld_name   = " " + oRsMes("alg_gebouw_code").value;
+  }
+  else
+  {
+    var bld_name = ""
+  }
 %>
 
 
@@ -40,6 +49,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
    FCLTHeader.Generate();
 %>
   <script  type="text/javascript" >
+      FcltMgr.setTitle("<%=lcl_building%> <%=bld_name%>", {hot:false});
       function algClose(params)
       {
           <% if (bld_key == -1)
@@ -49,10 +59,15 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
                   FcltMgr.closeDetail(window, params );
                   return true;
               }
-              FcltMgr.setTitle("<%=lcl_building%> " + params.bld_key, {hot:false});
-              window.location.href = "alg_gebouw.asp?verynew=1&key=" + params.bld_key;
+              if (!params.keepForm)
+                  window.location.href = "alg_gebouw.asp?verynew=1&key=" + params.bld_key;
           <% } else { // Bestaande melding bewerkt, switch naar show-mode %>
-              $("#algFrame")[0].src = "alg_show_gebouw.asp?bld_key=<%=bld_key%>";
+              if (params.close)
+              {
+                FcltMgr.closeDetail(window, { close: true})
+              }
+              if (!params.keepForm)
+                  $("#algFrame")[0].src = "alg_show_gebouw.asp?bld_key=<%=bld_key%>";
           <% } %>
       }
     </script>
@@ -69,21 +84,7 @@ page += "?bld_key="+bld_key;
 IFRAMER("algFrame", page, { title: lcl_alg_gebouw_frame,
                             initHeight: "450px",
                             FcltClose: "algClose" } );
-
-// AKZA#88 don not allow printing if call isn't saved yet.
-// UWVA#427 also print for FE
-if (bld_key>-1 ) {
-
-  add_str ='huh?';
-  menuArray = new Array();
-  menuArray[0] = lcl_print_report;
-  menuArray[1] = lcl_noti_vis_email;
-  onClickArray = new Array();
-  onClickArray[0] = 'print_test(0)';
-  onClickArray[1] = 'print_test(1)';
-
-// TODO: ik denk niet hier:  generateCmenu("c_menu")
-} %>
+%>
 
 </body>
 </html>
diff --git a/APPL/ALG/alg_gebouw_list.inc b/APPL/ALG/alg_gebouw_list.inc
index edb37bdafa..25f34a5c85 100644
--- a/APPL/ALG/alg_gebouw_list.inc
+++ b/APPL/ALG/alg_gebouw_list.inc
@@ -1,6 +1,6 @@
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 23:40 $
+     $Revision: 2 $
+     $Modtime: 10/14/09 2:16p $
     File:               alg_gebouw.inc
     Description:        Show an overview of gebouw items in list-form,
                         which meets with the given requirements
@@ -14,10 +14,11 @@
 <!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     })
 
  function fnrowData(oRs)
@@ -32,15 +33,8 @@ FCLTHeader.Requires({ plugins:["jQuery"],
           return JSON.stringify(data);
         }
 %>
-<script>
- dtable = "ALG_GEBOUW";
-</script>
-
 <script type="text/javascript">
 
-  var lcl_row_delete_failed1 = "<%=lcl_row_delete_failed1%>";
-  var lcl_row_delete_failed2 = "<%=lcl_row_delete_failed2%>";
-
   var autosearch = 1 // automatisch laden van resultaat op search pagina
 
   function gotoDetails(row)
@@ -61,33 +55,17 @@ FCLTHeader.Requires({ plugins:["jQuery"],
     var url = "appl/ALG/alg_gebouw.asp?mode=viewUpdate&key="+algData.key;
     FcltMgr.openDetail(url, "<%=lcl_building%>" + ' ' + algData.oms);
   }
-    function doDelete(row)
-  {
-   if (confirm('<%=lcl_row_delete_confirm%>')) {
 
-        var algData = eval('(' + row.ROWDATA + ')');
-        parent.document.body.style.cursor = "wait";
-        document.body.style.cursor = "wait";
-        hiddenFrame.navigate("setAlgVerwijder.asp?key=" + algData.key + "&table=" + dtable);
-      }
-  }
-
-  function DeleteFailed(result)
+function doDelete(row, isMulti)
 {
-  if (result == 1 ) {
-    alert(lcl_row_delete_failed1);
-  } else if ( result == 2 ) {
-    alert(lcl_row_delete_failed2);
-  }
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
 
-function Deleted()
-{
-  algtable.deleteSelectedRows();
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
+  var bld_key = row.ROWKEY;
+    if (isMulti || confirm("<%=lcl_alg_del_txt_verdieping%>"))
+       $.post("alg_delete.asp",
+               { key: bld_key,
+                 level: "G" },
+                 FcltCallback,
+                 "json");
 }
 </script>
 <%
@@ -95,8 +73,9 @@ function Deleted()
 function gebouw_list(pautfunction, params)
 {
   // De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
-  var authparams = user.checkAutorisation(pautfunction);
-  var canWrite = (authparams.ALGwritelevel < 9);  // TODO: fijner, ik denk 3. Ik moet voor deze locatie, dit district of deze regio schrijfrechten hebben
+  var addButton = [];
+  var authparams = alg.checkAutorisation();
+  var canAdd = (authparams.mALGwritelevel < 4);
 
   // Voor resulttable de globalen zetten; zou ng anders moeten.
   var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
@@ -105,6 +84,14 @@ function gebouw_list(pautfunction, params)
   var loc_key = params.loc_key;
   var bld_key = params.bld_key;
   var bld_func = params.bld_func;
+
+    function fnrowActionEnabler(oRs)
+    {
+        var eDelete = false;
+        if (alg.canWriteGebouw(oRs("alg_gebouw_key").value, authparams.mALGwritelevel))
+            eDelete = true;
+        return ({eDelete: eDelete})
+    }
 %>
 
   <html>
@@ -144,13 +131,11 @@ function gebouw_list(pautfunction, params)
 
    if (bld_key)
       {
-      __Log("bld_key is  "  + bld_key);
       sqln += " AND g.alg_gebouw_key = " + bld_key;
       }
 
    else if (loc_key)
       {
-      __Log("loc_key is  "  + loc_key);
       sqln += " AND g.alg_locatie_key = " + loc_key;
       }
 
@@ -164,17 +149,25 @@ function gebouw_list(pautfunction, params)
           +  "          g.alg_gebouw_upper ASC  ";
 
     var addurl = "appl/alg/alg_gebouw.asp";
+
+      if (canAdd)
+        {
+        addButton = [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+        }
+
 //    addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
 
     var rst = new ResultsetTable({ sql:sqln,
                                    keyColumn: "alg_gebouw_key",
                                    ID: "algtable",
+                                   showAll: showall,
                                    rowData: fnrowData,
+                                   rowActionEnabler: fnrowActionEnabler,
                                    flexModule: "ALG",
                                    flexId: "alg_gebouw_key",
                                    filterParams: params,
                                    outputmode: outputmode,
-                                   buttons: [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+                                   buttons: addButton
                                   });
 
     rst.addColumn(new Column({caption: lcl_estate_locatie_man_descr, content: "alg_locatie_omschrijving"}));
@@ -192,14 +185,12 @@ function gebouw_list(pautfunction, params)
     }
 
     rst.addAction({ action: "gebouwEdit", caption: lcl_edit, isDefault:  true});
-    if (canWrite )
-      rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true});
+    rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true, enabler: "eDelete"});
     rst.addAction({ action: "gotoDetails", caption: lcl_goto_verdieping_list});
     rst.addAction({ action: "gotoParent", caption: lcl_goto_locatie_list});
 
     var cnt = rst.processResultset();
 %>
-<iframe src="../Shared/empty.asp" id=hiddenFrame name=hiddenFrame style="display:none"></iframe>
 </body>
 </html>
 <%}%>
diff --git a/APPL/ALG/alg_gebouw_search.asp b/APPL/ALG/alg_gebouw_search.asp
index a04701c776..999d18645d 100644
--- a/APPL/ALG/alg_gebouw_search.asp
+++ b/APPL/ALG/alg_gebouw_search.asp
@@ -1,7 +1,7 @@
 <%@ LANGUAGE = JavaScript %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 15:18 $
+     $Revision: 2 $
+     $Modtime: 10/23/09 9:19a $
 */ %>
 
 <% Response.Expires = 0 %>
@@ -10,6 +10,7 @@
 <!-- #include file="../Shared/escape.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
 <!-- #include file="../Shared/selector.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"],
@@ -24,12 +25,9 @@ var gebouw_func = getQParam("gebouw_func", "");
 
 var autosearch = getQParam("autosearch", -1);
 
-autfunction = "WEB_ALGMAN"; //TODO WEB_ALGUSE 
-var authparams = user.checkAutorisation(autfunction);
-
-var lcl_bld_kenmerken = "lcl_gebouw_kenmerken";
+var authparams = alg.checkAutorisation();
 %>
-      
+
 <html>
   <head>
     <%  FCLTHeader.Generate(); %>
@@ -39,24 +37,23 @@ var lcl_bld_kenmerken = "lcl_gebouw_kenmerken";
                 // Submitten met kenmerken
                 doSubmitWithKenmerken(0);
             }
-    
+
         function myModal()
-        {        
+        {
           var lvl = "'G'";
           var key = 0;
           var bld_key = "";
-          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&bld_key=" + bld_key + "&onrgoedlvl=" + lvl;
-          alert(url);
-          var titel = "<%=lcl_bld_kenmerken%>";
+          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
+          var titel = "<%=lcl_properties%>";
           showKenmerkModal(key, url, titel)
         }
-        
+
           $(document).ready(function() {<% if (autosearch == 1) { %> document.forms.u2.submit();<%}%>});
       </script>
   </head>
   <body id="searchbody">
     <div id="search">
-<%    BLOCK_START("searchtable", lcl_filterblok);%>    
+<%    BLOCK_START("searchtable", lcl_filterblok);%>
       <form name="u2" target="workFrame" action="alg_gebouw_search_list.asp" method="get">
         <table id="searchtable"><!-- 1 rij, 2 kolommen -->
           <tr>
@@ -66,12 +63,12 @@ var lcl_bld_kenmerken = "lcl_gebouw_kenmerken";
                 <tr class="primsearch">
                   <td colspan="2">
 <%
-                    FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  locatiekey: locatie_key, 
+                    FCLTplaatsselector(authparams.ALGreadlevel, {
+                                                                  locatiekey: locatie_key,
                                                                   gebouwkey: gebouw_key,
                                                                   startlevel: 2, // locatie
                                                                   eindlevel: 3, // gebouw
-                                                                  whenEmpty: lcl_search_generic 
+                                                                  whenEmpty: lcl_search_generic
                                                                 });
 %>
                   </td>
@@ -84,7 +81,7 @@ var lcl_bld_kenmerken = "lcl_gebouw_kenmerken";
               <!-- Zoektekst -->
                 <tr class="primsearch">
 <%            sql = "SELECT alg_srtgebouw_key"
-                  + ", alg_srtgebouw_omschrijving" 
+                  + ", alg_srtgebouw_omschrijving"
                   + " FROM alg_srtgebouw"
                   + " WHERE alg_srtgebouw_verwijder IS NULL"
                   + " ORDER BY alg_srtgebouw_upper";
diff --git a/APPL/ALG/alg_gebouw_search_list.asp b/APPL/ALG/alg_gebouw_search_list.asp
index 97b7025447..fff04365fc 100644
--- a/APPL/ALG/alg_gebouw_search_list.asp
+++ b/APPL/ALG/alg_gebouw_search_list.asp
@@ -1,7 +1,7 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 12:06 $
+     $Revision: 2 $
+     $Modtime: 10/12/09 10:02a $
 
     File:        msg_search_list.asp
     Description: Vangt de parameters van msg_search op en verwerkt die in een aanroep van msg_list
@@ -17,12 +17,6 @@
 <!-- #include file="alg_gebouw_list.inc" -->
 
 <%
-var urole = getQParam("urole", "");   // Indien niet meegegeven, veronderstel dan frontend gebruik
-var fronto = (urole == "fo");
-var backo = (urole == "bo");
-var minfo = (urole == "mi");
-var frontend = (urole == "fe" || (!fronto & !backo & !minfo));
-
 // FORM parameters: de waarde indien aanwezig, anders null
 // Vaak is een lege selectie ook een -1, dus dan is-ie wel aanwezig, maar hoeft niet
 // als filter te worden toegepast. Dan is null dus gelijk aan -1, qua betekenis,
@@ -34,13 +28,10 @@ var showall = getQParam("showall", "0") == "1";
 var loc_key = parseInt(getQParam("locatiekey", -1), 10); // Locatie
 var bld_key = parseInt(getQParam("gebouwkey", -1), 10); // Gebouw
 
-var bld_func = parseInt(getQParam("bldfunction", -1), 10);
+var bld_func = parseInt(getQParam("srt", -1), 10);
 
-var autfunction = "WEB_ALGMAN";
-
-gebouw_list ( autfunction,
-              { urole : urole,
-                outputmode: outputmode,
+gebouw_list ( "*",
+              { outputmode: outputmode,
                  showall: showall,
                  bld_func: (bld_func != -1? bld_func: null),
                  loc_key: (loc_key != -1? loc_key : null),
diff --git a/APPL/ALG/alg_locatie.asp b/APPL/ALG/alg_locatie.asp
index 8995fda8e1..86b925b2af 100644
--- a/APPL/ALG/alg_locatie.asp
+++ b/APPL/ALG/alg_locatie.asp
@@ -1,28 +1,23 @@
 <%@language = "javascript" %>
-<%  // testing: bes_key=1251054
+<%
+/*  $Revision: 3 $
+    $Modtime: 10/14/09 3:17p $
 
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 11:09a $
+    File:
+    Status:
+    Description:
+
+    Parameters:
 
-    File:               bes_edit.asp
-    Status:             40% (new style)
-    Description:        Muteerscherm voor bestellingen
-                        dit is de grote 'wrapper' voor de diverse andere schermen
-    Parameters:         urole
-                        bes_key
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
-<!--#include file="../Shared/funcodes.inc" -->
-
 <!--#include file="../Shared/iface.inc" -->
 
-<!--#include file="../Shared/algautlevel.inc" -->
-<!--#include file="../Shared/cmenuFn.inc"-->
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jquery-ui.js"]})
+FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js"]})
 
   var autfunction = "WEB_ALGMAN";
   var authparams = user.checkAutorisation(autfunction);   //Wat weet ik dan nou van disciplines???
@@ -30,8 +25,23 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
 
   // dit lijkt mij de enige gehele readonlyverklaring, de rest is localer
   var readonly = !(authparams.PRSwritelevel< 9 || authparams.ALGwritelevel < 9);
-%>
 
+    if (loc_key > 0)
+    {
+      sql = " select alg_locatie_code "
+          + "  FROM alg_locatie "
+          + "  WHERE alg_locatie_key = " + loc_key;
+
+     oRsMes = Oracle.Execute(sql);
+
+     var loc_name   = " " + oRsMes("alg_locatie_code").value;
+    }
+    else
+    {
+    var loc_name = "";
+    }
+
+%>
 
 <html>
 <head>
@@ -39,6 +49,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
    FCLTHeader.Generate();
 %>
     <script  type="text/javascript" >
+      FcltMgr.setTitle("<%=lcl_location%> <%=loc_name%> ", {hot:false});
       function algClose(params)
       {
           <% if (loc_key == -1)
@@ -48,10 +59,15 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
                   FcltMgr.closeDetail(window, params );
                   return true;
               }
-              FcltMgr.setTitle("<%=lcl_location%> " + params.loc_key, {hot:false});
-              window.location.href = "alg_locatie.asp?verynew=1&key=" + params.loc_key;
+              if (!params.keepForm)
+                  window.location.href = "alg_locatie.asp?verynew=1&key=" + params.loc_key;
           <% } else { // Bestaande melding bewerkt, switch naar show-mode %>
-              $("#algFrame")[0].src = "alg_show_locatie.asp?loc_key=<%=loc_key%>";
+              if (params.close)
+              {
+                FcltMgr.closeDetail(window, { close: true})
+              }
+              if (!params.keepForm)
+                  $("#algFrame")[0].src = "alg_show_locatie.asp?loc_key=<%=loc_key%>";
           <% } %>
       }
     </script>
@@ -68,20 +84,7 @@ IFRAMER("algFrame", page, { title: lcl_alg_locatie_frame,
                             initHeight: "450px",
                             FcltClose: "algClose" } );
 
-// AKZA#88 don not allow printing if call isn't saved yet.
-// UWVA#427 also print for FE
-if (loc_key>-1 ) {
-
-  add_str ='huh?';
-  menuArray = new Array();
-  menuArray[0] = lcl_print_report;
-  menuArray[1] = lcl_noti_vis_email;
-  onClickArray = new Array();
-  onClickArray[0] = 'print_test(0)';
-  onClickArray[1] = 'print_test(1)';
-
-// TODO: ik denk niet hier:  generateCmenu("c_menu")
-} %>
+%>
 
 </body>
 </html>
diff --git a/APPL/ALG/alg_locatie_list.inc b/APPL/ALG/alg_locatie_list.inc
index 25172d5018..ecb516e7d2 100644
--- a/APPL/ALG/alg_locatie_list.inc
+++ b/APPL/ALG/alg_locatie_list.inc
@@ -1,6 +1,6 @@
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 14:04 $
+     $Revision: 2 $
+     $Modtime: 10/14/09 2:41p $
     File:               alg_locatie_list.inc
     Status:             95%
     Description:        Show an overview of alg_locatie items in list-form,
@@ -16,10 +16,11 @@
 <!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     })
 
  function fnrowData(oRs)
@@ -35,18 +36,7 @@ FCLTHeader.Requires({ plugins:["jQuery"],
         }
 
 %>
-<script>
- dtable = "ALG_LOCATIE";
-</script>
-
 <script type="text/javascript">
-
-  var lcl_row_delete_failed1 = "<%=lcl_row_delete_failed1%>";
-  var lcl_row_delete_failed2 = "<%=lcl_row_delete_failed2%>";
-
-  // TODO: PF verdacht. Hoort dit hier?
-  // Lijkt me alleen om met 1 wijziging de 3 aanroepen te veranderen, maar dat zal niet
-  // nodig zijn. Ik zou zeggen: gewoon 1 invullen hieronder.
   var autosearch = 1; //automatisch laden van resultaat op search pagina
 
   function gotoDetails(row)
@@ -70,45 +60,30 @@ FCLTHeader.Requires({ plugins:["jQuery"],
     function locatieEdit(row)
   {
     var algData = eval('(' + row.ROWDATA + ')');
-    var url = "appl/ALG/alg_locatie.asp?mode=viewUpdate&key="+algData.key;
+    var url = "appl/ALG/alg_locatie.asp?key="+algData.key;
     FcltMgr.openDetail(url, "<%=lcl_location%>" + ' ' + algData.oms);
   }
-    function doDelete(row)
-  {
-   if (confirm('<%=lcl_row_delete_confirm%>')) {
 
-        var algData = eval('(' + row.ROWDATA + ')');
-        parent.document.body.style.cursor = "wait";
-        document.body.style.cursor = "wait";  // TODO: via getJSON of zoiets
-        hiddenFrame.navigate("setAlgVerwijder.asp?key=" + algData.key + "&table=" + dtable);
-      }
-  }
-
-  function DeleteFailed(result)
+function doDelete(row, isMulti)
 {
-  if (result == 1 ) {
-    alert(lcl_row_delete_failed1);
-  } else if ( result == 2 ) {
-    alert(lcl_row_delete_failed2);
-  }
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
+  $(row).addClass('dirty');
+  var loc_key = row.ROWKEY;
+    if (isMulti || confirm("<%=lcl_alg_del_txt_locatie%>"))
+       $.post("alg_delete.asp",
+               { key: loc_key,
+                 level: "L" },
+                 FcltCallback,
+                 "json");
 }
-
-function Deleted()
-{
-  algtable.deleteSelectedRows();
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
-</script>
+    </script>
 <%
 
 function locatie_list(pautfunction, params)
 {
   // De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
-  var authparams = user.checkAutorisation(pautfunction);
-  var canWrite = (authparams.ALGwritelevel < 9);  // TODO: fijner, ik denk 3. Ik moet voor deze locatie, dit district of deze regio schrijfrechten hebben
+  var addButton = [];
+  var authparams = alg.checkAutorisation();
+  var canAdd = (authparams.mALGwritelevel < 3);
 
   // Voor resulttable de globalen zetten; zou ng anders moeten.
   var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
@@ -117,7 +92,13 @@ function locatie_list(pautfunction, params)
   var dis_key = params.dis_key;
   var loc_key = params.loc_key;
 
-
+    function fnrowActionEnabler(oRs)
+    {
+        var eDelete = false;
+        if (alg.canWriteLocatie(oRs("alg_locatie_key").value, authparams.mALGwritelevel))
+            eDelete = true;
+        return ({eDelete: eDelete})
+    }
 %>
 
   <html>
@@ -172,15 +153,22 @@ function locatie_list(pautfunction, params)
     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: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+        }
+
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "alg_locatie_key",
                                    ID: "algtable",
+                                   showAll: showall,
                                    rowData: fnrowData,
+                                   rowActionEnabler: fnrowActionEnabler,
                                    outputmode: outputmode,
                                    flexModule: "ALG",
                                    flexId: "alg_locatie_key",
                                    filterParams: params,
-                                   buttons: [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+                                   buttons: addButton
                                   });
 
     rst.addColumn(new Column({caption: lcl_estate_district_man_descr, content: "alg_district_omschrijving"}));
@@ -203,15 +191,13 @@ function locatie_list(pautfunction, params)
 
 
     rst.addAction({ action: "locatieEdit", caption: lcl_edit, isDefault:  true});
-    if (canWrite )
-        rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true});
+    rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true, enabler: "eDelete"});
     rst.addAction({ action: "gotoDetails", caption: lcl_goto_gebouw_list});
     rst.addAction({ action: "gotoDetails2", caption: lcl_goto_terreinsector_list});
     rst.addAction({ action: "gotoParent", caption: lcl_goto_district_list});
 
     var cnt = rst.processResultset();
 %>
-<iframe src="../Shared/empty.asp" id=hiddenFrame name=hiddenFrame style="display:none"></iframe>
 </body>
 </html>
 <%}%>
diff --git a/APPL/ALG/alg_locatie_search.asp b/APPL/ALG/alg_locatie_search.asp
index a0c03c609d..f974235929 100644
--- a/APPL/ALG/alg_locatie_search.asp
+++ b/APPL/ALG/alg_locatie_search.asp
@@ -1,7 +1,7 @@
 <%@ LANGUAGE = JavaScript %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 26-09-09 18:36 $
+     $Revision: 2 $
+     $Modtime: 10/20/09 9:40a $
 */ %>
 
 <% Response.Expires = 0 %>
@@ -9,6 +9,8 @@
 <!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../Shared/escape.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
+<!-- #include file="alg.inc" -->
+
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"],
                       js: ["expand_frame.js"]
@@ -19,8 +21,7 @@ var locatie_key = getQParamInt("locatie_key", -1); //locatie
 
 var autosearch = getQParam("autosearch", -1);
 
-autfunction = "WEB_ALGMAN";   // TODO: of WEB_ALGUSE
-var authparams = user.checkAutorisation(autfunction);
+var authparams = alg.checkAutorisation();
 
 var lcl_bld_kenmerken = "TODO lcl_locatiekenmerken";
 %>
@@ -40,7 +41,7 @@ var lcl_bld_kenmerken = "TODO lcl_locatiekenmerken";
           var lvl = "'L'";
           var key = 0;
           var bld_key = "";
-          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&bld_key=" +bld_key + "&onrgoedlvl=" + lvl;
+          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" +bld_key + "&onrgoed_niveau=" + lvl;
           var titel = "<%=lcl_bld_kenmerken%>";
           showKenmerkModal(key, url, titel)
         }
diff --git a/APPL/ALG/alg_locatie_search_list.asp b/APPL/ALG/alg_locatie_search_list.asp
index a1ea55df9a..2edc5c495c 100644
--- a/APPL/ALG/alg_locatie_search_list.asp
+++ b/APPL/ALG/alg_locatie_search_list.asp
@@ -1,12 +1,12 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 27-08-09 11:55 $
+     $Revision: 2 $
+     $Modtime: 10/12/09 12:55p $
 
-    File:        msg_search_list.asp
-    Description: Vangt de parameters van msg_search op en verwerkt die in een aanroep van msg_list
-    Parameters:  urole
-    Context:     Vanuit alg_locatie.asp
+    File:       
+    Description: 
+    Parameters:  
+    Context:     
     Note:
 */ %>
 
@@ -17,11 +17,6 @@
 <!-- #include file="alg_locatie_list.inc" -->
 
 <%
-var urole = getQParam("urole", "");   // Indien niet meegegeven, veronderstel dan frontend gebruik
-var fronto = (urole == "fo");
-var backo = (urole == "bo");
-var minfo = (urole == "mi");
-var frontend = (urole == "fe" || (!fronto & !backo & !minfo));
 
 // FORM parameters: de waarde indien aanwezig, anders null
 // Vaak is een lege selectie ook een -1, dus dan is-ie wel aanwezig, maar hoeft niet
@@ -34,11 +29,9 @@ var showall = getQParam("showall", "0") == "1";
 var dis_key = getQParamInt("districtkey", -1); // District
 var loc_key = getQParamInt("locatiekey", -1); // Locatie
 
-var autfunction = "WEB_ALGMAN";
 
-locatie_list ( autfunction,
-              { urole : urole,
-                outputmode: outputmode,
+locatie_list ( "*",
+              {  outputmode: outputmode,
                  showall: showall,
                  dis_key: (dis_key != -1? dis_key : null),
                  loc_key: (loc_key != -1? loc_key : null)
diff --git a/APPL/ALG/alg_regio.asp b/APPL/ALG/alg_regio.asp
index 88c956b6a5..736cdbed22 100644
--- a/APPL/ALG/alg_regio.asp
+++ b/APPL/ALG/alg_regio.asp
@@ -1,29 +1,22 @@
 <%@language = "javascript" %>
-<%  // testing: bes_key=1251054
+<%
+/*  $Revision: 2 $
+    $Modtime: 10/14/09 3:21p $
 
-/*  $Revision: 1 $
-    $Modtime: 30-09-09 9:35 $
+    File:
+    Status:
+    Description:
+
+    Parameters:
 
-    File:               bes_edit.asp
-    Status:             40% (new style)
-    Description:        Muteerscherm voor bestellingen
-                        dit is de grote 'wrapper' voor de diverse andere schermen
-    Parameters:         urole
-                        bes_key
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
-<!--#include file="../Shared/funcodes.inc" -->
-
 <!--#include file="../Shared/iface.inc" -->
-
-<!--#include file="../Shared/algautlevel.inc" -->
-<!--#include file="../Shared/cmenuFn.inc"-->
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "FCLTMgr.js", "jquery-ui.js"]})
-
+  FCLTHeader.Requires({plugins:["jQuery"], js: []})
 
   var autfunction = "WEB_ALGMAN";
   var authparams = user.checkAutorisation(autfunction);   //Wat weet ik dan nou van disciplines???
@@ -51,9 +44,15 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "FCLT
                   return true;
               }
               FcltMgr.setTitle("<%=lcl_region%> " + params.regio_key, {hot:false});
-              window.location.href = "alg_regio.asp?verynew=1&key=" + params.regio_key;
+              if (!params.keepForm)
+                  window.location.href = "alg_regio.asp?verynew=1&key=" + params.regio_key;
           <% } else { // Bestaande melding bewerkt, switch naar show-mode %>
-              $("#algFrame")[0].src = "alg_show_regio.asp?regio_key=<%=reg_key%>";
+              if (params.close)
+              {
+                FcltMgr.closeDetail(window, { close: true})
+              }
+              if (!params.keepForm)
+                  $("#algFrame")[0].src = "alg_show_regio.asp?regio_key=<%=reg_key%>";
           <% } %>
       }
     </script>
@@ -69,21 +68,7 @@ page += "?regio_key="+reg_key;
 IFRAMER("algFrame", page, { title: lcl_alg_regio_frame,
                             initHeight: "450px",
                             FcltClose: "algClose" } );
-
-// AKZA#88 don not allow printing if call isn't saved yet.
-// UWVA#427 also print for FE
-if (reg_key>-1 ) {
-
-  add_str ='huh?';
-  menuArray = new Array();
-  menuArray[0] = lcl_print_report;
-  menuArray[1] = lcl_noti_vis_email;
-  onClickArray = new Array();
-  onClickArray[0] = 'print_test(0)';
-  onClickArray[1] = 'print_test(1)';
-
-// TODO: ik denk niet hier:  generateCmenu("c_menu")
-} %>
+ %>
 
 </body>
 </html>
diff --git a/APPL/ALG/alg_regio_list.inc b/APPL/ALG/alg_regio_list.inc
index 74c1281f77..acc01cd9e8 100644
--- a/APPL/ALG/alg_regio_list.inc
+++ b/APPL/ALG/alg_regio_list.inc
@@ -1,6 +1,6 @@
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 13:07 $
+     $Revision: 2 $
+     $Modtime: 10/14/09 2:58p $
     File:               alg_regio.inc
     Description:        Show an overview of regio items in list-form,
                         which meets with the given requirements
@@ -14,10 +14,11 @@
 <!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     })
 
  function fnrowData(oRs)
@@ -32,15 +33,8 @@ FCLTHeader.Requires({ plugins:["jQuery"],
         }
 
 %>
-<script>
- dtable = "ALG_REGIO";
-</script>
-
 <script type="text/javascript">
 
-  var lcl_row_delete_failed1 = "<%=lcl_row_delete_failed1%>";
-  var lcl_row_delete_failed2 = "<%=lcl_row_delete_failed2%>";
-
   var autosearch = 1; // automatisch laden van resultaat op search pagina.
 
   function gotoDetails(row)
@@ -50,56 +44,48 @@ FCLTHeader.Requires({ plugins:["jQuery"],
     FcltMgr.openDetail(url, "<%=lcl_district%>");
   }
 
-    function gebouwEdit(row)
+    function districtEdit(row)
   {
     var algData = eval('(' + row.ROWDATA + ')');
     var url = "appl/ALG/alg_regio.asp?mode=viewUpdate&key="+algData.key;
     FcltMgr.openDetail(url, "<%=lcl_region%>" + ' ' + algData.oms);
   }
-    function doDelete(row)
+
+  function doDelete(row, isMulti)
   {
-   if (confirm('<%=lcl_row_delete_confirm%>')) {
-
-        var algData = eval('(' + row.ROWDATA + ')');
-        parent.document.body.style.cursor = "wait";
-        document.body.style.cursor = "wait";
-        hiddenFrame.navigate("setAlgVerwijder.asp?key=" + algData.key + "&table=" + dtable);
-      }
+      $(row).addClass('dirty');
+      var regio_key = row.ROWKEY;
+      if (isMulti || confirm("<%=lcl_alg_del_txt_regio%>"))
+           $.post("alg_delete.asp",
+                   { key: regio_key,
+                     level: "RE" },
+                     FcltCallback,
+                     "json");
   }
-
-  function DeleteFailed(result)
-{
-  if (result == 1 ) {
-    alert(lcl_row_delete_failed1);
-  } else if ( result == 2 ) {
-    alert(lcl_row_delete_failed2);
-  }
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
-
-function Deleted()
-{
-  algtable.deleteSelectedRows();
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
-</script>
+    </script>
 <%
 
 function regio_list(pautfunction, params)
 {
   // De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
-  var authparams = user.checkAutorisation(pautfunction);
-  var canWrite = (authparams.ALGwritelevel < 9);  // TODO: fijner, ik denk 3. Ik moet voor deze locatie, dit district of deze regio schrijfrechten hebben
+  var addButton = [];
+  var authparams = alg.checkAutorisation();
+  var canAdd = (authparams.mALGwritelevel < 1);
 
   // 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 reg_key = params.reg_key;
-%>
 
+    function fnrowActionEnabler(oRs)
+    {
+        var eDelete = false;
+        if (alg.canWriteRegio(oRs("alg_regio_key").value, authparams.mALGwritelevel))
+            eDelete = true;
+        return ({eDelete: eDelete})
+    }
+%>
   <html>
     <head>
       <% FCLTHeader.Generate({outputmode:outputmode}) %>
@@ -110,43 +96,48 @@ function regio_list(pautfunction, params)
          + "          r.alg_regio_omschrijving "
          + "    FROM  alg_regio r "
          + "   WHERE  r.alg_regio_verwijder IS NULL ";
-  
+
   if ( authparams.ALGreadlevel > -1 )
     {  // Er is een scope-beperking van kracht
         sqln += " AND r.alg_regio_key IN "
                + "(SELECT alg_regio_key FROM fac_v_my_regions "
                +   "WHERE prs_perslid_key="+user_key
                +    " AND niveau=" + authparams.ALGreadlevel + ")";
-    }       
+    }
 
     if (reg_key)
       {
       sqln += " AND r.alg_regio_key = " + reg_key;
       }
-    
+
     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: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+      }
+
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "alg_regio_key",
                                    ID: "algtable",
+                                   showAll: showall,
                                    rowData: fnrowData,
+                                   rowActionEnabler: fnrowActionEnabler,
                                    outputmode: outputmode,
                                    filterParams: params,
-                                   buttons: [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+                                   buttons: addButton
                                   });
 
 
     rst.addColumn(new Column({caption: lcl_estate_regio_descr, content: "alg_regio_omschrijving"}));
 
-    rst.addAction({ action: "gebouwEdit", caption: lcl_edit, isDefault:  true});
-    if (canWrite )
-      rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true});
+    rst.addAction({ action: "districtEdit", caption: lcl_edit, isDefault:  true});
+    rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true, enabler: "eDelete"});
     rst.addAction({ action: "gotoDetails", caption: lcl_goto_district_list});
 
     var cnt = rst.processResultset();
 %>
-<iframe src="../Shared/empty.asp" id=hiddenFrame name=hiddenFrame style="display:none"></iframe>
 </body>
 </html>
 <%}%>
diff --git a/APPL/ALG/alg_regio_search.asp b/APPL/ALG/alg_regio_search.asp
index 13a3b183e9..2d936dc813 100644
--- a/APPL/ALG/alg_regio_search.asp
+++ b/APPL/ALG/alg_regio_search.asp
@@ -1,7 +1,7 @@
 <%@ LANGUAGE = JavaScript %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 23:39 $
+     $Revision: 2 $
+     $Modtime: 10/12/09 12:35p $
 */ %>
 
 <% Response.Expires = 0 %>
@@ -10,10 +10,8 @@
 <!-- #include file="../Shared/escape.inc" -->
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/afdelingselector.inc" -->
-<!-- #include file="../Shared/persoonselector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
-<!-- #include file="../Shared/calendar.inc" -->
-<!-- #include file="../Shared/timer.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"],
@@ -24,11 +22,7 @@ var regio_key = getQParamInt("regio_key", -1); //regio
 
 var autosearch = getQParam("autosearch", -1);
 
-autfunction = "WEB_ALGMAN";
-var authparams = user.checkAutorisation(autfunction);
-
-
-
+var authparams = alg.checkAutorisation();
 %>
 
 <html>
diff --git a/APPL/ALG/alg_regio_search_list.asp b/APPL/ALG/alg_regio_search_list.asp
index 254b0943b8..1a3ec90fa6 100644
--- a/APPL/ALG/alg_regio_search_list.asp
+++ b/APPL/ALG/alg_regio_search_list.asp
@@ -1,7 +1,7 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 27-08-09 11:54 $
+     $Revision: 2 $
+     $Modtime: 10/12/09 12:36p $
 
     File:        alg_district_search_list.asp
     Description: Vangt de parameters van msg_search op en verwerkt die in een aanroep van msg_list
@@ -17,12 +17,6 @@
 <!-- #include file="alg_regio_list.inc" -->
 
 <%
-var urole = getQParam("urole", "");   // Indien niet meegegeven, veronderstel dan frontend gebruik
-var fronto = (urole == "fo");
-var backo = (urole == "bo");
-var minfo = (urole == "mi");
-var frontend = (urole == "fe" || (!fronto & !backo & !minfo));
-
 // FORM parameters: de waarde indien aanwezig, anders null
 // Vaak is een lege selectie ook een -1, dus dan is-ie wel aanwezig, maar hoeft niet
 // als filter te worden toegepast. Dan is null dus gelijk aan -1, qua betekenis,
@@ -33,11 +27,8 @@ var showall = getQParam("showall", "0") == "1";
 
 var reg_key = getQParamInt("regiokey", -1) // Regio
 
-var autfunction = "WEB_ALGMAN";
-
-regio_list ( autfunction,
-              { urole : urole,
-                outputmode: outputmode,
+regio_list ( "*",
+              {  outputmode: outputmode,
                  showall: showall,
                  reg_key: (reg_key != -1? reg_key : null)
               }
diff --git a/APPL/ALG/alg_ruimte.asp b/APPL/ALG/alg_ruimte.asp
index 20b02c861d..0ead46740d 100644
--- a/APPL/ALG/alg_ruimte.asp
+++ b/APPL/ALG/alg_ruimte.asp
@@ -1,28 +1,23 @@
 <%@language = "javascript" %>
-<%  // testing: bes_key=1251054
+<%
+/*  $Revision: 4 $
+    $Modtime: 10/22/09 10:27a $
 
-/*  $Revision: 3 $
-    $Modtime: 10/05/09 3:33p $
+    File:
+    Status:
+    Description:
+
+    Parameters:
 
-    File:               bes_edit.asp
-    Status:             40% (new style)
-    Description:        Muteerscherm voor bestellingen
-                        dit is de grote 'wrapper' voor de diverse andere schermen
-    Parameters:         urole
-                        bes_key
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
-<!--#include file="../Shared/funcodes.inc" -->
-
 <!--#include file="../Shared/iface.inc" -->
 
-<!--#include file="../Shared/algautlevel.inc" -->
-<!--#include file="../Shared/cmenuFn.inc"-->
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jquery-ui.js"]})
+FCLTHeader.Requires({plugins:["suggest","jQuery"], js: []})
 
   var autfunction = "WEB_ALGMAN";
   var authparams = user.checkAutorisation(autfunction);   //Wat weet ik dan nou van disciplines???
@@ -30,6 +25,32 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
 
   // dit lijkt mij de enige gehele readonlyverklaring, de rest is localer
   var readonly = !(authparams.PRSwritelevel< 9 || authparams.ALGwritelevel < 9);
+
+  if (room_key > 0)
+  {
+        sql = "SELECT r.alg_ruimte_nr, "
+            + "       g.alg_gebouw_code, "
+            + "       v.alg_verdieping_omschrijving "
+            + "  FROM alg_ruimte r, "
+            + "       alg_gebouw g, "
+            + "       alg_verdieping v "
+            + " WHERE r.alg_ruimte_key = " + room_key
+            + "   AND r.alg_verdieping_key = v.alg_verdieping_key "
+            + "   AND v.alg_gebouw_key = g.alg_gebouw_key ";
+
+
+     oRsMes = Oracle.Execute(sql);
+
+     var bld_code = oRsMes("alg_gebouw_code").value;
+     var flr_oms = oRsMes("alg_verdieping_omschrijving").value;
+     var room_nr = oRsMes("alg_ruimte_nr").value;
+
+     var room_name   = " " + bld_code + "-" + flr_oms + "-" + room_nr;
+  }
+  else
+  {
+    var room_name = "";
+  }
 %>
 
 
@@ -39,6 +60,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
    FCLTHeader.Generate();
 %>
   <script  type="text/javascript" >
+      FcltMgr.setTitle("<%=lcl_room%> <%=room_name%>", {hot:false});
       function algClose(params)
       {
           <% if (room_key == -1)
@@ -48,10 +70,16 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
                   FcltMgr.closeDetail(window, params );
                   return true;
               }
-              FcltMgr.setTitle("<%=lcl_room%> " + params.room_key, {hot:false});
-              window.location.href = "alg_ruimte.asp?verynew=1&key=" + params.room_key;
+              if (!params.keepForm)
+                  window.location.href = "alg_ruimte.asp?verynew=1&key=" + params.room_key;
           <% } else { // Bestaande melding bewerkt, switch naar show-mode %>
-              $("#algFrame")[0].src = "alg_show_ruimte.asp?room_key=<%=room_key%>";
+              if (params.close)
+              {
+                FcltMgr.closeDetail(window, { close: true})
+              }
+              if (!params.keepForm)
+                  $("#algFrame")[0].src = "alg_show_ruimte.asp?room_key=<%=room_key%>";
+
           <% } %>
       }
     </script>
@@ -64,24 +92,18 @@ else
     var page="alg_show_ruimte.asp";
 page += "?room_key="+room_key;
 
-IFRAMER("algFrame", page, { title: lcl_alg_ruimte_frame,
-                            initHeight: "450px",
+IFRAMER("algFrame", page, { initHeight: "450px",
                             FcltClose: "algClose" } );
 
-// AKZA#88 don not allow printing if call isn't saved yet.
-// UWVA#427 also print for FE
-if (room_key>-1 ) {
+var page2 ="alg_werkplek_search_list.asp?ruimtekey=" + room_key;
 
-  add_str ='huh?';
-  menuArray = new Array();
-  menuArray[0] = lcl_print_report;
-  menuArray[1] = lcl_noti_vis_email;
-  onClickArray = new Array();
-  onClickArray[0] = 'print_test(0)';
-  onClickArray[1] = 'print_test(1)';
-
-// TODO: ik denk niet hier:  generateCmenu("c_menu")
-} %>
+if (room_key > -1)
+    IFRAMER("wpFrame", page2, { initHeight: "450px" } );
+    
+var page3 ="../PRS/prs_afdeling_search_list.asp?room_key=" + room_key;
+if (room_key > -1)
+    IFRAMER("wpFrame", page3, { initHeight: "450px" } );
+%>
 
 </body>
 </html>
diff --git a/APPL/ALG/alg_ruimte_list.inc b/APPL/ALG/alg_ruimte_list.inc
index bf83543d83..8ccba1b27a 100644
--- a/APPL/ALG/alg_ruimte_list.inc
+++ b/APPL/ALG/alg_ruimte_list.inc
@@ -1,6 +1,6 @@
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 23:40 $
+     $Revision: 2 $
+     $Modtime: 10/14/09 2:16p $
     File:               alg_ruimte.inc
     Description:        Show an overview of ruimte items in list-form,
                         which meets with the given requirements
@@ -14,10 +14,11 @@
 <!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     })
 
  function fnrowData(oRs)
@@ -32,15 +33,7 @@ FCLTHeader.Requires({ plugins:["jQuery"],
           return JSON.stringify(data);
         }
 %>
-<script>
- dtable = "ALG_RUIMTE";
-</script>
-
 <script type="text/javascript">
-
-  var lcl_row_delete_failed1 = "<%=lcl_row_delete_failed1%>";
-  var lcl_row_delete_failed2 = "<%=lcl_row_delete_failed2%>";
-
   var autosearch = 1; // automatisch laden van resultaat op search pagina
 
   function gotoDetails(row)
@@ -49,54 +42,41 @@ FCLTHeader.Requires({ plugins:["jQuery"],
     var url = "appl/ALG/alg_werkplek_search.asp?ruimte_key="+algData.detail_key+"&autosearch="+autosearch;
     FcltMgr.openDetail(url, "<%=lcl_workspace%>");
   }
+
   function gotoParent(row)
   {
     var algData = eval('(' + row.ROWDATA + ')');
     var url = "appl/ALG/alg_verdieping_search.asp?verdieping_key="+algData.parent_key+"&autosearch="+autosearch;
     FcltMgr.openDetail(url, "<%=lcl_floor%>");
   }
-    function ruimteEdit(row)
+
+  function ruimteEdit(row)
   {
     var algData = eval('(' + row.ROWDATA + ')');
     var url = "appl/ALG/alg_ruimte.asp?mode=viewUpdate&key="+algData.key;
     FcltMgr.openDetail(url, "<%=lcl_room%>" + ' ' + algData.oms);
   }
-    function doDelete(row)
+
+  function doDelete(row, isMulti)
   {
-   if (confirm('<%=lcl_row_delete_confirm%>')) {
-
-        var algData = eval('(' + row.ROWDATA + ')');
-        parent.document.body.style.cursor = "wait";
-        document.body.style.cursor = "wait";
-        hiddenFrame.navigate("setAlgVerwijder.asp?key=" + algData.key + "&table=" + dtable);
-      }
+    $(row).addClass('dirty');
+    var room_key = row.ROWKEY;
+    if (isMulti || confirm("<%=lcl_alg_del_txt_ruimte%>"))
+       $.post("alg_delete.asp",
+               { key: room_key,
+                 level: "R" },
+                 FcltCallback,
+                 "json");
   }
-
-  function DeleteFailed(result)
-{
-  if (result == 1 ) {
-    alert(lcl_row_delete_failed1);
-  } else if ( result == 2 ) {
-    alert(lcl_row_delete_failed2);
-  }
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
-
-function Deleted()
-{
-  algtable.deleteSelectedRows();
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
 </script>
 <%
 
 function ruimte_list(pautfunction, params)
 {
   // De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
-  var authparams = user.checkAutorisation(pautfunction);
-  var canWrite = (authparams.ALGwritelevel < 9);  // TODO: fijner, ik denk 3. Ik moet voor deze locatie, dit district of deze regio schrijfrechten hebben
+  var addButton = [];
+  var authparams = alg.checkAutorisation();
+  var canAdd = (authparams.mALGwritelevel < 6);
 
   // Voor resulttable de globalen zetten; zou ng anders moeten.
   var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
@@ -109,6 +89,14 @@ function ruimte_list(pautfunction, params)
   var area_nr = params.area_nr;
   var area_descr = params.area_descr;
   var area_use = params.area_use
+
+  function fnrowActionEnabler(oRs)
+    {
+        var eDelete = false;
+        if (alg.canWriteRuimte(oRs("alg_ruimte_key").value, authparams.mALGwritelevel))
+            eDelete = true;
+        return ({eDelete: eDelete})
+    }
 %>
 
   <html>
@@ -199,15 +187,22 @@ function ruimte_list(pautfunction, params)
     var addurl = "appl/alg/alg_ruimte.asp";
 //    addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
 
+    if (canAdd)
+      {
+      addButton = [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+      }
+
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "alg_ruimte_key",
                                    ID: "algtable",
+                                   showAll: showall,
                                    rowData: fnrowData,
+                                   rowActionEnabler: fnrowActionEnabler,
                                    outputmode: outputmode,
                                    flexModule: "ALG",
                                    flexId: "alg_ruimte_key",
                                    filterParams: params,
-                                   buttons: [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+                                   buttons: addButton
                                   });
 
     rst.addColumn(new Column({caption: lcl_estate_gebouw_man_descr, content: "alg_gebouw_omschrijving"}));
@@ -240,14 +235,12 @@ if (fg_contourlayers_alt2!=""&&fg_labellayers_alt2!="")
     }
 
     rst.addAction({ action: "ruimteEdit", caption: lcl_edit, isDefault:  true});
-    if (canWrite )
-    rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true});
+    rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true, enabler: "eDelete"});
     rst.addAction({ action: "gotoDetails", caption: lcl_goto_werkplek_list});
     rst.addAction({ action: "gotoParent", caption: lcl_goto_verdieping_list});
 
     var cnt = rst.processResultset();
 %>
-<iframe src="../Shared/empty.asp" id=hiddenFrame name=hiddenFrame style="display:none"></iframe>
 </body>
 </html>
 <%}%>
diff --git a/APPL/ALG/alg_ruimte_search.asp b/APPL/ALG/alg_ruimte_search.asp
index 3ee8bd26fe..66c0cd1375 100644
--- a/APPL/ALG/alg_ruimte_search.asp
+++ b/APPL/ALG/alg_ruimte_search.asp
@@ -1,7 +1,7 @@
 <%@ LANGUAGE = JavaScript %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 10:51 $
+     $Revision: 2 $
+     $Modtime: 10/23/09 9:20a $
 */ %>
 
 <!-- #include file="../../cust/install.inc" -->
@@ -9,7 +9,7 @@
 <!-- #include file="../Shared/escape.inc" -->
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
-
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"],
@@ -27,10 +27,8 @@ var ruimte_descr = getQParam("ruimte_descr", "");
 
 var autosearch = getQParam("autosearch", -1);
 
-autfunction = "WEB_ALGMAN"; //WEB_ALGUSE
-var authparams = user.checkAutorisation(autfunction);
+var authparams = alg.checkAutorisation();
 
-var lcl_bld_kenmerken = "lcl_ruimte_kenmerken";
 %>
 <html>
   <head>
@@ -47,8 +45,8 @@ var lcl_bld_kenmerken = "lcl_ruimte_kenmerken";
           var lvl = "'R'";
           var key = 0;
           var bld_key = "";
-          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&bld_key=" + bld_key + "&onrgoedlvl=" + lvl;
-          var titel = "<%=lcl_bld_kenmerken%>";
+          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
+          var titel = "<%=lcl_properties%>";
           showKenmerkModal(key, url, titel)
         }
         
diff --git a/APPL/ALG/alg_ruimte_search_list.asp b/APPL/ALG/alg_ruimte_search_list.asp
index cb3191a3f1..34ce6fe7c7 100644
--- a/APPL/ALG/alg_ruimte_search_list.asp
+++ b/APPL/ALG/alg_ruimte_search_list.asp
@@ -1,7 +1,7 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 27-08-09 11:52 $
+     $Revision: 2 $
+     $Modtime: 10/12/09 1:08p $
 
     File:        alg_ruimte_search_list.asp
     Description: Vangt de parameters van msg_search op en verwerkt die in een aanroep van msg_list
@@ -17,12 +17,6 @@
 <!-- #include file="alg_ruimte_list.inc" -->
 
 <%
-var urole = getQParam("urole", "");   // Indien niet meegegeven, veronderstel dan frontend gebruik
-var fronto = (urole == "fo");
-var backo = (urole == "bo");
-var minfo = (urole == "mi");
-var frontend = (urole == "fe" || (!fronto & !backo & !minfo));
-
 // FORM parameters: de waarde indien aanwezig, anders null
 // Vaak is een lege selectie ook een -1, dus dan is-ie wel aanwezig, maar hoeft niet
 // als filter te worden toegepast. Dan is null dus gelijk aan -1, qua betekenis,
@@ -40,11 +34,8 @@ var area_nr = getQParam("nr", null);
 var area_descr = getQParam("descr", null);
 var area_use = getQParam("srt", null);
 
-var autfunction = "WEB_ALGMAN";
-
-ruimte_list ( autfunction,
-              { urole : urole,
-                outputmode: outputmode,
+ruimte_list ( "*",
+              {  outputmode: outputmode,
                  showall: showall,
                  loc_key: (loc_key != -1? loc_key : null),
                  bld_key: (bld_key != -1? bld_key : null),
diff --git a/APPL/ALG/alg_show_district.asp b/APPL/ALG/alg_show_district.asp
index 964f7c56ce..d6c854d1aa 100644
--- a/APPL/ALG/alg_show_district.asp
+++ b/APPL/ALG/alg_show_district.asp
@@ -1,45 +1,43 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 3:00p $
+/*  $Revision: 3 $
+    $Modtime: 10/20/09 9:52a $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
-<!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date.js"]})
+FCLTHeader.Requires({plugins:["jQuery"], js: []})
 
-   var dis_key  = parseInt(getQParam("dis_key", "-1"), 10);
+   var dis_key  = getQParamInt("dis_key")
    var reg_key
-   
+
    var onrgoedlvl = "'D'";
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-   var readonly = !(authparams.PRSwritelevel< 9 || authparams.ALGwritelevel < 9);
-   
+
+   var authparams = alg.checkAutorisation();
+
+   if (!alg.canWriteDistrict(dis_key, authparams.mALGreadlevel))
+     user.auth_required_or_abort(false);
+
     sql =    " select * "
-    + "  FROM alg_district, " 
+    + "  FROM alg_district, "
     + "       WHERE alg_district_key = " + dis_key;
-   
+
 %>
 
 <html>
@@ -48,11 +46,6 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
    FCLTHeader.Generate();
 %>
 <script  type="text/javascript" >
-  jQuery(document).ready(function() {
-        $('textarea').resize(function () { FcltMgr.resized(window) } );
-        $('textarea').autogrow();
-   });
-
     function dis_change()
     {
         if (FcltMgr.startEdit(window))
@@ -60,8 +53,13 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
     }
     function dis_delete()
     {
-        alert("Delete nog niet geimplementeerd");
-    }
+       if (confirm("<%=lcl_alg_del_txt_district%>"))
+           $.post("alg_delete.asp",
+               { key: <%=dis_key%>,
+                 level: "D" },
+                 FcltCallbackClose,
+                 "json");
+     }
 </script>
 </head>
 
@@ -69,42 +67,35 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
 <div id="show">
 <form name=u2 onSubmit="return false;">
 <%
+var buttons = [];
 
-var buttons =  [ {title: lcl_change, action:"dis_change()", icon: "wijzigen.png", id:"bchange_bez_afspraak" },
-                 {title: lcl_delete, action:"dis_delete()", icon: "delete.png", id:"bdelete_bez_afspraak" } ];
-IFRAMER_HEADER(lcl_alg_gebouw_frame, buttons);
+if (alg.canWriteDistrict(dis_key, authparams.mALGwritelevel))
+{
+var buttons =  [ {title: lcl_change, action:"dis_change()", icon: "wijzigen.png" },
+                 {title: lcl_delete, action:"dis_delete()", icon: "delete.png" } ];
+}
+IFRAMER_HEADER(lcl_alg_district_frame, buttons);
+
+BLOCK_START("algInfo", "");
+        FCLTplaatsselector(authparams.ALGreadlevel, {
+                  regiokey: reg_key,
+                  districtkey: dis_key,
+                  startlevel: 0, // Regio
+                  eindlevel: 1, // District
+                  readonly: true
+                });
 
-BLOCK_START("test", "");
-%>
-<table>
-<%
-                    FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  regiokey: reg_key, 
-                                                                  districtkey: dis_key,
-                                                                  startlevel: 0, // Regio
-                                                                  eindlevel: 1, // District
-                                                                  readonly: true
-                                                                });
-%>
-</table>
-<%                                                               
 BLOCK_END();
-    BLOCK_START("mldFlex", lcl_mld_flexblok);
- %>
- 
-<% //<tr id="theText"><td> %>
-<%
+    BLOCK_START("algFlex", lcl_alg_flexblok);
+
   generateFlexKenmerkCode ({
-     bld_key    : dis_key,
-     onrgoedlvl : onrgoedlvl,
-     reado      : true
+     onrgoed_key    : dis_key,
+     onrgoed_niveau : onrgoedlvl,
+     reado          : true
 });
-%>
-<% // </td></tr> %>
-<%
    BLOCK_END();
 %>
 </form>
-</div> <!-- edit -->
+</div>
 </body>
 </html>
diff --git a/APPL/ALG/alg_show_gebouw.asp b/APPL/ALG/alg_show_gebouw.asp
index b9de1fa1d2..7e7fc14154 100644
--- a/APPL/ALG/alg_show_gebouw.asp
+++ b/APPL/ALG/alg_show_gebouw.asp
@@ -1,47 +1,45 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 1 $
-    $Modtime: 30-09-09 15:55 $
+/*  $Revision: 2 $
+    $Modtime: 10/22/09 4:02p $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
 <!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date.js", "FcltMgr.js"]})
+FCLTHeader.Requires({plugins:["jQuery"], js: []})
 
-   var bld_key  = parseInt(getQParam("bld_key", "-1"), 10);
-   var loc_key
+   var bld_key  = getQParamInt("bld_key");
 
    var onrgoedlvl = "'G'";
-      
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-   
-    sql =    " select * "
-    + "  FROM ALG_GEBOUW " 
-    + "       WHERE alg_gebouw_key = " + bld_key;
-        
+
+   var authparams = alg.checkAutorisation();
+
+   if (!alg.canWriteGebouw(bld_key, authparams.mALGreadlevel))
+     user.auth_required_or_abort(false);
+
+    sql = " select * "
+        + "  FROM ALG_GEBOUW "
+        + "       WHERE alg_gebouw_key = " + bld_key;
+
     oRsMes = Oracle.Execute(sql);
 
-    if (!oRsMes.eof ) {
       var bld_srtkey = oRsMes("ALG_SRTGEBOUW_KEY").value;
       var bld_acakey = oRsMes("ALG_GEBOUW_ACADKEY").value;
       var bld_naam   = oRsMes("ALG_GEBOUW_NAAM").value;
@@ -60,14 +58,9 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
       var bld_dwgy   = oRsMes("ALG_GEBOUW_DWGY").value;
       var bld_x      = oRsMes("ALG_GEBOUW_X").value;
       var bld_y      = oRsMes("ALG_GEBOUW_Y").value;
-      var bld_bez    = oRsMes("ALG_GEBOUW_BEZ").value;       
-    } 
-    else {
-       Response.write("internal error or message deleted");
-        Response.End;
-    }
+      var bld_bez    = oRsMes("ALG_GEBOUW_BEZ").value;
+
     oRsMes.Close();
-   
 %>
 
 <html>
@@ -76,19 +69,22 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
    FCLTHeader.Generate();
 %>
 <script  type="text/javascript" >
-  jQuery(document).ready(function() {
-        $('textarea').resize(function () { FcltMgr.resized(window) } );
-        $('textarea').autogrow();
-   });
 
     function bld_change()
     {
         if (FcltMgr.startEdit(window))
-            window.location.href = "alg_edit_gebouw.asp?bld_key=<%=bld_key%>&embedded=1"
+            window.location.href = "alg_edit_gebouw.asp?bld_key=<%=bld_key%>"
     }
     function bld_delete()
     {
-        alert("Delete nog niet geimplementeerd");
+      if (confirm("<%=lcl_alg_del_txt_gebouw%>"))
+      {
+           $.post("alg_delete.asp",
+               { key: <%=bld_key%>,
+                 level: "G" },
+                 FcltCallbackClose,
+                 "json");
+          }
     }
 </script>
 </head>
@@ -97,23 +93,21 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
 <div id="show">
 <form name=u2 onSubmit="return false;">
 <%
+var buttons = [];
 
-var buttons =  [ {title: lcl_change, action:"bld_change()", icon: "wijzigen.png", id:"bchange_bez_afspraak" },
-                 {title: lcl_delete, action:"bld_delete()", icon: "delete.png", id:"bdelete_bez_afspraak" } ];
+if (alg.canWriteGebouw(bld_key, authparams.mALGwritelevel))
+{
+  var buttons =  [ {title: lcl_change, action:"bld_change()", icon: "wijzigen.png" },
+                   {title: lcl_delete, action:"bld_delete()", icon: "delete.png" } ];
+}
 IFRAMER_HEADER(lcl_alg_gebouw_frame, buttons);
 
 BLOCK_START("algLoc1", "");
-%>
-<table>
-<%
-          FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  locatiekey: loc_key, 
-                                                                  gebouwkey: bld_key,
-                                                                  
-                                                                  startlevel: 2, //Locatie
-                                                                  eindlevel: 3, // Gebouw
-                                                                  readonly: true }); %>
-</tr>
+          FCLTplaatsselector(authparams.ALGreadlevel, {
+              gebouwkey: bld_key,
+              startlevel: 2, //Locatie
+              eindlevel: 3, // Gebouw
+              readonly: true }); %>
 <tr>
     <%
     sql = "SELECT   alg_srtgebouw_key, "
@@ -129,7 +123,6 @@ BLOCK_START("algLoc1", "");
                     }
                   );
 %>
-
 </tr>
 <tr>
     <td class="label"><label><%=lcl_estate_gebouw_man_code%>:</label></td>
@@ -158,10 +151,9 @@ BLOCK_START("algLoc1", "");
     <td class="label"><label><%=lcl_estate_gebouw_ordernr%>:</label></td>
     <td><input class="fldbld" type="text" id="bld_ordrnr" name="bld_ordrnr" value="<%=bld_ordrnr%>" readonly></td>
 </tr>
-</table>
 <% BLOCK_END();
+
 BLOCK_START("algLoc2", ""); %>
-<table>
 <tr>
     <td class="label"><label><%=lcl_estate_gebouw_man_bruto_vloeropp%>:</label></td>
     <td><input class="fldbld" type="text" id="bld_opp" name="bld_opp" value="<%=bld_opp%>" readonly></td>
@@ -203,25 +195,18 @@ BLOCK_START("algLoc2", ""); %>
     <td class="label"><label><%=lcl_estate_gebouw_bez%>:</label></td>
     <td><input class="fldalgbez" type="checkbox" id="bld_bez" name="bld_bez" value="<%=bld_bez%>" <%= bld_bez==1 ? " checked " : "" %>disabled></td>
 </tr>
-</table>
 <% BLOCK_END();
-BLOCK_START("mldFlex", lcl_mld_flexblok);
- %>
-<!-- theText indicates flexkenmerken will follow on the next row -->
-<% //<tr id="theText"><td> %>
-<%
+BLOCK_START("algFlex", lcl_alg_flexblok);
+
   generateFlexKenmerkCode ({
-     bld_key    : bld_key,
-     onrgoedlvl : onrgoedlvl,
-     reado      : true
-     //mldman     : false // TODO: => MGE: Niet meer nodig. Wordt in generateFlexKenmerkCode bepaald.
+     onrgoed_key    : bld_key,
+     onrgoed_niveau : onrgoedlvl,
+     reado          : true
 });
-%>
-<% // </td></tr> %>
-<%
+
    BLOCK_END();
 %>
 </form>
-</div> <!-- edit -->
+</div>
 </body>
 </html>
diff --git a/APPL/ALG/alg_show_locatie.asp b/APPL/ALG/alg_show_locatie.asp
index 327b845a60..ecc560bccd 100644
--- a/APPL/ALG/alg_show_locatie.asp
+++ b/APPL/ALG/alg_show_locatie.asp
@@ -1,51 +1,48 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 11:08a $
+/*  $Revision: 3 $
+    $Modtime: 10/20/09 9:50a $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
-<% Response.Expires = -1; %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
 <!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date.js", "FcltMgr.js"]})
+FCLTHeader.Requires({plugins:["jQuery"], js: []})
+
+   var loc_key  = getQParamInt("loc_key");
 
-// AUTORISATIEPARAMETERS
-   var loc_key  = parseInt(getQParam("loc_key", "-1"), 10);
-   var dis_key
-   
    var onrgoedlvl = "'L'";
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
+
+   var authparams = alg.checkAutorisation();
+
+   if (!alg.canWriteLocatie(loc_key, authparams.mALGreadlevel))
+     user.auth_required_or_abort(false);
+
    var readonly = !(authparams.PRSwritelevel< 9 || authparams.ALGwritelevel < 9);
-   
+
     sql =    " select * "
-    + "  FROM ALG_LOCATIE " 
-    + "       WHERE alg_locatie_key = " + loc_key;
-    
-    
+        + "  FROM ALG_LOCATIE "
+        + "       WHERE alg_locatie_key = " + loc_key;
+
+
     oRsMes = Oracle.Execute(sql);
 
-    if (!oRsMes.eof ) {
       var loc_code   = oRsMes("alg_locatie_code").value;
       var bez_adres  = oRsMes("alg_locatie_adres").value;
       var bez_postc  = oRsMes("alg_locatie_postcode").value;
@@ -61,21 +58,16 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
       var pst_adres  = oRsMes("alg_locatie_post_adres").value;
       var pst_plaats = oRsMes("alg_locatie_post_plaats").value;
       var pst_land   = oRsMes("alg_locatie_post_land").value;
-    } 
-    else {
-       Response.write("internal error or message deleted");
-        Response.End;
-    }
-    oRsMes.Close();
-   
-%>
 
+    oRsMes.Close();
+%>
 <html>
 <head>
 <%
    FCLTHeader.Generate();
 %>
 <script  type="text/javascript" >
+
   jQuery(document).ready(function() {
         $('textarea').resize(function () { FcltMgr.resized(window) } );
         $('textarea').autogrow();
@@ -84,11 +76,19 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
     function loc_change()
     {
         if (FcltMgr.startEdit(window))
-            window.location.href = "alg_edit_locatie.asp?loc_key=<%=loc_key%>&embedded=1"
+            window.location.href = "alg_edit_locatie.asp?loc_key=<%=loc_key%>"
     }
+
     function loc_delete()
     {
-        alert("Delete nog niet geimplementeerd");
+       if (confirm("<%=lcl_alg_del_txt_locatie%>"))
+       {
+           $.post("alg_delete.asp",
+               { key: <%=loc_key%>,
+                 level: "L" },
+                 FcltCallbackClose,
+                 "json");
+       }
     }
 </script>
 </head>
@@ -97,23 +97,22 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
 <div id="show">
 <form name=u2 onSubmit="return false;">
 <%
+var buttons = [];
 
-var buttons =  [ {title: lcl_change, action:"loc_change()", icon: "wijzigen.png", id:"bchange_bez_afspraak" },
-                 {title: lcl_delete, action:"loc_delete()", icon: "delete.png", id:"bdelete_bez_afspraak" } ];
+if (alg.canWriteLocatie(loc_key, authparams.mALGwritelevel))
+{
+var buttons =  [ {title: lcl_change, action:"loc_change()", icon: "wijzigen.png" },
+                 {title: lcl_delete, action:"loc_delete()", icon: "delete.png" } ];
+}
 IFRAMER_HEADER(lcl_alg_locatie_frame, buttons);
 
 BLOCK_START("algLoc1", "");
+          FCLTplaatsselector(authparams.ALGreadlevel, {
+              locatiekey: loc_key,
+              startlevel: 1, //District
+              eindlevel: 2, // Locatie
+              readonly: true });
 %>
-<table>
-<%
-          FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  districtkey: dis_key, 
-                                                                  locatiekey: loc_key,
-                                                                  startlevel: 1, //District
-                                                                  eindlevel: 2, // Locatie
-                                                                  readonly: true }); %>
-
-</tr>
 <tr>
     <td class="label"><label><%=lcl_estate_locatie_man_code%>:</label></td>
     <td><input class="fldloc"" type="text" id="loc_code" name="loc_code" value="<%=loc_code%>" readonly></td>
@@ -142,10 +141,8 @@ BLOCK_START("algLoc1", "");
     <td class="label"><label><%=lcl_geoycoord%>:</label></td>
     <td><input class="fldloc"" type="text" id="loc_y" name="loc_y" value="<%=loc_y%>" readonly></td>
 </tr>
-</table>
 <% BLOCK_END();
 BLOCK_START("algLoc2", ""); %>
-<table>
 <tr>
     <td class="label"><label><%=lcl_prs_address_post_adres%>:</label></td>
     <td><input class="fldloc"" type="text" id="pst_adres" name="pst_adres" value="<%=pst_adres%>" readonly></td>
@@ -174,24 +171,18 @@ BLOCK_START("algLoc2", ""); %>
     <td class="label"><label><%=lcl_noti_email%>:</label></td>
     <td><input class="fldloc"" type="text" id="loc_mai" name="loc_mail" value="<%=loc_mail%>" readonly></td>
 </tr>
-</table>
 <% BLOCK_END();
-BLOCK_START("mldFlex", lcl_mld_flexblok);
- %>
-<!-- theText indicates flexkenmerken will follow on the next row -->
-<% //<tr id="theText"><td> %>
-<%
+BLOCK_START("algFlex", lcl_alg_flexblok);
+
   generateFlexKenmerkCode ({
-     bld_key    : loc_key,
-     onrgoedlvl : onrgoedlvl,
-     reado      : true
+     onrgoed_key    : loc_key,
+     onrgoed_niveau : onrgoedlvl,
+     reado          : true
 });
-%>
-<% // </td></tr> %>
-<%
+
    BLOCK_END();
 %>
 </form>
-</div> <!-- edit -->
+</div>
 </body>
 </html>
diff --git a/APPL/ALG/alg_show_regio.asp b/APPL/ALG/alg_show_regio.asp
index f1106f9769..6b1f9fc9f7 100644
--- a/APPL/ALG/alg_show_regio.asp
+++ b/APPL/ALG/alg_show_regio.asp
@@ -1,41 +1,40 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 1 $
-    $Modtime: 30-09-09 11:38 $
+/*  $Revision: 2 $
+    $Modtime: 10/14/09 5:14p $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
-<!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js"]})
+FCLTHeader.Requires({plugins:["jQuery"], js: []})
+
+   var regio_key  = getQParamInt("regio_key");
+
+   var authparams = alg.checkAutorisation();
+
+   if (!alg.canWriteRegio(regio_key, authparams.mALGreadlevel))
+     user.auth_required_or_abort(false);
+
+    sql = " select * "
+        + "  FROM alg_regio, "
+        + " WHERE alg_regio_key = " + regio_key;
 
-   var regio_key  = parseInt(getQParam("regio_key", "-1"), 10);
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-   
-    sql =    " select * "
-    + "  FROM alg_regio, " 
-    + "       WHERE alg_regio_key = " + regio_key;
-   
 %>
 
 <html>
@@ -44,19 +43,23 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js"]})
    FCLTHeader.Generate();
 %>
 <script  type="text/javascript" >
-  jQuery(document).ready(function() {
-        $('textarea').resize(function () { FcltMgr.resized(window) } );
-        $('textarea').autogrow();
-   });
 
     function reg_change()
     {
         if (FcltMgr.startEdit(window))
             window.location.href = "alg_edit_regio.asp?regio_key=<%=regio_key%>&embedded=1"
     }
+
     function reg_delete()
     {
-        alert("Delete nog niet geimplementeerd");
+      if (confirm("<%=lcl_alg_del_txt_regio%>"))
+      {
+           $.post("alg_delete.asp",
+               { key: <%=regio_key%>,
+                 level: "RE" },
+                 FcltCallbackClose,
+                 "json");
+      }
     }
 </script>
 </head>
@@ -65,21 +68,25 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js"]})
 <div id="show">
 <form name=u2 onSubmit="return false;">
 <%
+var buttons = [];
 
-var buttons =  [ {title: lcl_change, action:"reg_change()", icon: "wijzigen.png", id:"bchange_bez_afspraak" },
-                 {title: lcl_delete, action:"reg_delete()", icon: "delete.png", id:"bdelete_bez_afspraak" } ];
+if (alg.canWriteRegio(regio_key, authparams.mALGwritelevel))
+{
+var buttons =  [ {title: lcl_change, action:"reg_change()", icon: "wijzigen.png" },
+                 {title: lcl_delete, action:"reg_delete()", icon: "delete.png" } ];
+}
 IFRAMER_HEADER(lcl_alg_regio_frame, buttons);
 
-BLOCK_START("test", "");
-                    FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  regiokey: regio_key, 
-                                                                  startlevel: 0, // Regio
-                                                                  eindlevel: 0, // Regio
-                                                                  readonly: true 
-                                                                  });                                                           
+BLOCK_START("algInfo", "");
+                    FCLTplaatsselector(authparams.ALGreadlevel, {
+                          regiokey: regio_key,
+                          startlevel: 0, // Regio
+                          eindlevel: 0, // Regio
+                          readonly: true
+                          });
 BLOCK_END();
 %>
 </form>
-</div> <!-- edit -->
+</div>
 </body>
 </html>
diff --git a/APPL/ALG/alg_show_ruimte.asp b/APPL/ALG/alg_show_ruimte.asp
index 554080781e..ed131e078e 100644
--- a/APPL/ALG/alg_show_ruimte.asp
+++ b/APPL/ALG/alg_show_ruimte.asp
@@ -1,52 +1,46 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 11:34a $
+/*  $Revision: 3 $Modtime: 06-10-2009 $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
-<% Response.Expires = -1; %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
 <!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
 <!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date.js"]})
+FCLTHeader.Requires({plugins:["jQuery"], js: []})
+
+   var room_key  = getQParamInt("room_key");
 
-// AUTORISATIEPARAMETERS
-   var room_key  = parseInt(getQParam("room_key", "-1"), 10);
-   var loc_key
-   var bld_key
-   var flr_key
-   
    var onrgoedlvl = "'R'";
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-   
-    sql =    " select * "
-    + "  FROM ALG_RUIMTE " 
-    + "       WHERE alg_ruimte_key = " + room_key;
-    
-    
+
+   var authparams = alg.checkAutorisation();
+
+   if (!alg.canWriteRuimte(room_key, authparams.mALGreadlevel))
+     user.auth_required_or_abort(false);
+
+    sql = " select * "
+        + "  FROM ALG_RUIMTE "
+        + "       WHERE alg_ruimte_key = " + room_key;
+
+
     oRsMes = Oracle.Execute(sql);
 
-    if (!oRsMes.eof ) {
       var room_srt   = oRsMes("ALG_SRTRUIMTE_KEY").value;
       var room_nr    = oRsMes("ALG_RUIMTE_NR").value;
       var room_ackey = oRsMes("ALG_RUIMTE_ACADKEY").value;
@@ -62,26 +56,16 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
       var room_gebe  = oRsMes("ALG_RUIMTE_OPP_GEVELBEKLEDING").value;
       var room_oppa1 = oRsMes("ALG_RUIMTE_OPP_ALT1").value;
       var room_oppa2 = oRsMes("ALG_RUIMTE_OPP_ALT2").value;
-    } 
-    else {
-       Response.write("internal error or message deleted");
-        Response.End;
-    }
-    oRsMes.Close();
-   
-%>
 
+    oRsMes.Close();
+
+%>
 <html>
 <head>
 <%
    FCLTHeader.Generate();
 %>
 <script  type="text/javascript" >
-  jQuery(document).ready(function() {
-        $('textarea').resize(function () { FcltMgr.resized(window) } );
-        $('textarea').autogrow();
-   });
-
     function room_change()
     {
         if (FcltMgr.startEdit(window))
@@ -89,7 +73,14 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
     }
     function room_delete()
     {
-        alert("Delete nog niet geimplementeerd");
+        if (confirm("<%=lcl_alg_del_txt_ruimte%>"))
+        {
+           $.post("alg_delete.asp",
+               { key: <%=room_key%>,
+                 level: "R" },
+                 FcltCallbackClose,
+                 "json");
+        }
     }
 </script>
 </head>
@@ -98,28 +89,42 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
 <div id="show">
 <form name=u2 onSubmit="return false;">
 <%
+var buttons = [];
 
-var buttons =  [ {title: lcl_change, action:"room_change()", icon: "wijzigen.png", id:"bchange_bez_afspraak" },
-                 {title: lcl_delete, action:"room_delete()", icon: "delete.png", id:"bdelete_bez_afspraak" } ];
+if (alg.canWriteRuimte(room_key, authparams.mALGwritelevel))
+{
+var buttons =  [ {title: lcl_change, action:"room_change()", icon: "wijzigen.png" },
+                 {title: lcl_delete, action:"room_delete()", icon: "delete.png" } ];
+}
 IFRAMER_HEADER(lcl_alg_ruimte_frame, buttons);
 
 BLOCK_START("algLoc1", "");
-%>
-<table>
-<%
-          FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  locatiekey: loc_key, 
-                                                                  gebouwkey: bld_key,
-                                                                  verdiepingkey: flr_key,
-                                                                  ruimtekey: room_key,
-                                                                  startlevel: 2, //Locatie
-                                                                  eindlevel: 5, //Ruimte
-                                                                  readonly: true }); %>
+          FCLTplaatsselector(authparams.ALGreadlevel, {
+                  ruimtekey: room_key,
+                  startlevel: 2, //Locatie
+                  eindlevel: 5, //Ruimte
+                  readonly: true }); %>
 
   <%
      ROFIELDTR("fldroom", lcl_estate_ruimte_man_nr, room_nr);
-     ROFIELDTR("fldroom", lcl_estate_ruimte_man_sort, room_srt);
   %>
+<tr>
+    <%
+     sql  = "SELECT   alg_srtruimte_key, "
+          + "         alg_srtruimte_omschrijving "
+          + "    FROM alg_v_aanwezigsrtruimte "
+          + "ORDER BY alg_srtruimte_upper "
+    FCLTselector("room_srt", sql,
+                    {  label: lcl_estate_ruimte_man_sort,
+                       initKey: room_srt,
+                       emptyOption: "",
+                       readonly: true
+                    }
+                  );
+%>
+</tr>
+<% BLOCK_END();
+BLOCK_START("algLoc2", ""); %>
 <tr>
     <td class="label"><label><%=lcl_estate_ruimte_bruto_vloeropp%>:</label></td>
     <td><input class="fldroom" type="text" id="room_opp" name="room_opp" value="<%=room_opp%>" readonly></td>
@@ -148,24 +153,19 @@ BLOCK_START("algLoc1", "");
     <td class="label"><label><%=lcl_estate_ruimte_man_opmerk%>:</label></td>
     <td><input class="fldroom" type="text" id="room_opm" name="room_opm" value="<%=room_opm%>" readonly></td>
 </tr>
-</table>
 <% BLOCK_END();
-BLOCK_START("mldFlex", lcl_mld_flexblok);
- %>
-<!-- theText indicates flexkenmerken will follow on the next row -->
-<% //<tr id="theText"><td> %>
-<%
+
+BLOCK_START("algFlex", lcl_alg_flexblok);
+
   generateFlexKenmerkCode ({
-     bld_key    : room_key,
-     onrgoedlvl : onrgoedlvl,
-     reado      : true
+     onrgoed_key    : room_key,
+     onrgoed_niveau : onrgoedlvl,
+     reado          : true
 });
-%>
-<% // </td></tr> %>
-<%
-   BLOCK_END();
+
+BLOCK_END();
 %>
 </form>
-</div> <!-- edit -->
+</div>
 </body>
 </html>
diff --git a/APPL/ALG/alg_show_terreinsector.asp b/APPL/ALG/alg_show_terreinsector.asp
index d63a8cdeb4..e4d64af6e5 100644
--- a/APPL/ALG/alg_show_terreinsector.asp
+++ b/APPL/ALG/alg_show_terreinsector.asp
@@ -1,46 +1,42 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 2:26p $
+/*  $Revision: 3 $
+    $Modtime: 10/20/09 9:44a $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
 <!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date.js"]})
+FCLTHeader.Requires({plugins:["jQuery"], js: []})
+
+   var ter_key  = getQParamInt("ter_key");
 
-   var ter_key  = parseInt(getQParam("ter_key", "-1"), 10);
-   
    var onrgoedlvl = "'T'";
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-   
-    sql =    " select * "
-    + "  FROM alg_terreinsector " 
-    + "       WHERE alg_terreinsector_key = " + ter_key;
-    
+
+   var authparams = alg.checkAutorisation();
+
+    sql = " select * "
+        + "  FROM alg_terreinsector "
+        + "       WHERE alg_terreinsector_key = " + ter_key;
+
     oRsMes = Oracle.Execute(sql);
 
-    if (!oRsMes.eof ) {
       var loc_key   = oRsMes("ALG_LOCATIE_KEY").value;
       var ter_oms   = oRsMes("ALG_TERREINSECTOR_OMSCHRIJVING").value;
       var ter_code  = oRsMes("ALG_TERREINSECTOR_CODE").value;
@@ -51,12 +47,8 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
       var ter_aanmk = oRsMes("ALG_TERREINSECTOR_AANMAAK").value;
       var ter_oms   = oRsMes("ALG_TERREINSECTOR_OMSCHRIJVING").value;
       var ter_ordnr = oRsMes("ALG_TERREINSECTOR_ORDERNR").value;
-      var prs_kstn  = oRsMes("PRS_KOSTENPLAATS_KEY").value;       
-    } 
-    else {
-       Response.write("internal error or message deleted");
-        Response.End;
-    }
+      var prs_kstn  = oRsMes("PRS_KOSTENPLAATS_KEY").value;
+
     oRsMes.Close();
 %>
 
@@ -78,7 +70,15 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
     }
     function ter_delete()
     {
-        alert("Delete nog niet geimplementeerd");
+        if (confirm("<%=lcl_alg_del_txt_terreinsector%>"))
+        {
+           var ter_key = <%=ter_key%>
+           $.post("alg_delete.asp",
+               { key: <%=ter_key%>,
+                 level: "T" },
+                 FcltCallbackClose,
+                 "json");
+        }
     }
 </script>
 </head>
@@ -87,21 +87,22 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
 <div id="show">
 <form name=u2 onSubmit="return false;">
 <%
+var buttons = [];
 
-var buttons =  [ {title: lcl_change, action:"ter_change()", icon: "wijzigen.png", id:"bchange_bez_afspraak" },
-                 {title: lcl_delete, action:"ter_delete()", icon: "delete.png", id:"bdelete_bez_afspraak" } ];
+if (alg.canWriteLocatie(loc_key, authparams.mALGwritelevel))
+{
+var buttons =  [ {title: lcl_change, action:"ter_change()", icon: "wijzigen.png" },
+                 {title: lcl_delete, action:"ter_delete()", icon: "delete.png" } ];
+}
 IFRAMER_HEADER(lcl_alg_terreinsector_frame, buttons);
-BLOCK_START("test", "");
-%>
-<table>
-<%
-                    FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  locatiekey: loc_key, 
-                                                                  startlevel: 2, // Locatie
-                                                                  eindlevel: 2, // Locatie
-                                                                  readonly: true
-                                                               });%>
-                                                           
+BLOCK_START("algInfo", "");
+        FCLTplaatsselector(authparams.ALGreadlevel, {
+                locatiekey: loc_key,
+                startlevel: 2, // Locatie
+                eindlevel: 2, // Locatie
+                readonly: true
+         });%>
+
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_man_sort%>:</label></td>
     <td><input class="fldbld" type="text" id="ter_srkey" name="ter_srkey" value="<%=ter_srkey%>" readonly></td>
@@ -109,48 +110,41 @@ BLOCK_START("test", "");
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_man_code%>:</label></td>
     <td><input class="fldbld" type="text" id="ter_code" name="ter_code" value="<%=ter_code%>" readonly></td>
-</tr> 
+</tr>
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_man_name%>:</label></td>
     <td><input class="fldbld" type="text" id="ter_naam" name="ter_naam" value="<%=ter_naam%>" readonly></td>
-</tr> 
+</tr>
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_man_descr%>:</label></td>
     <td><input class="fldbld" type="text" id="ter_oms" name="ter_oms" value="<%=ter_oms%>" readonly></td>
-</tr> 
+</tr>
 <tr>
     <td class="label"><label><%=lcl_prs_dept_kosten%>:</label></td>
     <td><input class="fldbld" type="text" id="prs_kstn" name="prs_kstn" value="<%=prs_kstn%>" readonly></td>
-</tr> 
+</tr>
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_ordernr%>:</label></td>
     <td><input class="fldbld" type="text" id="ter_ordnr" name="ter_ordnr" value="<%=ter_ordnr%>" readonly></td>
-</tr> 
+</tr>
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_man_oppervlak%>:</label></td>
     <td><input class="fldbld" type="text" id="ter_opp" name="ter_opp" value="<%=ter_opp%>" readonly></td>
-</tr> 
+</tr>
 <tr>
     <td class="label"><label><%=lcl_estate_terreinsector_man_omtrek%>:</label></td>
     <td><input class="fldbld" type="text" id="ter_omt" name="ter_omt" value="<%=ter_omt%>" readonly></td>
 </tr>
-</table>                                                                                                               
-<%                                                                
+<%
 BLOCK_END();
-    BLOCK_START("mldFlex", lcl_mld_flexblok);
- %>
-<!-- theText indicates flexkenmerken will follow on the next row -->
-<% //<tr id="theText"><td> %>
-<%
+    BLOCK_START("algFlex", lcl_alg_flexblok);
+
   generateFlexKenmerkCode ({
-     bld_key    : ter_key,
-     onrgoedlvl : onrgoedlvl,
+     onrgoed_key    : ter_key,
+     onrgoed_niveau : onrgoedlvl,
      reado      : true
-     //mldman     : false // TODO: => MGE: Niet meer nodig. Wordt in generateFlexKenmerkCode bepaald.
 });
-%>
-<% // </td></tr> %>
-<%
+
    BLOCK_END();
 %>
 </form>
diff --git a/APPL/ALG/alg_show_verdieping.asp b/APPL/ALG/alg_show_verdieping.asp
index d2e519256a..36685a5c77 100644
--- a/APPL/ALG/alg_show_verdieping.asp
+++ b/APPL/ALG/alg_show_verdieping.asp
@@ -1,60 +1,51 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 1 $
-    $Modtime: 30-09-09 15:53 $
+/*  $Revision: 2 $
+    $Modtime: 10/14/09 4:06p $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
-<% Response.Expires = -1; %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
 <!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date.js", "FcltMgr.js"]})
+FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js"]})
+
+   var flr_key  = getQParamInt("flr_key");
 
-   var flr_key  = parseInt(getQParam("flr_key", "-1"), 10);
-   var bld_key
-   var loc_key
-   
    var onrgoedlvl = "'L'";
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-   
-    sql =    " select * "
-    + "  FROM ALG_VERDIEPING " 
-    + "       WHERE alg_verdieping_key = " + flr_key;
-    
-    
+
+   var authparams = alg.checkAutorisation();
+
+   if (!alg.canWriteVerdieping(flr_key, authparams.mALGreadlevel))
+     user.auth_required_or_abort(false);
+
+    sql = " select * "
+        + "  FROM ALG_VERDIEPING "
+        + "       WHERE alg_verdieping_key = " + flr_key;
+
+
     oRsMes = Oracle.Execute(sql);
 
-    if (!oRsMes.eof ) {
       var flr_omschr = oRsMes("ALG_VERDIEPING_OMSCHRIJVING").value;
       var flr_volgnr = oRsMes("ALG_VERDIEPING_VOLGNR").value;
       var flr_code   = oRsMes("ALG_VERDIEPING_CODE").value;
-    } 
-    else {
-       Response.write("internal error or message deleted");
-        Response.End;
-    }
+
     oRsMes.Close();
-   
 %>
 
 <html>
@@ -63,19 +54,22 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
    FCLTHeader.Generate();
 %>
 <script  type="text/javascript" >
-  jQuery(document).ready(function() {
-        $('textarea').resize(function () { FcltMgr.resized(window) } );
-        $('textarea').autogrow();
-   });
-
     function flr_change()
     {
         if (FcltMgr.startEdit(window))
             window.location.href = "alg_edit_verdieping.asp?flr_key=<%=flr_key%>&embedded=1"
     }
+
     function flr_delete()
     {
-        alert("Delete nog niet geimplementeerd");
+        if (confirm("<%=lcl_alg_del_txt_verdieping%>"))
+        {
+           $.post("alg_delete.asp",
+               { key: <%=flr_key%>,
+                 level: "V" },
+                 FcltCallbackClose,
+                 "json");
+        }
     }
 </script>
 </head>
@@ -84,37 +78,37 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
 <div id="show">
 <form name=u2 onSubmit="return false;">
 <%
+var buttons = [];
 
-var buttons =  [ {title: lcl_change, action:"flr_change()", icon: "wijzigen.png", id:"bchange_bez_afspraak" },
-                 {title: lcl_delete, action:"flr_delete()", icon: "delete.png", id:"bdelete_bez_afspraak" } ];
+if (alg.canWriteVerdieping(flr_key, authparams.mALGwritelevel))
+{
+var buttons =  [ {title: lcl_change, action:"flr_change()", icon: "wijzigen.png" },
+                 {title: lcl_delete, action:"flr_delete()", icon: "delete.png" } ];
+}
 IFRAMER_HEADER(lcl_alg_verdieping_frame, buttons);
 
 BLOCK_START("algLoc1", "");
-%>
-<table>
-<%
-          FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  locatiekey: loc_key,
-                                                                  gebouwkey: bld_key,
-                                                                  verdiepingkey: flr_key,
-                                                                  startlevel: 2, //locatie
-                                                                  eindlevel: 4, // Verdieping
-                                                                  readonly: true }); %>
 
-</tr>
+      FCLTplaatsselector(authparams.ALGreadlevel, {
+              verdiepingkey: flr_key,
+              startlevel: 2, //locatie
+              eindlevel: 4, // Verdieping
+              readonly: true });
+
+%>
 <tr>
     <td class="label"><label><%=lcl_estate_verdieping_man_code%>:</label></td>
-    <td><input class="fldloc" type="text" id="flr_volgnr" name="flr_volgnr" value="<%=flr_volgnr%>" readonly></td>
+    <td><input class="fldloc" type="text" id="flr_code" name="flr_code" value="<%=flr_code%>" readonly></td>
 </tr>
 <tr>
     <td class="label"><label><%=lcl_estate_verdieping_man_volgnr%>:</label></td>
-    <td><input class="fldloc" type="text" id="flr_code" name="flr_code" value="<%=flr_code%>" readonly></td>
+    <td><input class="fldloc" type="text" id="flr_volgnr" name="flr_volgnr" value="<%=flr_volgnr%>" readonly></td>
 </tr>
 </table>
 <%
    BLOCK_END();
 %>
 </form>
-</div> <!-- edit -->
+</div>
 </body>
 </html>
diff --git a/APPL/ALG/alg_show_wp.asp b/APPL/ALG/alg_show_wp.asp
index 942e9c02ce..b2f86bd2c8 100644
--- a/APPL/ALG/alg_show_wp.asp
+++ b/APPL/ALG/alg_show_wp.asp
@@ -1,63 +1,58 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 1 $
-    $Modtime: 30-09-09 15:53 $
+/*  $Revision: 2 $
+    $Modtime: 10/14/09 4:38p $
+
+    File:
+    Status:
+    Description:
+    Parameters:
+
 
-    File:               bez_show_afspraak.asp
-    Status:             10% (new style)
-    Description:        Detailscherm voor afspraken
-    Parameters:         urole (required)
-                        afspr_key (required)
-                        -
     Context:
     Note:
 
 */ %>
-<% Response.Expires = -1; %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
-<!--#include file="../Shared/persoonselector.inc" -->
 <!--#include file="../Shared/selector.inc" -->
-<!--#include file="../Shared/cmenuFn.inc" -->
 
-<!--#?include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/plaatsselector.inc" -->
-<!--#include file="../Shared/kostenplaatsselector.inc" -->
 <!-- #include file="alg_flexkenmerk.inc" -->
+<!-- #include file="alg.inc" -->
+
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date.js", "FcltMgr.js"]})
+FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js"]})
 
 // AUTORISATIEPARAMETERS
-   var wp_key  = parseInt(getQParam("bld_key", "-1"), 10);
+   var wp_key  = parseInt(getQParam("wp_key", "-1"), 10);
    var loc_key
    var bld_key
    var flr_key
    var room_key
-   
-   autfunction = "WEB_ALGMAN";
-   var authparams = user.checkAutorisation(autfunction);
-   var readonly = !(authparams.PRSwritelevel< 9 || authparams.ALGwritelevel < 9);
-   
+
+   var authparams = alg.checkAutorisation();
+
     sql =    " select * "
-    + "  FROM PRS_WERKPLEK " 
+    + "  FROM PRS_WERKPLEK "
     + "       WHERE prs_werkplek_key = " + wp_key;
-    
+
     oRsMes = Oracle.Execute(sql);
 
     if (!oRsMes.eof ) {
       var wp_volgnr = oRsMes("PRS_WERKPLEK_VOLGNR").value;
-      var wp_oms    = oRsMes("PRS_WERKPLEK_VOLGNR").value;
+      var wp_oms    = oRsMes("PRS_WERKPLEK_OMSCHRIJVING").value;
       var wp_vstopp = oRsMes("PRS_WERKPLEK_VASTOPP").value;
       var wp_opp    = oRsMes("PRS_WERKPLEK_OPP").value;
       var wp_vstopp = oRsMes("PRS_WERKPLEK_VASTOPP").value;
       var wp_virt   = oRsMes("PRS_WERKPLEK_VIRTUEEL").value;
-      var room_key  = oRsMes("PRS_ALG_RUIMTE_KEY").value;       
-    } 
+      var room_key  = oRsMes("PRS_ALG_RUIMTE_KEY").value;
+    }
     else {
        Response.write("internal error or message deleted");
         Response.End;
     }
-    oRsMes.Close();    
+    oRsMes.Close();
 %>
 
 <html>
@@ -66,19 +61,21 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
    FCLTHeader.Generate();
 %>
 <script  type="text/javascript" >
-  jQuery(document).ready(function() {
-        $('textarea').resize(function () { FcltMgr.resized(window) } );
-        $('textarea').autogrow();
-   });
 
     function wp_change()
     {
         if (FcltMgr.startEdit(window))
-            window.location.href = "alg_edit_wp.asp?wp_key=<%=wp_key%>&embedded=1"
+            window.location.href = "alg_edit_wp.asp?wp_key=<%=wp_key%>"
     }
     function wp_delete()
     {
-        alert("Delete nog niet geimplementeerd");
+       var wp_key = <%=wp_key%>;
+       if (confirm("<%=lcl_alg_del_txt_werkplek%>"))
+           $.post("alg_delete.asp",
+               { key: <%=wp_key%>,
+                 level: "W" },
+                 FcltCallbackClose,
+                 "json");
     }
 </script>
 </head>
@@ -87,24 +84,25 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date
 <div id="show">
 <form name=u2 onSubmit="return false;">
 <%
+var buttons = [];
 
-var buttons =  [ {title: lcl_change, action:"wp_change()", icon: "wijzigen.png", id:"bchange_bez_afspraak" },
-                 {title: lcl_delete, action:"wp_delete()", icon: "delete.png", id:"bdelete_bez_afspraak" } ];
+if (alg.canWriteRuimte(room_key, authparams.mALGwritelevel))
+{
+var buttons =  [ {title: lcl_change, action:"wp_change()", icon: "wijzigen.png" },
+                 {title: lcl_delete, action:"wp_delete()", icon: "delete.png" } ];
+}
 IFRAMER_HEADER(lcl_alg_wp_frame, buttons);
 
-BLOCK_START("test", "");
+BLOCK_START("algInfo", "");
+        FCLTplaatsselector(authparams.ALGreadlevel, {
+                  locatie: loc_key,
+                  gebouwkey: bld_key,
+                  verdiepingkey: flr_key,
+                  ruimtekey: room_key,
+                  startlevel: 2, // Regio
+                  eindlevel: 5, // District
+                  readonly: true   });
 %>
-<table>
-<%
-                    FCLTplaatsselector(authparams.ALGreadlevel, {                                                                 
-                                                                  locatie: loc_key, 
-                                                                  gebouwkey: bld_key,
-                                                                  verdiepingkey: flr_key,
-                                                                  ruimtekey: room_key,
-                                                                  startlevel: 2, // Regio
-                                                                  eindlevel: 5, // District
-                                                                  readonly: true   });
-%>                                                                  
 <tr>
     <td class="label"><label><%=lcl_estate_wp_seq%>:</label></td>
     <td><input class="fldbld" type="text" id="wp_volgnr" name="wp_volgnr" value="<%=wp_volgnr%>" readonly></td>
@@ -117,10 +115,10 @@ BLOCK_START("test", "");
 <td class="label"><label><%=lcl_estate_wp_fixed%>:</label></td>
                     <td>
                       <label for="wp_vstopp_v">
-                        <input type="radio" name="wp_vstopp_v" id="wp_vstopp_v" value="0" <%= wp_vstopp==0 ? " checked " : "" %> disabled><%=lcl_estate_wp_fixed_v%>
+                        <input type="radio" name="wp_vstopp_v" id="wp_vstopp_v" value="" <%= wp_vstopp==null ? " checked " : "" %> disabled><%=lcl_estate_wp_fixed_v%>
                       </label>
                       <label for="wp_vstopp_f">
-                        <input type="radio" name="wp_vstopp_f" id="wp_vstopp_f" value="1"<%= wp_vstopp==1 ? " checked " : "" %> disabled><%=lcl_estate_wp_fixed_f%>
+                        <input type="radio" name="wp_vstopp_v" id="wp_vstopp_f" value="1"<%= wp_vstopp==1 ? " checked " : "" %> disabled><%=lcl_estate_wp_fixed_f%>
                       </label>
                    </td>
 </tr>
@@ -130,7 +128,7 @@ BLOCK_START("test", "");
     <td class="label"><label><%=lcl_estate_wp_virt%>:</label></td>
     <td><input class="fldalgbez" type="checkbox" id="wp_virt" name="wp_virt" value="<%=wp_virt%>" <%= wp_virt==1 ? " checked " : "" %>disabled></td>
 </tr>
-</table> 
+</table>
 <%
 BLOCK_END();
 %>
diff --git a/APPL/ALG/alg_terreinsector.asp b/APPL/ALG/alg_terreinsector.asp
index 5e7e698047..74ada1da83 100644
--- a/APPL/ALG/alg_terreinsector.asp
+++ b/APPL/ALG/alg_terreinsector.asp
@@ -1,15 +1,14 @@
 <%@language = "javascript" %>
-<%  // testing: bes_key=1251054
+<%
+/*  $Revision: 3 $
+    $Modtime: 10/14/09 5:28p $
 
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 2:52p $
+    File:
+    Status:
+    Description:
+
+    Parameters:
 
-    File:               bes_edit.asp
-    Status:             40% (new style)
-    Description:        Muteerscherm voor bestellingen
-                        dit is de grote 'wrapper' voor de diverse andere schermen
-    Parameters:         urole
-                        bes_key
     Context:
     Note:
 
@@ -19,11 +18,9 @@
 
 <!--#include file="../Shared/iface.inc" -->
 
-<!--#include file="../Shared/algautlevel.inc" -->
-<!--#include file="../Shared/cmenuFn.inc"-->
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jquery-ui.js"]})
-
+FCLTHeader.Requires({plugins:["jQuery", "suggest"], // suggest voor alg_edit_terreinsector.asp
+                     js: []})
 
   var autfunction = "WEB_ALGMAN";
   var authparams = user.checkAutorisation(autfunction);   //Wat weet ik dan nou van disciplines???
@@ -31,6 +28,28 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
 
   // dit lijkt mij de enige gehele readonlyverklaring, de rest is localer
   var readonly = !(authparams.PRSwritelevel< 9 || authparams.ALGwritelevel < 9);
+
+  if (ter_key > 0)
+  {
+      sql = "SELECT t.alg_terreinsector_code, "
+          + "       l.alg_locatie_code "
+          + "  FROM alg_terreinsector t, "
+          + "       alg_locatie l "
+          + " WHERE t.alg_terreinsector_key = " + ter_key
+          + "   AND t.alg_locatie_key = l.alg_locatie_key ";
+
+
+     oRsMes = Oracle.Execute(sql);
+
+     var loc_code = oRsMes("alg_locatie_code").value;
+     var ter_code = oRsMes("alg_terreinsector_code").value;
+
+     var ter_naam   = " " + loc_code + "-" + ter_code;
+  }
+  else
+  {
+    var ter_naam = "";
+  }
 %>
 <html>
 <head>
@@ -38,6 +57,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
    FCLTHeader.Generate();
 %>
   <script  type="text/javascript" >
+      FcltMgr.setTitle("<%=lcl_terra%> <%=ter_naam%> ", {hot:false});
       function algClose(params)
       {
           <% if (ter_key == -1)
@@ -47,10 +67,15 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
                   FcltMgr.closeDetail(window, params );
                   return true;
               }
-              FcltMgr.setTitle("<%=lcl_terra%> " + params.ter_key, {hot:false});
-              window.location.href = "alg_terreinsector.asp?verynew=1&key=" + params.ter_key;
+              if (!params.keepForm)
+                  window.location.href = "alg_terreinsector.asp?verynew=1&key=" + params.ter_key;
           <% } else { // Bestaande melding bewerkt, switch naar show-mode %>
-              $("#algFrame")[0].src = "alg_show_terreinsector.asp?ter_key=<%=ter_key%>";
+              if (params.close)
+              {
+                FcltMgr.closeDetail(window, { close: true})
+              }
+              if (!params.keepForm)
+                  $("#algFrame")[0].src = "alg_show_terreinsector.asp?ter_key=<%=ter_key%>";
           <% } %>
       }
     </script>
@@ -67,21 +92,7 @@ page += "?ter_key="+ter_key;
 IFRAMER("algFrame", page, { title: lcl_alg_terreinsector_frame,
                             initHeight: "450px",
                             FcltClose: "algClose" } );
-
-// AKZA#88 don not allow printing if call isn't saved yet.
-// UWVA#427 also print for FE
-if (ter_key>-1 ) {
-
-  add_str ='huh?';
-  menuArray = new Array();
-  menuArray[0] = lcl_print_report;
-  menuArray[1] = lcl_noti_vis_email;
-  onClickArray = new Array();
-  onClickArray[0] = 'print_test(0)';
-  onClickArray[1] = 'print_test(1)';
-
-// TODO: ik denk niet hier:  generateCmenu("c_menu")
-} %>
+%>
 
 </body>
 </html>
diff --git a/APPL/ALG/alg_terreinsector_list.inc b/APPL/ALG/alg_terreinsector_list.inc
index 1f0a542322..8e0706329b 100644
--- a/APPL/ALG/alg_terreinsector_list.inc
+++ b/APPL/ALG/alg_terreinsector_list.inc
@@ -1,13 +1,13 @@
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 14:10 $
+     $Revision: 2 $
+     $Modtime: 10/14/09 2:58p $
     File:               alg_terreinsector.inc
     Description:        Show an overview of terrein items in list-form,
                         which meets with the given requirements
     Parameters:
     Context:            Search action from alg_terreinsector_search_list.asp form
     Note:
-*/ 
+*/
 %>
 
 <!-- #include file="../Shared/escape.inc" -->
@@ -15,34 +15,30 @@
 <!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getkenmerksql.inc" -->
-
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     })
-                    
+
  function fnrowData(oRs)
         {
           var parent_key = oRs("alg_locatie_key").value;
           var key        = oRs("alg_terreinsector_key").value;
           var oms        = oRs("alg_terreinsector_omschrijving").value;
-     
+
           var data = {parent_key:parent_key, key:key, oms:oms};
-            
+
           return JSON.stringify(data);
         }
 
 %>
-<script>
- dtable = "ALG_TERREINSECTOR";
-</script>
-
 <script type="text/javascript">
-  
+
   var lcl_row_delete_failed1 = "<%=lcl_row_delete_failed1%>";
   var lcl_row_delete_failed2 = "<%=lcl_row_delete_failed2%>";
-  
+
   var autosearch = 1; // automatisch laden van resultaat op search pagina
 
   function gotoParent(row)
@@ -57,42 +53,27 @@ FCLTHeader.Requires({ plugins:["jQuery"],
     var url = "appl/ALG/alg_terreinsector.asp?mode=viewUpdate&key="+algData.key;
     FcltMgr.openDetail(url, "<%=lcl_terra%>" + ' ' + algData.oms);
   }
-    function doDelete(row)
-  {
-   if (confirm('<%=lcl_row_delete_confirm%>')) {
-        
-        var algData = eval('(' + row.ROWDATA + ')');
-        parent.document.body.style.cursor = "wait";
-        document.body.style.cursor = "wait";                    
-        hiddenFrame.navigate("setAlgVerwijder.asp?key=" + algData.key + "&table=" + dtable);
-      }
-  }
-  
-  function DeleteFailed(result)
-{
-  if (result == 1 ) {
-    alert(lcl_row_delete_failed1);
-  } else if ( result == 2 ) {
-    alert(lcl_row_delete_failed2);
-  }
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
 
-function Deleted()
-{
-  algtable.deleteSelectedRows();
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
-</script>      
-<%  
+  function doDelete(row, isMulti)
+  {
+    $(row).addClass('dirty');
+    var ter_key = row.ROWKEY;
+    if (isMulti || confirm("<%=lcl_alg_del_txt_terreinsector%>"))
+       $.post("alg_delete.asp",
+               { key: ter_key,
+                 level: "T" },
+                 FcltCallback,
+                 "json");
+  }
+</script>
+<%
 
 function terrein_list(pautfunction, params)
-{ 
+{
   // De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
-  var authparams = user.checkAutorisation(pautfunction);
-  var canWrite = (authparams.ALGwritelevel < 9);  // TODO: fijner, ik denk 3. Ik moet voor deze locatie, dit district of deze regio schrijfrechten hebben
+  var addButton = [];
+  var authparams = alg.checkAutorisation();
+  var canAdd = (authparams.mALGwritelevel < 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.
@@ -101,6 +82,14 @@ function terrein_list(pautfunction, params)
   var loc_key = params.loc_key;
   var ter_code = params.ter_code;
   var ter_func = params.ter_func;
+
+    function fnrowActionEnabler(oRs) // klopt dit voor terreinsector?
+    {
+        var eDelete = false;
+        if (alg.canWriteLocatie(oRs("alg_locatie_key").value, authparams.mALGwritelevel))
+            eDelete = true;
+        return ({eDelete: eDelete})
+    }
 %>
 
   <html>
@@ -108,7 +97,7 @@ function terrein_list(pautfunction, params)
       <% FCLTHeader.Generate({outputmode:outputmode}) %>
     </head>
     <body id="listbody">
-<%    
+<%
    var sqln = "SELECT   g.alg_terreinsector_key, "
        + "         g.alg_locatie_key, "
        + "         l.alg_locatie_omschrijving, "
@@ -125,7 +114,7 @@ function terrein_list(pautfunction, params)
        + "   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 "
@@ -133,56 +122,61 @@ function terrein_list(pautfunction, params)
                +   "WHERE prs_perslid_key="+user_key
                +    " AND niveau=" + authparams.ALGreadlevel + ")";
       }
-       
+
       sqln += getKenmerkSql("ALG", "g.alg_terreinsector_key");
- 
+
    if (loc_key)
       {
       sqln += " AND g.alg_locatie_key = " + loc_key;
       }
-   
+
    if (ter_func && ter_func != -1)
       {
        sqln += " AND g.ALG_SRTTERREINSECTOR_KEY = " + ter_func;
-      } 
-       
-   if (ter_code)     
-     {      
+      }
+
+   if (ter_code)
+     {
      sqln += " AND (UPPER(g.ALG_TERREINSECTOR_CODE) LIKE UPPER('%" + ter_code + "%'))"
-     }      
-     
+     }
+
      sqln += " ORDER BY g.alg_terreinsector_upper ASC "
-     
+
     var addurl = "appl/alg/alg_terreinsector.asp";
 //    addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
-           
+
+      if (canAdd)
+        {
+        addButton = [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+        }
+
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "alg_terreinsector_key",
                                    ID: "algtable",
+                                   showAll: showall,
+                                   rowActionEnabler: fnrowActionEnabler,
                                    rowData: fnrowData,
                                    outputmode: outputmode,
                                    flexModule: "ALG",
                                    flexId: "alg_terreinsector_key",
                                    filterParams: params,
-                                   buttons: [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+                                   buttons: addButton
                                   });
-                                  
+
     rst.addColumn(new Column({caption: lcl_estate_locatie_man_descr, content: "alg_locatie_omschrijving"}));
     rst.addColumn(new Column({caption: lcl_estate_terreinsector_man_code, content: "alg_terreinsector_code"}));
     rst.addColumn(new Column({caption: lcl_estate_terreinsector_man_name, content: "alg_terreinsector_naam"}));
     rst.addColumn(new Column({caption: lcl_estate_terreinsector_man_sort, content: "alg_srtterreinsec_omschrijving"}));
     rst.addColumn(new Column({caption: lcl_estate_terreinsector_man_oppervlak, content: "alg_terreinsector_oppervlak"}));
-    rst.addColumn(new Column({caption: lcl_estate_terreinsector_man_omtrek, content: "alg_terreinsector_omtrek"}));                            
+    rst.addColumn(new Column({caption: lcl_estate_terreinsector_man_omtrek, content: "alg_terreinsector_omtrek"}));
 
     rst.addAction({ action: "terreinEdit", caption: lcl_edit, isDefault:  true});
-    if (canWrite )
-    rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true});
+    rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true, enabler: "eDelete"});
     rst.addAction({ action: "gotoParent", caption: lcl_goto_locatie_list});
-    
+
     var cnt = rst.processResultset();
 %>
-<iframe src="../Shared/empty.asp" id=hiddenFrame name=hiddenFrame style="display:none"></iframe>
 </body>
-</html>  
+</html>
 <%}%>
 
diff --git a/APPL/ALG/alg_terreinsector_search.asp b/APPL/ALG/alg_terreinsector_search.asp
index b4fc100b20..8fbca14461 100644
--- a/APPL/ALG/alg_terreinsector_search.asp
+++ b/APPL/ALG/alg_terreinsector_search.asp
@@ -1,15 +1,15 @@
 <%@ LANGUAGE = JavaScript %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 15:13 $
+     $Revision: 2 $
+     $Modtime: 10/23/09 9:19a $
 */ %>
 
-<% Response.Expires = 0 %>
 <!-- #include file="../../cust/install.inc" -->
 <!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../Shared/escape.inc" -->
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"],
@@ -23,10 +23,8 @@ var ter_func = getQParam("ter_func", "");
 
 var autosearch = getQParam("autosearch", -1);
 
-autfunction = "WEB_ALGMAN"; //TODO: WEB_ALGUSE
-var authparams = user.checkAutorisation(autfunction);
+var authparams = alg.checkAutorisation();
 
-var lcl_bld_kenmerken = "lcl_terreinsector_kenmerken";
 %>
 <html>
   <head>
@@ -43,8 +41,8 @@ var lcl_bld_kenmerken = "lcl_terreinsector_kenmerken";
           var lvl = "'T'";
           var key = 0;
           var bld_key = "";
-          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&bld_key=" + bld_key + "&onrgoedlvl=" + lvl;
-          var titel = "<%=lcl_bld_kenmerken%>";
+          var url = "load_kenmerk.asp?disc=" + "&urole=bo" + "&advanced=1" + "&onrgoed_key=" + bld_key + "&onrgoed_niveau=" + lvl;
+          var titel = "<%=lcl_properties%>";
           showKenmerkModal(key, url, titel)
         }
         $(document).ready(function() {<% if (autosearch == 1) { %> document.forms.u2.submit();<%}%>});
diff --git a/APPL/ALG/alg_terreinsector_search_list.asp b/APPL/ALG/alg_terreinsector_search_list.asp
index 1b11b589ad..e6c41abedc 100644
--- a/APPL/ALG/alg_terreinsector_search_list.asp
+++ b/APPL/ALG/alg_terreinsector_search_list.asp
@@ -1,7 +1,7 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 27-08-09 11:49 $
+     $Revision: 2 $
+     $Modtime: 10/12/09 3:05p $
 
     File:        alg_ruimte_search_list.asp
     Description: Vangt de parameters van msg_search op en verwerkt die in een aanroep van msg_list
@@ -17,12 +17,6 @@
 <!-- #include file="alg_terreinsector_list.inc" -->
 
 <%
-var urole = getQParam("urole", "");   // Indien niet meegegeven, veronderstel dan frontend gebruik
-var fronto = (urole == "fo");
-var backo = (urole == "bo");
-var minfo = (urole == "mi");
-var frontend = (urole == "fe" || (!fronto & !backo & !minfo));
-
 // FORM parameters: de waarde indien aanwezig, anders null
 // Vaak is een lege selectie ook een -1, dus dan is-ie wel aanwezig, maar hoeft niet
 // als filter te worden toegepast. Dan is null dus gelijk aan -1, qua betekenis,
@@ -35,11 +29,8 @@ var loc_key = getQParamInt("locatiekey", -1); // Locatie
 var ter_code = getQParam("descr", null);
 var ter_func = getQParam("srt", null);
 
-var autfunction = "WEB_ALGMAN";
-
-terrein_list ( autfunction,
-              { urole : urole,
-                outputmode: outputmode,
+terrein_list ( "*",
+              {  outputmode: outputmode,
                  showall: showall,
                  loc_key: (loc_key != -1? loc_key : null),
                  ter_code: (ter_code != ""? ter_code : null),
diff --git a/APPL/ALG/alg_verdieping.asp b/APPL/ALG/alg_verdieping.asp
index 361273f3fd..cd7ed7fe7f 100644
--- a/APPL/ALG/alg_verdieping.asp
+++ b/APPL/ALG/alg_verdieping.asp
@@ -1,44 +1,57 @@
 <%@language = "javascript" %>
-<%  // testing: bes_key=1251054
+<%
+/*  $Revision: 2 $
+    $Modtime: 10/14/09 3:21p $
 
-/*  $Revision: 1 $
-    $Modtime: 30-09-09 14:06 $
+    File:
+    Status:
+    Description:
+
+    Parameters:
 
-    File:               bes_edit.asp
-    Status:             40% (new style)
-    Description:        Muteerscherm voor bestellingen
-                        dit is de grote 'wrapper' voor de diverse andere schermen
-    Parameters:         urole
-                        bes_key
     Context:
     Note:
 
 */ %>
 <!--#include file="../../cust/install.inc" -->
-<!--#include file="../Shared/funcodes.inc" -->
-
 <!--#include file="../Shared/iface.inc" -->
 
-<!--#include file="../Shared/algautlevel.inc" -->
-<!--#include file="../Shared/cmenuFn.inc"-->
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jquery-ui.js"]})
+FCLTHeader.Requires({plugins:["jQuery"], js: []})
 
   var autfunction = "WEB_ALGMAN";
   var authparams = user.checkAutorisation(autfunction);   //Wat weet ik dan nou van disciplines???
   var flr_key = getQParamInt("key", -1);
-  // OVERIGE PARAMETERS
 
-  // dit lijkt mij de enige gehele readonlyverklaring, de rest is localer
+  if (flr_key > 0)
+  {
+      sql = "SELECT g.alg_gebouw_code, "
+          + "       v.alg_verdieping_omschrijving "
+          + "  FROM alg_gebouw g, "
+          + "       alg_verdieping v "
+          + " WHERE v.alg_verdieping_key = " + flr_key
+          + "   AND v.alg_gebouw_key = g.alg_gebouw_key ";
+
+     oRsMes = Oracle.Execute(sql);
+
+     var bld_code = oRsMes("alg_gebouw_code").value;
+     var flr_oms = oRsMes("alg_verdieping_omschrijving").value;
+
+     var floor_name   = " " + bld_code + "-" + flr_oms;
+  }
+  else
+  {
+    var floor_name = "";
+  }
 %>
 
-
 <html>
 <head>
 <%
    FCLTHeader.Generate();
 %>
     <script  type="text/javascript" >
+      FcltMgr.setTitle("<%=lcl_floor%> <%=floor_name%>", {hot:false});
       function algClose(params)
       {
           <% if (flr_key == -1)
@@ -48,10 +61,15 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
                   FcltMgr.closeDetail(window, params );
                   return true;
               }
-              FcltMgr.setTitle("<%=lcl_floor%> " + params.flr_key, {hot:false});
-              window.location.href = "alg_verdieping.asp?key=" + params.flr_key;
-          <% } else { // Bestaande melding bewerkt, switch naar show-mode %>
-              $("#algFrame")[0].src = "alg_show_verdieping.asp?flr_key=<%=flr_key%>";
+              if (!params.keepForm)
+                window.location.href = "alg_verdieping.asp?key=" + params.flr_key;
+          <% } else { // Bestaande verdieping bewerkt, switch naar show-mode %>
+              if (params.close)
+              {
+                FcltMgr.closeDetail(window, { close: true})
+              }
+              if (!params.keepForm)
+                $("#algFrame")[0].src = "alg_show_verdieping.asp?flr_key=<%=flr_key%>";
           <% } %>
       }
     </script>
@@ -68,21 +86,7 @@ page += "?flr_key="+flr_key;
 IFRAMER("algFrame", page, { title: lcl_alg_verdieping_frame,
                             initHeight: "450px",
                             FcltClose: "algClose" } );
-
-// AKZA#88 don not allow printing if call isn't saved yet.
-// UWVA#427 also print for FE
-if (flr_key>-1 ) {
-
-  add_str ='huh?';
-  menuArray = new Array();
-  menuArray[0] = lcl_print_report;
-  menuArray[1] = lcl_noti_vis_email;
-  onClickArray = new Array();
-  onClickArray[0] = 'print_test(0)';
-  onClickArray[1] = 'print_test(1)';
-
-// TODO: ik denk niet hier:  generateCmenu("c_menu")
-} %>
+%>
 
 </body>
 </html>
diff --git a/APPL/ALG/alg_verdieping_list.inc b/APPL/ALG/alg_verdieping_list.inc
index 9796bb0d88..3c721beb43 100644
--- a/APPL/ALG/alg_verdieping_list.inc
+++ b/APPL/ALG/alg_verdieping_list.inc
@@ -1,6 +1,6 @@
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 23:40 $
+     $Revision: 2 $
+     $Modtime: 10/14/09 2:58p $
     File:               alg_verdieping.inc
     Description:        Show an overview of verdieping items in list-form,
                         which meets with the given requirements
@@ -12,10 +12,11 @@
 <!-- #include file="../Shared/disCxprs3d.inc" -->
 <!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     })
 
  function fnrowData(oRs)
@@ -30,9 +31,6 @@ FCLTHeader.Requires({ plugins:["jQuery"],
           return JSON.stringify(data);
         }
 %>
-<script>
- dtable = "ALG_VERDIEPING";
-</script>
 
 <script type="text/javascript">
 
@@ -59,42 +57,28 @@ FCLTHeader.Requires({ plugins:["jQuery"],
     var url = "appl/ALG/alg_verdieping.asp?mode=viewUpdate&key="+algData.key;
     FcltMgr.openDetail(url, "<%=lcl_floor%>" + ' ' + algData.oms);
   }
-    function doDelete(row)
+
+  function doDelete(row, isMulti)
   {
-   if (confirm('<%=lcl_row_delete_confirm%>')) {
-
-        var algData = eval('(' + row.ROWDATA + ')');
-        parent.document.body.style.cursor = "wait";
-        document.body.style.cursor = "wait";
-        hiddenFrame.navigate("setAlgVerwijder.asp?key=" + algData.key + "&table=" + dtable);
-      }
+    $(row).addClass('dirty');
+    var flr_key = row.ROWKEY;
+    if (isMulti || confirm("<%=lcl_alg_del_txt_verdieping%>"))
+       $.post("alg_delete.asp",
+               { key: flr_key,
+                 level: "V" },
+                 FcltCallback,
+                 "json");
   }
 
-  function DeleteFailed(result)
-{
-  if (result == 1 ) {
-    alert(lcl_row_delete_failed1);
-  } else if ( result == 2 ) {
-    alert(lcl_row_delete_failed2);
-  }
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
-
-function Deleted()
-{
-  algtable.deleteSelectedRows();
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
 </script>
 <%
 
 function verdiepingen_list(pautfunction, params)
 {
   // De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
-  var authparams = user.checkAutorisation(pautfunction);
-  var canWrite = (authparams.ALGwritelevel < 9);  // TODO: fijner, ik denk 3. Ik moet voor deze locatie, dit district of deze regio schrijfrechten hebben
+  var addButton = [];
+  var authparams = alg.checkAutorisation();
+  var canAdd = (authparams.mALGwritelevel < 5);
 
   // Voor resulttable de globalen zetten; zou ng anders moeten.
   var outputmode = params.outputmode; // print to 0 = screen, 1 = printer, 2 = excel, etc.
@@ -103,6 +87,14 @@ function verdiepingen_list(pautfunction, params)
   var loc_key = params.loc_key;
   var bld_key = params.bld_key;
   var lvl_key = params.lvl_key;
+
+  function fnrowActionEnabler(oRs)
+    {
+        var eDelete = false;
+        if (alg.canWriteVerdieping(oRs("alg_verdieping_key").value, authparams.mALGwritelevel))
+            eDelete = true;
+        return ({eDelete: eDelete})
+    }
 %>
 
   <html>
@@ -135,19 +127,16 @@ function verdiepingen_list(pautfunction, params)
 
    if (lvl_key)
       {
-      __Log("lvl_key is  "  + lvl_key);
       sqln += " AND v.alg_verdieping_key = " + lvl_key;
       }
 
    else if (bld_key)
       {
-      __Log("bld_key is  "  + bld_key);
       sqln += " AND g.alg_gebouw_key = " + bld_key;
       }
 
    else if (loc_key)
       {
-      __Log("loc_key is  "  + loc_key);
       sqln += " AND g.alg_locatie_key = " + loc_key;
       }
 
@@ -159,13 +148,20 @@ function verdiepingen_list(pautfunction, params)
     var addurl = "appl/alg/alg_verdieping.asp";
 //    addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
 
+      if (canAdd)
+        {
+        addButton = [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+        }
+
     var rst = new ResultsetTable({sql:sqln,
-                                   keyColumn: "alg_verdieping_code",
+                                   keyColumn: "alg_verdieping_key",
                                    ID: "algtable",
+                                   showAll: showall,
                                    outputmode: outputmode,
                                    filterParams: params,
                                    rowData: fnrowData,
-                                   buttons: [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+                                   rowActionEnabler: fnrowActionEnabler,
+                                   buttons: addButton
                                   });
 
     rst.addColumn(new Column({caption: lcl_estate_locatie_man_descr, content: "alg_locatie_omschrijving"}));
@@ -174,14 +170,12 @@ function verdiepingen_list(pautfunction, params)
     rst.addColumn(new Column({caption: lcl_estate_verdieping_man_descr, content: "alg_verdieping_omschrijving", hasActions: true}));
 
     rst.addAction({ action: "verdiepingEdit", caption: lcl_edit, isDefault:  true});
-    if (canWrite )
-      rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true});
+    rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true, enabler: "eDelete"});
     rst.addAction({ action: "gotoDetails", caption: lcl_goto_ruimte_list});
     rst.addAction({ action: "gotoParent", caption: lcl_goto_gebouw_list});
 
     var cnt = rst.processResultset();
 %>
-<iframe src="../Shared/empty.asp" id=hiddenFrame name=hiddenFrame style="display:none"></iframe>
 </body>
 </html>
 <%}%>
diff --git a/APPL/ALG/alg_verdieping_search.asp b/APPL/ALG/alg_verdieping_search.asp
index 7872b5bbfc..722b7fbda7 100644
--- a/APPL/ALG/alg_verdieping_search.asp
+++ b/APPL/ALG/alg_verdieping_search.asp
@@ -1,7 +1,7 @@
 <%@ LANGUAGE = JavaScript %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 29-09-09 14:49 $
+     $Revision: 2 $
+     $Modtime: 10/12/09 12:58p $
 */ %>
 
 <% Response.Expires = 0 %>
@@ -10,6 +10,7 @@
 <!-- #include file="../Shared/escape.inc" -->
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
@@ -22,9 +23,7 @@ var verdieping_key = getQParamInt("verdieping_key", -1); // Verdieping
 
 var autosearch = getQParam("autosearch", -1);
 
-autfunction = "WEB_ALGMAN"; //TODO WEB_ALGUSE?
-
-var authparams = user.checkAutorisation(autfunction);
+var authparams = alg.checkAutorisation();
 %>
 
 <html>
diff --git a/APPL/ALG/alg_verdieping_search_list.asp b/APPL/ALG/alg_verdieping_search_list.asp
index a19894908b..adb2339243 100644
--- a/APPL/ALG/alg_verdieping_search_list.asp
+++ b/APPL/ALG/alg_verdieping_search_list.asp
@@ -1,7 +1,7 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 12:18 $
+     $Revision: 2 $
+     $Modtime: 10/12/09 12:59p $
 
     File:        msg_search_list.asp
     Description: Vangt de parameters van msg_search op en verwerkt die in een aanroep van msg_list
@@ -17,12 +17,6 @@
 <!-- #include file="alg_verdieping_list.inc" -->
 
 <%
-var urole = getQParam("urole", "");   // Indien niet meegegeven, veronderstel dan frontend gebruik
-var fronto = (urole == "fo");
-var backo = (urole == "bo");
-var minfo = (urole == "mi");
-var frontend = (urole == "fe" || (!fronto & !backo & !minfo));
-
 // FORM parameters: de waarde indien aanwezig, anders null
 // Vaak is een lege selectie ook een -1, dus dan is-ie wel aanwezig, maar hoeft niet
 // als filter te worden toegepast. Dan is null dus gelijk aan -1, qua betekenis,
@@ -35,11 +29,8 @@ var loc_key = getQParamInt("locatiekey", -1); // Locatie
 var bld_key = getQParamInt("gebouwkey", -1); // Gebouw
 var lvl_key = getQParamInt("verdiepingkey", -1); // Verdieping
 
-var autfunction = "WEB_ALGMAN";
-
-verdiepingen_list ( autfunction,
-              { urole : urole,
-                outputmode: outputmode,
+verdiepingen_list ( "*",
+              {  outputmode: outputmode,
                  showall: showall,
                  loc_key: (loc_key != -1? loc_key : null),
                  bld_key: (bld_key != -1? bld_key : null),
diff --git a/APPL/ALG/alg_werkplek_list.inc b/APPL/ALG/alg_werkplek_list.inc
index ccf87a80dc..92444552ee 100644
--- a/APPL/ALG/alg_werkplek_list.inc
+++ b/APPL/ALG/alg_werkplek_list.inc
@@ -1,6 +1,6 @@
 <% /*
-     $Revision: 1 $
-     $Modtime: 28-09-09 23:35 $
+     $Revision: 2 $
+     $Modtime: 10/14/09 3:07p $
     File:               alg_werkplek_list.inc
     Description:        Show an overview of werkplek items in list-form,
                         which meets with the given requirements
@@ -14,10 +14,11 @@
 <!-- #include file="../Shared/json2.js" -->
 <!-- #include file="../Shared/resultset_table_v2.inc" -->
 <!-- #include file="../Shared/getvalues.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     })
 
  function fnrowData(oRs)
@@ -31,15 +32,7 @@ FCLTHeader.Requires({ plugins:["jQuery"],
           return JSON.stringify(data);
         }
 %>
-<script>
- dtable = "PRS_WERKPLEK";
-</script>
-
 <script type="text/javascript">
-
-  var lcl_row_delete_failed1 = "<%=lcl_row_delete_failed1%>";
-  var lcl_row_delete_failed2 = "<%=lcl_row_delete_failed2%>";
-
   var autosearch = 1;
 
   function gotoParent(row)
@@ -54,44 +47,27 @@ FCLTHeader.Requires({ plugins:["jQuery"],
     var url = "appl/ALG/alg_wp.asp?mode=viewUpdate&key="+algData.key;
     FcltMgr.openDetail(url, "<%=lcl_workspace%>" + ' ' + algData.oms);
   }
-    function doDelete(row)
-  {
-   if (confirm('<%=lcl_row_delete_confirm%>')) {
 
-        var algData = eval('(' + row.ROWDATA + ')');
-        parent.document.body.style.cursor = "wait";
-        document.body.style.cursor = "wait";
-        hiddenFrame.navigate("setAlgVerwijder.asp?key=" + algData.key + "&table=" + dtable);
-      }
-  }
-
-  function DeleteFailed(result)
-{
-  if (result == 1 ) {
-    alert(lcl_row_delete_failed1);
-  } else if ( result == 2 ) {
-    alert(lcl_row_delete_failed2);
-  }
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-}
-
-function Deleted()
-{
-  selRow = parseInt(GetCurRow());
-  parent.document.body.style.cursor = "auto";
-  document.body.style.cursor = "auto";
-  rowData = document.all.item("row" + selRow);
-  rowData.style.display = 'none';
-}
+    function doDelete(row, isMulti)
+    {
+      $(row).addClass('dirty');
+      var wp_key = row.ROWKEY;
+      if (isMulti || confirm("<%=lcl_alg_del_txt_werkplek%>"))
+           $.post("alg_delete.asp",
+                   { key: wp_key,
+                     level: "W" },
+                     FcltCallback,
+                     "json");
+    }
 </script>
 <%
 
 function werkplek_list(pautfunction, params)
 {
   // De functie checkAutorisation(autfunction) geeft een Response.End indien er geen autorisatie voor autfunction wordt gevonden
-  var authparams = user.checkAutorisation(pautfunction);
-  var canWrite = (authparams.ALGwritelevel < 9);  // TODO: fijner, ik denk 3. Ik moet voor deze locatie, dit district of deze regio schrijfrechten hebben
+  var addButton = [];
+  var authparams = alg.checkAutorisation();
+  var canAdd = (authparams.mALGwritelevel < 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.
@@ -103,6 +79,14 @@ function werkplek_list(pautfunction, params)
   var room_key = params.room_key;
   var wp_descr = params.wp_descr;
 
+  function fnrowActionEnabler(oRs)
+    {
+        var eDelete = false;
+        if (alg.canWriteRuimte(oRs("alg_ruimte_key").value, authparams.mALGwritelevel))
+            eDelete = true;
+        return ({eDelete: eDelete})
+    }
+
 %>
   <html>
     <head>
@@ -150,9 +134,9 @@ function werkplek_list(pautfunction, params)
                + "(SELECT alg_ruimte_key FROM fac_v_my_rooms "
                +   "WHERE prs_perslid_key="+user_key
                +    " AND niveau=" + authparams.ALGreadlevel + ")";
-    }       
-       
-    if (room_key)
+    }
+
+    if (room_key >= 0)
       {
       sqln += " AND p.alg_ruimte_key = " + room_key;
       }
@@ -184,21 +168,28 @@ function werkplek_list(pautfunction, params)
           + "         p.alg_ruimte_nr ASC, "
           + "         p.prs_werkplek_volgnr ";
 
-    var addurl = "appl/alg/alg_wp.asp";
+    var addurl = "appl/alg/alg_wp.asp?room_key=" + room_key;
 //    addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
 
+      if (canAdd)
+        {
+        addButton = [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+        }
+
     var rst = new ResultsetTable({sql:sqln,
                                    keyColumn: "prs_werkplek_key",
                                    ID: "algtable",
+                                   showAll: showall,
                                    rowData: fnrowData,
+                                   rowActionEnabler: fnrowActionEnabler,
                                    outputmode: outputmode,
                                    filterParams: params,
                                    title: lcl_workplace,
-                                   buttons: [{ icon: "plus.png", title: lcl_add, action: "FcltMgr.openDetail('" + addurl + "', '" + lcl_add + "')" }]
+                                   buttons: addButton
                                   });
 
 
-    rst.addColumn(new Column({caption: lcl_room, content: "samengesteld"}));
+    rst.addColumn(new Column({caption: lcl_room, content: "Samengesteld"}));
     rst.addColumn(new Column({caption: lcl_estate_ruimte_man_descr, content: "alg_ruimte_omschrijving"}));
     rst.addColumn(new Column({caption: lcl_workplace, content: "prs_werkplek_omschrijving", hasActions: true}));
     rst.addColumn(new Column({caption: lcl_estate_wp_fixed, content: "decode_vastopp"}));
@@ -218,13 +209,11 @@ function werkplek_list(pautfunction, params)
     }
 
     rst.addAction({ action: "werkplekEdit", caption: lcl_edit, isDefault:  true});
-    if (canWrite )
-      rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true});
+    rst.addAction({ action: "doDelete", caption: lcl_delete, multi: true, enabler: "eDelete"});
     rst.addAction({ action: "gotoParent", caption: lcl_goto_ruimte_list});
 
     var cnt = rst.processResultset();
 %>
-<iframe src="../Shared/empty.asp" id=hiddenFrame name=hiddenFrame style="display:none"></iframe>
 </body>
 </html>
 <%}%>
diff --git a/APPL/ALG/alg_werkplek_search.asp b/APPL/ALG/alg_werkplek_search.asp
index 24dc7568bb..a89e2d7604 100644
--- a/APPL/ALG/alg_werkplek_search.asp
+++ b/APPL/ALG/alg_werkplek_search.asp
@@ -1,7 +1,7 @@
 <%@ LANGUAGE = JavaScript %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 29-09-09 14:51 $
+     $Revision: 2 $
+     $Modtime: 10/12/09 1:16p $
 */ %>
 
 <!-- #include file="../../cust/install.inc" -->
@@ -9,6 +9,7 @@
 <!-- #include file="../Shared/escape.inc" -->
 <!-- #include file="../Shared/selector.inc" -->
 <!-- #include file="../Shared/plaatsselector.inc" -->
+<!-- #include file="alg.inc" -->
 
 <%
 FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"],
@@ -24,8 +25,7 @@ var descr = getQParam("werkplek", "");
 
 var autosearch = getQParam("autosearch", -1);
 
-autfunction = "WEB_ALGMAN"; //WEB_ALGUSE
-var authparams = user.checkAutorisation(autfunction);
+var authparams = alg.checkAutorisation();
 
 %>
 <html>
diff --git a/APPL/ALG/alg_werkplek_search_list.asp b/APPL/ALG/alg_werkplek_search_list.asp
index bafd098744..cf977b6c0a 100644
--- a/APPL/ALG/alg_werkplek_search_list.asp
+++ b/APPL/ALG/alg_werkplek_search_list.asp
@@ -1,12 +1,12 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 27-08-09 11:50 $
+     $Revision: 2 $
+     $Modtime: 10/14/09 10:55a $
 
-    File:        alg_werkplek_search_list.asp
-    Description: Vangt de parameters van msg_search op en verwerkt die in een aanroep van msg_list
-    Parameters:  urole
-    Context:     Vanuit alg_werkplek_search.asp
+    File:        
+    Description: 
+    Parameters:  
+    Context:     
     Note:
 */ %>
 
@@ -17,12 +17,6 @@
 <!-- #include file="alg_werkplek_list.inc" -->
 
 <%
-var urole = getQParam("urole", "");   // Indien niet meegegeven, veronderstel dan frontend gebruik
-var fronto = (urole == "fo");
-var backo = (urole == "bo");
-var minfo = (urole == "mi");
-var frontend = (urole == "fe" || (!fronto & !backo & !minfo));
-
 // FORM parameters: de waarde indien aanwezig, anders null
 // Vaak is een lege selectie ook een -1, dus dan is-ie wel aanwezig, maar hoeft niet
 // als filter te worden toegepast. Dan is null dus gelijk aan -1, qua betekenis,
@@ -38,16 +32,13 @@ var lvl_key = getQParamInt("verdiepingkey", -1); // Verdieping
 var room_key = getQParamInt("ruimtekey", -1); // ruimte
 var wp_descr = getQParam("descr", null);
 
-var autfunction = "WEB_ALGMAN";
-
-werkplek_list ( autfunction,
-              { urole : urole,
-                outputmode: outputmode,
+werkplek_list ( "*",
+              {  outputmode: outputmode,
                  showall: showall,
                  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),
+                 room_key: (room_key != -1? room_key : -1),
                  wp_descr: (wp_descr != ""? wp_descr : null)
               }
              );
diff --git a/APPL/ALG/alg_wp.asp b/APPL/ALG/alg_wp.asp
index ce3b364fad..5f45dfd2c8 100644
--- a/APPL/ALG/alg_wp.asp
+++ b/APPL/ALG/alg_wp.asp
@@ -1,46 +1,56 @@
 <%@language = "javascript" %>
-<%  // testing: bes_key=1251054
+<%
+/*  $Revision: 3 $
+    $Modtime: 10/14/09 4:23p $
 
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 4:50p $
+    File:
+    Status:
+    Description:
+
+    Parameters:
 
-    File:               bes_edit.asp
-    Status:             40% (new style)
-    Description:        Muteerscherm voor bestellingen
-                        dit is de grote 'wrapper' voor de diverse andere schermen
-    Parameters:         urole
-                        bes_key
     Context:
     Note:
 
 */ %>
 
 <!--#include file="../../cust/install.inc" -->
-<!--#include file="../Shared/funcodes.inc" -->
-
 <!--#include file="../Shared/iface.inc" -->
 
-<!--#include file="../Shared/algautlevel.inc" -->
-<!--#include file="../Shared/cmenuFn.inc"-->
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jquery-ui.js"]})
-
+FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jQuery-ui.js"]})
+// jQuery-ui.js is nodig in het child formulier prs_perslidwerkplek_search_list
 
   var autfunction = "WEB_ALGMAN";
   var authparams = user.checkAutorisation(autfunction);   //Wat weet ik dan nou van disciplines???
   var wp_key = getQParamInt("key", -1);
+  var room_key = getQParamInt("room_key", -1);
 
   // dit lijkt mij de enige gehele readonlyverklaring, de rest is localer
   var readonly = !(authparams.PRSwritelevel< 9 || authparams.ALGwritelevel < 9);
+  if (wp_key > 0)
+  {
+        sql = " select prs_werkplek_omschrijving "
+        + "  FROM prs_werkplek "
+        + "  WHERE prs_werkplek_key = " + wp_key;
+
+     oRsMes = Oracle.Execute(sql);
+
+     var wp_naam   = " " + oRsMes("prs_werkplek_omschrijving").value;
+  }
+  else
+  {
+    var wp_naam = ""
+  }
 %>
 
-
 <html>
-<head>
+  <head>
 <%
    FCLTHeader.Generate();
 %>
   <script  type="text/javascript" >
+      FcltMgr.setTitle("<%=lcl_workplace%> <%=wp_naam%>", {hot:false});
       function algClose(params)
       {
           <% if (wp_key == -1)
@@ -50,14 +60,19 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jque
                   FcltMgr.closeDetail(window, params );
                   return true;
               }
-              FcltMgr.setTitle("<%lcl_workplace%> " + params.wp_key, {hot:false});
-              window.location.href = "alg_wp.asp?verynew=1&key=" + params.wp_key;
+              if (!params.keepForm)
+                  window.location.href = "alg_wp.asp?verynew=1&key=" + params.wp_key;
           <% } else { // Bestaande melding bewerkt, switch naar show-mode %>
-              $("#algFrame")[0].src = "alg_show_wp.asp?wp_key=<%=wp_key%>";
+              if (params.close)
+              {
+                FcltMgr.closeDetail(window, { close: true})
+              }
+              if (!params.keepForm)
+                  $("#algFrame")[0].src = "alg_show_wp.asp?wp_key=<%=wp_key%>";
           <% } %>
       }
     </script>
-</head>
+  </head>
 
 <body id="editbody">
 <%
@@ -65,26 +80,16 @@ 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;
+page += "?wp_key="+wp_key+"&room_key="+room_key;
 
 IFRAMER("algFrame", page, { title: lcl_alg_wp_frame,
                             initHeight: "450px",
                             FcltClose: "algClose" } );
-
-// AKZA#88 don not allow printing if call isn't saved yet.
-// UWVA#427 also print for FE
-if (wp_key>-1 ) {
-
-  add_str ='huh?';
-  menuArray = new Array();
-  menuArray[0] = lcl_print_report;
-  menuArray[1] = lcl_noti_vis_email;
-  onClickArray = new Array();
-  onClickArray[0] = 'print_test(0)';
-  onClickArray[1] = 'print_test(1)';
-
-// TODO: ik denk niet hier:  generateCmenu("c_menu")
-} %>
-
+if (wp_key > -1)
+{
+    var page2 ="prs_perslidwerkplek_search_list.asp?wp_key=" + wp_key
+    IFRAMER("algFrame", page2, { initHeight: "450px" } );
+}
+%>
 </body>
 </html>