diff --git a/CTR/CTR_TAB.SRC b/CTR/CTR_TAB.SRC index 1e290f66..c5d7a8ee 100644 --- a/CTR/CTR_TAB.SRC +++ b/CTR/CTR_TAB.SRC @@ -6,12 +6,18 @@ CREATE_TABLE (ctr_disc_params,0) ( - ctr_disc_params_key NUMBER(10), - ctr_ins_discipline_key NUMBER(10), + ctr_disc_params_key + NUMBER(10), + ctr_ins_discipline_key + NUMBER(10), ctr_disc_params_controle_type // 1=controle, 2=vervanging, 3=certificering, rest ntb - NUMBER(1) - DEFAULT(1) - CONSTRAINT ctr_disc_params_controle_type NOT NULL, + NUMBER(1) + DEFAULT(1) + CONSTRAINT ctr_disc_params_controle_type NOT NULL, + ctr_disc_params_ismjob + NUMBER(1) -- valid are 0, 1 + DEFAULT 0 + NOT NULL, CONSTRAINT ctr_c_ins_discipline_key CHECK (ctr_ins_discipline_key IS NOT NULL), CONSTRAINT ctr_k_ctr_disc_params_key PRIMARY KEY (ctr_disc_params_key), diff --git a/FAC/FAC_SET.SRC b/FAC/FAC_SET.SRC index b8c5e5bd..2c11c8f9 100644 --- a/FAC/FAC_SET.SRC +++ b/FAC/FAC_SET.SRC @@ -51,7 +51,7 @@ DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'ProxyServerIPAddress' DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'language_toggles' , 'array' , 'NL' , 'Allow language toggle for alternate languages') DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'multi_language_option' , 'number' , '0' , 'Enable multi language') DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'hiresTimer' , 'number' , '0' , 'internal use only') -DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'crypto_provider' , 'number' , '0' , '0=JavaScript, 1=Slnkdwf.dll (Future use)') +DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'crypto_provider' , 'number' , '1' , '0=JavaScript, 1=Slnkdwf.dll') DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'cache_changecounter' , 'number' , '0' , 'Increment by one to reset FCLT caching.') DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'csstemplate' , 'json' , '{}' , 'Color scheme.') DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'csscust' , 'string' , '' , 'cust.css replacement (Future use)') @@ -429,6 +429,10 @@ DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_inspect_soon_days' DEFINE_SETTING('INS', 0001, 'WEB_FACTAB', 'inspect_enabled' , 'number' , '0' , 'Is FACILITOR Inspect available {0 | 1} (future use)') DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_flex_uitgifte_empty' , 'number' , '0' , 'Flexvelden die geen meetwaarden zijn leeg maken bij uitgifte {0=no (default) | 1=yes}') DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_occupationsensors_srtgroep_key' , 'number' , '-1' , 'INS_SRTGROEP_KEY of sensor objects to be used for occupation/availability') +DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_explode_objects' , 'number' , '1' , 'Explode the nummer of (new) object {0=no | 1=yes (default)}') +DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_xcp_active_cost' , 'number' , '15' , 'Active cost fields used/shown {+1=kosten, +2=kosten2, +4=kosten3, +8=materiaal}') +DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'mjb_inflation' , 'float' , '1' , 'Default inflation mjob') +DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'mjb_show_years' , 'number' , '5' , 'Default number of years which should be shown in the MJOB console') DEFINE_SETTING('PRS', 0001, 'WEB_FACTAB', 'badgenum_kenmerk_key' , 'number' , '-1' , 'PRS_KENMERK_KEY of property badge number') DEFINE_SETTING('QVW', 0001, 'WEB_FACFAC', 'qvw_enabled' , 'number' , '0' , 'Number of licensed Qlikview users {0 | n}') DEFINE_SETTING('QVW', 0001, 'WEB_FACFAC', 'qvw_ajaxzfcpath' , 'string' , 'https://qv.facilitor.nl/QvAjaxZfc/', 'Root prefix to QlikView Analyzer Zero Footprint Client (must end with /)') diff --git a/INS/INS_VIE.SRC b/INS/INS_VIE.SRC index b36fc6f3..c7a92e5d 100644 --- a/INS/INS_VIE.SRC +++ b/INS/INS_VIE.SRC @@ -328,6 +328,7 @@ CREATE_VIEW(ins_v_deel_gegevens,0) , ins_deel_aanmaak , ins_deel_opmerking , ins_deel_getekend + , ins_deel_vervaldatum ) AS SELECT INS_D.ins_discipline_key , INS_D.ins_discipline_omschrijving @@ -370,6 +371,7 @@ AS SELECT INS_D.ins_discipline_key , INS_DE.ins_deel_aanmaak , INS_DE.ins_deel_opmerking , INS_DE.ins_deel_getekend + , INS_DE.ins_deel_vervaldatum FROM ins_deel INS_DE , ins_tab_discipline INS_D , ins_v_alg_overzicht INS_AO @@ -427,6 +429,7 @@ AS SELECT INS_D.ins_discipline_key , INS_DE.ins_deel_aanmaak , INS_DE.ins_deel_opmerking , INS_DE.ins_deel_getekend + , INS_DE.ins_deel_vervaldatum FROM ins_deel INS_DE , ins_tab_discipline INS_D , prs_v_afdeling_perslid PRS_AP @@ -1560,13 +1563,22 @@ CREATE_VIEW(ins_v_defined_inspect, 0) ins_srtcontrole_periode, ins_srtcontrole_bits, ins_srtcontrole_kosten, + ins_srtcontrole_kosten2, + ins_srtcontrole_kosten3, + ins_srtcontrole_uren, + ins_srtcontrole_materiaal, + ins_srtcontrole_percentage, ins_srtcontrole_eind, ins_srtcontrole_groep, ins_srtcontrole_opmerking, ins_srtcontrole_info, ins_srtcontrole_type, ins_srtcontrole_level, - ctr_discipline_key + ins_srtcontrole_afbouwtijd, + fin_btwtabelwaarde_key, + ctr_discipline_key, + ctr_controle_type, + ctr_ismjob ) AS SELECT id.ins_deel_key, @@ -1583,23 +1595,34 @@ AS isc.ins_srtcontrole_periode, isc.ins_srtcontrole_bits, isc.ins_srtcontrole_kosten, + isc.ins_srtcontrole_kosten2, + isc.ins_srtcontrole_kosten3, + isc.ins_srtcontrole_uren, + isc.ins_srtcontrole_materiaal, + isc.ins_srtcontrole_percentage, isc.ins_srtcontrole_eind, isc.ins_srtcontrole_groep, isc.ins_srtcontrole_opmerking, isc.ins_srtcontrole_info, isc.ins_srtcontrole_type, isc.ins_srtcontrole_level, - isc.ctr_discipline_key + isc.ins_srtcontrole_afbouwtijd, + isc.fin_btwtabelwaarde_key, + isc.ctr_discipline_key, + cdp.ctr_disc_params_controle_type, + cdp.ctr_disc_params_ismjob FROM ins_deel id, ins_srtdeel s, - ins_srtcontrole isc + ins_srtcontrole isc, + ctr_disc_params cdp 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 isc.ins_srtinstallatie_key = id.ins_discipline_key) + AND isc.ctr_discipline_key = cdp.ctr_ins_discipline_key; CREATE_VIEW(ins_v_defined_inspect_xcp, 0) ( @@ -1617,19 +1640,31 @@ CREATE_VIEW(ins_v_defined_inspect_xcp, 0) ins_srtcontrole_periode, ins_srtcontrole_bits, ins_srtcontrole_kosten, + ins_srtcontrole_kosten2, + ins_srtcontrole_kosten3, + ins_srtcontrole_uren, + ins_srtcontrole_materiaal, + ins_srtcontrole_percentage, ins_srtcontrole_eind, ins_srtcontrole_groep, ins_srtcontrole_opmerking, ins_srtcontrole_info, ins_srtcontrole_type, ins_srtcontrole_level, - ins_srtcontroledl_xcp_uren, - ins_srtcontroledl_xcp_materia, + ins_srtcontrole_afbouwtijd, + fin_btwtabelwaarde_key, + ins_srtcontroledl_xcp_key, + ins_srtcontroledl_xcp_kosten, ins_srtcontroledl_xcp_kosten2, ins_srtcontroledl_xcp_kosten3, + ins_srtcontroledl_xcp_uren, + ins_srtcontroledl_xcp_materia, ins_srtcontroledl_xcp_perc, + ins_srtcontroledl_xcp_eind, ins_scenario_key, - ctr_discipline_key + ctr_discipline_key, + ctr_controle_type, + ctr_ismjob ) AS SELECT di.ins_deel_key, @@ -1648,19 +1683,31 @@ AS di.ins_srtcontrole_periode), COALESCE (ins_srtcontroledl_xcp_bits, di.ins_srtcontrole_bits), COALESCE (ins_srtcontroledl_xcp_kosten, di.ins_srtcontrole_kosten), + COALESCE (ins_srtcontroledl_xcp_kosten2, di.ins_srtcontrole_kosten2), + COALESCE (ins_srtcontroledl_xcp_kosten3, di.ins_srtcontrole_kosten3), + COALESCE (ins_srtcontroledl_xcp_uren, di.ins_srtcontrole_uren), + COALESCE (ins_srtcontroledl_xcp_materia, di.ins_srtcontrole_materiaal), + COALESCE (ins_srtcontroledl_xcp_perc, di.ins_srtcontrole_percentage), COALESCE (ins_srtcontroledl_xcp_eind, di.ins_srtcontrole_eind), COALESCE (ins_srtcontroledl_xcp_groep, di.ins_srtcontrole_groep), - di.ins_srtcontrole_opmerking, + COALESCE (ins_srtcontroledl_xcp_opmerk, di.ins_srtcontrole_opmerking), di.ins_srtcontrole_info, di.ins_srtcontrole_type, ins_srtcontrole_level, - ins_srtcontroledl_xcp_uren, - ins_srtcontroledl_xcp_materia, + ins_srtcontrole_afbouwtijd, + fin_btwtabelwaarde_key, + ins_srtcontroledl_xcp_key, + ins_srtcontroledl_xcp_kosten, ins_srtcontroledl_xcp_kosten2, ins_srtcontroledl_xcp_kosten3, + ins_srtcontroledl_xcp_uren, + ins_srtcontroledl_xcp_materia, ins_srtcontroledl_xcp_perc, + ins_srtcontroledl_xcp_eind, ins_scenario_key, - di.ctr_discipline_key + di.ctr_discipline_key, + di.ctr_controle_type, + di.ctr_ismjob FROM ins_v_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(+);