diff --git a/CTR/CTR_IND.SRC b/CTR/CTR_IND.SRC new file mode 100644 index 00000000..806fcb97 --- /dev/null +++ b/CTR/CTR_IND.SRC @@ -0,0 +1,9 @@ +/* + * $Revision$ + * $Id$ + */ + +CREATE UNIQUE INDEX ctr_i_ctr_disc_params1 ON ctr_disc_params(ctr_ins_discipline_key); + +REGISTERONCE('$Id$') + diff --git a/CTR/CTR_INI.SRC b/CTR/CTR_INI.SRC new file mode 100644 index 00000000..53b0c9b0 --- /dev/null +++ b/CTR/CTR_INI.SRC @@ -0,0 +1,24 @@ +#ifdef CTR +/* + * $Revision$ + * $Id$ + */ + + +_FAC_MODULE('CTR','Periodieke taken') + +INSERT INTO ins_tab_discipline (ins_discipline_module, ins_discipline_omschrijving) values ('CTR', 'Controle'); +INSERT INTO ctr_disc_params(ctr_ins_discipline_key, ctr_disc_params_controle_type) + SELECT MAX(ins_discipline_key), 1 FROM ins_tab_discipline; + +INSERT INTO ins_tab_discipline (ins_discipline_module, ins_discipline_omschrijving) values ('CTR', 'Vervanging'); +INSERT INTO ctr_disc_params(ctr_ins_discipline_key, ctr_disc_params_controle_type) + SELECT MAX(ins_discipline_key), 2 FROM ins_tab_discipline; + +INSERT INTO ins_tab_discipline (ins_discipline_module, ins_discipline_omschrijving) values ('CTR', 'Certificering'); +insert into ctr_disc_params(ctr_ins_discipline_key, ctr_disc_params_controle_type) + SELECT MAX(ins_discipline_key), 3 FROM ins_tab_discipline; + +REGISTERONCE('$Id$') + +#endif // MRK diff --git a/CTR/CTR_PAC.SRC b/CTR/CTR_PAC.SRC new file mode 100644 index 00000000..450a93e4 --- /dev/null +++ b/CTR/CTR_PAC.SRC @@ -0,0 +1,10 @@ +#ifdef CTR +/* + * $Revision$ + * $Id$ + */ + + +REGISTERRUN('$Id$') + +#endif // CTR diff --git a/CTR/CTR_SEQ.SRC b/CTR/CTR_SEQ.SRC new file mode 100644 index 00000000..b3b3e331 --- /dev/null +++ b/CTR/CTR_SEQ.SRC @@ -0,0 +1,11 @@ +#ifdef CTR +/* + * $Revision$ + * $Id$ + */ + +CREATE SEQUENCE ctr_s_ctr_disc_params_key MINVALUE 1; + +REGISTERONCE('$Id$') + +#endif // CTR diff --git a/CTR/CTR_TAB.SRC b/CTR/CTR_TAB.SRC new file mode 100644 index 00000000..1e290f66 --- /dev/null +++ b/CTR/CTR_TAB.SRC @@ -0,0 +1,24 @@ +#ifdef CTR +/* + * $Revision$ + * $Id$ + */ + +CREATE_TABLE (ctr_disc_params,0) +( + 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, + + 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), + CONSTRAINT ctr_r_ins_discipine_key FOREIGN KEY (ctr_ins_discipline_key) + REFERENCES ins_tab_discipline (ins_discipline_key) +); + +REGISTERONCE('$Id$') + +#endif // CTR diff --git a/CTR/CTR_TRI.SRC b/CTR/CTR_TRI.SRC new file mode 100644 index 00000000..a32f6de9 --- /dev/null +++ b/CTR/CTR_TRI.SRC @@ -0,0 +1,18 @@ +#ifdef CTR +/* + * $Revision$ + * $Id$ + */ + + +CREATE_TRIGGER(ctr_t_ctr_disc_params_b_iu) +BEFORE INSERT OR UPDATE ON ctr_disc_params +FOR EACH ROW +BEGIN + UPDATE_PRIMARY_KEY(ctr_disc_params_key, ctr_s_ctr_disc_params_key); +END; +/ + +REGISTERRUN('$Id$') + +#endif // CTR diff --git a/CTR/CTR_VIE.SRC b/CTR/CTR_VIE.SRC new file mode 100644 index 00000000..5c57b98d --- /dev/null +++ b/CTR/CTR_VIE.SRC @@ -0,0 +1,17 @@ +#ifdef CTR +/* + * $Revision$ + * $Id$ + */ + + +CREATE_VIEW(ctr_discipline, 0) +AS + SELECT * FROM all_discipline WHERE ins_discipline_module = 'CTR'; + +DEFINIEER_VIEW_AANWEZIG(ctr_discipline, ins_discipline_verwijder, + ctr_v_aanwezigdiscipline, 0); + +REGISTERRUN('$Id$') + +#endif // CTR diff --git a/FAC/FAC_INI.SRC b/FAC/FAC_INI.SRC index f128bee2..4631d3b5 100644 --- a/FAC/FAC_INI.SRC +++ b/FAC/FAC_INI.SRC @@ -1884,6 +1884,7 @@ DEF_FAC_FUNCTIE2('WEB_MLDMGT', 'Modulebeheer:Servicedesk', 'MLD', DEF_FAC_FUNCTIE2('WEB_MRKMGT', 'Modulebeheer:Marktplaats', 'MRK', 0, 0, 2, 'Modulebeheer'); DEF_FAC_FUNCTIE2('WEB_PRSMGT', 'Modulebeheer:Personenbeheer', 'PRS', 0, 0, 2, 'Modulebeheer'); DEF_FAC_FUNCTIE2('WEB_RESMGT', 'Modulebeheer:Reserveringen', 'RES', 0, 0, 2, 'Modulebeheer'); +DEF_FAC_FUNCTIE2('WEB_CTRMGT', 'Modulebeheer:Periodie taken', 'CTR', 0, 0, 2, 'Modulebeheer'); DEF_FAC_FUNCTIE2('WEB_ALGMSU', 'Supergebruiker:Ruimtebeheer', 'ALG', 0, 0, 2, 'Supergebruiker'); DEF_FAC_FUNCTIE2('WEB_BESMSU', 'Supergebruiker:Artikelbeheer', 'BES', 0, 0, 2, 'Supergebruiker'); // changed diff --git a/FCLT.NMK b/FCLT.NMK index 29356232..76dca639 100644 --- a/FCLT.NMK +++ b/FCLT.NMK @@ -152,6 +152,13 @@ $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).SQL: \ $(MSRC)\cnt\cnt_tab.src \ $(MSRC)\cnt\cnt_tri.src \ $(MSRC)\cnt\cnt_vie.src \ + $(MSRC)\ctr\ctr_ind.src \ + $(MSRC)\ctr\ctr_ini.src \ + $(MSRC)\ctr\ctr_pac.src \ + $(MSRC)\ctr\ctr_seq.src \ + $(MSRC)\ctr\ctr_tab.src \ + $(MSRC)\ctr\ctr_tri.src \ + $(MSRC)\ctr\ctr_vie.src \ $(MSRC)\fac\fac_ind.src \ $(MSRC)\fac\fac_ini.src \ $(MSRC)\fac\fac_lcl.src \ diff --git a/FCLT.SRC b/FCLT.SRC index ebf273da..6458dcc4 100644 --- a/FCLT.SRC +++ b/FCLT.SRC @@ -78,6 +78,7 @@ SET ECHO ON #include "prj\prj_tab.src" #include "msg\msg_tab.src" #include "kpi\kpi_tab.src" +#include "ctr\ctr_tab.src" /* SEQUENCES */ #include "fac\fac_seq.src" @@ -96,6 +97,7 @@ SET ECHO ON #include "prj\prj_seq.src" #include "msg\msg_seq.src" #include "kpi\kpi_seq.src" +#include "ctr\ctr_seq.src" /* INDICES */ #include "fac\fac_ind.src" @@ -114,6 +116,7 @@ SET ECHO ON #include "prj\prj_ind.src" #include "msg\msg_ind.src" #include "kpi\kpi_ind.src" +#include "ctr\ctr_ind.src" /* VIEWS, PACKAGES, TRIGGERS and LOCALES */ #include "_up/recreate.inc" @@ -135,6 +138,7 @@ SET ECHO ON #include "prj\prj_ini.src" #include "msg\msg_ini.src" #include "kpi\kpi_ini.src" +#include "ctr\ctr_ini.src" COMMIT; diff --git a/INS/INS_TAB.SRC b/INS/INS_TAB.SRC index 46b8c9ee..6fa56dc3 100644 --- a/INS/INS_TAB.SRC +++ b/INS/INS_TAB.SRC @@ -424,6 +424,9 @@ CREATE_TABLE(ins_srtcontrole, 0) ins_srtcontrole_omschrijving VARCHAR2(60) NOT_NULL(ins_srtcontrole_omschrijving, ins_c_srtcontrole_omschrijving), + ctr_discipline_key NUMBER(10) + CONSTRAINT ctr_c_ins_srtcontrole_dis_key CHECK(ctr_discipline_key IS NOT NULL) + CONSTRAINT ctr_c_ins_srtctr_discipline REFERENCES ins_tab_discipline(ins_discipline_key), ins_srtcontrole_type // 1=controle, 2=vervanging, 3=certificering, rest ntb NUMBER(1) DEFAULT(1), diff --git a/MODULES.H b/MODULES.H index 40c61f9e..f97edd01 100644 --- a/MODULES.H +++ b/MODULES.H @@ -9,10 +9,11 @@ * BEZ - Bezoekers registratie * CAD - AutoCAD koppeling * CNT - Contracten + * CTR - Periodieke taken (controles) * FAC - Basismodule * FIN - Financien/facturen * INS - Installaties - * KPI - KPI's (planned 2015.3) + * KPI - KPI's * MLD - Meldingen * MRK - Marktplaats * MSG - Messenger @@ -27,6 +28,7 @@ #define BEZ BEZ #define CAD CAD #define CNT CNT +#define CTR CTR #define FAC FAC #define FIN FIN #define INS INS diff --git a/_UP/DB28to29.src b/_UP/DB28to29.src index 4d2035d0..4b992c55 100644 --- a/_UP/DB28to29.src +++ b/_UP/DB28to29.src @@ -74,6 +74,32 @@ UPDATE fac_menuitems WHERE fac_functie_code = 'FAC_PRSSYS') WHERE fac_menuitems_label = 'lcl_menu_cad_verify'; +/////////////////////////////////////////////////////////////////////////////////////////// FSN#37004 +#include "../ctr/ctr_tab.src" +#include "../ctr/ctr_seq.src" +#include "../ctr/ctr_ind.src" +#include "../ctr/ctr_tri.src" +#include "../ctr/ctr_ini.src" + +ALTER TABLE ins_srtcontrole ADD + ctr_discipline_key NUMBER(10) + --CONSTRAINT ctr_c_ins_srtcontrole_dis_key CHECK(ctr_discipline_key IS NOT NULL) + CONSTRAINT ctr_c_ins_srtcontrole_discipline REFERENCES ins_tab_discipline(ins_discipline_key); + +UPDATE ins_srtcontrole SET + ctr_discipline_key = (SELECT ctr_ins_discipline_key + FROM ctr_disc_params + WHERE ctr_disc_params_controle_type = ins_srtcontrole_type); + +ALTER TABLE ins_srtcontrole ADD + CONSTRAINT ctr_c_ins_srtcontrole_dis_key CHECK(ctr_discipline_key IS NOT NULL) + +DEF_FAC_FUNCTIE2('WEB_CTRMGT', 'Modulebeheer:Periodie taken', 'CTR', 0, 0, 2, 'Modulebeheer'); + +DEF_MENUITEM(1, 'lcl_menu_kpi', '', 'KPI', 'appl/kpi/kpi_search.asp', 0, 0, 'WEB_KPIRAP', 'R', '0', ''); +MENU_INS_AFTER('lcl_menu_kpi', 'lcl_menu_res_quality', 2); + + /////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/_UP/recreate.inc b/_UP/recreate.inc index 7776fbbc..50d01081 100644 --- a/_UP/recreate.inc +++ b/_UP/recreate.inc @@ -21,6 +21,7 @@ #include "prj\prj_vie.src" #include "msg\msg_vie.src" #include "kpi\kpi_vie.src" +#include "ctr\ctr_vie.src" // Recreation all packages #include "adm\adm_pac.src" @@ -40,6 +41,7 @@ #include "prj\prj_pac.src" #include "msg\msg_pac.src" #include "kpi\kpi_pac.src" +#include "ctr\ctr_pac.src" // Recreation all triggers #include "fac\fac_tri.src" @@ -58,6 +60,7 @@ #include "prj\prj_tri.src" #include "msg\msg_tri.src" #include "kpi\kpi_tri.src" +#include "ctr\ctr_tri.src" /* LOCALE's */ #include "fac\fac_lcl.src"