Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Answers.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Answers.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Answers.java	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -8,4 +8,5 @@
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -22,8 +23,10 @@
     private String answertext;
 
-    public Answers(Questions question, String answertext) {
+    public Answers(Questions question, Integer answerCount, String answertext) {
         this.datecreated = LocalDateTime.now();
         this.answertext = answertext;
-        answerId.setQuestion(question);
+        this.answerId=new AnswerId();
+        this.answerId.setAnswerid(answerCount);
+        this.answerId.setQuestion(question);
     }
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/ArticleStatus.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/ArticleStatus.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/ArticleStatus.java	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -2,4 +2,15 @@
 
 public enum ArticleStatus {
-    ORDERED, DELIVERED, PROCESSED
+    ORDERED("Ordered"), DELIVERED("Delivered"), PROCESSED("Processed");
+    private String name;
+
+    ArticleStatus(String s) {
+        this.name=s;
+    }
+    public String getName() {
+        return this.name;
+    }
+    public String toString() {
+        return name;
+    }
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderPriority.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderPriority.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderPriority.java	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -2,4 +2,15 @@
 
 public enum OrderPriority {
-    LOW, MEDIUM, HIGH;
+    LOW("Low"), MEDIUM("Medium"), HIGH("High");
+    private String name;
+
+    OrderPriority(String s) {
+        this.name=s;
+    }
+    public String getName() {
+        return this.name;
+    }
+    public String toString() {
+        return name;
+    }
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleAlreadyInQuestionException.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleAlreadyInQuestionException.java	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/ArticleAlreadyInQuestionException.java	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -0,0 +1,7 @@
+package com.bazi.fullystocked.Models.Exceptions;
+
+public class ArticleAlreadyInQuestionException extends RuntimeException{
+    public ArticleAlreadyInQuestionException() {
+        super("Article is already added to the question");
+    }
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/AnswersRepository.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/AnswersRepository.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Repositories/AnswersRepository.java	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -11,3 +11,4 @@
 public interface AnswersRepository extends JpaRepository<Answers, AnswerId> {
     List<Answers> findAnswersByAnswerId_Question(Questions q);
+    int countAnswersByAnswerId_Question(Questions q);
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/AnswerServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/AnswerServiceImpl.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/AnswerServiceImpl.java	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -35,5 +35,5 @@
             throw new InvalidArgumentsException();
         }
-        return Optional.of(answersRepository.save(new Answers(question, text)));
+        return Optional.of(answersRepository.save(new Answers(question, answersRepository.countAnswersByAnswerId_Question(question) +1, text)));
     }
 }
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/QuestionServiceImpl.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/QuestionServiceImpl.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Services/Implementations/QuestionServiceImpl.java	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -1,4 +1,5 @@
 package com.bazi.fullystocked.Services.Implementations;
 
+import com.bazi.fullystocked.Models.Exceptions.ArticleAlreadyInQuestionException;
 import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException;
 import com.bazi.fullystocked.Models.Managers;
@@ -39,5 +40,5 @@
             throw new InvalidArgumentsException();
         }
-        return Optional.of(new Questions(text, worker, manager));
+        return Optional.of(questionsRepository.save(new Questions(text, worker, manager)));
     }
 
@@ -47,5 +48,10 @@
         Questions question=questionsRepository.findById(questionid).orElseThrow(InvalidArgumentsException::new);
         StoredArticles article=storedArticlesRepository.findById(sarticleid).orElseThrow(InvalidArgumentsException::new);
