Fix Technician Job Status Update Screen UI and Formatting Issues

- Corrected inconsistent status label formatting: replaced "Inprogress" with "In Progress" in TechnicianMenu and MenuHelper.
- Updated headings in selectJobCardToUpdate to clearer phrasing:
  - "Select a job to mark as In Progress"
  - "Select a job to mark as Completed".
- Added spacing before and after the "No jobs available" message to improve readability and provide clear separation from headings.
- Replaced duplicated prompt "Select the Job Card to Update (Index):" with concise "Enter the job index to update:".
- Improved TechnicianMenu option display to show "In Progress" instead of "Inprogress".

Fixes #1808

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/services/ServiceManagementService.cpp

@@ -543,65 +543,50 @@ static void restoreInventory(ServiceBooking* booking)
 
 /*
 Function: processBookingCancellation
-Description: Handles cancellation or reassignment of a service booking based on user type.
+Description: Cancels jobs and updates the status of a given booking. Sends notifications to the
-             Cancels associated job cards, updates booking status, clears technician assignments,
+             specified user, resets technician assignment if needed, and restores inventory items.
-             restores inventory, and sends appropriate notifications.
+Parameter: ServiceBooking* booking - Pointer to the booking being cancelled
-Parameters:
+           util::ServiceJobStatus newServiceBookingStatus - New status to assign to the booking
-    ServiceBooking* booking - The booking to cancel or reset
+           const std::string& notificationTitle - Title of the booking cancellation notification
-    util::Map<std::string, JobCard*>& jobs - Collection of job cards to update
+           const std::string& notificationMessage - Message body of the booking cancellation notification
-    ServiceManagementService& currentService - Service layer for notifications
+           User* notifyUser - User to notify about the cancellation
-    util::UserType userType - Type of user initiating cancellation (CUSTOMER or TECHNICIAN)
+           util::ServiceJobStatus jobCardStatus - New status to assign to associated job cards
+           const std::string& jobNotificationTitle - Title of the job cancellation notification
+           const std::string& jobNotificationMessage - Message body of the job cancellation notification
+           util::Map<std::string, JobCard*>& jobs - Collection of job cards to update
+           ServiceManagementService& currentService - Reference to the service for sending notifications
 Return type: void
 */
 static void processBookingCancellation(ServiceBooking* booking,
-    util::Map<std::string, JobCard*>& jobs,
+    util::ServiceJobStatus newServiceBookingStatus,
-    ServiceManagementService& currentService,
+    const std::string& notificationTitle,
-    util::UserType userType)
+    const std::string& notificationMessage,
+    User* notifyUser,
+    util::ServiceJobStatus jobCardStatus,
+    const std::string& jobNotificationTitle,
+    const std::string& jobNotificationMessage,
+    util::Map<std::string, JobCard*>& jobs, ServiceManagementService& currentService)
 {
-    if (!booking)
+    if (!booking || !notifyUser)
     {
         return;
     }
     for (int jobIterator = 0; jobIterator < jobs.getSize(); ++jobIterator)
     {
         JobCard* jobCard = jobs.getValueAt(jobIterator);
-        if (!jobCard || jobCard->getBookingId() != booking->getId() || jobCard->getStatus() == util::ServiceJobStatus::CANCELLED)
+        if (jobCard && jobCard->getBookingId() == booking->getId())
         {
-            continue;
+            jobCard->setStatus(jobCardStatus);
-        }
+            currentService.sendNotification(notifyUser, jobNotificationTitle, jobNotificationMessage);
-        jobCard->setStatus(util::ServiceJobStatus::CANCELLED);
-        if (userType == util::UserType::CUSTOMER)
-        {
-            if (User* technician = booking->getAssignedTechnician())
-            {
-                const std::string jobTitle = "Job Cancelled";
-                const std::string jobMessage = "Your job card has been cancelled and the inventory has been restocked.";
-                currentService.sendNotification(technician, jobTitle, jobMessage);
-            }
         }
     }
-    if (userType == util::UserType::CUSTOMER)
+    booking->setStatus(newServiceBookingStatus);
+    currentService.sendNotification(notifyUser, notificationTitle, notificationMessage);
+    if (newServiceBookingStatus == util::ServiceJobStatus::PENDING)
     {
-        booking->setStatus(util::ServiceJobStatus::CANCELLED);
+        booking->setAssignedTechnician(nullptr);
-        if (User* technician = booking->getAssignedTechnician())
+        booking->setAssignedTechnicianId("");
-        {
-            const std::string title = "Customer Service Cancelled";
-            const std::string message = "Your assigned job card has been cancelled and the inventory has been restocked.";
-            currentService.sendNotification(technician, title, message);
-        }
     }
-    else if (userType == util::UserType::TECHNICIAN)
-    {
-        booking->setStatus(util::ServiceJobStatus::PENDING);
-        if (User* customer = booking->getCustomer())
-        {
-            const std::string title = "Technician Unavailable";
-            const std::string message = "Your booking has been reset to pending and we will reassign a new technician shortly.";               
-            currentService.sendNotification(customer, title, message);
-        }
-    }
-    booking->setAssignedTechnician(nullptr);
-    booking->setAssignedTechnicianId("");
     restoreInventory(booking);
 }
 
