FSN#36298: 1. Scenario’s (per complex moeten verschillende scenario’s gemaakt moeten kunnen.
svn path=/Website/trunk/; revision=34675
This commit is contained in:
@@ -636,6 +636,7 @@ ins = {checkAutLevel:
|
||||
+ " FROM ins_srtcontrole isc"
|
||||
+ " , ins_deelsrtcontrole idsc"
|
||||
+ " WHERE isc.ins_srtcontrole_key = idsc.ins_srtcontrole_key(+)" // Er kan nog voor de eerste keer geinspecteerd moeten worden.
|
||||
+ " AND isc.ins_srtcontrole_key = " + params.srtcont_key
|
||||
+ " AND idsc.ins_deel_key(+) = " + pins_deel_key
|
||||
+ (params.scen_key && params.scen_key > 0
|
||||
? " AND idsc.ins_scenario_key(+) = " + params.scen_key
|
||||
@@ -695,12 +696,12 @@ ins = {checkAutLevel:
|
||||
+ " , ins_srtcontroledl_xcp xcp"
|
||||
+ " WHERE isc.ins_srtcontrole_key = idsc.ins_srtcontrole_key(+)" // Er kan nog voor de eerste keer geinspecteerd moeten worden.
|
||||
+ " AND isc.ins_srtcontrole_key = xcp.ins_srtcontrole_key(+)"
|
||||
+ " AND isc.ins_srtcontrole_key = " + params.srtcont_key
|
||||
+ " AND xcp.ins_deel_key(+) = " + pins_deel_key
|
||||
+ " AND idsc.ins_deel_key(+) = " + pins_deel_key
|
||||
+ (params.scen_key && params.scen_key > 0
|
||||
? " AND idsc.ins_scenario_key(+) = " + params.scen_key
|
||||
: " AND idsc.ins_scenario_key(+) IS NULL")
|
||||
+ " AND isc.ins_srtcontrole_key = " + params.srtcont_key
|
||||
// Neem voor de rechten de xcp van de Active Situatie (AS). Die bepaalt of de soort controle vervallen is.
|
||||
+ " AND xcp.ins_scenario_key IS NULL"
|
||||
+ (params.deelsrtcont_key > 0
|
||||
|
||||
@@ -533,51 +533,27 @@ if (ins_key_arr.length == 1)
|
||||
}
|
||||
if (!multi)
|
||||
{ // Inspecteren van <20><>n object met <20><>n of meerdere soortcontroles
|
||||
var sql = "SELECT *"
|
||||
+ " FROM (WITH defined_inspect AS (SELECT id.ins_srtdeel_key srtdeel_key"
|
||||
+ " , isc.ins_srtcontrole_key"
|
||||
+ " , isc.ins_srtcontrole_omschrijving"
|
||||
+ " , isc.ins_srtcontrole_info"
|
||||
+ " , isc.ins_srtcontrole_eenheid"
|
||||
+ " , isc.ins_srtcontrole_periode"
|
||||
+ " , isc.ins_srtcontrole_eind"
|
||||
+ " , id.ins_deel_key"
|
||||
+ " FROM ins_deel id"
|
||||
+ " , ins_srtdeel s"
|
||||
+ " , ins_srtcontrole isc"
|
||||
+ " WHERE s.ins_srtdeel_key = id.ins_srtdeel_key"
|
||||
+ " AND (isc.ins_srtcontrole_niveau = 'S'"
|
||||
+ " AND isc.ins_srtinstallatie_key = id.ins_srtdeel_key"
|
||||
+ " OR isc.ins_srtcontrole_niveau = 'G'"
|
||||
+ " AND isc.ins_srtinstallatie_key = s.ins_srtgroep_key"
|
||||
+ " OR isc.ins_srtcontrole_niveau = 'D'"
|
||||
+ " AND isc.ins_srtinstallatie_key = id.ins_discipline_key)"
|
||||
+ " AND id.ins_deel_key = " + ingesloten[0] + ")"
|
||||
+ " SELECT di.ins_srtcontrole_key"
|
||||
+ " , " + lcl.xsqla('di.ins_srtcontrole_omschrijving', 'di.ins_srtcontrole_key')
|
||||
+ " , di.ins_srtcontrole_info info"
|
||||
+ " , COALESCE(xcp.ins_srtcontroledl_xcp_eenheid, di.ins_srtcontrole_eenheid) eenheid"
|
||||
var sql = "SELECT xcp.ins_srtcontrole_key"
|
||||
+ " , " + lcl.xsqla('xcp.ins_srtcontrole_omschrijving', 'xcp.ins_srtcontrole_key')
|
||||
+ " , xcp.ins_srtcontrole_info info"
|
||||
+ " , COALESCE(xcp.ins_srtcontroledl_xcp_eenheid, xcp.ins_srtcontrole_eenheid) eenheid"
|
||||
// Alleen Active Situatie (AS) soort controle's kunnen gewijzigd worden dus voor scenario key moet "null" genomen worden.
|
||||
+ " , ins.nextcyclusdate(di.ins_deel_key, di.ins_srtcontrole_key, null, 1) nextcyclusdate"
|
||||
+ " , fac.getdatemillisec(ins.nextcyclusdate(di.ins_deel_key, di.ins_srtcontrole_key, null, 1)) nextcyclusdatems"
|
||||
+ " , fac.getdatemillisec(ins.nextcyclusdate(di.ins_deel_key, di.ins_srtcontrole_key, null)) nextcyclusdatems_n"
|
||||
+ " FROM defined_inspect di"
|
||||
+ " , ins_srtcontroledl_xcp xcp"
|
||||
+ " WHERE di.ins_srtcontrole_key = xcp.ins_srtcontrole_key(+)"
|
||||
+ " AND di.ins_deel_key = xcp.ins_deel_key(+)"
|
||||
+ " AND di.ins_deel_key IN (" + ingesloten[0] + ")"
|
||||
+ " AND COALESCE (xcp.ins_srtcontroledl_xcp_periode, di.ins_srtcontrole_periode) > 0"
|
||||
+ " AND di.ins_srtcontrole_key = " + ingeslotensc[0]
|
||||
+ " AND xcp.ins_scenario_key(+) IS NULL"
|
||||
+ " GROUP BY di.ins_srtcontrole_key"
|
||||
+ " , di.ins_srtcontrole_omschrijving"
|
||||
+ " , di.ins_srtcontrole_info"
|
||||
+ " , di.ins_srtcontrole_eenheid"
|
||||
+ " , di.ins_srtcontrole_periode"
|
||||
+ " , di.ins_deel_key"
|
||||
+ " , xcp.ins_srtcontroledl_xcp_eenheid"
|
||||
+ " , ins.nextcyclusdate(xcp.ins_deel_key, xcp.ins_srtcontrole_key, null, 1) nextcyclusdate"
|
||||
+ " , fac.getdatemillisec(ins.nextcyclusdate(xcp.ins_deel_key, xcp.ins_srtcontrole_key, null, 1)) nextcyclusdatems"
|
||||
+ " , fac.getdatemillisec(ins.nextcyclusdate(xcp.ins_deel_key, xcp.ins_srtcontrole_key, null)) nextcyclusdatems_n"
|
||||
+ " FROM ins_v_defined_inspect_xcp xcp"
|
||||
+ " WHERE xcp.ins_deel_key IN (" + ingesloten[0] + ")"
|
||||
+ " AND xcp.ins_srtcontrole_periode > 0"
|
||||
+ " AND xcp.ins_srtcontrole_key = " + ingeslotensc[0]
|
||||
+ " AND xcp.ins_scenario_key(+) IS NULL"
|
||||
+ " GROUP BY xcp.ins_srtcontrole_key"
|
||||
+ " , xcp.ins_srtcontrole_omschrijving"
|
||||
+ " , xcp.ins_srtcontrole_info"
|
||||
+ " , xcp.ins_srtcontrole_eenheid"
|
||||
+ " , xcp.ins_srtcontrole_periode"
|
||||
+ " , xcp.ins_deel_key"
|
||||
+ " , xcp.ins_srtcontroledl_xcp_eenheid";
|
||||
//+ " HAVING COUNT(*) = " + 1 // Als multi dan alleen de inspecties die voor *alle* objecten gelden
|
||||
+ ")";
|
||||
|
||||
FCLTselector("sel_srtcontrole_show",
|
||||
sql,
|
||||
|
||||
@@ -47,7 +47,7 @@ var groupby = getQParamInt("groupby", 2);
|
||||
var frequentie = getQParamInt("frequentie", -1);
|
||||
var toyear = getQParamInt("toyear", new Date().getFullYear() + S("mjb_show_years"));
|
||||
var incbtw = getQParamInt("incbtw", 0) == 1;
|
||||
var scen_key_arr = getQParamIntArray("scen_keys", [-1]); // Scenario's
|
||||
var scen_key = getQParamInt("scenario", -1); // Scenario
|
||||
var actsit = getQParamInt("actsit", 0) == 1;
|
||||
var ctrdisc_key = getQParamInt("ctrdisc_key", -1); // Ctrdiscipline
|
||||
|
||||
@@ -86,6 +86,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
|
||||
|
||||
<script type="text/javascript">
|
||||
var urole = "<%=urole%>";
|
||||
var scen_key = <%=scen_key%>;
|
||||
|
||||
function doSubmit()
|
||||
{
|
||||
@@ -95,7 +96,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
|
||||
var selectedScen = true;
|
||||
function onChangeScenario()
|
||||
{
|
||||
if ($("#scenarios").val() > 0)
|
||||
if ($("#scenario").val() > 0)
|
||||
{
|
||||
if (!selectedScen)
|
||||
{
|
||||
@@ -114,7 +115,7 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
|
||||
|
||||
$(document).ready(function()
|
||||
{
|
||||
$(".tractsit").hide();
|
||||
if (scen_key < 0) $(".tractsit").hide();
|
||||
$("#actsit").prop("checked", true);
|
||||
selectedScen = false;
|
||||
<% if (autosearch)
|
||||
@@ -312,10 +313,10 @@ var authparamsCTRUSE = user.checkAutorisation("WEB_CTRUSE");
|
||||
var oRs = Oracle.Execute(sql);
|
||||
if (!oRs.Eof)
|
||||
{
|
||||
FCLTselector("scenarios",
|
||||
FCLTselector("scenario",
|
||||
sql,
|
||||
{ label: L("lcl_mjb_scenarios"),
|
||||
initKey: scen_key_arr,
|
||||
{ label: L("lcl_mjb_scenario"),
|
||||
initKey: scen_key,
|
||||
//multi: true, // Voor nu niet multi
|
||||
trclass:"primsearch noxd",
|
||||
emptyOption: "",
|
||||
|
||||
@@ -74,11 +74,7 @@ var inflatiefactor = 1 + (inflatiepct / 100);
|
||||
var frequentie = getQParamIntArray("frequentie", []); // Array met frequenties.
|
||||
var incbtw = getQParamInt("incbtw", 0) == 1; // Lijst inclusief BTW weergeven.
|
||||
|
||||
var scenarios = getQParamIntArray("scenarios", []); // Array met scenario's.
|
||||
// De lege (-1) waarde verwijderen als deze er tussen zit.
|
||||
var sindex = scenarios.join(",").indexOf("-1");
|
||||
if (sindex > -1)
|
||||
scenarios.splice(sindex, 1);
|
||||
var scenario = getQParamInt("scenario", -1); // Scenario
|
||||
var actsit = getQParamInt("actsit", 0) == 1; // Ook actuele situatie.
|
||||
|
||||
var ctrdisc_key = getQParamInt("ctrdisc_key", -1); // Ctrdiscipline
|
||||
@@ -101,7 +97,7 @@ var params = { deel: (deel != ""? deel : null),
|
||||
mjbfreq: frequentie.join(","),
|
||||
mjbincbtw: incbtw
|
||||
};
|
||||
var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrole", "inflatie", "frequentie", "incbtw", "toyear", "alg_startlevel", "alg_endlevel", "deel", "groep", "categorie_key"]);
|
||||
var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrole", "inflatie", "frequentie", "incbtw", "toyear", "alg_startlevel", "alg_endlevel", "deel", "groep", "categorie_key", "scenario"]);
|
||||
%>
|
||||
<html>
|
||||
<head>
|
||||
@@ -250,12 +246,13 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
FcltMgr.openModalDetail(url, L("lcl_mjb_dragdrop"), {callback: dragDropCallback});
|
||||
}
|
||||
|
||||
function insInstituteScen()
|
||||
{
|
||||
var subject = L("lcl_mjb_inst_scen");
|
||||
var url = "../mjb/mjb_institute_scen.asp";
|
||||
FcltMgr.openModalDetail(url, subject, {callback: FcltCallbackRefresh});
|
||||
}
|
||||
// Nu in "MJOP Scenario's" aan te roepen.
|
||||
//function insInstituteScen()
|
||||
//{
|
||||
// var subject = L("lcl_mjb_inst_scen");
|
||||
// var url = "../mjb/mjb_institute_scen.asp";
|
||||
// FcltMgr.openModalDetail(url, subject, {callback: FcltCallbackRefresh});
|
||||
//}
|
||||
|
||||
//function insAddTCScen()
|
||||
//{
|
||||
@@ -286,9 +283,29 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
}
|
||||
}
|
||||
|
||||
var subject = L("lcl_mjb_incl_scen");
|
||||
var url = "../mjb/mjb_incl_scen.asp?ins_keys=" + insKeyString + "&srtcont_keys=" + srtcontrolekeyArray.join(",");
|
||||
FcltMgr.openModalDetail(url, subject, {callback: FcltCallbackRefresh});
|
||||
if (insKeyString.length > 0)
|
||||
{
|
||||
if (<%=scenario%> > 0)
|
||||
{
|
||||
var data = { ins_keys: insKeyString,
|
||||
srtcont_keys: srtcontrolekeyArray.join(","),
|
||||
scen_key: <%=scenario%>
|
||||
};
|
||||
protectRequest.dataToken(data);
|
||||
$.post("../mjb/mjb_incl_scen_save.asp"
|
||||
, data
|
||||
, FcltCallbackRefresh
|
||||
, "json"
|
||||
);
|
||||
}
|
||||
else
|
||||
{
|
||||
var subject = L("lcl_mjb_incl_scen");
|
||||
var url = "../mjb/mjb_incl_scen.asp?ins_keys=" + insKeyString + "&srtcont_keys=" + srtcontrolekeyArray.join(",");
|
||||
FcltMgr.openModalDetail(url, subject, {callback: FcltCallbackRefresh});
|
||||
}
|
||||
}
|
||||
// else: alle taken zitten al in het scenario.
|
||||
}
|
||||
</script>
|
||||
<%
|
||||
@@ -343,6 +360,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
+ " , e.ctr_controle_type"
|
||||
+ " , e.ins_scenario_key"
|
||||
+ " , e.hasscenario"
|
||||
+ " , e.hasscenario2"
|
||||
+ " , e.scenario_oms"
|
||||
+ " , e.scenario_aantal"
|
||||
+ " FROM (SELECT el.ins_deel_key"
|
||||
@@ -367,7 +385,13 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
+ " , el.ins_srtcontroledl_xcp_eind"
|
||||
+ " , el.ctr_controle_type"
|
||||
+ " , el.ins_scenario_key"
|
||||
+ " , el.hasscenario"
|
||||
+ " , el.hasscenario" // Heeft de periodieke taak ook <20><>n of meerdere scenario's.
|
||||
+ " , COALESCE((SELECT MAX(1)" // Heeft de periodieke taak ook de meegegeven scenario 'scenario'.
|
||||
+ " FROM ins_srtcontroledl_xcp xcp2"
|
||||
+ " WHERE xcp2.ins_deel_key = el.ins_deel_key"
|
||||
+ " AND xcp2.ins_srtcontrole_key = el.ins_srtcontrole_key"
|
||||
+ " AND xcp2.ins_scenario_key = " + scenario
|
||||
+ " AND xcp2.ins_scenario_key IS NOT NULL), 0) hasscenario2"
|
||||
+ " , (SELECT LISTAGG(isc.ins_scenario_omschrijving, ', ') WITHIN GROUP (ORDER BY isc.ins_scenario_omschrijving)"
|
||||
+ " FROM ins_srtcontroledl_xcp xcp"
|
||||
+ " , ins_scenario isc"
|
||||
@@ -488,6 +512,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
+ " , comp.ctr_controle_type"
|
||||
+ " , comp.ins_scenario_key"
|
||||
+ " , comp.hasscenario"
|
||||
+ " , comp.hasscenario2"
|
||||
+ " , comp.scenario_oms"
|
||||
+ " , comp.scenario_aantal"
|
||||
+ " FROM (WITH comps (ins_deel_key" // Recursive WITH statement om het volgende vervangingsjaar te vinden (m.vervangingsjaar + m.ins_srtcontrole_periode).
|
||||
@@ -513,6 +538,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
+ " , ctr_controle_type"
|
||||
+ " , ins_scenario_key"
|
||||
+ " , hasscenario"
|
||||
+ " , hasscenario2"
|
||||
+ " , scenario_oms"
|
||||
+ " , scenario_aantal)"
|
||||
+ " AS (SELECT ins_deel_key"
|
||||
@@ -538,6 +564,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
+ " , ctr_controle_type"
|
||||
+ " , ins_scenario_key"
|
||||
+ " , hasscenario"
|
||||
+ " , hasscenario2"
|
||||
+ " , scenario_oms"
|
||||
+ " , scenario_aantal"
|
||||
+ " FROM (" + sql_componenten + ")"
|
||||
@@ -566,6 +593,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
+ " , ctr_controle_type"
|
||||
+ " , ins_scenario_key"
|
||||
+ " , hasscenario"
|
||||
+ " , hasscenario2"
|
||||
+ " , scenario_oms"
|
||||
+ " , scenario_aantal"
|
||||
+ " FROM comps m"
|
||||
@@ -635,6 +663,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
+ " , cy.ctr_controle_type"
|
||||
+ " , cy.ins_scenario_key"
|
||||
+ " , cy.hasscenario"
|
||||
+ " , cy.hasscenario2"
|
||||
+ " , cy.scenario_oms"
|
||||
+ " , cy.scenario_aantal"
|
||||
+ " FROM (" + sql_yearcost + ") cy"
|
||||
@@ -718,6 +747,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
+ " , cv.ctr_controle_type"
|
||||
+ " , cv.ins_scenario_key"
|
||||
+ " , cv.hasscenario"
|
||||
+ " , cv.hasscenario2"
|
||||
+ " , cv.scenario_oms"
|
||||
+ " , cv.scenario_aantal"
|
||||
+ " FROM (" + sql_cost_verval + ") cv";
|
||||
@@ -744,6 +774,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
+ " , SUM(bedrag) bedrag"
|
||||
+ " , SUM(orgbedrag) orgbedrag"
|
||||
+ " , hasscenario"
|
||||
+ " , hasscenario2"
|
||||
+ " , ins_scenario_key"
|
||||
+ " FROM (" + sql_cost + ")"
|
||||
+ " GROUP BY " + fields.join(", ")
|
||||
@@ -754,6 +785,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
+ (keyColumn == 'dg.ins_deel_key'?" , ins_deel_opmerking":"")
|
||||
+ " , vervangingsjaar"
|
||||
+ " , hasscenario"
|
||||
+ " , hasscenario2"
|
||||
+ " , ins_scenario_key";
|
||||
}
|
||||
|
||||
@@ -763,12 +795,12 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
+ ") PIVOT (SUM(bedrag), SUM(orgbedrag) AS orgbedrag "
|
||||
+ " FOR vervangingsjaar IN (" + jaren.join(",") + ") )";
|
||||
|
||||
if (scenarios.length > 0)
|
||||
if (scenario > 0)
|
||||
{
|
||||
if (!actsit)
|
||||
sql += " WHERE ins_scenario_key IN (" + scenarios + ") AND hasscenario = 1";
|
||||
sql += " WHERE ins_scenario_key IN (" + scenario + ") AND hasscenario2 = 1";
|
||||
else
|
||||
sql += " WHERE ins_scenario_key IN (" + scenarios + ") OR hasscenario = 0";
|
||||
sql += " WHERE ins_scenario_key IN (" + scenario + ") OR (hasscenario2 = 0 AND ins_scenario_key IS NULL)";
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -854,7 +886,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
{
|
||||
if (oRs("hasscenario").Value)
|
||||
{
|
||||
return "<nobr>" + (oRs("scenario_aantal").Value > 1? "*" : "") + "<i class='fa fa-fw fa-clone' title='" + oRs("scenario_oms").Value + "'></i>" + "</nobr>"
|
||||
return "<nobr>" + (oRs("scenario_aantal").Value > 1? "*" : "") + "<i class='fa fa-fw fa-clone' title='" + safe.htmlattr(oRs("scenario_oms").Value) + "'></i>" + "</nobr>"
|
||||
}
|
||||
else
|
||||
return "";
|
||||
@@ -864,7 +896,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
{
|
||||
if (hasReadALGUSE || hasReadALGMAN)
|
||||
{
|
||||
return "<span class='details' title='{2}' onclick='naargebouw({0}, this)'>{1}</span>".format(oRs("alg_gebouw_key").Value, safe.html(oRs("alg_gebouw_omschrijving").Value), (fulldetails ? safe.htmlattr(L("lcl_estate_gebouw_title")): L("ins_srtcontrole_m")));
|
||||
return "<span class='details' title='{2}' onclick='naargebouw({0}, this)'>{1}</span>".format(oRs("alg_gebouw_key").Value, safe.htmlattr(oRs("alg_gebouw_omschrijving").Value), (fulldetails ? safe.htmlattr(L("lcl_estate_gebouw_title")): L("ins_srtcontrole_m")));
|
||||
}
|
||||
else
|
||||
return safe.html(oRs("alg_gebouw_omschrijving").Value);
|
||||
@@ -877,7 +909,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
return "<span class='details' title='{2}' onclick='naardeel({0}, this)'>{1}</span>".format(oRs("keyColumn").Value, safe.html(oRs("ins_deel_omschrijving").Value), (oRs("ins_deel_opmerking").Value == null ? safe.htmlattr(L("lcl_mld_deel_details")) : safe.htmlattr(oRs("ins_deel_opmerking").Value)));
|
||||
}
|
||||
else
|
||||
return "<span title='{2}'>{1}</span>".format(oRs("keyColumn").Value, safe.html(oRs("ins_deel_omschrijving").Value), safe.htmlattr(oRs("ins_deel_opmerking").Value));
|
||||
return "<span title='{2}'>{1}</span>".format(oRs("keyColumn").Value, safe.htmlattr(oRs("ins_deel_omschrijving").Value), safe.htmlattr(oRs("ins_deel_opmerking").Value));
|
||||
}
|
||||
|
||||
function fnSrtcontrole(oRs)
|
||||
@@ -1017,7 +1049,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
|
||||
var buttons = [];
|
||||
//buttons.push({ icon: "plus.png", title: L("lcl_mjb_incl_scen"), action: 'insAddTCScen()' });
|
||||
buttons.push({ icon: "plus.png", title: L("lcl_mjb_inst_scen"), action: 'insInstituteScen()' });
|
||||
//buttons.push({ icon: "plus.png", title: L("lcl_mjb_inst_scen"), action: 'insInstituteScen()' });
|
||||
buttons.push({ icon: "page_refresh.png", title: L("lcl_refresh"), action: "FcltMgr.reload()" });
|
||||
buttons.push({ icon: "legenda.png", title: L("lcl_ins_controle_legenda"), action: 'openLegenda()' });
|
||||
|
||||
@@ -1039,7 +1071,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
});
|
||||
|
||||
//rst.addColumn(new Column({caption: L("level"), content: "ins_srtcontrole_level" /*, hasActions: true*/}));
|
||||
if (scenarios.length == 0)
|
||||
if (fulldetails && scenario == -1)
|
||||
rst.addColumn(new Column({caption: "<span title='{0}'>".format(safe.htmlattr(L("lcl_mjb_scenarios"))) + I("fa-clone") + "</span>", content: fnHasScenario }));
|
||||
rst.addColumn(new Column({caption: L("lcl_district"), content: "alg_district_omschrijving", purpose: (dist_key>-1 ? PRINTING_ONLY : PRINT_AND_VIEW)}));
|
||||
if (groupby > 1)
|
||||
@@ -1085,13 +1117,26 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol
|
||||
{
|
||||
rst.addAction({ action: "mjb_dragdrop", caption: L("lcl_mjb_dragdrop"), multi: true, multiOnce: true, onlyMulti: true } );
|
||||
|
||||
// Vooralsnog de acties niet in de regels weergeven en alleen als multi aanbieden.
|
||||
// Anders zijn de links naar gebouw, object en taak vaak niet niet zichtbaar en daardoor niet klikbaar.
|
||||
rst.addAction({ action: "insPlan", caption: L("lcl_ins_schedule"), multi: true, multiOnce: true, enabler: "ePlan", onlyMulti: true });
|
||||
rst.addAction({ action: "insStart", caption: L("lcl_ins_start"), multi: true, multiOnce: true, enabler: "eStart", onlyMulti: true });
|
||||
rst.addAction({ action: "insClose", caption: L("lcl_ins_close") + "/" + L("lcl_ins_finish"), multi: true, multiOnce: true, enabler: "eClose", onlyMulti: true });
|
||||
rst.addAction({ action: "insFinish", caption: L("lcl_ins_finish"), multi: true, multiOnce: true, enabler: "eFinish", onlyMulti: true });
|
||||
rst.addAction({ action: "insAddScen", caption: L("lcl_mjb_incl_scen"), multi: true, multiOnce: true, enabler: "eAddScen", onlyMulti: true });
|
||||
if (scenario == -1)
|
||||
{
|
||||
// Vooralsnog de acties niet in de regels weergeven en alleen als multi aanbieden.
|
||||
// Anders zijn de links naar gebouw, object en taak vaak niet niet zichtbaar en daardoor niet klikbaar.
|
||||
rst.addAction({ action: "insPlan", caption: L("lcl_ins_schedule"), multi: true, multiOnce: true, enabler: "ePlan", onlyMulti: true });
|
||||
rst.addAction({ action: "insStart", caption: L("lcl_ins_start"), multi: true, multiOnce: true, enabler: "eStart", onlyMulti: true });
|
||||
rst.addAction({ action: "insClose", caption: L("lcl_ins_close") + "/" + L("lcl_ins_finish"), multi: true, multiOnce: true, enabler: "eClose", onlyMulti: true });
|
||||
rst.addAction({ action: "insFinish", caption: L("lcl_ins_finish"), multi: true, multiOnce: true, enabler: "eFinish", onlyMulti: true });
|
||||
}
|
||||
if (scenario < 0)
|
||||
{
|
||||
rst.addAction({ action: "insAddScen", caption: L("lcl_mjb_incl_scen"), multi: true, multiOnce: true, enabler: "eAddScen", onlyMulti: true });
|
||||
}
|
||||
else if (scenario > 0 && actsit)
|
||||
{
|
||||
var oRs = Oracle.Execute("SELECT ins_scenario_omschrijving FROM ins_scenario WHERE ins_scenario_key = " + scenario);
|
||||
var scen_oms = oRs("ins_scenario_omschrijving").Value;
|
||||
oRs.Close();
|
||||
rst.addAction({ action: "insAddScen", caption: L("lcl_mjb_incl_scen0").format(scen_oms), multi: true, multiOnce: true, enabler: "eAddScen", onlyMulti: true });
|
||||
}
|
||||
}
|
||||
|
||||
var count = rst.processResultset();
|
||||
|
||||
Reference in New Issue
Block a user