TWYN#54916 multiselectie verdwenen

svn path=/Website/branches/v2018.1/; revision=39476

APPL/FAC/fac_usrrap_list.asp

@@ -138,6 +138,7 @@ if (!nohtml) {
     //      of op waarden vanuit fac_usrrap_infobord
     sql_where = "";
     sql_cond = " WHERE ";
+    sql_column = "";
     var i = 1;
     var xxx_versienummer = "";
     while (getQParam("fclt_f_colname" + i, "") != "")
@@ -145,31 +146,38 @@ if (!nohtml) {
         var p_col_name = getQParam("fclt_f_colname" + i);
         usrrap.requireFilterCol(p_tableName, p_col_name); // Safety check
 
-        // als het textveld niet gevuld is moeten we misschien de listbox waarde gebruiken
-        if (getQParam("fclt_f_colvalue" + i + "_l", "") != "")
-            var p_col_value = "" + getQParam("fclt_f_colvalue" + i + "_l");
-        else
-            var p_col_value = "" + getQParam("fclt_f_colvalue" + i, "");
+        // Multiselect
+        // En als de listbox niet gevuld is moeten we misschien de textveld waarde gebruiken
+        var p_col_value_arr = getQParamArray("fclt_f_colvalue" + i + "_l", []);
+        if (!p_col_value_arr.length)
+            p_col_value_arr.push(getQParam("fclt_f_colvalue" + i, ""));
 
-        if (p_col_value != "")
+        sql_column = "";
+        for (j=0; j<p_col_value_arr.length; j++)
         {
-            if (S("bgt_extra_report_param") && p_col_name == "versienummer")
+            var p_col_value = "" + p_col_value_arr[j]
+
+            if (p_col_value != "")
             {
-                xxx_versienummer = p_col_value;
-            }
-            else
-            {
-                if (p_col_value == "null")
-                    sql_where = sql_where + sql_cond + p_col_name + " IS NULL";
-                else if (p_col_name.match(/_key$/i))
-                    sql_where = sql_where + sql_cond + p_col_name + "=" + parseInt(p_col_value, 10);
+                if (S("bgt_extra_report_param") && p_col_name == "versienummer")
+                {
+                    xxx_versienummer = p_col_value;
+                }
                 else
-                    sql_where = sql_where + sql_cond + "UPPER(" + p_col_name + ") like " + safe.quoted_sql_wild(p_col_value);
-                sql_cond = " and ";
-                safeShowFilter += "<tr><td class='formheader'>" + safe.html(p_col_name.substring(7)) + "</td>"
-                                + "<td>" + safe.html(p_col_value) + "</td></tr>";
+                {
+                    if (p_col_value == "null")
+                        sql_column = (j > 0 ? " OR " : "") + p_col_name + " IS NULL";
+                    else if (p_col_name.match(/_key$/i))
+                        sql_column = (j > 0 ? " OR " : "") + p_col_name + "=" + parseInt(p_col_value, 10);
+                    else
+                        sql_column = (j > 0 ? " OR " : "") + "UPPER(" + p_col_name + ") like " + safe.quoted_sql_wild(p_col_value);
+                    safeShowFilter += "<tr><td class='formheader'>" + safe.html(p_col_name.substring(7)) + "</td>"
+                                    + "<td>" + safe.html(p_col_value) + "</td></tr>";
+                }
             }
         }
+        sql_where = sql_where + sql_cond + "(" + sql_column + ")";
+        sql_cond = " and ";
         i++;
     }
 

APPL/FAC/fac_usrrap_search.asp

@@ -106,7 +106,7 @@ var fac_usrrap = usrrap.fac_usrrap_info(usrrap_key);
                 <label><%=safe.html(col.caption)%>:</label>
               </td>
               <td>
-                  <input class="fldusrfilter" type="text"
+                  <input class="fld" type="text"
                          id="<%="fclt_f_colvalue"+ nr_charcols%>" name="<%="fclt_f_colvalue"+ nr_charcols%>">
                   <select id="<%="fclt_f_colvalue" + nr_charcols + "_l"%>"
                           name="<%="fclt_f_colvalue" + nr_charcols + "_l"%>"

APPL/FAC/fac_usrrap_search.js

@@ -40,6 +40,8 @@
       if (txtObject.style.display == "none") // reset normal textbox
       {
           txtObject.disabled = false; // Textveld wordt weer zichtbaar en moet worden gesubmit
+          $("#"+lstObject.id).prev().remove(); // de wrapper DIV moet verwijderd worden
+          $("#"+lstObject.id).unwrap();
           $(txtObject).show().val("");
           lstObject.style.display = 'none';
           lstObject.disabled = true; // Selectbox wordt hidden en moet niet meer worden gesubmit
@@ -52,17 +54,19 @@
           $(txtObject).show().val("Please wait");
           document.getElementById(objid+"_q").disabled = true;
           g_objid = objid;
+          $("#" + lstObject.id).multiSelectToggle();
           // Haal de waarden van de ingevulde filtervelden op
           filledListboxParams = getFilledListboxParams();
           // Aantal meegezonden waarden ook als parameter meegeven
           filledListboxParams.push({name: "aantalcolvalue", value: filledListboxParams.length/2});
-          $.getJSON("fac_usrrap_worker.asp?colname="+colname+"&usrrap_key="+usrrap_key,
+          $.getJSON("fac_usrrap_worker.asp?colname="+colname+"&usrrap_key="+usrrap_key+"&distinct=" + colname,
                     filledListboxParams, // Ingevulde filterwaarden
                     process_worker_info);
       }
   }
 
   // Called by onLoad of repWorker.asp
+
   function process_worker_info(data)
   {
       document.getElementById(g_objid).style.display = 'none';
@@ -97,4 +101,3 @@
       document.body.style.cursor = "auto";
       FcltMgr.resized(); // listbox is enkele pixels hoger dan de inputbox
   }
-