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=37563
This commit is contained in:
Maykel Geerdink
2018-04-05 13:46:28 +00:00
parent 5fcaf83f36
commit 1e5810a9ac
3 changed files with 65 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
APPL/INS/ins_search_list.asp
View File

@@ -86,6 +86,14 @@ var comp_key = getQParamInt("company", -1);
var mjob = getQParamInt("mjob", 0) == 1; // mjob mode
// FORM score velden.
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.
var gwfitness_score1_from = getQParamInt("gwfitness_score1_from", -1); // Grenswaarde conditie score van.
var gwfitness_score1_through = getQParamInt("gwfitness_score1_through", -1); // Grenswaarde conditie score t/m.
var priority_score2_from = getQParamInt("priority_score2_from", -1); // Prioriteitsscore van.
var priority_score2_through = getQParamInt("priority_score2_through", -1); // Prioriteitsscore t/m.
/***** End get webform parameters *****/
if (ctrdisc_key > 0)
lcl.set_dialect(ctrdisc_key, "INS_TAB_DISCIPLINE_KEY");
@@ -153,7 +161,13 @@ ins_list ( autfunction,
insAvail: insAvail,
insSuccessY: insSuccessY,
insSuccessN: insSuccessN,
mjob: mjob
mjob: mjob,
fitness_score1_from : fitness_score1_from,
fitness_score1_through : fitness_score1_through,
gwfitness_score1_from : gwfitness_score1_from,
gwfitness_score1_through : gwfitness_score1_through,
priority_score2_from : priority_score2_from,
priority_score2_through : priority_score2_through
}
);
%>

32
APPL/INS/ins_show_srtdeel.asp
View File

