PCHW#53543 -- Monitor bestanden westland

svn path=/Website/branches/v2017.3/; revision=39853

APPL/ALG/alg_district_list.inc

@@ -131,6 +131,11 @@ function district_list(pautfunction, params)
       sqln += " AND d.alg_district_key = " + dis_key;
       }
 
+   if (params.distr_descr)
+      {
+        sqln += " AND UPPER(d.alg_district_omschrijving) LIKE " + safe.quoted_sql_wild(params.distr_descr + "%");
+      }
+
    else if (reg_key)
       {
       sqln += " AND d.alg_regio_key = " + reg_key;

APPL/ALG/alg_district_search.asp

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

APPL/ALG/alg_district_search_list.asp

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

APPL/ALG/alg_edit_gebouw.asp

@@ -68,6 +68,7 @@ if (bld_key > 0)
   var verantw_key    = oRs("prs_perslid_key_verantw").Value;
   var verantw_key2   = oRs("prs_perslid_key_verantw2").Value;
   var vervaldatum = oRs("alg_gebouw_vervaldatum").Value != null ? new Date(oRs("alg_gebouw_vervaldatum").Value) : null;
+  var geb_score1 = oRs("alg_gebouw_mjb_score1").value;
   oRs.Close();
 }
 else
@@ -120,7 +121,7 @@ else
                              readonly: bld_key > 0,
                              required: true
                            });
-        manRWFIELD("bld_naam",  "fld",          L("lcl_estate_gebouw_man_name"),        bld_naam, {required: true, maxlength: 30});
+        manRWFIELD("bld_naam",  "fld",          L("lcl_estate_gebouw_man_name"),        bld_naam, {required: true, maxlength: 60});
         sql = "SELECT   alg_srtgebouw_key, "
             + "         "+lcl.xsqla('alg_srtgebouw_omschrijving', 'alg_srtgebouw_key')
             + "    FROM alg_srtgebouw "
@@ -188,7 +189,7 @@ else
                        label: L("lcl_delivery_address"),
                        adresKey:  mld_adres,
                        emptyOption: "",
-                       filtcode: "A",
+                       filtercode: "A",
                        readonly: !this_alg.writeman
                     }) ;
         manRWFIELD("bld_x",  "fld",          L("lcl_geoxcoord"),        bld_x, {maxlength: 25});
@@ -228,6 +229,7 @@ else
                       );
         if (this_alg.writeman)
           CHECKBOXTR(L("lcl_estate_gebouw_werkdagen"), "fldalgwerk", "bld_werkdagen", werkdagen==1)
+        ROFIELDTR("fld", "Conditie score", geb_score1, {suppressEmpty: true}); // L("lcl_alg_locatie_mjb_score1")
         BLOCK_END();
 
         generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,

APPL/ALG/alg_edit_locatie.asp

@@ -53,7 +53,8 @@ if (loc_key > 0)
     var pst_adres  = oRs("alg_locatie_post_adres").value;
     var pst_plaats = oRs("alg_locatie_post_plaats").value;
     var pst_land   = oRs("alg_locatie_post_land").value;
-  var dienstniveau  = oRs("mld_dienstniveau_key").value;
+    var dienstniveau  = oRs("mld_dienstniveau_key").value;
+    var loc_score1 = oRs("alg_locatie_mjb_score1").value;
 
     oRs.Close();
 }
@@ -138,6 +139,7 @@ manRWFIELD("pst_land",  "fld",          L("lcl_prs_address_post_land"),        p
 manRWFIELD("loc_vw",  "fld",          L("lcl_estate_locatie_man_verantw"),        loc_vw, {maxlength: 30});
 manRWFIELD("loc_vwtel",  "fld",          L("lcl_estate_locatie_man_verantw_tel"),        loc_vwtel, {maxlength: 15});
 manRWFIELD("loc_mail",  "fld",          L("lcl_noti_email"),        loc_mail, {maxlength: 200});
+ROFIELDTR("fld",                        "Conditie score",        loc_score1, {suppressEmpty: true}); // L("lcl_alg_locatie_mjb_score1")
 
 BLOCK_END();
 

APPL/ALG/alg_edit_ruimte_multi_save.asp

@@ -52,6 +52,10 @@ for (var i = 0; i < alg_key_arr.length; i++)
 
 
         allKenmerkenSQL     = "SELECT " + lcl.xsql('k.alg_kenmerk_omschrijving', 'k.alg_kenmerk_key') + " kenmerk_omschrijving"
+                            + ",      k.alg_kenmerk_kenmerktype kenmerk_kenmerktype"
+                            + ",      k.alg_kenmerk_systeem     kenmerk_systeem"
+                            + ",      k.alg_kenmerk_toonbaar    kenmerk_readonly"
+                            + ",      k.alg_kenmerk_uniek       kenmerk_uniek"
                             + ",      fac_kenmerkdomein_key"
                             + "  FROM alg_kenmerk k"
                             + " WHERE k.alg_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */

APPL/ALG/alg_flexkenmerk.inc

@@ -63,6 +63,7 @@ function generateFlexKenmerkBlock(params)
              + "         k.alg_kenmerk_dec              kenmerk_dec, "
              + "         k.alg_kenmerk_nmin             kenmerk_nmin, "
              + "         k.alg_kenmerk_nmax             kenmerk_nmax, "
+             + "         k.alg_kenmerk_systeem          kenmerk_systeem, "
              + (onrgoed_key > 0
                ? "     (SELECT v.alg_onrgoedkenmerk_waarde "
                  + "      FROM alg_onrgoedkenmerk v "

APPL/ALG/alg_gebouw_list.inc

@@ -68,33 +68,41 @@ function fnrowClass(oRs)
   function gotoDetails(row)
   {
     var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var url = "appl/ALG/alg_verdieping_search.asp?gebouw_key=" + algData.detail_key + "&autosearch=" + autosearch + "&chkgeb=1";
+    var url = "appl/alg/alg_verdieping_search.asp?gebouw_key=" + algData.detail_key + "&autosearch=" + autosearch + "&chkgeb=1";
     FcltMgr.openDetail(url, "<%=L("lcl_floor")%>");
   }
   function gotoParent(row)
   {
     var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var url = "appl/ALG/alg_locatie_search.asp?locatie_key=" + algData.parent_key + "&autosearch=" + autosearch;
+    var url = "appl/alg/alg_locatie_search.asp?locatie_key=" + algData.parent_key + "&autosearch=" + autosearch;
     FcltMgr.openDetail(url, "<%=L("lcl_location")%>");
   }
-    function gebouwEdit(row)
+  function gebouwEdit(row)
   {
     var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
-    var url = "appl/ALG/alg_gebouw.asp?mode=viewUpdate&key=" + algData.key;
+    var url = "appl/alg/alg_gebouw.asp?mode=viewUpdate&key=" + algData.key;
     FcltMgr.openDetail(url, "<%=L("lcl_building")%>" + ' ' + algData.oms);
   }
 
-function doDelete(rowArray, isMulti)
+  function doDelete(rowArray, isMulti)
+  {
+    FcltMgr.confirm(L("lcl_alg_del_txt_gebouw"), { autoconfirm: isMulti }, function() {
+      var bldKeyString = getKeyString(rowArray);
+      var data = { key: bldKeyString,
+                   level: "G"
+                 };
+      <% protectRequest.dataToken("data"); %>
+      $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
+    });
+  }
+
+function toObjMan(row)
 {
-  FcltMgr.confirm(L("lcl_alg_del_txt_gebouw"), { autoconfirm: isMulti }, function() {
-    var bldKeyString = getKeyString(rowArray);
-    var data = { key: bldKeyString,
-                 level: "G"
-               };
-    <% protectRequest.dataToken("data"); %>
-    $.post("alg_delete.asp", data, FcltCallbackRefresh, "json");
-  });
+  var algData = eval('(' + row.getAttribute("ROWDATA") + ')');
+  var url = "appl/ins/ins_search.asp?urole=bo&gebouw_key=" + algData.key;
+  FcltMgr.openDetail(url, "<%=L("lcl_building")%>" + ' ' + algData.oms);
 }
+
 </script>
 <%
 
@@ -118,13 +126,24 @@ function gebouw_list(pautfunction, params)
   var srtgebouw_key = params.srtgebouw_key;
   var verantw_key = params.verantw_key;
   var expalgincl = params.expalgincl;
+  var mjob = params.mjob;
+  var fitness_score1_from = params.fitness_score1_from;
+  var fitness_score1_through = params.fitness_score1_through;
 
+  var autparamsINSUSE = user.checkAutorisation("WEB_INSUSE", true);
+  var autparamsINSMAN = user.checkAutorisation("WEB_INSMAN", true);
+  var readuse = autparamsINSUSE && autparamsINSUSE.PRSreadlevel < 9 && autparamsINSUSE.ALGreadlevel < 9; // Wijzigen Afgeronde gegevens.
+  var readman = autparamsINSMAN && autparamsINSMAN.PRSreadlevel < 9 && autparamsINSMAN.ALGreadlevel < 9; // Wijzigen Afgeronde gegevens.
   function fnrowActionEnabler(oRs)
   {
     var eDelete = false;
+    var eObjMan = false;
     if (alg.canWriteGebouw(oRs("alg_gebouw_key").value, authparams.mALGwritelevel))
       eDelete = true;
-    return ({eDelete: eDelete})
+    // Heb ik rechten om het objectenbeheer overzicht te zien?
+    if (readuse || readman)
+      eObjMan = true;
+    return ({eDelete: eDelete, eObjMan: eObjMan});
   }
 
   function fnrowFlexParams(oRs)
@@ -158,6 +177,7 @@ function gebouw_list(pautfunction, params)
            + "     , g.alg_gebouw_x"
            + "     , g.alg_gebouw_y"
            + "     , g.alg_gebouw_vervaldatum"
+           + "     , g.alg_gebouw_mjb_score1"
            + "     , (SELECT MAX(t.fac_tracking_datum)"
            + "          FROM fac_tracking t"
            + "             , fac_srtnotificatie sn"
@@ -204,6 +224,15 @@ function gebouw_list(pautfunction, params)
     if (!expalgincl)
       sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";
 
+    if (params.mjob)
+    { // Conditiescore.
+      // Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
+      if (fitness_score1_from > 0)
+        sqln += " AND alg_locatie_mjb_score1 >= " + fitness_score1_from;
+      if (fitness_score1_through > 0)
+        sqln += " AND alg_locatie_mjb_score1 <= " + fitness_score1_through;
+    }
+
     sqln += " ORDER BY l.alg_locatie_upper ASC, "
           +  "          g.alg_gebouw_upper ASC  ";
 
@@ -247,14 +276,12 @@ function gebouw_list(pautfunction, params)
       rst.addColumn(new Column({caption: L("lcl_geoxcoord"), content: "alg_gebouw_x"}));
       rst.addColumn(new Column({caption: L("lcl_geoycoord"), content: "alg_gebouw_y"}));
     }
+    if (params.mjob)
+      rst.addColumn(new Column({caption: "Conditiescore", content: "alg_gebouw_mjb_score1"})); // L("lcl_alg_gebouw_mjb_score1")
 
     rst.addAction({ action: "gebouwEdit", caption: L("lcl_edit"), isDefault:  true});
     rst.addAction({ action: "doDelete", caption: L("lcl_delete"), enabler: "eDelete", single:!noref, multi: true, multiOnce: true});
-    if (!noref)
-    {
-      rst.addAction({ action: "gotoDetails", caption: L("lcl_goto_verdieping_list")});
-      rst.addAction({ action: "gotoParent", caption: L("lcl_goto_locatie_list")});
-    }
+    rst.addAction({ action: "toObjMan", caption: L("lcl_ins_object_management"), enabler: "eObjMan"});
     var cnt = rst.processResultset();
 %>
     </body>

APPL/ALG/alg_gebouw_search.asp

@@ -20,6 +20,7 @@ var srtgebouw_key = getQParamInt("gebouw_func", -1); // Gebouwfunctie
 var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
 var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
 var autosearch = getQParamInt("autosearch", 0) == 1;
+var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
 var authparams = alg.checkAutorisation();
 var this_alg = alg.func_enabled(gebouw_key);
 %>
@@ -50,6 +51,7 @@ var this_alg = alg.func_enabled(gebouw_key);
   <body id="searchbody">
     <div id="search">
       <form name="u2" target="workFrame" action="alg_gebouw_search_list.asp" method="get">
+        <input type=hidden name="mjob" id="mjob" value="<%=mjob?1:0%>">
 <%      BLOCK_START("searchtable", L("lcl_filterblok"));%>
         <tr>
           <td class="searchkolom1">
@@ -91,26 +93,62 @@ var this_alg = alg.func_enabled(gebouw_key);
                 + "  FROM alg_srtgebouw"
                 + " WHERE alg_srtgebouw_verwijder IS NULL"
                 + " ORDER BY UPPER("+lcl.xsql('alg_srtgebouw_omschrijving', 'alg_srtgebouw_key')+")";
-            FCLTselector("srt",
-                         sql,
-                         { initKey: srtgebouw_key,
-                           label: L("lcl_estate_gebouw_srtgebouw"),
-                           trclass: "primsearch",
-                           emptyOption: ""
-                         });
-%>
-            <!-- Gebouw verantwoordelijke -->
-<%          // Dit veld is alleen zichtbaar indien er minimaal <20><>n gebouwverantwoordelijke geconfigureerd is (suppressNoValues).
-            FCLTpersoonselector("verantw",
-                                "sgVerantw",
-                                { perslidKey: verantw_key,
-                                  label: L("lcl_alg_bld_verantw"),
-                                  filtercode: "GV", // Gebouw Verantwoordelijke
-                                  trclass: "primsearch",
-                                  suppressNoValues: true,
-                                  whenEmpty: L("lcl_search_generic")  // want filter
-                                });
+              FCLTselector("srt",
+                           sql,
+                           { initKey: srtgebouw_key,
+                             label: L("lcl_estate_gebouw_srtgebouw"),
+                             trclass: "primsearch",
+                             emptyOption: ""
+                           });
 %>
+              <!-- Gebouw verantwoordelijke -->
+<%            // Dit veld is alleen zichtbaar indien er minimaal <20><>n gebouwverantwoordelijke geconfigureerd is (suppressNoValues).
+              FCLTpersoonselector("verantw",
+                                  "sgVerantw",
+                                  { perslidKey: verantw_key,
+                                    label: L("lcl_alg_bld_verantw"),
+                                    filtercode: "GV", // Gebouw Verantwoordelijke
+                                    trclass: "primsearch",
+                                    suppressNoValues: true,
+                                    whenEmpty: L("lcl_search_generic")  // want filter
+                                  });
+
+              if (mjob)
+              { // Conditiescore
+%>              <tr class="primsearch fldfitness_score" id="fitness_score">
+                  <td>
+                    <table width="100%">
+                      <tr>
+                        <td class="label">
+                          <label for="show_fitness_score_from"><%="Conditiescore"%>:</label>  <% /* L("lcl_mjb_fitness_score") */ %>
+                        </td>
+                        <td style="text-align: right">
+                          <%="van"%>  <% /* L("lcl_mjb_from") */ %>
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                  <td class="score">
+                    <input type="text"
+                           onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
+                           onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
+                           id="fitness_score1_from"
+                           name="fitness_score1_from"
+                           class="fldflexN  number "
+                           value=""
+                           maxlength="1">
+                    &nbsp;<%="t/m"%>&nbsp;  <% /* L("lcl_mjb_through") */ %>
+                    <input type="text"
+                           onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
+                           onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
+                           id="fitness_score1_through"
+                           name="fitness_score1_through"
+                           class="fldflexN  number "
+                           value=""
+                           maxlength="1">
+                  </td>
+                </tr>
+<%            } %>
             </table>
           </td><!-- end column 1 -->
         </tr>

APPL/ALG/alg_gebouw_search_list.asp

@@ -32,6 +32,9 @@ var srtgebouw_key = getQParamInt("srt", -1); // Gebouwfunctie
 var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
 var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
 var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen gebouwen
+var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
+var fitness_score1_from = getQParamInt("fitness_score1_from", -1);       // Conditie score van.
+var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
 
 gebouw_list ( "*",
               { outputmode: outputmode,
@@ -45,6 +48,9 @@ gebouw_list ( "*",
                  bld_key: (bld_key != -1? bld_key : null),
                  bld_code: bld_code,
                  bld_name: bld_name,
+                 mjob: mjob,
+                 fitness_score1_from : fitness_score1_from,
+                 fitness_score1_through : fitness_score1_through,
                  noref: (noref != -1? noref : null),
                  expalgincl: expalgincl
               }

APPL/ALG/alg_locatie_list.inc

@@ -120,6 +120,9 @@ function locatie_list(pautfunction, params)
   var reg_key = params.reg_key;
   var dis_key = params.dis_key;
   var loc_key = params.loc_key;
+  var mjob = params.mjob;
+  var fitness_score1_from = params.fitness_score1_from;
+  var fitness_score1_through = params.fitness_score1_through;
 
   function fnrowActionEnabler(oRs)
   {
@@ -161,6 +164,7 @@ function locatie_list(pautfunction, params)
              + "     , l.alg_locatie_verantw_tel"
              + "     , l.alg_locatie_x"
              + "     , l.alg_locatie_y"
+             + "     , l.alg_locatie_mjb_score1"
              + "     , (SELECT MAX(t.fac_tracking_datum)"
              + "          FROM fac_tracking t"
              + "             , fac_srtnotificatie sn"
@@ -168,7 +172,7 @@ function locatie_list(pautfunction, params)
              + "           AND t.fac_tracking_refkey = l.alg_locatie_key"
              + "           AND sn.fac_srtnotificatie_xmlnode = 'locatie'"
              + "       ) recentdatum"
-             + "  FROM alg_v_aanweziglocatie l"
+             + "  FROM alg_locatie l"  // TODO: alg_v_aanweziglocatie gebruiken
              + "     , alg_district d "
              + " WHERE d.alg_district_key(+) = l.alg_district_key"
              + "   AND l.alg_locatie_verwijder IS NULL";
@@ -195,11 +199,22 @@ function locatie_list(pautfunction, params)
     {
       sqln += " AND d.alg_regio_key = " + reg_key;
     }
-    
-    if (params.loc_code)
-        sqln += " AND UPPER(l.alg_locatie_code) LIKE " + safe.quoted_sql_wild(params.loc_code + "%");    
 
-    sqln += " ORDER BY l.alg_locatie_upper ASC "
+    if (params.loc_code)
+        sqln += " AND UPPER(l.alg_locatie_code) LIKE " + safe.quoted_sql_wild(params.loc_code + "%");
+    if (params.loc_descr)
+        sqln += " AND UPPER(l.alg_locatie_omschrijving) LIKE " + safe.quoted_sql_wild(params.loc_descr + "%");
+
+    if (params.mjob)
+    { // Conditiescore.
+      // Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
+      if (fitness_score1_from > 0)
+        sqln += " AND alg_locatie_mjb_score1 >= " + fitness_score1_from;
+      if (fitness_score1_through > 0)
+        sqln += " AND alg_locatie_mjb_score1 <= " + fitness_score1_through;
+    }
+
+    sqln += " ORDER BY UPPER(alg_district_omschrijving), UPPER(alg_locatie_code)";
 
     var addurl = "appl/alg/alg_locatie.asp";
 //  addurl += buildTransitParam(["loc_key", "bld_key", "flo_key", "room_key"], params)  // TODO: welke allemaal?
@@ -231,6 +246,8 @@ function locatie_list(pautfunction, params)
     rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_adres"), content: "alg_locatie_adres"}));
     rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_postcode"), content: "alg_locatie_postcode"}));
     rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_plaats"), content: "alg_locatie_plaats"}));
+    if (params.mjob)
+      rst.addColumn(new Column({caption: "Conditiescore", content: "alg_locatie_mjb_score1"})); // L("lcl_alg_locatie_mjb_score1")
 
     if (outputmode != 0)
     {

APPL/ALG/alg_locatie_search.asp

@@ -15,6 +15,7 @@ FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });
 var district_key = getQParamInt("district_key", -1); //district
 var locatie_key = getQParamInt("locatie_key", -1); //locatie
 var autosearch = getQParamInt("autosearch", 0) == 1;
+var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
 var authparams = alg.checkAutorisation();
 %>
 
@@ -44,7 +45,8 @@ var authparams = alg.checkAutorisation();
   <body id="searchbody">
     <div id="search">
       <form name="u2" target="workFrame" action="alg_locatie_search_list.asp" method="get">
-<%    BLOCK_START("searchtable", L("lcl_filterblok"));%>
+        <input type=hidden name="mjob" id="mjob" value="<%=mjob?1:0%>">
+<%      BLOCK_START("searchtable", L("lcl_filterblok"));%>
           <tr>
             <td class="searchkolom1">
               <table><!-- x rijen, 2 kolommen: label + veld -->
@@ -53,7 +55,7 @@ var authparams = alg.checkAutorisation();
                                                                   districtkey: district_key,
                                                                   locatiekey: locatie_key,
                                                                   startlevel: 1, // District
-                                                                  eindlevel: 2, // locatie
+                                                                  eindlevel: 2, // Locatie
                                                                   whenEmpty: L("lcl_search_generic")  // want filter
                                                                 });
 %>
@@ -61,13 +63,56 @@ var authparams = alg.checkAutorisation();
                 <td class="label"><label><%=L("lcl_estate_locatie_man_code")%>:</label></td>
                 <td><input type="text" class="wildcard" id="loc_code" name="loc_code" value=""></td>
               </tr>
+              <tr class="primsearch">
+                <td class="label"><label><%=L("lcl_estate_locatie_man_descr")%>:</label></td>
+                <td><input type="text" class="wildcard" id="loc_descr" name="loc_descr" value=""></td>
+              </tr>
               </table>
             </td><!-- end column 1 -->
 
+            <!-- Second column -->
             <td class="searchkolom2">
-            </td><!-- end column 1 -->
+              <table><!-- x rijen, 2 kolommen: label + veld -->
+<%              if (mjob)
+                { // Conditiescore
+%>                <tr class="primsearch fldfitness_score" id="fitness_score">
+                    <td>
+                      <table width="100%">
+                        <tr>
+                          <td class="label">
+                            <label for="show_fitness_score_from"><%="Conditiescore"%>:</label>  <% /* L("lcl_mjb_fitness_score") */ %>
+                          </td>
+                          <td style="text-align: right">
+                            <%="van"%>  <% /* L("lcl_mjb_from") */ %>
+                          </td>
+                        </tr>
+                      </table>
+                    </td>
+                    <td class="score">
+                      <input type="text"
+                             onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
+                             onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
+                             id="fitness_score1_from"
+                             name="fitness_score1_from"
+                             class="fldflexN  number "
+                             value=""
+                             maxlength="1">
+                      &nbsp;<%="t/m"%>&nbsp;  <% /* L("lcl_mjb_through") */ %>
+                      <input type="text"
+                             onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
+                             onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
+                             id="fitness_score1_through"
+                             name="fitness_score1_through"
+                             class="fldflexN  number "
+                             value=""
+                             maxlength="1">
+                    </td>
+                  </tr>
+<%              } %>
+              </table>
+            </td><!-- end column 2 -->
           </tr>
-<%    BLOCK_END();
+<%      BLOCK_END();
 
   var buttons =  [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
                    {title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];

APPL/ALG/alg_locatie_search_list.asp

@@ -3,10 +3,10 @@
      $Revision$
      $Id$
 
-    File:       
-    Description: 
-    Parameters:  
-    Context:     
+    File:
+    Description:
+    Parameters:
+    Context:
     Note:
 */ %>
 
@@ -26,6 +26,10 @@ var reg_key = getQParamInt("regiokey", -1); // Regio
 var dis_key = getQParamInt("districtkey", -1); // District
 var loc_key = getQParamInt("locatiekey", -1); // Locatie
 var loc_code = getQParam("loc_code", ""); // Locatiecode
+var loc_descr = getQParam("loc_descr", ""); // Locatienaam
+var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
+var fitness_score1_from = getQParamInt("fitness_score1_from", -1);       // Conditie score van.
+var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
 
 locatie_list ( "*",
               {  outputmode: outputmode,
@@ -33,7 +37,11 @@ locatie_list ( "*",
                  reg_key: (reg_key != -1? reg_key : null),
                  dis_key: (dis_key != -1? dis_key : null),
                  loc_key: (loc_key != -1? loc_key : null),
-                 loc_code: loc_code,                 
+                 loc_code: loc_code,
+                 loc_descr: loc_descr,
+                 mjob: mjob,
+                 fitness_score1_from : fitness_score1_from,
+                 fitness_score1_through : fitness_score1_through,
                  noref: (noref != -1? noref : null)
               }
              );

APPL/ALG/alg_ruimte.asp

@@ -114,7 +114,7 @@ else
       var insman_read = authparamsINSMAN;
       if (insman_read)
       {
-          var page4="../INS/ins_list.asp?embedded=1&tiny=1&ruimtekey=" + room_key
+          var page4="../INS/ins_list.asp?embedded=1&tiny=1&inacObjIncl=1&ruimtekey=" + room_key
           IFRAMER("insdeel", page4, { initHeight: "450px" } );
       }
       var authparamsCNTUSE = user.checkAutorisation("WEB_CNTUSE", true);

APPL/ALG/alg_ruimteafdeling.asp

@@ -37,8 +37,19 @@ if (submitting)
 
   var afdeling_key = -1;
   var bezetting = -1;
-  var afdeling_keys = [];
-  var bezetting_keys = [];
+  var bezettingen = new Array();
+  var afdeling_keys = new Array();
+  var afdeling_names = [];
+
+  function shorttxt(txt, len)
+  {
+      len = len || S("max_tracking_length");
+      if  (txt.length < len)
+          return txt;
+      else
+          return txt.substr(0, len-4) + "...";
+  }
+
   for (var i = 0; i < nrRows; i++)
   {
     afdeling_key = getFParamInt("afd" + i, 0);
@@ -47,10 +58,47 @@ if (submitting)
     if (afdeling_key > 0 && bezetting >= 0)
     {
       afdeling_keys.push(afdeling_key);
-      bezetting_keys.push(bezetting);
+      bezettingen.push(bezetting);
     }
   }
 
+  if (afdeling_keys.length)
+  {
+      var sql = "SELECT prs_afdeling_key, prs_afdeling_omschrijving"
+              + "  FROM prs_afdeling a"
+              + " WHERE prs_afdeling_key IN (" + afdeling_keys.join(",") + ")"
+              + "   AND prs_afdeling_verwijder IS NULL";
+      var oRs = Oracle.Execute(sql);
+      while (!oRs.Eof)
+      {
+          afdeling_names[oRs("prs_afdeling_key").value] = oRs("prs_afdeling_omschrijving").value;
+          oRs.MoveNext();
+      }
+  }
+
+  var oldvals = [];
+  var sql = "SELECT ra.alg_ruimte_key, ra.prs_afdeling_key, a.prs_afdeling_omschrijving, ra.prs_ruimteafdeling_bezetting"
+          + "  FROM prs_ruimteafdeling ra, prs_afdeling a"
+          + " WHERE ra.alg_ruimte_key IN (" + ruimte_key_arr.join(",") + ")"
+          + "   AND ra.prs_afdeling_key = a.prs_afdeling_key"
+          + "   AND ra.prs_ruimteafdeling_verwijder IS NULL"
+          + "   AND a.prs_afdeling_verwijder IS NULL";
+
+
+  var oRs = Oracle.Execute(sql);
+  while (!oRs.Eof)
+  {
+      var tempTuple = { afd_key: oRs("prs_afdeling_key").value, bez: oRs("prs_ruimteafdeling_bezetting").value };
+      if (typeof oldvals[oRs("alg_ruimte_key").value] === 'undefined') // New ruimte
+          oldvals[oRs("alg_ruimte_key").value] = [tempTuple];
+      else
+          oldvals[oRs("alg_ruimte_key").value].push(tempTuple);
+
+      if (typeof afdeling_names[oRs("prs_afdeling_key").value] === 'undefined')
+          afdeling_names[oRs("prs_afdeling_key").value] = oRs("prs_afdeling_omschrijving").value;
+      oRs.MoveNext();
+  }
+
   for (var j = 0; j < ruimte_key_arr.length; j++)
   { // Verwijderen
     var sql = "DELETE prs_ruimteafdeling"
@@ -73,7 +121,7 @@ if (submitting)
       if (!oRs.eof)
       { // Update
         var sql = "UPDATE prs_ruimteafdeling SET"
-                + "       prs_ruimteafdeling_bezetting = " + bezetting_keys[i]
+                + "       prs_ruimteafdeling_bezetting = " + bezettingen[i]
                 + " WHERE prs_ruimteafdeling_key = " + oRs("prs_ruimteafdeling_key").Value;
         Oracle.Execute(sql);
       }
@@ -83,11 +131,60 @@ if (submitting)
                 + "        (alg_ruimte_key, prs_afdeling_key, prs_ruimteafdeling_bezetting)"
                 + " VALUES (" + ruimte_key_arr[j] + ","
                 +               afdeling_keys[i] + ","
-                +               bezetting_keys[i] + ")";
+                +               bezettingen[i] + ")";
         Oracle.Execute(sql);
       }
+      oRs.Close();
     }
   }
+
+  var trackingArr = new Object();
+  var fromLbl = "";
+  var toLbl = "";
+  var rowNr = -1;
+  var doneAfdeling = new Array();
+
+  for (var i = 0; i < ruimte_key_arr.length; i++)
+  {
+      if (typeof oldvals[ruimte_key_arr[i]] !== 'undefined')
+          for (var x = 0; x < oldvals[ruimte_key_arr[i]].length; x++)
+          {
+              fromLbl = shorttxt(afdeling_names[oldvals[ruimte_key_arr[i]][x].afd_key]) + " (" + oldvals[ruimte_key_arr[i]][x].bez + "%) ";
+
+              rowNr = sharedIndexOf(oldvals[ruimte_key_arr[i]][x].afd_key, afdeling_keys);
+              if (rowNr > -1) // Update
+              {
+                  doneAfdeling[rowNr] = true;
+                  if (oldvals[ruimte_key_arr[i]][x].bez == bezettingen[rowNr]) // No change
+                      continue;
+                  toLbl = " " + shorttxt(afdeling_names[afdeling_keys[rowNr]]) + " (" + bezettingen[rowNr] + "%)";
+              }
+              else // Delete
+                  toLbl = " " + L("lcl_tracktoempty");
+
+              if (typeof trackingArr[ruimte_key_arr[i]] === 'undefined')
+                  trackingArr[ruimte_key_arr[i]] = new Array();
+              trackingArr[ruimte_key_arr[i]].push(fromLbl + L("lcl_trackto") + toLbl);
+          }
+
+        for (var y = 0; y < afdeling_keys.length; y++)
+        {
+            if (doneAfdeling[y])
+                continue;
+            else if (typeof trackingArr[ruimte_key_arr[i]] === 'undefined')
+                trackingArr[ruimte_key_arr[i]] = new Array();
+            // Insert
+            fromLbl = L("lcl_trackfromempty") + " ";
+            toLbl = " " + shorttxt(afdeling_names[afdeling_keys[y]]) + " (" + bezettingen[y] + "%)";
+            trackingArr[ruimte_key_arr[i]].push(fromLbl + L("lcl_trackto") + toLbl);
+        }
+  }
+
+  for (var i = 0; i < ruimte_key_arr.length; i++)
+  {
+      if (typeof trackingArr[ruimte_key_arr[i]] !== 'undefined')
+          shared.trackaction("ALGRUP", ruimte_key_arr[i], L("lcl_alg_is_algrup") + "\n" + trackingArr[ruimte_key_arr[i]].join("\n"));
+  }
 %>
   <script type="text/javascript">
     FcltMgr.closeDetail(window, { success: true });

APPL/ALG/alg_show_gebouw.asp

@@ -60,6 +60,7 @@ var werkdagen  = oRs("alg_gebouw_werkdagen").Value;
 var verantw    = oRs("prs_perslid_key_verantw").Value;
 var verantw2    = oRs("prs_perslid_key_verantw2").Value;
 var vervaldatum = oRs("alg_gebouw_vervaldatum").Value;
+var geb_score1 = oRs("alg_gebouw_mjb_score1").value;
 oRs.Close();
 %>
 
@@ -89,10 +90,9 @@ oRs.Close();
 <%  if (S("alg_fg_remote_maps") != "" && bld_x && bld_y) { %>
       function openMaps(bldKey)
       {
-          fwnd = window.open('../cad/ShowGoogleMap.asp?bld_key=' + bldKey, 'FGShow',
+          FcltMgr.windowopen('../cad/ShowGoogleMap.asp?bld_key=' + bldKey, 'FGShow',
                              "width=800, height=600, directories=no, location=no, menubar=no,"
                            + "resizable=yes, status=no, titlebar=yes, toolbar=no");
-          fwnd.focus()
           return;
       }
 <%  } %>
@@ -129,7 +129,7 @@ oRs.Close();
                            { gebouwkey: bld_key,
                              startlevel: 2, //Locatie
                              eindlevel: 3, // Gebouw
-                             moreinfo: true,
+                             moreinfo: true,  // wel beetje suf om door te linken naar jezelf
                              readonly: true
                            });
         sql = "SELECT alg_srtgebouw_key"
@@ -145,7 +145,11 @@ oRs.Close();
                        suppressEmpty: true,
                        readonly: true
                      });
-        ROFIELDTR("fld", L("lcl_estate_gebouw_man_code"), bld_code, {suppressEmpty:true});
+        params = { infoPointer: { Url: "appl/shared/status_info.asp?bld_key=" + bld_key,
+                                  Title: L("lcl_status_details") + " " + bld_naam
+                                }
+                 }
+        ROFIELDTR("fld", L("lcl_estate_gebouw_man_code"), bld_code, params);
         ROFIELDTR("fld", L("lcl_estate_gebouw_man_opmerk"), bld_opmerk, {suppressEmpty:true});
         sql = "SELECT prs_kostenplaats_key"
             + "     , k.prs_kostenplaats_nr || ' ' || k.prs_kostenplaats_omschrijving"
@@ -219,6 +223,7 @@ oRs.Close();
         ROFIELDTR("fld", L("lcl_estate_gebouw_beginuur"), toTimeString(beginuur), {suppressEmpty:true} );
         ROFIELDTR("fld", L("lcl_estate_gebouw_einduur"), toTimeString(einduur), {suppressEmpty:true} );
         ROCHECKBOXTR("fldalgwerk", L("lcl_estate_gebouw_werkdagen"), werkdagen==1);
+        ROFIELDTR("fld", "Conditie score", geb_score1, {suppressEmpty: true}); // L("lcl_alg_locatie_mjb_score1")
         BLOCK_END();
 
         generateFlexKenmerkBlock ({ onrgoed_key    : bld_key,

APPL/ALG/alg_show_locatie.asp

@@ -40,6 +40,7 @@ var loc_vwtel  = oRs("alg_locatie_verantw_tel").value;
 var loc_x      = oRs("alg_locatie_x").value;
 var loc_y      = oRs("alg_locatie_y").value;
 var loc_mail   = oRs("alg_locatie_email").value;
+var loc_score1 = oRs("alg_locatie_mjb_score1").value;
 var pst_adres  = oRs("alg_locatie_post_adres").value;
 var pst_postc  = oRs("alg_locatie_post_postcode").value;
 var pst_adres  = oRs("alg_locatie_post_adres").value;
@@ -86,10 +87,9 @@ oRs.Close();
 <%  if (S("alg_fg_remote_maps") != "" && loc_x && loc_y) {  %>
       function openMaps(locKey)
       {
-          fwnd = window.open('../cad/ShowGoogleMap.asp?loc_key=' + locKey, 'FGShow',
+          FcltMgr.windowopen('../cad/ShowGoogleMap.asp?loc_key=' + locKey, 'FGShow',
                              "width=800, height=600, directories=no, location=no, menubar=no,"
                            + "resizable=yes, status=no, titlebar=yes, toolbar=no");
-          fwnd.focus()
           return;
       }
 <%  } %>
@@ -156,6 +156,7 @@ oRs.Close();
         ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw"), loc_vw, {suppressEmpty: true});
         ROFIELDTR("fld", L("lcl_estate_locatie_man_verantw_tel"), loc_vwtel, {suppressEmpty: true});
         AFIELDTR('fldmailto details', L("lcl_noti_email"), "mailto:" + loc_mail, loc_mail, { suppressEmpty: true });
+        ROFIELDTR("fld", "Conditie score", loc_score1, {suppressEmpty: true}); // L("lcl_alg_locatie_mjb_score1")
 
         BLOCK_END();
 

APPL/ALG/alg_srtruimte.asp

@@ -289,7 +289,7 @@ else if (srtruimte_key > 0 && mode == "delete")
             target="hidFrameSubmit"
             onSubmit="alg_submit()">
 <%
-        BLOCK_START("algInfo", safe.html(L("lcl_general_properties")));
+        BLOCK_START("algInfo", L("lcl_general_properties"));
 
             ROFIELDTR(                  "fld",      L("lcl_key"),                     srtruimte_key);
             myFIELD("omschrijving",     "fld",      L("lcl_descr"),                   srtr_info.alg_srtruimte_omschrijving, { translate: {fld: "mld_afmeldtekst_naam", key: srtruimte_key} });

APPL/API/api.inc

@@ -59,6 +59,7 @@ function API_func()
         loglevel:         oRs("fac_api_loglevel").Value,
         usrrap_key:       oRs("fac_usrrap_key").Value,
         stylesheet:       oRs("fac_api_stylesheet").Value,
+        stylesheet_out:   oRs("fac_api_stylesheet_out").Value,
         import_app_key:   oRs("fac_import_app_key").Value
     };
 

APPL/API/api_SOAP.asp

@@ -55,6 +55,15 @@ try
 
     var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
     xmlReq.load(Request);
+    if (xmlReq.parseError.errorCode != 0)
+    {
+      __DoLog( "Error loading XML: "
+                   + xmlReq.parseError.errorCode
+                   + "\n" + xmlReq.parseError.reason
+                   + " regel " + xmlReq.parseError.line
+                   + "(" + xmlReq.parseError.linepos + ")"
+               , "#ff0000");
+    }
 
     if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_IN");
 

APPL/API/api_besordsoap.asp

@@ -405,6 +405,7 @@
 
     xmlResp.appendChild(FCLTElement);
 
+    Response.ContentType = "text/xml";
     if (API.apidata.stylesheet)
     {
         // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
@@ -412,7 +413,6 @@
     }
     else
     {
-        Response.ContentType = "text/xml";
         Response.Write(xmlResp.xml)
     }
 %>

APPL/API/api_gen_import.asp

@@ -18,6 +18,7 @@
 <!-- #include file="../../appl/Shared/common.inc" -->
 <!-- #include file="../../appl/api/api.inc" -->
 <!-- #include file="../../appl/shared/FlexFiles.inc" -->
+<!-- #include file="../Shared/xml_converter.inc" -->
 <script language="javascript" src="../imp/imp_shared.js" runat="server"></script>
 <%
     // We sturen het antwoord in UTF-8.
@@ -120,5 +121,12 @@
     xmlResp.appendChild(FCLTElement);
 
     Response.ContentType = "text/xml";
-    Response.Write(xmlResp.xml);
+    if (API.apidata.stylesheet_out)
+    {
+        var params = {};
+        STR2Stream(xmlResp.xml, API.apidata.stylesheet_out, Response, params);
+    }
+    else
+        Response.Write(xmlResp.xml);
+
 %>

APPL/API/api_inssoap.asp

@@ -258,6 +258,7 @@
     if (API.apidata.stylesheet)
     {
         // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
+        Response.ContentType = "text/xml";
         STR2Stream(xmlResp.xml, API.apidata.stylesheet, Response, {});
     }
     else

APPL/API/api_mldsoap.asp

@@ -17,6 +17,7 @@
     THIS_FILE = "appl/api/api_mldsoap.asp";
 %>
 <!-- #include file="../Shared/common.inc" -->
+<!-- #include file="../Shared/kenmerk_common.inc" -->
 <!-- #include file="../Shared/xml_converter.inc" -->
 <!-- #include file="../Shared/save2db.inc" -->
 <!-- #include file="../Shared/flexfiles.inc" -->
@@ -38,18 +39,31 @@ var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
 if (API.apidata.stylesheet)
 {
     var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0");
+    iXsl.resolveExternals = true; // XSL kan includes hebben
     if( ! iXsl.load(Server.MapPath(API.apidata.stylesheet)) )
     {
         API.error("Could not load XSL " + API.apidata.stylesheet + "\n" + iXsl.parseError.reason);
     }
     var inputXML = Server.CreateObject("MSXML2.DOMDocument.6.0");
     inputXML.load(Request);
+
+    if (inputXML.parseError.errorCode != 0)
+    {
+      __DoLog( "Error loading XML: "
+                   + inputXML.parseError.errorCode
+                   + "\n" + inputXML.parseError.reason
+                   + " regel " + inputXML.parseError.line
+                   + "(" + inputXML.parseError.linepos + ")"
+               , "#ff0000");
+    }
+    if (API.apidata.loglevel) __Log2File(inputXML.xml, API.APIname + "_IN");
+
     inputXML.transformNodeToObject(iXsl, xmlReq);
 }
 else
     xmlReq.load(Request);
 
-if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_IN");
+if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_TUSSEN");
 
 var xmlResp = new ActiveXObject("MSXML2.DOMDocument.6.0");
 xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\""))
@@ -86,6 +100,7 @@ var meldingen = xmlReq.getElementsByTagName("melding");
 for (i = 0; i < meldingen.length; i++)
 {
   resultcode = -1;
+  resulttekst = "";
   // Lees per node de (optionele) tags en waarden.
   var fields = []; // Bij te werken velden.
   var ext_id        = meldingen[i].getAttribute("key");
@@ -262,9 +277,12 @@ for (i = 0; i < meldingen.length; i++)
         if (meld_oms)
           fields.push({ dbs: "mld_melding_omschrijving",  typ: "varchar",   val: meld_oms,     track: L("lcl_mld_inf_Omschrijving"),  len: 4000 });
 
-        var mldUpd = buildTrackingUpdate("mld_melding", "mld_melding_key = " + mld_key, fields, { noValidateToken: true });
-        Oracle.Execute(mldUpd.sql);
-        mld.trackmeldingupdate(mld_key, L("lcl_mld_is_updatedbysoap").format(mld_key) + "\n" + mldUpd.trackarray.join("\n"));
+        if (fields.length>0)
+        {
+            var mldUpd = buildTrackingUpdate("mld_melding", "mld_melding_key = " + mld_key, fields, { noValidateToken: true });
+            Oracle.Execute(mldUpd.sql);
+            mld.trackmeldingupdate(mld_key, L("lcl_mld_is_updatedbysoap").format(mld_key) + "\n" + mldUpd.trackarray.join("\n"));
+        }
 
         // De kenmerken.
         upsertKenmerk(mldkenmerken, stdmld_key, mld_key);
@@ -441,11 +459,20 @@ for (i = 0; i < meldingen.length; i++)
           {
              __DoLog(pResult.errmsg, "#00FF00");
           }
+          // De hookfunctie kan de stdmelding aanpassen.
+          if (pResult.stdmld_key)
+          {
+             // check de paden van de flexfiles als de stdmeldingkey aangepast is
+             mld.keepFlexDocuments(mld_key, stdmld_key, pResult.stdmld_key);
+          }
         }
       } // end geldige stdmld_key
     } // end insert
   } // end geldige ext_id
 
+  if (resultcode > 0)
+    __DoLog("api_mldsoap fail.\nResultcode: {0}\nReturntekst: {1}".format(resultcode, resulttekst), "#00FF00");
+
   var binfo = {returncode: resultcode,
                returntekst: resulttekst,
                // executed:sql,   // debug
@@ -597,6 +624,7 @@ function upsertKenmerk(kenmerken, stdmld_key, mld_key)
 
 xmlResp.appendChild(FCLTElement);
 
+Response.ContentType = "text/xml";
 if (API.apidata.stylesheet)
 {
   // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
@@ -604,7 +632,6 @@ if (API.apidata.stylesheet)
 }
 else
 {
-  Response.ContentType = "text/xml";
   Response.Write(xmlResp.xml)
 }
 %>

APPL/API/api_opdrsoap.asp

@@ -55,9 +55,14 @@ if ("ORDremark" in API.apidata.options)
 var tsql = "-";     // Voor tijdelijke statement.
 var sql = "-";      // De uiteindelijke insert/update-sql.
 var xmlReq = Server.CreateObject("MSXML2.DOMDocument.6.0");
+
+//if (API.apidata.loglevel) __Log2File(Request, API.APIname + "_IN1");
+
 if (API.apidata.stylesheet)
 {
   var iXsl = Server.CreateObject("MSXML2.DOMDocument.6.0");
+  iXsl.resolveExternals = true; // XSL kan includes hebben
+
   if( ! iXsl.load(Server.MapPath(API.apidata.stylesheet)) )
   {
       API.error("Could not load XSL " + API.apidata.stylesheet + "\n" + iXsl.parseError.reason);
@@ -79,7 +84,18 @@ if (API.apidata.stylesheet)
   inputXML.transformNodeToObject(iXsl, xmlReq);
 }
 else
+{
   xmlReq.load(Request);
+  if (xmlReq.parseError.errorCode != 0)
+  {
+    __DoLog( "Error loading XML: "
+                 + xmlReq.parseError.errorCode
+                 + "\n" + xmlReq.parseError.reason
+                 + " regel " + xmlReq.parseError.line
+                 + "(" + xmlReq.parseError.linepos + ")"
+             , "#ff0000");
+  }
+}
 
 if (API.apidata.loglevel) __Log2File(xmlReq.xml, API.APIname + "_TUSSEN");
 
@@ -140,6 +156,7 @@ for (i=0; i < opdrachten.length; i++)
   var meldingtekst    = XMLval(opdrachten[i], "meldingtekst"); // NEW
   var onderwerp       = XMLval(opdrachten[i], "onderwerp"); // NEW
   var opdr_kpn        = XMLval(opdrachten[i], "kostenplaats");
+  var flag            = parseInt(XMLval(opdrachten[i], "flag"), 10);
 
   var txt_mut_datum   = XMLval(opdrachten[i], "mut_datum"); // UPD
   var opdrstatus      = XMLval(opdrachten[i], "status"); // UPD
@@ -183,6 +200,7 @@ for (i=0; i < opdrachten.length; i++)
   {
      voor_key = oRs("prs_perslid_key").value;
   }
+  oRs.Close();
 
   // Kijk of er een opdracht bestaat met dit externe opdracht nummer.
   // Ben je bang dat het nummer vaker voorkomt dan kun je deze prefixen in de xsl
@@ -200,6 +218,7 @@ for (i=0; i < opdrachten.length; i++)
      // Als het externe opdracht nummer al bestaat weten we zeker dat het om een update gaat.
      opdraction = "update";
   }
+  oRs.Close();
 
   if (opdraction == "insert")
   {
@@ -231,6 +250,12 @@ for (i=0; i < opdrachten.length; i++)
               resulttekst = "Undefined stdmelding " + stdm_key;
             }
 
+            if (isNaN(voor_key))
+            {
+              resultcode = 3;
+              resulttekst = "Undefined 'voor': " + voor_email;
+            }
+
             // Hier heb ik een geldige stdm_key.
             if (resultcode == -1) // Nog steeds geen fouten.
             { // Bepaal kostenplaats via voor-user
@@ -384,6 +409,12 @@ for (i=0; i < opdrachten.length; i++)
         fields.push({ dbs: "mld_opdr_omschrijving",      typ: "varchar",  val: opdrachttekst, len: 4000 });
       }
 
+      // Flag, ignore if invalid
+      if (!isNaN(flag) && flag >= 0 && flag < S("mld_opdracht_flags"))
+      {
+        fields.push({ dbs: "mld_opdr_flag",      typ: "number",  val: flag });
+      }
+
       var mldIns = buildInsert("mld_opdr", fields, { noValidateToken: true });
       var sql = mldIns.sql;
       var err = Oracle.Execute(sql, true);
@@ -404,7 +435,7 @@ for (i=0; i < opdrachten.length; i++)
       mld.updatemeldingstatus (mld_key, 0);
     }
   }
-  else if (opdraction == "update")
+  else if (opdraction == "update" || opdraction == "note")
   {   // Bestaande opdracht zoeken
     var idarr = opdrid.split('/');
     mld_key = parseInt(idarr[0], 10);
@@ -433,6 +464,13 @@ for (i=0; i < opdrachten.length; i++)
       }
       oRs.Close();
     }
+    if (resultcode == -1 && opdraction == "note")
+    {
+       tsql = "INSERT INTO mld_opdr_note(mld_opdr_key, prs_perslid_key, mld_opdr_note_omschrijving)"
+            + " VALUES (" + opdr_key + "," + user_key + "," + safe.quoted_sql(opdropmerking) + ")";
+       Oracle.Execute(tsql);
+       resultcode = 0;   // we zijn klaar.
+    }
   }
   else
   {
@@ -530,6 +568,13 @@ for (i=0; i < opdrachten.length; i++)
       if (autoorder) // Ooit: net als appendRemark via json configureerbaar maken?
         mld_fields.push({ dbs: "mld_melding_einddatum",  typ: "date",    val: opdrgereeddate, track: L("lcl_mld_enddate") });
     }
+
+    // Flag, ignore if invalid
+    if (!isNaN(flag) && flag >= 0 && flag < S("mld_opdracht_flags"))
+    {
+      opdr_fields.push({ dbs: "mld_opdr_flag",  typ: "number",    val: flag });
+    }
+
     // We weten nu de updates, straks voeren we deze pas uit
     // Eerst de eventuele statuswijzigingen
     var newstatus = -1;
@@ -781,6 +826,10 @@ for (i=0; i < opdrachten.length; i++)
   {
     resultcode = 0; // Ik heb gedaan wat ik moest en mocht doen voor deze opdracht.
   }
+  else if (resultcode > 0)
+  {
+    __DoLog("api_opdrsoap fail.\nResultcode: {0}\nReturntekst: {1}".format(resultcode, resulttekst), "#00FF00");
+  }
 
   var binfo = {
                returncode: resultcode,
@@ -807,13 +856,13 @@ for (i=0; i < opdrachten.length; i++)
 
 xmlResp.appendChild(FCLTElement);
 
+Response.ContentType = "text/xml";
 if (API.apidata.stylesheet)
 { // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
   STR2Stream(xmlResp.xml, API.apidata.stylesheet, Response, {});
 }
 else
 {
-  Response.ContentType = "text/xml";
   Response.Write(xmlResp.xml)
 }
 %>

APPL/API/api_ressoap.asp

@@ -441,6 +441,7 @@
 
     xmlResp.appendChild(FCLTElement);
 
+    Response.ContentType = "text/xml";
     if (API.apidata.stylesheet)
     {
         // Niet super efficient dat we eerst naar tekstuele xml gaan maar ach...
@@ -448,7 +449,6 @@
     }
     else
     {
-        Response.ContentType = "text/xml";
         Response.Write(xmlResp.xml)
     }
 %>

APPL/API/shorturl.asp

@@ -62,6 +62,9 @@ __Log("== Entering shorturl.asp ==");
                 + "   AND prs_bedrijfadres_locksecret IS NOT NULL"
                 + "   AND prs_bedrijfadres_lockuser_key IS NOT NULL";
         var oRs = Oracle.Execute(sql);
+        if (oRs.EOF)
+            shared.simpel_page("Fixed user for company '{0}' is not or no longer valid.".format(locked_bdradr_key));
+
         var locksecret = oRs("prs_bedrijfadres_locksecret").Value;
         var lockuser_key = oRs("prs_bedrijfadres_lockuser_key").Value;
         var lockexpire = oRs("prs_bedrijfadres_lockexpire").Value;
@@ -152,6 +155,11 @@ __Log("== Entering shorturl.asp ==");
         }
 
         var url = oRs("fac_bookmark_path").Value;
+        if (url.indexOf("{$*}") > 0) // default.asp?Jumpto=cust/uwva/pacta.asp{$*}
+        {
+            url = url.replace("{$*}", safe.url("?" + rest));
+            rest = "";
+        }
         var refresher = oRs("fac_bookmark_refreshtime").Value;
         var bookmark_naam = oRs("fac_bookmark_naam").Value;
 

APPL/API2/TESTER/api2_tester.asp

@@ -39,7 +39,7 @@ var fac_id = Request.QueryString("fac_id").Count > 0&&String(Request.QueryString
     <body style='background-color:#E5EAF1; font-family: Helvetica; font-size: 0.8em;'>
         <form method="post" onsubmit="doSubmit();return false;">
           <table>
-            <th colspan="2">FACILITOR API2 tester  -  FOR INTERNAL USE ONLY [ <a href="<%=safe.htmlattr(HTTP.urlzelf())%>/api2/" target="_blank">API reference</a> ]</th>
+            <th colspan="2">FACILITOR API2 tester  -  FOR INTERNAL USE ONLY [ <a href="<%=safe.htmlattr(HTTP.urlzelf())%>/api2/" target="_blank" rel="noopener noreferrer">API reference</a> ]</th>
             <tr><td><label>Format</label></td>
                 <td><input type='radio' id='format' name='format' value='json' checked='1'>json</input>
                     <input type='radio' id='format' name='format' value='xml'>xml</input>

APPL/API2/TESTER/testall.js

@@ -368,9 +368,9 @@ String.prototype.format = function()
 
 WScript.Echo("Zorg dat je Fiddler open hebt staan");
 
-var G_fclt_url = 'http://uwva.facws001/trunk/';
+var G_fclt_url = 'http://uwva.facws001.sg.nl/trunk/';
 var G_fclt_url = 'http://uwva.lokalhost/trunk/';
-var G_fclt_url = 'http://uwva.facws001/branch20171/';
+//var G_fclt_url = 'http://uwva.facws001/branch20171/';
 var G_fclt_apikey = 'APIPFO';
 
 var apis = getAPI2JSON("GET", "apis");
@@ -391,6 +391,11 @@ function testOne(api2_name, docparam)
         if (data[api2_name].length && data[api2_name] instanceof Array)
         {
             var model = getAPI2JSON("GET", api2_name + ".api" + (docparam?"?x=1"+docparam:""));
+            if (!model)
+            {
+                WScript.echo("GET van api2_name + ".api + " werkt niet?");
+                return;
+            }
 
             url += "/" + data[api2_name][0]["id"];
             var data = getAPI2JSON("GET", url + (docparam?"?x=1"+docparam:""));
@@ -404,6 +409,11 @@ function testOne(api2_name, docparam)
             {
                 for (var inc in model.includes)
                 var data = getAPI2JSON("GET", url + "?include=" + model.includes[inc]);
+                if (!model)
+                {
+                    WScript.echo("GET van " + url + "?include=" + model.includes[inc] + " werkt niet?");
+                    return;
+                }
                 if (!(model.record_name in data))
                 {
                     WScript.echo("Data niet gevonden als include toegevoegd?");
@@ -423,6 +433,8 @@ function getAPI2JSON(method, url, data)
     {
         return eval ("(" + objXMLHTTP.responseText + ")");
     }
+    else
+        return null;
 }
 
 function FcltAPI2(method, url, data)
@@ -433,6 +445,7 @@ function FcltAPI2(method, url, data)
 
     objXMLHTTP.open(method, url, false);
     objXMLHTTP.setRequestHeader ("X-FACILITOR-API-Key", G_fclt_apikey);
+    objXMLHTTP.setRequestHeader ("Accept", "application/json");
     objXMLHTTP.send(data);
     if (objXMLHTTP.status >= 200 && objXMLHTTP.status <= 299)
     {
@@ -440,5 +453,6 @@ function FcltAPI2(method, url, data)
     }
     WScript.Echo(objXMLHTTP.responseText);
     WScript.Echo(objXMLHTTP.status);
+    WScript.Echo(objXMLHTTP.statusText);
     return null;
 }

APPL/API2/api2.inc

@@ -12,6 +12,7 @@
 */
 %>
 <!-- #include file="../Shared/save2db.inc" -->
+<!-- #include file="api2_tools.inc" -->
 <%
 api2 = {
     form2JSONdata: function _form2JSONdata(model, params, formfields) // Maak een jsondata-object voor gebruik vanuit model_xxx.inc
@@ -100,6 +101,13 @@ api2 = {
                     case "varchar":
                         val = getFParam(formfields[i].frm, null);
                         break;
+                    case "processingtime":
+                        val = {
+                                "duration": getFParamFloat(formfields[i].frm, null),
+                                "unit": getFParam(formfields[i].frm + "_eenheid", "D")
+                              }
+
+                        break;
                     default:
                     {
                         __DoLog(model.fields[formfields[i].name].typ);
@@ -176,6 +184,9 @@ api2 = {
                             continue;
                         if (filterval < 0 && field.typ == "key")
                             continue;
+                        if (filter == "like" && typeof filterval == "string" &&
+                           (filterval.toUpperCase() == "NULL" || filterval.toUpperCase() == "NOT NULL"))
+                            continue; // niet compatible met "like" filter
                     }
 
                     // Voor ranges komt de naam (misschien) niet letterlijk voor, maar (mogelijk) met start_ of end_ ervoor
@@ -188,11 +199,19 @@ api2 = {
                             filterval1 = filterval;
                         if ((filterval1 === "" || filterval1 === null) && (filterval2 === "" || filterval2 === null))
                             continue;
+                        if (typeof filterval1 == "string" && (filterval1.toUpperCase() == "NULL" || filterval1.toUpperCase() == "NOT NULL"))
+                            continue; // niet compatible met "range" filter
                     }
                     // Nu is ook voor ranges alles weer normaal
                     var clause;
                     var operand = " = ";
-                    switch (field.typ)
+                    if (filterval && typeof filterval == "string" &&
+                       (filterval.toUpperCase() == "NULL" || filterval.toUpperCase() == "NOT NULL"))
+                    {
+                        operand = " IS ";
+                        var safe_val = filterval;
+                    }
+                    else switch (field.typ)
                     {
                         case "key":
                             if (!filterval)
@@ -302,6 +321,8 @@ api2 = {
                                 var safe_val = 0;
                             else
                                 var safe_val = parseInt(filterval, 10);
+                            if (field.invert)
+                                safe_val = (safe_val==1?0:1);
                             if (isNaN(safe_val))
                             {
                                 return ["0=1"]; // niets gevonden
@@ -378,12 +399,12 @@ api2 = {
                                 if (filterval1) {
                                     var safe_val1 = api2.toDate(filterval1);
                                     var withtime = (field.typ == "datetime" && api2.hasTime(safe_val1));
-                                    safe_val1 = withtime?safe_val1.toSQL(true):safe_val1.beginToSQL();
+                                    safe_val1 = withtime?safe_val1.toSQL(true, true):safe_val1.beginToSQL();
                                 }
                                 if (filterval2) {
                                     var safe_val2 = api2.toDate(filterval2);
                                     var withtime = (field.typ == "datetime" && api2.hasTime(safe_val2));
-                                    safe_val2 = withtime?safe_val2.toSQL(true):safe_val2.endToSQL();
+                                    safe_val2 = withtime?safe_val2.toSQL(true, true):safe_val2.endToSQL();
                                 }
                                 if (filterval1 && filterval2) {
                                     operand = " BETWEEN ";
@@ -551,6 +572,17 @@ api2 = {
                     dbs = model.aliasprefix + fld;
                 selects.push(field.sql + " AS " + dbs);
             }
+            else if (field.typ == "processingtime")
+            {
+                var sqltijd = "(SELECT xx." + field.dbs + ".tijdsduur"
+                                 + "  FROM " + model.table + " xx"
+                                 + " WHERE xx." + model.primary + " = " + model.table + "." + model.primary + ")";
+                selects.push(sqltijd + " AS " + fld + "_tijdsduur");
+                var sqleenh = "(SELECT xx." + field.dbs + ".eenheid"
+                                 + "  FROM " + model.table + " xx"
+                                 + " WHERE xx." + model.primary + " = " + model.table + "." + model.primary + ")";
+                selects.push(sqleenh + " AS " + fld + "_eenheid");
+            }
             else if (dbs)
             {
                 // veldnamen moeten gelijk zijn bij het ophalen. Zie ook: sql2jsonval
@@ -775,10 +807,12 @@ api2 = {
                             if (field.foreign.desc_is_unique) // Dan mag je die bij saven ook opgeven
                             {
                                 field.typ = "sql";
-                                newval = "(SELECT {0} FROM {1} WHERE {2} = {3})".format(field.foreign.key,
-                                                                                        field.foreign.tbl,
-                                                                                        field.foreign.desc,
-                                                                                        safe.quoted_sql(newval.name));
+                                var where = "{0} = {1}".format(field.foreign.desc, safe.quoted_sql(newval.name));
+                                if (typeof field.foreign.desc_is_unique == "string")
+                                    where += " AND " + field.foreign.desc_is_unique;
+                                newval = "(SELECT {0} FROM {1} WHERE {2})".format(field.foreign.key,
+                                                                                  field.foreign.tbl,
+                                                                                  where);
                             }
                         }
                     }
@@ -878,11 +912,14 @@ api2 = {
                             existing_includes[inckey].found = true;
                         }
                     }
-                    for (oldi in existing_includes)
+                    if (!incmodel.keyfield) // niet voor custom_fields
                     {
-                        if (!existing_includes[oldi].found)
+                        for (oldi in existing_includes)
                         {
-                            incmodel.REST_DELETE(params, oldi);
+                            if (!existing_includes[oldi].found)
+                            {
+                                incmodel.REST_DELETE(params, oldi);
+                            }
                         }
                     }
                 }
@@ -894,33 +931,45 @@ api2 = {
         }
     },
     // Geeft de GET terug van een enkel veld
+    // Onder bepaalde omstandigheden wordt deze functie *heel* veel aangroepen
+    // Houd hem daarom efficient.
     sql2jsonval: function _sql2jsonval(oRs, fld, model)
     {
         var field = model.fields[fld];
         var sqlfieldname = (model.aliasprefix ? api2.sqlfield_alias(model, fld) : field.dbs);
+
+        if (field.typ == "processingtime")
+        {
+            var val = { "duration": oRs(fld + "_tijdsduur").Value,
+                        "unit": oRs(fld + "_eenheid").Value
+                      }
+            return val;
+        }
+
         if (field.val instanceof Function)
             var val = field.val(oRs, field, model, sqlfieldname);
         else if (field.dbs.indexOf(".") < 0)
-        {
             var val = oRs(sqlfieldname).Value;
-        }
         else
             var val = oRs(field.dbs.split(".")[1]).Value;
 
-        if (field.typ == "check" || field.typ == "check0")
-        {
-            if (field.invert)
-                val = (val==1?0:1);
-        }
-
-        if (val === null)
+        if (val === null && !field.invert)
             return val;
-        if (field.typ == "date")
-            val = new Date(val);
-        if (field.typ == "datetime")
-            val = new Date(val);
-        if (field.typ == "time") // In de database ondersteunen we dit niet maar komt voor bij fac_report
-            val = new Date(val);
+
+        switch (field.typ)
+        {
+            case "check":
+            case "check0":
+                if (field.invert)
+                    val = (val==1?0:1);
+                return val;
+                break;
+            case "date":
+            case "datetime":
+            case "time": // In de database ondersteunen we dit niet maar komt voor bij fac_report
+                return new Date(val);
+            break;
+        }
         // Wat te doen met lege waarde
         //  action: null
         //  action: {key: null, name: null}
@@ -1068,10 +1117,10 @@ api2 = {
         var oRs = Oracle.Execute(sql, params.errmsg);
         if (params.errmsg && oRs.friendlyMsg)
         {
-                var record = {};
-                record[model.list.columns[0]] = oRs.friendlyMsg;
-                data.push(record);
-                return data;
+            var record = {};
+            record[model.list.columns[0]] = oRs.friendlyMsg;
+            data.push(record);
+            return data;
         }
 
         var lastkey = 0;
@@ -1084,6 +1133,8 @@ api2 = {
             limit = params.filter.limit;
         if (params.filter.nolimit || limit == -1)
             limit = 99999999; // Excel/CSV alles tonen
+
+        var to_skip = params.filter.offset || 0;
         while (!oRs.Eof)
         {
             if (data.length >= limit) // Alleen nog maar tellen
@@ -1102,6 +1153,7 @@ api2 = {
                 oRs.MoveNext();
                 continue;
             }
+            var newrecord = true;
             if (model.primary)
             {
                 var key = oRs(model.primary).Value;
@@ -1114,13 +1166,18 @@ api2 = {
 
                     if (lastkey && !isEmptyObject(record)) // Record was er mogelijk uit gefilterd
                     {
-                        data.push(record);
+                        if (to_skip > 0)
+                            to_skip --;
+                        else
+                            data.push(record);
                         total_count ++;
                         if (data.length == limit)
                             continue; // alleen nog tellen, 'volgende' record niet meer opbouwen
                     }
                     var record = {};
                 }
+                else
+                    newrecord = false; // er komen nog wel include-records achteraan
             }
 
             // Complexe filtering die we niet voor elkaar kregen met een WHERE-clause
@@ -1135,21 +1192,24 @@ api2 = {
             }
 
             var fld;
-            for (fld in model.fields)
+            if (newrecord) // dan moeten de velden van het basis model eerst
             {
-                if (fld.substring(0,1) == "_")
-                    continue;
-                var field = model.fields[fld];
-                if (field.hidden)
-                    continue;
-                if ("fields" in params.filter && !inArray(fld, params.filter.fields.split(",")))
-                    continue;
+                for (fld in model.fields)
+                {
+                    if (fld.substring(0,1) == "_")
+                        continue;
+                    var field = model.fields[fld];
+                    if (field.hidden)
+                        continue;
+                    if ("fields" in params.filter && !inArray(fld, params.filter.fields.split(",")))
+                        continue;
 
-                var val = api2.sql2jsonval(oRs, fld, model)
-                //waarom was dit aanwezig?
-                //if (field.readonly && !val.id)
-                //    continue;
-                record[fld] = val;
+                    var val = api2.sql2jsonval(oRs, fld, model)
+                    //waarom was dit aanwezig?
+                    //if (field.readonly && !val.id)
+                    //    continue;
+                    record[fld] = val;
+                }
             }
             if (params.include && model.includes)
             {
@@ -1201,25 +1261,32 @@ api2 = {
             lastkey = key;
             if (!model.primary)
             {
-                data.push(record);
+                if (to_skip > 0)
+                    to_skip --;
+                else
+                    data.push(record);
                 record = {};
                 total_count ++;
             }
             oRs.MoveNext();
         }
+        oRs.Close();
         if (lastkey && data.length < limit)
         {
             total_count ++;
-            data.push(record);
+            if (to_skip > 0)
+                to_skip --;
+            else
+                data.push(record);
         }
         if ("merged_model" in model) // de disc_params truc
         {
             model.merged_model.limit = limit;
-            //model.offset = offset;
+            model.merged_model.offset = params.filter.offset || 0;
             model.merged_model.total_count = total_count;
         }
         model.limit = limit;
-        //model.offset = offset;
+        model.offset = params.filter.offset || 0;
         model.total_count = total_count;
         return data;
     },
@@ -1315,7 +1382,7 @@ api2 = {
             if (dt && dt instanceof Date)
                 return dt;
         }
-        NOT_A_DATE;
+        api2.error(400, "Invalid date format");
     },
     generic_REST: function(model, gparams)
     {
@@ -1438,7 +1505,10 @@ function generic_REST_GET(model, gparams)
                 for (var i = 0; i < params.orderby.length; i++)
                 {
                     var field = model.fields[params.orderby[i]];
-                    orderbys.push(field._foreignname || field.dbs);
+                    if (field.sql)
+                        orderbys.push(field.sql);
+                    else
+                        orderbys.push(field._foreignname || field.dbs);
                 }
             }
 
@@ -1560,7 +1630,9 @@ function generic_REST_POST(model, gparams)
 
             var err = Oracle.Execute(xxxIns.sql, true);
             if (err.friendlyMsg)
-                abort_with_warning(err.friendlyMsg);
+                api2.error(400, err.friendlyMsg); // Veronderstel Bad Request
+            if (model.trackcode && user_key > 0) // Bij SAML user-provisioning is er nog niet niemand ingelogd.
+              shared.trackaction(model.trackcode, the_key, L("lcl_inserted0").format(model.record_title));
 
             var inctrack = api2.process_includes(params, model, jsondata, the_key);
 
@@ -1612,22 +1684,29 @@ function generic_REST_PUT(model, gparams)
                 jsondata_dp[model.disc_params.joinfield] = the_key;
             }
 
-            var dbfields = api2.update_fields(params, model, jsondata);
-            var wheres = [model.fields["id"].dbs + "  = " + the_key];
-            var xxxUpd = buildTrackingUpdate(model.table, wheres.join(" AND " ), dbfields, { noValidateToken: true });
-            // TODO: Generieke tracking?
-
-            if (xxxUpd) // Misschien geen velden opgegeven.
+            if (params.custom_fields_only)
             {
-                var err = Oracle.Execute(xxxUpd.sql, true);
-                if (err.friendlyMsg)
-                    abort_with_warning(err.friendlyMsg);
-                if (model.trackcode)
-                    shared.trackaction(model.trackcode, the_key, xxxUpd.trackarray.join("\n"));
+                var xxxUpd = { trackarray: [] };
+            }
+            else
+            {
+                var dbfields = api2.update_fields(params, model, jsondata);
+                var wheres = [model.fields["id"].dbs + "  = " + the_key];
+                var xxxUpd = buildTrackingUpdate(model.table, wheres.join(" AND " ), dbfields, { noValidateToken: true });
+                // TODO: Generieke tracking?
+
+                if (xxxUpd) // Misschien geen velden opgegeven.
+                {
+                    var err = Oracle.Execute(xxxUpd.sql, true);
+                    if (err.friendlyMsg)
+                        api2.error(400, err.friendlyMsg); // Veronderstel Bad Request
+                    if (model.trackcode && xxxUpd.trackarray.length > 0)
+                        shared.trackaction(model.trackcode, the_key, L("lcl_updated") + "\n" + xxxUpd.trackarray.join("\n"));
+                }
             }
             var inctrack = api2.process_includes(params, model, jsondata, the_key);
 
-            if ("disc_params" in model)
+            if (!params.custom_fields_only && "disc_params" in model)
             {
                 // Nu de one-on-one tabel
                 var dbfields = api2.update_fields(params, model.disc_params.model, jsondata_dp);
@@ -1637,7 +1716,7 @@ function generic_REST_PUT(model, gparams)
                 {
                     var err = Oracle.Execute(xxxUpd.sql, true);
                     if (err.friendlyMsg)
-                        abort_with_warning(err.friendlyMsg);
+                        api2.error(400, err.friendlyMsg); // Veronderstel Bad Request
                 }
             }
 
@@ -1672,7 +1751,7 @@ function generic_REST_DELETE(model, gparams)
 
             var err = Oracle.Execute(sql, true);
             if (err.friendlyMsg)
-                abort_with_warning(err.friendlyMsg);
+                api2.error(400, err.friendlyMsg); // Veronderstel Bad Request
 
             return { key: the_key, warning: "" };
         }

APPL/API2/api2_dispatch.inc

@@ -55,7 +55,7 @@ var api2_mapper = {
     "emailsettings"           : { "filename": "appl/mgt/fac_email_setting.asp" },
     "exportfunctions"         : { "filename": "appl/mgt/fac_export_app.asp" },
     "authorizationfunctions"  : { "filename": "appl/mgt/fac_functie.asp" },
-    "authorizationgroups"     : { "filename": "appl/mgt/fac_groep.asp" },
+    "authorizationgroups"     : { "filename": "appl/api2/api_authorizationgroups.asp" },
     "authorizations"          : { "filename": "appl/mgt/fac_groeprechten.asp", "nodoc": true },
     "identityproviders"       : { "filename": "appl/mgt/aut_idp.asp" },
     "importfunctions"         : { "filename": "appl/mgt/fac_import_app.asp" },
@@ -82,7 +82,8 @@ var api2_mapper = {
     "servicelevels"           : { "filename": "appl/mgt/mld_dienstniveau.asp" },
     "issuedisciplines"        : { "filename": "appl/mgt/mld_discipline.asp" },
     "unproductivetimes"       : { "filename": "appl/mgt/mld_impropdr.asp" },
-    "issueproperties"         : { "filename": "appl/mgt/mld_kenmerk.asp" },
+    "issueproperties"         : { "filename": "appl/mgt/mld_mld_kenmerk.asp" },
+    "issueorderproperties"    : { "filename": "appl/mgt/mld_kenmerk.asp" },
     "expenses"                : { "filename": "appl/mgt/mld_kosten.asp" },
     "callsources"             : { "filename": "appl/mgt/mld_meldbron.asp" },
     "disciplinetypes"         : { "filename": "appl/mgt/mld_srtdiscipline.asp" },
@@ -94,9 +95,10 @@ var api2_mapper = {
     "workflowsteps"           : { "filename": "appl/mgt/mld_workflowstep.asp", "nodoc": true },
     "workflowexpressions"     : { "filename": "appl/mgt/mld_workflow_expression.asp" },
     "issuedisciplines"        : { "filename": "appl/api2/api_issuedisciplines.asp",         "module": "MLD" },
-    "orders"                  : { "filename": "appl/api2/api_orders.asp",                   "module": "MLD" },
+//    "orders"                  : { "filename": "appl/api2/api_orders.asp",                   "module": "MLD" },
+    "orders"                  : { "filename": "appl/bgt/mld_opdr.asp",                      "module": "MLD" },
     "issues"                  : { "filename": "appl/api2/api_issues.asp",                   "module": "MLD" },
-    "issuetypes"              : { "filename": "appl/api2/api_issuetypes.asp",               "module": "MLD" },
+    "issuetypes"              : { "filename": "appl/mgt/mld_stdmelding.asp",                "module": "MLD" },
     "pinboardcategories"      : { "filename": "appl/mgt/mrk_discipline.asp" },
     "services"                : { "filename": "appl/mgt/prs_dienst.asp" },
     "basisproperties"         : { "filename": "appl/mgt/prs_kenmerk.asp",                   "docparam": "&level=P" },
@@ -105,7 +107,7 @@ var api2_mapper = {
     "costtypegroups"          : { "filename": "appl/mgt/prs_kostensoortgrp.asp" },
     "costcentregroups"        : { "filename": "appl/mgt/prs_kostenplaatsgrp.asp" },
     "costcentres"             : { "filename": "appl/mgt/prs_kostenplaats.asp" },
-    "persons"                 : { "filename": "appl/mgt/prs_perslid.asp", "nodoc": true },
+    "persons"                 : { "filename": "appl/api2/api_persons.asp", "nodoc": true },
     "mandates"                : { "filename": "appl/mgt/prs_perslidkostenplaats.asp" },
     "relationtypes"           : { "filename": "appl/mgt/prs_relatietype.asp" },
     "employeefunctions"       : { "filename": "appl/mgt/prs_srtperslid.asp" },
@@ -134,7 +136,7 @@ var api2_mapper = {
     "doc"                     : { "filename": "appl/api2/api_doc.asp",                      "module": "API" },
     "apis"                    : { "filename": "appl/api2/api_apis.asp",                     "module": "API" },
     "about"                   : { "filename": "appl/api2/api_about.asp",                    "module": "API" },
-    "cadcontours"             : { "filename": "appl/api2/api_cadcontours.asp",              "module": "CAD" },
+    "cadcontours"             : { "filename": "appl/api2/api_cadcontours.asp",              "module": "CAD", "nodoc": true },
     "contracts"               : { "filename": "appl/api2/api_contracts.asp",                "module": "CNT" },
     "notes"                   : { "filename": "appl/api2/api_notes.asp",                    "module": "FAC", "docparam": "&module=MLD" },
     "approvals"               : { "filename": "appl/api2/api_approvals.asp",                "module": "FAC" },
@@ -143,6 +145,8 @@ var api2_mapper = {
     "reports"                 : { "filename": "appl/api2/api_reports.asp",                  "module": "FAC", "nodoc": true },
     "invoices"                : { "filename": "appl/api2/api_invoices.asp",                 "module": "FIN" },
     "objects"                 : { "filename": "appl/api2/api_objects.asp",                  "module": "INS" },
+    "inspections"             : { "filename": "appl/api2/api_ins_deelsrtcontrole.asp",      "module": "INS" },
+    "statehistory"            : { "filename": "appl/mgt/ins_deel_state_history.asp",        "module": "INS" },
     "companies"               : { "filename": "appl/api2/api_companies.asp",                "module": "PRS" },
     "departments"             : { "filename": "appl/mgt/prs_afdeling.asp",                  "module": "PRS" },
 

APPL/API2/api2_rest.inc

@@ -18,47 +18,22 @@ var DEZE = this;
 api2_rest = {
     authenticate: function _authenticate()
     {
-        var APIKEY;
-        if (S("fac_api_key_in_url"))
-            APIKEY = getQParam("APIKEY", "");
-        if (!APIKEY && Request.ServerVariables("HTTP_X_FACILITOR_API_KEY").Count)
-            APIKEY = String(Request.ServerVariables("HTTP_X_FACILITOR_API_KEY")); // Meegegeven als X-FACILITOR-API-Key
-
-        if (!APIKEY && Session("user_key") > 0)
+        var method = String(Request.ServerVariables("REQUEST_METHOD"));
+        if (method != "GET" && Session("stateless") != 1) // Vereis dan wel het CSRF token
         {
-            user_key = Session("user_key"); // Hierdoor is de API intern te gebruiken zonder authenticatie
-            var method = String(Request.ServerVariables("REQUEST_METHOD"));
-            if (method != "GET") // Vereis dan wel het CSRF token
-            {
-                var token = Request.ServerVariables("HTTP_X_CSRF_TOKEN").Count   // Meegegeven als X-CSRF-TOKEN
-                                ? String(Request.ServerVariables("HTTP_X_CSRF_TOKEN"))
-                                : "";
-                protectRequest.validateToken(token);
-            }
+            var token = Request.ServerVariables("HTTP_X_CSRF_TOKEN").Count   // Meegegeven als X-CSRF-TOKEN
+                            ? String(Request.ServerVariables("HTTP_X_CSRF_TOKEN"))
+                            : "";
+            protectRequest.validateToken(token);
         }
-        else
+        if (user_key < 0)
         {
-            if (Session("user_key") > 0)
-                {} // Tijdens ontwikkeling heb je soms in tweede tab de GUI open. Laat dat ongemoeid.
-            else
-                Session.Abandon(); // Altijd, voor de zekerheid
-
-            var sql = "SELECT prs_perslid_key, prs_perslid_naam, prs_perslid_oslogin"
-                    + "  FROM prs_perslid"
-                    + " WHERE prs_perslid_verwijder IS NULL"
-                    + "   AND prs_perslid_apikey = " + safe.quoted_sql(APIKEY);
-            var oRs = Oracle.Execute(sql);
-            if (oRs.Eof || !APIKEY)
-            {
-                Response.Status = "401 Unauthorized";
-                // Sommige applicaties kunnen in reactie hierop een b64 encoded username:password sturen
-                // Die onderscheppen wij in LoginTry.asp uiteindelijk
-                if (S("basic_auth_realm"))
-                    Response.AddHeader("WWW-Authenticate", "Basic realm=\"" + S("basic_auth_realm") + "\"");
-                Response.End;
-            };
-            __Log("API2 User is: {0} ({1})".format(oRs("prs_perslid_naam").Value, oRs("prs_perslid_oslogin").Value));
-            /* global */ user_key = oRs("prs_perslid_key").Value;
+            Response.Status = "401 Unauthorized";
+            // Sommige applicaties kunnen in reactie hierop een b64 encoded username:password sturen
+            // Die onderscheppen wij in LoginTry.asp uiteindelijk
+            if (S("basic_auth_realm"))
+                Response.AddHeader("WWW-Authenticate", "Basic realm=\"" + S("basic_auth_realm") + "\"");
+            Response.End;
 
             if (typeof NO_ADDHEADER == "undefined" && Request.Servervariables("HTTP_FCLT_VERSION").Count > 0)
             {   // wordt opgepikt door FCLTAPI.DLL voor in de logging en daarna gestript. Niet in Fiddler dus
@@ -93,7 +68,6 @@ api2_rest = {
             oRs.Close()
         }
 
-        /* global */ user = new Perslid(user_key); // wordt mogelijk nog overruled door imporsonate
         CheckForLogging(Request.QueryString("logging")); // Nu pas kan autorisatie via user gecontroleerd worden
     },
 
@@ -160,6 +134,12 @@ api2_rest = {
             /* global */ JSON_Result = true; // Zelf doen we er niets mee maar
                                              // shared.simple_page kijkt er naar
 
+        var orgError = api2.error;
+        api2.error = function (code, msg)
+        {
+            api2_rest.plugin.error_handler(code, msg, orgError);
+        }
+
         api2_rest.authenticate();
         // Kip-ei: de omzetting naar new model() mag pas als je geauthenticeerd bent
         // Hierboven willen we het echter al wel meegeven
@@ -175,20 +155,44 @@ api2_rest = {
             Response.Status = "405 Method not allowed";
             Response.End;
         }
-        if (!("REST_" + method in model))
+        // JGL: Met zeer grote tegenzin behoorlijk UWVA specifiek
+        if (Session("isWriteonlyApi2User"))
+        {
+            if (method == "PUT" || (method == "GET" && getQParam("api2") == "reports"))
+            {
+                // Dat is toegestaan
+            }
+            else
+            {
+                Response.Status = api2.error(400, "Method not supported for this user");
+            }
+        }
+
+        var key = getQParamInt("id", -1); // Voor POST/PUT/DELETE
+
+        var jsondata = {};
+        var filter = shared.qs2json(model);
+        filter = api2_rest.plugin.transform_filter(filter);
+        var requestparams = { filter: filter, include: getQParamArray("include", []) };
+        if (filter.mode == "attachment" && !("includes" in model && "custom_fields" in model.includes))
+            api2.error(400, "Attachment not supported for this model");
+
+        if (filter.mode == "attachment")
+        {
+            if (key > 0 && method == "POST") // het bestand mag dan wel nieuw zijn (POST is van toepassing),
+                method = "PUT";              // intern is het een update van een bestaand record, dus PUT
+        }
+
+        if (!("REST_" + method in model) || !model["REST_" + method])
         {
             Response.Status = "501 Not Implemented";
             // TODO The response MUST include an Allow header containing a list of valid methods for the requested resource.
             Response.End;
         }
-        var jsondata = {};
-        var filter = shared.qs2json(model);
-        filter = api2_rest.plugin.transform_filter(filter);
-        var requestparams = { filter: filter, include: getQParamArray("include", []) };
 
         if (/PUT|POST/.test(method)) // Dan is er in de body data meegestuurd
         {
-            if (filter.mode == "attachment" && "custom_fields" in model.includes)
+            if (filter.mode == "attachment")
             {
                 // Body bevat application/octet-stream, dat lezen we later wel uit
             }
@@ -250,7 +254,6 @@ api2_rest = {
             }
         }
 
-        var key = getQParamInt("id", -1); // Voor POST/PUT/DELETE
         var isSingle = /PUT|POST|DELETE/.test(method) || (key > 0);  // PUT, POST en DELETE altijd single
 
         if (outputformat == "doc")
@@ -304,10 +307,13 @@ api2_rest = {
         {
             if (method == "DELETE")
             {
+                if (!(key > 0))
+                    api2.error(400, "Missing id");
                 var result = model["REST_" + method]( requestparams, key );
             }
-            else if (filter.mode == "attachment" && "custom_fields" in model.includes)
-            {   // GET/PUT/POST https://xxxx.facilitor.nl/trunk/api2/visitors/99685/attachments/1040/testfile.jpg"
+            else if (filter.mode == "attachment")
+            {   // GET/PUT/POST https://xxxx.facilitor.nl/api2/visitors/99685/attachments/1040/testfile.jpg" bestaande folder
+                // POST https://xxxx.facilitor.nl/api2/issues/0/attachments/1040/testfile.jpg" nieuw object, maakt TEMP aan
                 if (wasCodePage != 65001)
                 {
                     // Door de IIS rewriter is de filenaam in de url utf-8 encoded
@@ -341,17 +347,40 @@ api2_rest = {
                 {
                     var bytes = Request.TotalBytes;
                     if (bytes == 0)
-                    { // TODO
-                        //__DoLog("api_gen_import empty body posted", "#ffff00");
-                        //Response.Write("Error: no data posted for API import");
-                        //Response.End; // Grof maar anders AiAi, dat is nog erger
-                    }
+                        api2.error(400, "Empty file");
+
                     var fileStream = Server.CreateObject("ADODB.Stream");
                     fileStream.Type = 1; // adTypeBinary eerst nog
                     fileStream.Open();
-                    fileStream.Write(Request.BinaryRead(bytes));
+                    try
+                    {
+                        fileStream.Write(Request.BinaryRead(bytes));
+                    }
+                    catch(e)
+                    {
+                        var msg = L("lcl_shared_upload_error_start") + e.description + L("lcl_shared_upload_error_end");
+                        api2.error(400, msg);
+                    }
                     jsondata["custom_fields"][0]["attachments"][0].datastream = fileStream;
+                    if (key == 0) // new record
+                    {
+                        var token = model.includes["custom_fields"].model.REST_POST(requestparams, jsondata.custom_fields[0], -1);
+                        var record = { xflexparentkey: -1, propertyid: jsondata.custom_fields[0].propertyid};
+                        var fileparams = { getFiles: true, api2name: null, tmpfolder: token };
+                    }
+                    else
+                    {
+                        requestparams.custom_fields_only = true; // Voorkom bij nieuwe bijlage onnodige update vam hele issue
+                        model["REST_" + method](requestparams, jsondata, key); // via het hoofdmodel met authorisatie controle en alles
+                        var record = { xflexparentkey: key, propertyid: jsondata.custom_fields[0].propertyid};
+                        var fileparams = { getFiles: true, api2name: model.records_name };
+                    }
+                    var data = model.includes["custom_fields"].model.get_file_info(requestparams, record, fileparams );
+
+                    api2_rest.deliver(data, /* dummy model */ { record_name: "attachment" }, outputformat, true);
+                    return;
                 }
+                // Geen atachment dus door met de reguliere code
                 var data = model["REST_" + method](requestparams, jsondata, key);
                 if (method == "GET")
                 {
@@ -370,6 +399,8 @@ api2_rest = {
             }
             else if (model.record_name in jsondata) // een enkel record
             {
+                if (method == "PUT" && !(key > 0))
+                    api2.error(400, "Missing id");
                 if (jsondata[model.record_name] instanceof Array)
                     api2.error(400, "{0} should be single record only.".format(method))
 
@@ -402,9 +433,9 @@ api2_rest = {
             case "POST":
             {
                 var key = result.key;
-                if (key > 0)
+                if (key > 0 && !Session("isWriteonlyApi2User"))
                 {
-                    var params = { filter: shared.qs2json(model), include: getQParamArray("include", []) }, jsondata, key
+                    // var params = { filter: shared.qs2json(model), include: getQParamArray("include", []) }, jsondata, key
                     // requestparams.include is mogelijk uitgebreid met wat er in de body stond
                     data = model.REST_GET({ filter: { id: key }, include: requestparams.include }); // resulterende data weer terug
                     __Log(data);
@@ -440,7 +471,7 @@ api2_rest = {
             {
                 result.total_count = model.total_count;
                 result.limit = model.limit;
-                result.offset = 0;
+                result.offset = model.offset;
                 result[model.records_name] = data;
             }
 
@@ -613,8 +644,12 @@ api2_rest = {
 
         // str_antwoord heeft nu het te versturen antwoord
         // Bepaal eTag
-        var oCrypto = new ActiveXObject("SLNKDWF.Crypto");
-        var eTag = '"' + oCrypto.hex_sha1(String(S("cache_changecounter")) + "_" + str_antwoord).toLowerCase() + '"';
+        var eTag = api2_rest.plugin.get_eTag({}, resultdata);
+        if (!eTag)
+        {
+            var oCrypto = new ActiveXObject("SLNKDWF.Crypto");
+            var eTag = '"' + oCrypto.hex_sha1(String(S("cache_changecounter")) + "_" + str_antwoord).toLowerCase() + '"';
+        }
         Response.AddHeader("ETag", eTag);
         if (Request.ServerVariables("HTTP_IF_NONE_MATCH") == eTag)
         {   // We hebben een match! Effectief besparen wel alleen op dataverkeer, de queries zijn al geweest
@@ -749,7 +784,7 @@ api2_rest = {
             var arrayElement = xmlDoc.createElement(rootname);
             arrayElement.setAttribute("total_count", model.total_count);
             arrayElement.setAttribute("limit", model.limit);
-            arrayElement.setAttribute("offset", 0);
+            arrayElement.setAttribute("offset", model.offset);
 
             for (var i = 0; i < data.length; i++)
                 arrayElement.appendChild(record2json(data[i], record_name));
@@ -857,6 +892,16 @@ api2_rest = {
             hook = null;
             return outdata;
         },
+        error_handler: function(code, msg, orgHandler)
+        {
+            var hook = api2_rest.find_plugin();
+            if ("error_handler" in hook)
+                outdata = hook.error_handler(code, msg, orgHandler);
+            else
+                outdata = orgHandler(code, msg);
+            hook = null;
+            return outdata;
+        },
         transform_incoming: function(params, data)
         {
             var outdata = data;
@@ -876,6 +921,15 @@ api2_rest = {
                 outdata = hook.transform_outgoing(params, data);
             hook = null;
             return outdata;
+        },
+        get_eTag: function(params, data)
+        {
+            var outdata = null;
+            var hook = api2_rest.find_plugin();
+            if ("get_eTag" in hook)
+                outdata = hook.get_eTag(params, data);
+            hook = null;
+            return outdata;
         }
     }
 }
@@ -890,7 +944,7 @@ function RequestJSON()
         var lngBytesCount = Request.TotalBytes;
         jvraag = BytesToStr(Request.BinaryRead(lngBytesCount));
     }
-    __Log("Vraag: " + jvraag);
+    __Log("Request body: " + jvraag);
     try
     {
         var vraag = myJSON.parse(jvraag);
@@ -898,7 +952,7 @@ function RequestJSON()
     catch (e)
     {
         result = { error: e.description || (e.message + ": " + e.name) };
-        __DoLog("JSON eval faalt met: '{0}'\n{1}".format(result, jvraag), "ffff00");
+        __DoLog("JSON eval faalt met: '{0}'\n{1}".format(result.error, jvraag), "ffff00");
         return result ;
     }
     return { json: vraag };
@@ -932,7 +986,13 @@ function BytesToStr(bytes)
     stream.type = 2; // Text
     stream.charset = "utf-8";
 
-    var sOut = stream.readtext();
+    // Als onverhoopt toch windows-1252 is gestuurd met diacrieten gaf
+    // stream.readtext() een 'The parameter is incorrect'
+    // Vreemd genoeg lijkt het expliciet meegeven van een lengte dat te voorkomen.
+    // Die mag zelfs gewoon veel 'te lang' zijn.
+    // Merk op dat we windows-1252 niet ondersteunen, je moet echt utf-8 sturen
+    // (we hadden waarschijnlijk ook 99999999 kunnen kiezen)
+    var sOut = stream.readtext(stream.Size * 2);
     stream.close;
     return sOut;
 }

APPL/API2/api2_tools.inc

@@ -2,13 +2,14 @@
     $Revision$
     $Id$
 
-    File:           mgt_tools.inc
+    File:           api2_tools.inc
 
     Description:
 
     Context:
 
-    Notes:
+    Notes:          voorheen mgt/mgt_tools.inc maar de functies zijn essentieel
+                    voor vele modellen dus moet het in api2_tools.inc
 */
 %>
 <%

APPL/API2/api_authorizationgroups.asp

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

APPL/API2/api_ins_deelsrtcontrole.asp

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

APPL/API2/api_persons.asp

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

APPL/API2/model_aut_client.inc

@@ -17,7 +17,7 @@ function model_aut_client(params)
     this.record_name = "autclient";
     this.table = "aut_client";
     this.primary = "aut_client_key";
-    this.autfunction = "WEB_FACFAC";
+    this.autfunction = params.internal?false:"WEB_FACTAB";
     this.record_title = L("aut_client");
     this.records_title = L("aut_client_m");
 
@@ -32,7 +32,8 @@ function model_aut_client(params)
             "dbs": "aut_client_id",
             "label": L("aut_client_code"),
             "typ": "varchar",
-            "filter": "exact"
+            "filter": "exact",
+            "caseinsensitive": true
         },
         "name": {
             "dbs": "aut_client_omschrijving",
@@ -58,6 +59,12 @@ function model_aut_client(params)
             "typ": "varchar",
             "defaultvalue": shared.random(32),
             "secret": true
+        },
+        "company": {
+            "dbs": "prs_bedrijf_key",
+            "label": L("prs_bedrijf_key"),
+            "typ": "key",
+            "foreign": "PRS_BEDRIJF"
         }
 /*        ,
         "redirect_uri": {
@@ -74,12 +81,8 @@ function model_aut_client(params)
               };
 
     this.REST_GET    = generic_REST_GET(this);
-    if (params.internal) // Dan geloof ik het wel
-    {
-        this.autfunction = false;
-        this.REST_POST   = generic_REST_POST(this);
-        this.REST_PUT    = generic_REST_PUT(this);
-        this.REST_DELETE = generic_REST_DELETE(this);
-    }
+    this.REST_POST   = generic_REST_POST(this);
+    this.REST_PUT    = generic_REST_PUT(this);
+    this.REST_DELETE = generic_REST_DELETE(this);
 }
 %>

APPL/API2/model_aut_client_perslid.inc

@@ -15,7 +15,7 @@ function model_aut_client_perslid(params)
     this.table = "aut_client_perslid";
     this.primary = "aut_client_perslid_key";
     this.autSELF = "person";
-    this.autfunction = "WEB_FACFAC";
+    this.autfunction = params.self?false:"WEB_FACFAC";
     this.record_title = L("aut_client_perslid");
     this.records_title = L("aut_client_perslid_m");
 
@@ -38,12 +38,23 @@ function model_aut_client_perslid(params)
                 "desc": "aut_client_omschrijving"
             }
         },
+        "registrationdate": {
+            "dbs": "aut_client_perslid_aanmaak",
+            "label": L("aut_client_perslid_aanmaak"),
+            "typ": "datetime",
+            "readonly": "true"
+        },
         "device_id": {
             "dbs": "aut_client_perslid_device_id",
-            "label": L("aut_client_perslid_device"),
+            "label": L("aut_client_perslid_device_id"),
             "typ": "varchar",
             "filter": "exact"
         },
+        "device_name": {
+            "dbs": "aut_client_perslid_device_name",
+            "label": L("aut_client_perslid_device_name"),
+            "typ": "varchar"
+        },
         "scope": {
             "dbs": "aut_client_perslid_scope",
             "label": L("aut_client_perslid_scope"),
@@ -95,7 +106,7 @@ function model_aut_client_perslid(params)
     };
 
     this.list = {
-        "columns": ["person", "scope", "device"]
+        "columns": ["person", "scope", "device_id", "accessdate", "login"]
     };
 
     this.REST_GET    = generic_REST_GET(this);
@@ -106,5 +117,20 @@ function model_aut_client_perslid(params)
         this.REST_PUT    = generic_REST_PUT(this);
         this.REST_DELETE = generic_REST_DELETE(this);
     }
+/*
+TODO: je eigen device_name mogen bewerken en registratie mogen verwijderen
+    if (params.self) // Alleen device_name bewerken
+    {
+        for (var fld in this.fields)
+        {
+            if (fld != 'device_name')
+            {
+                this.fields[fld].readonly = true;
+                if (!inArray(fld,["autclient", "autclient","registrationdate", "refreshdate"]))
+                    this.fields[fld].hidden_fld = true;
+            }
+        }
+    }
+*/
 }
 %>

APPL/API2/model_aut_idp_map.inc

@@ -53,10 +53,12 @@ function model_aut_idp_map(params)
                  + ";9;" + L("lcl_prs_person_email")
                  + ";10;" + L("lcl_prs_person_phone")
                  + ";11;" + L("lcl_prs_person_mobile")
+                 + ";12;" + L("prs_perslid_externid")
 
                  // De foreign's
                  + ";20;" + L("lcl_prs_person_function")
                  + ";21;" + L("lcl_prs_organisatie")
+                 + ";22;" + L("lcl_prs_profile")
                  //+ kostenplaats ondersteunen we niet, dat is in FACILITOR een organisatie of mandatering
 
                  // ";99;prs_perslid_key" gereserveerd voor intern gebruik

APPL/API2/model_aut_sp.inc

@@ -0,0 +1,116 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           model_aut_sp.inc
+    Description:
+    Notes:
+*/
+
+%>
+<!-- #include file="./model_aut_sp_map.inc" -->
+<%
+function model_aut_sp(params)
+{
+    params = params || {};
+    this.records_name = "serviceproviders";
+    this.record_name = "serviceprovider";
+    this.table = "aut_sp";
+    this.primary = "aut_sp_key";
+    this.autfunction = params.internal?false:"WEB_FACTAB";
+    this.record_title = L("aut_sp");
+    this.records_title = L("aut_sp_m");
+
+    this.fields = {
+        "id": {
+            "dbs": "aut_sp_key",
+            "label": L("lcl_key"),
+            "typ": "key",
+            "seq": "aut_s_aut_sp_key"
+        },
+        "code": {
+            "dbs": "aut_sp_code",
+            "label": L("aut_sp_code"),
+            "typ": "varchar",
+            "filter": "exact"
+        },
+        "name": {
+            "dbs": "aut_sp_omschrijving",
+            "label": L("aut_sp_omschrijving"),
+            "typ": "varchar",
+            "required": true
+        },
+        "type": {
+            "dbs": "aut_sp_type",
+            "label": L("aut_sp_type"),
+            "typ": "key",
+            "required": true,
+            "LOV": L("aut_sp_typeLOV") // TODO?
+        },
+        "remark": {
+            "dbs": "aut_sp_opmerking",
+            "label": L("aut_sp_opmerking"),
+            "typ": "memo"
+        },
+        "secret": {
+            "dbs": "aut_sp_secret",
+            "label": L("aut_sp_secret"),
+            "typ": "varchar",
+            "defaultvalue": shared.random(32),
+            "secret": true
+        },
+        "audience": {
+            "dbs": "aut_sp_audience",
+            "label": L("aut_sp_audience"),
+            "typ": "varchar",
+            "placeholder": customerId + ".facilitor.nl"
+        },
+        "redirecturi": {
+            "dbs": "aut_sp_redirect_uri",
+            "label": L("aut_sp_redirect_uri"),
+            "typ": "varchar",
+            "placeholder": customerId + ".facilitor.nl"
+        },
+        "issuer": {
+            "dbs": "aut_sp_issuer",
+            "label": L("aut_sp_issuer"),
+            "typ": "varchar"
+        },
+        "algorithm": {
+            "dbs": "aut_sp_algorithm",
+            "label": L("aut_sp_algorithm"),
+            "typ": "varchar"
+        },
+        "authorization": {
+            "dbs": "fac_functie_key",
+            "label": L("aut_sp_functie_key"),
+            "typ": "key",
+            "foreign": "fac_functie"
+        },
+        "loglevel": {
+            "dbs": "aut_sp_loglevel",
+            "label": L("aut_sp_loglevel"),
+            "typ": "number",
+            "defaultvalue": 0
+        },
+        "internal": {
+            "dbs": "aut_sp_internal",
+            "label": L("aut_sp_internal"),
+            "typ": "check0",
+            "readonly": true
+        }
+    }
+
+    this.includes =
+               {  "spmappings": { model: new model_aut_sp_map(),
+                                  joinfield: "serviceprovider",
+                                  enable_update: true
+                                }
+              };
+
+    this.REST_GET    = generic_REST_GET(this);
+    this.REST_POST   = generic_REST_POST(this);
+    this.REST_PUT    = generic_REST_PUT(this);
+    this.REST_DELETE = generic_REST_DELETE(this);
+}
+%>

APPL/API2/model_aut_sp_map.inc

@@ -2,38 +2,39 @@
     $Revision$
     $Id$
 
-    File:           model_fac_sp_map.inc
+    File:           model_aut_sp_map.inc
     Description:    Door sp 'released attributes'
     Notes:
 */
 
-function model_fac_sp_map()
+function model_aut_sp_map(params)
 {
+    params = params || {};
     this.records_name = "spmappings";
     this.record_name = "spmapping";
-    this.table = "fac_sp_map";
-    this.primary = "fac_sp_map_key";
-    this.autfunction = "WEB_FACFAC";
-    this.record_title = L("fac_sp_map");
-    this.records_title = L("fac_sp_map_m");
+    this.table = "aut_sp_map";
+    this.primary = "aut_sp_map_key";
+    this.autfunction = params.internal?false:"WEB_FACTAB";
+    this.record_title = L("aut_sp_map");
+    this.records_title = L("aut_sp_map_m");
 
     this.fields = {
         "id": {
-            "dbs": "fac_sp_map_key",
+            "dbs": "aut_sp_map_key",
             "label": L("lcl_key"),
             "typ": "key",
-            "seq": "fac_s_fac_sp_map_key"
+            "seq": "fac_s_aut_sp_map_key"
         },
         "serviceprovider": {
-            "dbs": "fac_sp_key",
-            "label": L("fac_sp"),
+            "dbs": "aut_sp_key",
+            "label": L("aut_sp"),
             "typ": "key",
             "hidden_fld": true,
             "required": true
         },
         "name": {
-            "dbs": "fac_sp_map_from",
-            "label": L("fac_sp_map_from"),
+            "dbs": "aut_sp_map_from",
+            "label": L("aut_sp_map_from"),
             "typ": "key",
             "required": true,
             "LOV":   "1;"   + L("lcl_prs_person_login")
@@ -48,8 +49,8 @@ function model_fac_sp_map()
                   + ";101;" + L("fac_groeprechten_m")
         },
         "to": {
-            "dbs": "fac_sp_map_to",
-            "label": L("fac_sp_map_to"),
+            "dbs": "aut_sp_map_to",
+            "label": L("aut_sp_map_to"),
             "typ": "varchar",
             "required": true
         }

APPL/API2/model_bes_disc_params.inc

@@ -151,11 +151,18 @@ model_bes_disc_params =
             "label": L("bes_discipline_remoteconfirm"),
             "typ": "check0"
         },
-        "freeartikel": {
-            "dbs": "bes_disc_params_freeartikel",
-            "label": L("bes_discipline_freeartikel"),
+        "ordermode": {
+            "dbs": "bes_disc_params_bestelmode",
+            "label": L("bes_discipline_bestelmode"),
             "typ": "number",
-            "LOV": L("bes_discipline_freeartikelLOV"),
+            "LOV": L("bes_discipline_bestelmodeLOV"),
+            "emptyoption": null
+        },
+        "photomode": {
+            "dbs": "bes_disc_params_fotomode",
+            "label": L("bes_discipline_fotomode"),
+            "typ": "number",
+            "LOV": L("bes_discipline_fotomodeLOV"),
             "emptyoption": null
         },
         "punchouturl": {
@@ -274,10 +281,22 @@ model_bes_disc_params =
                 "desc": "cnt_termijn_omschrijving"
             }
         },
-        "for_others": {
+        "forothers": {
             "dbs": "bes_disc_params_for_others",
             "label": L("bes_discipline_for_others"),
             "typ": "check0"
+        },
+        "objectmode": {
+            "dbs": "bes_disc_params_ins_mode",
+            "label": L("lcl_ins_mode"),
+            "typ": "number",
+            "LOV": L("bes_discipline_ins_modeLOV"),
+            "emptyoption": null
+        },
+        "feconfirm": {
+            "dbs": "bes_disc_params_fe_confirm",
+            "label": L("bes_discipline_fe_confirm"),
+            "typ": "check0"
         }
     }
 }

APPL/API2/model_bes_kenmerk.inc

@@ -4,13 +4,14 @@
 
     File:           model_bes_kenmerk.inc
 
-    Description:    Vanuit CodeCharge gegenereerd model voor bes_kenmerk
+    Description:    Model voor bes_kenmerk
 
     Context:
 
     Notes:
 */
 %>
+<!-- #include file="model_bes_srtkenmerk.inc"-->
 <%
 
 function model_bes_kenmerk(params)
@@ -165,6 +166,11 @@ function model_bes_kenmerk(params)
         }
     };
 
+    this.getPropertyType = function (kenmerkdata)
+    {
+        var typedata = api2.GET(new model_bes_srtkenmerk({internal: params.internal}), kenmerkdata.orderpropertytype.id);
+        return typedata;
+    }
 
     function buildBESKenmerkNiveauList()
     {

APPL/API2/model_bes_srtkenmerk.inc

@@ -13,14 +13,15 @@
 %>
 <%
 
-function model_bes_srtkenmerk()
+function model_bes_srtkenmerk(params)
 {
+    params = params || {};
     this.records_name = "orderpropertytypes";
     this.record_name = "orderpropertytype";
     this.table = "bes_srtkenmerk";
     this.primary = "bes_srtkenmerk_key";
     this.soft_delete = "bes_srtkenmerk_verwijder";
-    this.autfunction = "WEB_BESMGT";
+    this.autfunction = params.internal?false:"WEB_BESMGT";
     this.record_title = L("bes_srtkenmerk");
     this.records_title = L("bes_srtkenmerk_m");
 

APPL/API2/model_bez_kenmerk.inc

@@ -90,8 +90,11 @@ function model_bez_kenmerk(params)
         },
         "system": {
             "dbs": "bez_kenmerk_systeem",
-            "label": L("mgt_srtkenmerk_systeem"),
-            "typ": "check"
+            "label": L("mgt_srtkenmerk_systeem_adv"),
+            "typ": "number",
+            "LOV": L("mgt_kenmerk_systeemLOV"),
+            "defaultvalue": 0,
+            "required": true
         },
         "length": {
             "dbs": "bez_kenmerk_lengte",

APPL/API2/model_bgt_budget.inc

@@ -14,6 +14,7 @@
 <!-- #include file="../bgt/bgt_tools.inc" -->
 <!-- #include file="../api2/model_bgt_budgetmutatie.inc" -->
 <%
+var v_checkauth = getQParamInt("id", 0) > 0;
 
 function model_bgt_budget()
 {
@@ -41,8 +42,8 @@ function model_bgt_budget()
             "typ": "key",
             "required": true,
             "insertonly": true,
-            "foreign": bgt_budgetdiscipline_foreign(),
-            "emptyoption": null
+            "foreign": bgt_budgetdiscipline_foreign(v_checkauth),
+            "showtransit": true
         },
         "budgetproject": {
             "dbs": "bgt_project_key",
@@ -51,15 +52,16 @@ function model_bgt_budget()
             "required": true,
             "insertonly": true,
             "foreign": bgt_budgetproject_foreign(),
-            "emptyoption": null
+            "showtransit": true
         },
         "budgetcostcategory": {
             "dbs": "bgt_kostenrubriek_key",
             "label": L("bgt_kostenrubriek_oms"),
             "typ": "key",
-            "required": false,
+            "required": true,
             "insertonly": true,
-            "foreign": bgt_budgetcostcategory_foreign()
+            "foreign": bgt_budgetcostcategory_foreign(),
+            "showtransit": true
         },
         "costtypegroup": {
             "dbs": "prs_kostensoortgrp_key",
@@ -68,6 +70,7 @@ function model_bgt_budget()
             "required": false,
             "insertonly": true,
             "foreign": bgt_costtypegroup_foreign(),
+            "showtransit": true,
             "LOVinit": "",
             "filter": "exact"
         },
@@ -77,31 +80,48 @@ function model_bgt_budget()
             "typ": "key",
             "required": false,
             "insertonly": true,
-            "foreign": bgt_costtype_foreign()
+            "foreign": bgt_costtype_foreign(),
+            "showtransit": true
         },
         "amountoriginal": {
             "dbs": "bgt_budget_bedrag_origineel",
-            "sql": "(BGT.getBudgetOpDatum(bgt_budget.bgt_budget_key, NULL))",
+            "sql": "(BGT.getBudgetOpDatum(bgt_budget.bgt_budget_key, 0, NULL))",
             "label": L("bgt_budget_origineel"),
             "typ": "float",
             "iscurrency": true,
             "total": true
         },
+        "vatoriginal": {
+            "dbs": "bgt_budget_btwbedrag_origineel",
+            "sql": "(BGT.getBudgetOpDatum(bgt_budget.bgt_budget_key, 1, NULL))",
+            "label": L("bgt_budget_origineel")+" "+L("lcl_fin_btwtabelwaarde_oms"),
+            "typ": "float",
+            "iscurrency": true,
+            "total": true
+        },
         "amountmutation": {
             "dbs": "bgt_budget_bedrag_mutatie",
-            "sql": "(BGT.getBudgetMutaties(bgt_budget.bgt_budget_key, NULL, NULL))",
+            "sql": "(BGT.getBudgetSoortMutatie(NULL, NULL, bgt_budget.prs_kostensoort_key, 0, 'EM', NULL))",
             "label": L("bgt_budget_mutaties"),
             "typ": "float",
             "iscurrency": true,
             "total": true
         },
+        "amountreservation": {
+            "dbs": "bgt_budget_bedrag_reserve",
+            "sql": "(BGT.getBudgetSoortMutatie(NULL, NULL, bgt_budget.prs_kostensoort_key, 0, 'AR', NULL))",
+            "label": L("bgt_budget_vnreserve"),
+            "typ": "float",
+            "iscurrency": true,
+            "total": true
+        },
         "amount": {
             "dbs": "bgt_budget_bedrag",
             "label": L("bgt_budget_bedrag"),
             "typ": "float",
             "iscurrency": true,
             "total": true,
-            "required": true
+            "defaultvalue": 0
             },
         "vat": {
             "dbs": "bgt_budget_btwbedrag",
@@ -109,14 +129,32 @@ function model_bgt_budget()
             "typ": "float",
             "iscurrency": true,
             "total": true,
-            "required": true
+            "defaultvalue": 0
             },
+        "amountincl": {
+            "dbs": "bgt_budget_bedrag_incl",
+            "sql": "bgt_budget_bedrag + bgt_budget_btwbedrag",
+            "label": L("lcl_fin_total_sum"),
+            "typ": "float",
+            "readonly": true,
+            "sqlshow": true,
+            "iscurrency": true,
+            "total": true,
+            "defaultvalue": "0",
+            "clone": false
+        },
         "contingency": {
           "dbs": "bgt_budget_isreserve",
           "label": L("bgt_budget_isreserve"),
           "typ": "check0",
           "defaultvalue": 0
         },
+        "account": {
+            "dbs": "prs_kostenplaats_key",
+            "label": L("bgt_budget_account"),
+            "typ": "key",
+            "foreign": bgt_account_foreign()
+        },
         "begin": {
             "dbs": "bgt_budget_begin",
             "label": L("bgt_budget_begin"),
@@ -139,16 +177,6 @@ function model_bgt_budget()
                 "desc": "prs_kostenplaatsgrp_oms"
             },
             "hidden_fld": true
-        },
-        "account": {
-            "dbs": "prs_kostenplaats_key",
-            "label": L("bgt_budget_account"),
-            "typ": "key",
-            "foreign": {
-                "tbl": "prs_kostenplaats",
-                "key": "prs_kostenplaats_key",
-                "desc": "prs_kostenplaats_nr"
-            }
         }
     };
 
@@ -166,13 +194,45 @@ function model_bgt_budget()
         ]
     };
 
+
     this.hook_pre_edit = function (obj, fld)
     {
+        var btw_data = {};
         if (obj.id > -1)
         {
             fld.amount.readonly = true;
             fld.vat.readonly = true;
+
+            var sql = "SELECT s.prs_kostensoort_btw"
+                    + "     , f.fin_btwtabelwaarde_perc"
+                    + "  FROM bgt_budget b"
+                    + "     , prs_kostensoort s"
+                    + "     , fin_btwtabelwaarde f"
+                    + " WHERE s.fin_btwtabelwaarde_key = f.fin_btwtabelwaarde_key"
+                    + "   AND b.prs_kostensoort_key = s.prs_kostensoort_key"
+                    + "   AND b.bgt_budget_key = " + obj.id;
+            var oRs = Oracle.Execute(sql);
+            if (!oRs.eof)
+            {
+                btw_data.btw_inc = oRs("prs_kostensoort_btw").Value;
+                btw_data.btw_val = oRs("fin_btwtabelwaarde_perc").Value;
+            }
+            oRs.Close();
         }
+        else
+        {
+            // Een nieuw budget heeft nog geen origineel- en mutatie-bedrag.
+            delete fld.amountoriginal;
+            delete fld.amountmutation;
+        }
+        %>
+        <script type="text/javascript">
+            var cur_mode = "budget_edit"; // Laat alleen de kostensoorten zien waaraan nog geen budget gekoppeld is.
+            var btw_data = <%=JSON.stringify(btw_data)%>;
+            <% if (obj.budgetdiscipline) { %> var budgetdiscipline = "<%=obj.budgetdiscipline.id%>"; <% } %>
+            <% if (obj.budgetproject)    { %> var budgetproject    = "<%=obj.budgetproject.id%>";    <% } %>
+        </script>
+        <%
     }
 
     this.hook_pre_post = function(params, obj)
@@ -185,10 +245,73 @@ function model_bgt_budget()
     {   // Zoek bij wijzigen van kostenplaats de kostenplaatsgrp_key op
     }
 
+    this.hook_pre_delete = function(params, key)
+    {
+        var key_arr = getFParamIntArray("id");
 
-    this.REST_GET    = generic_REST_GET(this);
-    this.REST_POST   = generic_REST_POST(this);
-    this.REST_PUT    = generic_REST_PUT(this);
-    this.REST_DELETE = generic_REST_DELETE(this);
+        var sql_c = "SELECT COUNT(*) aantal"
+                  + "  FROM mld_opdr"
+                  + " WHERE prs_kostensoort_key IN"
+                  + " (SELECT prs_kostensoort_key"
+                  + "    FROM bgt_budget"
+                  + "   WHERE bgt_budget_key IN (" + key_arr.join(",") + ")"
+                  + " )";
+        var oRs_c = Oracle.Execute(sql_c);
+        var nr_mld_opdr = oRs_c("aantal").Value;
+        oRs_c.Close();
+        if (nr_mld_opdr > 0)
+        {
+//            abort_with_warning(L("bgt_budget_delete_val1").format(L("lcl_fin_contracten"))); // De geselecteerde budgetten hebben contracten. Verwijder deze eerst.
+            abort_with_warning("De geselecteerde budgetten hebben contracten. Verwijder deze eerst.");
+        }
+
+        var sql_m = "SELECT COUNT(*) aantal"
+                  + "  FROM bgt_budgetmutatie"
+                  + " WHERE bgt_budget_key_naar IN (" + key_arr.join(",") + ")"
+                  + "    OR bgt_budget_key_van  IN (" + key_arr.join(",") + ")";
+        var oRs_m = Oracle.Execute(sql_m);
+        var nr_mutatie = oRs_m("aantal").Value;
+        oRs_m.Close();
+        if (nr_mutatie > 0)
+        {
+//            abort_with_warning(L("bgt_budget_delete_val1").format(L("bgt_budget_mutaties"))); // De geselecteerde budgetten hebben mutaties. Verwijder deze eerst.
+            abort_with_warning("De geselecteerde budgetten hebben mutaties. Verwijder deze eerst.");
+        }
+        // Er zijn geen contracten of budgetmutaties bij de geselecteerde budget(ten) bekend.
+        // Verwijderen is geen probleem meer.
+    }
+
+    var v_budgetdiscipline = getQParamInt("budgetdiscipline", -1);
+    if (v_budgetdiscipline == -1)
+    {
+        gparams = {
+            GET: {wheres: [
+                    "bgt_budget.ins_discipline_key IN"
+                    + " (SELECT w.ins_discipline_key"
+                    + "    FROM fac_v_webgebruiker w"
+                    + "       , ins_tab_discipline d"
+                    + "   WHERE w.ins_discipline_key = d.ins_discipline_key"
+                    + "     AND w.prs_perslid_key = " + user_key
+                    + "     AND (w.fac_gebruiker_prs_level_read<9 OR w.fac_gebruiker_alg_level_read<9)"
+                    + "     AND d.ins_discipline_module = 'BGT'"
+                    + "     AND d.ins_discipline_verwijder IS NULL"
+                    + " )"
+                ]
+            }
+        }
+        this.REST_GET = generic_REST_GET(this, gparams);
+    }
+    else
+    {
+        this.REST_GET = generic_REST_GET(this);
+    }
+    this.REST_PUT = generic_REST_PUT(this);
+    var autparams = user.checkAutorisation(this.autfunction);
+    var canWrite = (autparams.PRSwritelevel < 9 && autparams.ALGwritelevel < 9);
+    if (canWrite)
+    {
+        this.REST_POST   = generic_REST_POST(this);
+        this.REST_DELETE = generic_REST_DELETE(this);
+    }
 }
 %>

APPL/API2/model_bgt_budgetmutatie.inc

@@ -11,6 +11,7 @@
     Notes:
 */
 %>
+<!-- #include file="../bgt/bgt_tools.inc" -->
 <%
 
 function model_bgt_budgetmutatie()
@@ -47,11 +48,14 @@ function model_bgt_budgetmutatie()
                        + "   AND b.prs_kostensoortgrp_key = g.prs_kostensoortgrp_key(+)"
                        + "   AND b.prs_kostensoort_key    = s.prs_kostensoort_key(+)"
                        + "   AND s.fin_btwtabelwaarde_key = f.fin_btwtabelwaarde_key(+)"
-                       + "   AND b.bgt_project_key = "
-                            + "(SELECT p.bgt_project_key"
-                            + "   FROM bgt_budget p"
-                            + "  WHERE bgt_budget_key = " + p_budget_key
-                            + ")";
+                       + ( p_budget_key > -1
+                         ? "   AND b.bgt_project_key = "
+                         + "(SELECT p.bgt_project_key"
+                         + "   FROM bgt_budget p"
+                         + "  WHERE bgt_budget_key = " + p_budget_key
+                         + ")"
+                         : ""
+                         );
 
     this.fields = {
         "id": {
@@ -76,6 +80,24 @@ function model_bgt_budgetmutatie()
             "typ": "varchar",
             "required": true
         },
+        "code": {
+            "dbs": "bgt_budgetmutatie_code",
+            "label": L("bgt_budgetmutatie_code"),
+            "typ": "varchar",
+            "LOV": budgetmutatie_code_LOV(),
+            "emptyoption": null
+        },
+        "sequence": {
+            "dbs": "bgt_budgetmutatie_volgnr",
+            "label": L("bgt_budgetmutatie_volgnr"),
+            "typ": "number"
+        },
+        "ident": {
+            "dbs": "bgt_budgetmutatie_identity",
+            "sql": "COALESCE(bgt_budgetmutatie_code || TO_CHAR(bgt_budgetmutatie_volgnr), TO_CHAR(bgt_budgetmutatie_key))",
+            "label": "Volgnr",
+            "typ": "varchar"
+        },
         "adjustedby": {
             "dbs": "prs_perslid_key",
             "label": L("bgt_budgetmutatie_door"),
@@ -132,13 +154,78 @@ function model_bgt_budgetmutatie()
             "typ": "float",
             "iscurrency": true
         },
-        "amountdifference": {
-            "dbs": "bgt_budget_bedrag_verschil",
-            "sql": "COALESCE(bgt_budget_bedrag_van, 0) + COALESCE(bgt_budget_bedrag_naar, 0)",
-            "label": L("bgt_budgetmutatie"),
+        "amounttoincl": {
+            "dbs": "bgt_budget_bedrag_naar_incl",
+            "sql": "COALESCE(bgt_budget_bedrag_naar, 0) + COALESCE(bgt_budget_btwbedrag_naar, 0)",
+            "label": L("lcl_fin_total_sum"),
+            "typ": "float",
+            "readonly": true,
+            "sqlshow": true,
+            "iscurrency": true,
+            "defaultvalue": "0"
+        },
+        "amountexc": {
+            "dbs": "bgt_budget_bedrag_naar_exc",
+            "sql": "CASE WHEN bgt_budget_key_naar IS NULL THEN bgt_budget_bedrag_van ELSE bgt_budget_bedrag_naar END",
+            "label": L("bgt_budgetmutatie_bedrag"),
             "typ": "float",
             "iscurrency": true,
             "total": true
+        },
+        "amountvat": {
+            "dbs": "bgt_budget_bedrag_naar_btw",
+            "sql": "CASE WHEN bgt_budget_key_naar IS NULL THEN bgt_budget_btwbedrag_van ELSE bgt_budget_btwbedrag_naar END",
+            "label": L("bgt_budgetmutatie_btwbedrag"),
+            "typ": "float",
+            "iscurrency": true,
+            "total": true
+        },
+        "mutbudgetexc": {
+            "dbs": "bgt_budget_mutatie_exc",
+            "sql": "BGT.getMutatieOpBudget("+p_budget_key+", bgt_budgetmutatie_key, 0)",
+            "label": L("bgt_budgetmutatie_bedrag"),
+            "typ": "float",
+            "readonly": true,
+            "iscurrency": true,
+            "total": true
+        },
+        "mutbudgetvat": {
+            "dbs": "bgt_budget_mutatie_btw",
+            "sql": "BGT.getMutatieOpBudget("+p_budget_key+", bgt_budgetmutatie_key, 1)",
+            "label": L("bgt_budgetmutatie_btwbedrag"),
+            "typ": "float",
+            "readonly": true,
+            "iscurrency": true,
+            "total": true
+        },
+        "amountdifference": {
+            "dbs": "bgt_budget_bedrag_verschil",
+            "sql": "BGT.getSoortMutatie(bgt_budgetmutatie_key)",
+            "label": L("bgt_budgetmutatie"),
+            "typ": "float",
+            "readonly": true,
+            "iscurrency": true
+        },
+        "budgetdiscipline": {
+            "dbs": "bgt_budget.ins_discipline_key",
+            "label": L("bgt_discipline_omschrijving"),
+            "typ": "key",
+            "foreign": bgt_budgetdiscipline_foreign(),
+            "hidden_fld": true
+        },
+        "budgetproject": {
+            "dbs": "bgt_budget.bgt_project_key",
+            "label": L("bgt_project_omschrijving"),
+            "typ": "key",
+            "foreign": bgt_budgetproject_foreign(),
+            "hidden_fld": true
+        },
+        "budgetcostcategory": {
+            "dbs": "bgt_budget.bgt_kostenrubriek_key",
+            "label": L("bgt_kostenrubriek_oms"),
+            "typ": "key",
+            "foreign": bgt_budgetcostcategory_foreign(),
+            "hidden_fld": true
         }
     };
 
@@ -149,14 +236,27 @@ function model_bgt_budgetmutatie()
     this.list = {
         "columns": [
             "mutationdate",
+            "ident",
             "name",
             "budgetfrom",
             "budgetto",
             "amountto",
+            "vatto",
+            "amountexc",
+            "amountvat",
             "amountdifference"
         ]
     };
 
+    function budgetmutatie_code_LOV()
+    {
+        var mutatie_code = ";;"
+                         + "A;A - automatische overboeking;"
+                         + "E;E - extra;"
+                         + "M;M - mutatie;"
+                         + "R;R - reserve";
+        return mutatie_code;
+    }
 
     this.hook_pre_edit = function (obj, fld)
     {
@@ -190,6 +290,7 @@ function model_bgt_budgetmutatie()
             }
             oRs.Close();
         }
+
 %>
     <script type="text/javascript">
         // Deze variabelen zijn nodig in bgt_budgetmutatie.js
@@ -207,23 +308,243 @@ function model_bgt_budgetmutatie()
 
         if ((!jsondata.amountto || jsondata.amountto == 0) && (!jsondata.vatto || jsondata.vatto == 0))
             abort_with_warning(L("bgt_budgetmutatie_err2").format(L("bgt_budgetmutatie_bedrag"), L("bgt_budgetmutatie_btwbedrag")));
+        jsondata.amountfrom = -1 * jsondata.amountto;
+        jsondata.vatfrom    = -1 * jsondata.vatto;
     }
 
+    this.hook_post_post = function (params, jsondata, key)
+    {
+        // Haal de budget-keys voor correctie uit het mutatierecord.
+        var sql = "SELECT bgt_budget_key_van"
+                + "     , bgt_budget_key_naar"
+                + "  FROM bgt_budgetmutatie"
+                + " WHERE bgt_budgetmutatie_key = " + key;
+        var oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        {
+            mutatie_correctie(oRs("bgt_budget_key_van").Value);
+            mutatie_correctie(oRs("bgt_budget_key_naar").Value);
+        }
+        oRs.Close();
+    }
+
+    this.hook_pre_put = function (params, jsondata, key)
+    {
+        if ((!jsondata.amountto || jsondata.amountto == 0) && (!jsondata.vatto || jsondata.vatto == 0))
+            abort_with_warning(L("bgt_budgetmutatie_err2").format(L("bgt_budgetmutatie_bedrag"), L("bgt_budgetmutatie_btwbedrag")));
+        jsondata.amountfrom = -1 * jsondata.amountto;
+        jsondata.vatfrom    = -1 * jsondata.vatto;
+    }
+
+    this.hook_post_put = function(params, jsondata, key)
+    {
+        // Haal de budget-keys voor correctie uit het mutatierecord.
+        var sql = "SELECT bgt_budget_key_van"
+                + "     , bgt_budget_key_naar"
+                + "  FROM bgt_budgetmutatie"
+                + " WHERE bgt_budgetmutatie_key = " + key;
+        var oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        {
+            mutatie_correctie(oRs("bgt_budget_key_van").Value);
+            mutatie_correctie(oRs("bgt_budget_key_naar").Value);
+        }
+        oRs.Close();
+    }
+
+    function contract_waarde(p_budget_key)
+    {
+        var v_contract = { bedrag_exc: 0
+                         , bedrag_btw: 0
+                         };
+        var sql = "SELECT SUM(COALESCE(o.mld_opdr_kosten, 0)) contract_exc"
+                + "     , SUM(COALESCE(o.mld_opdr_kosten_btw, 0)) contract_btw"
+                + "  FROM bgt_budget b"
+                + "     , mld_opdr   o"
+                + " WHERE b.prs_kostensoort_key = o.prs_kostensoort_key(+)"
+                + "   AND b.bgt_budget_key = " + p_budget_key;
+        var oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        {
+            v_contract.bedrag_exc = oRs("contract_exc").Value;
+            v_contract.bedrag_btw = oRs("contract_btw").Value;
+        }
+        oRs.Close();
+        return v_contract;
+    }
+
+    function budget_waarde(p_budget_key)
+    {
+        var v_budget = { bedrag_exc: 0
+                       , bedrag_btw: 0
+                       , isreserve: 1
+                       , reserve_key: -1
+                       };
+        var sql = "SELECT b.bgt_budget_isreserve"
+                + "     , COALESCE(b.bgt_budget_bedrag, 0)    bgt_budget_exc"
+                + "     , COALESCE(b.bgt_budget_btwbedrag, 0) bgt_budget_btw"
+                + "     , r.bgt_budget_key"
+                + "  FROM bgt_budget r"
+                + "     , bgt_budget b"
+                + " WHERE r.bgt_project_key = b.bgt_project_key"
+                + "   AND r.prs_kostensoort_key IS NULL"
+                + "   AND r.prs_kostensoortgrp_key IS NULL"
+                + "   AND b.bgt_budget_key = " + p_budget_key;
+        var oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        {
+            v_budget.bedrag_exc  = oRs("bgt_budget_exc").Value;
+            v_budget.bedrag_btw  = oRs("bgt_budget_btw").Value;
+            v_budget.isreserve   = oRs("bgt_budget_isreserve").Value == 1;
+            v_budget.reserve_key = oRs("bgt_budget_key").Value;
+        }
+        oRs.Close();
+        return v_budget;
+    }
+
+    function mutatie_waarde(p_budget_key, p_reserve)
+    {
+        var van_reserve = { bedrag_exc: 0
+                          , bedrag_btw: 0
+                          };
+        switch (p_reserve)
+        {
+            case "A": sql_res = " AND  m.bgt_budgetmutatie_reserve = 1"; break;  // alleen automatische overboekingen
+            case "M": sql_res = " AND  m.bgt_budgetmutatie_reserve = 0"; break;  // alleen mutaties
+            case "T": sql_res = ""; break;                                       // totaal alle mutaties
+            default: "";
+        }
+        var sql = "SELECT SUM(COALESCE(bedrag_exc, 0)) bedrag_exc"
+                + "     , SUM(COALESCE(bedrag_btw, 0)) bedrag_btw"
+                + "  FROM (SELECT SUM(COALESCE(m.bgt_budget_bedrag_van,    0)) bedrag_exc"
+                       + "      , SUM(COALESCE(m.bgt_budget_btwbedrag_van, 0)) bedrag_btw"
+                       + "   FROM bgt_budgetmutatie m"
+                       + "  WHERE bgt_budget_key_van = " + p_budget_key
+                       + sql_res
+                       + " UNION"
+                       + " SELECT SUM(COALESCE(m.bgt_budget_bedrag_naar,    0)) bedrag_exc"
+                       + "      , SUM(COALESCE(m.bgt_budget_btwbedrag_naar, 0)) bedrag_btw"
+                       + "   FROM bgt_budgetmutatie m"
+                       + "  WHERE bgt_budget_key_naar = " + p_budget_key
+                       + sql_res
+                       + ")";
+        var oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        {
+            van_reserve.bedrag_exc = oRs("bedrag_exc").Value;
+            van_reserve.bedrag_btw = oRs("bedrag_btw").Value;
+        }
+        oRs.Close();
+        return van_reserve;
+    }
+
+    function mutatie_correctie(p_budget_key)
+    {
+        function een_correctie(p_budget_key, p_budget_bedrag, p_uitreserve_bedrag, p_contract_bedrag)
+        {
+            // Als een deel van het budgetbedrag uit automatische overboeking bestaat kan het budgetbedrag nooit groter zijn dan het contractbedrag.
+            var te_contracteren = p_budget_bedrag - p_contract_bedrag;
+            var naar_reserve = ( (te_contracteren > p_uitreserve_bedrag) ? p_uitreserve_bedrag : te_contracteren);
+            return naar_reserve;
+        }
+
+        var v_budget = budget_waarde(p_budget_key);
+        var v_uitreserve = mutatie_waarde(p_budget_key, "A");
+        var v_contracten = contract_waarde(p_budget_key);
+
+        if (!v_budget.isreserve)
+        {   // Correctie is alleen voor budgetten op kostensoort, niet het reserve.
+            var v_correctie_bedrag_exc = een_correctie(p_budget_key, v_budget.bedrag_exc, v_uitreserve.bedrag_exc, v_contracten.bedrag_exc);
+            var v_correctie_bedrag_btw = een_correctie(p_budget_key, v_budget.bedrag_btw, v_uitreserve.bedrag_btw, v_contracten.bedrag_btw);
+
+            var data_correctie = { budget_res_key: v_budget.reserve_key
+                                 , budget_srt_key: p_budget_key
+                                 , bedrag_exc: v_correctie_bedrag_exc
+                                 , bedrag_btw: v_correctie_bedrag_btw
+                                 };
+            insertMutatie(data_correctie, "AO");
+        }
+    }
+
+    function insertMutatie(data_mutatie, mutatie_code)
+    {
+        if (data_mutatie.bedrag_exc != 0 || data_mutatie.bedrag_btw != 0)
+        {
+            var sql = "SELECT prs_kostensoort_altcode"
+                    + "  FROM prs_kostensoort"
+                    + " WHERE prs_kostensoort_key = "
+                        + " (SELECT MIN(prs_kostensoort_key)"
+                        + "    FROM bgt_budget"
+                        + "   WHERE bgt_budget_key = " + data_mutatie.budget_srt_key
+                        + " )";
+            var oRs = Oracle.Execute(sql);
+            var v_costtype_code = oRs("prs_kostensoort_altcode").Value;
+            oRs.Close();
+
+            var mutatie_omschr = "";
+            switch (mutatie_code)
+            {
+                case "AO": mutatie_omschr = "AO Automatische overboeking correctie"; break;
+                case "MW": mutatie_omschr = "MW Meer-, minderwerk van " + v_costtype_code; break;
+            }
+
+            var sql_m = "INSERT INTO bgt_budgetmutatie"
+                      + "( bgt_budgetmutatie_datum"
+                      + ", bgt_budgetmutatie_omschrijving"
+                      + ", prs_perslid_key" // not null!
+                      + ", bgt_budget_key_van"
+                      + ", bgt_budget_bedrag_van"
+                      + ", bgt_budget_btwbedrag_van"
+                      + ", bgt_budget_key_naar"
+                      + ", bgt_budget_bedrag_naar"
+                      + ", bgt_budget_btwbedrag_naar"
+                      + ", bgt_budgetmutatie_reserve"
+                      + ") VALUES"
+                      + "( SYSDATE"
+                      + ", " + safe.quoted_sql(mutatie_omschr)
+                      + ", " + user_key
+                      + ", " + data_mutatie.budget_res_key
+                      + ", " + data_mutatie.bedrag_exc
+                      + ", " + data_mutatie.bedrag_btw
+                      + ", " + data_mutatie.budget_srt_key
+                      + ", " + (-1 * data_mutatie.bedrag_exc)
+                      + ", " + (-1 * data_mutatie.bedrag_btw)
+                      + ", 1"
+                      + ")";
+            Oracle.Execute(sql_m);
+        }
+    }
+
+
+
     var budget_key = getQParamInt("budgetcommon", -1);
+    var mutatie_key = getQParamInt("id", -1);
+
+    var gparams = {
+            GET: {
+                tables: ["bgt_budget"],
+                wheres: ["(bgt_budget.bgt_budget_key = bgt_budgetmutatie.bgt_budget_key_van OR bgt_budget.bgt_budget_key = bgt_budgetmutatie.bgt_budget_key_naar)"]
+            }
+        };
+
     if (budget_key > -1)
     {
-        this.REST_GET = generic_REST_GET(this, {
-            "GET": {
-                "wheres": ["bgt_budget_key_van = {0} or bgt_budget_key_naar = {0}".format(budget_key)]
-            }
-        });
+        var v_where = ( mutatie_key > -1
+                      ? "bgt_budgetmutatie_key = {0}".format(mutatie_key)
+                      : "(bgt_budget.bgt_budget_key = {0})".format(budget_key)
+                      );
+        gparams.GET.wheres.push(v_where);
     }
-    else
+
+    var autparams = user.checkAutorisation(this.autfunction);
+    var canWrite = (autparams.PRSwritelevel < 9 && autparams.ALGwritelevel < 9);
+    this.REST_GET = generic_REST_GET(this, gparams);
+    if (p_budget_key > -1 || canWrite)
+        this.REST_POST = generic_REST_POST(this);
+    if (canWrite)
     {
-        this.REST_GET = generic_REST_GET(this);
+        this.REST_PUT = generic_REST_PUT(this);
+        this.REST_DELETE = generic_REST_DELETE(this);
     }
-    this.REST_POST   = generic_REST_POST(this);
-    this.REST_PUT    = generic_REST_PUT(this);
-    this.REST_DELETE = generic_REST_DELETE(this);
 }
 %>

APPL/API2/model_bgt_disc_params.inc

@@ -18,7 +18,7 @@ model_bgt_disc_params =
     "record_name": "budgetdisciplineparam",
     "table": "bgt_disc_params",
     "primary": "bgt_disc_params_key",
-    "autfunction": "WEB_BGTMAN",
+    "autfunction": "WEB_BGTMGT",
 
 
     "fields": {
@@ -47,7 +47,8 @@ model_bgt_disc_params =
         "startdate": {
             "dbs": "bgt_disc_params_startdatum",
             "label": L("bgt_discipline_startdatum"),
-            "typ": "date"
+            "typ": "date",
+            "autosize": true
         }
     }
 }

APPL/API2/model_bgt_discipline.inc

@@ -42,7 +42,7 @@ function _model_bgt_discipline()
   this.audit = { "childtable": "bgt_disc_params" }, // Parameters voor fac_audit.
   this.primary = "ins_discipline_key";
   this.soft_delete = "ins_discipline_verwijder";  // ik wil er eigenlijk liever niet standaard op kunnen filteren
-  this.autfunction = "WEB_BGTMAN";
+  this.autfunction = "WEB_BGTMGT";
   this.record_title = L("bgt_discipline");
   this.records_title = L("bgt_discipline_m");
 
@@ -79,11 +79,12 @@ function _model_bgt_discipline()
             "dbs": "ins_discipline_btw",
             "label": L("bgt_discipline_btw"),
             "typ": "check",
-            "default": "false"
+            "default": "false",
+            "hidden_fld": true
         }
     };
 
-    this.print = { xmlnode: "budget", where: "discipline"};
+//    this.print = { xmlnode: "budget", where: "discipline"};
 
     /* Velden van BGT_DISC_PARAMS komen er dynamisch bij */
     this.disc_params = {

APPL/API2/model_bgt_kostenrubriek.inc

@@ -45,7 +45,8 @@ function model_bgt_kostenrubriek()
                 "key": "bgt_project_key",
                 "desc": "bgt_project_omschrijving",
                 "where": "bgt_project_verwijder IS NULL"
-            }
+            },
+            "showtransit": true
         },
         "name": {
             "dbs": "bgt_kostenrubriek_oms",

APPL/API2/model_bgt_project.inc

@@ -12,6 +12,7 @@
 */
 %>
 <!-- #include file="../api2/model_bgt_kostenrubriek.inc" -->
+<!-- #include file="../bgt/bgt_tools.inc" -->
 <%
 
 function model_bgt_project()
@@ -48,7 +49,8 @@ function model_bgt_project()
                 "key": "ins_discipline_key",
                 "desc": "ins_discipline_omschrijving",
                 "where": "ins_discipline_module = 'BGT' AND ins_discipline_verwijder IS NULL"
-            }
+            },
+            "showtransit": true
         },
         "name": {
             "dbs": "bgt_project_omschrijving",
@@ -60,7 +62,8 @@ function model_bgt_project()
         "code": {
             "dbs": "bgt_project_code",
             "label": L("bgt_project_code"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "required": true
         },
         "sequence": {
             "dbs": "bgt_project_volgnr",
@@ -71,11 +74,7 @@ function model_bgt_project()
             "dbs": "prs_kostenplaats_key",
             "label": L("bgt_budget_account"),
             "typ": "key",
-            "foreign": {
-                "tbl": "prs_kostenplaats",
-                "key": "prs_kostenplaats_key",
-                "desc": "prs_kostenplaats_nr"
-            }
+            "foreign": bgt_account_foreign()
         },
         "pricedate": {
             "dbs": "bgt_project_prijspeildatum",
@@ -94,7 +93,68 @@ function model_bgt_project()
         }
     };
 
-    this.print = { xmlnode: "budget", where: "project"};
+    //this.print = { xmlnode: "budget", where: "project"};
+
+    this.hook_pre_edit = function (obj, fld)
+    {
+        if (mode != "save")
+        {
+            var sql = "SELECT count(*)"
+                    + "  FROM bgt_kostenrubriek"
+                    + " WHERE bgt_project_key = " + obj.id;
+            var oRs = Oracle.Execute(sql);
+            if (oRs(0) == 0) // Een nieuw project, of een project waaraan nog geen rubrieken zijn gekoppeld.
+            {   // Voeg de selectie voor het standaardproject toe.
+                fld["import"] = {
+                    "dbs": "fac_usrtab.fac_usrtab_key",
+                    "label": "Standaard projectdata",
+                    "typ": "key",
+                    "foreign": {
+                        "tbl": "(SELECT d.fac_usrdata_key"
+                             + "      , d.fac_usrdata_code"
+                             + "   FROM fac_usrtab t"
+                             + "      , fac_usrdata d"
+                             + "  WHERE d.fac_usrtab_key = t.fac_usrtab_key"
+                             + "    AND t.fac_usrtab_naam = 'project_import')",
+                        "key": "fac_usrdata_key",
+                        "desc": "fac_usrdata_code"
+                    }
+                };
+            }
+            oRs.Close();
+
+            if (obj.id > 0)
+            {
+                fld["account"].foreign.tbl = bgt_account_foreign_tbl(obj.id);
+            }
+            else
+            {
+                fld["account"].hidden_fld = true;
+            }
+        }
+    }
+
+    this.hook_pre_post = function(params, obj)
+    {
+        // Controle op, en wijzigingen aan data voordat het record wordt toegevoegd.
+    }
+
+    this.hook_post_post = function(params, obj, key)
+    {
+        // Nadat het project-record is toegevoegd is de key hiervan bekend.
+        create_default_kostenplaatsgrp(key);
+        var data_key = getFParamInt("import", -1);
+        create_default_projectdata(key, data_key);
+    }
+
+    this.hook_pre_put = function(params, obj, key)
+    {
+        // Wordt alleen gebruikt bij wijzigen.
+        create_default_kostenplaatsgrp(key);
+        var data_key = getFParamInt("import", -1);
+        create_default_projectdata(key, data_key);
+    }
+
 
     // if (!S("bgt_enabled"))
     // {
@@ -106,5 +166,37 @@ function model_bgt_project()
     this.REST_POST   = generic_REST_POST(this);
     this.REST_PUT    = generic_REST_PUT(this);
     this.REST_DELETE = generic_REST_DELETE(this);
+
+
+    function create_default_kostenplaatsgrp(key)
+    {
+        var sql_u = "SELECT count(*) aantal"
+                + "  FROM prs_kostenplaatsgrp"
+                + " WHERE bgt_project_key = " + key;
+        var oRs_u = Oracle.Execute(sql_u);
+        if (oRs_u("aantal").Value == 0)
+        {
+            var sql = "SELECT d.bgt_disc_params_code"
+                    + "     , p.bgt_project_code"
+                    + "  FROM bgt_disc_params d"
+                    + "     , bgt_project p"
+                    + " WHERE d.bgt_ins_discipline_key = p.ins_discipline_key"
+                    + "   AND p.bgt_project_key = " + key;
+            var oRs = Oracle.Execute(sql);
+            if (!oRs.eof)
+            {
+                var sql_i = "INSERT INTO prs_kostenplaatsgrp"
+                          + " (prs_kostenplaatsgrp_nr, prs_kostenplaatsgrp_oms, bgt_project_key)"
+                          + " VALUES"
+                          + " (" + safe.quoted_sql(oRs("bgt_disc_params_code").Value)
+                          + " ," + safe.quoted_sql(oRs("bgt_project_code").Value)
+                          + " ," + key
+                          + " )";
+                Oracle.Execute(sql_i);
+            }
+            oRs.Close();
+        }
+        oRs_u.Close();
+    }
 }
 %>

APPL/API2/model_buildings.inc

@@ -14,7 +14,6 @@
 %>
 <!-- #include file="../Shared/discxalg3d.inc"-->
 <!-- #include file="./model_custom_fields.inc"-->
-<!-- #include file="../mgt/mgt_tools.inc"-->
 <!-- #include file="./model_alg_kenmerk.inc"-->
 <%
 function model_buildings()

APPL/API2/model_cad_label.inc

@@ -11,7 +11,6 @@
     Notes:
 */
 %>
-<!-- #include file="../mgt/mgt_tools.inc" -->
 <%
 
 function model_cad_label()

APPL/API2/model_cad_thema.inc

@@ -11,7 +11,6 @@
     Notes:      TODO: JGL: Ik ben er nog niet helemaal uit hoe de bitjes netjes op te lossen
 */
 %>
-<!-- #include file="../mgt/mgt_tools.inc" -->
 <%
 
 function model_cad_thema()

APPL/API2/model_cadcontours.inc

@@ -11,54 +11,22 @@
     Notes:
 */
 %>
-<!-- #include file="../ALG/alg.inc" -->
 <%
 
-model_cadcontours =
+function model_cadcontours()
 {
-    table: "cad_imp_contour",
-    primary: "cad_imp_contour_key",
-    aliasprefix: "CAD.",
-    records_name: "cadcontours",
-    record_name: "cadcontour",
-    fields: {"id"      : { dbs: "cad_imp_contour_key",      typ: "key", filter: "exact" },
-             "name"    : { dbs: "cad_imp_contour_nr",       typ: "varchar", filter: "like"  },
-             "cadarea" : { dbs: "cad_imp_contour_opp",      typ: "float"  },
-             "cadalt1" : { dbs: "cad_imp_contour_opp_alt1", typ: "float"  },
-             "cadalt2" : { dbs: "cad_imp_contour.cad_imp_contour_opp_alt2", typ: "float"  },
-             "concept" : { dbs: "cad_imp_contour_concept",  typ: "number" }
-            },
+    this.table = "cad_imp_contour",
+    this.primary = "cad_imp_contour_key";
+    this.records_name = "cadcontours";
+    this.record_name = "cadcontour";
+    this.fields = {"id"      : { dbs: "cad_imp_contour_key",      typ: "key", filter: "exact" },
+                   "name"    : { dbs: "cad_imp_contour_nr",       typ: "varchar", filter: "like"  },
+                   "cadarea" : { dbs: "cad_imp_contour_opp",      typ: "float"  },
+                   "cadalt1" : { dbs: "cad_imp_contour_opp_alt1", typ: "float"  },
+                   "cadalt2" : { dbs: "cad_imp_contour.cad_imp_contour_opp_alt2", typ: "float"  },
+                   "concept" : { dbs: "cad_imp_contour_concept",  typ: "number" }
+                  };
 
-    _check_authorization: function(params, method)
-        {
-        },
-    _analyze_fields: function (fields, params, jsondata) /* analyseer inkomende data, common voor PUT en POST */
-        {
-        },
-    REST_GET: function _GET(params, jsondata)
-        {
-            model_cadcontours._check_authorization(params, "GET");
-            var query = api2.sqlfields(params, model_cadcontours);
-
-            var wheres = api2.sqlfilter(params, model_cadcontours);
-            query.wheres = query.wheres.concat(wheres);
-
-            var sql = "SELECT " + query.selects.join(", ")
-                    + "  FROM " + query.tables.join(", ")
-                    + (query.wheres.length ? " WHERE " + query.wheres.join(" AND " ) : "")
-
-            var json = api2.sql2json (params, sql, model_cadcontours);
-
-            return json;
-        },
-    REST_PUT: function (params, jsondata, the_key) /* update cad contour */
-        {
-        },
-    REST_POST: function (params, jsondata) /* new cad contour */
-        {
-        },
-    REST_DELETE: function (params, the_key) /* delete cad contour */
-        {
-        }
+    // (nog) geen eigen GET en dergelijke, alleen via include van model_rooms
 }
 %>

APPL/API2/model_cnt_disc_params.inc

@@ -2,7 +2,7 @@
     $Revision$
     $Id$
 
-    File:           model_bes_disc_params.inc
+    File:           model_cnt_disc_params.inc
 
     Description:    Vanuit CodeCharge gegenereerd model voor cnt_discipline
 

APPL/API2/model_cnt_kenmerk.inc

@@ -4,13 +4,14 @@
 
     File:           model_cnt_kenmerk.inc
 
-    Description:    Vanuit CodeCharge gegenereerd model voor cnt_kenmerk
+    Description:    Model voor cnt_kenmerk
 
     Context:
 
     Notes:
 */
 %>
+<!-- #include file="model_cnt_srtkenmerk.inc"-->
 <%
 
 function model_cnt_kenmerk(params)
@@ -139,6 +140,11 @@ function model_cnt_kenmerk(params)
         }
     };
 
+    this.getPropertyType = function (kenmerkdata)
+    {
+        var typedata = api2.GET(new model_cnt_srtkenmerk({internal: params.internal}), kenmerkdata.contractpropertytype.id);
+        return typedata;
+    }
 
     this.hook_pre_edit = function (obj, fld)
     {

APPL/API2/model_cnt_srtkenmerk.inc

@@ -13,14 +13,15 @@
 %>
 <%
 
-function model_cnt_srtkenmerk()
+function model_cnt_srtkenmerk(params)
 {
+    params = params || {};
     this.records_name = "contractpropertytypes";
     this.record_name = "contractpropertytype";
     this.table = "cnt_srtkenmerk";
     this.primary = "cnt_srtkenmerk_key";
     this.soft_delete = "cnt_srtkenmerk_verwijder";
-    this.autfunction = "WEB_CNTMGT";
+    this.autfunction = params.internal?false:"WEB_CNTMGT";
     this.record_title = L("cnt_srtkenmerk");
     this.records_title = L("cnt_srtkenmerk_m");
 

APPL/API2/model_companies.inc

@@ -13,7 +13,6 @@
 %>
 <!-- #include file="../prs/prs.inc" -->
 <!-- #include file="./model_custom_fields.inc"-->
-<!-- #include file="../mgt/mgt_tools.inc"-->
 <!-- #include file="./model_prs_kenmerk.inc"-->
 <%
 

APPL/API2/model_ctr_disc_params.inc

@@ -46,6 +46,12 @@ model_ctr_disc_params =
             "label": L("ctr_ismjob"),
             "typ": "check0",
             "readonly": S("mjb_enabled") != 1
+        },
+        "stdmelding": {
+            "dbs": "mld_stdmelding_key",
+            "label": L("mld_stdmelding_key"),
+            "typ": "key",
+            "foreign": "mld_stdmelding"
         }
     }
 }

APPL/API2/model_ctr_scenario.inc

@@ -0,0 +1,83 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           model_ctr_scenario.inc
+
+    Description:    Model voor scenario's
+
+    Context:
+
+    Notes:
+*/
+%>
+<!-- #include file="../ins/ins.inc" -->
+<%
+
+function model_ctr_scenario()
+{
+    this.records_name = "scenarios";
+    this.record_name = "scenario";
+    this.table = "ins_scenario";
+    this.primary = "ins_scenario_key";
+    this.autfunction = "WEB_CTRMGT";
+    this.record_title = L("ctr_scenario");
+    this.records_title = L("ctr_scenario_m");
+
+
+    this.fields = {
+        "id": {
+            "dbs": "ins_scenario_key",
+            "label": L("lcl_key"),
+            "typ": "key",
+            "required": true,
+            "filter": "exact",
+            "seq": "ins_s_ins_scenario_key"
+        },
+        "name": {
+            "dbs": "ins_scenario_omschrijving",
+            "label": L("ctr_scenario_omschrijving"),
+            "typ": "varchar",
+            "required": true,
+            "translate": true
+        },
+        "nrelements": {
+          "dbs": "nn_elements",
+          "sql": "(SELECT COUNT(*) FROM ins_srtcontroledl_xcp isx WHERE isx.ins_scenario_key = ins_scenario.ins_scenario_key)",
+          "label": L("ctr_scenario_aantal"),
+          "typ": "number"
+        },
+        "remark": {
+            "dbs": "ins_scenario_opmerking",
+            "label": L("ctr_scenario_opmerking"),
+            "typ": "varchar",
+            "translate": true
+        },
+        "created": {
+            "dbs": "ins_scenario_aanmaak",
+            "label": L("ctr_scenario_aanmaak"),
+            "typ": "date",
+            "readonly": true
+        },
+        "status": {
+            "dbs": "ins_scenario_status",
+            "label": L("ctr_scenario_status"),
+            "foreign": ins.getscenariostatustext,
+            "typ": "exact"
+        },
+        "person": {
+            "dbs": "prs_perslid_key",
+            "label": L("lcl_user"),
+            "typ": "key",
+            "foreign" : "prs_perslid",
+            readonly: true
+        }
+    };
+
+
+    this.REST_GET    = generic_REST_GET(this, { GET: { wheres: [ "ins_scenario_key <> 1"] }});
+    this.REST_POST   = generic_REST_POST(this);
+    this.REST_PUT    = generic_REST_PUT(this);
+    this.REST_DELETE = generic_REST_DELETE(this, {});
+}
+%>

APPL/API2/model_custom_fields.inc

@@ -21,14 +21,9 @@
 <!-- #include file="../Shared/resultset_flex.inc"-->
 <%
 
-function model_custom_fields(formodel, flexModule, flexParams)
+function model_custom_fields(formodel, flexModel, flexParams)
 {
-    var flexModel = null; // alleen nog niet bij issues
-    if (typeof flexModule != "string")
-    {
-        flexModel = flexModule;
-        flexModule = flexModel.module;
-    }
+    var flexModule = flexModel.module;
 
     flexParams         = flexParams || {};
     this.module        = flexModule;
@@ -93,34 +88,42 @@ function model_custom_fields(formodel, flexModule, flexParams)
         }
     };
 
+    this.get_file_info = function (params, record, fileparams)
+    {
+        var flexparam = flexProps(flexModule, record.xflexparentkey,
+                                  String(record.propertyid), flexParams.pNiveau,
+                                  fileparams);
+        var attachments = [];
+        for (var f in flexparam.files)
+        {
+            var file = flexparam.files[f];
+            var attachment = { name: file.name,
+                               date: file.date,
+                               size: file.size,
+                               content_url: file.deepurl,
+                               token: file.token,
+                               digest: file.digest };
+            switch (params.filter.fileencoding) // De enige twee encodings die we ondersteunen
+            {
+                case "base64":
+                    attachment.content_base64 = file.data;
+                    break;
+                case "hex":
+                    attachment.content_hex = file.data;
+                    break;
+            }
+            attachments.push(attachment);
+        };
+        return attachments;
+    }
     // Deze functie wordt na de GET aangeroepen. De bijlagen zijn zo afwijkend
     // dat ik dat niet fatsoenlijk in 'fields' verwerkt kreeg
     this.post_get = function (params, record)
         {
             if (record.type == 'F' || record.type == 'M')
             {
-                var flexparam = flexProps(flexModule, record.xflexparentkey, String(record.propertyid), flexParams.pNiveau,
-                                                { getFiles: true, getFileEncoded: params.filter.fileencoding, api2name: formodel.records_name });
-                record.attachments = [];
-                for (var f in flexparam.files)
-                {
-                    var file = flexparam.files[f];
-                    var attachment = { name: file.name,
-                                       date: file.date,
-                                       size: file.size,
-                                       content_url: file.deepurl,
-                                       digest: file.digest };
-                    switch (params.filter.fileencoding) // De enige twee encodings die we ondersteunen
-                    {
-                        case "base64":
-                            attachment.content_base64 = file.data;
-                            break;
-                        case "hex":
-                            attachment.content_hex = file.data;
-                            break;
-                    }
-                    record.attachments.push(attachment);
-                };
+                var fileparams = { getFiles: true, getFileEncoded: params.filter.fileencoding, api2name: formodel.records_name };
+                record.attachments = this.get_file_info(params, record, fileparams);
             }
             delete record["xflexparentkey"]; // nu niet meer nodig
         }
@@ -151,10 +154,16 @@ function model_custom_fields(formodel, flexModule, flexParams)
                             Response.Status = "304 Not modified";
                             Response.End;
                         }
-                        StreamFile(params.AttachPath, att.name, "application/octet-stream");
+                        var extension = att.name.split('.').pop();
+                        var mime = S("flex_mimetypes")[extension]; // Sommige mimetypes zijn bekend
+                        // Content-Type: image/jpeg; Charset=utf-8
+                        // Eigenlijk moet de Charset er alleen bij text/.... bij maar ik krijg die er niet netjes af
+                        // IE, FF en Chrome doen er in ieder geval niet moeilijk over
+                        //if (mime)
+                        //    Response.Charset = ''; /
+                        StreamFile(params.AttachPath, att.name, mime || "application/octet-stream");
                     }
                 }
-
             }
         }
         __Log(filter);
@@ -166,11 +175,25 @@ function model_custom_fields(formodel, flexModule, flexParams)
     {   // Let op: parameter the_key is de kenmerk_key, niet een een kenmerkwaarde_key
         // Merk op dat flexProps ook wel het type oplevert. Ik wil echter migreren naar modellen
         var kenmerkdata = api2.GET(flexModel, jsondata.propertyid);
-        // TODO: if (!kenmerkdata) en rechtencontrole
-        var typ = kenmerkdata.attributetype.id;
+
+        // Als je op de volgende regel een 'Object expected' krijgt is er
+        // gesubmit met een kenmerk_key welke niet bestaat
+        // Ik weet nog niet of daar een 'Unautorized', 'Bad request' of 'Stil negeren' van toepassing is
+        // Vooralsnog maar even ongewijzigd er hard uitklappen
+        if ("attributetype" in kenmerkdata)
+        {
+            var typ = kenmerkdata.attributetype.id;
+        }
+        else
+        {
+            var typedata = flexModel.getPropertyType(kenmerkdata); // getPropertyType moet gedefinieerd zijn
+            var typ = typedata.attributetype.id;
+        }
         if (typ == 'F' || typ == 'M')
         {
-            var flexparams = flexProps(this.module, parent_key, the_key, flexParams.pNiveau);
+            if (!(parent_key > 0))
+                var tmpfolder =  safe.filename(shared.random(32));
+            var flexparams = flexProps(this.module, parent_key, the_key, flexParams.pNiveau, { tmpfolder: tmpfolder });
             // TODO: bij type F zorgen dat er <20><>n file overblijft
             for (var i = 0; i < jsondata.attachments.length; i++)
             {
@@ -193,13 +216,12 @@ function model_custom_fields(formodel, flexModule, flexParams)
                 }
                 else
                 {
-                    Response.Status = "422 Unprocessable Entity";
-                    Response.End;
+                    api2.error(422, L("lcl_shared_file_ext_not_allowed"));
                 }
             }
         }
 
-        if (typ != "M")
+        if (typ != "M" && parent_key > 0)
         {
             var sql = "BEGIN flx.setflex({0}".format(safe.quoted_sql(this.module))
                     + "                , {0}".format(the_key) // == jsondata.propertyid
@@ -207,14 +229,17 @@ function model_custom_fields(formodel, flexModule, flexParams)
                     + "                , {0}".format(safe.quoted_sql(flexParams.pNiveau))
                     + "                , {0});".format(safe.quoted_sql(jsondata.value))
                     + "END;"
-            Oracle.Execute(sql);
+            var err = Oracle.Execute(sql, true);
+            if (err.friendlyMsg)
+                api2.error(400, err.friendlyMsg);
         }
+        return tmpfolder;
     }
 
     if (flexModel) // nog even niet voor MLD
     this.REST_POST = function (params, jsondata, parent_key) /* add custom_field */
     {   // Voor flexvelden is er geen verschil tusen 'toevoegen' en 'bijwerken'
-        this.REST_PUT(params, jsondata, jsondata.propertyid, parent_key);
+        return this.REST_PUT(params, jsondata, jsondata.propertyid, parent_key);
     }
 
     this.disabled_REST_DELETE = function (params, the_key) /* remove custom_field */

APPL/API2/model_doc.inc

@@ -30,10 +30,16 @@ function model_doc()
     this.modules = { };
     for (var i = 0; i < apis.length; i++)
     {
+        if (apis[i].nodoc)
+            continue;
+
         var modulecode = apis[i].modulecode || "XXX";
         if (!(modulecode in this.modules))
             this.modules[modulecode] = { name: apis[i].module, apis: { } };
-        this.modules[modulecode].apis[ apis[i].id ] = { label: apis[i].name };
+        var apidata = { label: apis[i].name };
+        if (apis[i].docparam )
+            apidata.docparam = apis[i].docparam;
+        this.modules[modulecode].apis[ apis[i].id ] = apidata;
     }
 
     this.REST_GET = generic_REST_GET(this, {});

APPL/API2/model_doc.xsl

@@ -21,7 +21,7 @@
                 <xsl:sort select="local-name()" />
                 <xsl:element name="li">
                     &#xA0;<xsl:element name="a">
-                        <xsl:attribute name="href">../api2/<xsl:value-of select="local-name()"/>.doc</xsl:attribute>
+                        <xsl:attribute name="href">../api2/<xsl:value-of select="local-name()"/>.doc<xsl:if test="docparam!=''">?x=x<xsl:value-of select="docparam"/></xsl:if></xsl:attribute>
         				<xsl:value-of select="local-name()"/>
                     </xsl:element>
                     &#xA0;<span class='apidesc'><xsl:value-of select="label"/></span>

APPL/API2/model_fac_groep.inc

@@ -57,13 +57,24 @@ function model_fac_groep(groep_key, params)
         "label": L("lcl_prs_substitutes"),
         "typ": "check0"
       },
+      "externalid": {
+          "dbs": "fac_groep_externid",
+          "label": L("fac_groep_externid"),
+          "typ": "varchar"
+      },
       "membercount": {
         "dbs": "nn_leden",
         "sql": "(SELECT COUNT(*) FROM fac_gebruikersgroep WHERE fac_groep.fac_groep_key = fac_gebruikersgroep.fac_groep_key)",
         "label": L("fac_groep_nn_leden"),
         "typ": "number"
+      },
+        "created": {
+        "dbs": "fac_groep_aanmaak",
+        "label": "Aanmaakdatum",
+        "typ": "datetime",
+        "readonly": true
       }
-    }
+    };
 
     this.includes = {
         "users": {
@@ -103,7 +114,17 @@ function model_fac_groep(groep_key, params)
                                + "         WHERE fgr.fac_functie_key = ff.fac_functie_key"
                                + "           AND ff.fac_functie_code = 'WEB_FACTAB')");
     }
-    this.REST_GET    = generic_REST_GET(this, xparams);
+    // _groepen geven we nooit mee
+
+    this.REST_GET = function (params)
+    {
+        if ("filter" in params && params.filter.nointernal)
+            xparams.GET.wheres.push("SUBSTR(fac_groep_omschrijving, 0, 1) <> '_'");
+
+        // Verder met de default
+        return generic_REST_GET(this, xparams)(params)
+    }
+
     this.REST_POST   = generic_REST_POST(this);
     this.REST_PUT    = generic_REST_PUT(this);
     this.REST_DELETE = generic_REST_DELETE(this);

APPL/API2/model_fac_session.inc

@@ -47,10 +47,11 @@ model_fac_session = // Internal only
             "label": L("fac_session_data"),
             "typ": "varchar"
         },
-        "creation": {
+        "created": {
             "dbs": "fac_session_aanmaak",
             "label": L("fac_session_aanmaak"),
-            "typ": "datetime"
+            "typ": "datetime",
+            "readonly": true
         },
         "expire": {
             "dbs": "fac_session_expire",

APPL/API2/model_fac_sp.inc

@@ -1,155 +0,0 @@
-<% /*
-    $Revision$
-    $Id$
-
-    File:           model_fac_sp.inc
-    Description:
-    Notes:
-*/
-
-%>
-<!-- #include file="./model_fac_sp_map.inc" -->
-<%
-function model_fac_sp()
-{
-    this.records_name = "identityproviders";
-    this.record_name = "identityprovider";
-    this.table = "fac_sp";
-    this.primary = "fac_sp_key";
-    this.autfunction = "WEB_FACFAC";
-    this.record_title = L("fac_sp");
-    this.records_title = L("fac_sp_m");
-
-    this.fields = {
-        "id": {
-            "dbs": "fac_sp_key",
-            "label": L("lcl_key"),
-            "typ": "key",
-            "seq": "fac_s_fac_sp_key"
-        },
-        "code": {
-            "dbs": "fac_sp_code",
-            "label": L("fac_sp_code"),
-            "typ": "varchar",
-            "filter": "exact"
-        },
-        "name": {
-            "dbs": "fac_sp_omschrijving",
-            "label": L("fac_sp_omschrijving"),
-            "typ": "varchar",
-            "required": true
-        },
-        "type": {
-            "dbs": "fac_sp_type",
-            "label": L("fac_sp_type"),
-            "typ": "key",
-            "required": true,
-            "LOV": L("fac_aut_typeLOV") // TODO?
-        },
-        "remark": {
-            "dbs": "fac_sp_opmerking",
-            "label": L("fac_sp_opmerking"),
-            "typ": "memo"
-        },
-        "secret": {
-            "dbs": "fac_sp_secret",
-            "label": L("fac_sp_secret"),
-            "typ": "varchar",
-            "defaultvalue": shared.random(32),
-            "secret": true
-        },
-        "audience": {
-            "dbs": "fac_sp_audience",
-            "label": L("fac_sp_audience"),
-            "typ": "varchar",
-            "placeholder": customerId + ".facilitor.nl"
-        },
-        "issuer": {
-            "dbs": "fac_sp_issuer",
-            "label": L("fac_sp_issuer"),
-            "typ": "varchar"
-        },
-        "algorithm": {
-            "dbs": "fac_sp_algorithm",
-            "label": L("fac_sp_algorithm"),
-            "typ": "varchar"
-        },
-        "timeout": {
-            "dbs": "fac_sp_clockskew",
-            "label": L("fac_sp_clockskew"),
-            "typ": "number",
-            "defaultvalue": 30
-        },
-        "duration": {
-            "dbs": "fac_sp_duration",
-            "label": L("fac_sp_duration"),
-            "typ": "number"
-        },
-        "remoteloginurl": {
-            "dbs": "fac_sp_remote_loginurl",
-            "label": L("fac_sp_remote_loginurl"),
-            "typ": "varchar"
-        },
-        "remotelogouturl": {
-            "dbs": "fac_sp_remote_logouturl",
-            "label": L("fac_sp_remote_logouturl"),
-            "typ": "varchar"
-        },
-        "ipfilter": {
-            "dbs": "fac_sp_ipfilter",
-            "label": L("fac_sp_ipfilter"),
-            "typ": "varchar"
-        },
-        "_currentIP" : {
-            "dbs": "",
-            "label": "Current IP",
-            "typ": "label",
-            "labelvalue": String(Request.ServerVariables("REMOTE_ADDR"))
-        },
-        "ipauto": {
-            "dbs": "fac_sp_ipauto",
-            "label": L("fac_sp_ipauto"),
-            "typ": "check0"
-        },
-/*
-        "company": {
-             "dbs": "prs_bedrijf_key",
-             "typ": "key",
-             "foreign": "prs_bedrijf",
-             "label": L("lcl_idp_company")
-        }
-        ,
-        "department": {
-             "dbs": "prs_afdeling_key",
-             "typ": "key",
-             "foreign": "prs_afdeling",
-             "label": L("lcl_idp_department")
-        },
-        "authorization": {
-            "dbs": "fac_functie_key",
-            "label": L("fac_sp_functie_key"),
-            "typ": "key",
-            "foreign": "fac_functie"
-        },
-*/
-        "internal": {
-            "dbs": "fac_sp_internal",
-            "label": L("fac_sp_internal"),
-            "typ": "check0",
-            "readonly": true
-        }
-    }
-
-    this.includes =
-               {  "spmappings": { model: new model_fac_sp_map(),
-                                  joinfield: "serviceprovider",
-                                  enable_update: true
-                                }
-              };
-
-    this.REST_GET    = generic_REST_GET(this);
-    this.REST_POST   = generic_REST_POST(this);
-    this.REST_PUT    = generic_REST_PUT(this);
-    this.REST_DELETE = generic_REST_DELETE(this);
-}
-%>

APPL/API2/model_fac_usrdata.inc

@@ -52,6 +52,7 @@ function model_fac_usrdata(params)
         "description": {
             "dbs": "fac_usrdata_omschr",
             "label": L("fac_usrdata_omschr"),
+            "required": true,
             "typ": "varchar",
             "translate": true
         },

APPL/API2/model_fac_widget.inc

@@ -86,7 +86,8 @@ function model_fac_widget()
             "dbs": "fac_widget_aanmaak",
             "label": L("fac_widget_aanmaak"),
             "typ": "date",
-            "hidden_fld": true
+            "hidden_fld": true,
+            "readonly": true
         },
         "authorization": {
             "dbs": "fac_functie_key",

APPL/API2/model_fin_factuur.inc

@@ -40,49 +40,71 @@ function model_fin_factuur()
             "typ": "key",
             "required": true,
             "foreign": bgt_budgetdiscipline_foreign(),
-            "emptyoption": null
+            "showtransit": true
         },
         "budgetproject": {
             "dbs": "bgt_project.bgt_project_key",
             "label": L("bgt_project_omschrijving"),
             "typ": "key",
-            "foreign": bgt_budgetproject_foreign()
-        },
-        "budgetcostcategory": {
-            "dbs": "bgt_kostenrubriek.bgt_kostenrubriek_key",
-            "label": L("bgt_kostenrubriek_oms"),
-            "typ": "key",
-            "foreign": bgt_budgetcostcategory_foreign()
-        },
-        "costtypegroup": {
-            "dbs": "prs_kostensoortgrp.prs_kostensoortgrp_key",
-            "label": L("prs_kostensoortgrp_key"),
-            "typ": "key",
-            "foreign": bgt_costtypegroup_foreign()
+            "foreign": bgt_budgetproject_foreign(),
+            "showtransit": true
         },
         "costtype": {
             "dbs": "prs_kostensoort_key",
             "label": L("prs_kostensoort_key"),
             "typ": "key",
             "foreign": bgt_costtype_foreign(),
-            "hidden_fld": true
+            "required": false
+        },
+        "company": {
+            "dbs": "mld_opdr.mld_uitvoerende_keys",
+            "label": L("lcl_ord_company"),
+            "typ": "key",
+            "foreign": bgt_company_foreign(),
+            "showtransit": true
         },
         "order": {
             "dbs": "mld_opdr_key",
             "label": L("lcl_fin_mld_opdr"),
             "typ": "key",
             "required": true,
-            "foreign": {
-                "tbl": "mld_opdr",
-                "key": "mld_opdr_key",
-                "desc": "mld_opdr_omschrijving"
-            },
+            "foreign": bgt_order_foreign(),
+            "showtransit": true,
             "clone": false
         },
+        "additional": {
+            "dbs": "mld_opdr.mld_opdr_meerwerk",
+            "label": L("lcl_mld_opdr_meerwerk"),
+            "typ": "check0",
+            "defaultvalue": 0,
+            "filter": "exact",
+            "multiedit": true
+        },
+         "ordernr_sort": {
+            "dbs": "mld_opdr_ordernr_int",
+            "label": L("bgt_opdr_ordernr"),
+            "sql": "fac.safe_to_number(mld_opdr.mld_opdr_ordernr)",
+            "typ": "number",
+            "readonly": true
+        },
         "ordernr": {
             "dbs": "mld_opdr.mld_opdr_ordernr",
             "label": L("bgt_opdr_ordernr"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "hidden_fld": true
+        },
+        "account": {
+            "dbs": "mld_opdr.prs_kostenplaats_key",
+            "label": L("bgt_budget_account"),
+            "typ": "key",
+            "foreign": bgt_account_foreign(),
+            "readonly": true
+        },
+        "_staticinvoice": {
+            "dbs": "",
+            "label": L("bgt_factuurnr_vast"),
+            "typ": "varchar",
+            "foreign": bgt_invoice_foreign()
         },
         "invoice": {
             "dbs": "fin_factuur_nr",
@@ -100,13 +122,21 @@ function model_fin_factuur()
             "label": L("lcl_fin_findate"),
             "typ": "date",
             "required": true,
-            "defaultvalue": new Date()
+            "defaultvalue": new Date(),
+            "filter": "exact"
         },
         "advice": {
             "dbs": "fin_factuur_advies",
             "label": L("lcl_fin_adviesdatum"),
             "typ": "date",
-            "defaultvalue": new Date()
+            "defaultvalue": new Date(),
+            "multiedit": true
+        },
+        "isprinted": {
+            "dbs": "fin_factuur_bron",
+            "label": "Geprint",
+            "typ": "check0",
+            "multiedit": true
         },
         "month": {
             "dbs": "fin_factuur_boekmaand",
@@ -118,24 +148,24 @@ function model_fin_factuur()
             "label": L("lcl_fin_fin_status"),
             "typ": "key",
             "foreign": bgt_invoicestatus_foreign(),
-            "defaultvalue": "2",
-            "clone": false  // Krijgt nu de default waarde.
+            "defaultvalue": "6",
+            "clone": false,  // Krijgt nu de default waarde.
+            "multiedit": true
         },
         "total": {
             "dbs": "fin_factuur_totaal",
             "label": L("lcl_fin_CO_sum"),
             "typ": "float",
             "iscurrency": true,
-            "total": true,
-            "defaultvalue": "0"
+            "total": true
         },
         "totalvat": {
             "dbs": "fin_factuur_totaal_btw",
             "label": L("lcl_fin_btwsum"),
             "typ": "float",
+            "defaultvalue": 0,
             "iscurrency": true,
             "total": true,
-            "defaultvalue": "0",
             "clone": false
         },
         "totalincl": {
@@ -143,6 +173,8 @@ function model_fin_factuur()
             "sql": "fin_factuur_totaal + fin_factuur_totaal_btw",
             "label": L("lcl_fin_total_sum"),
             "typ": "float",
+            "readonly": true,
+            "sqlshow": true,
             "iscurrency": true,
             "total": true,
             "defaultvalue": "0",
@@ -162,18 +194,128 @@ function model_fin_factuur()
         ]
     };
 
-
     this.hook_pre_edit = function(obj, fld)
     {
-        // Bij klonen: id=-1, invoice=niet leeg. Dan een (volgende) volgnummer erachter zetten.
-        if (obj.invoice)
+        var btw_data = {};
+        if (obj.id > -1)
+        {
+            var sql = "SELECT s.prs_kostensoort_btw"
+                    + "     , f.fin_btwtabelwaarde_perc"
+                    + "  FROM fin_factuur f"
+                    + "     , prs_kostensoort s"
+                    + "     , fin_btwtabelwaarde f"
+                    + " WHERE s.fin_btwtabelwaarde_key = f.fin_btwtabelwaarde_key"
+                    + "   AND f.prs_kostensoort_key = s.prs_kostensoort_key"
+                    + "   AND f.fin_factuur_key = " + obj.id;
+            var oRs = Oracle.Execute(sql);
+            if (!oRs.eof)
+            {
+                btw_data.btw_inc = oRs("prs_kostensoort_btw").Value;
+                btw_data.btw_val = oRs("fin_btwtabelwaarde_perc").Value;
+            }
+            oRs.Close();
+        }
+
+        %>
+        <script type="text/javascript">
+            var btw_data = <%=JSON.stringify(btw_data)%>;
+        </script>
+        <%
+
+        var vast_facnr = isVastFactuurnummer(obj.invoice);
+        if (!obj.id && obj.invoice)
         {
             var invoice = obj.invoice;
-            var cur_inv = (invoice.indexOf("/") > -1 ? invoice.substring(0,invoice.indexOf("/")-1) : invoice);
-            var cur_seq = (invoice.indexOf("/") > -1 ? invoice.substring(invoice.indexOf("/")+1) : 0);
-            cur_seq = (cur_seq ? cur_seq : 0);
-            var new_inv = cur_inv + "/" + (cur_seq + 1);
-            obj.invoice = new_inv;
+            if (!vast_facnr)
+            {
+                // Bij klonen: id=(bestaat niet), invoice=niet leeg. Dan een (volgende) volgnummer erachter zetten.
+                var cur_inv = (invoice.indexOf("/") > -1 ? invoice.substring(0,invoice.indexOf("/")) : invoice);
+                var cur_seq = (invoice.indexOf("/") > -1 ? invoice.substring(invoice.indexOf("/")+1) : 0);
+                cur_seq = parseInt(cur_seq ? cur_seq : 0);
+
+                var sql = "SELECT MAX(CASE WHEN INSTR(f.fin_factuur_nr, '/') > 0"
+                        + "                THEN TO_NUMBER(SUBSTR(f.fin_factuur_nr, INSTR(f.fin_factuur_nr, '/')+1))"
+                        + "                ELSE 0"
+                        + "           END) max_seq"
+                        + "  FROM bgt_kostenrubriek r"
+                        + "     , prs_kostensoortgrp g"
+                        + "     , prs_kostensoort s"
+                        + "     , mld_opdr o"
+                        + "     , fin_factuur f"
+                        + " WHERE r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+                        + "   AND g.prs_kostensoortgrp_key = s.prs_kostensoortgrp_key"
+                        + "   AND s.prs_kostensoort_key = o.prs_kostensoort_key"
+                        + "   AND o.mld_opdr_key = f.mld_opdr_key"
+                        + "   AND r.bgt_project_key = " + obj.budgetproject.id
+                        + "   AND f.fin_factuur_nr LIKE " + safe.quoted_sql(cur_inv + "%");
+                var oRs = Oracle.Execute(sql);
+                cur_seq = oRs("max_seq").Value;
+                oRs.Close();
+
+                var new_inv = cur_inv + "/" + (cur_seq==0 ? 2 : cur_seq + 1);
+                obj.invoice = new_inv;
+            }
+            else
+            {
+                // Bij klonen van een factuur met een vast factuurnr blijft deze ongewijzigd.
+                obj.invoice = invoice;
+            }
+            var v_company = obj.company.id;
+        %>
+        <script type="text/javascript">
+            <% if (v_company)    { %> var company          = "<%=v_company%>";    <% } %>
+        </script>
+        <%
+        }
+        else
+        {
+            var mld_opdr_key = getQParamInt("opdrachtcommon", -1);
+            if (obj.id == -1 && mld_opdr_key > -1)
+            {   // Nieuwe factuur bij bekende opdracht.
+                var sql = "SELECT p.ins_discipline_key"
+                        + "     , p.bgt_project_key"
+                        + "     , o.mld_uitvoerende_keys"
+                        + "     , s.prs_kostensoort_key"
+                        + "     , s.prs_kostensoort_oms"
+                        + "  FROM mld_opdr o"
+                        + "     , prs_kostensoort s"
+                        + "     , prs_kostensoortgrp g"
+                        + "     , bgt_kostenrubriek r"
+                        + "     , bgt_project p"
+                        + " WHERE p.bgt_project_key = r.bgt_project_key"
+                        + "   AND r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+                        + "   AND g.prs_kostensoortgrp_key = s.prs_kostensoortgrp_key"
+                        + "   AND s.prs_kostensoort_key = o.prs_kostensoort_key"
+                        + "   AND o.mld_opdr_key = " + mld_opdr_key;
+                var oRs = Oracle.Execute(sql);
+                var v_order = mld_opdr_key;
+                var v_discipline = oRs("ins_discipline_key").Value;
+                var v_project = oRs("bgt_project_key").Value;
+                var v_soort = oRs("prs_kostensoort_key").Value;
+                var v_srtoms = oRs("prs_kostensoort_oms").Value;
+                var v_company = oRs("mld_uitvoerende_keys").Value;
+                oRs.Close();
+                // Er is geen QParam voor costtype gezet, dus deze zelf vullen.
+                obj.costtype = {id: v_soort, name: v_srtoms};
+            }
+            else
+            {
+                var v_order      = null;
+                var v_discipline = (obj.budgetdiscipline ? obj.budgetdiscipline.id : null);
+                var v_project    = (obj.budgetproject    ? obj.budgetproject.id    : null);
+                var v_soort      = (obj.costtype         ? obj.costtype.id         : null);
+                var v_company    = (obj.company          ? obj.company.id          : null);
+            }
+        %>
+        <script type="text/javascript">
+            var cur_mode = "<%=mode%>";  // = "edit"
+            <% if (v_order)      { %> var mldopdracht      = "<%=v_order%>";      <% } %>
+            <% if (v_discipline) { %> var budgetdiscipline = "<%=v_discipline%>"; <% } %>
+            <% if (v_project)    { %> var budgetproject    = "<%=v_project%>";    <% } %>
+            <% if (v_soort)      { %> var costtype         = "<%=v_soort%>";      <% } %>
+            <% if (v_company)    { %> var company          = "<%=v_company%>";    <% } %>
+        </script>
+        <%
         }
         // De opdracht moet wel gewijzigd kunnen worden bij het klonen.
         if (!obj.id)
@@ -182,15 +324,175 @@ function model_fin_factuur()
 
     this.hook_pre_post = function(params, obj)
     {
-        // Wordt alleen gebruikt bij toevoegen.
+        // Bij toevoegen van een factuur moet prs_kostensoort_key nog gevuld worden.
+        // Gebruik daarvoor die van mld_opdr.
+        setKostensoort(obj);
+        // Is het factuurnummer/volgnummer uniek binnen het project?
+        var v_discipline_key = (typeof obj.budgetdiscipline == "object" ? obj.budgetdiscipline.id : obj.budgetdiscipline);
+        checkUniekFactuurnummer(-1, v_discipline_key, obj.invoice);
+        // Bij een kopiefactuur van een origineel (factuurnummer zonder volgnummer)
+        // moet het originele factuurnummer de toevoeging "/1" krijgen.
+        // De vaste factuurnummers echter niet.
+        var vast_factnr = isVastFactuurnummer(obj.invoice);
+        var is_clone = (getQParamInt("scf_clone", 0) == 1);
+        if (is_clone && !vast_factnr)
+        {
+            // Haal het originele factuurnummer op.
+            var org_fin_key = getQParamInt("id");
+            var sql = "SELECT fin_factuur_nr"
+                    + "  FROM fin_factuur"
+                    + " WHERE fin_factuur_key = " + org_fin_key;
+            var oRs = Oracle.Execute(sql);
+            var fact_nr_org = oRs("fin_factuur_nr").Value;
+            oRs.Close();
+            if (fact_nr_org.indexOf("/") == -1)
+            {
+                // Het originele factuurnummer heeft nog geen volgnummer.
+                // Deze dus alsnog toevoegen.
+                var sql = "UPDATE fin_factuur"
+                        + "   SET fin_factuur_nr = " + safe.quoted_sql(fact_nr_org + "/1")
+                        + " WHERE fin_factuur_key = " + org_fin_key;
+                Oracle.Execute(sql);
+            }
+        }
     }
 
     this.hook_pre_put = function(params, obj, key)
-    {   //wijzigen factuur: bepaal ook opnieuw de som van de factuurregels.
+    {
+        // Bij wijzigen van factuur moet prs_kostensoort_key nog gevuld worden.
+        // Gebruik daarvoor die van mld_opdr.
+        setKostensoort(obj);
+        // Project-key kan als gevolg van de filtering niet aanwezig zijn.
+        // Haal deze dus maar op met behulp van de factuur-key.
+        var sql = "SELECT pr.ins_discipline_key"
+                + "     , kr.bgt_project_key"
+                + "     , TRUNC(fa.fin_factuur_datum)  factuur_datum"
+                + "     , TRUNC(fa.fin_factuur_advies) advies_datum"
+                + "     , fa.fin_factuur_nr"
+                + "     , fa.fin_factuur_opmerking"
+                + "     , fa.fin_factuur_statuses_key"
+                + "  FROM bgt_project pr"
+                + "     , bgt_kostenrubriek kr"
+                + "     , prs_kostensoortgrp kg"
+                + "     , prs_kostensoort ks"
+                + "     , mld_opdr mo"
+                + "     , fin_factuur fa"
+                + " WHERE pr.bgt_project_key = kr.bgt_project_key"
+                + "   AND kr.bgt_kostenrubriek_key = kg.bgt_kostenrubriek_key"
+                + "   AND kg.prs_kostensoortgrp_key = ks.prs_kostensoortgrp_key"
+                + "   AND ks.prs_kostensoort_key = mo.prs_kostensoort_key"
+                + "   AND mo.mld_opdr_key = fa.mld_opdr_key"
+                + "   AND fa.fin_factuur_key = " + key;
+        var oRs = Oracle.Execute(sql);
+        var v_discipline_key = oRs("ins_discipline_key").Value;
+        var v_project_key = oRs("bgt_project_key").Value;
+        var v_factuur_datum = new Date(oRs("factuur_datum").Value);
+        var v_advies_datum = new Date(oRs("advies_datum").Value);
+        var v_invoice = oRs("fin_factuur_nr").Value;
+        var v_remark = oRs("fin_factuur_opmerking").Value || "";
+        var v_status = oRs("fin_factuur_statuses_key").Value;
+        oRs.Close();
+
+        // Is de combinatie factuurnummer/volgnummer nog steeds uniek?
+        if (obj.invoice != v_invoice)
+            checkUniekFactuurnummer(key, v_discipline_key, obj.invoice);
+
+        // Zet van alle facturen met hetzelfde factuurnummer binnen het project de adviesdatum gelijk.
+        // De vaste factuurnummers worden buiten beschouwing gelaten.
+        var vast_facnr = isVastFactuurnummer(obj.invoice);
+        var v_old_factuurdatum = toDateString(v_factuur_datum, true)
+        var v_new_factuurdatum = toDateString(obj.date.midnight(), true);
+        var v_old_adviesdatum = toDateString(v_advies_datum, true)
+        var v_new_adviesdatum = toDateString(obj.advice.midnight(), true);
+        //
+        var v_diff_datum  = (v_old_factuurdatum != v_new_factuurdatum)
+        var v_diff_advies = (v_old_adviesdatum != v_new_adviesdatum);
+        var v_diff_remark = (v_remark != obj.remark);
+        var v_diff_status = (v_status != obj.status);
+
+        if (!vast_facnr && (v_diff_datum || v_diff_advies || v_diff_remark || v_diff_status))
+        {
+            // We moeten zoeken op factuurnummer zonder volgnummer.
+            var cur_invoice = (obj.invoice.indexOf("/") > -1 ? obj.invoice.substring(0, obj.invoice.indexOf("/")) : obj.invoice);
+            var sql_u = "UPDATE fin_factuur"
+                      + "   SET fin_factuur_advies = " + obj.advice.toSQL()
+                      + "     , fin_factuur_datum = " + obj.date.toSQL()
+                      + "     , fin_factuur_opmerking = " + safe.quoted_sql(obj.remark)
+                      + "     , fin_factuur_statuses_key = " + obj.status
+                      + " WHERE fin_factuur_key IN"
+                            + " (SELECT fin_factuur_key"
+                            + "    FROM fin_factuur f"
+                            + "       , mld_opdr m"
+                            + "       , bgt_v_project_full p"
+                            + "   WHERE f.mld_opdr_key = m.mld_opdr_key"
+                            + "     AND m.prs_kostensoort_key = p.prs_kostensoort_key"
+                            + "     AND p.ins_discipline_key = " + v_discipline_key
+                            + "     AND SUBSTR(f.fin_factuur_nr, 0, INSTR(f.fin_factuur_nr,'/')-1) = " + safe.quoted_sql(cur_invoice)
+                            + " )";
+            Oracle.Execute(sql_u);
+        }
+    }
+
+    function setKostensoort(obj)
+    {
+        var sql = "SELECT o.prs_kostensoort_key"
+                + "  FROM mld_opdr o"
+                + " WHERE mld_opdr_key = " + obj.order;
+        var oRs = Oracle.Execute(sql);
+        if (!oRs.eof)
+        obj.costtype = (!oRs.eof ? oRs("prs_kostensoort_key").Value : NULL);
+        oRs.Close();
+    }
+
+    function isVastFactuurnummer(factnr)
+    {
+        // is de huidige factuurnummer iets uit de usrtab, dan deze gewoon laten staan.
+        var sql = "SELECT count(*) aantal"
+                + "  FROM fac_usrdata d"
+                + "     , fac_usrtab t"
+                + " WHERE t.fac_usrtab_key = d.fac_usrtab_key"
+                + "   AND t.fac_usrtab_naam = " + safe.quoted_sql(S("bgt_usrtab_vaste_factuurnummer"))
+                + "   AND d.fac_usrdata_code = " + safe.quoted_sql(factnr);
+        var oRs = Oracle.Execute(sql);
+        var vast_factnr = (oRs("aantal").Value == 1);
+        oRs.Close();
+        return vast_factnr;
+    }
+
+    function checkUniekFactuurnummer(p_factuur_key, p_discipline_key, p_factuurnr)
+    {
+            var sql = "SELECT count(*) aantal"
+                    + "  FROM bgt_project p"
+                    + "     , bgt_kostenrubriek r"
+                    + "     , prs_kostensoortgrp g"
+                    + "     , prs_kostensoort s"
+                    + "     , mld_opdr o"
+                    + "     , fin_factuur f"
+                    + " WHERE p.bgt_project_key = r.bgt_project_key"
+                    + "   AND r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+                    + "   AND g.prs_kostensoortgrp_key = s.prs_kostensoortgrp_key"
+                    + "   AND s.prs_kostensoort_key = o.prs_kostensoort_key"
+                    + "   AND o.mld_opdr_key = f.mld_opdr_key"
+                    + "   AND p.ins_discipline_key = " + p_discipline_key
+                    + "   AND f.fin_factuur_nr = " + safe.quoted_sql(p_factuurnr)
+                    + "   AND f.fin_factuur_nr NOT IN"
+                            + " (SELECT d.fac_usrdata_code"
+                            + "    FROM fac_usrdata d"
+                            + "       , fac_usrtab t"
+                            + "   WHERE t.fac_usrtab_key = d.fac_usrtab_key"
+                            + "     AND t.fac_usrtab_naam = " + safe.quoted_sql(S("bgt_usrtab_vaste_factuurnummer"))
+                            + " )"
+                    + (p_factuur_key != -1 ? "   AND f.fin_factuur_key <> " + p_factuur_key : "");
+            var oRs = Oracle.Execute(sql);
+            var uniek_factuurnr = (oRs("aantal").Value == 0);
+            oRs.Close();
+            if (!uniek_factuurnr)
+                abort_with_warning("Factuurnummer {0} bestaat al in dit project.".format(p_factuurnr));
     }
 
 
     var mld_opdr_key = getQParamInt("opdrachtcommon", -1);
+    var fin_key = getQParamInt("id", -1);
     var ischild = (getQParam("columns", "")=="" ? true : false);
     var xmodel = getQParam("model", "");
     if (mode == "list" && (xmodel == this.record_name || (ischild && mld_opdr_key == -1) || (!ischild && mld_opdr_key > -1)))
@@ -209,21 +511,46 @@ function model_fin_factuur()
                     "mld_opdr"
                 ],
                 wheres: [
-                    "fin_factuur.prs_kostensoort_key = prs_kostensoort.prs_kostensoort_key",
                     "prs_kostensoort.prs_kostensoortgrp_key = prs_kostensoortgrp.prs_kostensoortgrp_key",
                     "prs_kostensoortgrp.bgt_kostenrubriek_key = bgt_kostenrubriek.bgt_kostenrubriek_key",
                     "bgt_kostenrubriek.bgt_project_key = bgt_project.bgt_project_key",
+                    "mld_opdr.prs_kostensoort_key = prs_kostensoort.prs_kostensoort_key",
                     "mld_opdr.mld_opdr_key = fin_factuur.mld_opdr_key"
                 ]
             }
         };
-        if (mld_opdr_key > -1)
+        if (mld_opdr_key > -1 && fin_key == -1)
             gparams.GET.wheres.push("mld_opdr.mld_opdr_key = {0}".format(mld_opdr_key));
-        this.REST_GET = generic_REST_GET(this, gparams);
+
+        var v_budgetdiscipline = getQParamInt("budgetdiscipline", -1);
+        if (v_budgetdiscipline == -1)
+        {
+            gparams.GET.tables.push("ins_tab_discipline");
+            gparams.GET.wheres.push("bgt_project.ins_discipline_key = ins_tab_discipline.ins_discipline_key");
+            gparams.GET.wheres.push(
+                    "bgt_project.ins_discipline_key IN"
+                    + " (SELECT w.ins_discipline_key"
+                    + "    FROM fac_v_webgebruiker w"
+                    + "       , ins_tab_discipline d"
+                    + "   WHERE w.ins_discipline_key = d.ins_discipline_key"
+                    + "     AND w.prs_perslid_key = " + user_key
+                    + "     AND (w.fac_gebruiker_prs_level_read<9 OR w.fac_gebruiker_alg_level_read<9)"
+                    + "     AND d.ins_discipline_module = 'BGT'"
+                    + "     AND d.ins_discipline_verwijder IS NULL"
+                    + " )"
+            );
+        }
+
+        this.REST_GET =  generic_REST_GET(this, gparams);
     }
 
-    this.REST_POST   = generic_REST_POST(this);
-    this.REST_PUT    = generic_REST_PUT(this);
-    this.REST_DELETE = generic_REST_DELETE(this);
+    this.REST_PUT = generic_REST_PUT(this);
+    var autparams = user.checkAutorisation(this.autfunction);
+    var canWrite = (autparams.PRSwritelevel < 9 && autparams.ALGwritelevel < 9);
+    if (canWrite)
+    {
+        this.REST_POST   = generic_REST_POST(this);
+        this.REST_DELETE = generic_REST_DELETE(this);
+    }
 }
 %>

APPL/API2/model_fin_verkoopfactuur.inc

@@ -36,7 +36,7 @@ function model_fin_verkoopfactuurregels()
         "filter": "exact",
         "seq": "fin_s_fin_verkoopfactuur_key"
       },
-      "creation": {
+      "created": {
         "dbs": "fin_verkoopfactuur_aanmaak",
         "label": L("lcl_fin_verkoopfactuur_aanmaak"),
         "typ": "datetime",

APPL/API2/model_generic.inc

@@ -177,6 +177,8 @@ function model_generic(table, autfunction)
             case "CHAR":
             case "VARCHAR2":
                 field.typ = 'varchar';
+                if (ora_length > 50)
+                    field.typ = 'memo';
                 break;
             case "MLD_T_UITVOERTIJD":
                 field.typ = 'varchar';

APPL/API2/model_ins_controlemode.inc

@@ -11,7 +11,6 @@
     Notes:
 */
 %>
-<!-- #include file="../mgt/mgt_tools.inc" -->
 <%
 
 function model_ins_controlemode()

APPL/API2/model_ins_deel_state_history.inc

@@ -0,0 +1,60 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           model_ins_deel_state_history.inc
+
+    Description:    State history model.
+    Parameters:
+    Context:
+
+    Notes:          Altijd readonly.
+                    Je moet WEB_INSUSE op de discipline hebben, er is (nog) geen 3D controle
+                    Verondersteld wordt dat je in de praktijk altijd filtert op
+                    bijvoorbeeld &start_statedate=2018-01-01T00:00:00Z
+*/
+
+%>
+<%
+function model_ins_deel_state_history(params)
+{
+    params = params || {};
+    this.table        = "ins_deel_state_history";
+    this.primary      = "ins_deel_state_history_key";
+    this.records_name = "statehistory";
+    this.record_name  = "statehistory";
+    this.autfunction = false; // Authorisatie alleen via ins_deel.ins_discipline_key
+
+    params.authparams = user.checkAutorisation("WEB_INSUSE");
+
+    this.fields = { "id"       : { dbs: "ins_deel_state_history_key",   typ: "key" },
+                    "object"   : { dbs: "ins_deel_key",                 typ: "key",    foreign: "ins_deel" },
+                    "state"    : { dbs: "ins_deel_state",               typ: "varchar" },
+                    "statedate": { dbs: "ins_deel_statedate",           typ: "datetime" },
+                    "remark"   : {
+                        "dbs": "ins_deel_state_history_opmerk",
+                        "typ": "memo"
+                    }
+                  };
+
+    var gparams = {
+            GET: {
+                tables: [
+                    "ins_deel"
+                ],
+                wheres: [
+                    "ins_deel_state_history.ins_deel_key = ins_deel.ins_deel_key",
+                    "ins_deel.ins_discipline_key IN"
+                            + " (SELECT ins_discipline_key"
+                            + "    FROM fac_v_webgebruiker"
+                            + "   WHERE fac_functie_key = " + params.authparams.autfunctionkey
+                            + "     AND prs_perslid_key = " + user_key
+                            + "     AND fac_gebruiker_prs_level_read < 9"
+                            + "     AND fac_gebruiker_alg_level_read < 9)"
+                ]
+            }
+        };
+    this.REST_GET    = generic_REST_GET(this, gparams);
+    // updaten doe je door ins_deel.ins_deel_state te wijzigen
+}
+%>

APPL/API2/model_ins_deelsrtcontrole.inc

@@ -0,0 +1,40 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           model_ins_deelsrtcontrole.inc
+
+    Description:    Inspectie model.
+    Parameters:
+    Context:
+
+    Notes:          Extreem rudimentair, uitsluitend om flexkenmerken (bijlagen) te kunnen opslaan
+*/
+
+%>
+<!-- #include file="./model_custom_fields.inc"-->
+<!-- #include file="./model_ins_kenmerk.inc"-->
+<%
+function model_ins_deelsrtcontrole()
+{
+    this.table        = "ins_deelsrtcontrole";
+    this.primary      = "ins_deelsrtcontrole_key";
+    this.records_name = "objects";
+    this.record_name  = "object";
+    this.autfunction = false; // TODO?
+
+
+    this.fields = { "id"       : { dbs: "ins_deelsrtcontrole_key",   typ: "key" },
+                    "object"   : { dbs: "ins_deel_key",              typ: "key",    foreign: "ins_deel" }
+                  };
+
+    this.includes = { "custom_fields" : {
+                        "model": new model_custom_fields(this, new model_ins_kenmerk("C", { internal: true }), { readman: true, readuse: true }),
+                        "joinfield": "flexparentkey",
+                        "enable_update": true
+                    }
+              },
+    this.REST_GET    = generic_REST_GET(this);
+    this.REST_PUT    = generic_REST_PUT(this);
+}
+%>

APPL/API2/model_ins_kenmerk.inc

@@ -12,6 +12,7 @@
     Notes:
 */
 %>
+<!-- #include file="model_ins_srtkenmerk.inc"-->
 <%
 
 function model_ins_kenmerk(niveau, params)
@@ -181,6 +182,11 @@ function model_ins_kenmerk(niveau, params)
         }
     };
 
+    this.getPropertyType = function (kenmerkdata)
+    {
+        var typedata = api2.GET(new model_ins_srtkenmerk({internal: params.internal}), kenmerkdata.objectpropertytype.id);
+        return typedata;
+    }
 
     this.list = {
         "columns": ["id",

APPL/API2/model_ins_srtcontrole.inc

@@ -12,7 +12,6 @@
 */
 %>
 <!-- #include file="./model_ins_kenmerk.inc"-->
-<!-- #include file="../mgt/mgt_tools.inc" -->
 <!-- #include file="./model_ctr_discipline.inc" -->
 <%
 function model_ins_srtcontrole()
@@ -24,29 +23,34 @@ function model_ins_srtcontrole()
     this.autfunction = "WEB_INSMGT";
     this.record_title = L("ins_srtcontrole");
     this.records_title = L("ins_srtcontrole_m");
-
+    this.trackcode = "CTRSUP";
 
     this.fields = {
         "id": {
             "dbs": "ins_srtcontrole_key",
             "label": L("lcl_key"),
             "typ": "key",
+            "infoPointer": { Url: "appl/shared/status_info.asp?urole=bo&inssc_key=", Title: L("lcl_key") + " " },
             "required": true,
             "filter": "exact",
-            "seq": "ins_s_ins_srtcontrole_key"
+            "seq": "ins_s_ins_srtcontrole_key",
+            "track": true
         },
         "level": {
             "dbs": "ins_srtcontrole_niveau",
             "label": L("ins_srtcontrole_niveau"),
             "typ": "varchar",
             "hidden_fld": true,
-            "LOV": fill_niveau_LOV()
+            "LOV": fill_niveau_LOV(),
+            "track": true,
+            "insertonly": true
         },
         "objectkey": {
             "dbs": "ins_srtinstallatie_key",
             "label": L("lcl_ins_object"),
             "typ": "key",
-            "hidden_fld": true
+            "hidden_fld": true,
+            "insertonly": true
         },
         "objectdiscipline": {
             "dbs": "ins_v_allsrtinstallatie.ins_discipline_key",
@@ -56,7 +60,8 @@ function model_ins_srtcontrole()
             "foreign": { "tbl": "ins_v_aanwezigdiscipline",
                          "key": "ins_discipline_key",
                          "desc": "ins_discipline_omschrijving"
-                       }
+                       },
+            "insertonly": true
         },
         "objectgroup": {
             "dbs": "ins_v_allsrtinstallatie.ins_srtgroep_key",
@@ -65,7 +70,8 @@ function model_ins_srtcontrole()
             "foreign": { "tbl": "ins_srtgroep",
                          "key": "ins_srtgroep_key",
                          "desc": "ins_srtgroep_omschrijving"
-                       }
+                       },
+            "insertonly": true
         },
         "objecttype": {
             "dbs": "ins_v_allsrtinstallatie.ins_srtdeel_key",
@@ -74,20 +80,23 @@ function model_ins_srtcontrole()
             "foreign": { "tbl": "ins_srtdeel",
                          "key": "ins_srtdeel_key",
                          "desc": "ins_srtdeel_omschrijving"
-                       }
+                       },
+            "insertonly": true
         },
         "name": {
             "dbs": "ins_srtcontrole_omschrijving",
             "label": L("ins_srtcontrole_omschrijving"),
             "typ": "varchar",
             "required": true,
-            "translate": true
+            "translate": true,
+            "track": true
         },
         "info": {
             "dbs": "ins_srtcontrole_info",
             "label": L("ins_srtcontrole_info"),
             "typ": "memo",
-            "translate": true
+            "translate": true,
+            "track": true
         },
         "taskdiscipline": {
             "dbs": "ctr_discipline_key",
@@ -97,46 +106,55 @@ function model_ins_srtcontrole()
                          "key": "ins_discipline_key",
                          "desc": "ins_discipline_omschrijving"
                        },
-            "required": true
+            "required": true,
+            "track": true
         },
         "inspectionmode": {
             "dbs": "ins_srtcontrole_mode",
             "label": L("ins_srtcontrole_mode"),
-            "typ": "key",
+            "typ": "number",
             "required": true,
-            "LOV": L("ins_srtcontrole_modeLOV")
+            "LOV": L("ins_srtcontrole_modeLOV"),
+            "track": true
         },
         "priority": {
             "dbs": "ins_srtcontrole_level",
             "label": L("ins_srtcontrole_level"),
             "typ": "number",
             "defaultvalue": 10,
-            "required": true
+            "required": true,
+            "multiedit": true,
+            "track": true
         },
         "period": {
             "dbs": "ins_srtcontrole_periode",
             "label": L("ins_srtcontrole_periode"),
             "typ": "float",
-            "required": true
+            "required": true,
+            "multiedit": true,
+            "track": true
         },
         "unit": {
             "dbs": "ins_srtcontrole_eenheid",
             "label": L("ins_srtcontrole_eenheid"),
-            "typ": "key",
+            "typ": "number",
             "required": true,
-            "LOV": L("ins_srtcontrole_eenheidLOV")
+            "LOV": L("ins_srtcontrole_eenheidLOV"),
+            "track": true
         },
         "bits": {
             "dbs": "ins_srtcontrole_bits",
             "label": L("ins_srtcontrole_bits"),
             "typ": "number",
-            "hidden_fld": true
+            "hidden_fld": true,
+            "track": true
         },
         "_moment": {
             "dbs": "",
             "label": L("ins_srtcontrole_moment"),
             "typ": "button",
-            "defaultvalue": L("lcl_select")
+            "defaultvalue": L("lcl_select"),
+            "track": true
         },
         "account": {
             "dbs": "prs_kostenplaats_key",
@@ -144,56 +162,73 @@ function model_ins_srtcontrole()
             "typ": "key",
             "foreign": "prs_kostenplaats",
             "foreignfiltercode": "A", // Alle kostenplaatsen tonen.
-            "filter": "exact"
+            "filter": "exact",
+            "track": true
         },
         "costs": {
             "dbs": "ins_srtcontrole_kosten",
             "label": L("ins_srtcontrole_kosten"),
             "iscurrency": true,
-            "typ": "float"
+            "typ": "float",
+            "multiedit": true,
+            "track": true
         },
         "costs2": {
             "dbs": "ins_srtcontrole_kosten2",
             "label": L("ins_srtcontrole_kosten2"),
             "iscurrency": true,
-            "typ": "float"
+            "typ": "float",
+            "multiedit": true,
+            "track": true
         },
         "costs3": {
             "dbs": "ins_srtcontrole_kosten3",
             "label": L("ins_srtcontrole_kosten3"),
             "iscurrency": true,
-            "typ": "float"
+            "typ": "float",
+            "multiedit": true,
+            "track": true
         },
         "material": {
             "dbs": "ins_srtcontrole_materiaal",
             "label": L("ins_srtcontrole_materiaal"),
             "iscurrency": true,
-            "typ": "float"
+            "typ": "float",
+            "multiedit": true,
+            "track": true
         },
         "hours": {
             "dbs": "ins_srtcontrole_uren",
             "label": L("ins_srtcontrole_uren"),
-            "typ": "float"
+            "typ": "float",
+            "multiedit": true,
+            "track": true
         },
         "enddate": {
             "dbs": "ins_srtcontrole_eind",
             "label": L("ins_srtcontrole_eind"),
-            "typ": "date"
+            "typ": "date",
+            "multiedit": true,
+            "track": true
         },
         "phasingouttime": {
             "dbs": "ins_srtcontrole_afbouwtijd",
             "label": L("ins_srtcontrole_afbouwtijd"),
-            "typ": "float"
+            "typ": "float",
+            "multiedit": true,
+            "track": true
         },
         "taskgroup": {
             "dbs": "ins_srtcontrole_groep",
             "label": L("ins_srtcontrole_groep"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "track": true
         },
         "percentage": {
             "dbs": "ins_srtcontrole_percentage",
             "label": L("ins_srtcontrole_percentage"),
-            "typ": "float"
+            "typ": "float",
+            "track": true
         },
         "vat": {
             "dbs": "fin_btwtabelwaarde_key",
@@ -206,7 +241,14 @@ function model_ins_srtcontrole()
                                                     + "  FROM fin_btwtabelwaarde"
                                                     + " WHERE fin_btwtabelwaarde_key = " + S("fin_btw_default")
                                                     + ")"
-                       }
+                       },
+            "track": true
+        },
+        "issuetype": {
+            "dbs": "mld_stdmelding_key",
+            "label": L("mld_stdmelding_key"),
+            "typ": "key",
+            "foreign": "mld_stdmelding"
         },
         "options": {
             "dbs": "ins_srtcontrole_options",
@@ -245,12 +287,14 @@ function model_ins_srtcontrole()
                         }
                     ]
                 }
-            ]
+            ],
+            "track": true
         },
         "remark": {
             "dbs": "ins_srtcontrole_opmerking",
             "label": L("ins_srtcontrole_opmerking"),
-            "typ": "memo"
+            "typ": "memo",
+            "track": true
         }
     };
 

APPL/API2/model_ins_srtkenmerk.inc

@@ -13,14 +13,15 @@
 %>
 <%
 
-function model_ins_srtkenmerk()
+function model_ins_srtkenmerk(params)
 {
+    params = params || {};
     this.records_name = "objectpropertytypes";
     this.record_name = "objectpropertytype";
     this.table = "ins_srtkenmerk";
     this.primary = "ins_srtkenmerk_key";
     this.soft_delete = "ins_srtkenmerk_verwijder";
-    this.autfunction = "WEB_INSMGT";
+    this.autfunction = params.internal?false:"WEB_INSMGT";
     this.record_title = L("ins_srtkenmerk");
     this.records_title = L("ins_srtkenmerk_m");
 

APPL/API2/model_invoices.inc

@@ -25,7 +25,6 @@
 <!-- #include file="./model_invoicelines.inc"-->
 <!-- #include file="./model_custom_fields.inc"-->
 <!-- #include file="./model_fac_tracking.inc"-->
-<!-- #include file="../mgt/mgt_tools.inc"-->
 <!-- #include file="./model_fin_kenmerk.inc"-->
 
 <%

APPL/API2/model_issueobjects.inc

@@ -11,107 +11,21 @@
     Notes:
 */
 
-model_issueobjects =
+function model_issueobjects()
 {
-    table: "mld_melding_object",
-    primary: "mld_melding_object_key",
-    records_name: "issueobjects",
-    record_name: "issueobject",
-    fields: {"id"             : { dbs: "mld_melding_object_key", typ: "key",  filter: "exact" },
-             "object"         : { dbs: "ins_deel_key",           typ: "key",  foreign: "ins_deel" },
-             "mld_melding_key": { dbs: "mld_melding_key",        typ: "key" }
-            },
+    this.table = "mld_melding_object";
+    this.primary = "mld_melding_object_key";
+    this.records_name = "issueobjects";
+    this.record_name = "issueobject";
+    this.autfunction = false; // Kan alleen vanuit model_issue aangeroepen worden. De autorisatie is daar al geregeld.
+    this.fields = {"id"    : { dbs: "mld_melding_object_key", typ: "key",  filter: "exact",     seq: "mld_s_mld_object_key" },
+                   "object": { dbs: "ins_deel_key",           typ: "key",  foreign: "ins_deel" },
+                   "issue" : { dbs: "mld_melding_key",        typ: "key"}
+                  };
 
-    list: { columns: ["object"] },
-
-    _analyze_fields: function (dbfields, params, jsondata) /* analyseer inkomende data, common voor PUT en POST */
-    {
-        if (jsondata.id)
-        {
-            // Bestaande mld_melding_object: PUT
-        }
-        else
-        {   // Nieuwe mld_melding_object: POST
-            // Controleer of de combinatie melding_key/object_key al bestaat. Zo ja, dan niet toevoegen.
-            var mld_obj_key = -1;
-            var sql = "SELECT mld_melding_object_key"
-                    + "  FROM mld_melding_object"
-                    + " WHERE mld_melding_object_verwijder IS NULL"
-                    + "   AND mld_melding_key = " + params.filter.id
-                    + "   AND ins_deel_key = " + dbfields[0].val; // TODO: unsafe?
-            var oRs = Oracle.Execute(sql);
-            if (!oRs.eof)
-            {
-                mld_obj_key = oRs("mld_melding_object_key").Value;
-                params.isNew = false;
-            }
-            oRs.Close();
-        }
-    },
-
-    _validate_fields: function (dbfields, params, jsondata) /* valideer dbfields, alle constraints die niet door de database worden afgevangen */
-    {
-    },
-
-    REST_GET: function _GET(params)
-        {
-            // Kan alleen vanuit model_issue aangeroepen worden. De autorisatie is daar al geregeld.
-            var query = api2.sqlfields(params, model_issueobjects );
-
-            query.wheres.push("mld_melding_object_verwijder IS NULL");
-
-            var wheres = api2.sqlfilter(params, model_issueobjects);
-            query.wheres = query.wheres.concat(wheres);
-
-            var sql = "SELECT " + query.selects.join(", ")
-                    + "  FROM " + query.tables.join(", ")
-                    + " WHERE " + query.wheres.join(" AND " );
-
-            var json = api2.sql2json (params, sql, model_issueobjects );
-
-            return json;
-        },
-
-    REST_PUT: function (params, jsondata, the_key) /* update object */
-        {
-            // Kan alleen vanuit model_issue aangeroepen worden. De autorisatie is daar al geregeld.
-            var dbfields = api2.update_fields(params, model_issueobjects, jsondata); // Build updater
-            model_issueobjects._analyze_fields(dbfields, params, jsondata);
-
-            var mldUpd = buildTrackingUpdate("mld_melding_object", " mld_melding_object_key = " + the_key, dbfields, { noValidateToken: true });
-            Oracle.Execute(mldUpd.sql);
-
-            // Nu geen api2.process_includes() meer aanroepen, anders ga je de objecten zelf ook nog aanpassen.
-
-            return { key: the_key };
-        },
-
-    REST_POST: function (params, jsondata, parent_key) /* new object */
-        {
-            // Kan alleen vanuit model_issue aangeroepen worden. De autorisatie is daar al geregeld.
-            params.isNew = true; // negeer eventuele bestaande keys
-            var dbfields = api2.update_fields(params, model_issueobjects, jsondata); // Build updater
-            model_issueobjects._analyze_fields(dbfields, params, jsondata);
-
-            var new_key = null;
-            if (params.isNew)
-            {
-                dbfields["issue"] = { dbs: "mld_melding_key",        typ: "key", val: parent_key };
-                dbfields["id"] = { dbs: "mld_melding_object_key", typ: "key", seq: "mld_s_mld_object_key" };
-
-                var mldIns = buildInsert("mld_melding_object", dbfields, { noValidateToken: true });
-                new_key = mldIns.sequences["mld_melding_object_key"];
-                Oracle.Execute(mldIns.sql);
-            }
-
-            return { key: new_key };
-        },
-
-    REST_DELETE: function (params, the_key) /* delete object */
-        {
-            // Kan alleen vanuit model_issue aangeroepen worden. De autorisatie is daar al geregeld.
-            var sql = "DELETE FROM mld_melding_object WHERE mld_melding_object_key = " + the_key;
-            Oracle.Execute(sql);
-        }
+    this.REST_GET    = generic_REST_GET(this);
+    this.REST_POST   = generic_REST_POST(this);
+    this.REST_PUT    = generic_REST_PUT(this);
+    this.REST_DELETE = generic_REST_DELETE(this);
 }
 %>

APPL/API2/model_issues.inc

@@ -22,7 +22,6 @@
 <!-- #include file="./model_custom_fields.inc"-->
 <!-- #include file="./model_fac_tracking.inc"-->
 <!-- #include file="./model_mld_kenmerk.inc"-->
-<!-- #include file="../mgt/mgt_tools.inc"-->
 <%
 
 function fnextendedStatus (oRs, field, model)
@@ -61,6 +60,10 @@ function model_issues(mld_key, params)
              "terrain"    : { dbs: "alg_v_allonroerendgoed.alg_terreinsector_key", typ: "key",      foreign: "alg_terreinsector",          label: L("lcl_room"),              track: true,  filter: "exact" },
              "parent"     : { dbs: "mld_melding_parentkey",                        typ: "key",      xforeign: "mld_melding",               label: L("lcl_mld_completion_in"), track: true,  filter: "exact" },
              "extern_id"  : { dbs: "mld_melding_externnr",                         typ: "varchar",                                         label: L("lcl_mld_externr"),       track: true,  filter: "exact" },
+             "kto_key"    : { dbs: "mld_melding_kto_key",                          typ: "key",                                             label: L("lcl_mld_linktoparent"),  track: true,  filter: "exact" },
+             "kto_type"   : { dbs: "mld_melding_kto_type",                         typ: "varchar",                                         label: L("lcl_mld_kto"),           track: true,  filter: "exact" },
+             "kto"        : { dbs: "mld_melding_kto",                              typ: "number",                                          label: L("lcl_mld_kto_invite"),    track: true,  filter: "exact" },
+             "priority"   : { dbs: "mld_melding_spoed",                            typ: "key",                                             label: L("lcl_mld_urg"),           track: true,  filter: "exact" },
              "xstatus"    : { dbs: "mld_melding_status",
                               val: fnextendedStatus,                               typ: "key",      foreign: mld.getmldstatustext,         label: L("lcl_extended_status"), track: true,  filter: "exact", readonly: true }
             };
@@ -68,9 +71,10 @@ function model_issues(mld_key, params)
     this.list = { columns: ["id", "name", "requestor", "description"] };
 
     this.includes =
-              { "custom_fields": { model: new model_custom_fields(this, "MLD" /*new model_mld_kenmerk() is alleen voor opdrachten*/,
+              { "custom_fields": { model: new model_custom_fields(this, new model_mld_kenmerk('M', { internal: true }),
                                          { pNiveau: "M", readman: true, readuse: true }),
-                                   joinfield: "flexparentkey"
+                                   joinfield: "flexparentkey",
+                                   "enable_update": true
                                  },
                 "tracking":      {
                                    model: new model_tracking(['melding']),
@@ -85,8 +89,9 @@ function model_issues(mld_key, params)
                                    joinfield: "issue"
                                  },
                 "issueobjects":  {
-                                   model: model_issueobjects,
-                                   joinfield: "mld_melding_key"
+                                   model: new model_issueobjects(),
+                                   joinfield: "issue",
+                                   "enable_update": true
                                  }
               };
 
@@ -235,7 +240,7 @@ function model_issues(mld_key, params)
                 // Startdatum is vandaag: starttijd is huidige tijd.
                 // Startdatum is niet vandaag: starttijd is begin werkdag.
                 var startdate_is_today = (startdate.midnight().getTime() == sysdate.midnight().getTime());
-                startdate = (startdate_is_today? sysdate : startdatebegin);
+                params.data.startdate = (startdate_is_today? sysdate : startdatebegin);
             }
             else
             { // Bestaande melding
@@ -256,11 +261,11 @@ function model_issues(mld_key, params)
                     oRs_1.Close();
 
                     var startdatum_is_registratiedatum = (startdate.midnight().getTime() == registratiedatum.midnight().getTime());
-                    startdate = (startdatum_is_registratiedatum? registratiedatum : startdatebegin);
+                    params.data.startdate = (startdatum_is_registratiedatum? registratiedatum : startdatebegin);
                 }
                 else
                 { // else startdatum niet aanpassen.
-                    startdate = oldstartdate;
+                    params.data.startdate = oldstartdate;
                 }
                 oRs.Close();
             }
@@ -269,7 +274,7 @@ function model_issues(mld_key, params)
         {   // Situatie 2: Einddatum = COALESCE(huidige waarde, sysdate) + SLA
             if (params.isNew)
             {
-                startdate = new Date();
+                params.data.startdate = new Date();
             }
             else
             {
@@ -297,6 +302,7 @@ function model_issues(mld_key, params)
                 alg_onroerendgoed_keys = gebouwkey;
         }
         params.data.alg_onroerendgoed_keys = alg_onroerendgoed_keys;
+        return params;
     };
 
     function _analyze_fields (dbfields, params, jsondata) /* analyseer inkomende data, common voor PUT en POST */
@@ -385,30 +391,41 @@ function model_issues(mld_key, params)
 
             var this_mld = mld.func_enabled_melding(mld_key);
             user.auth_required_or_abort(this_mld.canChange);  // Geen wijzigingen toestaan bij onvoldoende rechten.
-            _pre_analyze_fields(params, jsondata);
-            // Verwijder voor PUT wat niet gewijzigd mag worden.
-            delete jsondata.name;
-            delete jsondata.contact;
-            delete jsondata.requestor;
-            delete jsondata.issuetype;
-            delete jsondata.location;
 
-            var dbfields = api2.update_fields(params, this, jsondata); // Build updater
-            _analyze_fields(dbfields, params, jsondata);
-            _validate_fields(dbfields, params, jsondata);
+            if (params.custom_fields_only)
+            {
+                var mldUpd = { trackarray: [] };
+            }
+            else
+            {
+                params = _pre_analyze_fields(params, jsondata);
+                // Verwijder voor PUT wat niet gewijzigd mag worden.
+                delete jsondata.name;
+                delete jsondata.contact;
+                delete jsondata.requestor;
+                delete jsondata.issuetype;
+                delete jsondata.location;
 
-            var wheres = [" mld_melding_key = " + mld_key];
-            var mldUpd = buildTrackingUpdate("mld_melding", wheres.join(" AND " ), dbfields, { noValidateToken: true });
+                var dbfields = api2.update_fields(params, this, jsondata); // Build updater
+                _analyze_fields(dbfields, params, jsondata);
+                _validate_fields(dbfields, params, jsondata);
 
-            var err = Oracle.Execute(mldUpd.sql, true);
-            if (err.friendlyMsg)
-                abort_with_warning(err.friendlyMsg);
+                var wheres = [" mld_melding_key = " + mld_key];
+                var mldUpd = buildTrackingUpdate("mld_melding", wheres.join(" AND " ), dbfields, { noValidateToken: true });
+
+                var err = Oracle.Execute(mldUpd.sql, true);
+                if (err.friendlyMsg)
+                    abort_with_warning(err.friendlyMsg);
+            }
 
             var mldtrack = api2.process_includes(params, this, jsondata, mld_key);
 
-            shared.trackaction("MLDUPD",
-                               mld_key,
-                               L("lcl_mld_is_mldupdtrack").format(mld_key) + (mldUpd.trackarray.length > 0? "\n" : "") + mldUpd.trackarray.join("\n"));
+            if (mldUpd.trackarray.length)
+            {
+                shared.trackaction("MLDUPD",
+                                   mld_key,
+                                   L("lcl_mld_is_mldupdtrack").format(mld_key) + (mldUpd.trackarray.length > 0? "\n" : "") + mldUpd.trackarray.join("\n"));
+            }
 
             if (jsondata.status > 0)
                mld.setmeldingstatus(mld_key, jsondata.status, "");
@@ -440,6 +457,10 @@ function model_issues(mld_key, params)
                 api2.error(500, "Account could not be validated");
             }
             jsondata.account = kpkey;
+            if (!jsondata.issuedate)
+                jsondata.issuedate = new Date();
+            if (!jsondata.priority)
+                jsondata.priority = 3;
 
             //
             if (!jsondata.contact) jsondata.contact = user_key; // Als er geen aanvrager opgegeven is, dan de huidige gebruiker invullen.
@@ -450,7 +471,7 @@ function model_issues(mld_key, params)
             }
 
             params.isNew = true;
-            _pre_analyze_fields(params, jsondata);
+            params = _pre_analyze_fields(params, jsondata);
 
             var this_mld = mld.func_enabled_mld(stdm_info.ins_discipline_key, "D");
             user.auth_required_or_abort(this_mld.canFEwrite || this_mld.canFOwrite);
@@ -459,16 +480,19 @@ function model_issues(mld_key, params)
             _analyze_fields(dbfields, params, jsondata);
             _validate_fields(dbfields, params, jsondata);
 
-            dbfields["alg"] =    { dbs: "mld_alg_onroerendgoed_keys", typ: "key",     val: (params.data.alg_onroerendgoed_keys==-1 ? null : params.data.alg_onroerendgoed_keys) };
-            dbfields["origin"] = { dbs: "mld_meldbron_key",           typ: "key",     val: S("mld_meldbron_key") };
-            dbfields["module"] = { dbs: "mld_melding_module",         typ: "varchar", val: "MLD" };
-            dbfields["issue"] =  { dbs: "mld_melding_key",            typ: "key",     seq: "mld_s_mld_melding_key" };
+            dbfields["alg"] =       { dbs: "mld_alg_onroerendgoed_keys", typ: "datetime", val: params.data.alg_onroerendgoed_keys == -1 ? null : params.data.alg_onroerendgoed_keys };
+            dbfields["origin"] =    { dbs: "mld_meldbron_key",           typ: "key",      val: jsondata.origin? jsondata.origin : S("mld_meldbron_key") };
+            dbfields["module"] =    { dbs: "mld_melding_module",         typ: "varchar",  val: "MLD" };
+            dbfields["issue"] =     { dbs: "mld_melding_key",            typ: "key",      seq: "mld_s_mld_melding_key" };
 
             var mldIns = buildInsert("mld_melding", dbfields, { noValidateToken: true });
             var new_key = mldIns.sequences["mld_melding_key"];
             var sql = mldIns.sql;
             Oracle.Execute(mldIns.sql);
 
+            params.filter = { id: new_key }; // De nieuwe mld_melding_key.
+            var mldtrack = api2.process_includes(params, this, jsondata, new_key);
+
             mld.setmeldingstatus(new_key, (stdm.xmld_directklaar? 0 : 2)); // Zorgt ook voor tracking & daarmee notificatie
 
             if (stdm_info.xis_kto_answer) // die direct afmelden

APPL/API2/model_issuetypes.inc

@@ -1,4 +1,10 @@
 <% /*
+
+    =============================================================
+    LET OP: Dit bestand moet nog vervallen omdat we tegenwoordig
+            model_mld_stdmelding.inc hebben die veel completer is
+    =============================================================
+
     $Revision$
     $Id$
 
@@ -104,7 +110,6 @@ function model_issuetypes(stdm_key, params)
         if (!xxx_array.length)
             shared.record_not_found();
         this.data = xxx_array[0];
-        this.data.discipline = new model_mld_discipline("MLD", this.data.discipline.id);
     }
 }
 

APPL/API2/model_locations.inc

@@ -14,7 +14,6 @@
 %>
 <!-- #include file="../Shared/discxalg3d.inc"-->
 <!-- #include file="./model_custom_fields.inc"-->
-<!-- #include file="../mgt/mgt_tools.inc" -->
 <!-- #include file="./model_alg_kenmerk.inc"-->
 <%
 function model_alg_locatie()

APPL/API2/model_mld_dienstniveau.inc

@@ -52,11 +52,12 @@ function model_mld_dienstniveau()
     this.includes = {
         "dienstpakket": {
             "model": new model_mld_dienstpakket(),
-            "joinfield": "level"
+            "joinfield": "level",
+            "enable_update": true,
+            "multiadd": "issuetype"
         }
     };
 
-
     this.REST_GET    = generic_REST_GET(this);
     this.REST_POST   = generic_REST_POST(this);
     this.REST_PUT    = generic_REST_PUT(this);

APPL/API2/model_mld_dienstpakket.inc

@@ -30,7 +30,7 @@ function model_mld_dienstpakket()
             "label": "Key",
             "typ": "key",
             "filter": "exact",
-            "seq": "mld_s_dienstniveau_key"
+            "seq": "mld_s_dienstpakket_key"
         },
         "level": {
             "dbs": "mld_dienstniveau_key",
@@ -40,7 +40,8 @@ function model_mld_dienstpakket()
                 "tbl": "mld_dienstniveau",
                 "key": "mld_dienstniveau_key",
                 "desc": "mld_dienstniveau_omschr"
-            }
+            },
+            "uniquewith": "issuetype"
         },
         "issuetype": {
             "dbs": "mld_stdmelding_key",
@@ -61,14 +62,16 @@ function model_mld_dienstpakket()
                 "key": "mld_stdmelding_key",
                 "desc": "full_description"
             },
-            "friendlyname": true
+            "friendlyname": true,
+            "uniquewith": "level"
         }
     };
 
     this.list = {
         "columns": [
             "id",
-            "issuetype"
+            "issuetype",
+            "level"
         ]
     };
 
@@ -78,6 +81,7 @@ function model_mld_dienstpakket()
 
 
     this.REST_GET    = generic_REST_GET(this);
+    this.REST_POST   = generic_REST_POST(this);
     this.REST_DELETE = generic_REST_DELETE(this);
     // POST: Er kan hier geen nieuwe dienstpakket toegevoegd worden. Deze ontstaan door bij standaardmeldingen dienstniveau's te koppelen
     //       Als je hier een stdmelding wilt kiezen, zou je eerst op vakgroep (discipline) moeten filteren. Anders wordt de lijst met stdmeldingen te lang.

APPL/API2/model_mld_disc_params.inc

@@ -123,31 +123,48 @@ model_mld_disc_params =
             "dbs": "mld_disc_params_factuurpct",
             "label": L("mld_discipline_marginpct"),
             "typ": "number",
-            "defaultvalue": 0
+            "defaultvalue": 0,
+            "multiedit": true
         },
         "invoicemargin": {
             "dbs": "mld_disc_params_factuurmarge",
             "label": L("mld_discipline_margin"),
             "iscurrency": true,
             "typ": "float",
-            "defaultvalue": 0
+            "defaultvalue": 0,
+            "multiedit": true
         },
         "invoicematchmode": {
             "dbs": "mld_disc_params_factmatchmode",
             "label": L("mld_discipline_match"),
             "typ": "number",
             "LOV": L("mld_discipline_matchLOV"),
-            "emptyoption": null
+            "emptyoption": null,
+            "multiedit": true
         },
         "invoiceapprove": {
             "dbs": "mld_disc_params_factuurappr",
             "label": L("mld_discipline_autofiat"),
-            "typ": "check0"
+            "typ": "check0",
+            "multiedit": true
         },
         "invoicebelow": {
             "dbs": "mld_disc_params_factuurgrens",
             "label": L("mld_discipline_belowfiat"),
-            "typ": "number"
+            "typ": "number",
+            "multiedit": true
+        },
+        "emailnew3": {
+            "dbs": "mld_disc_params_emailnw3",
+            "label": L("mld_discipline_emailnw3"),
+            "typ": "varchar",
+            "multiedit": true
+        },
+        "smsnew3": {
+            "dbs": "mld_disc_params_smsnw3",
+            "label": L("mld_discipline_smsnw3"),
+            "typ": "varchar",
+            "multiedit": true
         },
         "notifybo": {
             "dbs": "mld_disc_params_bonotify",

APPL/API2/model_mld_kenmerk.inc

@@ -4,19 +4,20 @@
 
     File:           model_mld_kenmerk.inc
 
-    Description:    Vanuit CodeCharge gegenereerd model voor mld_kenmerk
+    Description:    Model voor mld_kenmerk
 
     Context:
 
-    Notes:          LET OP: uitsluitend gebruikt voor opdracht kenmerken. Daar
-                    filteren we op en opdr_type is ook verplicht gemaakt.
-                    Melding kenmerken komen in dezelfde tabel maar die hebben
-                    eigen schermen via MLD\mld_kenmerk.asp
+    Notes:          Opdracht kenmerk definities worden ook aangemaakt via dit model
+                    Melding kenmerken definities komen in dezelfde tabel maar die hebben
+                    eigen bewerk schermen via MLD\mld_kenmerk.asp
+                    *Oproepen* via de API gaat voor MLD wel door dit bestand
 */
 %>
+<!-- #include file="model_mld_srtkenmerk.inc"-->
 <%
 
-function model_mld_kenmerk(params)
+function model_mld_kenmerk(niveau, params)
 {
     params = params || {};
     this.records_name = "issueproperties";
@@ -45,7 +46,7 @@ function model_mld_kenmerk(params)
             "typ": "varchar",
             "required": true,
             "hidden_fld": true,
-            "defaultvalue": "O"
+            "defaultvalue": "O" // omdat we MLD toch nog niet bewerken via dit bestand
         },
         "issuepropertytype": {
             "dbs": "mld_srtkenmerk_key",
@@ -78,7 +79,7 @@ function model_mld_kenmerk(params)
                 "key": "mld_typeopdr_key",
                 "desc": "mld_typeopdr_omschrijving"
             },
-            "required": true,
+            "required": true, // omdat we MLD toch nog niet bewerken via dit bestand
             "defaultvalue": null
         },
         "sequence": {
@@ -126,7 +127,7 @@ function model_mld_kenmerk(params)
             "typ": "memo",
             "translate": true
         },
-        "call": {
+        "issuetype": {
             "dbs": "mld_stdmelding_key",
             "label": L("mld_stdmelding_key"),
             "typ": "key",
@@ -158,22 +159,28 @@ function model_mld_kenmerk(params)
         }
     };
 
+    this.getPropertyType = function (kenmerkdata)
+    {
+        var typedata = api2.GET(new model_mld_srtkenmerk({internal: params.internal}), kenmerkdata.issuepropertytype.id);
+        return typedata;
+    }
 
     this.hook_pre_edit = function (obj, fld)
     {
     %>
-    <script type="text/javascript">
+    <script>
       var module = "MLD";
     </script>
     <%
     }
 
+    var gparams = {"GET": {}};
+    if (niveau == 'O')
+        gparams.GET = { wheres: [ "mld_kenmerk.mld_kenmerk_niveau = 'O'" ] };
+    else
+        gparams.GET = { wheres: [ "mld_kenmerk.mld_kenmerk_niveau IN ('T','D','S')" ] };
 
-    this.REST_GET    = generic_REST_GET(this, {
-        "GET": {
-            "wheres": ["mld_kenmerk_niveau = 'O'"]
-        }
-    });
+    this.REST_GET    = generic_REST_GET(this, gparams);
     this.REST_POST   = generic_REST_POST(this);
     this.REST_PUT    = generic_REST_PUT(this);
     this.REST_DELETE = generic_REST_DELETE(this);

APPL/API2/model_mld_opdr.inc

@@ -11,8 +11,10 @@
     Notes:
 */
 %>
-<!-- #include file="../mgt/mgt_tools.inc" -->
 <!-- #include file="../api2/model_fin_factuur.inc" -->
+<!-- #include file="./model_custom_fields.inc"-->
+<!-- #include file="./model_mld_kenmerk.inc"-->
+<!-- #include file="../bgt/bgt_tools.inc" -->
 <%
 
 function model_mld_opdr()
@@ -21,11 +23,15 @@ function model_mld_opdr()
     this.record_name = "order";
     this.table = "mld_opdr";
     this.primary = "mld_opdr_key";
-    this.autfunction = "WEB_BGTORD";
+    this.autfunction = S("bgt_enabled")==1?"WEB_BGTORD":"WEB_ORDBOF";
     this.record_title = L("lcl_fin_mld_opdr");
     this.records_title = L("lcl_fin_opdrachten");
 
-    this.fields = {
+    var fields_main_1 = {};
+    var fields_main_2 = {};
+    var fields_bgt_1 = {};
+
+    fields_main_1 = {
         "id": {
             "dbs": "mld_opdr_key",
             "label": L("lcl_key"),
@@ -34,73 +40,91 @@ function model_mld_opdr()
             "required": true,
             "filter": "exact",
             "seq": "mld_s_mld_opdr_key"
-        },
-        "budgetdiscipline": {
-            "dbs": "bgt_project.ins_discipline_key",
-            "label": L("bgt_discipline_omschrijving"),
-            "typ": "key",
-            "required": true,
-            "foreign": bgt_budgetdiscipline_foreign(),
-            "emptyoption": null
-        },
-        "budgetproject": {
-            "dbs": "bgt_project.bgt_project_key",
-            "label": L("bgt_project_omschrijving"),
-            "typ": "key",
-            "foreign": bgt_budgetproject_foreign()
-        },
-        "budgetcostcategory": {
-            "dbs": "bgt_kostenrubriek.bgt_kostenrubriek_key",
-            "label": L("bgt_kostenrubriek_oms"),
-            "typ": "key",
-            "foreign": bgt_budgetcostcategory_foreign()
-        },
-        "costtypegroup": {
-            "dbs": "prs_kostensoortgrp.prs_kostensoortgrp_key",
-            "label": L("prs_kostensoortgrp_key"),
-            "typ": "key",
-            "foreign": bgt_costtypegroup_foreign()
-        },
-        "costtype": {
-            "dbs": "prs_kostensoort_key",
-            "label": L("prs_kostensoort_key"),
-            "typ": "key",
-            "foreign": bgt_costtype_foreign()
-        },
+        }
+    };
+
+    if (S("bgt_enabled"))
+    {
+        fields_bgt_1 = {
+            "budgetdiscipline": {
+                "dbs": "bgt_project.ins_discipline_key",
+                "label": L("bgt_discipline_omschrijving"),
+                "typ": "key",
+                "required": true,
+                "foreign": bgt_budgetdiscipline_foreign(),
+                "showtransit": true
+            },
+            "budgetproject": {
+                "dbs": "bgt_project.bgt_project_key",
+                "label": L("bgt_project_omschrijving"),
+                "typ": "key",
+                "required": true,
+                "foreign": bgt_budgetproject_foreign(),
+                "showtransit": true
+            },
+            "budgetcostcategory": {
+                "dbs": "bgt_kostenrubriek.bgt_kostenrubriek_key",
+                "label": L("bgt_kostenrubriek_oms"),
+                "typ": "key",
+                "required": true,
+                "foreign": bgt_budgetcostcategory_foreign(),
+                "showtransit": true
+            },
+            "costtypegroup": {
+                "dbs": "prs_kostensoortgrp.prs_kostensoortgrp_key",
+                "label": L("prs_kostensoortgrp_key"),
+                "typ": "key",
+                "required": true,
+                "foreign": bgt_costtypegroup_foreign(),
+                "showtransit": true
+            },
+            "costtype": {
+                "dbs": "prs_kostensoort_key",
+                "label": L("prs_kostensoort_key"),
+                "typ": "key",
+                "required": true,
+                "foreign": bgt_costtype_foreign(),
+                "showtransit": true
+            }
+        };
+    }
+
+    fields_main_2 = {
         "company": {
             "dbs": "mld_uitvoerende_keys",
             "label": L("lcl_ord_company"),
             "typ": "key",
-            "foreign": {
-                "tbl": "prs_bedrijf",
-                "key": "prs_bedrijf_key",
-                "desc": "prs_bedrijf_naam"
-            }
+            "foreign": bgt_company_foreign()
         },
         "reference": {
             "dbs": "mld_opdr_id",
             "label": L("lcl_opdr_id"),
             "typ": "varchar"
+        },
+         "ordernr_sort": {
+            "dbs": "mld_opdr_ordernr_int",
+            "label": L("bgt_opdr_ordernr"),
+            "sql": "fac.safe_to_number(mld_opdr_ordernr)",
+            "typ": "number",
+            "readonly": true
         },
         "ordernr": {
             "dbs": "mld_opdr_ordernr",
             "label": L("bgt_opdr_ordernr"),
-            "typ": "varchar"
+            "typ": "varchar",
+            "hidden_fld": true
         },
         "sequence": {
             "dbs": "mld_opdr_bedrijfopdr_volgnr",
             "label": L("lcl_ins_volgnr"),
-            "typ": "number"
+            "typ": "number",
+            "defaultvalue": 0
         },
         "account": {
             "dbs": "prs_kostenplaats_key",
             "label": L("bgt_budget_account"),
             "typ": "key",
-            "foreign": {
-                "tbl": "prs_kostenplaats",
-                "key": "prs_kostenplaats_key",
-                "desc": "prs_kostenplaats_nr"
-            }
+            "foreign": bgt_account_foreign()
         },
         "description": {
             "dbs": "mld_opdr_omschrijving",
@@ -112,6 +136,26 @@ function model_mld_opdr()
             "label": L("bgt_contractdatum"),
             "typ": "date"
         },
+        "estimate": {
+            "dbs": "estimate",
+            "sql": "(BGT.getRaming(mld_opdr.mld_opdr_key, 0, NULL, NULL))",
+            "sqlshow": true,
+            "hidden_fld": true,
+            "label": "Raming",
+            "typ": "float",
+            "iscurrency": true,
+            "total": true
+        },
+        "contracted": {
+            "dbs": "contracted",
+            "sql": "(BGT.getGecontracteerd(mld_opdr.mld_opdr_key, 0, NULL, NULL))",
+            "sqlshow": true,
+            "hidden_fld": true,
+            "label": L("bgt_gecontracteerd"),
+            "typ": "float",
+            "iscurrency": true,
+            "total": true
+        },
         "amount": {
             "dbs": "mld_opdr_kosten",
             "label": L("bgt_gecontracteerd"),
@@ -126,11 +170,25 @@ function model_mld_opdr()
             "iscurrency": true,
             "total": true
         },
+        "amountincl": {
+            "dbs": "mld_opdr_kosten_incl",
+            "sql": "mld_opdr_kosten + mld_opdr_kosten_btw",
+            "label": L("lcl_fin_total_sum"),
+            "typ": "float",
+            "readonly": true,
+            "sqlshow": true,
+            "iscurrency": true,
+            "total": true,
+            "defaultvalue": "0",
+            "clone": false
+        },
         "invoiced": {
             "dbs": "mld_opdr_gefactureerd",
             "sql": "(BGT.getGefactureerd(mld_opdr.mld_opdr_key, 0, NULL, NULL))",
             "label": L("bgt_facturen"),
             "typ": "float",
+            "readonly": true,
+            "sqlshow": true,
             "iscurrency": true,
             "total": true
         },
@@ -139,6 +197,8 @@ function model_mld_opdr()
             "sql": "(BGT.getTefactureren(mld_opdr.mld_opdr_key, 0, NULL, NULL))",
             "label": L("bgt_facturentogo"),
             "typ": "float",
+            "readonly": true,
+            "sqlshow": true,
             "iscurrency": true,
             "total": true
         },
@@ -174,40 +234,577 @@ function model_mld_opdr()
             "dbs": "mld_opdr_meerwerk",
             "label": L("lcl_mld_opdr_meerwerk"),
             "typ": "check0",
-            "defaultvalue": "0",
+            "defaultvalue": 0,
             "filter": "exact"
+        },
+        "remark": {
+            "dbs": "mld_opdr_opmerking",
+            "label": L("lcl_remark"),
+            "typ": "memo"
+        },
+        "_is_clone": {
+            "dbs": "",
+            "label": "Is kopie",
+            "typ": "number",
+            "defaultvalue": 0,
+            "hidden_fld": true
         }
     };
 
-    this.includes = {
-        "invoices": {
-            "model": new model_fin_factuur(),
-            "joinfield": "order",
-            "enable_update": true
+    this.fields = object_merge({}, fields_main_1, (S("bgt_enabled") ? fields_bgt_1 : {}), fields_main_2);
+
+
+
+    this.includes= {
+                    "custom_fields" : {
+                        "model": new model_custom_fields(this, new model_mld_kenmerk('O', { internal: true }), { pNiveau: "O" }),
+                        "joinfield": "flexparentkey",
+                        "enable_update": true
+                    }
+                   }
+
+    this.hook_pre_edit = function (obj, fld, scf_params)
+    {
+        obj._is_clone = getQParamInt("scf_clone", 0);
+        var mld_opdr_id = (obj._is_clone == 1 ? getQParamInt("id", -1) : obj.id);
+        var btw_data = {};
+        if (obj.id > -1 || obj.ordernr_sort)
+        {
+            fld.ordernr.hidden_fld = false;
+            fld.ordernr.readonly = true;
         }
-    };
 
-    var gparams = {
-        GET: {
-            tables: [
-                "prs_kostensoort",
-                "prs_kostensoortgrp",
-                "bgt_kostenrubriek",
-                "bgt_project"
-            ],
-            wheres: [
-                "mld_opdr.prs_kostensoort_key = prs_kostensoort.prs_kostensoort_key",
-                "prs_kostensoort.prs_kostensoortgrp_key = prs_kostensoortgrp.prs_kostensoortgrp_key",
-                "prs_kostensoortgrp.bgt_kostenrubriek_key = bgt_kostenrubriek.bgt_kostenrubriek_key",
-                "bgt_kostenrubriek.bgt_project_key = bgt_project.bgt_project_key"
-            ]
+        if (mld_opdr_id > -1)
+        {
+            var sql = "SELECT s.prs_kostensoort_btw"
+                    + "     , f.fin_btwtabelwaarde_perc"
+                    + "  FROM mld_opdr o"
+                    + "     , prs_kostensoort s"
+                    + "     , fin_btwtabelwaarde f"
+                    + " WHERE s.fin_btwtabelwaarde_key = f.fin_btwtabelwaarde_key"
+                    + "   AND o.prs_kostensoort_key = s.prs_kostensoort_key"
+                    + "   AND o.mld_opdr_key = " + mld_opdr_id;
+            var oRs = Oracle.Execute(sql);
+            if (!oRs.eof)
+            {
+                btw_data.btw_inc = oRs("prs_kostensoort_btw").Value;
+                btw_data.btw_val = oRs("fin_btwtabelwaarde_perc").Value || "0";
+            }
+            oRs.Close();
+
+/*
+#TWYN#53173
+De bestaande knop "Kopi<70>ren" is komen te vervallen. Daarvoor in de plaats zijn twee nieuwe knoppen toegevoegd: "Nieuwe opdracht" en "nieuwe subopdracht".
+Bij een nieuwe subopdracht is het opdrachtnummer gelijk aan die van de opdracht van waaruit gekopieerd wordt en is niet te wijzigen. Het volgnummer staat standaard op volgnr(max+1).
+            if (obj._is_clone == 2))  // nieuw subcontract: bepaal hoogste volgnummer bij dit contract, en vul deze alvast in.
+            {
+                var sql = "SELECT COALESCE(MAX(s.mld_opdr_bedrijfopdr_volgnr), 0) + 1 volgnr"
+                        + "  FROM mld_opdr s"
+                        + " WHERE s.mld_opdr_ordernr ="
+                        + "  (SELECT m.mld_opdr_ordernr"
+                        + "     FROM mld_opdr m"
+                        + "    WHERE m. mld_opdr_key = " + mld_opdr_id
+                        + "  )";
+                var oRs = Oracle.Execute(sql);
+                obj.sequence = oRs("volgnr").Value;
+                oRs.Close();
+            }
+*/
         }
-    };
+
+        %>
+        <script type="text/javascript">
+            var btw_data = <%=JSON.stringify(btw_data)%>;
+            <% if (obj.budgetdiscipline)   { %> var budgetdiscipline   = "<%=obj.budgetdiscipline.id%>";   <% } %>
+            <% if (obj.budgetproject)      { %> var budgetproject      = "<%=obj.budgetproject.id%>";      <% } %>
+            <% if (obj.budgetcostcategory) { %> var budgetcostcategory = "<%=obj.budgetcostcategory.id%>"; <% } %>
+            <% if (obj.costtypegroup)      { %> var costtypegroup      = "<%=obj.costtypegroup.id%>";      <% } %>
+            <% if (obj.costtype)           { %> var costtype           = "<%=obj.costtype.id%>";           <% } %>
+        </script>
+        <%
+    }
+
+    this.hook_pre_post = function(params, obj)
+    {
+        var isclone = (obj._is_clone == 1);
+        if (!obj.sequence && obj.sequence!=0)
+            abort_with_warning("Vul een volgnummer voor het contract in.");
+
+        var v_costtype = (typeof obj.costtype == "object" ? obj.costtype.id : obj.costtype);
+        checkAanwezigBudget(v_costtype);
+
+/*
+TWYN#53173  : waarschijnlijk pas met 2018.1
+obj._is_clone=1 --> nieuwe (hoofd) opdracht
+obj._is_clone=2 --> nieuwe sub-opdracht
+*/
+        if (isclone)  // Bij kopie van opdracht geen nieuw nummer genereren.
+        {
+            var v_project_key = (typeof obj.budgetproject == "object" ? obj.budgetproject.id : obj.budgetproject);
+            // Vul het contractnummer van het oorspronkelijke contract in.
+            var parent_key = getQParamInt("id", -1);
+            var sql = "SELECT o.mld_opdr_ordernr"
+                    + "  FROM mld_opdr o"
+                    + " WHERE o.mld_opdr_key = " + parent_key;
+            var oRs = Oracle.Execute(sql);
+            obj.ordernr = oRs("mld_opdr_ordernr").Value;
+            oRs.Close();
+            // Kopie contract. Volgnummer moet uniek zijn binnen dit contractnummer.
+            checkUniekContractnummer(-1, v_project_key, obj.ordernr, obj.sequence);
+        }
+        else
+        {
+            // Genereer een uniek volgnummer binnen het project voor een nieuwe opdracht.
+            var prj_key = (obj.budgetproject ? obj.budgetproject : project_key);
+            var sql = "SELECT COALESCE(MAX(TO_NUMBER(o.mld_opdr_ordernr)), 0) + 1 new_ordernr"
+                    + "  FROM bgt_project p"
+                    + "     , bgt_kostenrubriek r"
+                    + "     , prs_kostensoortgrp g"
+                    + "     , prs_kostensoort s"
+                    + "     , mld_opdr o"
+                    + " WHERE p.bgt_project_key = r.bgt_project_key"
+                    + "   AND r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+                    + "   AND g.prs_kostensoortgrp_key = s.prs_kostensoortgrp_key"
+                    + "   AND s.prs_kostensoort_key = o.prs_kostensoort_key"
+                    + "   AND p.bgt_project_key = " + prj_key;
+            var oRs = Oracle.Execute(sql);
+            obj.ordernr = oRs("new_ordernr").Value;
+            oRs.Close();
+            // Nieuw contract, dus volgnummer is altijd uniek hierbinnen.
+        }
+
+        var v_budget = getBudget(v_costtype);
+        if (obj.additional == 0)
+        {
+            var v_datamutatie = checkBudgetoverschrijding(obj.id, v_budget, obj.amount, obj.vat);
+            insertMutatie( v_datamutatie, "AO" );
+        }
+        else
+        {
+            insertMutatie( { budget_res_key: v_budget.budget_res_key
+                           , bedrag_exc: -1 * obj.amount
+                           , bedrag_btw: -1 * obj.vat
+                           , budget_srt_key: v_budget.budget_srt_key
+                           }
+                         , "MW"
+                         );
+        }
+    }
+
+    this.hook_pre_put = function(params, obj, key)
+    {
+        // Is de combinatie opdrachtnummer/volgnummer nog steeds uniek?
+        var sql = "SELECT p.bgt_project_key"
+                + "     , o.prs_kostensoort_key"
+                + "     , o.mld_opdr_ordernr"
+                + "     , o.mld_opdr_meerwerk"
+                + "     , o.mld_opdr_kosten"
+                + "     , o.mld_opdr_kosten_btw"
+                + "  FROM bgt_project p"
+                + "     , bgt_kostenrubriek r"
+                + "     , prs_kostensoortgrp g"
+                + "     , prs_kostensoort s"
+                + "     , mld_opdr o"
+                + " WHERE p.bgt_project_key = r.bgt_project_key"
+                + "   AND r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+                + "   AND g.prs_kostensoortgrp_key = s.prs_kostensoortgrp_key"
+                + "   AND s.prs_kostensoort_key = o.prs_kostensoort_key"
+                + "   AND o.mld_opdr_key = " + key;
+        var oRs = Oracle.Execute(sql);
+        var v_ordernr = oRs("mld_opdr_ordernr").Value;
+        var v_meerwerk = oRs("mld_opdr_meerwerk").Value;
+        var v_project_key = oRs("bgt_project_key").Value;
+        var v_cur_costtype_key = oRs("prs_kostensoort_key").Value;
+        var v_cur_bedrag = oRs("mld_opdr_kosten").Value;
+        var v_cur_btwbedrag = oRs("mld_opdr_kosten_btw").Value;
+        oRs.Close();
+        checkUniekContractnummer(key, v_project_key, v_ordernr, obj.sequence);
+
+        var v_costtype = (obj.costtype ? obj.costtype : v_cur_costtype_key);
+        checkAanwezigBudget(v_costtype);
+
+        // Budget bijwerken als gevolg van meer-minderwerk.
+        if (obj.additional == 1 || v_meerwerk == 1)
+        {
+            // Boek eerst het oude bedrag terug.
+            var v_budget_old = getBudget(v_cur_costtype_key);
+            insertMutatie( { budget_res_key: v_budget_old.budget_res_key
+                           , budget_srt_key: v_budget_old.budget_srt_key
+                           , bedrag_exc: v_cur_bedrag
+                           , bedrag_btw: v_cur_btwbedrag
+                           }
+                         , "MW"
+                         );
+            if (obj.additional == 1)
+            {
+                // Boek het nieuwe bedrag naar het (nieuwe) kostensoort.
+                var v_budget_new = getBudget(v_costtype);
+                insertMutatie( { budget_res_key: v_budget_new.budget_res_key
+                               , budget_srt_key: v_budget_new.budget_srt_key
+                               , bedrag_exc: -1 * obj.amount
+                               , bedrag_btw: -1 * obj.vat
+                               }
+                             , "MW"
+                             );
+            }
+
+        }
+
+        // Controle op overschrijden van budget.
+        if (obj.additional == 0)
+        {
+            if (v_cur_costtype_key != v_costtype)
+            {   // Heeft dit contract ook nog subcontracten
+/*
+                var sql = "SELECT COUNT(*) aantal"
+                        + "       so.mld_opdr_key"
+                        + "     , so.prs_kostensoort_key"
+                        + "     , so.mld_opdr_kosten"
+                        + "     , so.mld_opdr_kosten_btw"
+                        + "  FROM mld_opdr co"
+                        + "     , mld_opdr so"
+                        + "     , bgt_v_project_full cp"
+                        + "     , bgt_v_project_full sp"
+                        + " WHERE co.prs_kostensoort_key = cp.prs_kostensoort_key"
+                        + "   AND so.prs_kostensoort_key = sp.prs_kostensoort_key"
+                        + "   AND co.mld_opdr_ordernr = so.mld_opdr_ordernr"
+                        + "   AND cp.bgt_project_key = sp.bgt_project_key"
+                        + "   AND co.mld_opdr_key = " + key;
+                var oRs = Oracle.Execute(sql);
+                while (!oRs.eof)
+                {
+                    var v_cur_opdr_key = oRs("mld_opdr_key").Value;
+                    //
+                    var v_opdr_exc = 0;
+                    var v_opdr_btw = 0;
+                    var v_budget = getBudget(v_cur_costtype_key);
+                    var v_datamutatie = checkBudgetoverschrijding(v_cur_opdr_key, v_budget, v_opdr_exc, v_opdr_btw);  // contractbedrag van deze kostensoort verwijderen
+                    insertMutatie( v_datamutatie, "AO" );
+                    //
+                    v_opdr_exc = (v_cur_opdr_key == key ? obj.amount : oRs("mld_opdr_kosten").Value);
+                    v_opdr_btw = (v_cur_opdr_key == key ? obj.vat : oRs("mld_opdr_kosten_btw").Value);
+                    v_budget = getBudget(v_costtype);
+                    v_datamutatie = checkBudgetoverschrijding(-1, v_budget, v_opdr_exc, v_opdr_btw); // (aangepast) bedrag aan nieuwe kostensoort toevoegen
+                    insertMutatie( v_datamutatie, "AO" );
+                    //
+                    // facturen krijgen ook nieuwe kostensoort.
+                    var sql = "UPDATE fin_factuur"
+                            + "   SET prs_kostensoort_key = " + v_costtype
+                            + " WHERE mld_opdr_key = " + v_cur_opdr_key;
+                    Oracle.Execute(sql);
+                    //
+                    oRs.MoveNext();
+                }
+                oRs.Close();
+*/
+/* dit is het originele stuk voor alleen het huidige contract */
+
+                // contract verplaatsen naar ander kostensoort
+                var v_budget_old = getBudget(v_cur_costtype_key);
+                var v_datamutatie = checkBudgetoverschrijding(obj.id, v_budget_old, 0, 0);            // bedrag van deze kostensoort verwijderen
+                insertMutatie( v_datamutatie, "AO" );
+                var v_budget_new = getBudget(v_costtype);
+                var v_datamutatie = checkBudgetoverschrijding(-1, v_budget_new, obj.amount, obj.vat); // (aangepast) bedrag aan nieuwe kostensoort toevoegen
+                insertMutatie( v_datamutatie, "AO" );
+                // facturen krijgen ook nieuwe kostensoort.
+                var sql = "UPDATE fin_factuur"
+                        + "   SET prs_kostensoort_key = " + v_costtype
+                        + " WHERE mld_opdr_key = " + key;
+                Oracle.Execute(sql);
+
+/*   einde  */
+            }
+            else
+            {
+                var v_budget_new = getBudget(v_costtype);
+                var v_datamutatie = checkBudgetoverschrijding(obj.id, v_budget_new, obj.amount, obj.vat);
+                insertMutatie( v_datamutatie, "AO" );
+            }
+        }
+    }
+
+    this.hook_pre_delete = function(params, key)
+    {
+        var sql = "SELECT MAX(o.prs_kostensoort_key) kostensoort"
+                + "     , MAX(o.mld_opdr_meerwerk)   meerwerk"
+                + "     , MAX(mld_opdr_kosten)       contract_exc"
+                + "     , MAX(mld_opdr_kosten_btw)   contract_btw"
+                + "     , COUNT(f.fin_factuur_key)   aantal"
+                + "  FROM mld_opdr    o"
+                + "     , fin_factuur f"
+                + " WHERE o.mld_opdr_key = f.mld_opdr_key(+)"
+                + "   AND o.mld_opdr_key = " + key;
+        var oRs = Oracle.Execute(sql);
+        var aantal_facturen = oRs("aantal").Value;
+        var prs_kostensoort = oRs("kostensoort").Value;
+        var meerwerk = oRs("meerwerk").Value == 1;
+        var contract_exc = oRs("contract_exc").Value;
+        var contract_btw = oRs("contract_btw").Value;
+        oRs.Close();
+        if (aantal_facturen > 0)
+            abort_with_warning("Verwijder eerst de facturen bij dit contract.");
+
+        // Eerst proberen of er automatisch terug geboekt moet worden door bedrag te muteren naar 0.
+        var v_budget_old = getBudget(prs_kostensoort);
+        if (meerwerk)
+        {
+            insertMutatie( { budget_res_key: v_budget_old.budget_res_key
+                           , bedrag_exc: contract_exc
+                           , bedrag_btw: contract_btw
+                           , budget_srt_key: v_budget_old.budget_srt_key
+                           }
+                         , "MW"
+                         );
+        }
+        else
+        {
+            var v_datamutatie = checkBudgetoverschrijding(key, v_budget_old, 0, 0);
+            insertMutatie( v_datamutatie, "AO" );
+        }
+    }
 
 
-    this.REST_GET    = generic_REST_GET(this, gparams);
-    this.REST_POST   = generic_REST_POST(this);
-    this.REST_PUT    = generic_REST_PUT(this);
-    this.REST_DELETE = generic_REST_DELETE(this);
+    var gparams = {};
+    if (S("bgt_enabled") == 1)
+    {
+        gparams = {
+            GET: {
+                tables: [
+                    "prs_kostensoort",
+                    "prs_kostensoortgrp",
+                    "bgt_kostenrubriek",
+                    "bgt_project"
+                ],
+                wheres: [
+                    "mld_opdr.prs_kostensoort_key = prs_kostensoort.prs_kostensoort_key",
+                    "prs_kostensoort.prs_kostensoortgrp_key = prs_kostensoortgrp.prs_kostensoortgrp_key",
+                    "prs_kostensoortgrp.bgt_kostenrubriek_key = bgt_kostenrubriek.bgt_kostenrubriek_key",
+                    "bgt_kostenrubriek.bgt_project_key = bgt_project.bgt_project_key"
+                ]
+            }
+        };
+
+        var v_budgetdiscipline = getQParamInt("budgetdiscipline", -1);
+        if (v_budgetdiscipline == -1)
+        {
+            gparams.GET.tables.push("ins_tab_discipline");
+            gparams.GET.wheres.push("bgt_project.ins_discipline_key = ins_tab_discipline.ins_discipline_key");
+            gparams.GET.wheres.push(
+                    "bgt_project.ins_discipline_key IN"
+                    + " (SELECT w.ins_discipline_key"
+                    + "    FROM fac_v_webgebruiker w"
+                    + "       , ins_tab_discipline d"
+                    + "   WHERE w.ins_discipline_key = d.ins_discipline_key"
+                    + "     AND w.prs_perslid_key = " + user_key
+                    + "     AND (w.fac_gebruiker_prs_level_read<9 OR w.fac_gebruiker_alg_level_read<9)"
+                    + "     AND d.ins_discipline_module = 'BGT'"
+                    + "     AND d.ins_discipline_verwijder IS NULL"
+                    + " )"
+            );
+        }
+    }
+
+    function getBudget(data_costtype)
+    {
+        var sql = "SELECT MAX(b.bgt_budget_key)  budget_s"
+                + "     , MAX(c.bgt_budget_key)  budget_r"
+                + "     , MAX(COALESCE(b.bgt_budget_bedrag, 0)) budget_exc"
+                + "     , MAX(COALESCE(b.bgt_budget_btwbedrag, 0)) budget_btw"
+                + "  FROM bgt_budget b"
+                + "     , bgt_budgetmutatie m"
+                + "     , (SELECT r.bgt_project_key"
+                      + "       , bgt_budget_key"
+                      + "    FROM bgt_budget r"
+                      + "    WHERE r.bgt_budget_isreserve = 1"
+                      + " ) c"
+                + " WHERE b.bgt_project_key = c.bgt_project_key(+)"
+                + "   AND b.prs_kostensoort_key = " + data_costtype;
+        var oRs = Oracle.Execute(sql);
+        var budget_key_res = oRs("budget_r").Value;
+        var budget_key_srt = oRs("budget_s").Value;
+        var budget_exc     = oRs("budget_exc").Value;
+        var budget_btw     = oRs("budget_btw").Value;
+        oRs.Close();
+        if (budget_key_res == null)
+            abort_with_warning("Er is geen budget met kenmerk 'reserve' aanwezig voor dit project");
+        else
+            return { budget_res_key: budget_key_res
+                   , budget_srt_key: budget_key_srt
+                   , costtype_key: data_costtype
+                   , bedrag_exc: budget_exc
+                   , bedrag_btw: budget_btw
+                   };
+    }
+
+    function checkUniekContractnummer(p_contract_key, p_project_key, p_contractnr, p_volgnr)
+    {
+            var sql = "SELECT count(*) aantal"
+                    + "  FROM bgt_project p"
+                    + "     , bgt_kostenrubriek r"
+                    + "     , prs_kostensoortgrp g"
+                    + "     , prs_kostensoort s"
+                    + "     , mld_opdr o"
+                    + " WHERE p.bgt_project_key = r.bgt_project_key"
+                    + "   AND r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+                    + "   AND g.prs_kostensoortgrp_key = s.prs_kostensoortgrp_key"
+                    + "   AND s.prs_kostensoort_key = o.prs_kostensoort_key"
+                    + "   AND p.bgt_project_key = " + p_project_key
+                    + "   AND o.mld_opdr_ordernr = " + safe.quoted_sql(p_contractnr)
+                    + "   AND o.mld_opdr_bedrijfopdr_volgnr = " + p_volgnr
+                    + (p_contract_key != -1 ? "   AND o.mld_opdr_key <> " + p_contract_key : "");
+            var oRs = Oracle.Execute(sql);
+            var uniek_contractnr = (oRs("aantal").Value == 0);
+            oRs.Close();
+            if (!uniek_contractnr)
+                abort_with_warning("Contractnummer {0}.{1} bestaat al in dit project.".format(p_contractnr, p_volgnr));
+    }
+
+    function checkAanwezigBudget(p_kostensoort_key)
+    {
+        // kostensoort moet een budget hebben, anders mag er geen contract aan gekoppeld worden.
+        var sql = "SELECT count(*) aantal"
+                + "  FROM bgt_budget"
+                + " WHERE prs_kostensoort_key = " + p_kostensoort_key;
+        var oRs = Oracle.Execute(sql);
+        var heeft_budget = oRs("aantal").Value == 1;
+        oRs.Close();
+        if (!heeft_budget)
+            abort_with_warning("Maak eerst een budget aan voor deze kostensoort voordat er contracten aan gekoppeld worden.");
+    }
+
+    function checkBudgetoverschrijding(data_id, data_budget, data_amount, data_vat)
+    {
+        var amount_old_exc = 0;
+        var amount_old_btw = 0;
+        if (data_id > -1)
+        {
+            var sql = "SELECT COALESCE(t.mld_opdr_kosten, 0) amount_old_exc"
+                    + "     , COALESCE(t.mld_opdr_kosten_btw, 0) amount_old_btw"
+                    + "  FROM mld_opdr t"
+                    + " WHERE t.prs_kostensoort_key = " + data_budget.costtype_key
+                    + "   AND t.mld_opdr_key = " + data_id;
+            var oRs = Oracle.Execute(sql);
+            amount_old_exc = oRs("amount_old_exc").Value;
+            amount_old_btw = oRs("amount_old_btw").Value;
+            oRs.Close();
+        }
+        var sql = "SELECT SUM(o.mld_opdr_kosten) amount_total_exc"
+                + "     , SUM(o.mld_opdr_kosten_btw) amount_total_btw"
+                + "  FROM mld_opdr o"
+                + " WHERE o.prs_kostensoort_key = " + data_budget.costtype_key;
+        var oRs = Oracle.Execute(sql);
+        var amount_sum_exc = oRs("amount_total_exc").Value;
+        var amount_sum_btw = oRs("amount_total_btw").Value;
+        oRs.Close();
+        var sql = "SELECT SUM(m1.bgt_budget_bedrag_van) reserve_exc"
+                + "     , SUM(m1.bgt_budget_btwbedrag_van) reserve_btw"
+                + "  FROM bgt_budget b1"
+                + "     , bgt_budget b2"
+                + "     , bgt_budgetmutatie m1"
+                + " WHERE b2.bgt_budget_isreserve = 1"
+                + "   AND b1.bgt_project_key = b2.bgt_project_key"
+                + "   AND m1.bgt_budget_key_van = b2.bgt_budget_key"
+                + "   AND m1.bgt_budget_Key_naar = b1.bgt_budget_key"
+                + "   AND b1.prs_kostensoort_key = " + data_budget.costtype_key;
+        var oRs = Oracle.Execute(sql);
+        var reserve_exc = oRs("reserve_exc").Value;
+        var reserve_btw = oRs("reserve_btw").Value;
+        oRs.Close();
+        //
+        var bedrag_exc = 0;
+        var bedrag_btw = 0;
+
+        if (amount_old_exc < data_amount)
+        {
+            // verhoging contractwaarde exc
+            var overschot_exc = data_budget.bedrag_exc - amount_sum_exc - (data_amount - amount_old_exc);
+            bedrag_exc = (overschot_exc < 0 ? overschot_exc : 0);
+        }
+        else
+        {
+            // verlaging contractwaarde exc
+            var overschot_exc = reserve_exc - (data_amount - amount_old_exc);
+            bedrag_exc = -1 * (overschot_exc > 0 ? reserve_exc : (data_amount - amount_old_exc) );
+        }
+        //
+        if (amount_old_btw < data_vat)
+        {
+            // verhoging contractwaarde btw
+            var overschot_btw = data_budget.bedrag_btw - amount_sum_btw - (data_vat - amount_old_btw);
+            bedrag_btw = (overschot_btw < 0 ? overschot_btw : 0);
+        }
+        else
+        {
+            // verlaging contractwaarde btw
+            var overschot_btw = reserve_btw - (data_vat - amount_old_btw);
+            bedrag_btw = -1 * (overschot_btw > 0 ? reserve_btw : (data_vat - amount_old_btw) );
+        }
+
+        return { budget_res_key: data_budget.budget_res_key
+               , bedrag_exc: bedrag_exc
+               , bedrag_btw: bedrag_btw
+               , budget_srt_key: data_budget.budget_srt_key
+               };
+    }
+
+    function insertMutatie(data_mutatie, mutatie_code)
+    {
+        if (data_mutatie.bedrag_exc != 0 || data_mutatie.bedrag_btw != 0)
+        {
+            var sql = "SELECT prs_kostensoort_altcode"
+                    + "  FROM prs_kostensoort"
+                    + " WHERE prs_kostensoort_key = "
+                        + " (SELECT MIN(prs_kostensoort_key)"
+                        + "    FROM bgt_budget"
+                        + "   WHERE bgt_budget_key = " + data_mutatie.budget_srt_key
+                        + " )";
+            var oRs = Oracle.Execute(sql);
+            var v_costtype_code = oRs("prs_kostensoort_altcode").Value;
+            oRs.Close();
+
+            var mutatie_omschr = "";
+            switch (mutatie_code)
+            {
+                case "AO": mutatie_omschr = "AO Automatische overboeking"; break;
+                case "MW": mutatie_omschr = "MW Meer-, minderwerk van " + v_costtype_code; break;
+            }
+
+            var sql_m = "INSERT INTO bgt_budgetmutatie"
+                      + "( bgt_budgetmutatie_datum"
+                      + ", bgt_budgetmutatie_omschrijving"
+                      + ", prs_perslid_key" // not null!
+                      + ", bgt_budget_key_van"
+                      + ", bgt_budget_bedrag_van"
+                      + ", bgt_budget_btwbedrag_van"
+                      + ", bgt_budget_key_naar"
+                      + ", bgt_budget_bedrag_naar"
+                      + ", bgt_budget_btwbedrag_naar"
+                      + ", bgt_budgetmutatie_reserve"
+                      + ") VALUES"
+                      + "( SYSDATE"
+                      + ", " + safe.quoted_sql(mutatie_omschr)
+                      + ", " + user_key
+                      + ", " + data_mutatie.budget_res_key
+                      + ", " + data_mutatie.bedrag_exc
+                      + ", " + data_mutatie.bedrag_btw
+                      + ", " + data_mutatie.budget_srt_key
+                      + ", " + (-1 * data_mutatie.bedrag_exc)
+                      + ", " + (-1 * data_mutatie.bedrag_btw)
+                      + ", 1"
+                      + ")";
+            Oracle.Execute(sql_m);
+        }
+    }
+
+
+    this.REST_GET = generic_REST_GET(this, gparams);
+    this.REST_PUT = generic_REST_PUT(this);
+    var autparams = user.checkAutorisation(this.autfunction);
+    var canWrite = (autparams.PRSwritelevel < 9 && autparams.ALGwritelevel < 9);
+    if (canWrite)
+    {
+        this.REST_POST   = generic_REST_POST(this);
+        this.REST_DELETE = generic_REST_DELETE(this);
+    }
 }
 %>

APPL/API2/model_mld_srtkenmerk.inc

@@ -13,14 +13,15 @@
 %>
 <%
 
-function model_mld_srtkenmerk()
+function model_mld_srtkenmerk(params)
 {
+    params = params || {};
     this.records_name = "issuepropertytypes";
     this.record_name = "issuepropertytype";
     this.table = "mld_srtkenmerk";
     this.primary = "mld_srtkenmerk_key";
     this.soft_delete  = "mld_srtkenmerk_verwijder";
-    this.autfunction = "WEB_MLDMGT";
+    this.autfunction = params.internal?false:"WEB_MLDMGT";
     this.record_title = L("mld_srtkenmerk");
     this.records_title = L("mld_srtkenmerk_m");
 
@@ -58,7 +59,7 @@ function model_mld_srtkenmerk()
         },
         "system": {
             "dbs": "mld_srtkenmerk_systeem",
-            "label": L("mgt_srtkenmerk_systeem"),
+            "label": L("mgt_srtkenmerk_systeem_adv"),
             "typ": "number",
             "LOV": L("mgt_srtkenmerk_systeemLOV"),
             "defaultvalue": 0,

APPL/API2/model_mld_stdmelding.inc

@@ -0,0 +1,616 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           model_mld_stdmelding.inc
+
+    Description:
+
+    Context:
+
+    Notes:          Er is ook een model_issuetypes.inc
+                    Deze bevat slechts een subset van de velden die hier worden gebruikt.
+                    Kan model_mld_stdmelding ook gebruikt worden ipv model_issuetypes?
+
+*/
+%>
+<!-- #include file="../mld/mld.inc" -->
+<!-- #include file="model_mld_dienstpakket.inc" -->
+<%
+
+function model_mld_stdmelding()
+{
+    this.records_name = "issuetypes";
+    this.record_name = "issuetype",
+    this.table = "mld_stdmelding";
+    this.primary = "mld_stdmelding_key";
+    this.soft_delete = "mld_stdmelding_verwijder";
+    this.soft_expire = "mld_stdmelding_vervaldatum";
+    this.autfunction = "WEB_MLDMGT";
+    this.record_title = L("mld_stdmelding");
+    this.records_title = L("mld_stdmelding_m");
+
+    this.fields = {
+        "id": {
+            "dbs": "mld_stdmelding_key",
+            "label": L("lcl_key"),
+            "typ": "key",
+            "required": true,
+            "filter": "exact",
+            "seq": "mld_s_mld_stdmelding_key"
+        },
+        "description": {
+            "dbs": "mld_stdmelding_omschrijving",
+            "label": L("lcl_complain"), //L("mld_stdmelding_omschrijving"),
+            "typ": "varchar",
+            "required": true,
+            "translate": true
+        },
+        "disciplinetype": {
+            "dbs": "ins_srtdiscipline.ins_srtdiscipline_key",
+            "label": L("lcl_mld_vakgroeptype"),
+            "typ": "key",
+            "insertonly": true,
+            "foreign" : {
+                "tbl": "(SELECT ins_srtdiscipline_key"
+                     + "      , ins_srtdiscipline_omschrijving srtdiscipline_oms"
+                     + "   FROM ins_srtdiscipline"
+                     + "  WHERE ins_srtdiscipline_module = 'MLD'"
+                     + "  ORDER BY 2 ASC"
+                     + ")",
+                "key": "ins_srtdiscipline_key",
+                "desc": "srtdiscipline_oms"
+            }
+        },
+        "discipline": {
+            "dbs": "mld_ins_discipline_key",
+            "typ": "key",
+            "label": L("lcl_mld_vakgroep"),
+            "foreign": {
+                "tbl": "(SELECT ins_discipline_key"
+                     + "      , ins_discipline_omschrijving"
+                     + "   FROM mld_v_aanwezigdiscipline"
+                     + "  ORDER BY ins_discipline_omschrijving ASC"
+                     + ")",
+                "key": "ins_discipline_key",
+                "desc": "ins_discipline_omschrijving"
+            },
+            "required": (mode == "edit")
+        },
+        "notfrontend": {
+            "dbs": "mld_stdmelding_notfrontend",
+            "typ": "check0",
+            "label": L("lcl_mld_notfrontend"),
+            "multiedit": true
+
+        },
+        "costtype": {
+            "dbs": "prs_kostensoort_key",
+            "typ": "key",
+            "label": L("lcl_charge_type"),
+            "foreign": {
+                "tbl": "prs_kostensoort",
+                "key": "prs_kostensoort_key",
+                "desc": "prs_kostensoort_oms"
+            },
+            "emptyoption": "",
+            "multiedit": true
+        },
+        "canrefer": {
+            "dbs": "mld_stdmelding_kanverwijzen",
+            "typ": "key",
+            "label": L("lcl_mld_kanverwijzen"),
+            "LOV": canrefer_LOV(),
+            "multiselect": true,
+            "multiadd": true,
+            "emptyoption": L("lcl_none")
+        },
+        "mandatorylevel": {
+            "dbs": "alg_onrgoed_niveau",
+            "typ": "varchar",
+            "label": L("lcl_mld_onrgoed_niveau"),
+            "LOV": "L;" + L("lcl_location") + ";"
+                 + "G;" + L("lcl_building") + ";"
+                 + "V;" + L("lcl_floor")    + ";"
+                 + "R;" + L("lcl_room"),
+            "emptyoption": null,
+            "multiedit": true
+        },
+        "notify": {
+            "dbs": "mld_stdmelding_notify",
+            "typ": "check0",
+            "label": L("lcl_mld_notify")
+        },
+        "plannable": {
+            "dbs": "mld_stdmelding_planbaar",
+            "typ": "number",
+            "label": L("lcl_mld_planbaar"),
+            "LOV": L("lcl_mld_planbaarLOV"),
+            "required": true,
+            "defaultvalue": 0,
+            "multiedit": true
+        },
+        "subjectlist": {
+            "dbs": "mld_stdmelding_subject",
+            "typ": "key",
+            "label": L("lcl_mld_subject"),
+            "LOV": "0;" + L("lcl_mld_onzichtbaar") + ";"
+                 + "1;" + L("lcl_mld_optioneel")   + ";"
+                 + "2;" + L("lcl_mld_verplicht"),
+            "emptyoption": null,
+            "multiedit": true
+        },
+        "freetext": {
+            "dbs": "mld_stdmelding_freetext",
+            "typ": "key",
+            "label": L("lcl_mld_freetext"),
+            "LOV": "0;" + L("lcl_mld_onzichtbaar") + ";"
+                 + "1;" + L("lcl_mld_optioneel")   + ";"
+                 + "2;" + L("lcl_mld_verplicht"),
+            "emptyoption": null,
+            "multiedit": true
+        },
+        "objectmandatory": {
+            "dbs": "ins_srtinst_verplicht",
+            "typ": "check0",
+            "label": L("lcl_mld_obj_verplicht")
+        },
+        "hint": {
+            "dbs": "mld_stdmelding_hint",
+            "typ": "memo",
+            "label": L("lcl_mld_hint"),
+            "translate": true
+        },
+        "autoorder": {
+            "dbs": "mld_stdmelding_autoorder",
+            "typ": "check0",
+            "label": L("lcl_mld_autoorder"),
+            "multiedit": true
+        },
+        "autoorderamount": {
+            "dbs": "mld_stdmelding_autoorderamount",
+            "typ": "float",
+            "iscurrency": true,
+            "label": L("lcl_mld_autoorderamount"),
+            "multiedit": true
+        },
+        "requireservice": {
+            "dbs": "mld_stdmelding_vereisdienst",
+            "typ": "check0",
+            "label": L("lcl_mld_vereisdienst"),
+            "multiedit": true
+        },
+        "service": {
+            "dbs": "prs_dienst_key",
+            "typ": "key",
+            "label": L("lcl_mld_behandel_dienst"),
+            "foreign": {
+                "tbl": "(SELECT prs_dienst_key"
+                     + "      , prs_dienst_omschrijving"
+                     + "   FROM prs_dienst"
+                     + "  ORDER BY UPPER(prs_dienst_omschrijving))",
+                "key": "prs_dienst_key",
+                "desc": "prs_dienst_omschrijving"
+            },
+            "emptyoption": ""
+        },
+        "ordertype": {
+            "dbs": "mld_typeopdr_key",
+            "typ": "key",
+            "label": L("lcl_mld_std_typeopdr"),
+            "foreign": {
+                "tbl": "(SELECT mld_typeopdr_key"
+                     + "      , mld_typeopdr_omschrijving"
+                     + "   FROM mld_typeopdr"
+                     + "  ORDER BY UPPER(mld_typeopdr_omschrijving))",
+                "key": "mld_typeopdr_key",
+                "desc": "mld_typeopdr_omschrijving"
+            },
+            "emptyoption": ""
+        },
+        "regime": {
+            "dbs": "mld_stdmelding_regime",
+            "typ": "key",
+            "label": L("lcl_mld_regime"),
+            "LOV": "1;" + L("lcl_mld_office_hours")  + ";"
+                 + "2;" + L("lcl_mld_opening_hours") + ";"
+                 + "3;" + L("lcl_mld_24_7"),
+            "emptyoption": null,
+            "multiedit": true
+        },
+        "fixedmalus": {
+            "dbs": "mld_stdmelding_malusbasis",
+            "typ": "float",
+            "label": L("lcl_mld_malusbasis"),
+            "multiedit": true
+        },
+        "periodmalus": {
+            "dbs": "mld_stdmelding_malus",
+            "typ": "float",
+            "label": L("lcl_mld_malus"),
+            "multiedit": true
+        },
+        "roomtypedependant": {
+            "dbs": "mld_stdmelding_afhankelijk",
+            "typ": "check0",
+            "label": L("lcl_mld_afh_srtruimte_object"),
+            "multiedit": true
+        },
+        "symbolname": {
+            "dbs": "mld_stdmelding_image",
+            "typ": "varchar",
+            "label": L("lcl_mld_symbol_name")
+        },
+        "closingtext": {
+            "dbs": "mld_stdmelding_afmeldtext",
+            "typ": "key",
+            "label": L("lcl_mld_afmeldtext"),
+            "LOV": "1;" + L("lcl_mld_optioneel") + ";"
+                 + "2;" + L("lcl_mld_verplicht"),
+            "emptyoption": null,
+            "multiedit": true
+       },
+        "sequence": {
+            "dbs": "mld_stdmelding_volgnr",
+            "typ": "number",
+            "label": L("lcl_mld_stdmelding_volgnummer")
+        },
+        "ownrooms": {
+            "dbs": "mld_stdmelding_prseigen",
+            "typ": "check0",
+            "label": L("lcl_mld_prseigen"),
+            "multiedit": true
+        },
+        "checksimilar": {
+            "dbs": "mld_stdmelding_doublecheck",
+            "typ": "key",
+            "label": L("lcl_mld_doublecheck"),
+            "LOV": "0;" + L("lcl_mld_not")         + ";"
+                 + "1;" + L("lcl_mld_when_enter")  + ";"
+                 + "2;" + L("lcl_mld_when_accept") + ";"
+                 + "3;" + L("lcl_mld_when_enter_accept"),
+            "emptyoption": null,
+            "multiedit": true
+        },
+        "copyable": {
+            "dbs": "mld_stdmelding_kopieerbaar",
+            "typ": "check0",
+            "label": L("lcl_mld_copyable"),
+            "multiedit": true
+        },
+        "survey": {
+            "dbs": "mld_stdmelding_kto",
+            "typ": "key",
+            "label": L("lcl_mld_in_KTO"),
+            "LOV": "0;" + L("lcl_mld_never")  + ";"
+                 + "1;" + L("lcl_mld_always") + ";"
+                 + "2;" + L("lcl_mld_opt_in") + ";"
+                 + "3;" + L("lcl_mld_opt_out")
+        },
+        "limitcatalogue": {
+            "dbs": "bes_ins_discipline_key",
+            "typ": "key",
+            "label": L("lcl_mld_limited_bes_cat"),
+            "foreign": {
+                "tbl": "(SELECT d.ins_discipline_key"
+                     + "      , ins_discipline_omschrijving"
+                     + "   FROM ins_tab_discipline d"
+                     + "  WHERE d.ins_discipline_module = 'BES'"
+                     + "    AND d.ins_discipline_verwijder IS NULL"
+                     + "  ORDER BY UPPER(d.ins_discipline_omschrijving))",
+                 "key": "ins_discipline_key",
+                 "desc": "ins_discipline_omschrijving"
+            },
+            "emptyoption": ""
+        },
+        "expires": {
+            "dbs": "mld_stdmelding_vervaldatum",
+            "typ": "date",
+            "label": L("lcl_mld_expiration_date")
+        },
+        "ordertypemandatory": {
+            "dbs": "mld_stdmelding_opdrtypevast",
+            "typ": "check0",
+            "label": L("lcl_mld_opdrtypevast")
+        },
+        "issuegroup": {
+            "dbs": "mld_stdmeldinggroep_key",
+            "typ": "key",
+            "label": L("lcl_mld_meldinggroep"),
+            "foreign": {
+                "tbl": "(SELECT g.mld_stdmeldinggroep_key"
+                     + ", " + lcl.xsqla("g.mld_stdmeldinggroep_naam", "g.mld_stdmeldinggroep_key")
+                     + " FROM mld_stdmeldinggroep g"
+                     + " ORDER BY 2)",
+                "key": "mld_stdmeldinggroep_key",
+                "desc": "mld_stdmeldinggroep_naam"
+            },
+            "emptyoption": ""
+        },
+        "immediateready": {
+            "dbs": "mld_stdmelding_directklaar",
+            "typ": "key",
+            "label": L("lcl_mld_directklaar"),
+            "LOV": ";"  + L("lcl_mld_afhankelijk_vakgroep") + ";"
+                 + "0;" + L("lcl_No")                       + ";"
+                 + "1;" + L("lcl_Yes")                      + ";"
+                 + "2;" + L("lcl_mld_initieel_fo"),
+            "emptyoption": null,
+            "multiedit": true
+        },
+        "monitorsla": {
+            "dbs": "mld_stdmelding_slabewaken",
+            "typ": "check0",
+            "label": L("lcl_mld_slabewaken"),
+            "multiedit": true
+        },
+        "showobject": {
+            "dbs": "alg_onrgoed_obj_niveau",
+            "typ": "varchar",
+            "label": L("lcl_mld_obj_show_niveau"),
+            "LOV": ";"  + L("lcl_mld_no_objects") + ";"
+                 + "L;" + L("lcl_location")       + ";"
+                 + "G;" + L("lcl_building")       + ";"
+                 + "V;" + L("lcl_floor")          + ";"
+                 + "R;" + L("lcl_room"),
+            "emptyisrealvalue": true,
+            "emptyoption": null
+        },
+        "departmentobjects": {
+            "dbs": "alg_org_obj_niveau",
+            "typ": "number",
+            "label": L("lcl_mld_dep_obj"),
+            "LOV": departmentobjects_foreign(),
+            "emptyoption": null
+        },
+        "personalobjects": {
+            "dbs": "mld_stdmelding_prsafdobj",
+            "label": L("lcl_mld_prsobjects"),
+            "typ": "check0"
+        },
+        "externallink": {
+            "dbs": "mld_stdmelding_externurl",
+            "typ": "varchar",
+            "label": L("lcl_mld_externurl")
+        },
+        "_upload": {
+            "dbs": "",
+            "label": L("lcl_mld_symbol_upload"),
+            "typ": "button2",
+            "defaultvalue": L("lcl_mld_browse_upload")
+        },
+        "_limitlabel": {
+            "dbs": "",
+            "label": "",
+            "typ": "label",
+            "labelvalue": L("lcl_mld_object_restrict")
+        },
+        "accepttime": {
+            "dbs": "mld_stdmelding_t_accepttijd",
+            "obj": "MLD_T_UITVOERTIJD",
+            "typ": "processingtime",
+            "label": L("lcl_mld_timetoaccept"),
+            "multiedit": true
+        },
+        "processingtime": {
+            "dbs": "mld_stdmelding_t_uitvoertijd",
+            "obj": "MLD_T_UITVOERTIJD",
+            "typ": "processingtime",
+            "label": L("lcl_mld_uitvoertijd_normaal"),
+            "required": true,
+            "multiedit": true
+        },
+        "criticaltime": {
+            "dbs": "mld_stdmelding_t_uitvtijd_pr1",
+            "obj": "MLD_T_UITVOERTIJD",
+            "typ": "processingtime",
+            "label": L("lcl_mld_uitvoertijd_kritisch"),
+            "multiedit": true
+        },
+        "highprioritytime": {
+            "dbs": "mld_stdmelding_t_uitvtijd_pr2",
+            "obj": "MLD_T_UITVOERTIJD",
+            "typ": "processingtime",
+            "label": L("lcl_mld_uitvoertijd_hoog"),
+            "multiedit": true
+        },
+        "lowprioritytime": {
+            "dbs": "mld_stdmelding_t_uitvtijd_pr4",
+            "obj": "MLD_T_UITVOERTIJD",
+            "typ": "processingtime",
+            "label": L("lcl_mld_uitvoertijd_laag"),
+            "multiedit": true
+        },
+        "enddateempty": {
+            "dbs": "mld_stdmelding_enddate_empty",
+            "typ": "check0",
+            "label": L("lcl_mld_enddate_empty"),
+            "multiedit": true
+        }
+    };
+
+    this.includes = {
+        "disciplines": {
+            "model": new model_mld_dienstpakket(),
+            "joinfield": "issuetype",
+            "enable_update": true,
+            "multiadd": "level"
+        }
+    };
+
+    var xparams = {
+        GET: {
+            tables: [ "ins_tab_discipline, mld_disc_params, ins_srtdiscipline"],
+            wheres: [ "ins_tab_discipline.ins_discipline_key = mld_stdmelding.mld_ins_discipline_key",
+                      "mld_disc_params.mld_ins_discipline_key = mld_stdmelding.mld_ins_discipline_key",
+                      "ins_tab_discipline.ins_srtdiscipline_key = ins_srtdiscipline.ins_srtdiscipline_key",
+                      "ins_tab_discipline.ins_discipline_verwijder IS NULL"
+                    ]
+        }
+    };
+
+    this.hook_pre_edit = function(obj, fld, scf_params)
+    {
+        scf_params.layout.block[0].label += " " +obj.id ;
+        if (obj.id == -1)
+            obj.canrefer = {id:-1, name:null};
+        obj.canrefer = translate_canrefer(obj.canrefer, null);
+        var srtdisc_key = -1;
+        var disc_key = -1;
+
+        obj._is_clone = getQParamInt("scf_clone", 0);
+        var stdm_id = (obj._is_clone == 1 ? getQParamInt("id", -1) : obj.id);
+
+        if (stdm_id > 0)
+        {
+            stdm_info = mld.mld_stdmeldinginfo(stdm_id);
+            srtdisc_key = stdm_info.ins_srtdiscipline_key;
+            disc_key = stdm_info.ins_discipline_key;
+            // Hier hebben we echt de waarde van mld_stdmelding_directklaar nodig,
+            // en niet de defaultwaarde uit mld_disc_params_directklaar.
+            var sql = "SELECT mld_stdmelding_directklaar"
+                    + "  FROM mld_stdmelding"
+                    + " WHERE mld_stdmelding_key = " + stdm_id;
+            var oRs = Oracle.Execute(sql);
+            stdm_info.directklaar = oRs("mld_stdmelding_directklaar").Value;
+            oRs.Close();
+            fld.limitcatalogue.foreign.tbl = limitcatalogue_foreign(stdm_info);
+        }
+
+        var proturl = protectQS.create("../shared/BijlagenForm.asp?module=MLDS" + (mode == "show"? "&reado=1" : ""));
+
+%>
+  <script>
+    var srtinstallatieselector_available = 1; // toon alleen actuele disciplines/groepen en objecten.
+    var proturl_bijlage = "<%=proturl%>";
+    var disciplinetype_key = <%=srtdisc_key%>;
+    var discipline_key = <%=disc_key%>;
+  </script>
+<%
+    }
+
+    this.hook_pre_show = function(obj, fld, scf_params)
+    {
+        scf_params.layout.block[0].label += " " +obj.id ;
+        obj.canrefer = (obj.canrefer.id != 0 ? translate_canrefer(obj.canrefer, null) : null);
+    }
+
+    // ? deze functie als parameter aan foreign/multiselect meegeven?
+    function translate_canrefer(db_value, lb_arr)
+    {
+        // Kan verwijzen naar meerdere referenties (modules).
+        if (db_value)
+        {
+            // Vertalen van databasewaarde naar multiselectbox waarde.
+            // mld_stdmelding_kanverwijzen is een multiselect-box. Hieraan moet een string met keys worden doorgegeven.
+            // Converteer de bitjes naar string met keys.
+            var kanverwijzen = { id: "", name: "" };
+            for (var i = 1; i < 256; i = i * 2)
+            { // Een string met keys maken.
+                kanverwijzen.id   += ((db_value.id & i) == i? ((kanverwijzen.id   == ""? "" : "," ) + i) : "");
+                kanverwijzen.name += ((db_value.id & i) == i? ((kanverwijzen.name == ""? "" : ", ") + mld.getrefmoduletext(i)) : "");
+            }
+        }
+        else
+        {
+            // Vertalen van multiselectbox waarde naar databasewaarde.
+            var kanverwijzen = 0;
+            for (var i = 0; i < lb_arr.length; i++)
+            {
+                if (lb_arr[i] > 0)
+                {
+                    kanverwijzen   += lb_arr[i];
+                }
+            }
+            if (kanverwijzen > 128)
+                kanverwijzen = 128; //{ id: 128, name:  mld.getrefmoduletext(128) };
+        }
+        //
+        return kanverwijzen;
+    }
+
+
+
+    this.hook_pre_post = function(scf_params, obj)
+    {   // toevoegen
+        var canrefer_arr = getFParamIntArray("canrefer", [-1]);
+        obj.canrefer = translate_canrefer(null, canrefer_arr);
+    }
+    this.hook_post_post = function(scf_params, obj, key)
+    {
+    }
+    this.hook_pre_put = function(scf_params, obj, key)
+    {   // wijzigen
+        var canrefer_arr = getFParamIntArray("canrefer", [-1]);
+        obj.canrefer = translate_canrefer(null, canrefer_arr);
+/*
+        // Kan verwijzen naar meerdere referenties (modules).
+        var kanverwijzen_arr = getFParamIntArray("canrefer", [-1]); // Kanverwijzen
+        var kanverwijzen = 0;
+        for (var i = 0; i < kanverwijzen_arr.length; i++)
+        {
+            if (kanverwijzen_arr[i] > 0)
+                kanverwijzen += kanverwijzen_arr[i];
+        }
+        obj.canrefer = (kanverwijzen > 128 ? 128 : kanverwijzen);
+        //
+*/
+    }
+    this.hook_pre_delete = function(scf_params, key)
+    {
+    }
+    this.hook_pre_search = function(fld)
+    {
+    }
+
+
+
+    this.REST_GET    = generic_REST_GET(this, xparams);
+    this.REST_POST   = generic_REST_POST(this);
+    this.REST_PUT    = generic_REST_PUT(this);
+    this.REST_DELETE = generic_REST_DELETE(this);
+
+
+    function departmentobjects_foreign()
+    {
+        var tbl = "9;"  + L("lcl_mld_no_objects")  + ";"
+                + "-1;" + L("lcl_mld_all_objects") + ";"
+                + "0;"  + L("lcl_company");
+        for (var i = 1; i <= S("prs_max_dep_level"); i++)
+            tbl += ";" + i + ";" + L("lcl_dep_name_level" + i);
+        return tbl;
+    }
+
+    function limitcatalogue_foreign(stdm_info)
+    {
+        tbl = "(SELECT d.ins_discipline_key"
+            + "      , ins_discipline_omschrijving"
+            + "   FROM ins_tab_discipline d"
+            + "  WHERE d.ins_discipline_module = 'BES'"
+            + "    AND d.ins_discipline_verwijder IS NULL"
+            + "    AND EXISTS (SELECT 1"
+            + "                  FROM mld_discipline md"
+            + "                     , ins_srtdiscipline isd"
+            + "                 WHERE md.ins_srtdiscipline_key = isd.ins_srtdiscipline_key"
+            + "                   AND isd.ins_srtdiscipline_bes = 1"
+            + "                   AND md.ins_discipline_key = " + stdm_info.ins_discipline_key + ")"
+            + "  ORDER BY UPPER(d.ins_discipline_omschrijving))";
+        return tbl;
+    }
+
+    function canrefer_LOV()
+    {
+        var tbl = "128;" + mld.getrefmoduletext(128) + ";" /* Alle meldingen */
+                + "1;"   + mld.getrefmoduletext(1)   + ";" /* [M] Eigen meldingen */
+                + "2;"   + mld.getrefmoduletext(2)   + ";" /* [O] Opdracht */
+                + "4;"   + mld.getrefmoduletext(4)   + ";" /* [R] Reservering */
+                + "8;"   + mld.getrefmoduletext(8)         /* [B] Bestelling */
+              //+ "16;"  + mld.getrefmoduletext(16   + ";" /* [X] Bestelopdracht :reserved for future use */
+              //+ "32;"  + mld.getrefmoduletext(32   + ";" /* [C] Contract       :reserved for future use */
+              //+ "64;"  + mld.getrefmoduletext(64)  + ";" /* [F] Factuur        :reserved for future use */
+              /*     0: Geen verwijzingen */
+        return tbl;
+    }
+
+}
+%>

APPL/API2/model_mld_stdmelding_srtinst.inc

@@ -0,0 +1,161 @@
+<% /*
+    $Revision$
+    $Id$
+
+    File:           model_mld_stdmelding_srtinst.inc
+
+    Description:    Model voor mld_stdmelding_srtinst
+
+    Context:
+
+    Notes:          Eerste opzet, under construction
+*/
+%>
+<!-- #include file="model_mld_stdmelding.inc"-->
+<%
+
+function model_mld_stdmelding_srtinst(params)
+{
+    params = params || {};
+    this.records_name = "issuetypeobjecttypes";
+    this.record_name = "issuetypeobjecttype";
+    this.table = "mld_stdmelding_srtinst";
+    this.primary = "mld_stdmelding_srtinst_key";
+    this.autfunction = params.internal?false:"WEB_MLDMGT";
+    this.record_title = L("mld_stdmelding_srtinst");
+    this.records_title = L("mld_stdmelding_srtinst_m");
+
+    this.fields = {
+        "id": {
+            "dbs": "mld_stdmelding_srtinst_key",
+            "label": L("lcl_key"),
+            "typ": "key",
+            "required": true,
+            "filter": "exact",
+            "seq": "mld_s_mld_stdm_srtinst_key",
+            "readonly": true
+        },
+        "disciplinetype": { // Voor filtering
+            "dbs": "ins_srtdiscipline.ins_srtdiscipline_key",
+            "label": L("lcl_mld_vakgroeptype"),
+            "typ": "key",
+            "foreign" : {
+                "tbl": "(SELECT ins_srtdiscipline_key"
+                     + "      , ins_srtdiscipline_omschrijving srtdiscipline_oms"
+                     + "   FROM ins_srtdiscipline"
+                     + "  WHERE ins_srtdiscipline_module = 'MLD'"
+                     + "    AND ins_srtdiscipline_ins = 1"
+                     + "  ORDER BY 2 ASC"
+                     + ")",
+                "key": "ins_srtdiscipline_key",
+                "desc": "srtdiscipline_oms"
+            }
+        },
+        "discipline": { // Voor filtering
+            "dbs": "mld_stdmelding.mld_ins_discipline_key",
+            "typ": "key",
+            "label": L("lcl_mld_vakgroep"),
+            "foreign": {
+                "tbl": "(SELECT ins_discipline_key"
+                     + "      , ins_discipline_omschrijving"
+                     + "   FROM mld_v_aanwezigdiscipline"
+                     + "  ORDER BY ins_discipline_omschrijving ASC"
+                     + ")",
+                "key": "ins_discipline_key",
+                "desc": "ins_discipline_omschrijving"
+            },
+            "required": (mode == "edit")
+        },
+        "issuetype": {
+            "dbs": "mld_stdmelding_key",
+            "label": L("mld_stdmelding_key"),
+            "typ": "key",
+            "hidden_fld": true,
+            "foreign": {
+                "tbl": "(SELECT m.mld_stdmelding_key"
+                     + "      , d.ins_discipline_omschrijving || '/' || m.mld_stdmelding_omschrijving  stdmelding_omschr"
+                     + "   FROM mld_stdmelding m"
+                     + "      , mld_v_aanwezigdiscipline d"
+                     + "  WHERE m.mld_ins_discipline_key = d.ins_discipline_key"
+                     + "  ORDER BY d.ins_discipline_omschrijving ASC"
+                     + "         , m.mld_stdmelding_omschrijving ASC"
+                     + ")",
+                "key": "mld_stdmelding_key",
+                "desc": "stdmelding_omschr"
+            },
+            "LOVinit": ""
+        },
+        "level": {
+            "dbs": "ins_srtinstallatie_niveau",
+            "label": L("lcl_niveau"),
+            "typ": "varchar",
+            "hidden_fld": true
+        },
+        "objectkey": {
+            "dbs": "ins_srtinstallatie_key",
+            "label": L("lcl_ins_object"),
+            "typ": "key",
+            "hidden_fld": true
+        },
+        "objectdiscipline": {
+            "dbs": "ins_v_allsrtinstallatie.ins_discipline_key",
+            "label": L("ins_srtinstallatie_discipline"),
+            "typ": "key",
+            "foreign": {
+                "tbl": "ins_discipline",
+                "key": "ins_discipline_key",
+                "desc": "ins_discipline_omschrijving"
+            },
+            "required": true
+        },
+        "objectgroup": {
+            "dbs": "ins_v_allsrtinstallatie.ins_srtgroep_key",
+            "label": L("ins_srtinstallatie_srtgroep"),
+            "typ": "key",
+            "foreign": { "tbl": "ins_srtgroep",
+                         "key": "ins_srtgroep_key",
+                         "desc": "ins_srtgroep_omschrijving"
+                       }
+        },
+        "objecttype": {
+            "dbs": "ins_v_allsrtinstallatie.ins_srtdeel_key",
+            "label": L("ins_srtinstallatie_srtdeel"),
+            "typ": "key",
+            "foreign": { "tbl": "ins_srtdeel",
+                         "key": "ins_srtdeel_key",
+                         "desc": "ins_srtdeel_omschrijving"
+                       }
+        }
+    };
+
+
+    this.hook_pre_edit = function (obj, fld)
+    {
+%>
+  <script>
+    var srtinstallatieselector_available = 1; // toon alleen actuele disciplines/groepen en objecten.
+  </script>
+<%
+        this.fields.disciplinetype.hidden_fld = true;
+        this.fields.discipline.hidden_fld = true;
+    }
+
+    var xparams = {
+        GET: {
+            tables: [ "ins_v_allsrtinstallatie, ins_srtdiscipline, mld_v_aanwezigdiscipline, mld_stdmelding" ],
+            wheres: [ "mld_stdmelding_srtinst.ins_srtinstallatie_key = ins_v_allsrtinstallatie.ins_srtinstallatie_key(+)",
+                      "mld_stdmelding_srtinst.ins_srtinstallatie_niveau = ins_v_allsrtinstallatie.niveau(+)",
+                      "mld_stdmelding.mld_stdmelding_key = mld_stdmelding_srtinst.mld_stdmelding_key",
+                      "mld_v_aanwezigdiscipline.ins_discipline_key = mld_stdmelding.mld_ins_discipline_key",
+                      "mld_v_aanwezigdiscipline.ins_srtdiscipline_key = ins_srtdiscipline.ins_srtdiscipline_key"
+                    ]
+        }
+    };
+
+    this.REST_GET    = generic_REST_GET(this, xparams);
+    if (mld_stdmelding_key != -1)
+        this.REST_POST   = generic_REST_POST(this);
+    this.REST_PUT    = generic_REST_PUT(this);
+    this.REST_DELETE = generic_REST_DELETE(this);
+}
+%>

APPL/API2/model_mld_typeopdr.inc

@@ -86,7 +86,8 @@ function model_mld_typeopdr()
             "dbs": "mld_typeopdr_afmeldmarge",
             "label": L("mld_typeopdr_afmeldmarge"),
             "typ": "number",
-            "defaultvalue": "0"
+            "defaultvalue": "0",
+            "multiedit": true
         },
         "visiblefe": {
             "dbs": "mld_typeopdr_zichtbaarfe",
@@ -102,13 +103,22 @@ function model_mld_typeopdr()
             "dbs": "mld_typeopdr_offertelimiet",
             "label": L("mld_typeopdr_offertelimiet"),
             "iscurrency": true,
-            "typ": "float"
+            "typ": "float",
+            "multiedit": true
         },
         "approval": {
             "dbs": "mld_typeopdr_gvs",
             "label": L("mld_typeopdr_gvs"),
             "iscurrency": true,
-            "typ": "float"
+            "typ": "float",
+            "multiedit": true
+        },
+        "approvalfiat": {
+            "dbs": "mld_typeopdr_fvs",
+            "label": L("mld_typeopdr_fvs"),
+            "iscurrency": true,
+            "typ": "float",
+            "multiedit": true
         },
         "nextissueordertype": {
             "dbs": "mld_typeopdr_typeopdr_key",
@@ -139,7 +149,8 @@ function model_mld_typeopdr()
             "label": L("mld_typeopdr_kosten_verplicht"),
             "typ": "number",
             "LOV": L("mld_typeopdr_kosten_verplichtLOV"),
-            "emptyoption": null
+            "emptyoption": null,
+            "multiedit": true
         },
         "slamode": {
             "dbs": "mld_typeopdr_slamode",
@@ -147,7 +158,8 @@ function model_mld_typeopdr()
             "typ": "number",
             "defaultvalue": "1",
             "LOV": L("mld_typeopdr_slamodeLOV"),
-            "emptyoption": null
+            "emptyoption": null,
+            "multiedit": true
         },
         "sequential": {
             "dbs": "mld_typeopdr_sequential",
@@ -155,7 +167,8 @@ function model_mld_typeopdr()
             "typ": "number",
             "defaultvalue": "0",
             "LOV": L("mld_typeopdr_seqmodeLOV"),
-            "emptyoption": null
+            "emptyoption": null,
+            "multiedit": true
         }
     };
 

APPL/API2/model_notes.inc

@@ -115,7 +115,7 @@ function model_notes(module)
             { "id"          : { dbs: tabel.id,                     typ: "key",     seq:     tabel.seq,     filter: "exact" },
               "author"      : { dbs: "prs_perslid_key",            typ: "key",     foreign: "prs_perslid", filter: "exact" },
               "description" : { dbs: tabel.naam + "_omschrijving", typ: "varchar",                         filter: "like"  },
-              "createdate"  : { dbs: tabel.naam + "_aanmaak",      typ: "datetime"},
+              "created"     : { dbs: tabel.naam + "_aanmaak",      typ: "datetime", "readonly": true},
               "parent"      : { dbs: tabel.parent + "_key",        typ: "key",                             filter: "exact" }
         };
 
@@ -197,7 +197,7 @@ function model_notes(module)
             //
             var dbfields = api2.update_fields(params, this, jsondata); // Build updater
 
-            var wheres = [ this.id.dbs + " = " + the_key];
+            var wheres = [ this.fields.id.dbs + " = " + the_key];
             wheres.push("prs_perslid = " + user_key);
 
             var xxxUpd = buildTrackingUpdate(this.table, wheres.join(" AND " ), dbfields, { noValidateToken: true });
@@ -209,7 +209,10 @@ function model_notes(module)
 
     this.REST_POST = function (params, jsondata) /* new note */
         {
-            params.filter.parent_key = jsondata.parent;
+            params.filter.parent_key = parseInt(jsondata.parent, 10);
+            if (!jsondata.author)
+                jsondata.author = user_key;
+
             _check_authorization(params, "POST");
             //
             var dbfields = api2.update_fields(params, this, jsondata); // Build updater

APPL/API2/model_objects.inc

@@ -4,7 +4,7 @@
 
     File:           model_objects.inc
 
-    Description:    Object model.
+    Description:    Object model. Still quite incomplete (or "under construction" if you like)
     Parameters:
     Context:
 
@@ -16,6 +16,7 @@
 <!-- #include file="./model_custom_fields.inc"-->
 <!-- #include file="./model_fac_tracking.inc"-->
 <!-- #include file="./model_ins_kenmerk.inc"-->
+<!-- #include file="model_issueobjects.inc"-->
 <%
 model_objects =
 {
@@ -24,14 +25,16 @@ model_objects =
     records_name: "objects",
     record_name: "object",
     multi_update: true,
-    fields: {"id"       : { dbs: "ins_deel_key",          typ: "key",     filter: "exact" },
-             "name"     : { dbs: "ins_deel_omschrijving", typ: "varchar", filter: "like"},
-             "description" : { dbs: "ins_deel_opmerking", typ: "varchar", filter: "like"},
-             "type"     : { dbs: "ins_srtdeel_key",       typ: "key",     filter: "exact", foreign: "ins_srtdeel"},
-             "state"    : { dbs: "ins_deel_state",        typ: "varchar" },
-             "statedate": { dbs: "ins_deel_statedate",    typ: "datetime" },
-             "expiration":{ dbs: "ins_deel_vervaldatum",  typ: "date" },
-             "manager"  : { dbs: "prs_perslid_key_beh",   typ: "key",      foreign: "prs_perslid",        track: true, label: L("lcl_ins_manager"),  sfilter: "exact" },
+    fields: {"id"       : { dbs: "ins_deel_key",                           typ: "key",     filter: "exact" },
+             "name"     : { dbs: "ins_deel_omschrijving",                  typ: "varchar", filter: "like"},
+             "description" : { dbs: "ins_deel_opmerking",                  typ: "varchar", filter: "like"},
+             "type"     : { dbs: "ins_srtdeel_key",                        typ: "key",     filter: "exact", foreign: "ins_srtdeel"},
+             "state"    : { dbs: "ins_deel_state",                         typ: "varchar" },
+             "statedate": { dbs: "ins_deel_statedate",                     typ: "datetime" },
+             "expiration":{ dbs: "ins_deel_vervaldatum",                   typ: "date" },
+             "manager"  : { dbs: "prs_perslid_key_beh",                    typ: "key",      foreign: "prs_perslid",        track: true, label: L("lcl_ins_manager"),  sfilter: "exact" },
+             "score1"   : { dbs: "ins_deel_mjb_score1",                    typ: "varchar", filter: "exact",                track: true, label: L("lcl_ins_deel_mjb_score1")},
+             "score2"   : { dbs: "ins_deel_mjb_score2",                    typ: "varchar", filter: "exact",                track: true, label: L("lcl_ins_deel_mjb_score2")},
              "location" : { dbs: "ins_v_deel_gegevens.alg_locatie_key",    typ: "key",     foreign: "alg_locatie"},
              "building" : { dbs: "ins_v_deel_gegevens.alg_gebouw_key",     typ: "key",     foreign: "alg_gebouw" },
              "floor"    : { dbs: "ins_v_deel_gegevens.alg_verdieping_key", typ: "key",     foreign: "alg_verdieping" },
@@ -39,15 +42,23 @@ model_objects =
              "owner"    : { dbs: "ins_v_deel_gegevens.prs_perslid_key",    typ: "key",     foreign: "prs_perslid" }
             },
 
+    // een include van model_ins_deel_state_history lijkt voor de hand te liggen
+    // maar gaf (vast oplosbare) problemen met een dubbele ins_deel in de query
+    // Bovendien wil je in de praktijk altijd een datumfilter op de statedatum hebben
+    // wat niet kan op een include. Doe daarom maar /api2/statehistory?object=16506&start_statedate=2017-11-01T12:20:16Z&fields=state,statedate
     includes: { "tracking": {
                                   model: new model_tracking(['deel']),
                                   joinfield: "trackingrefkey"
                             },
                 "custom_fields" : {
-                        "model": new model_custom_fields(this, new model_ins_kenmerk({ internal: true }), { readman: true, readuse: true }),
+                        "model": new model_custom_fields(this, new model_ins_kenmerk("D", { internal: true }), { readman: true, readuse: true }),
                         "joinfield": "flexparentkey",
                         "enable_update": true
-                    }
+                    },
+                "issueobjects":  {
+                                   model: new model_issueobjects(),
+                                   joinfield: "object"
+                                 }
               },
     REST_GET: function _GET(params)
         {
@@ -55,7 +66,6 @@ model_objects =
             var autfunction = urole == "fe"? "WEB_INSUSE" : "WEB_INSMAN";
             params.authparams = user.checkAutorisation(autfunction, null, null, true); // pessimistisch
 
-            // TODO: Add authorization
             var query = api2.sqlfields(params, model_objects);
             query.wheres.push("ins_deel_verwijder IS NULL");
             // Toon standaard alleen de niet vervallen objecten, behalve als specifiek op object identificatie wordt gezocht.
@@ -73,6 +83,16 @@ model_objects =
                 query.wheres.push("ins_alg_ruimte_key_org IS NULL");
             }
 
+            // TODO: Add 3D authorization
+            // Alleen nog maar simpele 1D autorisatie
+            query.wheres.push(" ins_deel.ins_discipline_key IN"
+                            + " (SELECT ins_discipline_key"
+                            + "    FROM fac_v_webgebruiker"
+                            + "   WHERE fac_functie_key = " + params.authparams.autfunctionkey
+                            + "     AND prs_perslid_key = " + user_key
+                            + "     AND fac_gebruiker_prs_level_read < 9"
+                            + "     AND fac_gebruiker_alg_level_read < 9)");
+
             // TODO: We ondersteunen uitsluitend ruimte- werkplek- en persoonsgebonden objecten
             query.tables.push("ins_v_deel_gegevens");
             query.wheres.push("ins_deel.ins_alg_ruimte_type IN ('R', 'W', 'P') ");
@@ -94,15 +114,22 @@ model_objects =
         },
     REST_PUT: function (params, jsondata, the_key) /* update object */
         {
-            var dbfields = api2.update_fields(params, model_objects, jsondata); // Build updater
-            //model_objects._validate_fields(dbfields, params, jsondata);
+            if (params.custom_fields_only)
+            {
+                var insUpd = { trackarray: [] };
+            }
+            else
+            {
+                var dbfields = api2.update_fields(params, model_objects, jsondata); // Build updater
+                //model_objects._validate_fields(dbfields, params, jsondata);
 
-            // TODO: Autorization
-            var wheres = [" ins_deel_key = " + the_key];
-            var insUpd = buildTrackingUpdate("ins_deel", wheres.join(" AND " ), dbfields, { noValidateToken: true });
-            Oracle.Execute(insUpd.sql);
+                // TODO: Autorization
+                var wheres = [" ins_deel_key = " + the_key];
+                var insUpd = buildTrackingUpdate("ins_deel", wheres.join(" AND " ), dbfields, { noValidateToken: true });
+                Oracle.Execute(insUpd.sql);
+            }
 
-            //var beztrack = api2.process_includes(params, model_objects, jsondata, the_key);
+            var instrack = api2.process_includes(params, model_objects, jsondata, the_key);
 
             return { key: the_key };
         },

APPL/API2/model_orders.inc

@@ -20,10 +20,10 @@
 <!-- #include file="../shared/budget.inc" -->
 <!-- #include file="../shared/kpl_ksrt_validate.inc" -->
 <!-- #include file="../mld/mld.inc" -->
+<!-- #include file="../prs/prs.inc" -->
 <!-- #include file="./model_notes.inc"-->
 <!-- #include file="./model_custom_fields.inc"-->
 <!-- #include file="./model_fac_tracking.inc"-->
-<!-- #include file="../mgt/mgt_tools.inc" -->
 <!-- #include file="./model_mld_kenmerk.inc"-->
 <%
 
@@ -87,8 +87,9 @@ function model_orders(opdr_key, params)
                            model: new model_notes("MLD"),
                            joinfield: "mld_opdr_key"
                          },
-                "custom_fields" : { model: new model_custom_fields(this, new model_mld_kenmerk({ internal: true }), { pNiveau: "O", readman: true, readuse: true }),
-                                    joinfield: "flexparentkey"
+                "custom_fields" : { model: new model_custom_fields(this, new model_mld_kenmerk('O', { internal: true }), { pNiveau: "O", readman: true, readuse: true }),
+                                    joinfield: "flexparentkey",
+                                    "enable_update": true
                                   },
                 "tracking": {
                                   model: new model_tracking(['opdracht']),
@@ -238,6 +239,7 @@ function model_orders(opdr_key, params)
                 + "     , mld_typeopdr_slamode"
                 + "     , mld_typeopdr_isofferte"
                 + "     , mld_typeopdr_gvs"
+                + "     , mld_typeopdr_fvs"
                 + "     , mld_typeopdr_kosten"
                 + "  FROM mld_typeopdr"
                 + " WHERE mld_typeopdr_key = " + params.mld_opdr.opdr_type;
@@ -246,6 +248,7 @@ function model_orders(opdr_key, params)
         params.mld_opdr.mld_typeopdr_slamode   = oRs("mld_typeopdr_slamode").Value;
         params.mld_opdr.mld_typeopdr_isofferte = oRs("mld_typeopdr_isofferte").Value;
         params.mld_opdr.mld_typeopdr_gvs       = oRs("mld_typeopdr_gvs").Value || 0;
+        params.mld_opdr.mld_typeopdr_fvs       = oRs("mld_typeopdr_fvs").Value || 0;
         var needKostenplaats = oRs("mld_typeopdr_kosten").Value == 1;
         oRs.Close();
 
@@ -349,6 +352,12 @@ function model_orders(opdr_key, params)
             var opdr_key = the_key;
             if (opdr_key == -1)
                 abort_with_warning("PUT needs record key in url.");
+            if (params.custom_fields_only)
+            {
+                var mldtrack = api2.process_includes(params, this, jsondata, opdr_key);
+                return { key: opdr_key };
+            }
+
             if (!jsondata.id) jsondata.id = opdr_key;       // huidige key altijd in jsondata
             //
             this._pre_analyze_fields(params, jsondata);
@@ -452,6 +461,7 @@ function model_orders(opdr_key, params)
             var disc_key         = params.mld_opdr.dis_key;
             var kostenplaats_key = params.mld_opdr.kostenplaats_key;
             var mld_typeopdr_gvs = params.mld_opdr.mld_typeopdr_gvs;
+            var mld_typeopdr_fvs = params.mld_opdr.mld_typeopdr_fvs || 0;
             var sla_mode         = params.mld_opdr.mld_typeopdr_slamode;
             var uitvoerende      = params.mld_opdr.uitvoerende;
             var act_key          = params.mld_opdr.act_key;
@@ -523,12 +533,16 @@ function model_orders(opdr_key, params)
               {
                 // Wie moet op verzoek goedkeuren voor deze kostenplaats, terwijl het bedrag wellicht onbekend is?
                 // Eerste fiatteur (pkey) mag niet fiatteren want het zit boven zijn profiel limiet.
-                // De melder van de melding (user_key) mag niet zelf goedkeuren boven het bedrag can_selfapprove.
+                // De melder van de melding (user_key) mag niet zelf goedkeuren boven het bedrag can_selfapprove (functie prs.getApprover() regelt dat).
                 // tot_kosten > can_selfapprove => user_key als exclude key meegeven.
-                if (tot_kosten > S("can_selfapprove"))
-                  approver_key = prs.getKpVerantwoordelijkeExcept(kostenplaats_key, user_key);
-                else
-                  approver_key = prs.getKpVerantwoordelijke(kostenplaats_key);
+                // De functie prs.getFiatteur() vervangen door de functie prs.getFiatteur().
+                // De functie prs.getApprover() levert de eerste fiatteur op en checkt daarnaast nog
+                // of het totaalbedrag door iemand gefiatteerd kan worden.
+                var params = {prs_key: user_key,
+                              dis_key: disc_key,
+                              kp_key: kostenplaats_key,
+                              totaalbedrag: tot_kosten};
+                approver_key = prs.getApprover(params);
                 for_approval = true;
               }
             }
@@ -553,6 +567,8 @@ function model_orders(opdr_key, params)
 
             if (for_approval && kp_fiat)
             {
+              // Als approver_key -1 was, dan had de functie prs.getApprover() al een abort_with_warning afgegeven
+              // maar de functie mld.getFirstApprover() nog niet. Daarom hier nog even testen.
               if (approver_key == -1)
                 abort_with_warning(L("lcl_bes_exceed_limit"));
               else
@@ -660,7 +676,12 @@ function model_orders(opdr_key, params)
                 requestApproval = true;
             }
             else if (requestApproval)
+            {
+              if (tot_kosten < mld_typeopdr_fvs)
+                requestApproval = false; // Hoge fiat vrijstelling, toch niet nodig
+              else
                 status = 3; // Ter fiattering.
+            }
             // requestApproval heeft nu zijn definitieve waarde, en approver_key is geldig gedefinieerd.
 
             // Status en tracking altijd met de functie setopdrachtstatus
@@ -818,10 +839,7 @@ function model_orders(opdr_key, params)
                             // Het mandaat is al te hoog voor de melder/aanvrager van de melding.
                             // De melder/aanmaker van de melding mag niet zelf goedkeuren boven het bedrag can_selfapprove.
                             // tot_kosten > can_selfapprove => mld_info.melder_key als exclude key meegeven.
-                            if (tot_kosten > S("can_selfapprove"))
-                              approver_key = prs.getKpVerantwoordelijkeExcept(kostenplaats_key, mld_info.melder_key);
-                            else
-                              approver_key = prs.getKpVerantwoordelijke(kostenplaats_key);
+                            approver_key = prs.getFiatteur(kostenplaats_key, (tot_kosten > S("can_selfapprove"))?mld_info.melder_key:-1, tot_kosten, mld_info.disc);
                             if (approver_key == -1)
                                 abort_with_warning(L("lcl_bes_exceed_limit"));
                             refiat = true;
@@ -1087,13 +1105,18 @@ function model_orders(opdr_key, params)
                                     + "    AND mld_opdr_key = " + opdr_key;
 
             var allKenmerkenSQL     = "SELECT " + lcl.xsql('t.mld_srtkenmerk_omschrijving', 't.mld_srtkenmerk_key') +" kenmerk_omschrijving"
-                                    + ",      m.mld_srtkenmerk_key srtkenmerk_key"
+                                    + ",      t.mld_srtkenmerk_kenmerktype kenmerk_kenmerktype"
+                                    + ",      t.mld_srtkenmerk_systeem     kenmerk_systeem"
+                                    + ",      k.mld_kenmerk_toonbaar       kenmerk_readonly"
+                                    + ",      k.mld_kenmerk_uniek          kenmerk_uniek"
                                     + ",      fac_kenmerkdomein_key"
-                                    + "  FROM mld_kenmerk m, "
+                                    + "  FROM mld_kenmerk k, "
                                     + "       mld_srtkenmerk t"
-                                    + " WHERE m.mld_srtkenmerk_key = t.mld_srtkenmerk_key"
-                                    + "   AND m.mld_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
-
+                                    + " WHERE k.mld_srtkenmerk_key = t.mld_srtkenmerk_key"
+                                    + "   AND k.mld_kenmerk_key = "; /* wordt in saveFlexkenmerken uitgebreid */
+// TODO: deze saveFlexKenmerken moet via de standaard includes door model_custom_fields opgelost worden
+//       pas echter op: die verwacht een properyid voor elk kenmerk terwijl saveFlexKenmerken (nog) een 'id' verwacht
+//       In het bijzonder wordt in d:\Apps\Facilitor\Branch20172\CUST\ASLE\Appl ook nog de 'id' gezet!
             var flextrack =
                 saveFlexKenmerken(opdr_key, { kenmerkTable: "mld_kenmerkopdr",
                                               kenmerkParentKey : "mld_opdr_key",

APPL/API2/model_prs_afdeling.inc

@@ -13,7 +13,6 @@
 %>
 <!-- #include file="../prs/prs.inc" -->
 <!-- #include file="./model_custom_fields.inc"-->
-<!-- #include file="../mgt/mgt_tools.inc"-->
 <!-- #include file="./model_prs_kenmerk.inc"-->
 <%
 
@@ -29,7 +28,8 @@ function model_prs_afdeling()
     this.fields = {
         "id": {
             "dbs": "prs_afdeling_key",
-            "typ": "key"
+            "typ": "key",
+            "seq": "prs_s_prs_afdeling_key"
         },
         "name": {
             "dbs": "prs_afdeling_naam",
@@ -39,11 +39,10 @@ function model_prs_afdeling()
             "dbs": "prs_afdeling_omschrijving",
             "typ": "varchar"
         },
-        "company": {
-            "dbs": "prs_afdeling_key",
-            "label": L("lcl_prs_company"),
-            "typ": "key",
-            "foreign": "prs_afdeling"
+        "externalid": {
+            "dbs": "prs_afdeling_externid",
+            "label": L("prs_afdeling_externid"),
+            "typ": "varchar"
         },
         "parent": {
             "dbs": "prs_afdeling_parentkey",
@@ -52,7 +51,19 @@ function model_prs_afdeling()
             "foreign": "prs_afdeling"
         },
         "company": {
-            "dbs": "pa.prs_bedrijf_key",
+            "dbs": "prs_bedrijf_key",
+            "label": L("lcl_prs_company"),
+            "typ": "key",
+            "foreign": {
+                "tbl": "prs_bedrijf",
+                "key": "prs_bedrijf_key",
+                "desc": "prs_bedrijf_naam",
+                "desc_is_unique": "prs_bedrijf_verwijder IS NULL"
+            }
+        },
+        "xcompany": {
+            "dbs": "top_prs_bedrijf_key",
+            "sql": "pa.prs_bedrijf_key",
             "label": L("lcl_prs_company"),
             "typ": "key",
             "foreign": "prs_bedrijf"
@@ -64,9 +75,15 @@ function model_prs_afdeling()
             "foreign": {
                 "tbl": "prs_kostenplaats",
                 "key": "prs_kostenplaats_key",
-                "desc": "prs_kostenplaats_nr"
-            },
-            "multiedit": true
+                "desc": "prs_kostenplaats_nr",
+                "desc_is_unique": "prs_kostenplaats_verwijder IS NULL"
+            }
+        },
+            "created": {
+            "dbs": "prs_afdeling_aanmaak",
+            "label": "Aanmaakdatum",
+            "typ": "datetime",
+            "readonly": true
         }
     };
 
@@ -84,7 +101,7 @@ function model_prs_afdeling()
                     }
                   }
 
-    var authparamsUSE = user.checkAutorisation("WEB_PRSUSE", true);
+    var authparamsUSE = user.checkAutorisation("WEB_PRSUSE");
     if (authparamsUSE.PRSreadlevel == 0) // prs_bedrijf
     {
         gparams["GET"].wheres.push("pa.prs_bedrijf_key = " + user.afdeling().prs_bedrijf_key());
@@ -103,11 +120,9 @@ function model_prs_afdeling()
     }
 
 
-    this.REST_GET   = generic_REST_GET(this, gparams);
-
-    // (even) nog geen updates
-    //this.REST_POST   = generic_REST_POST(this);
-    //this.REST_PUT    = generic_REST_PUT(this);
-    //this.REST_DELETE = generic_REST_DELETE(this);
+    this.REST_GET    = generic_REST_GET(this, gparams);
+    this.REST_POST   = generic_REST_POST(this);
+    this.REST_PUT    = generic_REST_PUT(this);
+    this.REST_DELETE = generic_REST_DELETE(this);
 }
 %>

APPL/API2/model_prs_kostencombinatie.inc

@@ -42,17 +42,6 @@ function model_prs_kostencombinatie()
             "hidden_fld": true,
             "filter": "like"
         },
-        "refcode": {
-            "dbs": "prs_kostencombinatie.prs_kostensoort_key",
-            "label": L("prs_kostensoort_refcode"),
-            "typ": "key",
-            "hidden_fld": true,
-            "foreign": {
-                "tbl": "prs_kostensoort",
-                "key": "prs_kostensoort_key",
-                "desc": "prs_kostensoort_refcode"
-            }
-        },
         "costtype": {
             "dbs": "prs_kostensoort_key",
             "label": L("prs_kostensoort_key"),
@@ -102,12 +91,15 @@ function model_prs_kostencombinatie()
 
         this.REST_GET    = generic_REST_GET(this, {
             "GET": {
-                "tables": [ext_sql],
-                "wheres": ["ks.prs_kostensoort_key = prs_kostencombinatie.prs_kostensoort_key",
-                           "(  ks.prs_kostensoort_upper LIKE " + safe.quoted_sql(costtype_search) +
-                           "OR UPPER(ks.prs_kostensoort_opmerking) LIKE " + safe.quoted_sql(costtype_search) +
-                           "OR UPPER(ks.prs_kostensoort_refcode) LIKE " + safe.quoted_sql(costtype_search) +
-                           ")"
+                "wheres": [ "EXISTS "
+                          + "  (SELECT 1 "
+                          + "     FROM prs_kostensoort "
+                          + "    WHERE     prs_kostensoort.prs_kostensoort_key = "
+                          + "              prs_kostencombinatie.prs_kostensoort_key "
+                          + "          AND (   prs_kostensoort_upper LIKE " + safe.quoted_sql(costtype_search)
+                          + "               OR UPPER (prs_kostensoort_opmerking) LIKE " + safe.quoted_sql(costtype_search)
+                          + "               OR UPPER (prs_kostensoort_refcode) LIKE " + safe.quoted_sql(costtype_search)
+                          + "))"
                           ]
             }
         });

APPL/API2/model_prs_kostenplaats.inc

@@ -11,7 +11,8 @@
     Notes:
 */
 %>
-<!-- #include file="../api2/model_prs_kostensoort.inc" -->
+<!-- #include file="../bgt/bgt_tools.inc" -->
+<!-- #include file="../api2/api2_tools.inc" -->
 <%
 
 function model_prs_kostenplaats()
@@ -21,8 +22,8 @@ function model_prs_kostenplaats()
     this.table = "prs_kostenplaats";
     this.primary = "prs_kostenplaats_key";
     this.autfunction = (S("bgt_enabled")==1 ? ["WEB_FINMSU", "WEB_BGTMGT"] : ["WEB_FINMSU"]);
-    this.record_title = L("lcl_account");
-    this.records_title = L("lcl_menu_fin_kostenplaatsen");
+    this.record_title = (S("bgt_enabled")==1 ? L("bgt_kostenplaats") : L("prs_kostenplaats"));
+    this.records_title = (S("bgt_enabled")==1 ? L("bgt_kostenplaats_m") : L("prs_kostenplaats_m"));
     this.soft_delete = "prs_kostenplaats_verwijder";
 
     this.fields = {
@@ -35,6 +36,29 @@ function model_prs_kostenplaats()
             "filter": "exact",
             "seq": "prs_s_prs_kostenplaats_key"
         },
+        "budgetdiscipline": {
+            "dbs": "bgt_project.ins_discipline_key",
+            "label": L("bgt_discipline_omschrijving"),
+            "typ": "key",
+            "required": true,
+            "foreign": bgt_budgetdiscipline_foreign(),
+            "showtransit": true
+        },
+        "budgetproject": {
+            "dbs": "bgt_project.bgt_project_key",
+            "label": L("bgt_project_omschrijving"),
+            "typ": "key",
+            "required": true,
+            "foreign": bgt_budgetproject_foreign(),
+            "showtransit": true
+        },
+        "costgroup": {
+            "dbs": "prs_kostenplaatsgrp_key",
+            "label": L("lcl_prs_kostenpl_group"),
+            "typ": "key",
+            "foreign": bgt_accountgroup_foreign(),
+            "showtransit": true
+        },
         "name": {
             "dbs": "prs_kostenplaats_nr",
             "label": L("lcl_prs_dept_name"),
@@ -43,6 +67,16 @@ function model_prs_kostenplaats()
             "required": true,
             "filter": "like"
         },
+        "module": {
+            "dbs": "prs_kostenplaats_module",
+            "label": L("lcl_prs_type"),
+            "typ": "varchar",
+            "LOV": "ALG;" + L("lcl_prs_kosttype_alg")
+                + ";PRJ;" + L("lcl_prs_kosttype_prj")
+                + ";PRS;" + L("lcl_prs_kosttype_prs"),
+            "hidden_fld": true,
+            "defaultvalue": "PRJ"
+        },
         "description": {
             "dbs": "prs_kostenplaats_omschrijving",
             "label": L("lcl_prs_descr"),
@@ -51,35 +85,39 @@ function model_prs_kostenplaats()
             "required": true,
             "filter": "like"
         },
-        "begin": {
-            "dbs": "prs_kostenplaats_begin",
-            "label": "Startdatum", // L("lcl_start_date"),
-            "typ": "date"
-            },
-        "end": {
-            "dbs": "prs_kostenplaats_eind",
-            "label": L("lcl_end_date"),
-            "typ": "date"
-            },
-        "costgroup": {
-            "dbs": "prs_kostenplaatsgrp_key",
-            "label": L("lcl_prs_kostenpl_group"),
-            "typ": "key",
-            "foreign": {
-                "tbl": "prs_kostenplaatsgrp",
-                "key": "prs_kostenplaatsgrp_key",
-                "desc": "prs_kostenplaatsgrp_oms"
-            }
-        },
         "person": {
             "dbs": "prs_perslid_key",
             "label": L("lcl_prs_budgethouder"),
             "typ": "key",
             "foreign" : "prs_perslid"
         },
+        "external": {
+            "dbs": "prs_kostenplaats_extern",
+            "label": L("lcl_prs_kpnextern"),
+            "typ": "check0",
+            "multiedit": true
+        },
+        "approval": {
+            "dbs": "prs_kostenplaats_fiat",
+            "label": L("lcl_prs_kpnfiat"),
+            "typ": "check0",
+            "multiedit": true
+        },
+        "begin": {
+            "dbs": "prs_kostenplaats_begin",
+            "label": L("lcl_start_date"),
+            "typ": "date",
+            "multiedit": true
+        },
+        "end": {
+            "dbs": "prs_kostenplaats_eind",
+            "label": L("lcl_end_date"),
+            "typ": "date",
+            "multiedit": true
+        },
         "costlimit": {
             "dbs": "prs_kostenplaats_limiet",
-            "label": L("lcl_prs_limiet"),
+            "label": L("lcl_prs_budget") + "&nbsp;(" + L("lcl_valutasign")+")",
             "typ": "number"
         },
         "limitperiod": {
@@ -89,23 +127,143 @@ function model_prs_kostenplaats()
             "LOV":  "0;" + L("lcl_prs_none") +
                    ";1;" + L("lcl_prs_month") +
                    ";2;" + L("lcl_prs_year")
-        },
-        "external": {
-            "dbs": "prs_kostenplaats_extern",
-            "label": L("lcl_prs_kpnextern"),
-            "typ": "check0"
-        },
-        "approval": {
-            "dbs": "prs_kostenplaats_fiat",
-            "label": L("lcl_prs_kpnfiat"),
-            "typ": "check0"
         }
     };
 
-    this.REST_GET    = generic_REST_GET(this);
-    // Nog even readonly
-    //this.REST_POST   = generic_REST_POST(this);
-    //this.REST_PUT    = generic_REST_PUT(this);
-    //this.REST_DELETE = generic_REST_DELETE(this);
+    if (S("bgt_enabled")) // alleen voor budgetcontrole, de rest nog even readonly
+    {
+        // Deze hoeven ze niet voor BGT te zien:
+        delete this.fields.begin;
+        delete this.fields.end;
+        delete this.fields.person;
+        delete this.fields.costlimit;
+        delete this.fields.limitperiod;
+        delete this.fields.external;
+        delete this.fields.approval;
+        this.fields.costgroup.hidden_fld = true;  // Deze wordt bepaald uit de gekozen project/deelproject.
+
+        this.hook_pre_edit = function (obj, fld)
+        {
+        %>
+        <script>
+            <% if (obj.budgetdiscipline) { %> var budgetdiscipline = "<%=obj.budgetdiscipline.id%>"; <% } %>
+            <% if (obj.budgetproject)    { %> var budgetproject    = "<%=obj.budgetproject.id%>";    <% } %>
+        </script>
+        <%
+        }
+
+        this.hook_pre_post = function (params, jsondata)
+        {
+            var v_discipline_key = jsondata.budgetdiscipline || getQParamInt("budgetdiscipline", -1);
+            var v_project_key    = jsondata.budgetproject    || getQParamInt("budgetproject", -1);
+            if (v_discipline_key > 0 && v_project_key > 0)
+            {
+                var sql_e = "SELECT prs_kostenplaatsgrp_key"
+                          + "  FROM prs_kostenplaatsgrp kpg"
+                          + " WHERE kpg.bgt_project_key = " + v_project_key;
+                var oRs_e = Oracle.Execute(sql_e);
+                var v_kostenplaatsgrp_key = (!oRs_e.eof ? oRs_e("prs_kostenplaatsgrp_key").Value : -1);
+                oRs_e.Close();
+                //
+                if (v_kostenplaatsgrp_key == -1 && v_project_key > 0)
+                {
+                    // Ontbrekende verwijzing tussen kostenplaats en project toevoegen.
+                    var sql = "INSERT INTO prs_kostenplaatsgrp"
+                            + " (bgt_project_key, prs_kostenplaatsgrp_nr, prs_kostenplaatsgrp_oms)"
+                            + "     SELECT " + v_project_key
+                            + "          , d.bgt_disc_params_code"
+                            + "          , p.bgt_project_code"
+                            + "      FROM bgt_project p"
+                            + "         , bgt_disc_params d"
+                            + "     WHERE p.ins_discipline_key = d.bgt_ins_discipline_key"
+                            + "       AND p.bgt_project_key = " + v_project_key;
+                    Oracle.Execute(sql);
+                    //
+                    oRs_e = Oracle.Execute(sql_e);
+                    v_kostenplaatsgrp_key = (!oRs_e.eof ? oRs_e("prs_kostenplaatsgrp_key").Value : -1);
+                    oRs_e.Close();
+                    //
+                    if (v_kostenplaatsgrp_key == -1)
+                        abort_with_warning("Er is een fout opgetreden bij het aanmaken van de kostenplaatsgroep");
+                }
+                //
+                jsondata.costgroup = v_kostenplaatsgrp_key;
+            }
+        }
+
+        this.REST_GET    = generic_REST_GET(this, {
+            "GET": {
+                "tables": [ "prs_kostenplaatsgrp"
+                          , "bgt_project"
+                          ],
+                "wheres": [ "prs_kostenplaatsgrp.bgt_project_key = bgt_project.bgt_project_key"
+                          , "prs_kostenplaatsgrp.prs_kostenplaatsgrp_key = prs_kostenplaats.prs_kostenplaatsgrp_key"
+                          , "bgt_project.bgt_project_verwijder IS NULL"
+                          ]
+            }
+        });
+        this.REST_POST   = generic_REST_POST(this);
+        this.REST_PUT    = generic_REST_PUT(this);
+        this.REST_DELETE = generic_REST_DELETE(this);
+    }
+    else
+    {
+        delete this.fields.budgetdiscipline;
+        delete this.fields.budgetproject;
+        delete this.fields.begin;
+        delete this.fields.module.hidden_fld;
+        delete this.fields.module.defaultvalue;
+
+        this.hook_pre_edit = function (obj, fld)
+        {
+            var kpngrp_prs_key = -1;
+            var kpg_limperiode = 0;
+            var kpn_limietperiode = 0;
+            if (obj.id > -1)
+            {
+                var sql = "SELECT kp.prs_kostenplaats_limietperiode"
+                        + "     , kpg.prs_kostenplaatsgrp_limperiode"
+                        + "     , kpg.prs_perslid_key"
+                        + "  FROM prs_kostenplaats kp"
+                        + "     , prs_kostenplaatsgrp kpg"
+                        + " WHERE kp.prs_kostenplaatsgrp_key = kpg.prs_kostenplaatsgrp_key(+)"
+                        + "   AND kp.prs_kostenplaats_key = " + obj.id;
+                var oRs = Oracle.Execute(sql);
+                kpngrp_prs_key    = oRs("prs_perslid_key").Value? oRs("prs_perslid_key").Value : -1;
+                kpg_limperiode    = oRs("prs_kostenplaatsgrp_limperiode").Value ? oRs("prs_kostenplaatsgrp_limperiode").Value : 0;
+                kpn_limietperiode = kpg_limperiode ? kpg_limperiode : (oRs("prs_kostenplaats_limietperiode").Value ? oRs("prs_kostenplaats_limietperiode").Value : 0);
+                oRs.Close();
+            }
+            // Wijzigen van de kostenplaats(groep)? Setting prs_restrict_kpedit {0=volgens autorisatie (default) | 1=alleen eigen kp/kpg wijzigen}.
+            // WEB_FINMSU rechten of budgethouder.
+            var authparams = user.checkAutorisation("WEB_FINMSU", true);
+            var canChangeAlg = (authparams && authparams.ALGwritelevel < 9);
+            var canChange = (canChangeAlg ||
+                             (S("prs_restrict_kpedit") == 1 && (obj.person == user_key || kpngrp_prs_key == user_key))) // Alleen eigen kp/kpg wijzigen
+            user.auth_required_or_abort(canChange);
+
+            fld.name.readonly = !canChangeAlg;
+            fld.module.readonly = !canChangeAlg;
+            fld.description.readonly = !canChangeAlg;
+            fld.person.readonly = !canChangeAlg;
+            fld.costgroup.readonly = !canChangeAlg;
+            fld.external.readonly = !canChangeAlg;
+            fld.approval.readonly = !canChangeAlg;
+            fld.end.readonly = !canChangeAlg;
+            fld.limitperiod.readonly = kpg_limperiode;
+
+            %>
+                <script type="text/javascript">
+                    // Deze variabelen zijn nodig in prs_kostenplaats.js
+                    var p_kpn_limietperiode = <%=kpn_limietperiode%>;
+                </script>
+            <%
+        }
+
+        this.REST_GET    = generic_REST_GET(this);
+        this.REST_POST   = generic_REST_POST(this);
+        this.REST_PUT    = generic_REST_PUT(this);
+        this.REST_DELETE = generic_REST_DELETE(this);
+    }
 }
 %>

APPL/API2/model_prs_kostenplaatsgrp.inc

@@ -4,7 +4,7 @@
 
     File:           model_prs_kostenplaatsgrp.inc
 
-    Description:    Vanuit CodeCharge gegenereerd model voor prs_kostenplaatsgrp
+    Description:    Model voor prs_kostenplaatsgrp
 
     Context:
 
@@ -48,12 +48,23 @@ function model_prs_kostenplaatsgrp()
             "label": L("lcl_prs_number"),
             "typ": "varchar",
             "translate": true,
-            "required": true,
             "filter": "like"
         },
         "person": {
             "dbs": "prs_perslid_key",
-            "label": L("lcl_prs_budgethouder"),
+            "label": L("prs_kostenplaatsgrp_fiat1_key").format(S("mld_opdr_kpg_fin_limit1")),
+            "typ": "key",
+            "foreign" : "prs_perslid"
+        },
+        "personfiat2": {
+            "dbs": "prs_kostenplaatsgrp_fiat2_key",
+            "label": L("prs_kostenplaatsgrp_fiat2_key").format(S("mld_opdr_kpg_fin_limit1"), S("mld_opdr_kpg_fin_limit2")),
+            "typ": "key",
+            "foreign" : "prs_perslid"
+        },
+        "personfiat3": {
+            "dbs": "prs_kostenplaatsgrp_fiat3_key",
+            "label": L("prs_kostenplaatsgrp_fiat3_key").format(S("mld_opdr_kpg_fin_limit2")),
             "typ": "key",
             "foreign" : "prs_perslid"
         },
@@ -69,9 +80,36 @@ function model_prs_kostenplaatsgrp()
             "LOV":  "0;" + L("lcl_prs_none") +
                    ";1;" + L("lcl_prs_month") +
                    ";2;" + L("lcl_prs_year")
+        },
+        "kpcount": {
+          "dbs": "nn_leden",
+          "sql": "(SELECT COUNT(*) "
+                + "  FROM prs_kostenplaats"
+                + " WHERE prs_kostenplaats.prs_kostenplaatsgrp_key = prs_kostenplaatsgrp.prs_kostenplaatsgrp_key"
+                + "   AND prs_kostenplaats_verwijder IS NULL)",
+          "label": L("lcl_menu_fin_kostenplaatsen"),
+          "readonly": true,
+          "typ": "number"
         }
     };
 
+if (0) {
+        sql = "SELECT SUM(k.prs_kostenplaats_limiet) gebruikt_budget"
+            + "  FROM prs_kostenplaatsgrp kpg"
+            + "     , prs_kostenplaats k"
+            + " WHERE kpg.prs_kostenplaatsgrp_key = k.prs_kostenplaatsgrp_key"
+            + "   AND kpg.prs_kostenplaatsgrp_key = " + kpngroep_key;
+        oRs = Oracle.Execute(sql);
+        var gebruikt_budget = oRs("gebruikt_budget").Value;
+        oRs.close();
+        if (kpngrp_limiet - gebruikt_budget > 0)
+        {
+          BLOCK_START("kpnGrp", L("lcl_prs_budgettering"));
+          ROFIELDTR("fldfreebudget" + (gebruikt_budget > kpngrp_limiet? " hot" : ""), L("lcl_prs_afwijking_budget") + " " + L("lcl_valutasign"), safe.curr(kpngrp_limiet - gebruikt_budget), {suppressEmpty: true});
+          BLOCK_END();
+        }
+}
+
     if (S("bgt_enabled"))
     {
         this.fields["budgetproject"] = {
@@ -90,9 +128,15 @@ function model_prs_kostenplaatsgrp()
     }
 
     this.REST_GET    = generic_REST_GET(this);
-    // Nog even readonly
-    //this.REST_POST   = generic_REST_POST(this);
-    //this.REST_PUT    = generic_REST_PUT(this);
-    //this.REST_DELETE = generic_REST_DELETE(this);
+    this.REST_POST   = generic_REST_POST(this);
+    this.REST_PUT    = function (params, jsondata, the_key)
+                        {
+                            if (prs.exceeds_budgetkps(the_key, jsondata.grouplimit))
+                            { // Is de som van de kostenplaatslimieten(budgetten) lager dan de limiet(budget) van hun kostenplaatsgroep.
+                              abort_with_warning(L("lcl_prs_exceed_limitkpg"));
+                            }
+                            return generic_REST_PUT(this)(params, jsondata, the_key);
+                        }
+    this.REST_DELETE = generic_REST_DELETE(this);
 }
 %>

APPL/API2/model_prs_kostensoort.inc

@@ -35,8 +35,11 @@ function model_prs_kostensoort()
     this.record_title = L("prs_kostensoort");
     this.records_title = L("prs_kostensoort_m");
 
+    var fields_main = {};
+    var fields_ext = {};
 
-    this.fields = {
+
+    fields_main = {
         "id": {
             "dbs": "prs_kostensoort_key",
             "label": L("lcl_key"),
@@ -50,20 +53,16 @@ function model_prs_kostensoort()
             "dbs": "prs_kostensoortgrp_key",
             "label": L("prs_kostensoortgrp_key"),
             "required": true,
-            //"insertonly" : true,
             "typ": "key",
-            "foreign": {
-                "tbl": "prs_kostensoortgrp",
-                "key": "prs_kostensoortgrp_key",
-                "desc": "prs_kostensoortgrp_oms"
-            },
+            "foreign": bgt_costtypegroup_foreign(),
             "LOVinit": "",
             "filter": "exact",
-            "multiedit": true
+            "multiedit": true,
+            "showtransit": true
         },
         "name": {
             "dbs": "prs_kostensoort_oms",
-            "label": L("prs_kostensoort_oms"),
+            "label": (S("bgt_enabled") ? L("prs_kostensoort_opmerking") : L("prs_kostensoort_oms")),
             "typ": "varchar",
             "required": true,  /* proberen */
             "translate": true,
@@ -72,24 +71,24 @@ function model_prs_kostensoort()
         },
         "remark": {
             "dbs": "prs_kostensoort_opmerking",
-            "label": L("prs_kostensoort_opmerking"),
+            "label": (S("bgt_enabled") ? L("prs_kostensoort_oms") : L("prs_kostensoort_opmerking")),
             "typ": "varchar",
             "required": (S("bgt_enabled") ? false : true),
+            "hidden_fld": (S("bgt_enabled") ? true : false),
             "filter": "like"
         },
         "altcode": {
             "dbs": "prs_kostensoort_altcode",
-            "label": L("prs_kostensoort_altcode"),
-            "typ": "varchar"
+            "label": (S("bgt_enabled") ? L("prs_kostensoort_oms") : L("prs_kostensoort_altcode")),
+            "typ": "varchar",
+            "required": (S("bgt_enabled") ? true : false)
         },
-
         "refcode": {
             "dbs": "prs_kostensoort_refcode",
             "label": L("prs_kostensoort_refcode"),
             "typ": "varchar",
             "translate": true
         },
-
         "charge": {
             "dbs": "prs_kostensoort_doorbelasten",
             "label": L("prs_kostensoort_doorbelasten"),
@@ -116,11 +115,7 @@ function model_prs_kostensoort()
             "dbs": "prs_kostenplaats_key",
             "label": L("prs_kostenplaats_key"),
             "typ": "key",
-            "foreign": {
-                "tbl": "prs_kostenplaats",
-                "key": "prs_kostenplaats_key",
-                "desc": "prs_kostenplaats_nr"
-            },
+            "foreign": bgt_account_foreign(),
             "multiedit": true
         }
     };
@@ -128,7 +123,45 @@ function model_prs_kostensoort()
 
     if (S("bgt_enabled")) // alleen voor budgetcontrole
     {
+        // Via Admin moet de context discipline/project toegevoegd worden.
+        fields_ext = {
+            "budgetdiscipline": {
+                "dbs": "bgt_project.ins_discipline_key",
+                "label": L("bgt_discipline_omschrijving"),
+                "typ": "key",
+                "required": true,
+                "foreign": bgt_budgetdiscipline_foreign(),
+                "showtransit": true
+            },
+            "budgetproject": {
+                "dbs": "bgt_project.bgt_project_key",
+                "label": L("bgt_project_omschrijving"),
+                "typ": "key",
+                "required": true,
+                "foreign": bgt_budgetproject_foreign(),
+                "showtransit": true
+            },
+            "budgetcostcategory": {
+                "dbs": "bgt_kostenrubriek.bgt_kostenrubriek_key",
+                "label": L("bgt_kostenrubriek"),
+                "typ": "key",
+                "required": true,
+                "foreign": bgt_budgetcostcategory_foreign(),
+                "showtransit": true
+            },
+            "costcategorycode": {
+                "dbs": "bgt_kostenrubriek.bgt_kostenrubriek_code",
+                "label": L("bgt_kostenrubriek_code"),
+                "typ": "varchar",
+                "readonly": true
+            }
+        };
+        this.fields = object_merge({}, fields_ext, fields_main);
+
         delete this.fields.charge;
+        delete this.fields.refcode;
+        this.fields.inclvat.hidden_fld = true;
+        this.fields.costcentre.label = L("bgt_budget_account");
         this.includes = {
             "budgets": {
                 "model": new model_bgt_budget(),
@@ -136,10 +169,87 @@ function model_prs_kostensoort()
                 "enable_update": true
             }
         };
-        this.print = { xmlnode: "budget", where: "kostensoort"};
+//        this.print = { xmlnode: "budget", where: "kostensoort"};
+
+        this.hook_pre_show = function (obj, fld)
+        {
+            delete this.fields.costcategorycode;
+        }
+
+        this.hook_pre_edit = function (obj, fld)
+        {
+            if ((obj.id > -1) || (obj.costtypegroup && obj.costtypegroup.id > -1))
+            {
+                this.fields.budgetdiscipline.hidden_fld = false;
+                this.fields.budgetdiscipline.readonly = true;
+                this.fields.budgetproject.hidden_fld = false;
+                this.fields.budgetproject.readonly = true;
+                this.fields.budgetcostcategory.hidden_fld = false;
+                this.fields.budgetcostcategory.readonly = true;
+
+                delete this.fields.costcategorycode;
+            }
+
+            if (obj.costtypegroup && obj.costtypegroup.id != -1)
+            {   // Nog even de parent gegevens erbij halen zodat deze readonly getoond worden.
+                var sql = "SELECT p.ins_discipline_key"
+                        + "     , p.bgt_project_key"
+                        + "     , r.bgt_kostenrubriek_key"
+                        + "     , dp.bgt_disc_params_code ||' - '|| di.ins_discipline_omschrijving oms_disc"
+                        + "     , p.bgt_project_code ||' - '|| p.bgt_project_omschrijving oms_proj"
+                        + "     , r.bgt_kostenrubriek_oms oms_rubr"
+                        + "  FROM bgt_disc_params    dp"
+                        + "     , ins_tab_discipline di"
+                        + "     , bgt_project        p"
+                        + "     , bgt_kostenrubriek  r"
+                        + "     , prs_kostensoortgrp g"
+                        + " WHERE dp.bgt_ins_discipline_key = p.ins_discipline_key"
+                        + "   AND di.ins_discipline_key = p.ins_discipline_key"
+                        + "   AND p.bgt_project_key = r.bgt_project_key"
+                        + "   AND r.bgt_kostenrubriek_key = g.bgt_kostenrubriek_key"
+                        + "   AND g.prs_kostensoortgrp_key = " + obj.costtypegroup.id
+                var oRs = Oracle.Execute(sql);
+                if (!oRs.eof)
+                {
+                    obj.budgetdiscipline = {id:oRs("ins_discipline_key").Value, name: oRs("oms_disc").Value};
+                    obj.budgetproject = {id: oRs("bgt_project_key").Value, name: oRs("oms_proj").Value};
+                    obj.budgetcostcategory = {id: oRs("bgt_kostenrubriek_key").Value, name: oRs("oms_rubr").Value};
+                }
+                oRs.Close();
+            }
+            var prj_key = (obj.budgetproject ? obj.budgetproject.id : -1);
+            fld["costcentre"].foreign.tbl = bgt_account_foreign_tbl(prj_key);
+            fld["costcentre"].multiedit = false;
+
+            %>
+            <script type="text/javascript">
+                <% if (obj.budgetdiscipline)   { %> var budgetdiscipline   = "<%=obj.budgetdiscipline.id%>";   <% } %>
+                <% if (obj.budgetproject)      { %> var budgetproject      = "<%=obj.budgetproject.id%>";      <% } %>
+                <% if (obj.budgetcostcategory) { %> var budgetcostcategory = "<%=obj.budgetcostcategory.id%>"; <% } %>
+                <% if (obj.costtypegroup)      { %> var costtypegroup      = "<%=obj.costtypegroup.id%>";      <% } %>
+            </script>
+            <%
+        }
+
+        this.REST_GET = generic_REST_GET(this, {
+            "GET": {
+                "tables": [
+                    "bgt_project",
+                    "bgt_kostenrubriek",
+                    "prs_kostensoortgrp"
+                ],
+                "wheres": [
+                    "bgt_project.bgt_project_key = bgt_kostenrubriek.bgt_project_key",
+                    "bgt_kostenrubriek.bgt_kostenrubriek_key = prs_kostensoortgrp.bgt_kostenrubriek_key",
+                    "prs_kostensoortgrp.prs_kostensoortgrp_key = prs_kostensoort.prs_kostensoortgrp_key"
+                ]
+            }
+        });
+
     }
     else
     {
+        this.fields = fields_main;
         delete this.fields.vat;
         this.includes = {
             "costcombinations": {
@@ -149,10 +259,8 @@ function model_prs_kostensoort()
                 "multiadd": "group"
             }
         };
+        this.REST_GET    = generic_REST_GET(this);
     }
-
-
-    this.REST_GET    = generic_REST_GET(this);
     this.REST_POST   = generic_REST_POST(this);
     this.REST_PUT    = generic_REST_PUT(this);
     this.REST_DELETE = generic_REST_DELETE(this);