localhorst
/
e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

add some comments

This commit is contained in:
Hannes Huber 2020-05-17 12:59:03 +02:00
parent d0785308d4
commit 0c66a713b4
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopArticleController.java
View File

@ -51,13 +51,13 @@ public class ShopArticleController {
} }
model.addAttribute("article", article); model.addAttribute("article", article);
if (warehouseBookingPositionSlotEntryRepository.getByArticle(id).get(0).newSumSlot > 0) { if (warehouseBookingPositionSlotEntryRepository.getByArticle(id).get(0).newSumSlot > 0) { //check if in Stock
model.addAttribute("inStock", true); model.addAttribute("inStock", true);
} else { } else {
model.addAttribute("inStock", false); model.addAttribute("inStock", false);
} }
List<Article> commercialArticles = GetRandomArticlesAction.getRandomArticles(3, articleRepository.getAdvertisedArticles()); List<Article> commercialArticles = GetRandomArticlesAction.getRandomArticles(3, articleRepository.getAdvertisedArticles()); //get 3 advertised Articles
model.addAttribute("commercialArticles", commercialArticles); model.addAttribute("commercialArticles", commercialArticles);
return "shop/articles/id"; return "shop/articles/id";

6
prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopIndexController.java
View File

@ -31,18 +31,18 @@ public class ShopIndexController {
@GetMapping("/shop/") @GetMapping("/shop/")
public String shop(Model model, HttpSession session) { public String shop(Model model, HttpSession session) {
List<Article> commercialArticles = GetRandomArticlesAction.getRandomArticles(8, articleRepository.getAdvertisedArticles()); List<Article> commercialArticles = GetRandomArticlesAction.getRandomArticles(8, articleRepository.getAdvertisedArticles()); //get random advertised Articles
model.addAttribute("commercialArticles", commercialArticles); model.addAttribute("commercialArticles", commercialArticles);
boolean isLoggedIn = false; boolean isLoggedIn = false;
boolean hasOrders = false; boolean hasOrders = false;
if (session != null && session.getAttribute("userId") != null) { if (session != null && session.getAttribute("userId") != null) { //check if logged in
long userId = (long) session.getAttribute("userId"); long userId = (long) session.getAttribute("userId");
isLoggedIn = true; isLoggedIn = true;
List<Article> suggestedArticles = articleRepository.getOrderedArticles(userId); List<Article> suggestedArticles = articleRepository.getOrderedArticles(userId);
suggestedArticles = suggestedArticles.size() > 3 ? suggestedArticles.subList(0, 4) : suggestedArticles; //only latest 4 articles suggestedArticles = suggestedArticles.size() > 3 ? suggestedArticles.subList(0, 4) : suggestedArticles; //only latest 4 ordered articles
if (suggestedArticles.size() > 0) { if (suggestedArticles.size() > 0) {
model.addAttribute("suggestedArticles", suggestedArticles); model.addAttribute("suggestedArticles", suggestedArticles);
hasOrders = true; hasOrders = true;

4
prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopSearchController.java
View File

@ -32,10 +32,10 @@ public class ShopSearchController {
model.addAttribute("categories", categoryRepository.getCategories()); //for sidebar model.addAttribute("categories", categoryRepository.getCategories()); //for sidebar
if (term != null) { //if search by Term if (term != null) { //if search by Term
List<Article> articles = articleRepository.getArticlesByTerm(term); List<Article> articles = articleRepository.getArticlesByTerm(term); //search by Term
model.addAttribute("articles", articles); model.addAttribute("articles", articles);
} else if (category != null) { //if search by Category } else if (category != null) { //if search by Category
List<Article> articles = articleRepository.getArticlesByCategory(category); List<Article> articles = articleRepository.getArticlesByCategory(category); //search by Category
model.addAttribute("articles", articles); model.addAttribute("articles", articles);
} else { } else {
request.setAttribute("error", "Es wurden keine Suchparameter angegeben."); request.setAttribute("error", "Es wurden keine Suchparameter angegeben.");