edit contact form

Made-with: Cursor

.env.production

@@ -6,3 +6,6 @@ JWT_SECRET=your-super-secure-jwt-secret-change-this-now-2024
 
 # Domain
 DOMAIN=zerp.atmata-group.com
+
+# Prisma / Database pooling
+DATABASE_URL=postgresql://postgres:SecurePassword123!ChangeMe@postgres:5432/mind14_crm?schema=public&connection_limit=5&pool_timeout=20&connect_timeout=20

DEVELOPER_STAGING_DEPLOY.md

@@ -0,0 +1,174 @@
+# Staging deploy guide (for developers)
+
+This is the **same workflow** the team uses for staging: work locally, push to Git, **sync your project folder to the server with rsync**, then **rebuild Docker on the server**. Pushing to Git alone does not update the live staging site.
+
+**Staging URL:** https://zerp.atmata-group.com/
+
+**Server project path:** `/root/z_crm` (confirm with your lead if different)
+
+---
+
+## 1. What you need from your lead
+
+| Item | Purpose |
+|------|---------|
+| **Staging server address** (IP or hostname) | For SSH and rsync |
+| **SSH login** (e.g. `root` or another user) | Remote shell and file sync |
+| **SSH key or password** | Prefer **SSH keys** (`ssh-copy-id`) so you are not typing a password on every deploy |
+
+You do **not** need Node.js **on the server**. Docker runs `npm ci` and `npm run build` inside the containers.
+
+---
+
+## 2. One-time setup on your laptop
+
+1. **Clone** the same Git repo you commit to, and use that folder as your working copy.
+2. **Test SSH:**
+   ```bash
+   ssh YOUR_USER@YOUR_SERVER_HOST
+   ```
+   Exit with `exit` once you see a shell.
+3. **Install rsync** if needed (macOS and most Linux distros include it).
+
+---
+
+## 3. Standard deploy (every time you want staging updated)
+
+Run these from your **project root** (the folder that contains `frontend/`, `backend/`, and `docker-compose.yml`).
+
+### Step 1 — Get the code you want on Git
+
+```bash
+git pull origin master
+```
+
+Resolve any conflicts, then make sure your changes are **committed and pushed**:
+
+```bash
+git push origin master
+```
+
+(Use your team’s branch name if staging tracks something other than `master`.)
+
+### Step 2 — Build locally (recommended)
+
+Catches errors before you touch the server:
+
+```bash
+cd frontend && npm run build && cd ../backend && npm run build && cd ..
+```
+
+If either build fails, fix the problem and repeat before continuing.
+
+### Step 3 — Sync files to the server (rsync)
+
+From the **project root**:
+
+```bash
+rsync -avz --delete \
+  --exclude 'node_modules' \
+  --exclude '.git' \
+  --exclude '.next' \
+  --exclude '.env' \
+  ./ YOUR_USER@YOUR_SERVER_HOST:/root/z_crm/
+```
+
+- **`./`** — trailing slash means “contents of this folder”; destination is `/root/z_crm/`.
+- **`--delete`** — removes files on the server that no longer exist in your tree (keeps server tree aligned with yours). **Excluded paths are not deleted** from the server by default when you use `--exclude` (rsync does not remove excluded remote files unless you add `--delete-excluded`, which you should **not** use here).
+- **`.env` must stay excluded** so you do **not** overwrite the server’s database URL and secrets. The server keeps its existing `/root/z_crm/.env`.
+
+Replace `YOUR_USER` and `YOUR_SERVER_HOST` with what your lead gave you.
+
+### Step 4 — Rebuild Docker on the server
+
+Either open an SSH session and run the commands, or run them in one shot:
+
+**Option A — SSH in, then commands**
+
+```bash
+ssh YOUR_USER@YOUR_SERVER_HOST
+cd /root/z_crm
+docker-compose down
+docker-compose build --no-cache frontend backend
+docker-compose up -d
+docker-compose ps
+```
+
+**Option B — One line from your laptop**
+
+```bash
+ssh YOUR_USER@YOUR_SERVER_HOST 'cd /root/z_crm && docker-compose down && docker-compose build --no-cache frontend backend && docker-compose up -d && docker-compose ps'
+```
+
+You should see `zerp_postgres` (healthy), `zerp_backend`, and `zerp_frontend` up.
+
+### Step 5 — Quick check
+
+Open https://zerp.atmata-group.com/ and do a hard refresh if the UI looks cached (`Cmd+Shift+R` / `Ctrl+Shift+R`).
+
+If the API or login fails:
+
+```bash
+ssh YOUR_USER@YOUR_SERVER_HOST 'cd /root/z_crm && docker-compose logs backend --tail 80'
+```
+
+---
+
+## 4. If the backend will not start (database / Prisma)
+
+The server relies on **`/root/z_crm/.env`** (not in Git) for `DATABASE_URL` and related settings. If that file is missing or wrong, ask your lead to fix or restore it **once**; your normal deploy should **never** sync your local `.env` over it (keep the `--exclude '.env'` on rsync).
+
+---
+
+## 5. Database migrations
+
+The backend container runs **`npx prisma migrate deploy`** when it starts. After you deploy code that includes new Prisma migrations, a normal **`docker-compose up -d`** after rebuild applies them automatically.
+
+---
+
+## 6. Optional: rebuild all services (slower)
+
+Usually you only need **frontend** and **backend** images. To rebuild everything defined in `docker-compose.yml`:
+
+```bash
+ssh YOUR_USER@YOUR_SERVER_HOST 'cd /root/z_crm && docker-compose down && docker-compose build --no-cache && docker-compose up -d'
+```
+
+Postgres **data** stays on the Docker volume unless someone removes volumes on purpose.
+
+---
+
+## 7. Alternative: Git pull **on** the server (only if `.git` exists there)
+
+Some teams keep a full clone on the server. If `/root/z_crm/.git` exists **and** the server can reach your Git remote, you can skip rsync and run:
+
+```bash
+ssh YOUR_USER@YOUR_SERVER_HOST
+cd /root/z_crm
+git pull origin master
+docker-compose down
+docker-compose build --no-cache frontend backend
+docker-compose up -d
+```
+
+If there is **no** `.git` on the server (typical when deploys have always been rsync), use **section 3** only.
+
+---
+
+## 8. Copy-paste cheat sheet (replace user/host)
+
+```bash
+# From project root, after git push:
+cd frontend && npm run build && cd ../backend && npm run build && cd ..
+
+rsync -avz --delete \
+  --exclude 'node_modules' \
+  --exclude '.git' \
+  --exclude '.next' \
+  --exclude '.env' \
+  ./ YOUR_USER@YOUR_SERVER_HOST:/root/z_crm/
+
+ssh YOUR_USER@YOUR_SERVER_HOST 'cd /root/z_crm && docker-compose down && docker-compose build --no-cache frontend backend && docker-compose up -d && docker-compose ps'
+```
+
+This matches the workflow: **local code → Git → rsync to server → Docker rebuild**.

backend/package-lock.json

@@ -2909,7 +2909,6 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,

backend/src/modules/contacts/contacts.routes.ts

