diff --git a/Back/Services/ServWalt.cs b/Back/Services/ServWalt.cs index 6eeff37..cd08010 100644 --- a/Back/Services/ServWalt.cs +++ b/Back/Services/ServWalt.cs @@ -40,12 +40,12 @@ namespace Back.Services } } - return await _repoCreditDocuments.Get(document=>document.CompanyID==CompanyID) + return await _repoCreditDocuments.Get(document=>document.CompanyID==CompanyID).OrderByDescending(o=>o.ID) .Select(s=>new CreditDocumentDto { Date=s.Date.ShamciToFormatShamci(), Title=s.Title, - typeName = s.type.GetDisplayName(), + typeName = s.type.GetEnumDisplayName(), type=s.type, Value=s.Value, }) diff --git a/Shared/Enums/CreditDocumentType.cs b/Shared/Enums/CreditDocumentType.cs index 27e0e50..65042fd 100644 --- a/Shared/Enums/CreditDocumentType.cs +++ b/Shared/Enums/CreditDocumentType.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -8,6 +9,6 @@ namespace Shared.Enums { public enum CreditDocumentType { - Increase,Decrease + [Display(Name ="افزایش")]Increase, [Display(Name = "کاهش")]Decrease } } diff --git a/TaxPayerFull/CUSComponent/CreditDocuments.razor b/TaxPayerFull/CUSComponent/CreditDocuments.razor index dcf438e..7d787df 100644 --- a/TaxPayerFull/CUSComponent/CreditDocuments.razor +++ b/TaxPayerFull/CUSComponent/CreditDocuments.razor @@ -1,35 +1,47 @@ @using Front.Services @using Shared.DTOs @using Shared.DTOs.Serch +@using Shared.Enums @inject HttpClientController hc; + + RowClass="GetRowClass" + Responsive="true" + PageSize="10"> - + @context.Date - + @context.Title - + @context.typeName - - @context.Value + + @context.Value.ToString("N0") ريال @code { + [Inject] protected PreloadService PreloadService { get; set; } = default!; + private string GetRowClass(CreditDocumentDto emp) + { + if (emp.type == CreditDocumentType.Decrease) + return "table-danger"; + else + return "table-success"; + } private async Task> DocumentDataProvider(GridDataProviderRequest request) { + PreloadService.Show(SpinnerColor.Dark); string sortString = ""; SortDirection sortDirection = SortDirection.None; @@ -59,6 +71,8 @@ { model = await rsp.Content.ReadFromJsonAsync>(); } + PreloadService.Hide(); + return await Task.FromResult(new GridDataProviderResult { Data = model.list, TotalCount = model.RowCount }); diff --git a/TaxPayerFull/Layout/PanelLayout.razor b/TaxPayerFull/Layout/PanelLayout.razor index 9e0cf48..6d3309f 100644 --- a/TaxPayerFull/Layout/PanelLayout.razor +++ b/TaxPayerFull/Layout/PanelLayout.razor @@ -91,7 +91,7 @@