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

MNNL#55851 Mogelijkheid om te zoeken in objectenbeheer naar notitie tekst

Browse Source 
svn path=/Website/trunk/; revision=40916
This commit is contained in:
Alex Tiehuis
2019-02-12 12:27:54 +00:00
parent 25f2202026
commit 9f92917df5
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/INS/ins.inc
View File

@@ -1365,6 +1365,7 @@ ins = {checkAutLevel:
var wpl_key = params.wpl_key;
var deel = params.deel;
var deel_opm = params.deel_opm;
var note_text = params.note_text;
var disc_key = params.disc_key;
var insgroup_key = params.insgroup_key;
var objsrt_key = params.objsrt_key;
@@ -2412,6 +2413,8 @@ ins = {checkAutLevel:
sql_ex += " AND ins_deel_upper LIKE " + safe.quoted_sql_wild("%" + deel + "%");
if (deel_opm)
sql_ex += " AND UPPER(ins_deel_opmerking) LIKE " + safe.quoted_sql_wild("%" + deel_opm + "%");
if (note_text)
sql_ex += " AND EXISTS (SELECT 1 FROM ins_deel_note n WHERE n.ins_deel_key = i.ins_deel_key AND UPPER(ins_deel_note_omschrijving) LIKE " + safe.quoted_sql_wild("%" + note_text + "%") + ")";
if (objsrt_oms)
sql_ex += " AND ( (ins_srtdeel_upper LIKE " + safe.quoted_sql_wild("%" + objsrt_oms + "%") + ")"
+ " OR (ins_srtdeel_code_upper LIKE " + safe.quoted_sql_wild("%" + objsrt_oms + "%") + "))";

6
APPL/INS/ins_search.asp
View File

@@ -328,6 +328,12 @@ var authparams = user.checkAutorisation(autfunction);
</tr>
<%
}
%>
<tr class="primsearch">
<td class="label"><label for="note_text"><%=L("lcl_ins_note")%>:</label></td>
<td><input type="text" class="fld" name="note_text" value=""></td>
</tr>
<%
if (insInspect) // Ook inspectiezoekvelden
{

2
APPL/INS/ins_search_list.asp
View File

@@ -46,6 +46,7 @@ var room_key = getQParamInt("ruimtekey", -1); // Ruimte
var wpl_key = getQParamInt("werkplekkey", -1); // Werkplek
var deel = getQParam("deel", ""); // Identificatie
var deel_opm = getQParam("deel_opm", ""); // Omschrijving
var note_text = getQParam("note_text", ""); // Note text
var disc_key = getQParamIntArray("disc", [-1]); // Discipline
var insgroup_key = getQParamIntArray("srtgroep", [-1]); // Groep
var objsrt_key = getQParamIntArray("srtdeel", -1); // Objectsoort
@@ -133,6 +134,7 @@ ins_list ( autfunction,
wpl_key: (wpl_key != -1 ? wpl_key : null),
deel: (deel != ""? deel : null),
deel_opm: deel_opm,
note_text: note_text,
disc_key: (disc_key != -1 ? disc_key : null),
insgroup_key: (insgroup_key != -1 ? insgroup_key : null),
objsrt_key: (objsrt_key.length > 0 ? objsrt_key : null),