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

Merge pull request 'benefit' (#43) from dev_chapal into devqc

Browse Source 
Reviewed-on: http://103.197.204.162:3025/CelHRTeam/EchoTex_Payroll/pulls/43
This commit is contained in:
chapal 2025-05-08 14:33:47 +06:00
commit 616cb5d748
7 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
HRM.DA/Service/Attendance/AttendanceProcess.cs
View File

@ -2101,7 +2101,7 @@ namespace HRM.DA
AttnWiseAllowance attnAllow = new AttnWiseAllowance();
// List<Employee> employees = new EmployeeService().GetByEmpIDs("352,70");
List<Employee> employees = new EmployeeService().GetAllEmps();
List<Employee> employees = new EmployeeService().GetAllLive();
List<ADParameter> oadParameters = new ADParameterService().GetWithDetail(EnumStatus.Active, PayrollTypeId);
PayrollType oPayrollType = new PayrollTypeService().Get(PayrollTypeId);
List<TermParameter> 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);
}
}
}
}

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

@ -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");

8
HRM.Report/PayrollDataSet/PayrollDataSet.Designer.cs generated
View File

@ -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);

36
HRM.Report/PayrollDataSet/PayrollDataSet.xsd
View File

@ -574,7 +574,7 @@
<xs:element name="EmoNo" msprop:Generator_ColumnPropNameInTable="EmoNoColumn" msprop:Generator_ColumnPropNameInRow="EmoNo" msprop:Generator_UserColumnName="EmoNo" msprop:Generator_ColumnVarNameInTable="columnEmoNo" type="xs:string" minOccurs="0" />
<xs:element name="Name" msprop:Generator_ColumnPropNameInTable="NameColumn" msprop:Generator_ColumnPropNameInRow="Name" msprop:Generator_UserColumnName="Name" msprop:Generator_ColumnVarNameInTable="columnName" type="xs:string" minOccurs="0" />
<xs:element name="OTDescription" msprop:Generator_ColumnPropNameInTable="OTDescriptionColumn" msprop:Generator_ColumnPropNameInRow="OTDescription" msprop:Generator_UserColumnName="OTDescription" msprop:Generator_ColumnVarNameInTable="columnOTDescription" type="xs:string" minOccurs="0" />
<xs:element name="OTRate" msprop:Generator_ColumnPropNameInTable="OTRateColumn" msprop:Generator_ColumnPropNameInRow="OTRate" msprop:Generator_UserColumnName="OTRate" msprop:Generator_ColumnVarNameInTable="columnOTRate" type="xs:double" minOccurs="0" />
<xs:element name="OTRate" msprop:Generator_ColumnPropNameInTable="OTRateColumn" msprop:Generator_ColumnPropNameInRow="OTRate" msprop:Generator_UserColumnName="OTRate" msprop:Generator_ColumnVarNameInTable="columnOTRate" type="xs:string" minOccurs="0" />
<xs:element name="OTAmount" msprop:Generator_ColumnPropNameInTable="OTAmountColumn" msprop:Generator_ColumnPropNameInRow="OTAmount" msprop:Generator_UserColumnName="OTAmount" msprop:Generator_ColumnVarNameInTable="columnOTAmount" type="xs:double" minOccurs="0" />
<xs:element name="OTMonth" msprop:Generator_ColumnPropNameInTable="OTMonthColumn" msprop:Generator_ColumnPropNameInRow="OTMonth" msprop:Generator_UserColumnName="OTMonth" msprop:Generator_ColumnVarNameInTable="columnOTMonth" type="xs:dateTime" minOccurs="0" />
<xs:element name="SLNo" msprop:Generator_ColumnPropNameInTable="SLNoColumn" msprop:Generator_ColumnPropNameInRow="SLNo" msprop:Generator_UserColumnName="SLNo" msprop:Generator_ColumnVarNameInTable="columnSLNo" type="xs:string" minOccurs="0" />
@ -3308,25 +3308,25 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="DeletedLifeCycle" msprop:Generator_RowEvHandlerName="DeletedLifeCycleRowChangeEventHandler" msprop:Generator_RowDeletedName="DeletedLifeCycleRowDeleted" msprop:Generator_RowDeletingName="DeletedLifeCycleRowDeleting" msprop:Generator_RowEvArgName="DeletedLifeCycleRowChangeEvent" msprop:Generator_TablePropName="DeletedLifeCycle" msprop:Generator_RowChangedName="DeletedLifeCycleRowChanged" msprop:Generator_RowChangingName="DeletedLifeCycleRowChanging" msprop:Generator_TableClassName="DeletedLifeCycleDataTable" msprop:Generator_RowClassName="DeletedLifeCycleRow" msprop:Generator_TableVarName="tableDeletedLifeCycle" msprop:Generator_UserTableName="DeletedLifeCycle">
<xs:element name="DeletedLifeCycle" msprop:Generator_RowClassName="DeletedLifeCycleRow" msprop:Generator_RowEvHandlerName="DeletedLifeCycleRowChangeEventHandler" msprop:Generator_RowDeletedName="DeletedLifeCycleRowDeleted" msprop:Generator_RowDeletingName="DeletedLifeCycleRowDeleting" msprop:Generator_RowEvArgName="DeletedLifeCycleRowChangeEvent" msprop:Generator_TablePropName="DeletedLifeCycle" msprop:Generator_RowChangedName="DeletedLifeCycleRowChanged" msprop:Generator_UserTableName="DeletedLifeCycle" msprop:Generator_RowChangingName="DeletedLifeCycleRowChanging" msprop:Generator_TableClassName="DeletedLifeCycleDataTable" msprop:Generator_TableVarName="tableDeletedLifeCycle">
<xs:complexType>
<xs:sequence>
<xs:element name="EffectDate" msprop:Generator_ColumnPropNameInRow="EffectDate" msprop:Generator_ColumnPropNameInTable="EffectDateColumn" msprop:Generator_ColumnVarNameInTable="columnEffectDate" msprop:Generator_UserColumnName="EffectDate" type="xs:string" minOccurs="0" />
<xs:element name="GrossSalary" msprop:Generator_ColumnPropNameInRow="GrossSalary" msprop:Generator_ColumnPropNameInTable="GrossSalaryColumn" msprop:Generator_ColumnVarNameInTable="columnGrossSalary" msprop:Generator_UserColumnName="GrossSalary" type="xs:string" minOccurs="0" />
<xs:element name="BasicSalary" msprop:Generator_ColumnPropNameInRow="BasicSalary" msprop:Generator_ColumnPropNameInTable="BasicSalaryColumn" msprop:Generator_ColumnVarNameInTable="columnBasicSalary" msprop:Generator_UserColumnName="BasicSalary" type="xs:string" minOccurs="0" />
<xs:element name="Grade" msprop:Generator_ColumnPropNameInRow="Grade" msprop:Generator_ColumnPropNameInTable="GradeColumn" msprop:Generator_ColumnVarNameInTable="columnGrade" msprop:Generator_UserColumnName="Grade" type="xs:string" minOccurs="0" />
<xs:element name="Company" msprop:Generator_ColumnPropNameInRow="Company" msprop:Generator_ColumnPropNameInTable="CompanyColumn" msprop:Generator_ColumnVarNameInTable="columnCompany" msprop:Generator_UserColumnName="Company" type="xs:string" minOccurs="0" />
<xs:element name="Designation" msprop:Generator_ColumnPropNameInRow="Designation" msprop:Generator_ColumnPropNameInTable="DesignationColumn" msprop:Generator_ColumnVarNameInTable="columnDesignation" msprop:Generator_UserColumnName="Designation" type="xs:string" minOccurs="0" />
<xs:element name="Location" msprop:Generator_ColumnPropNameInRow="Location" msprop:Generator_ColumnPropNameInTable="LocationColumn" msprop:Generator_ColumnVarNameInTable="columnLocation" msprop:Generator_UserColumnName="Location" type="xs:string" minOccurs="0" />
<xs:element name="Department" msprop:Generator_ColumnPropNameInRow="Department" msprop:Generator_ColumnPropNameInTable="DepartmentColumn" msprop:Generator_ColumnVarNameInTable="columnDepartment" msprop:Generator_UserColumnName="Department" type="xs:string" minOccurs="0" />
<xs:element name="Confirmed" msprop:Generator_ColumnPropNameInRow="Confirmed" msprop:Generator_ColumnPropNameInTable="ConfirmedColumn" msprop:Generator_ColumnVarNameInTable="columnConfirmed" msprop:Generator_UserColumnName="Confirmed" type="xs:string" minOccurs="0" />
<xs:element name="EmployeeNo" msprop:Generator_ColumnPropNameInRow="EmployeeNo" msprop:Generator_ColumnPropNameInTable="EmployeeNoColumn" msprop:Generator_ColumnVarNameInTable="columnEmployeeNo" msprop:Generator_UserColumnName="EmployeeNo" type="xs:string" minOccurs="0" />
<xs:element name="EmployeeName" msprop:Generator_ColumnPropNameInRow="EmployeeName" msprop:Generator_ColumnPropNameInTable="EmployeeNameColumn" msprop:Generator_ColumnVarNameInTable="columnEmployeeName" msprop:Generator_UserColumnName="EmployeeName" type="xs:string" minOccurs="0" />
<xs:element name="Status" msprop:Generator_ColumnPropNameInRow="Status" msprop:Generator_ColumnPropNameInTable="StatusColumn" msprop:Generator_ColumnVarNameInTable="columnStatus" msprop:Generator_UserColumnName="Status" type="xs:string" minOccurs="0" />
<xs:element name="Remarks" msprop:Generator_ColumnPropNameInRow="Remarks" msprop:Generator_ColumnPropNameInTable="RemarksColumn" msprop:Generator_ColumnVarNameInTable="columnRemarks" msprop:Generator_UserColumnName="Remarks" type="xs:string" minOccurs="0" />
<xs:element name="Description" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" msprop:Generator_ColumnVarNameInTable="columnDescription" msprop:Generator_UserColumnName="Description" type="xs:string" minOccurs="0" />
<xs:element name="SalaryMonth" msprop:Generator_ColumnPropNameInRow="SalaryMonth" msprop:Generator_ColumnPropNameInTable="SalaryMonthColumn" msprop:Generator_ColumnVarNameInTable="columnSalaryMonth" msprop:Generator_UserColumnName="SalaryMonth" type="xs:string" minOccurs="0" />
<xs:element name="GradeSalaryAssesment" msprop:Generator_ColumnPropNameInRow="GradeSalaryAssesment" msprop:Generator_ColumnPropNameInTable="GradeSalaryAssesmentColumn" msprop:Generator_ColumnVarNameInTable="columnGradeSalaryAssesment" msprop:Generator_UserColumnName="GradeSalaryAssesment" type="xs:string" minOccurs="0" />
<xs:element name="EffectDate" msprop:Generator_UserColumnName="EffectDate" msprop:Generator_ColumnPropNameInTable="EffectDateColumn" msprop:Generator_ColumnPropNameInRow="EffectDate" msprop:Generator_ColumnVarNameInTable="columnEffectDate" type="xs:string" minOccurs="0" />
<xs:element name="GrossSalary" msprop:Generator_UserColumnName="GrossSalary" msprop:Generator_ColumnPropNameInTable="GrossSalaryColumn" msprop:Generator_ColumnPropNameInRow="GrossSalary" msprop:Generator_ColumnVarNameInTable="columnGrossSalary" type="xs:string" minOccurs="0" />
<xs:element name="BasicSalary" msprop:Generator_UserColumnName="BasicSalary" msprop:Generator_ColumnPropNameInTable="BasicSalaryColumn" msprop:Generator_ColumnPropNameInRow="BasicSalary" msprop:Generator_ColumnVarNameInTable="columnBasicSalary" type="xs:string" minOccurs="0" />
<xs:element name="Grade" msprop:Generator_UserColumnName="Grade" msprop:Generator_ColumnPropNameInTable="GradeColumn" msprop:Generator_ColumnPropNameInRow="Grade" msprop:Generator_ColumnVarNameInTable="columnGrade" type="xs:string" minOccurs="0" />
<xs:element name="Company" msprop:Generator_UserColumnName="Company" msprop:Generator_ColumnPropNameInTable="CompanyColumn" msprop:Generator_ColumnPropNameInRow="Company" msprop:Generator_ColumnVarNameInTable="columnCompany" type="xs:string" minOccurs="0" />
<xs:element name="Designation" msprop:Generator_UserColumnName="Designation" msprop:Generator_ColumnPropNameInTable="DesignationColumn" msprop:Generator_ColumnPropNameInRow="Designation" msprop:Generator_ColumnVarNameInTable="columnDesignation" type="xs:string" minOccurs="0" />
<xs:element name="Location" msprop:Generator_UserColumnName="Location" msprop:Generator_ColumnPropNameInTable="LocationColumn" msprop:Generator_ColumnPropNameInRow="Location" msprop:Generator_ColumnVarNameInTable="columnLocation" type="xs:string" minOccurs="0" />
<xs:element name="Department" msprop:Generator_UserColumnName="Department" msprop:Generator_ColumnPropNameInTable="DepartmentColumn" msprop:Generator_ColumnPropNameInRow="Department" msprop:Generator_ColumnVarNameInTable="columnDepartment" type="xs:string" minOccurs="0" />
<xs:element name="Confirmed" msprop:Generator_UserColumnName="Confirmed" msprop:Generator_ColumnPropNameInTable="ConfirmedColumn" msprop:Generator_ColumnPropNameInRow="Confirmed" msprop:Generator_ColumnVarNameInTable="columnConfirmed" type="xs:string" minOccurs="0" />
<xs:element name="EmployeeNo" msprop:Generator_UserColumnName="EmployeeNo" msprop:Generator_ColumnPropNameInTable="EmployeeNoColumn" msprop:Generator_ColumnPropNameInRow="EmployeeNo" msprop:Generator_ColumnVarNameInTable="columnEmployeeNo" type="xs:string" minOccurs="0" />
<xs:element name="EmployeeName" msprop:Generator_UserColumnName="EmployeeName" msprop:Generator_ColumnPropNameInTable="EmployeeNameColumn" msprop:Generator_ColumnPropNameInRow="EmployeeName" msprop:Generator_ColumnVarNameInTable="columnEmployeeName" type="xs:string" minOccurs="0" />
<xs:element name="Status" msprop:Generator_UserColumnName="Status" msprop:Generator_ColumnPropNameInTable="StatusColumn" msprop:Generator_ColumnPropNameInRow="Status" msprop:Generator_ColumnVarNameInTable="columnStatus" type="xs:string" minOccurs="0" />
<xs:element name="Remarks" msprop:Generator_UserColumnName="Remarks" msprop:Generator_ColumnPropNameInTable="RemarksColumn" msprop:Generator_ColumnPropNameInRow="Remarks" msprop:Generator_ColumnVarNameInTable="columnRemarks" type="xs:string" minOccurs="0" />
<xs:element name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" type="xs:string" minOccurs="0" />
<xs:element name="SalaryMonth" msprop:Generator_UserColumnName="SalaryMonth" msprop:Generator_ColumnPropNameInTable="SalaryMonthColumn" msprop:Generator_ColumnPropNameInRow="SalaryMonth" msprop:Generator_ColumnVarNameInTable="columnSalaryMonth" type="xs:string" minOccurs="0" />
<xs:element name="GradeSalaryAssesment" msprop:Generator_UserColumnName="GradeSalaryAssesment" msprop:Generator_ColumnPropNameInTable="GradeSalaryAssesmentColumn" msprop:Generator_ColumnPropNameInRow="GradeSalaryAssesment" msprop:Generator_ColumnVarNameInTable="columnGradeSalaryAssesment" type="xs:string" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

