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

UWVA#29778 Bezoekersstromen 1e versie

Browse Source 
svn path=/Database/trunk/; revision=22368
This commit is contained in:
Jos Groot Lipman
2014-08-19 13:41:50 +00:00
parent 43c66e9084
commit 37819830dd
7 changed files with 75 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BEZ/BEZ_TAB.SRC
View File

@@ -13,6 +13,8 @@ CREATE_TABLE(bez_actie,0)
VARCHAR2(64),
bez_actie_default
NUMBER(1),
bez_actie_flags
NUMBER(3) DEFAULT 0 NOT NULL, -- 0x001=oproepen, 0x002=autobadge
bez_actie_verwijder
DATE
);

20
FAC/FAC_LCLASP.SRC
View File

@@ -3323,6 +3323,21 @@ FACXSL_LCL('lcl_res_flag6', 'Code 6', 'Code 6', 'Code 6', 'Code 6')
FACXSL_LCL('lcl_res_flag7', 'Code 7', 'Code 7', 'Code 7', 'Code 7')
FACXSL_LCL('lcl_res_flag8', 'Code 8', 'Code 8', 'Code 8', 'Code 8')
FACXSL_LCL('lcl_res_flag9', 'Code 9', 'Code 9', 'Code 9', 'Code 9')
FACXSL_LCL('lcl_respool', 'Pool reservering', '@@', '@@', '@@')
FACXSL_LCL('lcl_select_respool', 'Selecteer pool reservering', '@@', '@@', '@@')
FACXSL_LCL('lcl_res_ownafspr', 'Maak nieuwe afspraak', '@@', '@@', '@@')
FACXSL_LCL('lcl_norespool', 'Geen geschikte pool-reserveringen gevonden.', '@@', '@@', '@@')
FACXSL_LCL('lcl_respool_prefix', 'Pool:', '@@', '@@', '@@')
FACXSL_LCL('lcl_res_repeat_pool', 'Kopieer pool eservering {0}', 'Copy pool reservation {0}', 'Kopiere @@ Reservierung {0}', 'Copier @@ r<>servation {0}')
FACXSL_LCL('lcl_res_bez_novisitor', 'Er zijn geen wachtende bezoekers op dit moment.', '@@', '@@', '@@')
FACXSL_LCL('lcl_res_bez_hasleft', 'Bezoeker is al vertrokken om {0}', '@@', '@@', '@@')
FACXSL_LCL('lcl_res_bez_wascalled', 'Bezoeker is al opgeroepen om {0}', '@@', '@@', '@@')
FACXSL_LCL('lcl_res_bez_coming', 'Bezoeker: {0}\nNummer: {1}\n\nKomt naar: {2}\nAangemeld: {3}\nWachttijd: {4} minuten', '@@', '@@', '@@')
FACXSL_LCL('lcl_res_desk_head', 'Reservering {0} {1} ({2}-{3})', '@@', '@@', '@@')
FACXSL_LCL('lcl_res_bez_oproepen', 'Oproepen', '@@', '@@', '@@')
FACXSL_LCL('lcl_res_bez_loket', 'Loket', '@@', '@@', '@@')
FACXSL_LCL('lcl_res_bez_wait', 'Wachttijd', '@@', '@@', '@@')
FACXSL_LCL('lcl_res_bez_called', 'Opgeroepen', '@@', '@@', '@@')
FACXSL_LCL('lcl_shared_more', 'Meer >', 'More >', 'Mehr >', 'Plus >')
FACXSL_LCL('lcl_shared_other', 'Anders', 'Others', '<27>brige', 'D''autres')
@@ -3484,6 +3499,11 @@ FACXSL_LCL('lcl_qvw_bes_winst', 'Winst', 'Profit', 'Gewinn', 'B
FACXSL_LCL('lcl_qvw_bes_gem_kosten', 'Gemiddelde kosten per bestelling (in Euro)', 'Average costs per purchase order request (in Euro)', 'Kostendurchschnitt pro Bestellung (in Euro)', 'Co<43>ts moyenne par ordre (en Euro)')
FACXSL_LCL('lcl_qvw_bes_artikelprijs', 'Artikelprijs', 'Article price', 'Artikelpreis', 'Prix d''article')
FACXSL_LCL('lcl_xd_mld_crossdomain', 'Alle omgevingen', 'All domains', 'Alle <20>mgebungen', 'Tous domains')
FACXSL_LCL('lcl_xd_issues', 'Totaaloverzicht meldingen', '@', '@', '@')
FACXSL_LCL('lcl_xd_invoices', 'Totaaloverzicht facturen', '@', '@', '@')
FACXSL_LCL('lcl_xd_custid', 'Account', 'Account', '@', '@')
FACXSL_LCL('lcl_puo_order_failfirst', 'Verzenden van de opdracht is niet direct gelukt.\nHet verzenden zal automatisch opnieuw geprobeerd worden.', '@@', '@@', '@@')
END_FACXSL_LCL()

5
FAC/FAC_SET.SRC
View File

@@ -434,6 +434,8 @@ DEFINE_SETTING('RES', 0009, 'res_image_path' , 'string'
DEFINE_SETTING('RES', 0003, 'res_with_mld' , 'number' , '0' , 'Reservering kan meldingen hebben {0=Nee (default) | 1=Ja}')
DEFINE_SETTING('RES', 0003, 'res_ruimte_prijsfactor_intern' , 'float' , '1' , 'Default multiplication factor for room prices if for internal use (e.g. 0.8)')
DEFINE_SETTING('RES', 0003, 'res_delete_ask_kosten' , 'number' , '1' , 'Aks for recharge costs at delete (0=never ask, 1=ask after, 2=ask only final, 3=ask only final after)')
DEFINE_SETTING('RES', 0003, 'res_pool_early' , 'number' , '30' , 'Minutes for early pool-visitors')
DEFINE_SETTING('RES', 0003, 'res_pool_late' , 'number' , '30' , 'Minutes for late pool-visitors')
DEFINE_SETTING('RES', 0003, 'res_allow_for_others' , 'number' , '1' , 'Can I make reservations for others ? {0=no | 1=yes}')
DEFINE_SETTING('RES', 0003, 'res_reservering_flags' , 'number' , '0' , 'Number of flags fo/bo can define on reservation. Max 10')
DEFINE_SETTING('RES', 0001, 'res_remoteurl_refuse' , 'string' , '' , 'Regexp, do not jump to these remote url (future use)')
@@ -448,6 +450,9 @@ DEFINE_SETTING('BEZ', 0003, 'vis_afspraak_limiet' , 'number'
DEFINE_SETTING('BEZ', 0003, 'vis_fe_afspraak_limiet' , 'number' , '180' , 'max number of days from now that visitors are allowed by FE, in past or future {-1 = no limit}')
DEFINE_SETTING('BEZ', 0003, 'vis_checkout_enable' , 'number' , '1' , 'register checkout of visitors by BO {0=no | 1=yes}')
DEFINE_SETTING('BEZ', 0003, 'vis_badgeprint_enable' , 'number' , '1' , 'print {0=no | 1=print at check in | 2=show print button | 3=both 1 and 2}')
DEFINE_SETTING('BEZ', 0003, 'vis_autobadgeletters' , 'string' , '' , 'eg. ABCDEFG: Cycle through these letters daily')
DEFINE_SETTING('BEZ', 0003, 'vis_autobadgestart' , 'number' , '1' , 'Daily autobadge start')
DEFINE_SETTING('BEZ', 0003, 'vis_autobadgelength' , 'number' , '3' , 'Autobadge digits')
DEFINE_SETTING('BEZ', 0003, 'vis_user_history' , 'number' , '7' , 'number of days in the past the FE can see his vistors')
DEFINE_SETTING('BEZ', 0003, 'vis_expire' , 'number' , '0' , 'number of days in the future from which the FE can delete de visitors')
DEFINE_SETTING('BEZ', 0001, 'vis_afspraak_onrgoed_uses_keys' , 'number' , '0' , 'listboxes location until room instead of only a room text field; INITIEEL INRICHTEN (BEZ-tabellen leeg)!')

38
RES/RES_PAC.SRC
View File

@@ -6,7 +6,12 @@
*/
CREATE OR REPLACE PACKAGE res AS
FUNCTION res_copy_deelres (prsv_ruimte_key IN NUMBER, newdate IN DATE, puserkey NUMBER) RETURN NUMBER;
FUNCTION res_copy_res (pres_key IN NUMBER, newdate IN DATE, puserkey NUMBER, pmetbez NUMBER DEFAULT 0) RETURN NUMBER;
FUNCTION res_copy_deelres (prsv_ruimte_key IN NUMBER,
newdate IN DATE,
puserkey NUMBER,
pmetbez NUMBER DEFAULT 1,
newreskey NUMBER DEFAULT NULL) RETURN NUMBER;
PROCEDURE res_sync_deelres (prsv_ruimte_key_from IN NUMBER, prsv_ruimte_key_to IN NUMBER, flags IN NUMBER, pres_copy_to_bez IN NUMBER);
PROCEDURE set_ruimte_dirty (prsv_ruimte_key IN NUMBER);
PROCEDURE set_ruimtes_clean (checkdate IN DATE);
@@ -32,7 +37,32 @@ END res;
CREATE OR REPLACE PACKAGE BODY res
AS
FUNCTION res_copy_deelres (prsv_ruimte_key IN NUMBER, newdate IN DATE, puserkey NUMBER) RETURN NUMBER
FUNCTION res_copy_res (pres_key IN NUMBER, newdate IN DATE, puserkey NUMBER, pmetbez NUMBER DEFAULT 0) RETURN NUMBER
AS
nextkey res_reservering.res_reservering_key%TYPE;
rsv_key res_rsv_ruimte.res_rsv_ruimte_key%TYPE;
BEGIN
SELECT res_s_res_reservering_key.NEXTVAL INTO nextkey FROM DUAL;
INSERT INTO res_reservering (res_reservering_key, res_reservering_ispool)
SELECT nextkey, res_reservering_ispool
FROM res_reservering
WHERE res_reservering_key = pres_key;
FOR prsv_ruimte
IN (SELECT res_rsv_ruimte_key
FROM res_v_aanwezigrsv_ruimte
WHERE res_reservering_key = pres_key)
LOOP
rsv_key := res.res_copy_deelres (prsv_ruimte.res_rsv_ruimte_key, newdate, puserkey, pmetbez, nextkey);
END LOOP;
RETURN nextkey;
END;
FUNCTION res_copy_deelres (prsv_ruimte_key IN NUMBER,
newdate IN DATE,
puserkey NUMBER,
pmetbez NUMBER DEFAULT 1,
newreskey NUMBER DEFAULT NULL) RETURN NUMBER
AS
nextvolg res_rsv_ruimte.res_rsv_ruimte_volgnr%TYPE;
nextkey res_rsv_ruimte.res_rsv_ruimte_key%TYPE;
@@ -54,7 +84,7 @@ AS
res_rsv_ruimte_bezoekers, res_rsv_ruimte_cvab_mode, res_rsv_ruimte_telefoon
)
SELECT nextkey,
res_reservering_key,
COALESCE(newreskey, res_reservering_key),
nextvolg,
res_rsv_ruimte_omschrijving,
res_rsv_ruimte_opmerking,
@@ -76,7 +106,7 @@ AS
WHERE res_rsv_ruimte_key = prsv_ruimte_key;
-- Now make the copy have the same childeren as the original
-- (all main data is already uptodate)
res.res_sync_deelres (prsv_ruimte_key, nextkey, 128 + 256 + 512 + 1024, 0);
res.res_sync_deelres (prsv_ruimte_key, nextkey, 128 + 256 + pmetbez*512 + 1024, 0);
-- Het hekje voorkomt individuele notificaties
fac.trackaction ('#RESNEW', nextkey, puserkey, NULL, NULL);
RETURN nextkey;

8
RES/RES_TAB.SRC
View File

@@ -63,6 +63,11 @@ CREATE_TABLE(res_ruimte,0)
res_discipline_key NUMBER(10)
CONSTRAINT res_c_res_ruimte_dis_key CHECK(res_discipline_key IS NOT NULL)
CONSTRAINT res_c_res_ruimte_discipline REFERENCES ins_tab_discipline(ins_discipline_key),
res_ruimte_wachtplaats
VARCHAR2(40),
bez_actie_key
NUMBER(10)
REFERENCES bez_actie,
res_ruimte_aanmaak
DATE
DEFAULT SYSDATE,
@@ -309,6 +314,9 @@ CREATE_TABLE(res_reservering,0)
res_reservering_aanmaak
DATE
DEFAULT SYSDATE,
res_reservering_ispool
NUMBER(1)
DEFAULT 0 NOT NULL,
res_reservering_verwijder
DATE
DEFAULT NULLDATUM

4
RES/RES_VIE.SRC
View File

@@ -82,6 +82,7 @@ CREATE_VIEW(res_v_res_ruimte_gegevens_all, 0)
res_ruimte_key,
res_ruimte_nr,
res_ruimte_prijs,
bez_actie_key,
res_discipline_key,
alg_ruimte_verwijder,
res_ruimte_verwijder,
@@ -96,7 +97,8 @@ SELECT DISTINCT
, RES_R.res_ruimte_key
, RES_R.res_ruimte_nr
, RES_R.res_ruimte_prijs
, RES_R.res_discipline_key
, RES_R.bez_actie_key,
RES_R.res_discipline_key
, alg_ruimte_verwijder
, res_ruimte_verwijder
, res_alg_ruimte_verwijder

4
_UP/DB22to23.src
View File

@@ -57,7 +57,9 @@ DEF_FAC_SRTNOT('BES2BO', 0, 'Facilitor: Er is een nieuwe bestelling ##KEY## (##D
/////////////////////////////////////////////////////////////////////////////////////////// UWVA#29778
ALTER TABLE bez_bezoekers ADD bez_bezoekers_oproep DATE;
ALTER TABLE bez_actie ADD bez_actie_flags NUMBER(3) DEFAULT 0 NOT NULL;
ALTER TABLE res_reservering ADD res_reservering_flags NUMBER(3) DEFAULT 0 NOT NULL;
ALTER TABLE res_reservering ADD res_reservering_ispool NUMBER(1) DEFAULT 0 NOT NULL;
ALTER TABLE res_ruimte ADD res_ruimte_wachtplaats VARCHAR(40);
ALTER TABLE res_ruimte ADD bez_actie_key NUMBER(10) REFERENCES bez_actie;
/////////////////////////////////////////////////////////////////////////////////////////// FSN#30171
ALTER TABLE mld_opdr ADD mld_opdr_plandatum DATE;