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

PLAT#52238: Vervolg van PLAT#52094: nieuwe velden in de interface verwerken.

Browse Source 
svn path=/Website/branches/v2017.3/; revision=37562
This commit is contained in:
Maykel Geerdink
2018-04-05 13:44:42 +00:00
parent c7c5cff952
commit 5fcaf83f36
10 changed files with 346 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
APPL/ALG/alg_gebouw_list.inc
View File

@@ -126,6 +126,7 @@ function gebouw_list(pautfunction, params)
var srtgebouw_key = params.srtgebouw_key;
var verantw_key = params.verantw_key;
var expalgincl = params.expalgincl;
var mjob = params.mjob;
var fitness_score1_from = params.fitness_score1_from;
var fitness_score1_through = params.fitness_score1_through;
@@ -223,12 +224,14 @@ function gebouw_list(pautfunction, params)
if (!expalgincl)
sqln += " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE)) ";
// Conditie score.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
if (fitness_score1_from > 0)
sqln += " AND alg_locatie_mjb_score1 >= " + fitness_score1_from;
if (fitness_score1_through > 0)
sqln += " AND alg_locatie_mjb_score1 <= " + fitness_score1_through;
if (params.mjob)
{ // Conditiescore.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
if (fitness_score1_from > 0)
sqln += " AND alg_locatie_mjb_score1 >= " + fitness_score1_from;
if (fitness_score1_through > 0)
sqln += " AND alg_locatie_mjb_score1 <= " + fitness_score1_through;
}
sqln += " ORDER BY l.alg_locatie_upper ASC, "
+ " g.alg_gebouw_upper ASC ";
@@ -273,7 +276,8 @@ function gebouw_list(pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_geoxcoord"), content: "alg_gebouw_x"}));
rst.addColumn(new Column({caption: L("lcl_geoycoord"), content: "alg_gebouw_y"}));
}
rst.addColumn(new Column({caption: "Conditiescore", content: "alg_gebouw_mjb_score1"})); // L("lcl_alg_gebouw_mjb_score1")
if (params.mjob)
rst.addColumn(new Column({caption: "Conditiescore", content: "alg_gebouw_mjb_score1"})); // L("lcl_alg_gebouw_mjb_score1")
rst.addAction({ action: "gebouwEdit", caption: L("lcl_edit"), isDefault: true});
rst.addAction({ action: "doDelete", caption: L("lcl_delete"), enabler: "eDelete", single:!noref, multi: true, multiOnce: true});

74
APPL/ALG/alg_gebouw_search.asp
View File

@@ -20,6 +20,7 @@ var srtgebouw_key = getQParamInt("gebouw_func", -1); // Gebouwfunctie
var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
var autosearch = getQParamInt("autosearch", 0) == 1;
var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
var authparams = alg.checkAutorisation();
var this_alg = alg.func_enabled(gebouw_key);
%>
@@ -50,6 +51,7 @@ var this_alg = alg.func_enabled(gebouw_key);
<body id="searchbody">
<div id="search">
<form name="u2" target="workFrame" action="alg_gebouw_search_list.asp" method="get">
<input type=hidden name="mjob" id="mjob" value="<%=mjob?1:0%>">
<% BLOCK_START("searchtable", L("lcl_filterblok"));%>
<tr>
<td class="searchkolom1">
@@ -110,41 +112,43 @@ var this_alg = alg.func_enabled(gebouw_key);
suppressNoValues: true,
whenEmpty: L("lcl_search_generic") // want filter
});
%>
<% // Conditie score %>
<tr class="primsearch fldfitness_score" id="fitness_score">
<td>
<table width="100%">
<tr>
<td class="label">
<label for="show_fitness_score_from"><%="Conditie score"%>:</label> <% // L("lcl_mjb_fitness_score") %>
</td>
<td style="text-align: right">
<%="van"%> <% // L("lcl_mjb_from") %>
</td>
</tr>
</table>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_from"
name="fitness_score1_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% // L("lcl_mjb_through") %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_through"
name="fitness_score1_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
if (mjob)
{ // Conditiescore
%> <tr class="primsearch fldfitness_score" id="fitness_score">
<td>
<table width="100%">
<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>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_from"
name="fitness_score1_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_through"
name="fitness_score1_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
<% } %>
</table>
</td><!-- end column 1 -->
</tr>

2
APPL/ALG/alg_gebouw_search_list.asp
View File

