Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrderedArticlesReport.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrderedArticlesReport.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/OrderedArticlesReport.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
@@ -27,3 +27,4 @@
     private ArticleStatus articlestatus;
     private int orderid;
+    private int storedquantity;
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrdersReportRepository.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrdersReportRepository.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/OrdersReportRepository.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
@@ -1,5 +1,7 @@
 package com.bazi.fullystocked.Repositories;
 
+import com.bazi.fullystocked.Models.Enumerations.OrderStatus;
 import com.bazi.fullystocked.Models.SqlViews.OrdersReport;
+import org.hibernate.criterion.Order;
 import org.springframework.data.jpa.repository.JpaRepository;
 import java.util.*;
@@ -8,3 +10,4 @@
     List<OrdersReport> findAllBySupplieruserid(Integer id);
     List<OrdersReport> findAllByManageruserid(Integer id);
+    List<OrdersReport> findAllByStatus(OrderStatus status);
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/OrdersServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/OrdersServiceImpl.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/OrdersServiceImpl.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
@@ -192,3 +192,8 @@
     }
 
+    @Override
+    public List<OrdersReport> findByStatus(OrderStatus status) {
+        return ordersReportRepository.findAllByStatus(status);
+    }
+
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/OrdersService.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/OrdersService.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/OrdersService.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
@@ -23,4 +23,5 @@
     Optional<OrdersReport> findByIdReport(Integer orderId);
     Optional<Orders> updateStatus(Integer orderId, OrderStatus status);
+    List<OrdersReport> findByStatus(OrderStatus status);
 
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/OrderController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/OrderController.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/OrderController.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
@@ -291,9 +291,21 @@
         return "redirect:/orders/manager/details/"+orderId;
     }
+    @GetMapping("/worker/list")
+    public String listOrdersWorker(Model model)
+    {
+        model.addAttribute("orders", ordersService.findByStatus(OrderStatus.IN_PROGRESS));
+        return "workerOrders";
+    }
     @PostMapping("/worker/accept")
     public String acceptOrder(@RequestParam Integer orderId)
     {
-        ordersService.updateStatus(orderId, OrderStatus.DELIVERED);
-        return "redirect:/worker";
+        try {
+            ordersService.updateStatus(orderId, OrderStatus.DELIVERED);
+        }
+        catch (Exception e)
+        {
+            return "redirect:/orders/worker/list"+e.getMessage();
+        }
+        return "redirect:/orders/worker/list";
     }
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/WorkerController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/WorkerController.java	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/WorkerController.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
@@ -1,13 +1,13 @@
 package com.bazi.fullystocked.Web.Controller;
 
+import com.bazi.fullystocked.Models.Enumerations.ArticleStatus;
 import com.bazi.fullystocked.Models.SqlViews.ArticlesReport;
 import com.bazi.fullystocked.Models.Workers;
 import com.bazi.fullystocked.Services.ArticlesService;
+import com.bazi.fullystocked.Services.OrderedArticlesService;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -19,8 +19,10 @@
    private final StoredArticlesService storedArticlesService;
    private final ArticlesService articlesService;
+   private final OrderedArticlesService orderedArticlesService;
 
-    public WorkerController(StoredArticlesService storedArticlesService, ArticlesService articlesService) {
+    public WorkerController(StoredArticlesService storedArticlesService, ArticlesService articlesService, OrderedArticlesService orderedArticlesService) {
         this.storedArticlesService = storedArticlesService;
         this.articlesService = articlesService;
+        this.orderedArticlesService = orderedArticlesService;
     }
 
@@ -51,3 +53,34 @@
         return "redirect:/worker/articles?error=ArticleNotFound";
     }
+    @GetMapping("/deliveredArticles")
+    public String listDeliveredArticles(Model model, HttpServletRequest request)
+    {
+        Workers u= (Workers) request.getSession().getAttribute("user");
+        model.addAttribute("articles", orderedArticlesService.findByStatusAtLocation(ArticleStatus.DELIVERED, u.getLocation().getLocationid()));
+        return "deliveredArticles";
+    }
+
+    @PostMapping("/deliveredArticles/process")
+    public String processOrderedArticle(@RequestParam Integer articleId, HttpServletRequest request)
+    {
+        try
+        {
+            Workers u= (Workers) request.getSession().getAttribute("user");
+            if(storedArticlesService.findById(articleId).isEmpty())
+            {
+                return "redirect:/worker/deliveredArticles";
+            }
+            if(!storedArticlesService.findById(articleId).get().getLocationid().equals(u.getLocation().getLocationid()))
+            {
+                return "redirect:/login";
+            }
+            storedArticlesService.updateFromOrder(articleId);
+            return "redirect:/worker/deliveredArticles";
+        }
+        catch (Exception e)
+        {
+            return "redirect:/worker/deliveredArticles?error="+e.getMessage();
+        }
+    }
+
 }
