From 17b5f5fee5da0fc5feb0196d92e6c2fe8d853920 Mon Sep 17 00:00:00 2001
From: SamSys <f0604741@gmail.com>
Date: Sun, 1 Jun 2025 16:34:31 +0330
Subject: [PATCH] add new Permission

---
 .../Pages/Accounts/Account/CreateRole.cshtml  | 60 ++++++++++++++++---
 .../Pages/Accounts/Account/EditRole.cshtml    | 54 ++++++++++++++++-
 .../Admin/Pages/Accounts/Account/Index.cshtml | 47 ++++++++-------
 3 files changed, 129 insertions(+), 32 deletions(-)

diff --git a/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml b/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml
index 7a46a7d6..44f61a60 100644
--- a/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml
@@ -18,6 +18,10 @@
             margin-right: 80px;
         }
 
+		.level4 {
+			margin-right: 120px;
+		}
+
         .parent {
             border-radius: 10px 0px 0px 10px;
             min-width: 220px;
@@ -42,6 +46,16 @@
             border: 1px solid #666666 !important;
             margin-right: -4px;
         }
+
+		.parentLevel3 {
+			border-radius: 10px 0px 0px 10px;
+			min-width: 220px !important;
+			text-align: start;
+			background-color: #666666 !important;
+			border: 1px solid #666666 !important;
+			margin-right: -4px;
+		}
+
         .ion-plus {
             position: relative !important;
             top: 4px !important;
@@ -536,15 +550,45 @@
 		<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
 			<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
 		</label>
-		<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="306" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> مدیریت کاربران </span> </label>
-	</div>
-	@* تشخیص چهره *@
-    <div class="child-check level2">
-        <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
-            <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
-        </label>
-        <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="308" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تشخیص چهره </span> </label>
+        <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="306" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> مدیریت کاربران </span> </label>
+		@*لیست کاربران کلاینت*@
+        <div class="child-check level3">
+            <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
+            </label>
+            <label class="btn btn-inverse waves-effect waves-light m-b-5 parentLevel3"><input type="checkbox" disabled="disabled" value="30603" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> لیست کاربران کلاینت </span> </label>
+          
+            <div class="child-check level4">
+                <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="3060301" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> ورود به کلاینت </span> </label>
+            </div>
+            <div class="child-check level4">
+                <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="3060302" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تغییر رمز </span> </label>
+            </div>
+            <div class="child-check level4">
+                <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="3060303" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> ویرایش </span> </label>
+            </div>
+            <div class="child-check level4">
+                <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="3060304" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> حذف </span> </label>
+            </div>
+
+
+        </div>
+
+        <div class="child-check level3">
+            <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="30601" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> ایجادکاربر جدید </span> </label>
+        </div>
+        <div class="child-check level3">
+            <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="30602" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد نقش جدید </span> </label>
+        </div>
+      
+        <div class="child-check level3">
+            <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="30604" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> لیست کاربران ادمین </span> </label>
+        </div>
+        <div class="child-check level3">
+            <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="30605" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative">  نقش ها </span> </label>
+        </div>
     </div>
+
     @* گزارشات *@
     <div class="child-check level2">
         <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
diff --git a/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml b/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml
index 888dc7a5..38909dc7 100644
--- a/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml
@@ -18,6 +18,11 @@
             margin-right: 80px;
         }
 
+		.level4 {
+			margin-right: 120px;
+		}
+
+
         .parent {
             border-radius: 10px 0px 0px 10px;
             min-width: 220px;
@@ -42,6 +47,15 @@
             margin-right: -4px;
         }
 
