ATMATA/zerp
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates

Browse Source
This commit is contained in:
Aya
2026-05-07 15:21:10 +03:00
parent 9e5dd47a2f
commit e01e351713
9 changed files with 194 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
frontend/public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 101 KiB

4
frontend/src/app/dashboard/page.tsx
View File

@@ -127,12 +127,10 @@ function DashboardContent() {
if (notification.entityType === 'EXPENSE_CLAIM') {
if (notification.entityId) {
// إشعار المدير: بانتظار الموافقة
if (notification.type === 'EXPENSE_CLAIM_SUBMITTED') {
return `/portal/managed-expense-claims?claimId=${notification.entityId}`;
}
// إشعار الموظف: تم الإرسال / تمت الموافقة / تم الرفض
if (
notification.type === 'EXPENSE_CLAIM_CREATED' ||
notification.type === 'EXPENSE_CLAIM_APPROVED' ||
@@ -266,7 +264,7 @@ function DashboardContent() {
color: 'bg-emerald-500',
href: '/suppliers',
description: 'إدارة الموردين وبيانات التواصل والاعتماد',
permission: 'contacts'
permission: 'suppliers'
},
{
id: 'crm',

48
frontend/src/app/portal/leave/page.tsx
View File

@@ -24,6 +24,27 @@ const STATUS_MAP: Record<string, { label: string; color: string }> = {
REJECTED: { label: 'مرفوضة', color: 'bg-red-100 text-red-800' },
}
const COMPANY_TIME_ZONE = 'Asia/Riyadh'
const COMPANY_UTC_OFFSET = '+03:00'
const toCompanyDateTime = (date: string, time: string) => {
return `${date}T${time}:00${COMPANY_UTC_OFFSET}`
}
const formatCompanyTime = (value: string) => {
return new Date(value).toLocaleTimeString('en-US', {
hour: '2-digit',
minute: '2-digit',
timeZone: COMPANY_TIME_ZONE,
})
}
const formatCompanyDate = (value: string) => {
return new Date(value).toLocaleDateString('ar-SA', {
timeZone: COMPANY_TIME_ZONE,
})
}
export default function PortalLeavePage() {
const [leaveBalance, setLeaveBalance] = useState<any[]>([])
const [leaves, setLeaves] = useState<any[]>([])
@@ -53,10 +74,6 @@ export default function PortalLeavePage() {
}
useEffect(() => load(), [])
const toCompanyDateTime = (date: string, time: string) => {
return `${date}T${time}:00+03:00`
}
const handleSubmit = (e: React.FormEvent) => {
e.preventDefault()
@@ -89,9 +106,12 @@ export default function PortalLeavePage() {
return
}
payload.startDate = `${form.leaveDate}T${form.startTime}:00+03:00`
payload.endDate = `${form.leaveDate}T${form.endTime}:00+03:00`
}
payload.leaveDate = form.leaveDate
payload.startTime = form.startTime
payload.endTime = form.endTime
payload.startDate = toCompanyDateTime(form.leaveDate, form.startTime)
payload.endDate = toCompanyDateTime(form.leaveDate, form.endTime)
}
setSubmitting(true)
@@ -110,7 +130,15 @@ export default function PortalLeavePage() {
toast.success('تم إرسال طلب الإجازة')
load()
})
.catch(() => toast.error('فشل إرسال الطلب'))
.catch((err: any) => {
const message =
err.response?.data?.message ||
err.response?.data?.error ||
'فشل إرسال الطلب'
console.error('Leave request error:', err.response?.data || err)
toast.error(message)
})
.finally(() => setSubmitting(false))
}
@@ -165,12 +193,12 @@ export default function PortalLeavePage() {
<p className="font-medium">
{l.leaveType === 'ANNUAL' ? 'سنوية' : 'ساعية'} -{' '}
{l.leaveType === 'HOURLY'
? `${new Date(l.startDate).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })} - ${new Date(l.endDate).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}`
? `${formatCompanyTime(l.startDate)} - ${formatCompanyTime(l.endDate)}`
: `${l.days} يوم`}
</p>
<p className="text-sm text-gray-600">
{new Date(l.startDate).toLocaleDateString('ar-SA')} - {new Date(l.endDate).toLocaleDateString('ar-SA')}
{formatCompanyDate(l.startDate)} - {formatCompanyDate(l.endDate)}
</p>
</div>

23
frontend/src/app/portal/managed-leaves/page.tsx
View File

@@ -8,6 +8,23 @@ import { toast } from 'react-hot-toast'
import { CheckCircle2, XCircle, Calendar, User, ArrowLeft } from 'lucide-react'
import Link from 'next/link'
const COMPANY_TIME_ZONE = 'Asia/Riyadh'
const formatCompanyTime = (value: string) => {
return new Date(value).toLocaleTimeString('en-US', {
hour: '2-digit',
minute: '2-digit',
timeZone: COMPANY_TIME_ZONE,
})
}
const formatCompanyDateTime = (value: string) => {
return new Date(value).toLocaleString('ar-SA', {
timeZone: COMPANY_TIME_ZONE,
})
}
export default function ManagedLeavesPage() {
const { hasPermission } = useAuth()
const [leaves, setLeaves] = useState<ManagedLeave[]>([])
@@ -136,15 +153,15 @@ export default function ManagedLeavesPage() {
<div className="flex items-center gap-2">
<Calendar className="h-4 w-4 text-gray-400" />
<div>
<p>{new Date(leave.startDate).toLocaleString()}</p>
<p>{new Date(leave.endDate).toLocaleString()}</p>
<p>{formatCompanyDateTime(leave.startDate)}</p>
<p>{formatCompanyDateTime(leave.endDate)}</p>
</div>
</div>
</td>
<td className="px-6 py-4 text-gray-900">
{leave.leaveType === 'HOURLY'
? `${new Date(leave.startDate).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })} - ${new Date(leave.endDate).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}`
? `${formatCompanyTime(leave.startDate)} - ${formatCompanyTime(leave.endDate)}`
: `${leave.days} يوم`}
</td>

8
frontend/src/app/suppliers/page.tsx
View File

@@ -318,14 +318,6 @@ function SuppliersContent() {
</div>
</div>
</header>
<main className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
<div className="bg-white rounded-xl shadow-sm border border-gray-200 p-10 text-center">
<Shield className="h-12 w-12 text-red-500 mx-auto mb-4" />
<h2 className="text-xl font-bold text-gray-900 mb-2">غير مصرح بالوصول</h2>
<p className="text-gray-600">لا تملك صلاحية عرض إدارة الموردين.</p>
</div>
</main>
</div>
)
}

12
frontend/src/lib/api/portal.ts
View File

@@ -278,8 +278,16 @@ export const portalAPI = {
return response.data.data || []
},
submitLeaveRequest: async (data: { leaveType: string; startDate: string; endDate: string; reason?: string }): Promise<Leave> => {
const response = await api.post('/hr/portal/leaves', data)
submitLeaveRequest: async (data: {
leaveType: string
startDate: string
endDate: string
leaveDate?: string
startTime?: string
endTime?: string
reason?: string
}): Promise<Leave> => {
const response = await api.post('/hr/portal/leaves', data)
return response.data.data
},