Intranet AppService Leave and Overtime

api/src/Kurs.Platform.Application.Contracts/Intranet/IntranetDashboardDto.cs

@@ -15,5 +15,7 @@ public class IntranetDashboardDto
     public List<AnnouncementDto> Announcements { get; set; } = [];
     public List<ShuttleRouteDto> ShuttleRoutes { get; set; } = [];
     public List<MealDto> Meals { get; set; } = [];
+    public List<LeaveDto> Leaves { get; set; } = [];
+    public List<OvertimeDto> Overtimes { get; set; } = [];
 }
 

api/src/Kurs.Platform.Application.Contracts/Intranet/LeaveDto.cs

@@ -0,0 +1,26 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Kurs.Platform.Intranet;
+
+public class LeaveDto : FullAuditedEntityDto<Guid>
+{
+    public Guid? TenantId { get; set; }
+
+    public Guid EmployeeId { get; set; }
+    public EmployeeDto Employee { get; set; }
+
+    public string LeaveType { get; set; }
+    public DateTime StartDate { get; set; }
+    public DateTime EndDate { get; set; }
+    public decimal TotalDays { get; set; }
+    public bool IsHalfDay { get; set; }
+    public string Reason { get; set; }
+    public string Status { get; set; }
+    public DateTime AppliedDate { get; set; }
+    public Guid? ApprovedById { get; set; }
+    public EmployeeDto ApprovedBy { get; set; }
+    public DateTime? ApprovedDate { get; set; }
+    public string RejectionReason { get; set; }
+    public string Attachments { get; set; }
+}

api/src/Kurs.Platform.Application.Contracts/Intranet/OvertimeDto.cs

@@ -0,0 +1,24 @@
+using System;
+using Volo.Abp.Application.Dtos;
+
+namespace Kurs.Platform.Intranet;
+
+public class OvertimeDto : FullAuditedEntityDto<Guid>
+{
+    public Guid? TenantId { get; set; }
+
+    public Guid EmployeeId { get; set; }
+    public EmployeeDto Employee { get; set; }     // Navigation'dan doldurulabilir
+
+    public DateTime Date { get; set; }           // Mesai tarihi
+    public DateTime StartTime { get; set; }      // Başlangıç zamanı
+    public DateTime EndTime { get; set; }        // Bitiş zamanı
+    public decimal TotalHours { get; set; }      // Toplam fazla mesai süresi
+    public string Reason { get; set; }           // Fazla mesai nedeni
+    public string Status { get; set; }           // Durum: "Bekliyor", "Onaylandı", "Reddedildi"
+    public Guid? ApprovedById { get; set; }      // Onaylayan kişi ID
+    public DateTime? ApprovedDate { get; set; }  // Onay tarihi
+    public string RejectionReason { get; set; }  // Reddetme nedeni
+    public decimal Rate { get; set; }            // Fazla mesai oranı (ör. 1.5x)
+    public decimal? Amount { get; set; }         // Hesaplanan ödeme tutarı
+}

api/src/Kurs.Platform.Application/Intranet/IntranetAppService.cs

@@ -33,6 +33,8 @@ public class IntranetAppService : PlatformAppService, IIntranetAppService
     private readonly IRepository<Department, Guid> _departmentRepository;
     private readonly IRepository<ShuttleRoute, Guid> _shuttleRouteRepository;
     private readonly IRepository<Meal, Guid> _mealRepository;
+    private readonly IRepository<Leave, Guid> _leaveRepository;
+    private readonly IRepository<Overtime, Guid> _overtimeRepository;
 
     public IntranetAppService(
         ICurrentTenant currentTenant,
@@ -48,7 +50,9 @@ public class IntranetAppService : PlatformAppService, IIntranetAppService
         IRepository<Announcement, Guid> announcementRepository,
         IRepository<Department, Guid> departmentRepository,
         IRepository<ShuttleRoute, Guid> shuttleRouteRepository,
-        IRepository<Meal, Guid> mealRepository
+        IRepository<Meal, Guid> mealRepository,
+        IRepository<Leave, Guid> leaveRepository,
+        IRepository<Overtime, Guid> overtimeRepository
     )
     {
         _currentTenant = currentTenant;
@@ -65,6 +69,8 @@ public class IntranetAppService : PlatformAppService, IIntranetAppService
         _departmentRepository = departmentRepository;
         _shuttleRouteRepository = shuttleRouteRepository;
         _mealRepository = mealRepository;
+        _leaveRepository = leaveRepository;
+        _overtimeRepository = overtimeRepository;
     }
 
     public async Task<IntranetDashboardDto> GetIntranetDashboardAsync()
@@ -80,10 +86,34 @@ public class IntranetAppService : PlatformAppService, IIntranetAppService
             Documents = await GetIntranetDocumentsAsync(BlobContainerNames.Intranet),
             Announcements = await GetAnnouncementsAsync(),
             ShuttleRoutes = await GetShuttleRoutesAsync(),
-            Meals = await GetMealsAsync()
+            Meals = await GetMealsAsync(),
+            Leaves = await GetLeavesAsync(),
+            Overtimes = await GetOvertimesAsync()
         };
     }
 
+    private async Task<List<OvertimeDto>> GetOvertimesAsync()
+    {
+        var today = DateTime.Now;
+
+        var overtimes = await _overtimeRepository
+            .WithDetailsAsync(e => e.Employee)
+            .ContinueWith(t => t.Result.ToList());
+
+        return ObjectMapper.Map<List<Overtime>, List<OvertimeDto>>(overtimes);
+    }
+
+    private async Task<List<LeaveDto>> GetLeavesAsync()
+    {
+        var today = DateTime.Now;
+
+        var leaves = await _leaveRepository
+            .WithDetailsAsync(e => e.Employee)
+            .ContinueWith(t => t.Result.ToList());
+
+        return ObjectMapper.Map<List<Leave>, List<LeaveDto>>(leaves);
+    }
+
     private async Task<List<MealDto>> GetMealsAsync()
     {
         // Bu haftanın başlangıç ve bitiş tarihlerini hesapla
@@ -94,7 +124,7 @@ public class IntranetAppService : PlatformAppService, IIntranetAppService
         var weekEnd = weekStart.AddDays(6);
 
         // Sadece bu haftanın yemeklerini getir
-        var meals = await _mealRepository.GetListAsync(m => 
+        var meals = await _mealRepository.GetListAsync(m =>
             m.Date >= weekStart && m.Date <= weekEnd);
 
         var mealDtos = new List<MealDto>();
@@ -120,7 +150,7 @@ public class IntranetAppService : PlatformAppService, IIntranetAppService
 
         return mealDtos;
     }
-    
+
     private async Task<List<ShuttleRouteDto>> GetShuttleRoutesAsync()
     {
         var shuttleRoutes = await _shuttleRouteRepository.GetListAsync();

api/src/Kurs.Platform.Application/Intranet/IntranetAutoMapperProfile.cs

@@ -16,6 +16,8 @@ public class IntranetAutoMapperProfile : Profile
         CreateMap<Training, TrainingDto>();
         CreateMap<Currency, CurrencyDto>();
         CreateMap<Expense, ExpenseDto>();
+        CreateMap<Leave, LeaveDto>();
+        CreateMap<Overtime, OvertimeDto>();
 
         CreateMap<Meal, MealDto>()
             .ForMember(dest => dest.Materials, opt => opt.Ignore());
@@ -24,7 +26,7 @@ public class IntranetAutoMapperProfile : Profile
             .ForMember(dest => dest.Departments, opt => opt.Ignore());
 
         CreateMap<ShuttleRoute, ShuttleRouteDto>()
-            .ForMember(dest => dest.Route, opt => opt.Ignore()); 
+            .ForMember(dest => dest.Route, opt => opt.Ignore());
 
     }
 }