@@ -32,6 +32,7 @@ var srtgebouw_key = getQParamInt("srt", -1); // Gebouwfunctie
var verantw_key = getQParamInt("verantw", -1); // Gebouw verantwoordelijke
var verantw_key2 = getQParamInt("verantw2", -1); // Gebouw verantwoordelijke 2
var expalgincl = getQParamInt("expAlgIncl", 0) == 1; // Ook vervallen gebouwen
var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
var fitness_score1_from = getQParamInt("fitness_score1_from", -1); // Conditie score van.
var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
@@ -47,6 +48,7 @@ gebouw_list ( "*",
bld_key: (bld_key != -1? bld_key : null),
bld_code: bld_code,
bld_name: bld_name,
mjob: mjob,
fitness_score1_from : fitness_score1_from,
fitness_score1_through : fitness_score1_through,
noref: (noref != -1? noref : null),

18
APPL/ALG/alg_locatie_list.inc
View File

@@ -120,6 +120,7 @@ function locatie_list(pautfunction, params)
var reg_key = params.reg_key;
var dis_key = params.dis_key;
var loc_key = params.loc_key;
var mjob = params.mjob;
var fitness_score1_from = params.fitness_score1_from;
var fitness_score1_through = params.fitness_score1_through;
@@ -204,12 +205,14 @@ function locatie_list(pautfunction, params)
if (params.loc_descr)
sqln += " AND UPPER(l.alg_locatie_omschrijving) LIKE " + safe.quoted_sql_wild(params.loc_descr + "%");
// Conditie score.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
if (fitness_score1_from > 0)
sqln += " AND alg_locatie_mjb_score1 >= " + fitness_score1_from;
if (fitness_score1_through > 0)
sqln += " AND alg_locatie_mjb_score1 <= " + fitness_score1_through;
if (params.mjob)
{ // Conditiescore.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
if (fitness_score1_from > 0)
sqln += " AND alg_locatie_mjb_score1 >= " + fitness_score1_from;
if (fitness_score1_through > 0)
sqln += " AND alg_locatie_mjb_score1 <= " + fitness_score1_through;
}
sqln += " ORDER BY UPPER(alg_district_omschrijving), UPPER(alg_locatie_code)";
@@ -243,7 +246,8 @@ function locatie_list(pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_adres"), content: "alg_locatie_adres"}));
rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_postcode"), content: "alg_locatie_postcode"}));
rst.addColumn(new Column({caption: L("lcl_prs_address_bezoek_plaats"), content: "alg_locatie_plaats"}));
rst.addColumn(new Column({caption: "Conditiescore", content: "alg_locatie_mjb_score1"})); // L("lcl_alg_locatie_mjb_score1")
if (params.mjob)
rst.addColumn(new Column({caption: "Conditiescore", content: "alg_locatie_mjb_score1"})); // L("lcl_alg_locatie_mjb_score1")
if (outputmode != 0)
{

76
APPL/ALG/alg_locatie_search.asp
View File

@@ -15,6 +15,7 @@ FCLTHeader.Requires({ plugins:["jQuery", "kenmerk"] });
var district_key = getQParamInt("district_key", -1); //district
var locatie_key = getQParamInt("locatie_key", -1); //locatie
var autosearch = getQParamInt("autosearch", 0) == 1;
var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
var authparams = alg.checkAutorisation();
%>
@@ -44,7 +45,8 @@ var authparams = alg.checkAutorisation();
<body id="searchbody">
<div id="search">
<form name="u2" target="workFrame" action="alg_locatie_search_list.asp" method="get">
<% BLOCK_START("searchtable", L("lcl_filterblok"));%>
<input type=hidden name="mjob" id="mjob" value="<%=mjob?1:0%>">
<% BLOCK_START("searchtable", L("lcl_filterblok"));%>
<tr>
<td class="searchkolom1">
<table><!-- x rijen, 2 kolommen: label + veld -->
@@ -71,44 +73,46 @@ var authparams = alg.checkAutorisation();
<!-- Second column -->
<td class="searchkolom2">
<table><!-- x rijen, 2 kolommen: label + veld -->
<% // Conditie score %>
<tr class="primsearch fldfitness_score" id="fitness_score">
<td>
<table width="100%">
<tr>
<td class="label">
<label for="show_fitness_score_from"><%="Conditie score"%>:</label> <% // L("lcl_mjb_fitness_score") %>
</td>
<td style="text-align: right">
<%="van"%> <% // L("lcl_mjb_from") %>
</td>
</tr>
</table>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_from"
name="fitness_score1_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% // L("lcl_mjb_through") %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_through"
name="fitness_score1_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
<% if (mjob)
{ // Conditiescore
%> <tr class="primsearch fldfitness_score" id="fitness_score">
<td>
<table width="100%">
<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>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_from"
name="fitness_score1_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_through"
name="fitness_score1_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
<% } %>
</table>
</td><!-- end column 2 -->
</tr>
<% BLOCK_END();
<% BLOCK_END();
var buttons = [ {title: L("lcl_search"), action: "doSubmit()", id: "bSearch" },
{title: L("lcl_obj_advanced"), action: "myModal()", id: "bAdvanced" } ];

2
APPL/ALG/alg_locatie_search_list.asp
View File

@@ -27,6 +27,7 @@ var dis_key = getQParamInt("districtkey", -1); // District
var loc_key = getQParamInt("locatiekey", -1); // Locatie
var loc_code = getQParam("loc_code", ""); // Locatiecode
var loc_descr = getQParam("loc_descr", ""); // Locatienaam
var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
var fitness_score1_from = getQParamInt("fitness_score1_from", -1); // Conditie score van.
var fitness_score1_through = getQParamInt("fitness_score1_through", -1); // Conditie score t/m.
@@ -38,6 +39,7 @@ locatie_list ( "*",
loc_key: (loc_key != -1? loc_key : null),
loc_code: loc_code,
loc_descr: loc_descr,
mjob: mjob,
fitness_score1_from : fitness_score1_from,
fitness_score1_through : fitness_score1_through,
noref: (noref != -1? noref : null)

57
APPL/INS/ins.inc
View File

@@ -1075,6 +1075,13 @@ ins = {checkAutLevel:
var inspDone = params.inspDone;
var inspBusy = params.inspBusy;
var inspSoon = params.inspSoon;
var mjob = params.mjob;
var fitness_score1_from = params.fitness_score1_from;
var fitness_score1_through = params.fitness_score1_through;
var gwfitness_score1_from = params.gwfitness_score1_from;
var gwfitness_score1_through = params.gwfitness_score1_through;
var priority_score2_from = params.priority_score2_from;
var priority_score2_through = params.priority_score2_through;
var sql_objincl = "";
if (insObjIncl || parent_key > 0)
@@ -1508,6 +1515,7 @@ ins = {checkAutLevel:
+ ", i.ins_deel_actief"
+ ", i.ins_deel_mjb_score1"
+ ", i.ins_deel_mjb_score2"
+ ", s.ins_srtdeel_mjb_grensscore1"
: "");
sqlOwner_from = " FROM ins_deel i"
@@ -1699,6 +1707,7 @@ ins = {checkAutLevel:
+ ", i.ins_deel_actief"
+ ", i.ins_deel_mjb_score1"
+ ", i.ins_deel_mjb_score2"
+ ", s.ins_srtdeel_mjb_grensscore1"
+ sqlKenmerkBewerkbaar_select
+ ", NULL prs_bedrijf_key"
+ ", NULL prs_afdeling_key1"
@@ -1848,14 +1857,39 @@ ins = {checkAutLevel:
if (inspect && ctrdisc_key > -1)
sql_ex += " AND ispn.ctr_disc_key = " + ctrdisc_key;
// Nu filtercondities voor flexkenmerken toevoegen
sql_ex += getKenmerkSql("INS", "i.ins_deel_key");
var sql_score = "";
if (mjob)
{
// Conditie score.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
if (fitness_score1_from > 0)
sql_score += " AND i.ins_deel_mjb_score1 >= " + fitness_score1_from;
if (fitness_score1_through > 0)
sql_score += " AND i.ins_deel_mjb_score1 <= " + fitness_score1_through;
// Grenswaarde conditie score.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
if (gwfitness_score1_from > 0)
sql_score += " AND s.ins_srtdeel_mjb_grensscore1 >= " + gwfitness_score1_from;
if (gwfitness_score1_through > 0)
sql_score += " AND s.ins_srtdeel_mjb_grensscore1 <= " + gwfitness_score1_through;
// Prioriteitsscore.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
if (priority_score2_from > 0)
sql_score += " AND i.ins_deel_mjb_score2 >= " + priority_score2_from;
if (priority_score2_through > 0)
sql_score += " AND i.ins_deel_mjb_score2 <= " + priority_score2_through;
}
// Nu filtercondities voor scores en flexkenmerken toevoegen.
if (sqlPosition != "")
{
sqlPosition += sql_ex;
sqlPosition += sql_ex + sql_score;
if (auth_org)
sqlPosition_org += sql_ex;
sqlPosition_org += sql_ex + sql_score;
}
if (sqlPosition != "")
@@ -1961,11 +1995,11 @@ ins = {checkAutLevel:
// ik zit niet bij uitleenregistratie of
// object is niet uitgeleend.
sqlOwner = (insAvail || !auth_org
? sqlOwnerA + sql_ex + " UNION " + sqlOwnerCP + sql_ex + " UNION "
? sqlOwnerA + sql_ex + sql_score + " UNION " + sqlOwnerCP + sql_ex + sql_score + " UNION "
: "")
+ sqlOwnerP + sql_ex
+ sqlOwnerP + sql_ex + sql_score
+ (auth_org // S("ins_auth_obj_lendout") == 1 && fronto && insLentOut
? " UNION " + sqlOwnerA_org + sql_ex + " UNION " + sqlOwnerP_org + sql_ex + " UNION " + sqlOwnerCP_org + sql_ex
? " UNION " + sqlOwnerA_org + sql_ex + sql_score + " UNION " + sqlOwnerP_org + sql_ex + sql_score + " UNION " + sqlOwnerCP_org + sql_ex + sql_score
: "");
// Now apply user filtering on this query:
@@ -2293,7 +2327,6 @@ ins = {checkAutLevel:
+ " AND c.cnt_contract_status IN (0, 1)"
+ " )"
+ " )";
}
}
@@ -3105,10 +3138,16 @@ ins = {checkAutLevel:
// Conditie score.
// Niet gemeten objecten doen wel mee in dit filter. Deze objecten worden dus niet getoond als er een waarde is ingevuld.
var mjb_score = "ins_deel_mjb_score1";
if (groupby == 2)
mjb_score = "alg_locatie_mjb_score1";
else if (groupby == 3)
mjb_score = "alg_gebouw_mjb_score1";
if (fitness_score1_from > 0)
sql += " AND ins_deel_mjb_score1 >= " + fitness_score1_from;
sql += " AND " + mjb_score + " >= " + fitness_score1_from;
if (fitness_score1_through > 0)
sql += " AND ins_deel_mjb_score1 <= " + fitness_score1_through;
sql += " AND " + mjb_score + " <= " + fitness_score1_through;
// Negatieve afwijking (=dus slechter) van de conditiescore (ins_deel_mjb_score1) in hele getallen t.o.v. de norm (ins_srtdeel_mjb_grensscore1) .
// Wanneer een element NIET is gemeten (conditiemeting is niet geweest) dan is ins_deel_score1 LEEG,

5
APPL/INS/ins_edit_srtdeel.asp
View File

@@ -58,7 +58,8 @@ if (srtdeel_key > 0) // bestaande ins_utel/cilinder
srtdeel_nr: oRs("ins_srtdeel_nr").Value,
prs_bedrijf_key: oRs("prs_bedrijf_key").Value,
srtdeel_vervaldatum : (oRs('ins_srtdeel_vervaldatum').Value != null)? new Date(oRs('ins_srtdeel_vervaldatum').Value) : null,
srtdeel_image: oRs("ins_srtdeel_image").Value
srtdeel_image: oRs("ins_srtdeel_image").Value,
srtdeel_mjb_grensscore1: oRs("ins_srtdeel_mjb_grensscore1").Value
}
oRs.close();
@@ -209,6 +210,8 @@ else
html: "title='" + L("lcl_obj_symbol_upload") + "' onclick='UploadImage()'"
}
ROFIELDTR("image_button", L("lcl_obj_image_upload"), L("lcl_fg_upload"), params);
if (S("mjb_enabled") == 1)
ROFIELDTR("fld", L("ins_srtdeel_mjb_grensscore1"), srtdeel.srtdeel_mjb_grensscore1, {suppressEmpty: true});
BLOCK_END();
BLOCK_START("insBind", L("lcl_obj_bind"));

8
APPL/INS/ins_list.inc
View File

@@ -113,6 +113,13 @@ function ins_list (pautfunction, params)
var checkout = params.checkout;
var inacObjIncl = params.inacObjIncl;
var inspDone = params.inspDone;
var mjob = params.mjob;
var fitness_score1_from = params.fitness_score1_from;
var fitness_score1_through = params.fitness_score1_through;
var gwfitness_score1_from = params.gwfitness_score1_from;
var gwfitness_score1_through = params.gwfitness_score1_through;
var priority_score2_from = params.priority_score2_from;
var priority_score2_through = params.priority_score2_through;
%>
<html>
@@ -890,6 +897,7 @@ function ins_list (pautfunction, params)
if (params.mjob)
{
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score1"), content: "ins_deel_mjb_score1", align: "center"}));
rst.addColumn(new Column({caption: L("ins_srtdeel_mjb_grensscore1"), content: "ins_srtdeel_mjb_grensscore1", align: "center"}));
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score2"), content: "ins_deel_mjb_score2", align: "center"}));
}

256
APPL/INS/ins_search.asp
View File

@@ -306,86 +306,192 @@ var authparams = user.checkAutorisation(autfunction);
<%
}
if (insInspect) // Ook inspectiezoekvelden
{
if (ctrdisc_key > 0)
var ctr_disc_sql = " = " + ctrdisc_key;
else
ctr_disc_sql = " IN (SELECT w.ins_discipline_key"
+ " FROM fac_v_webgebruiker w"
+ " , fac_functie f"
+ " WHERE w.fac_functie_key = f.fac_functie_key "
+ " AND f.fac_functie_code = 'WEB_CTRUSE'"
+ " AND w.fac_gebruiker_prs_level_read < 9"
+ " AND w.fac_gebruiker_alg_level_read < 9"
+ " AND w.prs_perslid_key = " + user_key + ")";
if (insInspect) // Ook inspectiezoekvelden
{
if (ctrdisc_key > 0)
var ctr_disc_sql = " = " + ctrdisc_key;
else
ctr_disc_sql = " IN (SELECT w.ins_discipline_key"
+ " FROM fac_v_webgebruiker w"
+ " , fac_functie f"
+ " WHERE w.fac_functie_key = f.fac_functie_key "
+ " AND f.fac_functie_code = 'WEB_CTRUSE'"
+ " AND w.fac_gebruiker_prs_level_read < 9"
+ " AND w.fac_gebruiker_alg_level_read < 9"
+ " AND w.prs_perslid_key = " + user_key + ")";
if (ctrdisc_key == -1)
{
// <!-- Controle Type -->
sql = "SELECT ins_discipline_key"
+ " , ins_discipline_omschrijving"
+ " FROM ctr_discipline"
+ " WHERE ins_discipline_key " + ctr_disc_sql
+ " ORDER BY 2";
FCLTselector("ctr_discipline",
sql,
{ label: L("ctr_discipline"),
emptyOption: L("lcl_all")
});
}
else
{ %>
<input type=hidden name="ctr_discipline" id="ctr_discipline" value="<%=ctrdisc_key%>">
<% }
if (ctrdisc_key == -1)
{
// <!-- Controle Type -->
sql = "SELECT ins_discipline_key"
+ " , ins_discipline_omschrijving"
+ " FROM ctr_discipline"
+ " WHERE ins_discipline_key " + ctr_disc_sql
+ " ORDER BY 2";
FCLTselector("ctr_discipline",
sql,
{ label: L("ctr_discipline"),
emptyOption: L("lcl_all")
});
}
else
{ %>
<input type=hidden name="ctr_discipline" id="ctr_discipline" value="<%=ctrdisc_key%>">
<% }
var sql = "SELECT ins_srtcontrole_key,"
// + lcl.xsqla('ins_srtcontrole_omschrijving', 'ins_srtcontrole_key') + ","
+ lcl.xsql('ins_srtcontrole_omschrijving', 'ins_srtcontrole_key')
+ "||DECODE(ins_srtcontrole_niveau, 'S', ' '||asi.srtdeel_oms, 'G', ' '||asi.srtgroep_oms, 'D', ' '||asi.discipline_oms, '') ins_srtcontrole_omschrijving"
+ ","
+ " ins_srtcontrole_periode"
+ " FROM ins_srtcontrole isc, ins_v_allsrtinstallatie asi"
+ " WHERE asi.ins_srtinstallatie_key = isc.ins_srtinstallatie_key"
+ " AND asi.niveau = isc.ins_srtcontrole_niveau"
+ " AND ctr_discipline_key " + ctr_disc_sql
+ " ORDER BY UPPER("+lcl.xsql('ins_srtcontrole_omschrijving', 'ins_srtcontrole_key')+")";
FCLTselector("sel_srtcontrole",
sql,
{ label: L("lcl_ins_controle_srt"),
emptyOption: L("lcl_all")
});
var sql = "SELECT ins_srtcontrole_key,"
// + lcl.xsqla('ins_srtcontrole_omschrijving', 'ins_srtcontrole_key') + ","
+ lcl.xsql('ins_srtcontrole_omschrijving', 'ins_srtcontrole_key')
+ "||DECODE(ins_srtcontrole_niveau, 'S', ' '||asi.srtdeel_oms, 'G', ' '||asi.srtgroep_oms, 'D', ' '||asi.discipline_oms, '') ins_srtcontrole_omschrijving"
+ ","
+ " ins_srtcontrole_periode"
+ " FROM ins_srtcontrole isc, ins_v_allsrtinstallatie asi"
+ " WHERE asi.ins_srtinstallatie_key = isc.ins_srtinstallatie_key"
+ " AND asi.niveau = isc.ins_srtcontrole_niveau"
+ " AND ctr_discipline_key " + ctr_disc_sql
+ " ORDER BY UPPER("+lcl.xsql('ins_srtcontrole_omschrijving', 'ins_srtcontrole_key')+")";
FCLTselector("sel_srtcontrole",
sql,
{ label: L("lcl_ins_controle_srt"),
emptyOption: L("lcl_all")
});
// <!-- Groep-->
var sql = "SELECT DISTINCT COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep)"
+ " , COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep)"
+ " FROM ins_srtcontrole isc"
+ " , ins_srtcontroledl_xcp xcp"
+ " WHERE isc.ins_srtcontrole_key = xcp.ins_srtcontrole_key(+)"
+ " AND ctr_discipline_key " + ctr_disc_sql
+ " AND xcp.ins_scenario_key(+) = 1"
+ " AND COALESCE (xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep) IS NOT NULL"
+ " ORDER BY UPPER (COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep))";
FCLTselector("groep",
sql,
{ label: L("ins_srtcontrole_groep"),
emptyOption: L("lcl_all"),
trclass: "secsearch noxd"
});
// <!-- Groep-->
var sql = "SELECT DISTINCT COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep)"
+ " , COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep)"
+ " FROM ins_srtcontrole isc"
+ " , ins_srtcontroledl_xcp xcp"
+ " WHERE isc.ins_srtcontrole_key = xcp.ins_srtcontrole_key(+)"
+ " AND ctr_discipline_key " + ctr_disc_sql
+ " AND xcp.ins_scenario_key(+) = 1"
+ " AND COALESCE (xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep) IS NOT NULL"
+ " ORDER BY UPPER (COALESCE(xcp.ins_srtcontroledl_xcp_groep, isc.ins_srtcontrole_groep))";
FCLTselector("groep",
sql,
{ label: L("ins_srtcontrole_groep"),
emptyOption: L("lcl_all"),
trclass: "secsearch noxd"
});
<!-- Onderhouds bedrijf -->
FCLTbedrijfselector("cnt_bedrijf_key",
"sgBedrijf",
{ companyKey: -1,
label: L("lcl_company"),
trclass: "primsearch noxd",
filtercode: "CI", // Contract onderhoud inspectieobjecten
whenEmpty: L("lcl_search_generic")
});
<!-- Onderhouds bedrijf -->
FCLTbedrijfselector("cnt_bedrijf_key",
"sgBedrijf",
{ companyKey: -1,
label: L("lcl_company"),
trclass: "primsearch noxd",
filtercode: "CI", // Contract onderhoud inspectieobjecten
whenEmpty: L("lcl_search_generic")
});
}
if (backo)
}
if (mjob)
{
// 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>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_from"
name="fitness_score1_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_through"
name="fitness_score1_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</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>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="gwfitness_score1_from"
name="gwfitness_score1_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="gwfitness_score1_through"
name="gwfitness_score1_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</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>
</td>
<td class="score">
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 9)"
id="priority_score2_from"
name="priority_score2_from"
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 6)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 9)"
id="priority_score2_through"
name="priority_score2_through"
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
<% }
if (backo)
{ %>
<!-- Ook onderdelen -->
<tr class="secsearch">