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

FSN#39567: Van MJOB naar MJOP/R.

Browse Source 
svn path=/Database/trunk/; revision=34879
This commit is contained in:
Maykel Geerdink
2017-08-09 13:58:43 +00:00
parent 7fdfe93be8
commit 2817318284
9 changed files with 90 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CTR/CTR_TAB.SRC
View File

@@ -18,6 +18,9 @@ CREATE_TABLE (ctr_disc_params,0)
NUMBER(1) -- valid are 0, 1
DEFAULT 0
NOT NULL,
mld_stdmelding_key
NUMBER(10)
CONSTRAINT mld_r_mld_stdmelding_key6 REFERENCES mld_stdmelding,
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),

1
CTR/CTR_TRI.SRC
View File

@@ -9,6 +9,7 @@ AUDIT_BEGIN(ctr_disc_params)
AUDIT_VALUE(ctr_disc_params, ctr_ins_discipline_key)
AUDIT_VALUE(ctr_disc_params, ctr_disc_params_controle_type)
AUDIT_VALUE(ctr_disc_params, ctr_disc_params_ismjob)
AUDIT_VALUE(ctr_disc_params, mld_stdmelding_key)
AUDIT_END()
CREATE_TRIGGER(ctr_t_ctr_disc_params_b_iu)

39
FAC/FAC_LCL.SRC
View File