@@ -34,21 +34,22 @@ var sql = "SELECT *"
+ " AND s.ins_srtgroep_key = g.ins_srtgroep_key"
+ " AND ins_srtdeel_key = " + srtdeel_key;
var oRs = Oracle.Execute(sql);
var srtdeel = { discipline_omschrijving: oRs("ins_discipline_omschrijving").value,
groep_omschrijving: oRs("ins_srtgroep_omschrijving").value,
srtdeel_code : oRs("ins_srtdeel_code").value,
srtdeel_omschrijving: oRs("ins_srtdeel_omschrijving").value,
srtdeel_volgnr: oRs("ins_srtdeel_volgnr").value,
srtdeel_prijs: oRs("ins_srtdeel_prijs").value,
srtdeel_eenheid: oRs("ins_srtdeel_eenheid").value,
srtdeel_dimensie: oRs("ins_srtdeel_dimensie").value,
srtdeel_binding: oRs("ins_srtdeel_binding").value,
srtdeel_acadsymbol: oRs("ins_srtdeel_acadsymbol").value,
srtdeel_uitleenbaar: oRs("ins_srtdeel_uitleenbaar").value,
srtdeel_nr: oRs("ins_srtdeel_nr").value,
prs_bedrijf_key: oRs("prs_bedrijf_key").value,
srtdeel_vervaldatum : oRs('ins_srtdeel_vervaldatum').value,
srtdeel_image: oRs("ins_srtdeel_image").value
var srtdeel = { discipline_omschrijving: oRs("ins_discipline_omschrijving").Value,
groep_omschrijving: oRs("ins_srtgroep_omschrijving").Value,
srtdeel_code : oRs("ins_srtdeel_code").Value,
srtdeel_omschrijving: oRs("ins_srtdeel_omschrijving").Value,
srtdeel_volgnr: oRs("ins_srtdeel_volgnr").Value,
srtdeel_prijs: oRs("ins_srtdeel_prijs").Value,
srtdeel_eenheid: oRs("ins_srtdeel_eenheid").Value,
srtdeel_dimensie: oRs("ins_srtdeel_dimensie").Value,
srtdeel_binding: oRs("ins_srtdeel_binding").Value,
srtdeel_acadsymbol: oRs("ins_srtdeel_acadsymbol").Value,
srtdeel_uitleenbaar: oRs("ins_srtdeel_uitleenbaar").Value,
srtdeel_nr: oRs("ins_srtdeel_nr").Value,
prs_bedrijf_key: oRs("prs_bedrijf_key").Value,
srtdeel_vervaldatum : oRs('ins_srtdeel_vervaldatum').Value,
srtdeel_image: oRs("ins_srtdeel_image").Value,
srtdeel_mjb_grensscore1: oRs("ins_srtdeel_mjb_grensscore1").Value
}
oRs.close();
%>
@@ -132,6 +133,7 @@ oRs.close();
});
ROFIELDTR("fld", L("lcl_ins_vervaldatum"), toDateString(srtdeel.srtdeel_vervaldatum), {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_ins_image"), srtdeel.srtdeel_image, {suppressEmpty: true } );
ROFIELDTR("fld", L("ins_srtdeel_mjb_grensscore1"), srtdeel.srtdeel_mjb_grensscore1, {suppressEmpty: true});
BLOCK_END();
BLOCK_START("insBind", L("lcl_obj_bind"));

66
APPL/MJB/mjb_search.asp
View File

@@ -58,7 +58,7 @@ var alg_startlevel = getQParamInt("alg_startlevel", 1); // Startlevel van plaats
var alg_endlevel = getQParamInt("alg_endlevel", 3); // Eindlevel van plaatsselector (Gebouw)
var groupby = getQParamInt("groupby", 3);
var frequentie = getQParamInt("frequentie", -1);
var toyear = new Date().getFullYear() + getQParamInt("toyear", S("mjb_show_years"));
var toyear = getQParamInt("toyear", new Date().getFullYear() + S("mjb_show_years"));
var kp_key = getQParamInt("kp_key", -1); // Kostenplaats.
var incbtw = getQParamInt("incbtw", 0) == 1;
var scen_key = getQParamInt("scenario", 1); // Scenario
@@ -241,17 +241,17 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
whenEmpty: L("lcl_search_generic") // want dit is een filter
});
%>
<% // Conditie score %>
<tr class="primsearch fldfitness_score" id="fitness_score">
// Conditiescore
%> <tr class="primsearch fldfitness_score" id="fitness_score">
<td>
<table>
<tr>
<td class="label">
<label for="show_fitness_score_from"><%="Conditie score"%>:</label> <% // L("lcl_mjb_fitness_score") %>
<label for="show_fitness_score_from"><%="Conditiescore"%>:</label> <% /* L("lcl_mjb_fitness_score") */ %>
</td>
<td style="text-align: right">
<%="van"%> <% // L("lcl_mjb_from") %>
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
@@ -262,31 +262,31 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 6)"
id="fitness_score1_from"
name="fitness_score1_from"
class="fldflexN number "
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% // L("lcl_mjb_through") %>
&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 "
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
<% // Negatieve afwijking van de conditie score %>
<tr class="primsearch fldfitness_score_neg" id="fitness_score_neg">
<%
// Negatieve afwijking van de conditie score
%> <tr class="primsearch fldfitness_score_neg" id="fitness_score_neg">
<td class="label">
<table>
<tr>
<td class="label">
&nbsp;&nbsp;<3B> <%="Negatieve afwijking"%> <% // L("lcl_mbj_negative_dev") %>
&nbsp;&nbsp;<3B> <%="Negatieve afwijking"%> <% /* L("lcl_mbj_negative_dev") */ %>
</td>
<td style="text-align: right">
<%="van"%> <% // L("lcl_mjb_from") %>
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
@@ -297,31 +297,31 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 5)"
id="fitness_score1_from_neg"
name="fitness_score1_from_neg"
class="fldflexN number "
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp; <% // L("lcl_mjb_through") %>
&nbsp;<%="t/m"%>&nbsp; <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 5)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 5)"
id="fitness_score1_through_neg"
name="fitness_score1_through_neg"
class="fldflexN number "
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
<% // Positieve afwijking van de conditie score %>
<tr class="primsearch fldfitness_score_pos" id="fitness_score_pos">
<%
// Positieve afwijking van de conditie score
%> <tr class="primsearch fldfitness_score_pos" id="fitness_score_pos">
<td class="label">
<table>
<tr>
<td class="label">
&nbsp;&nbsp;<3B> <%="Positieve afwijking"%> <% // L("lcl_mjb_positive_dev") %>
&nbsp;&nbsp;<3B> <%="Positieve afwijking"%> <% /* L("lcl_mjb_positive_dev") */ %>
</td>
<td style="text-align: right">
<%="van"%> <% // L("lcl_mjb_from") %>
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
@@ -332,29 +332,30 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 5)"
id="fitness_score1_from_pos"
name="fitness_score1_from_pos"
class="fldflexN number "
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp <% // L("lcl_mjb_through") %>
&nbsp;<%="t/m"%>&nbsp <% /* L("lcl_mjb_through") */ %>
<input type="text"
onChange="fvalid=checkKenmerk(this, false, 'N', 1, 0, 1, 5)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 5)"
id="fitness_score1_through_pos"
name="fitness_score1_through_pos"
class="fldflexN number "
class="fldflexN number "
value=""
maxlength="1">
</td>
<tr class="primsearch fldpriority_score" id="priority_score">
<%
// Prioriteitsscore
%> <tr class="primsearch fldpriority_score" id="priority_score">
<td>
<table>
<tr>
<td class="label">
<label for="show_priority_score_from"><%="Prioriteitsscore"%>:</label> <% // L("lcl_mjb_priority_score") %>
<label for="show_priority_score_from"><%="Prioriteit"%>:</label> <% /* L("lcl_mjb_priority_score") */ %>
</td>
<td style="text-align: right">
<%="van"%> <% // L("lcl_mjb_from") %>
<%="van"%> <% /* L("lcl_mjb_from") */ %>
</td>
</tr>
</table>
@@ -365,22 +366,21 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 9)"
id="priority_score2_from"
name="priority_score2_from"
class="fldflexN number "
class="fldflexN number "
value=""
maxlength="1">
&nbsp;<%="t/m"%>&nbsp <% // L("lcl_mjb_through") %>
&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 "
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
<%
// Scenarios