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

Prod validation

Browse Source
This commit is contained in:
chapal 2025-01-09 12:03:52 +06:00
parent af46e47314
commit 792277e83b
9 changed files with 162 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HRM.BO/Salary/SalaryProcess.cs
View File

@ -383,7 +383,7 @@ namespace HRM.BO
List<SalaryProcessStatus> SalaryProcess(SalaryProcess item, List<Employee> employees);
int Save(SalaryProcess item);
void Delete(int id);
bool IsSalaryprocessed(DateTime salarymonth, int payrollTypeID);
void UndoSalary(int id);
void UndoMonthlySalaryByIDs(string ids);
void UndoMonthlySalaryByEmpIDs(string ids, DateTime salaryMonth);

11
HRM.DA/DA/Salary/SalaryProcessDA.cs
View File

@ -114,7 +114,16 @@ namespace HRM.DA
return bShowInDesktop;
}
internal static bool IsSalaryprocessed(TransactionContext tc, DateTime dSMonth, int payrollTypeID)
{
bool bShowInDesktop = false;
object obj =
tc.ExecuteScalar("Select SALARYPROCESSID from SALARYPROCESS where SALARYMONTH=%d AND PAYROLLTYPEID=%n",
dSMonth, payrollTypeID);
if (obj == DBNull.Value) return false;
else bShowInDesktop=true;
return bShowInDesktop;
}
#endregion
#region Delete function

25
HRM.DA/Service/Salary/SalaryProcessService.cs
View File

