From ea05eb34406a85331be8477b1772ee181679367f Mon Sep 17 00:00:00 2001 From: chapal Date: Thu, 8 May 2025 14:27:24 +0600 Subject: [PATCH] benefit --- .../Service/Attendance/AttendanceProcess.cs | 12 +++---- HRM.Report/Class/OTReport.cs | 2 +- .../PayrollDataSet/PayrollDataSet.Designer.cs | 8 ++--- HRM.Report/PayrollDataSet/PayrollDataSet.xsd | 36 +++++++++---------- HRM.Report/PayrollDataSet/PayrollDataSet.xss | 2 +- HRM.UI/RDLC/OTMonthlySheet.rdlc | 4 +-- HRM.UI/RDLC/OTMonthlySheetWithMonth.rdlc | 3 +- 7 files changed, 34 insertions(+), 33 deletions(-) diff --git a/HRM.DA/Service/Attendance/AttendanceProcess.cs b/HRM.DA/Service/Attendance/AttendanceProcess.cs index 59dc2cd..1fd9fc2 100644 --- a/HRM.DA/Service/Attendance/AttendanceProcess.cs +++ b/HRM.DA/Service/Attendance/AttendanceProcess.cs @@ -2101,7 +2101,7 @@ namespace HRM.DA AttnWiseAllowance attnAllow = new AttnWiseAllowance(); // List employees = new EmployeeService().GetByEmpIDs("352,70"); - List employees = new EmployeeService().GetAllEmps(); + List employees = new EmployeeService().GetAllLive(); List oadParameters = new ADParameterService().GetWithDetail(EnumStatus.Active, PayrollTypeId); PayrollType oPayrollType = new PayrollTypeService().Get(PayrollTypeId); List termParameters = tps.GetwithDetail(oPayrollType.ID); @@ -2132,7 +2132,7 @@ namespace HRM.DA Employee oemp = employees.FirstOrDefault(x => x.ID == Convert.ToInt32(oRow["EMPLOYEEID"].ToString())); if (oemp == null) { - ErrorList.Add(new SalaryProcessStatus("", "", " Employee not found, Internal ID:" + oRow["EMPLOYEEID"].ToString())); + // ErrorList.Add(new SalaryProcessStatus("", "", " Employee not found, Internal ID:" + oRow["EMPLOYEEID"].ToString())); continue; } @@ -2454,8 +2454,8 @@ namespace HRM.DA DataSet EmpOTHours = new ShiftTermService().GetEmpOT(oPayrollType.NextPayProcessDate, trm.ID); foreach (DataRow Dr in EmpOTHours.Tables[0].Rows) { - //if (Convert.ToDouble(Dr["TotalOT"])>0) - //{ + if (Convert.ToDouble(Dr["TotalOT"]) > 0) + { Employee tempEmployee = employees.Where(emp => emp.ID.ToString() == Dr["EmployeeID"].ToString()).FirstOrDefault(); if (tempEmployee == null || tempEmployee.IsEligibleOT == false) continue; @@ -2472,8 +2472,8 @@ namespace HRM.DA } EmpOverTimes = MakeEmployeeOvertimeObj(ref EmpOverTimes, ref ErrorList, tempEmployee, termParameters, - oPayrollType, trm.ID, Convert.ToDouble(Dr["TotalOT"]), userid); - //} + oPayrollType, trm.ID, Convert.ToDouble(Dr["TotalOT"]), userid); + } } } } diff --git a/HRM.Report/Class/OTReport.cs b/HRM.Report/Class/OTReport.cs index 14902a7..3df18c9 100644 --- a/HRM.Report/Class/OTReport.cs +++ b/HRM.Report/Class/OTReport.cs @@ -40,7 +40,7 @@ namespace HRM.Report oDR["EmoNo"] = oDRow["EmployeeNo"]; oDR["Name"] = oDRow["EmpName"]; oDR["OTDescription"] = oDRow["TermName"]; - oDR["OTRate"] = oDRow["Hours"]; + oDR["OTRate"] = GlobalFunctions.ConvertDoubleHourToHourMinute(Convert.ToDouble(oDRow["Hours"])); //oDRow["Hours"]; oDR["OTAmount"] = GlobalFunctions.Round(Convert.ToDouble(oDRow["Amount"])); // Math.Round(oDRow["Amount"]); //oDR["OTMonth"] = Convert.ToDateTime(oDRow["ProcessMonth"]).ToString("dd MMM yyyy"); oDR["OTMonth"] = Convert.ToDateTime(oDRow["OTMonth"]).ToString("dd MMM yyyy"); diff --git a/HRM.Report/PayrollDataSet/PayrollDataSet.Designer.cs b/HRM.Report/PayrollDataSet/PayrollDataSet.Designer.cs index 0c0269f..1a6e71d 100644 --- a/HRM.Report/PayrollDataSet/PayrollDataSet.Designer.cs +++ b/HRM.Report/PayrollDataSet/PayrollDataSet.Designer.cs @@ -18706,7 +18706,7 @@ namespace HRM.Report.PayrollDataSet { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public OTMonthlySheetRow AddOTMonthlySheetRow(string EmoNo, string Name, string OTDescription, double OTRate, double OTAmount, System.DateTime OTMonth, string SLNo, double Basic, string SeqNo) { + public OTMonthlySheetRow AddOTMonthlySheetRow(string EmoNo, string Name, string OTDescription, string OTRate, double OTAmount, System.DateTime OTMonth, string SLNo, double Basic, string SeqNo) { OTMonthlySheetRow rowOTMonthlySheetRow = ((OTMonthlySheetRow)(this.NewRow())); object[] columnValuesArray = new object[] { EmoNo, @@ -18760,7 +18760,7 @@ namespace HRM.Report.PayrollDataSet { base.Columns.Add(this.columnName); this.columnOTDescription = new global::System.Data.DataColumn("OTDescription", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnOTDescription); - this.columnOTRate = new global::System.Data.DataColumn("OTRate", typeof(double), null, global::System.Data.MappingType.Element); + this.columnOTRate = new global::System.Data.DataColumn("OTRate", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnOTRate); this.columnOTAmount = new global::System.Data.DataColumn("OTAmount", typeof(double), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnOTAmount); @@ -93121,10 +93121,10 @@ namespace HRM.Report.PayrollDataSet { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] - public double OTRate { + public string OTRate { get { try { - return ((double)(this[this.tableOTMonthlySheet.OTRateColumn])); + return ((string)(this[this.tableOTMonthlySheet.OTRateColumn])); } catch (global::System.InvalidCastException e) { throw new global::System.Data.StrongTypingException("The value for column \'OTRate\' in table \'OTMonthlySheet\' is DBNull.", e); diff --git a/HRM.Report/PayrollDataSet/PayrollDataSet.xsd b/HRM.Report/PayrollDataSet/PayrollDataSet.xsd index 91dde72..c4f4b0d 100644 --- a/HRM.Report/PayrollDataSet/PayrollDataSet.xsd +++ b/HRM.Report/PayrollDataSet/PayrollDataSet.xsd @@ -574,7 +574,7 @@ - + @@ -3308,25 +3308,25 @@ - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/HRM.Report/PayrollDataSet/PayrollDataSet.xss b/HRM.Report/PayrollDataSet/PayrollDataSet.xss index 0eed9bc..52af4b7 100644 --- a/HRM.Report/PayrollDataSet/PayrollDataSet.xss +++ b/HRM.Report/PayrollDataSet/PayrollDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/HRM.UI/RDLC/OTMonthlySheet.rdlc b/HRM.UI/RDLC/OTMonthlySheet.rdlc index e40149e..3017fe6 100644 --- a/HRM.UI/RDLC/OTMonthlySheet.rdlc +++ b/HRM.UI/RDLC/OTMonthlySheet.rdlc @@ -233,7 +233,7 @@ - =Sum(Fields!OTRate.Value) + =Fields!OTRate.Value @@ -544,6 +544,7 @@ 2pt + true