From 695af0f3397cd8bb3291711410ee3760eef2c2c4 Mon Sep 17 00:00:00 2001 From: Naz <2022755409@student.uitm.edu.my> Date: Wed, 16 Apr 2025 17:15:00 +0800 Subject: [PATCH] updated --- Areas/OTcalculate/Models/OtRegisterModel.cs | 2 +- .../OTcalculate/Models/OvertimeRequestDto.cs | 21 +++ .../Services/OvertimePdfService.cs | 2 +- .../Views/Overtime/EditOvertime.cshtml | 116 ++++++++---- .../Views/Overtime/OtRecords.cshtml | 13 +- .../Views/Overtime/OtRegister.cshtml | 74 +++----- Controllers/API/Inventory/InvMainAPI.cs | 2 +- Controllers/API/OvertimeAPI.cs | 167 +++++++++++++++--- PSTW_CentralSystem.csproj | 1 + ...T_0c935b6f-beb7-459d-ae67-807251e104a3.pdf | Bin 0 -> 282290 bytes 10 files changed, 286 insertions(+), 112 deletions(-) create mode 100644 Areas/OTcalculate/Models/OvertimeRequestDto.cs create mode 100644 wwwroot/Media/Overtime/OT_0c935b6f-beb7-459d-ae67-807251e104a3.pdf diff --git a/Areas/OTcalculate/Models/OtRegisterModel.cs b/Areas/OTcalculate/Models/OtRegisterModel.cs index 89054d6..ed17e09 100644 --- a/Areas/OTcalculate/Models/OtRegisterModel.cs +++ b/Areas/OTcalculate/Models/OtRegisterModel.cs @@ -27,7 +27,7 @@ namespace PSTW_CentralSystem.Areas.OTcalculate.Models public string OtDescription { get; set; } public string OtDays { get; set; } - public required string PDFBase64 { get; set; } + public string FilePath { get; set; } [Required] public int UserId { get; set; } diff --git a/Areas/OTcalculate/Models/OvertimeRequestDto.cs b/Areas/OTcalculate/Models/OvertimeRequestDto.cs new file mode 100644 index 0000000..df9f54a --- /dev/null +++ b/Areas/OTcalculate/Models/OvertimeRequestDto.cs @@ -0,0 +1,21 @@ +namespace PSTW_CentralSystem.Areas.OTcalculate.Models +{ + public class OvertimeRequestDto + { + public DateTime OtDate { get; set; } + public string OfficeFrom { get; set; } + public string OfficeTo { get; set; } + public int? OfficeBreak { get; set; } + public string OutsideFrom { get; set; } + public string OutsideTo { get; set; } + public int? OutsideBreak { get; set; } + public int? StationId { get; set; } + public string OtDescription { get; set; } + public string OtDays { get; set; } + public int UserId { get; set; } + public IFormFile File { get; set; } + } + + + +} diff --git a/Areas/OTcalculate/Services/OvertimePdfService.cs b/Areas/OTcalculate/Services/OvertimePdfService.cs index 75ad457..1d3bd1c 100644 --- a/Areas/OTcalculate/Services/OvertimePdfService.cs +++ b/Areas/OTcalculate/Services/OvertimePdfService.cs @@ -96,7 +96,7 @@ namespace PSTW_CentralSystem.Areas.OTcalculate.Services AddHeaderCell("Break\n(Outside)", "#edf2f7"); AddHeaderCell("Total OT\nHours", "#fdebd0"); AddHeaderCell("Break Hours\n(min)", "#fdebd0"); - AddHeaderCell("Net OT", "#fdebd0"); + AddHeaderCell("Net OT Hours", "#fdebd0"); if (departmentId == 2) AddHeaderCell("Station", "#d0f0ef"); AddHeaderCell("Days", "#e0f7da"); diff --git a/Areas/OTcalculate/Views/Overtime/EditOvertime.cshtml b/Areas/OTcalculate/Views/Overtime/EditOvertime.cshtml index 05503df..28d530e 100644 --- a/Areas/OTcalculate/Views/Overtime/EditOvertime.cshtml +++ b/Areas/OTcalculate/Views/Overtime/EditOvertime.cshtml @@ -15,44 +15,59 @@ v-on:input="calculateOTAndBreak"> +
OFFICE HOURS
-
-
+
+
-
+
-
+
- +
+ + +
+
OUTSIDE OFFICE HOURS
-
-
+
+
-
+
-
+
- +
+ + +
+