From 4b23448cc18b3da27ce5061dc04f450caa7c3398 Mon Sep 17 00:00:00 2001 From: MahanCh Date: Mon, 19 May 2025 17:55:58 +0330 Subject: [PATCH 1/6] change rotating shift report style --- .../_Partials/ModalDetailsRotatingShiftReport.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/ModalDetailsRotatingShiftReport.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/ModalDetailsRotatingShiftReport.cshtml index cc737f38..6efbea6d 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/ModalDetailsRotatingShiftReport.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/ModalDetailsRotatingShiftReport.cshtml @@ -76,7 +76,7 @@
-
+
وضعیت نوبت کاری: @Model.RotatingStatus
@@ -100,7 +100,7 @@
-
+
ردیف From 0cd8d5b4cf827d76b48168c62e2e8ef454c2c351 Mon Sep 17 00:00:00 2001 From: MahanCh Date: Mon, 19 May 2025 18:29:36 +0330 Subject: [PATCH 2/6] change confirm insurance style --- .../InsuranceList/InsuranceConfirm.cshtml | 980 +++++++++--------- 1 file changed, 494 insertions(+), 486 deletions(-) diff --git a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/InsuranceConfirm.cshtml b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/InsuranceConfirm.cshtml index f00ecb45..46b64a38 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/InsuranceConfirm.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/InsuranceConfirm.cshtml @@ -40,8 +40,7 @@ align-items: center; margin: 1rem 0; } - - .last-div { + .last-div{ width: 100%; /* height: 55px; */ } @@ -73,18 +72,20 @@ margin: 0 9rem; } - @@page { + @@page { size: A4 landscape; } .table-container-employee { - display: flex; - width: 100%; - justify-content: space-between; + display: flex; + width: 100%; + justify-content: space-between; } .trTable:nth-child(2n) { - background-color: #f1f1f1 !important; + background-color: #f1f1f1 !important; + -webkit-print-color-adjust: exact !important; + print-color-adjust: exact !important; } #printThis .table-bordered .has-left-work p, #printThis .table-bordered .has-start-work p { @@ -208,15 +209,15 @@ } #printThis .colgp-12 { - width: 44px; + width: 44px; } #printThis .colgp-13 { - width: 44px; + width: 44px; } #printThis .colgp-14 { - width: 40px; + width: 40px; } #printThis .table-bordered > tbody > tr:nth-child(12n) td:first-child { @@ -242,10 +243,10 @@ align-items: center; } - .titleSection p { - margin: 0; - text-align: right; - } + .titleSection p{ + margin: 0; + text-align: right; + } .titles { margin-left: auto; @@ -344,9 +345,9 @@ width: 18px; } - #printThis .colgp-7 { - width: 44px; - } + #printThis .colgp-7 { + width: 44px; + } #printThis .colgp-8 { width: 44px; @@ -356,13 +357,13 @@ width: 44px; } - #printThis .colgp-10 { - width: 44px; - } + #printThis .colgp-10 { + width: 44px; + } - #printThis .colgp-11 { - width: 44px; - } + #printThis .colgp-11 { + width: 44px; + } #printThis .colgp-12 { width: 44px; @@ -384,14 +385,14 @@ width: 60px; } - .col-md-9, .col-sm-9, .col-lg-9 { + .col-md-9, .col-sm-9, .col-lg-9 { width: 75%; - float: right; - } + float: right; + } - .asignment { - width: 25%; - } + .asignment { + width: 25%; + } } @@media screen { @@ -410,8 +411,8 @@ margin: 0 !important; padding: 0 !important; overflow: clip; - -webkit-print-color-adjust: exact !important; - print-color-adjust: exact !important; + -webkit-print-color-adjust:exact !important; + print-color-adjust:exact !important; } .modal-dialog { @@ -432,7 +433,7 @@ } .size-a4 { - width: 276mm; + width: 276mm; } #printThis .table-container { @@ -447,27 +448,26 @@ width: 100%; max-height: 15cm; border: hidden !important; - border-right: 0; + border-right :0; border-left: 0; } - #printThis .table-bordered > thead > tr > th { - font-size: 10px; - color: black; - text-align: center; - vertical-align: middle; - padding: 0; - border: 1px solid black; - } - - #printThis .table-bordered > tbody > tr > td { - padding: 8px 2px; - text-align: center; - font-size: 1rem; - border: 1px solid black; - } + #printThis .table-bordered > thead > tr > th { + font-size: 10px; + color: black; + text-align: center; + vertical-align: middle; + padding: 0; + border: 1px solid black; + } + #printThis .table-bordered > tbody > tr > td { + padding: 8px 2px; + text-align: center; + font-size: 1rem; + border: 1px solid black; + } .summary { display: flex; justify-content: flex-end; @@ -495,24 +495,33 @@ color: grey !important; } - .row-color2 .fa-square:before { - color: grey !important; - } + .row-color2 .fa-square:before { + color: grey !important; + } #printThis .table-bordered .has-left-work td { background: black !important; color: white !important; } - #printThis .table-bordered .has-left-work td p { - color: white !important; - } + #printThis .table-bordered .has-left-work td p{ + color: white !important; + } #printThis .table-bordered .has-start-work td { background: grey !important; } + + #printThis .trTable.new-leftwork td { + background-color: #333333 !important; + color: #ffffff !important; + -webkit-print-color-adjust: exact !important; + print-color-adjust: exact !important; + } } + + @@ -542,24 +551,24 @@
- @* *@ + @* *@
-

- * سطر به رنگ - به معنای ترک کار پرسنل می باشد. -

-

- * سطر به رنگ به معنای شروع بکار پرسنل می باشد. -

-
+

+ * سطر به رنگ + به معنای ترک کار پرسنل می باشد. +

+

+ * سطر به رنگ به معنای شروع بکار پرسنل می باشد. +

+
-

تایید کارفرما جهت تنظیم لیست بیمه پرسنل

-
+

تایید کارفرما جهت تنظیم لیست بیمه پرسنل

+
- -
+ +
@@ -587,307 +596,306 @@ - - توضیحات - مجموع مزایای ماهانه غیرمشمول - مجموع حقوق و مزایای ماهیانه - مجموع مزایای ماهیانه - حق تاهل - دستمزد ماهانه - پایه سنوات روزانه - دستمزد روزانه - روز کارکرد - سمت - کدملی - نام و نام خانوادگی - شماره بیمه - ردیف - + + توضیحات + مجموع مزایای ماهانه غیرمشمول + مجموع حقوق و مزایای ماهیانه + مجموع مزایای ماهیانه + حق تاهل + دستمزد ماهانه + پایه سنوات روزانه + دستمزد روزانه + روز کارکرد + سمت + کدملی + نام و نام خانوادگی + شماره بیمه + ردیف + - @{ - int count_j = 0; + @{ + int count_j = 0; - // count_j = (i == 0 ? (((CountList < 12) || (i == (q - 1) && CountList!=12)) ? r : 12) : (((CountList < 12) || (i == (q - 1))) ? r : 12)); + // count_j = (i == 0 ? (((CountList < 12) || (i == (q - 1) && CountList!=12)) ? r : 12) : (((CountList < 12) || (i == (q - 1))) ? r : 12)); - if (i == 0 && ((CountList < 12) || (i == (q - 1) && CountList != 12))) - { - count_j = r; - } - else if (i == 0 && (CountList >= 12 || (i != (q - 1)))) - { - count_j = 12; - } - else if (i != 0 && ((CountList < 12) || ((i == (q - 1)) && r != 0))) - { - count_j = r; - } - else - count_j = 12; - - - if (i == (q - 1)) - count_j = (i * 12) + count_j; - else - { - count_j = ((i + 1) * count_j); - } - } - @for (int j = (i * 12); j < count_j; j++) + if (i == 0 && ((CountList < 12) || (i == (q - 1) && CountList != 12))) { + count_j = r; + } + else if (i == 0 && (CountList >= 12 || (i != (q - 1)))) + { + count_j = 12; + } + else if (i != 0 && ((CountList < 12) || ((i == (q - 1))&& r!=0))) + { + count_j = r; + } + else + count_j = 12; + + + if (i == (q - 1)) + count_j = (i * 12) + count_j; + else + { + count_j = ((i + 1) * count_j); + } + } + @for (int j = (i * 12); j < count_j; j++) + { @**@ - - @if (i == (q - 1)) - { - - @if (!string.IsNullOrEmpty(Model.EmployeeDetailsForInsuranceList[j].LeftWorkDate)) - { -

@Model.EmployeeDetailsForInsuranceList[j].LeftWorkDate

- } - @if (Model.EmployeeDetailsForInsuranceList[j].HasStartWorkInMonth) - { -

@Model.EmployeeDetailsForInsuranceList[j].StartWorkDate

- } - - } - else - { - - @if (!string.IsNullOrEmpty(Model.EmployeeDetailsForInsuranceList[j].LeftWorkDate)) - { -

@Model.EmployeeDetailsForInsuranceList[j].LeftWorkDate

- } - @if (Model.EmployeeDetailsForInsuranceList[j].HasStartWorkInMonth) - { -

@Model.EmployeeDetailsForInsuranceList[j].StartWorkDate

- } - - } - @Model.EmployeeDetailsForInsuranceList[j].BenefitsIncludedNonContinuous.ToMoney() - @Model.EmployeeDetailsForInsuranceList[j].BenefitsIncludedContinuous.ToMoney() - @Model.EmployeeDetailsForInsuranceList[j].MonthlyBenefits.ToMoney() - @Model.EmployeeDetailsForInsuranceList[j].MarriedAllowance.ToMoney() - @Model.EmployeeDetailsForInsuranceList[j].MonthlySalary.ToMoney() - @Model.EmployeeDetailsForInsuranceList[j].BaseYears.ToMoney() - @Model.EmployeeDetailsForInsuranceList[j].DailyWage.ToMoney() - @Model.EmployeeDetailsForInsuranceList[j].WorkingDays - @Model.EmployeeDetailsForInsuranceList[j].JobName - @Model.EmployeeDetailsForInsuranceList[j].NationalCode - @(Model.EmployeeDetailsForInsuranceList[j].FName + " " + Model.EmployeeDetailsForInsuranceList[j].LName) - @Model.EmployeeDetailsForInsuranceList[j].InsuranceCode - @* @index *@ - @if (i == (q - 1)) - { - @index - } - else - { - @index - } + + @if (i == (q - 1)) + { + + @if (!string.IsNullOrEmpty(Model.EmployeeDetailsForInsuranceList[j].LeftWorkDate)) + { +

@Model.EmployeeDetailsForInsuranceList[j].LeftWorkDate

+ } + @if (Model.EmployeeDetailsForInsuranceList[j].HasStartWorkInMonth) + { +

@Model.EmployeeDetailsForInsuranceList[j].StartWorkDate

+ } + + } + else + { + + @if (!string.IsNullOrEmpty(Model.EmployeeDetailsForInsuranceList[j].LeftWorkDate)) + { +

@Model.EmployeeDetailsForInsuranceList[j].LeftWorkDate

+ } + @if (Model.EmployeeDetailsForInsuranceList[j].HasStartWorkInMonth) + { +

@Model.EmployeeDetailsForInsuranceList[j].StartWorkDate

+ } + + } + @Model.EmployeeDetailsForInsuranceList[j].BenefitsIncludedNonContinuous.ToMoney() + @Model.EmployeeDetailsForInsuranceList[j].BenefitsIncludedContinuous.ToMoney() + @Model.EmployeeDetailsForInsuranceList[j].MonthlyBenefits.ToMoney() + @Model.EmployeeDetailsForInsuranceList[j].MarriedAllowance.ToMoney() + @Model.EmployeeDetailsForInsuranceList[j].MonthlySalary.ToMoney() + @Model.EmployeeDetailsForInsuranceList[j].BaseYears.ToMoney() + @Model.EmployeeDetailsForInsuranceList[j].DailyWage.ToMoney() + @Model.EmployeeDetailsForInsuranceList[j].WorkingDays + @Model.EmployeeDetailsForInsuranceList[j].JobName + @Model.EmployeeDetailsForInsuranceList[j].NationalCode + @(Model.EmployeeDetailsForInsuranceList[j].FName + " " + Model.EmployeeDetailsForInsuranceList[j].LName) + @Model.EmployeeDetailsForInsuranceList[j].InsuranceCode + @* @index *@ + @if (i == (q - 1)) + { + @index + } + else + { + @index + } - - index = index + 1; - } - @if (i == (q - 1) && (r > 0 && r <= 8)) - { - CountLastRow = 0; - hasLastRow = true; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @Model.EmployeeDetailsForInsuranceList.Sum(x => x.BenefitsIncludedNonContinuous).ToMoney() - @Model.EmployeeDetailsForInsuranceList.Sum(x => x.BenefitsIncludedContinuous).ToMoney() - @Model.EmployeeDetailsForInsuranceList.Sum(x => x.MonthlyBenefits).ToMoney() - @Model.EmployeeDetailsForInsuranceList.Sum(x => x.MarriedAllowance).ToMoney() - @Model.EmployeeDetailsForInsuranceList.Sum(x => x.MonthlySalary).ToMoney() - @Model.EmployeeDetailsForInsuranceList.Sum(x => x.BaseYears).ToMoney() - @Model.EmployeeDetailsForInsuranceList.Sum(x => x.DailyWage).ToMoney() - @Model.EmployeeDetailsForInsuranceList.Sum(x => x.WorkingDays) - - - - - - - } - else if (i == (q - 1) && (r > 0 && r <= 9)) - { - CountLastRow = 1; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - } - else if (i == (q - 1) && (r > 0 && r <= 10)) - { - CountLastRow = 2; - - - - - - - - - - - - - - - - - } + + index = index + 1; + } + @if (i == (q - 1) && (r>0 && r <= 8 )) + { + CountLastRow = 0; + hasLastRow = true; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @Model.EmployeeDetailsForInsuranceList.Sum(x => x.BenefitsIncludedNonContinuous).ToMoney() + @Model.EmployeeDetailsForInsuranceList.Sum(x => x.BenefitsIncludedContinuous).ToMoney() + @Model.EmployeeDetailsForInsuranceList.Sum(x => x.MonthlyBenefits).ToMoney() + @Model.EmployeeDetailsForInsuranceList.Sum(x => x.MarriedAllowance).ToMoney() + @Model.EmployeeDetailsForInsuranceList.Sum(x => x.MonthlySalary).ToMoney() + @Model.EmployeeDetailsForInsuranceList.Sum(x => x.BaseYears).ToMoney() + @Model.EmployeeDetailsForInsuranceList.Sum(x => x.DailyWage).ToMoney() + @Model.EmployeeDetailsForInsuranceList.Sum(x => x.WorkingDays) + + + + + + + } + else if (i == (q - 1) && (r>0 && r <= 9)) + { + CountLastRow=1; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + } + else if (i == (q - 1) && (r>0 && r <= 10)) + { + CountLastRow=2; + + + + + + + + + + + + + + + + + }
-
+
-
- @{ - var pageStartIndex = i * 12; - var pageEndIndex = (i == q - 1) ? ((i * 12) + r) : ((i + 1) * 12); +
+ @{ + var pageStartIndex = i * 12; + var pageEndIndex = (i == q - 1) ? ((i * 12) + r) : ((i + 1) * 12); - var pageEmployees = Model.EmployeeDetailsForInsuranceList - .Skip(pageStartIndex) - .Take(pageEndIndex - pageStartIndex) - .ToList(); - var pageEmployeeIds = pageEmployees.Select(x => x.EmployeeId).ToHashSet(); + var pageEmployees = Model.EmployeeDetailsForInsuranceList + .Skip(pageStartIndex) + .Take(pageEndIndex - pageStartIndex) + .ToList(); + var pageEmployeeIds = pageEmployees.Select(x => x.EmployeeId).ToHashSet(); - var leftWorkList = Model.LeftWorkEmployees - .Where(x => pageEmployeeIds.Contains(x.EmployeeId)) - .Select(x => new LeftWorkViewModel - { - EmployeeFullName = x.EmployeeFullName ?? "-", - LeftWorkDate = x.LeftWorkDate ?? "-" - }) - .ToList(); + var leftWorkList = Model.LeftWorkEmployees + .Where(x => pageEmployeeIds.Contains(x.EmployeeId)) + .Select(x => new LeftWorkViewModel { + EmployeeFullName = x.EmployeeFullName ?? "-", + LeftWorkDate = x.LeftWorkDate ?? "-" + }) + .ToList(); - while (leftWorkList.Count < 12) - { + while (leftWorkList.Count < 12) + { leftWorkList.Add(new LeftWorkViewModel { EmployeeFullName = "-", LeftWorkDate = "-" }); - } + } var tables = new List>(); - for (int t = 0; t < 3; t++) - { - tables.Add(leftWorkList.Skip(t * 4).Take(4).ToList()); - } - } + for (int t = 0; t < 3; t++) + { + tables.Add(leftWorkList.Skip(t * 4).Take(4).ToList()); + } + } -

