PNBR#34712 overzicht bestelopdrachten

svn path=/Website/trunk/; revision=27922
2016-01-26 13:16:08 +00:00
parent 036301ca88
commit cefc074154
7 changed files with 95 additions and 101 deletions
--- a/APPL/BES/bes_search.asp
+++ b/APPL/BES/bes_search.asp
@@ -40,6 +40,9 @@
 <!-- #include file="../Shared/afdelingselector.inc" -->
 <!-- #include file="../Shared/bedrijfselector.inc" -->
 <!-- #include file="../Shared/persoonselector.inc" -->
+<!-- #include file="../Shared/disciplineselector.inc" -->
+<!-- #include file="../Shared/srtgroepselector.inc" -->
+<!-- #include file="../Shared/srtdeelselector.inc" -->
 <!-- #include file="bes.inc" -->

 <%
@@ -236,67 +239,62 @@ oRs.Close();
            }

            if (!frontend)
-            { // <!-- Catalogus -->
-              sql = "SELECT ins_discipline_key"
-                  + ", "+ lcl.xsqla('ins_discipline_omschrijving','ins_discipline_key')
-                  + " FROM bes_v_aanwezigdiscipline"
-                  + " WHERE 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) + ") "
-                  + " ORDER BY "+ lcl.xsql('ins_discipline_omschrijving','ins_discipline_key') +" ASC";
-              FCLTselector("disc",
-                           sql,
-                           { initKey: disc,
-                             label: L("lcl_bes_Catalogus"),
-                             onChange: 'updateSrtGroup("' + autfunction + '");', // discChanged
-                             trclass:"primsearch",
-                             emptyOption: ""
-                           });
-              // <!-- Groep -->
-              FCLTselector("srtgroup",
-                           "", // sql: lege selectbox die onload wordt geladen
-                           { initKey: srtgroup,
-                             label: L("lcl_bes_srtgroup"),
-                             onChange: 'updateSrtDeel("' + autfunction + '");', // srtgroupChanged
-                             trclass: "secsearch",
-                             emptyOption: ""
-                           });
-              // <!-- Item select box -->
-              FCLTselector("srtdeelmulti",
-                           "", // sql: lege selectbox die onload wordt geladen
-                           { initKey: srtdeel,
-                             label: L("lcl_bes_srtdeel"),
-                             trclass: "secsearch",
-                             emptyOption: ""
-                           });
-%>
-              <script type="text/javascript">
-                // Laad de groupen en de items
-                // Selecteer eventueel de initi<74>le groepen en items die meegegeven kunnen worden
-                $(document).ready(function()
            {
-                                    updateSrtGroup("<%=autfunction%>", "<%=srtgroup%>", "<%=srtdeel%>");
+              // Catalogus
+              FCLTdisciplineselector("disc",
+                                     "sgDisc",
+                                     { label: L("lcl_bes_Catalogus"),
+                                       module: "BES",
+                                       disc_key: disc,
+                                       srtdisc_key: null,
+                                       perslidKey: user_key,
+                                       autfunctionKey: authparams.autfunctionkey,
+                                       trclass: "primsearch",
+                                       onChange: "onChangeDiscipline",
+                                       whenEmpty: L("lcl_search_generic")  // want filter
                                     });
-              </script>
-<%          } %>
+              //Groep
+              FCLTsrtgroepselector("srtgroep",
+                                   "sgSrtgroep",
+                                   { label: L("lcl_obj_group"),
+                                     module: "BES",
+                                     srtgroep_key: srtgroup,
+                                     autfunction: autfunction,
+                                     trclass: "secsearch",
+                                     onChange: "onChangeSrtgroep",
+                                     urlAdd: [{urlParam: "disc_key", field: "disc"}],
+                                     whenEmpty: L("lcl_search_generic")  // want filter
+                                   });
+              // Item select box
+              FCLTsrtdeelselector("srtdeel",
+                                  "sgSrtdeel",
+                                  { label: L("lcl_bes_srtdeel"),
+                                    module: "BES",
+                                    srtdeel_key: srtdeel,
+                                    autfunction: autfunction,
+                                    trclass: "secsearch",
+                                    onChange: "onChangeSrtdeel",
+                                    urlAdd: [{urlParam: "srtgroep_key", field: "srtgroep"},
+                                             {urlParam: "disc_key", field: "disc"}],
+                                    whenEmpty: L("lcl_search_generic")  // want dit is een filter
+                                  });
+            }

