From 746f3400f44329d519a0aec5f7fa650df0b7130b Mon Sep 17 00:00:00 2001 From: JantBogard Date: Mon, 26 Feb 2024 17:54:46 +0100 Subject: [PATCH 1/4] add migration file to add inventory ward submenu in pharmacy --- sql/load_demo_data.sql | 2 ++ sql/step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 sql/step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql diff --git a/sql/load_demo_data.sql b/sql/load_demo_data.sql index d2e0c2275..66235cc0e 100644 --- a/sql/load_demo_data.sql +++ b/sql/load_demo_data.sql @@ -1587,6 +1587,7 @@ INSERT INTO `oh_groupmenu` (`GM_ID`, `GM_UG_ID_A`, `GM_MNI_ID_A`, `GM_ACTIVE`, ` INSERT INTO `oh_groupmenu` (`GM_ID`, `GM_UG_ID_A`, `GM_MNI_ID_A`, `GM_ACTIVE`, `GM_CREATED_BY`, `GM_CREATED_DATE`, `GM_LAST_MODIFIED_BY`, `GM_LAST_MODIFIED_DATE`) VALUES (342,'laboratorist','help',1,NULL,NULL,NULL,NULL); INSERT INTO `oh_groupmenu` (`GM_ID`, `GM_UG_ID_A`, `GM_MNI_ID_A`, `GM_ACTIVE`, `GM_CREATED_BY`, `GM_CREATED_DATE`, `GM_LAST_MODIFIED_BY`, `GM_LAST_MODIFIED_DATE`) VALUES (343,'admin','btnpharmstockcmovdelete',1,NULL,NULL,NULL,NULL); INSERT INTO `oh_groupmenu` (`GM_ID`, `GM_UG_ID_A`, `GM_MNI_ID_A`, `GM_ACTIVE`, `GM_CREATED_BY`, `GM_CREATED_DATE`, `GM_LAST_MODIFIED_BY`, `GM_LAST_MODIFIED_DATE`) VALUES (344,'admin','btnmedicalswarddelete',1,NULL,NULL,NULL,NULL); +INSERT INTO `oh_groupmenu` (`GM_ID`, `GM_UG_ID_A`, `GM_MNI_ID_A`, `GM_ACTIVE`, `GM_CREATED_BY`, `GM_CREATED_DATE`, `GM_LAST_MODIFIED_BY`, `GM_LAST_MODIFIED_DATE`) VALUES (345,'admin','inventoryward',1,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `oh_groupmenu` ENABLE KEYS */; UNLOCK TABLES; @@ -3009,6 +3010,7 @@ INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTI INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('groups','angal.menu.btn.groups','angal.menu.groups','x','G','users','org.isf.menu.gui.UserGroupBrowsing','N',1); INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('help','angal.menu.btn.help','angal.menu.help','x','H','main','none','Y',12); INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('hospital','angal.menu.btn.hospital','angal.menu.hospital','x','H','generaldata','org.isf.hospital.gui.HospitalBrowser','N',1); +INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('inventoryward','angal.menu.btn.inventory.ward','angal.menu.inventory.ward','x','P','pharmacy','org.isf.medicalinventory.gui.InventoryWardBrowser','N',5); INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('laboratory','angal.menu.btn.laboratory','angal.menu.laboratory','x','L','main','org.isf.lab.gui.LabBrowser','N',3); INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('logfile','angal.menu.btn.logfile','angal.menu.logfile','x','L','help','org.isf.help.LogViewer','N',2); INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('medicals','angal.menu.btn.medicals','angal.menu.medicals','x','P','pharmacy','org.isf.medicals.gui.MedicalBrowser','N',0); diff --git a/sql/step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql b/sql/step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql new file mode 100644 index 000000000..817d00759 --- /dev/null +++ b/sql/step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql @@ -0,0 +1,2 @@ +INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('inventoryward','angal.menu.btn.inventory.ward','angal.menu.inventory.ward','x','P','pharmacy','org.isf.medicalinventory.gui.InventoryWardBrowser','N',5); +INSERT INTO `oh_groupmenu` (`GM_ID`, `GM_UG_ID_A`, `GM_MNI_ID_A`, `GM_ACTIVE`, `GM_CREATED_BY`, `GM_CREATED_DATE`, `GM_LAST_MODIFIED_BY`, `GM_LAST_MODIFIED_DATE`) VALUES (345,'admin','inventoryward',1,NULL,NULL,NULL,NULL); \ No newline at end of file From 33e5487c41fd2da4b28676f92d7090e1638063d7 Mon Sep 17 00:00:00 2001 From: JantBogard Date: Tue, 27 Feb 2024 08:28:37 +0100 Subject: [PATCH 2/4] add step_a10X... migration in step_04... --- sql/step_04_all_following_steps.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/step_04_all_following_steps.sql b/sql/step_04_all_following_steps.sql index a61b0e32d..bf1c7d0f8 100644 --- a/sql/step_04_all_following_steps.sql +++ b/sql/step_04_all_following_steps.sql @@ -97,3 +97,4 @@ source step_a100_logviewer.sql; source step_a101_add_delete_btn_in_medicalstock.sql; source step_a102_add_delete_btn_in_medicalstockward.sql; source step_a103_fix_MedicalDsrStockMovementTypeBrowser.sql; +source step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql; \ No newline at end of file From b682f24c2842a3a4797ff9d09bc0a5f54e279cb5 Mon Sep 17 00:00:00 2001 From: JantBogard Date: Tue, 27 Feb 2024 17:47:04 +0100 Subject: [PATCH 3/4] update bundle code message in sql query --- sql/load_demo_data.sql | 2 +- sql/step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/load_demo_data.sql b/sql/load_demo_data.sql index 66235cc0e..bb17a1718 100644 --- a/sql/load_demo_data.sql +++ b/sql/load_demo_data.sql @@ -3010,7 +3010,7 @@ INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTI INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('groups','angal.menu.btn.groups','angal.menu.groups','x','G','users','org.isf.menu.gui.UserGroupBrowsing','N',1); INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('help','angal.menu.btn.help','angal.menu.help','x','H','main','none','Y',12); INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('hospital','angal.menu.btn.hospital','angal.menu.hospital','x','H','generaldata','org.isf.hospital.gui.HospitalBrowser','N',1); -INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('inventoryward','angal.menu.btn.inventory.ward','angal.menu.inventory.ward','x','P','pharmacy','org.isf.medicalinventory.gui.InventoryWardBrowser','N',5); +INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('inventoryward','angal.menu.btn.inventoryward','angal.menu.inventoryward','x','P','pharmacy','org.isf.medicalinventory.gui.InventoryWardBrowser','N',5); INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('laboratory','angal.menu.btn.laboratory','angal.menu.laboratory','x','L','main','org.isf.lab.gui.LabBrowser','N',3); INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('logfile','angal.menu.btn.logfile','angal.menu.logfile','x','L','help','org.isf.help.LogViewer','N',2); INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('medicals','angal.menu.btn.medicals','angal.menu.medicals','x','P','pharmacy','org.isf.medicals.gui.MedicalBrowser','N',0); diff --git a/sql/step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql b/sql/step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql index 817d00759..d751a0470 100644 --- a/sql/step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql +++ b/sql/step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql @@ -1,2 +1,2 @@ -INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('inventoryward','angal.menu.btn.inventory.ward','angal.menu.inventory.ward','x','P','pharmacy','org.isf.medicalinventory.gui.InventoryWardBrowser','N',5); +INSERT INTO `oh_menuitem` (`MNI_ID_A`, `MNI_BTN_LABEL`, `MNI_LABEL`, `MNI_TOOLTIP`, `MNI_SHORTCUT`, `MNI_SUBMENU`, `MNI_CLASS`, `MNI_IS_SUBMENU`, `MNI_POSITION`) VALUES ('inventoryward','angal.menu.btn.inventoryward','angal.menu.inventoryward','x','P','pharmacy','org.isf.medicalinventory.gui.InventoryWardBrowser','N',5); INSERT INTO `oh_groupmenu` (`GM_ID`, `GM_UG_ID_A`, `GM_MNI_ID_A`, `GM_ACTIVE`, `GM_CREATED_BY`, `GM_CREATED_DATE`, `GM_LAST_MODIFIED_BY`, `GM_LAST_MODIFIED_DATE`) VALUES (345,'admin','inventoryward',1,NULL,NULL,NULL,NULL); \ No newline at end of file From 67d22747575d9467bb9fd1a80517555cf89d17a3 Mon Sep 17 00:00:00 2001 From: JantBogard Date: Wed, 28 Feb 2024 11:05:32 +0100 Subject: [PATCH 4/4] Change migration file name from step_a10X... to step_a1XX --- sql/step_04_all_following_steps.sql | 2 +- ...ql => step_a1XX_add_inventory_ward_sub_menu_in_pharmacy.sql} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sql/{step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql => step_a1XX_add_inventory_ward_sub_menu_in_pharmacy.sql} (100%) diff --git a/sql/step_04_all_following_steps.sql b/sql/step_04_all_following_steps.sql index bf1c7d0f8..f984caa98 100644 --- a/sql/step_04_all_following_steps.sql +++ b/sql/step_04_all_following_steps.sql @@ -97,4 +97,4 @@ source step_a100_logviewer.sql; source step_a101_add_delete_btn_in_medicalstock.sql; source step_a102_add_delete_btn_in_medicalstockward.sql; source step_a103_fix_MedicalDsrStockMovementTypeBrowser.sql; -source step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql; \ No newline at end of file +source step_a1XX_add_inventory_ward_sub_menu_in_pharmacy.sql; \ No newline at end of file diff --git a/sql/step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql b/sql/step_a1XX_add_inventory_ward_sub_menu_in_pharmacy.sql similarity index 100% rename from sql/step_a10X_add_inventory_ward_sub_menu_in_pharmacy.sql rename to sql/step_a1XX_add_inventory_ward_sub_menu_in_pharmacy.sql