diff --git a/app/(admin)/services/(list)/page.tsx b/app/(admin)/services/(list)/page.tsx
index 15cc6e4..2e0e0ef 100644
--- a/app/(admin)/services/(list)/page.tsx
+++ b/app/(admin)/services/(list)/page.tsx
@@ -260,13 +260,14 @@ function formatDeviceName(brand?: string, model?: string, fallback = '—') {
{filteredJobs.length === 0 ? (
- |
+ |
{searchQuery || queueTab !== 'all' || filterStatus !== 'ALL'
? 'No jobs match your search.'
: 'No service jobs found.'}
@@ -276,7 +277,9 @@ function formatDeviceName(brand?: string, model?: string, fallback = '—') {
pager.items.map((job) => (
|
|
- {job.job_no || job.job_id}
+
+ {job.job_no || job.job_id}
+
|
{job.customer_name || 'Guest customer'}
@@ -300,6 +303,20 @@ function formatDeviceName(brand?: string, model?: string, fallback = '—') {
|
{getStatusBadge(job.status)}
|
+
+ {job.assigned_technician_name ? (
+
+ {job.assigned_technician_name}
+
+ ) : (
+
+ Assign Tech
+
+ )}
+ |
{job.created_at ? new Date(job.created_at).toLocaleDateString() : '—'}
|
diff --git a/app/(admin)/technician/page.tsx b/app/(admin)/technician/page.tsx
index 0966273..091201e 100644
--- a/app/(admin)/technician/page.tsx
+++ b/app/(admin)/technician/page.tsx
@@ -219,6 +219,10 @@ export default function TechnicianPortalPage() {
const [pickupStatus, setPickupStatus] = useState('BOOKED_PICKUP');
const [savingLogistics, setSavingLogistics] = useState(false);
+ const [technicians, setTechnicians] = useState([]);
+ const [selectedTechId, setSelectedTechId] = useState('');
+ const [assigningTech, setAssigningTech] = useState(false);
+
const [inspectionData, setInspectionData] = useState({
result: 'CUSTOMER_REPORT_CONFIRMED',
customer_report: '',
@@ -239,6 +243,13 @@ export default function TechnicianPortalPage() {
return true;
});
setJobs(unique);
+
+ try {
+ const techList = await adminService.fetchActiveTechnicians();
+ setTechnicians(techList);
+ } catch (tErr: any) {
+ console.warn('Technician list fetch:', tErr.message);
+ }
} catch (err: any) {
console.warn('Technician queue load:', err.message);
} finally {
@@ -246,6 +257,21 @@ export default function TechnicianPortalPage() {
}
};
+ const handleAssignTechnician = async () => {
+ if (!activeJobId || !selectedTechId) return;
+ setAssigningTech(true);
+ try {
+ await adminService.assignTechnicianToJob(activeJobId, selectedTechId);
+ toast.success('Technician assigned successfully! WhatsApp alert dispatched.');
+ handleSelectJob(activeJobId);
+ loadAssignedJobs();
+ } catch (err: any) {
+ toast.error(err.message || 'Failed to assign technician.');
+ } finally {
+ setAssigningTech(false);
+ }
+ };
+
useEffect(() => {
loadAssignedJobs();
if (targetJobId) {
@@ -260,6 +286,7 @@ export default function TechnicianPortalPage() {
try {
const data = await adminService.getServiceJobDetailsAdmin(jobId);
setActiveJob(data);
+ setSelectedTechId(data.assigned_technician_id || '');
setAdditionalCost('0');
setCourierName(data.courier_name || '');
setAwbNumber(data.awb_number || '');
@@ -567,13 +594,14 @@ export default function TechnicianPortalPage() {
Device / service |
Price |
Status |
+ Technician |
Action |
{filteredJobs.length === 0 ? (
- |
+ |
{searchQuery || queueTab !== 'all' ? 'No jobs match your search.' : 'No jobs currently assigned.'}
|
@@ -601,6 +629,17 @@ export default function TechnicianPortalPage() {
{money(job.base_price)} |
{renderStatusBadge(job.status)} |
+
+ {job.assigned_technician_name ? (
+
+ {job.assigned_technician_name}
+
+ ) : (
+
+ Unassigned
+
+ )}
+ |
|