-        question.getStoredarticlesList().add(article);
+        if(article.getQuestionsList().stream().anyMatch(questions -> questions.getQuestionid().equals(questionid)))
+        {
+            throw new ArticleAlreadyInQuestionException();
+        }
+        article.getQuestionsList().add(question);
+        storedArticlesRepository.save(article);
         questionsRepository.save(question);
         return Optional.of(question);
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/QuestionsController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/QuestionsController.java	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/QuestionsController.java	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -0,0 +1,197 @@
+package com.bazi.fullystocked.Web.Controller;
+
+import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException;
+import com.bazi.fullystocked.Models.Managers;
+import com.bazi.fullystocked.Models.Questions;
+import com.bazi.fullystocked.Models.Workers;
+import com.bazi.fullystocked.Services.AnswerService;
+import com.bazi.fullystocked.Services.ManagersService;
+import com.bazi.fullystocked.Services.QuestionsService;
+import com.bazi.fullystocked.Services.StoredArticlesService;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Controller
+@RequestMapping("/questions")
+public class QuestionsController {
+    private final QuestionsService questionsService;
+    private final StoredArticlesService storedArticlesService;
+    private final ManagersService managersService;
+    private final AnswerService answerService;
+
+    public QuestionsController(QuestionsService questionsService, StoredArticlesService storedArticlesService, ManagersService managersService, AnswerService answerService) {
+        this.questionsService = questionsService;
+        this.storedArticlesService = storedArticlesService;
+        this.managersService = managersService;
+        this.answerService = answerService;
+    }
+
+    @GetMapping("/worker/create")
+    public String createQuestion(Model model)
+    {
+        model.addAttribute("managers", managersService.findAll());
+        return "askAQuestion";
+    }
+    @PostMapping("/worker/create")
+    public String createQuestion(@RequestParam String text,
+                                 @RequestParam Integer managerId,
+                                 HttpServletRequest request,
+                                 Model model)
+    {
+        try
+        {
+            Workers u= (Workers) request.getSession().getAttribute("user");
+            Questions q = questionsService.create(text, u.getUserid(), managerId).orElseThrow();
+            model.addAttribute("questionId", q.getQuestionid());
+            model.addAttribute("articles", storedArticlesService.findByLocation(u.getLocation().getLocationid()));
+            return "selectQuestionArticle";
+        }
+        catch (Exception e)
+        {
+            return "redirect:/questions/worker/create?error="+e.getMessage();
+        }
+    }
+    @GetMapping("/worker/backToList/{questionId}")
+    public String backToList(@PathVariable int questionId, HttpServletRequest request, Model model, @RequestParam(required = false) String error)
+    {
+        Workers u=null;
+        try
+        {
+            u=(Workers) request.getSession().getAttribute("user");
+        }
+        catch (Exception e)
+        {
+            return "redirect:/login";
+        }
+        if(questionsService.findById(questionId).isEmpty())
+        {
+            return "redirect:/questions/worker/create";
+        }
+        Questions q = questionsService.findById(questionId).get();
+        if(!q.getWorker().getUserid().equals(u.getUserid()))
+        {
+            return "redirect:/login";
+
+        }
+        model.addAttribute("questionId", q.getQuestionid());
+        model.addAttribute("articles", storedArticlesService.findByLocation(u.getLocation().getLocationid()));
+        return "selectQuestionArticle";
+    }
+    @PostMapping("/worker/addArticle")
+    public String addArticleToQuestion(@RequestParam Integer questionId,
+                                       @RequestParam Integer articleId,
+                                       HttpServletRequest request,
+                                       Model model)
+    {
+        try
+        {
+            Workers u= (Workers) request.getSession().getAttribute("user");
+            if(storedArticlesService.findById(articleId).isEmpty())
+            {
+                return "redirect:/worker/articles";
+            }
+            if(!storedArticlesService.findById(articleId).get().getLocationid().equals(u.getLocation().getLocationid()))
+            {
+                return "redirect:/login";
+            }
+            questionsService.addArticle(questionId, articleId);
+            model.addAttribute("questionId", questionId);
+            model.addAttribute("articles", storedArticlesService.findByLocation(u.getLocation().getLocationid()));
+            return "selectQuestionArticle";
+        }
+        catch (Exception e)
+        {
+            return "redirect:/questions/worker/backToList/"+questionId+"?"+e.getMessage();
+        }
+    }
+
+    @GetMapping("/manager/list")
+    public String listQuestionsPerManager(HttpServletRequest request, Model model)
+    {
+        Managers m = (Managers) request.getSession().getAttribute("user");
+        model.addAttribute("questions", questionsService.findAllByManager(m.getUserid()));
+        return "managerQuestions";
+    }
+    @GetMapping("/manager/details/{id}")
+    public String questionDetailsManager(@PathVariable Integer id, Model model, HttpServletRequest request)
+    {
+        try {
+            Managers m = (Managers) request.getSession().getAttribute("user");
+            Questions q = questionsService.findById(id).orElseThrow(InvalidArgumentsException::new);
+            if(!q.getManager().getUserid().equals(m.getUserid()))
+            {
+                throw new IllegalAccessException();
+            }
+            model.addAttribute("question", q);
+            model.addAttribute("answers", answerService.findAllAnswersToQuestion(id));
+            return "managerQuestionDetails";
+        }
+        catch (Exception e)
+        {
+            return "redirect:/questions/manager/list?error="+e.getMessage();
+        }
+    }
+    @GetMapping("/worker/list")
+    public String listQuestionsPerWorker(HttpServletRequest request, Model model)
+    {
+        Workers w= (Workers) request.getSession().getAttribute("user");
+        model.addAttribute("questions", questionsService.findAllByWorker(w.getUserid()));
+        return "workerQuestions";
+    }
+    @GetMapping("/worker/details/{id}")
+    public String questionDetailsWorker(@PathVariable Integer id, Model model, HttpServletRequest request)
+    {
+        try {
+            Workers w= (Workers) request.getSession().getAttribute("user");
+            Questions q = questionsService.findById(id).orElseThrow(InvalidArgumentsException::new);
+            if(!q.getWorker().getUserid().equals(w.getUserid()))
+            {
+                throw new IllegalAccessException();
+            }
+            model.addAttribute("question", q);
+            model.addAttribute("answers", answerService.findAllAnswersToQuestion(id));
+            return "workerQuestionDetails";
+        }
+        catch (Exception e)
+        {
+            return "redirect:/questions/manager/list?error="+e.getMessage();
+        }
+    }
+    @PostMapping("/manager/answer")
+    public String answerAQuestion(@RequestParam Integer questionId, HttpServletRequest request, Model model)
+    {
+        try {
+            Managers m = (Managers) request.getSession().getAttribute("user");
+            Questions q = questionsService.findById(questionId).orElseThrow(InvalidArgumentsException::new);
+            if(!q.getManager().getUserid().equals(m.getUserid()))
+            {
+                throw new IllegalAccessException();
+            }
+            model.addAttribute("questionId", questionId);
+            return "createAnswer";
+        }
+        catch (Exception e)
+        {
+            return "redirect:/questions/manager/details/"+questionId+"?error="+e.getMessage();
+        }
+    }
+    @PostMapping("manager/answer/save")
+    public String saveAnswer(@RequestParam Integer questionId, @RequestParam String text)
+    {
+        /*try
+        {
+            answerService.create(questionId, text);
+            return "redirect:/questions/manager/details/"+questionId;
+        }
+        catch (Exception e)
+        {
+            return "redirect:/questions/manager/details/"+questionId+"?error="+e.getMessage();
+        }*/
+        answerService.create(questionId, text);
+        return "redirect:/questions/manager/details/"+questionId;
+    }
+
+}
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/WorkerController.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/WorkerController.java	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/WorkerController.java	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -2,9 +2,8 @@
 
 import com.bazi.fullystocked.Models.Enumerations.ArticleStatus;
