From ca8a35a68eba38a20ed48d32afe64a69de3d4e53 Mon Sep 17 00:00:00 2001
From: mmrbnjd <mehdi.rabienzhad@gmail.com>
Date: Tue, 30 Jul 2024 12:14:36 +0330
Subject: [PATCH] load dashboard

---
 Back/Back.csproj                          |   2 +-
 TaxPayerFull/FixedValues.cs               |   3 +-
 TaxPayerFull/Layout/PanelLayout.razor     |  14 +--
 TaxPayerFull/Pages/UserPanel/Orders.razor |   4 +
 TaxPayerFull/Pages/UserPanel/Panel.razor  | 123 +++++++++++-----------
 TaxPayerFull/Program.cs                   |   4 +-
 6 files changed, 77 insertions(+), 73 deletions(-)

diff --git a/Back/Back.csproj b/Back/Back.csproj
index fd97cd7..899d7e4 100644
--- a/Back/Back.csproj
+++ b/Back/Back.csproj
@@ -36,7 +36,7 @@
 
   <ItemGroup>
     <Reference Include="Service">
-      <HintPath>..\..\Dlls\Service.dll</HintPath>
+      <HintPath>..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/TaxPayerFull/FixedValues.cs b/TaxPayerFull/FixedValues.cs
index cdca77e..9cab291 100644
--- a/TaxPayerFull/FixedValues.cs
+++ b/TaxPayerFull/FixedValues.cs
@@ -81,7 +81,7 @@ namespace Front
 
             return InfoCompany;
         }
-        public async Task<DashBoardDTO?> GetDashBoard(bool run = false)
+        public async Task LoadDashBoard(bool run = false)
         {
 
             if (dashBoard == null || run)
@@ -94,7 +94,6 @@ namespace Front
             }
 
 