@@ -440,6 +440,7 @@ FAC_LCL('lcl_loggedin_as', '', 'Logged in as ')
FAC_LCL('lcl_password_link', 'Wachtwoord', 'Password')
FAC_LCL('lcl_password_title', 'Wijzig wachtwoord', 'Change password')
FAC_LCL('lcl_password_expired_title', 'Uw wachtwoord is verlopen', 'Your password has expired')
FAC_LCL('lcl_einddatum_login_expired', 'Uw account is verlopen', 'Your account has expired')
FAC_LCL('lcl_ch_password_old', 'Oud wachtwoord', 'Old password')
FAC_LCL('lcl_ch_password_new', 'Nieuw wachtwoord', 'New password')
FAC_LCL('lcl_ch_password_con', 'Bevestig nieuw wachtwoord', 'Confirm new password')
@@ -1058,8 +1059,10 @@ FAC_LCL('lcl_mjb_inclbtw', 'Inclusief BTW', 'Including VAT')
FAC_LCL('lcl_mjb_dragdrop', 'Herplannen taken', 'Reschedule tasks')
FAC_LCL('lcl_mjb_becancelled', 'Vervallen', 'Cancelled')
FAC_LCL('lcl_mjb_phasingout', 'Uitfasering', 'Phasing out')
FAC_LCL('lcl_mjb_status_mjob', 'Status van MJOB', 'Status of MJOB')
FAC_LCL('lcl_mjb_overruled_xcp', 'Aangepast', 'Overruled')
FAC_LCL('lcl_mjb_moved', 'Verschoven', 'Moved')
FAC_LCL('lcl_mjb_started', 'In behandeling', 'In progress')
FAC_LCL('lcl_mjb_year', 'Jaar', 'Year')
FAC_LCL('lcl_mjb_original', 'Oorspronkelijk {0}', 'Original {0}')
FAC_LCL('lcl_mjb_scenario', 'Scenario', 'Scenario')
@@ -1071,9 +1074,13 @@ FAC_LCL('lcl_mjb_incl_scen', 'Aan scenario toevoegen', 'Add to scenario')
FAC_LCL('lcl_mjb_incl_scen0', 'Aan scenario {0} toevoegen', 'Add to scenario {0}')
FAC_LCL('lcl_mjb_new_scenario', 'Nieuw scenario', 'New scenario')
FAC_LCL('lcl_mjb_scen_opm', 'Opmerking', 'Remark')
FAC_LCL('lcl_mjb_performed_high', 'De taak wordt uitgevoerd door een hogere prio taak.', 'The task will be performed by a higher priority task.')
FAC_LCL('lcl_mjb_adjustby_scen', 'Aangepast door scenario {0}', 'Adjusted by scenario {0}')
FAC_LCL('lcl_mjb_inst_scen', 'Scenario doorvoeren', 'Institute scenario')
FAC_LCL('lcl_mjb_copy_current', 'Kopieer actuele situatie', 'Copy current situation')
FAC_LCL('lcl_mjb_freeze', 'Bevriezen', 'Freeze')
FAC_LCL('lcl_mjb_freezing', 'Wilt u deze taak bevriezen?', 'Would you like to freeze this task?')
FAC_LCL('lcl_mjb_freezing_m', 'Wilt u deze taken bevriezen?', 'Would you like to freeze these tasks?')
FAC_LCL('lcl_holiday', 'De aangegeven dag is geen werkdag! Doorgaan?', 'The selected day is not a work day! Continue?')
FAC_LCL('lcl_holiday_not_ok_bes', 'De begin dag is geen werkdag. Start met een werkdag of kies een enkele dag.', 'The selected starting day is not a working day. Please select a working day or select a single day.')
FAC_LCL('lcl_remark', 'Opmerking', 'Remark')
@@ -4991,6 +4998,7 @@ FAC_LCL('mld_typeopdr_zichtbaarfe', 'Zichtbaar voor FE', 'Visible for FE')
FAC_LCL('mld_typeopdr_isofferte', 'Offerteaanvraag', 'Offer request')
FAC_LCL('mld_typeopdr_offertelimiet', 'Bedrag waarboven offerte nodig', 'Offer required above amount')
FAC_LCL('mld_typeopdr_gvs', 'Goedkeuringsvrijstelling', 'Functional approval exemption')
FAC_LCL('mld_typeopdr_fvs', 'Fiatteringvrijstelling', 'Financial approval exemption')
FAC_LCL('mld_typeopdr_typeopdr_key', 'Opdrachttype na offerte', 'Order type after offer')
FAC_LCL('mld_typeopdr_contract', 'Contract kiezen bij opdracht van dit type', 'Select contract for this order type')
FAC_LCL('mld_typeopdr_contractLOV',
@@ -5509,7 +5517,7 @@ FAC_LCL('aut_idp_type', 'Identity type', 'Identity type')
FAC_LCL('aut_idp_typeLOV', '1;Internal (login.asp, future use);2;UID_DEC (deprecated);3;GUID-encrypted (deprecated);4;JWT sso;5;SAML', '1;Internal (login.asp, future use);2;UID_DEC (deprecated);3;GUID-encrypted (deprecated);4;JWT sso;5;SAML')
FAC_LCL('aut_idp_secret', 'Gedeeld geheim', 'Shared secret')
FAC_LCL('aut_idp_audience', 'JWT audience', 'JWT audience')
FAC_LCL('aut_idp_issuer', 'JWT issuer/SAML EntityId', 'JWT issuer/SAML EntityId')
FAC_LCL('aut_idp_issuer', 'JWT issuer/SAML remote EntityId', 'JWT issuer/SAML remote EntityId')
FAC_LCL('aut_idp_algorithm', 'JWT algoritme', 'JWT algorithm')
FAC_LCL('aut_idp_remote_loginurl', 'Remote Login URL', 'Remote Login URL')
FAC_LCL('aut_idp_remote_logouturl', 'Remote Logout URL', 'Remote Logout URL')
@@ -5534,6 +5542,30 @@ FAC_LCL('aut_idp_map_to', 'FACILITOR attribuut', 'FACILITOR attribute')
FAC_LCL('aut_idp_map_from', 'Claim veld', 'Claim field')
FAC_LCL('aut_idp_map_default', 'Standaardwaarde', 'Default value')
FAC_LCL('aut_sp', 'Service provider', 'Service provider')
FAC_LCL('aut_sp_m', 'Service providers', 'Service providers')
FAC_LCL('lcl_menu_aut_sp', 'Service providers', 'Service providers')
FAC_LCL('aut_sp_code', 'Code voor ?sso=', 'Code for ?sso=')
FAC_LCL('aut_sp_omschrijving', 'Omschrijving', 'Description')
FAC_LCL('aut_sp_opmerking', 'Opmerking', 'Remark')
FAC_LCL('aut_sp_type', 'Identity type', 'Identity type')
FAC_LCL('aut_sp_typeLOV', '1;Internal (login.asp, future use);2;UID_DEC (deprecated);3;GUID-encrypted (deprecated);4;JWT sso;5;SAML', '1;Internal (login.asp, future use);2;UID_DEC (deprecated);3;GUID-encrypted (deprecated);4;JWT sso;5;SAML')
FAC_LCL('aut_sp_secret', 'Gedeeld geheim', 'Shared secret')
FAC_LCL('aut_sp_audience', 'JWT audience', 'JWT audience')
FAC_LCL('aut_sp_issuer', 'JWT issuer', 'JWT issuer')
FAC_LCL('aut_sp_algorithm', 'JWT algoritme', 'JWT algorithm')
FAC_LCL('aut_sp_redirect_uri', 'Redirect uri', 'Redirect uri')
FAC_LCL('aut_sp_duration', 'Maximale geldigheid', 'Maximum validity')
FAC_LCL('aut_sp_functie_key', 'Alleen als autorisatie', 'Only for authorisation')
FAC_LCL('aut_sp_internal', 'Internal', 'Internal')
FAC_LCL('aut_sp_autocreate', 'Aanmaken/bijwerken', 'Create/Update')
FAC_LCL('aut_sp_saml_metaurl', 'SAML metaurl', 'SAML metaurl')
FAC_LCL('aut_sp_loglevel', 'Log level', 'Log level')
FAC_LCL('aut_sp_map', 'Identity mapping', 'Identity mapping')
FAC_LCL('aut_sp_map_m', 'Identity mappings', 'Identity mappings')
FAC_LCL('aut_sp_map_to', 'FACILITOR attribuut', 'FACILITOR attribute')
FAC_LCL('aut_sp_map_from', 'Claim veld', 'Claim field')
FAC_LCL('aut_client', 'Applicatie', 'Application')
FAC_LCL('aut_client_m', 'Applicaties', 'Applications')
@@ -5578,6 +5610,7 @@ FAC_LCL('lcl_terms_accept', 'Ik ga akkoord met de', 'I accept the')
FAC_LCL('lcl_terms_volgende', 'Volgende', 'Continue')
FAC_LCL('lcl_menu_fac_anytable', 'Elke tabel bekijken', 'View any table')
FAC_LCL('lcl_menu_fac_anysql', 'Elke SQL bekijken', 'View any SQL')
FAC_LCL('lcl_menu_fac_anyupload', 'Alle bijlagen upload', 'Any attachment upload')
FAC_LCL('bgt_discipline', 'Project', 'Project')
FAC_LCL('bgt_discipline_m', 'Projecten', 'Projects')
@@ -5613,6 +5646,8 @@ FAC_LCL('bgt_budget_begin', 'Beschikbaar vanaf', '')
FAC_LCL('bgt_budget_eind', 'Beschikbaar tot', '')
FAC_LCL('bgt_budget_accountgrp', 'Accountgroep', '')
FAC_LCL('bgt_budget_account', 'Account', '')
FAC_LCL('bgt_kostenplaats', 'Account', 'Account')
FAC_LCL('bgt_kostenplaats_m', 'Accounts', 'Accounts')
//FAC_LCL('bgt_budget_vervaldatum', 'Vervaldatum', '')
FAC_LCL('bgt_totaaloverzicht', 'Totaaloverzicht', 'Total overview')
@@ -6067,7 +6102,7 @@ FAC_LCL('lcl_WEB_CTRMGT_info', 'Modulebeheer', 'Module management')
FAC_LCL('lcl_WEB_CTRUSE_info', 'Om periodieke taken van objecten te kunnen uitvoeren', 'To process recurring tasks')
FAC_LCL('lcl_WEB_APIDOC_info', 'Kan online API documentatie opvragen', 'Access online API documentation')
FAC_LCL('lcl_WEB_FACFAC_info', 'FACILITOR internal use only', 'FACILITOR internal use only')
FAC_LCL('lcl_WEB_FACMGT_info', 'Modulebeheer autorisatiegroepen (binnen de eigen autorisaties!)', 'Module management (within own autorisations!)')
FAC_LCL('lcl_WEB_FACMGT_info', 'Modulebeheer autorisatiegroepen (binnen de eigen autorisaties!)', 'Module management (within own authorisations!)')
FAC_LCL('lcl_WEB_FACMSU_info', 'Supergebruiker', 'Super user')
FAC_LCL('lcl_WEB_FACTAB_info', 'Technisch applicatie beheer (server instellingen)', 'Technical application management (server configuration)')
FAC_LCL('lcl_WEB_HLPADM_info', 'Voor klein systeembeheer', 'System management assistant')

23
FAC/FAC_PAC.SRC
View File

@@ -130,7 +130,7 @@ CREATE OR REPLACE PACKAGE fac
PROCEDURE processemail (pfrom IN VARCHAR2, pto IN VARCHAR2, psubject IN VARCHAR2, pbody IN VARCHAR2, psessionid IN VARCHAR2);
FUNCTION isdatefeestdag(p_date IN DATE) RETURN BOOLEAN;
FUNCTION calcnextcyclusdate (p_date IN DATE, p_mode IN NUMBER, p_eenheid IN NUMBER, p_periode IN NUMBER, p_bits IN NUMBER) RETURN DATE;
FUNCTION nextcyclusdate (p_date IN DATE, p_mode IN NUMBER, p_eenheid IN NUMBER, p_periode IN NUMBER, p_bits IN NUMBER, p_steps IN NUMBER DEFAULT 0) RETURN DATE;
FUNCTION nextcyclusdate (p_date IN DATE, p_mode IN NUMBER, p_eenheid IN NUMBER, p_periode IN NUMBER, p_bits IN NUMBER, p_steps IN NUMBER DEFAULT 0, p_ismjob IN NUMBER DEFAULT 0) RETURN DATE;
FUNCTION nextcyclusdatedeel (p_insdeel IN NUMBER, p_srtcontrole IN NUMBER, p_scenario IN NUMBER, p_steps IN NUMBER DEFAULT 0) RETURN DATE;
FUNCTION nextcyclusdatesteps (p_date IN DATE, p_mode IN NUMBER, p_eenheid IN NUMBER, p_periode IN NUMBER, p_bits IN NUMBER, p_steps IN NUMBER DEFAULT 1, p_enddate IN DATE DEFAULT SYSDATE) RETURN NUMBER;
FUNCTION makehash (p_in VARCHAR2, method IN VARCHAR2 DEFAULT 'MD5') RETURN VARCHAR2;
@@ -4347,7 +4347,8 @@ CREATE OR REPLACE PACKAGE BODY fac AS
p_eenheid IN NUMBER,
p_periode IN NUMBER,
p_bits IN NUMBER,
p_steps IN NUMBER DEFAULT 0)
p_steps IN NUMBER DEFAULT 0,
p_ismjob IN NUMBER DEFAULT 0)
RETURN DATE
IS
inspdate DATE;
@@ -4374,7 +4375,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
-- Bij het meegegeven van de huidige datum en steps is 0 de huidige controledatum weer teruggeven.
IF NOT (p_steps = 0 AND toekomst) -- p_steps != 0 || !toekomst
THEN
-- Calculate next cyclus date m.b.v. voledige datum met tijd.
-- Calculate next cyclus date m.b.v. volledige datum met tijd.
inspdate := calcnextcyclusdate (inspdate, p_mode, p_eenheid, p_periode, p_bits);
END IF;
@@ -4386,14 +4387,21 @@ CREATE OR REPLACE PACKAGE BODY fac AS
inspdate_trunc := TRUNC(inspdate, 'DDD');
END IF;
nuoftoekomst := inspdate_trunc >= vandaagdate;
-- Voor MJOB is nu het hele jaar.
IF p_ismjob = 1
THEN
nuoftoekomst := EXTRACT (YEAR FROM inspdate_trunc) >= EXTRACT (YEAR FROM vandaagdate);
ELSE
nuoftoekomst := inspdate_trunc >= vandaagdate;
END IF;
IF p_steps = 0
THEN
IF nuoftoekomst
THEN
RETURN inspdate;
ELSE
RETURN nextcyclusdate (inspdate, p_mode, p_eenheid, p_periode, p_bits, 0); -- voledige datum met tijd gebruiken
RETURN nextcyclusdate (inspdate, p_mode, p_eenheid, p_periode, p_bits, 0); -- volledige datum met tijd gebruiken
END IF;
ELSIF p_steps > 1 AND nuoftoekomst
THEN
@@ -4402,7 +4410,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
THEN
RETURN inspdate;
ELSE
RETURN nextcyclusdate (inspdate, p_mode, p_eenheid, p_periode, p_bits, p_steps - 1); -- voledige datum met tijd gebruiken
RETURN nextcyclusdate (inspdate, p_mode, p_eenheid, p_periode, p_bits, p_steps - 1); -- volledige datum met tijd gebruiken
END IF;
END;
@@ -4441,7 +4449,8 @@ CREATE OR REPLACE PACKAGE BODY fac AS
xcp.ins_srtcontrole_eenheid,
xcp.ins_srtcontrole_periode,
xcp.ins_srtcontrole_bits,
p_steps
p_steps,
xcp.ctr_ismjob
) inspectie_next
INTO inspdate
FROM ins_v_defined_inspect_xcp xcp

