Changeset e272096 for src/main/java/mk/ukim/finki/busngo/web/VozenjeController.java

Timestamp:

02/18/24 22:01:54 (9 months ago)

Author:

ppaunovski <paunovskipavel@…>

Branches:

master

Children:

4251327

Parents:

bde8b13

Message:

All 3 main use cases implemented.

1. Starting a commute
2. Writing a ticket
3. Starting an instance of a Bus Line

File:

• src/main/java/mk/ukim/finki/busngo/web/VozenjeController.java (modified) (2 diffs)

src/main/java/mk/ukim/finki/busngo/web/VozenjeController.java

@@ -4 +4 @@
 import mk.ukim.finki.busngo.model.entities.Patnik;
 import mk.ukim.finki.busngo.model.entities.Vozenje;
+import mk.ukim.finki.busngo.model.enums.VOZENJE_STATUS;
 import mk.ukim.finki.busngo.model.exceptions.InvalidPatnikIdException;
 import mk.ukim.finki.busngo.model.exceptions.InvalidPostojkaNaLinijaIdException;
@@ -29 +30 @@
     @GetMapping()
     public String getVozenjePage(Model model,
-                                 Authentication authentication){
+                                 Authentication authentication,
+                                 @RequestParam(required = false) VOZENJE_STATUS status){
         model.addAttribute("bodyContent", "listVozenja");
         Patnik patnik = null;
         try{
-            model.addAttribute("vozenja", vozenjeService.findVozenjaByPatnik(authentication.getName()));
+            if(status != null)
+                model.addAttribute("vozenja", vozenjeService.findVozenjaByPatnikAndStatus(authentication.getName(), status));
+            else
+                model.addAttribute("vozenja", vozenjeService.findVozenjaByPatnikAndStatus(authentication.getName(), VOZENJE_STATUS.ACTIVE));
+            model.addAttribute("vozStatus", VOZENJE_STATUS.values());
         }
         catch (InvalidPatnikIdException e){