From 4022a1afd8d20aee344695e53c524175fcfe0abe Mon Sep 17 00:00:00 2001
From: SamSys <f0604741@gmail.com>
Date: Mon, 5 May 2025 16:43:35 +0330
Subject: [PATCH] Add new Checkbox for Insurance in CreateWorshopp And
 EditWorkshop

---
 .../Repository/WorkshopRepository.cs              |  4 +++-
 .../Pages/Company/Workshops/CreateWorkshop.cshtml | 13 +++++++++++++
 .../Pages/Company/Workshops/EditWorkshop.cshtml   | 15 ++++++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/CompanyManagment.EFCore/Repository/WorkshopRepository.cs b/CompanyManagment.EFCore/Repository/WorkshopRepository.cs
index 8640a479..982eef2d 100644
--- a/CompanyManagment.EFCore/Repository/WorkshopRepository.cs
+++ b/CompanyManagment.EFCore/Repository/WorkshopRepository.cs
@@ -195,7 +195,9 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
             IsOldContract = x.IsOldContract,
             EmployerIdList = emp,
             HasRollCallFreeVip = x.HasRollCallFreeVip,
-            WorkshopHolidayWorking = x.WorkshopHolidayWorking
+            WorkshopHolidayWorking = x.WorkshopHolidayWorking,
+            InsuranceCheckoutOvertime = x.InsuranceCheckoutOvertime,
+            InsuranceCheckoutFamilyAllowance = x.InsuranceCheckoutFamilyAllowance
 
         }).FirstOrDefault(x => x.Id == id);
     }
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml
index 1411104c..3ce1844d 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/CreateWorkshop.cshtml
@@ -874,6 +874,19 @@
                             @if (Model.Command.PermissionIds != null && Model.Command.PermissionIds.Contains(10324))
                             {
                                 <div class="col-md-12 col-xs-12">
+                                    <div class="row card m-b-10">
+                                        <div class="col-md-6 col-xs-12">
+                                            <h4>محاسبه اضافه کار و حق عائله مندی در لیست بیمه کارگاه</h4>
+                                            <div>
+                                                    <label class="input-label"><input type="checkbox" asp-for="Command.InsuranceCheckoutOvertime" class="checkboxes"> <span>اضافه کار فیش حقوقی در لیست بیمه محاسبه گردد</span></label>
+                                            </div>
+                                            <div>
+                                                    <label class="input-label"><input type="checkbox" asp-for="Command.InsuranceCheckoutFamilyAllowance" class="checkboxes"><span class="m-r-5">حق عائله مندی فیش حقوقی در لیست بیمه محاسبه گردد </span></label>
+                                            </div>
+                                         
+                                        </div>
+                                    
+                                    </div>
                                     <div class="row card">
                                         <div class="col-md-6 col-xs-12">
                                             <h4>ارسال لیست بیمه کارگاه</h4>
diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml
index f63b1175..b37e26b2 100644
--- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml
+++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml
@@ -876,6 +876,19 @@
                                 <input type="hidden" id="PermissionInsurance" asp-for="@Model.HasPermissionInsurance" value="@Model.HasPermissionInsurance" />
                                 <div style="@(Model.HasPermissionInsurance ? "" : "display: none;")">
                                     <div class="col-md-12 col-xs-12">
+                                        <div class="row card m-b-10">
+                                            <div class="col-md-6 col-xs-12">
+                                                <h4>محاسبه اضافه کار و حق عائله مندی در لیست بیمه کارگاه</h4>
+                                                <div>
+                                                    <label class="input-label"><input type="checkbox" asp-for="Command.InsuranceCheckoutOvertime" class="checkboxes"> <span>اضافه کار فیش حقوقی در لیست بیمه محاسبه گردد</span></label>
+                                                </div>
+                                                <div>
+                                                    <label class="input-label"><input type="checkbox"  asp-for="Command.InsuranceCheckoutFamilyAllowance" class="checkboxes"><span class="m-r-5">حق عائله مندی فیش حقوقی در لیست بیمه محاسبه گردد </span></label>
+                                                </div>
+                                         
+                                            </div>
+                                    
+                                        </div>
                                         <div class="row card">
                                             <div class="col-md-6 col-xs-12">
                                                 <h4>ارسال لیست بیمه کارگاه</h4>
@@ -888,7 +901,7 @@
                                                 <div>
                                                     <label class="form-control-label"><input type="checkbox" value="Familylist" class="myCheckbox checkboxes sendList"> ارسال لیست بیمه کارگاه خانوادگی</label>
                                                 </div>
-                                                <input type="hidden" asp-for="Command.TypeOfInsuranceSend" id="asp-hidden" />
+                                                <input type="hidden" asp-for="Command.TypeOfInsuranceSend" id="asp-hidden"/>
                                             </div>
                                             <div class="col-md-3 col-xs-12 disabled" id="myDiv4">
                                                 <label class="input-label">کد کارگاهی بیمه</label>