Task Changes And ReportRepository bug fixed

0_Framework/0_Framework.csproj

@@ -10,6 +10,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.34" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
     <PackageReference Include="PersianTools.Core" Version="2.0.4" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
     

0_Framework/Application/AuthHelper.cs

@@ -35,6 +35,8 @@ public class AuthHelper : IAuthHelper
         result.ClientAriaPermission =claims.FirstOrDefault(x => x.Type == "ClientAriaPermission").Value;
         result.AdminAreaPermission = claims.FirstOrDefault(x => x.Type == "AdminAreaPermission").Value;
         result.PositionValue = !string.IsNullOrWhiteSpace(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) ? int.Parse(claims.FirstOrDefault(x => x.Type == "PositionValue")?.Value) : 0;
+        result.WorkshopList = Tools.DeserializeFromBsonList<WorkshopClaim>(claims.FirstOrDefault(x => x is { Type: "workshopList" })?.Value);
+        result.WorkshopSlug = claims.FirstOrDefault(x => x is { Type: "WorkshopSlug" }).Value;
         return result;
     }
 
@@ -45,7 +47,7 @@ public class AuthHelper : IAuthHelper
 
         var permissions = _contextAccessor.HttpContext.User.Claims.FirstOrDefault(x => x.Type == "permissions")
             ?.Value;
-        return JsonConvert.DeserializeObject<List<int>>(permissions);
+        return Tools.DeserializeFromBsonList<int>(permissions); //Mahan
     }
 
     public long CurrentAccountId()
@@ -120,7 +122,14 @@ public class AuthHelper : IAuthHelper
 
     public void Signin(AuthViewModel account)
     {
-        var permissions = JsonConvert.SerializeObject(account.Permissions);
+        #region MahanChanges
+
+        var permissions = account.Permissions is { Count: > 0 } ? Tools.SerializeToBson(account.Permissions) : "";
+        var workshopBson = account.WorkshopList is { Count: > 0 } ? Tools.SerializeToBson(account.WorkshopList) : "";
+        var slug = account.WorkshopSlug ?? "";
+
+        #endregion
+
         var claims = new List<Claim>
         {
             new Claim("AccountId", account.Id.ToString()),
@@ -134,7 +143,11 @@ public class AuthHelper : IAuthHelper
             new Claim("AdminAreaPermission", account.AdminAreaPermission.ToString()),
             new Claim("ClientAriaPermission", account.ClientAriaPermission.ToString()),
             new Claim("IsCamera", "false"),
-            new Claim("PositionValue",account.PositionValue.ToString())
+            new Claim("PositionValue",account.PositionValue.ToString()),
+            //mahanChanges
+            new("workshopList",workshopBson),
+            new("WorkshopSlug",slug)
+
         };
 
         var claimsIdentity = new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme);

0_Framework/Application/AuthViewModel.cs

@@ -15,7 +15,14 @@ public class AuthViewModel
     public List<int> Permissions { get; set; }
     public string AdminAreaPermission { get; set; }
     public string ClientAriaPermission { get; set; }
+
+    #region Mahan
+
     public int? PositionValue { get; set; }
+    public string WorkshopSlug { get; set; }
+    public List<WorkshopClaim> WorkshopList { get; set; }
+
+    #endregion
 
     public AuthViewModel(long id, long roleId, string fullname, string username, string mobile,string profilePhoto,
         List<int> permissions, string roleName, string adminAreaPermission, string clientAriaPermission, int? positionValue)

0_Framework/Application/IsActive.cs

@@ -0,0 +1,8 @@
+namespace _0_Framework.Application;
+
+public enum IsActive
+{
+    True,
+    False,
+  
+}

0_Framework/Application/Tools.cs

@@ -11,6 +11,8 @@ using PersianTools.Core;
 using static System.Net.Mime.MediaTypeNames;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 using Image = System.Drawing.Image;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Bson;
 
 
 namespace _0_Framework.Application;
@@ -879,9 +881,9 @@ public static class Tools
             var newImage = new Bitmap(width, height);
             using (var graphics = Graphics.FromImage(newImage))
             {
-                graphics.CompositingQuality = CompositingQuality.HighQuality;
+                graphics.CompositingQuality = CompositingQuality.HighSpeed;
-                graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                graphics.InterpolationMode = InterpolationMode.Bicubic;
-                graphics.SmoothingMode = SmoothingMode.HighQuality;
+                graphics.SmoothingMode = SmoothingMode.HighSpeed;
                 graphics.DrawImage(srcImage, 0, 0, width, height);
             }
 
@@ -1210,15 +1212,44 @@ public static class Tools
 			return "";
 		}
 	}
+    public static string SerializeToBson(object obj)
+    {
+        using var memoryStream = new MemoryStream();
+        using (BsonDataWriter bsonWriter = new BsonDataWriter(memoryStream))
+        {
+            JsonSerializer serializer = new JsonSerializer();
+            serializer.Serialize(bsonWriter, obj);
+        }
+        byte[] bsonData = memoryStream.ToArray();
+        return Convert.ToBase64String(bsonData);
+    }
+    //بیسان هایی که  بصورت لیست بودند استخراج میشود
+    public static List<T> DeserializeFromBsonList<T>(string base64Data)
+    {
+        byte[] data = Convert.FromBase64String(base64Data);
 
-	#region DayOfWeekMethods
+        using MemoryStream memoryStream = new MemoryStream(data);
+        using BsonDataReader reader = new BsonDataReader(memoryStream);
+        reader.ReadRootValueAsArray = true;
+        JsonSerializer serializer = new JsonSerializer();
+        return serializer.Deserialize<List<T>>(reader);
+    }
+    //بیسان هایی که  بصورت تکی بودند استخراج میشود
+    public static T DeserializeFromBson<T>(string base64Data)
+    {
+        byte[] bsonData = Convert.FromBase64String(base64Data);
+        using MemoryStream memoryStream = new MemoryStream(bsonData);
+        using BsonDataReader bsonReader = new BsonDataReader(memoryStream);
+        JsonSerializer serializer = new JsonSerializer();
+        return serializer.Deserialize<T>(bsonReader);
+    }
 
-	public static DateTime GetNextDayOfWeek(this DateTime date, DayOfWeek dayOfWeek)
+    public static DateTime GetNextDayOfWeek(this DateTime date, DayOfWeek dayOfWeek)
 	{
 		int numberOfNextDayOfWeek = ((int)dayOfWeek - (int)date.DayOfWeek + 7) % 7;
 		return date.AddDays(numberOfNextDayOfWeek == 0 ? 7 : numberOfNextDayOfWeek);
 	}
-	#endregion
+
 
 	//این متد آخر همان روز را به صورت دیت تایم برمیگرداند
 	public static DateTime ToGeorgianDateTime2(this string persianDate)

0_Framework/Application/Version.cs

@@ -10,8 +10,8 @@ public static class Version
 {
     static Version()
     {
-        StyleVersion = "2.12.14";
+        StyleVersion = "2.12.16";
-        AdminVersion = "2.5.34";
+        AdminVersion = "2.5.36";
         CameraVersion = "1.0.7";
     }
 

0_Framework/Application/WorkshopClaim.cs

@@ -0,0 +1,9 @@
+namespace _0_Framework.Application;
+
+public class WorkshopClaim
+{
+    public long Id { get; set; }
+    public string Name { get; set; }
+    public string Slug { get; set; }
+    public int PersonnelCount { get; set; }
+}

0_Framework/libman.json

@@ -0,0 +1,5 @@
+{
+  "version": "1.0",
+  "defaultProvider": "cdnjs",
+  "libraries": []
+}

AccountManagement.Application/AccountApplication.cs

@@ -12,10 +12,12 @@ using _0_Framework.Application.Sms;
 using AccountManagement.Domain.AccountLeftWorkAgg;
 using AccountManagement.Domain.CameraAccountAgg;
 using AccountManagement.Domain.RoleAgg;
+using CompanyManagment.App.Contracts.Workshop;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 using TaskManager.Domain.PositionAgg;
+using Company.Domain.WorkshopAgg;
 //using AccountManagement.Domain.RoleAgg;
 
 namespace AccountManagement.Application;
@@ -30,11 +32,12 @@ public class AccountApplication : IAccountApplication
     private readonly ISmsService _smsService;
     private readonly ICameraAccountRepository _cameraAccountRepository;
     private readonly IPositionRepository _positionRepository;
-    private readonly IAccountLeftworkRepository _accountLeftworkRepository;
+    private readonly IAccountLeftworkRepository _accountLeftworkRepository; 
+    private readonly IWorkshopRepository _workshopRepository;
 
 
     public AccountApplication(IAccountRepository accountRepository, IPasswordHasher passwordHasher,
-        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker, ISmsService smsService, ICameraAccountRepository cameraAccountRepository, IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository)
+        IFileUploader fileUploader, IAuthHelper authHelper, IRoleRepository roleRepository, IWorker worker, ISmsService smsService, ICameraAccountRepository cameraAccountRepository, IPositionRepository positionRepository, IAccountLeftworkRepository accountLeftworkRepository, IWorkshopRepository workshopRepository)
     {
         _authHelper = authHelper;
         _roleRepository = roleRepository;
@@ -42,6 +45,7 @@ public class AccountApplication : IAccountApplication
         _cameraAccountRepository = cameraAccountRepository;
         _positionRepository = positionRepository;
         _accountLeftworkRepository = accountLeftworkRepository;
+        _workshopRepository = workshopRepository;
         _fileUploader = fileUploader;
         _passwordHasher = passwordHasher;
         _accountRepository = accountRepository;
@@ -137,8 +141,8 @@ public class AccountApplication : IAccountApplication
             return opreation.Failed("پر کردن تمامی فیلدها الزامی است");
         if (_accountRepository.Exists(x => x.Username == command.Username))
             return opreation.Failed("نام کاربری تکراری است");
-        if (_accountRepository.Exists(x => x.Mobile == command.Mobile || 
+        if (_accountRepository.Exists(x => x.Mobile == command.Mobile && x.IsActiveString =="true"))
-                                           (x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(x.NationalCode))))
+                                          
             return opreation.Failed("مقادیر وارد شده تکراری است");
 
         //var nationalCodeValidation = command.NationalCode.NationalCodeValid();
@@ -223,6 +227,23 @@ public class AccountApplication : IAccountApplication
             var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
                 , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, account.AdminAreaPermission, account.ClientAriaPermission, positionValue);
 
+            if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
+                account.IsActiveString == "true")
+            {
+                var workshopList = _workshopRepository.SearchForClient(new WorkshopSearchModel() { AccountId = account.id })
+                    .OrderByDescending(x => x.PersonnelCount).ToList().Select(x => new WorkshopClaim()
+                        {
+                            Slug = _passwordHasher.SlugHasher(x.Id),
+                            Name = x.WorkshopFullName,
+                            PersonnelCount = x.PersonnelCount,
+                            Id = x.Id
+                        }
+                    ).ToList();
+                authViewModel.WorkshopList = workshopList;
+                if (workshopList.Any())
+                    authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshopList.First().Id);
+            }
+
             _authHelper.Signin(authViewModel);
 
             if ((account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" && account.IsActiveString == "true") || (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false" && account.IsActiveString == "true"))
@@ -281,6 +302,23 @@ public class AccountApplication : IAccountApplication
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
             , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, account.AdminAreaPermission, account.ClientAriaPermission, positionValue);
 
+        if (account.ClientAriaPermission == "true" && account.AdminAreaPermission == "false" &&
+            account.IsActiveString == "true")
+        {
+            var workshopList = _workshopRepository.SearchForClient(new WorkshopSearchModel() { AccountId = account.id })
+                .OrderByDescending(x => x.PersonnelCount).ToList().Select(x => new WorkshopClaim()
+                    {
+                        Slug = _passwordHasher.SlugHasher(x.Id),
+                        Name = x.WorkshopFullName,
+                        PersonnelCount = x.PersonnelCount,
+                        Id = x.Id
+                    }
+                ).ToList();
+            authViewModel.WorkshopList = workshopList;
+            if (workshopList.Any())
+                authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(workshopList.First().Id);
+        }
+
         _authHelper.Signin(authViewModel);
         long idAutoriz = 0;
         if (account.AdminAreaPermission == "true" && account.ClientAriaPermission == "true" || account.AdminAreaPermission == "true" && account.ClientAriaPermission == "false")
@@ -408,6 +446,17 @@ public class AccountApplication : IAccountApplication
         _authHelper.SignOut();
         var authViewModel = new AuthViewModel(account.id, account.RoleId, account.Fullname
             , account.Username, account.Mobile, account.ProfilePhoto, permissions, account.RoleName, "false", "true",null);
+        authViewModel.WorkshopList = _workshopRepository.SearchForClient(new WorkshopSearchModel() { AccountId = account.id })
+            .OrderByDescending(x => x.PersonnelCount).ToList().Select(x => new WorkshopClaim()
+                {
+                    Slug = _passwordHasher.SlugHasher(x.Id),
+                    Name = x.WorkshopFullName,
+                    PersonnelCount = x.PersonnelCount,
+                    Id = x.Id
+                }
+            ).ToList();
+        if (authViewModel.WorkshopList.Any())
+            authViewModel.WorkshopSlug = _passwordHasher.SlugHasher(authViewModel.WorkshopList.First().Id);
         _authHelper.Signin(authViewModel);
         return operation.Succcedded(2);
     }

AccountManagement.Domain/AccountAgg/Account.cs

@@ -60,7 +60,7 @@ namespace AccountManagement.Domain.AccountAgg
             Username = username;
             Password = password;
             Mobile = mobile;
-            NationalCode = nationalCode;
+            NationalCode = "";
             RoleId = 15;
             RoleName = "کارفرما";
             AdminAreaPermission = "false";

AccountMangement.Infrastructure.EFCore/Repository/AccountLeftworkRepository.cs

@@ -32,7 +32,7 @@ public class AccountLeftworkRepository : RepositoryBase<long, AccountLeftWork>,
 		var initial = new DateTime(2150, 1, 1);
 		string start = "";
 		string end = "";
-		var res = _accountContext.AccountLeftWorks.FirstOrDefault(x => x.AccountId == accountId);
+		var res = _accountContext.AccountLeftWorks.Where(x => x.AccountId == accountId).OrderByDescending(x=>x.StartWorkGr).FirstOrDefault();
 		if (res != null)
 		{
 			start = res.StartWorkGr != initial ? res.StartWorkGr.ToFarsi() : "";

Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs

@@ -0,0 +1,209 @@
+using _0_Framework.Domain;
+using System;
+using _0_Framework.Application;
+
+
+namespace Company.Domain.CustomizeCheckoutAgg;
+/// <summary>
+/// تصفیه حساب دلخواه
+/// </summary>
+public class CustomizeCheckout : EntityBase
+{
+    public CustomizeCheckout(DateTime contractStart, DateTime contractEnd, long employeeId, long workshopId, long? contractId, long employerId, double monthlySalary, double fridayPay, double overTimePay, double baseYearsPay, double bonusesPay, double nightWorkPay, double marriedAllowance, double shiftPay, double familyAllowance, double leavePay, double insuranceDeduction, double fineAbsenceDeduction, double lateToWorkDeduction, double earlyExitDeduction, double rewardPay, double salaryAidDeduction, double installmentDeduction, double fineDeduction, double taxDeduction, string sumOfWorkingDays, string totalClaims, string totalDeductions, double totalPayment)
+    {
+        YearInt = Convert.ToInt32(contractStart.ToFarsi().Substring(0,4));
+        MonthInt = Convert.ToInt32(contractStart.ToFarsi().Substring(5, 2));
+        ContractStart = contractStart;
+        ContractEnd = contractEnd;
+        EmployeeId = employeeId;
+        WorkshopId = workshopId;
+        EmployerId = employerId;
+        MonthlySalary = monthlySalary;
+        FridayPay = fridayPay;
+        OverTimePay = overTimePay;
+        BaseYearsPay = baseYearsPay;
+        BonusesPay = bonusesPay;
+        NightWorkPay = nightWorkPay;
+        MarriedAllowance = marriedAllowance;
+        ShiftPay = shiftPay;
+        FamilyAllowance = familyAllowance;
+        LeavePay = leavePay;
+        InsuranceDeduction = insuranceDeduction;
+        FineAbsenceDeduction = fineAbsenceDeduction;
+        LateToWorkDeduction = lateToWorkDeduction;
+        EarlyExitDeduction = earlyExitDeduction;
+        RewardPay = rewardPay;
+        SalaryAidDeduction = salaryAidDeduction;
+        InstallmentDeduction = installmentDeduction;
+        FineDeduction = fineDeduction;
+        TaxDeduction = taxDeduction;
+        SumOfWorkingDays = sumOfWorkingDays;
+        TotalClaims = totalClaims;
+        TotalDeductions = totalDeductions;
+        TotalPayment = totalPayment;
+        ContractId = contractId;
+        IsActiveString = IsActive.True;
+    }
+
+    #region Getters
+    /// <summary>
+    /// سال به صورت استرینگ
+    /// </summary>
+    public string Year => $"{YearInt}";
+    /// <summary>
+    /// نام ماه شمسی
+    /// </summary>
+    public string Month => MonthInt.ToFarsiMonthByIntNumber();
+    #endregion
+
+    #region DatabaseEntities
+
+    public IsActive IsActiveString { get; private set; }
+
+    /// <summary>
+    /// شماره قرارداد
+    /// </summary>
+    public string ContractNo { get; private set; }
+    /// <summary>
+    /// سال
+    /// </summary>
+    public int YearInt { get; private set; }
+    /// <summary>
+    /// ماه
+    /// </summary>
+    public int MonthInt { get; private set; }
+
+    /// <summary>
+    /// حقوق ماهانه
+    /// </summary>
+    public double MonthlySalary { get; private set; }
+
+    /// <summary>
+    /// شروع تصفیه حساب
+    /// </summary>
+    public DateTime ContractStart { get; private set; }
+
+    /// <summary>
+    /// پایان تصفیه حساب
+    /// </summary>
+    public DateTime ContractEnd { get; private set; }
+
+
+    /// <summary>
+    /// جمعه کاری
+    /// </summary>
+    public double FridayPay { get; private set; }
+
+    /// <summary>
+    /// اضافه کاری
+    /// </summary>
+    public double OverTimePay { get; private set; }
+
+    /// <summary>
+    /// سنوات
+    /// </summary>
+    public double BaseYearsPay { get; private set; }
+
+    /// <summary>
+    /// عیدی
+    /// </summary>
+    public double BonusesPay { get; private set; }
+
+    /// <summary>
+    /// شب کاری
+    /// </summary>
+    public double NightWorkPay { get; private set; }
+
+    /// <summary>
+    /// حق تاهل
+    /// </summary>
+    public double MarriedAllowance { get; private set; }
+
+    /// <summary>
+    /// نوبت کاری
+    /// </summary>
+    public double ShiftPay { get; private set; }
+
+    /// <summary>
+    /// حق اولاد(حق فرزند)ء
+    /// </summary>
+    public double FamilyAllowance { get; private set; }
+
+    /// <summary>
+    /// مزد مرخصی
+    /// </summary>
+    public double LeavePay { get; private set; }
+
+    /// <summary>
+    /// حق بیمه
+    /// </summary>
+    public double InsuranceDeduction { get; private set; }
+
+    /// <summary>
+    /// جریمه غیبت
+    /// </summary>
+    public double FineAbsenceDeduction { get; private set; }
+
+    /// <summary>
+    /// تاخیر در ورود
+    /// </summary>
+    public double LateToWorkDeduction { get; private set; }
+
+    /// <summary>
+    /// تعجیل در خروج
+    /// </summary>
+    public double EarlyExitDeduction { get; private set; }
+
+    /// <summary>
+    /// پاداش
+    /// </summary>
+    public double RewardPay { get; private set; }
+
+    /// <summary>
+    /// مساعده
+    /// </summary>
+    public double SalaryAidDeduction { get; private set; }
+
+    /// <summary>
+    /// قسط وام
+    /// </summary>
+    public double InstallmentDeduction { get; private set; }
+
+    /// <summary>
+    /// جریمه
+    /// </summary>
+    public double FineDeduction { get; private set; }
+
+    /// <summary>
+    /// مالیات
+    /// </summary>
+    public double TaxDeduction { get; private set; }
+
+
+    /// <summary>
+    /// تعداد روزهای کارکرد
+    /// </summary>
+    public string SumOfWorkingDays { get; private set; }
+
+    /// <summary>
+    /// مجموع مطالبات
+    /// </summary>
+    public string TotalClaims { get; private set; }
+    /// <summary>
+    /// مجموع کسورات
+    /// </summary>
+    public string TotalDeductions { get; private set; }
+    /// <summary>
+    /// مجموع پرداختی
+    /// </summary>
+    public double TotalPayment { get; private set; }
+
+    #endregion
+
+    #region Relations
+    public long EmployeeId { get; private set; }
+    public long WorkshopId { get; private set; }
+    public long EmployerId { get; private set; }
+    public long? ContractId { get; private set; }
+    #endregion
+}

Company.Domain/EmployeeAgg/Employee.cs

@@ -124,6 +124,9 @@ public class Employee : EntityBase
     public List<EmployeeInsuranceRecord> EmployeeInsuranceRecords { get; private set; }
 
     public List<PersonnelCodeDomain> PersonnelCodeList { get; set; }
+
+    public string FullName => $"{FName} {LName}";
+
     //public List<Checkout> Checkouts { get; set; }
     public Employee()
     {

CompanyManagment.App.Contracts/RollCallEmployee/AdjustRollCallEmployeesWithEmployeeLeftWork.cs

@@ -4,7 +4,8 @@ namespace CompanyManagment.App.Contracts.RollCallEmployee
 {
     public class AdjustRollCallEmployeesWithEmployeeLeftWork
     {
-        public long RollCallEmployeeId { get; set; }
+  
         public DateTime LeaveDate { get; set; }
+        public long RollCallStatusId { get; set; }
     }
 }

CompanyManagment.Application/LeftWorkApplication.cs

@@ -596,44 +596,39 @@ public class LeftWorkApplication : ILeftWorkApplication
     //این متد ترک کار های کارمند را با فعالیت حضور غیاب یکپارچه می کند
     private void IfEmployeeHasNewLeftWorkDateAddEndDateToRollCallStatus(long employeeId)
     {
+        //get last leftworks for employee in all workshops
+        var leftWorks = _leftWorkRepository.search(new LeftWorkSearchModel() { EmployeeId = employeeId }).GroupBy(x => x.WorkshopId).Select(x =>
+        {
+            var leftWork = x.MaxBy(y => y.StartWorkDateGr);
+            return new LeftWorkViewModel()
+            {
+                EmployeeId = employeeId,
+                WorkshopId = x.Key,
+                LeftWorkDateGr = leftWork.LeftWorkDateGr,
+                StartWorkDateGr = leftWork.StartWorkDateGr
+            };
+        }).ToList();
 
-	    //get all leftworks for employee
+        //get rollCallEmployee associated with those leftworks which have a higher end date than leftworkDate
-	    var leftWorks = _leftWorkRepository.search(new LeftWorkSearchModel() { EmployeeId = employeeId }).GroupBy(x=>x.WorkshopId).Select(x=>
+        var rollCallsEmployee = _rollCallEmployeeRepository.GetByEmployeeIdWithStatuses(employeeId)
-	    {
+            .Where(x => leftWorks.Any(y => y.WorkshopId == x.WorkshopId)).ToList();
-		    var leftwork = x.MaxBy(y => y.StartWorkDateGr);
-		    return new LeftWorkViewModel()
-		    {
-			    EmployeeId = employeeId,
-			    WorkshopId = x.Key,
-			    LeftWorkDateGr = leftwork.LeftWorkDateGr,
-			    StartWorkDateGr = leftwork.StartWorkDateGr
-		    };
-	    });
 
-	    //get rollCallEmployee associated with those leftworks which have a higher end date than leftworkDate
+        var joinedList = rollCallsEmployee.Join(leftWorks, x => x.WorkshopId, y => y.WorkshopId, (x, y) => new
-	    var rollCallsEmployee = _rollCallEmployeeRepository.GetByEmployeeIdWithStatuses(employeeId).GroupBy(x=>x.WorkshopId).Select(
+        {
-			    x =>
+            x.WorkshopId,
-			    {
+            x.EmployeeId,
-				    var maxRollCall = x.MaxBy(y => y.Statuses);
+            y.LeftWorkDateGr,
-				    return new RollCallEmployeeViewModel()
+            Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z => z.StartDateGr < y.LeftWorkDateGr && z.EndDateGr > y.LeftWorkDateGr)
-				    {
+        });
-					    WorkshopId = x.Key,
-					    EmployeeId = employeeId,
-                        Id=maxRollCall.Id,
-                        Statuses = maxRollCall.Statuses
-				    };
-			    })
-		    .Where(x => leftWorks.Any(y => y.WorkshopId == x.WorkshopId && x.Statuses.Any(z => z.StartDateGr < y.LeftWorkDateGr && z.EndDateGr > y.LeftWorkDateGr)));
 
-	    //shaping up the list to send as parameter to repository
+        //shaping up the list to send as parameter to repository
-	    var newRollCallRecords = rollCallsEmployee.Select(x => new AdjustRollCallEmployeesWithEmployeeLeftWork()
+        var newRollCallRecords = joinedList.Where(x => x.Status != null).Select(x => new AdjustRollCallEmployeesWithEmployeeLeftWork()
-	    {
+        {
-		    LeaveDate = leftWorks.FirstOrDefault(y => y.WorkshopId == x.WorkshopId && y.EmployeeId == x.EmployeeId)!.LeftWorkDateGr,
+            LeaveDate = x.LeftWorkDateGr,
-		    RollCallEmployeeId = x.Id
+            RollCallStatusId = x.Status.Id
-	    }).ToList();
+        }).ToList();
-
+        if(newRollCallRecords.Count > 0)
-
+            _rollCallEmployeeStatusRepository.AdjustRollCallStatusEndDates(newRollCallRecords);
-	    _rollCallEmployeeStatusRepository.AdjustRollCallStatusEndDates(newRollCallRecords);
     }
 
     #endregion

CompanyManagment.EFCore/Mapping/CustomizeCheckoutMapping.cs

@@ -0,0 +1,17 @@
+using Company.Domain.CustomizeCheckoutAgg;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace CompanyManagment.EFCore.Mapping;
+
+public class CustomizeCheckoutMapping : IEntityTypeConfiguration<CustomizeCheckout>
+{
+    public void Configure(EntityTypeBuilder<CustomizeCheckout> builder)
+    {
+        builder.ToTable("CustomizeCheckouts");
+        builder.HasKey(x => x.id);
+
+        builder.Property(x => x.IsActiveString).HasConversion<string>().HasMaxLength(5);
+        builder.Property(x => x.ContractNo).HasMaxLength(50);
+    }
+}

CompanyManagment.EFCore/Mapping/EmployeeMapping.cs

@@ -70,6 +70,12 @@ public class EmployeeMapping : IEntityTypeConfiguration<Employee>
             .WithOne(x => x.Employee)
             .HasForeignKey(x => x.EmployeeId);
 
+        #region Pooya
+
+
+        builder.Ignore(x => x.FullName);
+        #endregion
+
     }
 
 

CompanyManagment.EFCore/Repository/ReportRepository.cs

@@ -92,7 +92,7 @@ public class ReportRepository : IReportRepository
                 #endregion
 
 
-            }).Where(e => blockContractingPartyIds.Contains(e.ContractingPartId) && e.AccountIdList.Count > 0);
+            }).Where(e => blockContractingPartyIds.Contains(e.ContractingPartId) && e.AccountIdList.Count > 0).AsSplitQuery();
 
         var workshopsList = workshops.Select(x => new ActiveWorkshops
         {
@@ -114,12 +114,12 @@ public class ReportRepository : IReportRepository
             CheckoutLeftIds = _context.InstitutionContractSet.Any(c => c.ContractingPartyId == x.ContractingPartId && c.ContractStartGr <= currentMonthStart && c.ContractEndGr >= currentMonthEnd) ? x.CheckoutLeftIds : new List<long>(),
 
             #endregion
-        });
+        }).AsSplitQuery();
         //var wCount = workshops.Count();
         //var partyId = workshops.Select(x => x.ContractingPartId).ToList();
 
         Console.WriteLine("Ripo query 1 >>>>>: " + watch.Elapsed);
-        var res = workshopsList.ToList();
+        var res = workshopsList.AsEnumerable();
         watch.Restart();
         var result = res.Select(x => new ActiveWorkshops
         {
@@ -162,7 +162,7 @@ public class ReportRepository : IReportRepository
                                 (l.ContractEnd >= nextMonthStart && l.ContractEnd <= nextMonthEnd))
                 : 0,
 
-        });
+        }).AsEnumerable();
      
         Console.WriteLine("Ripo query 2 >>>>>: " + watch.Elapsed);
         var contractAccountResult = result.Select(x => new ActiveWorkshops()
@@ -182,7 +182,7 @@ public class ReportRepository : IReportRepository
             IsActiveString = x.IsActiveString,
             WorkshopFullName = x.WorkshopFullName,
 
-        }).Where(x => x.AccountId != 0).ToList();
+        }).Where(x => x.AccountId != 0 && x.ContractLeftWorkCount > 0).ToList();
         var checkoutAccountResult = result.Select(x => new ActiveWorkshops()
         {
 	        Id = x.Id,
@@ -201,7 +201,7 @@ public class ReportRepository : IReportRepository
 	        IsActiveString = x.IsActiveString,
 	        WorkshopFullName = x.WorkshopFullName,
 
-        }).Where(x => x.AccountId != 0).ToList();
+        }).Where(x => x.AccountId != 0 && x.CheckoutLeftWorkCount > 0).ToList();
 		watch.Restart();
         //قرارداد هایی که باید اسجاد می شد
         var contractToBe = contractAccountResult.Sum(x => x.ContractLeftWorkCount);
@@ -226,7 +226,7 @@ public class ReportRepository : IReportRepository
             AccountId = x.Key,
             AccountFullName = _accountContext.Accounts.FirstOrDefault(a=>a.id == x.Key)!.Fullname,
 
-            ContractDonePercent = (x.Sum(c => c.ContrctDoneCount) * 100) / x.Sum(c => c.ContractLeftWorkCount),
+            ContractDonePercent = (x.Sum(c => c.ContrctDoneCount) * 100) / (x.Sum(c => c.ContractLeftWorkCount)),
             ContractSignPercent = x.Sum(c => c.ContrctDoneCount) > 0 ? (x.Sum(c => c.ContrctSignDoneCount) * 100) / (x.Sum(c => c.ContrctDoneCount)) : 0,
 
 
@@ -354,7 +354,7 @@ public class ReportRepository : IReportRepository
 
 
             }).Where(e => blockContractingPartyIds.Contains(e.ContractingPartId))
-            .Where(a => a.AccountIdList.Contains(accountId));
+            .Where(a => a.AccountIdList.Contains(accountId)).AsSplitQuery();
 
         var workshopsList = workshops.Select(x => new ActiveWorkshops
         {
@@ -488,7 +488,7 @@ public class ReportRepository : IReportRepository
 
 
             }).Where(e => blockContractingPartyIds.Contains(e.ContractingPartId))
-            .Where(a => a.AccountIdList.Contains(accountId));
+            .Where(a => a.AccountIdList.Contains(accountId)).AsSplitQuery();
         var workshopsList = workshops.Select(x => new ActiveWorkshops
         {
             Id = x.Id,
@@ -628,7 +628,7 @@ public class ReportRepository : IReportRepository
                 #endregion
 
             }).Where(e => blockContractingPartyIds.Contains(e.ContractingPartId))
-            .Where(a => a.AccountIdList.Contains(accountId));
+            .Where(a => a.AccountIdList.Contains(accountId)).AsSplitQuery();
         var workshopsList = workshops.Select(x => new ActiveWorkshops
         {
             Id = x.Id,
@@ -761,7 +761,7 @@ public class ReportRepository : IReportRepository
                 #endregion
 
             }).Where(e => blockContractingPartyIds.Contains(e.ContractingPartId))
-            .Where(a => a.AccountIdList.Contains(accountId));
+            .Where(a => a.AccountIdList.Contains(accountId)).AsSplitQuery();
         var workshopsList = workshops.Select(x => new ActiveWorkshops
         {
             Id = x.Id,
@@ -1087,7 +1087,7 @@ public class ReportRepository : IReportRepository
                     (l.LeftWorkDateGr >= nextMonthStart && l.LeftWorkDateGr <= nextMonthEnd)).Select(l => l.EmployeeId).ToList(),
                 #endregion
             }).Where(e => blockContractingPartyIds.Contains(e.ContractingPartId))
-            .Where(a => a.AccountIdList.Contains(accountId));
+            .Where(a => a.AccountIdList.Contains(accountId)).AsSplitQuery();
         var workshopsList = workshops.Select(x => new ActiveWorkshops
         {
             Id = x.Id,
@@ -1221,7 +1221,7 @@ public class ReportRepository : IReportRepository
                 #endregion
 
             }).Where(e => blockContractingPartyIds.Contains(e.ContractingPartId))
-            .Where(a => a.AccountIdList.Contains(accountId));
+            .Where(a => a.AccountIdList.Contains(accountId)).AsSplitQuery();
         var workshopsList = workshops.Select(x => new ActiveWorkshops
         {
             Id = x.Id,
@@ -1363,7 +1363,7 @@ public class ReportRepository : IReportRepository
                 #endregion
 
             }).Where(e => blockContractingPartyIds.Contains(e.ContractingPartId))
-            .Where(a => a.AccountIdList.Contains(accountId));
+            .Where(a => a.AccountIdList.Contains(accountId)).AsSplitQuery();
         var workshopsList = workshops.Select(x => new ActiveWorkshops
         {
             Id = x.Id,
@@ -1493,7 +1493,7 @@ public class ReportRepository : IReportRepository
                 #endregion
 
             }).Where(e => blockContractingPartyIds.Contains(e.ContractingPartId))
