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

FCLT#64044 Conversie gelijk aan upgrade

Browse Source 
svn path=/Database/trunk/; revision=54159
This commit is contained in:
Koen Reefman
2021-12-15 08:55:59 +00:00
parent 7a84fbeb9e
commit 17dcddccd5
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
COMSQL.H
View File

@@ -633,7 +633,7 @@ CEIL
#define DEF_MENUKOPV(g, v, s, i) INSERT INTO fac_menu (fac_menu_volgnr, fac_menu_altlabel, fac_menu_altgroep, fac_menu_image, fac_menu_level) VALUES (v, s, g, i, 1)
#define DEF_MENUITEM(g, l, i, m, u, s, d, f, rw, x, img) 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 g, l, i, m, u, s, d, fac_functie_key, rw, x, img FROM fac_functie WHERE fac_functie_code=f
#define DEF_MENUENTRY(g, v, l, i, m, u, s, d, f) INSERT INTO fac_menu (fac_menu_volgnr, fac_menu_altlabel, fac_menu_info, fac_menu_alturl, fac_menu_altgroep, fac_functie_key) SELECT v, l, i, u, g, fac_functie_key FROM fac_functie WHERE fac_functie_code = f AND NOT EXISTS (SELECT '' FROM fac_menu WHERE fac_menu_alturl = u)
#define DEF_MENUENTRY(g, v, l, i, m, u, s, d, f) INSERT INTO fac_menu (fac_menu_volgnr, fac_menu_altlabel, fac_menu_info, fac_menu_alturl, fac_menu_altgroep, fac_menu_level, fac_functie_key) SELECT v, l, i, u, g, 2, fac_functie_key FROM fac_functie WHERE fac_functie_code = f AND NOT EXISTS (SELECT '' FROM fac_menu WHERE fac_menu_alturl = u)
#define DEF_SETTING(m, n, d, t) INSERT INTO fac_setting (fac_setting_module, fac_setting_name, fac_setting_default, fac_setting_description) VALUES (m, n, d, t)
#define DEF_BOOKMARK(x, p, q)INSERT INTO fac_bookmark (fac_bookmark_id, fac_bookmark_naam, fac_bookmark_xmlnode, fac_bookmark_path, fac_bookmark_query) VALUES (DBMS_RANDOM.string ('a', 16), x, x, p, q)
@@ -643,9 +643,9 @@ CEIL
// Voeg (nieuwe, default) menukop met label a van groep g en level l toe na bestaande menuoptie met label b, increment n
#define MENU_INSKOP_AFTER(a, b, g, n) INSERT INTO fac_menu (fac_menu_volgnr, fac_menu_altlabel, fac_menu_altgroep, fac_menu_level) SELECT fac_menu_volgnr + n, a, g, 1 FROM fac_menu m WHERE m.fac_menuitems_key = (SELECT MAX (mm.fac_menuitems_key) FROM fac_menu mm, fac_menuitems mmi WHERE mm.fac_menuitems_key = mmi.fac_menuitems_key AND mmi.fac_menuitems_label = b)
// Voeg (nieuwe, default) menuoptie met label a toe na de eerste bestaande menukop met label b, increment n
#define MENU_INS_AFTERKOP(a, b, n) INSERT INTO fac_menu (fac_menuitems_key, fac_menu_volgnr) SELECT i.fac_menuitems_key, MIN (m.fac_menu_volgnr) + n FROM fac_menuitems i, fac_menu m WHERE i.fac_menuitems_key = (SELECT MAX (mmi.fac_menuitems_key) FROM fac_menuitems mmi WHERE mmi.fac_menuitems_label = a) AND m.fac_menu_altlabel = b GROUP BY i.fac_menuitems_key
#define MENU_INS_AFTERKOP(a, b, n) INSERT INTO fac_menu (fac_menuitems_key, fac_menu_altlabel, fac_menu_alturl, fac_menu_altgroep, fac_menu_image, fac_menu_info, fac_menu_volgnr, fac_menu_level) SELECT i.fac_menuitems_key, i.fac_menuitems_label, i.fac_menuitems_url, i.fac_menuitems_groep, i.fac_menuitems_image, i.fac_menuitems_oms, MIN (m.fac_menu_volgnr) + n, 2 FROM fac_menuitems i, fac_menu m WHERE i.fac_menuitems_key = (SELECT MAX (mmi.fac_menuitems_key) FROM fac_menuitems mmi WHERE mmi.fac_menuitems_label = a) AND m.fac_menu_altlabel = b GROUP BY i.fac_menuitems_key
// Voeg (nieuwe, default) menuoptie met label a toe na bestaande menuoptie met label b, increment n
#define MENU_INS_AFTER(a, b, n) INSERT INTO fac_menu (fac_menuitems_key, fac_menu_volgnr) SELECT i.fac_menuitems_key, m.fac_menu_volgnr + n FROM fac_menuitems i, fac_menu m WHERE i.fac_menuitems_key = (SELECT MAX(mmi.fac_menuitems_key) FROM fac_menuitems mmi WHERE mmi.fac_menuitems_label = a) AND m.fac_menuitems_key = (SELECT MAX(mm.fac_menuitems_key) FROM fac_menu mm, fac_menuitems mmi WHERE mm.fac_menuitems_key = mmi.fac_menuitems_key AND mmi.fac_menuitems_label = b)
#define MENU_INS_AFTER(a, b, n) INSERT INTO fac_menu (fac_menuitems_key, fac_menu_altlabel, fac_menu_alturl, fac_menu_altgroep, fac_menu_image, fac_menu_info, fac_menu_volgnr, fac_menu_level) SELECT i.fac_menuitems_key, i.fac_menuitems_label, i.fac_menuitems_url, i.fac_menuitems_groep, i.fac_menuitems_image, i.fac_menuitems_oms, m.fac_menu_volgnr + n, 2 FROM fac_menuitems i, fac_menu m WHERE i.fac_menuitems_key = (SELECT MAX(mmi.fac_menuitems_key) FROM fac_menuitems mmi WHERE mmi.fac_menuitems_label = a) AND m.fac_menuitems_key = (SELECT MAX(mm.fac_menuitems_key) FROM fac_menu mm, fac_menuitems mmi WHERE mm.fac_menuitems_key = mmi.fac_menuitems_key AND mmi.fac_menuitems_label = b)
// poging 1
#define MENU_MOV_AFTER(b, a, n) UPDATE fac_menu SET fac_menu_volgnr = (SELECT m.fac_menu_volgnr + n FROM fac_menuitems i, fac_menu m WHERE m.fac_menuitems_key=i.fac_menuitems_key AND i.fac_menuitems_key = (SELECT MAX(mmi.fac_menuitems_key) FROM fac_menuitems mmi WHERE mmi.fac_menuitems_label = a)) WHERE fac_menuitems_key = (SELECT MAX(mm.fac_menuitems_key) FROM fac_menu mm, fac_menuitems mmi WHERE mm.fac_menuitems_key = mmi.fac_menuitems_key AND mmi.fac_menuitems_label = b)