هشدار پرسنل ذیل با توجه به تاریخ مندرج با مجموعه شما هیچگونه قرارداد کاری ندارند.

-
-
+

هشدار پرسنل ذیل با توجه به تاریخ مندرج با مجموعه شما هیچگونه قرارداد کاری ندارند.

+
+
+ + @for (int t = 0; t < tables.Count; t++) + { + var table = tables[t]; + + + + + - @for (int t = 0; t < tables.Count; t++) - { - var table = tables[t]; -
- - - - + + + + - - - - - - @foreach (var item in table) - { - - + - - } -
تاریخنام پرسنل
تاریخنام پرسنل
+ @foreach (var item in table) + { +
@item.LeftWorkDate + @item.EmployeeFullName
- } + } + + } + + - - - - @* + + @*
@@ -907,11 +915,11 @@
*@ -
-
-
+
+ +
- @*

* سطر به رنگ @@ -921,8 +929,8 @@ * سطر به رنگ به معنای شروع بکار پرسنل می باشد.

*@ -

صفحه @(i + 1) از @((r > 0 && r <= 8) ? q : q + 1)

-
+

صفحه @(i + 1) از @((r > 0 && r <= 8) ? q : q + 1)

+
@*
*@
امضا و تایید کارفرما
@@ -936,7 +944,7 @@ if (!hasLastRow) { -
+
@* *@ @@ -957,42 +965,129 @@
- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - @if (CountLastRow == 0) + @if (CountLastRow == 0) + { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + } + else if (CountLastRow == 2) + { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + } + + else if (CountLastRow == 1) { @@ -1009,113 +1104,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - } - else if (CountLastRow == 2) - { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + } - else if (CountLastRow == 1) - { - - - - - - - - - - - - - - - - - } - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
توضیحات مجموع مزایای ماهانه غیرمشمول مجموع حقوق و مزایای ماهیانه مجموع مزایای ماهیانه حق تاهل دستمزد ماهانه پایه سنوات روزانه دستمزد روزانه روز کارکرد سمت کدملی نام و نام خانوادگی شماره بیمه ردیف
توضیحات مجموع مزایای ماهانه غیرمشمول مجموع حقوق و مزایای ماهیانه مجموع مزایای ماهیانه حق تاهل دستمزد ماهانه پایه سنوات روزانه دستمزد روزانه روز کارکرد سمت کدملی نام و نام خانوادگی شماره بیمه ردیف
@Model.EmployeeDetailsForInsuranceList.Sum(x => x.BenefitsIncludedNonContinuous).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.BenefitsIncludedContinuous).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.MonthlyBenefits).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.MarriedAllowance).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.MonthlySalary).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.BaseYears).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.DailyWage).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.WorkingDays)
@Model.EmployeeDetailsForInsuranceList.Sum(x => x.BenefitsIncludedNonContinuous).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.BenefitsIncludedContinuous).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.MonthlyBenefits).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.MarriedAllowance).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.MonthlySalary).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.BaseYears).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.DailyWage).ToMoney()@Model.EmployeeDetailsForInsuranceList.Sum(x => x.WorkingDays)
@@ -1130,7 +1138,7 @@ * سطر به رنگ به معنای شروع بکار پرسنل می باشد.

-

صفحه @(q + 1) از @(q + 1)

+

صفحه @(q+1) از @(q+1)