+import com.bazi.fullystocked.Models.Questions;
 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 com.bazi.fullystocked.Services.*;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -20,9 +19,13 @@
    private final ArticlesService articlesService;
    private final OrderedArticlesService orderedArticlesService;
+   private final QuestionsService questionsService;
+   private final ManagersService managersService;
 
-    public WorkerController(StoredArticlesService storedArticlesService, ArticlesService articlesService, OrderedArticlesService orderedArticlesService) {
+    public WorkerController(StoredArticlesService storedArticlesService, ArticlesService articlesService, OrderedArticlesService orderedArticlesService, QuestionsService questionsService, ManagersService managersService) {
         this.storedArticlesService = storedArticlesService;
         this.articlesService = articlesService;
         this.orderedArticlesService = orderedArticlesService;
+        this.questionsService = questionsService;
+        this.managersService = managersService;
     }
 
@@ -84,3 +87,34 @@
     }
 
+    @PostMapping("/articles/askAQuestion")
+    public String askAQuestionForASingleArticle(@RequestParam Integer articleId, Model model)
+    {
+        model.addAttribute("articleId", articleId);
+        model.addAttribute("managers", managersService.findAll());
+        return "AskAQuestionSingle";
+    }
+    @PostMapping("/articles/askAQuestion/send")
+    public String sendQuestionSingle(@RequestParam Integer articleId, @RequestParam Integer managerId, @RequestParam String text, HttpServletRequest request)
+    {
+        try
+        {
+            Workers u= (Workers) request.getSession().getAttribute("user");
+            if(storedArticlesService.findById(articleId).isEmpty())
+            {
+                return "redirect:/worker/articles";
+            }
+            if(!storedArticlesService.findById(articleId).get().getLocationid().equals(u.getLocation().getLocationid()))
+            {
+                return "redirect:/login";
+            }
+            Questions q=questionsService.create(text, u.getUserid(), managerId).orElseThrow();
+            questionsService.addArticle(q.getQuestionid(), articleId);
+            return "redirect:/worker";
+        }
+        catch (Exception e)
+        {
+            return "redirect:/worker?error="+e.getMessage();
+        }
+    }
+
 }
