permission changed

2025-03-17 18:37:44 +03:30
parent 44d5af811b
commit bf94e9c76d
3 changed files with 61 additions and 20 deletions
--- a/0_Framework/Application/SubAccountPermissionHelper.cs
+++ b/0_Framework/Application/SubAccountPermissionHelper.cs
@@ -37,10 +37,12 @@
        /// </summary>
        public const int PersonnelStatusIndividualReportPermissionCode = 10205;

-        /// <summary>
-        /// لیست کل پرسنل
-        /// </summary>
-        public const int PersonnelListPermissionCode = 10206;
+
+        //کد 10206   به بخش عملیات پرسنل منتقل شد و رزرو می باشد
+        ///// <summary>
+        ///// لیست کل پرسنل
+        ///// </summary>
+        //public const int PersonnelListPermissionCode = 10206;

        #endregion

@@ -72,11 +74,22 @@
        /// </summary>
        public const int PaymentToEmployeePermissionCode = 10304;

+
        /// <summary>
        /// عملیات حساب بانکی پرسنل
        /// </summary>
        public const int EmployeeBankInformationPermissionCode = 10309;

+        /// <summary>
+        /// عملیات افزودن پرسنل
+        /// </summary>
+        public const int AddEmployeePermissionCode = 10310;
+
+        /// <summary>
+        /// عملیات افزودن پرسنل
+        /// </summary>
+        public const int LeftWorkEmployeePermissionCode = 10311;
+
        /// <summary>
        /// ایجاد وام
        /// </summary>
@@ -190,6 +203,12 @@
        public const int DeleteFinePermissionCode = 1030804;
        #endregion

+        /// <summary>
+        /// لیست کل پرسنل
+        /// </summary>
+        public const int PersonnelListPermissionCode = 10206;
+
+
        #endregion


@@ -562,13 +581,7 @@
            Code = PersonnelStatusIndividualReportPermissionCode,
            ParentId = WorkshopOperationsPermissionCode
        };
-        public static SubAccountPermissionDto PersonnelListPermission { get; } = new()
-        {
-            Id = PersonnelListPermissionCode,
-            Name = "لیست کل پرسنل",
-            Code = PersonnelListPermissionCode,
-            ParentId = WorkshopOperationsPermissionCode
-        };
+ 
        #endregion

        #region عملیات پرسنل, ParentId = PersonnelOperationsPermissionCode
@@ -613,12 +626,35 @@
 	        ParentId = PersonnelOperationsPermissionCode
        };

-		#endregion
+        public static SubAccountPermissionDto AddEmployeeInformationPermission { get; } = new()
+        {
+            Id = AddEmployeePermissionCode,
+            Name = "عملیات افزودن پرسنل",
+            Code = AddEmployeePermissionCode,
+            ParentId = PersonnelOperationsPermissionCode
+        };

-		#region فیش حقوقی غیر رسمی,ParentId = CustomizeCheckoutOperationsPermissionCode
+        public static SubAccountPermissionDto LeftWorkEmployeeInformationPermission { get; } = new()
+        {
+            Id = LeftWorkEmployeePermissionCode,
+            Name = "عملیات ترک کار پرسنل",
+            Code = LeftWorkEmployeePermissionCode,
+            ParentId = PersonnelOperationsPermissionCode
+        };
+
+        public static SubAccountPermissionDto PersonnelListPermission { get; } = new()
+        {
+            Id = PersonnelListPermissionCode,
+            Name = "لیست کل پرسنل",
+            Code = PersonnelListPermissionCode,
+            ParentId = PersonnelOperationsPermissionCode
+        };
+        #endregion
+
+        #region فیش حقوقی غیر رسمی,ParentId = CustomizeCheckoutOperationsPermissionCode


-		public static SubAccountPermissionDto CustomizeCheckoutSetGroupAndSalaryPermission { get; } = new()
+        public static SubAccountPermissionDto CustomizeCheckoutSetGroupAndSalaryPermission { get; } = new()
        {
            Id = CustomizeCheckoutSetGroupAndSalaryPermissionCode,
            Name = "تنظیم گروه بندی و حقوق پرسنل",
--- a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
+++ b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
@@ -71,13 +71,16 @@ CreateWorkingHoursTemp command, bool holidayWorking)

 		//گرفتن ساعت استراحت پرسنل از تنظیمات
 		#region breakTime