8
FAC/FAC_SET.SRC
View File

@@ -115,6 +115,7 @@ DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'prs_login_lockout_delay'
DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'prs_login_lockout_delayfactor' , 'float' , '2' , 'Exponent base for prs_login_lockout_delay')
DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'prs_login_attempts' , 'number' , '5' , 'Lockout username after this many failed attempts')
DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'prs_login_lockout_expire' , 'number' , '15' , 'Lockout minutes after prs_login_attempts failed attempts')
DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'prs_einddatum_login_grace' , 'number' , '-1' , 'Disallow login after prs_einddatum. (-1=disabled, >=0 disallow after einddatum+nnn days')
DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'prs_allow_impersonate' , 'boolean' , 'false' , 'Allow impersonation by PRSSYS')
DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'prs_personal_noti_options' , 'number' , '15' , 'Options that are provided for personal notification overrules (+8:popup,+4:sms,+2:mail,+1:portal)')
@@ -459,9 +460,13 @@ DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'ins_occupationsensors_srtgroep_key'
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', 'ins_auth_obj_lendout' , 'number' , '0' , 'Authorization scope for objects which are lent out for lending registration (INSFOF/fo) {0=owner(borrower) (default) | 1=basic place/owner}')
DEFINE_SETTING('FAC', 0001, 'WEB_FACFAC', 'mjb_enabled' , 'number' , '0' , 'Is MJOB module available {0 | 1}')
DEFINE_SETTING('INS', 0001, 'WEB_FACFAC', 'mjb_enabled' , 'number' , '0' , 'Is MJOB available {0 | 1}')
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('INS', 0001, 'WEB_PRSSYS', 'mjb_operation_external' , 'number' , '0' , 'Operational handling mjob {0=internal (default) | 1=external}')
DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'mjb_default_stdmelding' , 'number' , '-1' , 'Default backoffice (stdmelding key) for mjob calls')
DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'mjb_start_year' , 'number' , EXTRACT(YEAR FROM SYSDATE) , 'Start year of using MJOB')
DEFINE_SETTING('INS', 0001, 'WEB_PRSSYS', 'mjb_freeze_year' , 'number' , EXTRACT(YEAR FROM SYSDATE) , 'Freeze year of MJOB')
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 /)')
@@ -746,6 +751,7 @@ DEFINE_SETTING('PUO', 0000, 'WEB_FACTAB', 'puo_sendpassword' , 'string
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_flags' , 'number' , '255' , '+1=send notifications, +2=send orders, +4=all orders Immediate')
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_order_flexfiles' , 'number' , '0' , 'Include flexfiles with sent orders')
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_apppushurl' , 'string' , '' , 'URL for pushing APP notifications')
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_failalert_threshold' , 'number' , '30' , 'Minimum number of failed send-attempts before an alert is send to the (FACFAC) application manager(s)')
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'bdradrfiles_path' , 'string' , NULL , 'Technische adressen bijlagen folder')
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_lcl_friendly_mailto' , 'string' , 'Opdracht per e-mail gestuurd naar {0}' , 'Friendly text for mail tracking')
DEFINE_SETTING('PUO', 0001, 'WEB_PRSSYS', 'puo_lcl_friendly_http' , 'string' , 'Opdracht per SOAP gestuurd naar {0}' , 'Friendly text for http tracking')

