(Feat-Fix): Lots of fixes.

backend-deno/routes/reports.ts

@@ -29,11 +29,14 @@ router.get(
              e.name as employee_name, e.username as employee_username,
              e.phone_number as employee_phone,
              s.name as supervisor_name,
-             c.name as contractor_name,
+             COALESCE(oc.name, c.name) as contractor_name,
              sd.name as sub_department_name,
              d.name as department_name,
              d.id as department_id,
-             sr.rate as standard_rate
+             sr.rate as standard_rate,
+             es.id as active_swap_id,
+             oc.name as original_contractor_name,
+             tc.name as target_contractor_name
       FROM work_allocations wa
       JOIN users e ON wa.employee_id = e.id
       JOIN users s ON wa.supervisor_id = s.id
@@ -42,6 +45,9 @@ router.get(
       LEFT JOIN departments d ON e.department_id = d.id
       LEFT JOIN standard_rates sr ON wa.sub_department_id = sr.sub_department_id 
         AND wa.activity = sr.activity
+      LEFT JOIN employee_swaps es ON es.employee_id = e.id AND es.status = 'Active' AND es.swap_date <= wa.assigned_date
+      LEFT JOIN users oc ON es.original_contractor_id = oc.id
+      LEFT JOIN users tc ON es.target_contractor_id = tc.id
       WHERE wa.status = 'Completed'
     `;
       const queryParams: unknown[] = [];