From fa75beb9c4f1d286f823d9db2c4bd70efe927078 Mon Sep 17 00:00:00 2001 From: CodeSteak Date: Sat, 20 Jun 2020 22:09:25 +0200 Subject: [PATCH] Fix 6284a4d7bf altering template --- .../entities/dashboard/DashboardSummary.java | 31 ++++++++++++++----- .../src/main/resources/application.properties | 5 --- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/dashboard/DashboardSummary.java b/prototype/src/main/java/org/hso/ecommerce/entities/dashboard/DashboardSummary.java index 7f7b6a5..4986697 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/dashboard/DashboardSummary.java +++ b/prototype/src/main/java/org/hso/ecommerce/entities/dashboard/DashboardSummary.java @@ -15,12 +15,27 @@ public class DashboardSummary { @NotNull public java.sql.Date created; - public int todaysNewCustomers; - public int todaysCustomersOrders; - public int todaysSuppliersOrders; - public int todaysItemsSold; - public int todaysSalesCent; - public int totalWarehouseCapacity; - public double currentWarehouseCapacity; - public double todaysWarehouseCapacity; + @NotNull + public Integer todaysNewCustomers; + + @NotNull + public Integer todaysCustomersOrders; + + @NotNull + public Integer todaysSuppliersOrders; + + @NotNull + public Integer todaysItemsSold; + + @NotNull + public Integer todaysSalesCent; + + @NotNull + public Integer totalWarehouseCapacity; + + @NotNull + public Double currentWarehouseCapacity; + + @NotNull + public Double todaysWarehouseCapacity; } diff --git a/prototype/src/main/resources/application.properties b/prototype/src/main/resources/application.properties index 7c62f1b..aee1c7d 100644 --- a/prototype/src/main/resources/application.properties +++ b/prototype/src/main/resources/application.properties @@ -22,8 +22,3 @@ spring.servlet.multipart.max-request-size=10MB # EMBEDDED SERVER CONFIGURATION (ServerProperties) server.address=::1 server.port=8080 - -spring.thymeleaf.prefix=file:src/main/resources/templates/ -spring.thymeleaf.cache=false -spring.resources.static-locations=file:src/main/resources/static/ -spring.resources.cache=false \ No newline at end of file