From 247960ee9b32b7b22b9967d7d6745be6f1503547 Mon Sep 17 00:00:00 2001 From: Tiago dos Santos Date: Wed, 17 Dec 2025 14:00:49 -0300 Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o:=20separa=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20sites=20de=20utilidade=20e=20ajuste=20na=20navega=C3=A7?= =?UTF-8?q?=C3=A3o=20do=20bot=C3=A3o=20voltar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GuiaSeniorWeb/README.md | 2 ++ .../com/example/guiasenior/HomeController.java | 17 +++++++++++++++++ .../main/resources/templates/site_detail.html | 4 ++-- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/GuiaSeniorWeb/README.md b/GuiaSeniorWeb/README.md index 6bf1ff7..abb16c1 100644 --- a/GuiaSeniorWeb/README.md +++ b/GuiaSeniorWeb/README.md @@ -48,6 +48,8 @@ GuiaSeniorWeb/ │ ├── home.html # Tela Inicial (Menu Principal) │ ├── sites.html # Lista de sites do governo │ ├── regions.html # Seleção de região (Luz e Água) + + │ ├── site_detail.html # Tela de explicação detalhada de um site │ └── safety_detail.html # Tela com lista de dicas de segurança │ diff --git a/GuiaSeniorWeb/src/main/java/com/example/guiasenior/HomeController.java b/GuiaSeniorWeb/src/main/java/com/example/guiasenior/HomeController.java index 5614f6c..9e44443 100644 --- a/GuiaSeniorWeb/src/main/java/com/example/guiasenior/HomeController.java +++ b/GuiaSeniorWeb/src/main/java/com/example/guiasenior/HomeController.java @@ -159,7 +159,24 @@ public class HomeController { public String siteDetail(@PathVariable String id, Model model) { SiteInfo site = allSitesLookup.get(id); if (site == null) return "redirect:/sites"; + model.addAttribute("site", site); + + // Determine back link + String backLink = "/sites"; // default + if (!govSitesDisplay.containsKey(id)) { + // It's likely a utility, find which region + for (Map.Entry> entry : utilities.entrySet()) { + for (SiteInfo s : entry.getValue()) { + if (s.id.equals(id)) { + backLink = "/utilidades/" + entry.getKey(); + break; + } + } + } + } + model.addAttribute("backLink", backLink); + return "site_detail"; } diff --git a/GuiaSeniorWeb/src/main/resources/templates/site_detail.html b/GuiaSeniorWeb/src/main/resources/templates/site_detail.html index 07b9855..65e6a70 100644 --- a/GuiaSeniorWeb/src/main/resources/templates/site_detail.html +++ b/GuiaSeniorWeb/src/main/resources/templates/site_detail.html @@ -14,8 +14,8 @@ Nome Site -