From 3b38b80a282c6858623eb26178dd1d9d191dd4d4 Mon Sep 17 00:00:00 2001 From: MahanCh Date: Mon, 19 May 2025 20:32:15 +0330 Subject: [PATCH 3/6] add list pending --- .../Task/EditTask.cs | 1 + .../Task/TaskViewModel.cs | 1 + .../TaskScheduleDetailsViewModel.cs | 2 + .../Repository/TaskRepository.cs | 56 +++--- .../Repository/TaskScheduleRepository.cs | 17 +- .../Pages/Company/Task/DetailsModal.cshtml | 7 +- .../Company/Task/DetailsScheduleModal.cshtml | 182 +++++++++++------- .../AdminNew/Pages/Company/Task/Index.cshtml | 2 +- .../wwwroot/AssetsAdminNew/Tasks/js/Index.js | 29 ++- 9 files changed, 186 insertions(+), 111 deletions(-) diff --git a/AccountManagement.Application.Contracts/Task/EditTask.cs b/AccountManagement.Application.Contracts/Task/EditTask.cs index 7769c629..f70c6706 100644 --- a/AccountManagement.Application.Contracts/Task/EditTask.cs +++ b/AccountManagement.Application.Contracts/Task/EditTask.cs @@ -21,4 +21,5 @@ public class EditTask:CreateTask public List AssignsLists { get; set; } public bool HasTicket { get; set; } public long TaskScheduleId { get; set; } + public bool HasRequest { get; set; } } \ No newline at end of file diff --git a/AccountManagement.Application.Contracts/Task/TaskViewModel.cs b/AccountManagement.Application.Contracts/Task/TaskViewModel.cs index 30c4562b..56fa2fab 100644 --- a/AccountManagement.Application.Contracts/Task/TaskViewModel.cs +++ b/AccountManagement.Application.Contracts/Task/TaskViewModel.cs @@ -48,6 +48,7 @@ public class TaskViewModel public bool CanDelete { get; set; } public bool CanAssign { get; set; } public bool CanCheckRequests { get; set; } + public bool HasRequest { get; set; } public AssignViewModel AssignedReceiverViewModel { get; set; } public TaskScheduleType ScheduleType { get; set; } diff --git a/AccountManagement.Application.Contracts/TaskSchedule/TaskScheduleDetailsViewModel.cs b/AccountManagement.Application.Contracts/TaskSchedule/TaskScheduleDetailsViewModel.cs index 637f1fbb..12b40d31 100644 --- a/AccountManagement.Application.Contracts/TaskSchedule/TaskScheduleDetailsViewModel.cs +++ b/AccountManagement.Application.Contracts/TaskSchedule/TaskScheduleDetailsViewModel.cs @@ -15,6 +15,8 @@ public class TaskScheduleDetailsViewModel public string ContractingPartyName { get; set; } public string Title { get; set; } public string Description { get; set; } + public string Count { get; set; } + public string FirstEndTaskDate { get; set; } public List Medias { get; set; } } \ No newline at end of file diff --git a/AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs b/AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs index 4a41b01e..84e805e5 100644 --- a/AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs +++ b/AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs @@ -106,14 +106,16 @@ public class TaskRepository : RepositoryBase, ITaskRepository { res.EndTaskDate = _accountContext.Assigns.First(a => a.TaskId == res.Id && a.AssignedId == userId) .EndTaskDate.ToFarsi(); - + var userAssign = res.AssignViewModels.First(x => x.AssignedId == userId); res.AssignViewModels = res.AssignViewModels.Where(x => x.AssignedId == userId).ToList(); - res.IsDone = res.AssignViewModels.First(x => x.AssignedId == userId).IsDone; - res.IsCancel = res.AssignViewModels.First(x => x.AssignedId == userId).IsCancel; + res.IsDone = userAssign.IsDone; + res.IsCancel = userAssign.IsCancel; + res.HasRequest = userAssign.IsCanceledRequest || userAssign.TimeRequest || + userAssign.IsDoneRequest; } - if (res.TaskScheduleId>0) + if (res.TaskScheduleId > 0) { var taskSchedule = _accountContext.TaskSchedules.FirstOrDefault(x => x.id == res.TaskScheduleId); @@ -121,7 +123,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository res.ScheduleType = taskSchedule.Type; res.ScheduleCount = taskSchedule.Count; res.ScheduleUnitNumber = taskSchedule.UnitNumber; - } + } //_accountContext.Tasks.Where(x => x.id == TaskId).Select(x => new EditTask() @@ -160,8 +162,6 @@ public class TaskRepository : RepositoryBase, ITaskRepository Remove(task); } - - public List GetRequestedTasks(TaskSearchModel searchModel) { var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value); @@ -900,7 +900,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository AcceptedTimeRequest = x.AcceptedTimeRequest, IsCancelRequest = x.IsCancelRequest, ContractingPartyName = x.ContractingPartyName, - Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel), + Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false), MediaCount = x.MediaCount, HasAttachment = x.MediaCount > 0, SelfName = x.SelfName, @@ -1229,7 +1229,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository AcceptedTimeRequest = x.AcceptedTimeRequest, IsCancelRequest = x.IsCancelRequest, ContractingPartyName = x.ContractingPartyName, - Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel), + Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false), MediaCount = x.MediaCount, HasAttachment = x.MediaCount > 0, SelfName = x.SelfName, @@ -1788,7 +1788,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository AcceptedTimeRequest = x.AcceptedTimeRequest, IsCancelRequest = x.IsCancelRequest, ContractingPartyName = x.ContractingPartyName, - Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel), + Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false), MediaCount = x.MediaCount, HasAttachment = x.MediaCount > 0, SelfName = x.SelfName, @@ -2056,7 +2056,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository TaskScheduleId = x.TaskScheduleId - }).ToList(); + }).ToList(); final = final.Select(x => new TaskViewModel() @@ -2082,7 +2082,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository AcceptedTimeRequest = x.AcceptedTimeRequest, IsCancelRequest = x.IsCancelRequest, ContractingPartyName = x.ContractingPartyName, - Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel), + Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false), MediaCount = x.MediaCount, HasAttachment = x.MediaCount > 0, SelfName = x.SelfName, @@ -2095,7 +2095,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository ScheduleUnitType = x.ScheduleUnitType, TaskScheduleId = x.TaskScheduleId - }).ToList(); + }).ToList(); final = final.Select(x => new TaskViewModel() { @@ -2149,12 +2149,15 @@ public class TaskRepository : RepositoryBase, ITaskRepository ScheduleUnitType = x.ScheduleUnitType, TaskScheduleId = x.TaskScheduleId - }).ToList(); + }).ToList(); return final; } - public string SetTasksColors(DateTime date, bool isCancel) + public string SetTasksColors(DateTime date, bool isCancel, bool hasRequest) { + if (hasRequest) + return "red"; + if (isCancel) { //return "brown"; @@ -2390,7 +2393,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository public List GetTasksByTaskScheduleId(long taskScheduleId) { - return _accountContext.Tasks.Include(x=>x.Assigns).Where(x => x.TaskScheduleId != null && x.TaskScheduleId == taskScheduleId).ToList(); + return _accountContext.Tasks.Include(x => x.Assigns).Where(x => x.TaskScheduleId != null && x.TaskScheduleId == taskScheduleId).ToList(); } @@ -2658,7 +2661,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository AcceptedTimeRequest = x.AcceptedTimeRequest, IsCancelRequest = x.IsCancelRequest, ContractingPartyName = x.ContractingPartyName, - Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel), + Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, false), MediaCount = x.MediaCount, HasAttachment = x.MediaCount > 0, SelfName = x.SelfName, @@ -2722,6 +2725,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository { var accountId = long.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value); var positionValue = int.Parse(_contextAccessor.HttpContext.User.FindFirst("PositionValue").Value); + var today = DateTime.Today; var emptyAcc = new AccountViewModel() { Fullname = "-", @@ -2731,7 +2735,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository var raw = _accountContext.Assigns.Include(x => x.Task).ThenInclude(x => x.TaskMedias) .ThenInclude(x => x.Media) .Where(x => - x.Task.IsActiveString == "true" && x.AssignedId == accountId && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TicketId == null); + x.Task.IsActiveString == "true" && x.AssignedId == accountId && x.Task.TicketId == null); if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch)) { raw = raw.Where(x => @@ -2764,6 +2768,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository MediaCount = _accountContext.TaskMedias.Count(m => m.TaskId == x.Task.id), Description = x.Task.Description, IsDoneRequest = x.IsDoneRequest, + }); if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch)) { @@ -2802,7 +2807,8 @@ public class TaskRepository : RepositoryBase, ITaskRepository ContractingPartyName = x.ContractingPartyName, MediaCount = x.MediaCount, Description = x.Description, - IsDoneRequest = x.IsDoneRequest + IsDoneRequest = x.IsDoneRequest, + HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest }); if (!string.IsNullOrWhiteSpace(searchModel.StartDate) && !string.IsNullOrWhiteSpace(searchModel.EndDate)) { @@ -2871,8 +2877,10 @@ public class TaskRepository : RepositoryBase, ITaskRepository } - var orderResult = result.OrderByDescending(x => x.IsCancel ? 0 : 1).ThenBy(x => x.IsDone ? 1 : 0) - .ThenBy(x => x.EndTaskDateGE); + var orderResult = result.OrderBy(x => x.IsDone || x.IsCancel) + .ThenByDescending(x => x.EndTaskDateGE <= today.AddDays(1) && !x.HasRequest) + .ThenByDescending(x => x.HasRequest) + .ThenBy(x => x.EndTaskDateGE); // مرتب‌سازی داخلی بر اساس تاریخ var final = orderResult.Skip(searchModel.PageIndex).Take(30).ToList(); @@ -2906,7 +2914,8 @@ public class TaskRepository : RepositoryBase, ITaskRepository MediaCount = x.MediaCount, SelfName = x.SelfName, Description = x.Description, - IsDoneRequest = x.IsDoneRequest + IsDoneRequest = x.IsDoneRequest, + HasRequest = x.IsDoneRequest || x.RequestTime || x.IsCancelRequest }).ToList(); @@ -2934,7 +2943,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository AcceptedTimeRequest = x.AcceptedTimeRequest, IsCancelRequest = x.IsCancelRequest, ContractingPartyName = x.ContractingPartyName, - Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel), + Color = x.IsDone ? "green" : SetTasksColors(x.EndTaskDateGE, x.IsCancel, x.HasRequest), MediaCount = x.MediaCount, HasAttachment = x.MediaCount > 0, SelfName = x.SelfName, @@ -2993,6 +3002,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository AssignedName = "-", AssignedPositionValue = 0 }, + HasRequest = x.IsCancelRequest || x.RequestTime || x.IsDoneRequest }).ToList(); return final; } diff --git a/AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs b/AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs index 7228b20b..6563e91d 100644 --- a/AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs +++ b/AccountMangement.Infrastructure.EFCore/Repository/TaskScheduleRepository.cs @@ -3,25 +3,26 @@ using System.Threading.Tasks; using _0_Framework.Application; using _0_Framework.InfraStructure; using AccountManagement.Application.Contracts.Media; +using AccountManagement.Application.Contracts.Task; using AccountManagement.Application.Contracts.TaskSchedule; using AccountManagement.Domain.TaskScheduleAgg; using Microsoft.EntityFrameworkCore; namespace AccountMangement.Infrastructure.EFCore.Repository; -public class TaskScheduleRepository: RepositoryBase, ITaskScheduleRepository +public class TaskScheduleRepository : RepositoryBase, ITaskScheduleRepository { private readonly AccountContext _accountContext; - public TaskScheduleRepository(AccountContext accountContext):base(accountContext) + public TaskScheduleRepository(AccountContext accountContext) : base(accountContext) { _accountContext = accountContext; } public async Task GetDetails(long id) { - var taskSchedule=await _accountContext.TaskSchedules.Include(x=>x.TasksList).ThenInclude(x=>x.Assigns) - .Include(x=>x.TasksList).ThenInclude(x=>x.TaskMedias).ThenInclude(x=>x.Media).FirstOrDefaultAsync(x => x.id == id); + var taskSchedule = await _accountContext.TaskSchedules.Include(x => x.TasksList).ThenInclude(x => x.Assigns) + .Include(x => x.TasksList).ThenInclude(x => x.TaskMedias).ThenInclude(x => x.Media).FirstOrDefaultAsync(x => x.id == id); if (taskSchedule == null) { return null; @@ -29,7 +30,7 @@ public class TaskScheduleRepository: RepositoryBase, ITaskSc var firstTaskDetails = taskSchedule.TasksList.First(); - var firstTimeAssigns = firstTaskDetails.Assigns.Where(x=>x.FirstTimeCreation).ToList(); + var firstTimeAssigns = firstTaskDetails.Assigns.Where(x => x.FirstTimeCreation).ToList(); var assignedIds = firstTimeAssigns.Select(x => x.AssignedId).ToList(); @@ -46,13 +47,15 @@ public class TaskScheduleRepository: RepositoryBase, ITaskSc Title = firstTaskDetails.Title, Description = firstTaskDetails.Description, ContractingPartyName = firstTaskDetails.ContractingPartyName, - AssignedName = assignedAccounts.Select(x=>x.Fullname).ToList(), + AssignedName = assignedAccounts.Select(x => x.Fullname).ToList(), CreationDateFa = firstTaskDetails.CreationDate.ToFarsi(), SenderName = sender.Fullname, TaskScheduleType = taskSchedule.Type, TaskScheduleUnitType = taskSchedule.UnitType, UnitNumber = taskSchedule.UnitNumber, - Medias = firstTaskDetails.TaskMedias.Select(x=> new MediaViewModel() + Count = taskSchedule.Type == TaskScheduleType.Limited ? taskSchedule.Count : "نامحدود", + FirstEndTaskDate = firstTaskDetails.Assigns.FirstOrDefault()?.EndTaskDate.ToFarsi() ?? "", + Medias = firstTaskDetails.TaskMedias.Select(x => new MediaViewModel() { Category = x.Media.Category, Id = x.MediaId, diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModal.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModal.cshtml index 4cd285ab..65aa5658 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModal.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModal.cshtml @@ -273,8 +273,10 @@
- - @if (userId == Model.SenderId) + + @if (!Model.HasRequest) + { + @if (userId == Model.SenderId) { @@ -288,6 +290,7 @@ } + }
}
diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsScheduleModal.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsScheduleModal.cshtml index 400dd8fc..8116cd74 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsScheduleModal.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsScheduleModal.cshtml @@ -25,6 +25,10 @@ } @@ -48,78 +75,93 @@
-
-
-
- ارجاع دهنده: - @Model.SenderName +
+
+
+
+ ارجاع دهنده: + @Model.SenderName +
+ +
+ ارجاع گیرنده: + @Model.AssignedName?.First() +
+
+
+
+ تاریخ ایجاد: + @Model.CreationDateFa +
+ +
+ تاریخ سررسید: + @Model.FirstEndTaskDate +
-
-
- ارجاع گیرنده: - @Model.AssignedName?.First() + +
+
+
+ طرف حساب: + @Model.ContractingPartyName +
+
+ عنوان وظیفه: + @Model.Title +
+
+ +
- -
-
- محدودیت: - - @(Model.TaskScheduleType == TaskScheduleType.Limited ? "محدود" : "نامحدود") - + +
+
+
+ تعداد یادآوری: + + @(Model.TaskScheduleType == TaskScheduleType.Limited ? "محدود" : "نامحدود") + +
-
-
-
- دوره بازه: - - @{ - var unitTypeText = Model.TaskScheduleUnitType switch + +
+
+ دوره بازه: + + @{ + var unitTypeText = Model.TaskScheduleUnitType switch + { + TaskScheduleUnitType.Day => "روزه", + TaskScheduleUnitType.Week => "هفته", + TaskScheduleUnitType.Month => "ماهه", + TaskScheduleUnitType.Year => "سال", + _ => "نامشخص" + }; + } + @if (Model.UnitNumber == "first") { - TaskScheduleUnitType.Day => "روزه", - TaskScheduleUnitType.Week => "هفته", - TaskScheduleUnitType.Month => "ماهه", - TaskScheduleUnitType.Year => "سال", - _ => "نامشخص" - }; - } - @if (Model.UnitNumber == "first") - { - @("اول هفته") - } - else if (Model.UnitNumber == "last") - { - @("آخر هفته") - } - else - { - @Model.UnitNumber @unitTypeText - } - + @("اول هفته") + } + else if (Model.UnitNumber == "last") + { + @("آخر هفته") + } + else + { + @Model.UnitNumber + @unitTypeText + } + +
-
-
- تاریخ ایجاد: - @Model.CreationDateFa -
-
- -
-
- طرف حساب: - @Model.ContractingPartyName -
-
- -
-
- عنوان وظیفه: - @Model.Title -
-
- + +
+ +
@@ -179,7 +221,7 @@
- +
@@ -188,17 +230,17 @@ - + - + - +
@@ -213,11 +255,11 @@ if (fileExtensions.Contains(extension)) { svgName = extension.TrimStart('.').ToLower(); - + } else { - + } } diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml index b1a321da..733d9b82 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml @@ -89,7 +89,7 @@ - diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js index e0d15815..79eefe8d 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js @@ -609,8 +609,8 @@ function loadMore(type) { if (response.pageIndex > 0) { var n = pageIndex + 1; var taskList = response.taskList; - if (n == 1) { + if (type === "schedule") { html += `
ردیف
@@ -676,13 +676,16 @@ function loadMore(type) { html += `
`; + var isRequestTask = item.hasRequest; html += `
${item.createDate}
-
${item.endTaskTime} ${item.endTaskDateFA}
+
+ ${isRequestTask ? `در حال بررسی` : `${item.endTaskTime} ${item.endTaskDateFA}` } +
@@ -906,7 +909,9 @@ function loadMore(type) {
- ${item.endTaskTime} ${item.endTaskDateFA} + + ${isRequestTask ? `در حال بررسی` : `${item.endTaskTime} ${item.endTaskDateFA}` } +
@@ -1011,13 +1016,16 @@ function loadMore(type) { html += `
`; + var isRequestTask = item.hasRequest; html += `
${item.createDate}
-
${item.endTaskTime} ${item.endTaskDateFA}
+
+ ${isRequestTask ? `در حال بررسی` : `${item.endTaskTime} ${item.endTaskDateFA}` } +
@@ -1228,7 +1236,7 @@ function loadMore(type) { // } // }); //} - + html += `
@@ -1258,7 +1266,9 @@ function loadMore(type) {
- ${item.endTaskTime} ${item.endTaskDateFA} + + ${isRequestTask ? `در حال بررسی` : `${item.endTaskTime} ${item.endTaskDateFA}` } +
@@ -1471,10 +1481,12 @@ function loadMoreRequest(type) { headers: { "RequestVerificationToken": `${antiForgeryToken}` }, + success: function (response) { if (response.pageIndex > 0) { var n = pageIndex + 1; var taskList = response.taskList; + console.log(taskList); if (n == 1) { html += `
@@ -1560,14 +1572,15 @@ function loadMoreRequest(type) { html += `
`; - html += `
${item.createDate}
-
${item.endTaskTime} ${item.endTaskDateFA}
+
+ ${item.endTaskTime} ${item.endTaskDateFA} +
From 59112d9635b6ff875c76c3b82e35d25e7f84524c Mon Sep 17 00:00:00 2001 From: MahanCh Date: Tue, 20 May 2025 18:34:30 +0330 Subject: [PATCH 4/6] add static checkout style --- .../CheckoutApplication.cs | 229 +- .../Repository/CheckoutRepository.cs | 164 +- .../Repository/RollCallMandatoryRepository.cs | 8 +- .../Company/Checkouts/CheckoutPrintAll.cshtml | 2883 +------------ .../Pages/Company/Checkouts/Details.cshtml | 3752 +++++------------ .../Pages/Company/Checkouts/Index.cshtml | 2051 +-------- .../Pages/Company/Checkouts/PrintAll.cshtml | 2871 +------------ .../Checkouts/PrintDetailsRollCall.cshtml | 118 +- .../_Partials/PrintDetailStaticRaw.cshtml | 632 +++ .../_Partials/PrintDetailsRollCallRaw.cshtml | 98 +- .../Company/Checkouts/CheckoutPrintAll.cshtml | 2202 +--------- .../Pages/Company/Checkouts/PrintAll.cshtml | 2829 +------------ .../Pages/Company/Checkouts/PrintOne.cshtml | 2861 +++---------- .../Company/Checkouts/PrintOneMobile.cshtml | 3619 +++------------- .../Company/Checkouts/PrintOneRollCall.cshtml | 156 +- .../_Partials/PrintDetailStaticRaw.cshtml | 631 +++ .../_Partials/PrintDetailsRollCallRaw.cshtml | 58 +- .../AssetsAdmin/page/Checkouts/css/Index.css | 617 +++ .../AssetsAdmin/page/Checkouts/js/Index.js | 1036 +++++ .../pages/Checkouts/css/PrintOne.css | 58 + .../pages/Checkouts/css/PrintOneMobile.css | 58 + .../pages/Checkouts/css/PrintOneRollCall.css | 33 + 22 files changed, 6234 insertions(+), 20730 deletions(-) create mode 100644 ServiceHost/Areas/Admin/Pages/Company/Checkouts/_Partials/PrintDetailStaticRaw.cshtml create mode 100644 ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailStaticRaw.cshtml create mode 100644 ServiceHost/wwwroot/AssetsAdmin/page/Checkouts/css/Index.css create mode 100644 ServiceHost/wwwroot/AssetsAdmin/page/Checkouts/js/Index.js diff --git a/CompanyManagment.Application/CheckoutApplication.cs b/CompanyManagment.Application/CheckoutApplication.cs index 5470fcaa..227aa0d4 100644 --- a/CompanyManagment.Application/CheckoutApplication.cs +++ b/CompanyManagment.Application/CheckoutApplication.cs @@ -52,73 +52,85 @@ public class CheckoutApplication : ICheckoutApplication string month = string.Empty; switch (smonth) { - case 1: month = "فروردین"; + case 1: + month = "فروردین"; break; - case 2: month = "اردیبهشت"; + case 2: + month = "اردیبهشت"; break; - case 3:month = "خرداد"; + case 3: + month = "خرداد"; break; - case 4: month = "تیر"; + case 4: + month = "تیر"; break; - case 5: month = "مرداد"; + case 5: + month = "مرداد"; break; - case 6: month = "شهریور"; + case 6: + month = "شهریور"; break; - case 7:month = "مهر"; + case 7: + month = "مهر"; break; - case 8: month = "آبان"; + case 8: + month = "آبان"; break; - case 9: month = "آذر"; + case 9: + month = "آذر"; break; - case 10: month = "دی"; + case 10: + month = "دی"; break; - case 11: month = "بهمن"; + case 11: + month = "بهمن"; break; - case 12: month = "اسفند"; + case 12: + month = "اسفند"; break; } var year = syear.ToString(); - #region SickLeav + #region SickLeav - //var serachModel = new LeaveSearchModel() - //{ - // EmployeeId = command.EmployeeId, - // WorkshopId = command.WorkshopId, - // LeaveType = "استعلاجی", - // StartLeave = command.ContractStart, - // EndLeave = command.ContractEnd, - // IsAccepted = true, - //}; - //var leavList = _leaveApplication.search(serachModel); - // int sickLeaveCount = 0; - //if (leavList.Count > 0) - //{ - - // foreach (var leave in leavList) - // { - // if (leave.StartLeaveGr < command.ContractStartGr && leave.EndLeaveGr <= command.ContractEndGr) - // { - // int res = (int)((leave.EndLeaveGr - command.ContractStartGr).TotalDays +1); - // sickLeaveCount += res; - // } - // else if (leave.StartLeaveGr >= command.ContractStartGr && leave.EndLeaveGr > command.ContractEndGr) - // { - // int res = (int)((command.ContractEndGr - leave.StartLeaveGr).TotalDays + 1); - // sickLeaveCount += res; - // } - // else - // { - // int res = (int)((leave.EndLeaveGr - leave.StartLeaveGr).TotalDays + 1); - // sickLeaveCount += res; - // } - - // } - //} + //var serachModel = new LeaveSearchModel() + //{ + // EmployeeId = command.EmployeeId, + // WorkshopId = command.WorkshopId, + // LeaveType = "استعلاجی", + // StartLeave = command.ContractStart, + // EndLeave = command.ContractEnd, + // IsAccepted = true, + //}; + //var leavList = _leaveApplication.search(serachModel); + // int sickLeaveCount = 0; + //if (leavList.Count > 0) + //{ - #endregion + // foreach (var leave in leavList) + // { + // if (leave.StartLeaveGr < command.ContractStartGr && leave.EndLeaveGr <= command.ContractEndGr) + // { + // int res = (int)((leave.EndLeaveGr - command.ContractStartGr).TotalDays +1); + // sickLeaveCount += res; + // } + // else if (leave.StartLeaveGr >= command.ContractStartGr && leave.EndLeaveGr > command.ContractEndGr) + // { + // int res = (int)((command.ContractEndGr - leave.StartLeaveGr).TotalDays + 1); + // sickLeaveCount += res; + // } + // else + // { + // int res = (int)((leave.EndLeaveGr - leave.StartLeaveGr).TotalDays + 1); + // sickLeaveCount += res; + // } - var dayliWage = command.DayliWage.MoneyToDouble(); + // } + //} + + #endregion + + var dayliWage = command.DayliWage.MoneyToDouble(); // کمک هزینه اقلام var consumableItem = command.ConsumableItems.MoneyToDouble(); //حق اولاد @@ -128,8 +140,8 @@ public class CheckoutApplication : ICheckoutApplication //حق تاهل var marriedAllowance = command.MarriedAllowance.MoneyToDouble(); var MontlyYearsBunos = - _yearlySalaryRepository.GetMontlyBunosYears(command.WeeklyTime, command.ContractStartGr, command.ContractEndGr, dayliWage,command.WorkingWeeklyTime,command.officialholiday,command.friday, command.TotalHolidaysAndNotH, command.TotalHolidaysAndNotM, command.Basic, command.FridayStarttoEnd,command.DailFeeComplete,command.HasRollCall, command.HolidayWorking, command.ShiftWork); - //دستمزد ماهانه + _yearlySalaryRepository.GetMontlyBunosYears(command.WeeklyTime, command.ContractStartGr, command.ContractEndGr, dayliWage, command.WorkingWeeklyTime, command.officialholiday, command.friday, command.TotalHolidaysAndNotH, command.TotalHolidaysAndNotM, command.Basic, command.FridayStarttoEnd, command.DailFeeComplete, command.HasRollCall, command.HolidayWorking, command.ShiftWork); + //دستمزد ماهانه var monthlyWage = MontlyYearsBunos.MontlyWage; //سنوات var years = command.YearsPay; @@ -147,7 +159,7 @@ public class CheckoutApplication : ICheckoutApplication //حق بیمه سهم کارگر var insuranceDeduction = (monthlyWage + bacicYears + consumableItem + housingAllowance + marriedAllowance) * 7 / 100; - if (command.OvertimePay > 0 && command.AbsenceDeduction>0) + if (command.OvertimePay > 0 && command.AbsenceDeduction > 0) { if (command.AbsenceDeduction >= command.OvertimePay) { @@ -165,14 +177,14 @@ public class CheckoutApplication : ICheckoutApplication var checkoutEnd = checkoutStart.FindeEndOfMonth(); var salaryAids = _rollCallMandatoryRepository.SalaryAidsForCheckout(command.EmployeeId, command.WorkshopId, checkoutStart.ToGeorgianDateTime(), checkoutEnd.ToGeorgianDateTime()) - .Select(x => new CheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa, x.CalculationDateTimeGe, x.CalculationDateTimeFa,x.Id)).ToList(); + .Select(x => new CheckoutSalaryAid(x.Amount, x.SalaryAidDateTimeGe, x.SalaryAidDateTimeFa, x.CalculationDateTimeGe, x.CalculationDateTimeFa, x.Id)).ToList(); command.SalaryAidDeduction = salaryAids.Sum(x => x.Amount.MoneyToDouble()); var loanInstallments = _rollCallMandatoryRepository.LoanInstallmentForCheckout(command.EmployeeId, command.WorkshopId, command.ContractStartGr, command.ContractEndGr) - .Select(x => new CheckoutLoanInstallment(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount,x.Id)).ToList(); + .Select(x => new CheckoutLoanInstallment(x.Amount, x.Month, x.Year, x.IsActive, x.RemainingAmount, x.LoanAmount, x.Id)).ToList(); command.InstallmentDeduction = loanInstallments.Sum(x => x.AmountForMonth.MoneyToDouble()); @@ -196,14 +208,14 @@ public class CheckoutApplication : ICheckoutApplication command.Signature = "0"; } - - - var checkout = new Checkout(command.EmployeeFullName, command.FathersName ,command.NationalCode + + + var checkout = new Checkout(command.EmployeeFullName, command.FathersName, command.NationalCode , command.DateOfBirth, command.EmployeeId, command.WorkshopName, command.WorkshopId, command.ContractNo, command.ContractStartGr, command.ContractEndGr, month, year, command.ContractId, command.WorkingHoursId, monthlyWage, bacicYears, consumableItem, housingAllowance , command.OvertimePay, command.NightworkPay, command.FridayPay, 0, command.ShiftPay, familyAllowance, bunos, years, command.LeavePay, insuranceDeduction, 0, command.InstallmentDeduction, command.SalaryAidDeduction, command.AbsenceDeduction, sumOfWorkingDays, - command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature,marriedAllowance,command.LeaveCheckout,command.CreditLeaves,command.AbsencePeriod,command.AverageHoursPerDay,command.HasRollCall,command.OverTimeWorkValue,command.OverNightWorkValue - ,command.FridayWorkValue, command.RotatingShiftValue,command.AbsenceValue,command.TotalDayOfLeaveCompute,command.TotalDayOfYearsCompute,command.TotalDayOfBunosesCompute,loanInstallments, salaryAids); + command.ArchiveCode, command.PersonnelCode, totalClaims, totalDeductions, totalPayment, command.Signature, marriedAllowance, command.LeaveCheckout, command.CreditLeaves, command.AbsencePeriod, command.AverageHoursPerDay, command.HasRollCall, command.OverTimeWorkValue, command.OverNightWorkValue + , command.FridayWorkValue, command.RotatingShiftValue, command.AbsenceValue, command.TotalDayOfLeaveCompute, command.TotalDayOfYearsCompute, command.TotalDayOfBunosesCompute, loanInstallments, salaryAids); _checkoutRepository.CreateCkeckout(checkout).GetAwaiter().GetResult(); //_checkoutRepository.SaveChanges(); @@ -214,7 +226,7 @@ public class CheckoutApplication : ICheckoutApplication } - + } public OperationResult Edit(EditCheckout command) @@ -230,7 +242,7 @@ public class CheckoutApplication : ICheckoutApplication public async Task> Search(CheckoutSearchModel searchModel) { var result = new List(); - var query =await _checkoutRepository.SearchForMainCheckout(searchModel); + var query = await _checkoutRepository.SearchForMainCheckout(searchModel); query = query.Select(x => new CheckoutViewModel() { Id = x.Id, @@ -268,7 +280,7 @@ public class CheckoutApplication : ICheckoutApplication // // .Select(x => x.EmployerId).FirstOrDefault(); // //var employerName = _context.Employers?.FirstOrDefault(x => x.id == employeId).FullName; // // = employerName; - + //} return query; @@ -288,31 +300,30 @@ public class CheckoutApplication : ICheckoutApplication return new(); result.ForEach(x => { - if (x.HasRollCall) - { - int yearFa; - int monthFa; - try - { - yearFa = int.Parse(oneRecord.Year); - monthFa = oneRecord.Month.ToMonthByStringValue(); - } - catch (Exception e) - { - return; - } - double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa); - int mandatoryWholeHours = (int)mandatoryHours; - int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60); - var totalWorking = new TimeSpan(x.MonthlyRollCall.Sum(y => y.TotalhourseSpan.Ticks)); - var totalBreakTime = new TimeSpan(x.MonthlyRollCall.Sum(y => y.BreakTimeTimeSpan.Ticks)); - var totalPresent = totalWorking + totalBreakTime; - x.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-"); - x.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-"); - x.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-"); - x.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-"); + + int yearFa; + int monthFa; + try + { + yearFa = int.Parse(oneRecord.Year); + monthFa = oneRecord.Month.ToMonthByStringValue(); } + catch (Exception e) + { + return; + } + double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa); + int mandatoryWholeHours = (int)mandatoryHours; + int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60); + var totalWorking = new TimeSpan(x.MonthlyRollCall.Sum(y => y.TotalhourseSpan.Ticks)); + var totalBreakTime = new TimeSpan(x.MonthlyRollCall.Sum(y => y.BreakTimeTimeSpan.Ticks)); + var totalPresent = totalWorking + totalBreakTime; + x.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-"); + x.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-"); + x.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-"); + x.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-"); + }); return result; } @@ -321,31 +332,29 @@ public class CheckoutApplication : ICheckoutApplication { var result = _checkoutRepository.PrintOne(id); - if (result.HasRollCall) + int yearFa; + int monthFa; + try { - int yearFa; - int monthFa; - try - { - yearFa = int.Parse(result.Year); - monthFa = result.Month.ToMonthByStringValue(); - } - catch (Exception e) - { - return new(); - } - double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa); - int mandatoryWholeHours = (int)mandatoryHours; - int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60); - var totalWorking = new TimeSpan(result.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks)); - var totalBreakTime = new TimeSpan(result.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks)); - var totalPresent = totalWorking + totalBreakTime; - - result.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-"); - result.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-"); - result.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-"); - result.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-"); + yearFa = int.Parse(result.Year); + monthFa = result.Month.ToMonthByStringValue(); } + catch (Exception e) + { + return new(); + } + double mandatoryHours = _mandatoryHoursApplication.GetMandatoryHoursByYearAndMonth(yearFa, monthFa); + int mandatoryWholeHours = (int)mandatoryHours; + int mandatoryMinutes = (int)((mandatoryHours - mandatoryWholeHours) * 60); + var totalWorking = new TimeSpan(result.MonthlyRollCall.Sum(x => x.TotalhourseSpan.Ticks)); + var totalBreakTime = new TimeSpan(result.MonthlyRollCall.Sum(x => x.BreakTimeTimeSpan.Ticks)); + var totalPresent = totalWorking + totalBreakTime; + + result.TotalWorkingTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalWorking.TotalHours, totalWorking.Minutes, "-"); + result.TotalBreakTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalBreakTime.TotalHours, totalBreakTime.Minutes, "-"); + result.TotalPresentTimeStr = Tools.ToFarsiHoursAndMinutes((int)totalPresent.TotalHours, totalPresent.Minutes, "-"); + result.TotalMandatoryTimeStr = Tools.ToFarsiHoursAndMinutes(mandatoryWholeHours, mandatoryMinutes, "-"); + return result; } @@ -408,7 +417,7 @@ public class CheckoutApplication : ICheckoutApplication _checkoutRepository.SaveChanges(); - + return opration.Succcedded(); } @@ -423,7 +432,7 @@ public class CheckoutApplication : ICheckoutApplication var checkout = _checkoutRepository.Get(id); var totalClaimsDouble = checkout.TotalClaims.MoneyToDouble(); var totalDeductionsDouble = checkout.TotalDeductions.MoneyToDouble(); - totalClaimsDouble = (double) (totalClaimsDouble - checkout.RewardPay); + totalClaimsDouble = (double)(totalClaimsDouble - checkout.RewardPay); totalDeductionsDouble = totalDeductionsDouble - checkout.SalaryAidDeduction; var totalClaims = totalClaimsDouble + rewardPay; diff --git a/CompanyManagment.EFCore/Repository/CheckoutRepository.cs b/CompanyManagment.EFCore/Repository/CheckoutRepository.cs index 0741bfe8..8f9ff480 100644 --- a/CompanyManagment.EFCore/Repository/CheckoutRepository.cs +++ b/CompanyManagment.EFCore/Repository/CheckoutRepository.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Globalization; using System.Linq; using System.Threading.Tasks; using _0_Framework.Application; @@ -11,9 +12,11 @@ using Company.Domain.RollCallAgg; using CompanyManagment.App.Contracts.Checkout; using CompanyManagment.App.Contracts.Contract; using CompanyManagment.App.Contracts.Employee; +using CompanyManagment.App.Contracts.HolidayItem; using CompanyManagment.App.Contracts.Leave; using CompanyManagment.App.Contracts.LeftWork; using CompanyManagment.App.Contracts.Loan; +using CompanyManagment.App.Contracts.RollCall; using CompanyManagment.App.Contracts.SalaryAid; using CompanyManagment.App.Contracts.WorkingHours; using CompanyManagment.App.Contracts.WorkingHoursTemp; @@ -37,8 +40,9 @@ public class CheckoutRepository : RepositoryBase, ICheckoutRepos private readonly IConfiguration _configuration; private readonly ILeftWorkRepository _leftWorkRepository; private readonly IRollCallRepository _rollCallRepository; + private readonly IRollCallMandatoryRepository _rollCallMandatoryRepository; - public CheckoutRepository(IAuthHelper authHelper, CompanyContext context, IConfiguration configuration, ILeftWorkRepository leftWorkRepository, IWorkingHoursTempApplication workingHoursTempApplication, IRollCallRepository rollCallRepository) : base(context) + public CheckoutRepository(IAuthHelper authHelper, CompanyContext context, IConfiguration configuration, ILeftWorkRepository leftWorkRepository, IWorkingHoursTempApplication workingHoursTempApplication, IRollCallRepository rollCallRepository, IRollCallMandatoryRepository rollCallMandatoryRepository) : base(context) { _authHelper = authHelper; @@ -47,6 +51,7 @@ public class CheckoutRepository : RepositoryBase, ICheckoutRepos _leftWorkRepository = leftWorkRepository; _workingHoursTempApplication = workingHoursTempApplication; _rollCallRepository = rollCallRepository; + _rollCallMandatoryRepository = rollCallMandatoryRepository; } /// @@ -664,7 +669,17 @@ public class CheckoutRepository : RepositoryBase, ICheckoutRepos } if (ch.HasRollCall) ch.MonthlyRollCall = _rollCallRepository.GetEmployeeRollCallsForMonth(ch.EmployeeId, ch.WorkshopId, ch.ContractStartGr, ch.ContractEndGr); - query.Add(ch); + else + { + ch.CreateWorkingHoursTemp.ContractStartGr = ch.ContractStartGr; + ch.CreateWorkingHoursTemp.ContractEndGr = ch.ContractEndGr; + ch.CreateWorkingHoursTemp.ContarctStart = ch.ContractStartGr.ToFarsi(); + ch.CreateWorkingHoursTemp.ContractEnd = ch.ContractEndGr.ToFarsi(); + ch.CreateWorkingHoursTemp.EmployeeId = ch.EmployeeId; + ch.CreateWorkingHoursTemp.WorkshopId = ch.WorkshopId; + ch.MonthlyRollCall = ConvertStaticToRollCall(ch.CreateWorkingHoursTemp, workshopName.WorkshopHolidayWorking); + } + query.Add(ch); } query = query.OrderBy(x => x.PersonnelCodeInt).ToList(); @@ -950,11 +965,150 @@ public class CheckoutRepository : RepositoryBase, ICheckoutRepos } if (ch.HasRollCall) ch.MonthlyRollCall = _rollCallRepository.GetEmployeeRollCallsForMonth(ch.EmployeeId, ch.WorkshopId, ch.ContractStartGr, ch.ContractEndGr); - - return ch; + else + { + ch.CreateWorkingHoursTemp.ContractStartGr = ch.ContractStartGr; + ch.CreateWorkingHoursTemp.ContractEndGr = ch.ContractEndGr; + ch.CreateWorkingHoursTemp.ContarctStart = ch.ContractStartGr.ToFarsi(); + ch.CreateWorkingHoursTemp.ContractEnd = ch.ContractEndGr.ToFarsi(); + ch.CreateWorkingHoursTemp.EmployeeId = ch.EmployeeId; + ch.CreateWorkingHoursTemp.WorkshopId = ch.WorkshopId; + ch.MonthlyRollCall = ConvertStaticToRollCall(ch.CreateWorkingHoursTemp, workshopName.WorkshopHolidayWorking); + } + return ch; } - public OperationResult RemoveCheckout(long id) + private List ConvertStaticToRollCall(CreateWorkingHoursTemp workingHours, bool workshopHolidayWorking) + { + var rollCalls = _rollCallMandatoryRepository.ConvertStaticHoursToRollCall(workingHours, + workshopHolidayWorking); + var workshopId = workingHours.WorkshopId; + var employeeId = workingHours.EmployeeId; + var year = Convert.ToInt32(workingHours.ContarctStart.Substring(0, 4)); + var month = Convert.ToInt32(workingHours.ContarctStart.Substring(5, 2)); + var startMonthDay = $"{year:0000}/{month:00}/01".ToGeorgianDateTime(); + var endMonthDay = workingHours.ContractEndGr; + + var leaves = _context.LeaveList.Where(x => + x.WorkshopId == workshopId && x.EmployeeId == employeeId && x.EndLeave.Date >= startMonthDay.Date && + x.StartLeave.Date <= endMonthDay.Date).ToList(); + + var firstDayOfCurrentMonth = new DateTime(year, month, 1, new PersianCalendar()); + + + if (month == 12) + { + year += 1; + month = 1; + } + else + month += 1; + + var nextMonthDate = new DateTime(year, month, 1, new PersianCalendar()); + + var lastDayOfCurrentMonth = nextMonthDate.AddDays(-1); + + int dateRange = (int)(lastDayOfCurrentMonth - firstDayOfCurrentMonth).TotalDays + 1; + + + var holidays = _context.HolidayItems.Where(x => x.HolidayYear.Contains(year.ToString())).Select(x => new HolidayItemViewModel + { + Id = x.id, + Holidaydate = x.Holidaydate.ToFarsi(), + HolidayId = x.HolidayId, + HolidayYear = x.HolidayYear, + HolidaydateGr = x.Holidaydate + }).ToList(); + + if (workshopHolidayWorking) + holidays = []; + + //all the dates from start to end, to be compared with present days to get absent dates + var completeDaysList = Enumerable.Range(0, dateRange).Select(offset => startMonthDay.AddDays(offset).Date).ToList(); + + var absentRecords = completeDaysList + .ExceptBy(rollCalls.Select(x => x.ShiftDate.Date), y => y.Date) + .Select(x => + { + var leave = leaves.FirstOrDefault(y => + y.EmployeeId == employeeId && y.EndLeave.Date >= x.Date && y.StartLeave.Date <= x.Date); + var isHoliday = false; + var isFriday = x.Date.DayOfWeek == DayOfWeek.Friday; + var isNormalWorkingDay = isHoliday == false && isFriday == false; + return new CheckoutDailyRollCallViewModel() + { + StartDate1 = null, + EndDate1 = null, + DateTimeGr = x.Date, + DayOfWeek = x.Date.DayOfWeek.DayOfWeeKToPersian(), + RollCallDateFa = x.Date.ToFarsi(), + LeaveType = leave != null ? leave.LeaveType : "", + IsAbsent = leave == null && isNormalWorkingDay + }; + }); + + + var presentDays = rollCalls.GroupBy(x => x.ShiftDate.Date).Select(x => + { + + var orderedRollcalls = x.OrderBy(y => y.ShiftDate).ToList(); + + var rollCallTimeSpanPerDay = + new TimeSpan(x.Where(y => y.EndDate != null).Sum(y => (y.EndDate - y.StartDate)!.Value.Ticks)); + var breakTimePerDay = new TimeSpan(x.Sum(r => r.BreakTimeSpan.Ticks)); + + var firstRollCall = orderedRollcalls.FirstOrDefault(); + var secondRollCall = orderedRollcalls.FirstOrDefault(); + + return new CheckoutDailyRollCallViewModel() + { + StartDate1 = firstRollCall?.StartDate?.ToString("HH:mm") ?? "", + EndDate1 = firstRollCall?.EndDate?.ToString("HH:mm") ?? "", + + StartDate2 = secondRollCall?.StartDate?.ToString("HH:mm") ?? "", + EndDate2 = secondRollCall?.EndDate?.ToString("HH:mm") ?? "", + + TotalhourseSpan = rollCallTimeSpanPerDay - breakTimePerDay, + + BreakTimeTimeSpan = breakTimePerDay, + + DayOfWeek = x.Key.DayOfWeek.DayOfWeeKToPersian(), + RollCallDateFa = x.Key.Date.ToFarsi(), + DateTimeGr = x.Key.Date, + IsSliced = x.Count() > 2, + IsAbsent = false + }; + }); + + + presentDays = presentDays.Select(x => new CheckoutDailyRollCallViewModel + { + StartDate1 = x.StartDate1, + EndDate1 = x.EndDate1, + EndDate2 = x.EndDate2, + StartDate2 = x.StartDate2, + TotalWorkingHours = $"{(int)(x.TotalhourseSpan.TotalHours)}:{x.TotalhourseSpan.Minutes:00}", + BreakTimeString = $"{(int)(x.BreakTimeTimeSpan.TotalHours)}:{x.BreakTimeTimeSpan.Minutes:00}", + TotalhourseSpan = x.TotalhourseSpan, + BreakTimeTimeSpan = x.BreakTimeTimeSpan, + DayOfWeek = x.DayOfWeek, + RollCallDateFa = x.RollCallDateFa, + DateTimeGr = x.DateTimeGr, + IsSliced = x.IsSliced, + IsAbsent = false + }); + + var result = presentDays.Concat(absentRecords).OrderBy(x => x.DateTimeGr).ToList(); + result.ForEach(x => + { + x.IsHoliday = holidays.Any(y => x.DateTimeGr.Date == y.HolidaydateGr.Date); + x.IsFriday = x.DateTimeGr.DayOfWeek == DayOfWeek.Friday; + }); + + return result; + } + + public OperationResult RemoveCheckout(long id) { var op = new OperationResult(); var item = _context.CheckoutSet.FirstOrDefault(x => x.id == id); diff --git a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs index 3301287f..ad1cae73 100644 --- a/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs @@ -2037,7 +2037,7 @@ public class RollCallMandatoryRepository : RepositoryBase, IRoll var starTimeSingel1 = Convert.ToDateTime(shift1Start); var endTimeSingel2 = Convert.ToDateTime(shift1End); - + bool hasRestTime = false; shift1StartGr = new DateTime(cuurentDate.Year, cuurentDate.Month, cuurentDate.Day, starTimeSingel1.Hour, starTimeSingel1.Minute,0); shift1EndGr = new DateTime(cuurentDate.Year, cuurentDate.Month, cuurentDate.Day, endTimeSingel2.Hour, endTimeSingel2.Minute, 0); @@ -2048,6 +2048,7 @@ public class RollCallMandatoryRepository : RepositoryBase, IRoll var shiftSpan = (shift1EndGr - shift1StartGr); if (restTime > TimeSpan.Zero && shiftSpan >= restTime) { + hasRestTime = true; shift1EndGr = shift1EndGr.Subtract(restTime); shiftSpan = (shift1EndGr - shift1StartGr); } @@ -2060,6 +2061,7 @@ public class RollCallMandatoryRepository : RepositoryBase, IRoll { result.Add(new RollCallViewModel() { + BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero, StartDate = shift1StartGr, EndDate = shift1EndGr, ShiftSpan = shiftSpan, @@ -2075,6 +2077,7 @@ public class RollCallMandatoryRepository : RepositoryBase, IRoll //shift <----------------------------------> result.Add(new RollCallViewModel() { + BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero, StartDate = hourseLeaveTypeResult.EndLeaveGr, EndDate = shift1EndGr, ShiftSpan = (shift1EndGr - hourseLeaveTypeResult.EndLeaveGr), @@ -2087,6 +2090,7 @@ public class RollCallMandatoryRepository : RepositoryBase, IRoll //shift <----------------------------------> result.Add(new RollCallViewModel() { + BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero, StartDate = shift1StartGr, EndDate = hourseLeaveTypeResult.StartLeaveGr, ShiftSpan = (hourseLeaveTypeResult.StartLeaveGr - shift1StartGr), @@ -2095,6 +2099,7 @@ public class RollCallMandatoryRepository : RepositoryBase, IRoll result.Add(new RollCallViewModel() { + BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero, StartDate = hourseLeaveTypeResult.EndLeaveGr, EndDate = shift1EndGr, ShiftSpan = (shift1EndGr - hourseLeaveTypeResult.EndLeaveGr), @@ -2108,6 +2113,7 @@ public class RollCallMandatoryRepository : RepositoryBase, IRoll result.Add(new RollCallViewModel() { + BreakTimeSpan = hasRestTime ? restTime : TimeSpan.Zero, StartDate = shift1StartGr, EndDate = hourseLeaveTypeResult.StartLeaveGr, ShiftSpan = (hourseLeaveTypeResult.StartLeaveGr - shift1StartGr), diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/CheckoutPrintAll.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/CheckoutPrintAll.cshtml index 7b6e5d7f..355fd8fb 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/CheckoutPrintAll.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/CheckoutPrintAll.cshtml @@ -314,6 +314,44 @@ width: 100%; justify-content: space-between; } + + .trTable:nth-child(even) { + background-color: #f1f1f1 !important; + } + + .shiftWorkContainerMsg { + position: relative; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + border: 1px solid #D9D9D9 !important; + border-radius: 7px; + color: #1F1F1F !important; + font-size: 16px !important; + gap: 9px; + padding: 15px 21px; + max-width: 380px; + margin: auto; + } + + .shiftTitle { + position: absolute; + top: -10px; + right: 5px; + padding: 2px 4px; + color: #000000 !important; + font-size: 12px !important; + background-color: #F6F6F6 !important; + } + + .shiftTime { + display: flex; + align-items: center; + justify-content: center; + gap: 6px; + } + var btnActive = "btn-active"; @@ -373,2838 +411,19 @@
-
- -@foreach (var items in Model.GroupPrintList) -{ - @if (items.HasRollCall) - { - - } - else - { -
-
-
-
-
-
-
-
@items.ContractNo
-
-
-

بسمه تعالی

-

فیش حقوقی و رسید پرداخت حقوق

-
-
-
-
-
- - اینجانب   @items.EmployeeFullName - - - نام پدر: - @if (string.IsNullOrWhiteSpace(items.FathersName)) - { - "1111111111" - } - else - { - @items.FathersName - } - - - - به کد ملی:   - @if (string.IsNullOrWhiteSpace(items.NationalCode)) - { - 222333111 - } - else - { - @items.NationalCode - } - - متولد:   - @if (string.IsNullOrWhiteSpace(items.DateOfBirth)) - { - 1401/01/01 - } - else - { - @items.DateOfBirth - } - -
-
-
- - @{ - if (items.EmployerList.FirstOrDefault().IsLegal == "حقیقی") - { - پـرسنل کارگاه  @items.WorkshopName -   - به کارفرمایی   آقای/خانم -   -   - if (items.EmployerList.Count > 1) - { - - @items.EmployerList[0].EmployerFullName ، -  @items.EmployerList[1].EmployerFullName - @if (items.EmployerList.Count > 2) - { - و غیره - } - -
- } - else - { - - @items.EmployerList.FirstOrDefault().EmployerFullName - -
- } - } - else if (items.EmployerList.FirstOrDefault().IsLegal == "حقوقی") - { - پـرسنل شرکت/موسسه  @items.WorkshopName -
- } - - } - - کلیه حق السعی خود اعم از حقوق، کمک هزینه اقلام مصرفی خانوار، کمک هزینه مسکن - - و همچنین عیدی و پاداش، سنوات و... - @items.Month ماه - سال @items.Year - برابر با قرارداد به شماره فوق را از کارفرما بصورت وجه نقد و واریز به حساب دریافت نموده ام. - -
- -
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
مطالبات کسورات
ردیف شرح مبلغ(ریال) شرح مبلغ(ریال)
1 حقوق و مزد @items.MonthlySalary حق بیمه سهم کارگر @items.InsuranceDeduction
2 پایه سنوات @items.BaseYearsPay مالیات بر حقوق @items.TaxDeducation
3 کمک هزینه اقلام مصرفی خانوار @items.ConsumableItems قسط تسهیلات @items.InstallmentDeduction
4 کمک هزینه مسکن @items.HousingAllowance مساعده @items.SalaryAidDeduction
5 فوق العاده اضافه کاری @items.OvertimePay غیبت @items.AbsenceDeduction
6 فوق العاده شب کاری @items.NightworkPay
7 فوق العاده جمعه کاری @items.FridayPay
8 فوق العاده ماموریت @items.MissionPay
9 فوق العاده نوبت کاری @items.ShiftPay
10 کمک هزینه عائله مندی @items.FamilyAllowance
11 حق تاهل @items.MarriedAllowance
12 پاداش @items.RewardPay
13 عیدی و پاداش @items.BonusesPay
14 سنوات @items.YearsPay
15 مزد مرخصی @items.LeavePay
جمع مطالبات @items.TotalClaims جمع کسورات @items.TotalDeductions
مبلغ قابل پرداخت @items.TotalPayment
-
-
-
- - - - - @if (items.CreateWorkingHoursTemp.ShiftWork == "4") - { -
-
- مقطع اول کار - مدت استراحت - مقطع دوم کار - مقطع اول کار - مدت استراحت - مقطع دوم کار - - -
-
- - -
- هفته اول - -
- - - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
- هفته دوم - -
- - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- - -
- -
- هفته سوم - -
- - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
- هفته چهارم -
- - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
-
- } - else - { -
-
- -
- - - - - - - - - - -
- -
- - -
- } - - - - - - - -
-
-
-
- @{ - if (items.IsLeft) - { - - طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب  - @items.LastDayOfWork  - بوده و قطع همکاری با کارفرما و کارگاه از تاریخ  - @items.LeftWorkDate  - می باشد - - } - } - -
-
-
- @*
اینجانب     @Model.EmployeeFullName
-
نام پدر:     @Model.FathersName
-
به کد ملی:  @Model.NationalCode
-
متولد:     @Model.DateOfBirth
*@ -
-
-
- @* پـرسنل شـرکت  @Model.WorkshopName -   - به کارفرمایی   آقای/خانم/شرکت    - @{ - foreach (var item in @Model.EmployerList) - { - @item.EmployerFullName ، - } - } -    - مبلغ ............. ریال را بصورت نقدی از کارفرما دریافت نمودم. *@ - - - -
- -
-
- -
- امضاء و اثر انگشت -
-
- -
-
-
-
-
-
- -
-
- } - - -} - - - - -
+
+ @foreach (var items in Model.GroupPrintList) + { + @if (items.HasRollCall) + { + + } + else + { + + } + } +
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Details.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Details.cshtml index 8bafce71..91b4e62a 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Details.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Details.cshtml @@ -1,6 +1,15 @@ -@model CompanyManagment.App.Contracts.Checkout.CheckoutViewModel +@using System.Security.Cryptography.X509Certificates +@model CompanyManagment.App.Contracts.Checkout.CheckoutViewModel @{ - }
- +
-
-
-
-
-
-
-
@Model.ContractNo
-
-
-

بسمه تعالی

-

فیش حقوقی و رسید پرداخت حقوق

-
-
-
-
-
- - اینجانب   @Model.EmployeeFullName - - - نام پدر: - @if (string.IsNullOrWhiteSpace(Model.FathersName)) - { - "1111111111" - } - else - { - @Model.FathersName - } - - - - به کد ملی:   - @if (string.IsNullOrWhiteSpace(Model.NationalCode)) - { - 222333111 - } - else - { - @Model.NationalCode - } - - متولد:   - @if (string.IsNullOrWhiteSpace(Model.DateOfBirth)) - { - 1401/01/01 - } - else - { - @Model.DateOfBirth - } - - - -
-
-
- - @{ - if (Model.EmployerList.FirstOrDefault().IsLegal == "حقیقی") - { - پـرسنل کارگاه  @Model.WorkshopName -   - به کارفرمایی   آقای/خانم -   -   - if (Model.EmployerList.Count > 1) - { - - @Model.EmployerList[0].EmployerFullName ، -  @Model.EmployerList[1].EmployerFullName - @if (Model.EmployerList.Count > 2) - { - و غیره - } - -
- } - else - { - - @Model.EmployerList.FirstOrDefault().EmployerFullName - -
- } - } - else if (Model.EmployerList.FirstOrDefault().IsLegal == "حقوقی") - { - پـرسنل شرکت/موسسه  @Model.WorkshopName -
- } - - } - - کلیه حق السعی خود اعم از حقوق، کمک هزینه اقلام مصرفی خانوار، کمک هزینه مسکن - - و همچنین عیدی و پاداش، سنوات و... - @Model.Month ماه - سال @Model.Year - برابر با قرارداد به شماره فوق را از کارفرما بصورت وجه نقد و واریز به حساب دریافت نموده ام. - -
- -
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
مطالبات کسورات
ردیف شرح مبلغ(ریال) شرح مبلغ(ریال)
1 حقوق و مزد @Model.MonthlySalary حق بیمه سهم کارگر @Model.InsuranceDeduction
2 پایه سنوات @Model.BaseYearsPay مالیات بر حقوق @Model.TaxDeducation
3 کمک هزینه اقلام مصرفی خانوار @Model.ConsumableItems قسط تسهیلات @Model.InstallmentDeduction
4 کمک هزینه مسکن @Model.HousingAllowance مساعده @Model.SalaryAidDeduction
5 فوق العاده اضافه کاری @Model.OvertimePay غیبت @Model.AbsenceDeduction
6 فوق العاده شب کاری @Model.NightworkPay
7 فوق العاده جمعه کاری @Model.FridayPay
8 فوق العاده ماموریت @Model.MissionPay
9 فوق العاده نوبت کاری @Model.ShiftPay
10 کمک هزینه عائله مندی @Model.FamilyAllowance
11 حق تاهل @Model.MarriedAllowance
12 پاداش @Model.RewardPay
13 عیدی و پاداش @Model.BonusesPay
14 سنوات @Model.YearsPay
15 مزد مرخصی @Model.LeavePay
جمع مطالبات @Model.TotalClaims جمع کسورات @Model.TotalDeductions
مبلغ قابل پرداخت @Model.TotalPayment
-
-
-
-
-
- -
-
- - - -
-
- - - -
-
- -
- - -
-
-
- مقطع اول کار - مدت استراحت - مقطع دوم کار - مقطع اول کار - مدت استراحت - مقطع دوم کار - - -
-
- - -
-هفته اول - -
- - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-هفته دوم - -
- - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- - -
- -
-هفته سوم - -
- - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-هفته چهارم -
- - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
-
-
-
-
-
- @{ - if (Model.IsLeft) - { - - طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب  - @Model.LastDayOfWork  - بوده و قطع همکاری با کارفرما و کارگاه از تاریخ  - @Model.LeftWorkDate  - می باشد - - } - } - -
-
-
- @*
اینجانب     @Model.EmployeeFullName
-
نام پدر:     @Model.FathersName
-
به کد ملی:  @Model.NationalCode
-
متولد:     @Model.DateOfBirth
*@ -
-
-
- @* پـرسنل شـرکت  @Model.WorkshopName -   - به کارفرمایی   آقای/خانم/شرکت    - @{ - foreach (var item in @Model.EmployerList) +
+
+
+
+
+
@Model.ContractNo
+
+

بسمه تعالی

+

فیش حقوقی و رسید پرداخت حقوق

+
+
+
+ +
+
+
+
+
+
+ اینجانب + @Model.EmployeeFullName +
+
+
+ نام پدر: + @if (string.IsNullOrWhiteSpace(@Model.FathersName)) + { + "" + } + else + { + @Model.FathersName + + } +
+
+ به کد ملی: + @if (string.IsNullOrWhiteSpace(@Model.NationalCode)) + { + + } + else + { + + @Model.NationalCode + + } +
+
+ متولد: + @if (string.IsNullOrWhiteSpace(@Model.DateOfBirth)) + { + 1401/01/01 + } + else + { + @Model.DateOfBirth + } +
+
+
+ +
+
+ @{ + if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقیقی") + { +
+
+ نام کارگاه: + @Model.WorkshopName +
+
+ +
+ نام کارفرما: + @if (Model.EmployerList.Count > 1) { - @item.EmployerFullName ، + + @Model.EmployerList[0].EmployerFullName ، +  @Model.EmployerList[1].EmployerFullName + @if (@Model.EmployerList.Count > 2) + { + و غیره + } + } + else + { + + @Model.EmployerList.FirstOrDefault().EmployerFullName + + } +
+ + } + else if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقوقی") + { +
+ پـرسنل شرکت/موسسه: + + @Model.WorkshopName + +
+ } + } +
+
+ @{ + var items = new List(); + + if (Model.MonthlySalary != "0") items.Add("حقوق و مزد"); + if (Model.ConsumableItems != "0") items.Add("کمک هزینه اقلام مصرفی خانوار"); + if (Model.HousingAllowance != "0") items.Add("کمک هزینه مسکن"); + if (!string.IsNullOrWhiteSpace(Model.OvertimePay) && Model.OvertimePay != "0") items.Add("فوق العاده اضافه کاری"); + if (!string.IsNullOrWhiteSpace(Model.NightworkPay) && Model.NightworkPay != "0") items.Add("فوق العاده شب کاری"); + if (!string.IsNullOrWhiteSpace(Model.FridayPay) && Model.FridayPay != "0") items.Add("فوق العاده جمعه کاری"); + if (Model.MissionPay != "0") items.Add("فوق العاده ماموریت"); + if (Model.ShiftPay != "0") items.Add("فوق العاده نوبت کاری"); + if (Model.FamilyAllowance != "0") items.Add("کمک هزینه عائله مندی"); + if (Model.MarriedAllowance != "0") items.Add("حق تاهل"); + if (Model.RewardPay != "0") items.Add("پاداش"); + if (Model.BonusesPay != "0") items.Add("عیدی و پاداش"); + if (Model.YearsPay != "0") items.Add("سنوات"); + if (Model.LeavePay != "0") items.Add("مزد مرخصی"); + + string finalText = ""; + if (items.Count == 1) + { + finalText = items[0]; + } + else if (items.Count > 1) + { + finalText = string.Join("، ", items.Take(items.Count - 1)) + " و " + items.Last(); + } + } + + + کلیه حق السعی خود اعم از @Html.Raw(finalText) @Model.Month ماه سال @Model.Year برابر با قرارداد به شماره فوق را از کارفرما بصورت وجه نقد و واریز به حساب دریافت نموده ام. + +
+
+
+
+ +
+
+ + + + @* *@ + + @* + *@ + + @* + *@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @{ + if (Model.IsLeft) + { + + } + else + { + + + + } + } + + + + + + + + + @{ + if (!Model.IsLeft) + { + + + + } + } + + + + + + + + @{ + if (!Model.IsLeft) + { + + + + } + } + + + + + + + + + + + + + + + + + + + + +
مطالبات کسورات
ردیف شرح ساعت/روز/تعداد مبلغ(ریال) شرح ساعت/روز/تعداد مبلغ(ریال)
1 حقوق و مزد @Model.SumOfWorkingDays @(Model.MonthlySalary == "0" ? "-" : Model.MonthlySalary) حق بیمه سهم کارگر - @(Model.InsuranceDeduction == "0" ? "-" : Model.InsuranceDeduction)
2 پایه سنوات @(Model.BaseYearsPay == "0" ? "-" : Model.SumOfWorkingDays) @(Model.BaseYearsPay == "0" ? "-" : Model.BaseYearsPay) مالیات بر حقوق - @(Model.TaxDeducation == "0" ? "-" : Model.TaxDeducation)
3 کمک هزینه اقلام مصرفی خانوار @(Model.ConsumableItems == "0" ? "-" : Model.SumOfWorkingDays) @(Model.ConsumableItems == "0" ? "-" : Model.ConsumableItems) قسط تسهیلات - @(Model.InstallmentDeduction == "0" ? "-" : Model.InstallmentDeduction)
4 کمک هزینه مسکن @(Model.HousingAllowance == "0" ? "-" : Model.SumOfWorkingDays) @(Model.HousingAllowance == "0" ? "-" : Model.HousingAllowance) مساعده - @(Model.SalaryAidDeduction == "0" ? "-" : Model.SalaryAidDeduction)
5 فوق العاده اضافه کاری @((Model.OverTimeWorkValue == "00:00" || string.IsNullOrWhiteSpace(Model.OverTimeWorkValue)) ? "-" : Model.OverTimeWorkValue) @((Model.OvertimePay == "0" || string.IsNullOrWhiteSpace(Model.OvertimePay)) ? "-" : Model.OvertimePay) غیبت - @(Model.AbsenceDeduction == "0" ? "-" : Model.AbsenceDeduction)
6 فوق العاده شب کاری @((Model.OverNightWorkValue == "00:00" || string.IsNullOrWhiteSpace(Model.OverNightWorkValue)) ? "-" : Model.OverNightWorkValue) @((Model.NightworkPay == "0" || string.IsNullOrWhiteSpace(Model.NightworkPay)) ? "-" : Model.NightworkPay)
7 فوق العاده جمعه کاری @((Model.FridayWorkValue == "0" || string.IsNullOrWhiteSpace(Model.FridayWorkValue)) ? "-" : Model.FridayWorkValue) @((Model.FridayPay == "0" || string.IsNullOrWhiteSpace(Model.FridayPay)) ? "-" : Model.FridayPay)
8 فوق العاده ماموریت - @(Model.MissionPay == "0" ? "-" : Model.MissionPay)
9 فوق العاده نوبت کاری @((Model.RotatingShiftValue == "0" || string.IsNullOrWhiteSpace(Model.RotatingShiftValue)) ? "-" : "%" + Model.RotatingShiftValue) @(Model.ShiftPay == "0" ? "-" : Model.ShiftPay)
10 کمک هزینه عائله مندی - @(Model.FamilyAllowance == "0" ? "-" : Model.FamilyAllowance)
11 حق تاهل @Model.MaritalStatus @(Model.MarriedAllowance == "0" ? "-" : Model.MarriedAllowance)
12 پاداش - @(Model.RewardPay == "0" ? "-" : Model.RewardPay)
13 عیدی و پاداش @(Model.BonusesPay == "0" ? "-" : Model.SumOfWorkingDays) @(Model.BonusesPay == "0" ? "-" : Model.BonusesPay) +
+
+ طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب + @Model.LastDayOfWork + بوده و قطع همکاری با کارفرما و کارگاه از تاریخ + @Model.LeftWorkDate + می باشد +
+
+
14 سنوات @(Model.YearsPay == "0" ? "-" : Model.SumOfWorkingDays) @(Model.YearsPay == "0" ? "-" : Model.YearsPay)
15 مزد مرخصی @(Model.LeavePay == "0" ? "-" : Model.SumOfWorkingDays) @(Model.LeavePay == "0" ? "-" : Model.LeavePay)
جمع مطالبات - @(Model.TotalClaims == "0" ? "-" : Model.TotalClaims) جمع کسورات - @(Model.TotalDeductions == "0" ? "-" : Model.TotalDeductions)
مبلغ قابل پرداخت @(Model.TotalPayment == "0" ? "-" : Model.TotalPayment)
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + @if (Model.CreateWorkingHoursTemp.ShiftWork == "4") + { + + + + + + + + + + + + + + @for (int i = 0; i < 16; i++) + { + @* var dailyStatic = Model.MonthlyRollCall[i]; *@ + + @* var leftItem = i < leftSideDays ? Model.MonthlyRollCall[i] : null; *@ + var leftItem = i < 15 ? Model.MonthlyRollCall[i] : null; + @* var rightItem = i < rightSideDays ? Model.MonthlyRollCall[i + leftSideDays] : null; *@ + var rightIndex = 15 + i; + var rightItem = rightIndex < Model.MonthlyRollCall.Count ? Model.MonthlyRollCall[rightIndex] : null; + + + + + @* section one *@ + + @if (string.IsNullOrWhiteSpace(leftItem?.LeaveType)) + { + + + + } + else + { + + + } + + + + + @* section two *@ + + @if (string.IsNullOrWhiteSpace(rightItem?.LeaveType)) + { + + + + } + else + { + + } + + + + } + } + else + { + + + + } + + + + + + + + + + +
فیش حقوقی بدون سیستم هوشمند حضور غیاب
تاریخ مقطع اول کار مقطع دوم کار استراحت جمع تاریخ مقطع اول کار مقطع دوم کار استراحت جمع
+ @(leftItem?.RollCallDateFa ?? "") @(leftItem?.DayOfWeek ?? "") + + @(!String.IsNullOrWhiteSpace(leftItem?.StartDate1) ? leftItem?.StartDate1 + " الی " + leftItem?.EndDate1 : "") + + @(!String.IsNullOrWhiteSpace(leftItem?.StartDate2) ? leftItem?.StartDate2 + " الی " + leftItem?.EndDate2 : "") + + @(leftItem?.BreakTimeString ?? "") + + @leftItem?.LeaveType + + @(leftItem?.TotalWorkingHours ?? "") + + @(rightItem?.RollCallDateFa ?? "") @(rightItem?.DayOfWeek ?? "") + + @(!String.IsNullOrWhiteSpace(rightItem?.StartDate1) ? rightItem?.StartDate1 + " الی " + rightItem?.EndDate1 : "") + + @(!String.IsNullOrWhiteSpace(rightItem?.StartDate2) ? rightItem?.StartDate2 + " الی " + rightItem?.EndDate2 : "") + + @(rightItem?.BreakTimeString ?? "") + + @rightItem?.LeaveType + + @(rightItem?.TotalWorkingHours ?? "") +
+
+
شیفت کاری
+
+
ساعات ‌کاری این پرسنل در قالب
+
۲۴ ساعت کار / ۲۴ ساعت استراحت است.
+
+
+ + + + ۰۸:۰۰ الی ۰۸:۰۰ +
+
+
مدت مرخصی استحقاقی : @Model.TotalDayOfLeaveCompute مدت مرخصی استعلاجی : @Model.TotalDayOfLeaveCompute
+ + + + + + + +
موظفی @Model.Month @Model.Year : @Model.TotalMandatoryTimeStr ساعات حضور : @Model.TotalPresentTimeStr ساعات استراحت : @Model.TotalBreakTimeStr ساعات کارکرد واقعی : @Model.TotalWorkingTimeStr
+
+
+
+
+ +
+
+
+
+ +
+ + + + + + + + + + + + + + + + @for (int i = 0; i < 5; i++) + { + + + + } -    - مبلغ ............. ریال را بصورت نقدی از کارفرما دریافت نمودم. *@ + +
مساعده
تاریخمبلغ
+ @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count + ? Model.SalaryAidViewModels[i]?.SalaryAidDateTimeFa ?? "" + : "") + + @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count + ? Model.SalaryAidViewModels[i]?.Amount ?? "" + : "") +
+ +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + @for (int i = 0; i < 5; i++) + { + + + + + + } + +
وام
مبلغ کلمبلغ هر قسطمبلغ باقیمانده
+ @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count + ? Model.InstallmentViewModels[i]?.LoanAmount ?? "" + : "") + + @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count + ? Model.InstallmentViewModels[i]?.Amount ?? "" + : "") + + @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count + ? Model.InstallmentViewModels[i]?.RemainingAmount ?? "" + : "") +
+
+ +
+
+
+
+
+
+ اثر انگشت +
+
+ امضاء +
+
+
+
+
+
+
+ +
-
- -
- -
- -
- - امضاء و اثر انگشت -
-
- -
-
-
-
-
-
- -
- - - + -
- - -
+ + + + +
+ + + +
- + + \ No newline at end of file diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml index eace4adc..da8cc149 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/Index.cshtml @@ -3,1884 +3,219 @@ @model ServiceHost.Areas.Admin.Pages.Company.Checkouts.IndexModel @{ - - //int i = 1; - - + string adminVersion = _0_Framework.Application.Version.AdminVersion; + //int i = 1; } @{ - //Layout = "~/Pages/Shared/_Layout.cshtml"; - Layout = "Shared/_AdminLayout"; - ViewData["title"] = "تصفیه حساب"; - - @section Styles{ - - - - } - @*@section Script{ - - }*@ + //Layout = "~/Pages/Shared/_Layout.cshtml"; + Layout = "Shared/_AdminLayout"; + ViewData["title"] = "تصفیه حساب"; + + + @section Styles { + + + + } }
-
-
+
+
-

- ایجاد تصفیه حساب -@* ویرایش *@ +

+ ایجاد تصفیه حساب + @* ویرایش *@ -

- @*href="#showmodal=@Url.Page("./Index", "PrintAll", new {ids = idss})"*@ -
-
-
-
+

+ @*href="#showmodal=@Url.Page("./Index", "PrintAll", new {ids = idss})"*@ +
+
+
+
- - + + -
-
-

- -

+
+
+

+ +

-
-
-
- @*===================================================================================================================*@ -
-
-
-
-
-
-
- -
-
-
-
- -
-
-
- - - -
-
    -
-
-
-
-
- - -
-
-
-
-
-
-
- انتخاب تاریخ -
-
- -
-
- -
-
-
-
- @**@ - -
+
+
+
+ @*===================================================================================================================*@ +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+ + + +
+
    +
+
+
+
+
+ + +
+
+
+
+
+
+
+ انتخاب تاریخ +
+
+ +
+
+ +
+
+
+
+ @**@ + +
-
-
-
- @**@ +
+
+
+ @**@ - -
-
+ +
+
-
-
- @**@ - @**@ -
-
-
-
-
- @* *@ - @* *@ -
+
+
+ @**@ + @**@ +
+
+
+
+
+ @* *@ + @* *@ +
-
- جستجو - - مشاهده همه -
-
-
- +
+ جستجو + + مشاهده همه +
+
+
+ -
-
- @*==================================================================personal=====*@ -
-
-
-
-
+
+
+ @*==================================================================personal=====*@ +
+
+
+
+
-
-
-
-

لیست تصفیه حساب ها

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

لیست تصفیه حساب ها

+
+
+
+
+ +
+
+
+
+
@section Script { - - - - - - - - - - - @**@ - - - - + + + + + + } - - - - diff --git a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/PrintAll.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/PrintAll.cshtml index 0927888e..bfe0d7ee 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Checkouts/PrintAll.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Checkouts/PrintAll.cshtml @@ -294,6 +294,42 @@ -webkit-print-color-adjust: exact; } + + + + .shiftWorkContainerMsg { + position: relative; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + border: 1px solid #D9D9D9 !important; + border-radius: 7px; + color: #1F1F1F !important; + font-size: 16px !important; + gap: 9px; + padding: 15px 21px; + max-width: 380px; + margin: auto; + } + + .shiftTitle { + position: absolute; + top: -10px; + right: 5px; + padding: 2px 4px; + color: #000000 !important; + font-size: 12px !important; + background-color: #F6F6F6 !important; + } + + .shiftTime { + display: flex; + align-items: center; + justify-content: center; + gap: 6px; + } + var btnActive = "btn-active"; @@ -301,2833 +337,20 @@ var inputDeactive = "input-deactive"; } -
- -@foreach (var items in Model.CheckoutViewModels) -{ - @if (items.HasRollCall) - { - - } - else - { -
-
-
-
-
-
-
-
@items.ContractNo
-
-
-

بسمه تعالی

-

فیش حقوقی و رسید پرداخت حقوق

-
-
-
-
-
- - اینجانب   @items.EmployeeFullName - - - نام پدر: - @if (string.IsNullOrWhiteSpace(items.FathersName)) - { - "1111111111" - } - else - { - @items.FathersName - } - - - - به کد ملی:   - @if (string.IsNullOrWhiteSpace(items.NationalCode)) - { - 222333111 - } - else - { - @items.NationalCode - } - - متولد:   - @if (string.IsNullOrWhiteSpace(items.DateOfBirth)) - { - 1401/01/01 - } - else - { - @items.DateOfBirth - } - -
-
-
- - @{ - if (items.EmployerList.FirstOrDefault().IsLegal == "حقیقی") - { - پـرسنل کارگاه  @items.WorkshopName -   - به کارفرمایی   آقای/خانم -   -   - if (items.EmployerList.Count > 1) - { - - @items.EmployerList[0].EmployerFullName ، -  @items.EmployerList[1].EmployerFullName - @if (items.EmployerList.Count > 2) - { - و غیره - } - -
- } - else - { - - @items.EmployerList.FirstOrDefault().EmployerFullName - -
- } - } - else if (items.EmployerList.FirstOrDefault().IsLegal == "حقوقی") - { - پـرسنل شرکت/موسسه  @items.WorkshopName -
- } - - } - - کلیه حق السعی خود اعم از حقوق، کمک هزینه اقلام مصرفی خانوار، کمک هزینه مسکن - - و همچنین عیدی و پاداش، سنوات و... - @items.Month ماه - سال @items.Year - برابر با قرارداد به شماره فوق را از کارفرما بصورت وجه نقد و واریز به حساب دریافت نموده ام. - -
- -
- - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
مطالبات کسورات
ردیف شرح مبلغ(ریال) شرح مبلغ(ریال)
1 حقوق و مزد @items.MonthlySalary حق بیمه سهم کارگر @items.InsuranceDeduction
2 پایه سنوات @items.BaseYearsPay مالیات بر حقوق @items.TaxDeducation
3 کمک هزینه اقلام مصرفی خانوار @items.ConsumableItems قسط تسهیلات @items.InstallmentDeduction
4 کمک هزینه مسکن @items.HousingAllowance مساعده @items.SalaryAidDeduction
5 فوق العاده اضافه کاری @items.OvertimePay غیبت @items.AbsenceDeduction
6 فوق العاده شب کاری @items.NightworkPay
7 فوق العاده جمعه کاری @items.FridayPay
8 فوق العاده ماموریت @items.MissionPay
9 فوق العاده نوبت کاری @items.ShiftPay
10 کمک هزینه عائله مندی @items.FamilyAllowance
11 حق تاهل @items.MarriedAllowance
12 پاداش @items.RewardPay
13 عیدی و پاداش @items.BonusesPay
14 سنوات @items.YearsPay
15 مزد مرخصی @items.LeavePay
جمع مطالبات @items.TotalClaims جمع کسورات @items.TotalDeductions
مبلغ قابل پرداخت @items.TotalPayment
-
-
-
- - - @if (items.CreateWorkingHoursTemp.ShiftWork == "4") - { -
-
- مقطع اول کار - مدت استراحت - مقطع دوم کار - مقطع اول کار - مدت استراحت - مقطع دوم کار - - -
-
- - -
- هفته اول - -
- - - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
- هفته دوم - -
- - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- - -
- -
- هفته سوم - -
- - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
- هفته چهارم -
- - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- -
-
- } - else - { -
-
- -
- - - - - - - - - - - - -
-
- -
- } - - -
-
-
-
- @{ - if (items.IsLeft) - { - - طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب  - @items.LastDayOfWork  - بوده و قطع همکاری با کارفرما و کارگاه از تاریخ  - @items.LeftWorkDate  - می باشد - - } - } - -
-
-
- @*
اینجانب     @Model.EmployeeFullName
-
نام پدر:     @Model.FathersName
-
به کد ملی:  @Model.NationalCode
-
متولد:     @Model.DateOfBirth
*@ -
-
-
- @* پـرسنل شـرکت  @Model.WorkshopName -   - به کارفرمایی   آقای/خانم/شرکت    - @{ - foreach (var item in @Model.EmployerList) - { - @item.EmployerFullName ، - } - } -    - مبلغ ............. ریال را بصورت نقدی از کارفرما دریافت نمودم. *@ - - - -
- -
-
- -
- امضاء و اثر انگشت -
-
- -
-
-
-
-
-
- -
-
- } - -} - - - - + @foreach (var items in Model.CheckoutViewModels) + { + @if (items.HasRollCall) + { + + } + else + { + + } + }
- - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOneRollCall.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOneRollCall.cshtml index dc0f91f7..48ac68cc 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOneRollCall.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOneRollCall.cshtml @@ -737,92 +737,104 @@
-
-
-
+
+
+
-
- - - - - +
+
+ + + + - + - + - - - - + + + + - @for (int i = 0; i < 5; i++) - { - - - - - } + @for (int i = 0; i < 5; i++) + { + + + + + } -
مساعده
تاریخمبلغ
تاریخمبلغ
- @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count - ? Model.SalaryAidViewModels[i]?.SalaryAidDateTimeFa ?? "" - : "") - - @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count - ? Model.SalaryAidViewModels[i]?.Amount ?? "" - : "") -
+ @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count + ? Model.SalaryAidViewModels[i]?.SalaryAidDateTimeFa ?? "" + : "") + + @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count + ? Model.SalaryAidViewModels[i]?.Amount ?? "" + : "") +
+ - - - - - + - - - + - - - - +
+
+
وام
مبلغ کل واممبلغ باقیمانده وام
+ + + + + - @for (int i = 0; i < 5; i++) - { - - - - - } + + + -
- @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count - ? Model.InstallmentViewModels[i]?.LoanAmount ?? "" - : "") - - @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count - ? Model.InstallmentViewModels[i]?.RemainingAmount ?? "" - : "") -
وام
-
+ + مبلغ کل + مبلغ هر قسط + مبلغ باقیمانده + -
-
-
-
-
+ @for (int i = 0; i < 5; i++) + { + + + @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count + ? Model.InstallmentViewModels[i]?.LoanAmount ?? "" + : "") + + + @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count + ? Model.InstallmentViewModels[i]?.Amount ?? "" + : "") + + + @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count + ? Model.InstallmentViewModels[i]?.RemainingAmount ?? "" + : "") + + + } + + +
+
+
+
+
+
- اثر انگشت -
+ اثر انگشت +
- امضاء -
-
-
-
+ امضاء +
+
+
+
diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailStaticRaw.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailStaticRaw.cshtml new file mode 100644 index 00000000..a007eedf --- /dev/null +++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailStaticRaw.cshtml @@ -0,0 +1,631 @@ +@model CompanyManagment.App.Contracts.Checkout.CheckoutViewModel + +@{ + var totalDays = Model.MonthlyRollCall?.Count ?? 0; + var rightSideDays = totalDays / 2; + var leftSideDays = totalDays - rightSideDays; + var maxRows = rightSideDays; + var rawHeight = (int)Math.Floor(300.0 / maxRows); + var rowHeight = Math.Max(15, Math.Min(16, rawHeight)); + var calculateHeight = rowHeight + "px"; +} + +
+
+
+ +
+ +
+
@Model.ContractNo
+
+