-            .Where(a => a.AccountIdList.Contains(accountId));
+            .Where(a => a.AccountIdList.Contains(accountId)).AsSplitQuery();
         var workshopsList = workshops.Select(x => new ActiveWorkshops
         {
             Id = x.Id,

CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs

@@ -68,36 +68,57 @@ public class RollCallEmployeeRepository : RepositoryBase<long, RollCallEmployee>
 
     public List<RollCallEmployeeViewModel> GetPersonnelRollCallListPaginate(RollCallEmployeeSearchModel command)
     {
-		var dateNow = DateTime.Now;
+        var dateNow = DateTime.Now;
-		var rawQuery = _context.Employees.Include(x => x.LeftWorks).Include(x => x.LeftWorkInsurances)
+        var rawQuery = _context.Employees.Include(x => x.LeftWorks).Include(x => x.LeftWorkInsurances)
-			.Where(x => x.LeftWorks.Any(y => y.WorkshopId == command.WorkshopId && y.StartWorkDate <= dateNow && y.LeftWorkDate > dateNow) ||
+            .Where(x => x.LeftWorks.Any(y =>
-			            x.LeftWorkInsurances.Any(y => y.WorkshopId == command.WorkshopId && y.StartWorkDate <= dateNow &&
+                            y.WorkshopId == command.WorkshopId && y.StartWorkDate <= dateNow &&
-			                                          (y.LeftWorkDate > dateNow || y.LeftWorkDate == null)));
+                            y.LeftWorkDate > dateNow) ||
-		if (!string.IsNullOrWhiteSpace(command.Name))
+                        x.LeftWorkInsurances.Any(y =>
-			rawQuery = rawQuery.Where(x => (x.FName + " " + x.LName).Contains(command.Name));
+                            y.WorkshopId == command.WorkshopId && y.StartWorkDate <= dateNow &&
+                            (y.LeftWorkDate > dateNow || y.LeftWorkDate == null))).OrderByDescending(x => x.id).AsQueryable().AsSplitQuery();
+        if (!string.IsNullOrWhiteSpace(command.Name))
+            rawQuery = rawQuery.Where(x => (x.FName + " " + x.LName).Contains(command.Name));
 
-		var list = rawQuery.ToList();
+        var rollCallEmployees = _context.RollCallEmployees.Where(x => x.WorkshopId == command.WorkshopId);
-		var res = list.Select(x => new RollCallEmployeeViewModel
-			{
-				WorkshopId = command.WorkshopId,
-				EmployeeId = x.id,
-				Id = _context.RollCallEmployees.Any(r => r.EmployeeId == x.id && r.WorkshopId == command.WorkshopId) ?
-					_context.RollCallEmployees.FirstOrDefault(r => r.EmployeeId == x.id && r.WorkshopId == command.WorkshopId)!.id : 0,
-				EmployeeFullName = $"{x.FName} {x.LName}",
-				EmployeeSlug = _passwordHasher.SlugHasher(x.id),
-				NationalCode = _context.Employees.FirstOrDefault(e => e.id == x.id)?.NationalCode,
-				IsActiveString = _context.RollCallEmployees.Any(r => r.EmployeeId == x.id && r.WorkshopId == command.WorkshopId && r.IsActiveString == "true") ? "true" : "false",
-				HasUploadedImage = _context.RollCallEmployees.Any(r => r.EmployeeId == x.id && r.WorkshopId == command.WorkshopId && r.HasUploadedImage == "true") ? "true" : "false",
-				ImagePath = (System.IO.File.Exists(Path.Combine(_webHostEnvironment.ContentRootPath, "Faces", command.WorkshopId.ToString(), x.id.ToString(), "1.jpg")))
-					? Tools.ResizeImage(Path.Combine(_webHostEnvironment.ContentRootPath, "Faces", command.WorkshopId.ToString(), x.id.ToString(), "1.jpg"), 150, 150)
-					: "",
-			}).OrderBy(x => x.PersonelCode)
-			.Skip(command.PageIndex)
-			.Take(30)
-			.ToList();
 
-		return res;
+
-	}
+        var joinedQuery = from employee in rawQuery
+                          join rollCallEmployee in rollCallEmployees
+                              on employee.id equals rollCallEmployee.EmployeeId into grp
+                          from joinedRollCall in grp.DefaultIfEmpty()
+                          select new RollCallEmployeeViewModel()
+                          {
+                              WorkshopId = command.WorkshopId,
+                              EmployeeId = employee.id,
+                              Id = joinedRollCall == null ? 0 : joinedRollCall.id,
+                              EmployeeFullName = employee.FullName,
+                              NationalCode = employee.NationalCode,
+                              IsActiveString = joinedRollCall == null ? "false" : joinedRollCall.IsActiveString,
+                              HasUploadedImage = joinedRollCall == null ? "false" : joinedRollCall.HasUploadedImage
+                          };
+        var firstlist = joinedQuery.AsSplitQuery();
+        var list = firstlist.OrderByDescending(x => x.IsActiveString == "true" ? 1 : 0)
+            .ThenByDescending(x => x.HasUploadedImage == "true" ? 1 : 0)
+            .Skip(command.PageIndex).Take(30).ToList();
+
+        list = list.Select(x => new RollCallEmployeeViewModel()
+        {
+            WorkshopId = x.WorkshopId,
+            EmployeeId = x.EmployeeId,
+            Id = x.Id,
+            EmployeeFullName = x.EmployeeFullName,
+            NationalCode = x.NationalCode,
+            IsActiveString = x.IsActiveString,
+            HasUploadedImage = x.HasUploadedImage,
+            EmployeeSlug = _passwordHasher.SlugHasher(x.EmployeeId),
+            ImagePath = (System.IO.File.Exists(Path.Combine(_webHostEnvironment.ContentRootPath, "Faces", command.WorkshopId.ToString(), x.EmployeeId.ToString(), "1.jpg")))
+                ? Tools.ResizeImage(Path.Combine(_webHostEnvironment.ContentRootPath, "Faces", command.WorkshopId.ToString(), x.EmployeeId.ToString(), "1.jpg"), 150, 150) : ""
+        }).ToList();
+    
+    
+
+         return list;
+    }
 
     public RollCallEmployee GetWithRollCallStatus(long id)
     {

CompanyManagment.EFCore/Repository/RollCallEmployeeStatusRepository.cs

@@ -32,23 +32,21 @@ namespace CompanyManagment.EFCore.Repository
 		}
 		public void AdjustRollCallStatusEndDates(List<AdjustRollCallEmployeesWithEmployeeLeftWork> command)
 		{
-			var rollCallEmployeeIds = command.Select(y => y.RollCallEmployeeId);
 
-			var list = _context.RollCallEmployeesStatus.Where(x =>rollCallEmployeeIds.Any(y =>y == x.RollCallEmployeeId))
+            var statusIds = command.Select(x => x.RollCallStatusId);
-				.GroupBy(x => x.RollCallEmployeeId).AsEnumerable().Select(x=> new RollCallEmployeeStatusViewModel()
+            var finalList = _context.RollCallEmployeesStatus.Where(x => statusIds.Contains(x.id)).AsEnumerable();
-				{
+            finalList.Where(x => command.Any(y => !y.LeaveDate.IsDateUndefined() && y.LeaveDate < x.EndDate)).ToList().ForEach(
-					Id = x.MaxBy(c=>c.StartDate).id,
+                z =>
+                {
+                    var cmd = command.FirstOrDefault(y => y.RollCallStatusId == z.id);
 
+                    if (cmd!.LeaveDate >= z.StartDate)
+                        z.Edit(z.StartDate, cmd!.LeaveDate);
+                }
+            );
 
-				}).Select(c=>c.Id);
+            _context.SaveChanges();
-
+        }
-			var finalList = _context.RollCallEmployeesStatus.Where(x => list.Contains(x.id)).AsEnumerable();
-			finalList.Where(x =>  command.Any(y => !y.LeaveDate.IsDateUndefined() && y.LeaveDate < x.EndDate)).ToList().ForEach(x =>
-				x.Edit(x.StartDate, command.FirstOrDefault(y => y.RollCallEmployeeId == x.RollCallEmployeeId)!.LeaveDate)
-			);
-
-			_context.SaveChanges();
-		}
 		#endregion
 	}
 }

CompanyManagment.EFCore/Repository/WorkshopRepository.cs