7
INS/INS_PAC.SRC
View File

@@ -8,7 +8,7 @@ CREATE OR REPLACE PACKAGE ins AS
FUNCTION delete_deelkoppeling( DeelKey IN NUMBER ) RETURN BOOLEAN;
FUNCTION get_description(LPNName IN VARCHAR2, CondKey IN NUMBER, Prefix IN VARCHAR2) RETURN VARCHAR2;
FUNCTION sprintf (ps IN varchar2, pins_deel_key IN number) RETURN varchar2;
FUNCTION contrsprintf (ps IN varchar2, pins_deelsrtcontr_key IN number) RETURN varchar2;
FUNCTION contrsprintf (ps IN varchar2, pins_deelsrtcontr_key IN NUMBER) RETURN varchar2;
FUNCTION nextcyclusdate (p_insdeel IN NUMBER, p_srtcontrole IN NUMBER, p_scenario IN NUMBER, p_steps IN NUMBER DEFAULT 0) RETURN DATE;
FUNCTION nextcyclusdatesteps (p_insdeel IN NUMBER, p_srtcontrole IN NUMBER, p_steps IN NUMBER DEFAULT 1) RETURN NUMBER;
PROCEDURE setinspectstatus (pdlsrtcontrkey IN NUMBER, pstatus IN NUMBER, puserkey IN NUMBER);
@@ -202,7 +202,7 @@ CREATE OR REPLACE PACKAGE BODY ins AS
-- Berekent de n-de (p_steps) controledatum na p_date.
-- Indien p_steps niet is meegegeven dan wordt de eerstvolgende controledatum na nu teruggegeven.
-- steps = 0, (NULL): 1-ste vandaag of in de toekomst (als meegegeven datum (p_date) de huidite datum is, dan deze weer teruggeven).
-- steps = 0, (NULL): 1-ste vandaag of in de toekomst (als meegegeven datum (p_date) de huidige datum is, dan deze weer teruggeven).
-- steps = n: n-volgende vanaf meegegeven datum (p_date). Als deze berekende datum in de toekomst ligt en steps is nog niet null, dan wordt NULL teruggegeven).
-- De einddatum van het object (xcp.ins_srtcontroledl_xcp_eind) wordt niet meegenomen. De volgende inspectiedatum wordt gewoon teruggeven.
FUNCTION nextcyclusdate (p_insdeel IN NUMBER,
@@ -234,7 +234,8 @@ CREATE OR REPLACE PACKAGE BODY ins AS
xcp.ins_srtcontrole_eenheid,
xcp.ins_srtcontrole_periode,
xcp.ins_srtcontrole_bits,
p_steps
p_steps,
xcp.ctr_ismjob
) inspectie_next
INTO inspdate
FROM ins_v_defined_inspect_xcp xcp