@@ -639,13 +624,21 @@ void ServiceManagementService::cancelCustomerServiceBookings(const std::string&
         {
             continue;
         }
-        if (booking->getStatus() != util::ServiceJobStatus::PENDING &&
+        if (booking->getStatus() != util::ServiceJobStatus::PENDING && booking->getStatus() != util::ServiceJobStatus::STARTED)
-            booking->getStatus() != util::ServiceJobStatus::STARTED && 
-            booking->getStatus() != util::ServiceJobStatus::IN_PROGRESS)
         {
             continue;
         }
-        processBookingCancellation(booking, jobs, *this, util::UserType::CUSTOMER);
+        User* assignedTechnician = booking->getAssignedTechnician();
+        std::string titleToTechnician = "Customer Service Cancelled";
+        std::string messageToTechnician = "The customer has cancelled their service booking. Your assigned job card has been cancelled and the inventory has been restocked.";
+        std::string jobTitle = "Job Cancelled";
+        std::string jobMessage = "The job has been cancelled. Your job card has been cancelled and the inventory has been restocked.";
+        processBookingCancellation(booking, 
+            util::ServiceJobStatus::CANCELLED,
+            titleToTechnician, messageToTechnician, assignedTechnician,
+            util::ServiceJobStatus::CANCELLED,
+            jobTitle, jobMessage, jobs, *this
+        );
     }
 }
 
@@ -683,9 +676,7 @@ void ServiceManagementService::cancelTechnicianJobs(const std::string& technicia
         {
             continue;
         }
-        if (booking->getStatus() != util::ServiceJobStatus::PENDING &&
+        if (booking->getStatus() != util::ServiceJobStatus::PENDING && booking->getStatus() != util::ServiceJobStatus::STARTED)
-            booking->getStatus() != util::ServiceJobStatus::STARTED &&
-            booking->getStatus() != util::ServiceJobStatus::IN_PROGRESS)
         {
             continue;
         }
@@ -694,7 +685,14 @@ void ServiceManagementService::cancelTechnicianJobs(const std::string& technicia
         {
             continue;
         }
-        processBookingCancellation(booking, jobs, *this, util::UserType::TECHNICIAN);
+        std::string title = "Technician Unavailable";
+        std::string message = "Your assigned technician is no longer available. Your booking has been reset to pending and we will reassign a new technician shortly.";
+        processBookingCancellation(booking,
+            util::ServiceJobStatus::PENDING,
+            title, message, customer,
+            util::ServiceJobStatus::CANCELLED,
+            title, message, jobs, *this
+        );
     }
 }
 

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h

@@ -736,7 +736,7 @@ inline std::string selectJobCardToUpdate(util::Map<std::string, const JobCard*>&
     util::Map<int, const JobCard* > incompleteJobCards;
     if (assignedJobCards.getSize() == 0)
     {
-        std::cout << "No jobs available.\n\n";
+        std::cout << "\nNo jobs available.\n\n";
         return "";
     }
     int currentIndex = 1;
@@ -744,12 +744,12 @@ inline std::string selectJobCardToUpdate(util::Map<std::string, const JobCard*>&
     if (selectedJobStatusType == util::ServiceJobStatus::STARTED)
     {
         util::clear();
-        std::cout << "Select a job to update to Inprogress\n";
+        std::cout << "Select a job to mark as In Progress\n";
     }
     else if (selectedJobStatusType == util::ServiceJobStatus::IN_PROGRESS)
     {
         util::clear();
-        std::cout << "Select a job to update to Completed\n";
+        std::cout << "Select a job to mark as Completed\n";
     }
     else
     {
@@ -780,7 +780,7 @@ inline std::string selectJobCardToUpdate(util::Map<std::string, const JobCard*>&
             incompleteJobCards.insert(currentIndex++, currentJobCard);
         }
     }
-    std::cout << "Select the Job Card to Update (Index): ";
+    std::cout << "Enter the job index to update: ";
     util::read(choice);
     int selectedJobCardIndex = incompleteJobCards.find(choice);
     if (selectedJobCardIndex != -1)

Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/TechnicianMenu.cpp

@@ -121,7 +121,7 @@ void TechnicianMenu::updateJobStatus()
     std::string selectedJobID;
     util::ServiceJobStatus selectedJobStatus = util::ServiceJobStatus::PENDING;
 	util::Map<std::string, const JobCard*> assignedJobCards = m_controller.getJobCardsByUser();
-    std::cout << "Select the type of job you want to update\n1.Started\n2.Inprogress\nChoice: ";
+    std::cout << "Select the type of job you want to update:\n1.Started\n2.In Progress\nChoice: ";
     util::read(choice);
     if (choice == 1)
     {