+		.parentLevel3 {
+			border-radius: 10px 0px 0px 10px;
+			min-width: 220px !important;
+			text-align: start;
+			background-color: #666666 !important;
+			border: 1px solid #666666 !important;
+			margin-right: -4px;
+		}
+
         .ion-plus {
             position: relative !important;
             top: 4px !important;
@@ -547,8 +561,44 @@
 		<label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
 			<i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
 		</label>
-		<label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="306" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> مدیریت کاربران </span> </label>
-	</div>
+        <label class="btn btn-inverse waves-effect waves-light m-b-5  parentLevel2"> <input type="checkbox" disabled="disabled" value="306" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> مدیریت کاربران </span> </label>
+		@*لیست کاربران کلاینت*@
+        <div class="child-check level3">
+            <label class="btn btn-icon waves-effect btn-default m-b-5 open-close">
+                <i class="ion-plus"></i> <i class="ion-minus" style="display: none;"></i><input type="checkbox" style="display: none" class="open-btn"/>
+            </label>
+            <label class="btn btn-inverse waves-effect waves-light m-b-5 parentLevel3"><input type="checkbox" disabled="disabled" value="30603" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> لیست کاربران کلاینت </span> </label>
+          
+            <div class="child-check level4">
+                <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="3060301" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> ورود به کلاینت </span> </label>
+            </div>
+            <div class="child-check level4">
+                <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="3060302" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> تغییر رمز </span> </label>
+            </div>
+            <div class="child-check level4">
+                <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="3060303" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> ویرایش </span> </label>
+            </div>
+            <div class="child-check level4">
+                <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="3060304" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> حذف </span> </label>
+            </div>
+
+
+        </div>
+
+        <div class="child-check level3">
+            <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="30601" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> ایجادکاربر جدید </span> </label>
+        </div>
+        <div class="child-check level3">
+            <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="30602" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> ایجاد نقش جدید </span> </label>
+        </div>
+      
+        <div class="child-check level3">
+            <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="30604" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative"> لیست کاربران ادمین </span> </label>
+        </div>
+        <div class="child-check level3">
+            <label class="btn btn-inverse waves-effect waves-light m-b-5 children "><input type="checkbox" disabled="disabled" value="30605" class="check-btn"> &nbsp;<span style="bottom: 2px;position: relative">  نقش ها </span> </label>
+        </div>
+    </div>
 
     @* گزارشات *@
     <div class="child-check level2">
diff --git a/ServiceHost/Areas/Admin/Pages/Accounts/Account/Index.cshtml b/ServiceHost/Areas/Admin/Pages/Accounts/Account/Index.cshtml
index c8b06c30..0f24648c 100644
--- a/ServiceHost/Areas/Admin/Pages/Accounts/Account/Index.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Accounts/Account/Index.cshtml
@@ -3,12 +3,14 @@
 @using Microsoft.EntityFrameworkCore
 @using _0_Framework.Application
 @model ServiceHost.Areas.Admin.Pages.Accounts.Account.IndexModel
+@inject IAuthHelper _AuthHelper;
 
 @{
  
     var i = 1;
     var j = 1;
     var r = 1;
+    var permissionList = _AuthHelper.GetPermissions();
     //string colaps = "in";
     //string act = "active";
 }
@@ -64,11 +66,11 @@
 <div class="row">
     <div class="col-md-12">
 
-        <p class="pull-right">
+        <p class="pull-right" permission="30601">
             <a href="#showmodal=@Url.Page("./Index", "Create")" class="btn btn-success btn-rounded waves-effect waves-light m-b-5" style=" background-color: #f5f5f5; border-color: #0f9500; font-family: 'Web_Yekan' !important; color: #0f9500 !important; border-top-left-radius: 0px; border-bottom-left-radius: 0px "> <i class="fa fa-user-plus" style="padding-left: 3px; font-size: 14px; color: #0f9500 !important "></i> ایجاد کاربر جدید</a>
 
         </p>
-        <p class="pull-right">
+        <p class="pull-right" permission="30602">
             <a href="#showmodal=@Url.Page("./Index", "CreateRole")" class="btn btn-success btn-rounded waves-effect waves-light m-b-5" style=" background-color: #f5f5f5; border-color: #605f5f; font-family: 'Web_Yekan' !important; color: #605f5f !important; border-top-right-radius: 0px; border-bottom-right-radius: 0px "> <i class="fa fa-group" style="padding-left: 3px; font-size: 14px; color: #605f5f !important "></i> ایجاد نقش جدید</a>
 
         </p>
@@ -99,17 +101,17 @@
 
 <ul class="nav nav-tabs tabs" id="myTab">
     @* ============================================RolesTab=================*@
-    <li class="tab">
+    <li class="tab  @(permissionList.All(x => x != 30604) && permissionList.All(x => x != 30603)? "active" : "") ">
         <a href="#profile-21" data-toggle="tab" aria-expanded="false" class=" ac">
-	        <span class="visible-xs">
-		        <i class="fa fa-group" style="display: block;padding: 20px 0 0 0;"></i>
+            <span class="visible-xs">
+                <i class="fa fa-group" style="display: block;padding: 20px 0 0 0;"></i>
                 <span class="textMenu">نقش ها</span>
-	        </span>
+            </span>
             <h3 class="hideInMobile" style="font-family: 'Web_Yekan' !important; font-size: 18px !important"><i class="fa fa-group fa-2x" style="padding-left: 3px;"></i> نقش ها</h3>
         </a>
-    </li>
+    </li> 
   @*  ===============================================AdminTab=================*@
-    <li class="tab active">
+    <li class="tab active" permission="30604">
         <a href="#home-21" data-toggle="tab" aria-expanded="false" class="active ac">
 	        <span class="visible-xs">
 		        <i class="fa fa-user" style="display: block;padding: 20px 0 0 0;"></i>
@@ -119,20 +121,21 @@
         </a>
     </li>
     @*  ===============================================ClientTab=================*@
-    <li class="tab">
+     <li class="tab @(permissionList.All(x => x != 30604) ? "active" : "")" permission="30603">
         <a href="#Client-21" data-toggle="tab" aria-expanded="false" class=" ac">
-	        <span class="visible-xs" >
-		        <i class="fa fa-group" style="display: block;padding: 20px 0 0 0;"></i>
-		        <span class="textMenu">لیست موازی</span>
-		    </span>
-            <h3 class="hideInMobile" style="font-family: 'Web_Yekan' !important; font-size: 18px !important"><i class="fa fa-group fa-2x" style="padding-left: 3px;"></i> لیست کاربران ( موازی) (@Model.ClientAccounts.Count) </h3>
+            <span class="visible-xs" >
+                <i class="fa fa-group" style="display: block;padding: 20px 0 0 0;"></i>
+                <span class="textMenu">لیست کلاینت</span>
+            </span>
+            <h3 class="hideInMobile" style="font-family: 'Web_Yekan' !important; font-size: 18px !important"><i class="fa fa-group fa-2x" style="padding-left: 3px;"></i> لیست کاربران ( کلاینت) (@Model.ClientAccounts.Count) </h3>
         </a>
     </li>
+  
 </ul>
 
 <div class="tab-content">
 @*==================================================================Adminusers=====*@
-<div class="tab-pane active" id="home-21">
+<div class="tab-pane active" id="home-21" permission="30604">
 
     <div class="row">
         <div class="col-md-12">
@@ -298,7 +301,7 @@
 </div>
 
 @*==================================================================roles=====*@
-<div class="tab-pane" id="profile-21">
+<div class="tab-pane @(permissionList.All(x => x != 30604) && permissionList.All(x => x != 30603)? "active" : "") " id="profile-21">
 
 
 
@@ -367,7 +370,7 @@
 </div>
 
 @*==================================================================Clientusers=====*@
-<div class="tab-pane" id="Client-21">
+<div class="tab-pane @(permissionList.All(x => x != 30604) ? "active" : "")" id="Client-21" permission="30603">
 
     <div class="row">
         <div class="col-md-12">
@@ -485,27 +488,27 @@
                                                         j++;
                                                     }
                                                     <td>
