FCLT#64017 widget-labels erbij, sequence fac_s_fac_widget_page_key minvalue terug naar 100, en syntax fout uit db40to41.src

svn path=/Database/trunk/; revision=53330
This commit is contained in:
2021-10-11 14:18:41 +00:00
parent 68e2f24882
commit c4b18cc3a8
3 changed files with 16 additions and 7 deletions

View File

@@ -516,6 +516,7 @@ FAC_LCL('lcl_export_to_excel', 'Excel', 'Excel')
FAC_LCL('lcl_print_table', 'Afdrukken', 'Print')
FAC_LCL('lcl_export_to_csv', 'Naar bestand', 'Save to file')
FAC_LCL('lcl_search_diff_fields', 'Zoektekst', 'Search text')
FAC_LCL('lcl_search_or_fields', 'OF', 'OR')
FAC_LCL('lcl_communicatie', 'Communicatie', 'Communication')
FAC_LCL('lcl_properties', 'Kenmerken', 'Properties')
FAC_LCL('lcl_print_properties', 'Kenmerken ook opnemen?', 'Include properties?')
@@ -5778,7 +5779,7 @@ FAC_LCL('fac_widget_reftype_M', 'Menuitem', 'Menuitem')
FAC_LCL('fac_widget_reftype_R', 'Rapportage', 'Report')
FAC_LCL('fac_widget_content', 'HTML code', 'Raw HTML')
FAC_LCL('fac_widget_groep', 'Widgetgroep', 'Widget group')
FAC_LCL('fac_widget_title', 'Widgetitel', 'Widget title')
FAC_LCL('fac_widget_title', 'Widgettitel', 'Widget title')
FAC_LCL('fac_widget_url', 'Inhoud-URL', 'URL')
FAC_LCL('fac_widget_querystring', 'Querystring', 'Querystring')
FAC_LCL('fac_widget_volgnr', 'Volgnr', 'Sequence nr')
@@ -5797,12 +5798,18 @@ FAC_LCL('lcl_menu_wgt_pages', 'Widgetpagina''s', 'Widgetpages')
FAC_LCL('fac_widget_page', 'Widget pagina', 'Workspace')
FAC_LCL('fac_widget_page_m', 'Widget pagina''s', 'Workspaces')
FAC_LCL('fac_widget_page_name', 'Naam', 'Name')
FAC_LCL('fac_widget_page_personal', 'Persoonlijke pagina', 'Personal page')
FAC_LCL('fac_widget_page_aanmaak', 'Aanmaakdatum', 'Creation date')
FAC_LCL('fac_widget_page_auth', 'Extra autorisatie', 'Additional authorisation')
FAC_LCL('fac_widget_page_pers', 'Pagina van', 'Page of')
FAC_LCL('fac_widget_page_layout', 'Indeling', 'Layout')
FAC_LCL('fac_widget_page_show', 'Pagina tonen', 'View page')
FAC_LCL('fac_widget_page_edit', 'Wijzigen', 'Edit')
FAC_LCL('fac_widget_onpage_del', 'Alle widgets van de pagina verwijderd', 'All widgets deleted from the page')
FAC_LCL('fac_widget_add_new', 'Voeg direct uw eerste widget toe', 'Add your first widget now')
FAC_LCL('fac_widget_add_here', 'Voeg een nieuwe widget toe aan deze rij', 'Add a new widget to this row')
FAC_LCL('fac_widget_fix_height', 'Hoogte vastzetten', 'Fix height')
FAC_LCL('lcl_note_group_default', 'Standaard', 'Default')
FAC_LCL('fac_note_groups', 'Notitie classificaties', 'Note indications')

View File