@@ -749,7 +749,7 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
 
     public List<WorkshopViewModel> SearchForClient(WorkshopSearchModel searchModel)
     {
-        var acountID = _authHelper.CurrentAccountId();
+        var acountID = searchModel.AccountId > 0 ? searchModel.AccountId : _authHelper.CurrentAccountId();
         var contracingPartyAcc = _context.ContractingPartyAccounts.FirstOrDefault(x => x.AccountId == acountID);
         if (contracingPartyAcc == null)
         {

ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml.cs

@@ -338,7 +338,7 @@ public class IndexModel : PageModel
 					Username = userPass,
 					Password = userPass,
 					Mobile = phone.PhoneNumber,
-					NationalCode = conractingParty.IsLegal == "حقوقی" ? "حقوقی" : userPass
+					NationalCode = userPass
 				};
 				var res = _accountApplication.RegisterClient(createAcc);
 				if (res.IsSuccedded)

ServiceHost/Areas/Admin/Pages/Company/Workshops/Index.cshtml

@@ -889,8 +889,7 @@
                                                         asp-page="./AutoExtension" asp-route-id="@item.Id">
                                                             <i class="fa fa-file-text-o"></i>
                                                         </a>
-                                                        <a permission="10314" class="btn btn-table btn-warning pull-left rad @(item.HasBlockContractingParty?"disabled":"")" style="margin-left: 5px;"
+                                                        <a permission="10314" asp-page="./EditWorkshop" asp-route-id="@item.Id" class="btn btn-table btn-warning pull-left rad @(item.HasBlockContractingParty?"disabled":"")" style="margin-left: 5px;">
-                                                           href="#showmodal=@Url.Page("./Index", "Edit", new {Id = item.Id})">
                                                             <i class="fa faSize fa-edit"></i>
                                                         </a>
                                                         <a class="btn btn-info rad printModal btn-table" href="#showmodal=@Url.Page("./Index", "AnnualConfirm", new {Id = item.Id})" style="background-color: #136576;border: 1px solid #136576;">

ServiceHost/Areas/AdminNew/Pages/Company/Task/CreateModal.cshtml

@@ -1,11 +1,10 @@
 @model AccountManagement.Application.Contracts.Task.CreateTaskModal
 @* @model ServiceHost.Areas.AdminNew.Pages.Company.Task.CreateModel *@
 @inject _0_Framework.Application.IAuthHelper AuthHelper;
-@using _0_Framework.Application
 
 @{
+	string adminVersion = _0_Framework.Application.Version.AdminVersion;
 	ViewData["title"] = " - وظیفه جدید";
-    string adminVersion = _0_Framework.Application.Version.AdminVersion;
 }
 
 <script src="~/AssetsClient/js/jquery-ui.js"></script>
@@ -334,4 +333,4 @@
 
 </script>
 
-<script src="~/assetsadminnew/tasks/js/create.js?ver=@adminVersion"></script>
+<script src="~/assetsadminnew/tasks/js/create.js"></script>

ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModal.cshtml

@@ -1,8 +1,9 @@
 @model AccountManagement.Application.Contracts.Task.EditTask
 @using System.Security.Claims
 @using AccountManagement.Application.Contracts.Media
-@using Version = _0_Framework.Application.Version
 @{
+	string adminVersion = _0_Framework.Application.Version.AdminVersion;
+
 	MediaViewModel voice = null;
     var userId = Convert.ToInt64(User.FindFirstValue("AccountId"));
     
@@ -18,9 +19,9 @@
     int i = 1;
 
     <script src="~/AssetsClient/js/jquery-ui.js"></script>
-    <link href="~/assetsadminnew/tasks/css/task-manager-create.css?ver=@Version.AdminVersion" rel="stylesheet" />
+    <link href="~/assetsadminnew/tasks/css/task-manager-create.css?ver=@adminVersion" rel="stylesheet" />
-    <link href="~/AssetsClient/css/select2.css?ver=@Version.AdminVersion" rel="stylesheet" />
+    <link href="~/AssetsClient/css/select2.css?ver=@adminVersion" rel="stylesheet" />
-    <link href="~/assetsadminnew/tasks/css/detailmodal.css?ver=@Version.AdminVersion" rel="stylesheet" />
+    <link href="~/assetsadminnew/tasks/css/detailmodal.css?ver=@adminVersion" rel="stylesheet" />
     <link href="~/assetsadminnew/libs/sweetalert2/sweetalert2.min.css" rel="stylesheet" />
 
     if (Model.AssignViewModels?.Count > 1)
@@ -87,31 +88,31 @@
 	                <div class="chat-section">
 		                <div class="chat-card-main">
 			                <div class="row">
-				                <div class="col-6 mb-2">
+				                <div class="col-6">
-                                    <h6 class="taskTitle text-start row align-items-center">
+                                    <h6 class="taskTitle justify-content-start row align-items-center mb-1">
-                                        <span class="col-5">طرف حساب:</span>
+                                        <span class="col-5 col-md-4 ps-0">طرف حساب:</span>
-                                        <span class="taskTitleSub col-7">@Model.ContractingPartyName</span>
+                                        <span class="taskTitleSub col-7 col-md-8">@Model.ContractingPartyName</span>
 					                </h6>
-					                <h6 class="taskTitle text-start row align-items-center">
+                                    <h6 class="taskTitle justify-content-start row align-items-center">
-                                        <span class="col-5">عنوان وظیفه:</span>
+                                        <span class="col-5 col-md-4 ps-0 ps-0">عنوان وظیفه:</span>
-						                <span class="taskTitleSub col-7">@Model.Title</span>
+                                        <span class="taskTitleSub col-7 col-md-8">@Model.Title</span>
 					                </h6>
 				                </div>
-				                <div class="col-6 mb-2">
+				                <div class="col-6">
-					                <h6 class="taskTitle text-end row align-items-center">
+                                    <h6 class="taskTitle text-end row align-items-center mb-1">
-                                        <span class="col-5">تاریخ ایجاد:</span>
+                                        <span class="col-6 col-md-5 ps-0">تاریخ ایجاد:</span>
-						                <span class="taskTitleSub text-center col-6">@Model.CreateDateFa</span>
+                                        <span class="taskTitleSub text-center col-6 col-md-7 justify-content-center">@Model.CreateDateFa</span>
 					                </h6>
-					                <h6 class="taskTitle text-end row align-items-center">
+                                    <h6 class="taskTitle text-end row align-items-center">
-                                        <span class="col-5">تاریخ سررسید:</span>
+                                        <span class="col-6 col-md-5 ps-0">تاریخ سررسید:</span>
-                                        <span class="taskTitleSub text-center col-6" id="AssignEndTaskDateFa">@Model.AssignViewModels?.First().EndTaskDateFa</span>
+                                        <span class="taskTitleSub text-center col-6 col-md-7 justify-content-center" id="AssignEndTaskDateFa">@Model.AssignViewModels?.First().EndTaskDateFa</span>
 					                </h6>
 				                </div>
 			                </div>
 			                @if (!String.IsNullOrWhiteSpace(Model.Description))
 			                {
+				                <div class="taskTitle">توضیحات :</div>
 				                <div class="taskDesc">
-					                <div>توضیحات :</div>
 					                @Html.Raw(Model.Description)
 				                </div>
 			                }
@@ -211,66 +212,69 @@
 		                </div>
 
 
-		                <div id="ajaxChatSection"></div>
+		                <div class="mainChat">
+			                <div id="ajaxChatSection"></div>
+		                </div>
+		                
 	                </div>
                 </div>
 
                 <div class="col-12">
-                    @if (!Model.IsDone && !Model.IsCancel)
+	                @* && Model.ReceiverId.All(x => x == userId) || userId == Model.SenderId *@
-                    {
+	                @if (!Model.IsDone && !Model.IsCancel)
-                        <div class="actionBtnsection">
+	                {
-                            <div class="input-form row" id="select2MemberList">
+		                <div class="actionBtnsection">
-                                <select class="form-select select2Member" id="select2AssignList" multiple="multiple">
+			                <div class="input-form row" id="select2MemberList">
+				                <select class="form-select select2Member" id="select2AssignList" multiple="multiple">
 
-                                    @foreach (var item in Model.AssignsLists)
+					                @foreach (var item in Model.AssignsLists)
-                                    {
+					                {
-                                        <option value="@item.Id">@item.Fullname</option>
+						                <option value="@item.Id">@item.Fullname</option>
-                                    }
+					                }
-                                </select>
+				                </select>
-                            </div>
+			                </div>
-                            <div id="Desc-Time-Area" class="input-form row" style="display: none;">
+			                <div id="Desc-Time-Area" class="input-form row" style="display: none;">
-                                <div class="col-8 textarea-col p-0">
+				                <div class="col-8 textarea-col p-0">
-                                    <textarea class="form-control" id="Description" placeholder="توضیحات" style="height: 63px; resize: none;"></textarea>
+					                <textarea class="form-control" id="Description" placeholder="توضیحات" style="height: 63px; resize: none;"></textarea>
-                                </div>
+				                </div>
-                                <div class="col-4">
+				                <div class="col-4">
-                                    <div class="row select-time-section" style="display: none;">
+					                <div class="row select-time-section" style="display: none;">
-                                        <div class="col-4 timeSelect1 pe-0">
+						                <div class="col-4 timeSelect1 pe-0">
-                                            <input type="radio" class="tm-rad" name="btnradio" id="today" autocomplete="off">
+							                <input type="radio" class="tm-rad" name="btnradio" id="today" autocomplete="off">
-                                            <label class="btn btn-outline-primary d-flex justify-content-center radio-btn" for="today" style="font-size: 11px">امروز</label>
+							                <label class="btn btn-outline-primary d-flex justify-content-center radio-btn" for="today" style="font-size: 11px">امروز</label>
-                                        </div>
+						                </div>
-                                        <div class="col-4 timeSelect2 p-0">
+						                <div class="col-4 timeSelect2 p-0">
-                                            <input type="radio" class="tm-rad" name="btnradio" id="tommorow" autocomplete="off">
+							                <input type="radio" class="tm-rad" name="btnradio" id="tommorow" autocomplete="off">
-                                            <label class="btn btn-outline-primary d-flex justify-content-center radio-btn" for="tommorow" style="font-size: 11px">فردا</label>
+							                <label class="btn btn-outline-primary d-flex justify-content-center radio-btn" for="tommorow" style="font-size: 11px">فردا</label>
-                                        </div>
+						                </div>
-                                        <div class="col-4 timeSelect3 p-0">
+						                <div class="col-4 timeSelect3 p-0">
-                                            <input type="radio" class="tm-rad" name="btnradio" id="two-day-later" autocomplete="off">
+							                <input type="radio" class="tm-rad" name="btnradio" id="two-day-later" autocomplete="off">
-                                            <label class="btn btn-outline-primary d-flex justify-content-center radio-btn" for="two-day-later" style="font-size: 11px">پس‌فردا</label>
+							                <label class="btn btn-outline-primary d-flex justify-content-center radio-btn" for="two-day-later" style="font-size: 11px">پس‌فردا</label>
-                                        </div>
+						                </div>
-                                        <div class="from-group position-relative pe-0">
+						                <div class="from-group position-relative pe-0">
-                                            <input type="text" id="EndTaskDate" class="form-control text-center date EndTaskDateStyle textFormTM" placeholder="تاریخ" onkeyup="CheckHoliday()" style="border-radius: 0 0 6px 6px;">
+							                <input type="text" id="EndTaskDate" class="form-control text-center date EndTaskDateStyle textFormTM" placeholder="تاریخ" onkeyup="CheckHoliday()" style="border-radius: 0 0 6px 6px;">
-                                            <div class="text-center" id="HolidayError" style="display: none; font-size: 11px; color: red; position: absolute; top: 7px; right: 40px; font-weight: 700;">تعطیل</div>
+							                <div class="text-center" id="HolidayError" style="display: none; font-size: 11px; color: red; position: absolute; top: 7px; right: 40px; font-weight: 700;">تعطیل</div>
-                                        </div>
+						                </div>
-                                    </div>
+					                </div>
-                                </div>
+				                </div>
-                            </div>
+			                </div>
 
-                            @if (userId == Model.SenderId)
+			                @if (userId == Model.SenderId)
-                            {
+			                {
-                                <button class="actionBtn" id="AssignBtn">ارجاع</button>
+				                <button class="actionBtn" id="AssignBtn">ارجاع</button>
-                                <button class="actionBtn" id="deadlineBtn">تغییر مهلت</button>
+				                <button class="actionBtn" id="deadlineBtn">تغییر مهلت</button>
-                                <button class="actionBtn" id="notPossibleBtn">لغو وظیفه</button>
+				                <button class="actionBtn" id="notPossibleBtn">لغو وظیفه</button>
-                                <button class="actionBtn" id="doneBtn">تکمیل وظیفه</button>
+				                <button class="actionBtn" id="doneBtn">تکمیل وظیفه</button>
-                            }
+			                }
-                            else
+			                else
-                            {
+			                {
-                                <button class="actionBtn" id="AssignBtn">ارجاع</button>
+				                <button class="actionBtn" id="AssignBtn">ارجاع</button>
-                                <button class="actionBtn" id="deadlineBtn">مهلت برای روز خاص</button>
+				                <button class="actionBtn" id="deadlineBtn">مهلت برای روز خاص</button>
-                                <button class="actionBtn" id="notPossibleBtn">قابل انجام نیست</button>
+				                <button class="actionBtn" id="notPossibleBtn">قابل انجام نیست</button>
-                                <button class="actionBtn" id="doneBtn">انجام شد</button>
+				                <button class="actionBtn" id="doneBtn">انجام شد</button>
-                            }
+			                }
-                        </div>
+		                </div>
-
+	                }
-                    }
                 </div>
             </div>
         </div>
@@ -280,7 +284,7 @@
     <div class="modal-footer justify-content-center align-items-center p-2 pt-0">
         <div class="row">
             <div class="col-6 text-end">
-                <button type="button" class="btn-cancel2" data-bs-dismiss="modal">بستن</button>
+                <button type="button" class="btn-cancel2 d-flex align-items-center justify-content-center" data-bs-dismiss="modal">بستن</button>
             </div>
             @if (!Model.IsDone)
             {
@@ -313,9 +317,9 @@
 
 @if (Convert.ToInt64(User.FindFirstValue("AccountId")) == Model.SenderId)
 {
-    <script src="~/assetsadminnew/tasks/js/detailmodalSender.js?ver=@Version.AdminVersion"></script>
+    <script src="~/assetsadminnew/tasks/js/detailmodalSender.js?ver=@adminVersion"></script>
 }
 else
 {
-    <script src="~/assetsadminnew/tasks/js/detailmodal.js?ver=@Version.AdminVersion"></script>
+    <script src="~/assetsadminnew/tasks/js/detailmodal.js?ver=@adminVersion"></script>
 }

ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsTaskTicketsModal.cshtml

@@ -377,8 +377,8 @@
 			<div class="">
 				<div class="modal-header d-block text-center header-custom-color">
 					<div class="d-flex align-items-center justify-content-between">
-						<h6 class="modal-title" style="font-size: 14px;">جزئیات وظیفه</h6>
+						<h6 class="modal-title">جزئیات وظیفه</h6>
-						<h6 class="modal-title" style="font-size: 14px;">@Model.EndTaskDate</h6>
+						<h6 class="modal-title">@Model.EndTaskDate</h6>
 					</div>
 				</div>
 
@@ -410,36 +410,36 @@
 							<div class="@(Model.AssignViewModels?.Count > 1 ? "col-9" : "col-12")">
 								<div class="chat-section">
 									<div class="chat-card-main">
-										<div class="row mb-2">
+										<div class="row">
 											@* <h6 class="modal-title text-start text-white" style="font-size: 14px;">طرف حساب: @Model.ContractingPartyName</h6>
 											<h6 class="modal-title text-start text-white" style="font-size: 14px;">عنوان وظیفه: @Model.Title</h6>
 											 *@
 
-											<div class="col-6 mb-2">
+											<div class="col-6">
-												<h6 class="taskTitle text-start row align-items-center">
+												<h6 class="taskTitle text-start row align-items-center mb-1">
-													<span class="col-5">طرف حساب:</span>
+													<span class="col-5 col-md-4 ps-0">طرف حساب:</span>
-													<span class="taskTitleSub col-7">@Model.ContractingPartyName</span>
+													<span class="taskTitleSub col-7 col-md-8">@Model.ContractingPartyName</span>
 												</h6>
 												<h6 class="taskTitle text-start row align-items-center">
-													<span class="col-5">عنوان وظیفه:</span>
+													<span class="col-5 col-md-4 ps-0">عنوان وظیفه:</span>
-													<span class="taskTitleSub col-7">@Model.Title</span>
+													<span class="taskTitleSub col-7 col-md-8">@Model.Title</span>
 												</h6>
 											</div>
-											<div class="col-6 mb-2">
+											<div class="col-6">
-												<h6 class="taskTitle text-end row align-items-center">
+												<h6 class="taskTitle text-center row align-items-center mb-1">
-													<span class="col-5">تاریخ ایجاد:</span>
+													<span class="col-6 col-md-5 ps-0">تاریخ ایجاد:</span>
-													<span class="taskTitleSub text-center col-6">@Model.CreateDateFa</span>
+													<span class="taskTitleSub text-center col-6 col-md-7">@Model.CreateDateFa</span>
 												</h6>
-												<h6 class="taskTitle text-end row align-items-center">
+												<h6 class="taskTitle text-center row align-items-center">
-													<span class="col-5">تاریخ سررسید:</span>
+													<span class="col-6 col-md-5 ps-0">تاریخ سررسید:</span>
-													<span class="@(Model.AssignViewModels?.First() != null ? "" : "taskTitleSub") text-center col-6" id="AssignEndTaskDateFa">@Model.AssignViewModels?.First().EndTaskDateFa</span>
+													<span class="col-6 col-md-7 @(Model.AssignViewModels?.First() != null ? "" : "taskTitleSub") text-center" id="AssignEndTaskDateFa">@Model.AssignViewModels?.First().EndTaskDateFa</span>
 												</h6>
 											</div>
 										</div>
 										@if (!String.IsNullOrWhiteSpace(Model.Description))
 										{
+											<div class="taskTitle">توضیحات:</div>
 											<div class="taskDesc">
-												<div>توضیحات :</div>
 												@Html.Raw(Model.Description)
 											</div>
 										}
@@ -533,9 +533,10 @@
 
 										<span style="font-size: 11px">@Model.CreateDateFa</span>
 									</div>
-
+									
-
+									<div class="mainChat">
-									<div id="ajaxChatSection"></div>
+										<div id="ajaxChatSection"></div>
+									</div>
 								</div>
 							</div>
 

ServiceHost/Areas/AdminNew/Pages/Company/Task/DiagramTaskModal.cshtml

@@ -1,15 +1,22 @@
 @model AccountManagement.Application.Contracts.Task.EditTask
-@using Version = _0_Framework.Application.Version
 
 @{
-	<link href="~/assetsadminnew/tasks/css/diagramtaskmodal.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	string adminVersion = _0_Framework.Application.Version.AdminVersion;
+
+	<link href="~/assetsadminnew/tasks/css/diagramtaskmodal.css?ver=@adminVersion" rel="stylesheet" />
 	
 	<style>
         .modal-content {
-	        background-color: #eef3f3;
+	        background-color: #ffffff;
-	        background-image: url("data:image/svg+xml,%3Csvg width='20' height='20' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='%23e8eef0' fill-opacity='0.67' fill-rule='evenodd'%3E%3Ccircle cx='3' cy='3' r='3'/%3E%3Ccircle cx='13' cy='13' r='3'/%3E%3C/g%3E%3C/svg%3E");
-        }
 
+        }
+        .modal-body {
+	        display: flex;
+	        justify-content: center;
+	        align-items: center;
+	        height: 100vh; /* Ensure the modal takes full viewport height */
+	        overflow: hidden; /* Hide overflow to prevent content from expanding beyond viewport */
+        }
         .modal-xl-taskTime {
 	        max-width: 600px;
         }
@@ -59,8 +66,8 @@
     </div>
 
     <div class="modal-body p-2">
-        <div class="d-flex align-items-center justify-content-center h-100">
+        <div class="d-flex align-items-center justify-content-center h-100 boxShadowDiagram">
-            <div class="tree-section w-100">
+            <div class="tree-section w-100" id="canvas-wrapper" style="cursor: grab;">
                 <div id="tree">
 	                <div id="tree-container" class="branch">
 
@@ -82,4 +89,4 @@
         var assignments = @Html.Raw(Json.Serialize(Model.AssignViewModels));
         var senderId= @Model.SenderId;
     </script>
-    <script src="~/assetsadminnew/tasks/js/DiagramTaskModal.js?ver=@Version.AdminVersion"></script>
+    <script src="~/assetsadminnew/tasks/js/DiagramTaskModal.js?ver=@adminVersion"></script>

ServiceHost/Areas/AdminNew/Pages/Company/Task/Edit.cshtml

@@ -2,9 +2,10 @@
 @using System.Web
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @using File = System.IO.File
-@using Version = _0_Framework.Application.Version
 
 @{
+	string adminVersion = _0_Framework.Application.Version.AdminVersion;
+
 	var voice = Model.EditTask.medias.FirstOrDefault(x => x.Category == "صوت");
 	string svgName = "unknow";
 	string[] fileExtensions = new string[]
@@ -18,10 +19,10 @@
 	int fileIndex = 0;
 	int i = 1;
 	<script src="~/AssetsClient/js/jquery-ui.js"></script>
-	<link href="~/assetsadminnew/tasks/css/task-manager-create.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	<link href="~/assetsadminnew/tasks/css/task-manager-create.css?ver=@adminVersion" rel="stylesheet" />
-	<link href="~/assetsadminnew/tasks/css/edit.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	<link href="~/assetsadminnew/tasks/css/edit.css?ver=@adminVersion" rel="stylesheet" />
 	<link href="~/assetsadminnew/libs/sweetalert2/sweetalert2.min.css" rel="stylesheet" />
-	<link href="~/AssetsClient/css/select2.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	<link href="~/AssetsClient/css/select2.css?ver=@adminVersion" rel="stylesheet" />
 
 }
 
@@ -371,4 +372,4 @@
 	var voiceSrc = '@(voice == null ? "" : @Url.Page("./Index", "ShowVoice", new { filePath = voice?.Path }))';
 
 </script>
-<script src="~/assetsadminnew/tasks/js/edit.js?ver=484"></script>
+<script src="~/assetsadminnew/tasks/js/edit.js?ver=@adminVersion"></script>

ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml

@@ -1,24 +1,24 @@
 @page
-@using Version = _0_Framework.Application.Version
 @model ServiceHost.Areas.AdminNew.Pages.Company.Task.IndexModel
 @inject _0_Framework.Application.IAuthHelper AuthHelper;
+@using _0_Framework.Application
 @{
+	string adminVersion = _0_Framework.Application.Version.AdminVersion;
 	var index = 1;
 }
 
 
 @section Styles {
-	<link href="~/AssetsClient/css/table-style.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	<link href="~/AssetsClient/css/table-style.css?ver=@adminVersion" rel="stylesheet" />
-	<link href="~/AssetsClient/css/table-responsive.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	<link href="~/AssetsClient/css/table-responsive.css?ver=@adminVersion" rel="stylesheet" />
-	<link href="~/assetsclient/css/table-grid.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	<link href="~/assetsclient/css/table-grid.css?ver=@adminVersion" rel="stylesheet" />
-	<link href="~/assetsclient/css/operation-button.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	<link href="~/assetsclient/css/operation-button.css?ver=@adminVersion" rel="stylesheet" />
-	<link href="~/assetsadminnew/tasks/css/task-manager-list.css?ver=123" rel="stylesheet" />
+	<link href="~/assetsadminnew/tasks/css/task-manager-list.css?ver=?ver=@adminVersion" rel="stylesheet" />
-		@* ?ver=@Version.AdminVersion *@
+	<link href="~/AssetsClient/css/select2.css?ver=@adminVersion" rel="stylesheet" />
-	<link href="~/AssetsClient/css/select2.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	<link href="~/AssetsClient/css/datetimepicker.css?ver=@adminVersion" rel="stylesheet" />
-	<link href="~/AssetsClient/css/datetimepicker.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	<link href="~/AssetsClient/css/dropdown.css?ver=@adminVersion" rel="stylesheet" />
-	<link href="~/AssetsClient/css/dropdown.css?ver=@Version.AdminVersion" rel="stylesheet" />
 
-	<link href="~/AssetsClient/css/filter-search.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	<link href="~/AssetsClient/css/filter-search.css?ver=@adminVersion" rel="stylesheet" />
 
 	<!-- sweet alerts -->
 	<link href="~/AdminTheme/assets/sweet-alert/sweet-alert.min.css" rel="stylesheet">
@@ -306,7 +306,7 @@
 						<div class="row">
 							<div class="col-12 mb-4">
 								<div class="mb-2">
-									<select class="form-select select2Option" aria-label="انتخاب پرسنل ..." asp-for="SearchModel.AccountId" id="AccountIdMobile">
+									<select class="form-select select2OptionMobile" aria-label="انتخاب پرسنل ..." asp-for="SearchModel.AccountId" id="AccountIdMobile">
 										<option value="0">پرسنل را انتخاب کنید ...</option>
 									</select>
 								</div>
@@ -377,8 +377,8 @@
 
 
 @section Script {
-	<script src="~/assetsclient/js/site.js?ver=@Version.AdminVersion"></script>
+	<script src="~/assetsclient/js/site.js?ver=@adminVersion"></script>
-	<script src="~/AssetsClient/js/dropdown.js?ver=@Version.AdminVersion"></script>
+	<script src="~/AssetsClient/js/dropdown.js?ver=@adminVersion"></script>
 	<script src="~/AdminTheme/assets/sweet-alert/sweet-alert.min.js"></script>
 
 	<script>
@@ -399,5 +399,5 @@
 
 		var itemsYearList = @Html.Raw(Json.Serialize(Model.YearlyList.OrderBy(x => x)));
 	</script>
-	<script src="~/assetsadminnew/tasks/js/index.js?ver=@Version.AdminVersion"></script>
+	<script src="~/assetsadminnew/tasks/js/index.js?ver=@adminVersion"></script>
 }

ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml.cs

@@ -7,6 +7,7 @@ using AccountManagement.Application.Contracts.Assign;
 using AccountManagement.Application.Contracts.Position;
 using AccountManagement.Application.Contracts.Task;
 using AccountManagement.Application.Contracts.Ticket;
+using AccountManagement.Domain.AssignAgg;
 using AccountManagement.Domain.MediaAgg;
 using CompanyManagment.App.Contracts.Checkout;
 using CompanyManagment.App.Contracts.Contract;
@@ -58,6 +59,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.Task
 		public int UserPositionValue { get; set; }
 		public List<string> YearlyList { get; set; }
 
+
         public override void OnPageHandlerExecuting(PageHandlerExecutingContext context)
         {
             bool hasAccessToTask = _positionApplication.HasPositionValue(_authHelper.CurrentAccountId());
@@ -68,6 +70,11 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.Task
             base.OnPageHandlerExecuting(context);
         }
 
+        
+           
+         
+        
+
         public IActionResult OnGet(TaskSearchModel searchModel)
 		{
 			if (_authHelper.GetPermissions().Any(x => x == 901))
@@ -373,17 +380,28 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.Task
 		// برای باز کردن مودال عملیات درخواست تسک 
 		public IActionResult OnGetOperationRequestTask(long taskId, string type)
 		{
-			var model = new OperationModalViewModel()
+			var accounts = _accountApplication.AccountsForAssign(taskId);
+            var taskDetails = _taskApplication.GetRequestDetails(taskId);
+            var model = new OperationModalViewModel()
 			{
 				//ModalTaskRequest = _taskApplication.GetRequestDetails(taskId),
 				TaskId = taskId,
 				Type = type,
-				Accounts = _accountApplication.AccountsForAssign(taskId),
+				Accounts = accounts,
-				TaskDetails = _taskApplication.GetRequestDetails(taskId)
+                TaskDetails = taskDetails,
-			};
+            };
 			return Partial("OperationRequestModal", model);
 		}
 
+		public IActionResult OnGetOperationRequestTaskDetailsAjax(long taskId)
+		{
+			var taskDetails = _taskApplication.GetRequestDetails(taskId);
+			return new JsonResult(new
+			{
+				data = taskDetails
+			});
+		}
+
 		// برای باز کردن مودال جزئیات تسک مثل عنوان، تاریخ، توضیحات و ... 
 		public IActionResult OnGetDetailsTask(long taskId)
 		{
@@ -726,12 +744,16 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.Task
 			}
 		}
 
-		public IActionResult OnGetChatMessageDetailsTask(long assignId)
+		public IActionResult OnGetChatMessageDetailsTask(long assignId, long taskId)
 		{
 			var result = _taskApplication.GetTaskMessages(assignId);
+
+            var taskDetails = taskId > 0 ? _taskApplication.GetRequestDetails(taskId).AssignViewModels.First(x => x.Id == assignId) : null;
+
 			return new JsonResult(new
 			{
 				data = result,
+				taskDetailsData = taskDetails
 			});
 		}
 

ServiceHost/Areas/AdminNew/Pages/Company/Task/OperationRequestModal.cshtml

@@ -1,9 +1,10 @@
 @model AccountManagement.Application.Contracts.Task.OperationModalViewModel
 @using System.Security.Claims
 @using AccountManagement.Application.Contracts.Media
-@using Version = _0_Framework.Application.Version
 
 @{
+	string adminVersion = _0_Framework.Application.Version.AdminVersion;
+
 	MediaViewModel voice = null;
 	var userId = Convert.ToInt64(User.FindFirstValue("AccountId"));
 
@@ -19,10 +20,10 @@
 	int i = 1;
 
     <script src="~/AssetsClient/js/jquery-ui.js"></script>
-    <link href="~/assetsadminnew/tasks/css/task-manager-create.css?ver=@Version.AdminVersion" rel="stylesheet" />
+    <link href="~/assetsadminnew/tasks/css/task-manager-create.css?ver=@adminVersion" rel="stylesheet" />
-    <link href="~/AssetsClient/css/select2.css?ver=@Version.AdminVersion" rel="stylesheet" />
+    <link href="~/AssetsClient/css/select2.css?ver=@adminVersion" rel="stylesheet" />
-	<link href="~/assetsadminnew/tasks/css/operationrequestmodal.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	<link href="~/assetsadminnew/tasks/css/operationrequestmodal.css?ver=@adminVersion" rel="stylesheet" />
-	<link href="~/assetsadminnew/tasks/css/detailmodal.css?ver=@Version.AdminVersion" rel="stylesheet" />
+	<link href="~/assetsadminnew/tasks/css/detailmodal.css?ver=@adminVersion" rel="stylesheet" />
 
 	
 	if (Model.TaskDetails.AssignViewModels?.Count > 1)
@@ -50,18 +51,18 @@
         <div class="topColor"></div>
 		
         <div class="row">
-	        <div class="col-4 text-start">
+	        <div class="col-5 col-md-4 text-start">
-		        <h6 class="modal-title" style="margin: 0 38px 0 0;font-size: 14px;">جزئیات وظیفه</h6>
+		        <h6 class="modal-title" style="margin: 0 38px 0 0;">جزئیات وظیفه</h6>
 	        </div>
-	        <div class="col-4">
+			<div class="col-6 col-md-4">
-		        <h6 class="modal-title" style="margin: 0 38px 0 0; font-size: 14px;" id="AssignTaskName">
+		        <h6 class="modal-title" id="AssignTaskName">
 					@(Model.TaskDetails.AssignViewModels.Count() == 1 ? Model.TaskDetails.AssignViewModels.First().AssignedName : "کل درخواست‌ها")
 		        </h6>
 	        </div>
         </div>
     </div>
 
-    <div class="modal-body p-2">
+	<div class="modal-body p-2" style="overflow-y: auto;">
         <div class="container-fluid">
 
             <div class="row">
@@ -132,33 +133,33 @@
 
 				<div id="chatSection" class="@(Model.TaskDetails.AssignViewModels?.Count > 0 && Model.TaskDetails.AssignViewModels?.Count != 1 ? "col-12 col-md-9" : "col-12") p-0">
 	                <div class="chat-section">
-		                <div class="chat-card-main">
+						<div class="chat-card-main" style="height: 175px;position: sticky;top: 5px;z-index: 40;">
-			                <div class="row mb-2">
+			                <div class="row">
-								<div class="col-6 mb-2">
+								<div class="col-6">
-									<h6 class="taskTitle text-start row align-items-center">
+									<h6 class="taskTitle text-start row align-items-center mb-1">
-										<span class="col-5">طرف حساب:</span>
+										<span class="col-5 col-md-4 p-0">طرف حساب:</span>
-										<span class="taskTitleSub col-7">@Model.TaskDetails.ContractingPartyName</span>
+										<span class="taskTitleSub col-7 col-md-8">@Model.TaskDetails.ContractingPartyName</span>
 									</h6>
 									<h6 class="taskTitle text-start row align-items-center">
-										<span class="col-5">عنوان وظیفه:</span>
+										<span class="col-5 col-md-4 p-0">عنوان وظیفه:</span>
-										<span class="taskTitleSub col-7">@Model.TaskDetails.Title</span>
+										<span class="taskTitleSub col-7 col-md-8">@Model.TaskDetails.Title</span>
 									</h6>
 								</div>
-								<div class="col-6 mb-2">
+								<div class="col-6">
-									<h6 class="taskTitle text-end row align-items-center">
+									<h6 class="taskTitle text-end row align-items-center mb-1">
-										<span class="col-5">تاریخ ایجاد:</span>
+										<span class="col-6 col-md-5 ps-0">تاریخ ایجاد:</span>
-										<span class="taskTitleSub text-center col-6">@Model.TaskDetails.CreateDateFa</span>
+										<span class="taskTitleSub text-center col-6 col-md-7 justify-content-center">@Model.TaskDetails.CreateDateFa</span>
 									</h6>
 									<h6 class="taskTitle text-end row align-items-center">
-										<span class="col-5">تاریخ سررسید:</span>
+										<span class="col-6 col-md-5 ps-0">تاریخ سررسید:</span>
-										<span class="@(Model.TaskDetails.AssignViewModels?.First() != null ? "" : "taskTitleSub") text-center col-6" id="AssignEndTaskDateFa">@Model.TaskDetails.AssignViewModels?.First().EndTaskDateFa</span>
+										<span class="@(Model.TaskDetails.AssignViewModels?.First() != null ? "" : "taskTitleSub") text-center col-6 col-md-7 justify-content-center" id="AssignEndTaskDateFa">@Model.TaskDetails.AssignViewModels?.First().EndTaskDateFa</span>
 									</h6>
 								</div>
 			                </div>
 							@if (!String.IsNullOrWhiteSpace(Model.TaskDetails.Description))
 							{
+								<div class="taskTitle">توضیحات :</div>
 								<div class="taskDesc">
-									<div>توضیحات :</div>
 									@Html.Raw(Model.TaskDetails.Description)
 								</div>
 							}
@@ -254,80 +255,24 @@
 							<span style="font-size: 11px">@Model.TaskDetails.CreateDateFa</span>
 						</div>
 
-						<div id="ajaxChatSection"></div>
+						<div id="mainChat" class="mainChat">
+			                <div id="LoadingCard">
+				                <div class="px-2">
+					                @for (int j = 0; j < 4; j++)
+					                {
+						                bool isOdd = j % 2 != 0;
+						                string marginStyle = isOdd ? "margin-right: auto;" : "margin-left: auto;";
 
-						<div class="admincardActionSection position-relative">
+						                <div class="skeleton-loader" style="height: 90px; width: 330px; @marginStyle"></div>
-							@foreach (var assign in Model.TaskDetails.AssignViewModels!)
+					                }
-							{
+				                </div>
-								string typeMessage = "";
+			                </div>
-								string color = "";
-								if (assign.IsCanceledRequest)
-								{
-									typeMessage = "درخواست انصراف ";
-									color = "red";
-								}
-								else if (assign.TimeRequest)
-								{
-									typeMessage = "درخواست مهلت ";
-									color = "orange";
-								}
-								else if (assign.IsDoneRequest)
-								{
-									typeMessage = "درخواست انجام شد ";
-									color = "green";
-								}
-								<div class="admincardAction @color" id="Assign_@assign.Id">
-									<div class="row">
-										<div class="@(assign.TimeRequest ? "col-6" : "col-9")">
-											<p class="mb-1 m-0">@assign.AssignedName @typeMessage از وظیفه داده است.</p>
-										</div>
-										@if (assign.TimeRequest)
-										{
-											<div class="col-3">
-												<p class="mb-1 m-0 text-center">به تاریخ: @assign.RequestDateFa</p>
-											</div>
-										}
-									</div>
-									<div class="row align-items-center">
-										<div class="@(assign.TimeRequest ? "col-6" : "col-9") pe-1">
-											<textarea class="form-control" id="Description_@assign.AssignedId" placeholder="توضیحات" style="height: 40px; resize: none"></textarea>
-										</div>
-										@if (assign.TimeRequest)
-										{
-											<div class="col-3 px-0">
-												<input type="text" id="dateTime_@assign.AssignedId" class="form-control text-center date" placeholder="تاریخ" style="height: 40px;" />
-											</div>
-										}
-										<div class="col-3 mt-1 ps-1">
-											<div class="btn-section">
-												@{
-													string onclickReject = string.Empty;
-													string onclickAccept = string.Empty;
 
-													if (assign.IsCanceledRequest)
+			                <div id="ajaxChatSection">
-													{
+
-														onclickReject = $"handleRejectCancel({assign.AssignedId},{assign.Id})";
+			                </div>
-														onclickAccept = $"handleAcceptCancel({assign.AssignedId},{assign.Id})";
-													}
-													else if (assign.TimeRequest)
-													{
-														onclickReject = $"handleRejectTimeRequest({assign.AssignedId},{assign.Id})";
-														onclickAccept = $"handleAcceptTimeRequest({assign.AssignedId},{assign.Id})";
-													}
-													else if (assign.IsDoneRequest)
-													{
-														onclickReject = $"handleRejectComplete({assign.AssignedId},{assign.Id})";
-														onclickAccept = $"handleAcceptComplete({assign.AssignedId},{assign.Id})";
-													}
-												}
-												<button type="button" class="btn-submit" onclick="@onclickAccept">تایید</button>
-												<button type="button" class="btn-reject" onclick="@onclickReject">عدم تایید</button>
-											</div>
-										</div>
-									</div>
-								</div>
-							}
 		                </div>
+
 	                </div>
 
                 </div>
@@ -338,7 +283,7 @@
     <div class="modal-footer justify-content-center align-items-center p-2 pt-0">
         <div class="row">
             <div class="col-6 text-end">
-                <button type="button" class="btn-cancel2" data-bs-dismiss="modal">بستن</button>
+                <button type="button" class="btn-cancel2 d-flex align-items-center justify-content-center" data-bs-dismiss="modal">بستن</button>
             </div>
             @if (!Model.TaskDetails.IsDone)
             {
@@ -369,10 +314,11 @@
 	var taskId = Number(@Model.TaskDetails.Id);
 	var UserId = @User.FindFirstValue("AccountId");
 	var loadChatMessageAjax = '@Url.Page("./Index", "ChatMessageDetailsTask")';
+	var loadOperationRequestTaskDetailsAjax = '@Url.Page("./Index", "OperationRequestTaskDetailsAjax")';
 	var voiceSrc = '@(voice == null ? "" : @Url.Page("./Index", "ShowVoice", new { filePath = voice?.Path }))';
 
 	var btnAllRequestActive = @(Model.TaskDetails.AssignViewModels?.Count == 1 ? "true" : "false");
 	var CountAssignViewModel = @(Model.TaskDetails.AssignViewModels?.Count);
 </script>
-<script src="~/assetsadminnew/tasks/js/operationrequestmodal.js?ver=@Version.AdminVersion"></script>
+<script src="~/assetsadminnew/tasks/js/operationrequestmodal.js?ver=@adminVersion"></script>
-<script src="~/assetsadminnew/tasks/js/detailmodal.js?ver=@Version.AdminVersion"></script>
+<script src="~/assetsadminnew/tasks/js/detailmodal.js?ver=@adminVersion"></script>

ServiceHost/Areas/Client/Pages/Company/Checkouts/CheckoutPrintAll.cshtml

@@ -1,9 +1,7 @@
 @page
 @model ServiceHost.Areas.Client.Pages.Company.Checkouts.CheckoutPrintAllModel
-@* @section Styles
+
-{
+<link href="~/assetsclient/pages/checkouts/css/printonerollcall.css" rel="stylesheet" />
-    <meta name="viewport" content="width=100vw">
-} *@
 @{
     <style>
         .modal .modal-dialog .modal-content {
@@ -2649,7 +2647,7 @@
 
                                                             </div>
 
-                                                            <div class="row p-0" style="margin-top:40px;">
+                                                            <div class="row p-0" @* style="margin-top:40px;" *@>
                                                                 <div classs="col-12" style="padding:0 !important">
                                                                     <span style="float: left; margin-left: 0px">امضاء و اثر انگشت</span>
                                                                 </div>

ServiceHost/Areas/Client/Pages/Company/Checkouts/Index.cshtml.cs

@@ -58,56 +58,46 @@ namespace ServiceHost.Areas.Client.Pages.Company.Checkouts
 
 		public IActionResult OnGet(CheckoutSearchModel searchModel)
 		{
-
+			var workshopHash = User.FindFirstValue("WorkshopSlug");
-			if (User.Identity.IsAuthenticated)
+			var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
+			if (workshopId > 0)
 			{
-				var workshopHash = User.FindFirstValue("WorkshopSlug");
+				searchModel.Sorting = string.IsNullOrWhiteSpace(searchModel.Sorting)
-				var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
+					? "CreationDate-Max"
-				if (workshopId > 0)
+					: searchModel.Sorting;
+				searchModel.PageIndex = 0;
+				Year = searchModel.Year;
+				Month = searchModel.Month;
+				ContarctStart = searchModel.ContractStart;
+				ContarctEnd = searchModel.ContractEnd;
+				EmployeeId = searchModel.EmployeeId;
+				WorkshopId = workshopId == 0 ? searchModel.WorkshopId : workshopId;
+				searchModel.WorkshopId = WorkshopId;
+				Sorting = string.IsNullOrWhiteSpace(searchModel.Sorting) ? "CreationDate-Max" : searchModel.Sorting;
+				var workshopInfo = _workshopApplication.GetWorkshopInfo(WorkshopId);
+				WorkshopName = workshopInfo.WorkshopFullName;
+				Employees = workshopInfo.EmployeeList.Select(x => new EmployeeSelectListViewModel()
+				{ Id = x.Id, EmployeeFullName = x.EmployeeFullName }).ToList();
+				Checkouts = _checkoutApplication.SearchForClient(searchModel);
+				PageIndex = Checkouts.Count;
+				YearlyList =
+					_yearlySalaryApplication.GetYears();
+				SearchModel = new CheckoutSearchModel()
 				{
-					searchModel.Sorting = string.IsNullOrWhiteSpace(searchModel.Sorting)
+					Year = string.IsNullOrWhiteSpace(searchModel.Year) ? " " : searchModel.Year,
-						? "CreationDate-Max"
+					Month = string.IsNullOrWhiteSpace(searchModel.Month) ? " " : searchModel.Month,
-						: searchModel.Sorting;
+					ContractStart = searchModel.ContractStart,
-					searchModel.PageIndex = 0;
+					ContractEnd = searchModel.ContractEnd,
-					Year = searchModel.Year;
+					EmployeeId = searchModel.EmployeeId,
-					Month = searchModel.Month;
+					Sorting = searchModel.Sorting,
-					ContarctStart = searchModel.ContractStart;
-					ContarctEnd = searchModel.ContractEnd;
-					EmployeeId = searchModel.EmployeeId;
-					WorkshopId = workshopId == 0 ? searchModel.WorkshopId : workshopId;
-					searchModel.WorkshopId = WorkshopId;
-					Sorting = string.IsNullOrWhiteSpace(searchModel.Sorting) ? "CreationDate-Max" : searchModel.Sorting;
-					var workshopInfo = _workshopApplication.GetWorkshopInfo(WorkshopId);
-					WorkshopName = workshopInfo.WorkshopFullName;
-					Employees = workshopInfo.EmployeeList.Select(x => new EmployeeSelectListViewModel()
-					{ Id = x.Id, EmployeeFullName = x.EmployeeFullName }).ToList();
-					Checkouts = _checkoutApplication.SearchForClient(searchModel);
-					PageIndex = Checkouts.Count;
-					YearlyList =
-						_yearlySalaryApplication.GetYears();
-					SearchModel = new CheckoutSearchModel()
-					{
-						Year = string.IsNullOrWhiteSpace(searchModel.Year) ? " " : searchModel.Year,
-						Month = string.IsNullOrWhiteSpace(searchModel.Month) ? " " : searchModel.Month,
-						ContractStart = searchModel.ContractStart,
-						ContractEnd = searchModel.ContractEnd,
-						EmployeeId = searchModel.EmployeeId,
-						Sorting = searchModel.Sorting,
 
 
-					};
+				};
-					return Page();
+				return Page();
-				}
-				else
-				{
-					return Redirect("error/401");
-				}
 			}
 			else
 			{
-
+				return Redirect("error/401");
-				return Redirect("error/404");
-
 			}
 		}
 
@@ -162,8 +152,10 @@ namespace ServiceHost.Areas.Client.Pages.Company.Checkouts
 		{
 
 			var res = _checkoutApplication.PrintOne(id);
+            if (res.HasRollCall)
+                return Partial("PrintOneRollCall", res);
 
-			return Partial("PrintOneMobile", res);
+            return Partial("PrintOneMobile", res);
 		}
 
 		#endregion

ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintAll.cshtml

@@ -1,4 +1,5 @@
 @model CompanyManagment.App.Contracts.Checkout.CheckoutGroupPrintViewModel
+
 @{
     <style>
         .modal .modal-dialog .modal-content {
@@ -84,7 +85,7 @@
 
             #printSection {
                 position: absolute;
-                left: 0;
+                right: 0;
                 page-break-after: auto;
                 top: 0;
             }
@@ -3169,7 +3170,7 @@
 
                                             </div>
 
-                                            <div class="row p-0" style="margin-top:40px;">
+                                            <div class="row p-0" @* style="margin-top:40px;" *@>
                                                 <div classs="col-12" style="padding:0 !important">
                                                     <span style="float: left; margin-left: 0px">امضاء و اثر انگشت</span>
                                                 </div>

ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOneRollCall.cshtml

@@ -34,7 +34,7 @@
                                 <span> نام پدر: </span>
                                 @if (string.IsNullOrWhiteSpace(@Model.FathersName))
                                 {
-                                    <span style="visibility: hidden">"1111111111"</span>
+                                    <span style="visibility: hidden">""</span>
                                 }
                                 else
                                 {
@@ -47,7 +47,7 @@
                                 <span>به کد ملی:</span> <span>&nbsp;</span>
                                 @if (string.IsNullOrWhiteSpace(@Model.NationalCode))
                                 {
-                                    <span style="margin-left: 15px; visibility: hidden">222333111</span>
+                                    <span style="margin-left: 15px; visibility: hidden"></span>
                                 }
                                 else
                                 {

ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailsRollCallRaw.cshtml

@@ -2,438 +2,426 @@
 @model CompanyManagment.App.Contracts.Checkout.CheckoutViewModel
 
 
-
-<div class="container container2" id="printThis">
 <div class="row">
-<div class="row">
+    <div class="col-12 mt-30">
-            <div class="col-md-12">
+        <fieldset style="border: 1px solid black;
-                <fieldset style="border: 1px solid black;
+                        padding: revert;
-                             padding: revert;
+                        border-radius: 10px;
-                             border-radius: 10px;
+                        height: 28cm;
-                             height: 28cm;
+                        margin: 3mm 5mm 0 5mm; position: relative;">
-                             margin: 3mm 5mm 0 5mm; ">
+            <div class="row" dir="rtl">
-                    <div class="row" dir="rtl">
+            <div class="col-3 d-inline-block"><fieldset style="border: 1px solid black;border-radius: 15px;padding: 1px 15px 1px 15px;margin-top: 5px;width: 70%;font-size: 12px;text-align: center;"> @Model.ContractNo</fieldset></div>
-                        <div class="col-xs-3 d-inline-block"><fieldset style="border: 1px solid black; border-radius: 15px; padding: 1px 15px 1px 15px; margin-top: 5px; width: 60%; font-size: 12px; text-align: center;"> @Model.ContractNo</fieldset></div>
+                <div class="col-6 d-inline-block text-center"><p style="margin-top:10px !important;font-size: 18px; font-family: 'IranNastaliq' !important; ">بسمه تعالی</p>  <p style="font-size: 15px; font-weight: bold">فیش حقوقی و رسید پرداخت حقوق</p> </div>
-                        <div class="col-xs-6 d-inline-block text-center">
+                <div class="col-3 d-inline-block"></div>
-                            <p style="margin-top:10px !important;font-size: 18px; font-family: 'IranNastaliq' !important; ">بسمه تعالی</p>
+            </div>
-                            <p style="font-size: 15px; font-weight: bold">فیش حقوقی و رسید پرداخت حقوق</p>
+            <div class="row" style="font-size: 14px; margin-bottom: 10px; ">
-                        </div>
+                <div class="col-12">
-                        <div class="col-xs-3 d-inline-block"></div>
+                    <span style="width: 280px;padding: 0px 0px 0px 0px !important; float:right"><span>اینجانب <span>&nbsp;</span> <span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.EmployeeFullName</span> </span></span>
-                    </div>
+                    <span style="margin-right: 5px; float:right">
-                    <div class="row" style="padding: 0px 12px;font-size: 14px; margin-bottom: 10px; ">
+                        <span> نام پدر: </span>
-                        <div class="row">
+                        @if (string.IsNullOrWhiteSpace(@Model.FathersName))
-                            <span style="width: 280px;padding: 0px 10px 0px 0px !important; float:right"><span>اینجانب <span>&nbsp;</span> <span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.EmployeeFullName</span> </span></span>
+                        {
-                            <span style="margin-right: 5px; float:right">
+                            <span style="visibility: hidden">""</span>
-                                <span> نام پدر: </span>
+                        }
-                                @if (string.IsNullOrWhiteSpace(@Model.FathersName))
+                        else
-                                {
+                        {
-                                    <span style="visibility: hidden">"1111111111"</span>
+                            <span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.FathersName</span>
-                                }
-                                else
-                                {
-                                    <span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.FathersName</span>
 
-                                }
+                        }
-                            </span>
+                    </span>
-                            <span style="padding: 0px !important; float: left">
+                    <span style="padding: 0px !important; float: left">
 
-                                <span>به کد ملی:</span> <span>&nbsp;</span>
+                        <span>به کد ملی:</span> <span>&nbsp;</span>
-                                @if (string.IsNullOrWhiteSpace(@Model.NationalCode))
+                        @if (string.IsNullOrWhiteSpace(@Model.NationalCode))
-                                {
+                        {
-                                    <span style="margin-left: 15px; visibility: hidden">222333111</span>
+                            <span style="margin-left: 15px; visibility: hidden"></span>
-                                }
+                        }
-                                else
+                        else
-                                {
+                        {
-                                    <span style="margin-left: 15px; font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.NationalCode</span>
+                            <span style="margin-left: 15px; font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.NationalCode</span>
-                                }
+                        }
 
-                                <span>متولد:</span> <span>&nbsp;</span>
+                        <span>متولد:</span> <span>&nbsp;</span>
-                                @if (string.IsNullOrWhiteSpace(@Model.DateOfBirth))
+                        @if (string.IsNullOrWhiteSpace(@Model.DateOfBirth))
-                                {
+                        {
-                                    <span style="margin-left: 10px; visibility: hidden">1401/01/01</span>
+                            <span style="margin-left: 10px; visibility: hidden">1401/01/01</span>
-                                }
+                        }
-                                else
+                        else
-                                {
+                        {
-                                    <span style="margin-left: 10px; font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.DateOfBirth</span>
+                            <span style="margin-left: 0px; font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.DateOfBirth</span>
-                                }
+                        }
-                            </span>
+                    </span>
 
 
-                        </div>
+                </div>
-                        <div class="row">
+                <div class="col-12" style="font-size: 14px; text-align: justify">
-                            <div class="col-xs-12" style="font-size: 14px; text-align: justify">
 
-                                @{
+                    @{
-                                    if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقیقی")
+                        if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقیقی")
+                        {
+                            <span> پـرسنل کارگاه<span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.WorkshopName</span> </span>
+                            <span>&nbsp;</span>
+                            <span>به کارفرمایی  <span>&nbsp;</span> آقای/خانم</span> <span>&nbsp;</span>
+
+                            <span>&nbsp;</span>
+                            if (@Model.EmployerList.Count > 1)
+                            {
+                                <span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">
+                                    @Model.EmployerList[0].EmployerFullName <span>،</span>
+                                    <span>&nbsp;</span>@Model.EmployerList[1].EmployerFullName
+                                    @if (@Model.EmployerList.Count > 2)
                                     {
-                                        <span> پـرسنل کارگاه<span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.WorkshopName</span> </span>
+                                        <span>و غیره</span>
-                                        <span>&nbsp;</span>
-                                        <span>به کارفرمایی <span>&nbsp;</span> آقای/خانم</span>
-                                        <span>&nbsp;</span>
-                                        <span>&nbsp;</span>
-                                        if (@Model.EmployerList.Count > 1)
-                                        {
-                                            <span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">
-                                                @Model.EmployerList[0].EmployerFullName <span>،</span>
-                                                <span>&nbsp;</span>@Model.EmployerList[1].EmployerFullName
-                                                @if (@Model.EmployerList.Count > 2)
-                                                {
-                                                    <span>و غیره</span>
-                                                }
-                                            </span>
-                                            <br />
-                                        }
-                                        else
-                                        {
-                                            <span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">
-                                                @Model.EmployerList.FirstOrDefault().EmployerFullName
-                                            </span>
-                                            <br />
-                                        }
-
-                                    }
-                                    else if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقوقی")
-                                    {
-                                        <span> پـرسنل شرکت/موسسه<span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.WorkshopName</span> </span>
-                                        <br />
                                     }
+                                </span> <br />
+                            }
+                            else
+                            {
+                                <span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">
+                                    @Model.EmployerList.FirstOrDefault().EmployerFullName
+                                </span>
 
-                                }
+                                <br />
+                            }
 
-                                <span>کلیه حق السعی خود اعم از حقوق، کمک هزینه اقلام مصرفی خانوار، کمک هزینه مسکن </span>
+                        }
+                        else if (@Model.EmployerList.FirstOrDefault().IsLegal == "حقوقی")
+                        {
+                            <span> پـرسنل شرکت/موسسه<span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold; background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">@Model.WorkshopName</span> </span>
+                            <br />
+                        }
 
-                                <span>و همچنین عیدی و پاداش، سنوات و...</span>
+                    }
-                                <span style="background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;"> <span style="font-weight: bold">@Model.Month</span> ماه </span>
-                                <span style="background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;"> سال <span style="font-weight: bold">@Model.Year</span> </span>
-                                <span> برابر با قرارداد به شماره فوق را از کارفرما بصورت وجه نقد و واریز به حساب دریافت نموده ام. </span>
 
-                            </div>
+                    <span>کلیه حق السعی خود اعم از حقوق، کمک هزینه اقلام مصرفی خانوار، کمک هزینه مسکن </span>
 
-                        </div>
+                    <span>و همچنین عیدی و پاداش، سنوات و...</span>
+                    <span style="background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;"> <span style="font-weight: bold">@Model.Month</span> ماه </span>
+                    <span style="background-color: #ebe6e6 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;"> سال <span style="font-weight: bold">@Model.Year</span> </span>
+                    <span> برابر با قرارداد به شماره فوق را از کارفرما بصورت وجه نقد و واریز به حساب دریافت نموده ام. </span>
+
+                </div>
+            </div>
+
+            <div class="row" style="margin-top: 10px;padding: 0 12px;">
+                <fieldset style="border: 1px solid black !important;-webkit-print-color-adjust: exact;print-color-adjust: exact; border-radius: 10px 10px 10px 10px;  margin: 0px 0px; overflow: hidden;padding: 0;">
+                    <table style="/* table-layout: fixed; */ width: 100%">
 
 
-                    </div>
+                        <tr style="border-bottom: 1px solid; height: 25px; border-collapse: separate; background-color: #cdcdcd !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                    <div class="row m-t-20">
+                            <th style="text-align: center; width: 8mm; font-size: 12px; padding: 2px; border-collapse: separate; border-radius: 0px 10px 0px 0px;">  </th>
-                        <fieldset style="border: 1px solid black !important;-webkit-print-color-adjust: exact;print-color-adjust: exact; border-radius: 10px 10px 10px 10px;  margin: 0px 10px;overflow:hidden">
+                            <th style="text-align: center; position: absolute ; right: 55mm; font-size: 13px;padding-top:4px"> مطالبات </th>
-                            <table style="/* table-layout: fixed; */ width: 100%">
+                            <th style="text-align: center;"> </th>
+                            <th style="text-align: center; border-left: 2px solid #000; font-size: 12px"> </th>
+                            <th style="text-align: center; font-size: 13px; position: absolute; left: 50mm; padding-top: 4px;"> کسورات </th>
+                            <th style="text-align: center; font-size: 12px; border-collapse: separate; border-radius: 0px 0px 0px 0px;">  </th>
+                            <th style="text-align: center; font-size: 12px; border-collapse: separate; border-radius: 10px 0px 0px 0px;">  </th>
+                        </tr>
+
+                        <tr style="border-bottom: 1px solid; background-color: #e1e1e1 !important ;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <th style="width: 5%; text-align: center; border-left: 1px solid #000; font-size: 12px;padding: 2px"> ردیف </th>
+                            <th style="width: 23%; text-align: center; border-left: 1px solid #000; font-size: 12px"> شرح </th>
+                            <th style="width: 10%; text-align: center; border-left: 1px solid #000; font-size: 9px"> ساعت/روز/تعداد </th>
+                            <th style="width: 12%; text-align: center; border-left: 2px solid #000; font-size: 12px"> مبلغ(ریال) </th>
+                            <th style="width: 28%; text-align: center; border-left: 1px solid #000; font-size: 12px"> شرح </th>
+                            <th style="width: 10%; text-align: center; border-left: 1px solid #000; font-size: 9px"> ساعت/روز/تعداد </th>
+                            <th style="width: 12%; text-align: center; font-size: 12px"> مبلغ(ریال) </th>
+                        </tr>
 
 
-                                <tr style="border-bottom: 1px solid; height: 25px; border-collapse: separate; background-color: #cdcdcd !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                        <tr style="font-size: 12px; ">
-                                    <th style="text-align: center; width: 8mm; font-size: 12px; padding: 2px; border-collapse: separate; border-radius: 0px 10px 0px 0px;"> </th>
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">1</td>
-                                    <th style="text-align: center; position: absolute ; right: 55mm; font-size: 13px;padding-top:4px"> مطالبات </th>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> حقوق و مزد </td>
-                                    <th style="text-align: center;"> </th>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <th style="text-align: center; border-left: 2px solid #000; font-size: 12px"> </th>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MonthlySalary == "0" ? "-" : Model.MonthlySalary) </td>
-                                    <th style="text-align: center; font-size: 13px; position: absolute; left: 50mm; padding-top: 4px;"> کسورات </th>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> حق بیمه سهم کارگر </td>
-                                    <th style="text-align: center; font-size: 12px; border-collapse: separate; border-radius: 0px 0px 0px 0px;"> </th>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <th style="text-align: center; font-size: 12px; border-collapse: separate; border-radius: 10px 0px 0px 0px;"> </th>
+                            <td style="text-align: center;"> @(Model.InsuranceDeduction == "0" ? "-" : Model.InsuranceDeduction) </td>
-                                </tr>
+                        </tr>
 
-                                <tr style="border-bottom: 1px solid; background-color: #e1e1e1 !important ;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <th style="width: 5%; text-align: center; border-left: 1px solid #000; font-size: 12px;padding: 2px"> ردیف </th>
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">2</td>
-                                    <th style="width: 23%; text-align: center; border-left: 1px solid #000; font-size: 12px"> شرح </th>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> پایه سنوات </td>
-                                    <th style="width: 10%; text-align: center; border-left: 1px solid #000; font-size: 9px"> ساعت/روز/تعداد </th>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <th style="width: 12%; text-align: center; border-left: 2px solid #000; font-size: 12px"> مبلغ(ریال) </th>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.BaseYearsPay == "0" ? "-" : Model.BaseYearsPay) </td>
-                                    <th style="width: 28%; text-align: center; border-left: 1px solid #000; font-size: 12px"> شرح </th>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> مالیات بر حقوق </td>
-                                    <th style="width: 10%; text-align: center; border-left: 1px solid #000; font-size: 9px"> ساعت/روز/تعداد </th>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <th style="width: 12%; text-align: center; font-size: 12px"> مبلغ(ریال) </th>
+                            <td style="text-align: center;"> @(Model.TaxDeducation == "0" ? "-" : Model.TaxDeducation) </td>
-                                </tr>
+                        </tr>
 
+                        <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">3</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه اقلام مصرفی خانوار </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.ConsumableItems == "0" ? "-" : Model.ConsumableItems) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> قسط تسهیلات </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center;"> @(Model.InstallmentDeduction == "0" ? "-" : Model.InstallmentDeduction) </td>
+                        </tr>
 
-                                <tr style="font-size: 12px; ">
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">1</td>
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">4</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> حقوق و مزد </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه مسکن </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MonthlySalary == "0" ? "-" : Model.MonthlySalary) </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.HousingAllowance == "0" ? "-" : Model.HousingAllowance) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> حق بیمه سهم کارگر </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> مساعده  </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.InsuranceDeduction == "0" ? "-" : Model.InsuranceDeduction) </td>
+                            <td style="text-align: center;"> @(Model.SalaryAidDeduction == "0" ? "-" : Model.SalaryAidDeduction) </td>
-                                </tr>
+                        </tr>
-
+                        <tr style="font-size: 12px;">
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">5</td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">2</td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده اضافه کاری </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> پایه سنوات </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.OvertimePay == "0" ? "-" : Model.OvertimePay) </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.BaseYearsPay == "0" ? "-" : Model.BaseYearsPay) </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> غیبت  </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> مالیات بر حقوق </td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center;"> @(Model.AbsenceDeduction == "0" ? "-" : Model.AbsenceDeduction) </td>
-                                    <td style="text-align: center;"> @(Model.TaxDeducation == "0" ? "-" : Model.TaxDeducation) </td>
+                        </tr>
-                                </tr>
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">6</td>
-                                <tr style="font-size: 12px;">
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده شب کاری </td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">3</td>
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه اقلام مصرفی خانوار </td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.NightworkPay == "0" ? "-" : Model.NightworkPay) </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.ConsumableItems == "0" ? "-" : Model.ConsumableItems) </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> قسط تسهیلات </td>
+                            <td style="text-align: center;"> </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                        </tr>
-                                    <td style="text-align: center;"> @(Model.InstallmentDeduction == "0" ? "-" : Model.InstallmentDeduction) </td>
+                        <tr style="font-size: 12px;">
-                                </tr>
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">7</td>
-
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده جمعه کاری </td>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">4</td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.FridayPay == "0" ? "-" : Model.FridayPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه مسکن </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.HousingAllowance == "0" ? "-" : Model.HousingAllowance) </td>
+                            <td style="text-align: center;"> </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> مساعده </td>
+                        </tr>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
-                                    <td style="text-align: center;"> @(Model.SalaryAidDeduction == "0" ? "-" : Model.SalaryAidDeduction) </td>
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">8</td>
-                                </tr>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده ماموریت </td>
-                                <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">5</td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MissionPay == "0" ? "-" : Model.MissionPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده اضافه کاری </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.OvertimePay == "0" ? "-" : Model.OvertimePay) </td>
+                            <td style="text-align: center;"> </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> غیبت </td>
+                        </tr>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                        <tr style="font-size: 12px;">
-                                    <td style="text-align: center;"> @(Model.AbsenceDeduction == "0" ? "-" : Model.AbsenceDeduction) </td>
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">9</td>
-                                </tr>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده نوبت کاری </td>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">6</td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.ShiftPay == "0" ? "-" : Model.ShiftPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده شب کاری </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.NightworkPay == "0" ? "-" : Model.NightworkPay) </td>
+                            <td style="text-align: center;"> </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
+                        </tr>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center;"> </td>
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">10</td>
-                                </tr>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه عائله مندی </td>
-                                <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">7</td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.FamilyAllowance == "0" ? "-" : Model.FamilyAllowance) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده جمعه کاری </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.FridayPay == "0" ? "-" : Model.FridayPay) </td>
+                            <td style="text-align: center;"> </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
+                        </tr>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
+                        <tr style="font-size: 12px;">
-                                    <td style="text-align: center;"> </td>
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">11</td>
-                                </tr>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> حق تاهل </td>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact; print-color-adjust: exact;">
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">8</td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MarriedAllowance == "0" ? "-" : Model.MarriedAllowance) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده ماموریت </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">  </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MissionPay == "0" ? "-" : Model.MissionPay) </td>
+                            <td style="text-align: center;"> </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
+                        </tr>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center;"> </td>
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">12</td>
-                                </tr>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> پاداش </td>
-                                <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">9</td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.RewardPay == "0" ? "-" : Model.RewardPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> فوق العاده نوبت کاری </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.ShiftPay == "0" ? "-" : Model.ShiftPay) </td>
+                            <td style="text-align: center;"> </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
+                        </tr>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
+                        <tr style="font-size: 12px;">
-                                    <td style="text-align: center;"> </td>
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">13</td>
-                                </tr>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> عیدی و پاداش </td>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">10</td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.BonusesPay == "0" ? "-" : Model.BonusesPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> کمک هزینه عائله مندی </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.FamilyAllowance == "0" ? "-" : Model.FamilyAllowance) </td>
+                            <td style="text-align: center;"> </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
+                        </tr>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
+                        <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center;"> </td>
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">14</td>
-                                </tr>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> سنوات </td>
-                                <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">11</td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.YearsPay == "0" ? "-" : Model.YearsPay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> حق تاهل </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.MarriedAllowance == "0" ? "-" : Model.MarriedAllowance) </td>
+                            <td style="text-align: center;"> </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
+                        </tr>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
+                        <tr style="font-size: 12px;">
-                                    <td style="text-align: center;"> </td>
+                            <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">15</td>
-                                </tr>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> مزد مرخصی </td>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">12</td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.LeavePay == "0" ? "-" : Model.LeavePay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> پاداش </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.RewardPay == "0" ? "-" : Model.RewardPay) </td>
+                            <td style="text-align: center;"> </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
+                        </tr>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
+                        <tr style="font-size: 12px; height: 20px; background-color: #dddcdc !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; border-bottom: 1px solid #000; border-top: 1px solid #000; ">
-                                    <td style="text-align: center;"> </td>
+                            <td style="text-align: center; padding: 2px "></td>
-                                </tr>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> جمع مطالبات </td>
-                                <tr style="font-size: 12px;">
+                            <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">13</td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.TotalClaims == "0" ? "-" : Model.TotalClaims) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> عیدی و پاداش </td>
+                            <td style="padding-right: 8px; border-left: 1px solid #000;"> جمع کسورات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">  -  </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.BonusesPay == "0" ? "-" : Model.BonusesPay) </td>
+                            <td style="text-align: center;"> @(Model.TotalDeductions == "0" ? "-" : Model.TotalDeductions) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
+                        </tr>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
+                        <tr style="font-size: 12px; border-radius: 0px 0px 10px 10px !important; height: 20px; background-color: #efefef !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center;"> </td>
+                            <td style="text-align: center; padding: 2px; border-radius: 0px 0px 10px 0px "></td>
-                                </tr>
+                            <td style="padding-right: 8px; border-left: 1px solid #000; "> مبلغ قابل پرداخت </td>
-                                <tr style="font-size: 12px; background-color: #f1f1f1 !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                            <td style="padding-right: 8px; border-left: 1px solid #000;">  </td>
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">14</td>
+                            <td style="text-align: center; border-left: 2px solid #000;"> @(Model.TotalPayment == "0" ? "-" : Model.TotalPayment) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> سنوات </td>
+                            <td style="padding-right: 8px;">   </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
+                            <td style="text-align: center; border-left: 1px solid #000;">   </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.YearsPay == "0" ? "-" : Model.YearsPay) </td>
+                            <td style="text-align: center; border-radius:0px 0px 0px 10px"> </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
+                        </tr>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
+                    </table>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px;">
-                                    <td style="text-align: center; border-left: 1px solid #000; padding: 2px ">15</td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> مزد مرخصی </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.LeavePay == "0" ? "-" : Model.LeavePay) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center;"> </td>
-                                </tr>
-                                <tr style="font-size: 12px; height: 20px; background-color: #dddcdc !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; border-bottom: 1px solid #000; border-top: 1px solid #000; ">
-                                    <td style="text-align: center; padding: 2px "></td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> جمع مطالبات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.TotalClaims == "0" ? "-" : Model.TotalClaims) </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> جمع کسورات </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> - </td>
-                                    <td style="text-align: center;"> @(Model.TotalDeductions == "0" ? "-" : Model.TotalDeductions) </td>
-                                </tr>
-                                <tr style="font-size: 12px; border-radius: 0px 0px 10px 10px !important; height: 20px; background-color: #efefef !important; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <td style="text-align: center; padding: 2px; border-radius: 0px 0px 10px 0px "></td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000; "> مبلغ قابل پرداخت </td>
-                                    <td style="padding-right: 8px; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center; border-left: 2px solid #000;"> @(Model.TotalPayment == "0" ? "-" : Model.TotalPayment) </td>
-                                    <td style="padding-right: 8px;"> </td>
-                                    <td style="text-align: center; border-left: 1px solid #000;"> </td>
-                                    <td style="text-align: center; border-radius:0px 0px 0px 10px"> </td>
-                                </tr>
-                            </table>
-                        </fieldset>
-                    </div>
-                    <div style="padding: 0 10px;">
-                        <div class="row" style="margin-top: 8px; background-color: #F6F6F6 !important; border: 1px solid #000;border-radius: 10px;display: flex;gap: 8px;padding: 8px 0;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                            <div class="col-xs-6" style="background-color: #DDDCDC !important; border: 1px solid #CCCCCC;border-radius: 7px;padding: 7px; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                <table style="width: 100%">
-                                    <thead style="background-color: #AFAFAF;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                        <tr style="font-size: 8px;border-collapse: separate;background-color: #AFAFAF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;">
-                                            <th style="font-size: 8px !important;width: 33%;padding: 2px 10px !important;border-left: 0;border-radius: 0 5px 5px 0 !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;">تاریخ</th>
-                                            <th style="font-size: 8px;text-align: center;width: 19%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت ورود</th>
-                                            <th style="font-size: 8px;text-align: center;width: 19%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت خروج</th>
-                                            <th style="font-size: 8px;text-align: center;width: 10%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">منقطع</th>
-                                            <th style="font-size: 8px;text-align: center;width: 19%;padding: 0 0 0 5px !important;border-radius: 5px 0 0 5px !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت کارکرد</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        @for (int i = 0; i < 15; i++)
-                                        {
-                                            <tr style="@(Model.MonthlyRollCall[i].DateTimeGr.DayOfWeek.DayOfWeeKToPersian() == "جمعه" ? "background-color: #BBBBBB !important;" : "background-color: #FFFFFF !important;") font-size: 8px;border-collapse: separate;-webkit-print-color-adjust: exact;print-color-adjust: exact;">
-                                                <td style="font-size: 8px; padding: 1px 3px;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid; border-radius: 0 5px 5px 0; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">@Model.MonthlyRollCall[i].DateTimeGr.ToFarsi() - @Model.MonthlyRollCall[i].DateTimeGr.DayOfWeek.DayOfWeeKToPersian()</td>
-                                                <td style="font-size: 8px; text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@Model.MonthlyRollCall[i].StartDate</td>
-                                                <td style="font-size: 8px; text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@Model.MonthlyRollCall[i].EndDate</td>
-                                                <td style="font-size: 8px; text-align: center; border-width: 2px 0 2px 0; border-color: #DDDCDC; border-style: solid;vertical-align: center;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                                    @if (@Model.MonthlyRollCall[i].IsSliced)
-                                                    {
-                                                        <span>منقطع</span>
-                                                    }
-                                                </td>
-                                                <td style="font-size: 8px;text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact;border-radius: 5px 0 0 5px;">@Model.MonthlyRollCall[i].TotalWorkingHours</td>
-                                            </tr>
-                                        }
-                                    </tbody>
-                                </table>
-                            </div>
-                            <div class="col-xs-6" style="background-color: #DDDCDC !important; border: 1px solid #CCCCCC;border-radius: 7px;padding: 7px; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                <table style="width: 100%">
-                                    <thead style="background-color: #AFAFAF;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-                                    <tr style="font-size: 8px;border-collapse: separate;background-color: #AFAFAF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;">
-	                                    <th style="font-size: 8px !important;width: 33%;padding: 2px 10px !important;border-left: 0;border-radius: 0 5px 5px 0 !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;">تاریخ</th>
-	                                    <th style="font-size: 8px;text-align: center;width: 19%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت ورود</th>
-	                                    <th style="font-size: 8px;text-align: center;width: 19%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت خروج</th>
-	                                    <th style="font-size: 8px;text-align: center;width: 10%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">منقطع</th>
-	                                    <th style="font-size: 8px;text-align: center;width: 19%;padding: 0 0 0 5px !important;border-radius: 5px 0 0 5px !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت کارکرد</th>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    @{
-	                                    Model.MonthlyRollCall = Model.MonthlyRollCall.Skip(15).ToList();
-                                    }
-                                    @foreach (var day in Model.MonthlyRollCall)
-                                    {
-	                                    <tr style="@(day.DateTimeGr.DayOfWeek.DayOfWeeKToPersian() == "جمعه" ? "background-color: #BBBBBB !important;" : "background-color: #FFFFFF !important;")font-size: 8px;border-collapse: separate;-webkit-print-color-adjust: exact;print-color-adjust: exact;">
-		                                    <td style="font-size: 8px; padding: 1px 3px;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid; border-radius: 0 5px 5px 0; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">@day.DateTimeGr.ToFarsi() - @day.DateTimeGr.DayOfWeek.DayOfWeeKToPersian()</td>
-		                                    <td style="font-size: 8px !important; text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@day.StartDate</td>
-		                                    <td style="font-size: 8px !important; text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@day.EndDate</td>
-		                                    <td style="font-size: 8px !important; text-align: center; border-width: 2px 0 2px 0; border-color: #DDDCDC; border-style: solid;vertical-align: center;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
-			                                    @if (day.IsSliced)
-			                                    {
-				                                    <span>منقطع</span>
-			                                    }
-		                                    </td>
-		                                    <td style="font-size: 8px;text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact;border-radius: 5px 0 0 5px;">@day.TotalWorkingHours</td>
-	                                    </tr>
-                                    }
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <fieldset style="border-radius: 10px 10px 10px 10px; margin: 0px 10px;">
-                            <div class="row" style="padding: 10px 0 0px 0;">
-                                @{
-                                    if (Model.IsLeft)
-                                    {
-                                        <span style="float: right; margin-right: 15px; font-size: 11.2px;height: 36px;">
-                                            <span>طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب</span><span>&nbsp;</span>
-                                            <span>@Model.LastDayOfWork صدیقه محمدنژاداسطلخ جان</span><span>&nbsp;</span>
-                                            <span>بوده و قطع همکاری با کارفرما و کارگاه از تاریخ</span><span>&nbsp;</span>
-                                            <span>@Model.LeftWorkDate 1359/07/01</span><span>&nbsp;</span>
-                                            <span>می باشد</span>
-                                        </span>
-                                    }
-                                }
-
-                            </div>
-                            <div class="row" style="padding: 0px 14px; font-size: 14px;">
-                                <div class="row">
-                                    @*<div class="col-xs-3"><span>اینجانب <span>&nbsp;</span> <span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold">@Model.EmployeeFullName</span> </span></div>
-                                    <div class="col-xs-3"><span> نام پدر: <span>&nbsp;</span><span>&nbsp;</span> <span>&nbsp;</span><span style="font-weight: bold">@Model.FathersName</span></span></div>
-                                    <div class="col-xs-3"><span>به کد ملی:<span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold">@Model.NationalCode</span> </span></div>
-                                    <div class="col-xs-3" style="direction: ltr"> متولد: <span>&nbsp;</span><span>&nbsp;</span><span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold">@Model.DateOfBirth</span></div>*@
-                                </div>
-                                <div class="row">
-                                    <div class="col-xs-12" style="font-size: 14px; text-align: justify">
-                                        @*<span> پـرسنل شـرکت<span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold">@Model.WorkshopName</span> </span>
-                                        <span>&nbsp;</span>
-                                        <span>به کارفرمایی  <span>&nbsp;</span> آقای/خانم/شرکت</span> <span>&nbsp;</span><span>&nbsp;</span>
-                                        @{
-                                        foreach (var item in @Model.EmployerList)
-                                        {
-                                        <span style="font-weight: bold">@item.EmployerFullName </span> <span>،</span>
-                                        }
-                                        }
-                                        <span>&nbsp;</span><span>&nbsp;</span>
-                                        <span>مبلغ ............. ریال را بصورت نقدی از کارفرما دریافت نمودم. </span>*@
-
-
-
-                                    </div>
-
-                                </div>
-
-                                <div class="row">
-
-                                    <div classs="col-xs-12">
-                                        <div style="float: left;display: flex;position: absolute;left: 26px;bottom: 12px;">
-                                            <div style="margin-left: 15px; position: relative; width: 80px; border: 1px solid #000; height: 98px; border-radius: 10px;">
-                                                <span style="position: absolute; top: -9px; right: 50%; transform: translate(50%, 0px); border-collapse: separate;background-color: #FFFFFF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact; font-size: 12px;width: 55px;">اثر انگشت</span>
-                                            </div>
-                                            <div style="margin-left: 15px; position: relative; width: 160px; border: 1px solid #000; height: 98px; border-radius: 10px;">
-                                                <span style="position: absolute; top: -9px; right: 50%; transform: translate(50%, 0px); border-collapse: separate;background-color: #FFFFFF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact; font-size: 12px;">امضاء</span>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                </div>
-
-                            </div>
-                        </fieldset>
-                    </div>
-
                 </fieldset>
             </div>
 
