PNBR#91355: Foutmelding bij openen bestelvoorraad via menubalk.

svn path=/Website/branches/v2025.3/; revision=70961

APPL/BES/bes_search.js

@@ -53,6 +53,7 @@ function updateDisc(pautfunction, pdisc, psrtgroup, psrtdeel)
                         disctype: ldisctype,
                         module: "bes",
                         emptyOption: "",
+                        selectjustone: 1,
                         disc_key_arr: (pdisc? pdisc : []) }),
                       function ()
                       { // Selecteer eventueel de initi<74>le items die meegegeven kunnen worden
@@ -68,6 +69,7 @@ function updateSrtGroup(pautfunction, psrtgroup, psrtdeel)
                         disc_key_arr: ldis_key,
                         module: "bes",
                         emptyOption: "",
+                        selectjustone: 1,
                         srtgroup: (psrtgroup? psrtgroup : []) }),
                       function ()
                       { // Selecteer eventueel de initi<74>le items die meegegeven kunnen worden
@@ -84,6 +86,7 @@ function updateSrtDeel(pautfunction, psrtdeel)
       srtgroup_key_arr: lsrtgroup,
       module: "bes",
       emptyOption: "",
+      selectjustone: 1,
       srtdeel: (psrtdeel? psrtdeel : []),
       verwijderd: (maninfo ? 1 : ""),
       datefrom: (maninfo ? $('#date_from').val() : "")

APPL/BES/bes_voorraad_search.asp

@@ -99,7 +99,17 @@ var authparams = user.checkAutorisation(autfunction);
                   + "           END) aantal_actueel"
                   + "  FROM bes_discipline bd"
                   + "     , bes_disc_params dp"
-                  + " WHERE bd.ins_discipline_key = dp.bes_ins_discipline_key";
+                  + " WHERE bd.ins_discipline_key = dp.bes_ins_discipline_key"
+                  + "   AND bd.ins_discipline_verwijder IS NULL"
+                  + "   AND bd.ins_discipline_key IN (SELECT dp.bes_ins_discipline_key_inkoop"
+                    + "                                 FROM bes_disc_params dp"
+                    + "                                WHERE dp.bes_ins_discipline_key_inkoop IS NOT NULL)"
+                  + "   AND ins_discipline_key IN (SELECT ins_discipline_key"
+                    + "                              FROM fac_v_webgebruiker g"
+                    + "                                 , fac_functie f"
+                    + "                             WHERE g.prs_perslid_key = " + user_key
+                    + "                               AND f.fac_functie_key = g.fac_functie_key "
+                    + "                               AND f.fac_functie_code = " + safe.quoted_sql(autfunction) + ")";
           var oRs = Oracle.Execute(sql);
           var aantal_uitcat = oRs("aantal_uitcat").Value;   // Uit catalogus(0).
           var aantal_vrij = oRs("aantal_vrij").Value;       // Vrij aanmaken(1).
@@ -123,6 +133,7 @@ var authparams = user.checkAutorisation(autfunction);
                          onChange: 'updateDisc("' + autfunction + '");', // discChanged
                          trclass: "primsearch",
                          emptyOption: "",
+                         selectjustone: true, // required zorgt er eigenlijk ook al voor dat als er maar 1 waarde is, dat deze wordt geselecteerd.
                          required: true
                        });
 
@@ -147,7 +158,8 @@ var authparams = user.checkAutorisation(autfunction);
                          label: L("lcl_bes_Catalogus"),
                          onChange: 'updateSrtGroup("' + autfunction + '");', // discChanged
                          trclass:"primsearch",
-                         emptyOption: ""
+                         emptyOption: "",
+                         selectjustone: true
                        });
                        %>
 
@@ -158,7 +170,8 @@ var authparams = user.checkAutorisation(autfunction);
                          label: L("lcl_bes_srtgroup"),
                          onChange: 'updateSrtDeel("' + autfunction + '");', // srtgroupChanged
                          trclass: "secsearch",
-                         emptyOption: ""
+                         emptyOption: "",
+                         selectjustone: true
                        }); %>
 
           <!-- Item select box -->