@@ -38,7 +38,7 @@ CREATE SEQUENCE fac_s_fac_locale_xref_key MINVALUE 1;
CREATE SEQUENCE fac_s_fac_kenmerkdomein_key MINVALUE 1;
CREATE SEQUENCE fac_s_fac_kenmwaarden_key MINVALUE 1;
CREATE SEQUENCE fac_s_fac_widget_key MINVALUE 1;
CREATE SEQUENCE fac_s_fac_widget_page_key MINVALUE 1;
CREATE SEQUENCE fac_s_fac_widget_page_key MINVALUE 100;
CREATE SEQUENCE fac_s_fac_widget_onpage_key MINVALUE 1;
CREATE SEQUENCE fac_s_fac_note_group_key MINVALUE 1;
CREATE SEQUENCE fac_s_fac_code2label_key MINVALUE 1;

View File

@@ -63,7 +63,8 @@ INSERT INTO fac_menu (fac_menuitems_key, fac_menu_volgnr)
WHERE ii.fac_menuitems_label = 'lcl_menu_fe_myinfo') -- Originele fac_menuitems
OR ( m.fac_menu_altgroep = 0
AND ( (m.fac_menu_alturl LIKE '%appl/fac/fac_user_info.asp%') -- Handmatig ingevoegd met originele url
OR UPPER (m.fac_menu_altlabel) = 'MIJN GEGEVENS'))); -- Handmatig ingevoegd met originele label
OR UPPER (m.fac_menu_altlabel) = 'MIJN GEGEVENS'))) -- Handmatig ingevoegd met originele label
;
DEF_MENUITEM(2, 'lcl_menu_wgt_pages', '', 'WGT', 'appl/mgt/fac_widget_page.asp', 0, 0, 'WEB_WGTMAN', 'R', '1', '');
-- Variatie op MENU_INS_AFTER();
@@ -80,7 +81,8 @@ INSERT INTO fac_menu (fac_menuitems_key, fac_menu_volgnr)
WHERE ii.fac_menuitems_label = 'lcl_menu_fac_widgets') -- Originele fac_menuitems
OR ( m.fac_menu_altgroep = 2
AND ( m.fac_menu_alturl LIKE '%appl/mgt/fac_widget.asp%' -- Handmatig ingevoegd met originele url
OR UPPER (m.fac_menu_altlabel) = 'WIDGETS'))); -- Handmatig ingevoegd met originele label
OR UPPER (m.fac_menu_altlabel) = 'WIDGETS'))) -- Handmatig ingevoegd met originele label
;
CREATE_TABLE(fac_widget_page, 0)
(
@@ -102,7 +104,7 @@ ALTER TABLE fac_widget_page ADD (
CONSTRAINT fac_r_prs_perslid_key11 REFERENCES prs_perslid(prs_perslid_key) ON DELETE CASCADE
);
CREATE SEQUENCE fac_s_fac_widget_page_key MINVALUE 1;
CREATE SEQUENCE fac_s_fac_widget_page_key MINVALUE 100;
CREATE_TRIGGER(fac_t_fac_widget_page_B_I)
BEFORE INSERT ON fac_widget_page
@@ -181,7 +183,7 @@ ALTER TABLE fac_widget
OR (fac_widget_type IN ('M', 'R') AND fac_widget_typerefkey IS NOT NULL)
OR (fac_widget_type = 'H' AND fac_widget_content IS NOT NULL));
// UNDER CONSTRUCTION
// UNDER CONSTRUCTION; conversie optimaliseren
-- 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,
@@ -234,7 +236,7 @@ UPDATE fac_setting
WHERE fac_setting_name = 'fg_areathreshold' AND fac_setting_type = 'number';
/////////////////////////////////////////////////////////////////////////////////////////// MARX#68582
DROP CONSTRAINT res_c_alg_ruimte_or_opstel;
ALTER TABLE res_rsv_ruimte DROP CONSTRAINT res_c_alg_ruimte_or_opstel;
ALTER TABLE res_rsv_ruimte
ADD CONSTRAINT res_c_alg_ruimte_or_opstel
CHECK (res_ruimte_opstel_key IS NOT NULL OR alg_ruimte_key IS NOT NULL OR mld_opdr_key IS NOT NULL);