From df1e6f62b8347de20e7f2dbf4b384411718629da Mon Sep 17 00:00:00 2001 From: SamSys Date: Thu, 21 Aug 2025 15:55:53 +0330 Subject: [PATCH] new manualdailywage metod to create contract --- .../Repository/ContractRepository.cs | 16 ++++++++++++++++ .../Company/Workshops/AutoExtension.cshtml.cs | 2 ++ 2 files changed, 18 insertions(+) diff --git a/CompanyManagment.EFCore/Repository/ContractRepository.cs b/CompanyManagment.EFCore/Repository/ContractRepository.cs index 86467dc9..ca9f853d 100644 --- a/CompanyManagment.EFCore/Repository/ContractRepository.cs +++ b/CompanyManagment.EFCore/Repository/ContractRepository.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; +using System.Threading.Tasks; using _0_Framework.Application; using _0_Framework.InfraStructure; using Company.Domain.ContractAgg; @@ -13,6 +14,7 @@ using CompanyManagment.App.Contracts.Employee; using CompanyManagment.App.Contracts.Employer; using CompanyManagment.App.Contracts.LeftWork; using CompanyManagment.App.Contracts.Workshop; +using Microsoft.EntityFrameworkCore; using PersianTools.Core; using DateTime = System.DateTime; @@ -40,6 +42,20 @@ public class ContractRepository : RepositoryBase, IContractRepos _leftWorkRepository = leftWorkRepository; } + + public async Task GetManualDailWage(long workshopId, long employeeId) + { + + var lastContract = await _context.Contracts + .Where(x => x.WorkshopIds == workshopId && x.EmployeeId == employeeId && x.IsActiveString == "true") + .OrderByDescending(x => x.ContarctStart) + .FirstOrDefaultAsync(); + if (lastContract == null) + return 0; + + return 0; + } + public EditContract GetDetails(long id) { return _context.Contracts.Select(x => new EditContract diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs index 74c22bb9..8d52485d 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs +++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/AutoExtension.cshtml.cs @@ -574,6 +574,8 @@ public class AutoExtensionModel : PageModel var normaldailyWage = _yearlySalaryApplication.GetDailyWageByStartEnd(start, endOfMonthFromStart).GetAwaiter().GetResult(); + //var contract = _contractApplication.SearchForCheckout() + return new JsonResult(new { success = true,