diff --git a/0_Framework/0_Framework.csproj b/0_Framework/0_Framework.csproj index eb73e124..361e9176 100644 --- a/0_Framework/0_Framework.csproj +++ b/0_Framework/0_Framework.csproj @@ -10,6 +10,7 @@ + diff --git a/0_Framework/Application/AuthHelper.cs b/0_Framework/Application/AuthHelper.cs index 4e46f902..9a4997a5 100644 --- a/0_Framework/Application/AuthHelper.cs +++ b/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(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>(permissions); + return Tools.DeserializeFromBsonList(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 { 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); diff --git a/0_Framework/Application/AuthViewModel.cs b/0_Framework/Application/AuthViewModel.cs index 0a1aa59d..39c08a3e 100644 --- a/0_Framework/Application/AuthViewModel.cs +++ b/0_Framework/Application/AuthViewModel.cs @@ -15,7 +15,14 @@ public class AuthViewModel public List 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 WorkshopList { get; set; } + + #endregion public AuthViewModel(long id, long roleId, string fullname, string username, string mobile,string profilePhoto, List permissions, string roleName, string adminAreaPermission, string clientAriaPermission, int? positionValue) diff --git a/0_Framework/Application/IsActive.cs b/0_Framework/Application/IsActive.cs new file mode 100644 index 00000000..e1827783 --- /dev/null +++ b/0_Framework/Application/IsActive.cs @@ -0,0 +1,8 @@ +namespace _0_Framework.Application; + +public enum IsActive +{ + True, + False, + +} \ No newline at end of file diff --git a/0_Framework/Application/Tools.cs b/0_Framework/Application/Tools.cs index 6c3713b7..41f46b2d 100644 --- a/0_Framework/Application/Tools.cs +++ b/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.InterpolationMode = InterpolationMode.HighQualityBicubic; - graphics.SmoothingMode = SmoothingMode.HighQuality; + graphics.CompositingQuality = CompositingQuality.HighSpeed; + graphics.InterpolationMode = InterpolationMode.Bicubic; + 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 DeserializeFromBsonList(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>(reader); + } + //بیسان هایی که بصورت تکی بودند استخراج میشود + public static T DeserializeFromBson(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(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) diff --git a/0_Framework/Application/Version.cs b/0_Framework/Application/Version.cs index 1e4f922c..7fa57899 100644 --- a/0_Framework/Application/Version.cs +++ b/0_Framework/Application/Version.cs @@ -10,8 +10,8 @@ public static class Version { static Version() { - StyleVersion = "2.12.14"; - AdminVersion = "2.5.34"; + StyleVersion = "2.12.16"; + AdminVersion = "2.5.36"; CameraVersion = "1.0.7"; } diff --git a/0_Framework/Application/WorkshopClaim.cs b/0_Framework/Application/WorkshopClaim.cs new file mode 100644 index 00000000..a3869a42 --- /dev/null +++ b/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; } +} \ No newline at end of file diff --git a/0_Framework/libman.json b/0_Framework/libman.json new file mode 100644 index 00000000..ceee2710 --- /dev/null +++ b/0_Framework/libman.json @@ -0,0 +1,5 @@ +{ + "version": "1.0", + "defaultProvider": "cdnjs", + "libraries": [] +} \ No newline at end of file diff --git a/AccountManagement.Application/AccountApplication.cs b/AccountManagement.Application/AccountApplication.cs index 39202547..92542c51 100644 --- a/AccountManagement.Application/AccountApplication.cs +++ b/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 || - (x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(x.NationalCode)))) + if (_accountRepository.Exists(x => x.Mobile == command.Mobile && x.IsActiveString =="true")) + 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); } diff --git a/AccountManagement.Domain/AccountAgg/Account.cs b/AccountManagement.Domain/AccountAgg/Account.cs index 60ba1f0b..26f7df22 100644 --- a/AccountManagement.Domain/AccountAgg/Account.cs +++ b/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"; diff --git a/AccountMangement.Infrastructure.EFCore/Repository/AccountLeftworkRepository.cs b/AccountMangement.Infrastructure.EFCore/Repository/AccountLeftworkRepository.cs index 77232f33..8fa75641 100644 --- a/AccountMangement.Infrastructure.EFCore/Repository/AccountLeftworkRepository.cs +++ b/AccountMangement.Infrastructure.EFCore/Repository/AccountLeftworkRepository.cs @@ -32,7 +32,7 @@ public class AccountLeftworkRepository : RepositoryBase, 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() : ""; diff --git a/Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs b/Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs new file mode 100644 index 00000000..c7f926ae --- /dev/null +++ b/Company.Domain/CustomizeCheckoutAgg/CustomizeCheckout.cs @@ -0,0 +1,209 @@ +using _0_Framework.Domain; +using System; +using _0_Framework.Application; + + +namespace Company.Domain.CustomizeCheckoutAgg; +/// +/// تصفیه حساب دلخواه +/// +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 + /// + /// سال به صورت استرینگ + /// + public string Year => $"{YearInt}"; + /// + /// نام ماه شمسی + /// + public string Month => MonthInt.ToFarsiMonthByIntNumber(); + #endregion + + #region DatabaseEntities + + public IsActive IsActiveString { get; private set; } + + /// + /// شماره قرارداد + /// + public string ContractNo { get; private set; } + /// + /// سال + /// + public int YearInt { get; private set; } + /// + /// ماه + /// + public int MonthInt { get; private set; } + + /// + /// حقوق ماهانه + /// + public double MonthlySalary { get; private set; } + + /// + /// شروع تصفیه حساب + /// + public DateTime ContractStart { get; private set; } + + /// + /// پایان تصفیه حساب + /// + public DateTime ContractEnd { get; private set; } + + + /// + /// جمعه کاری + /// + public double FridayPay { get; private set; } + + /// + /// اضافه کاری + /// + public double OverTimePay { get; private set; } + + /// + /// سنوات + /// + public double BaseYearsPay { get; private set; } + + /// + /// عیدی + /// + public double BonusesPay { get; private set; } + + /// + /// شب کاری + /// + public double NightWorkPay { get; private set; } + + /// + /// حق تاهل + /// + public double MarriedAllowance { get; private set; } + + /// + /// نوبت کاری + /// + public double ShiftPay { get; private set; } + + /// + /// حق اولاد(حق فرزند)ء + /// + public double FamilyAllowance { get; private set; } + + /// + /// مزد مرخصی + /// + public double LeavePay { get; private set; } + + /// + /// حق بیمه + /// + public double InsuranceDeduction { get; private set; } + + /// + /// جریمه غیبت + /// + public double FineAbsenceDeduction { get; private set; } + + /// + /// تاخیر در ورود + /// + public double LateToWorkDeduction { get; private set; } + + /// + /// تعجیل در خروج + /// + public double EarlyExitDeduction { get; private set; } + + /// + /// پاداش + /// + public double RewardPay { get; private set; } + + /// + /// مساعده + /// + public double SalaryAidDeduction { get; private set; } + + /// + /// قسط وام + /// + public double InstallmentDeduction { get; private set; } + + /// + /// جریمه + /// + public double FineDeduction { get; private set; } + + /// + /// مالیات + /// + public double TaxDeduction { get; private set; } + + + /// + /// تعداد روزهای کارکرد + /// + public string SumOfWorkingDays { get; private set; } + + /// + /// مجموع مطالبات + /// + public string TotalClaims { get; private set; } + /// + /// مجموع کسورات + /// + public string TotalDeductions { get; private set; } + /// + /// مجموع پرداختی + /// + 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 +} \ No newline at end of file diff --git a/Company.Domain/EmployeeAgg/Employee.cs b/Company.Domain/EmployeeAgg/Employee.cs index 6c9b4c8d..07d30456 100644 --- a/Company.Domain/EmployeeAgg/Employee.cs +++ b/Company.Domain/EmployeeAgg/Employee.cs @@ -124,6 +124,9 @@ public class Employee : EntityBase public List EmployeeInsuranceRecords { get; private set; } public List PersonnelCodeList { get; set; } + + public string FullName => $"{FName} {LName}"; + //public List Checkouts { get; set; } public Employee() { diff --git a/CompanyManagment.App.Contracts/RollCallEmployee/AdjustRollCallEmployeesWithEmployeeLeftWork.cs b/CompanyManagment.App.Contracts/RollCallEmployee/AdjustRollCallEmployeesWithEmployeeLeftWork.cs index 2995b7d1..efd1439e 100644 --- a/CompanyManagment.App.Contracts/RollCallEmployee/AdjustRollCallEmployeesWithEmployeeLeftWork.cs +++ b/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; } } } diff --git a/CompanyManagment.Application/LeftWorkApplication.cs b/CompanyManagment.Application/LeftWorkApplication.cs index 94559962..82a96824 100644 --- a/CompanyManagment.Application/LeftWorkApplication.cs +++ b/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 - 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 - }; - }); + //get rollCallEmployee associated with those leftworks which have a higher end date than leftworkDate + var rollCallsEmployee = _rollCallEmployeeRepository.GetByEmployeeIdWithStatuses(employeeId) + .Where(x => leftWorks.Any(y => y.WorkshopId == x.WorkshopId)).ToList(); - //get rollCallEmployee associated with those leftworks which have a higher end date than leftworkDate - var rollCallsEmployee = _rollCallEmployeeRepository.GetByEmployeeIdWithStatuses(employeeId).GroupBy(x=>x.WorkshopId).Select( - x => - { - var maxRollCall = x.MaxBy(y => y.Statuses); - return new RollCallEmployeeViewModel() - { - 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))); + var joinedList = rollCallsEmployee.Join(leftWorks, x => x.WorkshopId, y => y.WorkshopId, (x, y) => new + { + x.WorkshopId, + x.EmployeeId, + y.LeftWorkDateGr, + Status = x.Statuses.OrderByDescending(z => z.StartDate).FirstOrDefault(z => z.StartDateGr < y.LeftWorkDateGr && z.EndDateGr > y.LeftWorkDateGr) + }); - //shaping up the list to send as parameter to repository - var newRollCallRecords = rollCallsEmployee.Select(x => new AdjustRollCallEmployeesWithEmployeeLeftWork() - { - LeaveDate = leftWorks.FirstOrDefault(y => y.WorkshopId == x.WorkshopId && y.EmployeeId == x.EmployeeId)!.LeftWorkDateGr, - RollCallEmployeeId = x.Id - }).ToList(); - - - _rollCallEmployeeStatusRepository.AdjustRollCallStatusEndDates(newRollCallRecords); + //shaping up the list to send as parameter to repository + var newRollCallRecords = joinedList.Where(x => x.Status != null).Select(x => new AdjustRollCallEmployeesWithEmployeeLeftWork() + { + LeaveDate = x.LeftWorkDateGr, + RollCallStatusId = x.Status.Id + }).ToList(); + if(newRollCallRecords.Count > 0) + _rollCallEmployeeStatusRepository.AdjustRollCallStatusEndDates(newRollCallRecords); } #endregion diff --git a/CompanyManagment.EFCore/Mapping/CustomizeCheckoutMapping.cs b/CompanyManagment.EFCore/Mapping/CustomizeCheckoutMapping.cs new file mode 100644 index 00000000..f4c2d357 --- /dev/null +++ b/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 +{ + public void Configure(EntityTypeBuilder builder) + { + builder.ToTable("CustomizeCheckouts"); + builder.HasKey(x => x.id); + + builder.Property(x => x.IsActiveString).HasConversion().HasMaxLength(5); + builder.Property(x => x.ContractNo).HasMaxLength(50); + } +} \ No newline at end of file diff --git a/CompanyManagment.EFCore/Mapping/EmployeeMapping.cs b/CompanyManagment.EFCore/Mapping/EmployeeMapping.cs index e1abec19..5913af19 100644 --- a/CompanyManagment.EFCore/Mapping/EmployeeMapping.cs +++ b/CompanyManagment.EFCore/Mapping/EmployeeMapping.cs @@ -70,6 +70,12 @@ public class EmployeeMapping : IEntityTypeConfiguration .WithOne(x => x.Employee) .HasForeignKey(x => x.EmployeeId); + #region Pooya + + + builder.Ignore(x => x.FullName); + #endregion + } diff --git a/CompanyManagment.EFCore/Repository/ReportRepository.cs b/CompanyManagment.EFCore/Repository/ReportRepository.cs index efced907..dfb94a0c 100644 --- a/CompanyManagment.EFCore/Repository/ReportRepository.cs +++ b/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(), #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, diff --git a/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs b/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs index fad629b0..8036ced1 100644 --- a/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs @@ -68,36 +68,57 @@ public class RollCallEmployeeRepository : RepositoryBase public List GetPersonnelRollCallListPaginate(RollCallEmployeeSearchModel command) { - var dateNow = DateTime.Now; - 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) || - x.LeftWorkInsurances.Any(y => y.WorkshopId == command.WorkshopId && y.StartWorkDate <= dateNow && - (y.LeftWorkDate > dateNow || y.LeftWorkDate == null))); - if (!string.IsNullOrWhiteSpace(command.Name)) - rawQuery = rawQuery.Where(x => (x.FName + " " + x.LName).Contains(command.Name)); + var dateNow = DateTime.Now; + 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) || + x.LeftWorkInsurances.Any(y => + 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 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(); + var rollCallEmployees = _context.RollCallEmployees.Where(x => x.WorkshopId == command.WorkshopId); - 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) { diff --git a/CompanyManagment.EFCore/Repository/RollCallEmployeeStatusRepository.cs b/CompanyManagment.EFCore/Repository/RollCallEmployeeStatusRepository.cs index c54c867e..d0289abf 100644 --- a/CompanyManagment.EFCore/Repository/RollCallEmployeeStatusRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallEmployeeStatusRepository.cs @@ -32,23 +32,21 @@ namespace CompanyManagment.EFCore.Repository } public void AdjustRollCallStatusEndDates(List command) { - var rollCallEmployeeIds = command.Select(y => y.RollCallEmployeeId); - var list = _context.RollCallEmployeesStatus.Where(x =>rollCallEmployeeIds.Any(y =>y == x.RollCallEmployeeId)) - .GroupBy(x => x.RollCallEmployeeId).AsEnumerable().Select(x=> new RollCallEmployeeStatusViewModel() - { - Id = x.MaxBy(c=>c.StartDate).id, + var statusIds = command.Select(x => x.RollCallStatusId); + 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( + 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); - - 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(); - } + _context.SaveChanges(); + } #endregion } } diff --git a/CompanyManagment.EFCore/Repository/WorkshopRepository.cs b/CompanyManagment.EFCore/Repository/WorkshopRepository.cs index 3e52969e..ecd11ece 100644 --- a/CompanyManagment.EFCore/Repository/WorkshopRepository.cs +++ b/CompanyManagment.EFCore/Repository/WorkshopRepository.cs @@ -749,7 +749,7 @@ public class WorkshopRepository : RepositoryBase 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) { diff --git a/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml.cs index 188ac642..209d12b6 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/InstitutionContracts/Index.cshtml.cs +++ b/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) diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/Index.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/Index.cshtml index 9dbaabfd..343712f0 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/Index.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/Index.cshtml @@ -889,8 +889,7 @@ asp-page="./AutoExtension" asp-route-id="@item.Id"> - + diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/CreateModal.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/CreateModal.cshtml index 2e135ebb..eae58f2c 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/CreateModal.cshtml +++ b/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; } @@ -334,4 +333,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModal.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModal.cshtml index 20bfde03..25fe81b4 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsModal.cshtml +++ b/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; - - - + + + if (Model.AssignViewModels?.Count > 1) @@ -87,31 +88,31 @@
-
-
- طرف حساب: - @Model.ContractingPartyName +
+
+ طرف حساب: + @Model.ContractingPartyName
-
- عنوان وظیفه: - @Model.Title +
+ عنوان وظیفه: + @Model.Title
-
-
- تاریخ ایجاد: - @Model.CreateDateFa +
+
+ تاریخ ایجاد: + @Model.CreateDateFa
-
- تاریخ سررسید: - @Model.AssignViewModels?.First().EndTaskDateFa +
+ تاریخ سررسید: + @Model.AssignViewModels?.First().EndTaskDateFa
@if (!String.IsNullOrWhiteSpace(Model.Description)) { +
توضیحات :
-
توضیحات :
@Html.Raw(Model.Description)
} @@ -211,66 +212,69 @@
-
+
+
+
+
- @if (!Model.IsDone && !Model.IsCancel) - { -
-
- - @foreach (var item in Model.AssignsLists) - { - - } - -
- + @foreach (var item in Model.AssignsLists) + { + + } + +
+ - @if (userId == Model.SenderId) - { - - - - - } - else - { - - - - - } -
- - } + @if (userId == Model.SenderId) + { + + + + + } + else + { + + + + + } +
+ } @@ -280,7 +284,7 @@
- +
@if (!Model.IsDone) { @@ -313,9 +317,9 @@ @if (Convert.ToInt64(User.FindFirstValue("AccountId")) == Model.SenderId) { - + } else { - + } diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsTaskTicketsModal.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsTaskTicketsModal.cshtml index 36ba4272..8bf16744 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsTaskTicketsModal.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/Task/DetailsTaskTicketsModal.cshtml @@ -377,8 +377,8 @@
-
جزئیات وظیفه
-
@Model.EndTaskDate
+
جزئیات وظیفه
+
@Model.EndTaskDate
@@ -410,36 +410,36 @@
-
+
@*
طرف حساب: @Model.ContractingPartyName
عنوان وظیفه: @Model.Title
*@ -
-
- طرف حساب: - @Model.ContractingPartyName +
+
+ طرف حساب: + @Model.ContractingPartyName
- عنوان وظیفه: - @Model.Title + عنوان وظیفه: + @Model.Title
-
-
- تاریخ ایجاد: - @Model.CreateDateFa +
+
+ تاریخ ایجاد: + @Model.CreateDateFa
-
- تاریخ سررسید: - @Model.AssignViewModels?.First().EndTaskDateFa +
+ تاریخ سررسید: + @Model.AssignViewModels?.First().EndTaskDateFa
@if (!String.IsNullOrWhiteSpace(Model.Description)) { +
توضیحات:
-
توضیحات :
@Html.Raw(Model.Description)
} @@ -533,9 +533,10 @@ @Model.CreateDateFa
- - -
+ +
+
+
diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DiagramTaskModal.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/DiagramTaskModal.cshtml index 2e12fd51..1320a281 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/DiagramTaskModal.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/Task/DiagramTaskModal.cshtml @@ -1,15 +1,22 @@ @model AccountManagement.Application.Contracts.Task.EditTask -@using Version = _0_Framework.Application.Version @{ - + string adminVersion = _0_Framework.Application.Version.AdminVersion; + + -} + #divTablescrollbar { + overflow-y: scroll; + max-height: calc(100vh - 200px); + position: relative; + scrollbar-width: thin; + scrollbar-gutter: stable; + } +
@foreach (var item in Model.PersonnelInfoPrintList) { - +
@@ -650,7 +624,7 @@ diff --git a/ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllDetailsPersonnelInfoMobile.cshtml b/ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllDetailsPersonnelInfoMobile.cshtml index 6e7b67be..3cbceaf2 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllDetailsPersonnelInfoMobile.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllDetailsPersonnelInfoMobile.cshtml @@ -1,616 +1,599 @@ @model CompanyManagment.App.Contracts.Workshop.PersonnelInfoPrintViewModel @{ int i = 1; - } + + + +
@foreach (var item in Model.PersonnelInfoPrintList) { -
-
+
@@ -665,7 +639,7 @@
-
+
موسسه نور دادمهر گستر کاسپین @@ -673,9 +647,9 @@
-
-

www.gozareshgir.ir

-

سامانه هوشمند گزارشگیر

+
+ +
+
@@ -674,8 +657,8 @@
-

www.gozareshgir.ir

-

سامانه هوشمند گزارشگیر

+ +
diff --git a/ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllList.cshtml b/ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllList.cshtml index ffaeb63b..66f6be7a 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllList.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllList.cshtml @@ -4,231 +4,240 @@ @* *@ + @{ - - int index = 1; } @@ -237,46 +246,51 @@ -
+
-
-
+
+
- - - + + + + + + diff --git a/ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllPersonnelInfo.cshtml b/ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllPersonnelInfo.cshtml index 5a792e80..8e9b78f2 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllPersonnelInfo.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Employees/PrintAllPersonnelInfo.cshtml @@ -1,612 +1,612 @@ @model CompanyManagment.App.Contracts.Workshop.PersonnelInfoPrintViewModel @{ int i = 1; - -} - + #printThis .colgp-14 { + width: 80px; + } + + #printThis .colgp-13 { + width: 80px; + } + + #printThis .colgp-12 { + width: 85px; + } + + #printThis .colgp-8 { + width: 55px; + } + + #printThis .colgp-9 { + width: 60px; + } + + .bl-hidden { + border-left: hidden !important; + } + + .table-name { + padding: 8px 0; + } + + #printThis .table-bordered > thead tr:first-child { + border: 0 !important; + } + + #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; + } + } + + + + .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; + } + + .table > tbody > tr.withdraw > td { + background-color: #b5b5b5 !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; + } */ + + #divTablescrollbar { + overflow-y: scroll; + max-height: calc(100vh - 200px); + position: relative; + scrollbar-width: thin; + scrollbar-gutter: stable; + } +
- #MainModal { - backdrop-filter: blur(8px); - } +} - .modal .modal-dialog .modal-content { - background-color: white; - // padding: 0px 30px 0 30px; - } + -} - + +
@@ -707,8 +694,7 @@ } else { - @item.MaritalStatus - ; + @item.MaritalStatus; } diff --git a/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml b/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml index e7166364..72054d42 100644 --- a/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml +++ b/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 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; - } - } + var workshopSelected = currentAccount.WorkshopList?.FirstOrDefault(x => x.Slug == User.FindFirstValue("WorkshopSlug"))?.Name; } +
+
@@ -123,22 +116,36 @@ - + + diff --git a/ServiceHost/Pages/Index.cshtml b/ServiceHost/Pages/Index.cshtml index 92d5d1c2..f7da7c03 100644 --- a/ServiceHost/Pages/Index.cshtml +++ b/ServiceHost/Pages/Index.cshtml @@ -25,18 +25,18 @@ "logo": "https://gozareshgir.ir" } - + @* *@ } @* *@ - + *@
@@ -178,7 +178,7 @@
- + +
+ + + `; + + }); + + } + + html += ``; + + $('#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) {

${item.message}

-

${item.creationDate}

-
+

${item.creationDate}

`; + + + if (response.data.length === i + 1) { + html += `
`; + 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 += `
+
+
+ +
`; + + html += `
`; + if (taskDetailsData.timeRequest) { + html += `
+ +
`; + } + html += `
`; + 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 += ` + +
+
+
+
`; + } + + html += `
`; + } + + + html += `
${item.typeOfMessage} @@ -128,8 +291,11 @@ function loadChatMessageRequest(id) {
`; } + + }); + $('#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(); } diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/create.js b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/create.js index 56f0dbac..3310d732 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/create.js +++ b/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}%`); } }); diff --git a/ServiceHost/wwwroot/AssetsClient/Workshop/js/employees.js b/ServiceHost/wwwroot/AssetsClient/Workshop/js/employees.js index 3a1502b6..d88404cb 100644 --- a/ServiceHost/wwwroot/AssetsClient/Workshop/js/employees.js +++ b/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; } diff --git a/ServiceHost/wwwroot/AssetsClient/css/dropdown.css b/ServiceHost/wwwroot/AssetsClient/css/dropdown.css index 1db7295b..fb3bad60 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/dropdown.css +++ b/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 { diff --git a/ServiceHost/wwwroot/AssetsClient/css/responsive.css b/ServiceHost/wwwroot/AssetsClient/css/responsive.css index c323b96f..1c785b34 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/responsive.css +++ b/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 { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/js/PrintOneRollCall.js b/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/js/PrintOneRollCall.js index 9cea5897..5058be27 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/js/PrintOneRollCall.js +++ b/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(); +} diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/Group.css b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/Group.css new file mode 100644 index 00000000..bd254d71 --- /dev/null +++ b/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; + } +} diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ModalTakeImages.css b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ModalTakeImages.css index b61f01cf..5d906188 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ModalTakeImages.css +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/css/ModalTakeImages.css @@ -110,18 +110,54 @@ video { position: relative; } - .image-show button { - height: 100%; - width: 100%; - background: #17909040; - font-family: inherit; - position: absolute; - z-index: 3; - color: #fff; - font-weight: 900; - top: 0; - right: 0; - } +.image-show .closeImage { + background-color: #fff; + width: 40px; + height: 40px; + z-index: 30; + position: absolute; + top: -18px; + right: -20px; + border-radius: 50px; + cursor: pointer; +} + +.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; diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/EmployeeUploadPicture.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/EmployeeUploadPicture.js index 41cff6fa..89e0b266 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/EmployeeUploadPicture.js +++ b/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() {
`; if (item.hasUploadedImage === "true") { - html += ``; + if (item.imagePath === "") { + html += ``; + } else { + html += ``; + } } else { html += ``; @@ -122,7 +127,7 @@ function loadDataAjax() {
`; var isActive = item.isActiveString === "true" ? "deactive" : "active"; - html += ` @@ -152,7 +157,11 @@ function loadDataAjax() {
`; if (item.hasUploadedImage === "true") { - html += ``; + if (item.imagePath === "") { + html += ``; + } else { + html += ``; + } } else { html += ``; @@ -179,11 +188,11 @@ function loadDataAjax() { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js index ae1e792a..e090afe3 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js +++ b/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 = ''; - document.getElementById('demoResult1').innerHTML = '
'; + document.getElementById('demoResult1').innerHTML = + '
' + + '' + + '' + + '' + + '
' + + '' + + '
' + + '' + + '
' + + ''; + //document.getElementById('demoResult1').innerHTML = '
'; $('#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 = ''; - document.getElementById('demoResult2').innerHTML = '
'; + document.getElementById('demoResult2').innerHTML = + '
' + + '' + + '' + + '' + + '
' + + '' + + '
' + + '' + + '
' + + ''; + //document.getElementById('demoResult2').innerHTML = '
'; $('#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(''); + $('#demoResult1').removeAttr('style'); + } else if (type === "image2") { + $('#demoResult2').html(''); + $('#demoResult2').html(''); + $('#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("ویرایش عکس");
-
-
- - - - - - - - - - - - - -
-
-
-
- موسسه نور دادمهر گستر کاسپین -
شماره ثبت: 1727
-
-
-
-
-

www.gozareshgir.ir

-

سامانه هوشمند گزارشگیر

-
-
-
+
+
+ + + + + + + + + + + + + +
+
+
+
+ موسسه نور دادمهر گستر کاسپین +
شماره ثبت: 1727
+
+
+
+
+

www.gozareshgir.ir

+

سامانه هوشمند گزارشگیر

+
+
+
+

@Model.LeaveList.First().EmployeeFullName

+
ردیف سال
-
+
@@ -652,7 +639,7 @@
-
+
موسسه نور دادمهر گستر کاسپین @@ -660,9 +647,9 @@
-
-

www.gozareshgir.ir

-

سامانه هوشمند گزارشگیر

+
+ +
diff --git a/ServiceHost/Areas/Client/Pages/Company/Employees/PrintOne.cshtml b/ServiceHost/Areas/Client/Pages/Company/Employees/PrintOne.cshtml index 4d7ccd42..b5c7c61b 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Employees/PrintOne.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Employees/PrintOne.cshtml @@ -1,10 +1,16 @@ @model CompanyManagment.App.Contracts.Leave.LeavePrintViewModel + @@ -354,7 +380,7 @@ - +@* *@ } diff --git a/ServiceHost/Areas/Client/Pages/Company/Reports/PrintAllCheckoutReport.cshtml b/ServiceHost/Areas/Client/Pages/Company/Reports/PrintAllCheckoutReport.cshtml index 591412c4..ca756a4c 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Reports/PrintAllCheckoutReport.cshtml +++ b/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 @@ - + - + } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs index 97c10c4e..87bd3be9 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs +++ b/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 diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalTakeImages.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalTakeImages.cshtml index 29915924..62ce25d7 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalTakeImages.cshtml +++ b/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; - + }
@@ -92,7 +93,11 @@
- + @*
- + @*
*@ @if (Model.HasPicture) { - + }
@@ -215,10 +224,11 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/Ticket/Index.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/Ticket/Index.cshtml.cs index eea136a1..462dcba0 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Ticket/Index.cshtml.cs +++ b/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; - //searchModel.PageIndex = 0; - //TicketList = _ticketApplication.GetTicketsForClients(searchModel); - //PageIndex = TicketList.Count; - var workshopId = _passwordHasher.SlugDecrypt(User.FindFirstValue("WorkshopSlug")); - WorkshopFullName = _workshopApplication.GetDetails(workshopId).WorkshopFullName; - TypesCountOfTicketViewModel = _ticketApplication.GetTypesCountOfTicketForClient(workshopId); + var workshopHash = User.FindFirstValue("WorkshopSlug"); + var workshopId = _passwordHasher.SlugDecrypt(workshopHash); + + if (workshopId > 0) + { + HasListTickets = _ticketApplication.GetTicketsForClients(searchModel).Count > 0; + //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) diff --git a/ServiceHost/Areas/Client/Pages/Company/Workshop/Employees.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/Workshop/Employees.cshtml.cs index 781cc3f6..12cb2940 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Workshop/Employees.cshtml.cs +++ b/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 id = _passwordHasher.SlugDecrypt(workshopSlugCliam); - if (id > 0) + var workshop = _workshopApplication.GetWorkshopInfo(id); + WorkshopFullName = workshop.WorkshopFullName; + WorkshopId = workshop.Id; + + var personnelSearchModel = new PersonnelInfoSearchModel() { - var workshop = _workshopApplication.GetWorkshopInfo(id); - WorkshopFullName = workshop.WorkshopFullName; - WorkshopId = workshop.Id; + WorkshopId = id, + }; - var personnelSearchModel = new PersonnelInfoSearchModel() - { - WorkshopId = id, - }; + var result = _workshopApplication.GetPersonnelInfo(personnelSearchModel); - 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)) - r = r.Where(x => x.FullName.Contains(searchModel.EmployeeFullName)).ToList(); + if (!string.IsNullOrWhiteSpace(searchModel.NationalCode)) + r = r.Where(x => x.NationalCode.Contains(searchModel.NationalCode)).ToList(); - if (!string.IsNullOrWhiteSpace(searchModel.NationalCode)) - 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 + Employees = new PersonnelInfoViewModel() { - NotFound(); - } + PersonnelInfoViewModels = r.OrderBy(x => x.Black ? 1 : 0).ThenBy(x => x.PersonnelCode).ToList(), + }; + + HasEmployees = Employees.PersonnelInfoViewModels.Count > 0 ? true : false; } else { - BadRequest(); + NotFound(); } } diff --git a/ServiceHost/Areas/Client/Pages/Company/Workshop/PrintOnePersonnelInfo.cshtml b/ServiceHost/Areas/Client/Pages/Company/Workshop/PrintOnePersonnelInfo.cshtml index c2929da0..68e18df8 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Workshop/PrintOnePersonnelInfo.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Workshop/PrintOnePersonnelInfo.cshtml @@ -1,614 +1,600 @@ @model CompanyManagment.App.Contracts.Employee.EditEmployee @{ int i = 1; - -} - + } +
@@ -681,7 +667,7 @@
-
+
@@ -696,7 +682,7 @@
-
+
موسسه نور دادمهر گستر کاسپین @@ -704,9 +690,9 @@
-
-

www.gozareshgir.ir

-

سامانه هوشمند گزارشگیر

+
+ +