-                                                        <a class="btn btn-success pull-right m-rl-5 red" onclick="directLogin(@item.Id)">
+                                                        <a permission="3060301" class="btn btn-success pull-right m-rl-5 red" onclick="directLogin(@item.Id)">
                                                             <i class="fa fa-sign-in faSize"></i><span style="position: relative;bottom: 3px;">ورود به کلاینت</span>
                                                         </a>
-                                                        <a class="btn btn-info pull-right m-rl-5 red"
+                                                        <a permission="3060302" class="btn btn-info pull-right m-rl-5 red"
                                                            href="#showmodal=@Url.Page("./Index", "ChangePassword", new { item.Id })">
                                                             <i class="fa fa-key faSize"></i>
                                                         </a>
-                                                        <a class="btn btn-warning pull-right m-rl-5 red"
+                                                        <a permission="3060303" class="btn btn-warning pull-right m-rl-5 red"
                                                            href="#showmodal=@Url.Page("./Index", "Edit", new { item.Id })">
                                                             <i class="fa fa-edit faSize"></i>
                                                         </a>
 
                                                         @if (item.IsActiveString == "true" && item.Role != "مدیر سیستم")
                                                         {
-                                                            <a onclick="deActive(@item.Id, '@item.Fullname')" class="btn btn-danger pull-right m-rl-5 red">
+                                                            <a permission="3060304" onclick="deActive(@item.Id, '@item.Fullname')" class="btn btn-danger pull-right m-rl-5 red">
                                                                 <i class="fa faSize  fa-trash"></i>
                                                             </a>
                                                         }
                                                         else if (item.IsActiveString == "false")
                                                         {
-                                                            <a onclick="Active(@item.Id, '@item.Fullname')" class=" btn btn-success pull-right m-rl-5 red">
+                                                            <a permission="3060304" onclick="Active(@item.Id, '@item.Fullname')" class=" btn btn-success pull-right m-rl-5 red">
                                                                 <i class="fa faSize fa-rotate-left"></i>
                                                             </a>
                                                         }