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

PLAT#52863: Testbevinding werken met scenario's - veel regels toevoegen aan scen. lukt niet.

Browse Source 
svn path=/Website/trunk/; revision=40615
This commit is contained in:
Maykel Geerdink
2019-01-22 07:38:52 +00:00
parent 67070fbd9c
commit 3ecf2fe936
4 changed files with 260 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/MGT/ctr_scenario.js
View File

@@ -24,7 +24,7 @@ function copy_current(key, table)
FcltMgr.confirm( L("lcl_mjb_copy_current") + "?",
{ autoconfirm: false },
function() {
var data = { scenario: key,
var data = { scen_key: key,
totalcopy: 1 };
protectRequest.dataToken(data);
$.post("../mjb/mjb_incl_scen_save.asp"

197
APPL/MJB/mjb_incl_scen.asp
View File

@@ -16,6 +16,7 @@
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/iface.inc" -->
<!-- #include file="../Shared/selector.inc" -->
<!-- #include file="../Shared/discxalg3d.inc" -->
<!-- #include file="../INS/ins.inc" -->
<%
FCLTHeader.Requires({ plugins: ["jQuery"],
@@ -26,6 +27,7 @@ FCLTHeader.Requires({ plugins: ["jQuery"],
<% FCLTHeader.Generate(); %>
<%
var posting = getQParamInt("post", 0) == 1;
var groupby = getQParamInt("groupby", 8);
if (!posting)
{ %>
<script type="text/javascript">
@@ -35,6 +37,68 @@ FCLTHeader.Requires({ plugins: ["jQuery"],
var srtcontrolekeyArray = FcltMgr.dialogArguments().srtcontrolekeyArray;
$("#ins_keys").val(insKeyString);
$("#srtcont_keys").val(srtcontrolekeyArray);
var groupby = FcltMgr.dialogArguments().groupby;
if (groupby < 8)
{
var scenario = FcltMgr.dialogArguments().scenario;
var actsit = FcltMgr.dialogArguments().actsit;
var dist_key_arr = FcltMgr.dialogArguments().dist_key_arr;
var loc_key_arr = FcltMgr.dialogArguments().loc_key_arr;
var bld_key_arr = FcltMgr.dialogArguments().bld_key_arr;
var disc_key = FcltMgr.dialogArguments().disc_key;
var srtgroep_key = FcltMgr.dialogArguments().srtgroep_key;
var srtdeel_key = FcltMgr.dialogArguments().srtdeel_key;
var groep = FcltMgr.dialogArguments().groep;
var categorie_key = FcltMgr.dialogArguments().categorie_key;
var srtcontrole = FcltMgr.dialogArguments().srtcontrole;
var frequentie = FcltMgr.dialogArguments().frequentie;
var kp_key = FcltMgr.dialogArguments().kp_key;
var incbtw = FcltMgr.dialogArguments().incbtw;
var toyear = FcltMgr.dialogArguments().toyear;
var groupby = FcltMgr.dialogArguments().groupby;
var deel = FcltMgr.dialogArguments().deel;
var fitness_score1_from = FcltMgr.dialogArguments().fitness_score1_from;
var fitness_score1_through = FcltMgr.dialogArguments().fitness_score1_through;
var fitness_score1_from_neg = FcltMgr.dialogArguments().fitness_score1_from_neg;
var fitness_score1_through_neg = FcltMgr.dialogArguments().fitness_score1_through_neg;
var fitness_score1_from_pos = FcltMgr.dialogArguments().fitness_score1_from_pos;
var fitness_score1_through_pos = FcltMgr.dialogArguments().fitness_score1_through_pos;
var priority_score2_from = FcltMgr.dialogArguments().priority_score2_from;
var priority_score2_through = FcltMgr.dialogArguments().priority_score2_through;
var mjbMoved = FcltMgr.dialogArguments().mjbMoved;
var mjbFreezed = FcltMgr.dialogArguments().mjbFreezed;
var mjbXcped = FcltMgr.dialogArguments().mjbXcped;
var jaren = FcltMgr.dialogArguments().jaren;
$("#scenario").val(scenario);
$("#actsit").val(actsit);
$("#dist_key_arr").val(dist_key_arr);
$("#loc_key_arr").val(loc_key_arr);
$("#bld_key_arr").val(bld_key_arr);
$("#disc_key").val(disc_key);
$("#srtgroep_key").val(srtgroep_key);
$("#srtdeel_key").val(srtdeel_key);
$("#groep").val(groep);
$("#categorie_key").val(categorie_key);
$("#srtcontrole").val(srtcontrole);
$("#frequentie").val(frequentie);
$("#kp_key").val(kp_key);
$("#incbtw").val(incbtw);
$("#toyear").val(toyear);
$("#groupby").val(groupby);
$("#deel").val(deel);
$("#fitness_score1_from").val(fitness_score1_from);
$("#fitness_score1_through").val(fitness_score1_through);
$("#fitness_score1_from_neg").val(fitness_score1_from_neg);
$("#fitness_score1_through_neg").val(fitness_score1_through_neg);
$("#fitness_score1_from_pos").val(fitness_score1_from_pos);
$("#fitness_score1_through_pos").val(fitness_score1_through_pos);
$("#priority_score2_from").val(priority_score2_from);
$("#priority_score2_through").val(priority_score2_through);
$("#mjbMoved").val(mjbMoved);
$("#mjbFreezed").val(mjbFreezed);
$("#mjbXcped").val(mjbXcped);
$("#jaren").val(jaren);
}
document.forms.u2.submit();
});
</script>
@@ -44,9 +108,41 @@ FCLTHeader.Requires({ plugins: ["jQuery"],
id="mod_mjbinclscen">
<div class="busyloading" style="width:100%;position: top"><center><i class="fa fa-spinner fa-pulse fa-4x fa-fw"></i><c/enter></div>
<div id="postinfo">
<form name="u2" id="u2" action="mjb_incl_scen.asp?post=1" method="post">
<form name="u2" id="u2" action="mjb_incl_scen.asp?post=1&groupby=<%=groupby%>" method="post">
<input type="hidden" name="ins_keys" id="ins_keys" value="">
<input type="hidden" name="srtcont_keys" id="srtcont_keys" value="">
<input type="hidden" name="groupby" id="groupby" value="">
<% if (groupby < 8)
{ %>
<input type="hidden" name="scenario" id="scenario" value="">
<input type="hidden" name="actsit" id="actsit" value="">
<input type="hidden" name="dist_key_arr" id="dist_key_arr" value="">
<input type="hidden" name="loc_key_arr" id="loc_key_arr" value="">
<input type="hidden" name="bld_key_arr" id="bld_key_arr" value="">
<input type="hidden" name="disc_key" id="disc_key" value="">
<input type="hidden" name="srtgroep_key" id="srtgroep_key" value="">
<input type="hidden" name="srtdeel_key" id="srtdeel_key" value="">
<input type="hidden" name="groep" id="groep" value="">
<input type="hidden" name="categorie_key" id="categorie_key" value="">
<input type="hidden" name="srtcontrole" id="srtcontrole" value="">
<input type="hidden" name="frequentie" id="frequentie" value="">
<input type="hidden" name="kp_key" id="kp_key" value="">
<input type="hidden" name="incbtw" id="incbtw" value="">
<input type="hidden" name="toyear" id="toyear" value="">
<input type="hidden" name="deel" id="deel" value="">
<input type="hidden" name="fitness_score1_from" id="fitness_score1_from" value="">
<input type="hidden" name="fitness_score1_through" id="fitness_score1_through" value="">
<input type="hidden" name="fitness_score1_from_neg" id="fitness_score1_from_neg" value="">
<input type="hidden" name="fitness_score1_through_neg" id="fitness_score1_through_neg" value="">
<input type="hidden" name="fitness_score1_from_pos" id="fitness_score1_from_pos" value="">
<input type="hidden" name="fitness_score1_through_pos" id="fitness_score1_through_pos" value="">
<input type="hidden" name="priority_score2_from" id="priority_score2_from" value="">
<input type="hidden" name="priority_score2_through" id="priority_score2_through" value="">
<input type="hidden" name="mjbMoved" id="mjbMoved" value="">
<input type="hidden" name="mjbFreezed" id="mjbFreezed" value="">
<input type="hidden" name="mjbXcped" id="mjbXcped" value="">
<input type="hidden" name="jaren" id="jaren" value="">
<% } %>
</form>
</div><!--postinfo-->
</body>
@@ -56,6 +152,105 @@ FCLTHeader.Requires({ plugins: ["jQuery"],
var ins_key_arr = getFParamIntArray("ins_keys");
var srtcont_key_arr = getFParamIntArray("srtcont_keys", []);
var multi = ins_key_arr.length > 1;
//var inflatiepct = S("mjb_inflation");
//var inflatiefactor = 1 + (inflatiepct / 100);
var mjb_start_year = S("mjb_start_year");
var mjb_freeze_year = S("mjb_freeze_year");
if (groupby < 8)
{
var scenario = getFParamInt("scenario", 1);
var actsit = getFParamInt("actsit", 0) == 1;
var dist_key_arr = getFParamIntArray("dist_key_arr", []); // District array
var loc_key_arr = getFParamIntArray("loc_key_arr", []); // Locatie array
var bld_key_arr = getFParamIntArray("bld_key_arr", []); // Gebouw array
var disc_key = getFParamInt("disc_key", -1);
var srtgroep_key = getFParamInt("srtgroep_key", -1);
var srtdeel_key = getFParamInt("srtdeel_key", -1);
var groep = getFParamArray("groep", []); // Groep
var categorie_key = getFParamInt("categorie_key", -1); // Categorie
var srtcontrole = getFParamIntArray("srtcontrole", []); // Taak
var frequentie = getFParamIntArray("frequentie", []); // Array met frequenties.
var kp_key = getFParamInt("account", -1); // Kostenplaats.
var incbtw = getFParamInt("incbtw", 0) == 1; // Lijst inclusief BTW weergeven.
var toyear = getFParamInt("toyear"); // Tot aan jaar.
//var inflatiepct = S("mjb_inflation");
//var inflatiefactor = 1 + (inflatiepct / 100);
var deel = getFParam("deel", ""); // Identieficatie
var jaren = getFParam("jaren", ""); // Jaren
// FORM score velden.
var fitness_score1_from = getFParamInt("fitness_score1_from", -1); // Conditie score van.
var fitness_score1_through = getFParamInt("fitness_score1_through", -1); // Conditie score t/m.
var fitness_score1_from_neg = getFParamInt("fitness_score1_from_neg", -1); // Negatieve afwijking conditie score van.
var fitness_score1_through_neg = getFParamInt("fitness_score1_through_neg", -1); // Negatieve afwijking conditie score t/m.
var fitness_score1_from_pos = getFParamInt("fitness_score1_from_pos", -1); // Positieve afwijking conditie score van.
var fitness_score1_through_pos = getFParamInt("fitness_score1_through_pos", -1); // Positieve afwijking conditie score t/m.
var priority_score2_from = getFParamInt("priority_score2_from", -1); // Prioriteitsscore van.
var priority_score2_through = getFParamInt("priority_score2_through", -1); // Prioriteitsscore t/m.
// FORM status checkboxes.
var mjbMoved = getFParamInt("mjbMoved", 0) == 1; // Verschoven.
var mjbFreezed = getFParamInt("mjbFreezed", 0) == 1; // In behandeling.
var mjbXcped = getFParamInt("mjbXcped", 0) == 1; // Aangepast.
// Start building the query to fetch all objects satisfying
var mjbparams = { niveau: groupby, // Het niveau (betekenis) van de keys (district(1), locatie(2), gebouw(3), discipline(4), groep(5), objectsoort(6), object(7))
keys: ins_key_arr,
scenario: 1,
fulldetails: true,
actsit: actsit, // Parameter actsit alleen van invloed op scenario_key > 1.
dist_key_arr: dist_key_arr,
loc_key_arr: loc_key_arr,
bld_key_arr: bld_key_arr,
disc_key: disc_key,
srtgroep_key: srtgroep_key,
srtdeel_key: srtdeel_key,
groep: groep,
categorie_key: categorie_key,
srtcontrole: srtcontrole,
frequentie: frequentie,
kp_key: kp_key,
incbtw: incbtw,
//inflatiefactor: inflatiefactor,
toyear: toyear,
groupby: 8, // Ik wil alle objecten opvragen.
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,
jaren: [jaren]
};
var mjblist_sql = ins.getmjblist_sql(mjbparams);
// De mjblist_sql bevat nu alle objecten (ins_deel_key) van de aangevinkte regels uit het mjb overzicht en levert voor elk object ook de ins_srtcontrole waarde op.
var result = {key: "", success: true, multi: multi, start: true };
var oRs = Oracle.Execute(mjblist_sql);
user.anything_todo_or_abort(!oRs.eof); // We klagen niet over enkele wel en enkele niet
ins_key_arr = [];
srtcont_key_arr = [];
while (!oRs.eof)
{
ins_key_arr[ins_key_arr.length] = oRs("ins_deel_key").Value;
srtcont_key_arr[srtcont_key_arr.length] = oRs("ins_srtcontrole_key").Value;
oRs.MoveNext();
}
oRs.Close();
}
var tobeincluded = 0;
var ingesloten = [];
var ingeslotensc = [];

2
APPL/MJB/mjb_incl_scen_save.asp
View File

@@ -25,7 +25,7 @@ var JSON_Result = true;
<%
protectRequest.validateToken();
var scen_key = getFParamInt("scenario");
var scen_key = getFParamInt("scen_key");
var totalcopy = getFParamInt("totalcopy", 0) == 1;
if (totalcopy)

76
APPL/MJB/mjb_search_list.asp
View File

@@ -135,7 +135,7 @@ var filterParams = { deel: (deel != ""? deel : null),
kp_key: kp_key,
mjbgroup: groupby,
mjbtoyear: toyear,
mjbscgroep: groep.join(", "),
mjbscgroep: groep.join(","),
mjbsrtcontr: srtcontrole.join(","),
mjbinfl_pct: inflatiepct,
mjbfreq: frequentie.join(","),
@@ -146,7 +146,7 @@ var filterParams = { deel: (deel != ""? deel : null),
mjbMoved: mjbMoved,
mjbFreezed: mjbFreezed,
mjbXcped: mjbXcped,
mjbs1_from: fitness_score1_from > 0? fitness_score1_from : null,
mjbs1_from: fitness_score1_from,
mjbs1_to: fitness_score1_through,
mjbs1_fromneg: fitness_score1_from_neg,
mjbs1_toneg: fitness_score1_through_neg,
@@ -172,10 +172,16 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
FCLTHeader.Generate({ outputmode: outputmode });
if (outputmode == 0) {
var jaren = [];
for (var i = fromyear; i <= toyear; i++)
jaren.push(i);
%>
<script type="text/javascript">
var urole = "<%=urole%>";
var scenario = <%=scenario%>;
var fulldetails = <%=fulldetails? 1 : 0%> == 1;
var actsit = <%=actsit? 1 : 0%> == 1;
var dist_key_arr = [<%=dist_key_arr%>];
var loc_key_arr = [<%=loc_key_arr%>];
var bld_key_arr = [<%=bld_key_arr%>];
@@ -186,14 +192,26 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
var categorie_key = <%=categorie_key%>;
var srtcontrole = "<%=srtcontrole.join(",")%>";
var frequentie = "<%=frequentie.join(",")%>";
var kp_key = <%=kp_key%>;
var account = <%=kp_key%>;
var incbtw = <%=incbtw? 1 : 0%>;
var toyear = <%=toyear%>;
var groupby = <%=groupby%>;
var deel = "<%=safe.jsstring(deel)%>";
var scenario = <%=scenario%>;
var actsit = <%=actsit? 1 : 0%>;
var mjbMoved = <%=mjbMoved? 1 : 0%>;
var mjbFreezed = <%=mjbFreezed? 1 : 0%>;
var mjbXcped = <%=mjbXcped? 1 : 0%>;
var fitness_score1_from = <%=fitness_score1_from%>;
var fitness_score1_through = <%=fitness_score1_through%>;
var fitness_score1_from_neg = <%=fitness_score1_from_neg%>;
var fitness_score1_through_neg = <%=fitness_score1_through_neg%>;
var fitness_score1_from_pos = <%=fitness_score1_from_pos%>;
var fitness_score1_through_pos = <%=fitness_score1_through_pos%>;
var priority_score2_from = <%=priority_score2_from%>;
var priority_score2_through = <%=priority_score2_through%>;
var jaren = [<%=jaren%>];
function naarlocatie(loc_key, deze)
{
@@ -493,7 +511,8 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
// Scenario's kunnen niet opgenomen worden in een scenario. Hier de scenario's er al uit filteren.
if (!rowdata.insScenKey || rowdata.insScenKey == 1)
{ // Het is geen scenario. De periodieke taak kan in een scenario worden opgenomen. De inspectie aan het array toevoegen.
srtcontrolekeyArray[i] = rowdata.insSrtControleKey;
if (groupby == 8)
srtcontrolekeyArray[i - deleted] = rowdata.insSrtControleKey;
}
else
{ // Het is een scenario. De ins_key verwijderen uit de lijst.
@@ -522,13 +541,47 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
else
{
var subject = L("lcl_mjb_incl_scen");
var url = "../mjb/mjb_incl_scen.asp";
var url = "../mjb/mjb_incl_scen.asp?groupby=" + groupby;
var data = { insKeyString: insKeyString,
srtcontrolekeyArray: srtcontrolekeyArray.join(","),
callback: FcltCallbackRefresh
};
if (groupby < 8)
{
data.scenario = scenario;
data.actsit = actsit;
data.dist_key_arr = dist_key_arr;
data.loc_key_arr = loc_key_arr;
data.bld_key_arr = bld_key_arr;
data.disc_key = disc_key;
data.srtgroep_key = srtgroep_key;
data.srtdeel_key = srtdeel_key;
data.groep = groep;
data.categorie_key = categorie_key;
data.srtcontrole = srtcontrole;
data.frequentie = frequentie;
data.kp_key = kp_key;
data.incbtw = incbtw;
data.toyear = toyear;
data.groupby = groupby;
data.deel = deel;
data.fitness_score1_from = fitness_score1_from;
data.fitness_score1_through = fitness_score1_through;
data.fitness_score1_from_neg = fitness_score1_from_neg;
data.fitness_score1_through_neg = fitness_score1_through_neg;
data.fitness_score1_from_pos = fitness_score1_from_pos;
data.fitness_score1_through_pos = fitness_score1_through_pos;
data.priority_score2_from = priority_score2_from ;
data.priority_score2_through = priority_score2_through;
data.mjbMoved = mjbMoved;
data.mjbFreezed = mjbFreezed;
data.mjbXcped = mjbXcped;
data.jaren = jaren;
}
FcltMgr.openModalDetail(url,
subject,
{ insKeyString: insKeyString,
srtcontrolekeyArray: srtcontrolekeyArray.join(","),
callback: FcltCallbackRefresh
});
data);
}
}
// else: alle taken zitten al in het scenario.
@@ -542,10 +595,6 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
<div id='timetip'></div>
<%
var jaren = [];
for (var i = fromyear; i <= toyear; i++)
jaren.push(i);
// Start building the query to fetch all objects satisfying
var mjbparams = { scenario: scenario,
fulldetails: fulldetails,
@@ -1023,8 +1072,7 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
{
rst.addAction({ action: "insFreeze", caption: L("lcl_mjb_freeze"), multi: true, multiOnce: true, enabler: "eFreeze", onlyMulti: true });
rst.addAction({ action: "insFinishMJOB", caption: L("lcl_ins_finish"), multi: true, multiOnce: true, enabler: "eFinishMjb", onlyMulti: true });
if (fulldetails)
rst.addAction({ action: "insAddScen", caption: L("lcl_mjb_incl_scen"), multi: true, multiOnce: true, enabler: "eAddScen", onlyMulti: true });
rst.addAction({ action: "insAddScen", caption: L("lcl_mjb_incl_scen"), multi: true, multiOnce: true, enabler: "eAddScen", onlyMulti: true });
}
else if (fulldetails && scenario > 1 && actsit)
{