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

PCHD#54382 dienst->suggest, hier tevens brutaal was wijzigingen naar eigen inzicht (dus kan fout zijn irt Plato bv)

Browse Source 
svn path=/Website/trunk/; revision=41361
This commit is contained in:
Peter Feij
2019-03-06 18:03:42 +00:00
parent 4c854d53e6
commit bae566f73a
1 changed files with 29 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
APPL/INS/ins_search.asp
View File

@@ -24,6 +24,7 @@
<!-- #include file="../Shared/srtgroepselector.inc" -->
<!-- #include file="../Shared/srtdeelselector.inc" -->
<!-- #include file="../Shared/calendar.inc" -->
<!-- #include file="../Shared/dienstselector.inc" -->
<!-- #include file="../Shared/xd.inc" -->
<%
@@ -214,11 +215,11 @@ var authparams = user.checkAutorisation(autfunction);
<!-- Object -->
<tr class="primsearch">
<td class="label"><label for="deel"><%=L("lcl_obj_identification")%>:</label></td>
<td><input type="text" class="flddeel" name="deel" value="<%=safe.htmlattr(deel)%>"></td>
<td><input type="text" class="flddeel" id="deel" name="deel" value="<%=safe.htmlattr(deel)%>"></td>
</tr>
<tr class="primsearch">
<td class="label"><label for="deel_opm"><%=L("lcl_ins_opmerking")%>:</label></td>
<td><input type="text" class="fld" name="deel_opm" value=""></td>
<td><input type="text" class="fld" id="deel_opm" name="deel_opm" value=""></td>
</tr>
<!-- Discipline -->
@@ -331,7 +332,7 @@ var authparams = user.checkAutorisation(autfunction);
%>
<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>
<td><input type="text" class="fld" id="note_text" name="note_text" value=""></td>
</tr>
<%
@@ -383,7 +384,7 @@ var authparams = user.checkAutorisation(autfunction);
FCLTselector("ctr_discipline",
sql,
{ label: L("ctr_discipline"),
emptyOption: L("lcl_all")
emptyOption: L("lcl_search_generic")
});
}
else
@@ -415,7 +416,8 @@ var authparams = user.checkAutorisation(autfunction);
FCLTselector("sel_srtcontrole",
sql,
{ label: L("lcl_ins_controle_srt"),
emptyOption: L("lcl_all")
trclass: "secsearch noxd",
emptyOption: L("lcl_search_generic")
});
// <!-- Groep-->
@@ -441,35 +443,18 @@ var authparams = user.checkAutorisation(autfunction);
FCLTselector("groep",
sql,
{ label: L("ins_srtcontrole_groep"),
emptyOption: L("lcl_all"),
trclass: "secsearch noxd"
});
sql = "SELECT pd.prs_dienst_key"
+ ", " + lcl.xsqla("pd.prs_dienst_omschrijving", "pd.prs_dienst_key")
+ " FROM prs_dienst pd"
+ (backo2 // Interne uitvoerder, alleen de diensten van de eigen bedrijfdienstlocaties.
? " WHERE pd.prs_dienst_key IN (SELECT DISTINCT d.prs_dienst_key"
+ " FROM prs_bedrijfdienstlocatie bdl"
+ " , prs_dienst d"
+ " WHERE bdl.prs_dienst_key = d.prs_dienst_key"
+ " AND d.prs_dienst_key = pd.prs_dienst_key"
+ " AND bdl.prs_bedrijf_key IN (SELECT cp.prs_bedrijf_key"
+ " FROM prs_contactpersoon cp"
+ " WHERE cp.prs_perslid_key = " + user_key + "))"
: "")
+ " ORDER BY UPPER(" + lcl.xsql("pd.prs_dienst_omschrijving", "pd.prs_dienst_key") + ")";
FCLTselector("dienst_key",
sql,
{ initKey: -1,
label: L("lcl_prs_companies_dienst"),
onChange: "onChangedDienst()",
suppressEmpty: true,
emptyOption: L("lcl_all")
emptyOption: L("lcl_search_generic"),
trclass: "primsearch noxd"
});
FCLTdienstselector("dienst_key","dienst_key",
{ label: L("lcl_prs_companies_dienst"),
dienstKey : -1,
not_onChange: "onChangedDienst()",
trclass:"secsearch noxd",
filtercode: (backo2 ? "OWN" : null),
whenEmpty: L("lcl_search_generic")
});
<!-- Onderhouds bedrijf -->
FCLTbedrijfselector("cnt_bedrijf_key",
"sgBedrijf",
@@ -486,18 +471,9 @@ var authparams = user.checkAutorisation(autfunction);
if (ins_score_enabled && !fronto)
{
// Conditie score
%> <tr class="primsearch fldfitness_score" id="fitness_score">
<td>
<table>
<tr>
<td class="label">
<label for="show_fitness_score_from"><%="Conditiescore"%>:</label> <% /* L("lcl_mjb_fitness_score") */ %>
</td>
<td style="text-align: right">
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
%> <tr class="secsearch fldfitness_score" id="fitness_score">
<td class="label">
<label for="fitness_score1_from"><%=L("lcl_mjb_fitness_score")%>: <span style="float:right;"><%=L("lcl_mjb_from")%></span></label>
</td>
<td class="score">
<input type="text"
@@ -508,7 +484,7 @@ var authparams = user.checkAutorisation(autfunction);
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% /* L("lcl_mjb_through") */ %>
&nbsp;<%=L("lcl_mjb_through")%>&nbsp;
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
@@ -521,18 +497,9 @@ var authparams = user.checkAutorisation(autfunction);
</tr>
<%
// Grenswaarde conditie score
%> <tr class="primsearch fldgwfitness_score" id="gwfitness_score">
<td>
<table>
<tr>
<td class="label">
<label for="show_fitness_score_from"><%=L("ins_srtdeel_mjb_grensscore1")%>:</label>
</td>
<td style="text-align: right">
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
%> <tr class="secsearch fldgwfitness_score" id="gwfitness_score">
<td class="label">
<label for="gwfitness_score1_from"><%=L("ins_srtdeel_mjb_grensscore1")%>: <span style="float:right;"><%=L("lcl_mjb_from")%></span></label>
</td>
<td class="score">
<input type="text"
@@ -543,7 +510,7 @@ var authparams = user.checkAutorisation(autfunction);
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% /* L("lcl_mjb_through") */ %>
&nbsp;<%=L("lcl_mjb_through")%>&nbsp;
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
@@ -556,18 +523,9 @@ var authparams = user.checkAutorisation(autfunction);
</tr>
<%
// Prioriteitsscore
%> <tr class="primsearch fldpriority_score" id="priority_score">
<td>
<table>
<tr>
<td class="label">
<label for="show_priority_score_from"><%="Prioriteit"%>:</label> <% /* L("lcl_mjb_priority_score") */ %>
</td>
<td style="text-align: right">
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
%> <tr class="secsearch fldpriority_score" id="priority_score">
<td class="label">
<label for="priority_score2_from"><%=L("lcl_mjb_priority_score")%>: <span style="float:right;"><%=L("lcl_mjb_from")%></span></label>
</td>
<td class="score">
<input type="text"
@@ -578,7 +536,7 @@ var authparams = user.checkAutorisation(autfunction);
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp <% /* L("lcl_mjb_through") */ %>
&nbsp;<%=L("lcl_mjb_through")%>&nbsp
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 9)"