Index: FullyStocked/src/main/resources/templates/AskAQuestionSingle.html
===================================================================
--- FullyStocked/src/main/resources/templates/AskAQuestionSingle.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
+++ FullyStocked/src/main/resources/templates/AskAQuestionSingle.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -0,0 +1,79 @@
+<!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="text-center">
+    <h2 class="m-2">Креирај прашање до менаџаер</h2>
+</div>
+<form method="POST" action="/worker/articles/askAQuestion/send">
+    <div class="mt-4">
+        <div class="form-group row">
+            <div class="col-md-3"></div>
+            <label for="text" class="col-form-label col-md-2 font-weight-bold text-left">Текст</label>
+            <div class="col-md-4">
+                <textarea id="text" class="form-control" name="text"></textarea>
+            </div>
+        </div>
+        <div class="form-group row">
+            <div class="col-md-3"></div>
+            <label for="supplier" class="col-form-label col-md-2 font-weight-bold text-left">Менаџер</label>
+            <div class="col-md-4">
+                <select name="managerId" id="supplier" class="form-control">
+                    <option th:each="man : ${managers}" th:value="${man.getUserid()}">
+                        <th:block th:text="${man.getUsername()}"></th:block>
+                    </option>
+                </select>
+            </div>
+        </div>
+        <input type="hidden" name="articleId" th:value="${articleId}">
+        <div class="row mt-4">
+            <div class="col-md-3">
+            </div>
+            <div class="col-md-6">
+                <input type="submit" value="Креирај" class="btn btn-default w-100" />
+            </div>
+        </div>
+    </div>
+</form>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/askAQuestion.html
===================================================================
--- FullyStocked/src/main/resources/templates/askAQuestion.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
+++ FullyStocked/src/main/resources/templates/askAQuestion.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -0,0 +1,78 @@
+<!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="text-center">
+    <h2 class="m-2">Креирај прашање до менаџаер</h2>
+</div>
+<form method="POST" action="/questions/worker/create">
+    <div class="mt-4">
+        <div class="form-group row">
+            <div class="col-md-3"></div>
+            <label for="text" class="col-form-label col-md-2 font-weight-bold text-left">Текст</label>
+            <div class="col-md-4">
+                <textarea id="text" class="form-control" name="text"></textarea>
+            </div>
+        </div>
+        <div class="form-group row">
+            <div class="col-md-3"></div>
+            <label for="supplier" class="col-form-label col-md-2 font-weight-bold text-left">Менаџер</label>
+            <div class="col-md-4">
+                <select name="managerId" id="supplier" class="form-control">
+                    <option th:each="man : ${managers}" th:value="${man.getUserid()}">
+                        <th:block th:text="${man.getUsername()}"></th:block>
+                    </option>
+                </select>
+            </div>
+        </div>
+        <div class="row mt-4">
+            <div class="col-md-3">
+            </div>
+            <div class="col-md-6">
+                <input type="submit" value="Креирај" class="btn btn-default w-100" />
+            </div>
+        </div>
+    </div>
+</form>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/createAnswer.html
===================================================================
--- FullyStocked/src/main/resources/templates/createAnswer.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
+++ FullyStocked/src/main/resources/templates/createAnswer.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -0,0 +1,69 @@
+<!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="text-center">
+  <h2 class="m-2">Одговор на прашање</h2>
+</div>
+<form method="POST" action="/questions/manager/answer/save">
+  <div class="mt-4">
+    <div class="form-group row">
+      <div class="col-md-3"></div>
+      <label for="text" class="col-form-label col-md-2 font-weight-bold text-left">Текст</label>
+      <div class="col-md-4">
+        <textarea name="text" id="text" class="form-control"></textarea>
+      </div>
+    </div>
+    <input type="hidden" name="questionId" th:value="${questionId}">
+
+    <div class="row mt-4">
+      <div class="col-md-3">
+      </div>
+      <div class="col-md-6">
+        <input type="submit" value="Креирај" class="btn btn-default w-100" />
+      </div>
+    </div>
+  </div>
+</form>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/detailsArticle.html
===================================================================
--- FullyStocked/src/main/resources/templates/detailsArticle.html	(revision 16f38d47a7c32c54b99605fa122cf5de7fdf4d48)
+++ FullyStocked/src/main/resources/templates/detailsArticle.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -68,4 +68,14 @@
       <div class="project-info-box mt-0 mb-0">
         <p class="mb-0">
