From 54d50286936802f2b6447951ead8dfe59bf52ed5 Mon Sep 17 00:00:00 2001 From: kasch309 Date: Mon, 16 Mar 2020 13:31:51 +0100 Subject: [PATCH] Add template for detailsNoMember.html, that displays the details when you search a page. Add connection to the controller --- .../controller/Gruppen2Controller.java | 12 +++++++++ .../resources/templates/detailsNoMember.html | 21 ++++++++++++++- src/main/resources/templates/search.html | 26 ++++++++++--------- 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index c71ae8d..a5116d6 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -112,4 +112,16 @@ public class Gruppen2Controller { throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found"); } + @RolesAllowed({"ROLE_orga", "ROLE_studentin", "ROLE_actuator)"}) + @GetMapping("/detailsSearch") + public String showGroupDetailsNoMember (KeycloakAuthenticationToken token, Model model, @RequestParam (value="id") Long id) throws EventException { + model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); + Group group = userService.getGroupById(id); + if (group!=null) { + model.addAttribute("group", group); + return "detailsNoMember"; + } + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found"); + } + } diff --git a/src/main/resources/templates/detailsNoMember.html b/src/main/resources/templates/detailsNoMember.html index f351207..e12d035 100644 --- a/src/main/resources/templates/detailsNoMember.html +++ b/src/main/resources/templates/detailsNoMember.html @@ -25,7 +25,26 @@
- +
+
+
+
+

+

+ Private Gruppe + Öffentliche Gruppe + Veranstaltung +

+

+
+
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html index 0a6e616..a3f6cbb 100644 --- a/src/main/resources/templates/search.html +++ b/src/main/resources/templates/search.html @@ -42,20 +42,22 @@ - - - - - - + + + + + + - - - - - - + + + + + +
GruppennameBeschreibungÖffentlich/PrivatMitgliederanzahl
GruppennameBeschreibungÖffentlich/PrivatMitgliederanzahl
GruppennameBeschreibungÖffentlichMitgliederanzahl
+ Gruppenname + BeschreibungÖffentlichMitgliederanzahl