Merge Branch2015.2 patches

svn path=/Website/trunk/; revision=27122

APPL/ALG/alg_edit_ruimte.asp

@@ -32,6 +32,7 @@ var cad_ruimte_nr = getQParam("cad_ruimte_nr", "");  // default nummer
 
 
 var room_params = { filter: { id: room_key,
+                              scope: "fe",
                               isNew: (room_key == -1 ? true : false)
                             },
                     include: ["cadcontours"]

APPL/API/shorturl.asp

@@ -59,6 +59,13 @@
         else
             url = known_bookmarks[u].mob || known_bookmarks[u].gui;
         url = rooturl + "/" + url + keyparam;
+
+        if (keyparam > -1)
+        {
+            rest = rest.substring(("k="+keyparam).length+1);
+        }
+        if (rest)
+            url += "&" + rest;
     }
     else
     {

APPL/API2/model_res_ruimte.inc

@@ -63,7 +63,8 @@ function model_res_ruimte()
                 "key": "alg_locatie_key",
                 "desc": "MIN(alg_locatie_code)",
                 "selectorforeign": "ALG_LOCATIE"
-            }
+            },
+            "foreignfiltercode": null // Ook facilitor irrelevant
         },
         "catalog": {
             "dbs": "res_discipline_key",
@@ -81,14 +82,14 @@ function model_res_ruimte()
         "open": {
             "dbs": "res_ruimte_begintijd",
             "label": L("res_ruimte_begintijd"),
-            "typ": "key",
+            "typ": "float",
             "LOV": api2.getTimetable(),
             "emptyoption": "Standaard"
         },
         "close": {
             "dbs": "res_ruimte_eindtijd",
             "label": L("res_ruimte_eindtijd"),
-            "typ": "key",
+            "typ": "float",
             "LOV": api2.getTimetable(),
             "emptyoption": "Standaard"
         },

APPL/API2/model_res_srtartikel_onrgoed.inc

@@ -72,7 +72,8 @@ function model_res_srtartikel_onrgoed()
                 "desc": "alg_plaatsaanduiding",
                 "where": "alg_onroerendgoed_type = res_srtartikel_onrgoed.alg_onrgoed_niveau",
                 "selectorforeign": "ALG_RUIMTE"
-            }
+            },
+            "foreignfiltercode": null // Ook facilitor irrelevant
         }
     };
 

APPL/API2/model_rooms.inc

@@ -88,7 +88,7 @@ function model_rooms(room_key, params)
     function _check_authorization (params, method)
         {
             params.message = "";
-            var autfunction = "WEB_ALGMAN";
+            var autfunction = (params.filter.scope == "fe"? "WEB_ALGUSE" : "WEB_ALGMAN");
             params.authparams = user.checkAutorisation(autfunction, null, null, true); // pessimistisch
 
             switch (method)

APPL/CAD/legenda.asp

@@ -186,8 +186,6 @@
             + " WHERE ti.CAD_LEGENDA_KEY = " + legenda_key
             + " ORDER BY fac.safe_to_number(CAD_LEGENDAWAARDE_VALUE)" // Numeriek sorteren!
     oRs = Oracle.Execute(sql)
-    if (!oRs.EOF)
-   {
 %>
     <TR>
         <td colspan='2'><span class='legendatitel'><%=legendaOmschrijving%></span>
@@ -200,7 +198,6 @@
         </td>
     </TR>
 <%
-    }
       v_count   = "";
       while (!oRs.EOF)
       {

APPL/CNT/cnt.inc

@@ -59,6 +59,7 @@ cnt = { setcontractstatus:
                   + "   FROM cnt_contract_object co"
                   + "      , ins_deel d"
                   + "  WHERE co.cnt_ins_deel_key = d.ins_deel_key"
+                  + "    AND d.ins_alg_locatie_key IS NOT NULL"
                   + " UNION ALL"
                   + " SELECT co.cnt_contract_key"
                   + "      , g.alg_locatie_key"
@@ -501,7 +502,9 @@ cnt = { setcontractstatus:
             var loc_arr = [];
             while (!oRs_loc.eof)
             {
-              loc_arr.push(oRs_loc("alg_locatie_key").Value);
+              var ors_loc_key = oRs_loc("alg_locatie_key").Value;
+              if (ors_loc_key) // Geen lege waarden toevoegen!
+                loc_arr.push(ors_loc_key);
               oRs_loc.MoveNext();
             }
 

APPL/INS/ins_list.inc

@@ -584,8 +584,7 @@ function ins_list (pautfunction, params)
                               + "        SELECT RANK ()" // volgnummertje toekennen
                               + "                  OVER ("
                               + "                     PARTITION BY di.ins_deel_key, idsc.ins_srtcontrole_key" // soort van group-by
-                              + "                     ORDER BY"
+                              + "                     ORDER BY ins_deelsrtcontrole_datum DESC) rn"  // Op volgorde zetten/Rangschikken/Sorteren op inspectiedatum.
-                              + "                        ins_deelsrtcontrole_datum_org + ins_srtcontrole_periode DESC) rn"
                               + "             , di.ins_deel_key"
                               + "             , COALESCE(xcp.ins_srtcontroledl_xcp_respijt,"
                                 + "                      fac.nextcyclusdate(CASE"

APPL/MLD/mld_melding.asp

@@ -65,6 +65,16 @@ if (mld_key > 0)
 {
   var mld_info = mld.mld_melding_info(mld_key);
   var mfe = mld.func_enabled_melding (mld_key); // heb ik uberhaubt leesrechten
+
+  if (urole == "xx") // Voor als je via de shorturl binnen komt.
+  {
+    var authparamsMLDFOF = user.checkAutorisation("WEB_MLDFOF", true, mld_info.disc);
+
+    if (authparamsMLDFOF)
+      urole = "fo";
+    else
+      urole = "fe";
+  }
 }
 
 if (mld_key == -1 || copy)

APPL/PRS/prs_locdienst_list.asp

@@ -105,7 +105,7 @@ function fnrowData(oRs)
             + (locatie_key != -1 ? " AND l.alg_locatie_key = " + locatie_key : "")
             + (dloc_key != -1 ? " AND dl.prs_bedrijfdienstlocatie_key = " + dloc_key : "")
             + ")"
-            + " ORDER BY prs_bedrijf_naam_upper, UPPER(" + lcl.xsql('prs_dienst_omschrijving', 'd.prs_dienst_key') + "), alg_locatie_upper";
+            + " ORDER BY prs_bedrijf_naam_upper, 3, alg_locatie_upper";
 
     var buttons = [];
 

APPL/RES/res.inc

@@ -497,7 +497,7 @@ res = {
 
          var exp_time = oRs("res_disc_params_expire_tijd").Value;
          var exp_datum = new Date(oRs("datum").Value);
-         if (exp_time)
+         if (exp_time > 0) // BLCC#34448: hij is nog wel eens -1
          {
            var now = (new Date).getFloatHours();
            if (now > exp_time) // (exp_time rol A)