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

FCLT#54581 Makkelijker prioriteit bepalen in MJOP console

Browse Source 
svn path=/Website/trunk/; revision=39794
This commit is contained in:
Alex Tiehuis
2018-11-14 12:58:16 +00:00
parent 570ee6706e
commit 81cc671989
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
APPL/INS/ins.inc
View File

@@ -732,6 +732,7 @@ ins = {checkAutLevel:
+ " , xcp.ctr_controle_type"
+ " , idsc.ins_deelsrtcontrole_plandatum plandatum"
+ " , ins_srtcontroledl_xcp_startdat"
+ " , ins_srtcontroledl_xcp_prio"
+ " , CASE"
+ " WHEN 1 = " + (hasInspect? 0 : 1) // lastinspect IS NULL
+ " THEN (SELECT d.ins_deel_aanmaak FROM ins_deel d WHERE d.ins_deel_key = " + pins_deel_key + ")"
@@ -1411,6 +1412,7 @@ ins = {checkAutLevel:
? " , inspectie_date"
: " , inspectie_next")
+ " , ins_srtcontroledl_xcp_startdat"
+ " , ins_srtcontroledl_xcp_prio"
+ " , nonext"
+ " , inspectie_eenheid"
+ " , inspectie_eind"
@@ -1437,6 +1439,7 @@ ins = {checkAutLevel:
+ " , dsc.ins_deelsrtcontrole_datum inspectie_date"
+ (inspDone ? " , dsc.prs_perslid_key inspecteur_key" : "")
+ " , di.ins_srtcontroledl_xcp_startdat"
+ " , di.ins_srtcontroledl_xcp_prio"
+ " , NULL nonext"
+ " , di.ins_srtcontrole_eenheid inspectie_eenheid"
+ " , di.ins_srtcontrole_eind inspectie_eind"
@@ -1607,6 +1610,7 @@ ins = {checkAutLevel:
+ " , di.ctr_ismjob))"
+ " END inspectie_next"
+ " , di.ins_srtcontroledl_xcp_startdat"
+ " , di.ins_srtcontroledl_xcp_prio"
+ " , CASE WHEN NOT " + lastinspect + " THEN 1 ELSE 0 END nonext"
+ " , di.ins_srtcontrole_eenheid inspectie_eenheid"
+ " , di.ins_srtcontrole_eind inspectie_eind"
@@ -1714,6 +1718,7 @@ ins = {checkAutLevel:
+ " END"
+ " END inspectie_next"
+ " , ins_srtcontroledl_xcp_startdat"
+ " , ins_srtcontroledl_xcp_prio"
+ " , CASE WHEN NOT " + lastinspect + " THEN 1 ELSE 0 END nonext"
+ " , di.ins_srtcontrole_eenheid inspectie_eenheid"
+ " , di.ins_srtcontrole_eind inspectie_eind"
@@ -1771,6 +1776,7 @@ ins = {checkAutLevel:
sqlInspectie_select = " ispn.ctr_ismjob"
+ ", " + (inspDone? "inspectie_date" : "inspectie_next")
+ ", ispn.ins_srtcontroledl_xcp_startdat"
+ ", ispn.ins_srtcontroledl_xcp_prio"
+ ", ispn.ins_srtcontrole_omschrijving"
+ ", ispn.ins_srtcontrole_key"
+ ", ispn.options"
@@ -3119,6 +3125,7 @@ ins = {checkAutLevel:
+ " , e.prs_kostenplaats_key"
+ " , e.fin_btwtabelwaarde_key"
+ " , e.ins_srtcontroledl_xcp_startdat"
+ " , e.ins_srtcontroledl_xcp_prio"
+ " , e.ins_srtcontroledl_xcp_eind"
+ " , e.ctr_controle_type"
+ " , e.ins_scenario_key"
@@ -3225,6 +3232,7 @@ ins = {checkAutLevel:
+ " AND id3.ins_deelsrtcontrole_status = 6)"
+ " ) laatste_not_suc"
+ " , el.ins_srtcontroledl_xcp_startdat"
+ " , el.ins_srtcontroledl_xcp_prio"
+ " , el.ins_srtcontroledl_xcp_eind"
+ " , el.ctr_controle_type"
+ " , ins.nextcyclusdate(el.ins_deel_key, el.ins_srtcontrole_key, 1, 0) nextdate"
@@ -3535,7 +3543,8 @@ ins = {checkAutLevel:
+ " , comp.ins_srtcontrole_afbouwtijd"
+ " , comp.prs_kostenplaats_key"
+ " , comp.fin_btwtabelwaarde_key"
+ " , comp. ins_srtcontroledl_xcp_startdat"
+ " , comp.ins_srtcontroledl_xcp_startdat"
+ " , comp.ins_srtcontroledl_xcp_prio"
+ " , comp.ins_srtcontroledl_xcp_eind"
+ " , comp.ctr_controle_type"
+ " , comp.ins_scenario_key"
@@ -3597,6 +3606,7 @@ ins = {checkAutLevel:
+ " , prs_kostenplaats_key"
+ " , fin_btwtabelwaarde_key"
+ " , ins_srtcontroledl_xcp_startdat"
+ " , ins_srtcontroledl_xcp_prio"
+ " , ins_srtcontroledl_xcp_eind"
+ " , ctr_controle_type"
+ " , ins_scenario_key"
@@ -3635,6 +3645,7 @@ ins = {checkAutLevel:
+ " , prs_kostenplaats_key"
+ " , fin_btwtabelwaarde_key"
+ " , ins_srtcontroledl_xcp_startdat"
+ " , ins_srtcontroledl_xcp_prio"
+ " , ins_srtcontroledl_xcp_eind"
+ " , ctr_controle_type"
+ " , ins_scenario_key"
@@ -3672,6 +3683,7 @@ ins = {checkAutLevel:
+ " , m.prs_kostenplaats_key"
+ " , m.fin_btwtabelwaarde_key"
+ " , m.ins_srtcontroledl_xcp_startdat"
+ " , m.ins_srtcontroledl_xcp_prio"
+ " , m.ins_srtcontroledl_xcp_eind"
+ " , m.ctr_controle_type"
+ " , m.ins_scenario_key"
@@ -3761,6 +3773,7 @@ ins = {checkAutLevel:
+ " , g.alg_gebouw_vervaldatum"
+ " , dl.ins_deel_vervaldatum"
+ " , cy.ins_srtcontroledl_xcp_startdat"
+ " , cy.ins_srtcontroledl_xcp_prio"
+ " , cy.ins_srtcontroledl_xcp_eind"
+ " , cy.ins_srtcontrole_eind"
// De startdatum is MAX(startdatum, aanmaakdatum/registratiedatum) en heeft altijd een waarde (ins_deel_aanmaak is altijd gevuld).
@@ -3900,6 +3913,7 @@ ins = {checkAutLevel:
+ " , cv.planjaar"
+ " , cv.afbouwtijd"
+ " , cv.ins_srtcontroledl_xcp_startdat startdatum"
+ " , cv.ins_srtcontroledl_xcp_prio"
+ " , (SELECT " + S("prs_kpn_string")
+ " FROM prs_kostenplaats k"
+ " WHERE k.prs_kostenplaats_key = CV.prs_kostenplaats_key) kostenplaats"

6
APPL/MJB/mjb_search_list.asp
View File

@@ -747,6 +747,11 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
return safe.html(oRs("ins_srtcontrole_omschrijving").Value);
}
function fnfncolPrioClass(oRs)
{
return "xcp_prio_"+oRs("ins_srtcontroledl_xcp_prio").Value;
}
function fnfnBedrag(jaar) // altijd afronden
{
return function (oRs)
@@ -963,6 +968,7 @@ var transitParam = buildTransitParam(["deel", "groep", "categorie_key", "distric
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score1"), content: "ins_deel_mjb_score1", datatype: "number", align: "center"}));
rst.addColumn(new Column({caption: L("ins_srtdeel_mjb_grensscore1"), content: "ins_srtdeel_mjb_grensscore1", datatype: "number", align: "center"}));
rst.addColumn(new Column({caption: L("lcl_ins_deel_mjb_score2"), content: "ins_deel_mjb_score2", datatype: "number", align: "center"}));
rst.addColumn(new Column({caption: L("lcl_ins_srtcontroledl_xcp_prio"), content: "ins_srtcontroledl_xcp_prio", columnClass: fnfncolPrioClass, datatype: "number", align: "center"}));
}
}
if (fulldetails)