Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Suppliers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Suppliers.java (revision 5168b2e469c9745d1c57d8d660ec08cca8f151e9) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Suppliers.java (revision aad0fb36711348ad05926a8e58d3c2feee9910a7) @@ -35,5 +35,5 @@ @NotEmpty(message = "Supplier must have street city") private String city; - @ManyToMany + @ManyToMany(fetch = FetchType.EAGER) @JoinTable(name = "supplier_supplies_category", joinColumns = @JoinColumn(name = "userid"), Index: FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/LoginController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/LoginController.java (revision 5168b2e469c9745d1c57d8d660ec08cca8f151e9) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/LoginController.java (revision aad0fb36711348ad05926a8e58d3c2feee9910a7) @@ -2,4 +2,5 @@ import com.bazi.fullystocked.Models.Exceptions.InvalidUserCredentialsException; +import com.bazi.fullystocked.Models.Exceptions.UserNotFoundException; import com.bazi.fullystocked.Models.Managers; import com.bazi.fullystocked.Models.Suppliers; @@ -60,9 +61,9 @@ return "redirect:/home"; } - catch (Exception exception) { + catch (InvalidUserCredentialsException exception) { model.addAttribute("hasError", true); model.addAttribute("error", exception.getMessage()); - return "login"; + return "redirect:/login"; } } Index: FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/SupplierController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/SupplierController.java (revision 5168b2e469c9745d1c57d8d660ec08cca8f151e9) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Web/Controller/SupplierController.java (revision aad0fb36711348ad05926a8e58d3c2feee9910a7) @@ -1,7 +1,13 @@ package com.bazi.fullystocked.Web.Controller; +import com.bazi.fullystocked.Models.Categories; +import com.bazi.fullystocked.Models.Suppliers; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; @Controller @@ -14,3 +20,11 @@ return "homeSupplier"; } + @GetMapping("/categories") + public String getSupplierCategories(HttpServletRequest request, Model m) + { + Suppliers s= (Suppliers) request.getSession().getAttribute("user"); + List categoriesList=s.getCategoryList(); + m.addAttribute("categoires",categoriesList); + return "supplierCategories"; + } } Index: FullyStocked/src/main/resources/templates/AskAQuestionSingle.html =================================================================== --- FullyStocked/src/main/resources/templates/AskAQuestionSingle.html (revision 5168b2e469c9745d1c57d8d660ec08cca8f151e9) +++ FullyStocked/src/main/resources/templates/AskAQuestionSingle.html (revision aad0fb36711348ad05926a8e58d3c2feee9910a7) @@ -10,5 +10,5 @@ + +
+

Категории што ги добавува добавувачот

+
+
+ +
+ + Index: FullyStocked/src/main/resources/templates/supplierOrders.html =================================================================== --- FullyStocked/src/main/resources/templates/supplierOrders.html (revision 5168b2e469c9745d1c57d8d660ec08cca8f151e9) +++ FullyStocked/src/main/resources/templates/supplierOrders.html (revision aad0fb36711348ad05926a8e58d3c2feee9910a7) @@ -11,5 +11,5 @@