@ -978,6 +978,31 @@ namespace HRM.DA
return bShowInDesktop;
}
public bool IsSalaryprocessed(DateTime dSalaryMonth, int payrollTypeID)
{
TransactionContext tc = null;
bool isSalaryprocessed;
try
{
tc = TransactionContext.Begin();
isSalaryprocessed = SalaryProcessDA.IsSalaryprocessed(tc, dSalaryMonth, payrollTypeID);
tc.End();
}
catch (Exception e)
{
#region Handle Exception
if (tc != null)
tc.HandleError();
ExceptionLog.Write(e);
throw new ServiceException(e.Message, e);
#endregion
}
return isSalaryprocessed;
}
public List<SalaryProcess> GetAllProcess(int payrollTypeID, DateTime nextPayProcessDate)
{
List<SalaryProcess> salaryProcesss = new List<SalaryProcess>();

4
HRM.UI/ClientApp/src/app/_services/payroll/salary.service.ts
View File

@ -238,5 +238,7 @@ export class SalaryService {
DownloadPayslipForMultiple(param: any): Observable<HttpEvent<any>> {
return this.apiService.httpPost<any>('/salary/DownloadPayslipForMultiple', param);
}
IsSalaryProcessed(salaryMonth: Date) {
return this.apiService.httpGet<boolean>('/salary' + '/IsSalaryprocessedMonthly' + '/' + salaryMonth.toDateString());
}
}

2
HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.html
View File

@ -136,6 +136,6 @@
</div>
<div class="p-col-10"></div>
<div class="p-col-2" align="right">
<button icon="save" kendoButton style="width:80%" (click)="onClickSubmit()">Submit</button>
<button icon="save" kendoButton style="width:80%" (click)="onClickSubmit()" [disabled]="isprevious">Submit</button>
</div>
</div>

51
HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-attendance/production-bonus-attendance.component.ts
View File

@ -20,6 +20,9 @@ import { EnumBonusItemType, EnumProductionBonusType } from 'src/app/_models/enum
import { ProdBonusParameter } from 'src/app/_models/Payroll/ProductionBonus/prodBonusParameter';
import { error } from 'console';
import { GridComponent } from '@progress/kendo-angular-grid';
import { AuthService } from '../../_services/auth/auth.service';
import { SalaryService } from '../../_services/payroll/salary.service';
import { PayrollType } from '../../_models/Authentication/payrollType';
@Component({
@ -63,7 +66,11 @@ export class ProductionBonusAttendanceComponent implements OnInit {
employeeSelection: string = 'commonEmployee';
employeeList: Employee[] = [];
allEmps: any[] = [];
allEmps: any[] = [];
isprevious: boolean = false;
iSalaryProcesed: boolean = false;
salaryMonth: Date = new Date();
payrollType: PayrollType;
value: '';
@ -72,7 +79,9 @@ export class ProductionBonusAttendanceComponent implements OnInit {
public dataTransferService: DataTransferService,
public WindowPopUp: AppWindowPopUp,
public loadingPanelService: loadingPanelService,
public employeeService: EmployeeServices,
public employeeService: EmployeeServices,
public authservice: AuthService,
public salaryService: SalaryService,
public bonusService: BonusService) {
this.apiService.selectedMenuName = 'Production Bonus Attendance';
this._departmentPicker = new DynamicPicker(EnumDynamicpickerType.Department, false);
@ -80,7 +89,17 @@ export class ProductionBonusAttendanceComponent implements OnInit {
ngOnInit(): void {
// this.Loadlayout();
// this.Loadlayout();
this.authservice.GetPayrollTypeByLoginID().subscribe(
(resp: any) => {
this.payrollType = resp;
},
(err: any) => {
},
() => {
this.salaryMonth = new Date(this.payrollType.nextPayProcessDate);
}
);
this.GetAllEmployees();
this.productionBonusSetup = new ProductionBonusSetup();
this.showScheduleDate = false;
@ -117,7 +136,31 @@ export class ProductionBonusAttendanceComponent implements OnInit {
}
Loadlayout() {
this.clear();
debugger;
debugger;
this.loadingPanelService.ShowLoadingPanel = true;
this.salaryService.IsSalaryProcessed(new Date(this.payrollType.nextPayProcessDate)).subscribe(
(resp: any) => {
this.iSalaryProcesed = resp;
},
(err: any) => {
this.loadingPanelService.ShowLoadingPanel = false;
this.notificationService.showError(err.error);
},
() => {
this.loadingPanelService.ShowLoadingPanel = false;
if (new Date(this.selectedSalaryDate) <= new Date(this.payrollType.lastPayProcessDate) ||
(new Date(this.selectedSalaryDate) > new Date(this.payrollType.lastPayProcessDate) &&
new Date(this.payrollType.nextPayProcessDate) >= new Date(this.selectedSalaryDate) && this.iSalaryProcesed)) {
this.isprevious = true;
}
else {
this.isprevious = false;
}
});
const data = {
createdDate: this.selectedSalaryDate
}

2
HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.html
View File

@ -130,7 +130,7 @@
<div class="p-col-12 p-lg-12" align="right">
<button kendoButton icon="save" [primary]="true" style="width: fit-content" (click)="onClickSubmit()">Submit</button>
<button kendoButton icon="save" [primary]="true" style="width: fit-content" (click)="onClickSubmit()" [disabled]="isprevious">Submit</button>
</div>
<div>

58
HRM.UI/ClientApp/src/app/payroll-ot/production-bonus-setup/production-bonus-setup.component.ts
View File

@ -29,6 +29,9 @@ import { process, State } from '@progress/kendo-data-query';
import { DataStateChangeEvent } from '@progress/kendo-angular-grid';
import { noUndefined } from '@angular/compiler/src/util';
import { EnumStatus } from '../../_models/enums';
import { AuthService } from '../../_services/auth/auth.service';
import { PayrollType } from '../../_models/Authentication/payrollType';
import { SalaryService } from '../../_services/payroll/salary.service';
@ -46,7 +49,9 @@ export class ProductionBonusSetupComponent implements OnInit {
public WindowPopUp: AppWindowPopUp,
public loadingPanelService: loadingPanelService,
public employeeService: EmployeeServices,
public bonusService: BonusService,
public bonusService: BonusService,
public authservice: AuthService,
public salaryService: SalaryService,
public datePipe: DatePipe) {
this.apiService.selectedMenuName = 'Production Bonus Setup';
this._departmentPicker = new DynamicPicker(EnumDynamicpickerType.Department, false);
@ -69,7 +74,11 @@ export class ProductionBonusSetupComponent implements OnInit {
prodBonusWork: ProdBonusWorkSchedule;
//Child-level 2
prodBonusSupervisor: ProdBonusSupervisor;
prodBonusParameter: ProdBonusParameter;
prodBonusParameter: ProdBonusParameter;
isprevious: boolean = false;
iSalaryProcesed: boolean = false;
salaryMonth: Date = new Date();
payrollType: PayrollType;
prodBonusAttn: ProdBonusAttn[];
depts: Department[] = [];
@ -119,12 +128,23 @@ export class ProductionBonusSetupComponent implements OnInit {
// { text: "Large", value: 3 },
// ];
ngOnInit(): void {
ngOnInit(): void {
this.productionBonusSetup = new ProductionBonusSetup();
this.prodBonusLine = new ProdBonusLine();
this.prodBonusSupervisor = new ProdBonusSupervisor();
this.prodBonusParameter = new ProdBonusParameter();
this.prodBonusWork = new ProdBonusWorkSchedule();
this.prodBonusWork = new ProdBonusWorkSchedule();
this.authservice.GetPayrollTypeByLoginID().subscribe(
(resp: any) => {
this.payrollType = resp;
},
(err: any) => {
},
() => {
this.salaryMonth = new Date(this.payrollType.nextPayProcessDate);
}
);
this.getBonusType();
@ -174,8 +194,34 @@ export class ProductionBonusSetupComponent implements OnInit {
Loadlayout() {
this.selectedProdBSdata = undefined;
debugger;
const data = {
debugger;
this.loadingPanelService.ShowLoadingPanel = true;
this.salaryService.IsSalaryProcessed(new Date(this.payrollType.nextPayProcessDate)).subscribe(
(resp: any) => {
this.iSalaryProcesed = resp;
},
(err: any) => {
this.loadingPanelService.ShowLoadingPanel = false;
this.notificationService.showError(err.error);
},
() => {
this.loadingPanelService.ShowLoadingPanel = false;
if (new Date(this.selectedSalaryDate) <= new Date(this.payrollType.lastPayProcessDate) ||
(new Date(this.selectedSalaryDate) > new Date(this.payrollType.lastPayProcessDate) &&
new Date(this.payrollType.nextPayProcessDate) >= new Date(this.selectedSalaryDate) && this.iSalaryProcesed)) {
this.isprevious = true;
}
else {
this.isprevious = false;
}
});
const data = {
createdDate: this.selectedSalaryDate
}
this.loadingPanelService.ShowLoadingPanel = true;

21
HRM.UI/Controllers/Payroll/SalaryController.cs
View File

@ -956,6 +956,27 @@ namespace HRM.UI.Controllers.Payroll
return Ok();
}
[HttpGet]
[Route("IsSalaryprocessedMonthly/{salarymonth}")]
public ActionResult IsSalaryprocessedMonthly(string salarymonth)
{
bool isSalaryprocessed = false;
DateTime month=Convert.ToDateTime(salarymonth);
CurrentUser currentUser = CurrentUser.GetCurrentUser(HttpContext.User);
try
{
isSalaryprocessed= _salaryProcessService.IsSalaryprocessed(month, (int)currentUser.PayrollTypeID);
}
catch (Exception e)
{
return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
}
return Ok(isSalaryprocessed);
}
[HttpPost]
[Route("salaryProcessApprove")]
public ActionResult SalaryProcessApprove(SalaryProcess process)