mmr/moadiran
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panel

Browse Source
This commit is contained in:
mmrbnjd
2024-06-10 20:49:31 +03:30
parent 2db5daa9b8
commit 5a96240660
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Back/Back.csproj
View File

@@ -36,7 +36,7 @@
<ItemGroup>
<Reference Include="Service">
<HintPath>..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll</HintPath>
<HintPath>..\..\Dlls\Service.dll</HintPath>
</Reference>
</ItemGroup>

4
Back/Services/servUser.cs
View File

@@ -206,8 +206,8 @@ namespace Back.Services
CalTypeID = item.CalculationTypeID,
CalTypeTitle = item.CalculationType.Title,
Total = item.CalculationTypeID == 1 ? item.TotalAmount.ToString() : "",
Remaining = item.CalculationTypeID == 1 ? item.RemainingAmount.ToString()
: item.CalculationTypeID == 2 ? "" : item.RemainingAmount.ToString().ShamciToFormatShamci()
Remaining = item.CalculationTypeID == 1 ? item.RemainingAmount
: item.CalculationTypeID == 2 ? 0 : item.RemainingAmount
});
}
request.LastLoginDate = _RepoUser.Get(w => w.ID == UserID).Select(s => s.DateLastLogin).FirstOrDefault();

2
Shared/DTOs/DashBoardDTO.cs
View File

@@ -24,6 +24,6 @@ namespace Shared.DTOs
public int CalTypeID { get; set; }
public string CalTypeTitle { get; set; }
public string Total { get; set; }
public string Remaining { get; set; }
public int Remaining { get; set; }
}
}

33
TaxPayerFull/Pages/UserPanel/Panel.razor
View File

@@ -1,5 +1,6 @@
@page "/Panel"
@using Front.Services
@using Shared
@using Shared.DTOs
@inject localService localserv;
@inject NavigationManager nav
@@ -52,7 +53,7 @@
<h3 class="card-title mb-1"><span style="font-size: 14px">مانده</span></h3>
@if (dashBoard.AlistofServices.Any(w => w.PermissionID == 3 && w.CalTypeID == 1))
{
@if (!dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First().Equals("-"))
@if (dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First()>0)
{
<small class="text-success fw-semibold">
@@ -79,18 +80,18 @@
}
else
{
@if (Convert.ToInt32(dashBoard.Datenow) <= Convert.ToInt32(@dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First().Replace("/","")))
@if (Convert.ToInt32(dashBoard.Datenow) <= dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First())
{
<small class="text-success fw-semibold">
<i class='bx'></i>
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First()
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
</small>
}
else
{
<small class="text-danger fw-semibold">
<i class='bx'></i>
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First()
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
</small>
}
}
@@ -121,7 +122,7 @@
<h3 class="card-title mb-1"><span style="font-size: 14px">مانده</span></h3>
@if (dashBoard.AlistofServices.Any(w => w.PermissionID == 4 && w.CalTypeID == 1))
{
@if (!dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First().Equals("-"))
@if (dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First()>0)
{
<small class="text-success fw-semibold">
<i class='bx'></i>
@@ -147,18 +148,18 @@
}
else
{
@if (Convert.ToInt32(dashBoard.Datenow) <= Convert.ToInt32(@dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First().Replace("/", "")))
@if (Convert.ToInt32(dashBoard.Datenow) <= dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First())
{
<small class="text-success fw-semibold">
<i class='bx'></i>
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First()
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
</small>
}
else
{
<small class="text-danger fw-semibold">
<i class='bx'></i>
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First()
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
</small>
}
}
@@ -244,7 +245,7 @@
<h3 class="card-title mb-1"><span style="font-size: 14px">مانده</span></h3>
@if (dashBoard.AlistofServices.Any(w => w.PermissionID == 5 && w.CalTypeID == 1))
{
@if (!dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First().Equals("-"))
@if (dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First()>0)
{
<small class="text-success fw-semibold">
@@ -271,18 +272,18 @@
}
else
{
@if (Convert.ToInt32(dashBoard.Datenow) <= Convert.ToInt32(@dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First().Replace("/", "")))
@if (Convert.ToInt32(dashBoard.Datenow) <= dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First())
{
<small class="text-success fw-semibold">
<i class='bx'></i>
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First()
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
</small>
}
else
{
<small class="text-danger fw-semibold">
<i class='bx'></i>
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First()
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
</small>
}
}
@@ -313,7 +314,7 @@
<h3 class="card-title mb-1"><span style="font-size: 14px">مانده</span></h3>
@if (dashBoard.AlistofServices.Any(w => w.PermissionID == 16 && w.CalTypeID == 1))
{
@if (!dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First().Equals("-"))
@if (dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First()>0)
{
<small class="text-success fw-semibold">
<i class='bx'></i>
@@ -339,18 +340,18 @@
}
else
{
@if (Convert.ToInt32(dashBoard.Datenow) <= Convert.ToInt32(@dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First().Replace("/", "")))
@if (Convert.ToInt32(dashBoard.Datenow) <= dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First())
{
<small class="text-success fw-semibold">
<i class='bx'></i>
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First()
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
</small>
}
else
{
<small class="text-danger fw-semibold">
<i class='bx'></i>
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First()
تا تاریخ @dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
</small>
}
}

4
TaxPayerFull/Program.cs
View File

@@ -34,9 +34,9 @@ builder.Services.AddScoped(sp => new UserAuthenticationDTO()
}) ;
//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") });
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("https://localhost:7075/api/") });
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") });
//builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://localhost:5271/api/") });
CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("fa-Ir");