diff --git a/Back/Services/ServBase.cs b/Back/Services/ServBase.cs index 0d7666e..a233b9b 100644 --- a/Back/Services/ServBase.cs +++ b/Back/Services/ServBase.cs @@ -51,7 +51,7 @@ namespace Back.Services public async Task> GetQuestion(int PageIndex, int PageSize) { return await _repoQuestion.Get(w => w.Status) - .Include(inc=>inc.questionCategory).OrderByDescending(o => o.ID) + .Include(inc=>inc.questionCategory).OrderBy(o => o.ID) .Select(s => new QuestionDto { Answer=s.Answer, diff --git a/TaxPayerFull/Layout/ItemQuestion.razor b/TaxPayerFull/Layout/ItemQuestion.razor index 981f41e..1c22c1d 100644 --- a/TaxPayerFull/Layout/ItemQuestion.razor +++ b/TaxPayerFull/Layout/ItemQuestion.razor @@ -1,20 +1,40 @@ @using Shared.DTOs - -
-

- -

-
-
- @qitem?.Answer +@if (!string.IsNullOrEmpty(headingName) && !string.IsNullOrEmpty(collapseName)) +{ +
+

+ +

+
+
+ @qitem?.Answer +
-
+} + @code { [Parameter] public QuestionDto? qitem { get; set; } + private static Random random = new Random(); + public string headingName { get; set; } + public string collapseName { get; set; } + public static string RandomString(int length) + { + const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + return new string(Enumerable.Repeat(chars, length) + .Select(s => s[random.Next(s.Length)]).ToArray()); + } + + protected override async Task OnParametersSetAsync() + { + string str = RandomString(3); + headingName = "heading" + str; + collapseName = " collapse" + str; + await base.OnParametersSetAsync(); + } } diff --git a/TaxPayerFull/Layout/LQuestion.razor b/TaxPayerFull/Layout/LQuestion.razor index fbb69a5..4a21b7f 100644 --- a/TaxPayerFull/Layout/LQuestion.razor +++ b/TaxPayerFull/Layout/LQuestion.razor @@ -11,9 +11,10 @@

سوالات پر تکرار

-
+
@for (int i = 0; i < request?.list.Count; i++) { + } @* @@ -63,7 +64,7 @@ protected override async Task OnParametersSetAsync() { - request = await _hc.GetFromJsonAsync>($"Base/LastQuestion?PageIndex={PageIndex}&PageSize=6"); + request = await _hc.GetFromJsonAsync>($"Base/LastQuestion?PageIndex={PageIndex}&PageSize=10"); await base.OnParametersSetAsync(); } }