From 43fbf03d1dd9eee2ace06b710881cf6204f8910b Mon Sep 17 00:00:00 2001 From: mashfiq Date: Thu, 17 Apr 2025 12:11:08 +0600 Subject: [PATCH] Attendance reports --- HRM.Report/Class/rptEcho.cs | 2 +- .../src/app/reports/report-viewer/report-viewer.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HRM.Report/Class/rptEcho.cs b/HRM.Report/Class/rptEcho.cs index 4efd4ff..2840451 100644 --- a/HRM.Report/Class/rptEcho.cs +++ b/HRM.Report/Class/rptEcho.cs @@ -2628,7 +2628,7 @@ namespace HRM.Report DataSet oDailyInOut = null; DataSet oPreviousDayInOut = null; DataRow oDR = null; - List oShifts = new ShiftService().Get(EnumStatus.Active, payrollTypeID); + List oShifts = new ShiftService().Get(EnumStatus.Regardless, payrollTypeID); oDailyInOut = new EchoTexExceptionReportService().GetDailyInOut(attnDate, sEmpID); oPreviousDayInOut = new EchoTexExceptionReportService().GetDailyInOut(PreviousAttnDate, sEmpID); position = 1; diff --git a/HRM.UI/ClientApp/src/app/reports/report-viewer/report-viewer.component.ts b/HRM.UI/ClientApp/src/app/reports/report-viewer/report-viewer.component.ts index b11d5e8..0844a45 100644 --- a/HRM.UI/ClientApp/src/app/reports/report-viewer/report-viewer.component.ts +++ b/HRM.UI/ClientApp/src/app/reports/report-viewer/report-viewer.component.ts @@ -733,7 +733,7 @@ export class ReportViewerComponent implements OnInit { } else if (this.reportType === '714') { // debugger; - this.SearchFrom = EnumSearchFrom.Attendance; + // this.SearchFrom = EnumSearchFrom.Attendance; this.multiselect = true; this.hiddenFromDate = true; this.hiddenToDate = false; @@ -746,7 +746,7 @@ export class ReportViewerComponent implements OnInit { this.apiService.selectedMenuName = 'Daily Absent'; } else if (this.reportType === '716') { // debugger; - this.SearchFrom = EnumSearchFrom.Attendance; + // this.SearchFrom = EnumSearchFrom.Attendance; this.multiselect = true; this.hiddenFromDate = true; this.hiddenToDate = false;