CelHRTeam/EchoTex_Payroll
14
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev_mashfiq #37

Merged
chapal merged 2 commits from dev_mashfiq into devqc 2025-04-20 14:41:54 +06:00
Conversation 0 Commits 2 Files Changed 4 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 43fbf03d1d - Show all commits

2
HRM.Report/Class/rptEcho.cs
View File

@ -2628,7 +2628,7 @@ namespace HRM.Report
DataSet oDailyInOut = null; DataSet oDailyInOut = null;
DataSet oPreviousDayInOut = null; DataSet oPreviousDayInOut = null;
DataRow oDR = null; DataRow oDR = null;
List<Shift> oShifts = new ShiftService().Get(EnumStatus.Active, payrollTypeID); List<Shift> oShifts = new ShiftService().Get(EnumStatus.Regardless, payrollTypeID);
oDailyInOut = new EchoTexExceptionReportService().GetDailyInOut(attnDate, sEmpID); oDailyInOut = new EchoTexExceptionReportService().GetDailyInOut(attnDate, sEmpID);
oPreviousDayInOut = new EchoTexExceptionReportService().GetDailyInOut(PreviousAttnDate, sEmpID); oPreviousDayInOut = new EchoTexExceptionReportService().GetDailyInOut(PreviousAttnDate, sEmpID);
position = 1; position = 1;

4
HRM.UI/ClientApp/src/app/reports/report-viewer/report-viewer.component.ts
View File

@ -733,7 +733,7 @@ export class ReportViewerComponent implements OnInit {
} else if (this.reportType === '714') { } else if (this.reportType === '714') {
// debugger; // debugger;
this.SearchFrom = EnumSearchFrom.Attendance; // this.SearchFrom = EnumSearchFrom.Attendance;
this.multiselect = true; this.multiselect = true;
this.hiddenFromDate = true; this.hiddenFromDate = true;
this.hiddenToDate = false; this.hiddenToDate = false;
@ -746,7 +746,7 @@ export class ReportViewerComponent implements OnInit {
this.apiService.selectedMenuName = 'Daily Absent'; this.apiService.selectedMenuName = 'Daily Absent';
} else if (this.reportType === '716') { } else if (this.reportType === '716') {
// debugger; // debugger;
this.SearchFrom = EnumSearchFrom.Attendance; // this.SearchFrom = EnumSearchFrom.Attendance;
this.multiselect = true; this.multiselect = true;
this.hiddenFromDate = true; this.hiddenFromDate = true;
this.hiddenToDate = false; this.hiddenToDate = false;