From 88a0552a07fbc8314040d9a5872cbed75fb1a0be Mon Sep 17 00:00:00 2001 From: SamSys Date: Tue, 13 May 2025 15:39:49 +0330 Subject: [PATCH] Sepration js client/Contract/index --- .../Repository/YearlySalaryRepository.cs | 8 +- .../Pages/Company/Contracts/Index.cshtml | 1862 ++--------------- .../AssetsClient/pages/Contracts/js/index.js | 1612 ++++++++++++++ 3 files changed, 1750 insertions(+), 1732 deletions(-) create mode 100644 ServiceHost/wwwroot/AssetsClient/pages/Contracts/js/index.js diff --git a/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs b/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs index 44bb382d..ccff40d4 100644 --- a/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs +++ b/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs @@ -120,10 +120,10 @@ public class YearlySalaryRepository : RepositoryBase, IYearl var totalHours = totalHoursHDouble + totalHoursMDouble;// ساعت کارکرد پرسنل در این ماه //var MandatoryDays = TotalDays - friday - officialholiday; - var MandatoryDays = TotalDays - fridayStartToEnd; - //اگر حضورغیاب داشت - if (hasRollCall) - MandatoryDays = TotalDays - fridayStartToEnd - officialholiday; + //var MandatoryDays = TotalDays - fridayStartToEnd; + ////اگر حضورغیاب داشت + //if (hasRollCall) + var MandatoryDays = TotalDays - fridayStartToEnd - officialholiday; //بدست آوردن ساعت موظفی این ماه var TotalMandatoryHours = MandatoryDays * 7.33;//ساعت موظفی این ماه diff --git a/ServiceHost/Areas/Client/Pages/Company/Contracts/Index.cshtml b/ServiceHost/Areas/Client/Pages/Company/Contracts/Index.cshtml index 4a99bd94..76464366 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Contracts/Index.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Contracts/Index.cshtml @@ -89,7 +89,6 @@
@@ -122,7 +121,7 @@
-
+
-
-
- -
-
- -
-
+
+
+ +
+
+ +
+
+ جستجو + + + + + - حذف جستجو - -
+ حذف جستجو + +
@*
@@ -252,50 +251,48 @@
- - @if (@Model.Contracts.Count > 0) { -
-
- - +
+
+ + +
+ +
+ + +
+
+
+
+

لیست قراردادها

+
+
+ +
+
+
- -
- - -
-
-
-
-

لیست قراردادها

-
-
- -
-
-
-
@@ -369,11 +366,11 @@
-
+
- + @(i)
@@ -396,7 +393,7 @@ @item.ContractEnd
-
} -
- } - else - { -
-
-
-
- -
اطلاعاتی وجود ندارد.
-
+
+ } + else + { +
+
+
+
+ +
اطلاعاتی وجود ندارد.
- } +
+ }
@@ -475,10 +472,9 @@
-