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
Merged PR 1155: Implement Confirm Payment Functionality
2026-06-01 18:02:45 +05:30 · 2026-06-01 17:34:41 +05:30 · 2026-06-01 17:30:27 +05:30 · 2026-06-01 17:25:28 +05:30
2 changed files with 5 additions and 5 deletions
@@ -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)
@@ -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)
    {
Author	SHA1	Message	Date
Jissin Mathew	ce50467816	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	2026-06-01 18:02:45 +05:30
joelthomastrenser	17f24b7733	Merged PR 1155: Implement Confirm Payment Functionality - Added Controller::getAllInvoices – retrieves all invoices from PaymentManagementService and returns them as a read-only map - Implemented Controller::confirmPayment – delegates payment confirmation for a given invoice ID to PaymentManagementService - Introduced PaymentManagementService::getAllInvoice – provides access to all invoices stored in the datastore - Added PaymentManagementService::confirmPayment – confirms payment for a specific invoice, updates payment date and status, and sends notification - Extended util::PaymentStatus enum – added PAID status and updated string conversion - Integrated AdminMenu::confirmPayment – validates invoice list, filters by status, allows selection, and confirms payment - Updated CustomerMenu::completePayments – uses parameterized status filtering for invoice selection - Enhanced MenuHelper::selectInvoiceFromUserForPayment – accepts requiredStatus parameter for flexible filtering - Adjusted AdminMenu options – added "Confirm Payment" before Logout Related work items: #1797	2026-06-01 17:34:41 +05:30
Avinash Rajesh	1032fc64bd	Commit `aee6356e`: Implement Confirm Payment Functionality <User Story> Complete Payments - 1797</User Story> <Changes> 1. Added Controller::getAllInvoices - Retrieves all invoices from PaymentManagementService and returns them as a read-only map. 2. Implemented Controller::confirmPayment - Delegates payment confirmation for a given invoice ID to PaymentManagementService. 3. Introduced PaymentManagementService::getAllInvoice - Provides access to all invoices stored in the datastore. 4. Added PaymentManagementService::confirmPayment - Confirms payment for a specific invoice, updates payment date and status, and sends notification. 5. Extended util::PaymentStatus enum - Added PAID status and updated string conversion. 6. Integrated AdminMenu::confirmPayment - Validates invoice list, filters by status, allows selection, and confirms payment. 7. Updated CustomerMenu::completePayments - Uses parameterized status filtering for invoice selection. 8. Enhanced MenuHelper::selectInvoiceFromUserForPayment - Accepts requiredStatus parameter for flexible filtering. 9. Adjusted AdminMenu options - Added "Confirm Payment" before Logout. </Changes> <Test> Acceptance Criteria: 1. Admin selects "Confirm Payment" from menu. - Verify system prompts and displays invoices filtered by status. 2. Admin selects invoice with status = PAID. - Verify payment confirmation updates date, sets status, and sends notification. 3. Admin attempts confirmation with empty invoice list. - Verify error message: "No pending invoices available for confirmation." 4. Customer completes payment. - Verify selection uses util::PaymentStatus::PENDING and payment flow works correctly. 5. Invalid invoice ID entered. - Verify system throws runtime_error with "Payment failed: invalid invoice ID." Precondition: 1. Admin logged into system. 2. At least one invoice exists in datastore. 3. Notification system available. Steps: 1. Navigate to Admin menu → Confirm Payment. 2. Select invoice with PAID status. 3. Confirm payment and check notification. 4. Attempt with empty invoice list. 5. Attempt with invalid invoice ID. </Test> <Review> Sreeja Reghukumar </Review>	2026-06-01 17:30:27 +05:30
joelthomastrenser	cfd1a2b675	Merged PR 1154: Implement Update Job Status for technician - Renamed Controller and ServiceManagementService methods from completeJob to updateJobStatus for clarity and flexibility. - Enhanced ServiceManagementService::updateJobStatus to support transitions: - STARTED → INPROGRESS - INPROGRESS → COMPLETED (with invoice generation and customer notification). - Added INPROGRESS state to ServiceJobStatus enum and updated string conversion utilities. - Introduced filterJobCards helper to generalize job filtering by status. - Updated TechnicianMenu to allow technicians to select job type (Started/Inprogress) and update status accordingly. - Improved job display to show current status and truncated service names for readability. Related work items: #1798	2026-06-01 17:25:28 +05:30