From 5d7ecbdfb71db0263cb8dda6db199b1179044fa3 Mon Sep 17 00:00:00 2001 From: localhorst Date: Sat, 30 May 2020 16:43:07 +0200 Subject: [PATCH] basic detail page for supplier --- .../hso/ecommerce/app/RequestController.java | 5 +- .../suppliers/SupplierIndexController.java | 135 ++++++++++++++++++ .../repos/supplier/SupplierRepository.java | 4 +- .../templates/intern/suppliers/id.html | 3 +- 4 files changed, 142 insertions(+), 5 deletions(-) diff --git a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java index 0f9c42e..b49241c 100644 --- a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java +++ b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java @@ -105,12 +105,13 @@ public class RequestController { public String internSuppliers() { return "intern/suppliers/index"; } -*/ + @GetMapping("/intern/suppliers/{id}") public String internSuppliersId() { return "intern/suppliers/id"; } - +*/ + @GetMapping("/intern/supplierOrders/") public String internSupplierOrders() { return "intern/supplierOrders/index"; diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierIndexController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierIndexController.java index 56ca421..d9d214a 100644 --- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierIndexController.java +++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierIndexController.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @Controller @@ -32,6 +33,24 @@ public class SupplierIndexController { return "intern/suppliers/index"; } + @GetMapping("/suppliers/{id}") + public String internListedArticlesId(Model model, @PathVariable String id) { + + System.out.println("hEre!"); + + int supplierId = Integer.parseInt(id); + + UImodelSupplierDetailOrders orders = new UImodelSupplierDetailOrders(supplierId, "01.01.1970", "orderd article", + "netto €", "42", "total €", "31.12.1970"); + + UImodelSupplierDetail total = new UImodelSupplierDetail(supplierRepository.findSupplierById(supplierId).name, + "42€", orders); + + model.addAttribute("SupplierDetail", total); + + return "intern/suppliers/id"; + } + public class UImodelSuppliers { long id; String name; @@ -59,4 +78,120 @@ public class SupplierIndexController { } + public class UImodelSupplierDetail { + + String name; + String balance; + UImodelSupplierDetailOrders orders; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBalance() { + return balance; + } + + public void setBalance(String balance) { + this.balance = balance; + } + + public UImodelSupplierDetailOrders getOrders() { + return orders; + } + + public void setOrders(UImodelSupplierDetailOrders orders) { + this.orders = orders; + } + + public UImodelSupplierDetail(String name, String balance, UImodelSupplierDetailOrders orders) { + this.name = name; + this.balance = balance; + this.orders = orders; + } + + } + + public class UImodelSupplierDetailOrders { + long id; + String dateOrder; + String articleName; + String priceNetto; + String quantity; + String price_total; + String dateArrival; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getDateOrder() { + return dateOrder; + } + + public void setDateOrder(String dateOrder) { + this.dateOrder = dateOrder; + } + + public String getArticleName() { + return articleName; + } + + public void setArticleName(String articleName) { + this.articleName = articleName; + } + + public String getPriceNetto() { + return priceNetto; + } + + public void setPriceNetto(String priceNetto) { + this.priceNetto = priceNetto; + } + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String quantity) { + this.quantity = quantity; + } + + public String getPrice_total() { + return price_total; + } + + public void setPrice_total(String price_total) { + this.price_total = price_total; + } + + public String getDateArrival() { + return dateArrival; + } + + public void setDateArrival(String dateArrival) { + this.dateArrival = dateArrival; + } + + public UImodelSupplierDetailOrders(long id, String dateOrder, String articleName, String priceNetto, + String quantity, String price_total, String dateArrival) { + this.id = id; + this.dateOrder = dateOrder; + this.articleName = articleName; + this.priceNetto = priceNetto; + this.quantity = quantity; + this.price_total = price_total; + this.dateArrival = dateArrival; + } + + } + } diff --git a/prototype/src/main/java/org/hso/ecommerce/repos/supplier/SupplierRepository.java b/prototype/src/main/java/org/hso/ecommerce/repos/supplier/SupplierRepository.java index f1023df..4437125 100644 --- a/prototype/src/main/java/org/hso/ecommerce/repos/supplier/SupplierRepository.java +++ b/prototype/src/main/java/org/hso/ecommerce/repos/supplier/SupplierRepository.java @@ -5,6 +5,7 @@ import java.util.List; import org.hso.ecommerce.entities.supplier.Supplier; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @Repository @@ -13,6 +14,7 @@ public interface SupplierRepository extends JpaRepository { @Query("SELECT a FROM Supplier a") List findAll(); + @Query("SELECT a FROM Supplier a WHERE a.id = :supplierId") + Supplier findSupplierById(@Param("supplierId") long supplierId); - } diff --git a/prototype/src/main/resources/templates/intern/suppliers/id.html b/prototype/src/main/resources/templates/intern/suppliers/id.html index f4f6788..308d009 100644 --- a/prototype/src/main/resources/templates/intern/suppliers/id.html +++ b/prototype/src/main/resources/templates/intern/suppliers/id.html @@ -15,8 +15,7 @@
-

Lierfant Cheap AG

- +

Lieferant