2
HRM.Report/PayrollDataSet/PayrollDataSet.xss
View File

@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-76" ViewPortY="-18" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-76" ViewPortY="-38" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Payslip" ZOrder="85" X="917" Y="260" Height="257" Width="157" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="253" />
<Shape ID="DesignTable:EmployeeInfo" ZOrder="3" X="-66" Y="301" Height="28" Width="150" AdapterExpanded="true" DataTableExpanded="false" OldAdapterHeight="0" OldDataTableHeight="253" SplitterPosition="24" />

4
HRM.UI/RDLC/OTMonthlySheet.rdlc
View File

@ -233,7 +233,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Sum(Fields!OTRate.Value)</Value>
<Value>=Fields!OTRate.Value</Value>
<Style>
<FontSize>8pt</FontSize>
<Format>N2</Format>
@ -322,7 +322,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Sum(Fields!OTRate.Value)</Value>
<Value />
<Style>
<FontFamily />
<FontSize>8pt</FontSize>

3
HRM.UI/RDLC/OTMonthlySheetWithMonth.rdlc
View File

@ -502,7 +502,7 @@
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Format((Fields!OTRate.Value),"###,##.00")</Value>
<Value>=Fields!OTRate.Value</Value>
<Style>
<FontSize>8pt</FontSize>
</Style>
@ -544,6 +544,7 @@
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>