-</div>
+            <div style="padding: 0 12px;">
-</div>
+                <div class="row" style="margin-top: 8px;background-color: #F6F6F6 !important;border: 1px solid #000;border-radius: 10px;display: grid;gap: 8px;padding: 8px 0;-webkit-print-color-adjust: exact;print-color-adjust: exact;padding: 6px;grid-template-columns: repeat(2, minmax(0, 1fr));">
+                    <div class="col-6 w-100" style="background-color: #DDDCDC !important; border: 1px solid #CCCCCC;border-radius: 7px;padding: 7px; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                        <table style="width: 100%">
+                            <thead style="background-color: #AFAFAF;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                                <tr style="font-size: 8px;border-collapse: separate;background-color: #AFAFAF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;">
+                                    <th style="font-size: 8px !important;width: 33%;padding: 2px 10px !important;border-left: 0;border-radius: 0 5px 5px 0 !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;">تاریخ</th>
+                                    <th style="font-size: 8px;text-align: center;width: 19%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت ورود</th>
+                                    <th style="font-size: 8px;text-align: center;width: 19%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت خروج</th>
+                                    <th style="font-size: 8px;text-align: center;width: 10%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">منقطع</th>
+                                    <th style="font-size: 8px;text-align: center;width: 19%;padding: 0 0 0 5px !important;border-radius: 5px 0 0 5px !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت کارکرد</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @for (int i = 0; i < 15; i++)
+                                {
+                                    <tr style="@(Model.MonthlyRollCall[i].DateTimeGr.DayOfWeek.DayOfWeeKToPersian() == "جمعه" ? "background-color: #BBBBBB !important;" : "background-color: #FFFFFF !important;") font-size: 8px;border-collapse: separate;-webkit-print-color-adjust: exact;print-color-adjust: exact;">
+                                        <td style="font-size: 8px; padding: 1px 3px;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid; border-radius: 0 5px 5px 0; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">@Model.MonthlyRollCall[i].DateTimeGr.ToFarsi() - @Model.MonthlyRollCall[i].DateTimeGr.DayOfWeek.DayOfWeeKToPersian()</td>
+                                        <td style="font-size: 8px; text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@Model.MonthlyRollCall[i].StartDate</td>
+                                        <td style="font-size: 8px; text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@Model.MonthlyRollCall[i].EndDate</td>
+                                        <td style="font-size: 8px; text-align: center; border-width: 2px 0 2px 0; border-color: #DDDCDC; border-style: solid;vertical-align: center;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                                            @if (@Model.MonthlyRollCall[i].IsSliced)
+                                            {
+                                                <span>منقطع</span>
+                                            }
+                                        </td>
+                                        <td style="font-size: 8px;text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact;border-radius: 5px 0 0 5px;">@Model.MonthlyRollCall[i].TotalWorkingHours</td>
+                                    </tr>
+                                }
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="col-6 w-100" style="background-color: #DDDCDC !important; border: 1px solid #CCCCCC;border-radius: 7px;padding: 7px; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                        <table style="width: 100%">
+                            <thead style="background-color: #AFAFAF;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                                <tr style="font-size: 8px;border-collapse: separate;background-color: #AFAFAF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;">
+                                    <th style="font-size: 8px !important;width: 33%;padding: 2px 10px !important;border-left: 0;border-radius: 0 5px 5px 0 !important;-webkit-print-color-adjust: exact;print-color-adjust: exact;">تاریخ</th>
+                                    <th style="font-size: 8px;text-align: center;width: 19%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت ورود</th>
+                                    <th style="font-size: 8px;text-align: center;width: 19%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت خروج</th>
+                                    <th style="font-size: 8px;text-align: center;width: 10%;-webkit-print-color-adjust: exact;print-color-adjust: exact;">منقطع</th>
+                                    <th style="font-size: 8px;text-align: center;width: 19%;padding: 0 0 0 5px !important;border-radius: 5px 0 0 5px !important; -webkit-print-color-adjust: exact;print-color-adjust: exact;">ساعت کارکرد</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @{
+                                    Model.MonthlyRollCall = Model.MonthlyRollCall.Skip(15).ToList();
+                                }
+                                @foreach (var day in Model.MonthlyRollCall)
+                                {
+                                    <tr style="@(day.DateTimeGr.DayOfWeek.DayOfWeeKToPersian() == "جمعه" ? "background-color: #BBBBBB !important;" : "background-color: #FFFFFF !important;") font-size: 8px;border-collapse: separate;-webkit-print-color-adjust: exact;print-color-adjust: exact;">
+                                        <td style="font-size: 8px; padding: 1px 3px;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid; border-radius: 0 5px 5px 0; -webkit-print-color-adjust: exact;print-color-adjust: exact; ">@day.DateTimeGr.ToFarsi() - @day.DateTimeGr.DayOfWeek.DayOfWeeKToPersian()</td>
+                                        <td style="font-size: 8px !important; text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@day.StartDate</td>
+                                        <td style="font-size: 8px !important; text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">@day.EndDate</td>
+                                        <td style="font-size: 8px !important; text-align: center; border-width: 2px 0 2px 0; border-color: #DDDCDC; border-style: solid;vertical-align: center;-webkit-print-color-adjust: exact;print-color-adjust: exact; ">
+                                            @if (day.IsSliced)
+                                            {
+                                                <span>منقطع</span>
+                                            }
+                                        </td>
+                                        <td style="font-size: 8px;text-align: center;border-width: 2px 0 2px 0;border-color: #DDDCDC;border-style: solid;-webkit-print-color-adjust: exact;print-color-adjust: exact;border-radius: 5px 0 0 5px;">@day.TotalWorkingHours</td>
+                                    </tr>
+                                }
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+
+            <div class="row">
+                <fieldset style="border-radius: 10px 10px 10px 10px; margin: 0px 10px;">
+                    <div class="row" style="padding: 10px 0 0px 0;">
+                        @{
+                            if (Model.IsLeft)
+                            {
+                                <span style="float: right; margin-right: 15px; font-size: 11.2px;height: 36px;">
+                                    <span>طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب</span><span>&nbsp;</span>
+                                    <span>@Model.LastDayOfWork    صدیقه محمدنژاداسطلخ جان</span><span>&nbsp;</span>
+                                    <span>بوده و قطع همکاری با کارفرما و کارگاه از تاریخ</span><span>&nbsp;</span>
+                                    <span>@Model.LeftWorkDate       1359/07/01</span><span>&nbsp;</span>
+                                    <span>می باشد</span>
+                                </span>
+                            }
+                        }
+
+                    </div>
+                    <div class="row" style="padding: 0px 14px; font-size: 14px;">
+                        <div class="row">
+                            @*<div class="col-3"><span>اینجانب <span>&nbsp;</span> <span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold">@Model.EmployeeFullName</span> </span></div>
+                            <div class="col-3"><span> نام پدر: <span>&nbsp;</span><span>&nbsp;</span> <span>&nbsp;</span><span style="font-weight: bold">@Model.FathersName</span></span></div>
+                            <div class="col-3"><span>به کد ملی:<span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold">@Model.NationalCode</span> </span></div>
+                            <div class="col-3" style="direction: ltr"> متولد: <span>&nbsp;</span><span>&nbsp;</span><span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold">@Model.DateOfBirth</span></div>*@
+                        </div>
+                        <div class="row">
+                            <div class="col-12" style="font-size: 14px; text-align: justify">
+                                @*<span> پـرسنل شـرکت<span>&nbsp;</span><span>&nbsp;</span><span style="font-weight: bold">@Model.WorkshopName</span> </span>
+                                <span>&nbsp;</span>
+                                <span>به کارفرمایی  <span>&nbsp;</span> آقای/خانم/شرکت</span> <span>&nbsp;</span><span>&nbsp;</span>
+                                @{
+                                foreach (var item in @Model.EmployerList)
+                                {
+                                <span style="font-weight: bold">@item.EmployerFullName </span> <span>،</span>
+                                }
+                                }
+                                <span>&nbsp;</span><span>&nbsp;</span>
+                                <span>مبلغ ............. ریال را بصورت نقدی از کارفرما دریافت نمودم. </span>*@
+
+
+
+                            </div>
+
+                        </div>
+
+                        <div class="row">
+
+                            <div classs="col-12">
+                            <div style="float: left;display: flex;position: absolute;left: 0px;/* bottom: 12px; */" class="signSection">
+                                    <div style="margin-left: 15px; position: relative; width: 80px; border: 1px solid #000; height: 98px; border-radius: 10px;">
+                                        <span style="position: absolute; top: -9px; right: 50%; transform: translate(50%, 0px); border-collapse: separate;background-color: #FFFFFF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact; font-size: 12px;width: 55px;">اثر انگشت</span>
+                                    </div>
+                                    <div style="margin-left: 15px; position: relative; width: 160px; border: 1px solid #000; height: 98px; border-radius: 10px;">
+                                        <span style="position: absolute; top: -9px; right: 50%; transform: translate(50%, 0px); border-collapse: separate;background-color: #FFFFFF !important;-webkit-print-color-adjust: exact;print-color-adjust: exact; font-size: 12px;">امضاء</span>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </div>
+                </fieldset>
+            </div>
+
+        </fieldset>
+    </div>
 </div>
 
 
@@ -441,5 +429,3 @@
 <input type="hidden" asp-for="Id" value="@Model.Id" />
 
 <input type="hidden" id="shiftWorkval" name="shiftWorkval" value="@Model.CreateWorkingHoursTemp.ShiftWork">
-
-

ServiceHost/Areas/Client/Pages/Company/Contracts/ContractPrintAll.cshtml

@@ -92,7 +92,7 @@
 
             #printSection {
                 position: absolute !important;
-                left: 0 !important;
+                right: 0 !important;
                 page-break-after: auto !important;
                 top: 0 !important;
             }
@@ -277,7 +277,7 @@
 
                         @foreach (var item in @Model.GroupPrintList)
                         {
-                            <div class="container2">
+                            <div class="container">
                                 <div class="row">
                                 <div class="col-md-12">
                                     <fieldset style="border: 1px solid black;

ServiceHost/Areas/Client/Pages/Company/Contracts/PrintAll.cshtml

@@ -87,7 +87,7 @@
 
             #printSection {
                 position: absolute !important;
-                left: 0 !important;
+                right: 0 !important;
                 page-break-after: auto !important;
                 top: 0 !important;
             }

ServiceHost/Areas/Client/Pages/Company/Contracts/PrintOne.cshtml

@@ -67,7 +67,7 @@
 
                 #printSection {
                     position: absolute !important;
-                    left: 0 !important;
+                    right: 0 !important;
                     page-break-after: auto !important;
                     top: 0 !important;
                 }

ServiceHost/Areas/Client/Pages/Company/Contracts/PrintOneMobile.cshtml

@@ -68,7 +68,7 @@
 
                 #printSection {
                     position: absolute !important;
-                    left: 0 !important;
+                    right: 0 !important;
                     page-break-after: auto !important;
                     top: 0 !important;
                 }

ServiceHost/Areas/Client/Pages/Company/Employees/Index.cshtml

@@ -105,7 +105,7 @@
                     </a>
                 </div>
 
-				<div class="gwb-card disable">
+                <div class="gwb-card disable">
 					<a asp-page="/Company/PaymentToEmployee/Index" class="click loadingButton">
 						<div class="d-flex align-items-center justify-content-start p-1">
 							<img src="~/AssetsClient/images/icons/money.png" alt="" class="img-fluid mx-1" width="50px" />

ServiceHost/Areas/Client/Pages/Company/Employees/Index.cshtml.cs

@@ -20,6 +20,7 @@ using CompanyManagment.App.Contracts.PersonnleCode;
 using CompanyManagment.App.Contracts.Workshop;
 using CompanyManagment.Application;
 using MD.PersianDateTime.Standard;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
@@ -28,6 +29,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace ServiceHost.Areas.Client.Pages.Company.Employees
 {
+    [Authorize]
     public class IndexModel : PageModel
     {
         [TempData]
@@ -67,129 +69,108 @@ namespace ServiceHost.Areas.Client.Pages.Company.Employees
 
         public IActionResult OnGet(EmployeeSearchModel searchModel)
         {
-            if (User.Identity.IsAuthenticated)
+            var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+            var id = _passwordHasher.SlugDecrypt(workshopSlugCliam);
+            if (id > 0)
             {
-                var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+                var workshop = _workshopApplication.GetWorkshopInfo(id);
-                var id = _passwordHasher.SlugDecrypt(workshopSlugCliam);
+                WorkshopFullName = workshop.WorkshopFullName;
-                if (id > 0)
+                WorkshopId = workshop.Id;
+
+                var personnelSearchModel = new PersonnelInfoSearchModel()
                 {
-                    var workshop = _workshopApplication.GetWorkshopInfo(id);
+                    WorkshopId = id,
-                    WorkshopFullName = workshop.WorkshopFullName;
+                };
-                    WorkshopId = workshop.Id;
 
-                    var personnelSearchModel = new PersonnelInfoSearchModel()
+                var result = _workshopApplication.GetPersonnelInfo(personnelSearchModel);
-                    {
-                        WorkshopId = id,
-                    };
 
-                    var result = _workshopApplication.GetPersonnelInfo(personnelSearchModel);
+                var r = result.GroupBy(x => x.EmployeeId).Select(x => x.First()).ToList();
 
-                    var r = result.GroupBy(x => x.EmployeeId).Select(x => x.First()).ToList();
+                if (!string.IsNullOrWhiteSpace(searchModel.EmployeeFullName))
+                    r = r.Where(x => x.FullName.Contains(searchModel.EmployeeFullName)).ToList();
 
-                    if (!string.IsNullOrWhiteSpace(searchModel.EmployeeFullName))
+                if (!string.IsNullOrWhiteSpace(searchModel.NationalCode))
-                        r = r.Where(x => x.FullName.Contains(searchModel.EmployeeFullName)).ToList();
+                    r = r.Where(x => x.NationalCode == searchModel.NationalCode).ToList();
 
-                    if (!string.IsNullOrWhiteSpace(searchModel.NationalCode))
+                Employees = new PersonnelInfoViewModel()
-                        r = r.Where(x => x.NationalCode == searchModel.NationalCode).ToList();
-
-                    Employees = new PersonnelInfoViewModel()
-                    {
-                        PersonnelInfoViewModels = r.OrderBy(x => x.Black ? 1 : 0).ThenBy(x => x.PersonnelCode).ToList(),
-                    };
-
-                    HasEmployees = Employees.PersonnelInfoViewModels.Count > 0 ? true : false;
-                    return Page();
-                }
-                else
                 {
-	                return NotFound();
+                    PersonnelInfoViewModels = r.OrderBy(x => x.Black ? 1 : 0).ThenBy(x => x.PersonnelCode).ToList(),
-                }
+                };
+
+                HasEmployees = Employees.PersonnelInfoViewModels.Count > 0 ? true : false;
+                return Page();
             }
             else
             {
-                return BadRequest();
+	            return NotFound();
             }
         }
 
         public IActionResult OnGetPrintAllPersonnelInfo(string idlist)
         {
-            if (User.Identity.IsAuthenticated)
+            var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+            long workshopId = _passwordHasher.SlugDecrypt(workshopSlugCliam);
+            if (workshopId > 0)
             {
-                var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+                var search = new PersonnelInfoSearchModel()
-                long workshopId = _passwordHasher.SlugDecrypt(workshopSlugCliam);
-                if (workshopId > 0)
                 {
-                    var search = new PersonnelInfoSearchModel()
+                    WorkshopId = workshopId,
-                    {
+                };
-                        WorkshopId = workshopId,
+                var result = _workshopApplication.GetPersonnelInfo(search)
-                    };
+                    .GroupBy(x => x.FullName)
-                    var result = _workshopApplication.GetPersonnelInfo(search)
+                    .Select(x => x.First())
-                        .GroupBy(x => x.FullName)
+                    .ToList();
-                        .Select(x => x.First())
-                        .ToList();
 
-                    if (!string.IsNullOrWhiteSpace(idlist))
+                if (!string.IsNullOrWhiteSpace(idlist))
-                    {
-                        var ListEmployeeId = idlist.ExtractNumbers();
-                        result = result.Where(x => ListEmployeeId.Contains(x.EmployeeId)).ToList();
-                    }
-
-                    var final = new PersonnelInfoPrintViewModel()
-                    {
-                        PersonnelInfoPrintList = result.OrderBy(x => x.Black ? 1 : 0).ThenBy(x => x.PersonnelCode).ToList(),
-                    };
-
-                    return Partial("PrintAllPersonnelInfo", final);
-                }
-                else
                 {
-	                return NotFound();
+                    var ListEmployeeId = idlist.ExtractNumbers();
+                    result = result.Where(x => ListEmployeeId.Contains(x.EmployeeId)).ToList();
                 }
+
+                var final = new PersonnelInfoPrintViewModel()
+                {
+                    PersonnelInfoPrintList = result.OrderBy(x => x.Black ? 1 : 0).ThenBy(x => x.PersonnelCode).ToList(),
+                };
+
+                return Partial("PrintAllPersonnelInfo", final);
             }
             else
             {
-                return BadRequest();
+	            return NotFound();
             }
         }
 
