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

Merge DB46d changes

Browse Source 
svn path=/Database/trunk/; revision=62887
This commit is contained in:
Koen Reefman
2023-12-07 11:32:01 +00:00
parent 1445e8f1cf 0848e61ab8
commit 5466689f07
6 changed files with 134 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
FAC/FAC_INI.SRC
View File

@@ -3014,6 +3014,7 @@ DEF_MENUENTRY(2, 99160, 'lcl_menu_fac_refresh_accept' , '', 'FAC', 'appl/fac/fa
DEF_MENUITEM(3, 'lcl_mobile_search' , '', 'FAC', 'appl/pda/productsearch.asp', 0, 0, 'WEB_MLDUSE', 'R', '0', 'fa-search');
DEF_MENUITEM(3, 'lcl_mobile_news' , '', 'FAC', 'appl/pda/portalnews.asp', 0, 0, 'WEB_MLDUSE', 'R', '0', 'fa-newspaper');
DEF_MENUITEM(3, 'lcl_mobile_lopendezaken' , '', 'FAC', 'appl/pda/fac_list.asp', 0, 0, 'WEB_MLDUSE', 'R', '1', 'fa-list-ul');
DEF_MENUITEM(3, 'lcl_mobile_msg' , '', 'MSG', 'appl/pda/berichten.asp', 0, 0, 'WEB_MSGUSE', 'R', '1', 'fa-circle-y');
DEF_MENUITEM(3, 'lcl_mobile_fiattering' , '', 'FAC', 'appl/pda/fiat_list.asp', 0, 0, 'WEB_MLDUSE', 'R', '1', 'fa-check-square');
DEF_MENUITEM(3, 'lcl_mobile_mld_menu' , '', 'MLD', 'appl/pda/melding_menu.asp', 0, 0, 'WEB_MLDUSE', 'W', '0', 'fa-play');
DEF_MENUITEM(3, 'lcl_mobile_doemelding' , '', 'MLD', 'appl/pda/melding.asp', 0, 0, 'WEB_MLDUSE', 'W', '1', 'fa-exclamation-circle');

10
FAC/FAC_LCL.SRC
View File

@@ -2045,6 +2045,12 @@ FAC_LCL('lcl_msg_nieuws_aanmaak', 'Datum aangemaakt', 'Date created')
FAC_LCL('lcl_msg_alg_omschr', 'Omschrijving', 'Description')
FAC_LCL('lcl_msg_search', 'Berichten', 'Messages')
FAC_LCL('lcl_message', 'Bericht', 'Message')
FAC_LCL('lcl_msg_new', 'Nieuw bericht', 'New message')
FAC_LCL('lcl_msg_no_messages', 'Geen berichten', 'No messages')
FAC_LCL('lcl_msg_reply', 'Antwoord', 'Reply')
FAC_LCL('lcl_msg_replies', 'Antwoorden', 'Replies')
FAC_LCL('lcl_msg_del_concept', 'Concept verwijderen?', 'Delete concept?')
FAC_LCL('lcl_msg_del_confirm', 'Hele bericht verwijderen?', 'Delete entire message?')
FAC_LCL('lcl_msg_onportal', 'Bericht geplaatst op de portal', 'Message is posted on the portal')
FAC_LCL('lcl_msg_changed', 'Bericht gewijzigd op de portal', 'Message changes have been submitted')
FAC_LCL('lcl_msg_preview', 'Voorbeeld', 'Preview')
@@ -2054,7 +2060,9 @@ FAC_LCL('lcl_msg_nieuws_portal', 'Portal', 'Portal')
FAC_LCL('lcl_msg_nieuws_blogpagina', 'Nieuwspagina', 'Newspage')
FAC_LCL('lcl_msg_nieuws_beide', 'Portal en nieuwspagina', 'Portal and newspage')
FAC_LCL('lcl_msg_nieuws_sticky', 'Sticky', 'Sticky')
FAC_LCL('lcl_msg_community', 'Onze gemeenschap', 'Our community')
FAC_LCL('lcl_msg_community', 'Facilitor community', 'Facilitor community')
FAC_LCL('lcl_mobile_msg', 'Berichten', 'Posts')
FAC_LCL('lcl_msg_community_title', 'Facilitor community', 'Facilitor community')
FAC_LCL('lcl_msg_firstpost', 'Wees de eerste die een bericht plaatst in {0}', 'Be the first to post in {0}')
FAC_LCL('lcl_msg_firstreply', 'Wees de eerste die reageert', 'Be the first to react')
FAC_LCL('fac_nieuws_groep', 'Categorie', 'Category')

2
FAC/FAC_SET.SRC
View File

@@ -519,6 +519,8 @@ DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'udr_graph_gauge_colors'
DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'udr_graph_pie_colors' , 'string' , '[''#003478'',''#6685ae'',''#e37b00'',''#0b94f9'',''#81ce58'',''#f3d736'',''#acaa65'',''#a222c4'',''#5b9bc3'',''#1c40eb'',''#037011'',''#d192e7'',''#f88625'',''#93b89f'',''#bf6b87'',''#a2b41a'',''#f76979'',''#f41181'',''#73eb59'',''#32d1d0'',''#a00bed'',''#66fe6b'',''#b94d5b'']' , 'Colors being used for pie charts (string!)')
DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'use_wildcard_with_suggests' , 'number' , '2' , 'Use wildcards for all sugest fields (0=no wildcard, 1=text*, 2=*text*)')
DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'usrrap_refreshrate' , 'number' , '60' , 'time between auto refresh of selected usrraps (seconds)')
DEFINE_SETTING('MSG', 0001, 'WEB_PRSSYS', 'msg_photo_size' , 'string' , 'r512x512' , 'Resize uploads to this maximum MSG photo size. Ex: r200x150')
DEFINE_SETTING('MSG', 0001, 'WEB_PRSSYS', 'msg_max_history' , 'number' , '30' , 'Show messages no longer than msg_max_history days ago')
DEFINE_SETTING('FAQ', 0001, 'WEB_PRSSYS', 'faq_kennisbank_popup' , 'number' , '3' , 'Show kennisbank popup {0=no | 01=1=FE | 10=2=FO | 11=3=FE+FO}')
DEFINE_SETTING('FAQ', 0001, 'WEB_PRSSYS', 'faq_max_results' , 'number' , '25' , 'Limit the FAQ results to this number')
DEFINE_SETTING('FAQ', 0001, 'WEB_PRSSYS', 'faq_max_results_mld' , 'number' , '0' , 'Initial number of faq items when editing an issue. 0 = show all.')