ui/src/mocks/mockEmployeeLeaves.ts

@@ -1,71 +0,0 @@
-import { HrLeave, LeaveStatusEnum, LeaveTypeEnum } from "../types/hr";
-import { mockEmployees } from "./mockEmployees";
-
-export const mockEmployeeLeaves: HrLeave[] = [
-  {
-    id: "1",
-    employeeId: "1",
-    employee: mockEmployees.find((e) => e.id === "1"),
-    leaveType: LeaveTypeEnum.Annual,
-    startDate: new Date("2024-12-20"),
-    endDate: new Date("2024-12-24"),
-    totalDays: 5,
-    reason: "Yıllık izin talebi",
-    status: LeaveStatusEnum.Pending,
-    appliedDate: new Date("2024-11-15"),
-    isHalfDay: false,
-    attachments: [],
-    creationTime: new Date("2024-11-15"),
-    lastModificationTime: new Date("2024-11-15"),
-  },
-  {
-    id: "2",
-    employeeId: "2",
-    employee: mockEmployees.find((e) => e.id === "2"),
-    leaveType: LeaveTypeEnum.Sick,
-    startDate: new Date("2024-11-10"),
-    endDate: new Date("2024-11-12"),
-    totalDays: 3,
-    reason: "Sağlık kontrolü",
-    status: LeaveStatusEnum.Approved,
-    appliedDate: new Date("2024-11-08"),
-    approvedDate: new Date("2024-11-09"),
-    isHalfDay: false,
-    attachments: [],
-    creationTime: new Date("2024-11-08"),
-    lastModificationTime: new Date("2024-11-09"),
-  },
-  {
-    id: "3",
-    employeeId: "3",
-    employee: mockEmployees.find((e) => e.id === "3"),
-    leaveType: LeaveTypeEnum.Personal,
-    startDate: new Date("2024-12-01"),
-    endDate: new Date("2024-12-01"),
-    totalDays: 0.5,
-    reason: "Kişisel işler",
-    status: LeaveStatusEnum.Rejected,
-    appliedDate: new Date("2024-11-20"),
-    rejectionReason: "Proje teslim tarihi nedeniyle uygun değil",
-    isHalfDay: true,
-    attachments: [],
-    creationTime: new Date("2024-11-20"),
-    lastModificationTime: new Date("2024-11-21"),
-  },
-  {
-    id: "4",
-    employeeId: "4",
-    employee: mockEmployees.find((e) => e.id === "4"),
-    leaveType: LeaveTypeEnum.Emergency,
-    startDate: new Date("2024-11-25"),
-    endDate: new Date("2024-11-26"),
-    totalDays: 2,
-    reason: "Acil aile durumu",
-    status: LeaveStatusEnum.Pending,
-    appliedDate: new Date("2024-11-24"),
-    isHalfDay: false,
-    attachments: [],
-    creationTime: new Date("2024-11-24"),
-    lastModificationTime: new Date("2024-11-24"),
-  },
-];

ui/src/mocks/mockIntranet.ts

