From 37aa57d773103db3f8b51245c50a90d003d8f342 Mon Sep 17 00:00:00 2001 From: mahan Date: Wed, 19 Nov 2025 19:16:55 +0330 Subject: [PATCH] Refactor repository and remove unused Index files Refactored `IPersonalContractingPartyRepository` to replace `GetByRegisterId` with `GetByNationalId`. Updated `InstitutionContractApplication` to use the new method and removed duplicate `RegisterId` validation logic. Removed `Index.cshtml` and `Index.cshtml.cs` files, including all associated HTML, scripts, styles, and backend logic, indicating a deprecation or restructuring of the related functionality. --- .../IPersonalContractingPartyRepository.cs | 2 +- .../InstitutionContractApplication.cs | 8 +- .../PersonalContractingPartyRepository.cs | 4 +- .../Company/MonthlyOverview/Index.cshtml | 418 ------------------ .../Company/MonthlyOverview/Index.cshtml.cs | 116 ----- 5 files changed, 7 insertions(+), 541 deletions(-) delete mode 100644 ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml delete mode 100644 ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml.cs diff --git a/Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs b/Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs index 26e6e6df..068625ad 100644 --- a/Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs +++ b/Company.Domain/ContarctingPartyAgg/IPersonalContractingPartyRepository.cs @@ -75,5 +75,5 @@ public interface IPersonalContractingPartyRepository :IRepository GetLegalDetails(long id); Task GetByNationalCode(string nationalCode); - Task GetByRegisterId(string registerId); + Task GetByNationalId(string registerId); } \ No newline at end of file diff --git a/CompanyManagment.Application/InstitutionContractApplication.cs b/CompanyManagment.Application/InstitutionContractApplication.cs index 10f5ae67..56e33e99 100644 --- a/CompanyManagment.Application/InstitutionContractApplication.cs +++ b/CompanyManagment.Application/InstitutionContractApplication.cs @@ -960,7 +960,7 @@ public class InstitutionContractApplication : IInstitutionContractApplication if (command.ContractingPartyLegalType == LegalType.Legal) { existingContractingParty = - await _contractingPartyRepository.GetByRegisterId(command.LegalParty.RegisterId); + await _contractingPartyRepository.GetByNationalId(command.LegalParty.NationalId); if (_contractingPartyRepository.Exists(x => x.LName == command.LegalParty.CompanyName && x.RegisterId == command.LegalParty.RegisterId)) { @@ -1491,9 +1491,9 @@ public class InstitutionContractApplication : IInstitutionContractApplication return opration.Failed("نام شرکت وارد شده تکراری است"); - if (_contractingPartyRepository.Exists(x => - x.RegisterId == request.RegisterId && x.LName != request.CompanyName)) - return opration.Failed("شماره ثبت وارد شده تکراری است"); + //if (_contractingPartyRepository.Exists(x => + // x.RegisterId == request.RegisterId && x.LName != request.CompanyName)) + // return opration.Failed("شماره ثبت وارد شده تکراری است"); if (_contractingPartyRepository.Exists(x => diff --git a/CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs b/CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs index b237be46..ba888dc6 100644 --- a/CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs +++ b/CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs @@ -768,9 +768,9 @@ public class PersonalContractingPartyRepository : RepositoryBase x.Nationalcode == nationalCode); } - public async Task GetByRegisterId(string registerId) + public async Task GetByNationalId(string nationalId) { - return await _context.PersonalContractingParties.FirstOrDefaultAsync(x => x.RegisterId == registerId); + return await _context.PersonalContractingParties.FirstOrDefaultAsync(x => x.NationalId == nationalId); } #endregion diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml deleted file mode 100644 index c4b3b2d3..00000000 --- a/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml +++ /dev/null @@ -1,418 +0,0 @@ -@page -@using _0_Framework.Application -@model ServiceHost.Areas.AdminNew.Pages.Company.MonthlyOverview.IndexModel -@inject _0_Framework.Application.IAuthHelper AuthHelper; -@{ - var adminVersion = _0_Framework.Application.Version.AdminVersion; - string clientVersion = _0_Framework.Application.Version.StyleVersion; - ViewData["Title"] = " - " + "کارگاه"; - - var hasNextPermission = AuthHelper.GetPermissions().Any(x => x == 501); - var hasPrevPermission = AuthHelper.GetPermissions().Any(x => x == 502); -} - -@section Styles { - - - - - -} - -
- -
-
- - - - - - - - - - - بررسی امور ماهانه پرسنل - -
- -
- - بازگشت - -
-
- - - @* Search *@ -
-
-
-
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- -
- - - - حذف جستجو - -
-
-
-
-
-
-
- - - - -
-
-
-
-
- -
-
- -
-
-
- -
- -
-
-
- - - - - - @* TabBar *@ -
-
- - - - - - - -
-
- -@* person Table Desktop *@ -
- @* Monthly Table Desktop *@ -
-
-
ردیف
-
ش بایگانی
-
نام کارگاه
-
استان
-
شهرستان
-
جزئیات نشانی
-
شماره تماس نماینده
-
پرسنل امور اجرائی
-
عملیات
-
- -
-
- - - - - - - - - - -
- @for (int j = 0; j < 30; j++) - { -
- } -
-
-
- -@* The whole workshop Desktop *@ - - - -@* //--------- Mobile --------- *@ -@* Monthly Table Mobile *@ -
-
-
-
ردیف
-
ش بایگانی
-
نام کارگاه
-
شماره تماس نماینده
-
عملیات
-
- @*
-
ردیف
-
نام کارگاه
-
عملیات
-
*@ - -
-
- - - - - - - - - -
-
- -@* The whole workshop Mobile *@ - - -
- - - - - - - - -@section Script { - - - - - - - - -} \ No newline at end of file diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml.cs b/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml.cs deleted file mode 100644 index 2d08256e..00000000 --- a/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml.cs +++ /dev/null @@ -1,116 +0,0 @@ -using _0_Framework.Application; -using AccountManagement.Application.Contracts.Account; -using CompanyManagment.App.Contracts.AdminMonthlyOverview; -using CompanyManagment.App.Contracts.CustomizeCheckout; -using CompanyManagment.App.Contracts.YearlySalary; -using CompanyManagment.Application; -using CompanyManagment.App.Contracts.Employer; -using CompanyManagment.App.Contracts.Workshop; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.RazorPages; -using ServiceHost.Areas.Client.Pages.Company.CustomizeCheckout; -using System.Globalization; - -namespace ServiceHost.Areas.AdminNew.Pages.Company.MonthlyOverview -{ - public class IndexModel : PageModel - { - private readonly IAdminMonthlyOverviewApplication _adminMonthlyOverviewApplication; - private readonly IAuthHelper _authHelper; - private readonly IYearlySalaryApplication _yearlySalaryApplication; - public List YearlyList; - public AdminMonthlyOverviewSearchModel SearchModel; - private readonly IWorkshopApplication _workshopApplication; - private readonly IEmployerApplication _employerApplication; - private readonly IAccountApplication _accountApplication; - - public IndexModel(IAdminMonthlyOverviewApplication adminMonthlyOverviewApplication, IAuthHelper authHelper, - IWorkshopApplication workshopApplication, IEmployerApplication employerApplication, - IAccountApplication accountApplication, IYearlySalaryApplication yearlySalaryApplication) - { - _adminMonthlyOverviewApplication = adminMonthlyOverviewApplication; - _yearlySalaryApplication = yearlySalaryApplication; - _authHelper = authHelper; - _workshopApplication = workshopApplication; - _employerApplication = employerApplication; - _accountApplication = accountApplication; - } - - public IActionResult OnGet() - { - var accountId = _authHelper.CurrentAccountId(); - - YearlyList = _yearlySalaryApplication.GetYears(); - - PersianCalendar pc = new PersianCalendar(); - DateTime now = DateTime.Now; - - int year = pc.GetYear(now); - int month = pc.GetMonth(now); - - SearchModel = new AdminMonthlyOverviewSearchModel() - { - Year = year, - Month = month, - AdminAccountId = accountId - }; - return Page(); - } - - public async Task OnGetWorkshops(AdminMonthlyOverviewSearchModel searchModel) - { - var workshopListByStatus = await _adminMonthlyOverviewApplication.GetWorkshopListByStatus(searchModel); - - return new JsonResult(new - { - data = workshopListByStatus - }); - } - - public async Task OnPostNext(long id) - { - var result = await _adminMonthlyOverviewApplication.Next(id); - - return new JsonResult(result); - } - - public async Task OnPostBack(long id) - { - var result = await _adminMonthlyOverviewApplication.Back(id); - - return new JsonResult(result); - } - - public async Task OnGetCounter(int year , int month , long accountId) - { - var counter = await _adminMonthlyOverviewApplication.GetCounter(year, month, accountId); - return new JsonResult(counter); - } - - public async Task OnGetEmployerSelectList(string search, long id) - { - var res = await _employerApplication.GetSelectList(search, id); - return new JsonResult(new - { - data = res - }); - } - public async Task OnGetWorkshopSelectList(string search, long id) - { - var res = await _workshopApplication.GetSelectList(search, id); - return new JsonResult(new - { - data = res - }); - } - public async Task OnGetAccountSelectList() - { - var res = await _accountApplication.GetAdminSelectList(); - //res = res.Where(x => x.RoleId == 5).ToList(); - return new JsonResult(new - { - data = res - }); - } - } -}