-        public IActionResult OnGetPrintAllPersonnelInfoMobile(long workshopID, string idlist)
+        public IActionResult OnGetPrintAllPersonnelInfoMobile(string idlist)
         {
-            if (User.Identity.IsAuthenticated)
+            var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+            long workshopId = _passwordHasher.SlugDecrypt(workshopSlugCliam);
+            if (workshopId > 0)
             {
-                var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+                var search = new PersonnelInfoSearchModel()
-                long workshopId = _passwordHasher.SlugDecrypt(workshopSlugCliam);
-                if (workshopId > 0)
                 {
-                    var search = new PersonnelInfoSearchModel()
+                    WorkshopId = workshopId,
-                    {
+                };
-                        WorkshopId = workshopID,
+                var result = _workshopApplication.GetPersonnelInfo(search)
-                    };
+                    .GroupBy(x => x.FullName)
-                    var result = _workshopApplication.GetPersonnelInfo(search)
+                    .Select(x => x.First())
-                        .GroupBy(x => x.FullName)
+                    .ToList();
-                        .Select(x => x.First())
-                        .ToList();
 
-                    if (!string.IsNullOrWhiteSpace(idlist))
+                if (!string.IsNullOrWhiteSpace(idlist))
-                    {
-                        var ListEmployeeId = idlist.ExtractNumbers();
-                        result = result.Where(x => ListEmployeeId.Contains(x.EmployeeId)).ToList();
-                    }
-
-                    var final = new PersonnelInfoPrintViewModel()
-                    {
-                        PersonnelInfoPrintList = result.OrderBy(x => x.Black ? 1 : 0).ThenBy(x => x.PersonnelCode).ToList(),
-                    };
-
-                    return Partial("PrintAllPersonnelInfoMobile", final);
-                }
-                else
                 {
-	                return NotFound();
+                    var ListEmployeeId = idlist.ExtractNumbers();
+                    result = result.Where(x => ListEmployeeId.Contains(x.EmployeeId)).ToList();
                 }
+
+                var final = new PersonnelInfoPrintViewModel()
+                {
+                    PersonnelInfoPrintList = result.OrderBy(x => x.Black ? 1 : 0).ThenBy(x => x.PersonnelCode).ToList(),
+                };
+
+                return Partial("PrintAllPersonnelInfoMobile", final);
             }
             else
             {
-	            return BadRequest();
+	            return NotFound();
             }
         }
 
@@ -224,6 +205,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.Employees
             {
                 WorkshopId = workshopID,
             };
+
             var result = _workshopApplication.GetPersonnelInfo(search)
                 .GroupBy(x => x.FullName)
                 .Select(x => x.First())
@@ -245,135 +227,121 @@ namespace ServiceHost.Areas.Client.Pages.Company.Employees
 
         public IActionResult OnGetContractCheckoutStatus()
         {
-            if (User.Identity.IsAuthenticated)
+            var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+            long workshopId = _passwordHasher.SlugDecrypt(workshopSlugCliam);
+            if (workshopId > 0)
             {
-                var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+                var workshopName = _workshopApplication.GetDetails(workshopId);
-                long workshopId = _passwordHasher.SlugDecrypt(workshopSlugCliam);
+                var command = new ContractStatusViewModel();
-                if (workshopId > 0)
+                command.WorkshopName = workshopName.WorkshopFullName;
-                {
+                command.HavingContract = false;
-                    var workshopName = _workshopApplication.GetDetails(workshopId);
-                    var command = new ContractStatusViewModel();
-                    command.WorkshopName = workshopName.WorkshopFullName;
-                    command.HavingContract = false;
 
-                    return Partial("ContractCheckoutStatus", command);
+                return Partial("ContractCheckoutStatus", command);
-                }
-                else
-                {
-                    return NotFound();
-                }
             }
             else
             {
-                return BadRequest();
+                return NotFound();
             }
         }
 
         public IActionResult OnGetContractCheckoutStatusAjax(long employeeId)
         {
-            if (User.Identity.IsAuthenticated)
+            var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+            long workshopId = _passwordHasher.SlugDecrypt(workshopSlugCliam);
+            if (workshopId > 0)
             {
-                var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+                var workshopName = _workshopApplication.GetDetails(workshopId);
-                long workshopId = _passwordHasher.SlugDecrypt(workshopSlugCliam);
+                var employeeName = _employeeApplication.GetDetails(employeeId);
-                if (workshopId > 0)
+
+                var command = new ContractStatusViewModel();
+                var contractSearch = new ContractSearchModel()
                 {
-                    var workshopName = _workshopApplication.GetDetails(workshopId);
+                    EmployeeId = employeeId,
-                    var employeeName = _employeeApplication.GetDetails(employeeId);
+                    WorkshopIds = workshopId,
+                };
+                var checkoutSearch = new CheckoutSearchModel()
+                {
+                    EmployeeId = employeeId,
+                    WorkshopId = workshopId,
+                };
+                var contractResult = _contractApplication.SearchForClient(contractSearch);
+                var checkoutResult = _checkoutApplication.SimpleSearch(checkoutSearch);
 
-                    var command = new ContractStatusViewModel();
+                if (contractResult.Count > 0)
-                    var contractSearch = new ContractSearchModel()
+                {
+                    var divideList = new List<ContractStatusDivide>();
+                    var ChekoutDivideList = new List<CheckoutStatusDivide>();
+
+                    var groupList = new List<ContractStatusGroup>();
+
+                    foreach (var item in contractResult)
                     {
-                        EmployeeId = employeeId,
+                        var divide = new ContractStatusDivide()
-                        WorkshopIds = workshopId,
-                    };
-                    var checkoutSearch = new CheckoutSearchModel()
-                    {
-                        EmployeeId = employeeId,
-                        WorkshopId = workshopId,
-                    };
-                    var contractResult = _contractApplication.SearchForClient(contractSearch);
-                    var checkoutResult = _checkoutApplication.SimpleSearch(checkoutSearch);
-
-                    if (contractResult.Count > 0)
-                    {
-                        var divideList = new List<ContractStatusDivide>();
-                        var ChekoutDivideList = new List<CheckoutStatusDivide>();
-
-                        var groupList = new List<ContractStatusGroup>();
-
-                        foreach (var item in contractResult)
                         {
-                            var divide = new ContractStatusDivide()
+                            ContractStart = item.ContarctStart,
-                            {
+                            ContractEnd = item.ContractEnd,
-                                ContractStart = item.ContarctStart,
+                            Year = item.ContarctStart.Substring(0, 4),
-                                ContractEnd = item.ContractEnd,
+                            MonthStart = Convert.ToInt32(item.ContarctStart.Substring(5, 2)),
-                                Year = item.ContarctStart.Substring(0, 4),
+                            MonthEnd = Convert.ToInt32(item.ContractEnd.Substring(5, 2)),
-                                MonthStart = Convert.ToInt32(item.ContarctStart.Substring(5, 2)),
+                            SignaturStatus = item.Signature,
-                                MonthEnd = Convert.ToInt32(item.ContractEnd.Substring(5, 2)),
+                        };
-                                SignaturStatus = item.Signature,
+                        divideList.Add(divide);
-                            };
-                            divideList.Add(divide);
-                        }
-                        foreach (var item in checkoutResult)
-                        {
-                            var CheckoutDivide = new CheckoutStatusDivide()
-                            {
-                                CheckoutStart = item.ContractStart,
-                                CheckoutEnd = item.ContractEnd,
-                                Year = item.ContractStart.Substring(0, 4),
-                                MonthStart = Convert.ToInt32(item.ContractStart.Substring(5, 2)),
-                                MonthEnd = Convert.ToInt32(item.ContractEnd.Substring(5, 2)),
-                                SignaturStatus = item.Signature,
-                            };
-                            ChekoutDivideList.Add(CheckoutDivide);
-                        }
-                        var contractByYear = divideList.GroupBy(x => x.Year).Select(x => x.First()).ToList();
-                        foreach (var year in contractByYear)
-                        {
-                            var divided = divideList.Where(x => x.Year == year.Year).ToList();
-                            var chDivided = ChekoutDivideList.Where(x => x.Year == year.Year).ToList();
-                            if (chDivided.Count < 1)
-                            {
-                                chDivided = new List<CheckoutStatusDivide>();
-                            }
-
-                            var group = new ContractStatusGroup()
-                            {
-                                Year = year.Year,
-                                ContractStatusDivideList = divided,
-                                CheckoutStatusDivideList = chDivided,
-                            };
-                            groupList.Add(group);
-                        }
-
-                        command.EmployeeName = employeeName.EmployeeFullName;
-                        command.WorkshopName = workshopName.WorkshopFullName;
-                        command.HavingContract = true;
-                        command.ContractStatusGroupList = groupList;
                     }
-                    else
+                    foreach (var item in checkoutResult)
                     {
-                        command.EmployeeName = employeeName.EmployeeFullName;
+                        var CheckoutDivide = new CheckoutStatusDivide()
-                        command.WorkshopName = workshopName.WorkshopFullName;
+                        {
-                        command.HavingContract = false;
+                            CheckoutStart = item.ContractStart,
+                            CheckoutEnd = item.ContractEnd,
+                            Year = item.ContractStart.Substring(0, 4),
+                            MonthStart = Convert.ToInt32(item.ContractStart.Substring(5, 2)),
+                            MonthEnd = Convert.ToInt32(item.ContractEnd.Substring(5, 2)),
+                            SignaturStatus = item.Signature,
+                        };
+                        ChekoutDivideList.Add(CheckoutDivide);
+                    }
+                    var contractByYear = divideList.GroupBy(x => x.Year).Select(x => x.First()).ToList();
+                    foreach (var year in contractByYear)
+                    {
+                        var divided = divideList.Where(x => x.Year == year.Year).ToList();
+                        var chDivided = ChekoutDivideList.Where(x => x.Year == year.Year).ToList();
+                        if (chDivided.Count < 1)
+                        {
+                            chDivided = new List<CheckoutStatusDivide>();
+                        }
+
+                        var group = new ContractStatusGroup()
+                        {
+                            Year = year.Year,
+                            ContractStatusDivideList = divided,
+                            CheckoutStatusDivideList = chDivided,
+                        };
+                        groupList.Add(group);
                     }
 
-                    return new JsonResult(new { command });
+                    command.EmployeeName = employeeName.EmployeeFullName;
+                    command.WorkshopName = workshopName.WorkshopFullName;
+                    command.HavingContract = true;
+                    command.ContractStatusGroupList = groupList;
                 }
                 else
                 {
-                    return NotFound();
+                    command.EmployeeName = employeeName.EmployeeFullName;
+                    command.WorkshopName = workshopName.WorkshopFullName;
+                    command.HavingContract = false;
                 }
+
+                return new JsonResult(new { command });
             }
             else
             {
-                return BadRequest();
+                return NotFound();
             }
         }
 
         public IActionResult OnGetEmployeeList()
         {
-            var workshopSlug = User.FindFirst("WorkshopSlug").Value;
+            var workshopSlug = User.FindFirstValue("WorkshopSlug");
             var workshopId = _passwordHasher.SlugDecrypt(workshopSlug);
             if (workshopId > 0)
             {
@@ -408,27 +376,20 @@ namespace ServiceHost.Areas.Client.Pages.Company.Employees
 
         public IActionResult OnGetLeaveCreate()
         {
-            if (User.Identity.IsAuthenticated)
+            var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+            var workshopId = _passwordHasher.SlugDecrypt(workshopSlugCliam);
+            if (workshopId > 0)
             {
-                var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+                var command = new CreateLeave()
-                var workshopId = _passwordHasher.SlugDecrypt(workshopSlugCliam);
-                if (workshopId > 0)
                 {
-                    var command = new CreateLeave()
+                    WorkshopId = workshopId,
-                    {
+                };
-                        WorkshopId = workshopId,
-                    };
 
-                    return Partial("LeaveCreateModal", command);
+                return Partial("LeaveCreateModal", command);
-                }
-                else
-                {
-                    return NotFound();
-                }
             }
             else
             {
-                return BadRequest();
+                return NotFound();
             }
         }
 

ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllList.cshtml

@@ -4,231 +4,240 @@
 
 @* <link href="~/assetsclient/css/insuranceprint.css?ver=@Version.StyleVersion" rel="stylesheet" /> *@
 
+<style>
+
+	table {
+		font-size: 12px;
+		page-break-inside: avoid;
+	}
+
+	table th, table td {
+		page-break-inside: avoid;
+	}
+
+	table span {
+		color: #000;
+	}
+
+	.modal .modal-dialog .modal-content {
+		background-color: white !important;
+	}
+
+	.modal-dialog {
+		max-width: 100%;
+		width: 22.4cm;
+	}
+
+	@@page {
+		size: A4;
+		margin: 0mm;
+		page-break-after: auto;
+	}
+
+	@@media screen {
+		#printSection {
+			display: none;
+		}
+	}
+
+/* 	.print:last-child {
+		page-break-after: auto !important;
+	} */
+
+	@@media print {
+		body * {
+			visibility: hidden;
+			page-break-after: auto;
+		}
+
+		html, body {
+			height: 100%;
+			margin: 0 !important;
+			padding: 0 !important;
+			overflow: clip;
+		}
+
+		#printSection, #printSection * {
+			visibility: visible;
+			page-break-after: auto;
+		}
+
+		#printSection {
+			/* width: 27.5cm; */
+			position: absolute;
+			right: 0;
+			page-break-after: auto;
+			top: 0;
+			padding: 2rem 2rem;
+		}
+
+		#printThis {
+			width: 100%;
+			padding: 2rem 1rem;
+		}
+
+		#printThis .section-leave {
+			/* margin: 9mm 0 0 0; */
+			page-break-inside: avoid !important;
+		}
+
+		footer {
+			page-break-after: auto;
+			display: none;
+		}
+
+		.no-print {
+			display: none;
+		}
+
+		header {
+			display: none;
+		}
+
+		#printThis .titleSection {
+			border-bottom: 0 !important;
+			border-radius: 10px 10px 0 0 !important;
+			background: #fff !important;
+			-webkit-print-color-adjust: exact !important;
+			print-color-adjust: exact !important;
+		}
+
+		#printThis .table-bordered > thead {
+			display: table-header-group !important;
+			page-break-inside: avoid !important;
+		}
+
+		#printThis .table-bordered > tbody > tr.withdraw > td {
+			background-color: #c7c7c7 !important;
+			-webkit-print-color-adjust: exact !important;
+			print-color-adjust: exact !important;
+		}
+
+		.print:last-child {
+			page-break-after: always !important;
+		}
+	}
+	@@page:first {
+		margin-top: 0mm; /* Margin for the first page */
+		margin-bottom: 0mm;
+		margin-left: 0mm;
+		margin-right: 0mm;
+	}
+
+	@@page {
+        margin-top: 10mm; /* Larger margin for the second and subsequent pages */
+        margin-bottom:0mm;
+        margin-left: 0mm;
+        margin-right: 0mm;
+    }
+
+	.cls-1 {
+		fill: url(#linear-gradient-2);
+	}
+
+	.cls-2 {
+		fill: url(#linear-gradient-3);
+	}
+
+	.cls-3 {
+		fill: url(#linear-gradient);
+	}
+
+	.flex {
+		display: flex;
+	}
+
+	.justify-between {
+		justify-content: space-between;
+	}
+
+	.justify-end {
+		justify-content: end;
+	}
+
+	.items-center {
+		align-items: center;
+	}
+
+	.titleSection {
+		background: #fff !important;
+		-webkit-print-color-adjust: exact !important;
+		print-color-adjust: exact !important;
+		padding: 5px;
+		margin: 0;
+		/* border: 1px solid #94a3b8; */
+		border-bottom: 0;
+		align-items: center;
+		display: flex;
+	}
+
+	.titleH1 {
+		font-size: 24px;
+		margin: 0 !important;
+		font-weight: 600;
+	}
+
+	.lineS {
+		margin: 4px 0 !important;
+	}
+
+	.col-4, .col-3, .col-9,
+	.col-2, .col-10, .col-6,
+	.col-8, .col-5, .col-7,
+	.col-offset-1 {
+		float: right !important;
+	}
+
+	label .modal {
+		margin-bottom: 2px;
+	}
+
+	.fontBold {
+		font-family: IranYekanEXBold !important;
+	}
+
+	.fontNumber {
+		font-family: IranText !important;
+	}
+
+	.modal-body {
+		height: 99%;
+	}
+
+	.row {
+		margin-right: -10px !important;
+		margin-left: -10px !important;
+	}
+
+	.table > tbody > tr.withdraw > td {
+		background-color: #c7c7c7 !important;
+	}
+
+	.table {
+		/* border: 1px solid #94a3b8 !important; */
+		border-collapse: separate !important;
+		overflow: hidden !important;
+		border-spacing: 0 !important;
+		border-radius: 10px !important;
+		text-align: center !important;
+		/* border: 1px solid #94a3b8 !important; */
+	}
+
+	.table th, .table td {
+		vertical-align: middle !important;
+		border: 1px solid #94a3b8 !important;
+	}
+
+	/* .table th:last-child, .table td:last-child {
+		    border-right: none !important;
+	   } */
+
+	 /* .table tbody tr:last-child th, .table tbody tr:last-child td {
+		    border-bottom: none !important;
+	   } */
+</style>
 
 @{
-    <style>
-
-        table{
-            font-size: 12px;
-        }
-
-        table span {
-            color: #000;
-        }
-
-
-
-        @@media screen {
-            #printSection {
-                display: none;
-            }
-        }
-        .modal .modal-dialog .modal-content {
-            background-color: white !important;
-        }
-
-        .modal-dialog {
-            max-width: 100%;
-            width: 22.4cm;
-        }
-
-        @@page {
-            size: A4;
-            margin: 0mm;
-            page-break-after: auto;
-        }
-
-        @@media screen {
-            #printSection {
-                display: none;
-            }
-        }
-
-        .print:last-child {
-            page-break-after: auto !important;
-        }
-
-        @@media print {
-            body * {
-                visibility: hidden;
-                page-break-after: auto;
-            }
-
-            html, body {
-                height: 100%;
-                margin: 0 !important;
-                padding: 0 !important;
-                overflow: clip;
-            }
-
-            #printSection, #printSection * {
-                visibility: visible;
-                page-break-after: auto;
-            }
-
-            #printThis {
-                width: 100%;
-                padding: 2rem 1rem;
-            }
-
-                #printThis .section-leave {
-                    /* margin: 9mm 0 0 0; */
-                    page-break-inside: avoid !important;
-                }
-
-            footer {
-                page-break-after: auto;
-                display: none;
-            }
-
-            .no-print {
-                display: none;
-            }
-
-            header {
-                display: none;
-            }
-
-            #printSection {
-                width: 27.5cm;
-                position: absolute;
-                left: 0;
-                page-break-after: auto;
-                top: 0;
-                padding: 2rem 3rem;
-            }
-
-            #printThis .titleSection {
-                //border: 1px solid #94a3b8 !important;
-                border-bottom: 0 !important;
-                border-radius: 10px 10px 0 0 !important;
-                background: #fff !important;
-                -webkit-print-color-adjust: exact !important;
-                print-color-adjust: exact !important;
-            }
-
-            #printThis .table-bordered > thead {
-                display: table-header-group !important;
-                page-break-inside: avoid !important;
-            }
-
-            #printThis .table-bordered > tbody > tr.withdraw > td {
-                background-color: #c7c7c7 !important;
-                -webkit-print-color-adjust: exact !important;
-                print-color-adjust: exact !important;
-            }
-
-        }
-
-
-        .cls-1 {
-            fill: url(#linear-gradient-2);
-        }
-
-        .cls-2 {
-            fill: url(#linear-gradient-3);
-        }
-
-        .cls-3 {
-            fill: url(#linear-gradient);
-        }
-
-        .flex {
-            display: flex;
-        }
-
-        .justify-between {
-            justify-content: space-between;
-        }
-
-        .justify-end {
-            justify-content: end;
-        }
-
-        .items-center {
-            align-items: center;
-        }
-
-        .titleSection {
-            background: #fff !important;
-            -webkit-print-color-adjust: exact !important;
-            print-color-adjust: exact !important;
-            padding: 5px;
-            margin: 0;
-            // border: 1px solid #94a3b8;
-            border-bottom: 0;
-            align-items: center;
-            display: flex;
-        }
-
-        .titleH1 {
-            font-size: 24px;
-            margin: 0 !important;
-            font-weight: 600;
-        }
-
-        .lineS {
-            margin: 4px 0 !important;
-        }
-
-        .col-4, .col-3, .col-9,
-        .col-2, .col-10, .col-6,
-        .col-8, .col-5, .col-7,
-        .col-offset-1 {
-            float: right !important;
-        }
-
-        label .modal {
-            margin-bottom: 2px;
-        }
-
-        .fontBold {
-            font-family: IranYekanEXBold !important;
-        }
-
-        .fontNumber {
-            font-family: IranText !important;
-        }
-
-        .modal-body {
-            height: 99%;
-        }
-
-        .row {
-            margin-right: -10px !important;
-            margin-left: -10px !important;
-        }
-
-        .table > tbody > tr.withdraw > td {
-            background-color: #c7c7c7 !important;
-        }
-
-        .table {
-            // border: 1px solid #94a3b8 !important;
-            border-collapse: separate !important;
-            overflow: hidden !important;
-            border-spacing: 0 !important;
-            border-radius: 10px !important;
-            text-align: center !important;
-            // border: 1px solid #94a3b8 !important;
-        }
-
-            .table th, .table td {
-                vertical-align: middle !important;
-                border: 1px solid #94a3b8 !important;
-            }
-
-                // .table th:last-child, .table td:last-child {
-                    // border-right: none !important;
-                    //
-                }
-
-            // .table tbody tr:last-child th, .table tbody tr:last-child td {
-                // border-bottom: none !important;
-                //
-            }
-    </style>
-
     int index = 1;
 }
 
@@ -237,46 +246,51 @@
 </div>
 
 
-        <div class="modal-body print " id="printThis">
+        <div class="modal-body print" id="printThis">
             <div class="row">
-                <div class="col-12" style="overflow-y: auto; height:490px;">
+                <div class="col-12">
-                    <div class="table-container table-responsive col-12">
+                    <th class="table-container table-responsive col-12">
 
                         <table class="table table-bordered">
                             <thead>
-                                <tr>
+	                            <tr>
-                                    <th colspan="9" class="col-md-12" style="border-radius: 10px 10px 0 0;padding: 5px 12px;">
+		                            <th colspan="9" class="col-md-12" style="border-radius: 10px 10px 0 0;padding: 5px 12px;">
-                                        <div class="row titleSection">
+			                            <div class="row titleSection">
-                                            <div class="col-3 text-start">
+				                            <div class="col-3 text-start">
-                                                <svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 621.6 721.91" width="55px">
+					                            <svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 621.6 721.91" width="55px">
-                                                    <defs>
+						                            <defs>
-                                                        <linearGradient id="linear-gradient" x1="0" y1="481.82" x2="621.6" y2="481.82" gradientUnits="userSpaceOnUse">
+							                            <linearGradient id="linear-gradient" x1="0" y1="481.82" x2="621.6" y2="481.82" gradientUnits="userSpaceOnUse">
-                                                            <stop offset="0" stop-color="#30c1c1" />
+								                            <stop offset="0" stop-color="#30c1c1" />
-                                                            <stop offset="1" stop-color="#087474" />
+								                            <stop offset="1" stop-color="#087474" />
-                                                        </linearGradient>
+							                            </linearGradient>
-                                                        <linearGradient id="linear-gradient-2" x1="217.07" y1="187.47" x2="523.83" y2="187.47" xlink:href="#linear-gradient" />
+							                            <linearGradient id="linear-gradient-2" x1="217.07" y1="187.47" x2="523.83" y2="187.47" xlink:href="#linear-gradient" />
-                                                        <linearGradient id="linear-gradient-3" x1="1.3" y1="146.6" x2="395.56" y2="146.6" xlink:href="#linear-gradient" />
+							                            <linearGradient id="linear-gradient-3" x1="1.3" y1="146.6" x2="395.56" y2="146.6" xlink:href="#linear-gradient" />
-                                                    </defs>
+						                            </defs>
-                                                    <polygon class="cls-3" points="0 328.82 129.91 244.95 129.91 453.87 310.8 562.4 488.4 453.87 488.4 355.2 310.8 355.2 488.4 241.73 621.6 241.73 621.6 541.02 310.8 721.91 0 541.02 0 328.82" />
+						                            <polygon class="cls-3" points="0 328.82 129.91 244.95 129.91 453.87 310.8 562.4 488.4 453.87 488.4 355.2 310.8 355.2 488.4 241.73 621.6 241.73 621.6 541.02 310.8 721.91 0 541.02 0 328.82" />
-                                                    <polygon class="cls-1" points="217.07 309.16 217.07 192.4 426.8 65.78 523.83 123.33 217.07 309.16" />
+						                            <polygon class="cls-1" points="217.07 309.16 217.07 192.4 426.8 65.78 523.83 123.33 217.07 309.16" />
-                                                    <polyline class="cls-2" points="308.61 0 395.56 47.69 1.3 293.19 1.3 184.66 308.61 0" />
+						                            <polyline class="cls-2" points="308.61 0 395.56 47.69 1.3 293.19 1.3 184.66 308.61 0" />
-                                                </svg>
+					                            </svg>
-                                            </div>
+				                            </div>
-                                            <div class="col-6 text-center">
+				                            <div class="col-6 text-center">
-                                                <div style="display: inline-block;">
+					                            <div style="display: inline-block;">
-                                                    <div style="position: relative;text-align: center;bottom: 10px;">
+						                            <div style="position: relative;text-align: center;bottom: 10px;">
-                                                        <span class="titleH1">موسسه نور دادمهر گستر کاسپین</span>
+							                            <span class="titleH1">موسسه نور دادمهر گستر کاسپین</span>
-                                                        <div style="position: absolute;left: 0;font-size: 14px;">شماره ثبت: 1727</div>
+							                            <div style="position: absolute;left: 0;font-size: 14px;">شماره ثبت: 1727</div>
-                                                    </div>
+						                            </div>
-                                                </div>
+					                            </div>
-                                            </div>
+				                            </div>
-                                            <div class="col-3 text-end">
+				                            <div class="col-3 text-end">
-                                                <p style="letter-spacing: 1.4px;font-size: 13px;margin: 0 0 2px 0;">www.gozareshgir.ir</p>
+					                            <p style="letter-spacing: 1.4px;font-size: 13px;margin: 0 0 2px 0;">www.gozareshgir.ir</p>
-                                                <p class="m-0" style="font-size: 13px;">سامانه هوشمند گزارشگیر</p>
+					                            <p class="m-0" style="font-size: 13px;">سامانه هوشمند گزارشگیر</p>
-                                            </div>
+				                            </div>
-                                        </div>
+			                            </div>
-                                    </th>
+		                            </th>
-                                </tr>
+	                            </tr>
+	                            <tr>
+		                            <th colspan="9" style="padding: 5px;">
+                                        <p class="m-0">@Model.LeaveList.First().EmployeeFullName</p>
+		                            </th>
+	                            </tr>
                                 <tr>
                                     <th style="background: #80808033 !important;border-top-right-radius: 0px!important;-webkit-print-color-adjust: exact !important; print-color-adjust: exact !important;">ردیف  </th>
                                     <th style="background: #80808033 !important;-webkit-print-color-adjust: exact !important; print-color-adjust: exact !important;"> سال </th>

ServiceHost/Areas/Client/Pages/Company/Employees/PrintOne.cshtml

@@ -1,10 +1,16 @@
 @model CompanyManagment.App.Contracts.Leave.LeavePrintViewModel
 
+
 <style>
     .modal .modal-dialog .modal-content {
         background-color: white !important;
     }
 
+    .modal-dialog {
+        max-width: 100%;
+        width: 22.4cm;
+    }
+
     @@page {
         size: A4;
         margin: 0mm;
@@ -28,27 +34,26 @@
         }
 
         html, body {
+            height: 100%;
             margin: 0 !important;
             padding: 0 !important;
             overflow: clip;
         }
 
         #printSection, #printSection * {
-            height: auto;
             visibility: visible;
             page-break-after: auto;
         }
 
         #printThis {
-            height: auto;
             width: 100%;
             padding: 2rem 1rem;
         }
 
-        #printThis .section-leave {
+            #printThis .section-leave {
-            /* margin: 9mm 0 0 0; */
+                /* margin: 9mm 0 0 0; */
-            page-break-inside: avoid !important;
+                page-break-inside: avoid !important;
-        }
+            }
 
         footer {
             page-break-after: auto;
@@ -60,10 +65,10 @@
         }
 
         #printSection {
-            /* position: absolute; */
+            position: absolute;
-            /* left: 0;
+            left: 0;
             page-break-after: auto;
-            top: 0; */
+            top: 0;
         }
 
         .head {
@@ -121,85 +126,106 @@
         border-radius: 10px;
     }
 
-    .section-leave .title {
+        .section-leave .title {
-        margin: 4px 0 0 0;
+            margin: 4px 0 0 0;
-        font-size: 15px;
+            font-size: 15px;
-        font-weight: bold;
+            font-weight: bold;
-        text-align: center;
+            text-align: center;
+        }
+
+        .section-leave .paragraph {
+            margin: 8px 0 0 0;
+            font-size: 14px;
+            text-align: justify;
+            line-height: 22px;
+        }
+
+        .section-leave .active-paragraph {
+            font-weight: bold;
+            background-color: #ebe6e6 !important;
+            padding: 0px 6px;
+            border-radius: 5px;
+            -webkit-print-color-adjust: exact;
+            print-color-adjust: exact;
+        }
+
+        .section-leave .signature-section {
+            width: 100%;
+            position: absolute;
+            right: 0;
+            bottom: 10px;
+            display: flex;
+            align-items: center;
+            justify-content: space-around;
+            font-size: 14px;
+        }
+
+            .section-leave .signature-section .signature-card {
+                position: relative;
+                width: 180px;
+                height: 95px;
+            }
+
+                .section-leave .signature-section .signature-card .signature-title {
+                    position: absolute;
+                    top: -7px;
+                    right: 10px;
+                    margin: 0;
+                    font-size: 10px;
+                    background-color: #fff;
+                    z-index: 2;
+                }
+
+                .section-leave .signature-section .signature-card .signature-border {
+                    width: 100%;
+                    border: 2px dashed #cacaca;
+                    height: 100%;
+                    border-radius: 15px;
+                }
+
+        .section-leave .status {
+            display: flex;
+            align-items: center;
+            font-size: 14px;
+        }
+
+            .section-leave .status svg {
+                margin: 0 0 0 4px;
+            }
+
+        .section-leave .leave-hour {
+            border: 1px solid #1e293b;
+            padding: 4px 7px;
+            border-radius: 4px;
+        }
+
+        .section-leave .leave-day {
+            background-color: #d3d3d3 !important;
+            padding: 4px 7px;
+            border-radius: 4px;
+            -webkit-print-color-adjust: exact;
+            print-color-adjust: exact;
+        }
+
+    .print-card {
+        position: fixed;
+        top: 130px;
+        width: auto;
+        z-index: 20;
+        box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
     }
 
-    .section-leave .paragraph {
+    @@media screen and (max-width: 992px) {
-        margin: 8px 0 0 0;
+        .wrapper {
-        font-size: 14px;
+            visibility: hidden;
-        text-align: justify;
+        }
-        line-height: 22px;
-    }
 
-    .section-leave .active-paragraph {
+        .print-card {
-        font-weight: bold;
+            position: relative;
-        background-color: #ebe6e6 !important;
+            top: 0;
-        padding: 0px 6px;
+            width: 100%;
-        border-radius: 5px;
+            z-index: 20;
-        -webkit-print-color-adjust: exact;
+        }
-        print-color-adjust: exact;
-    }
-
-    .section-leave .signature-section {
-        width: 100%;
-        position: absolute;
-        right: 0;
-        bottom: 10px;
-        display: flex;
-        align-items: center;
-        justify-content: space-around;
-        font-size: 14px;
-    }
-
-    .section-leave .signature-section .signature-card {
-        position: relative;
-        width: 180px;
-        height: 95px;
-    }
-
-    .section-leave .signature-section .signature-card .signature-title {
-        position: absolute;
-        top: -7px;
-        right: 10px;
-        margin: 0;
-        font-size: 10px;
-        background-color: #fff;
-        z-index: 2;
-    }
-
-    .section-leave .signature-section .signature-card .signature-border {
-        width: 100%;
-        border: 2px dashed #cacaca;
-        height: 100%;
-        border-radius: 15px;
-    }
-
-    .section-leave .status {
-        display: flex;
-        align-items: center;
-        font-size: 14px;
-    }
-
-    .section-leave .status svg {
-        margin: 0 0 0 4px;
-    }
-
-    .section-leave .leave-hour {
-        border: 1px solid #1e293b;
-        padding: 4px 7px;
-        border-radius: 4px;
-    }
-
-    .section-leave .leave-day {
-        background-color: #d3d3d3 !important;
-        padding: 4px 7px;
-        border-radius: 4px;
-        -webkit-print-color-adjust: exact;
-        print-color-adjust: exact;
     }
 </style>
 
@@ -354,7 +380,7 @@
 </form>
 
 <!--<script src="~/AdminTheme/assets/js/workingHoursPrintable.js"></script>-->
-<script src="~/AdminTheme/assets/printjs/print.min.js"></script>
+@* <script src="~/AdminTheme/assets/printjs/print.min.js"></script> *@
 
 <script>
     $(document).ready(function () {

ServiceHost/Areas/Client/Pages/Company/InsuranceList/PrintOne.cshtml

@@ -4,12 +4,22 @@
 
 <link href="~/assetsclient/css/insuranceprint.css?ver=@Version.StyleVersion" rel="stylesheet" />
 @{
-        <style>
+    <style>
-            @@media screen {
+        @@page {
-                #printSection {
+	        size: A4 landscape;
-                    display: none;
+        }
-                }
+
+        @@media screen {
+            #printSection {
+                display: none;
             }
+        }
+        
+        @@media print {
+	        body {
+		        background-color: white;
+	        }
+        }
     </style>
 }
 

ServiceHost/Areas/Client/Pages/Company/InsuranceList/PrintOneMobile.cshtml

@@ -4,6 +4,26 @@
 
 <link href="~/assetsclient/css/insuranceprint.css?ver=@Version.StyleVersion" rel="stylesheet" />
 
+@{
+	<style>
+		@@page {
+			size: A4 landscape;
+		}
+
+		@@media screen {
+			#printSection {
+				display: none;
+			}
+		}
+        
+		@@media print {
+			body {
+				background-color: white;
+			}
+		}
+	</style>
+}
+
 <div class="modal-header" style="border-bottom: unset;margin-bottom: 15px;">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 </div>

ServiceHost/Areas/Client/Pages/Company/Reports/CheckoutReport.cshtml

@@ -16,6 +16,7 @@
     <link href="~/AssetsClient/css/select2.css?ver=@Version.StyleVersion" rel="stylesheet" />
     <link href="~/AssetsClient/css/dropdown.css?ver=@Version.StyleVersion" rel="stylesheet" />
     <link href="~/AssetsClient/css/filter-search.css?ver=@Version.StyleVersion" rel="stylesheet" />
+    <link href="~/AssetsClient/css/datetimepicker.css?ver=@Version.StyleVersion" rel="stylesheet" />
 
 
     <style>
@@ -573,10 +574,24 @@
     <!-- List Items -->
     <div class="container-fluid">
         <div class="row p-lg-2">
-            @if (@Model.HasCheckoutReport)
+            <div class="card">
-            {
+                    
-                <div class="card">
+                <!-- Advance Search Box -->
+                <div class="search-box bg-white p-1 d-flex d-md-none">
+	                <div class="col text-center">
+		                <button class="btn-search w-100" type="button" data-bs-toggle="modal" data-bs-target="#searchModal">
+			                <span>جستجو پیشرفته</span>
+			                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+				                <circle cx="11" cy="11" r="6" stroke="white" />
+				                <path d="M20 20L17 17" stroke="white" stroke-linecap="round" />
+			                </svg>
+		                </button>
+	                </div>
+                </div>
+                <!-- End Advance Search Box -->
 
+	            @if (@Model.HasCheckoutReport)
+	            {
                     <div class="container-fluid">
                         <div class="row">
                             <div class="d-flex align-items-center justify-content-between my-1 px-1">
@@ -1018,17 +1033,17 @@
 
                     <!-- End List of Table -->
 
-                </div>
+	            }
-            }
+	            else
-            else
+	            {
-            {
+	                <div class="text-center bg-white d-flex align-items-center justify-content-center">
-                <div class="empty text-center bg-white d-flex align-items-center justify-content-center">
+	                    <div class="">
-                    <div class="">
+	                        <img src="~/assetsclient/images/empty.png" alt="" class="img-fluid" />
-                        <img src="~/assetsclient/images/empty.png" alt="" class="img-fluid" />
+	                        <h5>اطلاعاتی وجود ندارد.</h5>
-                        <h5>اطلاعاتی وجود ندارد.</h5>
+	                    </div>
-                    </div>
+	                </div>
-                </div>
+	            }
-            }
+            </div>
    
         </div>
     </div>
@@ -1049,6 +1064,150 @@
 </div>
 <!--End Of Print Modal Main -->
 
+<!-- Modal From Bottom For Advance Search -->
+<div class="modal fade" id="searchModal" tabindex="-1" data-bs-backdrop="static" aria-labelledby="searchModalModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-fullscreen">
+        <div class="modal-content">
+
+            <form role="form" method="get" name="search-theme-form2" id="search-theme-form2" autocomplete="off">
+                <div class="modal-header d-block text-center pb-0">
+                    <div class="iphone-line mx-auto mb-3"></div>
+                    <h5 class="modal-title mb-4 text-start" id="searchModalLabel">جستجوی پیشرفته</h5>
+                </div>
+
+                <div class="modal-body pt-0 mb-3">
+                    <div class="container-fluid search-box">
+
+                        <div id="overlaySearchAdvance" class=""></div>
+
+                        <div class="row">
+                            <div class="col-12 text-start mb-4">
+                                <div class="mb-2">
+                                    <select id="getPersonneModal" class="form-select" asp-for="SearchModel.EmployeeId">
+                                        <option value="0"> انتخاب پرسنل </option>
+                                        @foreach (var person in @Model.Employees)
+                                        {
+                                            <option style="font-family: 'IranSans' !important;" value="@person.Id"> @person.EmployeeFullName</option>
+                                        }
+                                    </select>
+                                </div>
+                            </div>
+
+                            <div class="col-12 text-start">
+                                <p class="mb-3">جستجو بر اساس سال و ماه</p>
+                                <div class="row">
+
+                                    <div class="col-6">
+                                        <div class="form-group">
+	                                        <span class="form-control text-center persianDateInputYear" id="yearText">
+		                                        @{
+			                                        if (string.IsNullOrWhiteSpace(Model.SearchModel.Year))
+			                                        {
+				                                        <span>سال</span>
+			                                        }
+			                                        else
+			                                        {
+				                                        @Model.SearchModel.Year
+			                                        }
+		                                        }
+	                                        </span>
+	                                        <input type="hidden" id="sendDropdownYearMobile" asp-for="SearchModel.Year" />
+                                            @* <span asp-validation-for="DateOfYear" class="error"></span> *@
+                                        </div>
+                                    </div>
+                                    <div class="col-6">
+                                        <div class="form-group">
+	                                        <span class="form-control text-center persianDateInputMonth" id="monthText">
+		                                        @{
+			                                        if (string.IsNullOrWhiteSpace(Model.SearchModel.Month))
+			                                        {
+				                                        <span>ماه</span>
+			                                        }
+			                                        else
+			                                        {
+				                                        @switch (@Model.SearchModel.Month)
+				                                        {
+					                                        case "01":
+						                                        <span>فروردین</span>
+						                                        break;
+					                                        case "02":
+						                                        <span>اردیبهشت</span>
+						                                        break;
+					                                        case "03":
+						                                        <span>خرداد</span>
+						                                        break;
+					                                        case "04":
+						                                        <span>تیر</span>
+						                                        break;
+					                                        case "05":
+						                                        <span>مرداد</span>
+						                                        break;
+					                                        case "06":
+						                                        <span>شهریور</span>
+						                                        break;
+					                                        case "07":
+						                                        <span>مهر</span>
+						                                        break;
+					                                        case "08":
+						                                        <span>آبان</span>
+						                                        break;
+					                                        case "09":
+						                                        <span>آذر</span>
+						                                        break;
+					                                        case "10":
+						                                        <span>دی</span>
+						                                        break;
+					                                        case "11":
+						                                        <span>بهمن</span>
+						                                        break;
+					                                        case "12":
+						                                        <span>اسفند</span>
+						                                        break;
+					                                        default:
+						                                        <span>ماه</span>
+						                                        break;
+				                                        }
+			                                        }
+		                                        }
+	                                        </span>
+	                                        <input type="hidden" id="sendDropdownMonthMobile" asp-for="SearchModel.Month" />
+                                            @* <span asp-validation-for="DateOfMonth" class="error"></span> *@
+                                        </div>
+                                    </div>
+                                    <div class="col-12">
+                                        <a href="/Client/Company/Reports/CheckoutReport" class="btn-clear-filter py-2 text-center d-block w-100 mt-2 disable" id="filterRemove">
+                                            <span class="w-100">حذف جستجو</span>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+
+                <div class="modal-footer justify-content-center align-items-center">
+                    <div class="container-fluid">
+                        <div class="row">
+                            <div class="col-6 text-end">
+                                <button type="button" class="btn-cancel w-100" data-bs-dismiss="modal">بستن</button>
+                            </div>
+                            <div class="col-6 text-start">
+                                <button type="submit" class="btn-search btn-search-click w-100">جستجو</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </form>
+
+
+        </div>
+    </div>
+</div>
+<!-- End Modal From Bottom For Advance Search -->
+
+
 
 <input type="hidden" asp-for="@Model.PageIndex" id="pageIndex" />
 
@@ -1098,26 +1257,33 @@
                 language: "fa",
                 dir: "rtl"
             });