-<%          if (!frontend)
-            { %>
-<%            if (fronto || backo)
-              { %>
+            if (!frontend)
+            {
+              if (fronto || backo)
+              {
+%>
                <!-- Item input box -->
                <tr class="secsearch">
                  <td class="label"><label for="item"><%=L("lcl_bes_srtdeel_zoek")%>:</label></td>
                  <td><input type="text" class="flditem" name="item" value="<%=safe.htmlattr(item)%>">
                </tr>
-<%            } %>
-<%          } %>
+<%
+              }
+            }

-<%          if (minfo)
+            if (minfo)
            { // <!-- Groepering1 -->
                sql = "SELECT 12, '', 0 FROM DUAL"
                    + " UNION SELECT 0, '" + L("lcl_bes_RFOs") + "', 1 FROM DUAL"
--- a/APPL/BES/bes_search.js
+++ b/APPL/BES/bes_search.js
@@ -65,3 +65,43 @@ function updateSrtDeel(pautfunction, psrtdeel)
                          });
 }

+function onChangeDiscipline()
+{
+  sgSrtgroep.setValue(-1, "", true, false, null, true);
+  sgSrtgroep.CheckJustOne();
+}
+
+function onChangeSrtgroep(srtgroep_key)
+{ // Zet de discipline indien niet ingevuld.
+  if (srtgroep_key > 0 && $("#disc").val() <= 0 && typeof sgDisc != "undefined")
+  {
+    $.getJSON("../Shared/get_bes_info.asp",
+              { srtgroep_key: srtgroep_key },
+                callback_bes_info);
+  }
+  sgSrtdeel.setValue(-1, "", true, false, null, true);
+  sgSrtdeel.CheckJustOne();
+}
+
+function onChangeSrtdeel(srtdeel_key)
+{ // Zet de soortgroep indien niet ingevuld.
+  if (srtdeel_key > 0 && $("#srtgroep").val() <= 0 && typeof sgSrtgroep != "undefined")
+  {
+    jQuery.ajaxSetup({async: false});
+    $.getJSON("../Shared/get_bes_info.asp",
+              { srtdeel_key: srtdeel_key },
+                callback_bes_info);
+    jQuery.ajaxSetup({async: true});
+  }
+}
+
+function callback_bes_info(data, textStatus, jqXHR)
+{ // Zet de discipline indien niet ingevuld
+  // setValue(key, txt, doonChange, checkExist, extraParam, lastTry)
+  if ($("#disc").val() == -1)
+    sgDisc.setValue(data.disc_key, data.disc_omschr, false /*doonChange*/, true /*checkExist*/);
+  if ($("#srtgroep").val() == -1)
+    sgSrtgroep.setValue(data.srtgroep_key, data.srtgroep_omschr, false /*doonChange*/, true /*checkExist*/);
+  if ($("#srtdeel").val() == -1)
+    sgSrtdeel.setValue(data.srtdeel_key, data.srtdeel_omschr, false /*doonChange*/, true /*checkExist*/);
+}
--- a/APPL/BES/opdr_search.asp
+++ b/APPL/BES/opdr_search.asp
@@ -12,7 +12,6 @@
 <!-- #include file="../Shared/afdelingselector.inc" -->
 <!-- #include file="../Shared/bedrijfselector.inc" -->
 <!-- #include file="../Shared/persoonselector.inc" -->
-
 <!-- #include file="../Shared/disciplineselector.inc" -->
 <!-- #include file="../Shared/srtgroepselector.inc" -->
 <!-- #include file="../Shared/srtdeelselector.inc" -->