Index: FullyStocked/src/main/resources/templates/deliveredArticles.html
===================================================================
--- FullyStocked/src/main/resources/templates/deliveredArticles.html	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
+++ FullyStocked/src/main/resources/templates/deliveredArticles.html	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <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">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+            <ul class="navbar-nav m-auto">
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Преглед на магацинот</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Постави прашање</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Погледни одговори</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Креирај фактура</a>
+                </li>
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+
+                <li class="nav-item">
+                    <a class="btn btn-light btn-sm ml-3" href="/logout">
+                        <i class="fa fa-shopping-cart"></i> Logout
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+<div class="d-flex justify-content-center">
+    <h2 class="m-2">Артикли</h2>
+</div>
+<table class="table">
+    <thead>
+    <tr>
+        <th>
+            Слика
+        </th>
+        <th>
+            Име
+        </th>
+        <th>
+            Доставена количина
+        </th>
+        <th>
+            Достапна количина
+        </th>
+        <th>
+            Максимална дозволена количина
+        </th>
+
+        <th>
+
+        </th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr th:each="article : ${articles}">
+
+        <td>
+            <img style="width:300px; max-height:200px " th:src="${article.getImageurl()}">
+        </td>
+        <td th:text="${article.getArticlename()}" class="link">
+        </td>
+        <td th:text="${article.getQuantity()}" class="link1">
+        </td>
+        <td th:text="${article.getStoredquantity()}" class="link1">
+        </td>
+        <td th:text="${article.getMaxquantityperlocation()}" class="link1">
+        </td>
+        <td>
+            <form action="/worker/deliveredArticles/process" th:method="POST">
+                <input type="hidden" name="articleId" th:value="${article.getOarticleid()}">
+                <button class="btn btn-primary" >Процесирај</button>
+            </form>
+
+        </td>
+
+    </tr>
+    </tbody>
+
+</table>
+<style>
+    .link {
+        font-size: 20px;
+    }
+
+    .link1 {
+        font-size: 18px;
+    }
+
+    th {
+        font-size: 16px;
+    }
+
+</style>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/supplierOrders.html
===================================================================
--- FullyStocked/src/main/resources/templates/supplierOrders.html	(revision 7e105998a09235466be92b2b252aab8ea85b4e68)
+++ FullyStocked/src/main/resources/templates/supplierOrders.html	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
@@ -49,5 +49,8 @@
         </th>
         <th>
-            Добавувач
+            Забелешка на менаџер
+        </th>
+        <th>
+            Забелешка на добавувач
         </th>
         <th>
@@ -56,7 +59,4 @@
         <th>
             Приоритет
-        </th>
-        <th>
-            Забелешка
         </th>
         <th>
Index: FullyStocked/src/main/resources/templates/workerOrders.html
===================================================================
--- FullyStocked/src/main/resources/templates/workerOrders.html	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
+++ FullyStocked/src/main/resources/templates/workerOrders.html	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
@@ -0,0 +1,109 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:sec="http://www.w3.org/1999/xhtml">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <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">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+
+        <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
+            <ul class="navbar-nav m-auto">
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Преглед на магацинот</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Постави прашање</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Погледни одговори</a>
+                </li>
+                <li class="nav-item m-auto">
+                    <a class="nav-link active" href="#">Креирај фактура</a>
+                </li>
+            </ul>
+
+            <ul class="nav navbar-nav navbar-right">
+
+                <li class="nav-item">
+                    <a class="btn btn-light btn-sm ml-3" href="/logout">
+                        <i class="fa fa-shopping-cart"></i> Logout
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+<div class="d-flex justify-content-center">
+    <h2 class="m-2">Нарачки во тек</h2>
+</div>
+<table class="table">
+    <thead>
+    <tr>
+        <th>
+
+        </th>
+        <th>
+            Добавувач
+        </th>
+        <th>
+            Статус
+        </th>
+        <th>
+            Приоритет
+        </th>
+        <th>
+            Забелешка
+        </th>
+        <th>
+            Датум креирана
+        </th>
+        <th>
+
+        </th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr th:each="order : ${orders}">
+        <td></td>
+        <td th:text="${order.getSupplierinfo()}" class="link"></td>
+        <td th:text="${order.getStatus()}" class="link"></td>
+        <td th:text="${order.getPriority()}" class="link"></td>
+        <td th:text="${order.getManagerremark()}" class="link"></td>
+        <td th:text="${order.getDatecreated()}" class="link"></td>
+        <td>
+            <form action="/orders/worker/accept" th:method="POST">
+                <input type="hidden" name="orderId" th:value="${order.getOrderid()}">
+                <button class="btn btn-primary" >Означи како доставена</button>
+            </form>
+        </td>
+    </tr>
+
+
+    </tbody>
+</table>
+
+<style>
+    .link {
+        font-size: 20px;
+    }
+
+    .link1 {
+        font-size: 18px;
+    }
+
+    th {
+        font-size: 16px;
+    }
+
+</style>
+</body>
+</html>