بسمه تعالی

+

فیش حقوقی و رسید پرداخت حقوق

+
+
+
+ +
+
+
+
+
+
+ اینجانب + @Model.EmployeeFullName +
+
+
+ نام پدر: + @if (string.IsNullOrWhiteSpace(@Model.FathersName)) + { + "" + } + else + { + @Model.FathersName + + } +
+
+ به کد ملی: + @if (string.IsNullOrWhiteSpace(@Model.NationalCode)) + { + + } + else + { + + @Model.NationalCode + + } +
+
+ متولد: + @if (string.IsNullOrWhiteSpace(@Model.DateOfBirth)) + { + 1401/01/01 + } + else + { + @Model.DateOfBirth + } +
+
+
+ +
+
+ @{ + if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقیقی") + { +
+
+ نام کارگاه: + @Model.WorkshopName +
+
+ +
+ نام کارفرما: + @if (Model.EmployerList.Count > 1) + { + + @Model.EmployerList[0].EmployerFullName ، +  @Model.EmployerList[1].EmployerFullName + @if (@Model.EmployerList.Count > 2) + { + و غیره + } + + } + else + { + + @Model.EmployerList.FirstOrDefault().EmployerFullName + + } +
+ + } + else if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقوقی") + { +
+ پـرسنل شرکت/موسسه: + + @Model.WorkshopName + +
+ } + } +
+
+ @{ + var items = new List(); + + if (Model.MonthlySalary != "0") items.Add("حقوق و مزد"); + if (Model.ConsumableItems != "0") items.Add("کمک هزینه اقلام مصرفی خانوار"); + if (Model.HousingAllowance != "0") items.Add("کمک هزینه مسکن"); + if (!string.IsNullOrWhiteSpace(Model.OvertimePay) && Model.OvertimePay != "0") items.Add("فوق العاده اضافه کاری"); + if (!string.IsNullOrWhiteSpace(Model.NightworkPay) && Model.NightworkPay != "0") items.Add("فوق العاده شب کاری"); + if (!string.IsNullOrWhiteSpace(Model.FridayPay) && Model.FridayPay != "0") items.Add("فوق العاده جمعه کاری"); + if (Model.MissionPay != "0") items.Add("فوق العاده ماموریت"); + if (Model.ShiftPay != "0") items.Add("فوق العاده نوبت کاری"); + if (Model.FamilyAllowance != "0") items.Add("کمک هزینه عائله مندی"); + if (Model.MarriedAllowance != "0") items.Add("حق تاهل"); + if (Model.RewardPay != "0") items.Add("پاداش"); + if (Model.BonusesPay != "0") items.Add("عیدی و پاداش"); + if (Model.YearsPay != "0") items.Add("سنوات"); + if (Model.LeavePay != "0") items.Add("مزد مرخصی"); + + string finalText = ""; + if (items.Count == 1) + { + finalText = items[0]; + } + else if (items.Count > 1) + { + finalText = string.Join("، ", items.Take(items.Count - 1)) + " و " + items.Last(); + } + } + + + کلیه حق السعی خود اعم از @Html.Raw(finalText) @Model.Month ماه سال @Model.Year برابر با قرارداد به شماره فوق را از کارفرما بصورت وجه نقد و واریز به حساب دریافت نموده ام. + +
+
+
+
+ +
+
+ + + + @* *@ + + @* + *@ + + @* + *@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @{ + if (Model.IsLeft) + { + + } + else + { + + + + } + } + + + + + + + + + @{ + if (!Model.IsLeft) + { + + + + } + } + + + + + + + + @{ + if (!Model.IsLeft) + { + + + + } + } + + + + + + + + + + + + + + + + + + + + +
مطالبات کسورات
ردیف شرح ساعت/روز/تعداد مبلغ(ریال) شرح ساعت/روز/تعداد مبلغ(ریال)
1 حقوق و مزد @Model.SumOfWorkingDays @(Model.MonthlySalary == "0" ? "-" : Model.MonthlySalary) حق بیمه سهم کارگر - @(Model.InsuranceDeduction == "0" ? "-" : Model.InsuranceDeduction)
2 پایه سنوات @(Model.BaseYearsPay == "0" ? "-" : Model.SumOfWorkingDays) @(Model.BaseYearsPay == "0" ? "-" : Model.BaseYearsPay) مالیات بر حقوق - @(Model.TaxDeducation == "0" ? "-" : Model.TaxDeducation)
3 کمک هزینه اقلام مصرفی خانوار @(Model.ConsumableItems == "0" ? "-" : Model.SumOfWorkingDays) @(Model.ConsumableItems == "0" ? "-" : Model.ConsumableItems) قسط تسهیلات - @(Model.InstallmentDeduction == "0" ? "-" : Model.InstallmentDeduction)
4 کمک هزینه مسکن @(Model.HousingAllowance == "0" ? "-" : Model.SumOfWorkingDays) @(Model.HousingAllowance == "0" ? "-" : Model.HousingAllowance) مساعده - @(Model.SalaryAidDeduction == "0" ? "-" : Model.SalaryAidDeduction)
5 فوق العاده اضافه کاری @((Model.OverTimeWorkValue == "00:00" || string.IsNullOrWhiteSpace(Model.OverTimeWorkValue)) ? "-" : Model.OverTimeWorkValue) @((Model.OvertimePay == "0" || string.IsNullOrWhiteSpace(Model.OvertimePay)) ? "-" : Model.OvertimePay) غیبت - @(Model.AbsenceDeduction == "0" ? "-" : Model.AbsenceDeduction)
6 فوق العاده شب کاری @((Model.OverNightWorkValue == "00:00" || string.IsNullOrWhiteSpace(Model.OverNightWorkValue)) ? "-" : Model.OverNightWorkValue) @((Model.NightworkPay == "0" || string.IsNullOrWhiteSpace(Model.NightworkPay)) ? "-" : Model.NightworkPay)
7 فوق العاده جمعه کاری @((Model.FridayWorkValue == "0" || string.IsNullOrWhiteSpace(Model.FridayWorkValue)) ? "-" : Model.FridayWorkValue) @((Model.FridayPay == "0" || string.IsNullOrWhiteSpace(Model.FridayPay)) ? "-" : Model.FridayPay)
8 فوق العاده ماموریت - @(Model.MissionPay == "0" ? "-" : Model.MissionPay)
9 فوق العاده نوبت کاری @((Model.RotatingShiftValue == "0" || string.IsNullOrWhiteSpace(Model.RotatingShiftValue)) ? "-" : "%" + Model.RotatingShiftValue) @(Model.ShiftPay == "0" ? "-" : Model.ShiftPay)
10 کمک هزینه عائله مندی - @(Model.FamilyAllowance == "0" ? "-" : Model.FamilyAllowance)
11 حق تاهل @Model.MaritalStatus @(Model.MarriedAllowance == "0" ? "-" : Model.MarriedAllowance)
12 پاداش - @(Model.RewardPay == "0" ? "-" : Model.RewardPay)
13 عیدی و پاداش @(Model.BonusesPay == "0" ? "-" : Model.SumOfWorkingDays) @(Model.BonusesPay == "0" ? "-" : Model.BonusesPay) +
+
+ طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب + @Model.LastDayOfWork + بوده و قطع همکاری با کارفرما و کارگاه از تاریخ + @Model.LeftWorkDate + می باشد +
+
+
14 سنوات @(Model.YearsPay == "0" ? "-" : Model.SumOfWorkingDays) @(Model.YearsPay == "0" ? "-" : Model.YearsPay)
15 مزد مرخصی @(Model.LeavePay == "0" ? "-" : Model.SumOfWorkingDays) @(Model.LeavePay == "0" ? "-" : Model.LeavePay)
جمع مطالبات - @(Model.TotalClaims == "0" ? "-" : Model.TotalClaims) جمع کسورات - @(Model.TotalDeductions == "0" ? "-" : Model.TotalDeductions)
مبلغ قابل پرداخت @(Model.TotalPayment == "0" ? "-" : Model.TotalPayment)
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + @if (Model.CreateWorkingHoursTemp.ShiftWork == "4") + { + + + + + + + + + + + + + + @for (int i = 0; i < 16; i++) + { + @* var dailyStatic = Model.MonthlyRollCall[i]; *@ + + @* var leftItem = i < leftSideDays ? Model.MonthlyRollCall[i] : null; *@ + var leftItem = i < 15 ? Model.MonthlyRollCall[i] : null; + @* var rightItem = i < rightSideDays ? Model.MonthlyRollCall[i + leftSideDays] : null; *@ + var rightIndex = 15 + i; + var rightItem = rightIndex < Model.MonthlyRollCall.Count ? Model.MonthlyRollCall[rightIndex] : null; + + + + + @* section one *@ + + @if (string.IsNullOrWhiteSpace(leftItem?.LeaveType)) + { + + + + } + else + { + + + } + + + + + @* section two *@ + + @if (string.IsNullOrWhiteSpace(rightItem?.LeaveType)) + { + + + + } + else + { + + } + + + + } + } + else + { + + + + } + + + + + + + + + + +
فیش حقوقی بدون سیستم هوشمند حضور غیاب
تاریخ مقطع اول کار مقطع دوم کار استراحت جمع تاریخ مقطع اول کار مقطع دوم کار استراحت جمع
+ @(leftItem?.RollCallDateFa ?? "") @(leftItem?.DayOfWeek ?? "") + + @(!String.IsNullOrWhiteSpace(leftItem?.StartDate1) ? leftItem?.StartDate1 + " الی " + leftItem?.EndDate1 : "") + + @(!String.IsNullOrWhiteSpace(leftItem?.StartDate2) ? leftItem?.StartDate2 + " الی " + leftItem?.EndDate2 : "") + + @(leftItem?.BreakTimeString ?? "") + + @leftItem?.LeaveType + + @(leftItem?.TotalWorkingHours ?? "") + + @(rightItem?.RollCallDateFa ?? "") @(rightItem?.DayOfWeek ?? "") + + @(!String.IsNullOrWhiteSpace(rightItem?.StartDate1) ? rightItem?.StartDate1 + " الی " + rightItem?.EndDate1 : "") + + @(!String.IsNullOrWhiteSpace(rightItem?.StartDate2) ? rightItem?.StartDate2 + " الی " + rightItem?.EndDate2 : "") + + @(rightItem?.BreakTimeString ?? "") + + @rightItem?.LeaveType + + @(rightItem?.TotalWorkingHours ?? "") +
+
+
شیفت کاری
+
+
ساعات ‌کاری این پرسنل در قالب
+
۲۴ ساعت کار / ۲۴ ساعت استراحت است.
+
+
+ + + + ۰۸:۰۰ الی ۰۸:۰۰ +
+
+
مدت مرخصی استحقاقی : @Model.TotalDayOfLeaveCompute مدت مرخصی استعلاجی : @Model.TotalDayOfLeaveCompute
+ + + + + + + +
موظفی @Model.Month @Model.Year : @Model.TotalMandatoryTimeStr ساعات حضور : @Model.TotalPresentTimeStr ساعات استراحت : @Model.TotalBreakTimeStr ساعات کارکرد واقعی : @Model.TotalWorkingTimeStr
+
+
+
+
+ +
+
+
+
+ +
+ + + + + + + + + + + + + + + + @for (int i = 0; i < 5; i++) + { + + + + + } + +
مساعده
تاریخمبلغ
+ @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count + ? Model.SalaryAidViewModels[i]?.SalaryAidDateTimeFa ?? "" + : "") + + @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count + ? Model.SalaryAidViewModels[i]?.Amount ?? "" + : "") +
+ +
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + @for (int i = 0; i < 5; i++) + { + + + + + + } + +
وام
مبلغ کلمبلغ هر قسطمبلغ باقیمانده
+ @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count + ? Model.InstallmentViewModels[i]?.LoanAmount ?? "" + : "") + + @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count + ? Model.InstallmentViewModels[i]?.Amount ?? "" + : "") + + @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count + ? Model.InstallmentViewModels[i]?.RemainingAmount ?? "" + : "") +
+
+
+
+
+
+
+
+ اثر انگشت +
+
+ امضاء +
+
+
+
+
+ +
+
+
\ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailsRollCallRaw.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailsRollCallRaw.cshtml index 86fbfc17..5b409cdf 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailsRollCallRaw.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailsRollCallRaw.cshtml @@ -559,9 +559,9 @@
-
-
-
+
+
+
@@ -570,13 +570,13 @@ - + - - - + + + @for (int i = 0; i < 5; i++) @@ -584,23 +584,30 @@ - + }
مساعده
تاریخمبلغ
تاریخمبلغ
@(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count - ? Model.SalaryAidViewModels[i]?.SalaryAidDateTimeFa ?? "" - : "") - + ? Model.SalaryAidViewModels[i]?.SalaryAidDateTimeFa ?? "" + : "") + @(Model.SalaryAidViewModels != null && i < Model.SalaryAidViewModels.Count - ? Model.SalaryAidViewModels[i]?.Amount ?? "" - : "") + ? Model.SalaryAidViewModels[i]?.Amount ?? "" + : "")
+
+ +
+ +
+
+ + - @@ -608,8 +615,9 @@ - - + + + @for (int i = 0; i < 5; i++) @@ -617,24 +625,28 @@ + ? Model.InstallmentViewModels[i]?.LoanAmount ?? "" + : "") + + }
مبلغ کل واممبلغ باقیمانده واممبلغ کلمبلغ هر قسطمبلغ باقیمانده
@(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count - ? Model.InstallmentViewModels[i]?.LoanAmount ?? "" - : "") - + @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count + ? Model.InstallmentViewModels[i]?.Amount ?? "" + : "") + @(Model.InstallmentViewModels != null && i < Model.InstallmentViewModels.Count - ? Model.InstallmentViewModels[i]?.RemainingAmount ?? "" - : "") + ? Model.InstallmentViewModels[i]?.RemainingAmount ?? "" + : "")
-
-
+
اثر انگشت diff --git a/ServiceHost/wwwroot/AssetsAdmin/page/Checkouts/css/Index.css b/ServiceHost/wwwroot/AssetsAdmin/page/Checkouts/css/Index.css new file mode 100644 index 00000000..a9238ddc --- /dev/null +++ b/ServiceHost/wwwroot/AssetsAdmin/page/Checkouts/css/Index.css @@ -0,0 +1,617 @@ +.bgGray, .bgGray:hover { + background-color: #b5b5b5 !important; + color: #646464; +} + +a.disabled { + pointer-events: none; + cursor: default; + background-color: grey !important; + border-color: grey !important; +} + +a.myLinkSign.disabled { + background-color: #b5b5b5 !important; +} + +a.customSet.disabled { + background: grey !important; +} + +.table > tbody > tr > td, .table > tbody > tr > th, .table > tfoot > tr > td, .table > tfoot > tr > th, .table > thead > tr > td, .table > thead > tr > th { + padding: 5px; +} + +::-webkit-scrollbar { + width: 8px; +} + +::-webkit-scrollbar-track { + background: #dfdfdf; + border-radius: 5px; +} + +::-webkit-scrollbar-thumb { + background: brown; + border-radius: 5px; +} + +table.dataTable thead > tr > th { + padding: 5px; +} + +table.dataTable thead .sorting:after, table.dataTable thead .sorting_asc:after, table.dataTable thead .sorting_desc:after { +} + +.sizeSet { + padding: 2px !important; + text-align: center !important; +} + +.rad { + border-radius: 8px !important; + /* padding: 10px; */ + padding: 2px 5px 0px 5px; +} + +.ionSize { + font-size: 20px !important; + top: 2px !important; + position: relative; +} + +.ionRad { + border-radius: 8px !important; + padding: 0px 7px 0px 7px !important; + background-color: #ff7700 !important; + border-color: #ff7700 !important; +} + +.ionRad2 { + border-radius: 8px !important; + padding: 0px 7px 0px 7px !important; + background-color: #7c7a7a !important; + border-color: #7c7a7a !important; +} + +.faSize { + font-size: 22px !important; +} + + + +.thhNastionalId { + width: 30px !important; +} + +.inpt { + width: 100%; + border: 1px solid #c7c7c7; +} + +.searchpanel { + background-color: #747272; +} + +select { + cursor: pointer; +} + +.panel-default > .panel-heading { + background-color: #1b9998 !important; +} + + + +.tooltip-container { + cursor: pointer; + position: relative; + display: inline-block; +} + +.tooltip2-container { + cursor: pointer; + position: relative; + display: inline-block; +} + +.tooltipfull-container { + cursor: pointer; + position: relative; + display: inline-block; +} + +.tooltipfull2-container { + cursor: pointer; + position: relative; + display: inline-block; +} + +.tooltip { + opacity: 0; + z-index: 99; + color: #fff; + width: 220px; + display: block; + font-size: 14px; + font-family: 'IranSans'; + padding: 5px 10px; + border-radius: 3px; + text-align: center; + /*text-shadow: 1px 1px 2px #111;*/ + background: #e67e22; + border: 1px solid #e67e22; + box-shadow: 0 0 3px rgba(0,0,0,0.5); + -webkit-transition: all .2s ease-in-out; + -moz-transition: all .2s ease-in-out; + -o-transition: all .2s ease-in-out; + -ms-transition: all .2s ease-in-out; + transition: all .2s ease-in-out; + -webkit-transform: scale(0); + -moz-transform: scale(0); + -o-transform: scale(0); + -ms-transform: scale(0); + transform: scale(0); + position: absolute; + right: -50px; + bottom: 40px; +} + + .tooltip:before, .tooltip:after { + content: ''; + border-left: 10px solid transparent; + border-right: 10px solid transparent; + border-top: 10px solid #e67e22; + position: absolute; + bottom: -10px; + left: 70%; + } + +.tooltip-container:hover .tooltip, a:hover .tooltip { + opacity: 1; + -webkit-transform: scale(1); + -moz-transform: scale(1); + -o-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); +} + +.tooltip2 { + opacity: 0; + z-index: 99; + color: #fff; + width: 220px; + display: block; + font-size: 14px; + font-family: 'IranSans'; + padding: 5px 10px; + border-radius: 3px; + text-align: center; + /*text-shadow: 1px 1px 2px #111;*/ + background: #e67e22; + border: 1px solid #e67e22; + box-shadow: 0 0 3px rgba(0,0,0,0.5); + -webkit-transition: all .2s ease-in-out; + -moz-transition: all .2s ease-in-out; + -o-transition: all .2s ease-in-out; + -ms-transition: all .2s ease-in-out; + transition: all .2s ease-in-out; + -webkit-transform: scale(0); + -moz-transform: scale(0); + -o-transform: scale(0); + -ms-transform: scale(0); + transform: scale(0); + position: absolute; + right: -90px; + bottom: 40px; +} + + .tooltip2:before, .tooltip2:after { + content: ''; + border-left: 10px solid transparent; + border-right: 10px solid transparent; + border-top: 10px solid #e67e22; + position: absolute; + bottom: -10px; + left: 50%; + } + +.tooltip2-container:hover .tooltip2, a:hover .tooltip2 { + opacity: 1; + -webkit-transform: scale(1); + -moz-transform: scale(1); + -o-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); +} + + + + +.tooltipfull { + opacity: 0; + z-index: 99; + color: #fff; + /* width: 180px;*/ + display: block; + font-size: 12px; + font-family: 'IranSans'; + padding: 5px 10px; + border-radius: 15px; + text-align: center; + /*text-shadow: 1px 1px 2px #111;*/ + background: #036205; + border: 1px solid #036205; + box-shadow: 0 0 3px rgba(0,0,0,0.5); + -webkit-transition: all .2s ease-in-out; + -moz-transition: all .2s ease-in-out; + -o-transition: all .2s ease-in-out; + /* -ms-transition: all .2s ease-in-out;*/ + transition: all .2s ease-in-out; + -webkit-transform: scale(0); + -moz-transform: scale(0); + -o-transform: scale(0); + -ms-transform: scale(0); + transform: scale(0); + position: absolute; + right: -2px; + bottom: 20px; + white-space: nowrap; +} + + .tooltipfull:before, .tooltipfull:after { + content: ''; + border-left: 10px solid transparent; + border-right: 10px solid transparent; + border-top: 10px solid #036205; + position: absolute; + bottom: -10px; + left: 50%; + } + +.tooltipfull-containerText:hover .tooltipfull, a:hover .tooltipfull { + opacity: 1; + -webkit-transform: scale(1); + -moz-transform: scale(1); + -o-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); +} + +@media screen and (max-width: 1920px) { + .fulltext { + font-family: 'IranSans' !important; + font-size: 12px !important; + text-align: right; + white-space: nowrap !important; + max-width: 160px; + width: 160px; + } + + .employer1920 { + max-width: 100px; + width: 250px; + } +} + +@media screen and (max-width: 1440px) { + .fulltext { + font-family: 'IranSans' !important; + font-size: 12px !important; + text-align: right; + white-space: nowrap !important; + max-width: 115px; + width: 115px; + overflow-x: hidden; + text-overflow: ellipsis + } + + .employer1920 { + max-width: fit-content; + width: fit-content; + } +} + +.signSize { + min-width: 65px; + width: 65px; +} + +.customSet { + margin-left: 5px; + background: linear-gradient(to right, #82fd82, green 50%, #ab0303 50%, #f97171); + border-color: #7c7a7a !important; + border-radius: 8px; + padding: 0px 4px 0px 4px; +} + +::-webkit-scrollbar { + width: 8px; +} + +::-webkit-scrollbar-track { + background: #dfdfdf; + border-radius: 5px; +} + +::-webkit-scrollbar-thumb { + background: brown; + border-radius: 5px; +} + +.opt { + background-color: #f5f5f5; + border-radius: 10px; + text-align: right; + padding: 2px 5px +} + + .opt:hover { + background-color: #d3f3f5 !important; + } + +.selectDiv { + position: relative; + z-index: 1; + border-radius: 10px; + min-height: 20px; + max-height: 140px; + overflow: hidden scroll; + width: 100%; + background-color: rgb(255 255 255); + display: block; + box-shadow: 0px -1px 12px 0px rgba(0,0,0,.16), 2px 1px 10px 0 rgba(0,0,0,.12); +} + +.selectedOption { + color: #04556a !important; + background-color: #e0f8ff !important; +} + +.keyboardSelected { + color: #04556a !important; + background-color: #e0f8ff !important; +} +/*-----------change by Heydari-----------*/ +.alarm { + background-color: #eb3434; + animation: color-change 1500ms linear infinite; +} + +@keyframes color-change { + 0% { + background-color: #eb3434; + } + + 50% { + background-color: #e5e5e5; + } + + 100% { + background-color: #eb3434; + } +} + + + +.warningSwall { + color: #fafafa !important; + background-color: #f3930af0 !important /* rgb(189 27 24 / 90%) */; + border: 1px solid #f3930a !important; +} + + .warningSwall .cancel { + background-color: #ffa728 !important; + border: 1px solid #f99e1b !important; + border-radius: 25px !important; + } + +.errorSwall { + color: #fafafa !important; + background-color: #bd1b18e6 !important /* rgb(189 27 24 / 90%) */; + border: 1px solid #ef5350 !important; +} + + .errorSwall h2, .warningSwall h2 { + text-align: center !important; + direction: rtl !important; + line-height: 25px; + color: #efefef !important; + margin: 15px 0; + } + + .errorSwall p, .warningSwall p { + text-align: center !important; + direction: rtl !important; + line-height: 25px; + color: #efefef !important; + margin-bottom: 15px; + } + + .errorSwall .sa-icon.sa-warning .sa-body, .warningSwall .sa-icon.sa-warning .sa-body { + background-color: #fff !important; + } + + .errorSwall .sa-icon.sa-warning .sa-dot, .warningSwall .sa-icon.sa-warning .sa-dot { + background-color: #fff !important; + } + + .errorSwall .sweet-alert .sa-icon.sa-warning, .warningSwall .sweet-alert .sa-icon.sa-warning { + border-color: #fff !important; + } + + .errorSwall .sa-icon.sa-warning, .warningSwall .sa-icon.sa-warning { + border-color: #fff !important; + } + + .errorSwall .confirm, .warningSwall .confirm { + display: none !important; + } + + .errorSwall .cancel { + background-color: #e75754 !important; + border: 1px solid #ef5350 !important; + border-radius: 25px !important; + } + + + +.successSwall { + color: #fafafa !important; + background-color: rgba(4, 149, 66, 0.8) !important; + border: 1px solid #33b86c !important; +} + + .successSwall h2 { + line-height: 25px; + color: #efefef !important; + margin: 15px 0; + } + + .successSwall p { + line-height: 25px; + color: #efefef !important; + margin-bottom: 15px; + } + + .successSwall .sa-icon.sa-warning .sa-body { + background-color: #fff !important; + } + + .successSwall .sa-icon.sa-warning .sa-dot { + background-color: #fff !important; + } + + .successSwall .sweet-alert .sa-icon.sa-warning { + border-color: #fff !important; + } + + .successSwall .sa-icon.sa-warning { + border-color: #fff !important; + } + + .successSwall .cancel { + display: none !important; + } + + .successSwall .confirm { + background-color: rgba(51, 184, 108, 0.8) !important; + border: 1px solid #33b86c !important; + border-radius: 25px !important; + } + + .successSwall .sa-icon { + width: 80px !important; + height: 80px !important; + margin: 20px auto !important; + } + + .successSwall .sa-icon.sa-success .sa-fix { + background-color: transparent !important; + } + + .successSwall .sa-icon.sa-success::after, .successSwall .sa-icon.sa-success::before { + background: transparent; + !important; + } + +#datatable td { + position: relative; +} + +table.dataTable thead .sorting_asc_disabled:after, +table.dataTable thead .sorting_desc_disabled:after { + display: none; +} + +.name-td { + font-family: 'Web_Yekan' !important; + font-size: 12px !important; + max-width: 100px; + position: relative; +} + +.date-box { + display: flex; + align-items: center; +} + +.operation-td.screen-view { + justify-content: left; + flex-direction: row-reverse; +} + +.employee-operations:before { + left: 49px; +} + +.code-td { + text-align: center; + font-size: 12px !important; + max-width: 100px; + position: relative; +} + +.fulltext { + opacity: 0; + white-space: nowrap; +} + +.ellipsed { + display: block; + width: 100%; + text-overflow: ellipsis; + overflow-x: clip; + white-space: nowrap; +} + +.date-box { + display: flex; + align-items: center; +} + +.tooltipfull-containerText { + cursor: pointer; + position: absolute; + display: inline-block; + right: 9px; + top: 13px; +} + +@media(max-width: 550px) { + .name-td { + font-size: 10px !important; + max-width: 75px; + position: relative; + } + + .code-td { + text-align: center; + font-size: 9px !important; + max-width: 35px; + position: relative; + } + + .deact i, #printAll i { + font-size: 16px !important; + } + + .table > tbody > tr > td, .table thead > tr > th { + padding: 8px 0 !important; + } + + .employee-operations { + width: 5rem; + font-size: 10px; + } + + .form-group { + margin: 3px auto !important; + } +} + +@media(max-width: 400px) { + .name-td { + max-width: 55px; + } +} diff --git a/ServiceHost/wwwroot/AssetsAdmin/page/Checkouts/js/Index.js b/ServiceHost/wwwroot/AssetsAdmin/page/Checkouts/js/Index.js new file mode 100644 index 00000000..a97dd329 --- /dev/null +++ b/ServiceHost/wwwroot/AssetsAdmin/page/Checkouts/js/Index.js @@ -0,0 +1,1036 @@ + + + $('.activer').on('change', + function(e) { + e.preventDefault(); + $('.search').click(); + + }); + + //var a = window.location.href; + //var res = a.split("#")[1]; + //if (res == "false") { + // $.Notification.autoHideNotify('error', 'top center', 'پیام سیستم ', " ابتدا یکی از فیلد های کارگاه، کارفرما، پرسنل را انتخاب نموده و سپس جستجو را بزنید "); + //} + + + + //if (document.getElementById("activing").selectedIndex == 1) { + // $('.deact').remove(); + // $('.act').append( + // ' ' + '' + ' ' + // ); + //} + //if (document.getElementById("activing").selectedIndex == 2) { + // $('.deact').remove(); + + + //} + $('.persianDateInputa').persianDatepicker({ + format: 'YYYY/MM/DD', + initialValueType: 'persian', + initialValue: false, + /* 'position': [-270, 25],*/ + autoClose: true, + + calendar: { + persian: { + leapYearMode: 'astronomical' + } + } + + }); + $('.persianDateInputb').persianDatepicker({ + format: 'YYYY/MM/DD', + initialValueType: 'persian', + + initialValue: false, + /*'position': [-270, 25],*/ + autoClose: true, + + calendar: { + persian: { + leapYearMode: 'astronomical' + } + } + }); + + //if (document.getElementById("sercheCheck").value == "false") { + // $(document).ready(function() { + // $('#datatable').dataTable({ + // "lengthMenu": [[25, 10, 50, 100, -1], [25, 10, 50, 100, "All"]] + // }); + // }); + //} else { + // $(document).ready(function() { + // $('#datatable').dataTable( + // { + // "lengthMenu": [[-1, 10, 50, 100, 25], ["All", 10, 50, 100, 25]] + // } + // ); + // }); + //} + + + $('.search').on('click', + function() { + const html = `
+ در حال بارگذاری... +
`; + + var myTable = $("#datatable_wrapper"); + myTable.remove(); + $('#mainPanel').append(html); + + }); + + $(document).ready(function() { + + $('.search').click(); + $(".personel-select").select2({ + + language: "fa", + dir: "rtl", + + + }); + }); + + $('#workshops').on('select2:open', + function(e) { + if ($('#workshops option').length == 1) { + + $.ajax({ + contentType: 'charset=utf-8', + dataType: 'json', + type: 'GET', + url: WorkshopMainListurl, + headers: { "RequestVerificationToken": $(AntiForgeryToken).val() }, + + success: function(response) { + $('#workshops').empty().append(''); + $.each(response.mylist, + function(i, item) { + $('#workshops').append($(''); + $.each(response.mylist, + function(i, item) { + $('#employer').append($('