diff --git a/Back/Back.csproj b/Back/Back.csproj index 7cd4417..69ae328 100644 --- a/Back/Back.csproj +++ b/Back/Back.csproj @@ -6,13 +6,6 @@ enable - - - - - - - @@ -31,13 +24,17 @@ + + + + - ..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll + ..\..\Dlls\Service.dll diff --git a/Back/Features/CheckOnlineUser.cs b/Back/Features/CheckOnlineUser.cs index dd13de4..505cbb1 100644 --- a/Back/Features/CheckOnlineUser.cs +++ b/Back/Features/CheckOnlineUser.cs @@ -29,12 +29,11 @@ namespace Back.Features { servUser _servUser = (servUser)httpContext.RequestServices.GetService(typeof(servUser)); var user = _servUser.GetUserByUserID(UserID).Result; - if (user.Token==accessToken) + if (user != null && user.Token==accessToken) await _next(httpContext); else - { httpContext.Response.StatusCode = StatusCodes.Status401Unauthorized; - } + } } } diff --git a/TaxPayerFull/Layout/LTicket.razor b/TaxPayerFull/Layout/LTicket.razor new file mode 100644 index 0000000..b35bd86 --- /dev/null +++ b/TaxPayerFull/Layout/LTicket.razor @@ -0,0 +1,81 @@ +@using Shared.DTOs + + + +
+ This is a vertically centered modal. +
+ + + + + + + +
  • +
    +
    +
    #@Ticket.TicketID     +
    +
    +
    @Ticket.Title
    + @Ticket.MsgStatus + +
    + +
    +

    تاریخ شروع
    @Ticket.CreateDate

    +
    + @if (!string.IsNullOrEmpty(Ticket.EndDate)) + { +
    +

    تاریخ پایان
    @Ticket.EndDate

    +
    + } + +
    + +
    • + +@code { + [Parameter] + public TicketDTO Ticket { get; set; } + public BadgeColor badgeColor = BadgeColor.Light; + + protected override async Task OnParametersSetAsync() + { + switch (Ticket.Status) + { + case StatusTicket.Awaitingreview: + badgeColor = BadgeColor.Warning; + break; + case StatusTicket.Read_Checking: + badgeColor = BadgeColor.Primary; + break; + case StatusTicket.hasbeenanswered: + badgeColor = BadgeColor.Success; + break; + case StatusTicket.End: + badgeColor = BadgeColor.Secondary; + break; + case StatusTicket.optout: + badgeColor = BadgeColor.Danger; + break; + default: + badgeColor = BadgeColor.Light; + break; + } + await base.OnParametersSetAsync(); + } + //----------- + private Modal modal = default!; + private async Task OnShowModalClick() + { + await modal.ShowAsync(); + } + + private async Task OnHideModalClick() + { + await modal.HideAsync(); + } +} diff --git a/TaxPayerFull/Pages/ListBlog.razor b/TaxPayerFull/Pages/ListBlog.razor index bac4c80..eaad4bc 100644 --- a/TaxPayerFull/Pages/ListBlog.razor +++ b/TaxPayerFull/Pages/ListBlog.razor @@ -68,7 +68,9 @@ } +