From 5dcdf0ab716c9edefb448a4b12e8225bd921c8e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= Date: Sat, 11 Jan 2020 19:00:13 +0100 Subject: Split attrib chart and adding zones --- .../mimuw/cloudatlas/client/ClientController.java | 20 ++++++++----- src/main/resources/application.properties | 2 +- .../cloudatlas/client/templates/attribChart.html | 20 ++----------- .../client/templates/fragments/navbar.html | 3 ++ .../mimuw/cloudatlas/client/templates/home.html | 2 -- .../cloudatlas/client/templates/zoneForm.html | 33 ++++++++++++++++++++++ 6 files changed, 52 insertions(+), 28 deletions(-) create mode 100644 src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/zoneForm.html (limited to 'src/main') diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java b/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java index 0715af5..210505d 100644 --- a/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java +++ b/src/main/java/pl/edu/mimuw/cloudatlas/client/ClientController.java @@ -24,7 +24,8 @@ import java.util.*; * /attribs - GET - displays attribute submission form * /attribs - POST - posts attribute submission data * /values - GET - displays attributes values - * /values - POST - posts zone change data + * /zones - GET - displays zone change data + * /zones - POST - posts zone change data * /attribNumValues - REST API to get numerical attribute values * /attribAllValues - REST API to get all attribute values */ @@ -325,9 +326,6 @@ public class ClientController { @GetMapping("/values") public String valuesPage(Model model) { - model.addAttribute("availableZones", getAvailableZonesString()); - model.addAttribute("currentZone", "Current zone: " + this.currentZoneName); - model.addAttribute("zoneName", new DataStringInput()); return "attribChart"; } @@ -439,13 +437,21 @@ public class ClientController { return processAttribValues(getValuesTable(false)); } - @PostMapping("/values") - public String valuesPage(@ModelAttribute DataStringInput zoneName, Model model) { + @GetMapping("/zones") + public String zonesGetPage(Model model) { + model.addAttribute("availableZones", getAvailableZonesString()); + model.addAttribute("currentZone", "Current zone: " + this.currentZoneName); + model.addAttribute("zoneName", new DataStringInput()); + return "zoneForm"; + } + + @PostMapping("/zones") + public String zonesPostPage(@ModelAttribute DataStringInput zoneName, Model model) { this.currentZoneName = zoneName.getString(); this.attributes.clear(); model.addAttribute("currentZone", "Current zone: " + this.currentZoneName); model.addAttribute("availableZones", getAvailableZonesString()); model.addAttribute("zoneName", new DataStringInput()); - return "attribChart"; + return "zoneForm"; } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ee983e2..2bd3b7e 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,7 +1,7 @@ server.port=8082 spring.application.name=CloudAtlas Client -spring.thymeleaf.cache=true +spring.thymeleaf.cache=false spring.thymeleaf.enabled=true spring.thymeleaf.prefix=classpath:/pl/edu/mimuw/cloudatlas/client/templates/ spring.thymeleaf.suffix=.html diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html index bfb306c..8da8798 100644 --- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html +++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/attribChart.html @@ -4,10 +4,8 @@ Attributes chart - - - + - diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/fragments/navbar.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/fragments/navbar.html index ca83cbb..7d28176 100644 --- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/fragments/navbar.html +++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/fragments/navbar.html @@ -32,6 +32,9 @@
  • Values
    • +
  • + Zones +
    • diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/home.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/home.html index 043ac76..47b19af 100644 --- a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/home.html +++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/home.html @@ -6,8 +6,6 @@ CloudAtlas Client - home - - diff --git a/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/zoneForm.html b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/zoneForm.html new file mode 100644 index 0000000..4c55e50 --- /dev/null +++ b/src/main/resources/pl/edu/mimuw/cloudatlas/client/templates/zoneForm.html @@ -0,0 +1,33 @@ + + + + + + Contacts query form + + + + + +
    + +

    +
    +
    +
    + + + + +
    + +
    +
    + + + + + + + + -- cgit v1.2.3