diff --git a/HRM.Report/Attendence/RDLC/MonthlyDetailAttnEcho.rdlc b/HRM.Report/Attendence/RDLC/MonthlyDetailAttnEcho.rdlc
index 7db55a6..f45d8d4 100644
--- a/HRM.Report/Attendence/RDLC/MonthlyDetailAttnEcho.rdlc
+++ b/HRM.Report/Attendence/RDLC/MonthlyDetailAttnEcho.rdlc
@@ -266,6 +266,146 @@
+
+
+
+ true
+ true
+
+
+
+
+ Department
+
+
+
+
+
+
+ Textbox3
+
+
+ Gainsboro
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Floor
+
+
+
+
+
+
+ Textbox9
+
+
+ Gainsboro
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Section
+
+
+
+
+
+
+ Textbox11
+
+
+ Gainsboro
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+ true
+ true
+
+
+
+
+ Line
+
+
+
+
+
+
+ Textbox13
+
+
+ Gainsboro
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
@@ -541,33 +681,225 @@
-
+
- =Fields!EmployeeNo.Value
+ =Fields!Department.Value
+
+
+ =Fields!Department.Value
+
+
+
+ 1in
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!Department.Value)
+
+
+
+
+
+
+ Department
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
-
+
- =Fields!EmployeeNo.Value
+ =Fields!Floor.Value
+
+
+ =Fields!Floor.Value
+
+
+
+ 1in
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!Floor.Value)
+
+
+
+
+
+
+ Floor
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
-
+
- =Fields!EmployeeNo.Value
+ =Fields!Section.Value
- Output
- true
+
+
+ =Fields!Section.Value
+
+
+
+ 1in
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!Section.Value)
+
+
+
+
+
+
+ Section
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
+ =Fields!Line.Value
+
+
+
+
+ =Fields!Line.Value
+
+
+
+ 1in
+
+
+ true
+ true
+
+
+
+
+ =First(Fields!Line.Value)
+
+
+
+
+
+
+ Line
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
+
+
+
+
+
+
+ =Fields!EmployeeNo.Value
+
+
+
+
+
+
+ =Fields!EmployeeNo.Value
+
+
+
+
+
+
+ =Fields!EmployeeNo.Value
+
+
+ Output
+ true
+
+
+ Output
+
+
+ Output
+
+
+
+
- Output
- Output
Output
@@ -591,7 +923,7 @@
AttendenceDataSet_MonthlyDetail
0.6875in
0.9in
- 4.35in
+ 8.35in
diff --git a/HRM.Report/Class/rptEcho.cs b/HRM.Report/Class/rptEcho.cs
index b8611f9..283ffee 100644
--- a/HRM.Report/Class/rptEcho.cs
+++ b/HRM.Report/Class/rptEcho.cs
@@ -2338,7 +2338,7 @@ namespace HRM.Report
continue;
}
var empDailyAttnProcess = dAttnProcessess.Where(x => x.EmployeeID == employee.ID &&
- x.AttnDate >= firstDateOfMonth && x.AttnDate <= lastDateOfMonth).ToList();
+ x.AttnDate >= firstDateOfMonth && x.AttnDate <= lastDateOfMonth).OrderBy(x => x.AttnDate).ToList();
if (empDailyAttnProcess.Count > 0)
{
GetEmpDailyAttn(employee, empDailyAttnProcess, dTableChild, month, out totalOTHour, out totalLateHour, _adps, _Adparameters, oShiftIDs, oShiftIDsSpecial, oNationalHolidays,
diff --git a/HRM.Report/HRM.Report.csproj b/HRM.Report/HRM.Report.csproj
index 192df9a..a083be8 100644
--- a/HRM.Report/HRM.Report.csproj
+++ b/HRM.Report/HRM.Report.csproj
@@ -324,7 +324,9 @@
-
+
+ Always
+
diff --git a/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.html b/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.html
index 460a2de..2f611f7 100644
--- a/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.html
+++ b/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.html
@@ -66,7 +66,7 @@
-
+
diff --git a/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.ts b/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.ts
index 094b4d8..721d291 100644
--- a/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.ts
+++ b/HRM.UI/ClientApp/src/app/attendance/echotex-roster-assignment/echotex-roster-assignment.component.ts
@@ -141,7 +141,7 @@ export class EchotexRosterAssignmentComponent implements OnInit {
ewpList.workPlanGroupID = this.selectedWorkPlanID;
var wp = this.workPlanGroupList.find(w => w.id == this.selectedWorkPlanID);
ewpList.workPlanGroupNameView = wp.name;
- debugger;
+ // debugger;
if (!this.fixedWorkPlan) {
ewpList.startDate = this.startDate;
// ewpList.weekEndOn = this.getDayOfWeekEnum(ewpList.startDate);
@@ -209,7 +209,7 @@ export class EchotexRosterAssignmentComponent implements OnInit {
loadGroupTypeAndInitialShift(workPlanGroup: WorkPlanGroup) {
this.loadingPanel.ShowLoadingPanel = true;
this.empWorkPlanSetupList = [];
- debugger;
+ // debugger;
// if (workPlanGroup.type != EnumWorkPlanGroup.Fixed &&
// (workPlanGroup.type != undefined || workPlanGroup.type != null)) {
// this.fixedWorkPlan = false;
@@ -227,7 +227,7 @@ export class EchotexRosterAssignmentComponent implements OnInit {
},
() => {
//console.log(this.empWorkPlanSetupList);
- debugger;
+ // debugger;
// if (this.empWorkPlanSetupList.length > 0) {
// if (this.empWorkPlanSetupList[0].workPlanGroupType != EnumWorkPlanGroup.Fixed &&
// (this.empWorkPlanSetupList[0].workPlanGroupType != undefined || this.empWorkPlanSetupList[0].workPlanGroupType != null)) {
@@ -340,7 +340,7 @@ export class EchotexRosterAssignmentComponent implements OnInit {
}
public getHolidayDayOfWeek(day: number): string {
- debugger;
+ // debugger;
day = day + 1;
switch (day) {
case HolidayDayOfWeek.Sunday:
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 546b3fc..b11d5e8 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
@@ -688,7 +688,10 @@ export class ReportViewerComponent implements OnInit {
this.hiddenToDate = true;
this.hiddenExport = true;
this.loadCurrentFiscalYear();
+ this.fromDate = new Date();
this.toDate = new Date();
+ this.fromDateFormat = 'MMM yyyy';
+ this.toDateFormat = 'MMM yyyy';
this.PDFTitle = 'Multiple Employee Job Card';
this.apiService.selectedMenuName = 'Multiple Employee Job Card';
} else if (this.reportType === '606') {
diff --git a/HRM.UI/Controllers/Report/ReportController.cs b/HRM.UI/Controllers/Report/ReportController.cs
index c8efb37..7c825bd 100644
--- a/HRM.UI/Controllers/Report/ReportController.cs
+++ b/HRM.UI/Controllers/Report/ReportController.cs
@@ -699,7 +699,7 @@ namespace HRM.UI.Controllers.Report
case EnumReportType.SalaryReconSummaryEcho:
break;
case EnumReportType.MultipleEmployeeJobCardEcho:
- bytes = new rptEcho().ShowJobCardMultiple(fromDate, toDate, sEmpIDs, reportType, (int)currentUser.PayrollTypeID);
+ bytes = new rptEcho().ShowJobCardMultiple(GlobalFunctions.FirstDateOfMonth(fromDate), GlobalFunctions.LastDateOfMonth(toDate), sEmpIDs, reportType, (int)currentUser.PayrollTypeID);
break;
case EnumReportType.DailyPresentEcho:
bytes = new rptEcho().ShowDailyPresent(fromDate, sEmpIDs, reportType, (int)currentUser.PayrollTypeID);