+            
 
-            $('#getPersonnel, #dropdown-month, #dropdown-year').change(function () {
+            $("#getPersonneModal").select2({
-                checkFilters();
+                language: "fa",
+                dir: "rtl",
+                dropdownParent: $('#searchModal')
             });
 
-            function checkFilters() {
+            // $('#getPersonnel, #dropdown-month, #dropdown-year').change(function () {
-                var filterEmployeeId = $('#getPersonnel').val();
+            //     checkFilters();
-                var filterYear = $('#sendDropdownYear').val();
+            // });
-                var filterMonth = $('#sendDropdownMonth').val();
-
-                if (filterEmployeeId != 0 || filterYear != ' ' || filterMonth != ' ') {
-                    $('.btn-clear-filter').removeClass('disable');
-                } else {
-                    $('.btn-clear-filter').addClass('disable');
-                }
-            }
 
             checkFilters();
         });
 
+        function checkFilters() {
+            var filterEmployeeId = $('#getPersonnel').val();
+            var filterYear = $('#sendDropdownYear').val();
+            var filterMonth = $('#sendDropdownMonth').val();
+
+            if (filterEmployeeId != 0 || filterYear != ' ' || filterMonth != ' ') {
+                $('.btn-clear-filter').removeClass('disable');
+            } else {
+                $('.btn-clear-filter').addClass('disable');
+            }
+        }
+
         $('#searchBtn').click(function (event) {
             var yearSelected = $('#sendDropdownYear').val().trim();
             var monthSelected = $('#sendDropdownMonth').val().trim();
@@ -1481,5 +1647,362 @@
 	        var url = '#showmodal=@Url.Page("/Company/Checkouts/Index", "PrintOneMobile")';
 	        window.location.href = url + parametr;
         }
+
+
+
+            //******************** نمایش سال و ماه در موبایل ********************
+            if ($(window).width() < 768) {
+
+                var middleYearIndex = 2;
+                var selectedMonth = 2;
+
+                //************* Year *************
+                $('.persianDateInputYear').on('click',
+                    function () {
+                        $('#overlaySearchAdvance').addClass("overlaySearchAdvance");
+
+                        var datepicker = $(this);
+                        if ($(this).parent().find('.datepicker-container-year').length) {
+                            return false;
+                        } else {
+                            $(this).parent().append(`
+                                                    <div class="datepicker-container-year">
+                                                        <div class="datepicker-container-date-div">
+                                                            <div class="date-container">
+                                                                <div id="years" class="scrollable-container"></div>
+                                                            </div>
+                                                            <div class="d-flex justify-content-around">
+                                                                <button type="button" class="btn-secondary" id="cancelYear" style="width:100px; font-size: 11px;">انصراف</button>
+                                                                <button type="button" class="btn-primary" id="confirmYear" style="width:100px; font-size: 11px;">تائید</button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                              `);
+                        }
+
+                        var datepickerContainer = $(this).parent().find('.datepicker-container-year');
+                        var years = datepickerContainer.find('#years');
+                        // datepickerContainer.width(datepicker.outerWidth());
+
+                        var middleYearIndexArray = [];
+                        let yearlyList = [];
+                        yearlyList.push({ year: 1368 });
+                        yearlyList.push({ year: 1369 });
+                        @foreach (var items in Model.YearlyList.OrderBy(x => x))
+                        {
+                            @:yearlyList.push({ year: Number(@items) });
+                        }
+                                var yearIndex = yearlyList.length;
+                        yearIndex = yearIndex - 1;
+                        var no3 = yearlyList[yearIndex].year + 1;
+                        var no4 = yearlyList[yearIndex].year + 2;
+                        yearlyList.push({ year: no3 });
+                        yearlyList.push({ year: no4 });
+                        var i = 0;
+
+                        for (var j = yearlyList[yearIndex + 2].year; j >= 1368; j--) {
+                            let y = { index: i, value: j };
+                            middleYearIndexArray.push(j);
+                            i++;
+
+                            var formattedNumber = String(j).padStart(2, '0');
+                            if (j == no3 || j == no4) {
+                                years.append($('<span>').text('-').css('visibility', 'hidden'));
+                            } else if (j == 1368 || j == 1369) {
+                                years.append($('<span>').text(formattedNumber).css('visibility', 'hidden'));
+                            } else {
+                                years.append($('<span>').text(formattedNumber));
+                            }
+
+                            // var middleYearIndex = Math.floor(years.children('span').length / 2) - 2;
+                            years.children('span').eq(middleYearIndex).addClass('chosen-date');
+                            var containerHeightYear = years.height();
+                            var optionHeightYear = years.children('span').outerHeight();
+                            var scrollOffsetYear = optionHeightYear * middleYearIndex;
+                            years.scrollTop(scrollOffsetYear - containerHeightYear / 2);
+                        }
+
+                        // datepickerContainer.addClass("date-container");
+
+                        var selectedYear = yearlyList[yearIndex].year;
+                        var yearsScrollTop;
+                        var scrollTimeout;
+
+                        // Scroll event listener
+                        datepickerContainer.find('.scrollable-container').on('scroll',
+                            function () {
+                                var optionHeightYear = years.children('span').outerHeight();
+                                // var scrollTopYear = years.scrollTop() + (optionHeightYear * 2);
+                                var scrollTopYear = Math.round((years.scrollTop() + (optionHeightYear * 2)) / 10) * 10;
+                                var selectedIndexYear = Math.round(scrollTopYear / optionHeightYear);
+                                years.children('span').removeClass('chosen-date');
+                                years.children('span').eq(selectedIndexYear).addClass('chosen-date');
+                                yearsScrollTop = years.scrollTop();
+                                var selectedValueYear = years.children('span').eq(selectedIndexYear).text();
+
+                                clearTimeout(scrollTimeout);
+                                scrollTimeout = setTimeout(function () {
+                                    var scrollTopYearRounded = customRound(yearsScrollTop);
+
+                                    if (yearsScrollTop !== scrollTopYearRounded) {
+                                        years.scrollTop(scrollTopYearRounded);
+                                    }
+                                },
+                                    250);
+
+                                var containerId = $(this).attr('id');
+
+                                if (containerId === 'years') {
+                                    selectedYear = selectedValueYear;
+
+                                    index = middleYearIndexArray.indexOf(Number(selectedValueYear));
+                                    middleYearIndex = index;
+                                }
+
+                                if (selectedYear) {
+                                    var formattedDate = selectedYear;
+                                    datepicker.val(formattedDate);
+                                    $('#sendDropdownYearMobile').val(formattedDate);
+                                    $('#yearText').text(selectedYear);
+                                }
+                            });
+
+                        $(document).on('click',
+                            '#confirmYear',
+                            function (event) {
+                                $('#sendDropdownYearMobile').val(selectedYear);
+                                $('#yearText').text(selectedYear);
+                                datepickerContainer.remove();
+                                $('#overlaySearchAdvance').removeClass("overlaySearchAdvance");
+                            });
+
+                        $(document).on('click',
+                            '#cancelYear',
+                            function (event) {
+                                $('#sendDropdownYearMobile').val('');
+                                $('#yearText').text('سال');
+                                middleYearIndex = 2;
+                                datepickerContainer.remove();
+                                $('#overlaySearchAdvance').removeClass("overlaySearchAdvance");
+                            });
+
+                        $(document).on('click',
+                            '.chosen-date',
+                            function () {
+                                // if (selectedYear == 0) {
+                                //     $('#yearModal').val($(this).text());
+                                //     console.log(selectedYear)
+                                //     $('#yearText').text($(this).text());
+                                // } else {
+                                $('#sendDropdownYearMobile').val(selectedYear);
+                                $('#yearText').text(selectedYear);
+                                // }
+                                $('#overlaySearchAdvance').removeClass("overlaySearchAdvance");
+                                datepickerContainer.remove();
+                            });
+                    });
+                //************* End Year *************
+
+
+                //************* Month *************
+                $('.persianDateInputMonth').on('click',
+                    function () {
+                        $('#overlaySearchAdvance').addClass("overlaySearchAdvance");
+
+                        var datepicker = $(this);
+                        if ($(this).parent().find('.datepicker-container-month').length) {
+                            return false;
+                        } else {
+                            $(this).parent().append(`
+                                                    <div class="datepicker-container-month">
+                                                        <div class="datepicker-container-date-div">
+                                                            <div class="date-container">
+                                                                <div id="months" class="scrollable-container"></div>
+                                                            </div>
+                                                            <div class="d-flex justify-content-around">
+                                                                <button type="button" class="btn-secondary" id="cancelMonth" style="width:100px; font-size: 11px;">انصراف</button>
+                                                                <button type="button" class="btn-primary" id="confirmMonth" style="width:100px; font-size: 11px;">تائید</button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                `);
+                            if ($(this).val() != '') {
+                                let number = selectedMonth + 1;
+                                var middleMonthIndex = number;
+                            }
+                        }
+
+
+                        var datepickerContainer = $(this).parent().find('.datepicker-container-month');
+                        var months = datepickerContainer.find('#months');
+
+                        // Populate months
+                        var monthNames = ['-', 'فروردین', 'اردیبهشت', 'خرداد', 'تیر', 'مرداد', 'شهریور', 'مهر', 'آبان', 'آذر', 'دی', 'بهمن', 'اسفند', '-'];
+                        for (var j = 0; j < 14; j++) {
+                            var monthIndex = j;
+                            // var monthIndex = (j * 12) % 12;
+                            // var monthIndex = (j + i * 12) % 12;
+                            var monthName = monthNames[j];
+
+                            if (j == 0) {
+                                months.append($('<span>').text('-').css('visibility', 'hidden'));
+                                months.append($('<span>').text('-').css('visibility', 'hidden'));
+                            } else if (j == 13) {
+                                months.append($('<span>').text('-').css('visibility', 'hidden'));
+                                months.append($('<span>').text('-').css('visibility', 'hidden'));
+
+                            } else {
+                                months.append($('<span>').text(monthName));
+                            }
+
+                            // var middleMonthIndex = selectedMonth;
+                            // var middleMonthIndex = Math.floor(months.children('span').length / 2) - 17;
+                            months.children('span').eq(selectedMonth).addClass('chosen-date');
+
+                            var containerHeightMonth = months.height();
+                            var optionHeightMonth = months.children('span').outerHeight();
+                            var scrollOffsetMonth = optionHeightMonth * middleMonthIndex;
+                            months.scrollTop(scrollOffsetMonth - containerHeightMonth / 2);
+
+                        }
+
+                        var selectedMonthValue = "01";
+                        var selectedNumber = 2;
+                        var selectedMonthText = "فروردین";
+                        var monthScrollTop;
+                        var scrollTimeout;
+
+                        // Scroll event listener
+                        datepickerContainer.find('.scrollable-container').on('scroll',
+                            function () {
+
+                                var optionHeightMonth = months.children('span').outerHeight();
+                                var scrollTopMonth = Math.round((months.scrollTop() + (optionHeightMonth * 2)) / 10) * 10;
+                                var selectedIndexMonth = Math.round(scrollTopMonth / optionHeightMonth);
+                                months.children('span').removeClass('chosen-date');
+                                months.children('span').eq(selectedIndexMonth).addClass('chosen-date');
+                                monthScrollTop = months.scrollTop();
+                                var selectedValueMonth = months.children('span').eq(selectedIndexMonth).text();
+
+                                clearTimeout(scrollTimeout);
+                                scrollTimeout = setTimeout(function () {
+                                    var scrollTopMonthRounded = customRound(monthScrollTop);
+
+                                    if (monthScrollTop !== scrollTopMonthRounded) {
+                                        months.scrollTop(scrollTopMonthRounded);
+                                    }
+                                },
+                                    250);
+
+                                var containerId = $(this).attr('id');
+
+                                if (containerId === 'months') {
+                                    if (selectedValueMonth === 'فروردین') {
+                                        selectedMonthValue = '01';
+                                        selectedNumber = 1;
+                                        selectedMonthText = "فروردین";
+                                    } else if (selectedValueMonth === 'اردیبهشت') {
+                                        selectedMonthValue = '02';
+                                        selectedNumber = 2;
+                                        selectedMonthText = "اردیبهشت";
+                                    } else if (selectedValueMonth === 'خرداد') {
+                                        selectedMonthValue = '03';
+                                        selectedNumber = 3;
+                                        selectedMonthText = "خرداد";
+                                    } else if (selectedValueMonth === 'تیر') {
+                                        selectedMonthValue = '04';
+                                        selectedNumber = 4;
+                                        selectedMonthText = "تیر";
+                                    } else if (selectedValueMonth === 'مرداد') {
+                                        selectedMonthValue = '05';
+                                        selectedNumber = 5;
+                                        selectedMonthText = "مرداد";
+                                    } else if (selectedValueMonth === 'شهریور') {
+                                        selectedMonthValue = '06';
+                                        selectedNumber = 6;
+                                        selectedMonthText = "شهریور";
+                                    } else if (selectedValueMonth === 'مهر') {
+                                        selectedMonthValue = '07';
+                                        selectedNumber = 7;
+                                        selectedMonthText = "مهر";
+                                    } else if (selectedValueMonth === 'آبان') {
+                                        selectedMonthValue = '08';
+                                        selectedNumber = 8;
+                                        selectedMonthText = "آبان";
+                                    } else if (selectedValueMonth === 'آذر') {
+                                        selectedMonthValue = '09';
+                                        selectedNumber = 9;
+                                        selectedMonthText = "آذر";
+                                    } else if (selectedValueMonth === 'دی') {
+                                        selectedMonthValue = '10';
+                                        selectedNumber = 10;
+                                        selectedMonthText = "دی";
+                                    } else if (selectedValueMonth === 'بهمن') {
+                                        selectedMonthValue = '11';
+                                        selectedNumber = 11;
+                                        selectedMonthText = "بهمن";
+                                    } else if (selectedValueMonth === 'اسفند') {
+                                        selectedMonthValue = '12';
+                                        selectedNumber = 12;
+                                        selectedMonthText = "اسفند";
+                                    }
+                                }
+
+                                if (selectedMonthValue) {
+                                    var formattedDate = selectedMonthValue;
+                                    datepicker.val(formattedDate);
+                                    $('#month').val(formattedDate);
+                                    $('#monthText').text(selectedMonthText);
+                                    selectedMonth = selectedNumber;
+                                }
+                            });
+
+
+                        $(document).on('click',
+                            '#confirmMonth',
+                            function (event) {
+                                $('#sendDropdownMonthMobile').val(selectedMonthValue);
+                                $('#monthText').text(selectedMonthText);
+                                selectedMonth = selectedNumber;
+                                datepickerContainer.remove();
+                                $('#overlaySearchAdvance').removeClass("overlaySearchAdvance");
+                            });
+
+                        $(document).on('click',
+                            '#cancelMonth',
+                            function (event) {
+                                $('#sendDropdownMonthMobile').val('');
+                                $('#monthText').text('ماه');
+                                selectedMonth = 2;
+                                datepickerContainer.remove();
+                                $('#overlaySearchAdvance').removeClass("overlaySearchAdvance");
+                            });
+
+                        $(document).on('click',
+                            '.chosen-date',
+                            function () {
+                                $('#sendDropdownMonthMobile').val(selectedMonthValue);
+                                $('#monthText').text(selectedMonthText);
+                                selectedMonth = selectedNumber;
+                                $('#overlaySearchAdvance').removeClass("overlaySearchAdvance");
+                                datepickerContainer.remove();
+                            });
+                    });
+                //************* End Month *************
+
+                //Pixel of height for Span in date
+                //For example: datepicker-container-date .years span
+                function customRound(number) {
+                    var roundedNumber = Math.round(number);
+                    var remainder = roundedNumber % 60; //60px
+                    if (remainder <= 10) {
+                        return roundedNumber - remainder;
+                    } else {
+                        return roundedNumber + (60 - remainder);
+                    }
+                }
+            }
+            //******************** نمایش سال و ماه در موبایل ********************
+
     </script>
 }

ServiceHost/Areas/Client/Pages/Company/Reports/PrintAllCheckoutReport.cshtml

@@ -219,7 +219,7 @@
 
         @@media print {
             @@page {
-                size: landscape;
+                size: A4 landscape;
             }
 
             th, td {
@@ -989,13 +989,25 @@
 
 
 <script>
-    $(document).ready(function () {
+	$(document).ready(function() {
-        $('.loading').hide();
+		$('.loading').hide();
-    })
+	});
 
-    document.getElementById("btnPrint").onclick = function () {
+	if (window.matchMedia('(max-width: 767px)').matches) {
-        printElement(document.getElementById("printThis"));
+		$(document).ready(function() {
-    }
+			window.onbeforeprint = (event) => {
+				$("#MainModal").modal("hide");
+			}
+			document.getElementById("MainModal").style.visibility = "hidden";
+			setTimeout(function () {
+				printElement(document.getElementById("printThis")); 
+			},500);
+		});
+	} else {
+		document.getElementById("btnPrint").onclick = function () {
+			printElement(document.getElementById("printThis"));
+		}
+	}
 
     function printElement(elem) {
         var domClone = elem.cloneNode(true);

ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml

@@ -1,17 +1,17 @@
 @page
 @model ServiceHost.Areas.Client.Pages.Company.RollCall.EmployeeUploadPictureModel
-@using Version = _0_Framework.Application.Version
 @{
+	string clientVersion = _0_Framework.Application.Version.StyleVersion;
 	Layout = "Shared/_ClientLayout";
 	ViewData["title"] = " - آپلود عکس پرسنل";
 	int index = 1;
 }
 
 @section Styles {
-	<link href="~/AssetsClient/css/table-style.css?ver=?ver=@Version.StyleVersion" rel="stylesheet" />
+	<link href="~/AssetsClient/css/table-style.css?ver=?ver=@clientVersion" rel="stylesheet" />
-	<link href="~/AssetsClient/css/table-responsive.css?ver=@Version.StyleVersion" rel="stylesheet" />
+	<link href="~/AssetsClient/css/table-responsive.css?ver=@clientVersion" rel="stylesheet" />
-	<link href="~/assetsclient/css/operation-button.css?ver=@Version.StyleVersion" rel="stylesheet" />
+	<link href="~/assetsclient/css/operation-button.css?ver=@clientVersion" rel="stylesheet" />
-	<link href="~/assetsclient/css/rollcall-list.css?ver=@Version.StyleVersion" rel="stylesheet" />
+	<link href="~/assetsclient/css/rollcall-list.css?ver=@clientVersion" rel="stylesheet" />
 
 	<style>
 
@@ -143,7 +143,7 @@
 						<div id="loadingSkeleton" style="display: contents;">
 							@for (int j = 0; j < 30; j++)
 							{
-								<div class="skeleton-loader" style="margin: 2px 0; !important"></div>
+								<div class="skeleton-loader" style="margin: 2px 0 !important;"></div>
 							}
 						</div>
 
@@ -176,7 +176,7 @@
 <input type="hidden" asp-for="@Model.HasEmployees" value="@Model.HasEmployees" id="hasEmployee" />
 @section Script {
 	<script src="~/assetsadminnew/libs/sweetalert2/sweetalert2.all.min.js"></script>
-	<script src="~/assetsclient/js/site.js?ver=@Version.StyleVersion"></script>
+	<script src="~/assetsclient/js/site.js?ver=@clientVersion"></script>
 	<script>
 		var antiForgeryToken = $('@Html.AntiForgeryToken()').val();
 		var loadEmployeeUploadDataAjax = `@Url.Page("EmployeeUploadPicture", "EmployeeUploadDataAjax")`;
@@ -185,5 +185,5 @@
 		var deActivePersonnelAjax = `@Url.Page("./EmployeeUploadPicture", "DeActivePersonnel")`;
 		var activePersonnelAjax = `@Url.Page("./EmployeeUploadPicture", "ActivePersonnel")`;
 	</script>
-	<script src="~/assetsclient/pages/rollcall/js/employeeuploadpicture.js?ver=@Version.StyleVersion"></script>
+	<script src="~/assetsclient/pages/rollcall/js/employeeuploadpicture.js?ver=@clientVersion"></script>
 }

ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs

@@ -63,6 +63,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall
 				});
 
 				HasEmployees = distinctEmployees.Count > 0 ? true : false;
+
 				return Page();
 		    }
 		    else

ServiceHost/Areas/Client/Pages/Company/RollCall/ModalTakeImages.cshtml

@@ -1,7 +1,8 @@
 @model CompanyManagment.App.Contracts.Workshop.TakePictureModel
 @{
+	string clientVersion = _0_Framework.Application.Version.StyleVersion;
 	int index = 1;
-	<link href="~/assetsclient/pages/rollcall/css/modaltakeimages.css" rel="stylesheet" />
+	<link href="~/assetsclient/pages/rollcall/css/modaltakeimages.css?ver=@clientVersion" rel="stylesheet" />
 }
 
 <form role="form" method="post" name="create-form" id="create-form" autocomplete="off">
@@ -92,7 +93,11 @@
 									<div id="result1" style="margin-bottom: 5px;"></div>
 									<div id="result2" style="margin-bottom: 5px;"></div>
 									<div id="demoResult1" class="image-show">
-										<button type="button" class="upload-image1">بارگذاری عکس اول</button>
+										<button type="button" class="upload-image1">
+											<p class="textUpload @(Model.HasPicture ? "textUploaded" : "")">
+												@(Model.HasPicture ? "عکس اول" : "بارگذاری عکس اول")
+											</p>
+										</button>
 										@* <div class="loadingImage" id="loadingImage1">
 											<div class="spinner-border" role="status">
 												<span class="visually-hidden">Loading...</span>
@@ -104,7 +109,11 @@
 										}
 									</div>
 									<div id="demoResult2" class="image-show">
-										<button type="button" class="upload-image2">بارگذاری عکس دوم</button>
+										<button type="button" class="upload-image2">
+											<p class="textUpload @(Model.HasPicture ? "textUploaded" : "")">
+												@(Model.HasPicture ? "عکس دوم" : "بارگذاری عکس دوم")
+											</p>
+										</button>
 										@* <div class="loadingImage" id="loadingImage2">
 											<div class="spinner-border" role="status">
 												<span class="visually-hidden">Loading...</span>
@@ -112,7 +121,7 @@
 										</div> *@
 										@if (Model.HasPicture)
 										{
-											<img style="width: 100%; height: 100%; border-radius:10px;" id="pic2" data-uri="data:image/jpeg;base64,@Model.Pic2" src="data:image/jpeg;base64,@Model.Pic2" />
+											<img style="width: 100%; height: 100%; border-radius: 10px;" id="pic2" data-uri="data:image/jpeg;base64,@Model.Pic2" src="data:image/jpeg;base64,@Model.Pic2"/>
 										}
 									</div>
 									
@@ -215,10 +224,11 @@
 <script>
 	var antiForgeryToken = $('@Html.AntiForgeryToken()').val();
 	var takePictureAjax = `@Url.Page("./EmployeeUploadPicture", "TakePicture")`;
+	var hasPicture = `@(Model.HasPicture)` === "True" ? true : false;
 	var checkFace1 = `@(Model.HasPicture)` === "True" ? true : false;
 	var checkFace2 = `@(Model.HasPicture)` === "True" ? true : false;
 	var hasErrorPic1 = false;
 	var hasErrorPic2 = false;
 </script>
 <script src="~/weights/face-api.js"></script>
-<script src="~/assetsclient/pages/rollcall/js/modaltakeimages.js"></script>
+<script src="~/assetsclient/pages/rollcall/js/modaltakeimages.js?ver=@clientVersion"></script>

ServiceHost/Areas/Client/Pages/Company/Ticket/Index.cshtml.cs

@@ -38,15 +38,26 @@ namespace ServiceHost.Areas.Client.Pages.Company.Ticket
             _workshopApplication = workshopApplication;
         }
 
-        public void OnGet(TicketSearchModel searchModel)
+        public IActionResult OnGet(TicketSearchModel searchModel)
         {
-            HasListTickets = _ticketApplication.GetTicketsForClients(searchModel).Count > 0;
+            var workshopHash = User.FindFirstValue("WorkshopSlug");
-			//searchModel.PageIndex = 0;
+            var workshopId = _passwordHasher.SlugDecrypt(workshopHash);
-			//TicketList = _ticketApplication.GetTicketsForClients(searchModel);
+
-			//PageIndex = TicketList.Count;
+            if (workshopId > 0)
-			var workshopId = _passwordHasher.SlugDecrypt(User.FindFirstValue("WorkshopSlug"));
+            {
-            WorkshopFullName = _workshopApplication.GetDetails(workshopId).WorkshopFullName;
+                HasListTickets = _ticketApplication.GetTicketsForClients(searchModel).Count > 0;
-            TypesCountOfTicketViewModel = _ticketApplication.GetTypesCountOfTicketForClient(workshopId);
+                //searchModel.PageIndex = 0;
+                //TicketList = _ticketApplication.GetTicketsForClients(searchModel);
+                //PageIndex = TicketList.Count;
+
+                WorkshopFullName = _workshopApplication.GetDetails(workshopId).WorkshopFullName;
+                TypesCountOfTicketViewModel = _ticketApplication.GetTypesCountOfTicketForClient(workshopId);
+                return Page();
+            }
+            else
+            {
+                return NotFound();
+            }
         }
 
         public IActionResult OnGetTicketDataAjax(int pageIndex, string status, string ticketNumber, string generalSearch)

ServiceHost/Areas/Client/Pages/Company/Workshop/Employees.cshtml.cs

@@ -4,9 +4,11 @@ using CompanyManagment.App.Contracts.Workshop;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using System.Security.Claims;
+using Microsoft.AspNetCore.Authorization;
 
 namespace ServiceHost.Areas.Client.Pages.Company.Workshop
 {
+	[Authorize]
     public class EmployeesModel : PageModel
     {
 		private readonly IPasswordHasher _passwordHasher;
@@ -28,46 +30,39 @@ namespace ServiceHost.Areas.Client.Pages.Company.Workshop
 
 		public void OnGet(EmployeeSearchModel searchModel)
         {
-			if (User.Identity.IsAuthenticated)
+			var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+			var id = _passwordHasher.SlugDecrypt(workshopSlugCliam);
+			if (id > 0)
 			{
-				var workshopSlugCliam = User.FindFirstValue("WorkshopSlug");
+				var workshop = _workshopApplication.GetWorkshopInfo(id);
-				var id = _passwordHasher.SlugDecrypt(workshopSlugCliam);
+				WorkshopFullName = workshop.WorkshopFullName;
-				if (id > 0)
+				WorkshopId = workshop.Id;
+
+				var personnelSearchModel = new PersonnelInfoSearchModel()
 				{
-					var workshop = _workshopApplication.GetWorkshopInfo(id);
+					WorkshopId = id,
-					WorkshopFullName = workshop.WorkshopFullName;
+				};
-					WorkshopId = workshop.Id;
 
-					var personnelSearchModel = new PersonnelInfoSearchModel()
+				var result = _workshopApplication.GetPersonnelInfo(personnelSearchModel);
-					{
-						WorkshopId = id,
-					};
 
-					var result = _workshopApplication.GetPersonnelInfo(personnelSearchModel);
+				var r = result.GroupBy(x => x.EmployeeId).Select(x => x.First()).ToList();
 
-					var r = result.GroupBy(x => x.EmployeeId).Select(x => x.First()).ToList();
+				if (!string.IsNullOrWhiteSpace(searchModel.EmployeeFullName))
+					r = r.Where(x => x.FullName.Contains(searchModel.EmployeeFullName)).ToList();
 
-					if (!string.IsNullOrWhiteSpace(searchModel.EmployeeFullName))
+				if (!string.IsNullOrWhiteSpace(searchModel.NationalCode))
-						r = r.Where(x => x.FullName.Contains(searchModel.EmployeeFullName)).ToList();
+					r = r.Where(x => x.NationalCode.Contains(searchModel.NationalCode)).ToList();
 
-					if (!string.IsNullOrWhiteSpace(searchModel.NationalCode))
+				Employees = new PersonnelInfoViewModel()
-						r = r.Where(x => x.NationalCode.Contains(searchModel.NationalCode)).ToList();
-
-					Employees = new PersonnelInfoViewModel()
-					{
-						PersonnelInfoViewModels = r.OrderBy(x => x.Black ? 1 : 0).ThenBy(x => x.PersonnelCode).ToList(),
-					};
-
-					HasEmployees = Employees.PersonnelInfoViewModels.Count > 0 ? true : false;
-				}
-				else
 				{
-					NotFound();
+					PersonnelInfoViewModels = r.OrderBy(x => x.Black ? 1 : 0).ThenBy(x => x.PersonnelCode).ToList(),
-				}
+				};
+
+				HasEmployees = Employees.PersonnelInfoViewModels.Count > 0 ? true : false;
 			}
 			else
 			{
-				BadRequest();
+				NotFound();
 			}
 		}
 

ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml

