Merge DB20 patches

svn path=/Customer/trunk/; revision=20938
This commit is contained in:
Jos Groot Lipman
2014-03-11 10:05:12 +00:00
parent 3caa1f41af
commit 40ba4b876d
74 changed files with 12065 additions and 4474 deletions

116
ALLI/Once/alli09.sql Normal file
View File

@@ -0,0 +1,116 @@
-- Customer specific once-script ALLI.
--
-- (c) 2011 SG|facilitor bv
-- $Revision$
-- $Modtime: 29-06-12 13:29 $
--
-- Support: +31 53 4800700
SET ECHO ON
SPOOL alli09.lst
SET DEFINE OFF
INSERT INTO fac_srtnotificatie
(fac_srtnotificatie_code, fac_srtnotificatie_mode,
fac_srtnotificatie_oms, fac_srtnotificatie_xmlnode,
fac_srtnotificatie_url, fac_srtnotificatie_groep
)
VALUES ('CUST01', 3,
'Nieuwe bestelaanvraag bouwbord ter beoordeling (bestelling ##KEY##)', 'bestelling',
'bes/bes_search.asp?urole=bo' || '&' || 'rfo_key=', 0
);
-- Notificatie JOB die elke 3 dagen (3*24 = 72 uur) afgaat: 's ochtends om 7.00u
-- Voorlopig ff met fac_notificatie_job_mode = 0 vullen, zodat de notificatiejob nog niet gaat lopen.
-- Op moment dat die moet gaan lopen via applicatiebeheer noti-jobs de mode HANDMATIG op 3 zetten.
INSERT INTO fac_notificatie_job
(fac_notificatie_job_view,
fac_notificatie_job_oms,
fac_notificatie_job_interval, fac_notificatie_job_mode, fac_notificatie_job_nextrun
)
VALUES ('alli_v_notify_bo_bouwbord',
'BES: Beoordeling van bouwbord door communicatiemedewerker',
72, 0, NULL
);
----- RTM grafieken op portaal
-- Enkele dummy views om inserts hieronder mogelijk te maken...
CREATE OR REPLACE VIEW alli_v_graph_cat_kantoor
AS SELECT * FROM DUAL;
CREATE OR REPLACE VIEW alli_v_graph_cat_bouwbord
AS SELECT * FROM DUAL;
CREATE OR REPLACE VIEW alli_v_graph_cat_drukwerk
AS SELECT * FROM DUAL;
CREATE OR REPLACE VIEW alli_v_graph_cat_ict
AS SELECT * FROM DUAL;
CREATE OR REPLACE VIEW alli_v_graph_cnt_new_close
AS SELECT * FROM DUAL;
-- RIJ 1:
-- Kantoorartikelen
INSERT INTO fac_usrgraph (fac_usrgraph_view_name, fac_usrgraph_type, fac_usrgraph_orderby, fac_usrgraph_maxrows, fac_usrgraph_options)
VALUES ('alli_v_graph_cat_kantoor', 4, 'VOLGORDE', 12, '{seriesColors: [''blue'', ''red''] , legend: {location:''n''} , axes: {yaxis: {min: 0}}}');
INSERT INTO fac_widget (fac_widget_groep, fac_widget_volgnr, fac_widget_title, fac_widget_height, fac_widget_width, fac_widget_url, fac_widget_refreshtime)
SELECT 'rtm_bestelaanvragen', 10 ,NULL, 200, 13, 'fac_usrgraph.asp?usrgraph_key=' || MAX(fac_usrgraph_key), NULL FROM fac_usrgraph;
-- Bouwborden
INSERT INTO fac_usrgraph (fac_usrgraph_view_name, fac_usrgraph_type, fac_usrgraph_orderby, fac_usrgraph_maxrows, fac_usrgraph_options)
VALUES ('alli_v_graph_cat_bouwbord', 4, 'VOLGORDE', 12, '{seriesColors: [''blue''] , legend: { show: true, placement: ''outsideGrid'', location: ''n''}, axes: {yaxis: {label: '''' ,min: 0}}}');
INSERT INTO fac_widget (fac_widget_groep, fac_widget_volgnr, fac_widget_title, fac_widget_height, fac_widget_width, fac_widget_url, fac_widget_refreshtime)
SELECT 'rtm_bestelaanvragen', 20 ,NULL, 200, 13, 'fac_usrgraph.asp?usrgraph_key=' || MAX(fac_usrgraph_key), NULL FROM fac_usrgraph;
-- Alle drukwerk + visitekaartjes
INSERT INTO fac_usrgraph (fac_usrgraph_view_name, fac_usrgraph_type, fac_usrgraph_orderby, fac_usrgraph_maxrows, fac_usrgraph_options)
VALUES ('alli_v_graph_cat_drukwerk', 4, 'VOLGORDE', 12, '{seriesColors: [''blue'', ''red'', ''green'', ''yellow'', ''black''] , axes: {yaxis: {label: '''' ,min: 0}}}');
INSERT INTO fac_widget (fac_widget_groep, fac_widget_volgnr, fac_widget_title, fac_widget_height, fac_widget_width, fac_widget_url, fac_widget_refreshtime)
SELECT 'rtm_bestelaanvragen', 30 ,NULL, 200, 24, 'fac_usrgraph.asp?usrgraph_key=' || MAX(fac_usrgraph_key), NULL FROM fac_usrgraph;
-- ICT Hardware & CYOD
INSERT INTO fac_usrgraph (fac_usrgraph_view_name, fac_usrgraph_type, fac_usrgraph_orderby, fac_usrgraph_maxrows, fac_usrgraph_options)
VALUES ('alli_v_graph_cat_ict', 4, 'VOLGORDE', 12, '{seriesColors: [''blue'', ''red'', ''black''] , axes: {yaxis: {label: '''' ,min: 0}}}');
INSERT INTO fac_widget (fac_widget_groep, fac_widget_volgnr, fac_widget_title, fac_widget_height, fac_widget_width, fac_widget_url, fac_widget_refreshtime)
SELECT 'rtm_bestelaanvragen', 40 ,NULL, 200, 24, 'fac_usrgraph.asp?usrgraph_key=' || MAX(fac_usrgraph_key), NULL FROM fac_usrgraph;
-- Nieuwe en aflopende contracten
INSERT INTO fac_usrgraph (fac_usrgraph_view_name, fac_usrgraph_type, fac_usrgraph_orderby, fac_usrgraph_maxrows, fac_usrgraph_options)
VALUES ('alli_v_graph_cnt_new_close', 4, 'VOLGORDE', 12, '{seriesColors: [''blue'', ''red''] , legend: {location:''n''} , axes: {yaxis: {min: 0}}}');
INSERT INTO fac_widget (fac_widget_groep, fac_widget_volgnr, fac_widget_title, fac_widget_height, fac_widget_width, fac_widget_url, fac_widget_refreshtime)
SELECT 'rtm_bestelaanvragen', 50 ,NULL, 200, 12, 'fac_usrgraph.asp?usrgraph_key=' || MAX(fac_usrgraph_key), NULL FROM fac_usrgraph;
-- En de laatste stap is dat ...... alle grafieken in portaal worden getoond via autorisatie WEB_USER01 (Analyzer-achtig)
-- Nu for-the-time being onderdrukken met WEB_USER30 (niemand ziet het).
INSERT INTO fac_widget (fac_widget_groep, fac_widget_volgnr, fac_widget_title, fac_widget_height, fac_widget_width, fac_widget_url, fac_widget_refreshtime, fac_functie_key)
SELECT 'myfacilitor', 15 ,NULL, 200, 99, 'fac_widgetspage.asp?wgrp=rtm_bestelaanvragen', 600 , fac_functie_key
FROM fac_functie
WHERE fac_functie_code = 'WEB_USER30';
BEGIN adm.systrackscriptId('$Id$'); END;
/
commit;
SPOOL OFF
@alli.sql

View File

@@ -2040,6 +2040,52 @@ IS
END alli_update_cyod_serienummers;
/
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--
-- Koppeling Bouwborden
--
-- Leverancier: Bas Honcoop (prs_bedrijf_key = 936)
-- Catalogus: Bouwborden (discipline = 521)
-- OCI Punchout: http://bh.enson.nl/oci.alliantie.php?username=alliantie&password=p$iSu45&~TARGET=_self
-- Financiele goedkeuring: nvt --> Automatisch accepteren aanvraag = ja
-- Functionele goedkeuring: communicatiemedewerker van project (door projectleider verplicht in te vullen bij bestelaanvraag)
-- Projectnummer: verplicht invulbaar veld door projectleider in te vullen bij bestelaanvraag.
-- mbmb
CREATE OR REPLACE VIEW ALLI_V_BO_MEDEWERKERS_BOUWBORD
(PRS_PERSLID_KEY, PRS_PERSLID_FULL)
AS
select distinct p.prs_perslid_key, P.prs_perslid_naam_full
FROM fac_groeprechten gr, fac_gebruikersgroep gg, prs_v_perslid_fullnames p
WHERE gr.ins_discipline_key = 521
AND GR.FAC_FUNCTIE_KEY = (SELECT fac_functie_key FROM fac_functie f WHERE f.fac_functie_code = 'WEB_BESBOF')
AND gr.fac_gebruiker_alg_level_write < 9
AND gr.fac_gebruiker_prs_level_write < 9
AND gr.fac_groep_key = gg.fac_groep_key
AND gg.prs_perslid_key = p.prs_perslid_key;
-- Notificatiejob met key 41 is via alli09.sql aangemaakt.
CREATE OR REPLACE VIEW ALLI_V_NOTIFY_BO_BOUWBORD (code, sender, receiver, text, KEY, par1, par2, xkey)
AS
SELECT sn.fac_srtnotificatie_code, b.prs_perslid_key, fac.safe_to_number(kb.bes_kenmerkbestell_waarde),
sn.fac_srtnotificatie_oms, b.bes_bestelling_key, NULL, NULL, NULL
FROM bes_bestelling b, bes_kenmerkbestell kb, bes_kenmerk k, bes_srtkenmerk sk, fac_kenmerkdomein kd, fac_notificatie_job nj, fac_srtnotificatie sn
WHERE sn.fac_srtnotificatie_code = 'CUST01'
AND nj.fac_notificatie_job_key = 41
AND b.bes_bestelling_key = kb.bes_bestelling_key
and b.bes_bestelling_status = 3
and KB.BES_KENMERK_KEY = k.bes_kenmerk_key
and K.BES_SRTKENMERK_KEY = SK.BES_SRTKENMERK_KEY
and SK.FAC_KENMERKDOMEIN_KEY= KD.FAC_KENMERKDOMEIN_KEY
and UPPER(KD.FAC_KENMERKDOMEIN_MODULE) = 'BES'
and UPPER(KD.FAC_KENMERKDOMEIN_OBJECTNAAM) = 'ALLI_V_BO_MEDEWERKERS_BOUWBORD';
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- View tbv notificatiejob contract-reminder (afgeleid van de FAC-standaard).
-- 1x per week wordt de job aangeroepen, verschil met de standaard FAC is dat niet alleen de beheerder (voor de UNION),
-- maar ook andere personen een mailt-notificatie moeten kunnen ontvangen (na UNION).
@@ -2089,8 +2135,245 @@ AS
AND fac_usrdata_verwijder IS NULL;
----------------------------------------------------------------------------------------------------------------------------------------------------------
--- RTM Grafieken op portaal
-- Alle bestelaanvragen per catalogus, per week.
CREATE OR REPLACE VIEW alli_v_bes_catalogus_p_week
(INS_DISCIPLINE_KEY, INS_DISCIPLINE_OMSCHRIJVING, jaar, week, aantal)
AS
select D.INS_DISCIPLINE_KEY, MIN(D.INS_DISCIPLINE_OMSCHRIJVING), to_char(bes_bestelling_datum, 'IYYY'), to_char(bes_bestelling_datum, 'IW'), count(b.bes_bestelling_key)
from bes_bestelling b, bes_bestelling_item bi, bes_srtdeel s, bes_srtgroep g, bes_discipline d
where BI.BES_BESTELLING_KEY = b.bes_bestelling_key
and BI.BES_SRTDEEL_KEY = s.bes_srtdeel_key
and s.bes_srtgroep_key = G.BES_SRTGROEP_KEY
and G.INS_DISCIPLINE_KEY = D.INS_DISCIPLINE_KEY
and TRUNC( b.bes_bestelling_datum) >= (TRUNC (SYSDATE)
- DECODE (TO_CHAR (SYSDATE, 'D'), '1', 8, TO_CHAR (SYSDATE, 'D'))
+ 2) - 10*7
group by D.INS_DISCIPLINE_KEY, to_char(bes_bestelling_datum, 'IYYY'), to_char(bes_bestelling_datum, 'IW');
-- View van de afgelopen 10 weken, met deze week erbij is dat 11.
CREATE OR REPLACE VIEW alli_v_10_week_history
(jaar, week)
AS
SELECT to_char(TRUNC(SYSDATE - (7* (LEVEL - 1))),'IYYY') jaar, substr(to_char(SYSDATE - (7* (LEVEL - 1)), 'IW'), 1, 2) week
FROM DUAL
CONNECT BY LEVEL <= 11;
CREATE OR REPLACE VIEW alli_v_10_week_future
(jaar, week)
AS
SELECT to_char(TRUNC(SYSDATE + (7* (LEVEL - 1))),'IYYY') jaar, substr(to_char(SYSDATE + (7* (LEVEL - 1)), 'IW'), 1, 2) week
FROM DUAL
CONNECT BY LEVEL <= 11;
-- Kantoorartikelen per week
CREATE OR REPLACE VIEW alli_v_graph_cat_kantoor
(
fclt_key,
FCLT_XAS_,
FCLT_YAS_KANTOOR,
FCLT_YAS_INCIDENTEEL,
FCLT_URL,
VOLGORDE
)
AS
SELECT '', week,
COALESCE(
(SELECT aantal
FROM alli_v_bes_catalogus_p_week c
WHERE INS_DISCIPLINE_KEY = 501
AND c.week = w10.week
AND c.jaar = w10.jaar),
0),
COALESCE(
(SELECT aantal
FROM alli_v_bes_catalogus_p_week c
WHERE INS_DISCIPLINE_KEY = 42
AND c.week = w10.week
AND c.jaar = w10.jaar),
0),
'',
jaar|| '-' ||week
FROM alli_v_10_week_history w10;
-- Bouwborden per week
CREATE OR REPLACE VIEW alli_v_graph_cat_bouwbord
(
fclt_key,
FCLT_XAS_,
FCLT_YAS_BOUWBORD,
FCLT_URL,
VOLGORDE
)
AS
SELECT '', week,
COALESCE(
(SELECT aantal
FROM alli_v_bes_catalogus_p_week c
WHERE INS_DISCIPLINE_KEY = 521
AND c.week = w10.week
AND c.jaar = w10.jaar),
0),
'',
jaar|| '-' ||week
FROM alli_v_10_week_history w10;
-- Drukwerk per week
CREATE OR REPLACE VIEW alli_v_graph_cat_drukwerk
(
fclt_key,
FCLT_XAS_,
FCLT_YAS_HUISSTIJL,
FCLT_YAS_VISITEKAARTJES,
FCLT_YAS_VVE,
FCLT_YAS_SSC,
FCLT_YAS_OVERIG,
FCLT_URL,
VOLGORDE
)
AS
SELECT '', week,
COALESCE(
(SELECT aantal
FROM alli_v_bes_catalogus_p_week c
WHERE INS_DISCIPLINE_KEY = 341
AND c.week = w10.week
AND c.jaar = w10.jaar),
0),
COALESCE(
(SELECT aantal
FROM alli_v_bes_catalogus_p_week c
WHERE INS_DISCIPLINE_KEY = 361
AND c.week = w10.week
AND c.jaar = w10.jaar),
0),
COALESCE(
(SELECT SUM(aantal)
FROM alli_v_bes_catalogus_p_week c
WHERE INS_DISCIPLINE_KEY IN (442, 443, 444, 445)
AND c.week = w10.week
AND c.jaar = w10.jaar),
0),
COALESCE(
(SELECT SUM(aantal)
FROM alli_v_bes_catalogus_p_week c
WHERE INS_DISCIPLINE_KEY IN (446, 447)
AND c.week = w10.week
AND c.jaar = w10.jaar),
0),
COALESCE(
(SELECT SUM(aantal)
FROM alli_v_bes_catalogus_p_week c
WHERE INS_DISCIPLINE_KEY IN (448, 449, 463, 441)
AND c.week = w10.week
AND c.jaar = w10.jaar),
0),
'',
jaar|| '-' ||week
FROM alli_v_10_week_history w10;
-- ICT (hardware en CYOD) per week
CREATE OR REPLACE VIEW alli_v_graph_cat_ict
(
fclt_key,
FCLT_XAS_,
FCLT_YAS_HARDWARE,
FCLT_YAS_INCIDENTEEL,
FCLT_YAS_CYOD,
FCLT_URL,
VOLGORDE
)
AS
SELECT '', week,
COALESCE(
(SELECT aantal
FROM alli_v_bes_catalogus_p_week c
WHERE INS_DISCIPLINE_KEY = 401
AND c.week = w10.week
AND c.jaar = w10.jaar),
0),
COALESCE(
(SELECT aantal
FROM alli_v_bes_catalogus_p_week c
WHERE INS_DISCIPLINE_KEY = 201
AND c.week = w10.week
AND c.jaar = w10.jaar),
0),
COALESCE(
(SELECT aantal
FROM alli_v_bes_catalogus_p_week c
WHERE INS_DISCIPLINE_KEY = 221
AND c.week = w10.week
AND c.jaar = w10.jaar),
0),
'',
jaar|| '-' ||week
FROM alli_v_10_week_history w10;
-- Alle nieuwe contracten die ingaan de komende 10 weken per week.
CREATE OR REPLACE VIEW alli_v_cnt_nieuw_per_week
(jaar, week, aantal)
AS
select to_char(c.cnt_contract_looptijd_van, 'IYYY'), to_char(c.cnt_contract_looptijd_van, 'IW'), count(c.cnt_contract_key)
from cnt_contract c
WHERE TRUNC(c.cnt_contract_looptijd_van) >= (TRUNC (SYSDATE) - DECODE (TO_CHAR (SYSDATE, 'D'), '1', 8, TO_CHAR (SYSDATE, 'D')) + 2)
AND TRUNC(c.cnt_contract_looptijd_van) <= (TRUNC (SYSDATE) - DECODE (TO_CHAR (SYSDATE, 'D'), '1', 8, TO_CHAR (SYSDATE, 'D')) + 2) + 10*7
GROUP BY to_char(c.cnt_contract_looptijd_van, 'IYYY'), to_char(c.cnt_contract_looptijd_van, 'IW');
-- Alle aflopende contracten de komende 10 weken per week.
CREATE OR REPLACE VIEW alli_v_cnt_aflopend_per_week
(jaar, week, aantal)
AS
select to_char(c.cnt_contract_looptijd_tot, 'IYYY'), to_char(c.cnt_contract_looptijd_tot, 'IW'), count(c.cnt_contract_key)
from cnt_contract c
WHERE TRUNC(c.cnt_contract_looptijd_tot) >= (TRUNC (SYSDATE) - DECODE (TO_CHAR (SYSDATE, 'D'), '1', 8, TO_CHAR (SYSDATE, 'D')) + 2)
AND TRUNC(c.cnt_contract_looptijd_tot) <= (TRUNC (SYSDATE) - DECODE (TO_CHAR (SYSDATE, 'D'), '1', 8, TO_CHAR (SYSDATE, 'D')) + 2) + 10*7
GROUP BY to_char(c.cnt_contract_looptijd_tot, 'IYYY'), to_char(c.cnt_contract_looptijd_tot, 'IW');
-- Grafiek van alle aflopende contracten voor de komende 10 weken
CREATE OR REPLACE VIEW alli_v_graph_cnt_new_close
(
fclt_key,
FCLT_XAS_,
FCLT_YAS_NIEUW,
FCLT_YAS_AFLOPEND,
FCLT_URL,
VOLGORDE
)
AS
SELECT '', week,
COALESCE(
(SELECT aantal
FROM alli_v_cnt_nieuw_per_week c
WHERE c.week = w10.week
AND c.jaar = w10.jaar),
0),
COALESCE(
(SELECT aantal
FROM alli_v_cnt_aflopend_per_week c
WHERE c.week = w10.week
AND c.jaar = w10.jaar),
0),
'',
jaar|| '-' ||week
FROM alli_v_10_week_future w10;
------ TESTAREA TESTAREA TESTAREA TESTAREA TESTAREA TESTAREA TESTAREA ----------------
CREATE OR REPLACE VIEW alli_v_visitekaartje (prs_perslid_key,
voornaam,
@@ -2207,11 +2490,13 @@ CREATE OR REPLACE VIEW alli_v_bestelling_maninfo
besteldatum,
fclt_3d_discipline_key,
fclt_f_catalogus,
fclt_f_leverancier,
fclt_f_aanvrager,
personeelsnr,
fclt_f_afdeling,
fclt_f_status,
totaalbedrag
bestelbedrag,
opdrachtbedrag
)
AS SELECT TO_CHAR(b.bes_bestelling_key),
TO_CHAR(MIN(bes_bestelling_datum), 'YYYY') jaar,
@@ -2220,6 +2505,7 @@ AS SELECT TO_CHAR(b.bes_bestelling_key),
TO_CHAR(MIN(bes_bestelling_datum), 'DD-MM-YYYY') datum,
MIN(dis.ins_discipline_key),
MIN(dis.ins_discipline_omschrijving) catalogus,
MIN(bd.prs_bedrijf_naam) leverancier,
MIN(p.prs_perslid_naam)
|| NVL2 (MIN(p.prs_perslid_voorletters),
', ' || MIN(p.prs_perslid_voorletters),
@@ -2236,9 +2522,14 @@ AS SELECT TO_CHAR(b.bes_bestelling_key),
MIN(BS.BES_BESTELLINGSTATUSES_OMSCHR),
SUM(bi.bes_bestelling_item_aantal
* COALESCE (bi.bes_bestelling_item_prijs, 0))
totaalbedrag
totaalbedrag,
SUM(BO.BES_BESTELOPDR_ITEM_AANTAL
* COALESCE (BO.BES_BESTELOPDR_ITEM_PRIJS , 0))
opdrachtbedrag
FROM bes_bestelling_item bi,
bes_bestelopdr_item bo,
bes_srtdeel srt,
prs_bedrijf bd,
bes_bestelling b,
bes_bestellingstatuses bs,
prs_perslid p,
@@ -2252,6 +2543,8 @@ AS SELECT TO_CHAR(b.bes_bestelling_key),
WHERE srt.bes_srtgroep_key = grp.bes_srtgroep_key
AND grp.ins_discipline_key = dis.ins_discipline_key
AND bi.bes_srtdeel_key = srt.bes_srtdeel_key
AND srt.prs_bedrijf_key = bd.prs_bedrijf_key
AND BO.BES_BESTELOPDR_ITEM_KEY (+) = BI.BES_BESTELOPDR_ITEM_KEY
AND bi.bes_bestelling_key = b.bes_bestelling_key
AND B.BES_BESTELLING_STATUS = BS.BES_BESTELLINGSTATUSES_KEY
AND p.prs_perslid_key = b.prs_perslid_key
@@ -2260,17 +2553,13 @@ AS SELECT TO_CHAR(b.bes_bestelling_key),
AND b.mld_adres_key_lev = m.mld_adres_key
AND m.alg_locatie_key = l.alg_locatie_key(+)
AND l.alg_district_key = di.alg_district_key(+)
GROUP BY b.bes_bestelling_key;
GROUP BY b.bes_bestelling_key, bd.prs_bedrijf_key;
BEGIN adm.systrackscriptId('$Id$', 0); END;
/
BEGIN fac.registercustversion('ALLI', 1); END;
BEGIN fac.registercustversion('ALLI', 9); END;
/
commit;