diff --git a/sisvietnamvn_Trang chính thức hiện tại/op1-view1gạch-min-1-1024x722.jpg b/sisvietnamvn_Trang chính thức hiện tại/op1-view1gạch-min-1-1024x722.jpg new file mode 100644 index 00000000..981ec04d Binary files /dev/null and b/sisvietnamvn_Trang chính thức hiện tại/op1-view1gạch-min-1-1024x722.jpg differ diff --git a/sisvietnamvn_Trang chính thức hiện tại/op1-view1gạch-min-1-1024x722.jpg:Zone.Identifier b/sisvietnamvn_Trang chính thức hiện tại/op1-view1gạch-min-1-1024x722.jpg:Zone.Identifier new file mode 100644 index 00000000..14610396 Binary files /dev/null and b/sisvietnamvn_Trang chính thức hiện tại/op1-view1gạch-min-1-1024x722.jpg:Zone.Identifier differ diff --git a/sisvietnamvn_main/sisvietnam_backup.dmp b/sisvietnamvn_main/sisvietnam_backup.dmp index 57ac4ce9..7a81eb0f 100644 Binary files a/sisvietnamvn_main/sisvietnam_backup.dmp and b/sisvietnamvn_main/sisvietnam_backup.dmp differ diff --git a/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/GlobalControllerAdvice.java b/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/GlobalControllerAdvice.java index 88f3f848..39f2890a 100644 --- a/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/GlobalControllerAdvice.java +++ b/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/GlobalControllerAdvice.java @@ -127,6 +127,18 @@ public class GlobalControllerAdvice { return settingService.getValue("theme_mod_customCss", ""); } + @ModelAttribute("hospitalBranches") + public java.util.List> getHospitalBranches() { + String defaultJson = "[{\"id\":\"sis-can-tho\",\"name\":\"Bệnh viện Đa khoa Quốc Tế S.I.S Cần Thơ\",\"address\":\"397 Nguyễn Văn Cừ, P. An Bình, TP. Cần Thơ\",\"phone\":\"18001115\",\"email\":\"cskh@dotquy.vn\",\"website\":\"https://sisvietnam.vn/\",\"mapUrl\":\"https://maps.google.com/maps?q=Bệnh%20viện%20Đa%20khoa%20Quốc%20Tế%20S.I.S%20Cần%20Thơ&t=&z=16&ie=UTF8&iwloc=&output=embed\"},{\"id\":\"sis-da-nang\",\"name\":\"Bệnh viện Đa khoa Quốc Tế S.I.S Đà Nẵng\",\"address\":\"201 Nguyễn Chí Thanh, Phường 12, Quận 5, TP. Hồ Chí Minh\",\"phone\":\"(84.28) 3955 5548\",\"email\":\"bvdaihoccoso2@umc.edu.vn\",\"website\":\"#\",\"mapUrl\":\"#\"},{\"id\":\"sis-nha-trang\",\"name\":\"Bệnh viện Đa khoa Quốc Tế S.I.S Nha Trang\",\"address\":\"221B Hoàng Văn Thụ, Phường 8, Q. Phú Nhuận, TP. Hồ Chí Minh\",\"phone\":\"(84.28) 3842 0070\",\"email\":\"bvdaihoccoso3@umc.edu.vn\",\"website\":\"#\",\"mapUrl\":\"#\"}]"; + String json = settingService.getValue("hospital_branches", defaultJson); + if (json.trim().isEmpty()) json = defaultJson; + try { + return new com.fasterxml.jackson.databind.ObjectMapper().readValue(json, new com.fasterxml.jackson.core.type.TypeReference>>() {}); + } catch (com.fasterxml.jackson.core.JsonProcessingException e) { + return new java.util.ArrayList<>(); + } + } + private java.util.List getWidgets(String area) { String json = settingService.getValue("theme_widgets_" + area, "[]"); try { diff --git a/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/manage/ManageSettingController.java b/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/manage/ManageSettingController.java index f3da7e80..81123da0 100644 --- a/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/manage/ManageSettingController.java +++ b/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/controller/manage/ManageSettingController.java @@ -139,4 +139,17 @@ public class ManageSettingController { public String savePrivacySettings(@RequestParam Map allParams, RedirectAttributes redirectAttributes) { return saveSettings(allParams, redirectAttributes, "privacy"); } + + // --- Branches Settings --- + + @GetMapping("/branches") + public String showBranchesSettings(Model model) { + addSettingsToModel(model); + return "manage/settings/branches"; + } + + @PostMapping("/branches/save") + public String saveBranchesSettings(@RequestParam Map allParams, RedirectAttributes redirectAttributes) { + return saveSettings(allParams, redirectAttributes, "branches"); + } } diff --git a/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/security/CoreSettingsRegistrar.java b/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/security/CoreSettingsRegistrar.java index b2b039d3..1b86e39a 100644 --- a/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/security/CoreSettingsRegistrar.java +++ b/sisvietnamvn_main/src/main/java/com/sisvietnamvn/web/security/CoreSettingsRegistrar.java @@ -13,9 +13,11 @@ import java.util.Map; public class CoreSettingsRegistrar { private final AdminSettingsManager settingsManager; + private final AdminMenuManager adminMenuManager; - public CoreSettingsRegistrar(AdminSettingsManager settingsManager) { + public CoreSettingsRegistrar(AdminSettingsManager settingsManager, AdminMenuManager adminMenuManager) { this.settingsManager = settingsManager; + this.adminMenuManager = adminMenuManager; } @PostConstruct @@ -56,6 +58,9 @@ public class CoreSettingsRegistrar { settingsManager.registerSetting(page, "date_format", "F j, Y"); // --- Menu Registration for Modules --- + // Register the "Branches" management page under Settings + adminMenuManager.addOptionsPage("Quản lý Chi nhánh", "Chi nhánh", "manage_options", "branches"); + // (Snippets menu is now statically defined under Components) } } diff --git a/sisvietnamvn_main/src/main/resources/static/css/custom.css b/sisvietnamvn_main/src/main/resources/static/css/custom.css index 33d4b14d..20001903 100644 --- a/sisvietnamvn_main/src/main/resources/static/css/custom.css +++ b/sisvietnamvn_main/src/main/resources/static/css/custom.css @@ -562,4 +562,28 @@ body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { .widget-sidebar-area { display: none !important; } -} \ No newline at end of file +} + + +#map-section .branch-text { + color: #111827; /* text-gray-900 */ +} + +#map-section .branch-card { + background-color: var(--color-white, #ffffff); +} + +/* Active State */ +#map-section .branch-card.active { + background-color: var(--color-old-brick); /* bg-primary-600 */ +} +#map-section .branch-card.active .branch-title, +#map-section .branch-card.active .branch-text, +#map-section .branch-card.active .branch-icon { + color: #ffffff; /* text-white */ +} + +/* Hero Background Override */ +.bg-linear-hero { + background: linear-gradient(180deg, transparent, #000) !important; +} diff --git a/sisvietnamvn_main/src/main/resources/templates/doctor_pretty.html b/sisvietnamvn_main/src/main/resources/templates/doctor_pretty.html deleted file mode 100644 index e69de29b..00000000 diff --git a/sisvietnamvn_main/src/main/resources/templates/manage/settings/branches.html b/sisvietnamvn_main/src/main/resources/templates/manage/settings/branches.html new file mode 100644 index 00000000..6090cbdc --- /dev/null +++ b/sisvietnamvn_main/src/main/resources/templates/manage/settings/branches.html @@ -0,0 +1,171 @@ + + + + Quản lý Chi nhánh + + +
+

Quản lý Chi nhánh

+ +
+ + +
+
+ + +
+ +
+
+
+ + + + + + +
+ +
+ + + +
+
+
+ +
+
+
+
+
+ + +
+ + diff --git a/sisvietnamvn_main/src/main/resources/templates/pages/contact-us.html b/sisvietnamvn_main/src/main/resources/templates/pages/contact-us.html index 838dc6b7..5f115251 100644 --- a/sisvietnamvn_main/src/main/resources/templates/pages/contact-us.html +++ b/sisvietnamvn_main/src/main/resources/templates/pages/contact-us.html @@ -9,16 +9,73 @@
- -
-
- Bệnh viện -
+ +
+
+
+
+
+
+ + + + + +
+
+
+

Liên hệ

+
+
+
+ + +
+
+
+
+
+
+ + +
-

Liên hệ

@@ -38,53 +95,16 @@
- - - -