diff --git a/Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs b/Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs index 2560709f..5d84c2bc 100644 --- a/Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs +++ b/Company.Domain/InstitutionContractAgg/IInstitutionContractRepository.cs @@ -25,7 +25,7 @@ public interface IInstitutionContractRepository : IRepository x.WorkshopCount != "0" && string.IsNullOrWhiteSpace(x.ExpireColor)) .ThenBy(x => x.WorkshopCount == "0" && string.IsNullOrWhiteSpace(x.ExpireColor)) - .ThenBy(x => x.ExpireColor == "red") + .ThenBy(x => x.IsExpier == "true") .ThenBy(x => x.ExpireColor == "purple") .ThenBy(x => x.ExpireColor == "black").ToList(); Console.WriteLine("test >>> " + timer.Elapsed); @@ -577,7 +580,7 @@ public class InstitutionContractRepository : RepositoryBase= now && contractEndGr <= endThisMontGr) + { result = "red"; + isExpier = "true"; + } + if (contractAmount == 0) + { result = "purple"; + if ((contractEndGr >= now && contractEndGr <= endThisMontGr) || (contractEndGr < now)) + { + isExpier = "true"; + } + } + if (isActiveString == "blue") + { result = "blue"; - return result; + isExpier = "false"; + } + + return (result, isExpier); } diff --git a/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml b/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml index 1fd371eb..321a04a7 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml @@ -1108,10 +1108,10 @@ @item.EmployeeCount - + @item.ContractStartFa - + @item.ContractEndFa diff --git a/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml.cs index 0b127ce9..fb1ed7d4 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml.cs +++ b/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml.cs @@ -91,7 +91,7 @@ public class IndexModel : PageModel new SelectList(_representativeApplication.GetRepresentatives(), "Id", "FullName"); InstitutionContracts = _institutionContract.NewSearch(searchModel) - .OrderByDescending(x => x.IsActiveString == "blue").ThenByDescending(x => x.IsContractingPartyBlock) + .OrderByDescending(x => x.IsActiveString == "blue").ThenByDescending(x => x.IsContractingPartyBlock == "true" && x.IsExpier == "false") .ToList(); var totalAmounts = InstitutionContracts.Where(x => x.IsActiveString == "true").Sum(x => x.SearchAmount); diff --git a/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/Create.js b/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/Create.js index cede2dff..2f6b8f85 100644 --- a/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/Create.js +++ b/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/Create.js @@ -239,7 +239,7 @@ } - if (start.length == 10 && end.length == 10 && amount.length > 1) { + if (start.length == 10 && end.length == 10 && amount.length >= 1) { $.ajax({ /* contentType: 'charset=utf-8',*/ async: false, diff --git a/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/Edit.js b/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/Edit.js index 81dc2a48..b9fb56d0 100644 --- a/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/Edit.js +++ b/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/Edit.js @@ -209,7 +209,7 @@ } - if (start.length == 10 && end.length == 10 && amount.length > 1) { + if (start.length == 10 && end.length == 10 && amount.length >= 1) { $.ajax({ /* contentType: 'charset=utf-8',*/ async: false, diff --git a/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/Extention.js b/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/Extention.js index f2fcf713..bf2cdc10 100644 --- a/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/Extention.js +++ b/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/Extention.js @@ -199,7 +199,7 @@ function calculateTotalAmount() { } console.log($('#officialStatus').val()); - if (start.length == 10 && end.length == 10 && amount.length > 1) { + if (start.length == 10 && end.length == 10 && amount.length >= 1) { $.ajax({ /* contentType: 'charset=utf-8',*/ async: false,