diff --git a/.gitignore b/.gitignore index 3912d2e..c52eb76 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,5 @@ local.properties prototype/*.db prototype/images +prototype/data + 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 ed78d84..9d67055 100644 --- a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java +++ b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java @@ -89,12 +89,12 @@ public class RequestController { public String shopSearch() { return "shop/search"; } - + @GetMapping("/intern/") public String intern() { return "intern/index"; } - + @GetMapping("/intern/listedArticles/") public String internListedArticles() { return "intern/listedArticles/index"; @@ -156,11 +156,13 @@ public class RequestController { return "intern/supplierOrders/id"; } + /* @GetMapping("/intern/suppliersOffers") public String internSuppliersOffers() { return "intern/offeredArticles/index"; } + */ @GetMapping("/intern/accounting/") diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java index b69b073..8b5da0a 100644 --- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java +++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java @@ -1,36 +1,23 @@ package org.hso.ecommerce.controller.intern.suppliers; +import javax.servlet.http.HttpSession; + import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @Controller -//@RequestMapping("/intern/suppliersOffers") +@RequestMapping("/intern/") public class SupplierOfferController { - - - - - /* - @GetMapping("/") - public String internListedArticles(Model model) { - - System.out.println("\n hier \n"); - - - + @GetMapping("suppliersOffers") + public String internListedArticles(Model model, HttpSession session) { + + System.out.println("\nhier\n"); + return "intern/offeredArticles/index"; + } - - - - */ - - - - - - + }