diff --git a/0_Framework/Application/Version.cs b/0_Framework/Application/Version.cs index 2f572a36..c2331097 100644 --- a/0_Framework/Application/Version.cs +++ b/0_Framework/Application/Version.cs @@ -10,8 +10,8 @@ public static class Version { static Version() { - StyleVersion = "2.12.01"; - AdminVersion = "2.5.21"; + StyleVersion = "2.12.03"; + AdminVersion = "2.5.23"; CameraVersion = "1.0.3"; } diff --git a/AccountManagement.Application.Contracts/Account/IAccountApplication.cs b/AccountManagement.Application.Contracts/Account/IAccountApplication.cs index f071ccfb..990bcb18 100644 --- a/AccountManagement.Application.Contracts/Account/IAccountApplication.cs +++ b/AccountManagement.Application.Contracts/Account/IAccountApplication.cs @@ -40,7 +40,7 @@ public interface IAccountApplication List AccountsForAssign(long taskId); List GetAccountsByPositionId(long positionId); - List GetAccountLowerPositionvalue(); + List GetAccountEqualToLowerPositionValue(); OperationResult ReLogin(); #endregion diff --git a/AccountManagement.Application/AccountApplication.cs b/AccountManagement.Application/AccountApplication.cs index 52004db4..f8bc94ee 100644 --- a/AccountManagement.Application/AccountApplication.cs +++ b/AccountManagement.Application/AccountApplication.cs @@ -464,9 +464,9 @@ public class AccountApplication : IAccountApplication return _accountRepository.GetAccountsByPositionId(positionId); } - public List GetAccountLowerPositionvalue() + public List GetAccountEqualToLowerPositionValue() { - return _accountRepository.GetAccountLowerPositionvalue(); + return _accountRepository.GetAccountEqualToLowerPositionValue(); } public OperationResult ReLogin() diff --git a/AccountManagement.Domain/AccountAgg/IAccountRepository.cs b/AccountManagement.Domain/AccountAgg/IAccountRepository.cs index 278ed596..570c81af 100644 --- a/AccountManagement.Domain/AccountAgg/IAccountRepository.cs +++ b/AccountManagement.Domain/AccountAgg/IAccountRepository.cs @@ -24,7 +24,7 @@ namespace AccountManagement.Domain.AccountAgg List GetAccountsByPositionId(long positionId); List AccountsForAssign(long taskId); List GetAccountsByIds(List ids); - List GetAccountLowerPositionvalue(); + List GetAccountEqualToLowerPositionValue(); AccountViewModel GetAccountViewModel(long id); List GetAccountsDeactivePositionValue(long Positionid); #endregion diff --git a/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs b/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs index a3c0223f..edaf2ea7 100644 --- a/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs +++ b/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs @@ -224,12 +224,12 @@ public class AccountRepository : RepositoryBase, IAccountReposito - public List GetAccountLowerPositionvalue() + public List GetAccountEqualToLowerPositionValue() { var account = GetIncludePositions(int.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value)); return _context.Accounts.Include(x => x.Position) - .Where(x => x.Position.PositionValue > account.Position.PositionValue && x.IsActiveString == "true").Select(x => new AccountViewModel() + .Where(x => x.Position.PositionValue >= account.Position.PositionValue && x.IsActiveString == "true").Select(x => new AccountViewModel() { PositionValue = x.Position.PositionValue, Id = x.id, diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/Create.cshtml.cs b/ServiceHost/Areas/AdminNew/Pages/Company/Task/Create.cshtml.cs index ae9cfafb..bc764189 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/Create.cshtml.cs +++ b/ServiceHost/Areas/AdminNew/Pages/Company/Task/Create.cshtml.cs @@ -63,7 +63,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.Task { if (_authHelper.GetPermissions().Any(x => x == 903)) { - var accounts = _accountApplication.GetAccountLowerPositionvalue(); + var accounts = _accountApplication.GetAccountEqualToLowerPositionValue(); AccountsList = new SelectList(accounts, "Id", "Fullname"); PositionViewModels = _positionApplication.GetLowerPosition(); DateFa = DateTime.Now.ToFarsi(); diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModal.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModal.cshtml index ee12d3ba..5343124e 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModal.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModal.cshtml @@ -20,8 +20,24 @@ - + + + if (Model.AssignViewModels?.Count > 1) + { + + } + else + { + + } + } @@ -40,7 +56,7 @@
-
+
@{ var index = 0; @@ -63,112 +79,113 @@
-
+
-
- @if (!String.IsNullOrWhiteSpace(Model.Description)) - { -
-
طرف حساب: @Model.ContractingPartyName
-
عنوان وظیفه: @Model.Title
-
-
- @Html.Raw(Model.Description) -
- } - - @if (Model.medias.Count > 0) - { - @foreach (var item in Model.medias) - { - if (item.Category == "صوت") - { - voice = item; -
-
- -
- } - } - } +
+
+
طرف حساب: @Model.ContractingPartyName
+
عنوان وظیفه: @Model.Title
+
+ @if (!String.IsNullOrWhiteSpace(Model.Description)) + { +
+ @Html.Raw(Model.Description) +
+ } - @if (Model.medias.Count > 0) - { + @if (Model.medias.Count > 0) + { + @foreach (var item in Model.medias) + { + if (item.Category == "صوت") + { + voice = item; +
+
+ +
+ } + } + } -
+ @if (Model.medias.Count > 0) + { - @foreach (var item in Model.medias) - { - if (item.Category == "فایل") - { - string fileName = System.IO.Path.GetFileName(item.Path); - string extension = System.IO.Path.GetExtension(fileName); - string nameWithoutExtension = fileName.Substring(0, fileName.LastIndexOf(".")); - int maxLength = 20 - extension.Length; - int sliceLength = Math.Max((maxLength - 3) / 2, 0); +
- string start = nameWithoutExtension.Substring(0, Math.Min(sliceLength, nameWithoutExtension.Length)); - string end = nameWithoutExtension.Substring(Math.Max(nameWithoutExtension.Length - sliceLength, 0)); + @foreach (var item in Model.medias) + { + if (item.Category == "فایل") + { + string fileName = System.IO.Path.GetFileName(item.Path); + string extension = System.IO.Path.GetExtension(fileName); + string nameWithoutExtension = fileName.Substring(0, fileName.LastIndexOf(".")); + int maxLength = 20 - extension.Length; + int sliceLength = Math.Max((maxLength - 3) / 2, 0); - var inBox = "inBox" + i; - @if (item.Path.EndsWith(".jpg") || item.Path.EndsWith(".jpeg") || item.Path.EndsWith(".png") || item.Path.EndsWith(".gif") || item.Path.EndsWith(".webp")) - { -
-
-
-
-
- -
-
-
-
-
+ string start = nameWithoutExtension.Substring(0, Math.Min(sliceLength, nameWithoutExtension.Length)); + string end = nameWithoutExtension.Substring(Math.Max(nameWithoutExtension.Length - sliceLength, 0)); - - - - - - - - - - - - - - - -
- lightboximage + var inBox = "inBox" + i; + @if (item.Path.EndsWith(".jpg") || item.Path.EndsWith(".jpeg") || item.Path.EndsWith(".png") || item.Path.EndsWith(".gif") || item.Path.EndsWith(".webp")) + { +
+
+
+
+
+ +
+
+
+
+
-
-
-
- } - else - { - if (fileExtensions.Contains(extension)) - { - svgName = extension.TrimStart('.').ToLower(); - - } - else - { - - } - } - i++; - } - } + + + + + + + + + + + + + + + +
+ lightboximage -
- } - - - @Model.CreateDateFa -
+
+ +
+ } + else + { + if (fileExtensions.Contains(extension)) + { + svgName = extension.TrimStart('.').ToLower(); + + } + else + { + + } + } + + i++; + } + } + +
+ } + + + @Model.CreateDateFa +
@@ -190,7 +207,7 @@