Index: FullyStocked/src/main/java/com/bazi/fullystocked/Controller/LoginController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Controller/LoginController.java (revision f08836bfc120c210b081f1fa4d99e0fc6479e2ed) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Controller/LoginController.java (revision 5f69a7062433e94bd5900103cc54f7bc0450b71f) @@ -3,4 +3,5 @@ import com.bazi.fullystocked.Models.Exceptions.InvalidUserCredentialsException; import com.bazi.fullystocked.Models.Managers; +import com.bazi.fullystocked.Models.Suppliers; import com.bazi.fullystocked.Models.User; import com.bazi.fullystocked.Models.Workers; @@ -48,4 +49,13 @@ return "redirect:/homeManager"; } + else if(user instanceof Suppliers) + { + Suppliers s= (Suppliers) user; + request.getSession().setAttribute("user", s); + request.getSession().setAttribute("info",s.getSupplierinfo()); + request.getSession().setAttribute("number",s.getPhone()); + request.getSession().setAttribute("location",s.getStreet()+" бр."+ s.getStreetnumber()+", "+s.getCity()); + return "redirect:/homeSupplier"; + } return "redirect:/home"; } Index: FullyStocked/src/main/java/com/bazi/fullystocked/Controller/RegisterController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Controller/RegisterController.java (revision f08836bfc120c210b081f1fa4d99e0fc6479e2ed) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Controller/RegisterController.java (revision 5f69a7062433e94bd5900103cc54f7bc0450b71f) @@ -1,5 +1,7 @@ package com.bazi.fullystocked.Controller; +import com.bazi.fullystocked.Models.Exceptions.InvalidArgumentsException; import com.bazi.fullystocked.Models.Exceptions.UsernameAlreadyExistsException; +import com.bazi.fullystocked.Models.User; import com.bazi.fullystocked.Services.AuthService; import org.springframework.stereotype.Controller; @@ -9,4 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; + +import javax.servlet.http.HttpServletRequest; @Controller @@ -28,16 +32,45 @@ @RequestParam String username, @RequestParam String email - ,@RequestParam String password - ,@RequestParam String role) - { - if(role.equals("menadzer")) - { - authService.registerManager(ime,prezime,username,email,password); - } - else if(role.equals("magacioner")) - { - authService.registerWorker(ime,prezime,username,email,password); + , @RequestParam String password + , @RequestParam String role, HttpServletRequest request) { + try { + if (role.equals("menadzer")) { + authService.registerManager(ime, prezime, username, email, password); + } else if (role.equals("magacioner")) { + authService.registerWorker(ime, prezime, username, email, password); + } else if (role.equals("dobavuvac")) { + User u = new User(ime, prezime, username, email, password); + request.getSession().setAttribute("user", u); + return "redirect:/register/registerSupplier"; } return "redirect:/login"; + } + catch (UsernameAlreadyExistsException | InvalidArgumentsException exception) + { + return "redirect:/register?error="+exception.getMessage(); + } + } + @GetMapping("/registerSupplier") + public String getRegisterSupplier(@RequestParam(required = false) String error, Model model) + { + return "registerSupplier"; + } + @PostMapping("/registerSupplier") + public String registerSupplier(@RequestParam String sinfo, + @RequestParam String phone, + @RequestParam String street, + @RequestParam String broj, + @RequestParam String grad,HttpServletRequest request) + { + try { + User u = (User) request.getSession().getAttribute("user"); + authService.registerSupplier(u.getFirstname(), u.getLastname(), u.getUsername(), u.getEmail(), u.getUserpassword(), sinfo, phone, street, Integer.parseInt(broj), grad); + request.getSession().invalidate(); + return "redirect:/login"; + } + catch (UsernameAlreadyExistsException | InvalidArgumentsException exception) + { + return "redirect:/register?error="+exception.getMessage(); + } } } Index: FullyStocked/src/main/java/com/bazi/fullystocked/Controller/SupplierController.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Controller/SupplierController.java (revision 5f69a7062433e94bd5900103cc54f7bc0450b71f) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Controller/SupplierController.java (revision 5f69a7062433e94bd5900103cc54f7bc0450b71f) @@ -0,0 +1,16 @@ +package com.bazi.fullystocked.Controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping(value ="/supplier") +public class SupplierController { + @GetMapping + public String getSupplierPage() + { + + return "homeSupplier"; + } +} Index: FullyStocked/src/main/resources/templates/homeSupplier.html =================================================================== --- FullyStocked/src/main/resources/templates/homeSupplier.html (revision 5f69a7062433e94bd5900103cc54f7bc0450b71f) +++ FullyStocked/src/main/resources/templates/homeSupplier.html (revision 5f69a7062433e94bd5900103cc54f7bc0450b71f) @@ -0,0 +1,64 @@ + + + + + + + Worker + + + + + +
+

FullyStocked

+
+

Добредојдовте на FullyStocked

+

Информации за добавувач

+

Добавувач:

+

Телефон:

+

Адреса:

+
+ +
+
+

За апликацијата

+

+ This application will enable management, searching, review and assignment of tasks in an organization and will aim to facilitate all concerned and responsible employees in working with a large number of tasks... +

+
+
+

За развивачите

+

Learn more about the developer of the application

+
+
+ + Index: FullyStocked/src/main/resources/templates/register.html =================================================================== --- FullyStocked/src/main/resources/templates/register.html (revision f08836bfc120c210b081f1fa4d99e0fc6479e2ed) +++ FullyStocked/src/main/resources/templates/register.html (revision 5f69a7062433e94bd5900103cc54f7bc0450b71f) @@ -57,5 +57,5 @@
- @@ -63,5 +63,5 @@ - +
Index: FullyStocked/src/main/resources/templates/registerSupplier.html =================================================================== --- FullyStocked/src/main/resources/templates/registerSupplier.html (revision 5f69a7062433e94bd5900103cc54f7bc0450b71f) +++ FullyStocked/src/main/resources/templates/registerSupplier.html (revision 5f69a7062433e94bd5900103cc54f7bc0450b71f) @@ -0,0 +1,76 @@ + + + + + +
+
+
+
+
+
+
+
+ +

Регистрација на добавувач

+ +
+ +
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+
+ +
+ +
+ +
+
+ + Sample image + +
+
+
+
+
+
+
+
+