From 79a9d72b868e515c47a6373af08b8a3bab4b5b03 Mon Sep 17 00:00:00 2001 From: mahan Date: Thu, 5 Feb 2026 11:32:16 +0330 Subject: [PATCH] rename SalaryAidViewModels property to Items in grouped view models --- .../SalaryAid/SalaryAidGroupedByDateViewModel.cs | 2 +- .../SalaryAid/SalaryAidGroupedByEmployeeViewModel.cs | 2 +- CompanyManagment.EFCore/Repository/SalaryAidRepository.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByDateViewModel.cs b/CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByDateViewModel.cs index a725e31f..0b26e5ec 100644 --- a/CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByDateViewModel.cs +++ b/CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByDateViewModel.cs @@ -8,7 +8,7 @@ public class SalaryAidGroupedByDateViewModel public string YearFa { get; set; } public int Month { get; set; } public int Year { get; set; } - public List SalaryAidViewModels { get; set; } + public List Items { get; set; } public string TotalAmount { get; set; } } diff --git a/CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByEmployeeViewModel.cs b/CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByEmployeeViewModel.cs index b3d1d9e0..f3ac6b9d 100644 --- a/CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByEmployeeViewModel.cs +++ b/CompanyManagment.App.Contracts/SalaryAid/SalaryAidGroupedByEmployeeViewModel.cs @@ -6,7 +6,7 @@ public class SalaryAidGroupedByEmployeeViewModel { public string EmployeeName { get; set; } public long EmployeeId { get; set; } - public List SalaryAidViewModels { get; set; } + public List Items { get; set; } public string TotalAmount { get; set; } } diff --git a/CompanyManagment.EFCore/Repository/SalaryAidRepository.cs b/CompanyManagment.EFCore/Repository/SalaryAidRepository.cs index fc54189d..c0fcadc1 100644 --- a/CompanyManagment.EFCore/Repository/SalaryAidRepository.cs +++ b/CompanyManagment.EFCore/Repository/SalaryAidRepository.cs @@ -146,7 +146,7 @@ public class SalaryAidRepository : RepositoryBase, ISalaryAidRe { YearFa = x.Key.YearFa, MonthFa = x.Key.MonthFa, - SalaryAidViewModels = x.Select(s => new SalaryAidGroupedByDateViewModelItems() + Items = x.Select(s => new SalaryAidGroupedByDateViewModelItems() { Amount = s.Amount, EmployeeName = s.EmployeeFullName, @@ -175,7 +175,7 @@ public class SalaryAidRepository : RepositoryBase, ISalaryAidRe EmployeeId = x.Key, TotalAmount = x.Sum(s => s.Amount).ToMoney(), EmployeeName = employees.FirstOrDefault(e => e.id == x.Key).FullName, - SalaryAidViewModels = x.Select(s => new SalaryAidGroupedByEmployeeViewModelItems() + Items = x.Select(s => new SalaryAidGroupedByEmployeeViewModelItems() { Amount = s.Amount.ToMoney(), Id = s.id,