@@ -167,14 +180,15 @@ var authparams = user.checkAutorisation(autfunction);
                        { initKey: srtdeel,
                          label: L("lcl_bes_srtdeel"),
                          trclass: "secsearch",
-                         emptyOption: ""
+                         emptyOption: "",
+                         selectjustone: true
                        }); %>
           <script type="text/javascript">
             // Laad de groupen en de items
             // Selecteer eventueel de initi<74>le groepen en items die meegegeven kunnen worden
             $(function()
             {
-              updateDisc("<%=autfunction%>", "<%=disc%>", "<%=srtgroup%>", "<%=srtdeel%>");
+             updateDisc("<%=autfunction%>", "<%=disc%>", "<%=srtgroup%>", "<%=srtdeel%>");
             });
           </script>
 <%      SEARCH_BLOCK_END();

APPL/Shared/loadBESDisc.asp

@@ -19,6 +19,7 @@ var autfunction_arr  = getQParamArray("autfunction", []); // Check of user recht
 var disctype  = getQParamInt("disctype", -1);             // Vakgroeptype.
 var disc_key_arr = getQParamIntArray("disc_key_str", []); // Vakgroep Array.
 var offerte = getQParamInt("offerte", -1);
+var selectjustone =  getQParamInt("selectjustone", 0) == 1;
 
 var discsql_aut = "SELECT ins_discipline_key"
                 + "  FROM fac_v_webgebruiker g"
@@ -51,7 +52,8 @@ var discsql = "SELECT bd.ins_discipline_key"
 FCLTselectorOptions(discsql,
                     { initKey: disc_key_arr.join(","),
                       onChange: 'updateSrtGroup("' + autfunction_arr.join(",") + '");',
-                      emptyOption: (disc_key_arr.length == 0 ? L("lcl_search_generic") : null) // Als een disc_key_arr is meegegeven dan geen lege optie
+                      emptyOption: (disc_key_arr.length == 0 ? L("lcl_search_generic") : null), // Als een disc_key_arr is meegegeven dan geen lege optie
+                      selectjustone: selectjustone? true : false
                     });
 %>
 mo

APPL/Shared/loadGroup.asp

@@ -20,6 +20,7 @@ var module = getQParam("module", ""); // Module die de ins_srtgroep-en opvraagt
 var multi = (getQParamInt("multi", 0) == 1);
 var size = getQParamInt("size", 4);
 var emptyOption = getQParam("emptyOption", null);
+var selectjustone =  getQParamInt("selectjustone", 0) == 1;
 var selectfirstone = (getQParamInt("selectfirstone", 0) == 1);
 var onChange = getQParam("onChange", "");
 var required = (getQParamInt("required", 0) == 1);
@@ -56,10 +57,12 @@ var params = { initKey: srtgroup_arr.join(","),
 
 if (emptyOption != null)
   params.emptyOption = emptyOption;
+if (selectjustone)
+  params.selectjustone = selectjustone;
 if (selectfirstone)
   params.selectfirstone = selectfirstone;
 
 FCLTselectorOptions(sql,
                     params);
 %>
-<% ASPPAGE_END(); %> 
+<% ASPPAGE_END(); %>

APPL/Shared/loadSrtDeel.asp

@@ -23,6 +23,7 @@ var module = getQParam("module", ""); // Module die de ins_srtgroep-en opvraagt
 var multi = (getQParamInt("multi", 0) == 1);
 var size = getQParamInt("size", 4);
 var emptyOption = getQParam("emptyOption", null);
+var selectjustone =  getQParamInt("selectjustone", 0) == 1;
 var selectfirstone = (getQParamInt("selectfirstone", 0) == 1);
 var extraParamValue = getQParam("extraParamValue", "");
 var required = (getQParamInt("required", 0) == 1);
@@ -92,6 +93,8 @@ if (extraParamValue != "")
   params.extraParamValue = extraParamValue;
 if (emptyOption != null)
   params.emptyOption = emptyOption;
+if (selectjustone)
+  params.selectjustone = selectjustone;
 if (selectfirstone)
   params.selectfirstone = selectfirstone;