updates

2026-05-07 15:21:10 +03:00
parent 9e5dd47a2f
commit e01e351713
9 changed files with 194 additions and 81 deletions
--- a/backend/src/modules/hr/hr.service.ts
+++ b/backend/src/modules/hr/hr.service.ts
@@ -314,16 +314,34 @@ class HRService {

  async createLeaveRequest(data: any, userId: string) {
    const allowedLeaveTypes = ['ANNUAL', 'HOURLY'];
+    const normalizedLeaveType = String(data.leaveType || '').toUpperCase();

-  if (!allowedLeaveTypes.includes(String(data.leaveType || '').toUpperCase())) {
+    if (!allowedLeaveTypes.includes(normalizedLeaveType)) {
      throw new AppError(400, 'نوع الإجازة غير مدعوم - Only ANNUAL and HOURLY leave types are allowed');
    }

-  const normalizedLeaveType = String(data.leaveType).toUpperCase();
-  const days = this.calculateLeaveDays(data.startDate, data.endDate);
    const startDate = new Date(data.startDate);
+    const endDate = new Date(data.endDate);
+
+    if (Number.isNaN(startDate.getTime()) || Number.isNaN(endDate.getTime())) {
+      throw new AppError(400, 'تاريخ أو وقت الإجازة غير صالح');
+    }
+
+    const isInvalidRange = normalizedLeaveType === 'HOURLY'
+      ? endDate <= startDate
+      : endDate < startDate;
+
+    if (isInvalidRange) {
+      throw new AppError(400, 'وقت/تاريخ النهاية يجب أن يكون بعد البداية');
+    }
+
+    const days = normalizedLeaveType === 'HOURLY'
+      ? 0
+      : this.calculateLeaveDays(startDate, endDate);
+
    const year = startDate.getFullYear();

+    if (normalizedLeaveType !== 'HOURLY') {
      const ent = await prisma.leaveEntitlement.findUnique({
        where: {
          employeeId_year_leaveType: {
@@ -340,12 +358,16 @@ class HRService {
          throw new AppError(400, `رصيد الإجازة غير كافٍ - Insufficient leave balance. Available: ${available}, Requested: ${days}`);
        }
      }
+    }

    const leave = await prisma.leave.create({
      data: {
-      ...data,
+        employeeId: data.employeeId,
        leaveType: normalizedLeaveType,
+        startDate,
+        endDate,
        days,
+        reason: data.reason || undefined,
      },
      include: {
        employee: true,
@@ -361,6 +383,7 @@ class HRService {

    return leave;
  }
+
  async approveLeave(id: string, approvedBy: string, userId: string) {
    const leave = await prisma.leave.update({
      where: { id },
--- a/backend/src/modules/hr/portal.controller.ts
+++ b/backend/src/modules/hr/portal.controller.ts
@@ -146,13 +146,59 @@ export class PortalController {

    async submitLeaveRequest(req: AuthRequest, res: Response, next: NextFunction) {
  try {
+    const body = { ...req.body };
+    const leaveType = String(body.leaveType || '').toUpperCase();
+
+    let startDate: Date;
+    let endDate: Date;
+
+    if (leaveType === 'HOURLY' && body.leaveDate && body.startTime && body.endTime) {
+      startDate = new Date(`${body.leaveDate}T${body.startTime}:00+03:00`);
+      endDate = new Date(`${body.leaveDate}T${body.endTime}:00+03:00`);
+    } else {
+      startDate = new Date(body.startDate);
+      endDate = new Date(body.endDate);
+    }
+
+    if (Number.isNaN(startDate.getTime()) || Number.isNaN(endDate.getTime())) {
+      return res.status(400).json({
+        success: false,
+        message: 'تاريخ أو وقت الإجازة غير صالح - Invalid leave date or time',
+      });
+    }
+
+    const isInvalidRange = leaveType === 'HOURLY'
+      ? endDate <= startDate
+      : endDate < startDate;
+
+    if (isInvalidRange) {
+      return res.status(400).json({
+        success: false,
+        message: 'وقت/تاريخ النهاية يجب أن يكون بعد البداية - End date/time must be after start date/time',
+      });
+    }
+
    const data = {
-        ...req.body,
-        startDate: new Date(req.body.startDate),
-        endDate: new Date(req.body.endDate),
+      leaveType,
+      startDate,
+      endDate,
+      reason: body.reason || undefined,
    };
-      const leave = await portalService.submitLeaveRequest(req.user?.employeeId, data, req.user!.id);
-      res.status(201).json(ResponseFormatter.success(leave, 'تم إرسال طلب الإجازة - Leave request submitted'));
+
+    const leave = await portalService.submitLeaveRequest(
+      req.user?.employeeId,
+      data,
+      req.user!.id
+    );
+
+    res
+      .status(201)
+      .json(
+        ResponseFormatter.success(
+          leave,
+          'تم إرسال طلب الإجازة - Leave request submitted'
+        )
+      );
  } catch (error) {
    next(error);
  }
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,6 +34,7 @@ services:
      JWT_SECRET: ${JWT_SECRET:-z-crm-jwt-secret-change-in-production-NOW}
      JWT_EXPIRES_IN: 7d
      JWT_REFRESH_EXPIRES_IN: 30d
+      MAX_FILE_SIZE: 52428800
      BCRYPT_ROUNDS: 10
      CORS_ORIGIN: https://zerp.atmata-group.com,http://zerp.atmata-group.com,http://localhost:3000,http://37.60.249.71:3000
    depends_on:
--- a/frontend/public/favicon.ico
+++ b/frontend/public/favicon.ico
--- a/frontend/src/app/dashboard/page.tsx
+++ b/frontend/src/app/dashboard/page.tsx
@@ -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',
--- a/frontend/src/app/portal/leave/page.tsx
+++ b/frontend/src/app/portal/leave/page.tsx
@@ -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,8 +106,11 @@ 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>

--- a/frontend/src/app/portal/managed-leaves/page.tsx
+++ b/frontend/src/app/portal/managed-leaves/page.tsx
@@ -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>

--- a/frontend/src/app/suppliers/page.tsx
+++ b/frontend/src/app/suppliers/page.tsx
@@ -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>
    )
  }
--- a/frontend/src/lib/api/portal.ts
+++ b/frontend/src/lib/api/portal.ts
@@ -278,7 +278,15 @@ export const portalAPI = {
    return response.data.data || []
  },

-  submitLeaveRequest: async (data: { leaveType: string; startDate: string; endDate: string; reason?: string }): Promise<Leave> => {
+  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
  },