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

Employee Joining status Issue Fixed

Browse Source
This commit is contained in:
mashfiq 2024-12-09 14:34:10 +06:00
parent ca8befd8cb
commit 6a436e9b3c
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HRM.DA/DA/SearchReport/SearchEmployeeDA.cs
View File

@ -231,7 +231,11 @@ END;";
{ {
string orderby = "name"; string orderby = "name";
string sqlClause = ""; string sqlClause = "";
sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("PayrollTypeID =%n AND Status = %n", payrollTypeID, EnumStatus.Active); //Previous Code For only Live Employee
//sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("PayrollTypeID =%n AND Status = %n", payrollTypeID, EnumStatus.Active);
//New Code For live And Waitiong for join Employee
sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("PayrollTypeID =%n AND Status = %n OR Status = %n", payrollTypeID, EnumEmployeeStatus.Live, EnumEmployeeStatus.Waitingforjoin);
if (code != string.Empty) if (code != string.Empty)
{ {
sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("EmployeeNo LIKE %s", ("%" + code + "%")); sqlClause = SQLParser.TagSQL(sqlClause) + SQLParser.MakeSQL("EmployeeNo LIKE %s", ("%" + code + "%"));

5
HRM.UI/ClientApp/src/app/_models/Employee/employee.ts
View File

@ -138,7 +138,7 @@ export class Employee {
this.taxCircle = EnumTaxCircle.CityCorporation; this.taxCircle = EnumTaxCircle.CityCorporation;
this.isConfirmed = false; this.isConfirmed = false;
this.endOfContractDate = null; this.endOfContractDate = null;
this.status = EnumEmployeeStatus.Live; this.status = EnumEmployeeStatus.Waitingforjoin;
this.statusName = ''; this.statusName = '';
this.isShownInTaxSheet = false; this.isShownInTaxSheet = false;
this.pfMemberType = EnumPFMembershipType.NotYetLive; this.pfMemberType = EnumPFMembershipType.NotYetLive;
@ -219,6 +219,9 @@ export class Employee {
case EnumEmployeeStatus.Discontinued: case EnumEmployeeStatus.Discontinued:
str = "Discontinued"; str = "Discontinued";
break; break;
case EnumEmployeeStatus.Waitingforjoin:
str = "Waiting For Join";
break;
default: default:
} }

10
HRM.UI/ClientApp/src/app/picker/employee-picker.component.ts
View File

@ -602,10 +602,18 @@ export class EmployeePickerComponent implements OnInit {
} }
if (this.checkLive === true) { if (this.checkLive === true) {
//Previous Code For Only Live Employee
srcManager.Parameter.AddParam(EnumSearchParameter.Status, EnumSearchObjDataType.Number, 1, EnumSQLOperator.EqualTo); srcManager.Parameter.AddParam(EnumSearchParameter.Status, EnumSearchObjDataType.Number, 1, EnumSQLOperator.EqualTo);
//New Code For Live And Waiting For Join
// srcManager.Parameter.AddParam(EnumSearchParameter.Status, EnumSearchObjDataType.Number, '1,6', EnumSQLOperator.In);
} }
if (this.checkLiveNo === true) { if (this.checkLiveNo === true) {
srcManager.Parameter.AddParam(EnumSearchParameter.Status, EnumSearchObjDataType.Number, 2, EnumSQLOperator.EqualTo); //Previous Code For Only Not Live
// srcManager.Parameter.AddParam(EnumSearchParameter.Status, EnumSearchObjDataType.Number, 2, EnumSQLOperator.EqualTo);
//New Code For Live And Waiting For Join
srcManager.Parameter.AddParam(EnumSearchParameter.Status, EnumSearchObjDataType.Number, '2,6', EnumSQLOperator.In);
} }
if (this.checkIA === true) if (this.checkIA === true)
srcManager.Parameter.AddParam(EnumSearchParameter.Status, EnumSearchObjDataType.Number, EnumEmployeeStatus.IA, EnumSQLOperator.EqualTo); srcManager.Parameter.AddParam(EnumSearchParameter.Status, EnumSearchObjDataType.Number, EnumEmployeeStatus.IA, EnumSQLOperator.EqualTo);