Index: FullyStocked/src/main/java/com/bazi/fullystocked/Controller/WorkerController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Controller/WorkerController.java (revision 154b74c8ddba87062870cfc12c487f0ccfbc82bd) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Controller/WorkerController.java (revision e278ff894cd227f8877b2c3c6ab48a7cef81450c) @@ -1,15 +1,28 @@ package com.bazi.fullystocked.Controller; +import com.bazi.fullystocked.Models.SqlViews.ArticlesReport; +import com.bazi.fullystocked.Models.StoredArticles; +import com.bazi.fullystocked.Models.User; import com.bazi.fullystocked.Models.Workers; +import com.bazi.fullystocked.Services.StoredArticlesService; 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; import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Optional; @Controller @RequestMapping(value ="/worker") public class WorkerController { + private final StoredArticlesService storedArticlesService; + + public WorkerController(StoredArticlesService storedArticlesService) { + this.storedArticlesService = storedArticlesService; + } + @GetMapping public String getWorkerPage() @@ -18,3 +31,22 @@ return "homeWorker"; } + @GetMapping("/articles") + public String getArticles(HttpServletRequest request, Model model) + { + Workers u= (Workers) request.getSession().getAttribute("user"); + List articlesReport=storedArticlesService.findByLocation(u.getLocation().getLocationid()); + model.addAttribute("articles",articlesReport); + return "articles"; + } + @GetMapping("/articles/details/{id}") + public String getDetails(@PathVariable Integer id,Model model) + { + if(this.storedArticlesService.findById(id).isPresent()) + { + ArticlesReport articlesReport=this.storedArticlesService.findById(id).get(); + model.addAttribute("article",articlesReport); + return "detailsArticle"; + } + return "redirect:/articles?error=ArticleNotFound"; + } } Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesReport.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesReport.java (revision 154b74c8ddba87062870cfc12c487f0ccfbc82bd) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesReport.java (revision e278ff894cd227f8877b2c3c6ab48a7cef81450c) @@ -20,3 +20,35 @@ private String locationname; private Integer locationid; + + public Integer getSarticleid() { + return sarticleid; + } + + public Integer getArticleid() { + return articleid; + } + + public String getArticlename() { + return articlename; + } + + public String getDescription() { + return description; + } + + public String getImageurl() { + return imageurl; + } + + public int getQuantity() { + return quantity; + } + + public String getLocationname() { + return locationname; + } + + public Integer getLocationid() { + return locationid; + } } Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/StoredArticlesServiceImpl.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/StoredArticlesServiceImpl.java (revision 154b74c8ddba87062870cfc12c487f0ccfbc82bd) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/StoredArticlesServiceImpl.java (revision e278ff894cd227f8877b2c3c6ab48a7cef81450c) @@ -62,3 +62,7 @@ return articlesReportRepository.findAllByLocationid(locationId); } + public Optional findById(Integer id) + { + return articlesReportRepository.findById(id); + } } Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/StoredArticlesService.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Services/StoredArticlesService.java (revision 154b74c8ddba87062870cfc12c487f0ccfbc82bd) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/StoredArticlesService.java (revision e278ff894cd227f8877b2c3c6ab48a7cef81450c) @@ -12,3 +12,5 @@ Optional updateFromOrder(Integer oarticleid); List findByLocation(Integer locationId); + Optional findById(Integer id); + } Index: FullyStocked/src/main/resources/templates/articles.html =================================================================== --- FullyStocked/src/main/resources/templates/articles.html (revision e278ff894cd227f8877b2c3c6ab48a7cef81450c) +++ FullyStocked/src/main/resources/templates/articles.html (revision e278ff894cd227f8877b2c3c6ab48a7cef81450c) @@ -0,0 +1,102 @@ + + + + + + + Title + + + +
+

Артикли

+
+ + + + + + + + + + + + + + + + + + + + + +
+ Слика + + Име + + Количина + + +
+ + + + +
+ +
+ +
+ + + Index: FullyStocked/src/main/resources/templates/detailsArticle.html =================================================================== --- FullyStocked/src/main/resources/templates/detailsArticle.html (revision e278ff894cd227f8877b2c3c6ab48a7cef81450c) +++ FullyStocked/src/main/resources/templates/detailsArticle.html (revision e278ff894cd227f8877b2c3c6ab48a7cef81450c) @@ -0,0 +1,73 @@ + + + + + + + Details + + + +
+
+
+
+
+

+
+
+ +
+

Локација:

+

Количина:

+
+ +
+

+ « Назад + +

+
+
+ +
+ project-image +
+
+
+ + Index: FullyStocked/src/main/resources/templates/homeManager.html =================================================================== --- FullyStocked/src/main/resources/templates/homeManager.html (revision 154b74c8ddba87062870cfc12c487f0ccfbc82bd) +++ FullyStocked/src/main/resources/templates/homeManager.html (revision e278ff894cd227f8877b2c3c6ab48a7cef81450c) @@ -11,5 +11,5 @@