@@ -4,6 +4,8 @@ import {
   DocumentDto,
   EventDto,
   ExpenseDto,
+  LeaveDto,
+  OvertimeDto,
   ReservationDto,
   ShuttleRouteDto,
   TrainingDto,
@@ -11,6 +13,9 @@ import {
 } from '@/proxy/intranet/models'
 import { mockEmployees } from './mockEmployees'
 import { Survey, SocialPost } from '@/types/intranet'
+import { LeaveStatusEnum, LeaveTypeEnum } from '@/types/hr'
+
+const currentUser = { ...mockEmployees[0], fullName: 'Siz' }
 
 export const mockSurveys: Survey[] = [
   {
@@ -187,8 +192,6 @@ export const mockSurveys: Survey[] = [
   },
 ]
 
-const currentUser = { ...mockEmployees[0], fullName: 'Siz' }
-
 export const mockSocialPosts: SocialPost[] = [
   {
     id: '1',
@@ -972,3 +975,222 @@ export const mockShuttleRoutes: ShuttleRouteDto[] = [
     type: 'evening',
   },
 ]
+
+export const mockLeaves: LeaveDto[] = [
+  {
+    id: '1',
+    employeeId: '1',
+    employee: mockEmployees.find((e) => e.id === '1'),
+    leaveType: LeaveTypeEnum.Annual,
+    startDate: new Date('2024-12-20'),
+    endDate: new Date('2024-12-24'),
+    totalDays: 5,
+    reason: 'Yıllık izin talebi',
+    status: LeaveStatusEnum.Pending,
+    appliedDate: new Date('2024-11-15'),
+    isHalfDay: false,
+    attachments: [],
+    creationTime: new Date('2024-11-15'),
+    lastModificationTime: new Date('2024-11-15'),
+  },
+  {
+    id: '2',
+    employeeId: '2',
+    employee: mockEmployees.find((e) => e.id === '2'),
+    leaveType: LeaveTypeEnum.Sick,
+    startDate: new Date('2024-11-10'),
+    endDate: new Date('2024-11-12'),
+    totalDays: 3,
+    reason: 'Sağlık kontrolü',
+    status: LeaveStatusEnum.Approved,
+    appliedDate: new Date('2024-11-08'),
+    approvedDate: new Date('2024-11-09'),
+    isHalfDay: false,
+    attachments: [],
+    creationTime: new Date('2024-11-08'),
+    lastModificationTime: new Date('2024-11-09'),
+  },
+  {
+    id: '3',
+    employeeId: '3',
+    employee: mockEmployees.find((e) => e.id === '3'),
+    leaveType: LeaveTypeEnum.Personal,
+    startDate: new Date('2024-12-01'),
+    endDate: new Date('2024-12-01'),
+    totalDays: 0.5,
+    reason: 'Kişisel işler',
+    status: LeaveStatusEnum.Rejected,
+    appliedDate: new Date('2024-11-20'),
+    rejectionReason: 'Proje teslim tarihi nedeniyle uygun değil',
+    isHalfDay: true,
+    attachments: [],
+    creationTime: new Date('2024-11-20'),
+    lastModificationTime: new Date('2024-11-21'),
+  },
+  {
+    id: '4',
+    employeeId: '4',
+    employee: mockEmployees.find((e) => e.id === '4'),
+    leaveType: LeaveTypeEnum.Emergency,
+    startDate: new Date('2024-11-25'),
+    endDate: new Date('2024-11-26'),
+    totalDays: 2,
+    reason: 'Acil aile durumu',
+    status: LeaveStatusEnum.Pending,
+    appliedDate: new Date('2024-11-24'),
+    isHalfDay: false,
+    attachments: [],
+    creationTime: new Date('2024-11-24'),
+    lastModificationTime: new Date('2024-11-24'),
+  },
+]
+
+export const mockOvertimes: OvertimeDto[] = [
+  {
+    id: '1',
+    employeeId: '1',
+    date: new Date('2024-12-15'),
+    startTime: '18:00',
+    endTime: '21:00',
+    totalHours: 3,
+    reason: "Proje deadline'ı nedeniyle acil çalışma",
+    status: LeaveStatusEnum.Approved,
+    approvedBy: 'emp_002',
+    rate: 1.5,
+    amount: 450, // 3 saat * 100 TL/saat * 1.5 kat
+    creationTime: new Date('2024-12-15T09:00:00'),
+    lastModificationTime: new Date('2024-12-15T10:30:00'),
+  },
+  {
+    id: '2',
+    employeeId: '3',
+    date: new Date('2024-12-14'),
+    startTime: '17:30',
+    endTime: '20:00',
+    totalHours: 2.5,
+    reason: 'Müşteri talep değişikliği nedeniyle ek çalışma',
+    status: LeaveStatusEnum.Pending,
+    rate: 1.5,
+    amount: 375, // 2.5 saat * 100 TL/saat * 1.5 kat
+    creationTime: new Date('2024-12-14T17:30:00'),
+    lastModificationTime: new Date('2024-12-14T17:30:00'),
+  },
+  {
+    id: '3',
+    employeeId: '4',
+    date: new Date('2024-12-13'),
+    startTime: '19:00',
+    endTime: '22:30',
+    totalHours: 3.5,
+    reason: 'Sistem bakımı ve güncelleme çalışmaları',
+    status: LeaveStatusEnum.Approved,
+    approvedBy: 'emp_002',
+    rate: 1.5,
+    amount: 525, // 3.5 saat * 100 TL/saat * 1.5 kat
+    creationTime: new Date('2024-12-13T19:00:00'),
+    lastModificationTime: new Date('2024-12-13T22:35:00'),
+  },
+  {
+    id: '4',
+    employeeId: '5',
+    date: new Date('2024-12-12'),
+    startTime: '17:00',
+    endTime: '19:00',
+    totalHours: 2,
+    reason: 'Rapor hazırlama ve sunum düzenleme',
+    status: LeaveStatusEnum.Rejected,
+    approvedBy: 'emp_002',
+    rate: 1.5,
+    amount: 0, // Reddedildiği için ücret hesaplanmadı
+    creationTime: new Date('2024-12-12T17:00:00'),
+    lastModificationTime: new Date('2024-12-12T08:30:00'),
+  },
+  {
+    id: '5',
+    employeeId: '6',
+    date: new Date('2024-12-11'),
+    startTime: '18:30',
+    endTime: '21:00',
+    totalHours: 2.5,
+    reason: 'Acil hata düzeltme ve test çalışmaları',
+    status: LeaveStatusEnum.Approved,
+    approvedBy: 'emp_001',
+    rate: 2.0, // Hafta sonu çalışması
+    amount: 500, // 2.5 saat * 100 TL/saat * 2.0 kat
+    creationTime: new Date('2024-12-11T18:30:00'),
+    lastModificationTime: new Date('2024-12-11T21:05:00'),
+  },
+  {
+    id: '6',
+    employeeId: '7',
+    date: new Date('2024-12-10'),
+    startTime: '16:00',
+    endTime: '20:00',
+    totalHours: 4,
+    reason: 'Yeni müşteri onboarding süreci',
+    status: LeaveStatusEnum.Pending,
+    rate: 1.5,
+    amount: 600, // 4 saat * 100 TL/saat * 1.5 kat
+    creationTime: new Date('2024-12-10T16:00:00'),
+    lastModificationTime: new Date('2024-12-10T16:00:00'),
+  },
+  {
+    id: '7',
+    employeeId: '8',
+    date: new Date('2024-12-09'),
+    startTime: '17:45',
+    endTime: '21:15',
+    totalHours: 3.5,
+    reason: 'Veri analizi ve raporlama çalışmaları',
+    status: LeaveStatusEnum.Approved,
+    approvedBy: 'emp_002',
+    rate: 1.5,
+    amount: 525, // 3.5 saat * 100 TL/saat * 1.5 kat
+    creationTime: new Date('2024-12-09T17:45:00'),
+    lastModificationTime: new Date('2024-12-09T21:20:00'),
+  },
+  {
+    id: '8',
+    employeeId: '9',
+    date: new Date('2024-12-08'),
+    startTime: '18:00',
+    endTime: '20:30',
+    totalHours: 2.5,
+    reason: 'Eğitim materyali hazırlama',
+    status: LeaveStatusEnum.Pending,
+    rate: 1.5,
+    amount: 375, // 2.5 saat * 100 TL/saat * 1.5 kat
+    creationTime: new Date('2024-12-08T18:00:00'),
+    lastModificationTime: new Date('2024-12-08T18:00:00'),
+  },
+  {
+    id: '9',
+    employeeId: '10',
+    date: new Date('2024-12-07'),
+    startTime: '19:30',
+    endTime: '23:00',
+    totalHours: 3.5,
+    reason: 'Kritik sistem güvenlik yaması uygulaması',
+    status: LeaveStatusEnum.Approved,
+    approvedBy: 'emp_001',
+    rate: 1.5,
+    amount: 525, // 3.5 saat * 100 TL/saat * 1.5 kat
+    creationTime: new Date('2024-12-07T19:30:00'),
+    lastModificationTime: new Date('2024-12-07T23:05:00'),
+  },
+  {
+    id: '10',
+    employeeId: '1',
+    date: new Date('2024-12-06'),
+    startTime: '17:30',
+    endTime: '20:00',
+    totalHours: 2.5,
+    reason: 'Stratejik planlama toplantısı hazırlığı',
+    status: LeaveStatusEnum.Rejected,
+    approvedBy: 'emp_002',
+    rate: 1.5,
+    amount: 0, // Reddedildiği için ücret hesaplanmadı
+    creationTime: new Date('2024-12-06T17:30:00'),
+    lastModificationTime: new Date('2024-12-06T08:15:00'),
+  },
+]

ui/src/mocks/mockOvertimes.ts

@@ -1,151 +0,0 @@
-import { HrOvertime, LeaveStatusEnum } from "../types/hr";
-
-export const mockOvertimes: HrOvertime[] = [
-  {
-    id: "1",
-    employeeId: "1",
-    date: new Date("2024-12-15"),
-    startTime: "18:00",
-    endTime: "21:00",
-    totalHours: 3,
-    reason: "Proje deadline'ı nedeniyle acil çalışma",
-    status: LeaveStatusEnum.Approved,
-    approvedBy: "emp_002",
-    rate: 1.5,
-    amount: 450, // 3 saat * 100 TL/saat * 1.5 kat
-    creationTime: new Date("2024-12-15T09:00:00"),
-    lastModificationTime: new Date("2024-12-15T10:30:00"),
-  },
-  {
-    id: "2",
-    employeeId: "3",
-    date: new Date("2024-12-14"),
-    startTime: "17:30",
-    endTime: "20:00",
-    totalHours: 2.5,
-    reason: "Müşteri talep değişikliği nedeniyle ek çalışma",
-    status: LeaveStatusEnum.Pending,
-    rate: 1.5,
-    amount: 375, // 2.5 saat * 100 TL/saat * 1.5 kat
-    creationTime: new Date("2024-12-14T17:30:00"),
-    lastModificationTime: new Date("2024-12-14T17:30:00"),
-  },
-  {
-    id: "3",
-    employeeId: "4",
-    date: new Date("2024-12-13"),
-    startTime: "19:00",
-    endTime: "22:30",
-    totalHours: 3.5,
-    reason: "Sistem bakımı ve güncelleme çalışmaları",
-    status: LeaveStatusEnum.Approved,
-    approvedBy: "emp_002",
-    rate: 1.5,
-    amount: 525, // 3.5 saat * 100 TL/saat * 1.5 kat
-    creationTime: new Date("2024-12-13T19:00:00"),
-    lastModificationTime: new Date("2024-12-13T22:35:00"),
-  },
-  {
-    id: "4",
-    employeeId: "5",
-    date: new Date("2024-12-12"),
-    startTime: "17:00",
-    endTime: "19:00",
-    totalHours: 2,
-    reason: "Rapor hazırlama ve sunum düzenleme",
-    status: LeaveStatusEnum.Rejected,
-    approvedBy: "emp_002",
-    rate: 1.5,
-    amount: 0, // Reddedildiği için ücret hesaplanmadı
-    creationTime: new Date("2024-12-12T17:00:00"),
-    lastModificationTime: new Date("2024-12-12T08:30:00"),
-  },
-  {
-    id: "5",
-    employeeId: "6",
-    date: new Date("2024-12-11"),
-    startTime: "18:30",
-    endTime: "21:00",
-    totalHours: 2.5,
-    reason: "Acil hata düzeltme ve test çalışmaları",
-    status: LeaveStatusEnum.Approved,
-    approvedBy: "emp_001",
-    rate: 2.0, // Hafta sonu çalışması
-    amount: 500, // 2.5 saat * 100 TL/saat * 2.0 kat
-    creationTime: new Date("2024-12-11T18:30:00"),
-    lastModificationTime: new Date("2024-12-11T21:05:00"),
-  },
-  {
-    id: "6",
-    employeeId: "7",
-    date: new Date("2024-12-10"),
-    startTime: "16:00",
-    endTime: "20:00",
-    totalHours: 4,
-    reason: "Yeni müşteri onboarding süreci",
-    status: LeaveStatusEnum.Pending,
-    rate: 1.5,
-    amount: 600, // 4 saat * 100 TL/saat * 1.5 kat
-    creationTime: new Date("2024-12-10T16:00:00"),
-    lastModificationTime: new Date("2024-12-10T16:00:00"),
-  },
-  {
-    id: "7",
-    employeeId: "8",
-    date: new Date("2024-12-09"),
-    startTime: "17:45",
-    endTime: "21:15",
-    totalHours: 3.5,
-    reason: "Veri analizi ve raporlama çalışmaları",
-    status: LeaveStatusEnum.Approved,
-    approvedBy: "emp_002",
-    rate: 1.5,
-    amount: 525, // 3.5 saat * 100 TL/saat * 1.5 kat
-    creationTime: new Date("2024-12-09T17:45:00"),
-    lastModificationTime: new Date("2024-12-09T21:20:00"),
-  },
-  {
-    id: "8",
-    employeeId: "9",
-    date: new Date("2024-12-08"),
-    startTime: "18:00",
-    endTime: "20:30",
-    totalHours: 2.5,
-    reason: "Eğitim materyali hazırlama",
-    status: LeaveStatusEnum.Pending,
-    rate: 1.5,
-    amount: 375, // 2.5 saat * 100 TL/saat * 1.5 kat
-    creationTime: new Date("2024-12-08T18:00:00"),
-    lastModificationTime: new Date("2024-12-08T18:00:00"),
-  },
-  {
-    id: "9",
-    employeeId: "10",
-    date: new Date("2024-12-07"),
-    startTime: "19:30",
-    endTime: "23:00",
-    totalHours: 3.5,
-    reason: "Kritik sistem güvenlik yaması uygulaması",
-    status: LeaveStatusEnum.Approved,
-    approvedBy: "emp_001",
-    rate: 1.5,
-    amount: 525, // 3.5 saat * 100 TL/saat * 1.5 kat
-    creationTime: new Date("2024-12-07T19:30:00"),
-    lastModificationTime: new Date("2024-12-07T23:05:00"),
-  },
-  {
-    id: "10",
-    employeeId: "1",
-    date: new Date("2024-12-06"),
-    startTime: "17:30",
-    endTime: "20:00",
-    totalHours: 2.5,
-    reason: "Stratejik planlama toplantısı hazırlığı",
-    status: LeaveStatusEnum.Rejected,
-    approvedBy: "emp_002",
-    rate: 1.5,
-    amount: 0, // Reddedildiği için ücret hesaplanmadı
-    creationTime: new Date("2024-12-06T17:30:00"),
-    lastModificationTime: new Date("2024-12-06T08:15:00"),
-  },
-];

ui/src/proxy/intranet/models.ts

@@ -6,11 +6,12 @@ import {
   HrCostCenter,
   HrDisciplinaryAction,
   HrEmergencyContact,
-  HrLeave,
   HrPerformanceEvaluation,
   HrTraining,
   HrWorkSchedule,
   JobLevelEnum,
+  LeaveStatusEnum,
+  LeaveTypeEnum,
   MaritalStatusEnum,
 } from '@/types/hr'
 
@@ -25,6 +26,8 @@ export interface IntranetDashboardDto {
   announcements: AnnouncementDto[]
   shuttleRoutes: ShuttleRouteDto[]
   meals: MealDto[]
+  leaves: LeaveDto[]
+  overtimes: OvertimeDto[]
   // surveys: Survey[]
   // priorityTasks: TaskDto[]
 }
@@ -91,7 +94,7 @@ export interface EmployeeDto {
   badgeNumber?: string
   employeeStatus: EmployeeStatusEnum
   isActive: boolean
-  leaves: HrLeave[]
+  leaves: LeaveDto[]
   evaluations: HrPerformanceEvaluation[]
   trainings: HrTraining[]
   disciplinaryActions: HrDisciplinaryAction[]
@@ -280,3 +283,43 @@ export interface MealDto {
   totalCalorie?: number
   materials: string[]
 }
+
+// İnsan Kaynakları Fazla Mesai
+export interface OvertimeDto {
+  id: string
+  employeeId: string
+  employee?: EmployeeDto
+  date: Date
+  startTime: string
+  endTime: string
+  totalHours: number
+  reason: string
+  status: LeaveStatusEnum
+  approvedBy?: string
+  approver?: EmployeeDto
+  rate?: number
+  amount?: number
+  creationTime: Date
+  lastModificationTime: Date
+}
+
+// İnsan Kaynakları İzni
+export interface LeaveDto {
+  id: string
+  employeeId: string
+  employee?: EmployeeDto
+  leaveType: LeaveTypeEnum
+  startDate: Date
+  endDate: Date
+  totalDays: number
+  reason?: string
+  status: LeaveStatusEnum
+  appliedDate: Date
+  approvedBy?: string
+  approvedDate?: Date
+  rejectionReason?: string
+  isHalfDay: boolean
+  attachments: string[]
+  creationTime: Date
+  lastModificationTime: Date
+}

ui/src/types/hr.ts

@@ -24,27 +24,6 @@ export interface HrCostCenter {
   lastModificationTime: Date
 }
 
-export interface HrLeave {
-  // İnsan Kaynakları İzni
-  id: string
-  employeeId: string
-  employee?: EmployeeDto
-  leaveType: LeaveTypeEnum
-  startDate: Date
-  endDate: Date
-  totalDays: number
-  reason?: string
-  status: LeaveStatusEnum
-  appliedDate: Date
-  approvedBy?: string
-  approvedDate?: Date
-  rejectionReason?: string
-  isHalfDay: boolean
-  attachments: string[]
-  creationTime: Date
-  lastModificationTime: Date
-}
-
 export interface HrPerformanceEvaluation {
   // İnsan Kaynakları Performans Değerlendirmesi
   id: string
@@ -185,25 +164,6 @@ export interface HrEmploymentType {
   lastModificationTime: Date
 }
 
-export interface HrOvertime {
-  // İnsan Kaynakları Fazla Mesai
-  id: string
-  employeeId: string
-  employee?: EmployeeDto
-  date: Date
-  startTime: string
-  endTime: string
-  totalHours: number
-  reason: string
-  status: LeaveStatusEnum
-  approvedBy?: string
-  approver?: EmployeeDto
-  rate?: number
-  amount?: number
-  creationTime: Date
-  lastModificationTime: Date
-}
-
 export interface HrPayroll {
   // İnsan Kaynakları Maaş Bordrosu
   id: string
@@ -547,22 +507,22 @@ export enum JobLevelEnum {
 
 export enum LeaveTypeEnum {
   // İzin Türü
-  Annual = 'ANNUAL', // Yıllık
+  Annual = 'Annual', // Yıllık
-  Sick = 'SICK', // Hastalık
+  Sick = 'Sick', // Hastalık
-  Maternity = 'MATERNITY', // Doğum
+  Maternity = 'Maternity', // Doğum
-  Paternity = 'PATERNITY', // Babalık
+  Paternity = 'Paternity', // Babalık
-  Personal = 'PERSONAL', // Kişisel
+  Personal = 'Personal', // Kişisel
-  Emergency = 'EMERGENCY', // Acil
+  Emergency = 'Emergency', // Acil
-  Study = 'STUDY', // Eğitim
+  Study = 'Study', // Eğitim
-  Unpaid = 'UNPAID', // Ücretsiz
+  Unpaid = 'Unpaid', // Ücretsiz
 }
 
 export enum LeaveStatusEnum {
   // İzin Durumu
-  Pending = 'PENDING', // Beklemede
+  Pending = 'Pending', // Beklemede
-  Approved = 'APPROVED', // Onaylandı
+  Approved = 'Approved', // Onaylandı
-  Rejected = 'REJECTED', // Reddedildi
+  Rejected = 'Rejected', // Reddedildi
-  Cancelled = 'CANCELLED', // İptal edildi
+  Cancelled = 'Cancelled', // İptal edildi
 }
 
 export enum EvaluationStatusEnum {

ui/src/views/hr/components/LeaveManagement.tsx

@@ -9,18 +9,19 @@ import {
   FaEye,
   FaUsers,
 } from 'react-icons/fa'
-import { HrLeave, LeaveStatusEnum, LeaveTypeEnum } from '../../../types/hr'
+import { LeaveStatusEnum, LeaveTypeEnum } from '../../../types/hr'
 import DataTable, { Column } from '../../../components/common/DataTable'
-import { mockEmployeeLeaves } from '../../../mocks/mockEmployeeLeaves'
 import { mockEmployees } from '../../../mocks/mockEmployees'
 import { mockDepartments } from '../../../mocks/mockDepartments'
 import Widget from '../../../components/common/Widget'
 import { getLeaveTypeText, getLeaveStatusColor, getLeaveStatusText } from '../../../utils/erp'
 import { Container } from '@/components/shared'
+import { mockLeaves } from '@/mocks/mockIntranet'
+import { LeaveDto } from '@/proxy/intranet/models'
 
 const LeaveManagement: React.FC = () => {
   // Leave states
-  const [leaves, setLeaves] = useState<HrLeave[]>(mockEmployeeLeaves)
+  const [leaves, setLeaves] = useState<LeaveDto[]>(mockLeaves)
   const [selectedStatus, setSelectedStatus] = useState<string>('all')
   const [selectedType, setSelectedType] = useState<string>('all')
   const [selectedPeriod, setSelectedPeriod] = useState<string>('all')
@@ -33,7 +34,7 @@ const LeaveManagement: React.FC = () => {
   const [showViewModal, setShowViewModal] = useState(false)
   const [showRejectModal, setShowRejectModal] = useState(false)
   const [showBulkModal, setShowBulkModal] = useState(false)
-  const [selectedLeave, setSelectedLeave] = useState<HrLeave | null>(null)
+  const [selectedLeave, setSelectedLeave] = useState<LeaveDto | null>(null)
   const [rejectReason, setRejectReason] = useState('')
 
   // Form state for add/edit
@@ -92,7 +93,7 @@ const LeaveManagement: React.FC = () => {
     setShowBulkModal(true)
   }
 
-  const handleEdit = (leave: HrLeave) => {
+  const handleEdit = (leave: LeaveDto) => {
     setSelectedLeave(leave)
     setFormData({
       employeeId: leave.employeeId,
@@ -147,7 +148,7 @@ const LeaveManagement: React.FC = () => {
     }
   }
 
-  const handleView = (leave: HrLeave) => {
+  const handleView = (leave: LeaveDto) => {
     setSelectedLeave(leave)
     setShowViewModal(true)
   }
@@ -163,7 +164,7 @@ const LeaveManagement: React.FC = () => {
     const totalDays =
       Math.ceil((endDate.getTime() - startDate.getTime()) / (1000 * 60 * 60 * 24)) + 1
 
-    const newLeave: HrLeave = {
+    const newLeave: LeaveDto = {
       id: `leave_${Date.now()}`,
       employeeId: formData.employeeId,
       leaveType: formData.leaveType,
@@ -244,7 +245,7 @@ const LeaveManagement: React.FC = () => {
     const totalDays =
       Math.ceil((endDate.getTime() - startDate.getTime()) / (1000 * 60 * 60 * 24)) + 1
 
-    const newLeaves: HrLeave[] = bulkFormData.selectedEmployees.map((employeeId) => {
+    const newLeaves: LeaveDto[] = bulkFormData.selectedEmployees.map((employeeId) => {
       const employee = getSelectedEmployee(employeeId)
       return {
         id: `leave_${Date.now()}_${employeeId}`,
@@ -325,11 +326,11 @@ const LeaveManagement: React.FC = () => {
     return true
   })
 
-  const columns: Column<HrLeave>[] = [
+  const columns: Column<LeaveDto>[] = [
     {
       key: 'employee',
       header: 'Personel',
-      render: (leave: HrLeave) => (
+      render: (leave: LeaveDto) => (
         <div className="flex items-center gap-2">
           <FaUser className="w-4 h-4 text-gray-500" />
           <div>
@@ -342,12 +343,12 @@ const LeaveManagement: React.FC = () => {
     {
       key: 'leaveType',
       header: 'İzin Türü',
-      render: (leave: HrLeave) => getLeaveTypeText(leave.leaveType),
+      render: (leave: LeaveDto) => getLeaveTypeText(leave.leaveType),
     },
     {
       key: 'period',
       header: 'İzin Dönemi',
-      render: (leave: HrLeave) => (
+      render: (leave: LeaveDto) => (
         <div className="text-sm">
           <div>{new Date(leave.startDate).toLocaleDateString('tr-TR')}</div>
           <div className="text-gray-500">{new Date(leave.endDate).toLocaleDateString('tr-TR')}</div>
@@ -357,7 +358,7 @@ const LeaveManagement: React.FC = () => {
     {
       key: 'totalDays',
       header: 'Gün Sayısı',
-      render: (leave: HrLeave) => (
+      render: (leave: LeaveDto) => (
         <div className="flex items-center gap-1">
           <FaCalendar className="w-4 h-4 text-gray-500" />
           <span>{leave.totalDays} gün</span>
@@ -367,12 +368,12 @@ const LeaveManagement: React.FC = () => {
     {
       key: 'appliedDate',
       header: 'Başvuru Tarihi',
-      render: (leave: HrLeave) => new Date(leave.appliedDate).toLocaleDateString('tr-TR'),
+      render: (leave: LeaveDto) => new Date(leave.appliedDate).toLocaleDateString('tr-TR'),
     },
     {
       key: 'status',
       header: 'Durum',
-      render: (leave: HrLeave) => (
+      render: (leave: LeaveDto) => (
         <span
           className={`px-2 py-1 text-xs font-medium rounded-full ${getLeaveStatusColor(
             leave.status,
@@ -385,7 +386,7 @@ const LeaveManagement: React.FC = () => {
     {
       key: 'actions',
       header: 'İşlemler',
-      render: (leave: HrLeave) => (
+      render: (leave: LeaveDto) => (
         <div className="flex gap-1">
           <button
             onClick={() => handleView(leave)}

ui/src/views/hr/components/OvertimeManagement.tsx

@@ -1,17 +1,18 @@
 import React, { useState } from 'react'
 import { FaClock, FaUser, FaPlus, FaEdit, FaCheck, FaTimes, FaEye, FaUsers } from 'react-icons/fa'
-import { LeaveStatusEnum, HrOvertime } from '../../../types/hr'
+import { LeaveStatusEnum } from '../../../types/hr'
 import DataTable, { Column } from '../../../components/common/DataTable'
-import { mockOvertimes } from '../../../mocks/mockOvertimes'
 import { mockEmployees } from '../../../mocks/mockEmployees'
 import { mockDepartments } from '../../../mocks/mockDepartments'
 import Widget from '../../../components/common/Widget'
 import { getLeaveStatusColor, getLeaveStatusText } from '../../../utils/erp'
 import { Container } from '@/components/shared'
+import { mockOvertimes } from '@/mocks/mockIntranet'
+import { OvertimeDto } from '@/proxy/intranet/models'
 
 const OvertimeManagement: React.FC = () => {
   // Overtime states
-  const [overtimes, setOvertimes] = useState<HrOvertime[]>(mockOvertimes)
+  const [overtimes, setOvertimes] = useState<OvertimeDto[]>(mockOvertimes)
   const [overtimeSelectedStatus, setOvertimeSelectedStatus] = useState<string>('all')
   const [overtimeSelectedPeriod, setOvertimeSelectedPeriod] = useState<string>('all')
   const [searchOvertimesTerm, setSearchOvertimesTerm] = useState('')
@@ -23,7 +24,7 @@ const OvertimeManagement: React.FC = () => {
   const [showOvertimeViewModal, setShowOvertimeViewModal] = useState(false)
   const [showOvertimeRejectModal, setShowOvertimeRejectModal] = useState(false)
   const [showBulkOvertimeModal, setShowBulkOvertimeModal] = useState(false)
-  const [selectedOvertime, setSelectedOvertime] = useState<HrOvertime | null>(null)
+  const [selectedOvertime, setSelectedOvertime] = useState<OvertimeDto | null>(null)
   const [overtimeRejectReason, setOvertimeRejectReason] = useState('')
 
   // Overtime form state
@@ -70,7 +71,7 @@ const OvertimeManagement: React.FC = () => {
     setShowOvertimeAddModal(true)
   }
 
-  const handleOvertimeEdit = (overtime: HrOvertime) => {
+  const handleOvertimeEdit = (overtime: OvertimeDto) => {
     setSelectedOvertime(overtime)
     setOvertimeFormData({
       employeeId: overtime.employeeId,
@@ -123,7 +124,7 @@ const OvertimeManagement: React.FC = () => {
     }
   }
 
-  const handleOvertimeView = (overtime: HrOvertime) => {
+  const handleOvertimeView = (overtime: OvertimeDto) => {
     setSelectedOvertime(overtime)
     setShowOvertimeViewModal(true)
   }
@@ -148,7 +149,7 @@ const OvertimeManagement: React.FC = () => {
       return
     }
 
-    const newOvertime: HrOvertime = {
+    const newOvertime: OvertimeDto = {
       id: `ot_${Date.now()}`,
       employeeId: overtimeFormData.employeeId,
       date: new Date(overtimeFormData.date),
@@ -256,7 +257,7 @@ const OvertimeManagement: React.FC = () => {
       return
     }
 
-    const newOvertimes: HrOvertime[] = bulkOvertimeFormData.selectedEmployees.map((employeeId) => {
+    const newOvertimes: OvertimeDto[] = bulkOvertimeFormData.selectedEmployees.map((employeeId) => {
       const employee = getSelectedEmployee(employeeId)
       return {
         id: `ot_${Date.now()}_${employeeId}`,
@@ -340,11 +341,11 @@ const OvertimeManagement: React.FC = () => {
   })
 
   // Overtime table columns
-  const overtimeColumns: Column<HrOvertime>[] = [
+  const overtimeColumns: Column<OvertimeDto>[] = [
     {
       key: 'employee',
       header: 'Personel',
-      render: (overtime: HrOvertime) => {
+      render: (overtime: OvertimeDto) => {
         const employee = mockEmployees.find((emp) => emp.id === overtime.employeeId)
         return (
           <div className="flex items-center gap-2">
@@ -360,14 +361,14 @@ const OvertimeManagement: React.FC = () => {
     {
       key: 'date',
       header: 'Tarih',
-      render: (overtime: HrOvertime) => (
+      render: (overtime: OvertimeDto) => (
         <div className="text-sm">{new Date(overtime.date).toLocaleDateString('tr-TR')}</div>
       ),
     },
     {
       key: 'time',
       header: 'Mesai Saatleri',
-      render: (overtime: HrOvertime) => (
+      render: (overtime: OvertimeDto) => (
         <div className="text-sm">
           <div>
             {overtime.startTime} - {overtime.endTime}
@@ -379,7 +380,7 @@ const OvertimeManagement: React.FC = () => {
     {
       key: 'reason',
       header: 'Neden',
-      render: (overtime: HrOvertime) => (
+      render: (overtime: OvertimeDto) => (
         <div className="text-sm max-w-xs truncate" title={overtime.reason}>
           {overtime.reason}
         </div>
@@ -388,19 +389,19 @@ const OvertimeManagement: React.FC = () => {
     {
       key: 'rate',
       header: 'Çarpan',
-      render: (overtime: HrOvertime) => <div className="text-sm">x{overtime.rate}</div>,
+      render: (overtime: OvertimeDto) => <div className="text-sm">x{overtime.rate}</div>,
     },
     {
       key: 'amount',
       header: 'Tutar',
-      render: (overtime: HrOvertime) => (
+      render: (overtime: OvertimeDto) => (
         <div className="text-sm font-medium">{overtime.amount?.toLocaleString('tr-TR')} ₺</div>
       ),
     },
     {
       key: 'status',
       header: 'Durum',
-      render: (overtime: HrOvertime) => (
+      render: (overtime: OvertimeDto) => (
         <span
           className={`px-2 py-1 text-xs font-medium rounded-full ${getLeaveStatusColor(
             overtime.status,
@@ -413,7 +414,7 @@ const OvertimeManagement: React.FC = () => {
     {
       key: 'actions',
       header: 'İşlemler',
-      render: (overtime: HrOvertime) => (
+      render: (overtime: OvertimeDto) => (
         <div className="flex gap-1">
           <button
             onClick={() => handleOvertimeView(overtime)}

ui/src/views/intranet/Dashboard.tsx

@@ -114,7 +114,7 @@ const IntranetDashboard: React.FC = () => {
     { id: 'documents', permission: 'App.Files.Widget', column: 'left' },
     { id: 'upcoming-trainings', permission: 'App.Hr.Training.Widget', column: 'left' },
     { id: 'active-reservations', permission: 'App.Intranet.Reservation.Widget', column: 'left' },
-    { id: 'active-surveys', permission: 'App.Intranet.Survey.Widget', column: 'left' },
+    { id: 'active-surveys', permission: 'App.Hr.Survey.Widget', column: 'left' },
     { id: 'visitors', permission: 'App.Intranet.Visitor.Widget', column: 'left' },
     { id: 'expense-management', permission: 'App.Hr.Expense.Widget', column: 'left' },
     { id: 'social-wall', permission: 'App.Intranet.SocialPost.Widget', column: 'center' },
@@ -285,6 +285,20 @@ const IntranetDashboard: React.FC = () => {
         return <ShuttleRoute shuttleRoutes={intranetDashboard?.shuttleRoutes || []} />
       case 'meal-weekly-menu':
         return <MealWeeklyMenu meals={intranetDashboard?.meals || []} />
+      case 'leave-management':
+        return (
+          <LeaveManagement
+            leaves={intranetDashboard?.leaves || []}
+            onNewLeave={() => setShowLeaveModal(true)}
+          />
+        )
+      case 'overtime-management':
+        return (
+          <OvertimeManagement
+            overtimes={intranetDashboard?.overtimes || []}
+            onNewOvertime={() => setShowOvertimeModal(true)}
+          />
+        )
 
       case 'active-surveys':
         return <ActiveSurveys onTakeSurvey={handleTakeSurvey} />
@@ -292,10 +306,6 @@ const IntranetDashboard: React.FC = () => {
         return <SocialWall />
       case 'priority-tasks':
         return <PriorityTasks />
-      case 'leave-management':
-        return <LeaveManagement onNewLeave={() => setShowLeaveModal(true)} />
-      case 'overtime-management':
-        return <OvertimeManagement onNewOvertime={() => setShowOvertimeModal(true)} />
       default:
         return null
     }

ui/src/views/intranet/widgets/LeaveManagement.tsx

@@ -2,13 +2,14 @@ import React from 'react'
 import { FaCalendarAlt, FaPlus } from 'react-icons/fa'
 import dayjs from 'dayjs'
 import { LeaveStatusEnum, LeaveTypeEnum } from '../../../types/hr'
-import { mockEmployeeLeaves } from '@/mocks/mockEmployeeLeaves'
+import { LeaveDto } from '@/proxy/intranet/models'
 
 interface LeaveManagementProps {
+  leaves: LeaveDto[]
   onNewLeave: () => void
 }
 
-const LeaveManagement: React.FC<LeaveManagementProps> = ({ onNewLeave }) => {
+const LeaveManagement: React.FC<LeaveManagementProps> = ({ leaves, onNewLeave }) => {
   return (
     <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700">
       <div className="p-4 border-b border-gray-200 dark:border-gray-700">
@@ -32,16 +33,21 @@ const LeaveManagement: React.FC<LeaveManagementProps> = ({ onNewLeave }) => {
 
         {/* Son izin talepleri */}
         <div className="space-y-2">
-          {mockEmployeeLeaves.slice(0, 3).map((leave) => (
+          {leaves.slice(0, 3).map((leave) => (
             <div
               key={leave.id}
               className="p-3 rounded-lg bg-gray-50 dark:bg-gray-900/20 border border-gray-200 dark:border-gray-700"
             >
               <div className="flex items-start justify-between mb-1">
                 <h4 className="text-sm font-medium text-gray-900 dark:text-white">
-                  {leave.leaveType === LeaveTypeEnum.Annual ? '🏖️ Yıllık' : 
+                  {leave.leaveType === LeaveTypeEnum.Annual
-                   leave.leaveType === LeaveTypeEnum.Sick ? '🏥 Hastalık' : 
+                    ? '🏖️ Yıllık'
-                   leave.leaveType === LeaveTypeEnum.Unpaid ? '💼 Ücretsiz' : '📋 Diğer'} İzin
+                    : leave.leaveType === LeaveTypeEnum.Sick
+                      ? '🏥 Hastalık'
+                      : leave.leaveType === LeaveTypeEnum.Unpaid
+                        ? '💼 Ücretsiz'
+                        : '📋 Diğer'}{' '}
+                  İzin
                 </h4>
                 <span
                   className={`text-xs px-2 py-1 rounded-full ${
@@ -52,12 +58,16 @@ const LeaveManagement: React.FC<LeaveManagementProps> = ({ onNewLeave }) => {
                         : 'bg-red-100 dark:bg-red-900/30 text-red-700 dark:text-red-300'
                   }`}
                 >
-                  {leave.status === LeaveStatusEnum.Approved ? 'Onaylandı' : 
+                  {leave.status === LeaveStatusEnum.Approved
-                   leave.status === LeaveStatusEnum.Pending ? 'Bekliyor' : 'Reddedildi'}
+                    ? 'Onaylandı'
+                    : leave.status === LeaveStatusEnum.Pending
+                      ? 'Bekliyor'
+                      : 'Reddedildi'}
                 </span>
               </div>
               <p className="text-xs text-gray-600 dark:text-gray-400">
-                {dayjs(leave.startDate).format('DD MMM')} - {dayjs(leave.endDate).format('DD MMM')} ({leave.totalDays} gün)
+                {dayjs(leave.startDate).format('DD MMM')} - {dayjs(leave.endDate).format('DD MMM')}{' '}
+                ({leave.totalDays} gün)
               </p>
             </div>
           ))}

ui/src/views/intranet/widgets/MealWeeklyMenu.tsx

@@ -8,14 +8,6 @@ import { MealDto } from '@/proxy/intranet/models'
 dayjs.extend(isBetween)
 
 const MealWeeklyMenu: React.FC<{ meals: MealDto[] }> = ({ meals }) => {
-  // const mealWeekMenus = meals.filter((menu) => {
-  //   const menuDate = dayjs(menu.date)
-  //   const today = dayjs()
-  //   const weekStart = today.startOf('week')
-  //   const weekEnd = today.endOf('week')
-  //   return menuDate.isBetween(weekStart, weekEnd, null, '[]')
-  // })
-
   return (
     <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700">
       <div className="p-4 border-b border-gray-200 dark:border-gray-700">

ui/src/views/intranet/widgets/OvertimeManagement.tsx

@@ -2,13 +2,14 @@ import React from 'react'
 import { FaClock, FaPlus } from 'react-icons/fa'
 import dayjs from 'dayjs'
 import { LeaveStatusEnum } from '../../../types/hr'
-import { mockOvertimes } from '@/mocks/mockOvertimes'
+import { OvertimeDto } from '@/proxy/intranet/models'
 
 interface OvertimeManagementProps {
+  overtimes: OvertimeDto[]
   onNewOvertime: () => void
 }
 
-const OvertimeManagement: React.FC<OvertimeManagementProps> = ({ onNewOvertime }) => {
+const OvertimeManagement: React.FC<OvertimeManagementProps> = ({ overtimes, onNewOvertime }) => {
   return (
     <div className="bg-white dark:bg-gray-800 rounded-lg shadow-sm border border-gray-200 dark:border-gray-700">
       <div className="p-4 border-b border-gray-200 dark:border-gray-700">
@@ -27,7 +28,7 @@ const OvertimeManagement: React.FC<OvertimeManagementProps> = ({ onNewOvertime }
 
         {/* Son mesai talepleri */}
         <div className="space-y-2">
-          {mockOvertimes.slice(0, 3).map((overtime) => (
+          {overtimes.slice(0, 3).map((overtime) => (
             <div
               key={overtime.id}
               className="p-3 rounded-lg bg-gray-50 dark:bg-gray-900/20 border border-gray-200 dark:border-gray-700"