diff --git a/APPL/MJB/mjb_search_list.asp b/APPL/MJB/mjb_search_list.asp index f7c7509ab6..cbbd3de476 100644 --- a/APPL/MJB/mjb_search_list.asp +++ b/APPL/MJB/mjb_search_list.asp @@ -284,11 +284,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , e.fin_btwtabelwaarde_key" + " , e.ins_srtcontroledl_xcp_eind" + " , e.ctr_controle_type" - + " , CASE" - + " WHEN c.laatste IS NOT NULL" - + " THEN 1" - + " ELSE 0" - + " END hasinspect" + " FROM (SELECT el.ins_deel_key" + " , el.ins_srtcontroledl_xcp_key" + " , el.ins_srtcontrole_omschrijving" @@ -401,7 +396,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , comp.fin_btwtabelwaarde_key" + " , comp.ins_srtcontroledl_xcp_eind" + " , comp.ctr_controle_type" - + " , comp.hasinspect" + " FROM (WITH comps (ins_deel_key" // Recursive WITH statement om het volgende vervangingsjaar te vinden (m.vervangingsjaar + m.ins_srtcontrole_periode). + " , ins_srtcontroledl_xcp_key" + " , ins_srtcontrole_key" @@ -421,8 +415,7 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , ins_srtcontrole_afbouwtijd" + " , fin_btwtabelwaarde_key" + " , ins_srtcontroledl_xcp_eind" - + " , ctr_controle_type" - + " , hasinspect)" + + " , ctr_controle_type)" + " AS (SELECT ins_deel_key" + " , ins_srtcontroledl_xcp_key" + " , ins_srtcontrole_key" @@ -443,7 +436,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , fin_btwtabelwaarde_key" + " , ins_srtcontroledl_xcp_eind" + " , ctr_controle_type" - + " , hasinspect" + " FROM (" + sql_componenten + ")" + " WHERE vervangingsjaar IS NOT NULL" + " UNION ALL" // latere jaren @@ -467,7 +459,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , m.fin_btwtabelwaarde_key" + " , m.ins_srtcontroledl_xcp_eind" + " , ctr_controle_type" - + " , hasinspect" + " FROM comps m" + " WHERE (m.vervangingsjaar + m.ins_srtcontrole_periode <= " + toyear + "))" + " SELECT *" @@ -532,7 +523,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " , ins_srtcontrole_afbouwtijd afbouwtijd" + " , bedrag" + " , cy.ctr_controle_type" - + " , cy.hasinspect" + " FROM (" + sql_yearcost + ") cy" + " , ins_v_deel_gegevens dg" + " , alg_district d" @@ -602,7 +592,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol + " ELSE cv.bedrag " + " END bedrag" + " , cv.ctr_controle_type" - + " , cv.hasinspect" + " FROM (" + sql_cost_verval + ") cv"; if (!fulldetails) @@ -662,7 +651,6 @@ var transitParam = buildTransitParam(["disc", "srtgroep", "srtdeel", "srtcontrol data.insDeelSrtContrKey = oRs("ins_deelsrtcontrole_key").Value? oRs("ins_deelsrtcontrole_key").Value : -1; data.insNexdate1 = new Date(oRs("org_nexdate_1").Value).getFullYear(); // Eerstvolgende na de laatste. data.insCtrControleType = oRs("ctr_controle_type").Value; - data.hasinspect = oRs("hasinspect").Value; } return JSON.stringify(data);