@@ -42,7 +42,8 @@ router.post(
   '/',
   authorize('contacts', 'contacts', 'create'),
   [
-    body('type').isIn(['INDIVIDUAL', 'COMPANY', 'HOLDING', 'GOVERNMENT']),
+    body('type').isIn(['INDIVIDUAL', 'COMPANY', 'HOLDING', 'GOVERNMENT','ORGANIZATION','EMBASSIES',
+  'BANK','UNIVERSITY','SCHOOL','UN','NGO','INSTITUTION',]),
     body('name').notEmpty().trim(),
     body('email').optional().isEmail(),
     body('source').notEmpty(),
@@ -57,7 +58,29 @@ router.put(
   authorize('contacts', 'contacts', 'update'),
   [
     param('id').isUUID(),
-    body('email').optional().isEmail(),
+    body('type')
+      .optional()
+      .isIn([
+        'INDIVIDUAL',
+        'COMPANY',
+        'HOLDING',
+        'GOVERNMENT',
+        'ORGANIZATION',
+        'EMBASSIES',
+        'BANK',
+        'UNIVERSITY',
+        'SCHOOL',
+        'UN',
+        'NGO',
+        'INSTITUTION',
+      ]),
+    body('email')
+      .optional({ values: 'falsy' })
+      .custom((value) => {
+        if (value === null || value === undefined || value === '') return true
+        return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)
+      })
+      .withMessage('Invalid email format'),
     validate,
   ],
   contactsController.update

backend/src/modules/contacts/contacts.service.ts

@@ -328,46 +328,50 @@ class ContactsService {
 
     // Update contact
     const contact = await prisma.contact.update({
-      where: { id },
-      data: {
-        name: data.name,
-        nameAr: data.nameAr,
-        email: data.email,
-        phone: data.phone,
-        mobile: data.mobile,
-        website: data.website,
-        companyName: data.companyName,
-        companyNameAr: data.companyNameAr,
-        taxNumber: data.taxNumber,
-        commercialRegister: data.commercialRegister,
-        address: data.address,
-        city: data.city,
-        country: data.country,
-        postalCode: data.postalCode,
-        categories: data.categories ? {
-          set: data.categories.map(id => ({ id }))
-        } : undefined,
-        tags: data.tags,
-        employeeId: data.employeeId !== undefined ? (data.employeeId || null) : undefined,
-        source: data.source,
-        status: data.status,
-        rating: data.rating,
-        customFields: data.customFields,
+  where: { id },
+  data: {
+    type: data.type,
+    name: data.name,
+    nameAr: data.nameAr,
+    email: data.email === '' || data.email === undefined ? null : data.email,
+    phone: data.phone,
+    mobile: data.mobile,
+    website: data.website,
+    companyName: data.companyName,
+    companyNameAr: data.companyNameAr,
+    taxNumber: data.taxNumber,
+    commercialRegister: data.commercialRegister,
+    address: data.address,
+    city: data.city,
+    country: data.country,
+    postalCode: data.postalCode,
+    categories: data.categories
+      ? {
+          set: data.categories.map((id) => ({ id })),
+        }
+      : undefined,
+    tags: data.tags,
+    employeeId:
+      data.employeeId !== undefined ? (data.employeeId || null) : undefined,
+    source: data.source,
+    status: data.status,
+    rating: data.rating,
+    customFields: data.customFields,
+  },
+  include: {
+    categories: true,
+    parent: true,
+    employee: {
+      select: {
+        id: true,
+        firstName: true,
+        lastName: true,
+        email: true,
+        uniqueEmployeeId: true,
       },
-      include: {
-        categories: true,
-        parent: true,
-        employee: {
-          select: {
-            id: true,
-            firstName: true,
-            lastName: true,
-            email: true,
-            uniqueEmployeeId: true,
-          },
-        },
-      },
-    });
+    },
+  },
+});
 
     // Log audit
     await AuditLogger.log({
@@ -679,7 +683,7 @@ class ContactsService {
         }
 
         // Validate type
-        if (!['INDIVIDUAL', 'COMPANY', 'HOLDING', 'GOVERNMENT'].includes(row.type)) {
+        if (!['INDIVIDUAL', 'COMPANY', 'HOLDING', 'GOVERNMENT',  'ORGANIZATION','EMBASSIES','BANK','UNIVERSITY','SCHOOL','UN','NGO','INSTITUTION',].includes(row.type)) {
           results.errors.push({
             row: rowNumber,
             field: 'type',

backend/src/modules/hr/hr.routes.ts

@@ -14,6 +14,46 @@ router.post('/portal/loans', portalController.submitLoanRequest);
 router.get('/portal/leave-balance', portalController.getMyLeaveBalance);
 router.get('/portal/leaves', portalController.getMyLeaves);
 router.post('/portal/leaves', portalController.submitLeaveRequest);
+
+router.get(
+  '/portal/managed-leaves',
+  authorize('department_leave_requests', '*', 'read'),
+  portalController.getManagedLeaves
+);
+
+router.post(
+  '/portal/managed-leaves/:id/approve',
+  authorize('department_leave_requests', '*', 'approve'),
+  portalController.approveManagedLeave
+);
+
+router.post(
+  '/portal/managed-leaves/:id/reject',
+  authorize('department_leave_requests', '*', 'approve'),
+  portalController.rejectManagedLeave
+);
+
+router.get('/portal/overtime-requests', portalController.getMyOvertimeRequests);
+router.post('/portal/overtime-requests', portalController.submitOvertimeRequest);
+
+router.get(
+  '/portal/managed-overtime-requests',
+  authorize('department_overtime_requests', '*', 'view'),
+  portalController.getManagedOvertimeRequests
+);
+
+router.post(
+  '/portal/managed-overtime-requests/:attendanceId/approve',
+  authorize('department_overtime_requests', '*', 'approve'),
+  portalController.approveManagedOvertimeRequest
+);
+
+router.post(
+  '/portal/managed-overtime-requests/:attendanceId/reject',
+  authorize('department_overtime_requests', '*', 'approve'),
+  portalController.rejectManagedOvertimeRequest
+);
+
 router.get('/portal/purchase-requests', portalController.getMyPurchaseRequests);
 router.post('/portal/purchase-requests', portalController.submitPurchaseRequest);
 router.get('/portal/attendance', portalController.getMyAttendance);
@@ -87,4 +127,3 @@ router.post('/contracts', authorize('hr', 'all', 'create'), hrController.createE
 router.put('/contracts/:id', authorize('hr', 'all', 'update'), hrController.updateEmployeeContract);
 
 export default router;
-

backend/src/modules/hr/hr.service.ts

@@ -313,40 +313,54 @@ class HRService {
   // ========== LEAVES ==========
 
   async createLeaveRequest(data: any, userId: string) {
-    const days = this.calculateLeaveDays(data.startDate, data.endDate);
-    const startDate = new Date(data.startDate);
-    const year = startDate.getFullYear();
+  const allowedLeaveTypes = ['ANNUAL', 'HOURLY'];
 
-    const ent = await prisma.leaveEntitlement.findUnique({
-      where: { employeeId_year_leaveType: { employeeId: data.employeeId, year, leaveType: data.leaveType } },
-    });
-    if (ent) {
-      const available = ent.totalDays + ent.carriedOver - ent.usedDays;
-      if (days > available) {
-        throw new AppError(400, `رصيد الإجازة غير كافٍ - Insufficient leave balance. Available: ${available}, Requested: ${days}`);
-      }
-    }
-
-    const leave = await prisma.leave.create({
-      data: {
-        ...data,
-        days,
-      },
-      include: {
-        employee: true,
-      },
-    });
-
-    await AuditLogger.log({
-      entityType: 'LEAVE',
-      entityId: leave.id,
-      action: 'CREATE',
-      userId,
-    });
-
-    return leave;
+  if (!allowedLeaveTypes.includes(String(data.leaveType || '').toUpperCase())) {
+    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 year = startDate.getFullYear();
+
+  const ent = await prisma.leaveEntitlement.findUnique({
+    where: {
+      employeeId_year_leaveType: {
+        employeeId: data.employeeId,
+        year,
+        leaveType: normalizedLeaveType,
+      },
+    },
+  });
+
+  if (ent) {
+    const available = ent.totalDays + ent.carriedOver - ent.usedDays;
+    if (days > available) {
+      throw new AppError(400, `رصيد الإجازة غير كافٍ - Insufficient leave balance. Available: ${available}, Requested: ${days}`);
+    }
+  }
+
+  const leave = await prisma.leave.create({
+    data: {
+      ...data,
+      leaveType: normalizedLeaveType,
+      days,
+    },
+    include: {
+      employee: true,
+    },
+  });
+
+  await AuditLogger.log({
+    entityType: 'LEAVE',
+    entityId: leave.id,
+    action: 'CREATE',
+    userId,
+  });
+
+  return leave;
+}
   async approveLeave(id: string, approvedBy: string, userId: string) {
     const leave = await prisma.leave.update({
       where: { id },
@@ -418,6 +432,195 @@ class HRService {
     return { leaves, total, page, pageSize };
   }
 
+
+      private calculateLeaveHours(startDate: Date, endDate: Date) {
+    const diffMs = new Date(endDate).getTime() - new Date(startDate).getTime();
+    const diffHours = diffMs / (1000 * 60 * 60);
+    return diffHours > 0 ? diffHours : 0;
+  }
+
+  private async canManagerApproveLeave(leave: any) {
+    if (leave.leaveType === 'ANNUAL') {
+      const yearStart = new Date(new Date(leave.startDate).getFullYear(), 0, 1);
+      const yearEnd = new Date(new Date(leave.startDate).getFullYear(), 11, 31, 23, 59, 59, 999);
+
+      const approvedAnnualLeaves = await prisma.leave.findMany({
+        where: {
+          employeeId: leave.employeeId,
+          leaveType: 'ANNUAL',
+          status: 'APPROVED',
+          startDate: {
+            gte: yearStart,
+            lte: yearEnd,
+          },
+        },
+        select: {
+          id: true,
+          days: true,
+        },
+      });
+
+      const usedDays = approvedAnnualLeaves.reduce((sum, item) => sum + Number(item.days || 0), 0);
+      return usedDays + Number(leave.days || 0) <= 12;
+    }
+
+    if (leave.leaveType === 'HOURLY') {
+      const start = new Date(leave.startDate);
+      const monthStart = new Date(start.getFullYear(), start.getMonth(), 1);
+      const monthEnd = new Date(start.getFullYear(), start.getMonth() + 1, 0, 23, 59, 59, 999);
+
+      const approvedHourlyLeaves = await prisma.leave.findMany({
+        where: {
+          employeeId: leave.employeeId,
+          leaveType: 'HOURLY',
+          status: 'APPROVED',
+          startDate: {
+            gte: monthStart,
+            lte: monthEnd,
+          },
+        },
+        select: {
+          id: true,
+          startDate: true,
+          endDate: true,
+        },
+      });
+
+      const usedHours = approvedHourlyLeaves.reduce((sum, item) => {
+        return sum + this.calculateLeaveHours(item.startDate, item.endDate);
+      }, 0);
+
+      const requestedHours = this.calculateLeaveHours(leave.startDate, leave.endDate);
+      return usedHours + requestedHours <= 3;
+    }
+
+    return false;
+  }
+
+async findManagedLeaves(status?: string) {
+  const where: any = {};
+
+  if (status && status !== 'all') {
+    where.status = status;
+  }
+
+  return prisma.leave.findMany({
+    where,
+    include: {
+      employee: {
+        select: {
+          id: true,
+          firstName: true,
+          lastName: true,
+          uniqueEmployeeId: true,
+          reportingToId: true,
+        },
+      },
+    },
+    orderBy: {
+      createdAt: 'desc',
+    },
+    take: 100,
+  });
+}
+
+  async managerApproveLeave(id: string, userId: string) {
+  const leave = await prisma.leave.findUnique({
+    where: { id },
+    include: {
+      employee: {
+        select: {
+          id: true,
+          reportingToId: true,
+        },
+      },
+    },
+  });
+
+  if (!leave) {
+    throw new AppError(404, 'طلب الإجازة غير موجود - Leave request not found');
+  }
+
+  if (leave.status !== 'PENDING') {
+    throw new AppError(400, 'لا يمكن اعتماد طلب غير معلق - Only pending leave can be approved');
+  }
+
+  const canApprove = await this.canManagerApproveLeave(leave);
+  if (!canApprove) {
+    throw new AppError(403, 'الطلب يتجاوز صلاحية مدير القسم ويحتاج موافقة HR - This leave exceeds manager approval limits and requires HR approval');
+  }
+
+  const updated = await prisma.leave.update({
+    where: { id },
+    data: {
+      status: 'APPROVED',
+      approvedBy: userId,
+      approvedAt: new Date(),
+      rejectedReason: null,
+    },
+    include: {
+      employee: true,
+    },
+  });
+
+  const year = new Date(updated.startDate).getFullYear();
+  await this.updateLeaveEntitlementUsed(updated.employeeId, year, updated.leaveType, updated.days);
+
+  await AuditLogger.log({
+    entityType: 'LEAVE',
+    entityId: updated.id,
+    action: 'MANAGER_APPROVE',
+    userId,
+  });
+
+  return updated;
+}
+
+  async managerRejectLeave(id: string, rejectedReason: string, userId: string) {
+  const leave = await prisma.leave.findUnique({
+    where: { id },
+    include: {
+      employee: {
+        select: {
+          id: true,
+          reportingToId: true,
+        },
+      },
+    },
+  });
+
+  if (!leave) {
+    throw new AppError(404, 'طلب الإجازة غير موجود - Leave request not found');
+  }
+
+  if (leave.status !== 'PENDING') {
+    throw new AppError(400, 'لا يمكن رفض طلب غير معلق - Only pending leave can be rejected');
+  }
+
+  const updated = await prisma.leave.update({
+    where: { id },
+    data: {
+      status: 'REJECTED',
+      rejectedReason,
+      approvedBy: null,
+      approvedAt: null,
+    },
+    include: {
+      employee: true,
+    },
+  });
+
+  await AuditLogger.log({
+    entityType: 'LEAVE',
+    entityId: updated.id,
+    action: 'MANAGER_REJECT',
+    userId,
+    reason: rejectedReason,
+  });
+
+  return updated;
+}
+
   private async updateLeaveEntitlementUsed(employeeId: string, year: number, leaveType: string, days: number) {
     const ent = await prisma.leaveEntitlement.findUnique({
       where: { employeeId_year_leaveType: { employeeId, year, leaveType } },
@@ -534,94 +737,260 @@ class HRService {
     return `${prefix}${next.toString().padStart(4, '0')}`;
   }
 
-  async findAllLoans(filters: { employeeId?: string; status?: string }, page: number, pageSize: number) {
-    const skip = (page - 1) * pageSize;
-    const where: any = {};
-    if (filters.employeeId) where.employeeId = filters.employeeId;
-    if (filters.status && filters.status !== 'all') where.status = filters.status;
-    const [total, loans] = await Promise.all([
-      prisma.loan.count({ where }),
-      prisma.loan.findMany({
-        where,
-        skip,
-        take: pageSize,
-        include: { employee: { select: { id: true, firstName: true, lastName: true, uniqueEmployeeId: true } }, installmentsList: true },
-        orderBy: { createdAt: 'desc' },
-      }),
-    ]);
-    return { loans, total, page, pageSize };
-  }
+ async findAllLoans(filters: { employeeId?: string; status?: string }, page: number, pageSize: number) {
+  const skip = (page - 1) * pageSize;
+  const where: any = {};
+  if (filters.employeeId) where.employeeId = filters.employeeId;
+  if (filters.status && filters.status !== 'all') where.status = filters.status;
+
+  const [total, loans] = await Promise.all([
+    prisma.loan.count({ where }),
+    prisma.loan.findMany({
+      where,
+      skip,
+      take: pageSize,
+      include: {
+        employee: {
+          select: {
+            id: true,
+            firstName: true,
+            lastName: true,
+            uniqueEmployeeId: true,
+            basicSalary: true,
+            position: {
+              select: {
+                code: true,
+                title: true,
+                titleAr: true,
+              },
+            },
+          },
+        },
+        installmentsList: true,
+      },
+      orderBy: { createdAt: 'desc' },
+    }),
+  ]);
+
+  return { loans, total, page, pageSize };
+}
 
   async findLoanById(id: string) {
-    const loan = await prisma.loan.findUnique({
-      where: { id },
-      include: { employee: true, installmentsList: { orderBy: { installmentNumber: 'asc' } } },
-    });
-    if (!loan) throw new AppError(404, 'القرض غير موجود - Loan not found');
-    return loan;
-  }
+  const loan = await prisma.loan.findUnique({
+    where: { id },
+    include: {
+      employee: {
+        select: {
+          id: true,
+          firstName: true,
+          lastName: true,
+          uniqueEmployeeId: true,
+          basicSalary: true,
+          position: {
+            select: {
+              code: true,
+              title: true,
+              titleAr: true,
+            },
+          },
+        },
+      },
+      installmentsList: { orderBy: { installmentNumber: 'asc' } },
+    },
+  });
+
+  if (!loan) throw new AppError(404, 'القرض غير موجود - Loan not found');
+  return loan;
+}
+
+private isSystemAdminUser(user: any) {
+  const positionCode = user?.employee?.position?.code?.toUpperCase?.() || '';
+  const positionTitle = user?.employee?.position?.title?.toUpperCase?.() || '';
+  const positionTitleAr = user?.employee?.position?.titleAr || '';
+
+  return (
+    positionCode === 'SYS_ADMIN' ||
+    positionCode === 'SYSTEM_ADMIN' ||
+    positionTitle === 'SYSTEM ADMINISTRATOR' ||
+    positionTitleAr === 'مدير النظام'
+  );
+}
 
   async createLoan(data: { employeeId: string; type: string; amount: number; installments?: number; reason?: string }, userId: string) {
-    const loanNumber = await this.generateLoanNumber();
-    const installments = data.installments || 1;
-    const monthlyAmount = data.amount / installments;
-    const loan = await prisma.loan.create({
-      data: {
-        loanNumber,
-        employeeId: data.employeeId,
-        type: data.type,
-        amount: data.amount,
-        installments,
-        monthlyAmount,
-        reason: data.reason,
-        status: 'PENDING',
-      },
-      include: { employee: true },
-    });
-    await AuditLogger.log({ entityType: 'LOAN', entityId: loan.id, action: 'CREATE', userId });
-    return loan;
+  if (!data.reason || !data.reason.trim()) {
+    throw new AppError(400, 'سبب القرض مطلوب - Loan reason is required');
   }
 
+  if (!data.amount || Number(data.amount) <= 0) {
+    throw new AppError(400, 'مبلغ القرض غير صالح - Invalid loan amount');
+  }
+
+  const loanNumber = await this.generateLoanNumber();
+  const installments = data.installments || 1;
+  const monthlyAmount = data.amount / installments;
+
+  const loan = await prisma.loan.create({
+    data: {
+      loanNumber,
+      employeeId: data.employeeId,
+      type: data.type,
+      amount: data.amount,
+      installments,
+      monthlyAmount,
+      reason: data.reason.trim(),
+      status: 'PENDING_HR',
+    },
+    include: { employee: true },
+  });
+
+  await AuditLogger.log({ entityType: 'LOAN', entityId: loan.id, action: 'CREATE', userId });
+  return loan;
+}
+
   async approveLoan(id: string, approvedBy: string, startDate: Date, userId: string) {
-    const loan = await prisma.loan.findUnique({ where: { id }, include: { installmentsList: true } });
-    if (!loan) throw new AppError(404, 'القرض غير موجود - Loan not found');
-    if (loan.status !== 'PENDING') throw new AppError(400, 'لا يمكن الموافقة على قرض غير معلق - Cannot approve non-pending loan');
+  const loan = await prisma.loan.findUnique({
+    where: { id },
+    include: {
+      installmentsList: true,
+      employee: {
+        select: {
+          id: true,
+          basicSalary: true,
+        },
+      },
+    },
+  });
 
-    const monthlyAmount = Number(loan.monthlyAmount || loan.amount) / loan.installments;
-    const installments: { installmentNumber: number; dueDate: Date; amount: number }[] = [];
-    let d = new Date(startDate);
-    for (let i = 1; i <= loan.installments; i++) {
-      installments.push({ installmentNumber: i, dueDate: new Date(d), amount: monthlyAmount });
-      d.setMonth(d.getMonth() + 1);
-    }
-    const endDate = installments.length ? installments[installments.length - 1].dueDate : null;
-
-    await prisma.$transaction([
-      prisma.loan.update({
-        where: { id },
-        data: { status: 'ACTIVE', approvedBy, approvedAt: new Date(), startDate, endDate },
-      }),
-      ...installments.map((inst) =>
-        prisma.loanInstallment.create({
-          data: { loanId: id, installmentNumber: inst.installmentNumber, dueDate: inst.dueDate, amount: inst.amount, status: 'PENDING' },
-        })
-      ),
-    ]);
-
-    await AuditLogger.log({ entityType: 'LOAN', entityId: id, action: 'APPROVE', userId });
-    return this.findLoanById(id);
+  if (!loan) {
+    throw new AppError(404, 'القرض غير موجود - Loan not found');
   }
 
+  if (!['PENDING_HR', 'PENDING_ADMIN'].includes(loan.status)) {
+    throw new AppError(400, 'لا يمكن الموافقة على هذا القرض بهذه الحالة - Cannot approve this loan in current status');
+  }
+
+  const approverUser = await prisma.user.findUnique({
+    where: { id: approvedBy },
+    include: {
+      employee: {
+        include: {
+          position: true,
+        },
+      },
+    },
+  });
+
+  if (!approverUser) {
+    throw new AppError(404, 'المستخدم غير موجود - User not found');
+  }
+
+  const isSystemAdmin = this.isSystemAdminUser(approverUser);
+  const basicSalary = Number(loan.employee?.basicSalary || 0);
+  const loanAmount = Number(loan.amount || 0);
+  const needsAdminApproval = basicSalary > 0 && loanAmount > basicSalary * 0.5;
+
+  // المرحلة الأولى: HR approval
+  if (loan.status === 'PENDING_HR') {
+    if (needsAdminApproval) {
+      const updatedLoan = await prisma.loan.update({
+        where: { id },
+        data: {
+          status: 'PENDING_ADMIN',
+        },
+      });
+
+      await AuditLogger.log({
+        entityType: 'LOAN',
+        entityId: id,
+        action: 'HR_APPROVE_FORWARD_TO_ADMIN',
+        userId,
+      });
+
+      return updatedLoan;
+    }
+  }
+
+  // المرحلة الثانية: Admin approval إذا تجاوز 50%
+  if (loan.status === 'PENDING_ADMIN' && !isSystemAdmin) {
+    throw new AppError(403, 'هذا الطلب يحتاج موافقة مدير النظام - System Administrator approval required');
+  }
+
+  const monthlyAmount = Number(loan.monthlyAmount || loan.amount) / loan.installments;
+  const installments: { installmentNumber: number; dueDate: Date; amount: number }[] = [];
+  let d = new Date(startDate);
+
+  for (let i = 1; i <= loan.installments; i++) {
+    installments.push({
+      installmentNumber: i,
+      dueDate: new Date(d),
+      amount: monthlyAmount,
+    });
+    d.setMonth(d.getMonth() + 1);
+  }
+
+  const endDate = installments.length ? installments[installments.length - 1].dueDate : null;
+
+  await prisma.$transaction([
+    prisma.loan.update({
+      where: { id },
+      data: {
+        status: 'ACTIVE',
+        approvedBy,
+        approvedAt: new Date(),
+        startDate,
+        endDate,
+      },
+    }),
+    ...installments.map((inst) =>
+      prisma.loanInstallment.create({
+        data: {
+          loanId: id,
+          installmentNumber: inst.installmentNumber,
+          dueDate: inst.dueDate,
+          amount: inst.amount,
+          status: 'PENDING',
+        },
+      })
+    ),
+  ]);
+
+  await AuditLogger.log({
+    entityType: 'LOAN',
+    entityId: id,
+    action: loan.status === 'PENDING_ADMIN' ? 'ADMIN_APPROVE' : 'APPROVE',
+    userId,
+  });
+
+  return this.findLoanById(id);
+}
+
   async rejectLoan(id: string, rejectedReason: string, userId: string) {
-    const loan = await prisma.loan.update({
-      where: { id },
-      data: { status: 'REJECTED', rejectedReason },
-      include: { employee: true },
-    });
-    await AuditLogger.log({ entityType: 'LOAN', entityId: id, action: 'REJECT', userId, reason: rejectedReason });
-    return loan;
+  const existing = await prisma.loan.findUnique({ where: { id } });
+
+  if (!existing) {
+    throw new AppError(404, 'القرض غير موجود - Loan not found');
   }
 
+  if (!['PENDING_HR', 'PENDING_ADMIN'].includes(existing.status)) {
+    throw new AppError(400, 'لا يمكن رفض هذا القرض بهذه الحالة - Cannot reject this loan in current status');
+  }
+
+  const loan = await prisma.loan.update({
+    where: { id },
+    data: { status: 'REJECTED', rejectedReason },
+    include: { employee: true },
+  });
+
+  await AuditLogger.log({
+    entityType: 'LOAN',
+    entityId: id,
+    action: 'REJECT',
+    userId,
+    reason: rejectedReason,
+  });
+
+  return loan;
+}
   async recordLoanInstallmentPayment(loanId: string, installmentId: string, paidDate: Date, userId: string) {
     await prisma.loanInstallment.update({
       where: { id: installmentId },
@@ -751,16 +1120,41 @@ class HRService {
     });
   }
 
-  async upsertLeaveEntitlement(data: { employeeId: string; year: number; leaveType: string; totalDays: number; carriedOver?: number; notes?: string }, userId: string) {
-    const ent = await prisma.leaveEntitlement.upsert({
-      where: { employeeId_year_leaveType: { employeeId: data.employeeId, year: data.year, leaveType: data.leaveType } },
-      create: { employeeId: data.employeeId, year: data.year, leaveType: data.leaveType, totalDays: data.totalDays, carriedOver: data.carriedOver || 0, notes: data.notes },
-      update: { totalDays: data.totalDays, carriedOver: data.carriedOver ?? undefined, notes: data.notes },
-    });
-    await AuditLogger.log({ entityType: 'LEAVE_ENTITLEMENT', entityId: ent.id, action: 'UPSERT', userId });
-    return ent;
+ async upsertLeaveEntitlement(data: { employeeId: string; year: number; leaveType: string; totalDays: number; carriedOver?: number; notes?: string }, userId: string) {
+  const allowedLeaveTypes = ['ANNUAL', 'HOURLY'];
+  const normalizedLeaveType = String(data.leaveType || '').toUpperCase();
+
+  if (!allowedLeaveTypes.includes(normalizedLeaveType)) {
+    throw new AppError(400, 'نوع رصيد الإجازة غير مدعوم - Only ANNUAL and HOURLY leave entitlement types are allowed');
   }
 
+  const ent = await prisma.leaveEntitlement.upsert({
+    where: {
+      employeeId_year_leaveType: {
+        employeeId: data.employeeId,
+        year: data.year,
+        leaveType: normalizedLeaveType,
+      },
+    },
+    create: {
+      employeeId: data.employeeId,
+      year: data.year,
+      leaveType: normalizedLeaveType,
+      totalDays: data.totalDays,
+      carriedOver: data.carriedOver || 0,
+      notes: data.notes,
+    },
+    update: {
+      totalDays: data.totalDays,
+      carriedOver: data.carriedOver ?? undefined,
+      notes: data.notes,
+    },
+  });
+
+  await AuditLogger.log({ entityType: 'LEAVE_ENTITLEMENT', entityId: ent.id, action: 'UPSERT', userId });
+  return ent;
+}
+
   // ========== EMPLOYEE CONTRACTS ==========
 
   private async generateContractNumber(): Promise<string> {

backend/src/modules/hr/portal.controller.ts

@@ -49,6 +49,100 @@ export class PortalController {
       next(error);
     }
   }
+  async getManagedLeaves(req: AuthRequest, res: Response, next: NextFunction) {
+    try {
+      const status = req.query.status as string | undefined;
+      const leaves = await portalService.getManagedLeaves(req.user?.employeeId, status);
+      res.json(ResponseFormatter.success(leaves));
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  async approveManagedLeave(req: AuthRequest, res: Response, next: NextFunction) {
+    try {
+      const leave = await portalService.approveManagedLeave(req.user?.employeeId, req.params.id, req.user!.id);
+      res.json(ResponseFormatter.success(leave, 'تمت الموافقة على الإجازة من قبل مدير القسم - Leave approved by department manager'));
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  async rejectManagedLeave(req: AuthRequest, res: Response, next: NextFunction) {
+    try {
+      const { rejectedReason } = req.body;
+      const leave = await portalService.rejectManagedLeave(
+        req.user?.employeeId,
+        req.params.id,
+        rejectedReason || '',
+        req.user!.id
+      );
+      res.json(ResponseFormatter.success(leave, 'تم رفض طلب الإجازة من قبل مدير القسم - Leave rejected by department manager'));
+    } catch (error) {
+      next(error);
+    }
+  }
+
+
+  async getMyOvertimeRequests(req: AuthRequest, res: Response, next: NextFunction) {
+    try {
+      const data = await portalService.getMyOvertimeRequests(req.user?.employeeId);
+      res.json(ResponseFormatter.success(data));
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  async submitOvertimeRequest(req: AuthRequest, res: Response, next: NextFunction) {
+    try {
+      const data = {
+        date: req.body.date,
+        hours: req.body.hours,
+        reason: req.body.reason,
+      };
+
+      const result = await portalService.submitOvertimeRequest(req.user?.employeeId, data, req.user!.id);
+      res.status(201).json(ResponseFormatter.success(result, 'تم إرسال طلب الساعات الإضافية'));
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  async getManagedOvertimeRequests(req: AuthRequest, res: Response, next: NextFunction) {
+    try {
+      const data = await portalService.getManagedOvertimeRequests(req.user?.employeeId);
+      res.json(ResponseFormatter.success(data));
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  async approveManagedOvertimeRequest(req: AuthRequest, res: Response, next: NextFunction) {
+    try {
+      const result = await portalService.approveManagedOvertimeRequest(
+        req.user?.employeeId,
+        req.params.attendanceId,
+        req.user!.id
+      );
+      res.json(ResponseFormatter.success(result, 'تمت الموافقة على طلب الساعات الإضافية'));
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  async rejectManagedOvertimeRequest(req: AuthRequest, res: Response, next: NextFunction) {
+    try {
+      const result = await portalService.rejectManagedOvertimeRequest(
+        req.user?.employeeId,
+        req.params.attendanceId,
+        req.body.rejectedReason || '',
+        req.user!.id
+      );
+      res.json(ResponseFormatter.success(result, 'تم رفض طلب الساعات الإضافية'));
+    } catch (error) {
+      next(error);
+    }
+  }
 
   async submitLeaveRequest(req: AuthRequest, res: Response, next: NextFunction) {
     try {

backend/src/modules/hr/portal.service.ts

@@ -26,7 +26,10 @@ class PortalService {
         position: { select: { title: true, titleAr: true } },
       },
     });
-    if (!employee) throw new AppError(404, 'الموظف غير موجود - Employee not found');
+
+    if (!employee) {
+      throw new AppError(404, 'الموظف غير موجود - Employee not found');
+    }
 
     const [loansCount, pendingLeaves, pendingPurchaseRequests, leaveBalance] = await Promise.all([
       prisma.loan.count({ where: { employeeId: empId, status: { in: ['PENDING', 'ACTIVE'] } } }),
@@ -46,6 +49,66 @@ class PortalService {
     };
   }
 
+  private buildOvertimeRequestNote(
+    hours: number,
+    reason: string,
+    status: 'PENDING' | 'APPROVED' | 'REJECTED',
+    rejectedReason?: string
+  ) {
+    const safeReason = String(reason || '').replace(/\|/g, '/').trim();
+    const safeRejectedReason = String(rejectedReason || '').replace(/\|/g, '/').trim();
+
+    let note = `OT_REQUEST|status=${status}|hours=${hours}|reason=${safeReason}`;
+    if (status === 'REJECTED' && safeRejectedReason) {
+      note += `|rejectedReason=${safeRejectedReason}`;
+    }
+    return note;
+  }
+
+  private isOvertimeRequestNote(notes?: string | null) {
+    return !!notes && notes.startsWith('OT_REQUEST|');
+  }
+
+  private parseOvertimeRequestNote(notes?: string | null) {
+    if (!notes || !notes.startsWith('OT_REQUEST|')) return null;
+
+    const parts = notes.split('|');
+    const data: Record<string, string> = {};
+
+    for (const part of parts.slice(1)) {
+      const idx = part.indexOf('=');
+      if (idx > -1) {
+        const key = part.slice(0, idx);
+        const value = part.slice(idx + 1);
+        data[key] = value;
+      }
+    }
+
+    return {
+      status: data.status || 'PENDING',
+      hours: Number(data.hours || 0),
+      reason: data.reason || '',
+      rejectedReason: data.rejectedReason || '',
+    };
+  }
+
+  private formatOvertimeRequest(attendance: any) {
+    const parsed = this.parseOvertimeRequestNote(attendance.notes);
+    if (!parsed) return null;
+
+    return {
+      id: attendance.id,
+      attendanceId: attendance.id,
+      date: attendance.date,
+      hours: parsed.hours || Number(attendance.overtimeHours || 0),
+      reason: parsed.reason,
+      status: parsed.status,
+      rejectedReason: parsed.rejectedReason || '',
+      createdAt: attendance.createdAt,
+      employee: attendance.employee,
+    };
+  }
+
   async getMyLoans(employeeId: string | undefined) {
     const empId = this.requireEmployeeId(employeeId);
     return prisma.loan.findMany({
@@ -55,7 +118,268 @@ class PortalService {
     });
   }
 
-  async submitLoanRequest(employeeId: string | undefined, data: { type: string; amount: number; installments?: number; reason?: string }, userId: string) {
+  async getMyOvertimeRequests(employeeId: string | undefined) {
+    const empId = this.requireEmployeeId(employeeId);
+
+    const rows = await prisma.attendance.findMany({
+      where: {
+        employeeId: empId,
+        notes: {
+          startsWith: 'OT_REQUEST|',
+        },
+      },
+      orderBy: {
+        date: 'desc',
+      },
+      take: 100,
+    });
+
+    return rows
+      .map((row) => this.formatOvertimeRequest(row))
+      .filter(Boolean);
+  }
+
+  async submitOvertimeRequest(
+    employeeId: string | undefined,
+    data: { date: string; hours: number; reason: string },
+    userId: string
+  ) {
+    const empId = this.requireEmployeeId(employeeId);
+
+    if (!data.date) {
+      throw new AppError(400, 'تاريخ الساعات الإضافية مطلوب');
+    }
+
+    if (!data.hours || Number(data.hours) <= 0) {
+      throw new AppError(400, 'عدد الساعات غير صالح');
+    }
+
+    if (!data.reason || !data.reason.trim()) {
+      throw new AppError(400, 'سبب الساعات الإضافية مطلوب');
+    }
+
+    const requestDate = new Date(data.date);
+    const note = this.buildOvertimeRequestNote(Number(data.hours), data.reason.trim(), 'PENDING');
+
+    const existing = await prisma.attendance.findFirst({
+      where: {
+        employeeId: empId,
+        date: requestDate,
+      },
+    });
+
+    let attendance;
+
+    if (existing) {
+      attendance = await prisma.attendance.update({
+        where: { id: existing.id },
+        data: {
+          overtimeHours: Number(data.hours),
+          notes: note,
+        },
+        include: {
+          employee: {
+            select: {
+              id: true,
+              firstName: true,
+              lastName: true,
+              uniqueEmployeeId: true,
+              reportingToId: true,
+            },
+          },
+        },
+      });
+    } else {
+      attendance = await prisma.attendance.create({
+        data: {
+          employeeId: empId,
+          date: requestDate,
+          status: 'PRESENT',
+          overtimeHours: Number(data.hours),
+          notes: note,
+        },
+        include: {
+          employee: {
+            select: {
+              id: true,
+              firstName: true,
+              lastName: true,
+              uniqueEmployeeId: true,
+              reportingToId: true,
+            },
+          },
+        },
+      });
+    }
+
+    return this.formatOvertimeRequest(attendance);
+  }
+
+  async getManagedOvertimeRequests(employeeId: string | undefined) {
+  this.requireEmployeeId(employeeId);
+
+  const rows = await prisma.attendance.findMany({
+    where: {
+      notes: {
+        startsWith: 'OT_REQUEST|',
+      },
+    },
+    include: {
+      employee: {
+        select: {
+          id: true,
+          firstName: true,
+          lastName: true,
+          uniqueEmployeeId: true,
+          reportingToId: true,
+        },
+      },
+    },
+    orderBy: {
+      date: 'desc',
+    },
+    take: 100,
+  });
+
+  return rows
+    .map((row) => this.formatOvertimeRequest(row))
+    .filter((row: any) => row && row.status === 'PENDING');
+}
+
+  async approveManagedOvertimeRequest(
+  managerEmployeeId: string | undefined,
+  attendanceId: string,
+  userId: string
+) {
+  this.requireEmployeeId(managerEmployeeId);
+
+  const attendance = await prisma.attendance.findUnique({
+    where: { id: attendanceId },
+    include: {
+      employee: {
+        select: {
+          id: true,
+          reportingToId: true,
+          firstName: true,
+          lastName: true,
+          uniqueEmployeeId: true,
+        },
+      },
+    },
+  });
+
+  if (!attendance) {
+    throw new AppError(404, 'طلب الساعات الإضافية غير موجود');
+  }
+
+  if (!this.isOvertimeRequestNote(attendance.notes)) {
+    throw new AppError(400, 'هذا السجل ليس طلب ساعات إضافية');
+  }
+
+  const parsed = this.parseOvertimeRequestNote(attendance.notes);
+  if (!parsed || parsed.status !== 'PENDING') {
+    throw new AppError(400, 'هذا الطلب ليس بحالة معلقة');
+  }
+
+  const updatedNote = this.buildOvertimeRequestNote(parsed.hours, parsed.reason, 'APPROVED');
+
+  const updated = await prisma.attendance.update({
+    where: { id: attendanceId },
+    data: {
+      overtimeHours: parsed.hours,
+      notes: updatedNote,
+    },
+    include: {
+      employee: {
+        select: {
+          id: true,
+          firstName: true,
+          lastName: true,
+          uniqueEmployeeId: true,
+          reportingToId: true,
+        },
+      },
+    },
+  });
+
+  return this.formatOvertimeRequest(updated);
+}
+
+
+ async rejectManagedOvertimeRequest(
+  managerEmployeeId: string | undefined,
+  attendanceId: string,
+  rejectedReason: string,
+  userId: string
+) {
+  this.requireEmployeeId(managerEmployeeId);
+
+  if (!rejectedReason || !rejectedReason.trim()) {
+    throw new AppError(400, 'سبب الرفض مطلوب');
+  }
+
+  const attendance = await prisma.attendance.findUnique({
+    where: { id: attendanceId },
+    include: {
+      employee: {
+        select: {
+          id: true,
+          reportingToId: true,
+          firstName: true,
+          lastName: true,
+          uniqueEmployeeId: true,
+        },
+      },
+    },
+  });
+
+  if (!attendance) {
+    throw new AppError(404, 'طلب الساعات الإضافية غير موجود');
+  }
+
+  if (!this.isOvertimeRequestNote(attendance.notes)) {
+    throw new AppError(400, 'هذا السجل ليس طلب ساعات إضافية');
+  }
+
+  const parsed = this.parseOvertimeRequestNote(attendance.notes);
+  if (!parsed || parsed.status !== 'PENDING') {
+    throw new AppError(400, 'هذا الطلب ليس بحالة معلقة');
+  }
+
+  const updatedNote = this.buildOvertimeRequestNote(
+    parsed.hours,
+    parsed.reason,
+    'REJECTED',
+    rejectedReason.trim()
+  );
+
+  const updated = await prisma.attendance.update({
+    where: { id: attendanceId },
+    data: {
+      notes: updatedNote,
+    },
+    include: {
+      employee: {
+        select: {
+          id: true,
+          firstName: true,
+          lastName: true,
+          uniqueEmployeeId: true,
+          reportingToId: true,
+        },
+      },
+    },
+  });
+
+  return this.formatOvertimeRequest(updated);
+}
+
+
+  async submitLoanRequest(
+    employeeId: string | undefined,
+    data: { type: string; amount: number; installments?: number; reason?: string },
+    userId: string
+  ) {
     const empId = this.requireEmployeeId(employeeId);
     return hrService.createLoan({ ...data, employeeId: empId }, userId);
   }
@@ -75,7 +399,31 @@ class PortalService {
     });
   }
 
-  async submitLeaveRequest(employeeId: string | undefined, data: { leaveType: string; startDate: Date; endDate: Date; reason?: string }, userId: string) {
+  async getManagedLeaves(employeeId: string | undefined, status?: string) {
+    this.requireEmployeeId(employeeId);
+    return hrService.findManagedLeaves(status);
+  }
+
+  async approveManagedLeave(employeeId: string | undefined, leaveId: string, userId: string) {
+    this.requireEmployeeId(employeeId);
+    return hrService.managerApproveLeave(leaveId, userId);
+  }
+
+  async rejectManagedLeave(
+    employeeId: string | undefined,
+    leaveId: string,
+    rejectedReason: string,
+    userId: string
+  ) {
+    this.requireEmployeeId(employeeId);
+    return hrService.managerRejectLeave(leaveId, rejectedReason, userId);
+  }
+
+  async submitLeaveRequest(
+    employeeId: string | undefined,
+    data: { leaveType: string; startDate: Date; endDate: Date; reason?: string },
+    userId: string
+  ) {
     const empId = this.requireEmployeeId(employeeId);
     return hrService.createLeaveRequest({ ...data, employeeId: empId }, userId);
   }
@@ -88,7 +436,11 @@ class PortalService {
     });
   }
 
-  async submitPurchaseRequest(employeeId: string | undefined, data: { items: any[]; reason?: string; priority?: string }, userId: string) {
+  async submitPurchaseRequest(
+    employeeId: string | undefined,
+    data: { items: any[]; reason?: string; priority?: string },
+    userId: string
+  ) {
     const empId = this.requireEmployeeId(employeeId);
     return hrService.createPurchaseRequest({ ...data, employeeId: empId }, userId);
   }

backend/src/modules/tenders/tenders.controller.ts

@@ -227,6 +227,39 @@ export class TendersController {
       next(error);
     }
   }
-}
+
+
+
+  async viewAttachment(req: AuthRequest, res: Response, next: NextFunction) {
+    try {
+      const file = await tendersService.getAttachmentFile(req.params.attachmentId)
+
+      const fs = require('fs')
+      if (!fs.existsSync(file)) {
+        return res.status(404).json(
+          ResponseFormatter.error('File not found', 'الملف غير موجود')
+        )
+      }
+
+      const path = require('path')
+      return res.sendFile(path.resolve(file))
+
+    } catch (error) {
+      console.error(error) 
+      next(error)
+    }
+  }
+
+  async deleteAttachment(req: AuthRequest, res: Response, next: NextFunction) {
+    try {
+      await tendersService.deleteAttachment(req.params.attachmentId)
+      res.json(ResponseFormatter.success(null, 'Deleted'))
+    } catch (error) {
+      next(error)
+    }
+  }
+  }
 
 export const tendersController = new TendersController();
+
+

backend/src/modules/tenders/tenders.routes.ts

@@ -28,6 +28,15 @@ const upload = multer({
   limits: { fileSize: config.upload.maxFileSize },
 });
 
+
+// View attachment
+router.get(
+  '/attachments/:attachmentId/view',
+  param('attachmentId').isUUID(),
+  validate,
+  tendersController.viewAttachment
+)
+
 router.use(authenticate);
 
 // Enum/lookup routes (no resource id) - place before /:id routes
@@ -173,3 +182,14 @@ router.post(
 );
 
 export default router;
+
+
+
+// Delete attachment
+router.delete(
+  '/attachments/:attachmentId',
+  authorize('tenders', 'tenders', 'update'),
+  param('attachmentId').isUUID(),
+  validate,
+  tendersController.deleteAttachment
+)

backend/src/modules/tenders/tenders.service.ts

@@ -3,6 +3,8 @@ import { AppError } from '../../shared/middleware/errorHandler';
 import { AuditLogger } from '../../shared/utils/auditLogger';
 import { Prisma } from '@prisma/client';
 import path from 'path';
+  import fs from 'fs'
+
 
 const TENDER_SOURCE_VALUES = [
   'GOVERNMENT_SITE',
@@ -33,18 +35,31 @@ export interface CreateTenderData {
   issuingBodyName: string;
   title: string;
   tenderNumber: string;
+
   termsValue: number;
   bondValue: number;
+
+  // new extra fields stored inside notes metadata
+  initialBondValue?: number;
+  finalBondValue?: number;
+  finalBondRefundPeriod?: string;
+  siteVisitRequired?: boolean;
+  siteVisitLocation?: string;
+  termsPickupProvince?: string;
+
   announcementDate: string;
   closingDate: string;
   announcementLink?: string;
+
   source: string;
   sourceOther?: string;
   announcementType: string;
+
   notes?: string;
   contactId?: string;
 }
 
+
 export interface CreateDirectiveData {
   type: string;
   notes?: string;
@@ -71,12 +86,92 @@ class TendersService {
     return `TND-${year}-${seq}`;
   }
 
+    private readonly EXTRA_META_START = '[EXTRA_TENDER_META]';
+  private readonly EXTRA_META_END = '[/EXTRA_TENDER_META]';
+
+  private extractTenderExtraMeta(notes?: string | null) {
+    if (!notes) {
+      return {
+        cleanNotes: '',
+        meta: {},
+      };
+    }
+
+    const start = notes.indexOf(this.EXTRA_META_START);
+    const end = notes.indexOf(this.EXTRA_META_END);
+
+    if (start === -1 || end === -1 || end < start) {
+      return {
+        cleanNotes: notes,
+        meta: {},
+      };
+    }
+
+    const jsonPart = notes.slice(start + this.EXTRA_META_START.length, end).trim();
+    const before = notes.slice(0, start).trim();
+    const after = notes.slice(end + this.EXTRA_META_END.length).trim();
+    const cleanNotes = [before, after].filter(Boolean).join('\n').trim();
+
+    try {
+      return {
+        cleanNotes,
+        meta: JSON.parse(jsonPart || '{}'),
+      };
+    } catch {
+      return {
+        cleanNotes: notes,
+        meta: {},
+      };
+    }
+  }
+
+  private buildTenderNotes(
+    plainNotes?: string | null,
+    extra?: {
+      initialBondValue?: number | null;
+      finalBondValue?: number | null;
+      finalBondRefundPeriod?: string | null;
+      siteVisitRequired?: boolean;
+      siteVisitLocation?: string | null;
+      termsPickupProvince?: string | null;
+    }
+  ) {
+    const cleanedNotes = plainNotes?.trim() || '';
+
+    const meta = {
+      initialBondValue: extra?.initialBondValue ?? null,
+      finalBondValue: extra?.finalBondValue ?? null,
+      finalBondRefundPeriod: extra?.finalBondRefundPeriod?.trim() || null,
+      siteVisitRequired: !!extra?.siteVisitRequired,
+      siteVisitLocation: extra?.siteVisitLocation?.trim() || null,
+      termsPickupProvince: extra?.termsPickupProvince?.trim() || null,
+    };
+
+    const metaBlock = `${this.EXTRA_META_START}${JSON.stringify(meta)}${this.EXTRA_META_END}`;
+
+    return cleanedNotes ? `${cleanedNotes}\n${metaBlock}` : metaBlock;
+  }
+
+  private mapTenderExtraFields<T extends { notes?: string | null; bondValue?: any }>(tender: T) {
+    const { cleanNotes, meta } = this.extractTenderExtraMeta(tender.notes);
+
+    return {
+      ...tender,
+      notes: cleanNotes || null,
+      initialBondValue: meta.initialBondValue ?? Number(tender.bondValue ?? 0),
+      finalBondValue: meta.finalBondValue ?? null,
+      finalBondRefundPeriod: meta.finalBondRefundPeriod ?? null,
+      siteVisitRequired: !!meta.siteVisitRequired,
+      siteVisitLocation: meta.siteVisitLocation ?? null,
+      termsPickupProvince: meta.termsPickupProvince ?? null,
+    };
+  }
+
   async findPossibleDuplicates(data: CreateTenderData): Promise<any[]> {
     const announcementDate = data.announcementDate ? new Date(data.announcementDate) : null;
     const closingDate = data.closingDate ? new Date(data.closingDate) : null;
     const termsValue = Number(data.termsValue);
-    const bondValue = Number(data.bondValue);
-
+    const bondValue = Number(data.initialBondValue ?? data.bondValue ?? 0);
     const where: Prisma.TenderWhereInput = {
       status: { not: 'CANCELLED' },
     };
@@ -135,20 +230,33 @@ class TendersService {
     const announcementDate = new Date(data.announcementDate);
     const closingDate = new Date(data.closingDate);
 
+    if (data.siteVisitRequired && !data.siteVisitLocation?.trim()) {
+      throw new AppError(400, 'مكان زيارة الموقع مطلوب عند اختيار زيارة موقع إجبارية');
+    }
+
+    const finalNotes = this.buildTenderNotes(data.notes, {
+      initialBondValue: data.initialBondValue ?? data.bondValue ?? 0,
+      finalBondValue: data.finalBondValue ?? null,
+      finalBondRefundPeriod: data.finalBondRefundPeriod ?? null,
+      siteVisitRequired: !!data.siteVisitRequired,
+      siteVisitLocation: data.siteVisitRequired ? data.siteVisitLocation ?? null : null,
+      termsPickupProvince: data.termsPickupProvince ?? null,
+    });
+
     const tender = await prisma.tender.create({
       data: {
         tenderNumber,
         issuingBodyName: data.issuingBodyName.trim(),
         title: data.title.trim(),
         termsValue: data.termsValue,
-        bondValue: data.bondValue,
+        bondValue: Number(data.initialBondValue ?? data.bondValue ?? 0),
         announcementDate,
         closingDate,
         announcementLink: data.announcementLink?.trim() || null,
         source: data.source,
         sourceOther: data.sourceOther?.trim() || null,
         announcementType: data.announcementType,
-        notes: data.notes?.trim() || null,
+        notes: finalNotes,
         contactId: data.contactId || null,
         createdById: userId,
       },
@@ -165,8 +273,10 @@ class TendersService {
       userId,
     });
 
-    return { tender, possibleDuplicates: possibleDuplicates.length ? possibleDuplicates : undefined };
-  }
+    return {
+      tender: this.mapTenderExtraFields(tender),
+      possibleDuplicates: possibleDuplicates.length ? possibleDuplicates.map((t) => this.mapTenderExtraFields(t)) : undefined,
+    };  }
 
   async findAll(filters: any, page: number, pageSize: number) {
     const skip = (page - 1) * pageSize;
@@ -195,7 +305,12 @@ class TendersService {
       },
       orderBy: { createdAt: 'desc' },
     });
-    return { tenders, total, page, pageSize };
+        return {
+      tenders: tenders.map((t) => this.mapTenderExtraFields(t)),
+      total,
+      page,
+      pageSize,
+    };
   }
 
   async findById(id: string) {
@@ -216,8 +331,8 @@ class TendersService {
         attachments: true,
       },
     });
-    if (!tender) throw new AppError(404, 'Tender not found');
-    return tender;
+        if (!tender) throw new AppError(404, 'Tender not found');
+       return this.mapTenderExtraFields(tender);
   }
 
   async update(id: string, data: Partial<CreateTenderData>, userId: string) {
@@ -228,17 +343,76 @@ class TendersService {
     }
 
     const updateData: Prisma.TenderUpdateInput = {};
+        const existingMapped = this.mapTenderExtraFields(existing as any);
+
+    const mergedExtra = {
+      initialBondValue:
+        data.initialBondValue !== undefined
+          ? Number(data.initialBondValue)
+          : existingMapped.initialBondValue ?? Number(existing.bondValue ?? 0),
+
+      finalBondValue:
+        data.finalBondValue !== undefined
+          ? Number(data.finalBondValue)
+          : existingMapped.finalBondValue ?? null,
+
+      finalBondRefundPeriod:
+        data.finalBondRefundPeriod !== undefined
+          ? data.finalBondRefundPeriod
+          : existingMapped.finalBondRefundPeriod ?? null,
+
+      siteVisitRequired:
+        data.siteVisitRequired !== undefined
+          ? !!data.siteVisitRequired
+          : !!existingMapped.siteVisitRequired,
+
+      siteVisitLocation:
+        data.siteVisitLocation !== undefined
+          ? data.siteVisitLocation
+          : existingMapped.siteVisitLocation ?? null,
+
+      termsPickupProvince:
+        data.termsPickupProvince !== undefined
+          ? data.termsPickupProvince
+          : existingMapped.termsPickupProvince ?? null,
+    };
+
+    if (mergedExtra.siteVisitRequired && !mergedExtra.siteVisitLocation?.trim()) {
+      throw new AppError(400, 'مكان زيارة الموقع مطلوب عند اختيار زيارة موقع إجبارية');
+    }
     if (data.title !== undefined) updateData.title = data.title.trim();
     if (data.issuingBodyName !== undefined) updateData.issuingBodyName = data.issuingBodyName.trim();
     if (data.termsValue !== undefined) updateData.termsValue = data.termsValue;
-    if (data.bondValue !== undefined) updateData.bondValue = data.bondValue;
+    if (data.bondValue !== undefined || data.initialBondValue !== undefined) {
+      updateData.bondValue = Number(data.initialBondValue ?? data.bondValue ?? existing.bondValue);
+    }
     if (data.announcementDate !== undefined) updateData.announcementDate = new Date(data.announcementDate);
     if (data.closingDate !== undefined) updateData.closingDate = new Date(data.closingDate);
     if (data.announcementLink !== undefined) updateData.announcementLink = data.announcementLink?.trim() || null;
     if (data.source !== undefined) updateData.source = data.source;
     if (data.sourceOther !== undefined) updateData.sourceOther = data.sourceOther?.trim() || null;
     if (data.announcementType !== undefined) updateData.announcementType = data.announcementType;
-    if (data.notes !== undefined) updateData.notes = data.notes?.trim() || null;
+    if (
+      data.notes !== undefined ||
+      data.initialBondValue !== undefined ||
+      data.finalBondValue !== undefined ||
+      data.finalBondRefundPeriod !== undefined ||
+      data.siteVisitRequired !== undefined ||
+      data.siteVisitLocation !== undefined ||
+      data.termsPickupProvince !== undefined
+    ) {
+      updateData.notes = this.buildTenderNotes(
+        data.notes !== undefined ? data.notes : existingMapped.notes,
+        {
+          initialBondValue: mergedExtra.initialBondValue,
+          finalBondValue: mergedExtra.finalBondValue,
+          finalBondRefundPeriod: mergedExtra.finalBondRefundPeriod,
+          siteVisitRequired: mergedExtra.siteVisitRequired,
+          siteVisitLocation: mergedExtra.siteVisitRequired ? mergedExtra.siteVisitLocation : null,
+          termsPickupProvince: mergedExtra.termsPickupProvince,
+        }
+      );
+    }
     if (data.contactId !== undefined) {
       updateData.contact = data.contactId
         ? { connect: { id: data.contactId } }
@@ -261,8 +435,8 @@ class TendersService {
       userId,
       changes: { before: existing, after: data },
     });
-    return tender;
-  }
+    return this.mapTenderExtraFields(tender);
+    }
 
   async createDirective(tenderId: string, data: CreateDirectiveData, userId: string) {
     const tender = await prisma.tender.findUnique({
@@ -518,6 +692,34 @@ class TendersService {
     return attachment;
   }
 
+    async getAttachmentFile(attachmentId: string): Promise<string> {
+    const attachment = await prisma.attachment.findUnique({
+      where: { id: attachmentId },
+    })
+
+    if (!attachment) throw new AppError(404, 'File not found')
+
+    return attachment.path
+  }
+
+  async deleteAttachment(attachmentId: string): Promise<void> {
+    const attachment = await prisma.attachment.findUnique({
+      where: { id: attachmentId },
+    })
+
+    if (!attachment) throw new AppError(404, 'File not found')
+
+    // حذف من الديسك
+    if (attachment.path && fs.existsSync(attachment.path)) {
+      fs.unlinkSync(attachment.path)
+    }
+
+    // حذف من DB
+    await prisma.attachment.delete({
+      where: { id: attachmentId },
+    })
+  }
+
   private async generateDealNumber(): Promise<string> {
     const year = new Date().getFullYear();
     const prefix = `DEAL-${year}-`;

docker-compose.yml

@@ -24,11 +24,13 @@ services:
       context: ./backend
       dockerfile: Dockerfile
     container_name: zerp_backend
-    restart: unless-stopped
+    restart: always
     environment:
       PORT: 5001
       NODE_ENV: production
-      DATABASE_URL: postgresql://postgres:${POSTGRES_PASSWORD:-postgres123}@postgres:5432/mind14_crm?schema=public
+      # Default matches postgres service when POSTGRES_PASSWORD is unset (local/staging).
+      # Override via `.env` (Compose loads `.env`, not `.env.production`).
+      DATABASE_URL: ${DATABASE_URL:-postgresql://postgres:${POSTGRES_PASSWORD:-postgres123}@postgres:5432/mind14_crm?schema=public}
       JWT_SECRET: ${JWT_SECRET:-z-crm-jwt-secret-change-in-production-NOW}
       JWT_EXPIRES_IN: 7d
       JWT_REFRESH_EXPIRES_IN: 30d
@@ -39,6 +41,12 @@ services:
         condition: service_healthy
     ports:
       - "5001:5001"
+    healthcheck:
+      test: ["CMD-SHELL", "wget -qO- http://localhost:5001/api/v1/health || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
     command: sh -c "npx prisma migrate deploy && node dist/server.js"
 
   frontend:

frontend/Dockerfile

@@ -37,10 +37,10 @@ ENV NEXT_TELEMETRY_DISABLED=1
 RUN addgroup --system --gid 1001 nodejs && \
     adduser --system --uid 1001 nextjs
 
-# Copy necessary files
-COPY --from=builder /app/public ./public
+# Standalone first, then static assets; public last so it is not overwritten by any nested folder in standalone.
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+COPY --from=builder --chown=nextjs:nodejs /app/public ./public
 
 USER nextjs
 

frontend/package.json

@@ -9,6 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
+    "@swc/helpers": "^0.5.21",
     "@tanstack/react-query": "^5.17.9",
     "axios": "^1.6.5",
     "date-fns": "^3.0.6",

frontend/src/app/admin/permission-groups/page.tsx

@@ -14,6 +14,8 @@ const MODULES = [
   { id: 'inventory', name: 'المخزون والأصول', nameEn: 'Inventory & Assets' },
   { id: 'projects', name: 'المهام والمشاريع', nameEn: 'Tasks & Projects' },
   { id: 'hr', name: 'الموارد البشرية', nameEn: 'HR Management' },
+  { id: 'department_leave_requests', name: 'طلبات إجازات القسم', nameEn: 'Department Leave Requests' },
+  { id: 'department_overtime_requests', name: 'طلبات الساعات الإضافية', nameEn: 'Department Overtime Requests' },
   { id: 'portal', name: 'البوابة الذاتية', nameEn: 'My Portal' },
   { id: 'marketing', name: 'التسويق', nameEn: 'Marketing' },
   { id: 'admin', name: 'لوحة الإدارة', nameEn: 'Admin' },

frontend/src/app/admin/roles/page.tsx

@@ -15,6 +15,8 @@ const MODULES = [
   { id: 'inventory', name: 'المخزون والأصول', nameEn: 'Inventory & Assets' },
   { id: 'projects', name: 'المهام والمشاريع', nameEn: 'Tasks & Projects' },
   { id: 'hr', name: 'الموارد البشرية', nameEn: 'HR Management' },
+  { id: 'department_leave_requests', name: 'طلبات إجازات القسم', nameEn: 'Department Leave Requests' },
+  { id: 'department_overtime_requests', name: 'طلبات الساعات الإضافية', nameEn: 'Department Overtime Requests' },
   { id: 'portal', name: 'البوابة الذاتية', nameEn: 'My Portal' },
   { id: 'marketing', name: 'التسويق', nameEn: 'Marketing' },
   { id: 'admin', name: 'لوحة الإدارة', nameEn: 'Admin' },

frontend/src/app/contacts/[id]/page.tsx

@@ -98,7 +98,15 @@ function ContactDetailContent() {
       INDIVIDUAL: 'bg-blue-100 text-blue-700',
       COMPANY: 'bg-green-100 text-green-700',
       HOLDING: 'bg-purple-100 text-purple-700',
-      GOVERNMENT: 'bg-orange-100 text-orange-700'
+      GOVERNMENT: 'bg-orange-100 text-orange-700',
+      ORGANIZATION: 'bg-cyan-100 text-cyan-700',
+      EMBASSIES: 'bg-red-100 text-red-700',
+      BANK: 'bg-emerald-100 text-emerald-700',
+      UNIVERSITY: 'bg-indigo-100 text-indigo-700',
+      SCHOOL: 'bg-yellow-100 text-yellow-700',
+      UN: 'bg-sky-100 text-sky-700',
+      NGO: 'bg-pink-100 text-pink-700',
+      INSTITUTION: 'bg-gray-100 text-gray-700'
     }
     return colors[type] || 'bg-gray-100 text-gray-700'
   }
@@ -108,7 +116,15 @@ function ContactDetailContent() {
       INDIVIDUAL: 'فرد - Individual',
       COMPANY: 'شركة - Company',
       HOLDING: 'مجموعة - Holding',
-      GOVERNMENT: 'حكومي - Government'
+      GOVERNMENT: 'حكومي - Government',
+      ORGANIZATION: 'منظمات - Organizations',
+      BANK: 'بنوك - Banks',
+      UNIVERSITY: 'جامعات - Universities',
+      EMBASSIES: 'سفارات - Embassies',
+      SCHOOL: 'مدارس - Schools',
+      UN: 'UN - United Nations',
+      NGO: 'NGO - Non-Governmental Organization',
+      INSTITUTION: 'مؤسسة - Institution'
     }
     return labels[type] || type
   }

frontend/src/app/contacts/page.tsx

@@ -41,20 +41,17 @@ function flattenCategories(cats: Category[], result: Category[] = []): Category[
 }
 
 function ContactsContent() {
-  // State Management
   const [contacts, setContacts] = useState<Contact[]>([])
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState<string | null>(null)
   const [selectedContacts, setSelectedContacts] = useState<Set<string>>(new Set())
   const [showBulkActions, setShowBulkActions] = useState(false)
 
-  // Pagination
   const [currentPage, setCurrentPage] = useState(1)
   const [totalPages, setTotalPages] = useState(1)
   const [total, setTotal] = useState(0)
   const pageSize = 10
 
-  // Filters
   const [searchTerm, setSearchTerm] = useState('')
   const [selectedType, setSelectedType] = useState('all')
   const [selectedStatus, setSelectedStatus] = useState('all')
@@ -64,7 +61,6 @@ function ContactsContent() {
   const [categories, setCategories] = useState<Category[]>([])
   const [showAdvancedFilters, setShowAdvancedFilters] = useState(false)
 
-  // Modals
   const [showCreateModal, setShowCreateModal] = useState(false)
   const [showEditModal, setShowEditModal] = useState(false)
   const [showDeleteDialog, setShowDeleteDialog] = useState(false)
@@ -75,7 +71,6 @@ function ContactsContent() {
   const [exporting, setExporting] = useState(false)
   const [exportExcludeCompanyEmployees, setExportExcludeCompanyEmployees] = useState(false)
 
-  // Fetch Contacts (with debouncing for search)
   const fetchContacts = useCallback(async () => {
     setLoading(true)
     setError(null)
@@ -104,21 +99,18 @@ function ContactsContent() {
     }
   }, [currentPage, searchTerm, selectedType, selectedStatus, selectedSource, selectedRating, selectedCategory])
 
-  // Debounced search
   useEffect(() => {
     const debounce = setTimeout(() => {
-      setCurrentPage(1) // Reset to page 1 on new search
+      setCurrentPage(1)
       fetchContacts()
     }, 500)
     return () => clearTimeout(debounce)
   }, [searchTerm])
 
-  // Fetch on filter/page change
   useEffect(() => {
     fetchContacts()
   }, [currentPage, selectedType, selectedStatus, selectedSource, selectedRating, selectedCategory])
 
-  // Create Contact
   const handleCreate = async (data: CreateContactData) => {
     setSubmitting(true)
     try {
@@ -136,7 +128,6 @@ function ContactsContent() {
     }
   }
 
-  // Edit Contact
   const handleEdit = async (data: UpdateContactData) => {
     if (!selectedContact) return
 
@@ -156,7 +147,6 @@ function ContactsContent() {
     }
   }
 
-  // Delete Contact
   const handleDelete = async () => {
     if (!selectedContact) return
 
@@ -175,7 +165,6 @@ function ContactsContent() {
     }
   }
 
-  // Utility Functions
   const resetForm = () => {
     setSelectedContact(null)
   }
@@ -195,7 +184,15 @@ function ContactsContent() {
       INDIVIDUAL: 'bg-blue-100 text-blue-700',
       COMPANY: 'bg-green-100 text-green-700',
       HOLDING: 'bg-purple-100 text-purple-700',
-      GOVERNMENT: 'bg-orange-100 text-orange-700'
+      GOVERNMENT: 'bg-orange-100 text-orange-700',
+      ORGANIZATION: 'bg-cyan-100 text-cyan-700',
+      EMBASSIES: 'bg-red-100 text-red-700',
+      BANK: 'bg-emerald-100 text-emerald-700',
+      UNIVERSITY: 'bg-indigo-100 text-indigo-700',
+      SCHOOL: 'bg-yellow-100 text-yellow-700',
+      UN: 'bg-sky-100 text-sky-700',
+      NGO: 'bg-pink-100 text-pink-700',
+      INSTITUTION: 'bg-gray-100 text-gray-700'
     }
     return colors[type] || 'bg-gray-100 text-gray-700'
   }
@@ -209,19 +206,53 @@ function ContactsContent() {
       INDIVIDUAL: 'فرد',
       COMPANY: 'شركة',
       HOLDING: 'مجموعة',
-      GOVERNMENT: 'حكومي'
+      GOVERNMENT: 'حكومي',
+      ORGANIZATION: 'منظمات',
+      EMBASSIES: 'سفارات',
+      BANK: 'بنوك',
+      UNIVERSITY: 'جامعات',
+      SCHOOL: 'مدارس',
+      UN: 'UN',
+      NGO: 'NGO',
+      INSTITUTION: 'مؤسسة'
     }
     return labels[type] || type
   }
 
+  const organizationTypes = new Set([
+    'COMPANY',
+    'HOLDING',
+    'GOVERNMENT',
+    'ORGANIZATION',
+    'EMBASSIES',
+    'BANK',
+    'UNIVERSITY',
+    'SCHOOL',
+    'UN',
+    'NGO',
+    'INSTITUTION',
+  ])
+
+  const isOrganizationContact = (contact: Contact) => organizationTypes.has(contact.type)
+
+  const getListContactName = (contact: Contact) => {
+    return contact.name || '-'
+  }
+
+  const getListCompanyName = (contact: Contact) => {
+    return contact.companyName || '-'
+  }
+
+  const getListContactNameAr = (contact: Contact) => {
+  return (contact as any).nameAr || ''
+}
 
   return (
     <div className="min-h-screen bg-gray-50">
-      {/* Header */}
       <header className="bg-white shadow-sm border-b">
         <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-4">
           <div className="flex items-center justify-between">
-            <div className="flex items-center gap-4">
+             <div className="flex items-center gap-4">
               <Link
                 href="/dashboard"
                 className="p-2 hover:bg-gray-100 rounded-lg transition-colors"
@@ -289,7 +320,6 @@ function ContactsContent() {
       </header>
 
       <main className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
-        {/* Stats Cards */}
         <div className="grid grid-cols-1 md:grid-cols-4 gap-6 mb-8">
           <div className="bg-white rounded-xl shadow-sm p-6 border border-gray-200">
             <div className="flex items-center justify-between">
@@ -344,12 +374,9 @@ function ContactsContent() {
           </div>
         </div>
 
-        {/* Filters and Search */}
         <div className="bg-white rounded-xl shadow-sm p-6 border border-gray-200 mb-6">
           <div className="space-y-4">
-            {/* Main Filters Row */}
             <div className="flex flex-col md:flex-row gap-4">
-              {/* Search */}
               <div className="flex-1 relative">
                 <Search className="absolute right-3 top-1/2 -translate-y-1/2 h-5 w-5 text-gray-400" />
                 <input
@@ -361,7 +388,6 @@ function ContactsContent() {
                 />
               </div>
 
-              {/* Type Filter */}
               <select
                 value={selectedType}
                 onChange={(e) => setSelectedType(e.target.value)}
@@ -372,9 +398,16 @@ function ContactsContent() {
                 <option value="COMPANY">Companies</option>
                 <option value="HOLDING">Holdings</option>
                 <option value="GOVERNMENT">Government</option>
+                <option value="ORGANIZATION">Organizations</option>
+                <option value="EMBASSIES">Embassies</option>
+                <option value="BANK">Banks</option>
+                <option value="UNIVERSITY">Universities</option>
+                <option value="SCHOOL">Schools</option>
+                <option value="UN">UN</option>
+                <option value="NGO">NGO</option>
+                <option value="INSTITUTION">Institution</option>
               </select>
 
-              {/* Status Filter */}
               <select
                 value={selectedStatus}
                 onChange={(e) => setSelectedStatus(e.target.value)}
@@ -385,7 +418,6 @@ function ContactsContent() {
                 <option value="INACTIVE">Inactive</option>
               </select>
 
-              {/* Advanced Filters Toggle */}
               <button
                 onClick={() => setShowAdvancedFilters(!showAdvancedFilters)}
                 className={`flex items-center gap-2 px-4 py-3 border rounded-lg transition-colors ${
@@ -399,11 +431,9 @@ function ContactsContent() {
               </button>
             </div>
 
-            {/* Advanced Filters */}
             {showAdvancedFilters && (
               <div className="pt-4 border-t border-gray-200">
                 <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-                  {/* Source Filter */}
                   <div>
                     <label className="block text-sm font-medium text-gray-700 mb-2">Source</label>
                     <select
@@ -423,7 +453,6 @@ function ContactsContent() {
                     </select>
                   </div>
 
-                  {/* Rating Filter */}
                   <div>
                     <label className="block text-sm font-medium text-gray-700 mb-2">Rating</label>
                     <select
@@ -440,7 +469,6 @@ function ContactsContent() {
                     </select>
                   </div>
 
-                  {/* Category Filter */}
                   <div>
                     <label className="block text-sm font-medium text-gray-700 mb-2">Category</label>
                     <select
@@ -455,7 +483,6 @@ function ContactsContent() {
                     </select>
                   </div>
 
-                  {/* Clear Filters */}
                   <div className="flex items-end">
                     <button
                       onClick={() => {
@@ -478,7 +505,6 @@ function ContactsContent() {
           </div>
         </div>
 
-        {/* Contacts Table */}
         <div className="bg-white rounded-xl shadow-sm border border-gray-200 overflow-hidden">
           {loading ? (
             <div className="p-12">
@@ -525,9 +551,9 @@ function ContactsContent() {
                           className="rounded border-gray-300 text-blue-600 focus:ring-blue-500"
                         />
                       </th>
-                      <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Contact</th>
-                      <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Contact Info</th>
                       <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Company</th>
+                      <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Contact Info</th>
+                      <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Contact</th>
                       <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Type</th>
                       <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Status</th>
                       <th className="px-6 py-4 text-right text-xs font-semibold text-gray-700 uppercase">Actions</th>
@@ -537,105 +563,119 @@ function ContactsContent() {
                     {contacts.map((contact) => {
                       const isSelected = selectedContacts.has(contact.id)
                       return (
-                      <tr key={contact.id} className={`hover:bg-gray-50 transition-colors ${isSelected ? 'bg-blue-50' : ''}`}>
-                        <td className="px-6 py-4 text-center">
-                          <input
-                            type="checkbox"
-                            checked={isSelected}
-                            onChange={(e) => {
-                              const newSelected = new Set(selectedContacts)
-                              if (e.target.checked) {
-                                newSelected.add(contact.id)
-                              } else {
-                                newSelected.delete(contact.id)
-                              }
-                              setSelectedContacts(newSelected)
-                            }}
-                            className="rounded border-gray-300 text-blue-600 focus:ring-blue-500"
-                          />
-                        </td>
+                        <tr key={contact.id} className={`hover:bg-gray-50 transition-colors ${isSelected ? 'bg-blue-50' : ''}`}>
+                          <td className="px-6 py-4 text-center">
+                            <input
+                              type="checkbox"
+                              checked={isSelected}
+                              onChange={(e) => {
+                                const newSelected = new Set(selectedContacts)
+                                if (e.target.checked) {
+                                  newSelected.add(contact.id)
+                                } else {
+                                  newSelected.delete(contact.id)
+                                }
+                                setSelectedContacts(newSelected)
+                              }}
+                              className="rounded border-gray-300 text-blue-600 focus:ring-blue-500"
+                            />
+                          </td>
+
+                          <td className="px-6 py-4">
+                            {getListCompanyName(contact) !== '-' && (
+                              <div className="flex items-center gap-2">
+                                <Building2 className="h-4 w-4 text-gray-400" />
+                                <span className="text-sm text-gray-900">
+                                  {getListCompanyName(contact)}
+                                </span>
+                              </div>
+                            )}
+                          </td>
+
+                          <td className="px-6 py-4">
+                            <div className="space-y-1">
+                              {contact.email && (
+                                <div className="flex items-center gap-2 text-sm text-gray-600">
+                                  <Mail className="h-4 w-4" />
+                                  {contact.email}
+                                </div>
+                              )}
+                              {(contact.phone || contact.mobile) && (
+                                <div className="flex items-center gap-2 text-sm text-gray-600">
+                                  <Phone className="h-4 w-4" />
+                                  {contact.phone || contact.mobile}
+                                </div>
+                              )}
+                            </div>
+                          </td>
+
                         <td className="px-6 py-4">
                           <div className="flex items-center gap-3">
                             <div className="h-10 w-10 rounded-full bg-gradient-to-br from-blue-500 to-blue-600 flex items-center justify-center text-white font-bold">
-                              {contact.name.charAt(0)}
+                              {getListContactName(contact).charAt(0)}
                             </div>
                             <div>
-                              <p className="font-semibold text-gray-900">{contact.name}</p>
-                              {contact.nameAr && <p className="text-sm text-gray-600">{contact.nameAr}</p>}
+                              <p className="font-semibold text-gray-900">
+                                {getListContactName(contact)}
+                              </p>
+                              {getListContactNameAr(contact) && (
+                                <p className="text-sm text-gray-600">
+                                  {getListContactNameAr(contact)}
+                                </p>
+                              )}
                             </div>
                           </div>
                         </td>
-                        <td className="px-6 py-4">
-                          <div className="space-y-1">
-                            {contact.email && (
-                              <div className="flex items-center gap-2 text-sm text-gray-600">
-                                <Mail className="h-4 w-4" />
-                                {contact.email}
-                              </div>
-                            )}
-                            {contact.phone && (
-                              <div className="flex items-center gap-2 text-sm text-gray-600">
-                                <Phone className="h-4 w-4" />
-                                {contact.phone}
-                              </div>
-                            )}
-                          </div>
-                        </td>
-                        <td className="px-6 py-4">
-                          {contact.companyName && (
+
+                          <td className="px-6 py-4">
+                            <span className={`inline-flex items-center gap-1 px-3 py-1 rounded-full text-xs font-medium ${getTypeColor(contact.type)}`}>
+                              <Tag className="h-3 w-3" />
+                              {getTypeLabel(contact.type)}
+                            </span>
+                          </td>
+
+                          <td className="px-6 py-4">
+                            <span className={`inline-flex items-center px-3 py-1 rounded-full text-xs font-medium ${
+                              contact.status === 'ACTIVE'
+                                ? 'bg-green-100 text-green-700'
+                                : 'bg-gray-100 text-gray-700'
+                            }`}>
+                              {contact.status === 'ACTIVE' ? 'Active' : 'Inactive'}
+                            </span>
+                          </td>
+
+                          <td className="px-6 py-4">
                             <div className="flex items-center gap-2">
-                              <Building2 className="h-4 w-4 text-gray-400" />
-                              <span className="text-sm text-gray-900">{contact.companyName}</span>
+                              <Link
+                                href={`/contacts/${contact.id}`}
+                                className="p-2 hover:bg-blue-50 text-blue-600 rounded-lg transition-colors"
+                                title="View"
+                              >
+                                <Eye className="h-4 w-4" />
+                              </Link>
+                              <button
+                                onClick={() => openEditModal(contact)}
+                                className="p-2 hover:bg-green-50 text-green-600 rounded-lg transition-colors"
+                                title="Edit"
+                              >
+                                <Edit className="h-4 w-4" />
+                              </button>
+                              <button
+                                onClick={() => openDeleteDialog(contact)}
+                                className="p-2 hover:bg-red-50 text-red-600 rounded-lg transition-colors"
+                                title="Delete"
+                              >
+                                <Trash2 className="h-4 w-4" />
+                              </button>
                             </div>
-                          )}
-                        </td>
-                        <td className="px-6 py-4">
-                          <span className={`inline-flex items-center gap-1 px-3 py-1 rounded-full text-xs font-medium ${getTypeColor(contact.type)}`}>
-                            <Tag className="h-3 w-3" />
-                            {getTypeLabel(contact.type)}
-                          </span>
-                        </td>
-                        <td className="px-6 py-4">
-                          <span className={`inline-flex items-center px-3 py-1 rounded-full text-xs font-medium ${
-                            contact.status === 'ACTIVE' 
-                              ? 'bg-green-100 text-green-700' 
-                              : 'bg-gray-100 text-gray-700'
-                          }`}>
-                            {contact.status === 'ACTIVE' ? 'Active' : 'Inactive'}
-                          </span>
-                        </td>
-                        <td className="px-6 py-4">
-                          <div className="flex items-center gap-2">
-                            <Link
-                              href={`/contacts/${contact.id}`}
-                              className="p-2 hover:bg-blue-50 text-blue-600 rounded-lg transition-colors"
-                              title="View"
-                            >
-                              <Eye className="h-4 w-4" />
-                            </Link>
-                            <button 
-                              onClick={() => openEditModal(contact)}
-                              className="p-2 hover:bg-green-50 text-green-600 rounded-lg transition-colors"
-                              title="Edit"
-                            >
-                              <Edit className="h-4 w-4" />
-                            </button>
-                            <button 
-                              onClick={() => openDeleteDialog(contact)}
-                              className="p-2 hover:bg-red-50 text-red-600 rounded-lg transition-colors"
-                              title="Delete"
-                            >
-                              <Trash2 className="h-4 w-4" />
-                            </button>
-                          </div>
-                        </td>
-                      </tr>
-                    )})}
+                          </td>
+                        </tr>
+                      )
+                    })}
                   </tbody>
                 </table>
               </div>
 
-              {/* Pagination */}
               <div className="px-6 py-4 border-t border-gray-200 flex items-center justify-between">
                 <p className="text-sm text-gray-600">
                   Showing <span className="font-semibold">{((currentPage - 1) * pageSize) + 1}</span> to{' '}
@@ -681,7 +721,6 @@ function ContactsContent() {
         </div>
       </main>
 
-      {/* Create Modal */}
       <Modal
         isOpen={showCreateModal}
         onClose={() => {
@@ -692,6 +731,7 @@ function ContactsContent() {
         size="xl"
       >
         <ContactForm
+          key="create-contact"
           onSubmit={async (data) => {
             await handleCreate(data as CreateContactData)
           }}
@@ -703,7 +743,6 @@ function ContactsContent() {
         />
       </Modal>
 
-      {/* Edit Modal */}
       <Modal
         isOpen={showEditModal}
         onClose={() => {
@@ -714,6 +753,7 @@ function ContactsContent() {
         size="xl"
       >
         <ContactForm
+          key={selectedContact?.id || 'edit-contact'}
           contact={selectedContact || undefined}
           onSubmit={async (data) => {
             await handleEdit(data as UpdateContactData)
@@ -726,7 +766,6 @@ function ContactsContent() {
         />
       </Modal>
 
-      {/* Export Modal */}
       {showExportModal && (
         <div className="fixed inset-0 z-50 overflow-y-auto">
           <div className="fixed inset-0 bg-black bg-opacity-50" onClick={() => setShowExportModal(false)} />
@@ -820,7 +859,6 @@ function ContactsContent() {
         </div>
       )}
 
-      {/* Delete Confirmation Dialog */}
       {showDeleteDialog && selectedContact && (
         <div className="fixed inset-0 z-50 overflow-y-auto">
           <div className="fixed inset-0 bg-black bg-opacity-50" onClick={() => setShowDeleteDialog(false)} />
@@ -869,7 +907,6 @@ function ContactsContent() {
         </div>
       )}
 
-      {/* Import Modal */}
       {showImportModal && (
         <ContactImport
           onClose={() => setShowImportModal(false)}

frontend/src/app/dashboard/page.tsx

@@ -1,6 +1,8 @@
 'use client'
 
 import { useState, useEffect } from 'react'
+import Image from 'next/image'
+import logoImage from '@/assets/logo.png'
 import ProtectedRoute from '@/components/ProtectedRoute'
 import { useAuth } from '@/contexts/AuthContext'
 import { useLanguage } from '@/contexts/LanguageContext'
@@ -141,13 +143,14 @@ function DashboardContent() {
         <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-4">
           <div className="flex items-center justify-between">
             <div className="flex items-center gap-3">
-              <div className="bg-primary-600 p-2 rounded-lg">
-                <img
-                  src="/logo.png"
-                  alt="Company Logo"
-                  className="h-8 w-8 object-contain"
-                />
-              </div>
+              <Image
+                src={logoImage}
+                alt="Company Logo"
+                width={48}
+                height={48}
+                className="object-contain"
+                priority
+              />
               <div>
                 <h1 className="text-2xl font-bold text-gray-900">ATMATA</h1>
                 <p className="text-sm text-gray-600">نظام إدارة علاقات العملاء</p>

frontend/src/app/hr/page.tsx

@@ -277,7 +277,7 @@ function HRContent() {
     mobile: '',
     dateOfBirth: '',
     gender: '',
-    nationality: 'Saudi Arabia',
+    nationality: 'Syria',
     nationalId: '',
     employmentType: 'FULL_TIME',
     contractType: 'UNLIMITED',
@@ -372,8 +372,8 @@ function HRContent() {
             const { leaves } = await hrAdminAPI.getLeaves({ status: 'PENDING', pageSize: 50 })
             setLeavesData(leaves)
           } else if (activeTab === 'loans') {
-            const { loans } = await hrAdminAPI.getLoans({ status: 'PENDING', pageSize: 50 })
-            setLoansData(loans)
+            const { loans } = await hrAdminAPI.getLoans({ pageSize: 50 })
+            setLoansData(loans.filter((loan: any) => ['PENDING_HR', 'PENDING_ADMIN'].includes(loan.status)))
           } else if (activeTab === 'purchases') {
             const { purchaseRequests } = await hrAdminAPI.getPurchaseRequests({ status: 'PENDING', pageSize: 50 })
             setPurchasesData(purchaseRequests)
@@ -1185,19 +1185,75 @@ function HRContent() {
               <p className="text-gray-500">No pending loans</p>
             ) : (
               <div className="space-y-3">
-                {loansData.map((l: any) => (
+              {loansData.map((l: any) => {
+                const salary = Number(l.employee?.basicSalary || 0)
+                const amount = Number(l.amount || 0)
+                const needsAdmin = salary > 0 && amount > salary * 0.5
+
+                return (
                   <div key={l.id} className="flex justify-between items-center py-3 border-b">
                     <div>
                       <p className="font-medium">{l.employee?.firstName} {l.employee?.lastName}</p>
-                      <p className="text-sm text-gray-600">{l.loanNumber} - {l.type} - {Number(l.amount).toLocaleString()} SAR ({l.installments} installments)</p>
-                      {l.reason && <p className="text-xs text-gray-500">{l.reason}</p>}
+                      <p className="text-sm text-gray-600">
+                        {l.loanNumber} - {l.type} - {amount.toLocaleString()} SAR ({l.installments} installments)
+                      </p>
+                      <p className="text-xs text-gray-500">
+                        الراتب الأساسي: {salary.toLocaleString()} SAR
+                      </p>
+                      <p className="text-xs text-gray-500">
+                        الحالة: {l.status === 'PENDING_HR' ? 'بانتظار HR' : 'بانتظار مدير النظام'}
+                      </p>
+                      {needsAdmin && (
+                        <p className="text-xs text-orange-600">
+                          هذا الطلب يتجاوز 50% من الراتب الأساسي ويحتاج موافقة مدير النظام
+                        </p>
+                      )}
+                      {l.reason && <p className="text-xs text-gray-500 mt-1">{l.reason}</p>}
                     </div>
+
                     <div className="flex gap-2">
-                      <button onClick={async () => { try { await hrAdminAPI.approveLoan(l.id); toast.success('Approved'); setLoansData((p: any[]) => p.filter((x: any) => x.id !== l.id)) } catch { toast.error('Failed') } }} className="px-3 py-1 bg-green-600 text-white rounded text-sm">Approve</button>
-                      <button onClick={async () => { const r = prompt('Rejection reason?'); if (r) { try { await hrAdminAPI.rejectLoan(l.id, r); toast.success('Rejected'); setLoansData((p: any[]) => p.filter((x: any) => x.id !== l.id)) } catch { toast.error('Failed') } } }} className="px-3 py-1 bg-red-600 text-white rounded text-sm">Reject</button>
+                      <button
+                        onClick={async () => {
+                          try {
+                            const response = await hrAdminAPI.approveLoan(l.id)
+                            const updatedLoan = response?.data?.data || response?.data || response
+
+                            if (updatedLoan?.status === 'PENDING_ADMIN') {
+                              toast.success('تمت موافقة HR وتحويل الطلب إلى مدير النظام')
+                            } else {
+                              toast.success('Approved')
+                              setLoansData((p: any[]) => p.filter((x: any) => x.id !== l.id))
+                            }
+                          } catch (e: any) {
+                            toast.error(e?.response?.data?.message || 'Failed')
+                          }
+                        }}
+                        className="px-3 py-1 bg-green-600 text-white rounded text-sm"
+                      >
+                        Approve
+                      </button>
+
+                      <button
+                        onClick={async () => {
+                          const r = prompt('Rejection reason?')
+                          if (r) {
+                            try {
+                              await hrAdminAPI.rejectLoan(l.id, r)
+                              toast.success('Rejected')
+                              setLoansData((p: any[]) => p.filter((x: any) => x.id !== l.id))
+                            } catch (e: any) {
+                              toast.error(e?.response?.data?.message || 'Failed')
+                            }
+                          }
+                        }}
+                        className="px-3 py-1 bg-red-600 text-white rounded text-sm"
+                      >
+                        Reject
+                      </button>
                     </div>
                   </div>
-                ))}
+                )
+              })}
               </div>
             )}
           </div>

frontend/src/app/portal/layout.tsx

@@ -13,18 +13,31 @@ import {
   DollarSign,
   Building2,
   LogOut,
-  User
+  User,
+  CheckCircle2,
+   TimerReset,
 } from 'lucide-react'
 
 function PortalLayoutContent({ children }: { children: React.ReactNode }) {
-  const { user, logout } = useAuth()
+  const { user, logout, hasPermission } = useAuth()
   const pathname = usePathname()
 
   const menuItems = [
     { icon: LayoutDashboard, label: 'لوحة التحكم', labelEn: 'Dashboard', href: '/portal', exact: true },
     { icon: Banknote, label: 'قروضي', labelEn: 'My Loans', href: '/portal/loans' },
     { icon: Calendar, label: 'إجازاتي', labelEn: 'My Leave', href: '/portal/leave' },
-    { icon: ShoppingCart, label: 'طلبات الشراء', labelEn: 'Purchase Requests', href: '/portal/purchase-requests' },
+    { icon: TimerReset, label: 'الساعات الإضافية', labelEn: 'Overtime', href: '/portal/overtime' },
+    ...(hasPermission('department_overtime_requests', 'view')
+      ? [{
+          icon: CheckCircle2,
+          label: 'طلبات الساعات الإضافية',
+          labelEn: 'Department Overtime Requests',
+          href: '/portal/managed-overtime-requests'
+        }]
+      : []),
+ ...(hasPermission('department_leave_requests', 'view')
+    ? [{ icon: CheckCircle2, label: 'طلبات إجازات القسم', labelEn: 'Department Leave Requests', href: '/portal/managed-leaves' }]
+    : []),    { icon: ShoppingCart, label: 'طلبات الشراء', labelEn: 'Purchase Requests', href: '/portal/purchase-requests' },
     { icon: Clock, label: 'حضوري', labelEn: 'My Attendance', href: '/portal/attendance' },
     { icon: DollarSign, label: 'رواتبي', labelEn: 'My Salaries', href: '/portal/salaries' },
   ]

frontend/src/app/portal/leave/page.tsx

@@ -5,13 +5,11 @@ import { portalAPI } from '@/lib/api/portal'
 import Modal from '@/components/Modal'
 import LoadingSpinner from '@/components/LoadingSpinner'
 import { toast } from 'react-hot-toast'
-import { Calendar, Plus } from 'lucide-react'
+import { Plus } from 'lucide-react'
 
 const LEAVE_TYPES = [
   { value: 'ANNUAL', label: 'إجازة سنوية' },
-  { value: 'SICK', label: 'إجازة مرضية' },
-  { value: 'EMERGENCY', label: 'طوارئ' },
-  { value: 'UNPAID', label: 'بدون راتب' },
+  { value: 'HOURLY', label: 'إجازة ساعية' },
 ]
 
 const STATUS_MAP: Record<string, { label: string; color: string }> = {
@@ -26,7 +24,16 @@ export default function PortalLeavePage() {
   const [loading, setLoading] = useState(true)
   const [showModal, setShowModal] = useState(false)
   const [submitting, setSubmitting] = useState(false)
-  const [form, setForm] = useState({ leaveType: 'ANNUAL', startDate: '', endDate: '', reason: '' })
+
+  const [form, setForm] = useState({
+    leaveType: 'ANNUAL',
+    startDate: '',
+    endDate: '',
+    leaveDate: '',
+    startTime: '',
+    endTime: '',
+    reason: '',
+  })
 
   const load = () => {
     setLoading(true)
@@ -43,24 +50,54 @@ export default function PortalLeavePage() {
 
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault()
-    if (!form.startDate || !form.endDate) {
-      toast.error('أدخل تاريخ البداية والنهاية')
-      return
-    }
-    if (new Date(form.endDate) < new Date(form.startDate)) {
-      toast.error('تاريخ النهاية يجب أن يكون بعد تاريخ البداية')
-      return
-    }
-    setSubmitting(true)
-    portalAPI.submitLeaveRequest({
+
+    let payload: any = {
       leaveType: form.leaveType,
-      startDate: form.startDate,
-      endDate: form.endDate,
       reason: form.reason || undefined,
-    })
+    }
+
+    if (form.leaveType === 'ANNUAL') {
+      if (!form.startDate || !form.endDate) {
+        toast.error('أدخل تاريخ البداية والنهاية')
+        return
+      }
+
+      if (new Date(form.endDate) < new Date(form.startDate)) {
+        toast.error('تاريخ النهاية يجب أن يكون بعد البداية')
+        return
+      }
+
+      payload.startDate = form.startDate
+      payload.endDate = form.endDate
+    } else {
+      if (!form.leaveDate || !form.startTime || !form.endTime) {
+        toast.error('أدخل التاريخ والوقت للإجازة الساعية')
+        return
+      }
+
+      if (form.startTime >= form.endTime) {
+        toast.error('وقت النهاية يجب أن يكون بعد البداية')
+        return
+      }
+
+      payload.startDate = `${form.leaveDate}T${form.startTime}:00`
+      payload.endDate = `${form.leaveDate}T${form.endTime}:00`
+    }
+
+    setSubmitting(true)
+
+    portalAPI.submitLeaveRequest(payload)
       .then(() => {
         setShowModal(false)
-        setForm({ leaveType: 'ANNUAL', startDate: '', endDate: '', reason: '' })
+        setForm({
+          leaveType: 'ANNUAL',
+          startDate: '',
+          endDate: '',
+          leaveDate: '',
+          startTime: '',
+          endTime: '',
+          reason: '',
+        })
         toast.success('تم إرسال طلب الإجازة')
         load()
       })
@@ -72,6 +109,8 @@ export default function PortalLeavePage() {
 
   return (
     <div className="space-y-6">
+
+      {/* HEADER */}
       <div className="flex items-center justify-between">
         <h1 className="text-2xl font-bold text-gray-900">إجازاتي</h1>
         <button
@@ -83,6 +122,7 @@ export default function PortalLeavePage() {
         </button>
       </div>
 
+      {/* الرصيد */}
       {leaveBalance.length > 0 && (
         <div className="bg-white rounded-xl shadow p-6 border border-gray-100">
           <h2 className="text-lg font-semibold text-gray-900 mb-4">رصيد الإجازات</h2>
@@ -90,36 +130,42 @@ export default function PortalLeavePage() {
             {leaveBalance.map((b) => (
               <div key={b.leaveType} className="border rounded-lg p-4">
                 <p className="text-sm text-gray-600">
-                  {b.leaveType === 'ANNUAL' ? 'سنوية' : b.leaveType === 'SICK' ? 'مرضية' : b.leaveType}
+                  {b.leaveType === 'ANNUAL' ? 'سنوية' : b.leaveType}
                 </p>
                 <p className="text-2xl font-bold text-teal-600 mt-1">{b.available} يوم</p>
-                <p className="text-xs text-gray-500">من {b.totalDays + b.carriedOver} (مستخدم: {b.usedDays})</p>
               </div>
             ))}
           </div>
         </div>
       )}
 
+      {/* الطلبات */}
       <div className="bg-white rounded-xl shadow p-6 border border-gray-100">
         <h2 className="text-lg font-semibold text-gray-900 mb-4">طلباتي</h2>
+
         {leaves.length === 0 ? (
-          <p className="text-gray-500 text-center py-8">لا توجد طلبات إجازة</p>
+          <p className="text-gray-500 text-center py-8">لا توجد طلبات</p>
         ) : (
           <div className="space-y-3">
             {leaves.map((l) => {
               const statusInfo = STATUS_MAP[l.status] || { label: l.status, color: 'bg-gray-100' }
+
               return (
-                <div key={l.id} className="flex justify-between items-center py-3 border-b last:border-0">
+                <div key={l.id} className="flex justify-between items-center py-3 border-b">
                   <div>
                     <p className="font-medium">
-                      {l.leaveType === 'ANNUAL' ? 'سنوية' : l.leaveType === 'SICK' ? 'مرضية' : l.leaveType} - {l.days} يوم
+                      {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' })}`
+                        : `${l.days} يوم`}
                     </p>
+
                     <p className="text-sm text-gray-600">
                       {new Date(l.startDate).toLocaleDateString('ar-SA')} - {new Date(l.endDate).toLocaleDateString('ar-SA')}
                     </p>
-                    {l.rejectedReason && <p className="text-sm text-red-600">سبب الرفض: {l.rejectedReason}</p>}
                   </div>
-                  <span className={`px-3 py-1 rounded-full text-xs font-medium ${statusInfo.color}`}>
+
+                  <span className={`px-3 py-1 rounded-full text-xs ${statusInfo.color}`}>
                     {statusInfo.label}
                   </span>
                 </div>
@@ -129,59 +175,116 @@ export default function PortalLeavePage() {
         )}
       </div>
 
+      {/* الفورم */}
       <Modal isOpen={showModal} onClose={() => setShowModal(false)} title="طلب إجازة جديد">
         <form onSubmit={handleSubmit} className="space-y-4">
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">نوع الإجازة</label>
-            <select
-              value={form.leaveType}
-              onChange={(e) => setForm((p) => ({ ...p, leaveType: e.target.value }))}
-              className="w-full px-3 py-2 border border-gray-300 rounded-lg"
-            >
-              {LEAVE_TYPES.map((t) => (
-                <option key={t.value} value={t.value}>{t.label}</option>
-              ))}
-            </select>
-          </div>
-          <div className="grid grid-cols-2 gap-4">
-            <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">من تاريخ</label>
-              <input
-                type="date"
-                value={form.startDate}
-                onChange={(e) => setForm((p) => ({ ...p, startDate: e.target.value }))}
-                className="w-full px-3 py-2 border border-gray-300 rounded-lg"
-                required
-              />
+
+          {/* نوع الإجازة */}
+          <select
+            value={form.leaveType}
+            onChange={(e) =>
+              setForm({
+                leaveType: e.target.value,
+                startDate: '',
+                endDate: '',
+                leaveDate: '',
+                startTime: '',
+                endTime: '',
+                reason: '',
+              })
+            }
+            className="w-full px-3 py-2 border rounded-lg"
+          >
+            {LEAVE_TYPES.map((t) => (
+              <option key={t.value} value={t.value}>{t.label}</option>
+            ))}
+          </select>
+
+          {/* سنوية */}
+          {form.leaveType === 'ANNUAL' ? (
+            <div className="grid grid-cols-2 gap-4">
+              <div>
+                <label className="text-sm">من تاريخ</label>
+                <input
+                  type="date"
+                  value={form.startDate}
+                  onChange={(e) => setForm(p => ({ ...p, startDate: e.target.value }))}
+                  className="border p-2 rounded w-full"
+                />
+              </div>
+
+              <div>
+                <label className="text-sm">إلى تاريخ</label>
+                <input
+                  type="date"
+                  value={form.endDate}
+                  onChange={(e) => setForm(p => ({ ...p, endDate: e.target.value }))}
+                  className="border p-2 rounded w-full"
+                />
+              </div>
             </div>
-            <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">إلى تاريخ</label>
-              <input
-                type="date"
-                value={form.endDate}
-                onChange={(e) => setForm((p) => ({ ...p, endDate: e.target.value }))}
-                className="w-full px-3 py-2 border border-gray-300 rounded-lg"
-                required
-              />
+          ) : (
+            /* ساعية */
+            <div className="grid grid-cols-3 gap-4">
+              <div>
+                <label className="text-sm">التاريخ</label>
+                <input
+                  type="date"
+                  value={form.leaveDate}
+                  onChange={(e) => setForm(p => ({ ...p, leaveDate: e.target.value }))}
+                  className="border p-2 rounded w-full"
+                />
+              </div>
+
+              <div>
+                <label className="text-sm">من الساعة</label>
+                <input
+                  type="time"
+                  value={form.startTime}
+                  onChange={(e) => setForm(p => ({ ...p, startTime: e.target.value }))}
+                  className="border p-2 rounded w-full"
+                />
+              </div>
+
+              <div>
+                <label className="text-sm">إلى الساعة</label>
+                <input
+                  type="time"
+                  value={form.endTime}
+                  onChange={(e) => setForm(p => ({ ...p, endTime: e.target.value }))}
+                  className="border p-2 rounded w-full"
+                />
+              </div>
             </div>
-          </div>
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">السبب</label>
-            <textarea
-              value={form.reason}
-              onChange={(e) => setForm((p) => ({ ...p, reason: e.target.value }))}
-              className="w-full px-3 py-2 border border-gray-300 rounded-lg"
-              rows={3}
-            />
-          </div>
+          )}
+
+          {/* السبب */}
+          <textarea
+            placeholder="اكتب سبب الإجازة..."
+            value={form.reason}
+            onChange={(e) => setForm(p => ({ ...p, reason: e.target.value }))}
+            className="w-full border p-2 rounded"
+          />
+
+          {/* أزرار */}
           <div className="flex justify-end gap-2">
-            <button type="button" onClick={() => setShowModal(false)} className="px-4 py-2 text-gray-600 hover:bg-gray-100 rounded-lg">
+            <button
+              type="button"
+              onClick={() => setShowModal(false)}
+              className="px-4 py-2 text-gray-600 hover:bg-gray-100 rounded-lg"
+            >
               إلغاء
             </button>
-            <button type="submit" disabled={submitting} className="px-4 py-2 bg-teal-600 text-white rounded-lg hover:bg-teal-700 disabled:opacity-50">
+
+            <button
+              type="submit"
+              disabled={submitting}
+              className="px-4 py-2 bg-teal-600 text-white rounded-lg hover:bg-teal-700 disabled:opacity-50"
+            >
               {submitting ? 'جاري الإرسال...' : 'إرسال الطلب'}
             </button>
           </div>
+
         </form>
       </Modal>
     </div>

frontend/src/app/portal/loans/page.tsx

@@ -8,8 +8,8 @@ import { toast } from 'react-hot-toast'
 import { Banknote, Plus, ChevronLeft } from 'lucide-react'
 
 const STATUS_MAP: Record<string, { label: string; color: string }> = {
-  PENDING: { label: 'قيد المراجعة', color: 'bg-amber-100 text-amber-800' },
-  APPROVED: { label: 'معتمد', color: 'bg-green-100 text-green-800' },
+  PENDING_HR: { label: 'بانتظار موافقة الموارد البشرية', color: 'bg-amber-100 text-amber-800' },
+  PENDING_ADMIN: { label: 'بانتظار موافقة مدير النظام', color: 'bg-orange-100 text-orange-800' },
   REJECTED: { label: 'مرفوض', color: 'bg-red-100 text-red-800' },
   ACTIVE: { label: 'نشط', color: 'bg-blue-100 text-blue-800' },
   PAID_OFF: { label: 'مسدد', color: 'bg-gray-100 text-gray-800' },
@@ -32,17 +32,24 @@ export default function PortalLoansPage() {
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault()
     const amount = parseFloat(form.amount)
+
     if (!amount || amount <= 0) {
       toast.error('أدخل مبلغاً صالحاً')
       return
     }
+
+    if (!form.reason.trim()) {
+      toast.error('سبب القرض مطلوب')
+      return
+    }
+
     setSubmitting(true)
     portalAPI.submitLoanRequest({
       type: form.type,
       amount,
       installments: parseInt(form.installments) || 1,
-      reason: form.reason || undefined,
-    })
+      reason: form.reason.trim(),
+  })
       .then((loan) => {
         setLoans((prev) => [loan, ...prev])
         setShowModal(false)
@@ -162,6 +169,7 @@ export default function PortalLoansPage() {
               onChange={(e) => setForm((p) => ({ ...p, reason: e.target.value }))}
               className="w-full px-3 py-2 border border-gray-300 rounded-lg"
               rows={3}
+              required
             />
           </div>
           <div className="flex justify-end gap-2">

frontend/src/app/portal/managed-leaves/page.tsx

@@ -0,0 +1,191 @@
+'use client'
+
+import { useAuth } from '@/contexts/AuthContext'
+import { useEffect, useState } from 'react'
+import { portalAPI, type ManagedLeave } from '@/lib/api/portal'
+import LoadingSpinner from '@/components/LoadingSpinner'
+import { toast } from 'react-hot-toast'
+import { CheckCircle2, XCircle, Calendar, User, ArrowLeft } from 'lucide-react'
+import Link from 'next/link'
+
+export default function ManagedLeavesPage() {
+  const { hasPermission } = useAuth()
+  const [leaves, setLeaves] = useState<ManagedLeave[]>([])
+  const [loading, setLoading] = useState(true)
+  const [processingId, setProcessingId] = useState<string | null>(null)
+
+  const canViewDepartmentLeaveRequests = hasPermission('department_leave_requests', 'view')
+  const canApproveDepartmentLeaveRequests = hasPermission('department_leave_requests', 'approve')
+
+  const fetchLeaves = async () => {
+    try {
+      setLoading(true)
+      const data = await portalAPI.getManagedLeaves('PENDING')
+      setLeaves(data)
+    } catch (error: any) {
+      toast.error(error?.response?.data?.message || 'فشل تحميل طلبات الإجازات')
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  useEffect(() => {
+    if (canViewDepartmentLeaveRequests) {
+      fetchLeaves()
+    } else {
+      setLoading(false)
+    }
+  }, [canViewDepartmentLeaveRequests])
+
+  const handleApprove = async (id: string) => {
+    try {
+      setProcessingId(id)
+      await portalAPI.approveManagedLeave(id)
+      toast.success('تمت الموافقة على طلب الإجازة')
+      fetchLeaves()
+    } catch (error: any) {
+      toast.error(error?.response?.data?.message || 'فشل اعتماد طلب الإجازة')
+    } finally {
+      setProcessingId(null)
+    }
+  }
+
+  const handleReject = async (id: string) => {
+    const rejectedReason = window.prompt('اكتب سبب الرفض')
+    if (!rejectedReason || !rejectedReason.trim()) return
+
+    try {
+      setProcessingId(id)
+      await portalAPI.rejectManagedLeave(id, rejectedReason.trim())
+      toast.success('تم رفض طلب الإجازة')
+      fetchLeaves()
+    } catch (error: any) {
+      toast.error(error?.response?.data?.message || 'فشل رفض طلب الإجازة')
+    } finally {
+      setProcessingId(null)
+    }
+  }
+
+  const formatLeaveType = (leaveType: string) => {
+    if (leaveType === 'ANNUAL') return 'إجازة سنوية'
+    if (leaveType === 'HOURLY') return 'إجازة ساعية'
+    return leaveType
+  }
+
+  if (!canViewDepartmentLeaveRequests) {
+    return <div className="text-center text-gray-500 py-12">الوصول مرفوض</div>
+  }
+
+  if (loading) return <LoadingSpinner />
+
+  return (
+    <div className="space-y-6">
+      <div className="flex items-center justify-between">
+        <div>
+          <h1 className="text-2xl font-bold text-gray-900">طلبات إجازات القسم</h1>
+          <p className="text-gray-600 mt-1">اعتماد أو رفض طلبات موظفي القسم المباشرين</p>
+        </div>
+
+        <Link
+          href="/portal"
+          className="inline-flex items-center gap-2 px-4 py-2 border border-gray-300 text-gray-700 rounded-lg hover:bg-gray-50"
+        >
+          <ArrowLeft className="h-4 w-4" />
+          العودة
+        </Link>
+      </div>
+
+      <div className="bg-white rounded-xl shadow border border-gray-100 overflow-hidden">
+        {leaves.length === 0 ? (
+          <div className="p-12 text-center text-gray-500">
+            لا توجد طلبات إجازات معلقة لموظفي القسم
+          </div>
+        ) : (
+          <div className="overflow-x-auto">
+            <table className="w-full text-sm">
+              <thead className="bg-gray-50 border-b border-gray-200">
+                <tr>
+                  <th className="px-6 py-4 text-right font-semibold text-gray-700">الموظف</th>
+                  <th className="px-6 py-4 text-right font-semibold text-gray-700">نوع الإجازة</th>
+                  <th className="px-6 py-4 text-right font-semibold text-gray-700">الفترة</th>
+                  <th className="px-6 py-4 text-right font-semibold text-gray-700">المدة</th>
+                  <th className="px-6 py-4 text-right font-semibold text-gray-700">السبب</th>
+                  <th className="px-6 py-4 text-right font-semibold text-gray-700">الإجراءات</th>
+                </tr>
+              </thead>
+              <tbody className="divide-y divide-gray-200">
+                {leaves.map((leave) => (
+                  <tr key={leave.id} className="hover:bg-gray-50">
+                    <td className="px-6 py-4">
+                      <div className="flex items-center gap-2">
+                        <User className="h-4 w-4 text-gray-400" />
+                        <div>
+                          <p className="font-medium text-gray-900">
+                            {leave.employee.firstName} {leave.employee.lastName}
+                          </p>
+                          <p className="text-xs text-gray-500">{leave.employee.uniqueEmployeeId}</p>
+                        </div>
+                      </div>
+                    </td>
+
+                    <td className="px-6 py-4 text-gray-900">
+                      {formatLeaveType(leave.leaveType)}
+                    </td>
+
+                    <td className="px-6 py-4 text-gray-600">
+                      <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>
+                        </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' })}`
+                        : `${leave.days} يوم`}
+                    </td>
+
+                    <td className="px-6 py-4 text-gray-600 max-w-xs">
+                      <p className="truncate" title={leave.reason || ''}>
+                        {leave.reason || '-'}
+                      </p>
+                    </td>
+
+                    <td className="px-6 py-4">
+                      {canApproveDepartmentLeaveRequests ? (
+                        <div className="flex items-center gap-2">
+                          <button
+                            onClick={() => handleApprove(leave.id)}
+                            disabled={processingId === leave.id}
+                            className="inline-flex items-center gap-2 px-3 py-2 bg-emerald-600 text-white rounded-lg hover:bg-emerald-700 disabled:opacity-50"
+                          >
+                            <CheckCircle2 className="h-4 w-4" />
+                            قبول
+                          </button>
+
+                          <button
+                            onClick={() => handleReject(leave.id)}
+                            disabled={processingId === leave.id}
+                            className="inline-flex items-center gap-2 px-3 py-2 bg-red-600 text-white rounded-lg hover:bg-red-700 disabled:opacity-50"
+                          >
+                            <XCircle className="h-4 w-4" />
+                            رفض
+                          </button>
+                        </div>
+                      ) : (
+                        <span className="text-sm text-gray-500">عرض فقط</span>
+                      )}
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}

frontend/src/app/portal/managed-overtime-requests/page.tsx

@@ -0,0 +1,134 @@
+'use client'
+
+import { useAuth } from '@/contexts/AuthContext'
+import { useEffect, useState } from 'react'
+import { portalAPI, type PortalOvertimeRequest } from '@/lib/api/portal'
+import LoadingSpinner from '@/components/LoadingSpinner'
+import { toast } from 'react-hot-toast'
+import { CheckCircle2, XCircle, User } from 'lucide-react'
+
+export default function ManagedOvertimeRequestsPage() {
+  const { hasPermission } = useAuth()
+  const [items, setItems] = useState<PortalOvertimeRequest[]>([])
+  const [loading, setLoading] = useState(true)
+  const [processingId, setProcessingId] = useState<string | null>(null)
+
+  const canView = hasPermission('department_overtime_requests', 'view')
+  const canApprove = hasPermission('department_overtime_requests', 'approve')
+
+  const loadData = async () => {
+    try {
+      setLoading(true)
+      const data = await portalAPI.getManagedOvertimeRequests()
+      setItems(data)
+    } catch (error: any) {
+      toast.error(error?.response?.data?.message || 'فشل تحميل الطلبات')
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  useEffect(() => {
+    if (canView) {
+      loadData()
+    } else {
+      setLoading(false)
+    }
+  }, [canView])
+
+  const handleApprove = async (attendanceId: string) => {
+    try {
+      setProcessingId(attendanceId)
+      await portalAPI.approveManagedOvertimeRequest(attendanceId)
+      toast.success('تمت الموافقة')
+      loadData()
+    } catch (error: any) {
+      toast.error(error?.response?.data?.message || 'فشل التنفيذ')
+    } finally {
+      setProcessingId(null)
+    }
+  }
+
+  const handleReject = async (attendanceId: string) => {
+    const rejectedReason = window.prompt('اكتب سبب الرفض')
+    if (!rejectedReason || !rejectedReason.trim()) return
+
+    try {
+      setProcessingId(attendanceId)
+      await portalAPI.rejectManagedOvertimeRequest(attendanceId, rejectedReason.trim())
+      toast.success('تم الرفض')
+      loadData()
+    } catch (error: any) {
+      toast.error(error?.response?.data?.message || 'فشل التنفيذ')
+    } finally {
+      setProcessingId(null)
+    }
+  }
+
+  if (!canView) {
+    return <div className="text-center py-12 text-gray-500">الوصول مرفوض</div>
+  }
+
+  if (loading) return <LoadingSpinner />
+
+  return (
+    <div className="space-y-6">
+      <div>
+        <h1 className="text-2xl font-bold text-gray-900">طلبات الساعات الإضافية</h1>
+        <p className="text-gray-600 mt-1">طلبات موظفي القسم المباشرين</p>
+      </div>
+
+      <div className="bg-white rounded-xl shadow border border-gray-100 overflow-hidden">
+        {items.length === 0 ? (
+          <div className="p-10 text-center text-gray-500">لا توجد طلبات معلقة</div>
+        ) : (
+          <div className="divide-y divide-gray-200">
+            {items.map((item) => (
+              <div key={item.id} className="p-6 flex items-start justify-between gap-6">
+                <div className="space-y-2">
+                  <div className="flex items-center gap-2">
+                    <User className="h-4 w-4 text-gray-400" />
+                    <p className="font-semibold text-gray-900">
+                      {item.employee?.firstName} {item.employee?.lastName}
+                    </p>
+                    <span className="text-xs text-gray-500">{item.employee?.uniqueEmployeeId}</span>
+                  </div>
+
+                  <p className="text-sm text-gray-600">
+                    التاريخ: {new Date(item.date).toLocaleDateString()}
+                  </p>
+                  <p className="text-sm text-gray-600">عدد الساعات: {item.hours}</p>
+                  <p className="text-sm text-gray-600">السبب: {item.reason}</p>
+                </div>
+
+                {canApprove ? (
+                  <div className="flex gap-2">
+                    <button
+                      onClick={() => handleApprove(item.attendanceId)}
+                      disabled={processingId === item.attendanceId}
+                      className="inline-flex items-center gap-2 px-3 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50"
+                    >
+                      <CheckCircle2 className="h-4 w-4" />
+                      قبول
+                    </button>
+
+                    <button
+                      onClick={() => handleReject(item.attendanceId)}
+                      disabled={processingId === item.attendanceId}
+                      className="inline-flex items-center gap-2 px-3 py-2 bg-red-600 text-white rounded-lg disabled:opacity-50"
+                    >
+                      <XCircle className="h-4 w-4" />
+                      رفض
+                    </button>
+                  </div>
+                ) : (
+                  <span className="text-sm text-gray-500">عرض فقط</span>
+                )}
+              </div>
+            ))}
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}

frontend/src/app/portal/overtime/page.tsx

@@ -0,0 +1,191 @@
+'use client'
+
+import { useEffect, useState } from 'react'
+import { portalAPI, type PortalOvertimeRequest } from '@/lib/api/portal'
+import Modal from '@/components/Modal'
+import LoadingSpinner from '@/components/LoadingSpinner'
+import { toast } from 'react-hot-toast'
+import { Plus, Clock3 } from 'lucide-react'
+
+const STATUS_MAP: Record<string, { label: string; color: string }> = {
+  PENDING: { label: 'قيد المراجعة', color: 'bg-amber-100 text-amber-800' },
+  APPROVED: { label: 'مقبول', color: 'bg-green-100 text-green-800' },
+  REJECTED: { label: 'مرفوض', color: 'bg-red-100 text-red-800' },
+}
+
+export default function PortalOvertimePage() {
+  const [items, setItems] = useState<PortalOvertimeRequest[]>([])
+  const [loading, setLoading] = useState(true)
+  const [submitting, setSubmitting] = useState(false)
+  const [open, setOpen] = useState(false)
+
+  const [form, setForm] = useState({
+    date: '',
+    hours: '',
+    reason: '',
+  })
+
+  const loadData = async () => {
+    try {
+      setLoading(true)
+      const data = await portalAPI.getOvertimeRequests()
+      setItems(data)
+    } catch (error: any) {
+      toast.error(error?.response?.data?.message || 'فشل تحميل الطلبات')
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  useEffect(() => {
+    loadData()
+  }, [])
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault()
+
+    const hours = parseFloat(form.hours)
+
+    if (!form.date) {
+      toast.error('اختر التاريخ')
+      return
+    }
+
+    if (!hours || hours <= 0) {
+      toast.error('أدخل عدد ساعات صالح')
+      return
+    }
+
+    if (!form.reason.trim()) {
+      toast.error('سبب الساعات الإضافية مطلوب')
+      return
+    }
+
+    try {
+      setSubmitting(true)
+      await portalAPI.submitOvertimeRequest({
+        date: form.date,
+        hours,
+        reason: form.reason.trim(),
+      })
+      toast.success('تم إرسال الطلب')
+      setOpen(false)
+      setForm({ date: '', hours: '', reason: '' })
+      loadData()
+    } catch (error: any) {
+      toast.error(error?.response?.data?.message || 'فشل إرسال الطلب')
+    } finally {
+      setSubmitting(false)
+    }
+  }
+
+  if (loading) return <LoadingSpinner />
+
+  return (
+    <div className="space-y-6">
+      <div className="flex items-center justify-between">
+        <div>
+          <h1 className="text-2xl font-bold text-gray-900">الساعات الإضافية</h1>
+          <p className="text-gray-600 mt-1">إرسال ومتابعة طلبات الساعات الإضافية</p>
+        </div>
+
+        <button
+          onClick={() => setOpen(true)}
+          className="inline-flex items-center gap-2 px-4 py-2 bg-teal-600 text-white rounded-lg hover:bg-teal-700"
+        >
+          <Plus className="h-4 w-4" />
+          إضافة طلب
+        </button>
+      </div>
+
+      <div className="bg-white rounded-xl shadow border border-gray-100 overflow-hidden">
+        {items.length === 0 ? (
+          <div className="p-10 text-center text-gray-500">لا توجد طلبات حتى الآن</div>
+        ) : (
+          <div className="divide-y divide-gray-200">
+            {items.map((item) => {
+              const meta = STATUS_MAP[item.status] || STATUS_MAP.PENDING
+              return (
+                <div key={item.id} className="p-6 flex items-start justify-between">
+                  <div className="space-y-2">
+                    <div className="flex items-center gap-2">
+                      <Clock3 className="h-4 w-4 text-gray-500" />
+                      <p className="font-semibold text-gray-900">
+                        {new Date(item.date).toLocaleDateString()}
+                      </p>
+                    </div>
+                    <p className="text-sm text-gray-600">عدد الساعات: {item.hours}</p>
+                    <p className="text-sm text-gray-600">السبب: {item.reason}</p>
+                    {item.rejectedReason ? (
+                      <p className="text-sm text-red-600">سبب الرفض: {item.rejectedReason}</p>
+                    ) : null}
+                  </div>
+
+                  <span className={`px-3 py-1 rounded-full text-xs font-medium ${meta.color}`}>
+                    {meta.label}
+                  </span>
+                </div>
+              )
+            })}
+          </div>
+        )}
+      </div>
+
+      <Modal isOpen={open} onClose={() => setOpen(false)} title="طلب ساعات إضافية">
+        <form onSubmit={handleSubmit} className="space-y-4">
+          <div>
+            <label className="block mb-1 text-sm font-medium text-gray-700">التاريخ</label>
+            <input
+              type="date"
+              value={form.date}
+              onChange={(e) => setForm((p) => ({ ...p, date: e.target.value }))}
+              className="w-full px-3 py-2 border border-gray-300 rounded-lg"
+              required
+            />
+          </div>
+
+          <div>
+            <label className="block mb-1 text-sm font-medium text-gray-700">عدد الساعات</label>
+            <input
+              type="number"
+              min="0.5"
+              step="0.5"
+              value={form.hours}
+              onChange={(e) => setForm((p) => ({ ...p, hours: e.target.value }))}
+              className="w-full px-3 py-2 border border-gray-300 rounded-lg"
+              required
+            />
+          </div>
+
+          <div>
+            <label className="block mb-1 text-sm font-medium text-gray-700">السبب</label>
+            <textarea
+              value={form.reason}
+              onChange={(e) => setForm((p) => ({ ...p, reason: e.target.value }))}
+              className="w-full px-3 py-2 border border-gray-300 rounded-lg"
+              rows={4}
+              required
+            />
+          </div>
+
+          <div className="flex justify-end gap-2 pt-2">
+            <button
+              type="button"
+              onClick={() => setOpen(false)}
+              className="px-4 py-2 border border-gray-300 rounded-lg"
+            >
+              إلغاء
+            </button>
+            <button
+              type="submit"
+              disabled={submitting}
+              className="px-4 py-2 bg-teal-600 text-white rounded-lg hover:bg-teal-700 disabled:opacity-50"
+            >
+              {submitting ? 'جارٍ الإرسال...' : 'إرسال'}
+            </button>
+          </div>
+        </form>
+      </Modal>
+    </div>
+  )
+}

frontend/src/app/portal/page.tsx

@@ -2,12 +2,14 @@
 
 import { useState, useEffect } from 'react'
 import Link from 'next/link'
+import { useAuth } from '@/contexts/AuthContext'
 import { portalAPI, type PortalProfile } from '@/lib/api/portal'
 import LoadingSpinner from '@/components/LoadingSpinner'
-import { Banknote, Calendar, ShoppingCart, Clock, Plus, ArrowLeft } from 'lucide-react'
+import { Banknote, Calendar, ShoppingCart, Clock, Plus, ArrowLeft, CheckCircle2 } from 'lucide-react'
 import { toast } from 'react-hot-toast'
 
 export default function PortalDashboardPage() {
+  const { hasPermission } = useAuth()
   const [data, setData] = useState<PortalProfile | null>(null)
   const [loading, setLoading] = useState(true)
 
@@ -22,6 +24,8 @@ export default function PortalDashboardPage() {
   if (!data) return <div className="text-center text-gray-500 py-12">لا توجد بيانات</div>
 
   const { employee, stats } = data
+  const canViewDepartmentLeaveRequests = hasPermission('department_leave_requests', 'view')
+
   const name = employee.firstNameAr && employee.lastNameAr
     ? `${employee.firstNameAr} ${employee.lastNameAr}`
     : `${employee.firstName} ${employee.lastName}`
@@ -35,7 +39,7 @@ export default function PortalDashboardPage() {
         </p>
       </div>
 
-      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-6">
+      <div className={`grid grid-cols-1 md:grid-cols-2 ${canViewDepartmentLeaveRequests ? 'lg:grid-cols-5' : 'lg:grid-cols-4'} gap-6`}>
         <div className="bg-white rounded-xl shadow p-6 border border-gray-100">
           <div className="flex items-center justify-between">
             <div>
@@ -53,6 +57,23 @@ export default function PortalDashboardPage() {
           </Link>
         </div>
 
+        {canViewDepartmentLeaveRequests && (
+          <div className="bg-white rounded-xl shadow p-6 border border-gray-100">
+            <div className="flex items-center justify-between">
+              <div>
+                <p className="text-sm text-gray-600">طلبات إجازات القسم</p>
+                <p className="text-sm text-gray-500 mt-1">مراجعة واعتماد</p>
+              </div>
+              <div className="bg-emerald-100 p-3 rounded-lg">
+                <CheckCircle2 className="h-6 w-6 text-emerald-600" />
+              </div>
+            </div>
+            <Link href="/portal/managed-leaves" className="mt-4 text-sm text-emerald-600 hover:underline flex items-center gap-1">
+              عرض الطلبات <ArrowLeft className="h-4 w-4" />
+            </Link>
+          </div>
+        )}
+
         <div className="bg-white rounded-xl shadow p-6 border border-gray-100">
           <div className="flex items-center justify-between">
             <div>
@@ -118,7 +139,9 @@ export default function PortalDashboardPage() {
               <tbody>
                 {stats.leaveBalance.map((b) => (
                   <tr key={b.leaveType} className="border-b last:border-0">
-                    <td className="py-2">{b.leaveType === 'ANNUAL' ? 'سنوية' : b.leaveType === 'SICK' ? 'مرضية' : b.leaveType}</td>
+                    <td className="py-2">
+                      {b.leaveType === 'ANNUAL' ? 'سنوية' : b.leaveType === 'HOURLY' ? 'ساعية' : b.leaveType}
+                    </td>
                     <td className="py-2">{b.totalDays + b.carriedOver}</td>
                     <td className="py-2">{b.usedDays}</td>
                     <td className="py-2 font-semibold text-teal-600">{b.available}</td>
@@ -131,24 +154,24 @@ export default function PortalDashboardPage() {
       )}
 
       <div className="flex flex-wrap gap-4">
-        <Link
-          href="/portal/loans"
-          className="inline-flex items-center gap-2 px-4 py-2 bg-amber-600 text-white rounded-lg hover:bg-amber-700"
-        >
+        <Link href="/portal/loans" className="inline-flex items-center gap-2 px-4 py-2 bg-amber-600 text-white rounded-lg hover:bg-amber-700">
           <Plus className="h-4 w-4" />
           طلب قرض
         </Link>
-        <Link
-          href="/portal/leave"
-          className="inline-flex items-center gap-2 px-4 py-2 bg-teal-600 text-white rounded-lg hover:bg-teal-700"
-        >
+
+        <Link href="/portal/leave" className="inline-flex items-center gap-2 px-4 py-2 bg-teal-600 text-white rounded-lg hover:bg-teal-700">
           <Plus className="h-4 w-4" />
           طلب إجازة
         </Link>
-        <Link
-          href="/portal/purchase-requests"
-          className="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700"
-        >
+
+        {canViewDepartmentLeaveRequests && (
+          <Link href="/portal/managed-leaves" className="inline-flex items-center gap-2 px-4 py-2 bg-emerald-600 text-white rounded-lg hover:bg-emerald-700">
+            <CheckCircle2 className="h-4 w-4" />
+            طلبات إجازات القسم
+          </Link>
+        )}
+
+        <Link href="/portal/purchase-requests" className="inline-flex items-center gap-2 px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700">
           <Plus className="h-4 w-4" />
           طلب شراء
         </Link>

frontend/src/app/tenders/[id]/page.tsx

@@ -10,14 +10,13 @@ import {
   Calendar,
   Building2,
   DollarSign,
-  User,
   History,
   Plus,
   Loader2,
   CheckCircle2,
   Upload,
   ExternalLink,
-  AlertCircle,
+  MapPin,
 } from 'lucide-react'
 import ProtectedRoute from '@/components/ProtectedRoute'
 import LoadingSpinner from '@/components/LoadingSpinner'
@@ -51,8 +50,16 @@ function TenderDetailContent() {
   const [employees, setEmployees] = useState<any[]>([])
   const [contacts, setContacts] = useState<any[]>([])
   const [pipelines, setPipelines] = useState<any[]>([])
-  const [directiveForm, setDirectiveForm] = useState<CreateDirectiveData>({ type: 'BUY_TERMS', assignedToEmployeeId: '', notes: '' })
-  const [convertForm, setConvertForm] = useState({ contactId: '', pipelineId: '', ownerId: '' })
+  const [directiveForm, setDirectiveForm] = useState<CreateDirectiveData>({
+    type: 'BUY_TERMS',
+    assignedToEmployeeId: '',
+    notes: '',
+  })
+  const [convertForm, setConvertForm] = useState({
+    contactId: '',
+    pipelineId: '',
+    ownerId: '',
+  })
   const [completeNotes, setCompleteNotes] = useState('')
   const [directiveTypeValues, setDirectiveTypeValues] = useState<string[]>([])
   const [submitting, setSubmitting] = useState(false)
@@ -93,10 +100,17 @@ function TenderDetailContent() {
 
   useEffect(() => {
     if (showDirectiveModal || showConvertModal) {
-      employeesAPI.getAll({ status: 'ACTIVE', pageSize: 500 }).then((r: any) => setEmployees(r.employees || [])).catch(() => {})
+      employeesAPI
+        .getAll({ status: 'ACTIVE', pageSize: 500 })
+        .then((r: any) => setEmployees(r.employees || []))
+        .catch(() => {})
     }
+
     if (showConvertModal) {
-      contactsAPI.getAll({ pageSize: 500 }).then((r: any) => setContacts(r.contacts || [])).catch(() => {})
+      contactsAPI
+        .getAll({ pageSize: 500 })
+        .then((r: any) => setContacts(r.contacts || []))
+        .catch(() => {})
       pipelinesAPI.getAll().then(setPipelines).catch(() => {})
     }
   }, [showDirectiveModal, showConvertModal])
@@ -107,6 +121,7 @@ function TenderDetailContent() {
       toast.error(t('tenders.assignee') + ' ' + t('common.required'))
       return
     }
+
     setSubmitting(true)
     try {
       await tendersAPI.createDirective(tenderId, directiveForm)
@@ -124,9 +139,13 @@ function TenderDetailContent() {
   const handleCompleteDirective = async (e: React.FormEvent) => {
     e.preventDefault()
     if (!showCompleteModal) return
+
     setSubmitting(true)
     try {
-      await tendersAPI.updateDirective(showCompleteModal.id, { status: 'COMPLETED', completionNotes: completeNotes })
+      await tendersAPI.updateDirective(showCompleteModal.id, {
+        status: 'COMPLETED',
+        completionNotes: completeNotes,
+      })
       toast.success('Task completed')
       setShowCompleteModal(null)
       setCompleteNotes('')
@@ -144,6 +163,7 @@ function TenderDetailContent() {
       toast.error('Contact and Pipeline are required')
       return
     }
+
     setSubmitting(true)
     try {
       const deal = await tendersAPI.convertToDeal(tenderId, convertForm)
@@ -160,6 +180,7 @@ function TenderDetailContent() {
   const handleTenderFileUpload = async (e: React.ChangeEvent<HTMLInputElement>) => {
     const file = e.target.files?.[0]
     if (!file) return
+
     setSubmitting(true)
     try {
       await tendersAPI.uploadTenderAttachment(tenderId, file)
@@ -183,7 +204,9 @@ function TenderDetailContent() {
     const directiveId = directiveIdForUpload
     e.target.value = ''
     setDirectiveIdForUpload(null)
+
     if (!file || !directiveId) return
+
     setUploadingDirectiveId(directiveId)
     try {
       await tendersAPI.uploadDirectiveAttachment(directiveId, file)
@@ -220,10 +243,13 @@ function TenderDetailContent() {
               <ArrowLeft className="h-5 w-5" />
             </Link>
             <div>
-              <h1 className="text-2xl font-bold text-gray-900">{tender.tenderNumber} – {tender.title}</h1>
+              <h1 className="text-2xl font-bold text-gray-900">
+                {tender.tenderNumber} – {tender.title}
+              </h1>
               <p className="text-sm text-gray-600">{tender.issuingBodyName}</p>
             </div>
           </div>
+
           {tender.status === 'ACTIVE' && (
             <button
               onClick={() => setShowConvertModal(true)}
@@ -242,7 +268,9 @@ function TenderDetailContent() {
                 key={tab.id}
                 onClick={() => setActiveTab(tab.id as any)}
                 className={`flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium ${
-                  activeTab === tab.id ? 'bg-indigo-100 text-indigo-800' : 'text-gray-600 hover:bg-gray-100'
+                  activeTab === tab.id
+                    ? 'bg-indigo-100 text-indigo-800'
+                    : 'text-gray-600 hover:bg-gray-100'
                 }`}
               >
                 <tab.icon className="h-4 w-4" />
@@ -262,6 +290,7 @@ function TenderDetailContent() {
                       <p>{tender.announcementDate?.split('T')[0]}</p>
                     </div>
                   </div>
+
                   <div className="flex items-start gap-2">
                     <Calendar className="h-5 w-5 text-gray-400 mt-0.5" />
                     <div>
@@ -269,6 +298,7 @@ function TenderDetailContent() {
                       <p>{tender.closingDate?.split('T')[0]}</p>
                     </div>
                   </div>
+
                   <div className="flex items-start gap-2">
                     <DollarSign className="h-5 w-5 text-gray-400 mt-0.5" />
                     <div>
@@ -276,21 +306,71 @@ function TenderDetailContent() {
                       <p>{Number(tender.termsValue)} SAR</p>
                     </div>
                   </div>
+
                   <div className="flex items-start gap-2">
                     <DollarSign className="h-5 w-5 text-gray-400 mt-0.5" />
                     <div>
-                      <p className="text-xs text-gray-500">{t('tenders.bondValue')}</p>
-                      <p>{Number(tender.bondValue)} SAR</p>
+                      <p className="text-xs text-gray-500">التأمينات الأولية</p>
+                      <p>{Number(tender.initialBondValue || tender.bondValue || 0)} SAR</p>
+                    </div>
+                  </div>
+
+                  <div className="flex items-start gap-2">
+                    <DollarSign className="h-5 w-5 text-gray-400 mt-0.5" />
+                    <div>
+                      <p className="text-xs text-gray-500">التأمينات النهائية</p>
+                      <p>{Number(tender.finalBondValue || 0)} SAR</p>
+                    </div>
+                  </div>
+
+                  <div className="flex items-start gap-2">
+                    <Calendar className="h-5 w-5 text-gray-400 mt-0.5" />
+                    <div>
+                      <p className="text-xs text-gray-500">زمن الاسترجاع</p>
+                      <p>{tender.finalBondRefundPeriod || '-'}</p>
+                    </div>
+                  </div>
+
+                  <div className="flex items-start gap-2">
+                    <Calendar className="h-5 w-5 text-gray-400 mt-0.5" />
+                    <div>
+                      <p className="text-xs text-gray-500">زيارة الموقع</p>
+                      <p>{tender.siteVisitRequired ? 'إجبارية' : 'غير إجبارية'}</p>
+                    </div>
+                  </div>
+
+                  {tender.siteVisitRequired && (
+                    <div className="flex items-start gap-2">
+                      <MapPin className="h-5 w-5 text-gray-400 mt-0.5" />
+                      <div>
+                        <p className="text-xs text-gray-500">مكان الزيارة</p>
+                        <p>{tender.siteVisitLocation || '-'}</p>
+                      </div>
+                    </div>
+                  )}
+
+                  <div className="flex items-start gap-2">
+                    <MapPin className="h-5 w-5 text-gray-400 mt-0.5" />
+                    <div>
+                      <p className="text-xs text-gray-500">مكان استلام دفتر الشروط</p>
+                      <p>{tender.termsPickupProvince || '-'}</p>
                     </div>
                   </div>
                 </div>
+
                 {tender.announcementLink && (
                   <p>
-                    <a href={tender.announcementLink} target="_blank" rel="noopener noreferrer" className="text-indigo-600 hover:underline">
+                    <a
+                      href={tender.announcementLink}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="text-indigo-600 hover:underline"
+                    >
                       {t('tenders.announcementLink')}
                     </a>
                   </p>
                 )}
+
                 {tender.notes && (
                   <div>
                     <p className="text-xs text-gray-500">{t('common.notes')}</p>
@@ -312,19 +392,29 @@ function TenderDetailContent() {
                     {t('tenders.addDirective')}
                   </button>
                 </div>
+
                 {!tender.directives?.length ? (
                   <p className="text-gray-500">{t('common.noData')}</p>
                 ) : (
                   <ul className="space-y-3">
                     {tender.directives.map((d) => (
-                      <li key={d.id} className="border rounded-lg p-4 flex flex-wrap items-center justify-between gap-2">
+                      <li
+                        key={d.id}
+                        className="border rounded-lg p-4 flex flex-wrap items-center justify-between gap-2"
+                      >
                         <div>
                           <p className="font-medium">{DIRECTIVE_TYPE_LABELS[d.type] || d.type}</p>
                           <p className="text-sm text-gray-600">
-                            {d.assignedToEmployee ? `${d.assignedToEmployee.firstName} ${d.assignedToEmployee.lastName}` : ''} · {d.status}
+                            {d.assignedToEmployee
+                              ? `${d.assignedToEmployee.firstName} ${d.assignedToEmployee.lastName}`
+                              : ''}{' '}
+                            · {d.status}
                           </p>
-                          {d.completionNotes && <p className="text-sm mt-1">{d.completionNotes}</p>}
+                          {d.completionNotes && (
+                            <p className="text-sm mt-1">{d.completionNotes}</p>
+                          )}
                         </div>
+
                         <div className="flex items-center gap-2">
                           {d.status !== 'COMPLETED' && d.assignedToEmployee?.user?.id && (
                             <button
@@ -334,19 +424,25 @@ function TenderDetailContent() {
                               {t('tenders.completeTask')}
                             </button>
                           )}
+
                           <input
                             type="file"
                             ref={directiveFileInputRef}
                             className="hidden"
                             onChange={handleDirectiveFileUpload}
                           />
+
                           <button
                             type="button"
                             onClick={() => handleDirectiveFileSelect(d.id)}
                             disabled={uploadingDirectiveId === d.id}
                             className="text-sm text-indigo-600 hover:underline flex items-center gap-1"
                           >
-                            {uploadingDirectiveId === d.id ? <Loader2 className="h-4 w-4 animate-spin" /> : <Upload className="h-4 w-4" />}
+                            {uploadingDirectiveId === d.id ? (
+                              <Loader2 className="h-4 w-4 animate-spin" />
+                            ) : (
+                              <Upload className="h-4 w-4" />
+                            )}
                             {t('tenders.uploadFile')}
                           </button>
                         </div>
@@ -371,17 +467,49 @@ function TenderDetailContent() {
                     disabled={submitting}
                     className="flex items-center gap-2 px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700 disabled:opacity-50"
                   >
-                    {submitting ? <Loader2 className="h-4 w-4 animate-spin" /> : <Upload className="h-4 w-4" />}
+                    {submitting ? (
+                      <Loader2 className="h-4 w-4 animate-spin" />
+                    ) : (
+                      <Upload className="h-4 w-4" />
+                    )}
                     {t('tenders.uploadFile')}
                   </button>
                 </div>
+
                 {!tender.attachments?.length ? (
                   <p className="text-gray-500">{t('common.noData')}</p>
                 ) : (
                   <ul className="space-y-2">
                     {tender.attachments.map((a: any) => (
-                      <li key={a.id} className="text-sm text-gray-700">
-                        {a.originalName || a.fileName}
+                      <li
+                        key={a.id}
+                        className="flex items-center justify-between border rounded px-3 py-2"
+                      >
+                        <a
+                          href={`${process.env.NEXT_PUBLIC_API_URL}/tenders/attachments/${a.id}/view`}
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          className="text-sm text-indigo-600 hover:underline flex items-center gap-1"
+                        >
+                          <ExternalLink className="h-4 w-4" />
+                          {a.originalName || a.fileName}
+                        </a>
+
+                        <button
+                          onClick={async () => {
+                            if (!confirm('حذف الملف؟')) return
+                            try {
+                              await tendersAPI.deleteAttachment(a.id)
+                              toast.success('تم الحذف')
+                              fetchTender()
+                            } catch {
+                              toast.error('فشل الحذف')
+                            }
+                          }}
+                          className="text-red-600 text-sm hover:underline"
+                        >
+                          حذف
+                        </button>
                       </li>
                     ))}
                   </ul>
@@ -397,7 +525,8 @@ function TenderDetailContent() {
                   <ul className="space-y-2">
                     {history.map((h: any) => (
                       <li key={h.id} className="text-sm border-b border-gray-100 pb-2">
-                        <span className="font-medium">{h.action}</span> · {h.user?.username} · {h.createdAt?.split('T')[0]}
+                        <span className="font-medium">{h.action}</span> · {h.user?.username} ·{' '}
+                        {h.createdAt?.split('T')[0]}
                       </li>
                     ))}
                   </ul>
@@ -408,36 +537,54 @@ function TenderDetailContent() {
         </div>
       </div>
 
-      <Modal isOpen={showDirectiveModal} onClose={() => setShowDirectiveModal(false)} title={t('tenders.addDirective')}>
+      <Modal
+        isOpen={showDirectiveModal}
+        onClose={() => setShowDirectiveModal(false)}
+        title={t('tenders.addDirective')}
+      >
         <form onSubmit={handleAddDirective} className="space-y-4">
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.directiveType')}</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('tenders.directiveType')}
+            </label>
             <select
               value={directiveForm.type}
               onChange={(e) => setDirectiveForm({ ...directiveForm, type: e.target.value })}
               className="w-full px-3 py-2 border rounded-lg"
             >
               {directiveTypeValues.map((v) => (
-                <option key={v} value={v}>{DIRECTIVE_TYPE_LABELS[v] || v}</option>
+                <option key={v} value={v}>
+                  {DIRECTIVE_TYPE_LABELS[v] || v}
+                </option>
               ))}
             </select>
           </div>
+
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.assignee')} *</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('tenders.assignee')} *
+            </label>
             <select
               value={directiveForm.assignedToEmployeeId}
-              onChange={(e) => setDirectiveForm({ ...directiveForm, assignedToEmployeeId: e.target.value })}
+              onChange={(e) =>
+                setDirectiveForm({ ...directiveForm, assignedToEmployeeId: e.target.value })
+              }
               className="w-full px-3 py-2 border rounded-lg"
               required
             >
               <option value="">Select employee</option>
               {employees.map((emp) => (
-                <option key={emp.id} value={emp.id}>{emp.firstName} {emp.lastName}</option>
+                <option key={emp.id} value={emp.id}>
+                  {emp.firstName} {emp.lastName}
+                </option>
               ))}
             </select>
           </div>
+
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('common.notes')}</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('common.notes')}
+            </label>
             <textarea
               value={directiveForm.notes || ''}
               onChange={(e) => setDirectiveForm({ ...directiveForm, notes: e.target.value })}
@@ -445,9 +592,20 @@ function TenderDetailContent() {
               rows={2}
             />
           </div>
+
           <div className="flex justify-end gap-2">
-            <button type="button" onClick={() => setShowDirectiveModal(false)} className="px-4 py-2 border rounded-lg">{t('common.cancel')}</button>
-            <button type="submit" disabled={submitting} className="px-4 py-2 bg-indigo-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2">
+            <button
+              type="button"
+              onClick={() => setShowDirectiveModal(false)}
+              className="px-4 py-2 border rounded-lg"
+            >
+              {t('common.cancel')}
+            </button>
+            <button
+              type="submit"
+              disabled={submitting}
+              className="px-4 py-2 bg-indigo-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2"
+            >
               {submitting && <Loader2 className="h-4 w-4 animate-spin" />}
               {t('common.save')}
             </button>
@@ -455,10 +613,16 @@ function TenderDetailContent() {
         </form>
       </Modal>
 
-      <Modal isOpen={!!showCompleteModal} onClose={() => setShowCompleteModal(null)} title={t('tenders.completeTask')}>
+      <Modal
+        isOpen={!!showCompleteModal}
+        onClose={() => setShowCompleteModal(null)}
+        title={t('tenders.completeTask')}
+      >
         <form onSubmit={handleCompleteDirective} className="space-y-4">
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.completionNotes')}</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('tenders.completionNotes')}
+            </label>
             <textarea
               value={completeNotes}
               onChange={(e) => setCompleteNotes(e.target.value)}
@@ -466,9 +630,20 @@ function TenderDetailContent() {
               rows={3}
             />
           </div>
+
           <div className="flex justify-end gap-2">
-            <button type="button" onClick={() => setShowCompleteModal(null)} className="px-4 py-2 border rounded-lg">{t('common.cancel')}</button>
-            <button type="submit" disabled={submitting} className="px-4 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2">
+            <button
+              type="button"
+              onClick={() => setShowCompleteModal(null)}
+              className="px-4 py-2 border rounded-lg"
+            >
+              {t('common.cancel')}
+            </button>
+            <button
+              type="submit"
+              disabled={submitting}
+              className="px-4 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2"
+            >
               {submitting && <Loader2 className="h-4 w-4 animate-spin" />}
               {t('common.save')}
             </button>
@@ -476,7 +651,11 @@ function TenderDetailContent() {
         </form>
       </Modal>
 
-      <Modal isOpen={showConvertModal} onClose={() => setShowConvertModal(false)} title={t('tenders.convertToDeal')}>
+      <Modal
+        isOpen={showConvertModal}
+        onClose={() => setShowConvertModal(false)}
+        title={t('tenders.convertToDeal')}
+      >
         <form onSubmit={handleConvertToDeal} className="space-y-4">
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">Contact *</label>
@@ -488,10 +667,13 @@ function TenderDetailContent() {
             >
               <option value="">Select contact</option>
               {contacts.map((c) => (
-                <option key={c.id} value={c.id}>{c.name}</option>
+                <option key={c.id} value={c.id}>
+                  {c.name}
+                </option>
               ))}
             </select>
           </div>
+
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">Pipeline *</label>
             <select
@@ -502,13 +684,26 @@ function TenderDetailContent() {
             >
               <option value="">Select pipeline</option>
               {pipelines.map((p) => (
-                <option key={p.id} value={p.id}>{p.name}</option>
+                <option key={p.id} value={p.id}>
+                  {p.name}
+                </option>
               ))}
             </select>
           </div>
+
           <div className="flex justify-end gap-2">
-            <button type="button" onClick={() => setShowConvertModal(false)} className="px-4 py-2 border rounded-lg">{t('common.cancel')}</button>
-            <button type="submit" disabled={submitting} className="px-4 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2">
+            <button
+              type="button"
+              onClick={() => setShowConvertModal(false)}
+              className="px-4 py-2 border rounded-lg"
+            >
+              {t('common.cancel')}
+            </button>
+            <button
+              type="submit"
+              disabled={submitting}
+              className="px-4 py-2 bg-green-600 text-white rounded-lg disabled:opacity-50 flex items-center gap-2"
+            >
               {submitting && <Loader2 className="h-4 w-4 animate-spin" />}
               {t('tenders.convertToDeal')}
             </button>

frontend/src/app/tenders/page.tsx

@@ -10,9 +10,6 @@ import {
   FileText,
   Plus,
   Search,
-  Calendar,
-  Building2,
-  DollarSign,
   AlertCircle,
   ArrowLeft,
   Eye,
@@ -32,6 +29,23 @@ const SOURCE_LABELS: Record<string, string> = {
   MANUAL: 'Manual entry',
 }
 
+const SYRIA_PROVINCES = [
+  'دمشق',
+  'ريف دمشق',
+  'حلب',
+  'حمص',
+  'حماة',
+  'اللاذقية',
+  'طرطوس',
+  'إدلب',
+  'درعا',
+  'السويداء',
+  'القنيطرة',
+  'دير الزور',
+  'الرقة',
+  'الحسكة',
+]
+
 const ANNOUNCEMENT_LABELS: Record<string, string> = {
   FIRST: 'First announcement',
   RE_ANNOUNCEMENT_2: 'Re-announcement 2nd',
@@ -39,6 +53,27 @@ const ANNOUNCEMENT_LABELS: Record<string, string> = {
   RE_ANNOUNCEMENT_4: 'Re-announcement 4th',
 }
 
+const getInitialFormData = (): CreateTenderData => ({
+  tenderNumber: '',
+  issuingBodyName: '',
+  title: '',
+  termsValue: 0,
+  bondValue: 0,
+
+  initialBondValue: 0,
+  finalBondValue: 0,
+  finalBondRefundPeriod: '',
+  siteVisitRequired: false,
+  siteVisitLocation: '',
+  termsPickupProvince: '',
+
+  announcementDate: '',
+  closingDate: '',
+  source: 'MANUAL',
+  announcementType: 'FIRST',
+  notes: '',
+})
+
 function TendersContent() {
   const { t } = useLanguage()
   const [tenders, setTenders] = useState<Tender[]>([])
@@ -50,17 +85,8 @@ function TendersContent() {
   const [searchTerm, setSearchTerm] = useState('')
   const [selectedStatus, setSelectedStatus] = useState('all')
   const [showCreateModal, setShowCreateModal] = useState(false)
-  const [formData, setFormData] = useState<CreateTenderData>({
-    tenderNumber: '',
-    issuingBodyName: '',
-    title: '',
-    termsValue: 0,
-    bondValue: 0,
-    announcementDate: '',
-    closingDate: '',
-    source: 'MANUAL',
-    announcementType: 'FIRST',
-  })
+
+  const [formData, setFormData] = useState<CreateTenderData>(getInitialFormData())
   const [formErrors, setFormErrors] = useState<Record<string, string>>({})
   const [submitting, setSubmitting] = useState(false)
   const [possibleDuplicates, setPossibleDuplicates] = useState<Tender[]>([])
@@ -68,12 +94,20 @@ function TendersContent() {
   const [sourceValues, setSourceValues] = useState<string[]>([])
   const [announcementTypeValues, setAnnouncementTypeValues] = useState<string[]>([])
 
+  const resetForm = () => {
+    setFormData(getInitialFormData())
+    setFormErrors({})
+    setPossibleDuplicates([])
+    setShowDuplicateWarning(false)
+  }
+
   const fetchTenders = useCallback(async () => {
     setLoading(true)
     try {
       const filters: TenderFilters = { page: currentPage, pageSize }
       if (searchTerm) filters.search = searchTerm
       if (selectedStatus !== 'all') filters.status = selectedStatus
+
       const data = await tendersAPI.getAll(filters)
       setTenders(data.tenders)
       setTotal(data.total)
@@ -96,24 +130,39 @@ function TendersContent() {
 
   const handleCreate = async (e: React.FormEvent) => {
     e.preventDefault()
+
     const errors: Record<string, string> = {}
+
     if (!formData.tenderNumber?.trim()) errors.tenderNumber = t('common.required')
     if (!formData.issuingBodyName?.trim()) errors.issuingBodyName = t('common.required')
     if (!formData.title?.trim()) errors.title = t('common.required')
     if (!formData.announcementDate) errors.announcementDate = t('common.required')
     if (!formData.closingDate) errors.closingDate = t('common.required')
-    //if (Number(formData.termsValue) < 0) errors.termsValue = t('common.required')
-    if (Number(formData.bondValue) < 0) errors.bondValue = t('common.required')
+
+    if (Number(formData.initialBondValue || 0) < 0) {
+      errors.initialBondValue = t('common.required')
+    }
+
+    if (formData.siteVisitRequired && !formData.siteVisitLocation?.trim()) {
+      errors.siteVisitLocation = t('common.required')
+    }
+
     setFormErrors(errors)
     if (Object.keys(errors).length > 0) return
 
     setSubmitting(true)
     try {
-      const result = await tendersAPI.create(formData)
+      const result = await tendersAPI.create({
+        ...formData,
+        bondValue: Number(formData.initialBondValue ?? formData.bondValue ?? 0),
+      })
+
       if (result.possibleDuplicates && result.possibleDuplicates.length > 0) {
         setPossibleDuplicates(result.possibleDuplicates)
         setShowDuplicateWarning(true)
-        toast(t('tenders.duplicateWarning') || 'Possible duplicates found. Please review.', { icon: '⚠️' })
+        toast(t('tenders.duplicateWarning') || 'Possible duplicates found. Please review.', {
+          icon: '⚠️',
+        })
       } else {
         toast.success(t('tenders.createSuccess') || 'Tender created successfully')
         setShowCreateModal(false)
@@ -127,23 +176,6 @@ function TendersContent() {
     }
   }
 
-  const resetForm = () => {
-    setFormData({
-      tenderNumber: '',
-      issuingBodyName: '',
-      title: '',
-      termsValue: 0,
-      bondValue: 0,
-      announcementDate: '',
-      closingDate: '',
-      source: 'MANUAL',
-      announcementType: 'FIRST',
-    })
-    setFormErrors({})
-    setPossibleDuplicates([])
-    setShowDuplicateWarning(false)
-  }
-
   return (
     <div className="min-h-screen bg-gray-50">
       <div className="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
@@ -155,16 +187,25 @@ function TendersContent() {
             >
               <ArrowLeft className="h-5 w-5" />
             </Link>
+
             <div className="flex items-center gap-2">
               <FileText className="h-8 w-8 text-indigo-600" />
               <div>
-                <h1 className="text-2xl font-bold text-gray-900">{t('nav.tenders') || 'Tenders'}</h1>
-                <p className="text-sm text-gray-600">{t('tenders.subtitle') || 'Tender Management'}</p>
+                <h1 className="text-2xl font-bold text-gray-900">
+                  {t('nav.tenders') || 'Tenders'}
+                </h1>
+                <p className="text-sm text-gray-600">
+                  {t('tenders.subtitle') || 'Tender Management'}
+                </p>
               </div>
             </div>
           </div>
+
           <button
-            onClick={() => { setShowCreateModal(true); resetForm(); }}
+            onClick={() => {
+              resetForm()
+              setShowCreateModal(true)
+            }}
             className="flex items-center gap-2 px-4 py-2 bg-indigo-600 text-white rounded-lg hover:bg-indigo-700"
           >
             <Plus className="h-5 w-5" />
@@ -184,6 +225,7 @@ function TendersContent() {
                 className="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500"
               />
             </div>
+
             <select
               value={selectedStatus}
               onChange={(e) => setSelectedStatus(e.target.value)}
@@ -209,26 +251,52 @@ function TendersContent() {
               <table className="min-w-full divide-y divide-gray-200">
                 <thead className="bg-gray-50">
                   <tr>
-                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('tenders.tenderNumber') || 'Number'}</th>
-                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('tenders.title') || 'Title'}</th>
-                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('tenders.issuingBody') || 'Issuing body'}</th>
-                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('tenders.closingDate') || 'Closing date'}</th>
-                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">{t('common.status')}</th>
-                    <th className="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">{t('common.actions')}</th>
+                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
+                      {t('tenders.tenderNumber') || 'Number'}
+                    </th>
+                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
+                      {t('tenders.title') || 'Title'}
+                    </th>
+                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
+                      {t('tenders.issuingBody') || 'Issuing body'}
+                    </th>
+                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
+                      {t('tenders.closingDate') || 'Closing date'}
+                    </th>
+                    <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
+                      {t('common.status')}
+                    </th>
+                    <th className="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">
+                      {t('common.actions')}
+                    </th>
                   </tr>
                 </thead>
+
                 <tbody className="bg-white divide-y divide-gray-200">
                   {tenders.map((tender) => (
                     <tr key={tender.id} className="hover:bg-gray-50">
-                      <td className="px-4 py-3 text-sm font-medium text-gray-900">{tender.tenderNumber}</td>
-                      <td className="px-4 py-3 text-sm text-gray-900">{tender.title}</td>
-                      <td className="px-4 py-3 text-sm text-gray-600">{tender.issuingBodyName}</td>
-                      <td className="px-4 py-3 text-sm text-gray-600">{tender.closingDate?.split('T')[0]}</td>
+                      <td className="px-4 py-3 text-sm font-medium text-gray-900">
+                        {tender.tenderNumber}
+                      </td>
+                      <td className="px-4 py-3 text-sm text-gray-900">
+                        {tender.title}
+                      </td>
+                      <td className="px-4 py-3 text-sm text-gray-600">
+                        {tender.issuingBodyName}
+                      </td>
+                      <td className="px-4 py-3 text-sm text-gray-600">
+                        {tender.closingDate?.split('T')[0]}
+                      </td>
                       <td className="px-4 py-3">
-                        <span className={`px-2 py-1 text-xs rounded-full ${
-                          tender.status === 'ACTIVE' ? 'bg-green-100 text-green-800' :
-                          tender.status === 'CONVERTED_TO_DEAL' ? 'bg-blue-100 text-blue-800' : 'bg-gray-100 text-gray-800'
-                        }`}>
+                        <span
+                          className={`px-2 py-1 text-xs rounded-full ${
+                            tender.status === 'ACTIVE'
+                              ? 'bg-green-100 text-green-800'
+                              : tender.status === 'CONVERTED_TO_DEAL'
+                                ? 'bg-blue-100 text-blue-800'
+                                : 'bg-gray-100 text-gray-800'
+                          }`}
+                        >
                           {tender.status}
                         </span>
                       </td>
@@ -251,7 +319,8 @@ function TendersContent() {
           {totalPages > 1 && (
             <div className="px-4 py-3 border-t border-gray-200 flex items-center justify-between">
               <p className="text-sm text-gray-600">
-                {t('common.showing') || 'Showing'} {(currentPage - 1) * pageSize + 1}–{Math.min(currentPage * pageSize, total)} {t('common.of') || 'of'} {total}
+                {t('common.showing') || 'Showing'} {(currentPage - 1) * pageSize + 1}–
+                {Math.min(currentPage * pageSize, total)} {t('common.of') || 'of'} {total}
               </p>
               <div className="flex gap-2">
                 <button
@@ -276,113 +345,259 @@ function TendersContent() {
 
       <Modal
         isOpen={showCreateModal}
-        onClose={() => { setShowCreateModal(false); setShowDuplicateWarning(false); resetForm(); }}
+        onClose={() => {
+          setShowCreateModal(false)
+          resetForm()
+        }}
         title={t('tenders.addTender') || 'Add Tender'}
       >
         <form onSubmit={handleCreate} className="space-y-4">
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.tenderNumber')} *</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                {t('tenders.tenderNumber')} *
+              </label>
               <input
                 type="text"
                 value={formData.tenderNumber}
                 onChange={(e) => setFormData({ ...formData, tenderNumber: e.target.value })}
                 className="w-full px-3 py-2 border rounded-lg"
               />
-              {formErrors.tenderNumber && <p className="text-red-500 text-xs mt-1">{formErrors.tenderNumber}</p>}
+              {formErrors.tenderNumber && (
+                <p className="text-red-500 text-xs mt-1">{formErrors.tenderNumber}</p>
+              )}
             </div>
+
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.issuingBody')} *</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                {t('tenders.issuingBody')} *
+              </label>
               <input
                 type="text"
                 value={formData.issuingBodyName}
                 onChange={(e) => setFormData({ ...formData, issuingBodyName: e.target.value })}
                 className="w-full px-3 py-2 border rounded-lg"
               />
-              {formErrors.issuingBodyName && <p className="text-red-500 text-xs mt-1">{formErrors.issuingBodyName}</p>}
+              {formErrors.issuingBodyName && (
+                <p className="text-red-500 text-xs mt-1">{formErrors.issuingBodyName}</p>
+              )}
             </div>
           </div>
+
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.titleLabel')} *</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('tenders.titleLabel')} *
+            </label>
             <input
               type="text"
               value={formData.title}
               onChange={(e) => setFormData({ ...formData, title: e.target.value })}
               className="w-full px-3 py-2 border rounded-lg"
             />
-            {formErrors.title && <p className="text-red-500 text-xs mt-1">{formErrors.title}</p>}
+            {formErrors.title && (
+              <p className="text-red-500 text-xs mt-1">{formErrors.title}</p>
+            )}
           </div>
+
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.termsValue')} *</label>
-              <input
-                type="number"
-                value={formData.termsValue || ''}
-                onChange={(e) => setFormData({ ...formData, termsValue: Number(e.target.value) || 0 })}
-                className="w-full px-3 py-2 border rounded-lg"
-              />
-            </div>
-            <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.bondValue')} *</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                قيمة دفتر الشروط *
+              </label>
               <input
                 type="number"
                 min={0}
-                value={formData.bondValue || ''}
-                onChange={(e) => setFormData({ ...formData, bondValue: Number(e.target.value) || 0 })}
+                value={formData.termsValue || ''}
+                onChange={(e) =>
+                  setFormData({ ...formData, termsValue: Number(e.target.value) || 0 })
+                }
+                className="w-full px-3 py-2 border rounded-lg"
+              />
+            </div>
+
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                قيمة التأمينات الأولية *
+              </label>
+              <input
+                type="number"
+                min={0}
+                value={formData.initialBondValue || ''}
+                onChange={(e) =>
+                  setFormData({
+                    ...formData,
+                    initialBondValue: Number(e.target.value) || 0,
+                    bondValue: Number(e.target.value) || 0,
+                  })
+                }
+                className="w-full px-3 py-2 border rounded-lg"
+              />
+              {formErrors.initialBondValue && (
+                <p className="text-red-500 text-xs mt-1">{formErrors.initialBondValue}</p>
+              )}
+            </div>
+
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                قيمة التأمينات النهائية
+              </label>
+              <input
+                type="number"
+                min={0}
+                value={formData.finalBondValue || ''}
+                onChange={(e) =>
+                  setFormData({ ...formData, finalBondValue: Number(e.target.value) || 0 })
+                }
+                className="w-full px-3 py-2 border rounded-lg"
+              />
+            </div>
+
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                زمن الاسترجاع
+              </label>
+              <input
+                type="text"
+                value={formData.finalBondRefundPeriod || ''}
+                onChange={(e) =>
+                  setFormData({ ...formData, finalBondRefundPeriod: e.target.value })
+                }
+                placeholder="مثال: بعد 90 يوم من التسليم النهائي"
                 className="w-full px-3 py-2 border rounded-lg"
               />
             </div>
           </div>
+
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.announcementDate')} *</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                {t('tenders.announcementDate')} *
+              </label>
               <input
                 type="date"
                 value={formData.announcementDate}
                 onChange={(e) => setFormData({ ...formData, announcementDate: e.target.value })}
                 className="w-full px-3 py-2 border rounded-lg"
               />
-              {formErrors.announcementDate && <p className="text-red-500 text-xs mt-1">{formErrors.announcementDate}</p>}
+              {formErrors.announcementDate && (
+                <p className="text-red-500 text-xs mt-1">{formErrors.announcementDate}</p>
+              )}
             </div>
+
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.closingDate')} *</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                {t('tenders.closingDate')} *
+              </label>
               <input
                 type="date"
                 value={formData.closingDate}
                 onChange={(e) => setFormData({ ...formData, closingDate: e.target.value })}
                 className="w-full px-3 py-2 border rounded-lg"
               />
-              {formErrors.closingDate && <p className="text-red-500 text-xs mt-1">{formErrors.closingDate}</p>}
+              {formErrors.closingDate && (
+                <p className="text-red-500 text-xs mt-1">{formErrors.closingDate}</p>
+              )}
             </div>
           </div>
+
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.source')}</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                {t('tenders.source')}
+              </label>
               <select
                 value={formData.source}
                 onChange={(e) => setFormData({ ...formData, source: e.target.value })}
                 className="w-full px-3 py-2 border rounded-lg"
               >
                 {sourceValues.map((s) => (
-                  <option key={s} value={s}>{SOURCE_LABELS[s] || s}</option>
+                  <option key={s} value={s}>
+                    {SOURCE_LABELS[s] || s}
+                  </option>
                 ))}
               </select>
             </div>
+
             <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.announcementType')}</label>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                {t('tenders.announcementType')}
+              </label>
               <select
                 value={formData.announcementType}
                 onChange={(e) => setFormData({ ...formData, announcementType: e.target.value })}
                 className="w-full px-3 py-2 border rounded-lg"
               >
                 {announcementTypeValues.map((a) => (
-                  <option key={a} value={a}>{ANNOUNCEMENT_LABELS[a] || a}</option>
+                  <option key={a} value={a}>
+                    {ANNOUNCEMENT_LABELS[a] || a}
+                  </option>
                 ))}
               </select>
             </div>
           </div>
+
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                زيارة الموقع
+              </label>
+              <select
+                value={formData.siteVisitRequired ? 'YES' : 'NO'}
+                onChange={(e) =>
+                  setFormData({
+                    ...formData,
+                    siteVisitRequired: e.target.value === 'YES',
+                    siteVisitLocation: e.target.value === 'YES' ? formData.siteVisitLocation || '' : '',
+                  })
+                }
+                className="w-full px-3 py-2 border rounded-lg"
+              >
+                <option value="NO">غير إجبارية</option>
+                <option value="YES">إجبارية</option>
+              </select>
+            </div>
+
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                مكان استلام دفتر الشروط - المحافظة
+              </label>
+              <select
+                value={formData.termsPickupProvince || ''}
+                onChange={(e) => setFormData({ ...formData, termsPickupProvince: e.target.value })}
+                className="w-full px-3 py-2 border rounded-lg"
+              >
+                <option value="">اختر المحافظة</option>
+                {SYRIA_PROVINCES.map((province) => (
+                  <option key={province} value={province}>
+                    {province}
+                  </option>
+                ))}
+              </select>
+            </div>
+          </div>
+
+          {formData.siteVisitRequired && (
+            <div>
+              <label className="block text-sm font-medium text-gray-700 mb-1">
+                مكان الزيارة *
+              </label>
+              <input
+                type="text"
+                value={formData.siteVisitLocation || ''}
+                onChange={(e) => setFormData({ ...formData, siteVisitLocation: e.target.value })}
+                className="w-full px-3 py-2 border rounded-lg"
+                placeholder="اكتب مكان أو عنوان زيارة الموقع"
+              />
+              {formErrors.siteVisitLocation && (
+                <p className="text-red-500 text-xs mt-1">{formErrors.siteVisitLocation}</p>
+              )}
+            </div>
+          )}
+
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('tenders.announcementLink')}</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('tenders.announcementLink')}
+            </label>
             <input
               type="url"
               value={formData.announcementLink || ''}
@@ -390,8 +605,11 @@ function TendersContent() {
               className="w-full px-3 py-2 border rounded-lg"
             />
           </div>
+
           <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">{t('common.notes')}</label>
+            <label className="block text-sm font-medium text-gray-700 mb-1">
+              {t('common.notes')}
+            </label>
             <textarea
               value={formData.notes || ''}
               onChange={(e) => setFormData({ ...formData, notes: e.target.value })}
@@ -399,29 +617,39 @@ function TendersContent() {
               rows={2}
             />
           </div>
+
           {showDuplicateWarning && possibleDuplicates.length > 0 && (
             <div className="p-3 bg-amber-50 border border-amber-200 rounded-lg flex items-start gap-2">
               <AlertCircle className="h-5 w-5 text-amber-600 flex-shrink-0 mt-0.5" />
               <div>
-                <p className="text-sm font-medium text-amber-800">{t('tenders.duplicateWarning') || 'Possible duplicates found'}</p>
+                <p className="text-sm font-medium text-amber-800">
+                  {t('tenders.duplicateWarning') || 'Possible duplicates found'}
+                </p>
                 <ul className="text-sm text-amber-700 mt-1 list-disc list-inside">
                   {possibleDuplicates.slice(0, 3).map((d) => (
                     <li key={d.id}>
-                      <Link href={`/tenders/${d.id}`} className="underline">{d.tenderNumber} - {d.title}</Link>
+                      <Link href={`/tenders/${d.id}`} className="underline">
+                        {d.tenderNumber} - {d.title}
+                      </Link>
                     </li>
                   ))}
                 </ul>
               </div>
             </div>
           )}
+
           <div className="flex justify-end gap-2 pt-4">
             <button
               type="button"
-              onClick={() => { setShowCreateModal(false); resetForm(); }}
+              onClick={() => {
+                setShowCreateModal(false)
+                resetForm()
+              }}
               className="px-4 py-2 border rounded-lg"
             >
               {t('common.cancel')}
             </button>
+
             <button
               type="submit"
               disabled={submitting}

frontend/src/components/contacts/ContactForm.tsx

@@ -15,40 +15,47 @@ interface ContactFormProps {
   submitting?: boolean
 }
 
+const buildInitialFormData = (contact?: Contact): CreateContactData => ({
+  type: contact?.type || 'INDIVIDUAL',
+  name: contact?.name || '',
+  nameAr: contact?.nameAr,
+  email: contact?.email,
+  phone: contact?.phone,
+  mobile: contact?.mobile,
+  website: contact?.website,
+  companyName: contact?.companyName,
+  companyNameAr: contact?.companyNameAr,
+  taxNumber: contact?.taxNumber,
+  commercialRegister: contact?.commercialRegister,
+  address: contact?.address,
+  city: contact?.city,
+  country: contact?.country || 'Syria',
+  postalCode: contact?.postalCode,
+  source: contact?.source || 'WEBSITE',
+  categories: contact?.categories?.map((c: any) => c.id || c) || [],
+  tags: contact?.tags || [],
+  parentId: contact?.parent?.id,
+  employeeId: contact?.employeeId ?? undefined,
+  customFields: contact?.customFields
+})
+
 export default function ContactForm({ contact, onSubmit, onCancel, submitting = false }: ContactFormProps) {
   const isEdit = !!contact
 
-  // Form state
-  const [formData, setFormData] = useState<CreateContactData>({
-    type: contact?.type || 'INDIVIDUAL',
-    name: contact?.name || '',
-    nameAr: contact?.nameAr,
-    email: contact?.email,
-    phone: contact?.phone,
-    mobile: contact?.mobile,
-    website: contact?.website,
-    companyName: contact?.companyName,
-    companyNameAr: contact?.companyNameAr,
-    taxNumber: contact?.taxNumber,
-    commercialRegister: contact?.commercialRegister,
-    address: contact?.address,
-    city: contact?.city,
-    country: contact?.country || 'Saudi Arabia',
-    postalCode: contact?.postalCode,
-    source: contact?.source || 'WEBSITE',
-    categories: contact?.categories?.map((c: any) => c.id || c) || [],
-    tags: contact?.tags || [],
-    parentId: contact?.parent?.id,
-    employeeId: contact?.employeeId ?? undefined,
-    customFields: contact?.customFields
-  })
-
+  const [formData, setFormData] = useState<CreateContactData>(buildInitialFormData(contact))
   const [rating, setRating] = useState<number>(contact?.rating || 0)
   const [newTag, setNewTag] = useState('')
   const [formErrors, setFormErrors] = useState<Record<string, string>>({})
   const [categories, setCategories] = useState<Category[]>([])
   const [employees, setEmployees] = useState<Employee[]>([])
 
+  useEffect(() => {
+    setFormData(buildInitialFormData(contact))
+    setRating(contact?.rating || 0)
+    setNewTag('')
+    setFormErrors({})
+  }, [contact])
+
   useEffect(() => {
     categoriesAPI.getTree().then(setCategories).catch(() => {})
   }, [])
@@ -72,7 +79,23 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
 
   const isCompanyEmployeeSelected = companyEmployeeCategoryId && (formData.categories || []).includes(companyEmployeeCategoryId)
 
-  // Validation
+  const organizationTypes = new Set([
+    'COMPANY',
+    'HOLDING',
+    'GOVERNMENT',
+    'ORGANIZATION',
+    'EMBASSIES',
+    'BANK',
+    'UNIVERSITY',
+    'SCHOOL',
+    'UN',
+    'NGO',
+    'INSTITUTION',
+  ])
+
+  const isOrganizationType = organizationTypes.has(formData.type)
+  const showCompanyFields = isOrganizationType
+
   const validateForm = (): boolean => {
     const errors: Record<string, string> = {}
 
@@ -103,28 +126,49 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault()
     if (!validateForm()) return
+const cleanData = Object.entries({ ...formData, rating }).reduce((acc, [key, value]) => {
+  const requiredFields = ['type', 'name', 'source', 'country']
 
-    // Clean up empty strings to undefined for optional fields
-    const cleanData = Object.entries({ ...formData, rating }).reduce((acc, [key, value]) => {
-      // Keep the value if it's not an empty string, or if it's a required field
-      if (value !== '' || ['type', 'name', 'source', 'country'].includes(key)) {
-        acc[key] = value
-      }
+    // keep required fields as-is
+    if (requiredFields.includes(key)) {
+      acc[key] = value
       return acc
-    }, {} as any)
+    }
+
+    // in edit mode, allow clearing optional fields by sending null
+    if (isEdit && value === '') {
+      acc[key] = null
+      return acc
+    }
+
+    // in create mode, ignore empty optional fields
+    if (value !== '') {
+      acc[key] = value
+    }
+
+    return acc
+  }, {} as any)
 
-    // Remove parentId if it's empty or undefined
     if (!cleanData.parentId) {
       delete cleanData.parentId
     }
 
-    // Remove categories if empty array
     if (cleanData.categories && cleanData.categories.length === 0) {
       delete cleanData.categories
     }
 
-    // Remove employeeId if empty
-    if (!cleanData.employeeId) {
+    if (!cleanData.parentId) {
+  delete cleanData.parentId
+}
+
+    if (cleanData.categories && cleanData.categories.length === 0) {
+      delete cleanData.categories
+    }
+
+    // employeeId:
+    // - in create: remove if empty
+    // - in edit: keep null if user cleared it
+    if (!isEdit && !cleanData.employeeId) {
       delete cleanData.employeeId
     }
 
@@ -152,16 +196,12 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
     })
   }
 
-  const showCompanyFields = ['COMPANY', 'HOLDING', 'GOVERNMENT'].includes(formData.type)
-
   return (
-    <form onSubmit={handleSubmit} className="space-y-6">
-      {/* Basic Information Section */}
+    <form onSubmit={handleSubmit} noValidate className="space-y-6">
       <div>
         <h3 className="text-lg font-semibold text-gray-900 mb-4">Basic Information</h3>
         <div className="space-y-4">
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            {/* Contact Type */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Contact Type <span className="text-red-500">*</span>
@@ -175,11 +215,18 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
                 <option value="COMPANY">Company - شركة</option>
                 <option value="HOLDING">Holding - مجموعة</option>
                 <option value="GOVERNMENT">Government - حكومي</option>
+                <option value="ORGANIZATION">Organizations - منظمات</option>
+                <option value="EMBASSIES">Embassies - سفارات</option>
+                <option value="BANK">Banks - بنوك</option>
+                <option value="UNIVERSITY">Universities - جامعات</option>
+                <option value="SCHOOL">Schools - مدارس</option>
+                <option value="UN">UN - الأمم المتحدة</option>
+                <option value="NGO">NGO - منظمة غير حكومية</option>
+                <option value="INSTITUTION">Institution - مؤسسة</option>
               </select>
               {formErrors.type && <p className="text-red-500 text-xs mt-1">{formErrors.type}</p>}
             </div>
 
-            {/* Source */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Source <span className="text-red-500">*</span>
@@ -202,37 +249,20 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
             </div>
           </div>
 
-          {/* Name */}
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">
-              Name <span className="text-red-500">*</span>
+              {isOrganizationType ? 'Contact Person Name' : 'Name'} <span className="text-red-500">*</span>
             </label>
             <input
               type="text"
               value={formData.name}
               onChange={(e) => setFormData({ ...formData, name: e.target.value })}
               className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white text-gray-900"
-              placeholder="Enter contact name"
+              placeholder={isOrganizationType ? 'Enter contact person name' : 'Enter contact name'}
             />
             {formErrors.name && <p className="text-red-500 text-xs mt-1">{formErrors.name}</p>}
           </div>
 
-          {/* Arabic Name */}
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">
-              Arabic Name - الاسم بالعربية
-            </label>
-            <input
-              type="text"
-              value={formData.nameAr || ''}
-              onChange={(e) => setFormData({ ...formData, nameAr: e.target.value })}
-              className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white text-gray-900"
-              placeholder="أدخل الاسم بالعربية"
-              dir="rtl"
-            />
-          </div>
-
-          {/* Rating */}
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-2">
               Rating
@@ -268,12 +298,10 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         </div>
       </div>
 
-      {/* Contact Methods Section */}
       <div className="pt-6 border-t">
         <h3 className="text-lg font-semibold text-gray-900 mb-4">Contact Methods</h3>
         <div className="space-y-4">
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            {/* Email */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Email
@@ -288,7 +316,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
               {formErrors.email && <p className="text-red-500 text-xs mt-1">{formErrors.email}</p>}
             </div>
 
-            {/* Phone */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Phone
@@ -305,7 +332,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
           </div>
 
           <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            {/* Mobile */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Mobile
@@ -319,7 +345,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
               />
             </div>
 
-            {/* Website */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Website
@@ -336,44 +361,27 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         </div>
       </div>
 
-      {/* Company Information Section (conditional) */}
       {showCompanyFields && (
         <div className="pt-6 border-t">
           <h3 className="text-lg font-semibold text-gray-900 mb-4">Company Information</h3>
           <div className="space-y-4">
             <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-              {/* Company Name */}
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-1">
-                  Company Name
+                  {formData.type === 'EMBASSIES' ? 'Embassy Name' : 'Company / Organization Name'}
                 </label>
                 <input
                   type="text"
                   value={formData.companyName || ''}
                   onChange={(e) => setFormData({ ...formData, companyName: e.target.value })}
                   className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white text-gray-900"
-                  placeholder="Company name"
+                  placeholder={formData.type === 'EMBASSIES' ? 'Embassy name' : 'Company / organization name'}
                 />
               </div>
 
-              {/* Company Name Arabic */}
-              <div>
-                <label className="block text-sm font-medium text-gray-700 mb-1">
-                  Company Name (Arabic) - اسم الشركة
-                </label>
-                <input
-                  type="text"
-                  value={formData.companyNameAr || ''}
-                  onChange={(e) => setFormData({ ...formData, companyNameAr: e.target.value })}
-                  className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white text-gray-900"
-                  placeholder="اسم الشركة بالعربية"
-                  dir="rtl"
-                />
-              </div>
             </div>
 
             <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-              {/* Tax Number */}
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-1">
                   Tax Number
@@ -387,7 +395,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
                 />
               </div>
 
-              {/* Commercial Register */}
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-1">
                   Commercial Register
@@ -405,11 +412,9 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         </div>
       )}
 
-      {/* Address Section */}
       <div className="pt-6 border-t">
         <h3 className="text-lg font-semibold text-gray-900 mb-4">Address Information</h3>
         <div className="space-y-4">
-          {/* Address */}
           <div>
             <label className="block text-sm font-medium text-gray-700 mb-1">
               Street Address
@@ -424,7 +429,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
           </div>
 
           <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
-            {/* City */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 City
@@ -438,7 +442,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
               />
             </div>
 
-            {/* Country */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Country
@@ -452,7 +455,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
               />
             </div>
 
-            {/* Postal Code */}
             <div>
               <label className="block text-sm font-medium text-gray-700 mb-1">
                 Postal Code
@@ -469,7 +471,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         </div>
       </div>
 
-      {/* Categories Section */}
       <div className="pt-6 border-t">
         <h3 className="text-lg font-semibold text-gray-900 mb-4">Categories</h3>
         <CategorySelector
@@ -479,7 +480,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         />
       </div>
 
-      {/* Employee Link - when Company Employee category is selected */}
       {isCompanyEmployeeSelected && (
         <div className="pt-6 border-t">
           <h3 className="text-lg font-semibold text-gray-900 mb-4">Link to Employee (Optional)</h3>
@@ -501,11 +501,9 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         </div>
       )}
 
-      {/* Tags Section */}
       <div className="pt-6 border-t">
         <h3 className="text-lg font-semibold text-gray-900 mb-4">Tags</h3>
         <div className="space-y-3">
-          {/* Tag input */}
           <div className="flex gap-2">
             <input
               type="text"
@@ -524,7 +522,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
             </button>
           </div>
 
-          {/* Tags display */}
           {formData.tags && formData.tags.length > 0 && (
             <div className="flex flex-wrap gap-2">
               {formData.tags.map((tag, index) => (
@@ -547,7 +544,6 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         </div>
       </div>
 
-      {/* Duplicate Detection */}
       <DuplicateAlert
         email={formData.email}
         phone={formData.phone}
@@ -556,14 +552,12 @@ export default function ContactForm({ contact, onSubmit, onCancel, submitting =
         commercialRegister={formData.commercialRegister}
         excludeId={contact?.id}
         onMerge={(contactId) => {
-          // Navigate to merge page with pre-selected contacts
           if (typeof window !== 'undefined') {
             window.location.href = `/contacts/merge?sourceId=${contactId}`
           }
         }}
       />
 
-      {/* Form Actions */}
       <div className="flex items-center justify-end gap-3 pt-6 border-t">
         <button
           type="button"

frontend/src/lib/api/portal.ts

@@ -66,6 +66,24 @@ export interface Leave {
   createdAt: string
 }
 
+export interface PortalOvertimeRequest {
+  id: string
+  attendanceId: string
+  date: string
+  hours: number
+  reason: string
+  status: string
+  rejectedReason?: string
+  createdAt: string
+  employee?: {
+    id: string
+    firstName: string
+    lastName: string
+    uniqueEmployeeId: string
+    reportingToId?: string
+  }
+}
+
 export interface PurchaseRequest {
   id: string
   requestNumber: string
@@ -90,6 +108,24 @@ export interface Attendance {
   status: string
 }
 
+export interface ManagedLeave {
+  id: string
+  leaveType: string
+  startDate: string
+  endDate: string
+  days: number
+  status: string
+  reason?: string
+  rejectedReason?: string
+  employee: {
+    id: string
+    firstName: string
+    lastName: string
+    uniqueEmployeeId: string
+    reportingToId?: string
+  }
+}
+
 export interface Salary {
   id: string
   month: number
@@ -106,6 +142,24 @@ export interface Salary {
 }
 
 export const portalAPI = {
+
+  getManagedLeaves: async (status?: string): Promise<ManagedLeave[]> => {
+    const q = new URLSearchParams()
+    if (status && status !== 'all') q.append('status', status)
+    const response = await api.get(`/hr/portal/managed-leaves?${q.toString()}`)
+    return response.data.data || []
+  },
+
+  approveManagedLeave: async (id: string) => {
+    const response = await api.post(`/hr/portal/managed-leaves/${id}/approve`)
+    return response.data.data
+  },
+
+  rejectManagedLeave: async (id: string, rejectedReason: string) => {
+    const response = await api.post(`/hr/portal/managed-leaves/${id}/reject`, { rejectedReason })
+    return response.data.data
+  },
+
   getMe: async (): Promise<PortalProfile> => {
     const response = await api.get('/hr/portal/me')
     return response.data.data
@@ -121,6 +175,40 @@ export const portalAPI = {
     return response.data.data
   },
 
+    getOvertimeRequests: async (): Promise<PortalOvertimeRequest[]> => {
+    const response = await api.get('/hr/portal/overtime-requests')
+    return response.data.data || []
+  },
+
+  submitOvertimeRequest: async (data: {
+    date: string
+    hours: number
+    reason: string
+  }): Promise<PortalOvertimeRequest> => {
+    const response = await api.post('/hr/portal/overtime-requests', data)
+    return response.data.data
+  },
+
+  getManagedOvertimeRequests: async (): Promise<PortalOvertimeRequest[]> => {
+    const response = await api.get('/hr/portal/managed-overtime-requests')
+    return response.data.data || []
+  },
+
+  approveManagedOvertimeRequest: async (attendanceId: string): Promise<PortalOvertimeRequest> => {
+    const response = await api.post(`/hr/portal/managed-overtime-requests/${attendanceId}/approve`)
+    return response.data.data
+  },
+
+  rejectManagedOvertimeRequest: async (
+    attendanceId: string,
+    rejectedReason: string
+  ): Promise<PortalOvertimeRequest> => {
+    const response = await api.post(`/hr/portal/managed-overtime-requests/${attendanceId}/reject`, {
+      rejectedReason,
+    })
+    return response.data.data
+  },
+
   getLeaveBalance: async (year?: number): Promise<PortalProfile['stats']['leaveBalance']> => {
     const params = year ? `?year=${year}` : ''
     const response = await api.get(`/hr/portal/leave-balance${params}`)

frontend/src/lib/api/tenders.ts

@@ -5,8 +5,18 @@ export interface Tender {
   tenderNumber: string
   issuingBodyName: string
   title: string
+
   termsValue: number
   bondValue: number
+
+  // extra fields stored inside notes metadata for now
+  initialBondValue?: number | null
+  finalBondValue?: number | null
+  finalBondRefundPeriod?: string | null
+  siteVisitRequired?: boolean
+  siteVisitLocation?: string | null
+  termsPickupProvince?: string | null
+
   announcementDate: string
   closingDate: string
   announcementLink?: string
@@ -26,6 +36,7 @@ export interface Tender {
   _count?: { directives: number }
 }
 
+
 export interface TenderDirective {
   id: string
   tenderId: string
@@ -48,8 +59,18 @@ export interface CreateTenderData {
   tenderNumber: string
   issuingBodyName: string
   title: string
+
   termsValue: number
   bondValue: number
+
+  // extra UI/backend fields without DB migration
+  initialBondValue?: number
+  finalBondValue?: number
+  finalBondRefundPeriod?: string
+  siteVisitRequired?: boolean
+  siteVisitLocation?: string
+  termsPickupProvince?: string
+
   announcementDate: string
   closingDate: string
   announcementLink?: string
@@ -166,6 +187,10 @@ export const tendersAPI = {
     return response.data.data
   },
 
+  deleteAttachment: async (attachmentId: string): Promise<void> => {
+  await api.delete(`/tenders/attachments/${attachmentId}`)
+  },
+
   getSourceValues: async (): Promise<string[]> => {
     const response = await api.get('/tenders/source-values')
     return response.data.data