-            return dashBoard;
         }
         public async Task<List<IdName<int>>> GetUnits()
         {
diff --git a/TaxPayerFull/Layout/PanelLayout.razor b/TaxPayerFull/Layout/PanelLayout.razor
index a72c54f..9e0cf48 100644
--- a/TaxPayerFull/Layout/PanelLayout.razor
+++ b/TaxPayerFull/Layout/PanelLayout.razor
@@ -173,9 +173,9 @@
                 <footer class="content-footer footer bg-footer-theme">
                     <div class="container-xxl d-flex flex-wrap justify-content-between py-2 flex-md-row flex-column">
                         <div class="mb-2 mb-md-0">
-                            @if (@dashBoard!=null)
+                            @if (@fv.dashBoard != null)
                             {
-                                <span>آخرین ورود : @dashBoard?.LastLoginDate</span>
+                                <span>آخرین ورود : @fv.dashBoard?.LastLoginDate</span>
                             }
                          
                         </div>
@@ -200,7 +200,7 @@
 @code {
     public int countnot = 0;
     private Modal modal = default!;
-    public DashBoardDTO? dashBoard { get; set; }
+   // public DashBoardDTO? dashBoard { get; set; }
     protected override async Task OnInitializedAsync()
     {
       await  fv.SetUlr("Panel");
@@ -208,9 +208,9 @@
         if (!await localserv.OnlineUser())
             nav.NavigateTo("/");
 
-        dashBoard = await fv.GetDashBoard();
-        if (dashBoard != null)
-    countnot = dashBoard.Notifications.Count();
+        await fv.LoadDashBoard();
+        if (fv.dashBoard != null)
+            countnot = fv.dashBoard.Notifications.Count();
         await base.OnInitializedAsync();
     }
 }
@@ -223,7 +223,7 @@
     {
        // dashBoard = await fv.GetDashBoard();
         var parameters = new Dictionary<string, object>();
-        parameters.Add("items", dashBoard?.Notifications);
+        parameters.Add("items", fv.dashBoard?.Notifications);
         parameters.Add("OnMultipleOfThree", EventCallback.Factory.Create<int>(this, CallBack));
         await modal.ShowAsync<Front.CUSComponent.Notifications>(title: "اطلاعیه ها", parameters: parameters);
 
diff --git a/TaxPayerFull/Pages/UserPanel/Orders.razor b/TaxPayerFull/Pages/UserPanel/Orders.razor
index a5fc655..c388ac9 100644
--- a/TaxPayerFull/Pages/UserPanel/Orders.razor
+++ b/TaxPayerFull/Pages/UserPanel/Orders.razor
@@ -179,7 +179,11 @@
         if (result.Action == ComponentAction.add)
         {
             if (result.Status == ComponentStatus.success)
+            {
                 ShowSuccessAlert("سفارش پرداخت شد");
+               await fv.LoadDashBoard(true);
+            }
+
 
         }
         else if (result.Action == ComponentAction.delete)
diff --git a/TaxPayerFull/Pages/UserPanel/Panel.razor b/TaxPayerFull/Pages/UserPanel/Panel.razor
index 667f65c..d38d870 100644
--- a/TaxPayerFull/Pages/UserPanel/Panel.razor
+++ b/TaxPayerFull/Pages/UserPanel/Panel.razor
@@ -32,7 +32,7 @@
         </div>
     </div>
     <div class="col-lg-2 mb-1 order-0">
-         @if (dashBoard != null)
+        @if (fv.dashBoard != null)
     {
         <div class="col-12 mb-4">
             <div class="card">
@@ -44,24 +44,25 @@
                                 <h5 class="text-nowrap mb-2">گزارش فروش</h5>
                                 <span class="badge bg-label-warning rounded-pill">این ماه</span>
                             </div>
-                            @if (dashBoard != null && dashBoard.SaleInMonth.HasValue)
+                                @if (fv.dashBoard != null && fv.dashBoard.SaleInMonth.HasValue)
                             {
                                 <div class="mt-sm-auto">
-                                    @if (dashBoard.Salepercent.HasValue && dashBoard.Salepercent.Value>0)
+                                        @if (fv.dashBoard.Salepercent.HasValue && fv.dashBoard.Salepercent.Value > 0)
                                     {
-                                        if (dashBoard.Salepercent.Value>=100)
+                                            if (fv.dashBoard.Salepercent.Value >= 100)
                                         {
-                                            <small class="text-success text-nowrap fw-semibold"><i class='bx bx-chevron-up'></i> @dashBoard.Salepercent %</small>
+                                                <small class="text-success text-nowrap fw-semibold"><i class='bx bx-chevron-up'></i> @fv.dashBoard.Salepercent %</small>
 
                                         }
                                         else
                                         {
-                                            <small class="text-danger text-nowrap fw-semibold"><i class='bx bx-chevron-down'></i> @dashBoard.Salepercent %</small>
+                                                <small class="text-danger text-nowrap fw-semibold"><i class='bx bx-chevron-down'></i> @fv.dashBoard.Salepercent %</small>
 
                                         }
                                     }
-                                  
-                                    <h6 class="mb-0">@dashBoard?.SaleInMonth.Value.ToString("N0")
+
+                                        <h6 class="mb-0">
+                                            @fv.dashBoard?.SaleInMonth.Value.ToString("N0")
                                         <span style="font-size: 10px"> ریال</span>
                                         </h6>
                                 </div>
@@ -77,7 +78,7 @@
     </div>
     <div class="col-lg-4 col-md-4 order-1">
         <div class="row">
-            @if (dashBoard != null && dashBoard.AlistofServices.Any(w => w.PermissionID == 3))
+            @if (fv.dashBoard != null && fv.dashBoard.AlistofServices.Any(w => w.PermissionID == 3))
             {
 
                 <div class="col-lg-6 col-md-12 col-6 mb-4">
@@ -97,28 +98,28 @@
                                     </div>
                                 </div>
                             </div>
-                            <span class="fw-semibold d-block">صورتحساب     <br /> (کل @dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Total).First())</span>
+                            <span class="fw-semibold d-block">صورتحساب     <br /> (کل @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Total).First())</span>
                             <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 (fv.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() > 0)
+                                @if (fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First() > 0)
                                 {
 
                                     <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() آیتم
+                                        @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First() آیتم
                                     </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() آیتم
+                                        @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First() آیتم
                                     </small>
                                 }
 
                             }
-                            else if (dashBoard.AlistofServices.Any(w => w.PermissionID == 3 && w.CalTypeID == 2))
+                            else if (fv.dashBoard.AlistofServices.Any(w => w.PermissionID == 3 && w.CalTypeID == 2))
                             {
                                 <small class="text-success fw-semibold">
                                     <i class='bx'></i>
@@ -128,18 +129,18 @@
                             }
                             else
                             {
-                                @if (Convert.ToInt32(dashBoard.Datenow) <= dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First())
+                                @if (Convert.ToInt32(fv.dashBoard.Datenow) <= fv.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().ToString().ShamciToFormatShamciinFront()
+                                        تا تاریخ  @fv.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().ToString().ShamciToFormatShamciinFront()
+                                        تا تاریخ  @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 3 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
                                     </small>
                                 }
                             }
@@ -147,7 +148,7 @@
                     </div>
                 </div>
             }
-            @if (dashBoard != null && dashBoard.AlistofServices.Any(w => w.PermissionID == 4))
+            @if (fv.dashBoard != null && fv.dashBoard.AlistofServices.Any(w => w.PermissionID == 4))
             {
                 <div class="col-lg-6 col-md-12 col-6 mb-4">
                     <div class="card">
@@ -166,27 +167,27 @@
                                     </div>
                                 </div>
                             </div>
-                            <span class="fw-semibold d-block">کالا     <br /> (کل @dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Total).First())</span>
+                            <span class="fw-semibold d-block">کالا     <br /> (کل @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Total).First())</span>
                             <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 (fv.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() > 0)
