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

FCLT#64017 conversie van widgets naar type RAP en URL verwijderd voor productie-gang zodat we met S(wgt_enabled) de WGT-module kunnen aanbieden

Browse Source 
svn path=/Database/trunk/; revision=54679
This commit is contained in:
Koen Reefman
2022-01-25 18:22:27 +00:00
parent 512c987dc5
commit c2fcdf3543
4 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
FAC/FAC_LCL.SRC
View File

@@ -4842,7 +4842,7 @@ FAC_LCL('lcl_mld_actiecodeYou', 'Er wordt een (re)actie van je gevraagd', 'This
FAC_LCL('lcl_mld_behandelaarYou', 'Jij bent de behandelaar', 'You are the processor')
FAC_LCL('lcl_mld_actiecodeATT', 'Attentie!', 'Attention!')
FAC_LCL('lcl_mld_actiecodeBOchk', 'Ook met actie bij behandelaar', 'Backoffice action')
FAC_LCL('lcl_mld_actiecodeFEchk', 'Meldingen met actie bij aanvrager tonen', 'Waiting for issuer action')
FAC_LCL('lcl_mld_actiecodeFEchk', 'Meldingen met actie bij aanvrager tonen', 'Show issues waiting for issuer action')
FAC_LCL('lcl_mld_actiecodeUITVchk', 'Opdrachten met actie bij uitvoerder tonen', 'Show orders waiting for contractor action')
FAC_LCL('lcl_mld_actiecodeATTchk', 'Alleen met attentie', 'With attention only')
@@ -5844,7 +5844,12 @@ FAC_LCL('fac_widget', 'Widget', 'Widget')
FAC_LCL('fac_widget_m', 'Widgets', 'Widgets')
FAC_LCL('fac_widget_naam', 'Naam', 'Name')
FAC_LCL('fac_widget_type', 'Type', 'Type')
FAC_LCL('fac_widget_typeLOV', 'FAC;Facilitor URL;URL;Externe URL;MK;Menukop;MI;Menuitem;RAP;Rapportage;RAW;HTML code;IMG;Plaatje;FLR;Plattegrond;FAQ;Kennisbankitem', 'FAC;Facilitor URL;URL;External URL;MK;Menu header;MI;Menuitem;RAP;Report;RAW;Raw HTML;IMG;Image;FLR;Floorplan;FAQ;Knowledge base item')
FAC_LCL('fac_widget_typeLOV', 'FAC;Facilitor URL;URL;Externe URL;MK;Menukop;MI;Menuitem;RAP;Rapportage;IMG;Plaatje;RAW;HTML code', 'FAC;Facilitor URL;URL;External URL;MK;Menu header;MI;Menuitem;RAP;Report;IMG;Image;RAW;Raw HTML')
FAC_LCL('fac_widget_typeWGT', 'WGT;Widget', 'WGT;Widget')
FAC_LCL('fac_widget_typeFLR', 'FLR;Plattegrond', 'FLR;Floorplan')
FAC_LCL('fac_widget_typeFAQ', 'FAQ;Kennisbankitem', 'FAQ;Knowledge base item')
FAC_LCL('fac_widget_noauth_typeLOV','FAC;Widget', 'FAC;Widget')
FAC_LCL('fac_widget_noauth_typeWGT','WGT;Widget bibliotheek', 'FAC;Widget library')
FAC_LCL('fac_widget_reftype_MK', 'Menukop', 'Menu header')
FAC_LCL('fac_widget_reftype_MI', 'Menuitem', 'Menuitem')
FAC_LCL('fac_widget_reftype_R', 'Rapportage', 'Report')

1
FAC/FAC_SET.SRC
View File

@@ -239,6 +239,7 @@ DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'sys_ip_lockmode'
DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'sys_ip_restrict' , 'string' , '' , 'Regexp ip-restriction')
DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'use_capacity_planning' , 'number' , '0' , 'De inzetbaarheid van personen en uitvoerbaarheid bij opdrachten kan worden aangegeven (0=nee {default}, 1=ja)')
DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'view_dwf_with_slnkdwf' , 'boolean' , 'false' , 'View DWF document files using SLNKDWF')
DEFINE_SETTING('FAQ', 0001, 'WEB_FACTAB', 'wgt_enabled' , 'number' , '0' , 'Is the widget module available {0 | 1} licensed separately')
DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'widgetportal' , 'number' , '0' , 'Use a widgetpage with this key as startpage (key) or the standard page (0)')
DEFINE_SETTING('FAQ', 0001, 'WEB_FACTAB', 'faq_enabled' , 'number' , '0' , 'Is kennisbank available {0 | 1} licensed separately')
DEFINE_SETTING('FIN', 0001, 'WEB_FACTAB', 'fin_defaultboekmaand' , 'number' , '1' , 'How to determine default "boekmaand" for entered invoice: 1=sysdate, 2=orderdate, 3=enddate/finisheddate')

14
FAC/FAC_TAB.SRC
View File

