TWYN#53903 Totaaloverzicht en Overzicht rubrieken deelproject 3 Stadhuis

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

APPL/API2/model_reportcolumns.inc

@@ -200,12 +200,18 @@ function model_reportcolumns(usrrap_key, params)
     this._view2columns = function (usrrap_key, lastrefresh, oldcols)
         {
             var sql = "SELECT fac_usrrap_view_name"
+                    + "     , SUBSTR(fac_usrrap_view_name, INSTR(fac_usrrap_view_name, '.')+1) viewname"
+                    + "     , CASE WHEN INSTR(fac_usrrap_view_name, '.') > 0 THEN fac_usrrap_view_name ELSE NULL END procname"
                     + "     , fac_usrrap_functie"
                     + "  FROM fac_usrrap"
                     + " WHERE fac_usrrap_key = " + usrrap_key;
             var oRs = Oracle.Execute(sql);
-            var view_name = oRs("fac_usrrap_view_name").Value;
+            var view_name = oRs("viewname").Value;
             var is_view_name = (oRs("fac_usrrap_functie").Value & 2) == 0;  // niet de procedures
+            if (oRs("fac_usrrap_functie").Value == 3) // procedure + gestyled
+            {
+                is_view_name = true;
+            }
             oRs.Close();
 
             if (!is_view_name) return;

APPL/FAC/fac_usrrap_list.asp

@@ -139,6 +139,7 @@ if (!nohtml) {
     sql_where = "";
     sql_cond = " WHERE ";
     var i = 1;
+    var xxx_versienummer = "";
     while (getQParam("fclt_f_colname" + i, "") != "")
     {
         var p_col_name = getQParam("fclt_f_colname" + i);
@@ -149,7 +150,14 @@ if (!nohtml) {
             var p_col_value = "" + getQParam("fclt_f_colvalue" + i + "_l");
         else
             var p_col_value = "" + getQParam("fclt_f_colvalue" + i, "");
+
         if (p_col_value != "")
+        {
+            if (S("bgt_extra_report_param") && p_col_name == "versienummer")
+            {
+                xxx_versienummer = p_col_value;
+            }
+            else
             {
                 if (p_col_value == "null")
                     sql_where = sql_where + sql_cond + p_col_name + " IS NULL";
@@ -161,6 +169,7 @@ if (!nohtml) {
                 safeShowFilter += "<tr><td class='formheader'>" + safe.html(p_col_name.substring(7)) + "</td>"
                                 + "<td>" + safe.html(p_col_value) + "</td></tr>";
             }
+        }
         i++;
     }
 
@@ -255,7 +264,7 @@ else
         try { stmt.Properties("PLSQLRSet") = false; } catch (e) { /* nodig voor OLEDB, error bij MSDAORA */ };
     }
     else { // Stored Procedure voor XML/XSL rapportage
-        sql_where = user_key + "#" + dt1 + "#" + dt2 // GEEN echte where-clause, maar om door te geven in make_xml (fac_pacx.src) en daar te parsen
+        sql_where = user_key + "#" + dt1 + "#" + dt2 + (sql_where?"#" + sql_where:"")// GEEN echte where-clause, maar om door te geven in make_xml (fac_pacx.src) en daar te parsen
     }
 }
 
@@ -284,7 +293,15 @@ else { // In alle andere gevallen, dus normaliter (bij gevulde oRs) zijn dat nog
                 <div>
                 <%
                   }
-                    FCLT2XMLResponse ({xmlnode: 'rapport', key: usrrap_key, mode: mode, where: sql_where});
+                    if (S("bgt_extra_report_param"))
+                    {
+                        FCLT2XMLResponse ({xmlnode: "rapport", key: usrrap_key, mode: mode, where: sql_where, title: xxx_versienummer});
+                    }
+                    else
+                    {
+                        FCLT2XMLResponse ({xmlnode: "rapport", key: usrrap_key, mode: mode, where: sql_where});
+                    }
+
                 if(!nohtml) {
                 %>
                 </div>

APPL/FAC/fac_usrrap_search.asp

@@ -25,6 +25,7 @@
 <!-- #include file="../Shared/iface.inc" -->
 <!-- #include file="../Shared/calendar.inc" -->
 <!-- #include file="fac_usrrap.inc" -->
+<!-- #include file="../shared/json2.js" -->
 
 <%
 FCLTHeader.Requires ({ plugins: ["jQuery"],
@@ -121,15 +122,38 @@ var fac_usrrap = usrrap.fac_usrrap_info(usrrap_key);
               </td>
             </tr>
 
+<%        }
+          if (col.filter == "E") // Exactfilter
+          {
+              nr_charcols++;
+%>
+            <tr>
+              <td class="label">
+                <label><%=safe.html(col.caption)%>:</label>
+              </td>
+              <td>
+                  <input class="fldusrfilter" type="text" id="<%="fclt_f_colvalue"+ nr_charcols%>" name="<%="fclt_f_colvalue"+ nr_charcols%>">
+                  <input type="hidden" id="<%="fclt_f_colname" + nr_charcols%>" name="<%="fclt_f_colname" + nr_charcols%>" value="<%=col.column_name%>">
+              </td>
+            </tr>
 <%        }
         }
         if (fac_usrrap.vraagbegindatum)
         {
-          FCLTcalendar ("s_date", {initEmpty: 1, label: L("lcl_from"), volgnr: 1, required: true})
+          FCLTcalendar ("s_date", {initEmpty: 1, label: L("lcl_from"), volgnr: 1, required: !S("bgt_enabled")})
         }
         if (fac_usrrap.vraageinddatum)
         {
-          FCLTcalendar ("e_date", {initEmpty: 1, label: L("lcl_to"), volgnr: 2, required: true})
+          var calendar_params = {label: L("lcl_to"), volgnr: 2, required: !S("bgt_enabled")};
+          if (S("bgt_enabled"))
+          {
+              calendar_params.datum = new Date();
+          }
+          else
+          {
+              calendar_params.initEmpty = 1;
+          }
+          FCLTcalendar ("e_date", calendar_params)
         }
 
       BLOCK_END();