@@ -2,34 +2,12 @@
 @using CompanyManagment.App.Contracts.Workshop
 @using System.Security.Claims
 @inject _0_Framework.Application.IAuthHelper AuthHelper;
-@inject CompanyManagment.App.Contracts.Workshop.IWorkshopApplication _workshopApplication;
 @{
     var currentAccount = AuthHelper.CurrentAccountInfo();
-    var searchModel = new WorkshopSearchModel();
+    var workshopSelected = currentAccount.WorkshopList?.FirstOrDefault(x => x.Slug == User.FindFirstValue("WorkshopSlug"))?.Name;
-    var workshopList = _workshopApplication.SearchForClient(searchModel).OrderByDescending(x => x.PersonnelCount).ToList();
-    var workshopSelected = "";
-
-    if (User.Identity.IsAuthenticated)
-    {
-        var workshopSlug = User.FindFirstValue("WorkshopSlug");
-
-        if (workshopSlug != null)
-        {
-            var selectedWorkshop = workshopList.FirstOrDefault(x => x.Slug == workshopSlug);
-            if (selectedWorkshop != null)
-            {
-                workshopSelected = selectedWorkshop.WorkshopFullName;
-            }
-        }
-        else if (workshopList.Any())
-        {
-            var firstWorkshop = workshopList.First();
-            AuthHelper.UpdateWorkshopSlugClaim(firstWorkshop.Slug);
-            workshopSelected = firstWorkshop.WorkshopFullName;
-        }
-    }
 }
 
+
 <div class="dropdown d-flex d-lg-none" style="padding: 0 !important;position: sticky;width: 100%;top: 0;z-index: 99;">
     <div class="workshop-box" style="width: 100%;">
         <button class="profile-box d-flex align-items-center justify-content-between" type="button" data-bs-toggle="dropdown" aria-expanded="false" style="width: 100%;padding: 8px;border-radius: 0px;">
@@ -49,21 +27,36 @@
         </button>
 
         <ul class="dropdown-menu" id="workshopLoad" style="position: absolute; inset: 0px auto auto 0px; margin: 0px; transform: translate(0px, 49px);border-radius: 0 0 25px 25px !important;">
-            @foreach (var workshopItem in workshopList)
+            @if (currentAccount.WorkshopList?.Count > 0)
             {
-                <li onclick="SelectWorkshop('@workshopItem.Slug')" class='@(workshopSelected == workshopItem.WorkshopFullName ? "workshopActive" : "")'>
+	            @foreach (var workshopItem in currentAccount.WorkshopList)
-                    <a class="dropdown-item w-100 selectLi" style="padding: 4px;">
+	            {
-                        <div class="d-flex align-items-center justify-content-between">
+		            <li onclick="SelectWorkshop('@workshopItem.Slug')" class='@(workshopSelected == workshopItem.Name ? "workshopActive" : "")'>
-                            <span>@workshopItem.WorkshopFullName</span>
+			            <a class="dropdown-item w-100 selectLi" style="padding: 4px;">
-                            <div class="d-flex align-items-center justify-content-start me-1">
+				            <div class="d-flex align-items-center justify-content-between">
-                                <span class="me-1">@workshopItem.PersonnelCount</span>
+					            <span>@workshopItem.Name</span>
-                                <i class="md md-group" style="font-size: 20px; color: #25acac; margin: 0 0 0 5px;"></i>
+					            <div class="d-flex align-items-center justify-content-start me-1">
-                            </div>
+						            <span class="me-1">@workshopItem.PersonnelCount</span>
-                        </div>
+						            <i class="md md-group" style="font-size: 20px; color: #25acac; margin: 0 0 0 5px;"></i>
-                    </a>
+					            </div>
-                </li>
+				            </div>
+			            </a>
+		            </li>
+	            }
             }
+            else
+            {
+	            <li>
+		            <a class="dropdown-item w-100 selectLi" style="padding: 4px;">
+			            <div class="d-flex align-items-center justify-content-between">
+				            <span>بدون کارگاه</span>
+			            </div>
+		            </a>
+	            </li>
+            }
+	        
         </ul>
+
     </div>
 </div>
 
@@ -123,22 +116,36 @@
 			           </svg>
 		           </button>
 
-		           <ul class="dropdown-menu" id="workshopLoad">
+                   <ul class="dropdown-menu" id="workshopLoad">
-			           @foreach (var workshopItem in workshopList)
+                       @if (currentAccount.WorkshopList?.Count > 0)
-			           {
+                       {
-				           <li onclick="SelectWorkshop('@workshopItem.Slug')" class='@(workshopSelected == workshopItem.WorkshopFullName ? "workshopActive" : "")'>
+                           @foreach (var workshopItem in currentAccount.WorkshopList)
-					           <a class="dropdown-item w-100 selectLi" style="padding: 4px;">
+                           {
-						           <div class="d-flex align-items-center justify-content-between">
+                               <li onclick="SelectWorkshop('@workshopItem.Slug')" class='@(workshopSelected == workshopItem.Name ? "workshopActive" : "")'>
-							           <span>@workshopItem.WorkshopFullName</span>
+                                   <a class="dropdown-item w-100 selectLi" style="padding: 4px;">
-							           <div class="d-flex align-items-center justify-content-start me-1">
+                                       <div class="d-flex align-items-center justify-content-between">
-								           <span class="me-1">@workshopItem.PersonnelCount</span>
+                                           <span>@workshopItem.Name</span>
-								           <i class="md md-group" style="font-size: 20px; color: #25acac; margin: 0 0 0 5px;"></i>
+                                           <div class="d-flex align-items-center justify-content-start me-1">
-							           </div>
+                                               <span class="me-1">@workshopItem.PersonnelCount</span>
-						           </div>
+                                               <i class="md md-group" style="font-size: 20px; color: #25acac; margin: 0 0 0 5px;"></i>
-					           </a>
+                                           </div>
-				           </li>
+                                       </div>
-			           }
+                                   </a>
-		           </ul>
+                               </li>
+                           }
+                       }
+                       else
+                       {
+                           <li>
+                               <a class="dropdown-item w-100 selectLi" style="padding: 4px;">
+                                   <div class="d-flex align-items-center justify-content-between">
+                                       <span>بدون کارگاه</span>
+                                   </div>
+                               </a>
+                           </li>
+                       }
+                   </ul>
+
 	           </div>
 
            </div>

ServiceHost/Pages/Index.cshtml

@@ -25,18 +25,18 @@
           "logo": "https://gozareshgir.ir"
         }
     </script>
-    <script src="https://www.google.com/recaptcha/api.js?hl=fa&render=6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH"></script>
+  @*   <script src="https://www.google.com/recaptcha/api.js?hl=fa&render=6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH"></script> *@
 
 }
 @* <input type="hidden" name="CaptchaRes" id="captchaRes" value="" /> *@
-<script>
+@* <script>
                             window.grecaptcha.ready(function () {
                                 window.grecaptcha.execute('6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH',
                                 { action: 'submit' }).then(function (response) {
                                    $('#captchaResult').val(response);
                                 });
                             });
-                        </script>
+                        </script> *@
 <div class="container-fluid">
     <div class="row">
 
@@ -178,7 +178,7 @@
                             </div>
                         </button>
 
-                        <button class="btn-login w-100" style="display: none" onclick="confirmCodeToLogin()" id="btn-login-code">
+                        <button  class="btn-login w-100" style="display: none" onclick="confirmCodeToLogin()" id="btn-login-code">
                             <div class="d-flex justify-content-center align-items-center">
                                 <span class="py-1">ورود</span>
                                 <div class="text-center loading ms-2" style="display: none;">
@@ -709,7 +709,14 @@
             }
         }
         //******************** عملیات ورود با موبایل و دریافت کد ********************
+        $("#btn-login").on("click", function () {
+            const username = $("#username").val();
+            const password = $("#password").val();
 
+            Android.saveCredentials(username, password);
+
+
+        });
     </script>
 }
 

ServiceHost/Pages/Index.cshtml.cs

@@ -89,8 +89,8 @@ namespace ServiceHost.Pages
         {
 
             bool captchaResult = true;
-			if (!_webHostEnvironment.IsDevelopment())
+			//if (!_webHostEnvironment.IsDevelopment())
-				captchaResult = _googleRecaptcha.IsSatisfy(CaptchaResponse).Result;
+			//	captchaResult = _googleRecaptcha.IsSatisfy(CaptchaResponse).Result;
             
            
             if (captchaResult)

ServiceHost/Properties/launchSettings.json

@@ -19,8 +19,8 @@
       "sqlDebugging": true,
       "dotnetRunMessages": "true",
       "nativeDebugging": true,
-      //"applicationUrl": "https://localhost:5004;http://localhost:5003;http://192.168.0.118:82;https://192.168.0.118:83",
+      "applicationUrl": "https://localhost:5004;http://localhost:5003;",
-      "applicationUrl": "https://localhost:5004;http://localhost:5003",
+      //"applicationUrl": "https://localhost:5004;http://localhost:5003;http://192.168.0.118:82;https://192.168.0.118:83;",
       "jsWebView2Debugging": false,
       "hotReloadEnabled": true
     },

ServiceHost/appsettings.Development.json

@@ -12,7 +12,7 @@
     //"MesbahDb": "Data Source=DESKTOP-NUE119G\\MSNEW;Initial Catalog=Mesbah_db;Integrated Security=True"
     
     //server
-    //"MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;"
+   // "MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;"
    
     //local
    "MesbahDb": "Data Source=.;Initial Catalog=Mesbah_db;Integrated Security=True;TrustServerCertificate=true;"

ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/DetailModal.css

@@ -49,19 +49,29 @@
 
 .taskTitle {
     color: #FFFFFF;
-    font-size: 12px;
+    font-size: 11px;
     font-weight: 500;
+    margin: auto auto 0;
 }
 
 .taskTitleSub {
     color: #000000;
-    font-size: 12px;
+    font-size: 11px;
     background-color: #ffffff;
     border-radius: 5px;
     font-weight: 500;
-    /*width: 65%;*/
+    /* width: 65%; */
     display: inline-block;
     padding: 3px 6px;
+    overflow-x: scroll;
+    white-space: nowrap;
+    height: 22px;
+    display: flex;
+    align-items: center;
+}
+
+.taskTitleSub::-webkit-scrollbar {
+    display: none;
 }
 
 .taskDesc {
@@ -72,7 +82,7 @@
     background-color: #ffffff;
     padding: 3px 6px;
     border-radius: 5px;
-    height: 90px;
+    height: 75px;
     overflow: auto;
 }
 
@@ -401,17 +411,18 @@
     grid-template-columns: repeat(1, minmax(0, 1fr));
 }
 
-.assigns_section .btnAssignList {
+    .assigns_section .btnAssignList {
-    background: #F0F0F0;
+        background: #F0F0F0;
-    width: 100%;
+        width: 100%;
-    margin: 3px 0;
+        margin: 3px 0;
-    padding: 8px 14px;
+        padding: 8px 14px;
-    text-align: right;
+        text-align: right;
-    font-size: 14px;
+        font-size: 14px;
-    display: flex;
+        display: flex;
-    align-items: center;
+        align-items: center;
-    justify-content: space-between;
+        justify-content: space-between;
-}
+        border: 2px solid transparent;
+    }
 
 .assigns_section .btnAssignList.active {
     border: 2px solid #29D0D0;
@@ -440,9 +451,6 @@
     /*border: 1px solid #EBEBEB;*/
     border-radius: 5px;
     position: relative;
-    height: 580px;
-    overflow-y: scroll;
-    scrollbar-width: thin;
 }
 
 .chat-section .chat-card-main {
@@ -454,6 +462,16 @@
     font-size: 14px;
 }
 
+.modal-title {
+    font-size: 14px;
+}
+
+.mainChat {
+    height: 510px;
+    overflow-y: scroll;
+    scrollbar-width: thin;
+}
+
 #ajaxChatSection {
     display: grid;
     gap: 6px;
@@ -636,6 +654,10 @@
     background: #ffdede;
 }
 
+.form-control {
+    margin: 0;
+}
+
 @media (max-width: 1366px) {
 
     .modal-xl-DetailModal {
@@ -646,8 +668,26 @@
         /*width: 820px;*/
     }
 
-    .chat-section {
+    .modal-title {
-        height: 400px;
+        font-size: 12px;
+    }
+
+    .taskTitle {
+        font-size: 10px;
+        font-weight: 600;
+    }
+
+    .taskTitleSub {
+        font-size: 10px;
+        font-weight: 600;
+    }
+
+    .taskDesc {
+        font-size: 11px;
+    }
+
+    .mainChat {
+        height: 220px;
     }
     .actionBtnsection .actionBtn {
         font-size: 10px;
@@ -688,13 +728,18 @@
         max-width: auto;
     }
 
+    .modal-title {
+        font-size: 10px;
+    }
+
     .modal-content {
         /*width: 700px;*/
         height: auto;
     }
 
-    .chat-section {
+    .mainChat {
-        height: 350px;
+        height: 100%;
+
     }
 
     .assigns_section .btnAssignList {
@@ -710,13 +755,39 @@
 
 
 @media (max-width: 768px) {
+    .modal-content {
+        height: 100vh; /* Full screen */
+        max-height: 94vh;
+        /*overflow-y: auto;*/
+    }
+
+    .modal-body {
+        max-height: calc(100vh - 100px); /* Subtracting space for header and footer */
+        /*overflow-y: auto;*/
+    }
+
+    .modal-header .btn-close {
+        right: 4px;
+    }
+
     .assigns_section {
         display: flex;
         align-items: center;
         gap: 3px;
         overflow-x: scroll;
+        scrollbar-width: thin;
     }
+
     .assigns_section .btnAssignList {
         white-space: nowrap;
     }
+    .admincardActionSection .admincardAction .btn-section .btn-submit,
+    .admincardActionSection .admincardAction .btn-section .btn-reject {
+        font-size: 9px;
+        font-weight: 600;
+    }
+    #ajaxChatSection .chat-card-receiver,
+    #ajaxChatSection .chat-card-sender {
+        width: 85%;
+    }
 }

ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/DiagramTaskModal.css

@@ -1,5 +1,13 @@
 .boxShadowDiagram {
-
+    background-color: #eef3f3;
+    background-image: url("data:image/svg+xml,%3Csvg width='20' height='20' viewBox='0 0 20 20' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='%23e8eef0' fill-opacity='0.67' fill-rule='evenodd'%3E%3Ccircle cx='3' cy='3' r='3'/%3E%3Ccircle cx='13' cy='13' r='3'/%3E%3C/g%3E%3C/svg%3E");
+    border-radius: 10px;
+    border: 1px solid #cccccc;
+    max-height: 100%;
+    position: relative;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
 }
 
 .infoTxt1,
@@ -64,12 +72,29 @@
 }
 
 .tree-section {
-    overflow: hidden;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    overflow: auto; /* Ensures overflow is scrollable if content is too wide */
+    max-width: 100%; /* Prevents horizontal overflow */
+    max-height: 100%; /* Prevents vertical overflow */
+}
+
+#canvas-wrapper {
+    width: 100%;
+    height: 100%;
+    overflow: hidden; /* Prevent overflowing */
+    position: relative;
+    cursor: grab;
 }
 
 #tree {
-    display: inline-block;
+    position: absolute;
-    padding: 10px;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%) scale(1); /* Center and default scale */
+    transform-origin: center center; /* Ensure scaling happens from the center */
+    transition: transform 0.3s ease; /* Smooth transitions for zooming */
 }
 
 #tree * {
@@ -84,6 +109,13 @@
     margin-right: 170px;
 }
 
+
+#tree-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
 #tree .branch:not(:first-child):after {
     content: "";
     width: 20px;
@@ -191,3 +223,28 @@
     border-color: #a6a6a6;
 }
 
+
+/* Disable selection during drag */
+#canvas-wrapper.dragging {
+    cursor: grabbing;
+    user-select: none;
+}
+
+/* Responsive scaling */
+@media screen and (max-width: 1200px) {
+    #tree {
+        transform: translate(-50%, -50%) scale(0.8);
+    }
+}
+
+@media screen and (max-width: 900px) {
+    #tree {
+        transform: translate(-50%, -50%) scale(0.6);
+    }
+}
+
+@media screen and (max-width: 600px) {
+    #tree {
+        transform: translate(-50%, -50%) scale(0.5);
+    }
+}

ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/task-manager-list.css

@@ -698,10 +698,8 @@
     border: 1px solid transparent;
     width: 30px;
     height: 30px;
-    border-radius: 5px;
     padding: 3px 1px;
-    color: $ffffff;
+    color: #ffffff;
-    margin: auto 4px auto 1px;
     background: rgba(209, 50, 50, 0.15);
     transition: ease .2s;
 }

ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/DetailModal.js

@@ -10,56 +10,96 @@ $(document).ready(function () {
         $(this).addClass('active');
     });
 