8
FAC/FAC_INI.SRC
View File

@@ -2936,7 +2936,7 @@ DEF_MENUITEM(3, 'lcl_mobile_plattegronden' , '', 'CAD', 'appl/pda/verdiepin
DEF_MENUITEM(3, 'lcl_mobile_setlocation' , '', 'FAC', 'appl/pda/setlocation.asp', 0, 0, 'WEB_CADUSE', 'R', '0', 'fa-map-marker');
DEF_MENUITEM(3, 'lcl_mobile_messages' , '', 'FAC', 'appl/pda/message_list.asp', 0, 0, 'WEB_MLDUSE', 'R', '0', 'fa-comment');
DEF_MENUITEM(3, 'lcl_mobile_rapporten' , '', 'FAC', 'appl/pda/reports.asp', 0, 0, 'WEB_USRRAP', 'R', '0', 'fa-file-alt');
DEF_MENUITEM(3, 'lcl_logoff' , '', 'FAC', 'appl/pda/logoff_confirm.asp', 0, 0, 'WEB_MLDUSE', 'R', '0', 'fa-fa-window-close');
DEF_MENUITEM(3, 'lcl_logoff' , '', 'FAC', 'appl/pda/logoff_confirm.asp', 0, 0, 'WEB_MLDUSE', 'R', '0', 'fa-window-close');
DEF_MENUITEM(7, 'lcl_mobile_scanqr' , '', 'FAC', 'qr:', 0, 0, 'WEB_FACQRC', 'R', '1', 'fa-camera');
@@ -2948,6 +2948,7 @@ INSERT INTO fac_menu (fac_menuitems_key,
fac_menu_alturl,
fac_menu_altgroep,
fac_menu_image,
fac_menu_level,
fac_menu_info)
SELECT fac_menuitems_key,
fac_menuitems_key * 100,
@@ -2955,6 +2956,11 @@ INSERT INTO fac_menu (fac_menuitems_key,
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_default = 1

2
FAC/FAC_TAB.SRC
View File

@@ -1417,7 +1417,7 @@ CREATE_TABLE(fac_menu, 0)
// Note: this column is defined in INS_TAB.SRC
// ins_discipline_key NUMBER(10) CONSTRAINT fac_r_menu3 REFERENCES ins_tab_discipline (ins_discipline_key),
// ins_srtdiscipline_key NUMBER(10) CONSTRAINT fac_r_menu4 REFERENCES ins_srtdiscipline (ins_srtdiscipline_key),
fac_menu_level NUMBER(1), /* 1=head, null=item, other=future use */
fac_menu_level NUMBER(1) DEFAULT 1 NOT NULL, /* 0=future-use, 1=hoofdmenu, 2=submenu, 3-9=future use */
fac_menu_portal NUMBER(1), /* 1=include in picture/portalmenu, null=donot include, other=future use **Not applicable WHERE fac_menu_altgroep IN (5,6) (pinned/FAV) */
// Note: this column is defined in PRS_TAB.SRC
// prs_perslid NUMBER(10) CONSTRAINT fac_r_prs_perslid_key7 REFERENCES prs_perslid (prs_perslid_key) ON DELETE CASCADE,

2
_UP/DB40to41.src
View File

@@ -487,7 +487,7 @@ UPDATE fac_setting
/////////////////////////////////////////////////////////////////////////////////////////// FCLT#64044
ALTER TABLE fac_menu
DROP CONSTRAINT fac_c_menu1;
DROP CONSTRAINT fac_c_menu1 DROP INDEX;
UPDATE fac_menu m
SET fac_menu_altgroep =