diff --git a/Back/Services/servUser.cs b/Back/Services/servUser.cs
index 67c6987..c841d45 100644
--- a/Back/Services/servUser.cs
+++ b/Back/Services/servUser.cs
@@ -227,11 +227,13 @@ namespace Back.Services
if (!string.IsNullOrEmpty(request.LastLoginDate))
request.LastLoginDate = $"{request.LastLoginDate.Substring(8, 2)}:{request.LastLoginDate.Substring(10, 2)} {request.LastLoginDate.Substring(0, 4)}/{request.LastLoginDate.Substring(4, 2)}/{request.LastLoginDate.Substring(6, 2)}";
+ //request.Warning.Add(new AlertDTO { Status = 6, Message = "تست هشدار آبی" });
+ //request.Warning.Add(new AlertDTO { Status = 5, Message = "تست هشدار زرد" });
//if (user.Mobile == user.Username)
// request.Warning.Add(new AlertDTO { Status = 0, Message = "موبایل و نام کاربری بهتر است شبیه هم نباشند" });
if (user.Mobile.encrypted() == user.Password)
- request.Warning.Add(new AlertDTO { Status = 0, Message = "موبایل و کلمه عبور بهتر است شبیه هم نباشند" });
+ request.Warning.Add(new AlertDTO { Status = 6, Message = "موبایل و کلمه عبور بهتر است شبیه هم نباشند" });
var Company = user.RolUsers.Where(w => w.CompanyID == user.RolUsers.First().CompanyID).Select(s => s.Company).FirstOrDefault();
if (Company != null)
{
@@ -239,7 +241,7 @@ namespace Back.Services
string.IsNullOrEmpty(Company.EconomicCode) || string.IsNullOrEmpty(Company.UniqeMemory)
|| string.IsNullOrEmpty(Company.PrivateKey))
{
- request.Warning.Add(new AlertDTO { Status = 0, Message = "بهتر است اطلاعات شرکت بروزرسانی شود" });
+ request.Warning.Add(new AlertDTO { Status = 5, Message = "بهتر است اطلاعات شرکت بروزرسانی شود" });
}
}
var nots = await _servNotification.GetNotifications();
diff --git a/TaxPayerFull/CUSComponent/Notifications.razor b/TaxPayerFull/CUSComponent/Notifications.razor
new file mode 100644
index 0000000..e522866
--- /dev/null
+++ b/TaxPayerFull/CUSComponent/Notifications.razor
@@ -0,0 +1,11 @@
+@using Shared.DTOs
+
Notifications
+@items.Count()
+
+ Holy guacamole! You should check in on some of those fields below.
+
+
+@code {
+
+ [Parameter] public List items { get; set; }
+}
diff --git a/TaxPayerFull/Layout/PanelLayout.razor b/TaxPayerFull/Layout/PanelLayout.razor
index 865e321..ea76c7d 100644
--- a/TaxPayerFull/Layout/PanelLayout.razor
+++ b/TaxPayerFull/Layout/PanelLayout.razor
@@ -7,6 +7,7 @@
@inject NavigationManager nav
@inject localService localserv;
@inject Fixedvalues fv;
+
@@ -165,6 +166,11 @@
+
+
+
@@ -206,6 +212,7 @@
@code {
+ private Modal modal = default!;
public DashBoardDTO? dashBoard { get; set; }
protected override async Task OnInitializedAsync()
{
@@ -217,6 +224,15 @@
}
}
@functions {
+ public async Task ShowNotifications()
+ {
+
+ var parameters = new Dictionary();
+ parameters.Add("items", dashBoard?.Notifications);
+ await modal.ShowAsync(title: "اطلاعیه ها", parameters: parameters);
+
+
+ }
private async Task Logout()
{
_hc.DefaultRequestHeaders.Clear();
diff --git a/TaxPayerFull/Pages/UserPanel/Panel.razor b/TaxPayerFull/Pages/UserPanel/Panel.razor
index e96c1b9..667f65c 100644
--- a/TaxPayerFull/Pages/UserPanel/Panel.razor
+++ b/TaxPayerFull/Pages/UserPanel/Panel.razor
@@ -7,9 +7,12 @@
@layout PanelLayout
@inject HttpClientController hc;
@inject Fixedvalues fv;
+
کاربری
+
+
@@ -402,14 +405,21 @@
@code {
-
+ List messages = new List();
+ private Modal modal = default!;
+ private void ShowMessage(ToastType toastType, string Message) => messages.Add(CreateToastMessage(toastType, Message));
public DashBoardDTO? dashBoard { get; set; }
protected override async Task OnInitializedAsync()
{
-
+
if (!await localserv.OnlineUser())
nav.NavigateTo("/");
dashBoard = await fv.GetDashBoard();
+ if (dashBoard != null)
+ foreach (var war in dashBoard.Warning)
+ ShowMessage((ToastType)Enum.Parse(typeof(ToastType), war.Status.ToString()), war.Message);
+
+
//var rsp = await hc.Get("User/GetDashBoard");
// if (rsp.IsSuccessStatusCode)
// {
@@ -418,3 +428,12 @@
await base.OnInitializedAsync();
}
}
+@functions {
+
+ private ToastMessage CreateToastMessage(ToastType toastType, string Message)
+ => new ToastMessage
+ {
+ Type = toastType,
+ Message = Message,
+ };
+}
\ No newline at end of file