From f2a2afc7a4ca5ee1fb381606cbca1a005a508e4c Mon Sep 17 00:00:00 2001
From: MahanCh <www.mahan.13831012c@gmail.com>
Date: Wed, 16 Apr 2025 17:14:23 +0330
Subject: [PATCH] fix sidebar bugs

---
 .../Client/Pages/Shared/_ClientLayout.cshtml  |  9 ++++----
 .../Areas/Client/Pages/Shared/_Menu.cshtml    | 23 ++++++++++++-------
 .../wwwroot/AssetsClient/css/sidebar-menu.css | 14 +++++++++++
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/ServiceHost/Areas/Client/Pages/Shared/_ClientLayout.cshtml b/ServiceHost/Areas/Client/Pages/Shared/_ClientLayout.cshtml
index 760a9895..647d9b6b 100644
--- a/ServiceHost/Areas/Client/Pages/Shared/_ClientLayout.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Shared/_ClientLayout.cshtml
@@ -389,16 +389,17 @@
 			success: function (response) {
 				if (response.success) {
 					if (response.countWorkFlow === 0) {
-						$('#_countWorkFlowMenu').hide();
-						$('#spinnerWorkFlow').hide();
+						$('#_countWorkFlowMenu, #_countRollCallMenuSubmenu').hide();
+						$('#spinnerWorkFlow, #spinnerRollCall').hide();
 						$('#_countWorkFlowMenuMobile').hide();
 						$('#spinnerWorkFlowMobile').hide();
 					} else {
-						$('#_countWorkFlowMenu').css('display', 'flex');
-						$('#spinnerWorkFlow').hide();
+						$('#_countWorkFlowMenu, #_countRollCallMenuSubmenu').css('display', 'flex');
+						$('#spinnerWorkFlow, #spinnerRollCall').hide();
 						$('#_countWorkFlowMenuMobile').show();
 						// $('#spinnerWorkFlowMobile').hide();
 						$('#_countWorkFlowMenu').text(response.countWorkFlow);
+						$('#_countRollCallMenuSubmenu').text(response.countWorkFlow);
 						$('#_countWorkFlowMenuMobile').text(response.countWorkFlow);
 					}
 				}
diff --git a/ServiceHost/Areas/Client/Pages/Shared/_Menu.cshtml b/ServiceHost/Areas/Client/Pages/Shared/_Menu.cshtml
index 025868b6..b1c2007f 100644
--- a/ServiceHost/Areas/Client/Pages/Shared/_Menu.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Shared/_Menu.cshtml
@@ -101,13 +101,13 @@
 		            <li Permission="@SubAccountPermissionHelper.PersonnelListPermissionCode"><a class="selectLi" asp-page="/Company/Employees/EmployeeList"><span>لیست کل پرسنل</span></a></li>
 		            <li Permission="@SubAccountPermissionHelper.LeaveListPermissionCode"><a class="selectLi" asp-page="/Company/Employees/Leave"><span>لیست کل مرخصی</span></a></li>
 		            @* <li><a class="selectLi" asp-page="/Company/Employees/Index"><span>ثبت مرخصی</span></a></li> *@
-		            <li Permission="@SubAccountPermissionHelper.EmployeeBankInformationPermissionCode"><a class="selectLi" asp-page="/Company/EmployeesBankInfo/Index"><span>عملیات حساب بانکی پرسنل</span></a></li>
-		            <li Permission="@SubAccountPermissionHelper.EmployeeDocumentsOperationsPermissionCode"><a class="selectLi" asp-page="/Company/EmployeesDocuments/Index"><span>عملیات مدارک پرسنل</span></a></li>
+		            <li Permission="@SubAccountPermissionHelper.EmployeeBankInformationPermissionCode"><a class="selectLi" asp-page="/Company/EmployeesBankInfo/Index"><span>حساب بانکی پرسنل</span></a></li>
+		            <li Permission="@SubAccountPermissionHelper.EmployeeDocumentsOperationsPermissionCode"><a class="selectLi" asp-page="/Company/EmployeesDocuments/Index"><span>مدارک پرسنل</span></a></li>
 		            @* <li><a class="selectLi" asp-page="/Company/PaymentToEmployee/Index"><span>عملیات پرداخت حقوق پرسنل</span></a></li> *@
-		            <li Permission="@SubAccountPermissionHelper.LoanOperationsPermissionCode"><a class="selectLi" asp-page="/Company/Loan/Index"><span>عملیات وام</span></a></li>
-		            <li Permission="@SubAccountPermissionHelper.RewardOperationsPermissionCode"><a class="selectLi" asp-page="/Company/Reward/Index"><span>عملیات پاداش</span></a></li>
-		            <li Permission="@SubAccountPermissionHelper.SalaryAidOperationsPermissionCode"><a class="selectLi" asp-page="/Company/SalaryAid/Index"><span>عملیات مساعده</span></a></li>
-                    <li Permission="@SubAccountPermissionHelper.FineOperationsPermissionCode"><a class="selectLi" asp-page="/Company/Fine/Index"><span>عملیات جرایم</span></a></li>
+		            <li Permission="@SubAccountPermissionHelper.LoanOperationsPermissionCode"><a class="selectLi" asp-page="/Company/Loan/Index"><span>وام</span></a></li>
+		            <li Permission="@SubAccountPermissionHelper.RewardOperationsPermissionCode"><a class="selectLi" asp-page="/Company/Reward/Index"><span>پاداش</span></a></li>
+		            <li Permission="@SubAccountPermissionHelper.SalaryAidOperationsPermissionCode"><a class="selectLi" asp-page="/Company/SalaryAid/Index"><span>مساعده</span></a></li>
+                    <li Permission="@SubAccountPermissionHelper.FineOperationsPermissionCode"><a class="selectLi" asp-page="/Company/Fine/Index"><span>جرایم</span></a></li>
 	            </ul>
             </li>
             
@@ -187,7 +187,7 @@
 		            <li id="UploadEmployeePicturePageUrl" Permission="@SubAccountPermissionHelper.UploadEmployeePicturePermissionCode"><a class="selectLi" asp-page="/Company/RollCall/EmployeeUploadPicture"><span>آپلود عکس پرسنل</span></a></li>
 		            <li id="ListCurrentDayRollCallsPageUrl" Permission="@SubAccountPermissionHelper.ListCurrentDayRollCallsPermissionCode"><a class="selectLi" asp-page="/Company/RollCall/CurrentDay"><span>حضور و غیاب جاری</span></a></li>
 		            <li id="ListRollCallHistoryPageUrl" Permission="@SubAccountPermissionHelper.ListRollCallHistoryPermissionCode"><a class="selectLi" asp-page="/Company/RollCall/CaseHistory"><span>سوابق حضور و غیاب</span></a></li>
-		            <li id="GroupingOperationsPageUrl" Permission="@SubAccountPermissionHelper.GroupingOperationsPermissionCode"><a class="selectLi" asp-page="/Company/RollCall/Grouping"><span>عملیات گروه‌بندی</span></a></li>
+		            <li id="GroupingOperationsPageUrl" Permission="@SubAccountPermissionHelper.GroupingOperationsPermissionCode"><a class="selectLi" asp-page="/Company/RollCall/Grouping"><span>گروه‌بندی</span></a></li>
                     <li id="SetWorkshopWorkingHoursPageUrl" Permission="@SubAccountPermissionHelper.SetWorkshopWorkingHoursPermissionCode"><a class="" href="#showmodal=@Url.Page("/Company/RollCall/Index", "EditSettingWorkTime")"><span>تنظیم ساعت فعالیت مجموعه</span></a></li>
 		            <li id="CameraAccountSettingsPageUrl" Permission="@SubAccountPermissionHelper.CameraAccountSettingsPermissionCode"><a class="selectLi" asp-page="/Company/RollCall/CameraAccounts"><span>تنظیمات حساب کاربری دوربین</span></a></li>
 	            </ul>
@@ -223,8 +223,15 @@
 	            </a>
 	            <ul class="submenu">
 		            <li Permission="@SubAccountPermissionHelper.WorkFlowRollCallsPermissionCode">
-			            <a class="selectLi" asp-page="/Company/WorkFlow/RollCall">
+			            <a class="selectLi d-flex align-items-center justify-content-between" asp-page="/Company/WorkFlow/RollCall">
 				            <span>حضور و غیاب</span>
+                            
+				            <div>
+					            <div id="spinnerRollCall" class="spinner-border spinner-border-sm text-light" role="status">
+						            <span class="visually-hidden">Loading...</span>
+					            </div>
+                                <span id="_countRollCallMenuSubmenu" class="alert-number-default" style="display:none"></span>
+				            </div>
 			            </a>
 		            </li>
 		            @*                     <li Permission="@SubAccountPermissionHelper.WorkFlowContractsAndCheckoutsPermissionCode"><a class="selectLi" asp-page=""><span>قرارداد و فیش حقوقی</span></a></li>
diff --git a/ServiceHost/wwwroot/AssetsClient/css/sidebar-menu.css b/ServiceHost/wwwroot/AssetsClient/css/sidebar-menu.css
index e75dca3f..b43a5a77 100644
--- a/ServiceHost/wwwroot/AssetsClient/css/sidebar-menu.css
+++ b/ServiceHost/wwwroot/AssetsClient/css/sidebar-menu.css
@@ -206,6 +206,20 @@
     padding: 2px 0 0 0;
 }
 
+.sidebar-navigation > .sidebar-menu > ul li a span.alert-number-default {
+    background-color: #fff;
+    width: 20px;
+    height: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 40px;
+    color: #0c7b7b;
+    font-weight: 600;
+    padding: 2px 0 0 0;
+    font-size: 11px;
+}
+
 .sidebar-navigation > .sidebar-menu > ul li a svg {
     margin: auto 2px;
 }