12
FAC/FAC_TRI.SRC
View File

@@ -356,6 +356,10 @@ BEGIN
IF INSTR (loms, chr(10)) > 0 THEN
loms := SUBSTR (loms, 1, INSTR (loms, chr(10)) -1);
END IF;
-- meestal is dit de doorklik-key
lparamkey := COALESCE (:new.fac_notificatie_extrakey, :new.fac_notificatie_refkey);
-- Verwijder oudere (achterhaalde) portalberichten over hetzelfde
IF :NEW.fac_srtnotificatie_key IS NOT NULL
THEN
@@ -364,11 +368,10 @@ BEGIN
FROM fac_srtnotificatie
WHERE fac_srtnotificatie_key = :NEW.fac_srtnotificatie_key;
-- de optionele tracking-key is geen goede doorklik-key voor melding/opdracht
IF lxmlnode IN ('melding', 'opdracht')
THEN
lparamkey := :new.fac_notificatie_refkey; -- de optionele tracking-key is geen goede
ELSE
lparamkey := COALESCE (:new.fac_notificatie_extrakey, :new.fac_notificatie_refkey);
lparamkey := :new.fac_notificatie_refkey;
END IF;
DELETE FROM web_user_messages
@@ -377,8 +380,9 @@ BEGIN
FROM fac_srtnotificatie
WHERE fac_srtnotificatie_xmlnode = lxmlnode)
AND prs_perslid_key_receiver = :NEW.prs_perslid_key_receiver
AND web_user_mess_action_params = COALESCE (:NEW.fac_notificatie_extrakey, :NEW.fac_notificatie_refkey);
AND web_user_mess_action_params = lparamkey;
END IF;
-- En voeg de nieuwe toe. Let op: als een extrakey bekend is, wordt die als parameter gebruikt, anders gewoon refkey
INSERT INTO web_user_messages
(prs_perslid_key_sender, prs_perslid_key_receiver, web_user_mess_dsc, web_user_mess_action_status,

26
_UP/DB45to46.src
View File

@@ -338,6 +338,32 @@ CREATE INDEX mld_i_mld_melding_note4 ON mld_melding_note(prs_perslid_key);
CREATE INDEX mld_i_mld_opdr_note3 ON mld_opdr_note(mld_opdr_note_parent_key);
CREATE INDEX mld_i_mld_opdr_note4 ON mld_opdr_note(prs_perslid_key);
/////////////////////////////////////////////////////////////////////////////////////////// AAIT#78892
DEF_MENUITEM(3, 'lcl_mobile_msg' , '', 'MSG', 'appl/pda/berichten.asp', 0, 0, 'WEB_MSGUSE', 'R', '1', 'fa-circle-y');
-- Op deze nieuwe LCL kunnen we wel veilig 1 menuitem matchen
INSERT INTO fac_menu (fac_menuitems_key,
fac_menu_volgnr,
fac_menu_altlabel,
fac_menu_alturl,
fac_menu_altgroep,
fac_menu_image,
fac_menu_level,
fac_menu_info)
SELECT fac_menuitems_key,
fac_menuitems_key * 100,
fac_menuitems_label,
fac_menuitems_url,
fac_menuitems_groep,
fac_menuitems_image,
CASE
WHEN fac_menuitems_groep IN (0, 1, 2) THEN 2
WHEN fac_menuitems_groep IN (3, 7) THEN 1
ELSE 0
END fac_menu_level,
fac_menuitems_oms
FROM fac_menuitems i
WHERE fac_menuitems_label = 'lcl_mobile_msg';
/////////////////////////////////////////////////////////////////////////////////////////// FCLT#00000

88
_UP/DB46cto46d.sql Normal file
View File

@@ -0,0 +1,88 @@
--
-- $Id$
--
-- Aanpassingen om DB46c (prod) naar de DB46d te brengen
-- Merk op dat de recreate er nog bij komt die de DB-version bijwerkt
--
-- MOET OOK ZIJN/WORDEN OPGENOMEN IN DB45TO46d.src !!!
DEFINE thisfile = 'DB46cto46d.sql'
DEFINE dbuser = '*'
SET ECHO ON
SET DEFINE ON
COLUMN fcltlogfile NEW_VALUE fcltlogfile NOPRINT;
COLUMN fcltcusterr NEW_VALUE fcltcusterr NOPRINT;
WHENEVER SQLERROR CONTINUE;
SELECT adm.getscriptspoolfile('&thisfile') AS fcltlogfile FROM DUAL;
SPOOL &fcltlogfile
WHENEVER SQLERROR EXIT;
SELECT adm.checkscriptcust('&dbuser') AS fcltcusterr FROM DUAL;
WHENEVER SQLERROR CONTINUE;
PROMPT &fcltcusterr
SET DEFINE OFF
------ payload begin ------
-- /////////////////////////////////////////////////////////////////////////////////////////// AAIT#78892
INSERT INTO fac_menuitems (fac_menuitems_groep,
fac_menuitems_label,
fac_menuitems_oms,
fac_menuitems_module,
fac_menuitems_url,
fac_menuitems_srtdisc,
fac_menuitems_disc,
fac_functie_key,
fac_menuitems_rw,
fac_menuitems_default,
fac_menuitems_image)
SELECT 3,
'lcl_mobile_msg',
'',
'MSG',
'appl/pda/berichten.asp',
0,
0,
fac_functie_key,
'R',
'1',
'fa-circle-y'
FROM fac_functie
WHERE fac_functie_code = 'WEB_MSGUSE';
-- Op deze nieuwe LCL kunnen we wel veilig 1 menuitem matchen
INSERT INTO fac_menu (fac_menuitems_key,
fac_menu_volgnr,
fac_menu_altlabel,
fac_menu_alturl,
fac_menu_altgroep,
fac_menu_image,
fac_menu_level,
fac_menu_info)
SELECT fac_menuitems_key,
fac_menuitems_key * 100,
fac_menuitems_label,
fac_menuitems_url,
fac_menuitems_groep,
fac_menuitems_image,
CASE
WHEN fac_menuitems_groep IN (0, 1, 2) THEN 2
WHEN fac_menuitems_groep IN (3, 7) THEN 1
ELSE 0
END fac_menu_level,
fac_menuitems_oms
FROM fac_menuitems i
WHERE fac_menuitems_label = 'lcl_mobile_msg';
------ payload end ------
SET DEFINE OFF
BEGIN adm.systrackscriptId ('$Id$', 1); END;
/
COMMIT;
SET ECHO OFF
SPOOL OFF
SET DEFINE ON
PROMPT Logfile of this upgrade is: &fcltlogfile