diff --git a/APPL/MJB/mjb_search_list.asp b/APPL/MJB/mjb_search_list.asp index 1b490094f8..63a746067e 100644 --- a/APPL/MJB/mjb_search_list.asp +++ b/APPL/MJB/mjb_search_list.asp @@ -359,7 +359,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , e.ins_srtcontroledl_xcp_eind" + " , e.ctr_controle_type" + " , e.ins_scenario_key" - + " , e.hasscenario" + " , e.hasscenario2" + " , e.scenario_oms" + " , e.scenario_aantal" @@ -385,7 +384,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , el.ins_srtcontroledl_xcp_eind" + " , el.ctr_controle_type" + " , el.ins_scenario_key" - + " , el.hasscenario" // Heeft de periodieke taak ook één of meerdere scenario's. + (scenario > 0 ? " , COALESCE((SELECT MAX(1)" // Heeft de periodieke taak ook de meegegeven scenario 'scenario'. + " FROM ins_srtcontroledl_xcp xcp2" @@ -513,7 +511,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , comp.ins_srtcontroledl_xcp_eind" + " , comp.ctr_controle_type" + " , comp.ins_scenario_key" - + " , comp.hasscenario" + " , comp.hasscenario2" + " , comp.scenario_oms" + " , comp.scenario_aantal" @@ -539,7 +536,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , ins_srtcontroledl_xcp_eind" + " , ctr_controle_type" + " , ins_scenario_key" - + " , hasscenario" + " , hasscenario2" + " , scenario_oms" + " , scenario_aantal)" @@ -565,7 +561,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , ins_srtcontroledl_xcp_eind" + " , ctr_controle_type" + " , ins_scenario_key" - + " , hasscenario" + " , hasscenario2" + " , scenario_oms" + " , scenario_aantal" @@ -594,7 +589,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , m.ins_srtcontroledl_xcp_eind" + " , ctr_controle_type" + " , ins_scenario_key" - + " , hasscenario" + " , hasscenario2" + " , scenario_oms" + " , scenario_aantal" @@ -664,7 +658,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , bedrag" + " , cy.ctr_controle_type" + " , cy.ins_scenario_key" - + " , cy.hasscenario" + " , cy.hasscenario2" + " , cy.scenario_oms" + " , cy.scenario_aantal" @@ -748,7 +741,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " END bedrag" + " , cv.ctr_controle_type" + " , cv.ins_scenario_key" - + " , cv.hasscenario" + " , cv.hasscenario2" + " , cv.scenario_oms" + " , cv.scenario_aantal" @@ -775,7 +767,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , vervangingsjaar" + " , SUM(bedrag) bedrag" + " , SUM(orgbedrag) orgbedrag" - + " , hasscenario" + " , hasscenario2" + " , ins_scenario_key" + " FROM (" + sql_cost + ")" @@ -786,7 +777,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , keyColumn" + (keyColumn == 'dg.ins_deel_key'?" , ins_deel_opmerking":"") + " , vervangingsjaar" - + " , hasscenario" + " , hasscenario2" + " , ins_scenario_key"; } @@ -886,7 +876,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol function fnHasScenario(oRs) { - if (oRs("hasscenario").Value) + if (oRs("scenario_aantal").Value > 0) { return "" + (oRs("scenario_aantal").Value > 1? "*" : "") + "" + "" } @@ -1040,7 +1030,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol { return function (oRs) { - if (oRs("hasscenario").Value) + if (oRs("scenario_aantal").Value > 0) { return "mjbcloned" }