+        <form action="/worker/articles/askAQuestion" th:method="POST">
+          <input type="hidden" name="articleId" th:value="${article.getSarticleid()}">
+          <button class="btn btn-primary" >Креаирај прашање</button>
+        </form>
+
+        </p>
+      </div>
+
+      <div class="project-info-box mt-3 mb-0">
+        <p class="mb-0">
           <a class="btn btn-danger" href="/worker/articles" role="button">&laquo; Назад</a>
 
Index: FullyStocked/src/main/resources/templates/managerQuestionDetails.html
===================================================================
--- FullyStocked/src/main/resources/templates/managerQuestionDetails.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
+++ FullyStocked/src/main/resources/templates/managerQuestionDetails.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -0,0 +1,112 @@
+<!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>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <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">
+            <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>
+            </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>
+<div class="container mt-2">
+    <div class="row">
+        <div class="col-md-5">
+            <div class="project-info-box mt-0">
+                <h5>Испратено од</h5>
+                <p class="mb-0" th:text="${question.getWorker().getUsername()}"></p>
+                <hr>
+            </div><!-- / project-info-box -->
+            <div class="project-info-box mt-0">
+                <h5>Креирана на</h5>
+                <p class="mb-0" th:text="${question.getDatecreated()}"></p>
+                <hr>
+            </div>
+            <div class="project-info-box mt-0">
+                <h5>Артикли</h5>
+                <ul>
+                    <li th:each="a:${question.getStoredarticlesList()}">
+                        <th:block th:text="${a.getArticle().getArticlename()}"></th:block>
+                        <th:block th:text="${a.getLocations().getLocationname()}"></th:block>
+                        <br/>Достапност:
+                        <th:block th:text="${a.getQuantity()}"></th:block> парчиња
+                    </li>
+                </ul>
+                <hr>
+            </div>
+
+            <div class="project-info-box mt-0 mb-0">
+                <p class="mb-0">
+                <form th:action="@{'/questions/manager/answer'}" th:method="POST">
+                    <input type="hidden" name="questionId" th:value="${question.getQuestionid()}">
+                    <button class="btn btn-primary" >Одговори</button>
+                </form>
+
+                </p>
+            </div>
+            <div class="project-info-box mt-0 mb-0">
+                <p class="mb-0">
+                    <a class="btn btn-danger" href="/questions/manager/list" role="button">&laquo; Назад</a>
+
+                </p>
+            </div><!-- / project-info-box -->
+        </div><!-- / column -->
+
+        <div class="col-md-7 mt-3">
+            <div class="project-info-box mt-0">
+                <h5>Текст</h5>
+                <p class="mb-0" th:text="${question.getQuestiontext()}"></p>
+                <hr>
+            </div>
+
+        </div>
+    </div>
+    <div class="row mt-5">
+        <h3>Одговори</h3>
+        <div class="col-md-12">
+            <div class="project-info-box mt-0" th:each="a : ${answers}">
+                <h5>Креирано на: <th:block th:text="${a.getDatecreated()}"></th:block></h5>
+                <p class="mb-0" th:text="${a.getAnswertext()}">
+                </p>
+                <hr>
+            </div>
+        </div>
+    </div>
+</div>
+
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/managerQuestions.html
===================================================================
--- FullyStocked/src/main/resources/templates/managerQuestions.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
+++ FullyStocked/src/main/resources/templates/managerQuestions.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -0,0 +1,96 @@
+<!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>Worker</title>
+</head>
+
+<body>
+<nav class="navbar navbar-expand-md navbar-dark bg-dark">
+    <div class="container">
+        <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">
+            <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>
+            </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>
+    </tr>
+    </thead>
+    <tbody>
+    <tr th:each="q : ${questions}">
+        <td></td>
+        <td th:text="${q.getWorker().getUsername()}" class="link">
+        </td>
+        <td th:text="${q.getDatecreated()}" class="link">
+        </td>
+
+        <td>
+            <form th:action="@{'/questions/manager/details/{id}' (id=${q.getQuestionid()})} " th:method="GET">
+                <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/selectQuestionArticle.html
===================================================================
--- FullyStocked/src/main/resources/templates/selectQuestionArticle.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
+++ FullyStocked/src/main/resources/templates/selectQuestionArticle.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -0,0 +1,110 @@
+<!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>
+    </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>
+            <form  action="/questions/worker/addArticle" method="POST">
+                <input type="hidden" name="questionId" th:value="${questionId}">
+                <input type="hidden" name="articleId" th:value="${article.getSarticleid()}">
+                <input type="submit" class="btn btn-primary" value="Додади во прашање">
+            </form>
+
+        </td>
+
+    </tr>
+    </tbody>
+
+</table>
+<div class="row">
+    <div class="col-md-4"></div>
+    <div class="col-md-4">
+        <a href="/worker" class="btn btn-primary w-100">Испрати прашање</a>
+    </div>
+</div>
+<style>
+    .link {
+        font-size: 20px;
+    }
+
+    .link1 {
+        font-size: 18px;
+    }
+
+    th {
+        font-size: 16px;
+    }
+
+</style>
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/workerQuestionDetails.html
===================================================================
--- FullyStocked/src/main/resources/templates/workerQuestionDetails.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
+++ FullyStocked/src/main/resources/templates/workerQuestionDetails.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -0,0 +1,105 @@
+<!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>
+<div class="container mt-2">
+  <div class="row">
+    <div class="col-md-5">
+      <div class="project-info-box mt-0">
+        <h5>Испратено до</h5>
+        <p class="mb-0" th:text="${question.getManager().getUsername()}"></p>
+        <hr>
+      </div><!-- / project-info-box -->
+      <div class="project-info-box mt-0">
+        <h5>Креирана на</h5>
+        <p class="mb-0" th:text="${question.getDatecreated()}"></p>
+        <hr>
+      </div>
+      <div class="project-info-box mt-0">
+        <h5>Артикли</h5>
+        <ul>
+          <li th:each="a:${question.getStoredarticlesList()}">
+            <th:block th:text="${a.getArticle().getArticlename()}"></th:block>
+            <th:block th:text="${a.getLocations().getLocationname()}"></th:block>
+            <br/>Достапност:
+            <th:block th:text="${a.getQuantity()}"></th:block> парчиња
+          </li>
+        </ul>
+        <hr>
+      </div>
+
+      <div class="project-info-box mt-0 mb-0">
+        <p class="mb-0">
+          <a class="btn btn-danger" href="/questions/worker/list" role="button">&laquo; Назад</a>
+
+        </p>
+      </div><!-- / project-info-box -->
+    </div><!-- / column -->
+
+    <div class="col-md-7 mt-3">
+      <div class="project-info-box mt-0">
+        <h5>Текст</h5>
+        <p class="mb-0" th:text="${question.getQuestiontext()}"></p>
+        <hr>
+      </div>
+
+    </div>
+  </div>
+  <div class="row mt-5">
+    <h3>Одговори</h3>
+    <div class="col-md-12">
+      <div class="project-info-box mt-0" th:each="a : ${answers}">
+        <h5>Креирано на: <th:block th:text="${a.getDatecreated()}"></th:block></h5>
+        <p class="mb-0" th:text="${a.getAnswertext()}">
+        </p>
+        <hr>
+      </div>
+    </div>
+  </div>
+</div>
+
+</body>
+</html>
Index: FullyStocked/src/main/resources/templates/workerQuestions.html
===================================================================
--- FullyStocked/src/main/resources/templates/workerQuestions.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
+++ FullyStocked/src/main/resources/templates/workerQuestions.html	(revision 0afa35a618cb50fc243de2dcc3ea83b51c6f96a0)
@@ -0,0 +1,98 @@
+<!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>
+    </tr>
+    </thead>
+    <tbody>
+    <tr th:each="q : ${questions}">
+        <td></td>
+        <td th:text="${q.getManager().getUsername()}" class="link">
+        </td>
+        <td th:text="${q.getDatecreated()}" class="link">
+        </td>
+
+        <td>
+            <form th:action="@{'/questions/worker/details/{id}' (id=${q.getQuestionid()})} " th:method="GET">
+                <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>