@@ -1762,7 +1762,7 @@ CREATE_TABLE(fac_widget, 0)
fac_widget_naam -- Widgetnaam (mn voor bibliotheekwidgets)
VARCHAR2(60)
NOT NULL,
fac_widget_type -- enumerated U=internal URL, M=Menuitem, R=Report, H=HTML, ...
fac_widget_type -- See; Constraint fac_c_widgettype1 for allowed types
VARCHAR2(3)
DEFAULT ('FAC')
NOT NULL,
@@ -1780,16 +1780,16 @@ CREATE_TABLE(fac_widget, 0)
NUMBER(5),
fac_widget_width -- DEPRECATED -> onpage
NUMBER(5),
fac_widget_url -- type U: Resultaat van URL wordt in de widget getoond
fac_widget_url -- type URL: Resultaat van URL wordt in de widget getoond
VARCHAR2(255),
fac_widget_content -- type H: HTML content
fac_widget_content -- type RAW: HTML content
VARCHAR2(4000),
fac_widget_aanmaak -- Aanmaakdatum
DATE
DEFAULT SYSDATE,
fac_widget_refreshtime -- Refreshtijd van widget in seconden, NULL is geen refresh
NUMBER(5),
fac_widget_public -- 0=Private widget, 1=publicly available widget
fac_widget_public -- 0=Private widget, 1=Publicly available widget
NUMBER(1)
DEFAULT 0
NOT NULL,
@@ -1797,9 +1797,9 @@ CREATE_TABLE(fac_widget, 0)
NUMBER(10)
CONSTRAINT fac_r_fac_widget_functie_key REFERENCES fac_functie(fac_functie_key)
, CONSTRAINT fac_c_widgettype1 CHECK
( (fac_widget_type IN ('FAC', 'URL', 'IMG') AND fac_widget_url IS NOT NULL)
OR (fac_widget_type IN ('MK', 'MI', 'RAP') AND fac_widget_typerefkey IS NOT NULL)
OR (fac_widget_type = 'RAW' AND fac_widget_content IS NOT NULL))
( (fac_widget_type IN ('FAC', 'URL', 'IMG', 'FLR') AND fac_widget_url IS NOT NULL)
OR (fac_widget_type IN ('MK', 'MI', 'RAP', 'FAQ') AND fac_widget_typerefkey IS NOT NULL)
OR (fac_widget_type = 'RAW' AND fac_widget_content IS NOT NULL))
);
// A widgetpage is an ordered group of widgets made accesible to the users

23
_UP/DB40to41.src
View File

@@ -254,27 +254,10 @@ ALTER TABLE fac_widget ADD fac_widget_content VARCHAR2(4000);
ALTER TABLE fac_widget ADD fac_widget_public NUMBER(1) DEFAULT 0 NOT NULL;
ALTER TABLE fac_widget
ADD CONSTRAINT fac_c_widgettype1 CHECK
( (fac_widget_type IN ('FAC', 'URL', 'IMG') AND fac_widget_url IS NOT NULL)
OR (fac_widget_type IN ('MK', 'MI', 'RAP') AND fac_widget_typerefkey IS NOT NULL)
( (fac_widget_type IN ('FAC', 'URL', 'IMG', 'FLR') AND fac_widget_url IS NOT NULL)
OR (fac_widget_type IN ('MK', 'MI', 'RAP', 'FAQ') AND fac_widget_typerefkey IS NOT NULL)
OR (fac_widget_type = 'RAW' AND fac_widget_content IS NOT NULL));
-- Hieronder, conversies optimaliseren voor fac_widget_type
-- Indien externe url, dan fac_widget_type = 'URL'
UPDATE fac_widget
SET fac_widget_type = 'URL'
WHERE REGEXP_LIKE (fac_widget_url, '^(f|ht)tps?:', 'i')
OR LOWER (fac_widget_url) LIKE '^www.%';
-- Indien rapportage, dan fac_widget_type = 'RAP' en zet widget_height in de querystring
UPDATE fac_widget
SET fac_widget_type = 'RAP',
fac_widget_typerefkey = REGEXP_SUBSTR (fac_widget_url, '^.{0,18}fac_report\.asp\?(.*)usrrap_key=(\d+)\&?(.*)$', 1, 1, 'i', 2),
fac_widget_url = REGEXP_SUBSTR (fac_widget_url, '^.{0,18}fac_report\.asp\?(.*)usrrap_key=(\d+)\&?(.*)$', 1, 1, 'i', 1)
|| REGEXP_SUBSTR (fac_widget_url, '^.{0,18}fac_report\.asp\?(.*)usrrap_key=(\d+)\&?(.*)$', 1, 1, 'i', 3)
|| (CASE WHEN fac_widget_height IS NULL THEN '' ELSE '&widget_height=' || fac_widget_height END)
WHERE fac_widget_type = 'FAC'
AND REGEXP_LIKE (fac_widget_url, '^.{0,18}fac_report\.asp\?(.*)usrrap_key=(\d+)\&?(.*)$');
-- Het vullen van de koppeltabel inclusief conversie van fac_widget.fac_widget_volgnr -> fac_widget_onpage.fac_widget_onpage_order
INSERT INTO fac_widget_onpage (fac_widget_page_key,
fac_widget_key,
@@ -712,7 +695,7 @@ ALTER TABLE mld_stdmeldinggroep ADD (
DEF_MENUITEM(3, 'lcl_mobile_mld_menu', '', 'MLD', 'appl/pda/melding_menu.asp', 0, 0, 'WEB_MLDUSE', 'W', '0', 'fa-play');
/////////////////////////////////////////////////////////////////////////////////////////// FCLT#69738
/////////////////////////////////////////////////////////////////////////////////////////// FCLT#69738
CREATE INDEX mld_i_mld_melding24 ON mld_melding(mld_ins_discipline_key,mld_melding_behandelaar2_key);
///////////////////////////////////////////////////////////////////////////////////////////