From 83a17a7e8605d545a39d99f93ec6beb78a4ce786 Mon Sep 17 00:00:00 2001 From: SamSys Date: Wed, 25 Jun 2025 03:50:39 +0330 Subject: [PATCH] Contract Sign opreation completed - new option to check workflow to create checkout --- .../Checkout/CreateCheckoutListViewModel.cs | 1 + .../Contract/ContractViweModel.cs | 4 + .../ContractApplication.cs | 7 +- .../Company/Checkouts/CreateLoadList.cshtml | 21 +- .../Pages/Company/Checkouts/Index.cshtml.cs | 14427 ++++++++-------- .../Pages/Company/Contracts/Index.cshtml | 37 +- 6 files changed, 7293 insertions(+), 7204 deletions(-) diff --git a/CompanyManagment.App.Contracts/Checkout/CreateCheckoutListViewModel.cs b/CompanyManagment.App.Contracts/Checkout/CreateCheckoutListViewModel.cs index 7d7dbcfb..1414d918 100644 --- a/CompanyManagment.App.Contracts/Checkout/CreateCheckoutListViewModel.cs +++ b/CompanyManagment.App.Contracts/Checkout/CreateCheckoutListViewModel.cs @@ -44,5 +44,6 @@ public class CreateCheckoutListViewModel /// public bool EmployeeHasCreateCheckout { get; set; } + public bool HasWorkFlow { get; set; } public List CreateCheckoutList { get; set; } } \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/Contract/ContractViweModel.cs b/CompanyManagment.App.Contracts/Contract/ContractViweModel.cs index f9d453b4..4e575494 100644 --- a/CompanyManagment.App.Contracts/Contract/ContractViweModel.cs +++ b/CompanyManagment.App.Contracts/Contract/ContractViweModel.cs @@ -63,6 +63,10 @@ public class ContractViweModel public string EmployeeLName { get; set; } public string IsBlockCantracingParty { get; set; } + /// + /// آیا مجاز به امضاء قرادا می باشد + /// + public bool HasSignContract { get; set; } public IQueryable WorkshopEmployerList { get; set; } public List Employers { get; set; } public List Workshops { get; set; } diff --git a/CompanyManagment.Application/ContractApplication.cs b/CompanyManagment.Application/ContractApplication.cs index 8bcc1c80..4d670a54 100644 --- a/CompanyManagment.Application/ContractApplication.cs +++ b/CompanyManagment.Application/ContractApplication.cs @@ -12,6 +12,7 @@ using Company.Domain.YearlySalaryAgg; using Company.Domain.YearlySalaryItemsAgg; using CompanyManagment.App.Contracts.Contract; using CompanyManagment.App.Contracts.Employee; +using CompanyManagment.App.Contracts.EmployeeComputeOptions; using CompanyManagment.App.Contracts.Employer; using CompanyManagment.App.Contracts.LeftWork; using CompanyManagment.App.Contracts.PersonalContractingParty; @@ -39,6 +40,7 @@ public class ContractApplication : IContractApplication private readonly IPersonnelCodeRepository _personnelCodeRepository; private readonly IWorkingHoursTempApplication _workingHoursTempApplication; private readonly IPersonalContractingPartyApp _contractingPartyApp; + private readonly IEmployeeComputeOptionsApplication _employeeComputeOptionsApplication; public List EmpList; @@ -54,7 +56,7 @@ public class ContractApplication : IContractApplication IYearlySalaryRepository yearlySalaryRepository, IYearlySalaryItemRepository yearlySalaryItemRepository , IEmployeeApplication employeeApplication, IEmployerApplication employerApplication, IWorkshopApplication workshopApplication, IEmployerRepository employerRepository, - IWorkingHoursApplication workingHoursApplication, IWorkingHoursItemsApplication workingHoursItemsApplication, ILeftWorkRepository leftWorkRepository, IPersonnelCodeRepository personnelCodeRepository, IWorkingHoursTempApplication workingHoursTempApplication, IPersonalContractingPartyApp contractingPartyApp) + IWorkingHoursApplication workingHoursApplication, IWorkingHoursItemsApplication workingHoursItemsApplication, ILeftWorkRepository leftWorkRepository, IPersonnelCodeRepository personnelCodeRepository, IWorkingHoursTempApplication workingHoursTempApplication, IPersonalContractingPartyApp contractingPartyApp, IEmployeeComputeOptionsApplication employeeComputeOptionsApplication) { _contractRepository = contractRepository; _holidayItemRepository = holidayItemRepository; @@ -70,6 +72,7 @@ public class ContractApplication : IContractApplication _personnelCodeRepository = personnelCodeRepository; _workingHoursTempApplication = workingHoursTempApplication; _contractingPartyApp = contractingPartyApp; + _employeeComputeOptionsApplication = employeeComputeOptionsApplication; //_leftWorkApplication = leftWorkApplication; } @@ -3155,7 +3158,7 @@ public class ContractApplication : IContractApplication EmployeeFName = x.EmployeeFName, EmployeeLName = x.EmployeeLName, IsBlockCantracingParty = _contractingPartyApp.IsBlockByEmployerId(x.EmployerId), - + HasSignContract = _employeeComputeOptionsApplication.GetEmployeeOptions(x.WorkshopIds,x.EmployeeId).SignContract }).ToList(); diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/CreateLoadList.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/CreateLoadList.cshtml index 39ea0494..e49343e6 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/CreateLoadList.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/CreateLoadList.cshtml @@ -1,4 +1,5 @@ -@model CompanyManagment.App.Contracts.Checkout.CreateCheckoutListViewModel +@using Microsoft.CodeAnalysis.CSharp.Syntax +@model CompanyManagment.App.Contracts.Checkout.CreateCheckoutListViewModel @{ var i = 1; var b = 0; @@ -14,7 +15,7 @@ -@if (Model.CreateCheckoutList.Count > 0) +@if (Model.CreateCheckoutList.Count > 0 && !Model.HasWorkFlow) { @foreach (var item in Model.CreateCheckoutList) { @@ -151,6 +152,22 @@ } } +else +{ + if (@Model.HasWorkFlow) + { +
+
+
+
+

این کارگاه به دلیل داشتن کارپوشه مجاز به ایجاد تصفیه حساب نمی باشد

+
+
+
+
+ + } +}