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=37468
This commit is contained in:
Maykel Geerdink
2018-03-22 16:17:02 +00:00
parent f2d91b8cce
commit 274966a8d8
7 changed files with 317 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
APPL/INS/ins.inc
View File

@@ -2336,6 +2336,14 @@ ins = {checkAutLevel:
var toyear = params.toyear;
var groupby = params.groupby;
var deel = params.deel;
var fitness_score1_from = params.fitness_score1_from;
var fitness_score1_through = params.fitness_score1_through;
var fitness_score1_from_neg = params.fitness_score1_from_neg;
var fitness_score1_through_neg = params.fitness_score1_through_neg;
var fitness_score1_from_pos = params.fitness_score1_from_pos;
var fitness_score1_through_pos = params.fitness_score1_through_pos;
var priority_score2_from = params.priority_score2_from;
var priority_score2_through = params.priority_score2_through;
var mjbMoved = params.mjbMoved;
var mjbFreezed = params.mjbFreezed;
var mjbXcped = params.mjbXcped;
@@ -2813,7 +2821,10 @@ ins = {checkAutLevel:
+ " , g.alg_gebouw_key"
+ " , dl.ins_deel_omschrijving"
+ " , dl.ins_deel_mjb_score1"
+ " , isd.ins_srtdeel_mjb_grensscore1"
+ " , dl.ins_deel_mjb_score2"
+ " , l.alg_locatie_mjb_score1"
+ " , g.alg_gebouw_mjb_score1"
+ " , cy.ins_deel_aantal"
+ " , cy.ins_srtdeel_eenheid"
+ " , dl.ins_deel_opmerking"
@@ -2914,6 +2925,9 @@ ins = {checkAutLevel:
+ " , cv.ins_deel_omschrijving"
+ " , cv.ins_deel_mjb_score1"
+ " , cv.ins_deel_mjb_score2"
+ " , cv.ins_srtdeel_mjb_grensscore1"
+ " , cv.alg_locatie_mjb_score1"
+ " , cv.alg_gebouw_mjb_score1"
+ " , cv.ins_deel_aantal"
+ " , cv.ins_srtdeel_eenheid"
+ " , cv.ins_deel_opmerking"
@@ -3011,12 +3025,15 @@ ins = {checkAutLevel:
fields.push("alg_district_omschrijving");
if (groupby == 2 || groupby == 3)
{
if (groupby == 2)
fields.push("alg_locatie_mjb_score1");
fields.push("alg_locatie_key");
fields.push("alg_locatie_omschrijving");
if (groupby == 3)
{
fields.push("alg_gebouw_key");
fields.push("alg_gebouw_omschrijving");
fields.push("alg_gebouw_mjb_score1");
}
}
}
@@ -3033,6 +3050,7 @@ ins = {checkAutLevel:
fields.push("ins_deel_aantal");
fields.push("ins_srtdeel_eenheid");
fields.push("ins_deel_mjb_score1");
fields.push("ins_srtdeel_mjb_grensscore1");
fields.push("ins_deel_mjb_score2");
}
@@ -3077,6 +3095,54 @@ ins = {checkAutLevel:
sql += " WHERE ins_scenario_key = 1";
}
// 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 += " AND ins_deel_mjb_score1 >= " + fitness_score1_from;
if (fitness_score1_through > 0)
sql += " AND ins_deel_mjb_score1 <= " + 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,
// Dan doet het elelement niet mee in het filter "afwijking". Want er is dan per defintie geen afwijking, omdat dit niet bekend is.
var fitness_score1_neg = [];
if (fitness_score1_from_neg > 0 || fitness_score1_through_neg > 0)
{
if (fitness_score1_from_neg > 0)
fitness_score1_neg.push("ins_deel_mjb_score1 >= (ins_srtdeel_mjb_grensscore1 + " + fitness_score1_from_neg + ")");
if (fitness_score1_through_neg > 0)
{
fitness_score1_neg.push("ins_deel_mjb_score1 <= (ins_srtdeel_mjb_grensscore1 + " + fitness_score1_through_neg + ")");
if (fitness_score1_from_neg == -1)
fitness_score1_neg.push("ins_deel_mjb_score1 > ins_srtdeel_mjb_grensscore1");
}
sql += "AND ((" + fitness_score1_neg.join(" AND ") + ") OR ins_srtdeel_mjb_grensscore1 IS NULL)"
}
// Positieve afwijking (=dus beter) 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,
// Dan doet het elelement niet mee in het filter "afwijking". Want er is dan per defintie geen afwijking, omdat dit niet bekend is.
var fitness_score1_pos = [];
if (fitness_score1_from_pos > 0 || fitness_score1_through_pos > 0)
{
if (fitness_score1_from_pos > 0)
fitness_score1_pos.push("ins_deel_mjb_score1 <= (ins_srtdeel_mjb_grensscore1 - " + fitness_score1_from_pos + ")");
if (fitness_score1_through_pos > 0)
{
fitness_score1_pos.push("ins_deel_mjb_score1 >= (ins_srtdeel_mjb_grensscore1 - " + fitness_score1_through_pos + ")");
if (fitness_score1_from_pos == -1)
fitness_score1_pos.push("ins_deel_mjb_score1 < ins_srtdeel_mjb_grensscore1");
}
sql += "AND ((" + fitness_score1_pos.join(" AND ") + ") OR ins_srtdeel_mjb_grensscore1 IS NULL)"
}
// 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 += " AND ins_deel_mjb_score2 >= " + priority_score2_from;
if (priority_score2_through > 0)
sql += " AND ins_deel_mjb_score2 <= " + priority_score2_through;
if (fulldetails && sqlArray.length)
sql += " AND ((" + sqlArray.join(") OR (") + "))";

9
APPL/INS/ins_edit_deel.asp
View File

@@ -206,6 +206,7 @@ var ins_deel_aantal = 1;
+ " , d.ins_deel_actief"
+ " , d.ins_deel_mjb_score1"
+ " , d.ins_deel_mjb_score2"
+ " , s.ins_srtdeel_mjb_grensscore1"
+ " FROM ins_deel d"
+ " , ins_srtdeel s"
+ " , ins_srtgroep g"
@@ -248,6 +249,7 @@ var ins_deel_aantal = 1;
+ " , " + lcl.xsqla('s.ins_srtdeel_eenheid', 's.ins_srtdeel_key')
+ " , d.ins_deel_mjb_score1"
+ " , d.ins_deel_mjb_score2"
+ " , s.ins_srtdeel_mjb_grensscore1"
+ " FROM ins_deel d"
+ " , ins_srtdeel s"
+ " , ins_srtgroep g"
@@ -287,6 +289,7 @@ var ins_deel_aantal = 1;
+ " , " + lcl.xsqla('s.ins_srtdeel_eenheid', 's.ins_srtdeel_key')
+ " , NULL ins_deel_mjb_score1"
+ " , NULL ins_deel_mjb_score2"
+ " , NULL ins_srtdeel_mjb_grensscore1"
+ " FROM ins_srtdeel s"
+ " , ins_srtgroep g"
+ " , ins_tab_discipline dis"
@@ -342,6 +345,7 @@ var ins_deel_aantal = 1;
autonum = oRs("ins_disc_params_autonum").Value;
mjb_score1 = oRs("ins_deel_mjb_score1").Value;
mjb_score2 = oRs("ins_deel_mjb_score2").Value;
ins_srtdeel_mjb_grensscore1 = oRs("ins_srtdeel_mjb_grensscore1").Value;
oRs.close();
@@ -805,8 +809,9 @@ var ins_deel_aantal = 1;
ROFIELDTR("fld", "", L("lcl_obj_is_lent_out"));
if (S("mjb_enabled") == 1) {
RWFIELDTR("deel_mjb_score1", "fldshort", L("lcl_ins_deel_mjb_score1"), mjb_score1, {datatype: "float", suppressEmpty: true, readonly: !this_ins.canChangeAlg});
RWFIELDTR("deel_mjb_score2", "fldshort", L("lcl_ins_deel_mjb_score2"), mjb_score2, {datatype: "float", suppressEmpty: true, readonly: !this_ins.canChangeAlg});
ROFIELDTR("fldshort", L("lcl_ins_deel_mjb_score1"), mjb_score1, {suppressEmpty: true});
ROFIELDTR("fld", L("ins_srtdeel_mjb_grensscore1"), ins_srtdeel_mjb_grensscore1, {suppressEmpty: true});
ROFIELDTR("fldshort", L("lcl_ins_deel_mjb_score2"), mjb_score2, {suppressEmpty: true});
}

4
APPL/INS/ins_edit_deel_save.asp
View File

@@ -94,8 +94,6 @@ if (obj_key > 0)
{ dbs: "ins_deel_aanmaak", typ: "date", frm: "aanmaakdatum", track: L("lcl_last_action") },
{ dbs: "prs_perslid_key_beh", typ: "key", frm: "ins_manager", track: L("lcl_ins_manager"), foreign: "prs_perslid" },
{ dbs: "ins_deel_opmerking", typ: "varchar", frm: "opmerk", track: L("lcl_ins_opmerking")},
{ dbs: "ins_deel_mjb_score1", typ: "float", frm: "deel_mjb_score1", track: L("lcl_ins_deel_mjb_score1")},
{ dbs: "ins_deel_mjb_score2", typ: "float", frm: "deel_mjb_score2", track: L("lcl_ins_deel_mjb_score2")},
{ dbs: "ins_deel_actief", typ: "check0", frm: "ins_actief", track: L("lcl_ins_active") } ];
if (ins_explode_objects == 0)
@@ -213,8 +211,6 @@ else
{ dbs: "prs_perslid_key_beh", typ: "key", frm: "ins_manager", foreign: "prs_perslid" },
{ dbs: "ins_deel_opmerking", typ: "varchar", frm: "opmerk"},
// bewust niet: { dbs: "ins_deel_actief", typ: "check0", frm: "ins_actief"}
{ dbs: "ins_deel_mjb_score1", typ: "varchar", frm: "deel_mjb_score1"},
{ dbs: "ins_deel_mjb_score2", typ: "varchar", frm: "deel_mjb_score2"},
{ dbs: "ins_alg_ruimte_key", typ: "key", val: bind_key },
{ dbs: "ins_alg_ruimte_type", typ: "varchar", val: bind } ];

3
APPL/INS/ins_show_deel.asp
View File

@@ -68,6 +68,7 @@ sql = "SELECT d.ins_deel_omschrijving" // identificatie
+ " , d.prs_perslid_key_beh"
+ " , d.ins_deel_mjb_score1"
+ " , d.ins_deel_mjb_score2"
+ " , s.ins_srtdeel_mjb_grensscore1"
+ " FROM ins_deel d"
+ " , ins_srtdeel s"
+ " , ins_srtgroep g"
@@ -108,6 +109,7 @@ var srtdeel_eenheid = oRs('ins_srtdeel_eenheid').Value;
var perslid_key_beh = oRs('prs_perslid_key_beh').Value;
var ins_deel_mjb_score1 = oRs('ins_deel_mjb_score1').Value;
var ins_deel_mjb_score2 = oRs('ins_deel_mjb_score2').Value;
var ins_srtdeel_mjb_grensscore1 = oRs('ins_srtdeel_mjb_grensscore1').Value;
var bind_lo = null;
var bind_key_lo = null;
@@ -420,6 +422,7 @@ oRs.Close();
//if (S("mjb_enabled") == '1') {
ROFIELDTR("fld", L("lcl_ins_deel_mjb_score1"), ins_deel_mjb_score1, {suppressEmpty: true});
ROFIELDTR("fld", L("ins_srtdeel_mjb_grensscore1"), ins_srtdeel_mjb_grensscore1, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_ins_deel_mjb_score2"), ins_deel_mjb_score2, {suppressEmpty: true});
//}

253
APPL/MJB/mjb_search.asp
View File

@@ -134,6 +134,27 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
}
}
function onChangeGroupBy()
{
if ($("#groupby").val() == 7 || $("#groupby").val() == 8)
{
$("#fitness_score").show();
$("#fitness_score_neg").show();
$("#fitness_score_pos").show();
$("#priority_score").show();
}
else
{
if ($("#groupby").val() == 2 || $("#groupby").val() == 3)
$("#fitness_score").show();
else
$("#fitness_score").hide();
$("#fitness_score_neg").hide();
$("#fitness_score_pos").hide();
$("#priority_score").hide();
}
}
$(document).ready(function()
{
if (scen_key == 1) $(".tractsit").hide();
@@ -143,6 +164,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
{ %>
window.afterfiltersready = function () { doSubmit() };
<% } %>
onChangeGroupBy();
});
</script>
</head>
@@ -219,33 +241,175 @@ 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">
<td>
<table>
<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>
<% // 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") %>
</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, 5)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 5)"
id="fitness_score1_from_neg"
name="fitness_score1_from_neg"
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, 5)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 5)"
id="fitness_score1_through_neg"
name="fitness_score1_through_neg"
class="fldflexN number "
value=""
maxlength="1">
</td>
</tr>
<% // 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") %>
</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, 5)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 5)"
id="fitness_score1_from_pos"
name="fitness_score1_from_pos"
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, 5)"
onBlur="checkKenmerk(this, true, 'N', 1, 0, 1, 5)"
id="fitness_score1_through_pos"
name="fitness_score1_through_pos"
class="fldflexN number "
value=""
maxlength="1">
</td>
<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") %>
</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>
<%
// Scenarios
if (mode == 1) { // scenario's zijn er alleen voor de toekomst
sql = "SELECT ins_scenario_key"
+ " , ins_scenario_omschrijving"
+ " FROM ins_scenario"
+ " WHERE ins_scenario_verwerkt IS NULL"
+ " AND ins_scenario_key <> 1" // niet de actuele
+ " ORDER BY ins_scenario_omschrijving";
var oRs = Oracle.Execute(sql);
if (!oRs.Eof)
{
FCLTselector("scenario",
sql,
{ label: L("lcl_mjb_scenario"),
initKey: scen_key,
//multi: true, // Voor nu niet multi
trclass:"primsearch",
emptyKey: 1,
emptyOption: "",
onChange: "onChangeScenario()"
});
RWCHECKBOXTR("actsit", "fldactsit", L("lcl_mjb_also_act_situation"), actsit, { html: " value='1' ", trclass: 'primsearch tractsit'});
if (mode == 1)
{ // scenario's zijn er alleen voor de toekomst
sql = "SELECT ins_scenario_key"
+ " , ins_scenario_omschrijving"
+ " FROM ins_scenario"
+ " WHERE ins_scenario_verwerkt IS NULL"
+ " AND ins_scenario_key <> 1" // niet de actuele
+ " ORDER BY ins_scenario_omschrijving";
var oRs = Oracle.Execute(sql);
if (!oRs.Eof)
{
FCLTselector("scenario",
sql,
{ label: L("lcl_mjb_scenario"),
initKey: scen_key,
//multi: true, // Voor nu niet multi
trclass:"primsearch",
emptyKey: 1,
emptyOption: "",
onChange: "onChangeScenario()"
});
RWCHECKBOXTR("actsit", "fldactsit", L("lcl_mjb_also_act_situation"), actsit, { html: " value='1' ", trclass: "primsearch tractsit"});
}
oRs.Close();
RWCHECKBOXTR("mjbshowempty", "fldmjbempty", L("lcl_mjb_empty_lines_too"), mjbempty, { html: " value='1' ", trclass: 'primsearch'});
}
oRs.Close();
RWCHECKBOXTR("mjbshowempty", "fldmjbempty", L("lcl_mjb_empty_lines_too"), mjbempty, { html: " value='1' ", trclass: "primsearch"});
}
%>
@@ -364,29 +528,30 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
FCLTselector("groupby",
sql,
{ initKey: groupby,
label: L("lcl_mjb_group")
label: L("lcl_mjb_group"),
onChange: "onChangeGroupBy()"
});
if (mode == 1) { // ook de verschillende bewerkingstatussen alleen tijdens plannen
if (mode == 1)
{ // ook de verschillende bewerkingstatussen alleen tijdens plannen
%>
<!-- Status checkboxen -->
<tr>
<td>
<label><%=L("lcl_mjb_status_mjob")%>:&nbsp;</label>
</td>
<td>
<div id="statusboxes">
<input type="checkbox" class="fldcheck" name="mjbMoved" id="mjbMoved" value="1" <%=mjbMoved? "checked" : ""%>><label for="mjbMoved"><%=L("lcl_mjb_moved")%></label>
<span id="checdfreezed">
<input type="checkbox" class="fldcheck" name="mjbFreezed" id="mjbFreezed" value="1" <%=mjbFreezed? "checked" : ""%>><label for="mjbFreezed"><%=L("lcl_mjb_started")%></label>
</span>
<input type="checkbox" class="fldcheck" name="mjbXcped" id="mjbXcped" value="1" <%=mjbXcped ? "checked" : " "%>><label for="mjbXcped"><%=L("lcl_mjb_overruled_xcp")%></label>
</div>
</td>
</tr>
<!-- Status checkboxen -->
<tr>
<td>
<label><%=L("lcl_mjb_status_mjob")%>:&nbsp;</label>
</td>
<td>
<div id="statusboxes">
<input type="checkbox" class="fldcheck" name="mjbMoved" id="mjbMoved" value="1" <%=mjbMoved? "checked" : ""%>><label for="mjbMoved"><%=L("lcl_mjb_moved")%></label>
<span id="checdfreezed">
<input type="checkbox" class="fldcheck" name="mjbFreezed" id="mjbFreezed" value="1" <%=mjbFreezed? "checked" : ""%>><label for="mjbFreezed"><%=L("lcl_mjb_started")%></label>
</span>
<input type="checkbox" class="fldcheck" name="mjbXcped" id="mjbXcped" value="1" <%=mjbXcped ? "checked" : " "%>><label for="mjbXcped"><%=L("lcl_mjb_overruled_xcp")%></label>
</div>
</td>
</tr>
<%
}
}
%>
</table>
</td><!-- end column 2-->

35
APPL/MJB/mjb_search_list.asp
View File

@@ -81,7 +81,17 @@ var scenario = getQParamInt("scenario", 1); // Scenario
var actsit = getQParamInt("actsit", 0) == 1; // Ook actuele situatie.
var mjbshowempty = getQParamInt("mjbshowempty", 0) == 1; // Ook lege regels.
// FORM status checkboxes
// 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 fitness_score1_from_neg = getQParamInt("fitness_score1_from_neg", -1); // Negatieve afwijking conditie score van.
var fitness_score1_through_neg = getQParamInt("fitness_score1_through_neg", -1); // Negatieve afwijking conditie score t/m.
var fitness_score1_from_pos = getQParamInt("fitness_score1_from_pos", -1); // Positieve afwijking conditie score van.
var fitness_score1_through_pos = getQParamInt("fitness_score1_through_pos", -1); // Positieve afwijking 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.
// FORM status checkboxes.
var mjbMoved = getQParamInt("mjbMoved", 0) == 1; // Verschoven.
var mjbFreezed = getQParamInt("mjbFreezed", 0) == 1; // In behandeling.
var mjbXcped = getQParamInt("mjbXcped", 0) == 1; // Aangepast.
@@ -481,6 +491,14 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
toyear: toyear,
groupby: groupby,
deel: deel,
fitness_score1_from : fitness_score1_from,
fitness_score1_through : fitness_score1_through,
fitness_score1_from_neg : fitness_score1_from_neg,
fitness_score1_through_neg : fitness_score1_through_neg,
fitness_score1_from_pos : fitness_score1_from_pos,
fitness_score1_through_pos : fitness_score1_through_pos,
priority_score2_from : priority_score2_from,
priority_score2_through : priority_score2_through,
mjbMoved: mjbMoved,
mjbFreezed: mjbFreezed,
mjbXcped: mjbXcped,
@@ -805,13 +823,18 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
if (groupby >= 5) rst.addColumn(new Column({caption: L("lcl_obj_group"), content: "ins_srtgroep_omschrijving"}));
if (groupby >= 6) rst.addColumn(new Column({caption: L("lcl_obj_sort"), content: "ins_srtdeel_omschrijving"}));
}
if (groupby == 2)
rst.addColumn(new Column({caption: "Conditiescore", content: "alg_locatie_mjb_score1", align: "center"})); // L("lcl_alg_locatie_mjb_score1")
if (groupby == 3)
rst.addColumn(new Column({caption: "Conditiescore", content: "alg_gebouw_mjb_score1", align: "center"})); // L("lcl_alg_gebouw_mjb_score1")
if (groupby >= 7)
{
rst.addColumn(new Column({caption: L("lcl_ins_object"), content: fnDeel}));
rst.addColumn(new Column({caption: L("lcl_amount"), content: "ins_deel_aantal", datatype: "float"}));
rst.addColumn(new Column({caption: L("lcl_obj_unit"), content: "ins_srtdeel_eenheid"}));
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score1"), content: "ins_deel_mjb_score1", align: "center"}));
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score2"), content: "ins_deel_mjb_score2", align: "center"}));
rst.addColumn(new Column({caption: L("lcl_ins_object"), content: fnDeel}));
rst.addColumn(new Column({caption: L("lcl_amount"), content: "ins_deel_aantal", datatype: "float"}));
rst.addColumn(new Column({caption: L("lcl_obj_unit"), content: "ins_srtdeel_eenheid"}));
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"}));
}
if (fulldetails)
{

3
APPL/Shared/default.csx
View File

@@ -2268,6 +2268,9 @@ td.label.flexsearch {
.opdrfooter {
font-style: italic;
}
.score {
min-width: 275px;
}
#goegel, img.blockrefresh {
margin: 2px 12px 0 12px;