admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TWYN#52344 Houdt nu ook rekening met procedure rapporten

Browse Source 
svn path=/Website/trunk/; revision=39862
This commit is contained in:
Koen Reefman
2018-11-19 13:14:50 +00:00
parent c6789dc1fb
commit 380d88e5de
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/FAC/fac_usrrap_search.asp
View File

@@ -117,9 +117,12 @@ var fac_usrrap = usrrap.fac_usrrap_info(usrrap_key);
</td>
<td>
<input class="fld" type="text"
id="<%="fclt_f_colvalue"+ nr_charcols%>" name="<%="fclt_f_colvalue"+ nr_charcols%>">
id="<%="fclt_f_colvalue"+ nr_charcols%>"
name="<%="fclt_f_colvalue"+ nr_charcols%>"
colname="<%=safe.htmlattr(col.column_name)%>">
<select id="<%="fclt_f_colvalue" + nr_charcols + "_l"%>"
name="<%="fclt_f_colvalue" + nr_charcols + "_l"%>"
colname="<%=safe.htmlattr(col.column_name)%>"
size="1" style="display:none;">
</select>
<i class='autoreport fa fa-comment fa-lg'
@@ -142,7 +145,7 @@ var fac_usrrap = usrrap.fac_usrrap_info(usrrap_key);
<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 class="fldusrfilter" type="text" id="<%="fclt_f_colvalue"+ nr_charcols%>" name="<%="fclt_f_colvalue"+ nr_charcols%>" colname="<%=safe.htmlattr(col.column_name)%>">
<input type="hidden" id="<%="fclt_f_colname" + nr_charcols%>" name="<%="fclt_f_colname" + nr_charcols%>" value="<%=col.column_name%>">
</td>
</tr>

17
APPL/Localscripts/iface.js
View File

@@ -107,9 +107,9 @@ var iface =
formToString: function (stringForm)
{
var formObject = {};
stringForm.find("input, select").not("[name='usrrap_key']").each(function()
stringForm.find("input, select").not("[name='usrrap_key'], [name^='fclt_f_colname']").each(function()
{
var nm = this.id || this.name || null;
var nm = $(this).attr("colname") || this.id || this.name || null;
if (!nm)
return;
@@ -148,16 +148,17 @@ var iface =
var formObject = JSON.parse(formString);
stringForm.find("input, select").not('reportmulti').each(function() // negeer reportmulti, die kunnen we niet aan
{
var nm = this.id || this.name || null;
if (!nm)
return;
if (!(nm in formObject))
var nm = $(this).attr("colname") || this.id || this.name || null;
if (!nm || !(nm in formObject))
return;
if (this.id)
if ($(this).attr("colname"))
var input = stringForm.find("[colname=" + nm + "]")
else if (this.id)
var input = stringForm.find("#" + nm)
else
input = stringForm.find("[name=" + nm + "]");
var input = stringForm.find("[name=" + nm + "]");
if (!input.length)
return;