Changeset e278ff8

Timestamp:

01/06/23 19:28:09 (23 months ago)

Author:

Bojan <bojantrpeski123@…>

Branches:

main

Children:

497d129

Parents:

154b74c

Message:

Articles by location and details views added

Location:

FullyStocked/src/main

Files:

• java/com/bazi/fullystocked/Controller/WorkerController.java (modified) (2 diffs)
• java/com/bazi/fullystocked/Models/SqlViews/ArticlesReport.java (modified) (1 diff)
• java/com/bazi/fullystocked/Services/Implementations/StoredArticlesServiceImpl.java (modified) (1 diff)
• java/com/bazi/fullystocked/Services/StoredArticlesService.java (modified) (1 diff)
• resources/templates/articles.html (added)
• resources/templates/detailsArticle.html (added)
• resources/templates/homeManager.html (modified) (1 diff)
• resources/templates/homeSupplier.html (modified) (1 diff)
• resources/templates/homeWorker.html (modified) (2 diffs)

FullyStocked/src/main/java/com/bazi/fullystocked/Controller/WorkerController.java

@@ -1 +1 @@
 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 +31 @@
         return "homeWorker";
     }
+    @GetMapping("/articles")
+    public String getArticles(HttpServletRequest request, Model model)
+    {
+        Workers u= (Workers) request.getSession().getAttribute("user");
+        List<ArticlesReport> 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";
+    }
 }

FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesReport.java

@@ -20 +20 @@
     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;
+    }
 }

FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/StoredArticlesServiceImpl.java

@@ -62 +62 @@
         return articlesReportRepository.findAllByLocationid(locationId);
     }
+    public Optional<ArticlesReport> findById(Integer id)
+    {
+        return articlesReportRepository.findById(id);
+    }
 }

FullyStocked/src/main/java/com/bazi/fullystocked/Services/StoredArticlesService.java

@@ -12 +12 @@
     Optional<StoredArticles> updateFromOrder(Integer oarticleid);
     List<ArticlesReport> findByLocation(Integer locationId);
+    Optional<ArticlesReport> findById(Integer id);
+
 }

FullyStocked/src/main/resources/templates/homeManager.html

@@ -11 +11 @@
 <nav class="navbar navbar-expand-md navbar-dark bg-dark">
   <div class="container">
-    <a class="navbar-brand" href="/">FULLYSTOCKED</a>
+    <a class="navbar-brand" href="/homeManager">FULLYSTOCKED</a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
             aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

FullyStocked/src/main/resources/templates/homeSupplier.html

@@ -11 +11 @@
 <nav class="navbar navbar-expand-md navbar-dark bg-dark">
   <div class="container">
-    <a class="navbar-brand" href="/">FULLYSTOCKED</a>
+    <a class="navbar-brand" href="/homeSupplier">FULLYSTOCKED</a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
             aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">

FullyStocked/src/main/resources/templates/homeWorker.html

@@ -11 +11 @@
 <nav class="navbar navbar-expand-md navbar-dark bg-dark">
   <div class="container">
-    <a class="navbar-brand" href="/">FULLYSTOCKED</a>
+    <a class="navbar-brand" href="/homeWorker">FULLYSTOCKED</a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
             aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
@@ -20 +20 @@
       <ul class="navbar-nav m-auto">
         <li class="nav-item m-auto">
-          <a class="nav-link active" href="#">Преглед на магацинот</a>
+          <a class="nav-link active" href="/worker/articles">Преглед на магацинот</a>
         </li>
         <li class="nav-item m-auto">