7
INS/INS_TAB.SRC
View File

@@ -479,7 +479,12 @@ CREATE_TABLE(ins_srtcontrole, 0)
CONSTRAINT ins_r_fin_btwtabelwaarde1 REFERENCES fin_btwtabelwaarde(fin_btwtabelwaarde_key),
*/
ins_srtcontrole_afbouwtijd
NUMBER(6,2)
NUMBER(6,2)
/* in mld_tab.src:
mld_stdmelding_key
NUMBER(10)
CONSTRAINT mld_r_mld_stdmelding_key7 REFERENCES mld_stdmelding
*/
/* in prs_tab.src:
,prs_kostenplaats_key
NUMBER(10)

15
INS/INS_VIE.SRC
View File

@@ -1526,7 +1526,8 @@ CREATE_VIEW(ins_v_defined_inspect, 0)
fin_btwtabelwaarde_key,
ctr_discipline_key,
ctr_controle_type,
ctr_ismjob
ctr_ismjob,
mld_stdmelding_key
)
AS
SELECT id.ins_deel_key,
@@ -1559,7 +1560,8 @@ AS
isc.fin_btwtabelwaarde_key,
isc.ctr_discipline_key,
cdp.ctr_disc_params_controle_type,
cdp.ctr_disc_params_ismjob
cdp.ctr_disc_params_ismjob,
COALESCE(isc.mld_stdmelding_key, cdp.mld_stdmelding_key)
FROM ins_deel id,
ins_srtdeel s,
ins_srtcontrole isc,
@@ -1622,7 +1624,8 @@ CREATE_VIEW(ins_v_defined_inspect_xcp, 0)
ins_scenario_key,
ctr_discipline_key,
ctr_controle_type,
ctr_ismjob
ctr_ismjob,
mld_stdmelding_key
)
AS
-- Alle scenario controles. Die hebben geen outer-join nodig omdat de exceptions compleet zijn
@@ -1673,7 +1676,8 @@ AS
ins_scenario_key,
di.ctr_discipline_key,
di.ctr_controle_type,
di.ctr_ismjob
di.ctr_ismjob,
di.mld_stdmelding_key
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
@@ -1726,7 +1730,8 @@ AS
1 ins_scenario_key,
di.ctr_discipline_key,
di.ctr_controle_type,
di.ctr_ismjob
di.ctr_ismjob,
di.mld_stdmelding_key
FROM ins_v_defined_inspect di,
(SELECT * -- de actuele exceptions
FROM ins_srtcontroledl_xcp

6
MLD/MLD_TAB.SRC
View File

@@ -409,6 +409,12 @@ ALTER TABLE mld_stdmelding MODIFY mld_stdmelding_t_uitvoertijd NOT_NULL(mld_stdm
ALTER TABLE mld_stdmelding MODIFY mld_stdmelding_t_uitvtijd_pr1 DEFAULT MLD_T_UITVOERTIJD(NULL, NULL);
ALTER TABLE mld_stdmelding MODIFY mld_stdmelding_t_uitvtijd_pr2 DEFAULT MLD_T_UITVOERTIJD(NULL, NULL);
ALTER TABLE mld_stdmelding MODIFY mld_stdmelding_t_uitvtijd_pr4 DEFAULT MLD_T_UITVOERTIJD(NULL, NULL);
ALTER TABLE ins_srtcontrole ADD
(
mld_stdmelding_key
NUMBER(10)
CONSTRAINT mld_r_mld_stdmelding_key7 REFERENCES mld_stdmelding
);
// Eventuele afwijkingen per srtruimte van SLA tijden.
// Fungeert als COALESCE met alg_srtruimte.