+                                @if (fv.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>
-                                        @dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First() آیتم
+                                        @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First() آیتم
                                     </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() آیتم
+                                        @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First() آیتم
                                     </small>
                                 }
 
                             }
-                            else if (dashBoard.AlistofServices.Any(w => w.PermissionID == 4 && w.CalTypeID == 2))
+                            else if (fv.dashBoard.AlistofServices.Any(w => w.PermissionID == 4 && w.CalTypeID == 2))
                             {
                                 <small class="text-success fw-semibold">
                                     <i class='bx'></i>
@@ -196,18 +197,18 @@
                             }
                             else
                             {
-                                @if (Convert.ToInt32(dashBoard.Datenow) <= dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First())
+                                @if (Convert.ToInt32(fv.dashBoard.Datenow) <= fv.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().ToString().ShamciToFormatShamciinFront()
+                                        تا تاریخ  @fv.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().ToString().ShamciToFormatShamciinFront()
+                                        تا تاریخ  @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 4 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
                                     </small>
                                 }
                             }
@@ -221,10 +222,10 @@
     <div class="col-12 col-lg-8 order-2 order-md-3 order-lg-2 mb-4">
         <div class="card col-12">
             <div class="row row-bordered g-0">
-         @if (dashBoard != null)
+                @if (fv.dashBoard != null)
                 {
                     <div class="col-md-12">
-                        <SaleChart items="dashBoard?.ForSaleChart" />
+                        <SaleChart items="fv.dashBoard?.ForSaleChart" />
                 </div>}
             </div>
         </div>
@@ -232,7 +233,7 @@
     <!--/ Total Revenue -->
     <div class="col-12 col-md-8 col-lg-4 order-3 order-md-2">
         <div class="row">
-            @if (dashBoard != null && dashBoard.AlistofServices.Any(w => w.PermissionID == 5))
+            @if (fv.dashBoard != null && fv.dashBoard.AlistofServices.Any(w => w.PermissionID == 5))
             {
                 <div class="col-6 mb-4">
                     <div class="card">
@@ -251,28 +252,28 @@
                                     </div>
                                 </div>
                             </div>
-                            <span class="fw-semibold d-block">مشتری     <br /> (کل @dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Total).First())</span>
+                            <span class="fw-semibold d-block">مشتری     <br /> (کل @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Total).First())</span>
                             <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 (fv.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() > 0)
+                                @if (fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First() > 0)
                                 {
 
                                     <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() آیتم
+                                        @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First() آیتم
                                     </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() آیتم
+                                        @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First() آیتم
                                     </small>
                                 }
 
                             }
-                            else if (dashBoard.AlistofServices.Any(w => w.PermissionID == 5 && w.CalTypeID == 2))
+                            else if (fv.dashBoard.AlistofServices.Any(w => w.PermissionID == 5 && w.CalTypeID == 2))
                             {
                                 <small class="text-success fw-semibold">
                                     <i class='bx'></i>
@@ -282,18 +283,18 @@
                             }
                             else
                             {
-                                @if (Convert.ToInt32(dashBoard.Datenow) <= dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First())
+                                @if (Convert.ToInt32(fv.dashBoard.Datenow) <= fv.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().ToString().ShamciToFormatShamciinFront()
+                                        تا تاریخ  @fv.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().ToString().ShamciToFormatShamciinFront()
+                                        تا تاریخ  @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 5 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
                                     </small>
                                 }
                             }
