From 8d9cf99e5f73f23878002944366a59b50d28214c Mon Sep 17 00:00:00 2001 From: SamSys Date: Sun, 8 Sep 2024 20:33:16 +0330 Subject: [PATCH] rollcall poya version 0 --- 0_Framework/Application/Version.cs | 6 +- .../RollCallAgg/IRollCallRepository.cs | 4 +- .../RollCall/AbsentEmployeeViewModel.cs | 1 + .../CheckoutDailyRollCallViewModel.cs | 4 +- .../EmployeeRollCallsByMonthViewModel.cs | 17 + .../RollCall/IRollCallApplication.cs | 8 +- .../RollCall/RollCallViewModel.cs | 35 +- .../RollCall/RollCallsByDateViewModel.cs | 2 + .../RollCallApplication.cs | 62 +- .../Repository/RollCallRepository.cs | 596 ++- .../Repository/YearlySalaryRepository.cs | 2 +- .../Company/Checkouts/CheckoutPrintAll.cshtml | 9 +- .../Pages/Company/Checkouts/Index.cshtml.cs | 4 +- .../Pages/Company/Checkouts/PrintAll.cshtml | 4158 ++++++++++------- .../Pages/Company/Checkouts/PrintOne.cshtml | 159 +- .../Company/Checkouts/PrintOneRollCall.cshtml | 74 +- .../_Partials/PrintDetailsRollCallRaw.cshtml | 445 ++ .../Employees/ContractCheckoutStatus.cshtml | 14 +- .../Company/Partial/_EmptySection.cshtml | 2 +- .../Company/Profile/ChangePassword.cshtml | 176 +- .../Pages/Company/RollCall/CaseHistory.cshtml | 199 +- .../Company/RollCall/CaseHistory.cshtml.cs | 54 +- .../Pages/Company/RollCall/CurrentDay.cshtml | 349 +- .../Company/RollCall/CurrentDay.cshtml.cs | 131 +- .../RollCall/EmployeeUploadPicture.cshtml.cs | 11 +- .../Pages/Company/RollCall/Index.cshtml | 63 +- .../RollCall/ModalCameraAccount.cshtml | 2 +- .../Company/RollCall/ModalOTPAction.cshtml | 2 +- .../Pages/Company/RollCall/Plans.cshtml | 229 +- .../Pages/Company/RollCall/Plans.cshtml.cs | 45 +- .../Company/Ticket/DetailTicketModal.cshtml | 4 +- ServiceHost/Areas/Client/Pages/Index.cshtml | 44 +- .../Areas/Client/Pages/LeaveCreate.cshtml | 659 +-- .../Areas/Client/Pages/LeaveList.cshtml | 499 +- ServiceHost/ServiceHost.csproj | 35 +- ServiceHost/wwwroot/AssetsClient/css/card.css | 4 + .../AssetsClient/css/rollcall-list-table.css | 262 +- .../AssetsClient/css/rollcall-package.css | 20 + .../wwwroot/AssetsClient/css/style.css | 6 +- .../ticket-global/ticket-create-global.css | 1 + .../wwwroot/AssetsClient/images/addUser.png | Bin 0 -> 1655 bytes .../AssetsClient/images/changePlan.png | Bin 0 -> 918 bytes .../AssetsClient/images/extensionPlan.png | Bin 0 -> 1954 bytes .../AssetsClient/images/icons/boxes.png | Bin 0 -> 6828 bytes .../images/icons/image-rollcall.png | Bin 0 -> 20160 bytes .../js/Ticket/detailTicketModal.js | 6 +- .../pages/Checkouts/css/PrintOneRollCall.css | 313 ++ .../pages/Checkouts/js/PrintOneRollCall.js | 20 + .../pages/Index/css/LeaveList.css | 95 + .../pages/Index/js/LeaveCreate.js | 630 +++ .../AssetsClient/pages/Index/js/LeaveList.js | 368 ++ .../pages/Profile/js/ChangePassword.js | 163 + .../pages/RollCall/js/CaseHistory.js | 457 +- .../pages/RollCall/js/CurrentDay.js | 192 +- .../AssetsClient/pages/RollCall/js/Index.js | 4 + .../AssetsClient/pages/RollCall/js/Plans.js | 56 +- 56 files changed, 6671 insertions(+), 4030 deletions(-) create mode 100644 CompanyManagment.App.Contracts/RollCall/EmployeeRollCallsByMonthViewModel.cs create mode 100644 ServiceHost/Areas/Client/Pages/Company/Checkouts/_Partials/PrintDetailsRollCallRaw.cshtml create mode 100644 ServiceHost/wwwroot/AssetsClient/images/addUser.png create mode 100644 ServiceHost/wwwroot/AssetsClient/images/changePlan.png create mode 100644 ServiceHost/wwwroot/AssetsClient/images/extensionPlan.png create mode 100644 ServiceHost/wwwroot/AssetsClient/images/icons/boxes.png create mode 100644 ServiceHost/wwwroot/AssetsClient/images/icons/image-rollcall.png create mode 100644 ServiceHost/wwwroot/AssetsClient/pages/Checkouts/css/PrintOneRollCall.css create mode 100644 ServiceHost/wwwroot/AssetsClient/pages/Checkouts/js/PrintOneRollCall.js create mode 100644 ServiceHost/wwwroot/AssetsClient/pages/Index/css/LeaveList.css create mode 100644 ServiceHost/wwwroot/AssetsClient/pages/Index/js/LeaveCreate.js create mode 100644 ServiceHost/wwwroot/AssetsClient/pages/Index/js/LeaveList.js create mode 100644 ServiceHost/wwwroot/AssetsClient/pages/Profile/js/ChangePassword.js diff --git a/0_Framework/Application/Version.cs b/0_Framework/Application/Version.cs index 8a29490d..96c34de0 100644 --- a/0_Framework/Application/Version.cs +++ b/0_Framework/Application/Version.cs @@ -10,9 +10,9 @@ public static class Version { static Version() { - StyleVersion = "2.12.05"; - AdminVersion = "2.5.25"; - CameraVersion = "1.0.3"; + StyleVersion = "2.12.06"; + AdminVersion = "2.5.26"; + CameraVersion = "1.0.4"; } public static string StyleVersion { get; set; } diff --git a/Company.Domain/RollCallAgg/IRollCallRepository.cs b/Company.Domain/RollCallAgg/IRollCallRepository.cs index 68a8551e..a95d44df 100644 --- a/Company.Domain/RollCallAgg/IRollCallRepository.cs +++ b/Company.Domain/RollCallAgg/IRollCallRepository.cs @@ -18,7 +18,9 @@ namespace Company.Domain.RollCallAgg List Search(RollCallSearchModel searchModel); CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId); List GetEmployeeRollCallsForMonth(long employeeId, long workshopId, DateTime startDate, DateTime endDate); - long Flag(long employeeId, long workshopId); + EmployeeRollCallsByMonthViewModel GetEmployeeRollCallsHistory(long employeeId, long workshopId, + DateTime? startDateTime, DateTime? endDateTime, DateTime? exactDateTime, DateTime? monthIndex); + long Flag(long employeeId, long workshopId); } diff --git a/CompanyManagment.App.Contracts/RollCall/AbsentEmployeeViewModel.cs b/CompanyManagment.App.Contracts/RollCall/AbsentEmployeeViewModel.cs index 227976ac..47a27594 100644 --- a/CompanyManagment.App.Contracts/RollCall/AbsentEmployeeViewModel.cs +++ b/CompanyManagment.App.Contracts/RollCall/AbsentEmployeeViewModel.cs @@ -5,6 +5,7 @@ public class AbsentEmployeeViewModel public long EmployeeId { get; set; } public string EmployeeFullName { get; set; } public string PersonnelCode { get; set; } + public bool HasLeave { get; set; } public string Reason { get; set; } } \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/RollCall/CheckoutDailyRollCallViewModel.cs b/CompanyManagment.App.Contracts/RollCall/CheckoutDailyRollCallViewModel.cs index 1d50c1a2..5f0e18e9 100644 --- a/CompanyManagment.App.Contracts/RollCall/CheckoutDailyRollCallViewModel.cs +++ b/CompanyManagment.App.Contracts/RollCall/CheckoutDailyRollCallViewModel.cs @@ -13,8 +13,8 @@ namespace CompanyManagment.App.Contracts.RollCall public DateTime DateTimeGr { get; set; } //منقطع بودن شیفت کاری public bool IsSliced { get; set; } - public TimeSpan TotalhourseSpan{ get; set; } - public string TotalWorkingHours { get; set; } + public TimeSpan TotalhourseSpan { get; set; } + public string TotalWorkingHours { get; set; } public string DayOfWeek { get; set; } diff --git a/CompanyManagment.App.Contracts/RollCall/EmployeeRollCallsByMonthViewModel.cs b/CompanyManagment.App.Contracts/RollCall/EmployeeRollCallsByMonthViewModel.cs new file mode 100644 index 00000000..ff650aa4 --- /dev/null +++ b/CompanyManagment.App.Contracts/RollCall/EmployeeRollCallsByMonthViewModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CompanyManagment.App.Contracts.RollCall +{ + public class EmployeeRollCallsByMonthViewModel + { + public DateTime DateGr { get; set; } + public string PersianYear { get; set; } + public string PersianMonthName { get; set; } + + public IEnumerable RollCalls { get; set; } + } +} diff --git a/CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs b/CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs index f428ab47..9ed7c80e 100644 --- a/CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs +++ b/CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs @@ -13,10 +13,12 @@ namespace CompanyManagment.App.Contracts.RollCall OperationResult Edit(long id); EditRollCall GetByEmployeeIdAndWorkshopId(long employeeId, long workshopId); - List GetEmployeeRollCallsForMonth(long employeeId, long workshopId, - DateTime startDate, DateTime endDate); + List GetActiveEmployeeRollCallsForDuration(long employeeId, long workshopId, + string startDate, string endDate); + EmployeeRollCallsByMonthViewModel GetEmployeeRollCallsHistory(long employeeId, long workshopId, + string startDateTime, string endDateTime, string exactDateTime, string dateIndex); - EditRollCall GetById(long id); + EditRollCall GetById(long id); List Search(RollCallSearchModel searchModel); List GetCurrentDay(RollCallSearchModel searchModel); List GetHistoryCase(RollCallSearchModel searchModel); diff --git a/CompanyManagment.App.Contracts/RollCall/RollCallViewModel.cs b/CompanyManagment.App.Contracts/RollCall/RollCallViewModel.cs index ee1b87b2..2a695d35 100644 --- a/CompanyManagment.App.Contracts/RollCall/RollCallViewModel.cs +++ b/CompanyManagment.App.Contracts/RollCall/RollCallViewModel.cs @@ -5,23 +5,30 @@ namespace CompanyManagment.App.Contracts.RollCall; public class RollCallViewModel { - public long Id { get; set; } - public long WorkshopId { get; set; } - public string Reason { get; set; } - public long EmployeeId { get; set; } - public string PersonnelCode { get; set; } - public string EmployeeFullName { get; set; } - public DateTime? StartDate { get; set; } + public long Id { get; set; } + public long WorkshopId { get; set; } + public string Reason { get; set; } + public long EmployeeId { get; set; } + public string PersonnelCode { get; set; } + public string EmployeeFullName { get; set; } + public string DateFa { get; set; } + public DateTime DateGr { get; set; } + public DateTime? StartDate { get; set; } public DateTime? EndDate { get; set; } - public string DateFa { get; set; } - public DateTime DateGr { get; set; } - public int Year { get; set; } - public int Month { get; set; } public TimeSpan ShiftSpan { get; set; } public DateTime CreationDate { get; set; } - - public string StartDateFa { get; set; } + public string StartDateFa { get; set; } public string EndDateFa { get; set; } public IEnumerable RollCallTimesList { get; set; } - public double TotalWorkingHours { get; set; } + public TimeSpan TotalWorkingHoursSpan { get; set; } + public string TotalWorkingHours { get; set; } + + + public int Year { get; set; } + public int Month { get; set; } + public bool IsAbsent { get; set; } + public bool HasLeave { get; set; } + public DateTime? DateIndex { get; set; } + public string DayOfWeekFa { get; set; } + public bool IsHoliday { get; set; } } \ No newline at end of file diff --git a/CompanyManagment.App.Contracts/RollCall/RollCallsByDateViewModel.cs b/CompanyManagment.App.Contracts/RollCall/RollCallsByDateViewModel.cs index bb1355b1..6f9c54e6 100644 --- a/CompanyManagment.App.Contracts/RollCall/RollCallsByDateViewModel.cs +++ b/CompanyManagment.App.Contracts/RollCall/RollCallsByDateViewModel.cs @@ -8,5 +8,7 @@ namespace CompanyManagment.App.Contracts.RollCall public string DateFa { get; set; } public DateTime DateGr { get; set; } public IEnumerable ActiveEmployees { get; set; } + public string DayOfWeekFa { get; set; } + public bool IsHoliday { get; set; } } } diff --git a/CompanyManagment.Application/RollCallApplication.cs b/CompanyManagment.Application/RollCallApplication.cs index a780edbc..c9a126d6 100644 --- a/CompanyManagment.Application/RollCallApplication.cs +++ b/CompanyManagment.Application/RollCallApplication.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using _0_Framework.Application; using Company.Domain.RollCallAgg; +using Company.Domain.RollCallEmployeeAgg; using CompanyManagment.App.Contracts.Employee; using CompanyManagment.App.Contracts.RollCall; @@ -14,11 +15,12 @@ public class RollCallApplication : IRollCallApplication { private readonly IRollCallRepository _rollCallRepository; private readonly IEmployeeApplication _employeeApplication; - - public RollCallApplication(IRollCallRepository rollCallRepository, IEmployeeApplication employeeApplication) + private readonly IRollCallEmployeeRepository _rollCallEmployeeRepository; + public RollCallApplication(IRollCallRepository rollCallRepository, IEmployeeApplication employeeApplication, IRollCallEmployeeRepository rollCallEmployeeRepository) { _rollCallRepository = rollCallRepository; _employeeApplication = employeeApplication; + _rollCallEmployeeRepository = rollCallEmployeeRepository; } public OperationResult Create(CreateRollCall command) @@ -52,16 +54,33 @@ public class RollCallApplication : IRollCallApplication { return _rollCallRepository.GetByEmployeeIdAndWorkshopId(employeeId, workshopId); } - - public List GetEmployeeRollCallsForMonth(long employeeId, long workshopId, DateTime startDate, DateTime endDate) + public EmployeeRollCallsByMonthViewModel GetEmployeeRollCallsHistory(long employeeId, long workshopId, string startDateTime, string endDateTime, string exactDateTime, + string dateIndex) { + DateTime? startDateTimeGr = null; + DateTime? endDateTimeGr = null; + if (!string.IsNullOrWhiteSpace(startDateTime) && !string.IsNullOrWhiteSpace(endDateTime)) + { + startDateTimeGr = startDateTime.ToGeorgianDateTime(); + endDateTimeGr = endDateTime.ToGeorgianDateTime(); + } - if (startDate >= endDate) - return new(); - - return _rollCallRepository.GetEmployeeRollCallsForMonth(employeeId, workshopId, startDate, endDate); + DateTime? exactDateTimeGr = + !string.IsNullOrWhiteSpace(exactDateTime) ? exactDateTime.ToGeorgianDateTime() : null; + DateTime? index; + try + { + index = DateTime.Parse(dateIndex); + } + catch + { + index = null; + } + return _rollCallRepository.GetEmployeeRollCallsHistory(employeeId, workshopId, startDateTimeGr, endDateTimeGr, exactDateTimeGr, index); } + + public EditRollCall GetById(long id) { return _rollCallRepository.GetById(id); @@ -82,17 +101,34 @@ public class RollCallApplication : IRollCallApplication return _rollCallRepository.GetCurrentDay(searchModel); } - public CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId) - { - return _rollCallRepository.GetWorkshopCurrentDayRollCalls(workshopId); - } + public RollCallsByDateViewModel GetWorkshopRollCallHistory(RollCallSearchModel searchModel) { return _rollCallRepository.GetWorkshopRollCallHistory(searchModel); } + public CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId) + { + return _rollCallRepository.GetWorkshopCurrentDayRollCalls(workshopId); + } + public List GetActiveEmployeeRollCallsForDuration(long employeeId, long workshopId, string startDate, + string endDate) + { + if (!string.IsNullOrWhiteSpace(startDate) || !string.IsNullOrWhiteSpace(endDate)) + return new(); - public long Flag(long employeeId, long workshopId) + var startDateGr = startDate.ToGeorgianDateTime(); + var endDateGr = endDate.ToGeorgianDateTime(); + + if (startDateGr >= endDateGr) + return new(); + + //if (!_rollCallEmployeeRepository.Exists(x => x.EmployeeId == employeeId && + // x.WorkshopId == workshopId && x.IsActiveString == "true")) + // return new(); + return _rollCallRepository.GetEmployeeRollCallsForMonth(employeeId, workshopId, startDateGr, endDateGr); + } + public long Flag(long employeeId, long workshopId) { return _rollCallRepository.Flag(employeeId, workshopId); } diff --git a/CompanyManagment.EFCore/Repository/RollCallRepository.cs b/CompanyManagment.EFCore/Repository/RollCallRepository.cs index 1890c3aa..8ca1acaf 100644 --- a/CompanyManagment.EFCore/Repository/RollCallRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallRepository.cs @@ -5,7 +5,9 @@ using System.Linq; using _0_Framework.Application; using _0_Framework.InfraStructure; using Company.Domain.RollCallAgg; +using CompanyManagment.App.Contracts.HolidayItem; using CompanyManagment.App.Contracts.RollCall; +using MD.PersianDateTime.Standard; using Microsoft.EntityFrameworkCore; namespace CompanyManagment.EFCore.Repository; @@ -13,10 +15,12 @@ namespace CompanyManagment.EFCore.Repository; public class RollCallRepository : RepositoryBase, IRollCallRepository { private readonly CompanyContext _context; - public RollCallRepository(CompanyContext context) : base(context) - { - _context = context; - } + private readonly IHolidayItemApplication _holidayItemApplication; + public RollCallRepository(CompanyContext context, IHolidayItemApplication holidayItemApplication) : base(context) + { + _context = context; + _holidayItemApplication = holidayItemApplication; + } public EditRollCall GetByEmployeeIdAndWorkshopId(long employeeId, long workshopId) { @@ -83,277 +87,439 @@ public class RollCallRepository : RepositoryBase, IRollCallRepos { throw new NotImplementedException(); } - #region Pooya - //حضور غیاب فیش حقوقی - public List GetEmployeeRollCallsForMonth(long employeeId, long workshopId, DateTime startMonthDay, DateTime endMonthDay) - { + #region Pooya + //حضور غیاب فیش حقوقی + public List GetEmployeeRollCallsForMonth(long employeeId, long workshopId, DateTime startMonthDay, DateTime endMonthDay) + { - var rollCalls = _context.RollCalls.Where(x => - x.EmployeeId == employeeId && x.WorkshopId == workshopId && x.StartDate != null && x.EndDate != null && - x.StartDate.Value.Date >= startMonthDay && x.StartDate.Value.Date <= endMonthDay).ToList(); + var rollCalls = _context.RollCalls.Where(x => + x.EmployeeId == employeeId && x.WorkshopId == workshopId && x.StartDate != null && x.EndDate != null && + x.StartDate.Value.Date >= startMonthDay && x.StartDate.Value.Date <= endMonthDay).ToList(); - var year = Convert.ToInt32(startMonthDay.ToFarsi().Substring(0, 4)); - var month = Convert.ToInt32(startMonthDay.ToFarsi().Substring(5, 2)); - var firstDayOfCurrentMonth = new DateTime(year, month, 1, new PersianCalendar()); + var year = Convert.ToInt32(startMonthDay.ToFarsi().Substring(0, 4)); + var month = Convert.ToInt32(startMonthDay.ToFarsi().Substring(5, 2)); + var firstDayOfCurrentMonth = new DateTime(year, month, 1, new PersianCalendar()); - if (month == 12) - { - year += 1; - month = 1; - } - else - month += 1; + if (month == 12) + { + year += 1; + month = 1; + } + else + month += 1; + + var nextMonthDate = new DateTime(year, month, 1, new PersianCalendar()); + + var lastDayOfCurrentMonth = nextMonthDate.AddDays(-1); + + int dateRange = (int)(lastDayOfCurrentMonth - firstDayOfCurrentMonth).TotalDays + 1; + + //all the dates from start to end, to be compared with present days to get absent dates + var completeDaysList = Enumerable.Range(0, dateRange).Select(offset => startMonthDay.AddDays(offset).Date); + + var absentRecords = completeDaysList + .ExceptBy(rollCalls.Select(x => x.StartDate!.Value.Date), y => y.Date.Date) + .Select(x => new CheckoutDailyRollCallViewModel() + { + StartDate = null, + EndDate = null, + DateTimeGr = x.Date.Date, + DayOfWeek = x.Date.DayOfWeek.ToString(), + RollCallDateFa = x.Date.ToFarsi() + }); + + var presentDays = rollCalls.GroupBy(x => x.StartDate!.Value.Date).Select(x => new CheckoutDailyRollCallViewModel() + { + StartDate = x.Min(y => y.StartDate)!.Value.ToString("HH:mm"), + EndDate = x.Max(y => y.EndDate)!.Value.ToString("HH:mm"), + TotalhourseSpan = new TimeSpan(x.Where(y => y.EndDate != null).Sum(y => (y.EndDate - y.StartDate)!.Value.Ticks)), + DayOfWeek = x.Key.DayOfWeek.DayOfWeeKToPersian(), + RollCallDateFa = x.Key.Date.ToFarsi(), + DateTimeGr = x.Key.Date, + IsSliced = x.Count() > 1 + }); + + presentDays = presentDays.Select(x => new CheckoutDailyRollCallViewModel + { + StartDate = x.StartDate, + EndDate = x.EndDate, + TotalWorkingHours = $"{Convert.ToInt32(x.TotalhourseSpan.TotalHours)}:{x.TotalhourseSpan.Minutes.ToString("00")}", + DayOfWeek = x.DayOfWeek, + RollCallDateFa = x.RollCallDateFa, + DateTimeGr = x.DateTimeGr, + IsSliced = x.IsSliced, - var nextMonthDate = new DateTime(year, month, 1, new PersianCalendar()); + }); - var lastDayOfCurrentMonth = nextMonthDate.AddDays(-1); + return presentDays.Concat(absentRecords).OrderBy(x => x.DateTimeGr).ToList(); - int dateRange = (int)(lastDayOfCurrentMonth - firstDayOfCurrentMonth).TotalDays + 1; + } - //all the dates from start to end, to be compared with present days to get absent dates - var completeDaysList = Enumerable.Range(0, dateRange).Select(offset => startMonthDay.AddDays(offset).Date); + //جستجوی سوابق حضور غیاب بر اساس کارمند + public EmployeeRollCallsByMonthViewModel GetEmployeeRollCallsHistory(long employeeId, long workshopId, + DateTime? startDateTime, DateTime? endDateTime, DateTime? exactDateTime, DateTime? dateIndex) + { - var absentRecords = completeDaysList - .ExceptBy(rollCalls.Select(x => x.StartDate!.Value.Date), y => y.Date.Date) - .Select(x => new CheckoutDailyRollCallViewModel() - { - StartDate = null, - EndDate = null, - DateTimeGr = x.Date.Date, - DayOfWeek = x.Date.DayOfWeek.ToString(), - - RollCallDateFa = x.Date.ToFarsi() - }); - var presentDays = rollCalls.GroupBy(x => x.StartDate!.Value.Date).Select(x => new CheckoutDailyRollCallViewModel() - { - StartDate = x.Min(y => y.StartDate)!.Value.ToString("HH:mm"), - EndDate = x.Max(y => y.EndDate)!.Value.ToString("HH:mm"), - TotalhourseSpan = new TimeSpan(x.Where(y => y.EndDate != null).Sum(y => (y.EndDate - y.StartDate)!.Value.Ticks)), - DayOfWeek = x.Key.DayOfWeek.DayOfWeeKToPersian(), - RollCallDateFa = x.Key.Date.ToFarsi(), - DateTimeGr = x.Key.Date, - IsSliced = x.Count() > 1 - }); + var employeeRollCallStatuses = _context.RollCallEmployees.Include(x => x.EmployeesStatus) + .FirstOrDefault(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId); + + if (employeeRollCallStatuses == null) + return new(); + + var activeMonths = new List(); + + foreach (var status in employeeRollCallStatuses.EmployeesStatus) + { + var persianEndDayOfMonth = new PersianDateTime(status.EndDate.Date); + var persianStartDayOfMonth = new PersianDateTime(status.StartDate.Date); + + //var persianEndFirstDayOfMonth = + // new PersianDateTime(persianEndDayOfMonth.Year, persianEndDayOfMonth.Month, 1); + var persianStartFirstDayOfMonth = new PersianDateTime(persianStartDayOfMonth.Year, persianStartDayOfMonth.Month, 1); + for (PersianDateTime start = persianStartFirstDayOfMonth; start <= persianEndDayOfMonth; start = start.AddMonths(1)) + { + activeMonths.Add(start); + + } + } + var activeMonthsList = activeMonths.Distinct().ToList(); + + PersianDateTime startSearch; + PersianDateTime endSearch; + + if (startDateTime.HasValue && endDateTime.HasValue) + { + startSearch = new PersianDateTime(startDateTime.Value); + endSearch = new PersianDateTime(endDateTime.Value); + + activeMonthsList = activeMonthsList.Where(x => x.Date >= startSearch && x.Date <= endSearch).ToList(); + } + + if (exactDateTime.HasValue) + { + startSearch = new PersianDateTime(exactDateTime.Value); + endSearch = startSearch; + } + //else + //{ + // startSearch = employeeRollCallStatuses.EmployeesStatus.Max(x => x.StartDate.Date).To; + // endSearch = employeeRollCallStatuses.EmployeesStatus.Min(x => x.EndDate.Date); + //} + + + //var statusesByMonth = + // employeeRollCallStatuses.EmployeesStatus + // .GroupBy(x => new DateTime(Convert.ToInt32(x.StartDate.ToFarsi().Substring(0, 4)), Convert.ToInt32(x.StartDate.ToFarsi().Substring(5, 2)), 1, new PersianCalendar()).Date) + // .OrderByDescending(x => x.Key); + if (dateIndex != null) + { + var persianDateIndex = new PersianDateTime(dateIndex.Value); + var dateIndexFirstOfMonth = persianDateIndex.AddDays(-(persianDateIndex.Day - 1)); + activeMonthsList = activeMonthsList.Where(x => dateIndexFirstOfMonth == x).OrderByDescending(x => x).ToList(); + } + + if (!activeMonthsList.Any()) return new(); + + + //get the last month which user was active in + PersianDateTime selectedMonthPersian = activeMonthsList.First(); + + DateTime selectedMonthFirstDay = selectedMonthPersian; + DateTime nextMonthFirstDay = selectedMonthPersian.AddMonths(1); + + var statusesOfMonth = employeeRollCallStatuses.EmployeesStatus.Where(x => x.EndDate >= selectedMonthFirstDay && + x.StartDate < nextMonthFirstDay); - presentDays = presentDays.Select(x => new CheckoutDailyRollCallViewModel - { - StartDate = x.StartDate, - EndDate = x.EndDate, - TotalWorkingHours = $"{Convert.ToInt32(x.TotalhourseSpan.TotalHours)}:{x.TotalhourseSpan.Minutes.ToString("00")}", - DayOfWeek = x.DayOfWeek, - RollCallDateFa = x.RollCallDateFa, - DateTimeGr = x.DateTimeGr, - IsSliced = x.IsSliced, - }); - return presentDays.Concat(absentRecords).OrderBy(x => x.DateTimeGr).ToList(); + var leavesQuery = + _context.LeaveList.Where(x => (x.LeaveType == "استعلاجی" || (x.LeaveType == "استحقاقی" && x.PaidLeaveType == "روزانه")) && + x.IsAccepted && + x.EndLeave >= selectedMonthFirstDay && x.StartLeave < nextMonthFirstDay && x.WorkshopId == workshopId); - } + var rollCalls = _context.RollCalls.Where(x => + !leavesQuery.Any(y => + y.StartLeave.Date <= x.StartDate.Value.Date && y.EndLeave.Date >= x.StartDate.Value.Date) && + x.EmployeeId == employeeId && x.WorkshopId == workshopId && x.StartDate != null && x.EndDate != null && + x.StartDate >= selectedMonthFirstDay && x.StartDate < nextMonthFirstDay); - //سوابق حضور غیاب کارگاه - public RollCallsByDateViewModel GetWorkshopRollCallHistory(RollCallSearchModel searchModel) - { + var rollCallsList = rollCalls.ToList(); + var leavesList = leavesQuery.ToList(); - //initialize + int dateRange = (int)(nextMonthFirstDay - selectedMonthFirstDay).TotalDays; - DateTime searchDurationStart = DateTime.Now.AddDays(-1).Date; - DateTime searchDurationEnd = searchDurationStart.AddDays(-16); + //all the dates from start to end, to be compared with present days to get absent dates + var completeDaysList = Enumerable.Range(0, dateRange).Select(offset => selectedMonthFirstDay.AddDays(offset).Date); + var result = completeDaysList.Where(x => statusesOfMonth.Any(y => x >= y.StartDate.Date && x <= y.EndDate.Date)) + .Select(x => new RollCallViewModel() + { + DateGr = x.Date.Date, + DateFa = x.Date.Date.ToFarsi(), + RollCallTimesList = rollCallsList.Where(y => x.Date.Date == y.StartDate!.Value.Date).Select(y => + new RollCallTimeViewModel() + { + StartDate = y.StartDate.Value.ToString("HH:mm"), + EndDate = y.EndDate!.Value.ToString("HH:mm") + }), + TotalWorkingHoursSpan = new TimeSpan(rollCallsList.Where(y => x.Date.Date == y.StartDate!.Value.Date) + .Sum(y => (y.EndDate!.Value - y.StartDate.Value).Ticks)), + Reason = leavesList.FirstOrDefault(y => y.EndLeave >= x.Date.Date && y.StartLeave <= x.Date.Date)?.LeaveType ?? "" + }); + result = result.Select(x => new RollCallViewModel() + { + DateGr = x.DateGr, + DateFa = x.DateFa, + DayOfWeekFa = x.DateGr.DayOfWeek.DayOfWeeKToPersian(), + IsHoliday = _holidayItemApplication.IsHoliday(x.DateGr), + RollCallTimesList = x.RollCallTimesList, + TotalWorkingHours = $"{Convert.ToInt32(x.TotalWorkingHoursSpan.TotalHours)}:{x.TotalWorkingHoursSpan.Minutes.ToString("00")}", + DateIndex = activeMonthsList.Count > 2 ? activeMonthsList.Skip(1).First().ToDateTime() : null + }).ToList(); + return new EmployeeRollCallsByMonthViewModel() + { + PersianMonthName = selectedMonthPersian.ToString("MMMM"), + PersianYear = selectedMonthPersian.ToString("yyyy"), + DateGr = selectedMonthFirstDay, + RollCalls = result + }; + } + + //سوابق حضور غیاب کارگاه + //dateIndex starts at 0 + public RollCallsByDateViewModel GetWorkshopRollCallHistory(RollCallSearchModel searchModel) + { + + //initialize + + DateTime searchDurationEnd = DateTime.Now.AddDays(-1).Date; + DateTime searchDurationStart = searchDurationEnd.AddDays(-16); + + + + //override if user has entered inputs (dates must be validated in the application layer) + if (!string.IsNullOrWhiteSpace(searchModel.StarDateFa) && !string.IsNullOrWhiteSpace(searchModel.StarDateFa)) + { + searchDurationEnd = searchModel.EndDateFa.ToGeorgianDateTime().Date; + searchDurationStart = searchModel.StarDateFa.ToGeorgianDateTime().AddDays(-1).Date; + } + + + + else + if (!string.IsNullOrWhiteSpace(searchModel.ExactDateFa)) + { + searchDurationEnd = searchModel.ExactDateFa.ToGeorgianDateTime().Date; + searchDurationStart = searchModel.ExactDateFa.ToGeorgianDateTime().AddDays(-1).Date; + } + + + if (searchDurationEnd < searchDurationStart) + return new(); - //override if user has entered inputs (dates must be validated in the application layer) - if (!string.IsNullOrWhiteSpace(searchModel.StarDateFa) && !string.IsNullOrWhiteSpace(searchModel.StarDateFa)) - { - searchDurationStart = searchModel.StarDateFa.ToGeorgianDateTime().Date; - searchDurationEnd = searchModel.EndDateFa.ToGeorgianDateTime().AddDays(-1).Date; - } + DateTime dateIndex = searchDurationEnd.AddDays(-1 * (searchModel.DateIndex)).Date; + + if (dateIndex <= searchDurationStart) + return new(); - else - if (!string.IsNullOrWhiteSpace(searchModel.ExactDateFa)) - { - searchDurationStart = searchModel.ExactDateFa.ToGeorgianDateTime().Date; - searchDurationEnd = searchModel.ExactDateFa.ToGeorgianDateTime().AddDays(-1).Date; - } + //get leaves for workshop that have been activated in dateIndex date + var leavesQuery = _context.LeaveList.Where(x => x.WorkshopId == searchModel.WorkshopId && + x.IsAccepted && (x.LeaveType == "استعلاجی" || (x.LeaveType == "استحقاقی" && x.PaidLeaveType == "روزانه")) && + x.EndLeave.Date >= dateIndex && x.StartLeave.Date <= dateIndex); + + //roll calls for current workshop where shift start is in dateIndex date (filters today's shifts) + var rollCallsQuery = _context.RollCalls + .Where(x => x.WorkshopId == searchModel.WorkshopId && x.StartDate.HasValue && x.EndDate.HasValue && x.StartDate < DateTime.Now.Date && + x.StartDate.Value.Date == dateIndex.Date); + + + //get active employees of workshop in dateIndex date + var activeEmployeesQuery = + _context.RollCallEmployees.Include(x => x.EmployeesStatus) + .Where(x => x.WorkshopId == searchModel.WorkshopId && x.EmployeesStatus.Any(y => y.EndDate.Date >= dateIndex && y.StartDate.Date <= dateIndex)); - if (searchDurationStart < searchDurationEnd) - return new(); - DateTime dateIndex = searchDurationStart.AddDays(-1 * (searchModel.DateIndex)).Date; - if (dateIndex <= searchDurationEnd) - return new(); + if (searchModel.EmployeeId > 0) + { + rollCallsQuery = rollCallsQuery.Where(x => x.EmployeeId == searchModel.EmployeeId); + activeEmployeesQuery = activeEmployeesQuery.Where(x => x.EmployeeId == searchModel.EmployeeId); + leavesQuery = leavesQuery.Where(x => x.EmployeeId == searchModel.EmployeeId); + } - //get leaves for workshop that have been activated in dateIndex date - var leavesQuery = _context.LeaveList.Where(x => x.WorkshopId == searchModel.WorkshopId && - x.IsAccepted && (x.LeaveType == "استعلاجی" || (x.LeaveType == "استحقاقی" && x.PaidLeaveType == "روزانه")) && - x.EndLeave.Date >= dateIndex && x.StartLeave.Date <= dateIndex); + var personnelCodeList = + _context.PersonnelCodeSet.Where(x => activeEmployeesQuery.Any(y => y.EmployeeId == x.EmployeeId)); + var rollCallsList = rollCallsQuery.ToList(); + var activatedEmployeesList = activeEmployeesQuery.ToList(); + var leavesList = leavesQuery.ToList(); - //roll calls for current workshop where shift start is in dateIndex date (filters today's shifts) - var rollCallsQuery = _context.RollCalls - .Where(x => x.WorkshopId == searchModel.WorkshopId && x.StartDate.HasValue && x.EndDate.HasValue && x.StartDate < DateTime.Now.Date && - x.StartDate.Value.Date == dateIndex.Date); + rollCallsList = rollCallsList.Where(x => leavesList.All(y => y.EmployeeId != x.EmployeeId)).ToList(); + var result = new RollCallsByDateViewModel() + { + DateGr = dateIndex, + DayOfWeekFa = dateIndex.DayOfWeek.DayOfWeeKToPersian(), + IsHoliday = _holidayItemApplication.IsHoliday(dateIndex), + DateFa = dateIndex.ToFarsi(), + ActiveEmployees = activatedEmployeesList.Select(x => + { + var leave = leavesList.FirstOrDefault(y => y.EmployeeId == x.EmployeeId); + var employeeRollCallsForDate = rollCallsList.Where(y => y.EmployeeId == x.EmployeeId).ToList(); + return new RollCallViewModel() + { + EmployeeFullName = x.EmployeeFullName, + EmployeeId = x.EmployeeId, + Reason = leave == null ? "" : $"{leave.LeaveType}-{leave.PaidLeaveType}", + RollCallTimesList = employeeRollCallsForDate.Select(y => new RollCallTimeViewModel() + { + EndDate = y.EndDate!.Value.ToString("HH:mm"), + StartDate = y.StartDate!.Value.ToString("HH:mm") + }), + HasLeave = leave != null, + IsAbsent = !employeeRollCallsForDate.Any(), + TotalWorkingHoursSpan = new TimeSpan(employeeRollCallsForDate.Sum(y => (y.EndDate!.Value - y.StartDate!.Value).Ticks)), + PersonnelCode = personnelCodeList.FirstOrDefault(y => y.EmployeeId == x.EmployeeId)?.PersonnelCode.ToString() + }; + }) + }; + result.ActiveEmployees = result.ActiveEmployees.Select(x => new RollCallViewModel() + { + EmployeeFullName = x.EmployeeFullName, + EmployeeId = x.EmployeeId, + Reason = x.Reason, + RollCallTimesList = x.RollCallTimesList, + HasLeave = x.HasLeave, + IsAbsent = x.IsAbsent, + PersonnelCode = x.PersonnelCode, + TotalWorkingHours = $"{Convert.ToInt32(x.TotalWorkingHoursSpan.TotalHours)}:{x.TotalWorkingHoursSpan.Minutes.ToString("00")}" + }); + return result; + } - //get active employees of workshop in dateIndex date - var activeEmployeesQuery = - _context.RollCallEmployees.Include(x => x.EmployeesStatus) - .Where(x => x.WorkshopId == searchModel.WorkshopId && x.EmployeesStatus.Any(y => y.EndDate.Date >= dateIndex && y.StartDate.Date <= dateIndex)); + //گزارش آنلاین حضور غیاب کارگاه + public CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId) + { + var date = DateTime.Now.Date; + //get active leaves for workshop which are active today and accepted and are either روزانه and استحقاقی or استعلاجی + var leaves = _context.LeaveList.Where(x => x.WorkshopId == workshopId && x.EndLeave.Date >= date && x.StartLeave.Date <= date && + x.IsAccepted && (x.LeaveType == "استعلاجی" || (x.LeaveType == "استحقاقی" && x.PaidLeaveType == "روزانه"))); + var personnelCodes = _context.PersonnelCodeSet.Where(x => x.WorkshopId == workshopId).ToList(); - if (searchModel.EmployeeId > 0) - { - rollCallsQuery = rollCallsQuery.Where(x => x.EmployeeId == searchModel.EmployeeId); - activeEmployeesQuery = activeEmployeesQuery.Where(x => x.EmployeeId == searchModel.EmployeeId); - leavesQuery = leavesQuery.Where(x => x.EmployeeId == searchModel.EmployeeId); - } + //get currently working employees with leftWork table + //var workingEmployees = + // _context.LeftWorkList.Where(x => x.WorkshopId == workshopId && x.StartWorkDate < date && x.LeftWorkDate.Date > date); - var personnelCodeList = - _context.PersonnelCodeSet.Where(x => activeEmployeesQuery.Any(y => y.EmployeeId == x.EmployeeId)); - var rollCallsList = rollCallsQuery.ToList(); - var activatedEmployeesList = activeEmployeesQuery.ToList(); - var leavesList = leavesQuery.ToList(); - rollCallsList = rollCallsList.Where(x => leavesList.All(y => y.EmployeeId != x.EmployeeId)).ToList(); - var result = new RollCallsByDateViewModel() - { - DateGr = dateIndex, - DateFa = dateIndex.ToFarsi(), - ActiveEmployees = activatedEmployeesList.Select(x => - { - var leave = leavesList.FirstOrDefault(y => y.EmployeeId == x.EmployeeId); - var employeeRollCallsForDate = rollCallsList.Where(y => y.EmployeeId == x.EmployeeId).ToList(); + //get activated employees + var activeEmployees = + _context.RollCallEmployees.Include(x => x.EmployeesStatus) + .Where(x => x.WorkshopId == workshopId && x.EmployeesStatus.Any(y => + y.StartDate.Date <= date && + y.EndDate.Date >= date)); - return new RollCallViewModel() - { - EmployeeFullName = x.EmployeeFullName, - EmployeeId = x.EmployeeId, - Reason = leave == null ? "" : $"{leave.LeaveType}-{leave.PaidLeaveType}", - RollCallTimesList = employeeRollCallsForDate.Select(y => new RollCallTimeViewModel() - { - EndDate = y.EndDate!.Value.ToString("HH:mm:ss"), - StartDate = y.StartDate!.Value.ToString("HH:mm:ss") - }), - TotalWorkingHours = employeeRollCallsForDate.Sum(y => (y.EndDate!.Value - y.StartDate!.Value).TotalHours), - PersonnelCode = personnelCodeList.FirstOrDefault(y => y.EmployeeId == x.EmployeeId)?.PersonnelCode.ToString() - }; - }) - }; + //get today's roll calls + var rollCallsQuery = _context.RollCalls.Where(x => + x.WorkshopId == workshopId && x.StartDate.Value.Date == date); - return result; - } + //var mustBePresent = activeEmployees.Where(x => !leaves.Any(y => y.EmployeeId == x.EmployeeId) && + // workingEmployees.Any(y => y.EmployeeId == x.EmployeeId)); - //گزارش آنلاین حضور غیاب کارگاه - public CurrentDayRollCall GetWorkshopCurrentDayRollCalls(long workshopId) - { - //get today's roll calls - var rollCallsQuery = _context.RollCalls.Where(x => - x.WorkshopId == workshopId && x.StartDate.Value.Date == DateTime.Now.Date); - //get active leaves for workshop which are active today and accepted and are either روزانه and استحقاقی or استعلاجی - var leaves = _context.LeaveList.Where(x => x.WorkshopId == workshopId && x.EndLeave.Date >= DateTime.Now.Date && x.StartLeave.Date <= DateTime.Now.Date && - x.IsAccepted && (x.LeaveType == "استعلاجی" || (x.LeaveType == "استحقاقی" && x.PaidLeaveType == "روزانه"))); + var mustBePresent = activeEmployees.Where(x => !leaves.Any(y => y.EmployeeId == x.EmployeeId)); + + + //filter roll calls for active and currently working employees only + // var filteredRollCallQuery = rollCallsQuery.Where(x => mustBePresent + // .Any(y => x.EmployeeId == y.EmployeeId)) + //.Where(x => workingEmployees.Any(y => y.EmployeeId == x.EmployeeId)).ToList(); + + var filteredRollCallQuery = rollCallsQuery.Where(x => mustBePresent + .Any(y => x.EmployeeId == y.EmployeeId)).ToList(); + + + + //presents list is ready + var presentEmployees = filteredRollCallQuery.GroupBy(x => x.EmployeeId).Select(x => new RollCallViewModel() + { + PersonnelCode = personnelCodes + .FirstOrDefault(y => y.EmployeeId == x.Key)? + .PersonnelCode.ToString(), + EmployeeFullName = x.FirstOrDefault()!.EmployeeFullName, + EmployeeId = x.FirstOrDefault()!.EmployeeId, + + TotalWorkingHoursSpan = new TimeSpan(x.Where(y => y.EndDate != null).Sum(y => (y.EndDate!.Value - y.StartDate!.Value).Ticks)), + RollCallTimesList = x.Select(y => new RollCallTimeViewModel() + { + StartDate = y.StartDate!.Value.ToString("HH:mm"), + EndDate = y.EndDate?.ToString("HH:mm") + }).ToList() + + + }); + + presentEmployees = presentEmployees.Select(x => new RollCallViewModel() + { + PersonnelCode = x.PersonnelCode, + EmployeeFullName = x.EmployeeFullName, + EmployeeId = x.EmployeeId, + TotalWorkingHours = + $"{Convert.ToInt32(x.TotalWorkingHoursSpan.TotalHours)}:{x.TotalWorkingHoursSpan.Minutes.ToString("00")}", + RollCallTimesList = x.RollCallTimesList + }).ToList(); - //get currently working employees with leftWork table - var workingEmployees = - _context.LeftWorkList.Where(x => x.WorkshopId == workshopId && x.StartWorkDate < DateTime.Now.Date && x.LeftWorkDate.Date > DateTime.Now.Date); + //absent ones are those who are active and not on the roll call list + var absentsQuery = activeEmployees.AsEnumerable() + .ExceptBy(presentEmployees.Select(x => x.EmployeeId), e => e.EmployeeId).ToList(); - //get activated employees - var activeEmployees = - _context.RollCallEmployees.Include(x => x.EmployeesStatus) - .Where(x => x.WorkshopId == workshopId && x.EmployeesStatus.Any(y => - y.StartDate.Date <= DateTime.Now.Date && - y.EndDate.Date >= DateTime.Now.Date)); + //get today's active leaves + var employeesWithLeave = leaves.AsEnumerable() + .Where(x => absentsQuery.Any(y => y.EmployeeId == x.EmployeeId)) + .Select(x => new { x.EmployeeId, x.LeaveType }).ToList(); + //join leave and absents + var absentsViewModel = absentsQuery.Select(x => new AbsentEmployeeViewModel() + { + PersonnelCode = personnelCodes + .FirstOrDefault(y => y.EmployeeId == x.EmployeeId)? + .PersonnelCode.ToString(), + EmployeeId = x.EmployeeId, + EmployeeFullName = x.EmployeeFullName, + HasLeave = employeesWithLeave.Any(y => y.EmployeeId == x.EmployeeId), + Reason = employeesWithLeave.FirstOrDefault(y => y.EmployeeId == x.EmployeeId)?.LeaveType + }).ToList(); + return new CurrentDayRollCall() + { + AbsentEmployees = absentsViewModel.ToList(), + PresentEmployees = presentEmployees.ToList() + }; + } - var mustBePresent = activeEmployees.Where(x => !leaves.Any(y => y.EmployeeId == x.EmployeeId) && - workingEmployees.Any(y => y.EmployeeId == x.EmployeeId)); - - - - - //filter roll calls for active and currently working employees only - var filteredRollCallQuery = rollCallsQuery.Where(x => mustBePresent - .Any(y => x.EmployeeId == y.EmployeeId)) - .Where(x => workingEmployees.Any(y => y.EmployeeId == x.EmployeeId)).ToList(); - - - - - //presents list is ready - var presentEmployees = filteredRollCallQuery.GroupBy(x => x.EmployeeId).Select(x => new RollCallViewModel() - { - EmployeeFullName = x.FirstOrDefault()!.EmployeeFullName, - EmployeeId = x.FirstOrDefault()!.EmployeeId, - - TotalWorkingHours = x.Where(y => y.EndDate != null).Sum(y => (y.EndDate!.Value - y.StartDate!.Value).TotalHours), - RollCallTimesList = x.Select(y => new RollCallTimeViewModel() - { - StartDate = y.StartDate!.Value.ToString("HH:mm:ss"), - EndDate = y.EndDate?.ToString("HH:mm:ss") - }).ToList() - - - }).ToList(); - - //absent ones are those who are active and not on the roll call list - var absentsQuery = activeEmployees.AsEnumerable() - .ExceptBy(presentEmployees.Select(x => x.EmployeeId), e => e.EmployeeId).ToList(); - - - - //get today's active leaves - var employeesWithLeave = _context.LeaveList.Where(x => - x.EndLeave.Date >= DateTime.Now.Date && x.StartLeave.Date <= DateTime.Now.Date && - x.WorkshopId == workshopId && (x.LeaveType == "استعلاجی" || (x.LeaveType == "استحقاقی" && x.PaidLeaveType == "روزانه"))) - .AsEnumerable() - .Where(x => absentsQuery.Any(y => y.EmployeeId == x.EmployeeId)) - .Select(x => new { x.EmployeeId, x.LeaveType }).ToList(); - - //join leave and absents - var absentsViewModel = absentsQuery.Select(x => new AbsentEmployeeViewModel() - { - PersonnelCode = _context.PersonnelCodeSet - .FirstOrDefault(y => y.EmployeeId == x.EmployeeId && y.WorkshopId == workshopId) - !.PersonnelCode.ToString(), - EmployeeId = x.EmployeeId, - EmployeeFullName = x.EmployeeFullName, - Reason = employeesWithLeave.Any(y => y.EmployeeId == x.EmployeeId) - ? employeesWithLeave.FirstOrDefault(y => y.EmployeeId == x.EmployeeId)!.LeaveType - : "" - }).ToList(); - - return new CurrentDayRollCall() - { - AbsentEmployees = absentsViewModel.ToList(), - PresentEmployees = presentEmployees.ToList() - }; - } - - #endregion - public long Flag(long employeeId, long workshopId) + #endregion + public long Flag(long employeeId, long workshopId) { var checkDate = DateTime.Now.AddDays(-3); var query = _context.RollCalls diff --git a/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs b/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs index 6c9b47f2..0537e382 100644 --- a/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs +++ b/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs @@ -687,7 +687,7 @@ public class YearlySalaryRepository : RepositoryBase, IYearl if (step2.Count > 1)// اگر تعدادشون بیش از 1 بود { - var stDate = step2.FirstOrDefault(); // آخریی + var stDate = step2.FirstOrDefault(); // آخری if (DayCounter < Max365) { diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/CheckoutPrintAll.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/CheckoutPrintAll.cshtml index cf23a0b6..37b9a55b 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/CheckoutPrintAll.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/CheckoutPrintAll.cshtml @@ -457,7 +457,13 @@ @foreach (var items in @Model.GroupPrintList) { -
+ @if (items.HasRollCall) + { + + } + else + { +
@foreach (var items in @Model.CheckoutViewModels) + { + @if (items.HasRollCall) + { + + } + else {
-
-
-
+
+
-
-
@items.ContractNo
-

بسمه تعالی

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

-
-
-
-
- اینجانب   @items.EmployeeFullName - - نام پدر: - @if (string.IsNullOrWhiteSpace(@items.FathersName)) - { - "1111111111" - } - else - { - @items.FathersName - - } - - - - به کد ملی:   - @if (string.IsNullOrWhiteSpace(@items.NationalCode)) - { - 222333111 - } - else - { - @items.NationalCode - } - - متولد:   - @if (string.IsNullOrWhiteSpace(@items.DateOfBirth)) - { - 1401/01/01 - } - else - { - @items.DateOfBirth - } - - - -
-
- - @{ - if (@items.EmployerList.FirstOrDefault().IsLegal == "حقیقی") - { - پـرسنل کارگاه  @items.WorkshopName -   - به کارفرمایی   آقای/خانم   - -   - if (@items.EmployerList.Count > 1) - { - - @items.EmployerList[0].EmployerFullName ، -  @items.EmployerList[1].EmployerFullName - @if (@items.EmployerList.Count > 2) +
+
@items.ContractNo
+

بسمه تعالی

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

+
+
+
+
+ اینجانب   @items.EmployeeFullName + + نام پدر: + @if (string.IsNullOrWhiteSpace(@items.FathersName)) { - و غیره + "1111111111" } -
- } - else - { - - @items.EmployerList.FirstOrDefault().EmployerFullName - + else + { + @items.FathersName -
- } + } + + - } - else if (@items.EmployerList.FirstOrDefault().IsLegal == "حقوقی") - { - پـرسنل شرکت/موسسه  @items.WorkshopName -
- } + به کد ملی:   + @if (string.IsNullOrWhiteSpace(@items.NationalCode)) + { + 222333111 + } + else + { + @items.NationalCode + } - } - - کلیه حق السعی خود اعم از حقوق، کمک هزینه اقلام مصرفی خانوار، کمک هزینه مسکن - - و همچنین عیدی و پاداش، سنوات و... - @items.Month ماه - سال @items.Year - برابر با قرارداد به شماره فوق را از کارفرما بصورت وجه نقد و واریز به حساب دریافت نموده ام. - -
-
-
-
-
- + متولد:  + @if (string.IsNullOrWhiteSpace(@items.DateOfBirth)) + { + 1401/01/01 + } + else + { + @items.DateOfBirth + } + - - - - - - - + +
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
مطالبات کسورات
ردیف شرح مبلغ(ریال) شرح مبلغ(ریال)
1 حقوق و مزد @items.MonthlySalary حق بیمه سهم کارگر @items.InsuranceDeduction
2 پایه سنوات @items.BaseYearsPay مالیات بر حقوق @items.TaxDeducation
3 کمک هزینه اقلام مصرفی خانوار @items.ConsumableItems قسط تسهیلات @items.InstallmentDeduction
4 کمک هزینه مسکن @items.HousingAllowance مساعده @items.SalaryAidDeduction
5 فوق العاده اضافه کاری @items.OvertimePay غیبت @items.AbsenceDeduction
6 فوق العاده شب کاری @items.NightworkPay
7 فوق العاده جمعه کاری @items.FridayPay
8 فوق العاده ماموریت @items.MissionPay
9 فوق العاده نوبت کاری @items.ShiftPay
10 کمک هزینه عائله مندی @items.FamilyAllowance
11 حق تاهل @items.MarriedAllowance
12 پاداش @items.RewardPay
13 عیدی و پاداش @items.BonusesPay
14 سنوات @items.YearsPay
15 مزد مرخصی @items.LeavePay
جمع مطالبات @items.TotalClaims جمع کسورات @items.TotalDeductions
مبلغ قابل پرداخت @items.TotalPayment
-
-
-
-
-
- - @if(@items.CreateWorkingHoursTemp.ShiftWork=="4") - { -
-
- مقطع اول کار - مدت استراحت - مقطع دوم کار - مقطع اول کار - مدت استراحت - مقطع دوم کار -
-
-
- هفته اول - -
-
- - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @{ + if (@items.EmployerList.FirstOrDefault().IsLegal == "حقیقی") + { + پـرسنل کارگاه  @items.WorkshopName +   + به کارفرمایی   آقای/خانم   +   + if (@items.EmployerList.Count > 1) + { + + @items.EmployerList[0].EmployerFullName ، +  @items.EmployerList[1].EmployerFullName + @if (@items.EmployerList.Count > 2) + { + و غیره + } +
+ } + else + { + + @items.EmployerList.FirstOrDefault().EmployerFullName -
+ +
+ } + + } + else if (@items.EmployerList.FirstOrDefault().IsLegal == "حقوقی") + { + پـرسنل شرکت/موسسه  @items.WorkshopName +
+ } + + } + + کلیه حق السعی خود اعم از حقوق، کمک هزینه اقلام مصرفی خانوار، کمک هزینه مسکن + + و همچنین عیدی و پاداش، سنوات و... + @items.Month ماه + سال @items.Year + برابر با قرارداد به شماره فوق را از کارفرما بصورت وجه نقد و واریز به حساب دریافت نموده ام. + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
مطالبات کسورات
ردیف شرح مبلغ(ریال) شرح مبلغ(ریال)
1 حقوق و مزد @items.MonthlySalary حق بیمه سهم کارگر @items.InsuranceDeduction
2 پایه سنوات @items.BaseYearsPay مالیات بر حقوق @items.TaxDeducation
3 کمک هزینه اقلام مصرفی خانوار @items.ConsumableItems قسط تسهیلات @items.InstallmentDeduction
4 کمک هزینه مسکن @items.HousingAllowance مساعده @items.SalaryAidDeduction
5 فوق العاده اضافه کاری @items.OvertimePay غیبت @items.AbsenceDeduction
6 فوق العاده شب کاری @items.NightworkPay
7 فوق العاده جمعه کاری @items.FridayPay
8 فوق العاده ماموریت @items.MissionPay
9 فوق العاده نوبت کاری @items.ShiftPay
10 کمک هزینه عائله مندی @items.FamilyAllowance
11 حق تاهل @items.MarriedAllowance
12 پاداش @items.RewardPay
13 عیدی و پاداش @items.BonusesPay
14 سنوات @items.YearsPay
15 مزد مرخصی @items.LeavePay
جمع مطالبات @items.TotalClaims جمع کسورات @items.TotalDeductions
مبلغ قابل پرداخت @items.TotalPayment
+
+
+
+
+
+ + @if (@items.CreateWorkingHoursTemp.ShiftWork == "4") + { +
+
+ مقطع اول کار + مدت استراحت + مقطع دوم کار + مقطع اول کار + مدت استراحت + مقطع دوم کار
- -
-
- - یکشنبه - - - - - - - - - - - - - - - - - - - - - - +
+
+ هفته اول + +
+
+ + شنبه - - - - - - - - - - - - -
-
- -
-
- - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- -
- هفته دوم - -
-
- - - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-
- - - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - سه شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- -
-
- - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - -
-
- هفته سوم - -
-
- - - شنبه - - - - + + + - + - + - @@ -1578,7 +676,7 @@ - @@ -1600,40 +698,1292 @@ - + - + - + + + +
+
+ +
+
+ + یکشنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + دوشنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + سه شنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + چهارشنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + پنجشنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + جمعه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ هفته دوم + +
+
+ + + شنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+
+ + + یکشنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + + دوشنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + سه شنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- -
-
+
+ +
+
+ + چهارشنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + + پنجشنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + جمعه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + +
+
+ هفته سوم + +
+
+ + + شنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+
- یکشنبه + یکشنبه - + - + - @@ -1665,35 +2015,57 @@ - + - + - + -
-
- -
-
+
+
+ +
+
- دوشنبه + دوشنبه - + - + @@ -1730,36 +2102,58 @@ - + - + - +
-
+
- -
-
+ +
+
- سه شنبه + سه شنبه - - - - - + + + + + @@ -1796,35 +2190,57 @@ - + - + - +
-
- -
-
+
+ +
+
- چهارشنبه + چهارشنبه - + - + @@ -1861,35 +2277,57 @@ - + - + - +
-
- -
-
+
+ +
+
- پنجشنبه + پنجشنبه - + - + @@ -1927,34 +2365,56 @@ - + - + - + -
-
- -
-
+
+
+ +
+
- جمعه + جمعه - + - + @@ -1991,575 +2451,741 @@ - + - + - +
-
-
- - -
+
+
+ + +
هفته چهارم -
-
- - شنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
+ + شنبه + + + + + + - - - - - - -
-
- - -
-
- - یکشنبه - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - -
-
- -
-
- - دوشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + -
+ +
+
+ + +
+
+ + یکشنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + دوشنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+
+ + سه شنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + چهارشنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + پنجشنبه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ + جمعه + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+
+ } + else + { -
-
- - سه شنبه - - - - - - +
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - چهارشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - پنجشنبه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
- - جمعه - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-
-
- - }else{ - -
-
- -
- - -
+ + + - - - - + + + font-size: 11px !important;" class="time" id="EndComplex" type="text" asp-for="@items.CreateWorkingHoursTemp.EndComplex"> - -
- -
+ +
+ +
- - - } + + + } -
-
-
-
-
-
- @{ - if (items.IsLeft) - { - - طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب  - @items.LastDayOfWork  - بوده و قطع همکاری با کارفرما و کارگاه از تاریخ  - @items.LeftWorkDate  - می باشد - - } - } - -
-
-
- @*
اینجانب     @Model.EmployeeFullName
-
نام پدر:     @Model.FathersName
-
به کد ملی:  @Model.NationalCode
-
متولد:     @Model.DateOfBirth
*@ +
-
-
- @* پـرسنل شـرکت  @Model.WorkshopName -   - به کارفرمایی   آقای/خانم/شرکت    - @{ - foreach (var item in @Model.EmployerList) - { - @item.EmployerFullName ، - } +
+
+
+
+ @{ + if (items.IsLeft) + { + + طبق تصفیه حساب نهایی تنظیمی فوق، آخرین روز اشتغال بکار اینجانب  + @items.LastDayOfWork  + بوده و قطع همکاری با کارفرما و کارگاه از تاریخ  + @items.LeftWorkDate  + می باشد + } -    - مبلغ ............. ریال را بصورت نقدی از کارفرما دریافت نمودم. *@ + } + +
+
+
+ @*
اینجانب     @Model.EmployeeFullName
+
نام پدر:     @Model.FathersName
+
به کد ملی:  @Model.NationalCode
+
متولد:     @Model.DateOfBirth
*@ +
+
+
+ @* پـرسنل شـرکت  @Model.WorkshopName +   + به کارفرمایی   آقای/خانم/شرکت    + @{ + foreach (var item in @Model.EmployerList) + { + @item.EmployerFullName ، + } + } +    + مبلغ ............. ریال را بصورت نقدی از کارفرما دریافت نمودم. *@ -
+
-
+
-
-
- امضاء و اثر انگشت +
+
+ امضاء و اثر انگشت +
+
+ +
+
- - - + - - - + } + } diff --git a/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOne.cshtml b/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOne.cshtml index 226635df..3110ce0d 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOne.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Checkouts/PrintOne.cshtml @@ -2,7 +2,6 @@ @using System.Security.Cryptography.X509Certificates @model CompanyManagment.App.Contracts.Checkout.CheckoutViewModel @{ - } @section Styles { @@ -26,7 +58,7 @@
-

سوابق حضور و غیاب

+

تاریخچه حضور و غیاب

@Model.WorkshopFullName
@@ -51,14 +83,14 @@
    -
  • تاریخ براساس یک روز
    • +
  • تاریخ براساس یک روز
  • تاریخ براساس بازه ی زمانی
-
+
الی
@@ -70,10 +102,10 @@
@@ -86,7 +118,7 @@ - + حذف جستجو
@@ -97,166 +129,49 @@
-
+
- @if (@Model.RollCallViewModels.Any()) + @if (@Model.RollCallViewModels.ActiveEmployees.Any()) {
-
+
ردیف
نام پرسنل
شماره پرسنلی
-
تاریخ
-
ساعت ورود
-
ساعت خروج
-
- - @*
تاخیر در ورود
-
تعجیل در خروج
*@ +
تاخیر در ورود
+
ورود
+
خروج
+
تجمیع در خروج
+
مجموع ساعات کاری
+
+ +
+
- - @foreach (var item in Model.RollCallViewModels) - { -
-
-
- ردیف -
-
-
- @(index++) -
-
-
- -
-
نام پرسنل
-
- @item.EmployeeFullName -
-
- -
-
-
شماره پرسنلی:
-
@item.PersonnelCode
-
-
- -
-
تاریخ
-
- @item.DateFa -
-
- -
- @foreach (var itemTime in item.RollCallTimesList) - { -
ساعت ورود
-
-
@itemTime.StartDate
-
- } -
- -
- @foreach (var itemTime in item.RollCallTimesList) - { -
ساعت خروج
-
-
@itemTime.EndDate
-
- } -
- -
- - @*
*@ -
-
- - - -
-
-
-
-
-
ساعت ورود
- @foreach (var itemTime in item.RollCallTimesList) - { -
-
@itemTime.StartDate
-
- } -
-
-
-
-
ساعت خروج
- @foreach (var itemTime in item.RollCallTimesList) - { -
-
@itemTime.EndDate
-
- } -
-
- @*
-
-
تاخیر در ورود
- @foreach (var itemTime in item.RollCallTimesList) - { -
-
@itemTime.StartDate
-
- } -
-
-
-
-
تعجیل در خروج
- @foreach (var itemTime in item.RollCallTimesList) - { -
-
@itemTime.StartDate
-
- } -
-
*@ -
-
-
- } -
} else { -
-
- -
اطلاعاتی وجود ندارد.
-
-
+ }
+
@section Script { + } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml.cs index 6bba3145..d4f2bf55 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml.cs +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml.cs @@ -1,4 +1,4 @@ -using _0_Framework.Application; +using _0_Framework.Application; using CompanyManagment.App.Contracts.RollCall; using CompanyManagment.App.Contracts.RollCallEmployee; using CompanyManagment.App.Contracts.Workshop; @@ -18,7 +18,8 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall private readonly IRollCallEmployeeApplication _rollCallEmployeeApplication; private readonly IRollCallApplication _rollCallApplication; - public List RollCallViewModels { get; set; } + public RollCallsByDateViewModel RollCallViewModels { get; set; } + public EmployeeRollCallsByMonthViewModel RollCallEmployeeViewModels { get; set; } public string WorkshopFullName { get; set; } public List RollCallEmployeeList; @@ -42,20 +43,20 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall { if (_rollCallEmployeeApplication.GetByWorkshopId(workshopId).Any()) { - RollCallEmployeeList = _rollCallEmployeeApplication.GetPersonnelRollCallList(workshopId); + RollCallEmployeeList = _rollCallEmployeeApplication.GetPersonnelRollCallList(workshopId); WorkshopFullName = _workshopApplication.GetDetails(workshopId).WorkshopFullName; var searchModel = new RollCallSearchModel() { - WorkshopId = workshopId, - }; + WorkshopId = workshopId + }; - RollCallViewModels = _rollCallApplication.GetHistoryCase(searchModel); + RollCallViewModels = _rollCallApplication.GetWorkshopRollCallHistory(searchModel); return Page(); } else { - return NotFound(); + return Redirect("/Client/Company/RollCall"); } } else @@ -64,6 +65,45 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall } } + public IActionResult OnGetCaseHistoryRollCallAjax(int dateIndex, string exactDateFa, string startDate, string endDate, long employeeId, string dateEmployeeIndex) + { + var workshopHash = User.FindFirstValue("WorkshopSlug"); + var workshopId = _passwordHasher.SlugDecrypt(workshopHash); + if (workshopId > 0) + { + if (employeeId > 0) + { + RollCallEmployeeViewModels = _rollCallApplication.GetEmployeeRollCallsHistory(employeeId, workshopId, startDate, endDate, exactDateFa, dateEmployeeIndex); + } + else + { + var searchModel = new RollCallSearchModel() + { + WorkshopId = workshopId, + DateIndex = dateIndex, + ExactDateFa = exactDateFa, + StarDateFa = startDate, + EndDateFa = endDate, + EmployeeId = employeeId + }; + RollCallViewModels = _rollCallApplication.GetWorkshopRollCallHistory(searchModel); + } + return new JsonResult(new + { + IsSuccedded = true, + data = RollCallViewModels, + dataEmployee = RollCallEmployeeViewModels, + }); + } + else + { + return new JsonResult(new + { + IsSuccedded = false, + message = "داده ای یافت نشد!", + }); + } + } } } diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml index 64cbde07..6fbe76c0 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml @@ -5,6 +5,8 @@ @{ ViewData["Title"] = " - " + "لیست حضور و غیاب جاری"; int index = 1; + int indexAbsent = 1; + int indexLeave = 1; int i = 0; } @@ -28,7 +30,7 @@

