Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryDto.java (revision 411c954dc60fcc85e21493d2147a40ab238b0823) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryDto.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -15,6 +15,8 @@ private Integer delStartKm; private Integer delEndKm; - private LocalTime delStartTime; - private LocalTime delEndTime; + + private String delStartTime; + private String delEndTime; + private Short dStatusId; private String delStatus; @@ -23,3 +25,12 @@ private String driverName; private String driverImg; + + + public LocalTime getParsedDelStartTime() { + return delStartTime != null ? LocalTime.parse(delStartTime) : null; + } + + public LocalTime getParsedDelEndTime() { + return delEndTime != null ? LocalTime.parse(delEndTime) : null; + } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryEndDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryEndDto.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryEndDto.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -0,0 +1,13 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DeliveryEndDto { + private Long id; + private Integer delEndKm; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryFullDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryFullDto.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryFullDto.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -0,0 +1,33 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalTime; +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DeliveryFullDto { + private Long delId; + private Date delDateCreated; + private Date delDate; + private Integer delStartKm; + private Integer delEndKm; + + private String delStartTime; + private String delEndTime; + + private Short delStatusId; + private Integer veh_id; + + public LocalTime getParsedDelStartTime() { + return delStartTime != null ? LocalTime.parse(delStartTime) : null; + } + + public LocalTime getParsedDelEndTime() { + return delEndTime != null ? LocalTime.parse(delEndTime) : null; + } +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryStartDto.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryStartDto.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/model/dto/DeliveryStartDto.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -0,0 +1,13 @@ +package mk.ukim.finki.db.distributorapp.model.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DeliveryStartDto { + private Long id; + private Integer delStartKm; +} Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java (revision 411c954dc60fcc85e21493d2147a40ab238b0823) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DeliveryRepository.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -3,4 +3,5 @@ import lombok.NonNull; import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto; +import mk.ukim.finki.db.distributorapp.model.dto.DeliveryFullDto; import mk.ukim.finki.db.distributorapp.model.dto.DeliverySimpleDto; import mk.ukim.finki.db.distributorapp.model.entities.Delivery; @@ -112,6 +113,6 @@ del.del_start_km as delStartKm, del.del_end_km as delEndKm, - del.del_start_time as delStartTime, - del.del_end_time as delEndTime, + to_char(d.del_start_time, 'HH24:MI:22') as delStartTime, + to_char(d.del_end_time, 'HH24:MI:SS') as delEndTime, del.d_status_id as dStatusId, ds.d_status_name as delStatus, @@ -140,6 +141,6 @@ d.del_start_km as delStartKm, d.del_end_km as delEndKm, - d.del_start_time as delStartTime, - d.del_end_time as delEndTime, + to_char(d.del_start_time, 'HH24:MI:22') as delStartTime, + to_char(d.del_end_time, 'HH24:MI:SS') as delEndTime, d.d_status_id as dStatusId, ds.d_status_name as delStatus, @@ -180,3 +181,21 @@ ) List getDeliveriesByVehicle(Integer vehicleId); + + @Query( + nativeQuery = true, + value = """ + select d.del_id as delId, + d.del_date_created as delDateCreated, + d.del_date as delDate, + d.del_start_km as delStartKm, + d.del_end_km as delEndKm, + to_char(d.del_start_time, 'HH24:MI:22') as delStartTime, + to_char(d.del_end_time, 'HH24:MI:SS') as delEndTime, + d.d_status_id as delStatusId, + d.veh_id as veh_id + from delivery d + where d.del_id = ?1 + """ + ) + DeliveryFullDto findDeliveryDtoById(@Param("id") Long id); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java (revision 411c954dc60fcc85e21493d2147a40ab238b0823) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/repository/DriverRepository.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -2,5 +2,5 @@ import lombok.NonNull; -import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto; +import mk.ukim.finki.db.distributorapp.model.dto.DeliverySimpleDto; import mk.ukim.finki.db.distributorapp.model.entities.Driver; import org.springframework.data.jpa.repository.JpaRepository; @@ -71,53 +71,56 @@ nativeQuery = true, value = """ - select de.del_id as id, - de.del_date_created as dateCreated, - de.del_date as delDate, - de.del_start_km as delStartKm, - de.del_end_km as delEndKm, - de.del_start_time as delStartTime, - de.del_end_time as delEndTime, - de.d_status_id as delStatusId, - ds.d_status_name as delStatus, - v.veh_id as vehId, - d.user_id as driverId, + select del.del_id as deliveryId, u.user_name as driverName, - u.user_image as driverImg - from driver d + del.del_date as deliveryDate, + del.del_date_created as deliveryCreatedDate, + del.d_status_id as deliveryStatus, + ds.d_status_name as deliveryStatusName + from delivery del + join delivery_status ds on del.d_status_id = ds.d_status_id + join vehicle v on del.veh_id = v.veh_id + join driver d on v.veh_id = d.veh_id join users u on u.user_id = d.user_id - join vehicle v on d.veh_id = v.veh_id - join delivery de on v.veh_id = de.veh_id - join delivery_status ds on de.d_status_id = ds.d_status_id - where d.user_id = ?1 and de.d_status_id = 1 - order by de.del_date desc + where d.user_id = ?1 and del.d_status_id = 1 """ ) - List activeAssignedDeliveries(@NonNull Long id); + List activeAssignedDeliveries(@NonNull Long id); @Query( nativeQuery = true, value = """ - select de.del_id as id, - de.del_date_created as dateCreated, - de.del_date as delDate, - de.del_start_km as delStartKm, - de.del_end_km as delEndKm, - de.del_start_time as delStartTime, - de.del_end_time as delEndTime, - de.d_status_id as delStatusId, - ds.d_status_name as delStatus, - v.veh_id as vehId, - d.user_id as driverId, + select del.del_id as deliveryId, u.user_name as driverName, - u.user_image as driverImg - from driver d + del.del_date as deliveryDate, + del.del_date_created as deliveryCreatedDate, + del.d_status_id as deliveryStatus, + ds.d_status_name as deliveryStatusName + from delivery del + join delivery_status ds on del.d_status_id = ds.d_status_id + join vehicle v on del.veh_id = v.veh_id + join driver d on v.veh_id = d.veh_id join users u on u.user_id = d.user_id - join vehicle v on d.veh_id = v.veh_id - join delivery de on v.veh_id = de.veh_id - join delivery_status ds on de.d_status_id = ds.d_status_id - where d.user_id = ?1 and de.d_status_id not between 1 and 3 - order by de.del_date desc + where d.user_id = ?1 and del.d_status_id not between 1 and 3 """ ) - List finishedAssignedDeliveries(@NonNull Long id); + List finishedAssignedDeliveries(@NonNull Long id); + + @Query( + nativeQuery = true, + value = """ + select del.del_id as deliveryId, + u.user_name as driverName, + del.del_date as deliveryDate, + del.del_date_created as deliveryCreatedDate, + del.d_status_id as deliveryStatus, + ds.d_status_name as deliveryStatusName + from delivery del + join delivery_status ds on del.d_status_id = ds.d_status_id + join vehicle v on del.veh_id = v.veh_id + join driver d on v.veh_id = d.veh_id + join users u on u.user_id = d.user_id + where d.user_id = ?1 and del.d_status_id = 3 + """ + ) + List getOngoingDeliveries(Long driverId); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java (revision 411c954dc60fcc85e21493d2147a40ab238b0823) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DeliveryService.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -3,4 +3,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.DeliveryCreateDto; import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto; +import mk.ukim.finki.db.distributorapp.model.dto.DeliveryFullDto; import mk.ukim.finki.db.distributorapp.model.dto.DeliverySimpleDto; import mk.ukim.finki.db.distributorapp.model.entities.Driver; @@ -16,9 +17,9 @@ List getAllDeliveriesByDriver(Driver driver); - DeliveryDto findDeliveryById(Long id); + DeliveryFullDto findDeliveryById(Long id); Integer create(DeliveryCreateDto deliveryDto); - Integer edit(DeliveryDto deliveryDto); + Integer edit(DeliveryFullDto deliveryDto); void deleteById(Long del_id); Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java (revision 411c954dc60fcc85e21493d2147a40ab238b0823) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/DriverService.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -1,5 +1,7 @@ package mk.ukim.finki.db.distributorapp.service; -import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto; +import mk.ukim.finki.db.distributorapp.model.dto.DeliveryEndDto; +import mk.ukim.finki.db.distributorapp.model.dto.DeliverySimpleDto; +import mk.ukim.finki.db.distributorapp.model.dto.DeliveryStartDto; import mk.ukim.finki.db.distributorapp.model.dto.DriverDto; import mk.ukim.finki.db.distributorapp.model.entities.Driver; @@ -23,6 +25,12 @@ void deleteById(Long id); - List getNewAssignedDeliveries(Long driverId); + List getNewAssignedDeliveries(Long driverId); - List getFinishedAssignedDeliveries(Long driverId); + List getFinishedAssignedDeliveries(Long driverId); + + void startDelivery(DeliveryStartDto delivery); + + List getOngoingDeliveries(Long driverId); + + void endDelivery(DeliveryEndDto delivery); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java (revision 411c954dc60fcc85e21493d2147a40ab238b0823) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DeliveryServiceImpl.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -4,4 +4,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.DeliveryCreateDto; import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto; +import mk.ukim.finki.db.distributorapp.model.dto.DeliveryFullDto; import mk.ukim.finki.db.distributorapp.model.dto.DeliverySimpleDto; import mk.ukim.finki.db.distributorapp.model.entities.Delivery; @@ -30,6 +31,6 @@ del.getDeliveryStartKm(), del.getDeliveryEndKm(), - del.getDeliveryStartTime(), - del.getDeliveryEndTime(), + null, + null, del.getDeliveryStatus().getDeliveryStatusId(), del.getDeliveryStatus().getDeliveryStatusName(), @@ -63,21 +64,6 @@ @Override - public DeliveryDto findDeliveryById(Long id) { - Delivery del = this.deliveryRepository.findById(id).get(); - return new DeliveryDto( - del.getDeliveryId(), - del.getDeliveryDateCreated(), - del.getDeliveryDate(), - del.getDeliveryStartKm(), - del.getDeliveryEndKm(), - del.getDeliveryStartTime(), - del.getDeliveryEndTime(), - del.getDeliveryStatus().getDeliveryStatusId(), - del.getDeliveryStatus().getDeliveryStatusName(), - del.getVehicle().getVehicleId(), - del.getVehicle().getDriver().getUserId(), - del.getVehicle().getDriver().getUsername(), - del.getVehicle().getDriver().getUserImage() - ); + public DeliveryFullDto findDeliveryById(Long id) { + return this.deliveryRepository.findDeliveryDtoById(id); } @@ -98,15 +84,15 @@ @Override - public Integer edit(DeliveryDto deliveryDto) { + public Integer edit(DeliveryFullDto deliveryDto) { return this.deliveryRepository.edit( - deliveryDto.getId(), - deliveryDto.getDateCreated(), + deliveryDto.getDelId(), + deliveryDto.getDelDateCreated(), deliveryDto.getDelDate(), deliveryDto.getDelStartKm(), deliveryDto.getDelEndKm(), - deliveryDto.getDelStartTime(), - deliveryDto.getDelEndTime(), - deliveryDto.getDStatusId(), - deliveryDto.getVehId() + deliveryDto.getParsedDelStartTime(), + deliveryDto.getParsedDelEndTime(), + deliveryDto.getDelStatusId(), + deliveryDto.getVeh_id() ); } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java (revision 411c954dc60fcc85e21493d2147a40ab238b0823) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/service/impl/DriverServiceImpl.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -2,11 +2,14 @@ import lombok.RequiredArgsConstructor; -import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto; -import mk.ukim.finki.db.distributorapp.model.dto.DriverDto; +import mk.ukim.finki.db.distributorapp.model.dto.*; import mk.ukim.finki.db.distributorapp.model.entities.Driver; import mk.ukim.finki.db.distributorapp.repository.DriverRepository; +import mk.ukim.finki.db.distributorapp.service.DeliveryService; import mk.ukim.finki.db.distributorapp.service.DriverService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; @@ -16,4 +19,5 @@ public class DriverServiceImpl implements DriverService { private final DriverRepository driverRepository; + private final DeliveryService deliveryService; private List buildDto(List drivers) { @@ -84,11 +88,40 @@ @Override - public List getNewAssignedDeliveries(Long driverId) { + public List getNewAssignedDeliveries(Long driverId) { return this.driverRepository.activeAssignedDeliveries(driverId); } @Override - public List getFinishedAssignedDeliveries(Long driverId) { + public List getFinishedAssignedDeliveries(Long driverId) { return this.driverRepository.finishedAssignedDeliveries(driverId); } + + @Override + public List getOngoingDeliveries(Long driverId) { + return this.driverRepository.getOngoingDeliveries(driverId); + } + + @Override + @Transactional + public void startDelivery(DeliveryStartDto delivery) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss"); + + DeliveryFullDto deliveryDto = this.deliveryService.findDeliveryById(delivery.getId()); + deliveryDto.setDelStartKm(delivery.getDelStartKm()); + deliveryDto.setDelStartTime(LocalTime.now().format(formatter)); + deliveryDto.setDelStatusId((short)3); + this.deliveryService.edit(deliveryDto); + } + + @Override + @Transactional + public void endDelivery(DeliveryEndDto delivery) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss"); + + DeliveryFullDto deliveryDto = this.deliveryService.findDeliveryById(delivery.getId()); + deliveryDto.setDelEndKm(delivery.getDelEndKm()); + deliveryDto.setDelEndTime(LocalTime.now().format(formatter)); + deliveryDto.setDelStatusId((short)4); + this.deliveryService.edit(deliveryDto); + } } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java (revision 411c954dc60fcc85e21493d2147a40ab238b0823) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/DriverController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -2,4 +2,6 @@ import lombok.RequiredArgsConstructor; +import mk.ukim.finki.db.distributorapp.model.dto.DeliveryEndDto; +import mk.ukim.finki.db.distributorapp.model.dto.DeliveryStartDto; import mk.ukim.finki.db.distributorapp.model.dto.UserDto; import mk.ukim.finki.db.distributorapp.service.DriverService; @@ -10,4 +12,6 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,11 +23,4 @@ private final UsersService usersService; - @GetMapping("/all") - public String allDrivers(Model model) { -// List drivers = driverService.getAllDrivers(); -// model.addAttribute("drivers", drivers); - return "all-drivers"; - } - @GetMapping({"/dashboard","/"}) public String dashboard(Model model) { @@ -31,5 +28,9 @@ String userEmail = authentication.getName(); UserDto user = this.usersService.findUserDtoByEmail(userEmail); + model.addAttribute("user", user); + model.addAttribute("startDelivery", new DeliveryStartDto()); + model.addAttribute("endDelivery", new DeliveryEndDto()); + model.addAttribute("ongoingDeliveries", this.driverService.getOngoingDeliveries(user.getId())); model.addAttribute("newDeliveries", this.driverService.getNewAssignedDeliveries(user.getId())); model.addAttribute("finishedDeliveries", this.driverService.getFinishedAssignedDeliveries(user.getId())); @@ -37,4 +38,16 @@ } + @PostMapping("/start-delivery") + public String startDelivery(@ModelAttribute("startDelivery") DeliveryStartDto delivery) { + this.driverService.startDelivery(delivery); + return "redirect:/driver/dashboard"; + } + + @PostMapping("/end-delivery") + public String endDelivery(@ModelAttribute("endDelivery") DeliveryEndDto delivery) { + this.driverService.endDelivery(delivery); + return "redirect:/driver/dashboard"; + } + } Index: backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryController.java =================================================================== --- backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryController.java (revision 411c954dc60fcc85e21493d2147a40ab238b0823) +++ backend/src/main/java/mk/ukim/finki/db/distributorapp/web/rest/RestDeliveryController.java (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -3,4 +3,5 @@ import mk.ukim.finki.db.distributorapp.model.dto.DeliveryCreateDto; import mk.ukim.finki.db.distributorapp.model.dto.DeliveryDto; +import mk.ukim.finki.db.distributorapp.model.dto.DeliveryFullDto; import mk.ukim.finki.db.distributorapp.service.DeliveryService; import org.springframework.http.ResponseEntity; @@ -31,5 +32,5 @@ @PutMapping("/edit") - public ResponseEntity editDelivery(@RequestBody DeliveryDto DeliveryDto) { + public ResponseEntity editDelivery(@RequestBody DeliveryFullDto DeliveryDto) { Integer result = this.deliveryService.edit(DeliveryDto); return ResponseEntity.ok(result); Index: backend/src/main/resources/templates/fragments/navbar.html =================================================================== --- backend/src/main/resources/templates/fragments/navbar.html (revision 411c954dc60fcc85e21493d2147a40ab238b0823) +++ backend/src/main/resources/templates/fragments/navbar.html (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -29,5 +29,5 @@
  • - Create order + Create an order
    • @@ -36,5 +36,5 @@
  • - Create delivery + Create a delivery
    • @@ -43,5 +43,5 @@
  • - Deliveries + Start a delivery
    • Index: backend/src/main/resources/templates/home/driver.html =================================================================== --- backend/src/main/resources/templates/home/driver.html (revision 411c954dc60fcc85e21493d2147a40ab238b0823) +++ backend/src/main/resources/templates/home/driver.html (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -5,4 +5,10 @@ Driver Home + @@ -10,49 +16,151 @@

    +

    New Deliveries

    - - - - - - - - - - - - - - - -
    Delivery IDDriver NameDelivery Date
    +
    + + + + + + + + + + + + + + + + + +
    Delivery IDDriver NameDelivery DateAction
    1Driver Name2025-02-14 + + +
    +
    -

    Delivery History

    - - - - - - - - - - - - - - - -
    Delivery IDDriver NameDelivery Date
    +

    Ongoing Deliveries

    +
    + + + + + + + + + + + + + + + + + +
    Delivery IDDriver NameDelivery DateAction
    1Driver Name2025-02-14 + +
    +
    + + + + Index: backend/src/main/resources/templates/start-delivery-1.html =================================================================== --- backend/src/main/resources/templates/start-delivery-1.html (revision c37f619de47cc7d286b60052dffee79cc885c1a3) +++ backend/src/main/resources/templates/start-delivery-1.html (revision c37f619de47cc7d286b60052dffee79cc885c1a3) @@ -0,0 +1,10 @@ + + + + + Title + + + + +