@@ -74,49 +73,6 @@ oRs.Close();
 <html>
  <head>
 <%  FCLTHeader.Generate(); %>
-    <script>
-      function onChangeDiscipline()
-      {
-        sgSrtgroep.setValue(-1, "", true, false, null, true);
-        sgSrtgroep.CheckJustOne();
-      }
-
-      function onChangeSrtgroep(srtgroep_key)
-      { // Zet de discipline indien niet ingevuld.
-        if (srtgroep_key > 0 && $("#disc").val() <= 0 && typeof sgDisc != "undefined")
-        {
-          $.getJSON("../Shared/get_bes_info.asp",
-                    { srtgroep_key: srtgroep_key },
-                      callback_bes_info);
-        }
-        sgSrtdeel.setValue(-1, "", true, false, null, true);
-        sgSrtdeel.CheckJustOne();
-      }
-
-      function onChangeSrtdeel(srtdeel_key)
-      { // Zet de soortgroep indien niet ingevuld.
-        if (srtdeel_key > 0 && $("#srtgroep").val() <= 0 && typeof sgSrtgroep != "undefined")
-        {
-          jQuery.ajaxSetup({async: false});
-          $.getJSON("../Shared/get_bes_info.asp",
-                    { srtdeel_key: srtdeel_key },
-                      callback_bes_info);
-          jQuery.ajaxSetup({async: true});
-        }
-      }
-
-      function callback_bes_info(data, textStatus, jqXHR)
-      { // Zet de discipline indien niet ingevuld
-        // setValue(key, txt, doonChange, checkExist, extraParam, lastTry)
-        if ($("#disc").val() == -1)
-          sgDisc.setValue(data.disc_key, data.disc_omschr, false /*doonChange*/, true /*checkExist*/);
-        if ($("#srtgroep").val() == -1)
-          sgSrtgroep.setValue(data.srtgroep_key, data.srtgroep_omschr, false /*doonChange*/, true /*checkExist*/);
-        if ($("#srtdeel").val() == -1)
-          sgSrtdeel.setValue(data.srtdeel_key, data.srtdeel_omschr, false /*doonChange*/, true /*checkExist*/);
-      }
-
-    </script>
  </head>

  <body id="searchbody">
--- a/APPL/Shared/Suggest/srtdeelFilter.inc
+++ b/APPL/Shared/Suggest/srtdeelFilter.inc
@@ -21,7 +21,7 @@ function getFiltClauseSrtdeel(pfiltcode, params) // pfiltcode not used yet
  {
    lfiltClause.from = ", " + module + "_discipline id";
    lfiltClause.where = " AND sg.ins_discipline_key = id.ins_discipline_key"
-                      + " AND id.ins_discipline_module = '" + module + "'"
+                      + " AND id.ins_discipline_module = " + safe.quoted_sql(module)
                      + (module == "INS"
                        ? " AND sg.ins_srtgroep_key NOT IN (" + S("sle_ins_srt_groep_key") + ", " + S("cil_ins_srt_groep_key") + ")"
                        : ""
--- a/APPL/Shared/Suggest/srtgroepFilter.inc
+++ b/APPL/Shared/Suggest/srtgroepFilter.inc
@@ -21,7 +21,7 @@ function getFiltClauseSrtgroep(pfiltcode, params) // pfiltcode not used yet
  // Indien ook alleen sleutelsets/cilinderssets getoond dienen te worden dan extra parameter module invoeren (params.module == "INS", params.module == "SLE")
  // Vooralsnog volstaat uitsluiting van sleutelsets/cilinderssets:
  lfiltClause += " AND sg.ins_discipline_key = td.ins_discipline_key"
-               + " AND td.ins_discipline_module = '" + module + "'"
+               + " AND td.ins_discipline_module = " + safe.quoted_sql(module)
               + (module == "INS"
                 ? " AND sg.ins_srtgroep_key NOT IN (" + S("sle_ins_srt_groep_key") + ", " + S("cil_ins_srt_groep_key") + ")"
                 : ""