+ {isStartPickerOpen && (
+
- {/* Verification Stats */}
+ {/* Employers Registered & active/inactive */}
-
Verification & OCR Rate
-
-
+
Employers Registered
+
+
- {stats?.verification_rate || 0}%
+ {stats?.total_employers?.toLocaleString() || 0}
-
-
- {stats?.verified_workers_count?.toLocaleString() || 0} Profiles Auto-OCR Verified
-
+
+ {stats?.active_employers || 0} Active
+ •
+ {stats?.inactive_employers || 0} Inactive
+
diff --git a/resources/js/Pages/Admin/Disputes/Index.jsx b/resources/js/Pages/Admin/Disputes/Index.jsx
index 65210f0..a216ff6 100644
--- a/resources/js/Pages/Admin/Disputes/Index.jsx
+++ b/resources/js/Pages/Admin/Disputes/Index.jsx
@@ -289,12 +289,6 @@ export default function DisputesHub({ tickets }) {
-
diff --git a/resources/js/Pages/Admin/MasterData/WorkerSkills.jsx b/resources/js/Pages/Admin/MasterData/WorkerSkills.jsx
index 6aaf6d5..3bf3555 100644
--- a/resources/js/Pages/Admin/MasterData/WorkerSkills.jsx
+++ b/resources/js/Pages/Admin/MasterData/WorkerSkills.jsx
@@ -31,11 +31,13 @@ export default function WorkerSkills({ skills }) {
const [isDialogOpen, setIsDialogOpen] = useState(false);
const [editingSkill, setEditingSkill] = useState(null);
const [skillName, setSkillName] = useState('');
+ const [imageFile, setImageFile] = useState(null);
const [error, setError] = useState('');
const handleOpenAdd = () => {
setEditingSkill(null);
setSkillName('');
+ setImageFile(null);
setError('');
setIsDialogOpen(true);
};
@@ -43,6 +45,7 @@ export default function WorkerSkills({ skills }) {
const handleOpenEdit = (skill) => {
setEditingSkill(skill);
setSkillName(skill.name);
+ setImageFile(null);
setError('');
setIsDialogOpen(true);
};
@@ -54,23 +57,28 @@ export default function WorkerSkills({ skills }) {
return;
}
+ const formData = {
+ name: skillName.trim()
+ };
+ if (imageFile) {
+ formData.image = imageFile;
+ }
+
if (editingSkill) {
- router.post(`/admin/master-data/skills/${editingSkill.id}/update`, {
- name: skillName.trim()
- }, {
+ router.post(`/admin/master-data/skills/${editingSkill.id}/update`, formData, {
onSuccess: () => {
setIsDialogOpen(false);
+ setImageFile(null);
},
onError: (err) => {
setError(err.name || 'Failed to update skill.');
}
});
} else {
- router.post('/admin/master-data/skills', {
- name: skillName.trim()
- }, {
+ router.post('/admin/master-data/skills', formData, {
onSuccess: () => {
setIsDialogOpen(false);
+ setImageFile(null);
},
onError: (err) => {
setError(err.name || 'Failed to add skill.');
@@ -147,7 +155,16 @@ export default function WorkerSkills({ skills }) {
- {skill.name}
+
+ {skill.image_url ? (
+ 
+ ) : (
+
+ {skill.name.charAt(0)}
+
+ )}
+ {skill.name}
+
@@ -222,6 +239,22 @@ export default function WorkerSkills({ skills }) {
{error}
)}
+
+ {editingSkill && editingSkill.image_url && !imageFile && (
+
+ 
+ Current Image
+
+ )}
+ setImageFile(e.target.files[0])}
+ className="w-full text-xs text-slate-500 file:mr-4 file:py-2.5 file:px-4 file:rounded-xl file:border-0 file:text-xs file:font-black file:uppercase file:bg-teal-50 file:text-[#0F6E56] hover:file:bg-teal-100 cursor-pointer"
+ />
+ |
-
{worker.phone} • {worker.email}
+ {worker.phone}
@@ -314,9 +314,6 @@ export default function WorkerManagement({ workers }) {
- {worker.category}
-
-
{worker.nationality} • {worker.experience}
@@ -374,21 +371,6 @@ export default function WorkerManagement({ workers }) {
)}
-
-
- handleAvailabilityOverride(worker.id, 'Available Now')}
- className="flex items-center gap-2 p-2 rounded-lg cursor-pointer font-bold text-xs text-slate-700 hover:bg-slate-50"
- >
- Mark Available
-
-
- handleAvailabilityOverride(worker.id, 'Engaged')}
- className="flex items-center gap-2 p-2 rounded-lg cursor-pointer font-bold text-xs text-slate-700 hover:bg-slate-50"
- >
- Mark Engaged
-
@@ -423,8 +405,15 @@ export default function WorkerManagement({ workers }) {
{selectedWorker?.name ? selectedWorker.name.charAt(0) : ''}
- {selectedWorker?.name}
- {selectedWorker?.nationality} • ID #{selectedWorker?.id}
+
+ {selectedWorker?.name}
+
+ {selectedWorker?.verified ? 'Verified' : 'Pending'}
+
+
+ {selectedWorker?.nationality} • ID #{selectedWorker?.id}
Classification & Experience
-
-
- setEditForm({ ...editForm, category: e.target.value })}
- className="w-full bg-white border border-slate-200 rounded-xl p-2.5 text-xs font-bold text-slate-700 outline-none focus:ring-2 focus:ring-[#0F6E56]/20"
- required
- />
-
-
-
-
@@ -236,7 +400,7 @@ export default function Announcements({ initialAnnouncements }) {
-
+
+
+
+ setSearchTerm(e.target.value)}
+ className="w-full pl-12 pr-4 py-3 bg-slate-50 border-none rounded-2xl text-sm font-bold focus:ring-2 focus:ring-[#185FA5]/20 transition-all outline-none"
+ />
+
+
+ {/* Status Filters */}
+
+ {['All', 'Pending', 'Approved', 'Rejected'].map((status) => (
+
+ ))}
+
+
+
+
{filteredAnnouncements.length === 0 ? (
-
+
@@ -259,94 +457,100 @@ export default function Announcements({ initialAnnouncements }) {
) : (
filteredAnnouncements.map((ann) => {
const details = ann.charityDetails;
+ const isExpanded = !!expandedCards[ann.id];
+ const statusColorClass =
+ ann.status === 'approved' ? 'border-l-emerald-500' :
+ ann.status === 'rejected' ? 'border-l-rose-500' :
+ 'border-l-amber-500';
return (
-
-
-
-
-
-
- {t('community_charity_drive', 'COMMUNITY CHARITY DRIVE')}
-
-
-
-
- {ann.created_at}
-
-
-
-
- {t('push_reminder_scheduled', 'Push & Reminder Scheduled')}
+ {/* Top Card Area */}
+
+
+
+
+
+
+ {ann.title}
+
+
+ {ann.status === 'approved' ? t('status_approved', 'APPROVED') : (ann.status === 'rejected' ? t('status_rejected', 'REJECTED') : t('status_pending', 'PENDING'))}
+
+ {ann.status === 'approved' && (
+
+
+ {t('push_reminder_scheduled', 'Push & Reminder Scheduled')}
+
+ )}
+
-
-
-
- {ann.title}
-
- {ann.content}
+ {/* Collapsible Content */}
+
+
+ {ann.content}
+
+
+ {ann.content.length > 90 && (
+
+ )}
+ {/* Details metadata row (compact icons) */}
{details && (
-
-
-
-
-
-
- {t('provided_packages', 'Provided Packages')}
- {details.provided_items}
-
+
+
+
+
+ {details.provided_items}
+
-
-
-
-
-
-
- {t('event_timing', 'Event Timing')}
-
- {details.event_date} • {details.event_time}
-
-
+
+
+
+ {details.event_date}
+
-
-
-
-
-
-
+
+
+
+ {details.location_details}
+
)}
-
-
+ {/* Bottom Card Footer */}
+
);
diff --git a/resources/js/Pages/Employer/Messages/Show.jsx b/resources/js/Pages/Employer/Messages/Show.jsx
index 3391ca6..e433afe 100644
--- a/resources/js/Pages/Employer/Messages/Show.jsx
+++ b/resources/js/Pages/Employer/Messages/Show.jsx
@@ -123,37 +123,7 @@ export default function Show({ conversation, initialMessages, conversations = []
}, {
preserveScroll: true,
onSuccess: () => {
- // Show immediate confirmation of the push alert popping up on worker mobile app
- toast.success(t('direct_push_sent', 'Direct Mobile Push Notification sent!'), {
- description: t('popped_up_instantly_desc', "Popped up instantly on {name}'s mobile device.").replace('{name}', conversation.worker_name),
- duration: 4500,
- });
-
- // Simulate worker typing response shortly after
- setTimeout(() => {
- setIsTyping(true);
- setTimeout(() => {
- setIsTyping(false);
-
- // Reload conversation to pull actual database messages (including automated worker 'Yes')
- router.reload({
- preserveScroll: true,
- onSuccess: () => {
- if (isLookingJobQuery) {
- toast.success(t('candidate_hired_success', "Candidate response: YES! Automatically marked as HIRED!"), {
- description: t('candidate_hired_desc', "{name} has been successfully added to your Hired candidate pipeline.").replace('{name}', conversation.worker_name),
- duration: 6000,
- });
- } else {
- toast.info(t('new_message_from', 'New message from {name}!').replace('{name}', conversation.worker_name), {
- description: t('auto_reply_text', "Thank you for your response! I have reviewed your offer proposal and am looking forward to our video interview."),
- duration: 5000
- });
- }
- }
- });
- }, 2000);
- }, 1500);
+ router.reload({ preserveScroll: true });
}
});
};
diff --git a/resources/js/Pages/Employer/SelectedCandidates.jsx b/resources/js/Pages/Employer/SelectedCandidates.jsx
index 26b6f86..c37574b 100644
--- a/resources/js/Pages/Employer/SelectedCandidates.jsx
+++ b/resources/js/Pages/Employer/SelectedCandidates.jsx
@@ -1,26 +1,18 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useMemo } from 'react';
import { Head, Link, router } from '@inertiajs/react';
import EmployerLayout from '../../Layouts/EmployerLayout';
import { useTranslation } from '../../lib/LanguageContext';
import {
- CheckCircle2,
- Globe2,
- Briefcase,
- DollarSign,
MessageSquare,
UserCheck,
Search,
- FileText,
- Download,
- Printer,
- Copy,
- FileSpreadsheet,
- FileJson,
Filter,
- ChevronRight,
MoreHorizontal,
- Users,
- Send
+ MapPin,
+ Briefcase,
+ Home,
+ Globe2,
+ Plane
} from 'lucide-react';
import {
DropdownMenu,
@@ -30,31 +22,212 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger
} from '@/components/ui/dropdown-menu';
+import FilterDrawer, { FilterSection, FilterSelect, FilterInput, FilterChips } from '../../Components/Employer/FilterDrawer';
export default function SelectedCandidates({ selectedWorkers }) {
const { t } = useTranslation();
const [workers, setWorkers] = useState((selectedWorkers || []).filter(w => w.status !== 'Searching'));
const [searchTerm, setSearchTerm] = useState('');
+ // Drawer state
+ const [drawerOpen, setDrawerOpen] = useState(false);
+
+ // Filter States
+ const [filterLocation, setFilterLocation] = useState('');
+ const [filterJobType, setFilterJobType] = useState('All');
+ const [filterAccommodation, setFilterAccommodation] = useState('All');
+ const [filterNationality, setFilterNationality] = useState('All');
+ const [filterInCountry, setFilterInCountry] = useState('All');
+ const [filterVisaType, setFilterVisaType] = useState('All');
+
useEffect(() => {
setWorkers((selectedWorkers || []).filter(w => w.status !== 'Searching'));
}, [selectedWorkers]);
const changeStatus = (id, newStatus) => {
- // Optimistic UI state update
setWorkers(workers.map(w => w.id === id ? { ...w, status: newStatus } : w));
-
- // Persist change to database
router.post(`/employer/candidates/${id}/status`, { status: newStatus }, {
preserveScroll: true
});
};
+ // Extract unique nationalities for filter dropdown
+ const nationalities = useMemo(() => {
+ const nats = (selectedWorkers || []).map(w => w.nationality).filter(Boolean);
+ return [...new Set(nats)];
+ }, [selectedWorkers]);
+
+ // Apply Client-Side Filters
+ const filteredWorkers = useMemo(() => {
+ let list = (selectedWorkers || []).filter(w => w.status !== 'Searching');
+
+ if (searchTerm.trim() !== '') {
+ const query = searchTerm.toLowerCase();
+ list = list.filter(w => w.name.toLowerCase().includes(query));
+ }
+ if (filterLocation.trim() !== '') {
+ const query = filterLocation.toLowerCase();
+ list = list.filter(w => w.preferred_location && w.preferred_location.toLowerCase().includes(query));
+ }
+ if (filterJobType !== 'All') {
+ list = list.filter(w => w.preferred_job_type && w.preferred_job_type.toLowerCase() === filterJobType.toLowerCase());
+ }
+ if (filterAccommodation !== 'All') {
+ list = list.filter(w => w.live_in_out && w.live_in_out.toLowerCase() === filterAccommodation.toLowerCase());
+ }
+ if (filterNationality !== 'All') {
+ list = list.filter(w => w.nationality && w.nationality.toLowerCase() === filterNationality.toLowerCase());
+ }
+ if (filterInCountry !== 'All') {
+ const wantInCountry = filterInCountry === 'In Country';
+ list = list.filter(w => {
+ const wVal = w.in_country;
+ return (wVal === true || wVal === '1' || wVal === 1) === wantInCountry;
+ });
+ }
+ if (filterInCountry === 'In Country' && filterVisaType !== 'All') {
+ list = list.filter(w => w.visa_status && w.visa_status.toLowerCase().includes(filterVisaType.toLowerCase()));
+ }
+
+ return list;
+ }, [selectedWorkers, searchTerm, filterLocation, filterJobType, filterAccommodation, filterNationality, filterInCountry, filterVisaType]);
+
+ const resetFilters = () => {
+ setFilterLocation('');
+ setFilterJobType('All');
+ setFilterAccommodation('All');
+ setFilterNationality('All');
+ setFilterInCountry('All');
+ setFilterVisaType('All');
+ };
+
+ const activeFilterCount = useMemo(() => {
+ let count = 0;
+ if (filterLocation.trim() !== '') count++;
+ if (filterJobType !== 'All') count++;
+ if (filterAccommodation !== 'All') count++;
+ if (filterNationality !== 'All') count++;
+ if (filterInCountry !== 'All') count++;
+ if (filterInCountry === 'In Country' && filterVisaType !== 'All') count++;
+ return count;
+ }, [filterLocation, filterJobType, filterAccommodation, filterNationality, filterInCountry, filterVisaType]);
+
+ // Active filter tags for display
+ const activeFilterTags = useMemo(() => {
+ const tags = [];
+ if (filterLocation.trim()) tags.push({ key: 'location', label: `📍 ${filterLocation}`, clear: () => setFilterLocation('') });
+ if (filterJobType !== 'All') tags.push({ key: 'job', label: `💼 ${filterJobType}`, clear: () => setFilterJobType('All') });
+ if (filterAccommodation !== 'All') tags.push({ key: 'acc', label: `🏠 ${filterAccommodation.replace('_', '-')}`, clear: () => setFilterAccommodation('All') });
+ if (filterNationality !== 'All') tags.push({ key: 'nat', label: `🌍 ${filterNationality}`, clear: () => setFilterNationality('All') });
+ if (filterInCountry !== 'All') tags.push({ key: 'country', label: `✈️ ${filterInCountry}`, clear: () => { setFilterInCountry('All'); setFilterVisaType('All'); } });
+ if (filterInCountry === 'In Country' && filterVisaType !== 'All') tags.push({ key: 'visa', label: `🪪 ${filterVisaType}`, clear: () => setFilterVisaType('All') });
+ return tags;
+ }, [filterLocation, filterJobType, filterAccommodation, filterNationality, filterInCountry, filterVisaType]);
+
return (
-
+ {/* ── Filter Drawer ── */}
+ setDrawerOpen(false)}
+ onReset={resetFilters}
+ activeCount={activeFilterCount}
+ title="Filter Candidates"
+ >
+ {/* Preferred Location */}
+
+ setFilterLocation(e.target.value)}
+ placeholder="e.g. Dubai, Abu Dhabi…"
+ />
+
+
+ {/* Job Type */}
+
+
+
+
+ {/* Accommodation */}
+
+
+
+
+ {/* Nationality */}
+
+ setFilterNationality(e.target.value)}
+ >
+
+ {nationalities.map(nat => (
+
+ ))}
+
+
+
+ {/* Country Status */}
+
+ {
+ setFilterInCountry(val);
+ if (val !== 'In Country') setFilterVisaType('All');
+ }}
+ />
+
+
+ {/* Visa Type */}
+
+
+ setFilterVisaType(e.target.value)}
+ disabled={filterInCountry !== 'In Country'}
+ >
+
+
+
+
+
+
+
+ {filterInCountry !== 'In Country' && (
+
+ Select "In Country" to enable this filter
+
+ )}
+
+
+
{/* Header Section */}
@@ -65,32 +238,76 @@ export default function SelectedCandidates({ selectedWorkers }) {
{/* Table Section */}
-
-
+ {/* Toolbar */}
+
+ {/* Search */}
+
setSearchTerm(e.target.value)}
+ onChange={e => setSearchTerm(e.target.value)}
/>
-
-
+
+ {/* Results count */}
+
+ {filteredWorkers.length} result{filteredWorkers.length !== 1 ? 's' : ''}
+
+
+ {/* Export actions */}
+
{['COPY', 'CSV', 'PDF', 'PRINT'].map(action => (
))}
-
+ {/* Active filter tags */}
+ {activeFilterTags.length > 0 && (
+
+ Active:
+ {activeFilterTags.map(tag => (
+
+ ))}
+
+
+ )}
+
+ {/* Table */}
@@ -104,57 +321,67 @@ export default function SelectedCandidates({ selectedWorkers }) {
- {workers.length > 0 ? (
- workers.filter(w => w.name.toLowerCase().includes(searchTerm.toLowerCase())).map((worker) => (
-
-
-
-
- {worker.name.charAt(0)}
-
-
- {worker.name}
- {worker.nationality}
-
- |
- Nov 14, 2026 |
-
- {worker.category}
- |
-
- {worker.salary} AED
- |
-
-
-
- {t('hired', 'Hired').toUpperCase()}
-
- |
-
-
-
-
-
-
-
-
-
- |
-
- ))
+ {filteredWorkers.length > 0 ? (
+ filteredWorkers.map((worker) => (
+
+
+
+
+ {worker.name.charAt(0)}
+
+
+ {worker.name}
+
+
+ {worker.nationality || '—'}
+
+
+ |
+ {worker.applied_at || '—'} |
+
+ {worker.category}
+ |
+
+ {worker.salary} AED
+ |
+
+
+
+ {t('hired', 'Hired').toUpperCase()}
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+ ))
) : (
- |
+ |
-
+
+
+
{t('no_candidates_found', 'No candidates found')}
+ {activeFilterCount > 0 && (
+
+ )}
|
@@ -163,21 +390,15 @@ export default function SelectedCandidates({ selectedWorkers }) {
- {/* Pagination Footer */}
+ {/* Footer */}
- {t('showing_candidates', 'Showing {start} to {end} of {total} candidates')
- .replace('{start}', 1)
- .replace('{end}', workers.length)
- .replace('{total}', workers.length)}
+ Showing {filteredWorkers.length} of {(selectedWorkers || []).filter(w => w.status !== 'Searching').length} candidates
-
-
-
-
-
+
+
diff --git a/resources/js/Pages/Employer/Support/Create.jsx b/resources/js/Pages/Employer/Support/Create.jsx
index 0c2f463..9ffe383 100644
--- a/resources/js/Pages/Employer/Support/Create.jsx
+++ b/resources/js/Pages/Employer/Support/Create.jsx
@@ -9,10 +9,11 @@ import {
CheckCircle
} from 'lucide-react';
-export default function Create() {
+export default function Create({ reasons = [] }) {
const { t } = useTranslation();
const { data, setData, post, processing, errors } = useForm({
+ reason_id: '',
subject: '',
description: '',
priority: 'medium',
@@ -51,6 +52,28 @@ export default function Create() {
+ {ticket.reason && (
+
+ Support Category:
+ {ticket.reason}
+
+ )}
{ticket.subject}
diff --git a/resources/js/Pages/Employer/Workers/Index.jsx b/resources/js/Pages/Employer/Workers/Index.jsx
index 39a7593..fe25fad 100644
--- a/resources/js/Pages/Employer/Workers/Index.jsx
+++ b/resources/js/Pages/Employer/Workers/Index.jsx
@@ -28,6 +28,7 @@ import {
ShieldCheck,
User
} from 'lucide-react';
+import FilterDrawer, { FilterSection, FilterSelect, FilterInput, FilterChips, FilterCheckboxList } from '../../../Components/Employer/FilterDrawer';
const getLanguageFlag = (lang) => {
const flags = {
@@ -50,7 +51,7 @@ export default function Index({ initialWorkers = [], initialShortlistedIds = [],
const [selectedNationality, setSelectedNationality] = useState('All Nationalities');
const [selectedExperience, setSelectedExperience] = useState('All Experience');
const [selectedReligion, setSelectedReligion] = useState('All Religions');
- const [maxSalary, setMaxSalary] = useState(3000);
+ const [maxSalary, setMaxSalary] = useState(5000);
// Advanced Multi-Select Filters & Sorting
const [selectedLanguages, setSelectedLanguages] = useState([]);
@@ -58,6 +59,14 @@ export default function Index({ initialWorkers = [], initialShortlistedIds = [],
const [selectedSkills, setSelectedSkills] = useState([]);
const [selectedWorkTypes, setSelectedWorkTypes] = useState([]);
const [sortBy, setSortBy] = useState('default');
+
+ // Advanced Filters Toggle & Details
+ const [showAdvancedFilters, setShowAdvancedFilters] = useState(false);
+ const [filterLocation, setFilterLocation] = useState('');
+ const [filterJobType, setFilterJobType] = useState('All');
+ const [filterAccommodation, setFilterAccommodation] = useState('All');
+ const [filterInCountry, setFilterInCountry] = useState('All');
+ const [filterVisaType, setFilterVisaType] = useState('All');
// UI Helpers
const [isLangOpen, setIsLangOpen] = useState(false);
@@ -79,6 +88,9 @@ export default function Index({ initialWorkers = [], initialShortlistedIds = [],
const [presetNameInput, setPresetNameInput] = useState('');
const [showPresetModal, setShowPresetModal] = useState(false);
+ // Drawer
+ const [drawerOpen, setDrawerOpen] = useState(false);
+
// Worker Comparison & Quick Preview
const [comparisonIds, setComparisonIds] = useState([]);
const [previewWorker, setPreviewWorker] = useState(null);
@@ -89,10 +101,47 @@ export default function Index({ initialWorkers = [], initialShortlistedIds = [],
const cat = params.get('category');
const nat = params.get('nationality');
const sal = params.get('max_salary');
+ const loc = params.get('preferred_location');
+ const job = params.get('job_type') || params.get('preferred_job_type');
+ const acc = params.get('live_in_out') || params.get('accommodation_type') || params.get('accomadation_type');
+ const inCountryVal = params.get('in_country');
+ const outCountryVal = params.get('out_country');
+ const visa = params.get('visa_status') || params.get('next_visa_type') || params.get('visa_type');
+
+ let hasAdvanced = false;
if (cat) setSelectedCategory(cat);
if (nat) setSelectedNationality(nat);
if (sal) setMaxSalary(Number(sal));
+ if (loc) {
+ setFilterLocation(loc);
+ hasAdvanced = true;
+ }
+ if (job) {
+ setFilterJobType(job);
+ hasAdvanced = true;
+ }
+ if (acc) {
+ setFilterAccommodation(acc);
+ hasAdvanced = true;
+ }
+ if (inCountryVal) {
+ const isTrue = inCountryVal === 'true' || inCountryVal === '1' || inCountryVal === 'yes' || inCountryVal === 'in' || inCountryVal === 'In Country';
+ setFilterInCountry(isTrue ? 'In Country' : 'Out of Country');
+ hasAdvanced = true;
+ } else if (outCountryVal) {
+ const isTrue = outCountryVal === 'true' || outCountryVal === '1' || outCountryVal === 'yes' || outCountryVal === 'out' || outCountryVal === 'Out of Country';
+ setFilterInCountry(isTrue ? 'Out of Country' : 'In Country');
+ hasAdvanced = true;
+ }
+ if (visa) {
+ setFilterVisaType(visa);
+ hasAdvanced = true;
+ }
+
+ if (hasAdvanced) {
+ setShowAdvancedFilters(true);
+ }
}, []);
const toggleShortlist = (id) => {
@@ -150,15 +199,48 @@ export default function Index({ initialWorkers = [], initialShortlistedIds = [],
setSelectedNationality('All Nationalities');
setSelectedExperience('All Experience');
setSelectedReligion('All Religions');
- setMaxSalary(3000);
+ setMaxSalary(5000);
setSelectedLanguages([]);
setSelectedVisaStatuses([]);
setSelectedSkills([]);
setSelectedWorkTypes([]);
setSortBy('default');
setVisibleCount(6);
+ setFilterLocation('');
+ setFilterJobType('All');
+ setFilterAccommodation('All');
+ setFilterInCountry('All');
+ setFilterVisaType('All');
};
+ const activeFilterCount = useMemo(() => {
+ let count = 0;
+ if (filterLocation.trim() !== '') count++;
+ if (filterJobType !== 'All') count++;
+ if (filterAccommodation !== 'All') count++;
+ if (selectedNationality !== 'All Nationalities') count++;
+ if (filterInCountry !== 'All') count++;
+ if (filterInCountry === 'In Country' && filterVisaType !== 'All') count++;
+ if (selectedSkills.length > 0) count++;
+ if (selectedLanguages.length > 0) count++;
+ if (maxSalary < 5000) count++;
+ return count;
+ }, [filterLocation, filterJobType, filterAccommodation, selectedNationality, filterInCountry, filterVisaType, selectedSkills, selectedLanguages, maxSalary]);
+
+ const activeFilterTags = useMemo(() => {
+ const tags = [];
+ if (filterLocation.trim()) tags.push({ key: 'loc', label: `📍 ${filterLocation}`, clear: () => setFilterLocation('') });
+ if (filterJobType !== 'All') tags.push({ key: 'job', label: `💼 ${filterJobType}`, clear: () => setFilterJobType('All') });
+ if (filterAccommodation !== 'All') tags.push({ key: 'acc', label: `🏠 ${filterAccommodation.replace('_', '-')}`, clear: () => setFilterAccommodation('All') });
+ if (selectedNationality !== 'All Nationalities') tags.push({ key: 'nat', label: `🌍 ${selectedNationality}`, clear: () => setSelectedNationality('All Nationalities') });
+ if (filterInCountry !== 'All') tags.push({ key: 'country', label: `✈️ ${filterInCountry}`, clear: () => { setFilterInCountry('All'); setFilterVisaType('All'); } });
+ if (filterInCountry === 'In Country' && filterVisaType !== 'All') tags.push({ key: 'visa', label: `🪪 ${filterVisaType}`, clear: () => setFilterVisaType('All') });
+ if (selectedSkills.length > 0) tags.push({ key: 'skills', label: `🛠 ${selectedSkills.length} skill${selectedSkills.length > 1 ? 's' : ''}`, clear: () => setSelectedSkills([]) });
+ if (selectedLanguages.length > 0) tags.push({ key: 'lang', label: `🗣 ${selectedLanguages.length} lang`, clear: () => setSelectedLanguages([]) });
+ if (maxSalary < 5000) tags.push({ key: 'salary', label: `💰 ≤${maxSalary} AED`, clear: () => setMaxSalary(5000) });
+ return tags;
+ }, [filterLocation, filterJobType, filterAccommodation, selectedNationality, filterInCountry, filterVisaType, selectedSkills, selectedLanguages, maxSalary]);
+
// Filter and Sort Worker List
const filteredWorkers = useMemo(() => {
let workers = initialWorkers.filter(worker => {
@@ -176,7 +258,7 @@ export default function Index({ initialWorkers = [], initialShortlistedIds = [],
if (selectedNationality !== 'All Nationalities' && worker.nationality !== selectedNationality) return false;
if (selectedExperience !== 'All Experience' && worker.experience !== selectedExperience) return false;
if (selectedReligion !== 'All Religions' && worker.religion !== selectedReligion) return false;
- if (worker.salary > maxSalary) return false;
+ if (maxSalary < 5000 && worker.salary > maxSalary) return false;
// Multi-select filters
if (selectedLanguages.length > 0) {
@@ -192,6 +274,34 @@ export default function Index({ initialWorkers = [], initialShortlistedIds = [],
}
if (selectedWorkTypes.length > 0 && !selectedWorkTypes.includes(worker.preferred_job_type)) return false;
+ // Preferred Location
+ if (filterLocation.trim() !== '') {
+ const query = filterLocation.toLowerCase();
+ if (!worker.preferred_location || !worker.preferred_location.toLowerCase().includes(query)) return false;
+ }
+
+ // Job Type
+ if (filterJobType !== 'All') {
+ if (!worker.preferred_job_type || worker.preferred_job_type.toLowerCase() !== filterJobType.toLowerCase()) return false;
+ }
+
+ // Accommodation
+ if (filterAccommodation !== 'All') {
+ if (!worker.live_in_out || worker.live_in_out.toLowerCase() !== filterAccommodation.toLowerCase()) return false;
+ }
+
+ // In/Out Country
+ if (filterInCountry !== 'All') {
+ const wantInCountry = filterInCountry === 'In Country';
+ const wVal = worker.in_country;
+ if ((wVal === true || wVal === '1' || wVal === 1) !== wantInCountry) return false;
+ }
+
+ // Visa Type (if in country)
+ if (filterInCountry === 'In Country' && filterVisaType !== 'All') {
+ if (!worker.visa_status || !worker.visa_status.toLowerCase().includes(filterVisaType.toLowerCase())) return false;
+ }
+
return true;
});
@@ -219,7 +329,12 @@ export default function Index({ initialWorkers = [], initialShortlistedIds = [],
selectedVisaStatuses,
selectedSkills,
selectedWorkTypes,
- sortBy
+ sortBy,
+ filterLocation,
+ filterJobType,
+ filterAccommodation,
+ filterInCountry,
+ filterVisaType
]);
const paginatedWorkers = useMemo(() => {
@@ -265,10 +380,145 @@ export default function Index({ initialWorkers = [], initialShortlistedIds = [],
+ {/* ── Filter Drawer ── */}
+ setDrawerOpen(false)}
+ onReset={resetFilters}
+ activeCount={activeFilterCount}
+ title="Filter Workers"
+ >
+ {/* Preferred Location */}
+
+ setFilterLocation(e.target.value)}
+ placeholder="e.g. Dubai, Abu Dhabi…"
+ />
+
+
+ {/* Job Type */}
+
+
+
+
+ {/* Accommodation */}
+
+
+
+
+ {/* Nationality */}
+
+ setSelectedNationality(e.target.value)}
+ >
+ {filtersMetadata.nationalities?.map(nat => (
+
+ ))}
+
+
+
+ {/* Country Status */}
+
+ {
+ setFilterInCountry(val);
+ if (val !== 'In Country') setFilterVisaType('All');
+ }}
+ />
+
+
+ {/* Visa Type */}
+
+
+ setFilterVisaType(e.target.value)}
+ disabled={filterInCountry !== 'In Country'}
+ >
+
+
+
+
+
+
+
+ {filterInCountry !== 'In Country' && (
+ Select "In Country" to enable this filter
+ )}
+
+ 500 AED
+ 5,000 AED
+
+
+
+
{/* Filter and Search Panel */}
-
-
- {/* Core Search bar */}
+
+
+ {/* Search */}
- {/* Sort & Reset Actions */}
-
- {/* Sort Selector */}
-
+
+ {/* Sort */}
+
+ {/* Reset */}
+
+ {/* Filter Drawer button */}
+
- {/* Primary filters grid */}
-
- {/* Nationality */}
-
-
-
+ {/* Active filter tags */}
+ {activeFilterTags.length > 0 && (
+
+ Active:
+ {activeFilterTags.map(tag => (
+
+ ))}
+
-
- {/* Skills */}
-
-
-
- {isSkillsOpen && (
-
- {filtersMetadata.skills?.slice(1).map(skill => (
-
- ))}
-
- )}
-
-
- {/* Language */}
-
-
-
- {isLangOpen && (
-
- {filtersMetadata.languages?.slice(1).map(lang => (
-
- ))}
-
- )}
-
-
- {/* Visa Status */}
-
-
-
- {isVisaOpen && (
-
- {filtersMetadata.visaStatuses?.slice(1).map(status => (
-
- ))}
-
- )}
-
-
+ )}
{/* Listing metadata bar */}
@@ -625,7 +787,8 @@ export default function Index({ initialWorkers = [], initialShortlistedIds = [],
href={`/employer/workers/${worker.id}`}
className="w-full bg-[#185FA5] hover:bg-[#144f8a] text-white rounded-xl h-10 font-bold text-xs flex items-center justify-center transition-colors shadow-xs"
>
- {t('open_full_profile')}
+ View Profile
+
diff --git a/resources/js/Pages/Employer/Workers/Show.jsx b/resources/js/Pages/Employer/Workers/Show.jsx
index df22064..32cb3d4 100644
--- a/resources/js/Pages/Employer/Workers/Show.jsx
+++ b/resources/js/Pages/Employer/Workers/Show.jsx
@@ -232,10 +232,12 @@ export default function Show({ worker }) {
•
{worker.category}
-
-
- {worker.rating} / 5.0 ({workerReviews.length} {t('reviews', 'reviews')})
-
+ {workerReviews.length > 0 && (
+
+
+ {worker.rating} / 5.0 ({workerReviews.length} {t('reviews', 'reviews')})
+
+ )}
@@ -348,23 +350,13 @@ export default function Show({ worker }) {
{worker.passport_status}
-
+
{t('visa_status', 'Visa Status')}
{worker.visa_status}
-
-
-
-
- {t('medical_health_test', 'Medical Health Test')}
-
-
- {t('passed_certified', 'PASSED CERTIFIED')}
-
-
{/* Languages Spoken with visual flags */}
@@ -386,13 +378,7 @@ export default function Show({ worker }) {
{/* Right Column: Bio & Skills */}
- {/* Professional Summary */}
-
- {t('professional_summary', 'Professional Summary')}
-
- "{worker.bio}"
-
-
+
{/* Verified Skills & Competencies */}
@@ -562,40 +548,15 @@ export default function Show({ worker }) {
))}
+ {workerReviews.length === 0 && (
+
+ {t('no_reviews_yet', 'No reviews posted yet.')}
+
+ )}
- {/* Similar Recommendations Slider */}
-
- {t('similar_recommended_workers', 'Similar Recommended Workers')}
-
- {worker.similar_workers?.map((sim) => (
-
-
-
- {sim.name}
- {sim.nationality} • {sim.category}
-
- {sim.verified && (
-
- {t('verified', 'Verified')}
-
- )}
-
-
- {sim.salary} {t('aed', 'AED')}/{t('mo', 'mo')}
-
- {t('view_profile', 'View Profile')}
- →
-
-
-
- ))}
-
-
+
{/* Stage 4/5 Hired Flow Success Modal Overlay */}
diff --git a/resources/js/components/Employer/FilterDrawer.jsx b/resources/js/components/Employer/FilterDrawer.jsx
new file mode 100644
index 0000000..8996283
--- /dev/null
+++ b/resources/js/components/Employer/FilterDrawer.jsx
@@ -0,0 +1,213 @@
+import React, { useEffect } from 'react';
+import { X, RotateCcw, SlidersHorizontal } from 'lucide-react';
+
+/**
+ * FilterDrawer — a right-side slide-in drawer for employer portal filter panels.
+ *
+ * Props:
+ * open {boolean} – controls visibility
+ * onClose {function} – called when backdrop or X is clicked
+ * onReset {function} – called when "Clear All" is clicked
+ * activeCount {number} – number of active filters (shown in badge)
+ * title {string} – drawer heading
+ * children {node} – filter form content
+ */
+export default function FilterDrawer({ open, onClose, onReset, activeCount = 0, title = 'Filters', children }) {
+ // Lock body scroll when drawer is open
+ useEffect(() => {
+ if (open) {
+ document.body.style.overflow = 'hidden';
+ } else {
+ document.body.style.overflow = '';
+ }
+ return () => { document.body.style.overflow = ''; };
+ }, [open]);
+
+ // Close on Escape key
+ useEffect(() => {
+ const handler = (e) => { if (e.key === 'Escape') onClose(); };
+ window.addEventListener('keydown', handler);
+ return () => window.removeEventListener('keydown', handler);
+ }, [onClose]);
+
+ return (
+ <>
+ {/* ── Backdrop ── */}
+
+
+ {/* ── Drawer Panel ── */}
+
+ {/* Header */}
+
+
+
+
+
+
+ {title}
+ {activeCount > 0 && (
+
+ {activeCount} filter{activeCount !== 1 ? 's' : ''} active
+
+ )}
+
+
+
+ {activeCount > 0 && (
+
+ )}
+
+
+
+
+ {/* Scrollable body */}
+
+ {children}
+
+
+ {/* Footer */}
+
+
+
+
+
+ );
+}
+
+/**
+ * FilterSection — a labelled group inside FilterDrawer.
+ */
+export function FilterSection({ label, children }) {
+ return (
+
+ );
+}
+
+/**
+ * FilterSelect — a full-width styled select inside FilterDrawer.
+ */
+export function FilterSelect({ id, value, onChange, disabled = false, children }) {
+ return (
+
+ );
+}
+
+/**
+ * FilterInput — a full-width styled text input inside FilterDrawer.
+ */
+export function FilterInput({ id, value, onChange, placeholder }) {
+ return (
+
+ );
+}
+
+/**
+ * FilterChips — a row of selectable chip buttons for single-select options.
+ * options: [{ value, label }]
+ */
+export function FilterChips({ options, selected, onChange }) {
+ return (
+
+ {options.map(opt => (
+
+ ))}
+
+ );
+}
+
+/**
+ * FilterCheckboxList — a list of checkboxes for multi-select.
+ * items: string[]
+ */
+export function FilterCheckboxList({ items, selected, onToggle }) {
+ return (
+
+ {items.map(item => (
+
+ ))}
+
+ );
+}
diff --git a/routes/web.php b/routes/web.php
index 4399114..faa7c1c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -89,6 +89,7 @@
return [
'id' => $skill->id,
'name' => $skill->name,
+ 'image_url' => $skill->image_path ? asset('storage/' . $skill->image_path) : null,
'worker_count' => \DB::table('worker_skills')->where('skill_id', $skill->id)->count(),
'status' => 'Active',
];
@@ -101,9 +102,15 @@
Route::post('/master-data/skills', function (\Illuminate\Http\Request $request) {
$request->validate([
'name' => 'required|string|max:255|unique:skills,name',
+ 'image' => 'nullable|image|max:2048',
]);
+ $imagePath = null;
+ if ($request->hasFile('image')) {
+ $imagePath = $request->file('image')->store('skills', 'public');
+ }
\App\Models\Skill::create([
'name' => strtolower($request->name),
+ 'image_path' => $imagePath,
]);
return redirect()->back();
})->name('admin.skills.store');
@@ -111,16 +118,28 @@
Route::post('/master-data/skills/{id}/update', function (\Illuminate\Http\Request $request, $id) {
$request->validate([
'name' => 'required|string|max:255|unique:skills,name,' . $id,
+ 'image' => 'nullable|image|max:2048',
]);
$skill = \App\Models\Skill::findOrFail($id);
+ $imagePath = $skill->image_path;
+ if ($request->hasFile('image')) {
+ if ($imagePath) {
+ \Storage::disk('public')->delete($imagePath);
+ }
+ $imagePath = $request->file('image')->store('skills', 'public');
+ }
$skill->update([
'name' => strtolower($request->name),
+ 'image_path' => $imagePath,
]);
return redirect()->back();
})->name('admin.skills.update');
Route::delete('/master-data/skills/{id}', function ($id) {
$skill = \App\Models\Skill::findOrFail($id);
+ if ($skill->image_path) {
+ \Storage::disk('public')->delete($skill->image_path);
+ }
\DB::table('worker_skills')->where('skill_id', $id)->delete();
$skill->delete();
return redirect()->back();
@@ -143,7 +162,7 @@
Route::post('/master-data/reasons', function (\Illuminate\Http\Request $request) {
$request->validate([
'reason' => 'required|string|max:255|unique:report_reasons,reason',
- 'type' => 'required|string|in:Chat,Review,Both',
+ 'type' => 'required|string|in:Chat,Review,Both,Support',
]);
\App\Models\ReportReason::create([
'reason' => $request->reason,
@@ -157,7 +176,7 @@
$request->validate([
'reason' => 'required|string|max:255|unique:report_reasons,reason,' . $id,
'status' => 'required|string|in:Active,Inactive',
- 'type' => 'required|string|in:Chat,Review,Both',
+ 'type' => 'required|string|in:Chat,Review,Both,Support',
]);
$reason = \App\Models\ReportReason::findOrFail($id);
$reason->update([
diff --git a/tests/Feature/EmployerWorkerFilterApiTest.php b/tests/Feature/EmployerWorkerFilterApiTest.php
new file mode 100644
index 0000000..f0616e1
--- /dev/null
+++ b/tests/Feature/EmployerWorkerFilterApiTest.php
@@ -0,0 +1,318 @@
+token = 'test-employer-token';
+ $this->employer = User::create([
+ 'name' => 'Test Employer',
+ 'email' => 'employer@example.com',
+ 'password' => bcrypt('Password@123'),
+ 'role' => 'employer',
+ 'api_token' => $this->token,
+ ]);
+
+ // Create worker category
+ $this->category = WorkerCategory::create([
+ 'name' => 'General Helper',
+ ]);
+
+ // Seed 3 workers with specific filter attributes
+ // Worker 1: Dubai, full-time, live-in, India, in_country=true, Residence Visa
+ $w1 = Worker::create([
+ 'name' => 'Worker India In Dubai',
+ 'email' => 'worker1@example.com',
+ 'phone' => '+971501111111',
+ 'password' => bcrypt('password'),
+ 'nationality' => 'India',
+ 'category_id' => $this->category->id,
+ 'verified' => true,
+ 'status' => 'active',
+ 'preferred_location' => 'Dubai',
+ 'preferred_job_type' => 'full-time',
+ 'live_in_out' => 'live_in',
+ 'in_country' => true,
+ 'visa_status' => 'Residence Visa',
+ 'age' => 25,
+ 'salary' => 1500,
+ 'experience' => '3 Years',
+ 'religion' => 'Christian',
+ 'language' => 'EN',
+ 'availability' => 'Immediate',
+ 'bio' => 'Experienced helper',
+ ]);
+ WorkerDocument::create([
+ 'worker_id' => $w1->id,
+ 'type' => 'passport',
+ 'number' => 'P111111',
+ 'file_path' => 'passports/test1.jpg',
+ ]);
+
+ // Worker 2: Abu Dhabi, part-time, live-out, Philippines, in_country=true, Tourist Visa
+ $w2 = Worker::create([
+ 'name' => 'Worker Philippines In Abu Dhabi',
+ 'email' => 'worker2@example.com',
+ 'phone' => '+971502222222',
+ 'password' => bcrypt('password'),
+ 'nationality' => 'Philippines',
+ 'category_id' => $this->category->id,
+ 'verified' => true,
+ 'status' => 'active',
+ 'preferred_location' => 'Abu Dhabi',
+ 'preferred_job_type' => 'part-time',
+ 'live_in_out' => 'live_out',
+ 'in_country' => true,
+ 'visa_status' => 'Tourist Visa',
+ 'age' => 28,
+ 'salary' => 1800,
+ 'experience' => '2 Years',
+ 'religion' => 'Christian',
+ 'language' => 'TL',
+ 'availability' => 'Immediate',
+ 'bio' => 'Ready to work',
+ ]);
+ WorkerDocument::create([
+ 'worker_id' => $w2->id,
+ 'type' => 'passport',
+ 'number' => 'P222222',
+ 'file_path' => 'passports/test2.jpg',
+ ]);
+
+ // Worker 3: Dubai, full-time, live-out, Kenya, in_country=false, Cancelled Visa
+ $w3 = Worker::create([
+ 'name' => 'Worker Kenya Out Country',
+ 'email' => 'worker3@example.com',
+ 'phone' => '+971503333333',
+ 'password' => bcrypt('password'),
+ 'nationality' => 'Kenya',
+ 'category_id' => $this->category->id,
+ 'verified' => true,
+ 'status' => 'active',
+ 'preferred_location' => 'Dubai',
+ 'preferred_job_type' => 'full-time',
+ 'live_in_out' => 'live_out',
+ 'in_country' => false,
+ 'visa_status' => 'Cancelled Visa',
+ 'age' => 30,
+ 'salary' => 1200,
+ 'experience' => 'None',
+ 'religion' => 'Christian',
+ 'language' => 'SW',
+ 'availability' => 'Immediate',
+ 'bio' => 'New helper',
+ ]);
+ WorkerDocument::create([
+ 'worker_id' => $w3->id,
+ 'type' => 'passport',
+ 'number' => 'P333333',
+ 'file_path' => 'passports/test3.jpg',
+ ]);
+ }
+
+ /**
+ * Test getWorkers filtering.
+ */
+ public function test_get_workers_preferred_location_filter()
+ {
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/workers?preferred_location=Abu Dhabi');
+
+ $response->assertStatus(200);
+ $workers = $response->json('data.workers');
+ $this->assertCount(1, $workers);
+ $this->assertEquals('Worker Philippines In Abu Dhabi', $workers[0]['name']);
+ }
+
+ public function test_get_workers_job_type_filter()
+ {
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/workers?job_type=part-time');
+
+ $response->assertStatus(200);
+ $workers = $response->json('data.workers');
+ $this->assertCount(1, $workers);
+ $this->assertEquals('Worker Philippines In Abu Dhabi', $workers[0]['name']);
+ }
+
+ public function test_get_workers_live_in_out_filter()
+ {
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/workers?live_in_out=live_out');
+
+ $response->assertStatus(200);
+ $workers = $response->json('data.workers');
+ $this->assertCount(2, $workers);
+ }
+
+ public function test_get_workers_nationality_multiple_filter()
+ {
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/workers?nationality=India,Kenya');
+
+ $response->assertStatus(200);
+ $workers = $response->json('data.workers');
+ $this->assertCount(2, $workers);
+ }
+
+ public function test_get_workers_in_country_filter()
+ {
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/workers?in_country=false');
+
+ $response->assertStatus(200);
+ $workers = $response->json('data.workers');
+ $this->assertCount(1, $workers);
+ $this->assertEquals('Worker Kenya Out Country', $workers[0]['name']);
+ }
+
+ public function test_get_workers_visa_status_if_in_country_filter()
+ {
+ // Tourist Visa matches Worker 2 (in country)
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/workers?visa_status=Tourist Visa');
+
+ $response->assertStatus(200);
+ $workers = $response->json('data.workers');
+ $this->assertCount(1, $workers);
+ $this->assertEquals('Worker Philippines In Abu Dhabi', $workers[0]['name']);
+
+ // Cancelled Visa is for Worker 3, but Worker 3 is out country, so it should not match
+ // because of the "if in country next visa type" constraint.
+ $response2 = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/workers?visa_status=Cancelled Visa');
+
+ $response2->assertStatus(200);
+ $workers2 = $response2->json('data.workers');
+ $this->assertCount(0, $workers2);
+ }
+
+ /**
+ * Test getCandidates filtering.
+ */
+ public function test_get_candidates_filters()
+ {
+ // To be in getCandidates, candidates need status 'Hired' per current logic:
+ // Let's create three direct offers with status accepted (which maps to 'Hired')
+ $worker1 = Worker::where('nationality', 'India')->first();
+ $worker2 = Worker::where('nationality', 'Philippines')->first();
+ $worker3 = Worker::where('nationality', 'Kenya')->first();
+
+ JobOffer::create([
+ 'employer_id' => $this->employer->id,
+ 'worker_id' => $worker1->id,
+ 'work_date' => now()->format('Y-m-d'),
+ 'location' => 'Dubai',
+ 'salary' => 1500,
+ 'notes' => 'Hired test',
+ 'status' => 'accepted', // maps to Hired
+ ]);
+
+ JobOffer::create([
+ 'employer_id' => $this->employer->id,
+ 'worker_id' => $worker2->id,
+ 'work_date' => now()->format('Y-m-d'),
+ 'location' => 'Abu Dhabi',
+ 'salary' => 1500,
+ 'notes' => 'Hired test 2',
+ 'status' => 'accepted', // maps to Hired
+ ]);
+
+ JobOffer::create([
+ 'employer_id' => $this->employer->id,
+ 'worker_id' => $worker3->id,
+ 'work_date' => now()->format('Y-m-d'),
+ 'location' => 'Dubai',
+ 'salary' => 1500,
+ 'notes' => 'Hired test 3',
+ 'status' => 'accepted', // maps to Hired
+ ]);
+
+ // Filter candidates by preferred location Dubai
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/candidates?preferred_location=Dubai');
+
+ $response->assertStatus(200);
+ $candidates = $response->json('data.candidates');
+ $this->assertCount(2, $candidates);
+
+ // Filter candidates by job_type
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/candidates?job_type=part-time');
+
+ $response->assertStatus(200);
+ $candidates = $response->json('data.candidates');
+ $this->assertCount(1, $candidates);
+ $this->assertEquals('Worker Philippines In Abu Dhabi', $candidates[0]['name']);
+
+ // Filter candidates by live_in_out
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/candidates?live_in_out=live_in');
+
+ $response->assertStatus(200);
+ $candidates = $response->json('data.candidates');
+ $this->assertCount(1, $candidates);
+ $this->assertEquals('Worker India In Dubai', $candidates[0]['name']);
+
+ // Filter candidates by nationality
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/candidates?nationality=Kenya');
+
+ $response->assertStatus(200);
+ $candidates = $response->json('data.candidates');
+ $this->assertCount(1, $candidates);
+ $this->assertEquals('Worker Kenya Out Country', $candidates[0]['name']);
+
+ // Filter candidates by in_country
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/candidates?in_country=false');
+
+ $response->assertStatus(200);
+ $candidates = $response->json('data.candidates');
+ $this->assertCount(1, $candidates);
+ $this->assertEquals('Worker Kenya Out Country', $candidates[0]['name']);
+
+ // Filter candidates by visa_status (if in country)
+ $response = $this->withHeaders([
+ 'Authorization' => 'Bearer ' . $this->token,
+ ])->getJson('/api/employers/candidates?visa_status=Tourist Visa');
+
+ $response->assertStatus(200);
+ $candidates = $response->json('data.candidates');
+ $this->assertCount(1, $candidates);
+ $this->assertEquals('Worker Philippines In Abu Dhabi', $candidates[0]['name']);
+ }
+}
diff --git a/tests/Feature/EmployerWorkerWebFilterTest.php b/tests/Feature/EmployerWorkerWebFilterTest.php
new file mode 100644
index 0000000..1132313
--- /dev/null
+++ b/tests/Feature/EmployerWorkerWebFilterTest.php
@@ -0,0 +1,208 @@
+employer = User::create([
+ 'name' => 'Test Employer',
+ 'email' => 'employer@example.com',
+ 'password' => bcrypt('password'),
+ 'role' => 'employer',
+ ]);
+
+ $this->category = WorkerCategory::create([
+ 'name' => 'General Helper',
+ ]);
+
+ // Seed some workers
+ $w1 = Worker::create([
+ 'name' => 'Worker India Dubai',
+ 'email' => 'worker1@example.com',
+ 'phone' => '+971501111111',
+ 'password' => bcrypt('password'),
+ 'nationality' => 'India',
+ 'category_id' => $this->category->id,
+ 'verified' => true,
+ 'status' => 'active',
+ 'preferred_location' => 'Dubai',
+ 'preferred_job_type' => 'full-time',
+ 'live_in_out' => 'live_in',
+ 'in_country' => true,
+ 'visa_status' => 'Residence Visa',
+ 'age' => 25,
+ 'salary' => 1500,
+ 'experience' => '3 Years',
+ 'religion' => 'Christian',
+ 'language' => 'EN',
+ 'availability' => 'Immediate',
+ 'bio' => 'Experienced helper',
+ ]);
+ WorkerDocument::create([
+ 'worker_id' => $w1->id,
+ 'type' => 'passport',
+ 'number' => 'P111111',
+ 'file_path' => 'passports/test1.jpg',
+ ]);
+
+ $w2 = Worker::create([
+ 'name' => 'Worker Philippines Abu Dhabi',
+ 'email' => 'worker2@example.com',
+ 'phone' => '+971502222222',
+ 'password' => bcrypt('password'),
+ 'nationality' => 'Philippines',
+ 'category_id' => $this->category->id,
+ 'verified' => true,
+ 'status' => 'active',
+ 'preferred_location' => 'Abu Dhabi',
+ 'preferred_job_type' => 'part-time',
+ 'live_in_out' => 'live_out',
+ 'in_country' => true,
+ 'visa_status' => 'Tourist Visa',
+ 'age' => 28,
+ 'salary' => 1800,
+ 'experience' => '2 Years',
+ 'religion' => 'Christian',
+ 'language' => 'TL',
+ 'availability' => 'Immediate',
+ 'bio' => 'Ready to work',
+ ]);
+ WorkerDocument::create([
+ 'worker_id' => $w2->id,
+ 'type' => 'passport',
+ 'number' => 'P222222',
+ 'file_path' => 'passports/test2.jpg',
+ ]);
+ }
+
+ /**
+ * Test web workers index page loads correctly.
+ */
+ public function test_employer_can_view_workers_index()
+ {
+ $response = $this->actingAs($this->employer)
+ ->withSession(['user' => $this->employer])
+ ->get(route('employer.workers'));
+
+ $response->assertStatus(200);
+ $response->assertSee('initialWorkers');
+ }
+
+ /**
+ * Test web workers index filtering on server-side.
+ */
+ public function test_employer_workers_web_filtering()
+ {
+ // 1. Filter by location
+ $response = $this->actingAs($this->employer)
+ ->withSession(['user' => $this->employer])
+ ->get(route('employer.workers', ['preferred_location' => 'Abu Dhabi']));
+ $response->assertStatus(200);
+ $response->assertSee('Worker Philippines Abu Dhabi');
+ $response->assertDontSee('Worker India Dubai');
+
+ // 2. Filter by nationality
+ $response = $this->actingAs($this->employer)
+ ->withSession(['user' => $this->employer])
+ ->get(route('employer.workers', ['nationality' => 'India']));
+ $response->assertStatus(200);
+ $response->assertSee('Worker India Dubai');
+ $response->assertDontSee('Worker Philippines Abu Dhabi');
+
+ // 3. Filter by job_type
+ $response = $this->actingAs($this->employer)
+ ->withSession(['user' => $this->employer])
+ ->get(route('employer.workers', ['job_type' => 'part-time']));
+ $response->assertStatus(200);
+ $response->assertSee('Worker Philippines Abu Dhabi');
+ $response->assertDontSee('Worker India Dubai');
+
+ // 4. Filter by live_in_out
+ $response = $this->actingAs($this->employer)
+ ->withSession(['user' => $this->employer])
+ ->get(route('employer.workers', ['live_in_out' => 'live_in']));
+ $response->assertStatus(200);
+ $response->assertSee('Worker India Dubai');
+ $response->assertDontSee('Worker Philippines Abu Dhabi');
+
+ // 5. Filter by visa_status
+ $response = $this->actingAs($this->employer)
+ ->withSession(['user' => $this->employer])
+ ->get(route('employer.workers', ['visa_status' => 'Tourist Visa']));
+ $response->assertStatus(200);
+ $response->assertSee('Worker Philippines Abu Dhabi');
+ $response->assertDontSee('Worker India Dubai');
+ }
+
+ /**
+ * Test web candidates index page loads correctly.
+ */
+ public function test_employer_can_view_candidates_index_and_apply_filters()
+ {
+ // Add a hired worker (candidate)
+ $w = Worker::create([
+ 'name' => 'Worker Kenya Hired',
+ 'email' => 'worker3@example.com',
+ 'phone' => '+971503333333',
+ 'password' => bcrypt('password'),
+ 'nationality' => 'Kenya',
+ 'category_id' => $this->category->id,
+ 'verified' => true,
+ 'status' => 'Hired',
+ 'preferred_location' => 'Dubai',
+ 'preferred_job_type' => 'full-time',
+ 'live_in_out' => 'live_out',
+ 'in_country' => false,
+ 'visa_status' => 'Cancelled Visa',
+ 'age' => 30,
+ 'salary' => 1200,
+ 'experience' => 'None',
+ 'religion' => 'Christian',
+ 'language' => 'SW',
+ 'availability' => 'Immediate',
+ 'bio' => 'New helper',
+ ]);
+
+ JobOffer::create([
+ 'employer_id' => $this->employer->id,
+ 'worker_id' => $w->id,
+ 'work_date' => now()->format('Y-m-d'),
+ 'location' => 'Dubai',
+ 'salary' => 1200,
+ 'notes' => 'Hired',
+ 'status' => 'accepted', // Hired status
+ ]);
+
+ // Request with location Dubai
+ $response = $this->actingAs($this->employer)
+ ->withSession(['user' => $this->employer])
+ ->get(route('employer.candidates', ['preferred_location' => 'Dubai']));
+
+ $response->assertStatus(200);
+ $response->assertSee('selectedWorkers');
+
+ // Request with out_country=true
+ $response2 = $this->actingAs($this->employer)
+ ->withSession(['user' => $this->employer])
+ ->get(route('employer.candidates', ['out_country' => 'true']));
+
+ $response2->assertStatus(200);
+ }
+}
diff --git a/tests/Feature/WorkerJourneyApiTest.php b/tests/Feature/WorkerJourneyApiTest.php
index 234b537..5b940e5 100644
--- a/tests/Feature/WorkerJourneyApiTest.php
+++ b/tests/Feature/WorkerJourneyApiTest.php
@@ -130,6 +130,7 @@ public function test_s1_complete_basic_profile_setup()
'name' => 'Rahul Sharma',
'nationality' => 'India',
'language' => 'HI',
+ 'gender' => 'male',
'skills' => [],
]);
@@ -155,6 +156,7 @@ public function test_s1_complete_basic_profile_setup()
'name' => 'Rahul Sharma',
'phone' => $phone,
'language' => 'HI',
+ 'gender' => 'male',
'verified' => false,
'status' => 'active',
]);
@@ -431,9 +433,6 @@ public function test_register_with_new_api_fields()
'gender' => 'male',
'live_in_out' => 'live_out',
'preferred_location' => 'Dubai Marina',
- 'country' => 'UAE',
- 'city' => 'Dubai',
- 'area' => 'Marina',
]);
$response->assertStatus(201);
@@ -447,9 +446,6 @@ public function test_register_with_new_api_fields()
'gender' => 'male',
'live_in_out' => 'live_out',
'preferred_location' => 'Dubai Marina',
- 'country' => 'UAE',
- 'city' => 'Dubai',
- 'area' => 'Marina',
]);
}
diff --git a/vite.config.js b/vite.config.js
index fa54835..a8a6c63 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,7 +23,7 @@ export default defineConfig({
port: 5173,
cors: true,
hmr: {
- host: '192.168.29.131',
+ host: '192.168.0.203',
},
watch: {
ignored: ['**/storage/framework/views/**'],
|