-		BaseCustomizeEntity settings = _context.CustomizeWorkshopEmployeeSettings.AsSplitQuery().FirstOrDefault(x =>
+		BaseCustomizeEntity settings = _context.CustomizeWorkshopEmployeeSettings.AsSplitQuery()
+            .Include(x=>x.CustomizeWorkshopGroupSettings).FirstOrDefault(x =>
 			x.WorkshopId == workshopId && x.EmployeeId == employeeId);
 		//اگر ساعت استراحت پرسنل وجود نداشت صفر است
 		var breakTime = settings == null ? new BreakTime(false, new TimeOnly()) : settings.BreakTime;
-		#endregion

-		List<RollCallViewModel> rollCallResult = _context.RollCalls.Where(x =>
+
+        #endregion
+
+        List<RollCallViewModel> rollCallResult = _context.RollCalls.Where(x =>
 			x.EmployeeId == employeeId && x.WorkshopId == workshopId && x.StartDate.Value.Date >= contractStart.Date &&
 			x.StartDate.Value.Date <= contractEnd.Date && x.EndDate != null).Select(x => new RollCallViewModel()
 			{
@@ -148,6 +151,8 @@ CreateWorkingHoursTemp command, bool holidayWorking)
 			}).ToList();
 			leavingDayCout += afterCheckout.Sum(x => x.DayCounter);
 			Console.WriteLine(leavingDayCout);
+
+			
 			TimeSpan workingPerDayAve = sumSpans / groupedRollCall.Count;//میانگین ساعت کار در روز
 			TimeSpan sumLeave = new TimeSpan();
 			if (workingPerDayAve <= new TimeSpan(7, 20, 0))
--- a/ServiceHost/Areas/Client/Pages/Index.cshtml
+++ b/ServiceHost/Areas/Client/Pages/Index.cshtml
@@ -115,7 +115,7 @@
                </div>
            }

-			<div class="col-12 col-sm-12 col-md-6 col-lg-4 col-xl-3 col-xxl-2 mt-3">
+			<div Permission="@SubAccountPermissionHelper.AddEmployeePermissionCode" class="col-12 col-sm-12 col-md-6 col-lg-4 col-xl-3 col-xxl-2 mt-3">
 				<div class="card p-0">
 					<div class="card-section-btn">
 						<div class="content btn-group">
@@ -135,7 +135,7 @@
 				</div>
 			</div>

-			<div class="col-12 col-sm-12 col-md-6 col-lg-4 col-xl-3 col-xxl-2 mt-3">
+			<div Permission="@SubAccountPermissionHelper.LeftWorkEmployeePermissionCode" class="col-12 col-sm-12 col-md-6 col-lg-4 col-xl-3 col-xxl-2 mt-3">
 				<div class="card p-0">
 					<div class="card-section-btn">
 						<div class="content btn-group">
@@ -146,7 +146,7 @@
 									<path d="M18.0947 15.0312C17.6699 15 17.1487 15 16.5 15C14.8501 15 14.0251 15 13.5126 15.5126C13 16.0251 13 16.8501 13 18.5C13 19.6663 13 20.4204 13.1811 20.9433C12.7971 20.9806 12.4025 21 12 21C8.13401 21 5 19.2091 5 17C5 14.7909 8.13401 13 12 13C14.6134 13 16.8924 13.8184 18.0947 15.0312Z" fill="#C4E8E8" />
 								</svg>

-								<p class="btn-title text-nowrap m-0">افزودن ترک کار</p>
+								<p class="btn-title text-nowrap m-0">اعلام ترک کار</p>
 								<div class="spinner-loading loading rounded-0" style="display: none;">
 									<span class="spinner-border spinner-border-sm loading text-white" role="status" aria-hidden="true"></span>
 								</div>