+    //$('.actionBtn').click(function () {
+    //    $('.actionBtn').removeClass('active');
+    //    $('#save').removeClass('disable');
+    //    $(this).addClass('active');
+
+    //    $('#save').removeClass('disable');
+    //    $(this).addClass('active');
+
+    //    $('.input-form').show();
+
+    //    switch ($(this).attr('id')) {
+    //        case "deadlineBtn":
+    //            $('.select-time-section').show();
+    //            $('#select2MemberList').hide();
+    //            $('.textarea-col').removeClass('col-12').addClass('col-8');
+    //            $('#save').attr('onclick', 'handleDeadlineClick()');
+    //            break;
+    //        case "notPossibleBtn":
+    //            $('.select-time-section').hide();
+    //            $('#select2MemberList').hide();
+    //            $('.textarea-col').removeClass('col-8').addClass('col-12');
+    //            $('#save').attr('onclick', 'handleNotPossibleClick()');
+    //            break;
+    //        case "doneBtn":
+    //            $('.select-time-section').hide();
+    //            $('#select2MemberList').hide();
+    //            $('.textarea-col').removeClass('col-8').addClass('col-12');
+    //            $('#save').attr('onclick', 'handleDoneClick()');
+    //            break;
+    //        case "AssignBtn":
+    //            $('#Desc-Time-Area').hide();
+    //            $('.select-time-section').hide();
+    //            $('#select2MemberList').show();
+    //            $('.textarea-col').removeClass('col-8').addClass('col-12');
+    //            $('#save').attr('onclick', 'handleAssignClick   ()');
+    //    }
+
+    //    // if ($(this).attr('id') === "deadlineBtn") {
+    //    //     $('.select-time-section').show();
+    //    //     $('.textarea-col').removeClass('col-12').addClass('col-8');
+    //    //     $('#save').attr('onclick', 'handleDeadlineClick()');
+    //    // } else if ($(this).attr('id') === "notPossibleBtn") {
+    //    //     $('.select-time-section').hide();
+    //    //     $('.textarea-col').removeClass('col-8').addClass('col-12');
+    //    //     $('#save').attr('onclick', 'handleNotPossibleClick()');
+    //    // } else if ($(this).attr('id') === "doneBtn") {
+    //    //     $('.select-time-section').hide();
+    //    //     $('.textarea-col').removeClass('col-8').addClass('col-12');
+    //    //     $('#save').attr('onclick', 'handleDoneClick()');
+    //    // }
+    //});
+
     $('.actionBtn').click(function () {
+        var isActive = $(this).hasClass('active');
+
         $('.actionBtn').removeClass('active');
         $('#save').removeClass('disable');
-        $(this).addClass('active');
+        $('.input-form').hide();
+        $('.select-time-section').hide();
+        $('#select2MemberList').hide();
+        $('.textarea-col').removeClass('col-8').addClass('col-12');
 
-        $('#save').removeClass('disable');
+        if (!isActive) {
-        $(this).addClass('active');
+            $(this).addClass('active');
+            $('.input-form').show();
 
-        $('.input-form').show();
+            switch ($(this).attr('id')) {
-
-        switch ($(this).attr('id')) {
             case "deadlineBtn":
                 $('.select-time-section').show();
-                $('#select2MemberList').hide();
                 $('.textarea-col').removeClass('col-12').addClass('col-8');
                 $('#save').attr('onclick', 'handleDeadlineClick()');
                 break;
             case "notPossibleBtn":
-                $('.select-time-section').hide();
-                $('#select2MemberList').hide();
                 $('.textarea-col').removeClass('col-8').addClass('col-12');
                 $('#save').attr('onclick', 'handleNotPossibleClick()');
                 break;
             case "doneBtn":
-                $('.select-time-section').hide();
-                $('#select2MemberList').hide();
                 $('.textarea-col').removeClass('col-8').addClass('col-12');
                 $('#save').attr('onclick', 'handleDoneClick()');
                 break;
             case "AssignBtn":
                 $('#Desc-Time-Area').hide();
-                $('.select-time-section').hide();
                 $('#select2MemberList').show();
                 $('.textarea-col').removeClass('col-8').addClass('col-12');
-                $('#save').attr('onclick', 'handleAssignClick   ()');
+                $('#save').attr('onclick', 'handleAssignClick()');
+            }
+        } else {
+            $(this).removeClass('active');
+            $('.input-form').hide();
         }
-
-        // if ($(this).attr('id') === "deadlineBtn") {
-        //     $('.select-time-section').show();
-        //     $('.textarea-col').removeClass('col-12').addClass('col-8');
-        //     $('#save').attr('onclick', 'handleDeadlineClick()');
-        // } else if ($(this).attr('id') === "notPossibleBtn") {
-        //     $('.select-time-section').hide();
-        //     $('.textarea-col').removeClass('col-8').addClass('col-12');
-        //     $('#save').attr('onclick', 'handleNotPossibleClick()');
-        // } else if ($(this).attr('id') === "doneBtn") {
-        //     $('.select-time-section').hide();
-        //     $('.textarea-col').removeClass('col-8').addClass('col-12');
-        //     $('#save').attr('onclick', 'handleDoneClick()');
-        // }
     });
 
     $('.select2Member').select2({
@@ -99,12 +139,14 @@ $(document).ready(function () {
     }).mask("0000/00/00");
 
     setTimeout(function () {
-        $('.chat-section').animate({
+        $('.modal-body').animate({
-            scrollTop: $('.chat-section').get(0).scrollHeight
+            scrollTop: $('.modal-body').get(0).scrollHeight
         }, 1200);
     }, 900);
 });
 
+
+
 function updateDateInput(daysToAdd) {
     var today = new Date();
     today.setDate(today.getDate() + daysToAdd);
@@ -224,7 +266,10 @@ function saveAjax(url, data) {
                 setTimeout(function () {
                     $('.alert-success-msg').hide();
                     $('.alert-success-msg p').text('');
-                    document.location.reload();
+                    // document.location.reload();
+                    $(`.section-btns-task button.active`).click();
+
+                    $('#MainModal').modal('toggle');
                 }, 1500);
 
 
@@ -362,6 +407,26 @@ function loadChatMessage(id) {
 							</div>
                         `;
                 }
+
+                if (Number(UserId) !== item.receiverId && Number(UserId) !== item.senderId) {
+                    html += `
+                             <div class="chat-card-${i % 2 === 0 ? `receiver` : `sender`} ${color}" style="">
+                                 <h6 class="m-0" style="padding:0 0 0 0;">
+                                    ${item.senderName}
+                                 </h6>
+								 <p class="mb-0 mt-2" style="word-break: break-word; padding:0 0 0 0;">
+								     ${item.message}
+								 </p>
+								 <p class="date-time pt-3 m-0" style="padding:0 0 0 0;">${item.creationDate}</p>
+								 <div class="chat-tag" style="left: 0;right: auto;">
+								     <span>
+								         ${textType}
+								     </span>
+								 </div>
+							 </div>
+                        `;
+                }
+
             });
 
             $('#ajaxChatSection').append(html);

ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/DetailModalSender.js

@@ -10,56 +10,96 @@ $(document).ready(function () {
         $(this).addClass('active');
     });
 
+    //$('.actionBtn').click(function () {
+    //    $('.actionBtn').removeClass('active');
+    //    $('#save').removeClass('disable');
+    //    $(this).addClass('active');
+
+    //    $('#save').removeClass('disable');
+    //    $(this).addClass('active');
+
+    //    $('.input-form').show();
+
+    //    switch ($(this).attr('id')) {
+    //        case "deadlineBtn":
+    //            $('.select-time-section').show();
+    //            $('#select2MemberList').hide();
+    //            $('.textarea-col').removeClass('col-12').addClass('col-8');
+    //            $('#save').attr('onclick', 'handleDeadlineClick()');
+    //            break;
+    //        case "notPossibleBtn":
+    //            $('.select-time-section').hide();
+    //            $('#select2MemberList').hide();
+    //            $('.textarea-col').removeClass('col-8').addClass('col-12');
+    //            $('#save').attr('onclick', 'handleNotPossibleClick()');
+    //            break;
+    //        case "doneBtn":
+    //            $('.select-time-section').hide();
+    //            $('#select2MemberList').hide();
+    //            $('.textarea-col').removeClass('col-8').addClass('col-12');
+    //            $('#save').attr('onclick', 'handleDoneClick()');
+    //            break;
+    //        case "AssignBtn":
+    //            $('#Desc-Time-Area').hide();
+    //            $('.select-time-section').hide();
+    //            $('#select2MemberList').show();
+    //            $('.textarea-col').removeClass('col-8').addClass('col-12');
+    //            $('#save').attr('onclick', 'handleAssignClick   ()');
+    //    }
+
+    //    // if ($(this).attr('id') === "deadlineBtn") {
+    //    //     $('.select-time-section').show();
+    //    //     $('.textarea-col').removeClass('col-12').addClass('col-8');
+    //    //     $('#save').attr('onclick', 'handleDeadlineClick()');
+    //    // } else if ($(this).attr('id') === "notPossibleBtn") {
+    //    //     $('.select-time-section').hide();
+    //    //     $('.textarea-col').removeClass('col-8').addClass('col-12');
+    //    //     $('#save').attr('onclick', 'handleNotPossibleClick()');
+    //    // } else if ($(this).attr('id') === "doneBtn") {
+    //    //     $('.select-time-section').hide();
+    //    //     $('.textarea-col').removeClass('col-8').addClass('col-12');
+    //    //     $('#save').attr('onclick', 'handleDoneClick()');
+    //    // }
+    //});
+
     $('.actionBtn').click(function () {
+        var isActive = $(this).hasClass('active');
+
         $('.actionBtn').removeClass('active');
         $('#save').removeClass('disable');
-        $(this).addClass('active');
+        $('.input-form').hide();
+        $('.select-time-section').hide();
+        $('#select2MemberList').hide();
+        $('.textarea-col').removeClass('col-8').addClass('col-12');
 
-        $('#save').removeClass('disable');
+        if (!isActive) {
-        $(this).addClass('active');
+            $(this).addClass('active');
+            $('.input-form').show();
 
-        $('.input-form').show();
+            switch ($(this).attr('id')) {
-
-        switch ($(this).attr('id')) {
             case "deadlineBtn":
                 $('.select-time-section').show();
-                $('#select2MemberList').hide();
                 $('.textarea-col').removeClass('col-12').addClass('col-8');
                 $('#save').attr('onclick', 'handleDeadlineClick()');
                 break;
             case "notPossibleBtn":
-                $('.select-time-section').hide();
-                $('#select2MemberList').hide();
                 $('.textarea-col').removeClass('col-8').addClass('col-12');
                 $('#save').attr('onclick', 'handleNotPossibleClick()');
                 break;
             case "doneBtn":
-                $('.select-time-section').hide();
-                $('#select2MemberList').hide();
                 $('.textarea-col').removeClass('col-8').addClass('col-12');
                 $('#save').attr('onclick', 'handleDoneClick()');
                 break;
             case "AssignBtn":
                 $('#Desc-Time-Area').hide();
-                $('.select-time-section').hide();
                 $('#select2MemberList').show();
                 $('.textarea-col').removeClass('col-8').addClass('col-12');
-                $('#save').attr('onclick', 'handleAssignClick   ()');
+                $('#save').attr('onclick', 'handleAssignClick()');
+            }
+        } else {
+            $(this).removeClass('active');
+            $('.input-form').hide();
         }
-
-        // if ($(this).attr('id') === "deadlineBtn") {
-        //     $('.select-time-section').show();
-        //     $('.textarea-col').removeClass('col-12').addClass('col-8');
-        //     $('#save').attr('onclick', 'handleDeadlineClick()');
-        // } else if ($(this).attr('id') === "notPossibleBtn") {
-        //     $('.select-time-section').hide();
-        //     $('.textarea-col').removeClass('col-8').addClass('col-12');
-        //     $('#save').attr('onclick', 'handleNotPossibleClick()');
-        // } else if ($(this).attr('id') === "doneBtn") {
-        //     $('.select-time-section').hide();
-        //     $('.textarea-col').removeClass('col-8').addClass('col-12');
-        //     $('#save').attr('onclick', 'handleDoneClick()');
-        // }
     });
 
     $('.select2Member').select2({
@@ -99,8 +139,8 @@ $(document).ready(function () {
     }).mask("0000/00/00");
 
     setTimeout(function () {
-        $('.chat-section').animate({
+        $('.modal-body').animate({
-            scrollTop: $('.chat-section').get(0).scrollHeight
+            scrollTop: $('.modal-body').get(0).scrollHeight
         }, 1200);
     }, 900);
 });
@@ -224,7 +264,11 @@ function saveAjax(url, data) {
                 setTimeout(function () {
                     $('.alert-success-msg').hide();
                     $('.alert-success-msg p').text('');
-                    document.location.reload();
+                    //document.location.reload();
+                    $(`.section-btns-task button.active`).click();
+
+
+                    $('#MainModal').modal('toggle');
                 }, 1500);
 
 

ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/DiagramTaskModal.js

@@ -121,4 +121,57 @@ $(document).ready(function () {
 
     const diagramContainer = document.getElementById('tree-container');
     renderTree(treeData, diagramContainer);
+
+
+
+    const canvasWrapper = document.getElementById("canvas-wrapper");
+    const tree = document.getElementById("tree");
+    let isDragging = false;
+    let startX, startY;
+    let translateX = -50, translateY = -50;
+    let scale = 1;
+    let dragSensitivity = 0.4;
+
+    canvasWrapper.addEventListener("mousedown", (e) => {
+        isDragging = true;
+        startX = e.clientX;
+        startY = e.clientY;
+        canvasWrapper.classList.add("dragging");
+    });
+
+    canvasWrapper.addEventListener("mousemove", (e) => {
+        if (!isDragging) return;
+
+        const dx = (e.clientX - startX) * dragSensitivity / scale;
+        const dy = (e.clientY - startY) * dragSensitivity / scale;
+
+        translateX += dx;
+        translateY += dy;
+
+        tree.style.transform = `translate(${translateX}%, ${translateY}%) scale(${scale})`;
+
+        startX = e.clientX;
+        startY = e.clientY;
+    });
+
+    document.addEventListener("mouseup", () => {
+        isDragging = false;
+        canvasWrapper.classList.remove("dragging");
+    });
+
+    canvasWrapper.addEventListener("wheel", (e) => {
+        e.preventDefault();
+        const delta = e.deltaY > 0 ? -0.1 : 0.1;
+
+        scale = Math.min(Math.max(0.2, scale + delta), 3);
+
+        tree.style.transform = `translate(${translateX}%, ${translateY}%) scale(${scale})`;
+    });
 });
+
+
+
+
+
+
+

ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js

@@ -514,7 +514,7 @@ function loadMore(type) {
 
                         var successSend = item.status == "موفق" ? "successSend" : "";
 
-                        html += `<div class="Rtable-row align-items-center position-relative openAction tm-${item.color}" style="cursor: pointer;">
+                        html += `<div id="DivRtable_${item.id}" class="Rtable-row align-items-center position-relative openAction tm-${item.color}" style="cursor: pointer;">
 																		<div class="Rtable-cell d-md-block d-flex width1">
 																			<div class="Rtable-cell--content">
 																				<span class="d-flex justify-content-center span-number">
@@ -727,7 +727,7 @@ function loadMore(type) {
 
 
                                if (!item.isDone && !item.isCancel) {
-                                   html += `<div class="tm-${item.color}-operation operation-div w-100">
+                                   html += `<div id="OperationDiv_${item.id}" class="tm-${item.color}-operation operation-div w-100">
                         					<div class="operations-btns">
                         						<div class="row p-0">
                         							<div class="col-md-12 col-12 p-1">
@@ -1729,6 +1729,12 @@ $(document).ready(function () {
         dir: "rtl",
     });
 
+    $(".select2OptionMobile").select2({
+        language: "fa",
+        dir: "rtl",
+        dropdownParent: $('#searchModal'),
+    });
+
     function formatSelection(val) {
         return val.id;
     }

ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/OperationRequestModal.js

@@ -2,9 +2,13 @@
     if (btnAllRequestActive) {
         var firstButton = $('#btnAssignList').first();
         var firstDataId = firstButton.data('id');
-        setTimeout(function () {
+        setTimeout(function() {
             loadChatMessageRequest(Number(firstDataId));
         }, 1000);
+    } else {
+        setTimeout(function () {
+            loadAllRequest();
+        }, 1000);
     }
 
     $('.btnAssignList').click(function () {
@@ -16,7 +20,7 @@
         $(this).removeClass('error-valid');
     });
 
-    showAllRequestAction();
+    //showAllRequestAction();
 });
 
 $(".date").on('input', function () {
@@ -31,9 +35,106 @@ function showAllRequestAction() {
     $('#ajaxChatSection').html('');
     $('.admincardActionSection').addClass('position-relative');
     $('.admincardAction').show();
+    loadAllRequest();
+}
+
+function loadAllRequest() {
+    $('#LoadingCard').show();
+    $('#ajaxChatSection').html('');
+    var html = '';
+    $.ajax({
+        async: false,
+        contentType: 'charset=utf-8',
+        dataType: 'json',
+        type: 'GET',
+        url: loadOperationRequestTaskDetailsAjax,
+        data: { 'taskId': taskId },
+        headers: { "RequestVerificationToken": `${antiForgeryToken}` },
+        success: function(response) {
+            var assignViewModels = response.data.assignViewModels;
+
+            //var taskDetailsData = response.taskDetailsData;
+
+            html += `<div class="admincardActionSection position-relative">`;
+
+
+            if (assignViewModels.length > 0) {
+
+                assignViewModels.forEach(function(taskDetailsData) {
+                    var typeMessage = "";
+                    var color = "";
+                    if (taskDetailsData.isCanceledRequest) {
+                        typeMessage = "درخواست انصراف ";
+                        color = "red";
+                    } else if (taskDetailsData.timeRequest) {
+                        typeMessage = "درخواست مهلت ";
+                        color = "orange";
+                    } else if (taskDetailsData.isDoneRequest) {
+                        typeMessage = "درخواست انجام شد ";
+                        color = "green";
+                    }
+
+                    html += `
+                            <div class="admincardAction ${color}" id="Assign_${taskDetailsData.id}">
+                                <div class="row">
+                                    <div class="${taskDetailsData.timeRequest ? `col-6` : `col-9`}">
+                                        <p class="mb-1 m-0">${taskDetailsData.assignedName} ${typeMessage} از وظیفه داده است.</p>
+                                    </div>`;
+                                    if (taskDetailsData.timeRequest) {
+                                        html += `<div class="col-3">
+                                            <p class="mb-1 m-0 text-center">به تاریخ: ${taskDetailsData.requestDateFa}</p>
+                                        </div>`;
+                                    }
+                                    html += `</div>
+                                <div class="row align-items-center">
+                                    <div class="${taskDetailsData.timeRequest ? `col-6` : `col-9`} pe-1">
+                                        <textarea class="form-control" id="Description_${taskDetailsData.assignedId}" placeholder="توضیحات" style="height: 40px; resize: none"></textarea>
+                                    </div>`;
+                                    if (taskDetailsData.timeRequest) {
+                                        html += `<div class="col-3 px-0">
+                                            <input type="text" id="dateTime_${taskDetailsData.assignedId}" class="form-control text-center date" placeholder="تاریخ" style="height: 40px;"/>
+                                        </div>`;
+                                    }
+                                    html += `<div class="col-3 mt-1 ps-1">
+                                        <div class="btn-section gap-1">`;
+                                    var onclickReject = '';
+                                    var onclickAccept = '';
+
+                                    if (taskDetailsData.isCanceledRequest) {
+                                        onclickReject = `handleRejectCancel(${taskDetailsData.assignedId},${taskDetailsData.id})`;
+                                        onclickAccept = `handleAcceptCancel(${taskDetailsData.assignedId},${taskDetailsData.id})`;
+                                    }
+                                    else if (taskDetailsData.timeRequest) {
+                                        onclickReject = `handleRejectTimeRequest(${taskDetailsData.assignedId},${taskDetailsData.id})`;
+                                        onclickAccept = `handleAcceptTimeRequest(${taskDetailsData.assignedId},${taskDetailsData.id})`;
+                                    }
+                                    else if (taskDetailsData.isDoneRequest) {
+                                        onclickReject = `handleRejectComplete(${taskDetailsData.assignedId},${taskDetailsData.id})`;
+                                        onclickAccept = `handleAcceptComplete(${taskDetailsData.assignedId},${taskDetailsData.id})`;
+                                    }
+
+                                    html += `<button type="button" class="btn-submit" onclick="${onclickAccept}">تایید</button>
+											<button type="button" class="btn-reject" onclick="${onclickReject}">عدم تایید</button>
+										</div>
+									</div>
+								</div>
+							</div>`;
+
+                });
+
+            }
+
+            html += `</div>`;
+
+            $('#LoadingCard').hide();
+            $('#ajaxChatSection').append(html);
+        }
+    });
 }
 
 function loadChatMessageRequest(id) {
+    $('#LoadingCard').show();
+
     //$('.admincardActionSection').css('position', 'absolute');
 
     $('#AssignTaskName').text($(`#AssignedName_${id}`).text());
@@ -51,10 +152,10 @@ function loadChatMessageRequest(id) {
         dataType: 'json',
         type: 'GET',
         url: `${loadChatMessageAjax}`,
-        data: { 'assignId': Number(id) },
+        data: { 'assignId': Number(id), 'taskId': taskId },
         headers: { "RequestVerificationToken": `${antiForgeryToken}` },
         success: function (response) {
-            console.log(response);
+
             $.each(response.data, function (i, item) {
                 var color = "";
                 var textType = "";
@@ -105,8 +206,70 @@ function loadChatMessageRequest(id) {
 		                        <p class="m-0 mt-2" style="word-break: break-word; ${Number(UserId) === item.receiverId ? 'padding:0 20px 0 0;' : ''}">
 									${item.message}
 		                        </p>
-		                        <p class="date-time pt-3 m-0" style="word-break: break-word; ${Number(UserId) === item.receiverId ? 'padding:0 20px 0 0;' : ''}">${item.creationDate}</p>
+		                        <p class="date-time pt-3 m-0" style="word-break: break-word; ${Number(UserId) === item.receiverId ? 'padding:0 20px 0 0;' : ''}">${item.creationDate}</p>`;
-		                        <div class="chat-tag" style="${Number(UserId) === item.receiverId ? 'right: 0;left: auto;' : ''}">
+
+
+                    if (response.data.length === i + 1) {
+                        html += `<div class="admincardActionSection position-relative">`;
+                        var taskDetailsData = response.taskDetailsData;
+
+                        if (taskDetailsData != null) {
+
+                            var typeMessage = "";
+                            var color = "";
+                            if (taskDetailsData.isCanceledRequest) {
+                                typeMessage = "درخواست انصراف ";
+                                color = "#F87171";
+                            } else if (taskDetailsData.timeRequest) {
+                                typeMessage = "درخواست مهلت ";
+                                color = "#FBBF24";
+                            } else if (taskDetailsData.isDoneRequest) {
+                                typeMessage = "درخواست انجام شد ";
+                                color = "#84CC16";
+                            }
+
+                            html += `<div class="admincardAction" style="background: transparent; border: none;margin: 5px 12px 0 -6px;border-top: 1px solid ${color};border-radius: 0; padding: 7px 7px 3px;" id="Assign_${taskDetailsData.id}">
+								<div class="row align-items-center">
+									<div class="col-8 pe-1">
+										<textarea class="form-control" id="Description_${taskDetailsData.assignedId}" placeholder="توضیحات" style="height: ${taskDetailsData.timeRequest ? `53px` : `40px`}; resize: none"></textarea>
+									</div>`;
+
+                            html += `<div class="col-4 mt-1 ps-1">`;
+                            if (taskDetailsData.timeRequest) {
+                                html += `<div class="px-0">
+								        <input type="text" id="dateTime_${taskDetailsData.assignedId}" class="form-control text-center date mb-1" style="height: 25px;" placeholder="تاریخ" />
+							        </div>`;
+                            }
+                            html += `<div class="btn-section gap-1">`;
+                            var onclickReject = '';
+                            var onclickAccept = '';
+
+                            if (taskDetailsData.isCanceledRequest) {
+                                onclickReject = `handleRejectCancel(${taskDetailsData.assignedId},${taskDetailsData.id})`;
+                                onclickAccept = `handleAcceptCancel(${taskDetailsData.assignedId},${taskDetailsData.id})`;
+                            }
+                            else if (taskDetailsData.timeRequest) {
+                                onclickReject = `handleRejectTimeRequest(${taskDetailsData.assignedId},${taskDetailsData.id})`;
+                                onclickAccept = `handleAcceptTimeRequest(${taskDetailsData.assignedId},${taskDetailsData.id})`;
+                            }
+                            else if (taskDetailsData.isDoneRequest) {
+                                onclickReject = `handleRejectComplete(${taskDetailsData.assignedId},${taskDetailsData.id})`;
+                                onclickAccept = `handleAcceptComplete(${taskDetailsData.assignedId},${taskDetailsData.id})`;
+                            }
+
+                            html += `<button type="button" class="btn-submit" onclick="${onclickAccept}" style="height: 24px;">تایید</button>
+								<button type="button" class="btn-reject" onclick="${onclickReject}" style="height: 24px;">عدم تایید</button>
+										</div>
+									</div>
+								</div>
+							</div>`;
+                        }
+
+                        html += `</div>`;
+                    }
+
+
+                    html += `<div class="chat-tag" style="${Number(UserId) === item.receiverId ? 'right: 0;left: auto;' : ''}">
 		                            <span>
 		                                ${item.typeOfMessage}
 		                            </span>
@@ -128,8 +291,11 @@ function loadChatMessageRequest(id) {
 		                    </div>
 						`;
                 }
+
+
             });
 
+            $('#LoadingCard').hide();
             $('#ajaxChatSection').append(html);
 
         },
@@ -273,7 +439,8 @@ function saveRequestAjax(url, data, assignId) {
                else if (countAssign === 0) {
                     /*window.location.reload();*/
                     $('#MainModal').modal('toggle');
-                    $('#btnTaskRequest').click();
+                    //$('#btnTaskRequest').click();
+                    $(`.section-btns-task button.active`).click();
                     loadRequestCount();
                }
 

ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/create.js

@@ -680,13 +680,12 @@ function uploadFile(file, id, boxClass) {
     var xhr = new XMLHttpRequest();
     xhr.open('POST', uploadFileModalAjax, true);
     xhr.setRequestHeader('RequestVerificationToken', antiForgeryToken);
-    console.log(loading);
+
     xhr.upload.addEventListener('progress', function (e) {
         if (e.lengthComputable) {
             var percentComplete = (e.loaded / e.total) * 100;
             //$('#progressBar').text(Math.round(percentComplete) + '%');
             let h = Math.round(percentComplete);
-            console.log(h);
             loading.css('width', `${h}%`);
         }
     });

ServiceHost/wwwroot/AssetsClient/Workshop/js/employees.js

@@ -92,10 +92,8 @@
                 }
             });
 
-            console.log(idlist);
-
             var workshop_ID = Number(workshopId);
-            var goTo = `#showmodal=/Client/Company/Employees/Index?workshopID=${workshop_ID}&idlist=${idlist}&handler=PrintAllDetailsPersonnelInfoMobile`;
+            var goTo = `#showmodal=/Client/Company/Employees/Index?workshopID=${workshop_ID}&idlist=${idlistidlist}&handler=PrintAllDetailsPersonnelInfoMobile`;
             window.location.href = goTo;
         }
 		

ServiceHost/wwwroot/AssetsClient/css/dropdown.css

@@ -149,7 +149,7 @@ svg {
 }
 
 .dropdown {
-    padding: 0.5rem !important;
+    /*padding: 0.5rem !important;*/
 }
 
 .wrapper-dropdown .dropdown li:hover {

ServiceHost/wwwroot/AssetsClient/css/responsive.css

@@ -183,7 +183,7 @@
 
     .step-progress p {
         font-size: 11px;
-        font-weight: 200;
+        font-weight: 600;
     }
 
     .line {
@@ -1588,7 +1588,7 @@
     /* Progress Step */
     .step-progress p {
         font-size: 10px;
-        font-weight: 300;
+        font-weight: 500;
     }
 
     .line {

ServiceHost/wwwroot/AssetsClient/pages/Checkouts/js/PrintOneRollCall.js

@@ -1,20 +1,32 @@
 
+if (window.matchMedia('(max-width: 767px)').matches) {
+    $(document).ready(function() {
+        window.onbeforeprint = (event) => {
+            $("#MainModal").modal("hide");
+        }
+        document.getElementById("MainModal").style.visibility = "hidden";
+        setTimeout(function () {
+            printElement(document.getElementById("printThis")); 
+        },500);
+    });
+} else {
     document.getElementById("btnPrint").onclick = function () {
         printElement(document.getElementById("printThis"));
-    }  
-
-    function printElement(elem) {
-        var domClone = elem.cloneNode(true);
-
-        var $printSection = document.getElementById("printSection");
-
-        if (!$printSection) {
-            $printSection = document.createElement("div");
-            $printSection.id = "printSection";
-            document.body.appendChild($printSection);
-        }
-
-        $printSection.innerHTML = "";
-        $printSection.appendChild(domClone);
-        window.print();
     }
+}
+
+function printElement(elem) {
+    var domClone = elem.cloneNode(true);
+
+    var $printSection = document.getElementById("printSection");
+
+    if (!$printSection) {
+        $printSection = document.createElement("div");
+        $printSection.id = "printSection";
+        document.body.appendChild($printSection);
+    }
+
+    $printSection.innerHTML = "";
+    $printSection.appendChild(domClone);
+    window.print();
+}

ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/Group.css

@@ -0,0 +1,377 @@
+/* ----------------------------------------------------------------- table RollCall group 1 list */
+.table-rollcall-group1 .width1 {
+    width: 8% !important;
+}
+
+.table-rollcall-group1 .width2 {
+    width: 20% !important;
+}
+
+.table-rollcall-group1 .width3 {
+    width: 25% !important;
+}
+
+.table-rollcall-group1 .width4 {
+    width: 25% !important;
+}
+
+.table-rollcall-group1 .width5 {
+    width: 27% !important;
+}
+
+
+
+.infoGroupBox {
+    background-color: #ffffff;
+    justify-content: space-between;
+    display: flex;
+    align-items: center;
+    padding: 12px 16px;
+    border-radius: 10px;
+}
+
+.infoGroup1 {
+    font-size: 13px;
+    font-weight: 500;
+    color: #696969;
+}
+
+.infoGroup2 {
+    font-size: 13px;
+    font-weight: 500;
+    color: #65A30D;
+}
+
+.infoGroup3 {
+    font-size: 13px;
+    font-weight: 500;
+    color: #EF4444;
+}
+
+
+#loadAccountItems {
+    height: 620px;
+    background-color: #ffffff;
+    border-radius: 10px;
+    padding: 1px 6px;
+    outline: 2px solid #55D1D1;
+}
+
+.loadAccountItems .Rtable-cell--content {
+    color: #716969;
+    font-size: 13px;
+}
+
+
+.row-index1 {
+    background: #B5EDED;
+    color: #8C8C8C;
+    width: 35px;
+    height: 35px;
+    border-radius: 5px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 20px;
+}
+
+.row-index2 {
+    background: #A7EAEA;
+    color: #716969;
+    width: 36px;
+    height: 36px;
+    border-radius: 5px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 14px;
+}
+
+.title-group1 {
+    font-size: 15px;
+    font-weight: 600;
+    margin: 0;
+    color: #696969;
+}
+
+.title-group2 {
+    font-size: 15px;
+    font-weight: 600;
+    margin: 0;
+    color: #716969;
+}
+
+.time-set-title {
+    font-size: 14px;
+}
+
+.group-task-section .card-group .title {
+    width: 120px;
+}
+
+    .group-task-section .card-group .title h3 {
+        font-size: 20px;
+        font-weight: 800;
+    }
+
+.btn-delete1 {
+    background-color: #F9BABA;
+    border: 1px solid #F63D3D;
+    color: #ffffff;
+    width: 30px;
+    height: 30px;
+    border-radius: 5px;
+    padding: 3px 1px;
+    margin: auto 1px auto 0;
+    transition: ease .2s;
+}
+
+
+    .btn-delete1:hover {
+        background-color: #e3adad
+    }
+
+.btn-delete2 {
+    border: 1px solid transparent;
+    width: 30px;
+    height: 30px;
+    border-radius: 5px;
+    padding: 3px 1px;
+    color: #FF5151;
+    margin: auto 1px auto 0;
+    background: rgba(209, 50, 50, 0.15);
+    transition: ease .2s;
+}
+
+
+    .btn-delete2:hover {
+        background: rgba(209, 50, 50, 0.25);
+    }
+
+
+.group-task-section .card-group p {
+    font-size: 16px;
+}
+
+.group-task-section .list-personnel {
+    grid-column: span 8 / span 7;
+}
+
+.btnPosition {
+    background-color: #E5FCFC;
+    outline: 1px solid #CAD4D4;
+    cursor: pointer;
+    margin: 0 0 6px 0;
+    transition: ease .3s;
+    height: 76px;
+}
+
+    .btnPosition:hover {
+        background-color: #FFFFFF;
+        outline: 1px solid #55D1D1;
+    }
+
+    .btnPosition.active {
+        background-color: #FFFFFF;
+        outline: 2px solid #55D1D1;
+    }
+
+.btn-add {
+    background-color: #84CC16;
+    color: #ffffff;
+    padding: 6px 12px;
+    font-size: 12px;
+    font-weight: 500;
+    border-radius: 5px;
+    margin: 0 4px;
+}
+
+
+    .btn-add:hover {
+        background-color: #629b0c;
+    }
+
+
+.btn-register {
+    font-size: 14px;
+    font-weight: 500;
+    background-color: #84CC16;
+    color: #FFFFFF;
+    border-radius: 8px;
+    padding: 10px 70px;
+}
+
+    .btn-register:hover {
+        background-color: #5f9213;
+    }
+
+.btn-cancel2 {
+    font-size: 14px;
+    font-weight: 500;
+    background-color: #1F2937;
+    color: #FFFFFF;
+    border-radius: 8px;
+    padding: 10px 70px;
+}
+
+    .btn-cancel2:hover {
+        background-color: #121820;
+    }
+
+.items {
+    border: 1px solid #D9D9D9;
+    padding: 5px;
+    border-radius: 8px;
+    margin: 4px 0;
+    cursor: pointer;
+    transition: all ease-in-out .3s;
+}
+
+    .items:hover {
+        border: 1px solid #148989;
+    }
+
+    .items.checked-item {
+        border: 1px solid #148989;
+    }
+
+.form-control {
+    color: #797979;
+    border: 1px solid #DADADA;
+    border-radius: 7px;
+    background-color: #F6F6F6;
+    font-size: 13px;
+    font-weight: 500;
+}
+
+.btnCreateNew {
+}
+
+.btnCreateNew {
+    font-size: 14px;
+    font-weight: 500;
+    background-color: #84CC16;
+    color: #FFFFFF;
+    border-radius: 8px;
+    padding: 10px 70px;
+}
+
+    .btnCreateNew:hover {
+        background-color: #5f9213;
+    }
+
+.operation-div .operations-btns {
+    background-color: #FFFFFF;
+}
+
+@media(max-width: 1366px) {
+    #loadAccountItems {
+        height: 310px;
+    }
+
+    .title-group1,
+    .title-group2 {
+        font-size: 15px;
+        color: #353232;
+    }
+
+    .row-index1 {
+        width: 30px;
+        height: 30px;
+        font-size: 17px;
+    }
+
+    .row-index2 {
+        width: 28px;
+        height: 28px;
+        font-size: 15px;
+    }
+
+    .btn-register, .btn-cancel2 {
+        font-size: 12px;
+        padding: 10px 30px;
+    }
+
+    .btn-add {
+        padding: 6px 12px;
+        font-size: 10px;
+    }
+
+    .title-group {
+        font-size: 13px;
+    }
+
+        .title-group h4 {
+            font-size: 18px;
+        }
+}
+
+@media (max-width:768px) {
+    .btnPosition {
+        background-color: #FFFFFF;
+        outline: 0;
+        box-shadow: 0px 2px 9px rgba(0, 0, 0, 0.1);
+    }
+
+        .btnPosition.active {
+            outline: 0;
+        }
+
+    .Rtable--collapse .Rtable-row .Rtable-cell .Rtable-cell--heading,
+    .Rtable--collapse .Rtable-row .Rtable-cell .Rtable-cell--content {
+        color: #716969;
+        font-size: 12px;
+        font-weight: 500;
+        text-align: right;
+    }
+
+    .widthMobile1 {
+        width: 5% !important;
+    }
+
+    .widthMobile2 {
+        width: 50% !important;
+    }
+
+    .widthMobile3 {
+        width: 10% !important;
+    }
+
+    .Rtable .Rtable-row {
+        margin: 10px 0px 0;
+    }
+
+        .Rtable .Rtable-row .Rtable-cell.column-heading {
+            margin: 0;
+        }
+
+        .Rtable .Rtable-row .Rtable-cell {
+            width: auto;
+        }
+
+    .Rtable--collapse .Rtable-row {
+        outline: none;
+    }
+
+    .btn-register, .btn-cancel2 {
+        padding: auto;
+        width: 100%;
+    }
+
+    .btn-register, .btn-cancel2 {
+        font-size: 12px;
+        padding: 10px 30px;
+    }
+
+    #loadAccountItems {
+        height: auto;
+    }
+
+    .btn-add {
+        padding: 6px 7px;
+    }
+
+    .infoGroupBox {
+        display: block;
+    }
+}

ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ModalTakeImages.css

@@ -110,18 +110,54 @@ video {
     position: relative;
 }
 
-    .image-show button {
+.image-show .closeImage {
-        height: 100%;
+    background-color: #fff;
-        width: 100%;
+    width: 40px;
-        background: #17909040;
+    height: 40px;
-        font-family: inherit;
+    z-index: 30;
-        position: absolute;
+    position: absolute;
-        z-index: 3;
+    top: -18px;
-        color: #fff;
+    right: -20px;
-        font-weight: 900;
+    border-radius: 50px;
-        top: 0;
+    cursor: pointer;
-        right: 0;
+}
-    }
+
+.image-show .closeImage svg {
+    width: 40px;
+    position: absolute;
+    z-index: 30;
+    color: #ef4444;
+    display: flex;
+    align-content: center;
+    align-items: center;
+}
+
+.image-show button {
+    height: 100%;
+    width: 100%;
+    background: #17909040;
+    font-family: inherit;
+    position: absolute;
+    z-index: 3;
+    top: 0;
+    right: 0;
+}
+
+.image-show button .textUpload {
+    padding: 0;
+    margin: 0;
+    color: #148b8b;
+    font-weight: 900;
+}
+
+.image-show button .textUploaded {
+    display: flex;
+    align-items: center;
+    justify-content: end;
+    height: 100%;
+    flex-direction: column;
+    color: #fff !important;
+}
 
 .camera_close {
     position: fixed;

ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/EmployeeUploadPicture.js

@@ -1,4 +1,4 @@
-var pageIndexMain = 0
+var pageIndexMain = 0;
 var searchName = '';
 
 $(document).ready(function () {
@@ -8,16 +8,17 @@ $(document).ready(function () {
 		loadingDiv.show();
     });
 
-    $('.desktop-btn, .mobile-btn').on('click', function () {
-        var id = $(this).attr('id').split('_')[1];
-        var isActive = $(this).hasClass('btn-deactive') ? 'deactive' : 'active';
-        togglePersonnelStatus(id, isActive);
-    });
 
     loadInfoCount();
     loadDataAjax();
 });
 
+$(document).on('click', '.desktop-btn, .mobile-btn', function () {
+    var id = $(this).attr('id').split('_')[1];
+    var isActive = $(this).hasClass('btn-deactive') ? 'deactive' : 'active';
+    togglePersonnelStatus(id, isActive);
+});
+
 $('.btn-search-click').on('click', function () {
 
 
@@ -31,7 +32,7 @@ $('.btn-search-click').on('click', function () {
             $('.alert-msg p').text('');
             $('#personnelSearch').removeClass('errored');
         }, 3500);
-        return
+        return;
     }
 
 
@@ -96,7 +97,11 @@ function loadDataAjax() {
 									<div class="Rtable-cell--content">`;
 
                         if (item.hasUploadedImage === "true") {
-                            html += `<img id="ImageEmployee_${item.employeeId}" src="data:image/jpeg;base64,${item.imagePath}" class="img-avatar" />`;
+                            if (item.imagePath === "") {
+                                html += `<img id="ImageEmployee_${item.employeeId}" src="/AssetsClient/images/Credits.png" class="img-avatar border border-2 border-danger" alt="">`;
+                            } else {
+                                html += `<img id="ImageEmployee_${item.employeeId}" src="data:image/jpeg;base64,${item.imagePath}" class="img-avatar" />`;
+                            }
                         }
                         else {
                             html += `<img id="ImageEmployee_${item.employeeId}" src="/AssetsClient/images/Credits.png" class="img-avatar" alt="">`;
@@ -122,7 +127,7 @@ function loadDataAjax() {
 								<div class="Rtable-cell d-md-block d-none width5">
 									<div class="Rtable-cell--content align-items-center d-flex d-md-block text-end">`;
                         var isActive = item.isActiveString === "true" ? "deactive" : "active";
-                        html += `<button class="desktop-btn ${(item.isActiveString === "true"
+                        html += `<button class="desktop-btn btnAvticeAction_${item.employeeId} ${(item.isActiveString === "true"
                             ? `btn-deactive`
                             : item.hasUploadedImage === "false"
                                 ? `btn-active disable`
@@ -130,7 +135,7 @@ function loadDataAjax() {
 										        type="button" 
 										        style="width: 95px;"
 										        id="togglePersonnelStatus_${item.id}_desktop">
-											<div id="IsActiveString_${item.id}_desktop">
+											<div id="IsActiveString_${item.id}_desktop" class="IsActiveStringFind_${item.employeeId}">
 												${item.isActiveString === "true" ? `غیر فعال کردن` : `فعال کردن`}
 											</div>
 										</button>
@@ -152,7 +157,11 @@ function loadDataAjax() {
 										<div class="Rtable-cell--content">
 											<span class="mx-2">`;
                         if (item.hasUploadedImage === "true") {
-                            html += `<img id="ImageEmployeeMobile_${item.employeeId}" src="data:image/jpeg;base64,${item.imagePath}" class="img-avatar" />`;
+                            if (item.imagePath === "") {
+                                html += `<img id="ImageEmployeeMobile_${item.employeeId}" src="/AssetsClient/images/Credits.png" class="img-avatar border border-2 border-danger" alt="">`;
+                            } else {
+                                html += `<img id="ImageEmployeeMobile_${item.employeeId}" src="data:image/jpeg;base64,${item.imagePath}" class="img-avatar" />`;
+                            }
                         }
                         else {
                             html += `<img id="ImageEmployeeMobile_${item.employeeId}" src="/AssetsClient/images/Credits.png" class="img-avatar" alt="">`;
@@ -179,11 +188,11 @@ function loadDataAjax() {
 												</button>
 
 												<button 
-													class="mobile-btn text-nowrap mt-1 w-100 ${item.isActiveString === "true" ? `btn-deactive` : item.hasUploadedImage === "false" ? `btn-active disable` : `btn-active`}" 
+													class="mobile-btn text-nowrap mt-1 w-100 btnAvticeActionMobile_${item.employeeId} ${item.isActiveString === "true" ? `btn-deactive` : item.hasUploadedImage === "false" ? `btn-active disable` : `btn-active`}" 
 													type="button" 
 													id="togglePersonnelStatus_${item.id}_mobile" 
 													style="padding: 9px 8px; font-weight: 600; font-size: 10px;">
-													<div id="IsActiveString_${item.id}_mobile">
+													<div id="IsActiveString_${item.id}_mobile" class="IsActiveStringFindMobile_${item.employeeId}">
 														${item.isActiveString === "true" ? `غیر فعال کردن` : `فعال کردن`}
 													</div>
 												</button>

ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js

@@ -216,7 +216,22 @@ function take_snapshot1() {
 	var dataUri = cameraPhoto.getDataUri(config);
 	cropAndResizeImage(dataUri, 1800, 1800).then((resizedDataUri) => {
 		document.getElementById('result1').innerHTML = '<img style="display:none; object-fit: cover;" id="pic1" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
-		document.getElementById('demoResult1').innerHTML = '<button type="button" class="upload-image1">آپلود عکس اول</button><div class="loadingImage" id="loadingImage1"><div class="spinner-border" role="status"><span class="visually-hidden">Loading...</span></div></div><img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
+        document.getElementById('demoResult1').innerHTML =
+            '<div class="closeImage" onclick="closeImage(\'image1\')">' +
+            '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">' +
+            '<path fill-rule="evenodd" d="M10 18a8 8 0 1 0 0-16 8 8 0 0 0 0 16ZM8.28 7.22a.75.75 0 0 0-1.06 1.06L8.94 10l-1.72 1.72a.75.75 0 1 0 1.06 1.06L10 11.06l1.72 1.72a.75.75 0 1 0 1.06-1.06L11.06 10l1.72-1.72a.75.75 0 0 0-1.06-1.06L10 8.94 8.28 7.22Z" clip-rule="evenodd" />' +
+            '</svg>' +
+            '</div>' +
+            '<button type="button" class="upload-image1">' +
+            '<p class="textUpload textUploaded">عکس اول</p>' +
+            '</button>' +
+            '<div class="loadingImage" id="loadingImage1">' +
+            '<div class="spinner-border" role="status">' +
+            '<span class="visually-hidden">Loading...</span>' +
+            '</div>' +
+            '</div>' +
+			'<img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
+		//document.getElementById('demoResult1').innerHTML = '<div class="closeImage" onclick="closeImage("image1")"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor"><path fill-rule="evenodd" d="M10 18a8 8 0 1 0 0-16 8 8 0 0 0 0 16ZM8.28 7.22a.75.75 0 0 0-1.06 1.06L8.94 10l-1.72 1.72a.75.75 0 1 0 1.06 1.06L10 11.06l1.72 1.72a.75.75 0 1 0 1.06-1.06L11.06 10l1.72-1.72a.75.75 0 0 0-1.06-1.06L10 8.94 8.28 7.22Z" clip-rule="evenodd" /></svg></div><button type="button" class="upload-image1"><p class="textUpload textUploaded">عکس اول</p></button><div class="loadingImage" id="loadingImage1"><div class="spinner-border" role="status"><span class="visually-hidden">Loading...</span></div></div><img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
         $('#loadingImage1').css('display', 'flex');
         runCheckFace1();
 	}).catch((error) => {
@@ -243,7 +258,22 @@ function take_snapshot2() {
 	var dataUri = cameraPhoto.getDataUri(config);
 	cropAndResizeImage(dataUri, 1800, 1800).then((resizedDataUri) => {
 		document.getElementById('result2').innerHTML = '<img style="display:none; object-fit: cover;"  id="pic2" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
-		document.getElementById('demoResult2').innerHTML = '<button type="button" class="upload-image2">آپلود عکس دوم</button><div class="loadingImage" id="loadingImage2"><div class="spinner-border" role="status"><span class="visually-hidden">Loading...</span></div></div><img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
+        document.getElementById('demoResult2').innerHTML =
+            '<div class="closeImage" onclick="closeImage(\'image2\')">' +
+            '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">' +
+            '<path fill-rule="evenodd" d="M10 18a8 8 0 1 0 0-16 8 8 0 0 0 0 16ZM8.28 7.22a.75.75 0 0 0-1.06 1.06L8.94 10l-1.72 1.72a.75.75 0 1 0 1.06 1.06L10 11.06l1.72 1.72a.75.75 0 1 0 1.06-1.06L11.06 10l1.72-1.72a.75.75 0 0 0-1.06-1.06L10 8.94 8.28 7.22Z" clip-rule="evenodd" />' +
+            '</svg>' +
+            '</div>' +
+            '<button type="button" class="upload-image2">' +
+            '<p class="textUpload textUploaded">عکس دوم</p>' +
+            '</button>' +
+            '<div class="loadingImage" id="loadingImage2">' +
+            '<div class="spinner-border" role="status">' +
+            '<span class="visually-hidden">Loading...</span>' +
+            '</div>' +
+            '</div>' +
+            '<img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
+		//document.getElementById('demoResult2').innerHTML = '<div class="closeImage" onclick="closeImage("image2")"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor"><path fill-rule="evenodd" d="M10 18a8 8 0 1 0 0-16 8 8 0 0 0 0 16ZM8.28 7.22a.75.75 0 0 0-1.06 1.06L8.94 10l-1.72 1.72a.75.75 0 1 0 1.06 1.06L10 11.06l1.72 1.72a.75.75 0 1 0 1.06-1.06L11.06 10l1.72-1.72a.75.75 0 0 0-1.06-1.06L10 8.94 8.28 7.22Z" clip-rule="evenodd" /></svg></div><button type="button" class="upload-image2"><p class="textUpload textUploaded">عکس دوم</p></button><div class="loadingImage" id="loadingImage2"><div class="spinner-border" role="status"><span class="visually-hidden">Loading...</span></div></div><img style="width: 100%; height: 100%; border-radius:10px; object-fit: cover;" data-uri="' + resizedDataUri + '" src="' + resizedDataUri + '"/>';
         $('#loadingImage2').css('display', 'flex');
         runCheckFace2();
 	}).catch((error) => {
@@ -254,6 +284,26 @@ function take_snapshot2() {
 	stopCamera();
 }
 
+function closeImage(type) {
+	if (type === "image1") {
+        $('#demoResult1').html('');
+        $('#demoResult1').html('<button type="button" class="upload-image1"><p class="textUpload">بارگذاری عکس اول</p></button>');
+		$('#demoResult1').removeAttr('style');
+	} else if (type === "image2") {
+        $('#demoResult2').html('');
+		$('#demoResult2').html('<button type="button" class="upload-image2"><p class="textUpload">بارگذاری عکس دوم</p></button>');
+		$('#demoResult2').removeAttr('style');
+    } else {
+        $('.alert-msg').show();
+        $('.alert-msg p').text('خطایی رخ داده است.');
+        setTimeout(function () {
+            $('.alert-msg').hide();
+            $('.alert-msg p').text('');
+        }, 4000);
+	}
+
+    $('#SaveImageEmployee').addClass('disable');
+}
 
 async function set() {
 	let pic1 = $("#pic1").attr('src');
@@ -315,7 +365,6 @@ async function set() {
 				success: function (response) {
 					let elapsedTime = Date.now() - startTime;
 					let delay = Math.max(1000 - elapsedTime, 0); 
-                    console.log(response);
 
 					setTimeout(function () {
 						if (response.isSuccedded) {
@@ -330,6 +379,20 @@ async function set() {
 								$(`#TextUpload_${employeeId}`).text("عکس پرسنل آپلود شده است").removeClass('text-danger');
 								$(`#TextUploadMobile_${employeeId}`).text("عکس پرسنل آپلود شده است").removeClass('text-danger');
 
+								if (!hasPicture) {
+                                    $(`.btnAvticeAction_${employeeId}`)
+                                        .removeClass('disable')
+                                        .addClass('btn-deactive')
+										.attr('id', `togglePersonnelStatus_${response.idRollCall}_desktop`);
+									$(`.IsActiveStringFind_${employeeId}`).attr('id', `IsActiveString_${response.idRollCall}_desktop`).text("غیر فعال کردن");
+										
+									$(`.btnAvticeActionMobile_${employeeId}`)
+										.removeClass('disable')
+										.addClass('btn-deactive')
+										.attr('id', `togglePersonnelStatus_${response.idRollCall}_mobile`);
+									$(`.IsActiveStringFindMobile_${employeeId}`).attr('id', `IsActiveString_${response.idRollCall}_mobile`).text("غیر فعال کردن");
+                                }
+
 								$(`#uploadMobileBTN_${employeeId}`).text("ویرایش عکس");
 								$(`#uploadMobileBTNMobile_${employeeId}`).text("ویرایش عکس");