@@ -301,7 +302,7 @@
                     </div>
                 </div>
             }
-            @if (dashBoard != null && dashBoard.AlistofServices.Any(w => w.PermissionID == 16))
+            @if (fv.dashBoard != null && fv.dashBoard.AlistofServices.Any(w => w.PermissionID == 16))
             {
                 <div class="col-6 mb-4">
                     <div class="card">
@@ -320,27 +321,27 @@
                                     </div>
                                 </div>
                             </div>
-                            <span class="fw-semibold d-block">سامانه مودیان     <br /> (کل @dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Total).First())</span>
+                            <span class="fw-semibold d-block">سامانه مودیان     <br /> (کل @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Total).First())</span>
                             <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 (fv.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() > 0)
+                                @if (fv.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>
-                                        @dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First() آیتم
+                                        @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First() آیتم
                                     </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() آیتم
+                                        @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First() آیتم
                                     </small>
                                 }
 
                             }
-                            else if (dashBoard.AlistofServices.Any(w => w.PermissionID == 16 && w.CalTypeID == 2))
+                            else if (fv.dashBoard.AlistofServices.Any(w => w.PermissionID == 16 && w.CalTypeID == 2))
                             {
                                 <small class="text-success fw-semibold">
                                     <i class='bx'></i>
@@ -350,18 +351,18 @@
                             }
                             else
                             {
-                                @if (Convert.ToInt32(dashBoard.Datenow) <= dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First())
+                                @if (Convert.ToInt32(fv.dashBoard.Datenow) <= fv.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().ToString().ShamciToFormatShamciinFront()
+                                        تا تاریخ  @fv.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().ToString().ShamciToFormatShamciinFront()
+                                        تا تاریخ  @fv.dashBoard.AlistofServices.Where(w => w.PermissionID == 16 && w.CalTypeID == 1).Select(s => s.Remaining).First().ToString().ShamciToFormatShamciinFront()
                                     </small>
                                 }
                             }
@@ -377,27 +378,27 @@
     </div>
 </div>
 <div class="row">
-    @if (dashBoard == null)
+    @if (fv.dashBoard == null)
     {
         <p>در حال بارگذاری...</p>
     }
-    @if (dashBoard != null)
+    @if (fv.dashBoard != null)
     {
         <!-- Order Statistics -->
-        <LastActivityServices dashBoard="dashBoard" />
+        <LastActivityServices dashBoard="fv.dashBoard" />
         <!--/ Order Statistics -->
     }
     <!-- MostInvoicedCustomer -->
-    @if (dashBoard != null)
+    @if (fv.dashBoard != null)
     {
-        <MostInvoicedCustomer model="dashBoard?.MostInvoicedCustomer" />
+        <MostInvoicedCustomer model="fv.dashBoard?.MostInvoicedCustomer" />
 
     }
     <!--/ MostInvoicedCustomer -->
     <!-- MostInvoicedProduct -->
-    @if (dashBoard!=null)
+    @if (fv.dashBoard != null)
     {
-        <MostInvoicedProduct model="dashBoard?.MostInvoicedProduct" />
+        <MostInvoicedProduct model="fv.dashBoard?.MostInvoicedProduct" />
 
     }
     <!--/ MostInvoicedProduct -->
@@ -408,15 +409,15 @@
     List<ToastMessage> messages = new List<ToastMessage>();
     private Modal modal = default!;
     private void ShowMessage(ToastType toastType, string Message) => messages.Add(CreateToastMessage(toastType, Message));
-    public DashBoardDTO? dashBoard { get; set; }
+   // 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)
+        await fv.LoadDashBoard();
+        if (fv.dashBoard != null)
+            foreach (var war in fv.dashBoard.Warning)
                 ShowMessage((ToastType)Enum.Parse(typeof(ToastType), war.Status.ToString()), war.Message);
 
     
diff --git a/TaxPayerFull/Program.cs b/TaxPayerFull/Program.cs
index ea0270a..670070e 100644
--- a/TaxPayerFull/Program.cs
+++ b/TaxPayerFull/Program.cs
@@ -37,10 +37,10 @@ builder.Services.AddScoped(sp => new UserAuthenticationDTO()
 //builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri("http://195.88.208.142:7075/api/") });
 
 //Home
-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/") });
 
 //farzan
-//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");