ساعات حضور و غیاب جاری

-
@Model.WorkshopFullName تاریخ امروز @Model.NowDate
+
@Model.WorkshopFullName تاریخ امروز @Model.NowDate
+
تاریخ امروز @Model.NowDate
- -
- @if (@Model.RollCallViewModels.Any()) - { +
+
@@ -53,145 +54,265 @@
ردیف
نام پرسنل
شماره پرسنلی
-
ساعت ورود
-
ساعت خروج
-
- - @*
تاخیر در ورود
-
تعجیل در خروج
*@ +
تاخیر در ورود
+
ورود
+
خروج
+
تجمیع در خروج
+
مجموع ساعات کاری
- @foreach (var item in Model.RollCallViewModels) + @if (@Model.RollCallViewModels.PresentEmployees.Any()) { -
-
-
- ردیف -
-
-
- @(index++) + @foreach (var item in Model.RollCallViewModels.PresentEmployees) + { +
+
+
+ ردیف +
+
+
+ @(index++) +
-
-
-
نام پرسنل
-
- @item.EmployeeFullName -
-
- -
-
-
شماره پرسنلی:
-
@item.PersonnelCode
-
-
- -
- @foreach (var itemTime in item.RollCallTimesList) - { -
ساعت ورود
-
-
@itemTime.StartDate
+
+
نام پرسنل
+
+ @item.EmployeeFullName
- } -
+
-
- @foreach (var itemTime in item.RollCallTimesList) - { -
ساعت خروج
-
-
@itemTime.EndDate
+
+
+
شماره پرسنلی:
+
@item.PersonnelCode
- } -
+
-
- - @*
*@ -
-
+
+
+
تاخیر در ورود:
+
-
+
+
+
+ @foreach (var itemTime in item.RollCallTimesList) + { +
ساعت ورود
+
+
@(itemTime.StartDate ?? "-")
+
+ } +
+
+ @foreach (var itemTime in item.RollCallTimesList) + { +
ساعت خروج
+
+
@(itemTime.EndDate ?? "-")
+
+ } +
-
-
-
-
-
-
ساعت ورود
- @foreach (var itemTime in item.RollCallTimesList) +
+
+
تجمیع در خروج:
+
-
+
+
+ +
+
+
مجموع ساعات کاری:
+
+ @if (item.RollCallTimesList.Last().EndDate == null) { -
-
@itemTime.StartDate
-
+ + + + + + + } + else + { + @item.TotalWorkingHours }
-
-
-
ساعت خروج
- @foreach (var itemTime in item.RollCallTimesList) - { -
-
@itemTime.EndDate
-
- } -
-
- @*
-
-
تاخیر در ورود
- @foreach (var itemTime in item.RollCallTimesList) - { -
-
@itemTime.StartDate
-
- } -
-
-
-
-
تعجیل در خروج
- @foreach (var itemTime in item.RollCallTimesList) - { -
-
@itemTime.StartDate
-
- } -
-
*@
+
-
+ } + } + else + { + } - -
- } - else - { -
-
- -
اطلاعاتی وجود ندارد.
+
+
+
+
+
+
+
+
+ +
+
غیبت
+
+
ردیف
+
نام پرسنل
+
شماره پرسنلی
+
+
+ + @if (@Model.RollCallViewModels.AbsentEmployees.Any(x => !x.HasLeave)) + { + @foreach (var item in Model.RollCallViewModels.AbsentEmployees) + { + if (!item.HasLeave) + { +
+
+
+ ردیف +
+
+
+ @(indexAbsent++) +
+
+
+ +
+
نام پرسنل
+
+ @item.EmployeeFullName +
+
+ +
+
+
شماره پرسنلی:
+
@item.PersonnelCode
+
+
+
+ } + } + } + else + { + + } +
+
- } +
+
+
+
+ +
+
مرخصی
+
+
ردیف
+
نام پرسنل
+
شماره پرسنلی
+
نوع مرخصی
+
+
+ + @if (@Model.RollCallViewModels.AbsentEmployees.Any(x => x.HasLeave)) + { + @foreach (var item in Model.RollCallViewModels.AbsentEmployees) + { + if (item.HasLeave) + { +
+
+
+ ردیف +
+
+
+ @(indexLeave++) +
+
+
+ +
+
نام پرسنل
+
+ @item.EmployeeFullName +
+
+ +
+
+
شماره پرسنلی:
+
@item.PersonnelCode
+
+
+ +
+
+
+
@item.Reason
+
+
+
+ } + } + } + else + { + + } +
+
+
+
+
+ +
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
@section Script { + } diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml.cs index 3d33ab74..855a58cb 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml.cs +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using System.Security.Claims; using _0_Framework.Application; using AccountManagement.Application.Contracts.Account; @@ -7,15 +8,17 @@ using CompanyManagment.App.Contracts.RollCallEmployee; using CompanyManagment.App.Contracts.RollCallPlan; using CompanyManagment.App.Contracts.RollCallService; using CompanyManagment.App.Contracts.Workshop; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; namespace ServiceHost.Areas.Client.Pages.Company.RollCall { + [Authorize] public class CurrentDayModel : PageModel { - public List RollCallViewModels; + public CurrentDayRollCall RollCallViewModels; public string WorkshopFullName; public string NowDate; @@ -34,41 +37,34 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall public IActionResult OnGet() { - if (User.Identity.IsAuthenticated) - { - var workshopHash = User.FindFirstValue("WorkshopSlug"); - var workshopId = _passwordHasher.SlugDecrypt(workshopHash); - if (workshopId > 0) - { - if (_rollCallEmployeeApplication.GetByWorkshopId(workshopId).Any()) - { - WorkshopFullName = _workshopApplication.GetDetails(workshopId).WorkshopFullName; - - var now = DateTime.Now.ToFarsi(); - NowDate = now; + var workshopHash = User.FindFirstValue("WorkshopSlug"); + var workshopId = _passwordHasher.SlugDecrypt(workshopHash); + if (workshopId > 0) + { + if (_rollCallEmployeeApplication.GetByWorkshopId(workshopId).Any()) + { + WorkshopFullName = _workshopApplication.GetDetails(workshopId).WorkshopFullName; + + var now = DateTime.Now.ToFarsi(); + NowDate = now; - var searchModel = new RollCallSearchModel() - { - WorkshopId = workshopId, - }; + var searchModel = new RollCallSearchModel() + { + WorkshopId = workshopId, + }; - RollCallViewModels = _rollCallApplication.GetCurrentDay(searchModel); - return Page(); - } - else - { - return NotFound(); - } + RollCallViewModels = _rollCallApplication.GetWorkshopCurrentDayRollCalls(workshopId); + return Page(); + } + else + { + return Redirect("/Client/Company/RollCall"); } - else - { - return NotFound(); - } - } - else - { - return Forbid(); - } + } + else + { + return NotFound(); + } } public IActionResult OnGetCurrentDayPagination() @@ -87,5 +83,74 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall list }); } + + + public IActionResult OnGetCurrentDayAjax(string type) + { + var workshopHash = User.FindFirstValue("WorkshopSlug"); + var workshopId = _passwordHasher.SlugDecrypt(workshopHash); + if (workshopId > 0) + { + RollCallViewModels = _rollCallApplication.GetWorkshopCurrentDayRollCalls(workshopId); + + List data = new(); + switch (type) + { + case "all": + data.AddRange(RollCallViewModels.PresentEmployees); + break; + case "absent": + data.AddRange(RollCallViewModels.AbsentEmployees.Where(x => !x.HasLeave)); + break; + case "leave": + data.AddRange(RollCallViewModels.AbsentEmployees.Where(x => x.HasLeave)); + break; + default: + break; + } + + return new JsonResult(new + { + isSuccess = true, + data = data + }); + } + else + { + return new JsonResult(new + { + isSuccess = false, + message = "داده ای یافت نشده!" + }); + } + } + + public IActionResult OnGetCurrentAjaxCount() + { + var workshopHash = User.FindFirstValue("WorkshopSlug"); + var workshopId = _passwordHasher.SlugDecrypt(workshopHash); + if (workshopId > 0) + { + RollCallViewModels = _rollCallApplication.GetWorkshopCurrentDayRollCalls(workshopId); + + var absentEmployeesCount = RollCallViewModels.AbsentEmployees.Count(x => !x.HasLeave); + var leaveEmployeesCount = RollCallViewModels.AbsentEmployees.Count(x => x.HasLeave); + + return new JsonResult(new + { + isSuccess = true, + absentEmployeesCount = absentEmployeesCount, + leaveEmployeesCount = leaveEmployeesCount + }); + } + else + { + return new JsonResult(new + { + isSuccess = false, + message = "داده ای یافت نشده!" + }); + } + } } } diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs index 5491d393..fb5ae650 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs @@ -3,6 +3,7 @@ using _0_Framework.Application; using CompanyManagment.App.Contracts.Employee; using CompanyManagment.App.Contracts.Error; using CompanyManagment.App.Contracts.RollCallEmployee; +using CompanyManagment.App.Contracts.RollCallEmployeeStatus; using CompanyManagment.App.Contracts.RollCallService; using CompanyManagment.App.Contracts.Workshop; using Microsoft.AspNetCore.Authorization; @@ -26,8 +27,8 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall private readonly IRollCallServiceApplication _rollCallServiceApplication; private readonly IWebHostEnvironment _webHostEnvironment; private readonly IPasswordHasher _passwordHasher; - - public EmployeeUploadPictureModel(IWorkshopApplication workshopApplication, IPasswordHasher passwordHasher, IRollCallEmployeeApplication rollCallEmployeeApplication, IRollCallServiceApplication rollCallServiceApplication, IWebHostEnvironment webHostEnvironment, IEmployeeApplication employeeApplication) + private readonly IRollCallEmployeeStatusApplication _rollCallEmployeeStatusApplication; + public EmployeeUploadPictureModel(IWorkshopApplication workshopApplication, IPasswordHasher passwordHasher, IRollCallEmployeeApplication rollCallEmployeeApplication, IRollCallServiceApplication rollCallServiceApplication, IWebHostEnvironment webHostEnvironment, IEmployeeApplication employeeApplication, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication) { _workshopApplication = workshopApplication; _passwordHasher = passwordHasher; @@ -35,6 +36,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall _rollCallServiceApplication = rollCallServiceApplication; _webHostEnvironment = webHostEnvironment; _employeeApplication = employeeApplication; + _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication; } public IActionResult OnGet() @@ -182,6 +184,8 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall HasUploadedImage = "true", }; result = _rollCallEmployeeApplication.Create(createCommand); + + } else { @@ -191,7 +195,8 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall Message = "عملیات با موفقیت انجام شده است" }; } - + _rollCallEmployeeStatusApplication.Create(new CreateRollCallEmployeeStatus() + { RollCallEmployeeId = result.SendId }); if (result.IsSuccedded) { return new JsonResult(new diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml index 487d5c17..d8bd25a5 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml @@ -179,45 +179,35 @@
-
- @if (Model.HasCameraAccount == "false") - { -
- -
- -
-
ساخت حساب کاربری دوربین
-
-
- - -
- } +
- @if (!Model.CheckRollCallService) - { -
- -
- -
-
خرید سرویس
+
+ +
+ +
+
+ @if (!Model.CheckRollCallService) + { + خرید سرویس + } + else + { + ارتقا یا تغییر سرویس + }
- - -
- } +
+ + +
- +
آپلود عکس پرسنل
@@ -247,7 +237,7 @@
-
سوابق حضور و غیاب
+
تاریخچه حضور و غیاب
@* مودال حساب کاربری *@ + + @section Script { -} +} \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCameraAccount.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCameraAccount.cshtml index 55e47047..cc2197a0 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCameraAccount.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCameraAccount.cshtml @@ -155,4 +155,4 @@ var checkAccountAjax = `@Url.Page("./Index", "CheckAccount")`; var saveCameraAccountAjax = `@Url.Page("./Index", "SaveCameraAccount")`; - \ No newline at end of file + \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalOTPAction.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalOTPAction.cshtml index 2824b0ff..10317098 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalOTPAction.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalOTPAction.cshtml @@ -180,7 +180,7 @@ + - \ No newline at end of file + diff --git a/ServiceHost/Areas/Client/Pages/LeaveList.cshtml b/ServiceHost/Areas/Client/Pages/LeaveList.cshtml index d1b15d48..bf0f4c30 100644 --- a/ServiceHost/Areas/Client/Pages/LeaveList.cshtml +++ b/ServiceHost/Areas/Client/Pages/LeaveList.cshtml @@ -1,11 +1,6 @@ @using Version = _0_Framework.Application.Version @model CompanyManagment.App.Contracts.Leave.CreateLeave -@section Styles -{ - -} - @{ @@ -13,129 +8,22 @@ - + } -
-
- - -
-
+
+
+ + +
+ +
@* form-morakhasi-estehghaghi *@
- @*
- -
-
- -
-
*@
@@ -214,371 +102,6 @@ \ No newline at end of file + var lastLeaveAjax = `@Url.Page("/Index", "LastLeave")`; + + \ No newline at end of file diff --git a/ServiceHost/ServiceHost.csproj b/ServiceHost/ServiceHost.csproj index e111a8fe..87650591 100644 --- a/ServiceHost/ServiceHost.csproj +++ b/ServiceHost/ServiceHost.csproj @@ -46,25 +46,6 @@ - - - - - - - - - - - - - - - - - - - @@ -132,6 +113,7 @@ + @@ -184,6 +166,7 @@ + @@ -194,6 +177,7 @@ + @@ -203,13 +187,21 @@ + + + + + + + + @@ -224,6 +216,7 @@ + @@ -550,6 +543,10 @@ + + + + diff --git a/ServiceHost/wwwroot/AssetsClient/css/card.css b/ServiceHost/wwwroot/AssetsClient/css/card.css index 71741fc8..515ffc7c 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/card.css +++ b/ServiceHost/wwwroot/AssetsClient/css/card.css @@ -169,6 +169,10 @@ .card-area-rollcall2 .gwb-card:last-child { grid-column: span 2 / span 2; } + + .card-area-rollcall { + grid-template-columns: repeat(2, minmax(0, 1fr)); + } } /************************* End Responsive *************************/ \ No newline at end of file diff --git a/ServiceHost/wwwroot/AssetsClient/css/rollcall-list-table.css b/ServiceHost/wwwroot/AssetsClient/css/rollcall-list-table.css index 32a13349..b36df929 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/rollcall-list-table.css +++ b/ServiceHost/wwwroot/AssetsClient/css/rollcall-list-table.css @@ -6,6 +6,24 @@ padding: 0; } +.rollcall-list.Rtable .Rtable-row .Rtable-cell { + font-size: 10px; + font-weight: 700; +} + +.Rtable .Rtable-row:nth-child(even) { + background-color: #ddf4f4; + border: 1px solid #eee; +} + +.Rtable .Rtable-row.existTimeRollCall { + background-color: #9EE2E2; +} + +.Rtable .Rtable-row.garyHolidy { + background-color: #bdbdbd; +} + .Rtable .Rtable-row .Rtable-cell .Rtable-cell--content > .table-number { border-radius: 5px; background: rgba(87, 227, 227, 0.25); @@ -15,7 +33,8 @@ } .Rtable .Rtable-row .Rtable-cell .Rtable-cell--content { - font-size: 12px; + font-size: 10px; + font-weight:700; color: #0B5959; white-space: nowrap; height: 30px; @@ -24,34 +43,72 @@ justify-content: center; } +.Rtable .Rtable-row .Rtable-cell .Rtable-cell--content div { + z-index:5; +} + .table-rollcall .width1 { width: 5% !important; } .table-rollcall .width2 { - width: 10% !important; + width: 20% !important; } .table-rollcall .width3 { - width: 30% !important; + width: 10% !important; } .table-rollcall .width4 { - width: 15% !important; + width: 10% !important; +} +.rollcall-list.Rtable .Rtable-row .Rtable-cell.width4 .Rtable-cell--content { + /*justify-content: end;*/ + padding: 0 15px 0 0; } .table-rollcall .width5 { + width: 10% !important; + text-align: center; +} + +.table-rollcall .width6 { + width: 10% !important; + text-align: center; +} + +.table-rollcall .width7 { + width: 10% !important; +} + +.rollcall-list.Rtable .Rtable-row .Rtable-cell.width7 .Rtable-cell--content { + /*justify-content: start;*/ + padding: 0 0 0 15px; +} + +.table-rollcall .width8 { width: 15% !important; } +.table-rollcall .width4.bg-filter, +.table-rollcall .width7.bg-filter, +.table-rollcall .width8.bg-filter { + top: 0; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + /*padding: 0 35px 0 0;*/ +} + .Rtable .Rtable-row .Rtable-cell.width3 { text-align: center; } .Rtable .Rtable-row .Rtable-cell.width1 .Rtable-cell--content, .Rtable .Rtable-row .Rtable-cell.width2 .Rtable-cell--content { - font-size: 12px; + font-size: 10px; color: #0B5959; white-space: nowrap; height: 30px; @@ -62,9 +119,13 @@ .table-rollcall .column-heading.width4:before, -.table-rollcall .column-heading.width5:before { +.table-rollcall .column-heading.width5:before, +.table-rollcall .column-heading.width6:before, +.table-rollcall .column-heading.width7:before, +.table-rollcall .column-heading.width8:before { content: ""; position: relative; + z-index: 4; } /*.table-rollcall .Rtable-cell.width4:nth-child(n+1):before { @@ -81,26 +142,62 @@ position: absolute; top: 0; left: 0%; - width: 90%; + width: 85%; height: 100%; - background-color: #aeeaeab8 + border-radius: 0 7px 7px 0; + /*background-color: #aeeaeab8;*/ + background-color: rgba(0, 0, 0, 0.1); } .table-rollcall .width5:before { + content: ""; + position: absolute; + top: 0; + left: 0%; + width: 95%; + height: 100%; + border-radius: 0 7px 7px 0; + /*background-color: #aeeaeab8;*/ + background-color: rgba(0, 0, 0, 0.1); +} + +.table-rollcall .width6:before { + content: ""; + position: absolute; + top: 0; + right: 0%; + width: 95%; + height: 100%; + border-radius: 7px 0 0 7px; + /*background-color: #aeeaeab8;*/ + background-color: rgba(0, 0, 0, 0.1); +} + +.table-rollcall .width7:before { + content: ""; + position: absolute; + top: 0; + right: 0%; + width: 85%; + height: 100%; + border-radius: 7px 0 0 7px; + /*background-color: #aeeaeab8;*/ + background-color: rgba(0, 0, 0, 0.1); +} + +.table-rollcall .width8:before { content: ""; position: absolute; top: 0; right: 0%; width: 90%; height: 100%; - background-color: #aeeaeab8 + border-radius: 7px 7px 7px 7px; + /*background-color: #aeeaeab8;*/ + background-color: rgba(0, 0, 0, 0.1); } -.Rtable .Rtable-row:nth-child(even), .table-workshop .Rtable .Rtable-row:nth-child(4n+2), .table-personals .Rtable .Rtable-row:nth-child(4n+2) { - background-color: #ddf4f4; - border: 1px solid #eee; -} .table-rollcall .Rtable .Rtable-row .Rtable-cell .Rtable-cell--content > span { color: #0B5959; @@ -180,7 +277,111 @@ .elay { color: #797979; - font-size: 12px; + font-size: 10px; +} + + + +.Rtable .Rtable-row.absenceHeadColor, +.Rtable .Rtable-row.leaveHeadColor { + margin: 0 auto; + border-radius: 0 0 10px 10px; + border: 0; +} + +/* RollCall - Absence */ +.absenceHeadColorTop { + background: #DD6363 !important; + color: #ffffff; + width: 100%; + padding: 3px; + text-align: center; +} + +.absenceHeadColor { + background: #F87171 !important; +} + +.Rtable .Rtable-row.absenceItem { + background-color: #FEE2E2; + color: #716969; +} + +.Rtable .Rtable-row.absenceItem .Rtable-cell .Rtable-cell--content > .table-number { + background-color: #FCA5A5; + color: #716969; +} + +.Rtable .Rtable-row.absenceItem .Rtable-cell .Rtable-cell--content { + color: #716969; +} + +.Rtable .Rtable-row.absenceItem:hover { + background-color: #FBDBDB; +} + + + +/* RollCall - Leave */ +.leaveHeadColorTop { + background: #FCD34D !important; + color: #ffffff; + width: 100%; + padding: 3px; + text-align: center; +} + +.leaveHeadColor { + background: #FBDE82 !important; +} + +.Rtable .Rtable-row.leaveItem { + background-color: #FEF3C7; + color: #716969; +} + +.Rtable .Rtable-row.leaveItem .Rtable-cell .Rtable-cell--content { + color: #716969; +} + + +.Rtable .Rtable-row.leaveItem .Rtable-cell .Rtable-cell--content > .table-number { + background-color: #FCD34D; + color: #716969; +} + +.Rtable .Rtable-row.leaveItem:hover { + background-color: #FFEEB9; +} + + + +.btnsRollCallOnlline { + display:flex; + justify-content:space-between; + align-items:center; +} + +.btnRollCallStatus { + border-radius: 6px; + padding: 5px 6px; + width: 100%; + margin: auto 3px; + color: #ffffff; + border: 2px solid transparent; +} + +.btnRollCallStatus:nth-child(1){ + background-color: #9AD9D9; +} +.btnRollCallStatus:nth-child(2){ + background-color: #FBBF24; +} +.btnRollCallStatus:nth-child(3){ + background-color: #F87171; +} +.btnRollCallStatus.active { + border:2px solid #48B8B8; } @media (max-width: 767px) { @@ -191,13 +392,13 @@ .title-mobile { font-weight: 600; - font-size: 13px; + font-size: 12px; color: #0B5959; } .content-mobile { font-weight: 400; - font-size: 11px; + font-size: 10px; color: #0B5959; } @@ -257,7 +458,7 @@ text-align: end !important; } - .btn-taskmanager-more { + .btn-rollcall-more { background: #B6F2E1; border: 0.2px solid #0596691c; border-radius: 6px; @@ -271,7 +472,6 @@ font-weight: 400; line-height: normal; white-space: nowrap; - width: 70px; } .v-line { @@ -287,10 +487,36 @@ margin: 2px auto 10px; } + .rollcall-list-mobile.Rtable .Rtable-row .Rtable-cell { + width: auto; + } + .rollcall-list-mobile .Rtable-cell--content { color: #0B5959; font-size: 12px; font-weight: 500; margin: 2px auto; } + + .operations-btns.rollcall-operations-mobile { + background: #F5F5F5 !important; + } + + + + .table-rollcall .column-heading.width4:before, + .table-rollcall .column-heading.width5:before, + .table-rollcall .column-heading.width6:before, + .table-rollcall .column-heading.width7:before, + .table-rollcall .column-heading.width8:before { + display:none; + } + + .table-rollcall .width4:before, + .table-rollcall .width5:before, + .table-rollcall .width6:before, + .table-rollcall .width7:before, + .table-rollcall .width8:before { + display: none; + } } \ No newline at end of file diff --git a/ServiceHost/wwwroot/AssetsClient/css/rollcall-package.css b/ServiceHost/wwwroot/AssetsClient/css/rollcall-package.css index 7d991552..b6b18882 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/rollcall-package.css +++ b/ServiceHost/wwwroot/AssetsClient/css/rollcall-package.css @@ -493,6 +493,9 @@ border-right: 1px solid rgb(108,117,125); } +.d-flex-pay-rollcall { + display: flex; +} @@ -538,6 +541,11 @@ height: 30px; } + .increDecreTxt { + font-size: 13px; + font-weight: 600; + } + .btn-buy { padding: 5px 20px; margin: 6px auto 0px; @@ -591,6 +599,10 @@ padding: 2px 1px; } + .increDecreTxt { + font-size: 12px; + } + .card-grid-package { grid-template-columns: repeat(2, minmax(0, 1fr)); } @@ -627,6 +639,14 @@ .service-invoice-table p { font-size: 13px; } + + .d-flex-pay-rollcall { + flex-direction: column + } + + .payIncDec { + order: 1 + } } diff --git a/ServiceHost/wwwroot/AssetsClient/css/style.css b/ServiceHost/wwwroot/AssetsClient/css/style.css index 4578eae3..1cd1a400 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/style.css +++ b/ServiceHost/wwwroot/AssetsClient/css/style.css @@ -416,7 +416,7 @@ ul { margin-right: -300px; background-color: #100901; /*overflow: hidden;*/ - z-index: 101 !important; + z-index: 1011 !important; transition: ease .4s; } @@ -574,7 +574,7 @@ ul { } .static-menu { - z-index: 10; + z-index: 1010; } /* Top Header */ @@ -1429,7 +1429,7 @@ button.btn-more span:nth-child(4) { height: 100vh !important; /* max-height: 300vh !important; */ /* width:100vw; */ - z-index: 100; + z-index: 1011; transition: background-color 0.3s, transform 0.3s; } diff --git a/ServiceHost/wwwroot/AssetsClient/css/ticket-global/ticket-create-global.css b/ServiceHost/wwwroot/AssetsClient/css/ticket-global/ticket-create-global.css index 8cae7400..7ce77feb 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/ticket-global/ticket-create-global.css +++ b/ServiceHost/wwwroot/AssetsClient/css/ticket-global/ticket-create-global.css @@ -75,6 +75,7 @@ box-shadow: 0px 3px 5px rgba(22, 52, 80, 0.15); border-radius: 16px; transform: rotate(0.12deg); + z-index: 1000; } .screenshot-border-global { diff --git a/ServiceHost/wwwroot/AssetsClient/images/addUser.png b/ServiceHost/wwwroot/AssetsClient/images/addUser.png new file mode 100644 index 0000000000000000000000000000000000000000..19aa8f3cf018410a109bf5a924d7416dcc879463 GIT binary patch literal 1655 zcmV--28j8IP)cIVE_na6+b znS0MYcYr?nc&HFiz#A8~rn*wx89u^jl0uh~>P-_juV>U&R|t=RI1)3#@BUqu?sDl1 ze1@1WrI>0$CYcg2$@&qjvII5zO!`Th+OD?N+b0e^z2qt!CThWjmr4fe1KcYNL#&WQ zF26u|M`TyQfqfKQ;);*tmxssYZ-RqFCAg@;n=O5E4+|L9DKdP){v|)8^R2DMyoxCW zm*D^!B4kygcZM+Kk6avvDBx!?QBTs3&#WpL1qX;o@T$6RpMjJ|xtNStKu8w}dL@e< z2*ubI{J|~n0GCMcfn#Xs$dsfKHk+w+>sd=Y&URcbfr6pgB-P z*n*R%PMAzYNpOZt?x2;#`C$u|Bp-uwq)e#UG8hU7Td>fC@}QtADNTB8f|`2>ztJMI z1rFj%NNR!t!mnXdy8!37eKzaWn@~X5f?HC5ujM}S7MwuCsRx-1ttgrPWaYLIuu1sc zlJH0lgATy~xOv`vzx^YB-kzyzILU@@!6x72I z>xcpCAAjXfUgQ_vDF4_5-ab62G*8FQ*;_?gm4qFq)S zQf|62^G#dbWK3$fgQfo-Oe3nxYH!CRcDu1$Dan4?w|Gon%jNTvc3wQ~@pvTS zK-7W*b4$r{Odl;Vjrwd!BH8jcf4(9p$#O|eXfP3QyK}FNse2)B$9^BQ^49CMM=EAH zH=`JFD_!_s$-v?|?^<_S@?R{hoL`vd5dKUA$H3xsjp#tq6B!q0*X&f9n(azNg4fjV zUY3G>7m4Ib_SQ5+$5UMG8)ns%U3#{9`#dPdmf&?%*8h_x?;#T6Yis$98<(%~FyF$iL;bVkf0CcW*+eg7K1jO2NS@|C#M%=fCH@59rAq36t+z^Mj zjAuKF#-H6W9WkOu!Cz7N2#yt&-hFk%10x+4cs5>haC{_ljej?+8bfi!&!5GCCN ze?#2w3Na165FT^oB1*amc7d{bw2pJSfG{`{1c@8uyGG-<*V{>d+YdbHya3EpUJ(}X_;hSY+`vw`1U29EbJ?0LKi{Z3PpBV5J5#01rh{q)P*FN2uXEgNMHta8KD>b z1wuiQ(1pvAMOivua&G5&emy5swsmw5_?$hP^nr)%Jm<%DzUTM4Gll?p$e+gn>im0n z^MZY{3jx6p5PdX!%;DB({+>%Xex>Hr2m&AwA@`PsVzyoLnt@{Z`@}HKUAN_0?U^Jr zV?i^0^fJUO`?2(Es330BYzI_0i(CQHZD;?F6|9*6)xB~7qSWFEx|E{fCwzvJ+7vPj;?(XVWFq7eM}aB@+QxJ451WS zbM)&vhq#O~!@#`a_hbi)Bud+s;0MjerBNpgV!`T4Y&I0~o#wjbUAch@Kzb&z z2lWZ8Q!LgM@{Q*2%a@C&AUrYq*tWReIbR_uO2;iQqv5n30+eWE4e{dre}trDPUJoL zs7T~Z?w6h^$e98mQ`u0O;v=J3QC~`)1jq+qDRasu@z#gDv~{?U{e)2qSBq!s+MimC9Z;v zQfRTQP_;a`;T*{-*eH3#He9u!V?^+E66L9G-~T+sH0Yqd`TDo@(glHKRJ zk_+?b9e<0%4ZGI%7ThdeOipO8a#@9rxT(%QI`!qx3Yv_L9I1rgBPys3ja#L&o9-ie slHJM9*g1PvzKy~JgxPGJm@Z}Z8-sX6nMqRz@c;k-07*qoM6N<$f@IgKnE(I) literal 0 HcmV?d00001 diff --git a/ServiceHost/wwwroot/AssetsClient/images/extensionPlan.png b/ServiceHost/wwwroot/AssetsClient/images/extensionPlan.png new file mode 100644 index 0000000000000000000000000000000000000000..bc2f80e0612f2bd5fa62a71a4524dd7e09d57ccc GIT binary patch literal 1954 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 literal 0 HcmV?d00001 diff --git a/ServiceHost/wwwroot/AssetsClient/images/icons/image-rollcall.png b/ServiceHost/wwwroot/AssetsClient/images/icons/image-rollcall.png new file mode 100644 index 0000000000000000000000000000000000000000..1251e123d595c219434c2a171792676f32cacf71 GIT binary patch literal 20160 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
-

+

${responseTickets.description === "$GOzaReshgirMediaVoIce@" ? "" : responseTickets.description}

`; @@ -239,7 +239,7 @@ function loadMessages() {
-

+

${itemResponse.responseMessage === "$GOzaReshgirMediaVoIce@" ? "" : itemResponse.responseMessage}

`; @@ -322,7 +322,7 @@ function loadMessages() {
پشتیبانی
-

+

${itemResponse.responseMessage === "$GOzaReshgirMediaVoIce@" ? "" : itemResponse.responseMessage}

`; diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/css/PrintOneRollCall.css b/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/css/PrintOneRollCall.css new file mode 100644 index 00000000..a8bdf36e --- /dev/null +++ b/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/css/PrintOneRollCall.css @@ -0,0 +1,313 @@ +.modal .modal-dialog .modal-content { + background-color: white !important; +} + +.modal-dialog { + max-width: 100%; + width: 22.4cm; +} + +/* @page { + size: 7in 9.25in; + margin: 27mm 16mm 27mm 16mm; +}*/ + +@page { + size: A4; + margin: 0mm; + page-break-after: auto; +} + +@media screen { + #printSection { + display: none; + } +} + +.print * { + font-family: IranSans !important; +} + +.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: hidden; + } + + #printSection, #printSection * { + visibility: visible; + page-break-after: auto; + } + + footer { + page-break-after: auto; + display: none; + } + + header { + display: none; + } + + #printSection { + position: absolute; + left: 0; + page-break-after: auto; + top: 0; + } + + .head { + background-color: #cdcdcd !important; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; + } + + .week { + -webkit-print-color-adjust: exact; + print-color-adjust: exact; + } + + .radio-info input[type="radio"]:checked + label::after { + background-color: black !important; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; + } + + .mt-30 { + margin: 30px 0 0 0 !important; + } + + .restActive, .rest { + pointer-events: none; + font-size: 8px !important; + width: 46px !important; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + text-align: center; + } + + .signSection { + left: 24px !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; +} + +h5, h6 { + margin: 5px 0px !important; +} + +body .modal { + font-size: 11px; +} + +label .modal { + margin-bottom: 2px; +} + +.radio { + display: inline-block; + margin-top: -10px !important; +} + + .radio input[type=radio] { + position: unset !important; + } + +textarea.form-control { + height: 100px !important; +} + +.fontBold { + font-family: IranSans !important; +} + +.fontNumber { + font-family: IranText !important; +} + +.modal-body { + height: 99%; +} + +.row { + margin-right: -10px !important; + margin-left: -10px !important; +} + + + +div span.week { + /* border-radius: 5px; + padding: 2px 8px; + margin-right: 32px; + pointer-events: none;*/ +} + +#shanbeh, #yekshanbeh, #doshanbeh, #seshanbeh, #cheharshanbeh, #panjshanbeh, #jomeh { + width: 80px; +} + +#Sh1, #Sh2, #Sh3, #Sh4, #Sh5, #Sh6, #Sh7, #Sh8 { + width: 80px; + margin-right: 21%; + border-radius: 15px; + font-size: 8px !important; +} + +.week { + width: 48px !important; + border-radius: 5px; + padding: 1px !important; + font-size: 8px !important; + pointer-events: none; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; +} + +.time { + width: 8%; + text-align: center; + padding: 0px !important; + direction: ltr; + border-radius: 5px; + border: 1px solid #47c848 !important; + pointer-events: none; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; + font-size: 8px !important; +} + +.time2 { + width: 8%; + text-align: center; + direction: ltr; + border-radius: 5px; + border: 1px solid #47c848 !important; + pointer-events: none; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; + font-size: 8px !important; +} + +.fild { + border: 1px solid #878686 !important; + background-color: #f7f7f7 !important; + border-radius: 10px; + // margin: 5px 10px; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; +} + +.fild2 { + border: 1px solid #878686 !important; + background-color: #d9d9d9 !important; + border-radius: 10px; + padding: 10px 0 10px 0; + display: inline; + float: left; + width: 80%; + margin-left: 15px; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; +} + +.fild3 { + border: 1px solid #878686 !important; + background-color: #e7e7e7 !important; + border-radius: 10px; + display: inline; + float: left; + width: 100%; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; +} + +.call { + background-color: #d2dbd2 !important; + border-radius: 5px; + margin-bottom: 3px; + margin-left: 10px; + margin-right: 10px; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; +} + +.rest { + pointer-events: none; + font-size: 8px !important; + width: 49px !important; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + text-align: center; +} + +.shiftDisplayNone { + display: none; +} + +.fildeWeek { + height: 136px !important; + width: 48% !important; + display: inline-block; + border: 1px solid #cfcfcf !important; + background-color: #e7e5e5 !important; + border-radius: 12px 0px 12px 12px; + padding: 2px 15px !important; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; +} + + .fildeWeek .row { + height: 16px; + margin: 1px 0; + } + +.weekName { + margin-bottom: -18px !important; + top: -18px; + position: relative; + margin-right: -16px; + padding-right: 5px !important; + font-size: 10px !important; + border-bottom: 0px; + color: #505458 !important; + background-color: #bdd1be !important; + border-radius: 15px 5px 0px 0px; + width: 57px; + -webkit-print-color-adjust: exact; + print-color-adjust: exact; +} + +.btn-deactive { + background-color: #bbbbbb !important; + -webkit-print-color-adjust: exact; +} + +.btn-active { + background-color: #3ac53c !important; + -webkit-print-color-adjust: exact; +} + +.input-deactive { + background-color: #dbd8d8 !important; + -webkit-print-color-adjust: exact !important; +} diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/js/PrintOneRollCall.js b/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/js/PrintOneRollCall.js new file mode 100644 index 00000000..9cea5897 --- /dev/null +++ b/ServiceHost/wwwroot/AssetsClient/pages/Checkouts/js/PrintOneRollCall.js @@ -0,0 +1,20 @@ + + 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(); + } diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Index/css/LeaveList.css b/ServiceHost/wwwroot/AssetsClient/pages/Index/css/LeaveList.css new file mode 100644 index 00000000..9e47b25e --- /dev/null +++ b/ServiceHost/wwwroot/AssetsClient/pages/Index/css/LeaveList.css @@ -0,0 +1,95 @@ +.errored { + color: #FF3A3A !important; + border: 1px solid #FF3A3A !important +} + +.personal-paid-leave-scroll { + height: 330px; + overflow-y: scroll; + overflow-x: hidden; + scrollbar-width: thin; +} + +#printSection { + display: none; +} + +.personal-paid-leave-grid-list .Rtable-row .Rtable-cell .Rtable-cell--content .badge.badge-paid-leave span, +.personal-paid-leave-grid-list .Rtable-row .Rtable-cell .Rtable-cell--content .badge.sick span { + font-size: 12px; + font-weight: 500; +} + +.Rtable .Rtable-row .Rtable-cell { + font-size: 12px; +} + + +@media (max-width: 992px) { + .list-box { + padding: 4px 10px 4px 10px !important; + } + + .Rtable--collapse .Rtable-row { + padding: 4px 10px; + margin: 3px 0px 0; + font-size: 11px; + } + + .leaveDiv { + font-size: 11px; + } + + .openAction-mobile1 { + height: 46px; + } +} + +.tooltipfull-container { + cursor: pointer; + position: relative; +} + +.tooltipfull { + opacity: 0; + z-index: 99; + color: #fff; + display: grid; + font-size: 12px; + padding: 5px 10px; + border-radius: 8px; + background: #23a8a8; + border: 1px solid #23a8a8; + -webkit-transition: all .2s ease-in-out; + -moz-transition: all .2s ease-in-out; + -o-transition: all .2s ease-in-out; + transition: all .2s ease-in-out; + -webkit-transform: scale(0); + -moz-transform: scale(0); + -o-transform: scale(0); + -ms-transform: scale(0); + transform: scale(0); + position: absolute; + right: -2px; + bottom: 30px; + white-space: nowrap; +} + +.tooltipfull-container:hover .tooltipfull, a:hover .tooltipfull { + opacity: 1; + -webkit-transform: scale(1); + -moz-transform: scale(1); + -o-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); +} + +.tooltipfull:before, .tooltipfull:after { + content: ''; + border-left: 10px solid transparent; + border-right: 10px solid transparent; + border-top: 10px solid #23a8a8; + position: absolute; + bottom: -10px; + right: 20px; +} diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Index/js/LeaveCreate.js b/ServiceHost/wwwroot/AssetsClient/pages/Index/js/LeaveCreate.js new file mode 100644 index 00000000..b09cecd5 --- /dev/null +++ b/ServiceHost/wwwroot/AssetsClient/pages/Index/js/LeaveCreate.js @@ -0,0 +1,630 @@ + + $(document).ready(function () { + + $('.loading').hide(); + + document.getElementById("MainModal").style.visibility = "visible"; + + $(".select2Option").select2({ + language: "fa", + dir: "rtl", + dropdownParent: $('#MainModal'), + templateResult: function (data, container) { + if (data.element) { + $(container).addClass($(data.element).attr("class")); + } + return data.text; + } + }); + + //******************** شرط استحقاقی و استعلاجی ******************** + $(document).on("change", ".LeaveType", function () { + if ($('#paid').is(':checked')) { + $('#dailyType').css('visibility', 'visible'); + } + + if ($('#sick').is(':checked')) { + $('#dailyType').css('visibility', 'hidden'); + $('#daily').prop('checked', true); + if ($('#daily').is(':checked')) { + $('#end_date_estehghaghi').show(); + $('.time_paid').hide(); + } + } + }); + + // شرط ساعتی و روزانه + $(document).on("change", ".LeaveTime", function () { + if ($('#daily').is(':checked')) { + $('#end_date_estehghaghi').show(); + $('.time_paid').hide(); + } + + if ($('#hourly').is(':checked')) { + $('#end_date_estehghaghi').hide(); + $('.time_paid').show(); + } + }); + //******************** شرط استحقاقی و استعلاجی ******************** + + + //******************** بلور کردن باکس ******************** + $('#IsAccepted').on('change', function () { + if ($(this).is(':checked')) { + $('#blur-div').addClass('blur'); + $('#descriptionAcceptedCheck').text(''); + $('#descriptionAcceptedCheck').attr('disabled', true); + + } else { + $('#blur-div').removeClass('blur'); + $('#descriptionAcceptedCheck').attr('disabled', false); + } + }); + + + if ($('#IsAccepted').is(':checked')) { + $('#blur-div').addClass('blur'); + $('#descriptionAcceptedCheck').text(''); + $('#descriptionAcceptedCheck').attr('disabled', true); + } else { + $('#blur-div').removeClass('blur'); + $('#descriptionAcceptedCheck').attr('disabled', false); + } + //******************** بلور کردن باکس ******************** + + $(document).ready(function () { + $(document).on("change", "#IsAccepted", function () { + var IsAcceptedCheck = $('#IsAccepted').is(':checked'); + if (IsAcceptedCheck) { + $('#descriptionAcceptedCheck').removeClass('errored'); + $('#descriptionAcceptedCheck').addClass('disable-input'); + $("#descriptionAcceptedCheck").prop('disabled', true); + } else { + $('#descriptionAcceptedCheck').removeClass('disable-input'); + $("#descriptionAcceptedCheck").prop('disabled', false); + } + }) + }); + + $('#save').on('click', function () { + var workshopSelect = $("#workshopSelect").val(); + var employeeSelect = $("#employeeSelect").val(); + + console.log(workshopSelect); + + if(workshopSelect == '') { + $('.alert-msg').show(); + $('.alert-msg p').text('لطفا کارگاه را انتخاب کنید ...'); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3500); + return false; + } + + if (employeeSelect == '') { + $('.alert-msg').show(); + $('.alert-msg p').text('لطفا پرسنل را انتخاب کنید ...'); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3500); + return false; + } + + $("#descriptionAcceptedCheck").on("change", function () { + $('#descriptionAcceptedCheck').removeClass('errored'); + }); + + var IsAcceptedCheck = $('#IsAccepted').is(':checked'); + var descriptionAcceptedCheck = $('#descriptionAcceptedCheck').val(); + + if (!IsAcceptedCheck && descriptionAcceptedCheck.length === 0) { + $('#descriptionAcceptedCheck').addClass('errored'); + $('.alert-msg').show(); + $('.alert-msg p').text('لطفا توضیحات در صورت عدم موافقت را پر کنید.'); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3500); + return false; + } + + if ($('.errored').length < 1) { + // $('#saveFinaly').click(); + + $.ajax({ + async: false, + dataType: 'json', + type: 'POST', + url: leaveSaveAjax, + headers: { "RequestVerificationToken": antiForgeryToken }, + data: $('#create-leave-form').serialize(), + success: function (response) { + if (response.isSuccedded) { + $('.alert-success-msg').show(); + $('.alert-success-msg p').text(response.message); + setTimeout(function () { + $('.alert-success-msg').hide(); + $('.alert-success-msg p').text(''); + }, 3500); + + $('#printSingleID').val(response.printID); + $('#printSingle').show(); + } else { + $('.alert-msg').show(); + $('.alert-msg p').text(response.message); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3500); + } + }, + error: function (err) { + console.log(err); + } + }); + } else { + $('.alert-msg').show(); + $('.alert-msg p').text('لطفا خطاها را برطرف کنید.'); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3500); + } + }); + + $('#printSingle').on('click', function () { + var id = $('#printSingleID').val(); + var parametr = '&id=' + id; + var url = printOneMobileUrl; + location.href = url + parametr; + }); + + + // $(".date").mask("0000/00/00"); + $(".date").on('input', function () { + var value = $(this).val(); + $(this).val(convertPersianNumbersToEnglish(value)); + }).mask("0000/00/00"); + + $('.date').on('input', + function () { + let startDate = this.value; + if (startDate.length == 10) { + let submitcheck = dateValidcheck(this); + if (submitcheck) { + + $(this).removeClass('errored'); + if ($('#StartLeave').val() != '' && $('#EndLeave').val() != '') { + computeDays(); + } + + } else { + $(this).addClass('errored'); + } + + } else { + $(this).addClass('errored'); + } + }); + + function dateValidcheck(inputField1) { + + let persianNumbers = [/۰/g, /۱/g, /۲/g, /۳/g, /۴/g, /۵/g, /۶/g, /۷/g, /۸/g, /۹/g], + arabicNumbers = [/٠/g, /١/g, /٢/g, /٣/g, /٤/g, /٥/g, /٦/g, /٧/g, /٨/g, /٩/g], + fixNumbers = function (str) { + if (typeof str === 'string') { + for (var i = 0; i < 10; i++) { + str = str.replace(persianNumbers[i], i).replace(arabicNumbers[i], i); + } + } + return str; + }; + let getdate = inputField1.value; + + let m1, m2; + let y1, y2, y3, y4; + let d1, d2; + let s1, s2; + for (var i = 0; i < getdate.length; i++) { + if (i === 0) { + y1 = fixNumbers(getdate[i]); + } + if (i === 1) { + y2 = fixNumbers(getdate[i]); + } + if (i === 2) { + y3 = fixNumbers(getdate[i]); + } + if (i === 3) { + y4 = fixNumbers(getdate[i]); + } + if (i === 4) { + s1 = fixNumbers(getdate[i]); + } + if (i === 5) { + m1 = fixNumbers(getdate[i]); + } + if (i === 6) { + m2 = fixNumbers(getdate[i]); + } + if (i === 7) { + s2 = fixNumbers(getdate[i]); + } + if (i === 8) { + d1 = fixNumbers(getdate[i]); + } + if (i === 9) { + d2 = fixNumbers(getdate[i]); + } + + } + let yRes = y1 + y2 + y3 + y4; + let year = parseInt(yRes); + let mRes = m1 + m2; + let month = parseInt(mRes); + let dRes = d1 + d2; + let day = parseInt(dRes); + let fixResult = yRes + s1 + mRes + s2 + dRes; + let test1 = checkEnValid(inputField1.value); + + let isValid = /^([1][3-4][0-9][0-9][/])([0][1-9]|[1][0-2])([/])([0][1-9]|[1-2][0-9]|[3][0-1])$/.test(fixResult); + + + if (isValid && test1) { + // inputField1.style.backgroundColor = '#a6e9a6'; + start1valid = true; + } else { + if (inputField1.value != "") { + // inputField1.style.backgroundColor = '#f94c4c'; + $.Notification.autoHideNotify('error', 'top center', 'پیام سیستم ', "لطفا تاریخ را بصورت صحیح وارد کنید"); + start1valid = false; + } + } + return start1valid; + + } + + function checkEnValid(fixDate1) { + + let persianNumbers = [/۰/g, /۱/g, /۲/g, /۳/g, /۴/g, /۵/g, /۶/g, /۷/g, /۸/g, /۹/g], + arabicNumbers = [/٠/g, /١/g, /٢/g, /٣/g, /٤/g, /٥/g, /٦/g, /٧/g, /٨/g, /٩/g], + fixNumbers = function (str) { + if (typeof str === 'string') { + for (var i = 0; i < 10; i++) { + str = str.replace(persianNumbers[i], i).replace(arabicNumbers[i], i); + } + } + return str; + }; + let getdate = fixDate1; + + let m1, m2; + let y1, y2, y3, y4; + let d1, d2; + for (let i = 0; i < getdate.length; i++) { + if (i === 0) { + y1 = fixNumbers(getdate[i]); + } + if (i === 1) { + y2 = fixNumbers(getdate[i]); + } + if (i === 2) { + y3 = fixNumbers(getdate[i]); + } + if (i === 3) { + y4 = fixNumbers(getdate[i]); + } + if (i === 5) { + m1 = fixNumbers(getdate[i]); + } + if (i === 6) { + m2 = fixNumbers(getdate[i]); + } + if (i === 8) { + d1 = fixNumbers(getdate[i]); + } + if (i === 9) { + d2 = fixNumbers(getdate[i]); + } + } + let yRes = y1 + y2 + y3 + y4; + let year = parseInt(yRes); + let mRes = m1 + m2; + let month = parseInt(mRes); + let dRes = d1 + d2; + let day = parseInt(dRes); + let kabiseh = false; + if (month <= 6 && day > 31) { + return false; + } else if (month > 6 && month < 12 && day > 30) { + return false; + } else if (month === 12) { + + switch (year) { + case 1346: + kabiseh = true; + break; + case 1350: + kabiseh = true; + break; + case 1354: + kabiseh = true; + break; + case 1358: + kabiseh = true; + break; + case 1362: + kabiseh = true; + break; + case 1366: + kabiseh = true; + break; + case 1370: + kabiseh = true; + break; + case 1375: + kabiseh = true; + break; + case 1379: + kabiseh = true; + break; + case 1383: + kabiseh = true; + break; + case 1387: + kabiseh = true; + break; + case 1391: + kabiseh = true; + break; + case 1395: + kabiseh = true; + break; + case 1399: + kabiseh = true; + break; + case 1403: + kabiseh = true; + break; + case 1408: + kabiseh = true; + break; + case 1412: + kabiseh = true; + break; + case 1416: + kabiseh = true; + break; + case 1420: + kabiseh = true; + break; + case 1424: + kabiseh = true; + break; + case 1428: + kabiseh = true; + break; + case 1432: + kabiseh = true; + break; + case 1436: + kabiseh = true; + break; + case 1441: + kabiseh = true; + break; + case 1445: + kabiseh = true; + break; + default: + kabiseh = false; + + } + if (kabiseh == true && day > 30) { + return false; + } else if (kabiseh == false && day > 29) { + return false; + } else { + return true; + } + } else { + return true; + } + } + + $('input:radio[name="PaidLeaveType"]').change(function () { + if ($(this).is(':checked') && $(this).val() === 'روزانه') { + $("#hours").val(''); + $("#hours").attr("disabled", "disabled"); + $("#endLeave").removeAttr("disabled"); + $('.endLeaveLabal').show(); + $('#StartHoures').removeClass("invalidTime"); + $('#StartHoures').val(''); + $('#EndHours').removeClass("invalidTime"); + $('#EndHours').val(''); + $("#endLeave").show(); + $('.res').remove(); + $('.validTime').removeClass("validTime"); + $('.sumHourseDiv').hide(); + $('.sumDaysDiv').show(); + } else if ($(this).is(':checked') && $(this).val() === 'ساعتی') { + $("#endLeave").val(''); + $("#endLeave").attr("disabled", "disabled"); + $("#endLeave").hide(); + $('.endLeaveLabal').hide(); + $("#hours").removeAttr("disabled"); + $('.sumHourseDiv').show(); + $('.sumDaysDiv').hide(); + } + }); + /////////////////Time Input Validatet///////////////// + + $('#StartHoures').on("keyup", + function () { + var isValid = /^([2][0-3]|[1][0-9]|[0-9]|[0][0-9])([:][0-5][0-9])$/.test($(this).val()); + if (isValid) { + $(this).addClass("validTime"); + $(this).removeClass("invalidTime"); + if ($('#EndHours').hasClass('validTime') && $('#EndHours').val() != null) { + computeHourse(); + } + } else { + $(this).removeClass("validTime"); + $(this).addClass("invalidTime"); + } + }); + $('#EndHours').on("keyup", + function () { + var isValid = /^([2][0-3]|[1][0-9]|[0-9]|[0][0-9])([:][0-5][0-9])$/.test($(this).val()); + if (isValid) { + $(this).addClass("validTime"); + $(this).removeClass("invalidTime"); + if ($('#StartHoures').hasClass('validTime') && $('#StartHoures').val() != null) { + computeHourse(); + } + } else { + $(this).removeClass("validTime"); + $(this).addClass("invalidTime"); + } + }); + + function computeHourse() { + $('.res').remove(); + $.ajax({ + async: false, + dataType: 'json', + type: 'GET', + url: computeLeaveHourlyAjax, + headers: { "RequestVerificationToken": antiForgeryToken }, + data: { "startHours": $('#StartHoures').val(), "endHours": $('#EndHours').val() }, + success: function (response) { + let res = `${response.res}`; + $('.sumHours').append(res); + }, + failure: function (response) { + console.log(5, response); + } + }); + } + + function computeDays() { + $('.resultDays').remove(); + $.ajax({ + async: false, + dataType: 'json', + type: 'GET', + url: computeLeaveDailyAjax, + headers: { "RequestVerificationToken": antiForgeryToken }, + data: { "startDay": $('#StartLeave').val(), "endDay": $('#EndLeave').val() }, + success: function (response) { + if (response.status == false) { + $('.sumDays').addClass("note"); + } else { + $('.sumDays').removeClass("note"); + } + let res = `${response.res}`; + $('.sumDays').append(res); + }, + failure: function (response) { + console.log(5, response); + } + }); + } + }); + + $(document).ready(function () { + $("#cardSectionLeave div *").prop('disabled', true); + + ajaxPersonals(); + // Fetch workshops on page load + // $.ajax({ + // url: '@Url.Page("/Index", "WorkshopList")', + // type: 'GET', + // success: function (response) { + // var workshops = response.workshops; + // var workshopOptionsHtml = ''; + // if (workshops.length != 1) { + // workshopOptionsHtml += ''; + // } + // workshops.forEach(function (workshop) { + // workshopOptionsHtml += ''; + // }); + // $('#workshopSelect').html(workshopOptionsHtml); + // if (workshops.length == 1) { + // ajaxPersonals(workshops[0].id); + // } + // }, + // error: function (xhr, status, error) { + // console.error(xhr.responseText); + // } + // }); + + // Handle workshop selection + // $('#workshopSelect').change(function () { + // var workshopId = $(this).val(); + // if (workshopId) { + // ajaxPersonals(workshopId); + // } + // }); + + var selectEmployeeValue = $('#employeeSelect').val(); + if (selectEmployeeValue == '') { + $('#cardSectionLeave').addClass('blur'); + $("#cardSectionLeave div *").prop('disabled', true); + } + + var selectWorkshopValue = $('#workshopSelect').val(); + if (selectWorkshopValue == '') { + $('#cardSectionLeave').addClass('blur'); + $("#cardSectionLeave div *").prop('disabled', true); + } + + $('#employeeSelect').change(function () { + var selectValue = $('#employeeSelect').val(); + + if (selectValue == '') { + $('#cardSectionLeave').addClass('blur'); + $("#cardSectionLeave div *").prop('disabled', true); + } else { + $('#cardSectionLeave').removeClass('blur'); + $("#cardSectionLeave div *").prop('disabled', false); + $('#descriptionAcceptedCheck').attr('disabled', true); + } + }); + + // $('#workshopSelect').change(function () { + // var selectValue = $('#workshopSelect').val(); + + // if (selectValue == '') { + // var employeeOptionsHtmlEmpty = ``; + // $('#employeeSelect').html(employeeOptionsHtmlEmpty); + // $('#cardSectionLeave').addClass('blur'); + // $("#cardSectionLeave div *").prop('disabled', true); + // } + // }); + }); + + + + function ajaxPersonals() { + $.ajax({ + url: employeeListAjax, + type: 'GET', + success: function (response) { + $('#cardSectionLeave').addClass('blur'); + $("#cardSectionLeave div *").prop('disabled', true); + var employees = response.employees.connectedPersonnelViewModels; + var employeeOptionsHtml = ''; + employees.forEach(function (employee) { + var black = employee.black ? "blackSelect" : ""; + employeeOptionsHtml += ``; + }); + $('#employeeSelect').html(employeeOptionsHtml); + }, + error: function (xhr, status, error) { + console.error(xhr.responseText); + } + }); + } \ No newline at end of file diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Index/js/LeaveList.js b/ServiceHost/wwwroot/AssetsClient/pages/Index/js/LeaveList.js new file mode 100644 index 00000000..0710575e --- /dev/null +++ b/ServiceHost/wwwroot/AssetsClient/pages/Index/js/LeaveList.js @@ -0,0 +1,368 @@ + + $(document).ready(function () { + + $('.loading').hide(); + + $(document).ready(function () { + $(document).on('click', '.loadingButtonModal', function () { + var button = $(this); + var loadingDiv = button.find('.loading'); + loadingDiv.show(); + }); + }); + + document.getElementById("MainModal").style.visibility = "visible"; + + $("#personalLeaveGridSection").hide(); + $("#personalLeaveEmptySection").show(); + + let pageIndex = Number($('#pageIndex').val()); + var b = pageIndex % 30; + if (b === 0) { + $.ajax({ + async: false, + contentType: 'charset=utf-8', + dataType: 'json', + type: 'GET', + url: lastLeaveAjax, + data: { + pageIndex: pageIndex + }, + success: function (response) { + if (response.pageIndex > 0) { + var n = pageIndex + 1; + $.each(response.data, function (i, item) { + const html = ` +
+
+
+
+
+ ردیف +
+ +
+
+
+ ${item.employeeFullName} +
+
+
+
+ ${item.year} +
+
+
+
+ ${item.monthStr} +
+
+
+
+
+ ${item.leaveType == "استحقاقی" ? + ` + + استحقاقی + + ` + : + ` + + استعلاجی + + ` + } +
+
+
+
+
+
${item.startLeave}
+
+
+
+
+
+ ${item.paidLeaveType == "ساعتی" ? + `-` + : + `${item.endLeave}` + } +
+
+
+
+
+
+ ${item.paidLeaveType == "ساعتی" ? + `${time_format(item.startLeaveGr)} الی ${time_format(item.endLeaveGr)}` + : + `-` + } +
+
+
+
+
+
${item.leaveHourses}
+
+
+
+
+
+ ${item.isAccepted ? + ` + + + + + موافقت + ` + : + ` + + + + + + عدم موافقت + ` + } +
+
+
+
+
+
+ + + + + + + +
+
+
+
+
+ +
+ `; + $('#EmployeesLeaveList').append(html); + + const htmlMobile = ` +
+
+ +
+
+ + ${item.employeeFullName} + +
+
+ + ${item.year} + +
+
+ + ${item.monthStr} + +
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+
نوع مرخصی (${item.paidLeaveType})
+
${item.leaveType}
+
+
+
تاریخ شروع
+
${item.startLeave}
+
+
+
تاریخ پایان
+
${item.endLeave}
+
+
+
مدت مرخصی
+
+ ${item.paidLeaveType == "ساعتی" ? + `${time_format(item.startLeaveGr)} + الی + ${time_format(item.endLeaveGr)}` + : + `${item.leaveHourses}` + } +
+
+
+
وضعیت موافقت
+ ${item.isAccepted ? + `
موافقت
` + : + `
عدم موافقت
` + } +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+
+
+
+
+
+ `; + $('#EmployeesLeaveMobileList').append(htmlMobile); + n += 1; + }); + var newPageIndex = pageIndex + response.pageIndex; + $('#pageIndex').val(newPageIndex); + } + $('.loading').hide(); + }, + error: function (xhr, status, error) { + console.error(xhr.responseText); + } + }); + } + + + + function time_format(date) { + var d = new Date(date); + hours = format_two_digits(d.getHours()); + minutes = format_two_digits(d.getMinutes()); + return hours + ":" + minutes; + } + function format_two_digits(n) { + return n < 10 ? '0' + n : n; + } + + }); + + function redirectLeavePage() { + var workshopSelect = $('#workshopSelect').val(); + var employeeSelect = $('#employeeSelect').val(); + + if (workshopSelect == '') { + $('.alert-msg').show(); + $('.alert-msg p').text('لطفا کارگاه را انتخاب کنید ...'); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3500); + return false; + } + + if (employeeSelect == '') { + $('.alert-msg').show(); + $('.alert-msg p').text('لطفا پرسنل را انتخاب کنید ...'); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3500); + return false; + } + + window.location.href = "/Client/Company/Employees/Leave?workshopId=" + workshopSelect + "&employeeId=" + employeeSelect; + } + + function EditLeaveRedirect(id) { + var workshopSelect = $('#workshopSelect').val(); + var employeeSelect = $('#employeeSelect').val(); + + var parametr = '&editId=' + id; + var url = "/Client/Company/Employees/Leave?workshopId=" + workshopSelect + "&employeeId=" + employeeSelect; + window.location.href = url + parametr; + } + + function goToLeaveWorkshop(slug) { + var url = "/Client/Company/Employees/Leave/" +slug+"/"; + window.location.href = url; + } \ No newline at end of file diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Profile/js/ChangePassword.js b/ServiceHost/wwwroot/AssetsClient/pages/Profile/js/ChangePassword.js new file mode 100644 index 00000000..50990b1b --- /dev/null +++ b/ServiceHost/wwwroot/AssetsClient/pages/Profile/js/ChangePassword.js @@ -0,0 +1,163 @@ + $(document).ready(function () { + $('#timerCount').hide(); + $('.codeInput').val(''); + }); + + //******************** حرکت اتوماتیک اینپوت به اینپوت دیگر مربوط به کد برای ورود و انتخاب اینپوت برای انتخاب کردن ******************** + //حرکت اتوماتیک + + $('.codeInput').keyup(function (e) { + if (this.value.length === this.maxLength) { + let next = $(this).data('next'); + $('#n' + next).focus(); + $('#n' + next).select(); + } + + //وقتی کد ورودی وارد شد، اتوماتیک ورود میشود + if ($('#n0').val() && $('#n1').val() && $('#n2').val() && $('#n3').val() && $('#n4').val() && $('#n5').val()) { + console.log($('#n1').val()); + //$('#btn-login-code').trigger('click'); + confirmCodeToLogin(); + } + }); + + //انتخاب متن هنگام کلیک کردن بر روی اینپوت + $(".codeInput").click(function () { + $(this).select(); + }); + //******************** حرکت اتوماتیک اینپوت به اینپوت دیگر مربوط به کد برای ورود و انتخاب اینپوت برای انتخاب کردن ******************** + + + + //******************** عملیات ورود با موبایل و دریافت کد ******************** + //فقط عدد وارد کنه + $('#codeInput').on('keyup', function () { + this.value = this.value.replace(/[^\d]/, ''); + }); + + function codeTimer() { + $('.codeInput').val(''); + $('#btn-login-code').show(); + $('#timerCount').show(); + $('.otp').show(); + $('.loading').hide(); + $('#msg').hide(); + $('#n0').focus(); + var timer2 = "2:00"; + var interval = setInterval(function () { + var timer = timer2.split(':'); + //by parsing integer, I avoid all extra string processing + var minutes = parseInt(timer[0], 10); + var seconds = parseInt(timer[1], 10); + --seconds; + minutes = (seconds < 0) ? --minutes : minutes; + if (minutes < 0) clearInterval(interval); + seconds = (seconds < 0) ? 59 : seconds; + seconds = (seconds < 10) ? '0' + seconds : seconds; + //minutes = (minutes < 10) ? minutes : minutes; + $('.countdown').html(minutes + ':' + seconds); + timer2 = minutes + ':' + seconds; + + // || + if (timer2 === "0:00" && !$('#passDiv').hasClass("showPassDiv")) { + //دکمه ورود مخفی میشود + $('#btn-login-code').hide(); + + //اینپوت برای وارد کردن کدها خالی میشود + $('.codeInput').val(''); + + + //دکمه برای دریافت کد باز میشود + $('#btnSmsReciver').show(); + $('.loading').hide(); + $('#timerCount').hide(); + $('.otp').hide(); + $('#msg').show(); + } + + }, 1000); + } + + $('#btnSmsReciver').on("click", function () { + $('.loading').show(); + $('#btnSmsReciver').hide(); + sendVervifyCode(); + }); + function sendVervifyCode() { + + $.ajax({ + + dataType: 'json', + type: 'POST', + url: sendSmsAjax, + headers: { "RequestVerificationToken": antiForgeryToken }, + success: function (response) { + if (response.isSuccess) { + codeTimer() + + } else { + $('.loading').hide(); + $('#btnSmsReciver').show(); + + } + }, + failure: function (response) { + console.log(5, response); + } + + }); + } + + + function confirmCodeToLogin() { + let no0 = $('#n0').val(); + let no1 = $('#n1').val(); + let no2 = $('#n2').val(); + let no3 = $('#n3').val(); + let no4 = $('#n4').val(); + let no5 = $('#n5').val(); + var code = no0 + no1 + no2 + no3 + no4 + no5; + + if (code.length == 6) { + $('.loading').show(); + setTimeout(function () { + $.ajax({ + async: false, + dataType: 'json', + type: 'POST', + url: checkCodeAjax, + headers: { "RequestVerificationToken": antiForgeryToken }, + data: { + 'code': code + }, + success: function (response) { + if (response.exist === true) { + $('#passDiv').show(); + $('#passDiv').addClass("showPassDiv"); + $('.loading').hide(); + $('#timerCount').hide(); + $('.otp').hide(); + $('#btn-login-code').hide(); + $('#submitPass').show(); + $('.password').val(''); + $('#msg').hide(); + + + } else { + $('.loading').hide(); + $('.alert-msg').show(); + $('.alert-msg p').text('کد وارد شده صحیح نیست'); + } + }, + failure: function (response) { + console.log(5, response); + } + }); + }, 1000); + } else { + $('.loading').hide(); + $('.alert-msg').show(); + $('.alert-msg p').text('کد وارد شده کمتر از 6 رقم است'); + } + } +//******************** عملیات ورود با موبایل و دریافت کد ******************** \ No newline at end of file diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CaseHistory.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CaseHistory.js index 71fb977d..13caf583 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CaseHistory.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CaseHistory.js @@ -1,30 +1,53 @@ -$(document).ready(function () { - $(".select2Option").select2({ - language: "fa", - dir: "rtl" - }); +var dateIndex = 0; +var width = $(document).width(); +var height = $(document).height(); +var hasData = true; - $('.loadingButton').on('click', function () { - var button = $(this); - var loadingDiv = button.find('.loading'); - loadingDiv.show(); - }); +$(document).ready(function () { + $(".select2Option").select2({ + language: "fa", + dir: "rtl" + }); - $(document).on('click', ".openAction", function () { - $(this).next().find(".operations-btns").slideToggle(500); - $(".operations-btns").not($(this).next().find(".operations-btns")).slideUp(500); - }); + $('.loadingButton').on('click', function () { + var button = $(this); + var loadingDiv = button.find('.loading'); + loadingDiv.show(); + }); + + $(document).on('click', ".openAction", function () { + $(this).next().find(".operations-btns").slideToggle(500); + $(".operations-btns").not($(this).next().find(".operations-btns")).slideUp(500); + }); - var filterEmployeeId = $('#AccountId').val(); - var filterStart = $('#StartDate').val().trim(); - var filterEnd = $('#EndDate').val().trim(); + var filterEmployeeId = $('#employeeSelect').val(); + var filterStart = $('#StartDate').val().trim(); + var filterEnd = $('#EndDate').val().trim(); - if (filterEmployeeId != 0 || filterStart != '' || filterEnd != '') { - $('.btn-clear-filter').removeClass('disable'); - } else { - $('.btn-clear-filter').addClass('disable'); - } + if (filterEmployeeId != 0 || filterStart != '' || filterEnd != '') { + $('.btn-clear-filter').removeClass('disable'); + } else { + $('.btn-clear-filter').addClass('disable'); + } +}); + +$(document).ready(function () { + var stickyMain = $('.stickyMain'); + var stickyElements = $('.sticky'); + + $(window).scroll(function () { + stickyElements.each(function () { + var scrollTop = $(window).scrollTop(); + var elementOffset = $(this).offset().top; + + if (scrollTop >= elementOffset - stickyMain.outerHeight()) { + $(this).addClass('is-sticky'); + } else { + $(this).removeClass('is-sticky'); + } + }); + }); }); @@ -35,80 +58,370 @@ const selectedAll = document.querySelectorAll(".wrapper-dropdown"); var wrapperDropdown = $(".wrapper-dropdown"); $(document).ready(function () { - wrapperDropdown.on("click", function () { - var dropdown = $(this); - var optionsContainer = dropdown.children(".dropdown"); - var optionsList = optionsContainer.find(".item"); + wrapperDropdown.on("click", function () { + var dropdown = $(this); + var optionsContainer = dropdown.children(".dropdown"); + var optionsList = optionsContainer.find(".item"); - dropdown.toggleClass("active"); + dropdown.toggleClass("active"); - if (dropdown.hasClass("active")) { - wrapperDropdown.not(this).removeClass("active"); - } + if (dropdown.hasClass("active")) { + wrapperDropdown.not(this).removeClass("active"); + } - optionsList.on("click", function () { - var selectedOption = $(this); - var valueData = selectedOption.data("value"); + optionsList.on("click", function () { + var selectedOption = $(this); + var valueData = selectedOption.data("value"); - dropdown.removeClass("active"); - dropdown.find(".selected-display").text(selectedOption.text()); - $("#sendSorting").val(valueData); + dropdown.removeClass("active"); + dropdown.find(".selected-display").text(selectedOption.text()); + $("#sendSorting").val(valueData); - optionsList.removeClass("active"); - selectedOption.addClass("active"); - }); - }); + optionsList.removeClass("active"); + selectedOption.addClass("active"); + }); + }); - var defaultValue = $("#sendSorting").val(); - if (defaultValue) { + var defaultValue = $("#sendSorting").val(); + if (defaultValue) { - let defaultItem = $(".dropdown").find(".item[value-data='" + defaultValue + "']"); - defaultItem.addClass("active"); - var selectedDisplay = wrapperDropdown.find(".selected-display"); - selectedDisplay.text(defaultItem.text()); - } + let defaultItem = $(".dropdown").find(".item[value-data='" + defaultValue + "']"); + defaultItem.addClass("active"); + var selectedDisplay = wrapperDropdown.find(".selected-display"); + selectedDisplay.text(defaultItem.text()); + } + + $('.btn-search-click').click(function () { + var filterEmployeeId = $('#employeeSelect').val(); + var filterStart = $('#StartDate').val().trim(); + var filterEnd = $('#EndDate').val().trim(); + + if (filterEmployeeId !== 0 || filterStart !== '' || filterEnd !== '') { + $('.btn-clear-filter').removeClass('disable'); + } else { + $('.btn-clear-filter').addClass('disable'); + } + + hasData = true; + dateIndex = 0; + $('#caseHistoryLoadData').html(''); + caseHistoryLoadAjax(); + loadUntilHeightExceeds(); + }); }); $('.dropdown-days .item').on("click", function () { - let dataVal = $(this).attr("value-data-normal"); - console.log(dataVal); - if (dataVal === "OneDay") { - // $('#endDateRollcall').removeClass('d-flex'); - $('#endDateRollcall').addClass('d-none'); - } else { - // $('#endDateRollcall').addClass('d-flex'); - $('#endDateRollcall').removeClass('d-none'); - } - // $('#dropdown-RollcallDate').val(dataVal); + let dataVal = $(this).attr("value-data-normal"); + if (dataVal === "OneDay") { + // $('#endDateRollcall').removeClass('d-flex'); + $('#endDateRollcall').addClass('d-none'); + $('#StartDate').attr("placeholder", "تاریخ"); + $('#StartDate').val(''); + $('#EndDate').val(''); + } else { + // $('#endDateRollcall').addClass('d-flex'); + $('#endDateRollcall').removeClass('d-none'); + $('#StartDate').attr("placeholder", "تاریخ شروع"); + $('#StartDate').val(''); + $('#EndDate').val(''); + } + // $('#dropdown-RollcallDate').val(dataVal); }); var sendDropdownNormal = $("#sendSorting").val(); if (sendDropdownNormal) { - let itemDropdownNormal = $(".dropdown-normal").find(".item[value-data-normal='" + sendDropdownNormal + "']"); - itemDropdownNormal.addClass("active"); - var selectedNormalDisplay = $(".wrapper-dropdown-normal").find(".selected-display"); - selectedNormalDisplay.text(itemDropdownNormal.text()); + let itemDropdownNormal = $(".dropdown-normal").find(".item[value-data-normal='" + sendDropdownNormal + "']"); + itemDropdownNormal.addClass("active"); + var selectedNormalDisplay = $(".wrapper-dropdown-normal").find(".selected-display"); + selectedNormalDisplay.text(itemDropdownNormal.text()); } var sendDropdownYear = $("#sendDropdownYear").val(); if (sendDropdownYear) { - let itemDropdownYear = $(".dropdown-year").find(".item[value-data-year='" + sendDropdownYear + "']"); - itemDropdownYear.addClass("active"); - var selectedYearDisplay = $(".wrapper-dropdown-year").find(".selected-display"); - selectedYearDisplay.text(itemDropdownYear.text()); + let itemDropdownYear = $(".dropdown-year").find(".item[value-data-year='" + sendDropdownYear + "']"); + itemDropdownYear.addClass("active"); + var selectedYearDisplay = $(".wrapper-dropdown-year").find(".selected-display"); + selectedYearDisplay.text(itemDropdownYear.text()); } var sendDropdownMonth = $("#sendDropdownMonth").val(); if (sendDropdownMonth) { - let itemDropdownMonth = $(".dropdown-month").find(".item[value-data-month='" + sendDropdownMonth + "']"); - itemDropdownMonth.addClass("active"); - var selectedMonthDisplay = $(".wrapper-dropdown-month").find(".selected-display"); - selectedMonthDisplay.text(itemDropdownMonth.text()); + let itemDropdownMonth = $(".dropdown-month").find(".item[value-data-month='" + sendDropdownMonth + "']"); + itemDropdownMonth.addClass("active"); + var selectedMonthDisplay = $(".wrapper-dropdown-month").find(".selected-display"); + selectedMonthDisplay.text(itemDropdownMonth.text()); } $(".date").on('input', function () { - var value = $(this).val(); - $(this).val(convertPersianNumbersToEnglish(value)); -}).mask("0000/00/00"); \ No newline at end of file + var value = $(this).val(); + $(this).val(convertPersianNumbersToEnglish(value)); +}).mask("0000/00/00"); + + +//setInterval(caseHistoryLoadAjax, 1000); + +var dateEmployeeIndex = null; +function caseHistoryLoadAjax() { + + + var filterEmployeeId = $('#employeeSelect').val(); + var filterStart = $('#StartDate').val().trim(); + var filterEnd = $('#EndDate').val().trim(); + + var html = ""; + var isHolidyColor = 'garyHolidy'; + + var data = { + dateIndex: dateIndex, + employeeId: filterEmployeeId, + startDate: filterEnd !== '' ? filterStart : '', + endDate: filterEnd, + exactDateFa: filterEnd === '' ? filterStart : '', + dateEmployeeIndex: dateEmployeeIndex + }; + + $.ajax({ + async: false, + contentType: 'charset=utf-8', + dataType: 'json', + type: 'GET', + url: caseHistoryAjaxLoadData, + data: data, + headers: { "RequestVerificationToken": antiForgeryToken }, + success: function (response) { + var caseHistoryData = response.data; + var caseHistoryEmployeeData = response.dataEmployee; + + if (response.isSuccedded) { + if (caseHistoryData == null) { + //if (caseHistoryEmployeeData) { + console.log(caseHistoryEmployeeData); + + + + + + hasData = false; + //} else { + // hasData = false; + //} + } else { + if (caseHistoryData.dateFa !== null) { + html += ` +
+
+
+ ${caseHistoryData.dayOfWeekFa} + ${caseHistoryData.isHoliday ? `(تعطیل)` : ``} +
+
+
+
${caseHistoryData.dateFa}
+
+
+
+ `; + + $.each(caseHistoryData.activeEmployees, + function (i, item) { + + html += ` +
+
+
+ ردیف +
+
+
+ ${i + 1} +
+
+
+ +
+
نام پرسنل
+
+ ${item.employeeFullName} +
+
+ +
+
+
شماره پرسنلی:
+
${item.personnelCode}
+
+
+ +
+
+
تاخیر در ورود:
+
-
+
+
+ +
`; + + if (item.rollCallTimesList.length > 0) { + item.rollCallTimesList.forEach(function (itemTime) { + html += `
ساعت ورود
+
+
${itemTime.startDate ?? `-`}
+
`; + }); + } else { + html += `
ساعت ورود
+
+
-
+
`; + } + + html += `
+ +
`; + + if (item.rollCallTimesList.length > 0) { + item.rollCallTimesList.forEach(function (itemTime) { + html += `
ساعت خروج
+
+
${itemTime.endDate ?? `-`}
+
`; + }); + } else { + html += `
ساعت خروج
+
+
-
+
`; + } + + html += `
+ +
+
+
تجمیع در خروج:
+
-
+
+
+ +
+
+
مجموع ساعات کاری:
+
${item.totalWorkingHours}
+
+
`; + + + html += + `
-
`; + + if (item.rollCallTimesList.length > 0) { + item.rollCallTimesList.forEach(function (itemTime) { + html += `
+
+
${itemTime.startDate ?? "-"}
+
+
`; + }); + } else { + html += `
+
+
-
+
+
`; + } + + if (item.rollCallTimesList.length > 0) { + item.rollCallTimesList.forEach(function (itemTime) { + html += `
+
+
${itemTime.endDate ?? "-"}
+
+
`; + }); + } else { + html += `
+
+
-
+
+
`; + } + html += + `
-
`; + + html += `
`; + + if (!(!item.hasLeave && item.isAbsent)) { + html += `
+
+
+
+
+
+ شماره پرسنل: ${item.personnelCode} +
+
+
+
+
+
+ مجموع ساعات کارکرد: ${item.totalWorkingHours} +
+
+
+
+
+
+
`; + } + + + }); + + dateIndex++; + $('#caseHistoryLoadData').append(html); + + } else { + hasData = false; + } + } + } else { + hasData = false; + } + }, + failure: function (response) { + console.log(response); + hasData = false; + } + }); +} + +function loadUntilHeightExceeds() { + var heightCard = $('#containerHeight').height(); + while (heightCard < height && hasData) { + caseHistoryLoadAjax(); + heightCard = $('#containerHeight').height(); + } +} + +if (hasData) { + loadUntilHeightExceeds(); +} + +//$(window).on('scroll', function () { +// if ($(window).scrollTop() + $(window).height() >= $(document).height()) { +// caseHistoryLoadAjax(); +// } +//}); + +$(window).scroll(function () { + if ($(window).scrollTop() + $(window).height() > $(document).height() - 600) { + caseHistoryLoadAjax(); + } + + //if ($(this).scrollTop() > 100) { + // $('.goToTop').show().fadeIn(); + //} else { + // $('.goToTop').fadeOut().hide(); + //} +}); \ No newline at end of file diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CurrentDay.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CurrentDay.js index f2edd9e2..b3ac9b54 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CurrentDay.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CurrentDay.js @@ -9,4 +9,194 @@ $(this).next().find(".operations-btns").slideToggle(500); $(".operations-btns").not($(this).next().find(".operations-btns")).slideUp(500); }); -}); \ No newline at end of file + + $(document).on('click', ".btnRollCallStatus", function () { + var index = $(this).index(); + $('.btnRollCallStatus').removeClass('active'); + $(this).addClass('active'); + }); + + loadRollCallStatus('all'); + loadRollCallCount(); +}); + + +function loadRollCallCount() { + $.ajax({ + async: false, + contentType: 'charset=utf-8', + dataType: 'json', + type: 'GET', + url: `${loadRollCallAbsentLeaveCountAjax}`, + headers: { "RequestVerificationToken": `${antiForgeryToken}` }, + success: function (response) { + $('#leaveCount').text(response.leaveEmployeesCount); + $('#absentCount').text(response.absentEmployeesCount); + }, + failure: function (response) { + console.log(response); + } + }); +} + +function loadRollCallStatus(type) { + + console.log(type); + + var index = 1; + var html = ''; + let colorDivStyle = ''; + + switch (type) { + case "leave": + colorDivStyle = "leaveItem"; + break; + case "absent": + colorDivStyle = "absenceItem"; + break; + default: + colorDivStyle = ""; + } + + + $.ajax({ + async: false, + contentType: 'charset=utf-8', + dataType: 'json', + type: 'GET', + url: `${loadRollCallMoreAjax}`, + data: { + type: type + }, + headers: { "RequestVerificationToken": `${antiForgeryToken}` }, + success: function (response) { + console.log(response); + var responseData = response.data; + + + + if (responseData.length > 0) { + responseData.forEach(function (item) { + + // html += `
+ //
ردیف
+ //
تاریخ ایجاد
+ //
تاریخ سررسید
+ //
طرف حساب
+ //
عنوان وظیفه
+ //
عملیات
+ //
`; + + + html += `
+
+
+
+ ردیف +
+
+
+ ${index++} +
+
+
+ +
+
+ ${item.employeeFullName} +
+
`; + + if (type !== "all") { + html += `
+
+
شماره پرسنلی: ${item.personnelCode}
+
+
`; + } + + if (type === "all") { + html += `
-
`; + html += `
`; + item.rollCallTimesList.forEach(function (itemTime) { + html += `
+
${itemTime.startDate}
+
`; + }); + html += `
`; + html += `
`; + item.rollCallTimesList.forEach(function (itemTime) { + html += `
+
${itemTime.endDate == null ? "-" : itemTime.endDate}
+
`; + }); + html += `
`; + html += `
-
`; + + html += `
+ +
`; + } + + html += `
`; + + if (type === "all") { + const hasLastEndDate = item.rollCallTimesList.map(itemTime => itemTime.endDate).filter(endDate => endDate === null).pop() !== undefined; + + html += `
+
+
+
+
+
+ شماره پرسنل: ${item.personnelCode} +
+
+
+
+
+
+ مجموع ساعات کارکرد: ${hasLastEndDate + ? ` + + + + + ` + : `${item.totalWorkingHours}` + } +
+
+
+
+
+
+
`; + } + + }); + + } else { + html += `
+
+ +
اطلاعاتی وجود ندارد.
+
+
`; + } + + $('#loadRollCallTypeAjax').html(html); + }, + failure: function (response) { + console.log(response); + } + }); +} diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/Index.js index 253f67d0..d3b36c49 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/Index.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/Index.js @@ -7,6 +7,10 @@ $(document).ready(function () { }); $(document).ready(function () { + if (!hasCameraAccount) { + window.location.href = saveCameraAccountUrl; + } + $('.loadingButton').on('click', function () { var button = $(this); var loadingDiv = button.find('.loading'); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/Plans.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/Plans.js index 453fc299..d097e977 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/Plans.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/Plans.js @@ -16,4 +16,58 @@ function choosePlaneFree() { $('.alert-msg p').text(''); }, 3500); } -} \ No newline at end of file +} + +$(document).on('click', '.gwb-card', function () { + var index = $(this).index(); + var $clickedCard = $(this).find('.click'); + + $('.click').removeClass('active'); + $clickedCard.addClass('active'); + + var isPaymentBoxVisible = $('#paymentIncDecBox').is(':visible'); + var isPackageVisible = $('.card-grid-package').is(':visible'); + + $('.card-grid-package').slideUp("slow"); + $('#paymentIncDecBox').slideUp("slow"); + + if (index === 2) { + if (!isPaymentBoxVisible) { + $('#paymentIncDecBox').slideDown("slow"); + } + } else { + if (!isPackageVisible) { + $('.card-grid-package').slideDown("slow"); + } + } +}) + + +$(document).ready(function () { + $(document).on('click', '.increment', function () { + var $input = $(this).siblings('.increDecreInput'); + var currentValue = parseInt($input.val()); + + $input.val(currentValue + 1); + updateTotalAmount(currentValue + 1); + $('#addMaxPerson').text(Number($('#addMaxPerson').text()) + 1); + }); + + $(document).on('click', '.decrement', function () { + var $input = $(this).siblings('.increDecreInput'); + var currentValue = parseInt($input.val()); + + if (currentValue > 0) { + $input.val(currentValue - 1); + updateTotalAmount(currentValue - 1); + $('#addMaxPerson').text(Number($('#addMaxPerson').text()) - 1); + } + }); + + function updateTotalAmount(quantity) { + var pricePerPerson = 350000; + var totalAmount = quantity * pricePerPerson; + + $('.increDecreTxt3').text(totalAmount.toLocaleString() + ' تومان'); + } +}); \ No newline at end of file