diff --git a/0_Framework/Application/Version.cs b/0_Framework/Application/Version.cs index 8e502ad0..3c1d2c51 100644 --- a/0_Framework/Application/Version.cs +++ b/0_Framework/Application/Version.cs @@ -10,13 +10,12 @@ public static class Version { static Version() { - StyleVersion = "2.12.07"; - AdminVersion = "2.5.27"; - CameraVersion = "1.0.4"; + StyleVersion = "2.12.10"; + AdminVersion = "2.5.30"; + CameraVersion = "1.0.6"; } public static string StyleVersion { get; set; } public static string AdminVersion { get; set; } public static string CameraVersion { get; set; } - } \ No newline at end of file diff --git a/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs b/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs index edaf2ea7..6c448baa 100644 --- a/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs +++ b/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs @@ -224,30 +224,30 @@ public class AccountRepository : RepositoryBase, IAccountReposito - public List GetAccountEqualToLowerPositionValue() - { + public List GetAccountEqualToLowerPositionValue() + { - var account = GetIncludePositions(int.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value)); - return _context.Accounts.Include(x => x.Position) - .Where(x => x.Position.PositionValue >= account.Position.PositionValue && x.IsActiveString == "true").Select(x => new AccountViewModel() - { - PositionValue = x.Position.PositionValue, - Id = x.id, - Fullname = x.Fullname, - Mobile = x.Mobile, - ProfilePhoto = x.ProfilePhoto, - Role = x.Role.Name, - RoleId = x.RoleId, - Username = x.Username, - RoleName = x.RoleName, - CreationDate = x.CreationDate.ToFarsi(), - IsActiveString = x.IsActiveString, - CreationDateGr = x.CreationDate, + var account = GetIncludePositions(int.Parse(_contextAccessor.HttpContext.User.FindFirst("AccountId").Value)); + return _context.Accounts.Include(x => x.Position) + .Where(x => x.Position.PositionValue >= account.Position.PositionValue && x.IsActiveString == "true" && x.id != account.id).Select(x => new AccountViewModel() + { + PositionValue = x.Position.PositionValue, + Id = x.id, + Fullname = x.Fullname, + Mobile = x.Mobile, + ProfilePhoto = x.ProfilePhoto, + Role = x.Role.Name, + RoleId = x.RoleId, + Username = x.Username, + RoleName = x.RoleName, + CreationDate = x.CreationDate.ToFarsi(), + IsActiveString = x.IsActiveString, + CreationDateGr = x.CreationDate, - }).ToList(); + }).ToList(); - } - public List GetAccountsByIds(List ids) + } + public List GetAccountsByIds(List ids) { var res = _context.Accounts.Include(x => x.Position).Where(x => x.PositionId != null); return res.Where(x => ids.Contains(x.id)).ToList(); diff --git a/CompanyManagment.App.Contracts/Workshop/TakePictureModel.cs b/CompanyManagment.App.Contracts/Workshop/TakePictureModel.cs index e9ea2295..0c811e2c 100644 --- a/CompanyManagment.App.Contracts/Workshop/TakePictureModel.cs +++ b/CompanyManagment.App.Contracts/Workshop/TakePictureModel.cs @@ -13,6 +13,8 @@ namespace CompanyManagment.App.Contracts.Workshop public long EmployeeId { get; set; } public string Name { get; set; } public IFormFile ProfilePhoto { get; set; } - public bool HasPicture { get; set; } + public string Pic1 { get; set; } + public string Pic2 { get; set; } + public bool HasPicture { get; set; } } } diff --git a/CompanyManagment.Application/InsuranceListApplication.cs b/CompanyManagment.Application/InsuranceListApplication.cs index 894d9fc3..1c8652f5 100644 --- a/CompanyManagment.Application/InsuranceListApplication.cs +++ b/CompanyManagment.Application/InsuranceListApplication.cs @@ -622,7 +622,7 @@ public class InsuranceListApplication: IInsuranceListApplication } //farokhiChanges if (item.EmployeeId == 42783) - employeeDetailsForInsuranceObj.MonthlyBenefits = 88000000; + employeeDetailsForInsuranceObj.MonthlyBenefits = 5382855; employeeDetailsForInsuranceObj.BenefitsIncludedContinuous =employeeDetailsForInsuranceObj.MonthlyBenefits + employeeDetailsForInsuranceObj.MonthlySalary; @@ -666,7 +666,7 @@ public class InsuranceListApplication: IInsuranceListApplication employeeDetailsForInsuranceObj.StartWorkDateGr = item.StartWorkDateGr; //farokhiChanges if (item.EmployeeId == 42783) - employeeDetailsForInsuranceObj.MonthlyBenefits = 88000000; + employeeDetailsForInsuranceObj.MonthlyBenefits = 5382855; list.Add(employeeDetailsForInsuranceObj); } diff --git a/CompanyManagment.Application/RollCallEmployeeApplication.cs b/CompanyManagment.Application/RollCallEmployeeApplication.cs index 5b39cae8..d8776c6d 100644 --- a/CompanyManagment.Application/RollCallEmployeeApplication.cs +++ b/CompanyManagment.Application/RollCallEmployeeApplication.cs @@ -83,15 +83,16 @@ public class RollCallEmployeeApplication : IRollCallEmployeeApplication public OperationResult UploadedImage(long Employeeid, long WorkshopId) { - var opreation = new OperationResult(); - var emp = _rollCallEmployeeRepository.Get(Employeeid); - if (emp == null) - return opreation.Failed("پرسنل یافت نشد"); + var opreation = new OperationResult(); + var emp = _rollCallEmployeeRepository.GetByEmployeeIdAndWorkshopId(Employeeid, WorkshopId); + if (emp == null) + return opreation.Failed("پرسنل یافت نشد"); - emp.HasImage(); - _rollCallEmployeeRepository.SaveChanges(); - return opreation.Succcedded(); - } + var rollCall = _rollCallEmployeeRepository.Get(emp.Id); + rollCall.HasImage(); + _rollCallEmployeeRepository.SaveChanges(); + return opreation.Succcedded(); + } public List GetByWorkshopId(long workshopId) diff --git a/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs b/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs index 94c84d53..9a667009 100644 --- a/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs @@ -29,6 +29,7 @@ public class RollCallEmployeeRepository : RepositoryBase var query = _context.RollCallEmployees.Select(x => new RollCallEmployeeViewModel() { Id = x.id, + EmployeeId = x.EmployeeId, WorkshopId = x.WorkshopId, EmployeeFullName = x.EmployeeFullName, IsActiveString = x.IsActiveString, diff --git a/CompanyManagment.EFCore/Repository/RollCallRepository.cs b/CompanyManagment.EFCore/Repository/RollCallRepository.cs index 391b00ab..f5e709ba 100644 --- a/CompanyManagment.EFCore/Repository/RollCallRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallRepository.cs @@ -95,7 +95,7 @@ public class RollCallRepository : RepositoryBase, IRollCallRepos { StartDate = x.StartDate, EndDate = x.EndDate, - TotalWorkingHours = $"{Convert.ToInt32(x.TotalhourseSpan.TotalHours)}:{x.TotalhourseSpan.Minutes.ToString("00")}", + TotalWorkingHours = $"{x.TotalhourseSpan.TotalHours.ToString("0")}:{x.TotalhourseSpan.Minutes.ToString("00")}", DayOfWeek = x.DayOfWeek, RollCallDateFa = x.RollCallDateFa, DateTimeGr = x.DateTimeGr, @@ -237,7 +237,7 @@ public class RollCallRepository : RepositoryBase, IRollCallRepos IsHoliday = _holidayItemApplication.IsHoliday(x.DateGr), IsAbsent = !x.RollCallTimesList.Any(), RollCallTimesList = x.RollCallTimesList, - TotalWorkingHours = $"{Convert.ToInt32(x.TotalWorkingHoursSpan.TotalHours)}:{x.TotalWorkingHoursSpan.Minutes.ToString("00")}", + TotalWorkingHours = $"{x.TotalWorkingHoursSpan.TotalHours.ToString("0")}:{x.TotalWorkingHoursSpan.Minutes.ToString("00")}", }).ToList(); return new EmployeeRollCallsByMonthViewModel() { @@ -362,7 +362,7 @@ public class RollCallRepository : RepositoryBase, IRollCallRepos HasLeave = x.HasLeave, IsAbsent = x.IsAbsent, PersonnelCode = x.PersonnelCode, - TotalWorkingHours = $"{Convert.ToInt32(x.TotalWorkingHoursSpan.TotalHours)}:{x.TotalWorkingHoursSpan.Minutes.ToString("00")}" + TotalWorkingHours = $"{x.TotalWorkingHoursSpan.TotalHours.ToString("0")}:{x.TotalWorkingHoursSpan.Minutes.ToString("00")}" }); return result; } @@ -443,7 +443,7 @@ public class RollCallRepository : RepositoryBase, IRollCallRepos EmployeeFullName = x.EmployeeFullName, EmployeeId = x.EmployeeId, TotalWorkingHours = - $"{Convert.ToInt32(x.TotalWorkingHoursSpan.TotalHours)}:{x.TotalWorkingHoursSpan.Minutes.ToString("00")}", + $"{x.TotalWorkingHoursSpan.TotalHours.ToString("0")}:{x.TotalWorkingHoursSpan.Minutes.ToString("00")}", RollCallTimesList = x.RollCallTimesList }).ToList(); diff --git a/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs b/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs index 0537e382..e1e876a2 100644 --- a/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs +++ b/CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs @@ -710,8 +710,7 @@ public class YearlySalaryRepository : RepositoryBase, IYearl BaseResult = Sum + fixFeePrice; //var rondUp = Convert.ToInt32(BaseResult); - - + Console.WriteLine($"{test} - mozdeSaleGhabl[{firstDayliSalary}] - mozdeSaleJari[{BaseResult}] - fixFeePercentage[{fixFeePercentage}] - fixFeePrice[{fixFeePrice}]"); //آی دی سال جاری loopDateId = salary.Where(x => x.StartDate <= LoopDateGr && x.EndDate >= LoopDateGr && x.id != loopDateId).Select(x => x.id).FirstOrDefault(); // ذخیره سال جاری بعنوان سال گذشته برای عملیات بعدی @@ -746,12 +745,12 @@ public class YearlySalaryRepository : RepositoryBase, IYearl var Sum = firstDayliSalary + percntSumDaylifee; //مزد پایه BaseResult = Sum + fixFeePrice; - //var rondUp = Convert.ToInt32(BaseResult); + //var rondUp = Convert.ToInt32(BaseResult); + Console.WriteLine($"{test} - mozdeSaleGhabl[{firstDayliSalary}] - mozdeSaleJari[{BaseResult}] - fixFeePercentage[{fixFeePercentage}] - fixFeePrice[{fixFeePrice}]"); - - //آی دی سال جاری - loopDateId = salary.Where(x => x.StartDate <= LoopDateGr && x.EndDate >= LoopDateGr && x.id != loopDateId).Select(x => x.id).FirstOrDefault(); + //آی دی سال جاری + loopDateId = salary.Where(x => x.StartDate <= LoopDateGr && x.EndDate >= LoopDateGr && x.id != loopDateId).Select(x => x.id).FirstOrDefault(); // ذخیره سال جاری بعنوان سال گذشته برای عملیات بعدی oldYear = loopdateYear; } @@ -774,12 +773,12 @@ public class YearlySalaryRepository : RepositoryBase, IYearl //مزد پایه BaseResult = Sum + fixFeePrice; - //var rondUp = Convert.ToInt32(BaseResult); + //var rondUp = Convert.ToInt32(BaseResult); + Console.WriteLine($"{test} - mozdeSaleGhabl[{firstDayliSalary}] - mozdeSaleJari[{BaseResult}] - fixFeePercentage[{fixFeePercentage}] - fixFeePrice[{fixFeePrice}]"); - - //آی دی سال جاری - loopDateId = salary.Where(x => x.StartDate <= LoopDateGr && x.EndDate >= LoopDateGr && x.id != loopDateId).Select(x => x.id).FirstOrDefault(); + //آی دی سال جاری + loopDateId = salary.Where(x => x.StartDate <= LoopDateGr && x.EndDate >= LoopDateGr && x.id != loopDateId).Select(x => x.id).FirstOrDefault(); // ذخیره سال جاری بعنوان سال گذشته برای عملیات بعدی oldYear = loopdateYear; } @@ -806,8 +805,11 @@ public class YearlySalaryRepository : RepositoryBase, IYearl //پایه سنوات سال جاری بعلاوه مزد پایه BaseResult += Basic; basicResultSum += Basic; - //صفر نمودن شمارنده روزها - DayCounter = 0; + Console.BackgroundColor = ConsoleColor.DarkYellow; + Console.WriteLine($"{test} - mozd[{BaseResult}] - Basic[{Basic}]"); + Console.ResetColor(); + //صفر نمودن شمارنده روزها + DayCounter = 0; } //if (loopdateFa == "1398/12/29") diff --git a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml.cs b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml.cs index 4abada1d..56d87b1a 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml.cs +++ b/ServiceHost/Areas/Admin/Pages/Company/InsuranceList/Index.cshtml.cs @@ -844,7 +844,7 @@ public class IndexModel : PageModel if (workingDaysL == endMonthCurrentDayL) benefitsIncludedContinuousL = sum; //farokhiChanges if (employeeId == 42783) - benefitsIncludedContinuousL = 88000000; + benefitsIncludedContinuousL = 5382855; if (workingDaysL < endMonthCurrentDayL) { if (endMonthCurrentDayL == 29) diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/CreateModal.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/CreateModal.cshtml index 359c9586..2e135ebb 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/CreateModal.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/Task/CreateModal.cshtml @@ -1,16 +1,17 @@ @model AccountManagement.Application.Contracts.Task.CreateTaskModal @* @model ServiceHost.Areas.AdminNew.Pages.Company.Task.CreateModel *@ @inject _0_Framework.Application.IAuthHelper AuthHelper; -@using Version = _0_Framework.Application.Version +@using _0_Framework.Application @{ ViewData["title"] = " - وظیفه جدید"; + string adminVersion = _0_Framework.Application.Version.AdminVersion; } - - - + + + @@ -313,7 +314,7 @@ - + @@ -333,4 +334,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml index 14c6760d..e1938aaf 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml +++ b/ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml @@ -12,7 +12,7 @@ - + @* ?ver=@Version.AdminVersion *@ diff --git a/ServiceHost/Areas/Camera/Pages/ErrorMessage.cshtml b/ServiceHost/Areas/Camera/Pages/ErrorMessage.cshtml new file mode 100644 index 00000000..55ea471e --- /dev/null +++ b/ServiceHost/Areas/Camera/Pages/ErrorMessage.cshtml @@ -0,0 +1,64 @@ +@page +@model ServiceHost.Areas.Camera.Pages.ErrorMessageModel +@using Version = _0_Framework.Application.Version + +@{ + Layout = "Shared/_Layout"; + ViewData["Title"] = " - " + "خطای سیستمی"; +} + +@section Styles +{ + + +} + +
+
+ + + + + + + + + + + + + + + +
+
+

@Model.Message

+
+
\ No newline at end of file diff --git a/ServiceHost/Areas/Camera/Pages/ErrorMessage.cshtml.cs b/ServiceHost/Areas/Camera/Pages/ErrorMessage.cshtml.cs new file mode 100644 index 00000000..8747bf49 --- /dev/null +++ b/ServiceHost/Areas/Camera/Pages/ErrorMessage.cshtml.cs @@ -0,0 +1,18 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace ServiceHost.Areas.Camera.Pages +{ + public class ErrorMessageModel : PageModel + { + public string Message { get; set; } + public void OnGet(string message) + { + if (message == "ServiceNotFound") + Message = "شما سرویس فعال ندارید."; + + if (message == "EmployeeNotFound") + Message = "شما هیچ پرسنلی را به حضور غیاب اضافه نکرده‌اید."; + } + } +} diff --git a/ServiceHost/Areas/Camera/Pages/Index.cshtml b/ServiceHost/Areas/Camera/Pages/Index.cshtml index 2215e9e1..9834bd9a 100644 --- a/ServiceHost/Areas/Camera/Pages/Index.cshtml +++ b/ServiceHost/Areas/Camera/Pages/Index.cshtml @@ -1,10 +1,14 @@ @page @model ServiceHost.Areas.Camera.Pages.IndexModel -@{ - Layout = "Shared/_CameraLayout"; - ViewData["title"] = "حضور غیاب"; - + .div-logout { + position: fixed; + right: -130px; + top: 110px; + } + } - -
- -
- آماده سازی... -
- -
-
-
-
- +@section Styles +{ + + +} + +
+
+
+ + + + + + + + + + + + + + + +
+
+

برای ساعات حضور و غیاب میباست از گوشی استفاده نمایید!

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

خاموش

+ +
+
+ + + + + + + + + + + + + + + +
+ +
+ + +
+ @*
+ + +
*@ + +
+ +
+ +
+
+ +
+ +
+ آماده سازی... +
+ +
+
+@*
+
*@ +
+ + +
+
+
+ + + + + + +@*
+
+
+
*@ +
- @foreach (var item in Model.ImageDataList) - { - - } - - + @foreach (var item in @Model.ImageDataList) + { + + }
@section Script { - @* *@ - @* *@ - - - - + + + @* *@ + @* *@ + + + + } \ No newline at end of file diff --git a/ServiceHost/Areas/Camera/Pages/Index.cshtml.cs b/ServiceHost/Areas/Camera/Pages/Index.cshtml.cs index 2a616316..99cebcb6 100644 --- a/ServiceHost/Areas/Camera/Pages/Index.cshtml.cs +++ b/ServiceHost/Areas/Camera/Pages/Index.cshtml.cs @@ -1,127 +1,162 @@ +using System.Diagnostics; using _0_Framework.Application; using CompanyManagment.App.Contracts.Employee; using CompanyManagment.App.Contracts.RollCall; -using CompanyManagment.App.Contracts.RollCallEmployee; -using CompanyManagment.App.Contracts.RollCallService; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; +using System.IO; +using CompanyManagment.App.Contracts.RollCallEmployee; +using CompanyManagment.App.Contracts.RollCallService; namespace ServiceHost.Areas.Camera.Pages; [Authorize] public class IndexModel : PageModel { - private readonly IAuthHelper _authHelper; - private readonly IConfiguration _configuration; - private readonly IEmployeeApplication _employeeApplication; - private readonly IRollCallApplication _rollCallApplication; - private readonly IRollCallEmployeeApplication _rollCallEmployeeApplication; - private readonly IRollCallServiceApplication _rollCallServiceApplication; - private readonly IWebHostEnvironment _webHostEnvironment; - public string filePath = ""; - public List ImageDataList; - public string modelPath = ""; - public List PersonelIds; - public long WorkshopId; + private readonly IWebHostEnvironment _webHostEnvironment; + private readonly IConfiguration _configuration; + private readonly IEmployeeApplication _employeeApplication; + private readonly IRollCallApplication _rollCallApplication; + private readonly IRollCallServiceApplication _rollCallServiceApplication; + private readonly IRollCallEmployeeApplication _rollCallEmployeeApplication; + private readonly IAuthHelper _authHelper; + public long WorkshopId; + public List ImageDataList; + public List PersonelIds; - public IndexModel(IWebHostEnvironment webHostEnvironment, IConfiguration configuration, - IEmployeeApplication employeeApplication, IRollCallApplication rollCallApplication, IAuthHelper authHelper, - IRollCallServiceApplication rollCallServiceApplication, - IRollCallEmployeeApplication rollCallEmployeeApplication) - { - _webHostEnvironment = webHostEnvironment; - _configuration = configuration; - _employeeApplication = employeeApplication; - _rollCallApplication = rollCallApplication; - _authHelper = authHelper; - _rollCallServiceApplication = rollCallServiceApplication; - _rollCallEmployeeApplication = rollCallEmployeeApplication; - } + public IndexModel(IWebHostEnvironment webHostEnvironment, IConfiguration configuration, IEmployeeApplication employeeApplication, IRollCallApplication rollCallApplication, IAuthHelper authHelper, IRollCallServiceApplication rollCallServiceApplication, IRollCallEmployeeApplication rollCallEmployeeApplication) + { + _webHostEnvironment = webHostEnvironment; + _configuration = configuration; + _employeeApplication = employeeApplication; + _rollCallApplication = rollCallApplication; + _authHelper = authHelper; + _rollCallServiceApplication = rollCallServiceApplication; + _rollCallEmployeeApplication = rollCallEmployeeApplication; + } - public void OnGet() - { - var cameraAccount = _authHelper.CameraAccountInfo(); - WorkshopId = cameraAccount.WorkshopId; - var service = _rollCallServiceApplication.GetActiveServiceByWorkshopId(cameraAccount.WorkshopId); - if (service != null && service.IsActiveString == "true") - if (_rollCallEmployeeApplication.GetByWorkshopId(cameraAccount.WorkshopId).Count > 0) - { - PersonelIds = _rollCallEmployeeApplication.GetByWorkshopId(cameraAccount.WorkshopId) - .Where(x => x.IsActiveString == "true" && x.HasUploadedImage == "true") - .Select(x => x.EmployeeId) - .Take(service.MaxPersonValid) - .ToList(); - var imageData = new List(); - foreach (var personId in PersonelIds) - for (var i = 1; i <= 2; i++) - { - var fileContent = System.IO.File.ReadAllBytes( - $"{_webHostEnvironment.ContentRootPath}\\Faces\\{WorkshopId}\\{personId}\\{i}.jpg"); - imageData.Add(new ImageData - { - ImagePath = Convert.ToBase64String(fileContent), - ImageNumber = i, - Id = personId - }); - } + public IActionResult OnGet() + { + var cameraAccount = _authHelper.CameraAccountInfo(); + WorkshopId = cameraAccount.WorkshopId; + var service = _rollCallServiceApplication.GetActiveServiceByWorkshopId(cameraAccount.WorkshopId); + if (service != null && service.IsActiveString == "true") + { + if (_rollCallEmployeeApplication.GetByWorkshopId(cameraAccount.WorkshopId).Count > 0) + { + var personnelIdsList = _rollCallEmployeeApplication.GetByWorkshopId(cameraAccount.WorkshopId) + .Where(x => x.IsActiveString == "true" && x.HasUploadedImage == "true") + .Select(x => x.EmployeeId); - ImageDataList = imageData; - } - } + if (service.MaxPersonValid != -1) + { + PersonelIds = personnelIdsList.Take(service.MaxPersonValid).ToList(); + } + else + { + PersonelIds = personnelIdsList.ToList(); + } - public IActionResult OnGetEmployeeFlag(long employeeId, long workshopId) - { - var employeeFullName = _rollCallEmployeeApplication.GetByEmployeeIdAndWorkshopId(employeeId, workshopId) - .EmployeeFullName; - var flagId = _rollCallApplication.Flag(employeeId, workshopId); + var imageData = new List(); + foreach (var personId in PersonelIds) + { + for (int i = 1; i <= 2; i++) + { + byte[] fileContent = System.IO.File.ReadAllBytes($"{_webHostEnvironment.ContentRootPath}\\Faces\\{WorkshopId}\\{personId}\\{i}.jpg"); + imageData.Add(new ImageData() + { + ImagePath = Convert.ToBase64String(fileContent), + ImageNumber = i, + Id = personId + }); + } + } + ImageDataList = imageData; + } + else + { + var message = "EmployeeNotFound"; + return Redirect("/Camera/ErrorMessage?message=" + message); + } - return new JsonResult(new - { - employeeName = employeeFullName, - flag = flagId - }); - } + } else + { + var message = "ServiceNotFound"; + return Redirect("/Camera/ErrorMessage?message=" + message); + } - public IActionResult OnGetOut(long flagId) - { - var res = _rollCallApplication.Edit(flagId); - if (res.IsSuccedded) - return new JsonResult(new - { - isSuccess = true - }); - return new JsonResult(new - { - isSuccess = false - }); - } + return Page(); + } - public IActionResult OnGetInCom(long employeeId, long workshopId) - { - var now = DateTime.Now; - var command = new CreateRollCall - { - WorkshopId = workshopId, - EmployeeId = employeeId, - StartDate = now - }; - var res = _rollCallApplication.Create(command); - if (res.IsSuccedded) - return new JsonResult(new - { - isSuccess = true - }); - return new JsonResult(new - { - isSuccess = false - }); - } + public IActionResult OnGetEmployeeFlag(long employeeId, long workshopId) + { + var employeeFullName = _rollCallEmployeeApplication.GetByEmployeeIdAndWorkshopId(employeeId, workshopId).EmployeeFullName; + var flagId = _rollCallApplication.Flag(employeeId, workshopId); + + return new JsonResult(new + { + employeeName = employeeFullName, + flag = flagId + + }); + + } + + public IActionResult OnGetOut(long flagId) + { + var res = _rollCallApplication.Edit(flagId); + if (res.IsSuccedded) + { + return new JsonResult(new + { + isSuccess = true, + }); + } + else + { + return new JsonResult(new + { + isSuccess = false, + }); + } + } + + public IActionResult OnGetInCom(long employeeId, long workshopId) + { + var now = DateTime.Now; + var command = new CreateRollCall() + { + WorkshopId = workshopId, + EmployeeId = employeeId, + StartDate = now, + + }; + var res = _rollCallApplication.Create(command); + if (res.IsSuccedded) + { + return new JsonResult(new + { + isSuccess = true, + }); + } + else + { + return new JsonResult(new + { + isSuccess = false, + }); + } + + } } public class ImageData { - public string ImagePath { get; set; } - public int ImageNumber { get; set; } - public long Id { get; set; } + + public string ImagePath { get; set; } + public int ImageNumber { get; set; } + public long Id { get; set; } + + } \ No newline at end of file diff --git a/ServiceHost/Areas/Camera/Pages/Shared/_AdminLayoutCopy.cshtml b/ServiceHost/Areas/Camera/Pages/Shared/_AdminLayoutCopy.cshtml new file mode 100644 index 00000000..44fd2616 --- /dev/null +++ b/ServiceHost/Areas/Camera/Pages/Shared/_AdminLayoutCopy.cshtml @@ -0,0 +1,154 @@ +@using Microsoft.AspNetCore.Razor.Language.Intermediate +@using Version = _0_Framework.Application.Version + + + + + + + + + + + + @ViewData["Title"] | دادمهر گستر + + + + + + + + + + + + + + + + + + + + + + @**@ + + + + + + + + + + + + + + @* *@ + + @RenderSection("Styles", false) + + + + + +@RenderBody() + + + + + + @**@ + + + + + + + + + + + + + + + + + + + + + @* + + + + + + + *@ + + + + + @**@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @RenderSection("Script", false) + + + + + + + + + + \ No newline at end of file diff --git a/ServiceHost/Areas/Camera/Pages/Shared/_CameraLayout.cshtml b/ServiceHost/Areas/Camera/Pages/Shared/_CameraLayout.cshtml index 5a0a7c04..09be94d1 100644 --- a/ServiceHost/Areas/Camera/Pages/Shared/_CameraLayout.cshtml +++ b/ServiceHost/Areas/Camera/Pages/Shared/_CameraLayout.cshtml @@ -1,26 +1,32 @@  - - - - - حضور و غیاب @ViewData["Title"] + + + + + حضور و غیاب @ViewData["Title"] - + - - + + - + - + - + - *@ + + + + + + +
+
+ + @RenderBody() + +
+
+ + + + + + @RenderSection("Script", false) + + + + \ No newline at end of file diff --git a/ServiceHost/Areas/Camera/Pages/Shared/_ValidationScriptsPartial.cshtml b/ServiceHost/Areas/Camera/Pages/Shared/_ValidationScriptsPartial.cshtml index 660f00c3..5a16d80a 100644 --- a/ServiceHost/Areas/Camera/Pages/Shared/_ValidationScriptsPartial.cshtml +++ b/ServiceHost/Areas/Camera/Pages/Shared/_ValidationScriptsPartial.cshtml @@ -1,2 +1,2 @@  - \ No newline at end of file + diff --git a/ServiceHost/Areas/Camera/Pages/_ViewImports.cshtml b/ServiceHost/Areas/Camera/Pages/_ViewImports.cshtml index 9053e2ec..78140377 100644 --- a/ServiceHost/Areas/Camera/Pages/_ViewImports.cshtml +++ b/ServiceHost/Areas/Camera/Pages/_ViewImports.cshtml @@ -1,3 +1,3 @@ @using ServiceHost @namespace ServiceHost.Pages -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/ServiceHost/Areas/Camera/Pages/_ViewStart.cshtml b/ServiceHost/Areas/Camera/Pages/_ViewStart.cshtml index 1a148b27..a5f10045 100644 --- a/ServiceHost/Areas/Camera/Pages/_ViewStart.cshtml +++ b/ServiceHost/Areas/Camera/Pages/_ViewStart.cshtml @@ -1,3 +1,3 @@ @{ - Layout = "_CameraLayout"; -} \ No newline at end of file + Layout = "_Layout"; +} diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml index 0ad47ed8..af3d1ca0 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml @@ -35,15 +35,38 @@ border-radius: 7px; } - @@media (max-width: 767px) { - .table-rollcall .width2 { - width: 35% !important; - overflow: hidden; - } + .goToTop { + position: fixed; + bottom: -10px; + margin-right: 100px; + z-index: 100; + color: #fff; + background-color: #25acacd6; + } + + .goToTop:hover { + color: #fff; + background-color: #2ca4a4; + } + + @@media screen and (max-width: 767px) { + .table-rollcall .width2 { + width: 35% !important; + overflow: hidden; + } .sticky { top: 48px !important; } + + .goToTop { + position: fixed; + bottom: 54px; + margin-right: 39%; + z-index: 100; + color: #fff; + background-color: #25acac70; + } } } @@ -79,6 +102,16 @@
+ +
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml index 6fbe76c0..8cec90aa 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml @@ -46,7 +46,7 @@
-
+
@@ -60,99 +60,102 @@
تجمیع در خروج
مجموع ساعات کاری
- - @if (@Model.RollCallViewModels.PresentEmployees.Any()) - { - @foreach (var item in Model.RollCallViewModels.PresentEmployees) + +
+
+ @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 ?? "-")
-
- } -
- -
- @foreach (var itemTime in item.RollCallTimesList) - { -
ساعت خروج
-
-
@(itemTime.EndDate ?? "-")
-
- } -
- -
-
-
تجمیع در خروج:
-
-
-
-
- -
-
-
مجموع ساعات کاری:
-
- @if (item.RollCallTimesList.Last().EndDate == null) - { - - - - - - - } - else - { - @item.TotalWorkingHours - } +
+
نام پرسنل
+
+ @item.EmployeeFullName
-
-
+
+
+
شماره پرسنلی:
+
@item.PersonnelCode
+
+
+ +
+
+
تاخیر در ورود:
+
-
+
+
+ +
+ @foreach (var itemTime in item.RollCallTimesList) + { +
ساعت ورود
+
+
@(itemTime.StartDate ?? "-")
+
+ } +
+ +
+ @foreach (var itemTime in item.RollCallTimesList) + { +
ساعت خروج
+
+
@(itemTime.EndDate ?? "-")
+
+ } +
+ +
+
+
تجمیع در خروج:
+
-
+
+
+ +
+
+
مجموع ساعات کاری:
+
+ @if (item.RollCallTimesList.Last().EndDate == null) + { + + + + + + + } + else + { + @item.TotalWorkingHours + } +
+
+
+ +
+ } } - } - else - { - - } + else + { + + } +
@@ -160,7 +163,7 @@
-
+
@@ -173,51 +176,55 @@
- @if (@Model.RollCallViewModels.AbsentEmployees.Any(x => !x.HasLeave)) - { - @foreach (var item in Model.RollCallViewModels.AbsentEmployees) +
+
+ @if (@Model.RollCallViewModels.AbsentEmployees.Any(x => !x.HasLeave)) { - if (!item.HasLeave) + @foreach (var item in Model.RollCallViewModels.AbsentEmployees) { -
-
-
- ردیف + if (!item.HasLeave) + { +
+
+
+ ردیف +
+
+
+ @(indexAbsent++) +
+
-
-
- @(indexAbsent++) + +
+
نام پرسنل
+
+ @item.EmployeeFullName +
+
+ +
+
+
شماره پرسنلی:
+
@item.PersonnelCode
- -
-
نام پرسنل
-
- @item.EmployeeFullName -
-
- -
-
-
شماره پرسنلی:
-
@item.PersonnelCode
-
-
-
+ } } } - } - else - { - - } + else + { + + } + +
-
+
@@ -231,52 +238,55 @@
- @if (@Model.RollCallViewModels.AbsentEmployees.Any(x => x.HasLeave)) - { - @foreach (var item in Model.RollCallViewModels.AbsentEmployees) +
+
+ @if (@Model.RollCallViewModels.AbsentEmployees.Any(x => x.HasLeave)) { - if (item.HasLeave) + @foreach (var item in Model.RollCallViewModels.AbsentEmployees) { -
-
-
- ردیف + if (item.HasLeave) + { +
+
+
+ ردیف +
+
+
+ @(indexLeave++) +
+
-
-
- @(indexLeave++) + +
+
نام پرسنل
+
+ @item.EmployeeFullName +
+
+ +
+
+
شماره پرسنلی:
+
@item.PersonnelCode
+
+
+ +
+
+
+
@item.Reason
- -
-
نام پرسنل
-
- @item.EmployeeFullName -
-
- -
-
-
شماره پرسنلی:
-
@item.PersonnelCode
-
-
- -
-
-
-
@item.Reason
-
-
-
+ } } } - } - else - { - - } + else + { + + } +
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml.cs index f7bd4896..65fa2d3d 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml.cs +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml.cs @@ -68,7 +68,6 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall } - public IActionResult OnGetCurrentDayAjax(string type) { var workshopHash = User.FindFirstValue("WorkshopSlug"); diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml index 2c0be50a..dedaeffa 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml @@ -74,7 +74,7 @@ -

تعداد پرسنل سرویس خریداری شده: @Model.MaxPersonValid

+

تعداد پرسنل سرویس خریداری شده: @(Model.MaxPersonValid == -1 ? "نامحدود" : Model.MaxPersonValid)

diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs index 109dd716..5c69be70 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml.cs @@ -79,49 +79,53 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall public IActionResult OnGetCheckModalTakeImage() { - var mess = ""; var workshopHash = User.FindFirstValue("WorkshopSlug"); var workshopId = _passwordHasher.SlugDecrypt(workshopHash); - if (workshopId > 0) + + if (workshopId <= 0) { - var plan = _rollCallServiceApplication.GetActiveServiceByWorkshopId(workshopId); - if (plan != null) + return new JsonResult(new { - if (plan.IsActiveString == "true") - { - var maxValid = plan.MaxPersonValid; - var activedPerson = _rollCallEmployeeApplication.activedPerson(workshopId); - if (activedPerson < maxValid) - { - return new JsonResult(new - { - isSuccedded = true, - message = "موفق" - }); - } - else - { - mess = "محدودیت افزودن پرسنل"; - } - } - else - { - mess = "سرویس شما فعال نیست"; - } - } - else - { - mess = "شما سرویس خریداری شده ندارید"; - } + isSuccedded = false, + message = "کارگاه شما یافت نشده است" + }); } - else + + var plan = _rollCallServiceApplication.GetActiveServiceByWorkshopId(workshopId); + + if (plan == null) { - mess = "کارگاه شما یافت نشده است"; + return new JsonResult(new + { + isSuccedded = false, + message = "شما سرویس خریداری شده ندارید" + }); } + + if (plan.IsActiveString != "true") + { + return new JsonResult(new + { + isSuccedded = false, + message = "سرویس شما فعال نیست" + }); + } + + var maxValid = plan.MaxPersonValid; + + if (maxValid == -1 || _rollCallEmployeeApplication.activedPerson(workshopId) < maxValid) + { + return new JsonResult(new + { + isSuccedded = true, + message = "موفق" + }); + } + return new JsonResult(new { isSuccedded = false, - message = mess, + message = "محدودیت افزودن پرسنل" }); } @@ -144,13 +148,26 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall if (employeeDetails != null) employeeName = employeeDetails.EmployeeFullName; + string pic1 = ""; + string pic2 = ""; + if (hasPicture) + { + byte[] fileContent1 = System.IO.File.ReadAllBytes($"{_webHostEnvironment.ContentRootPath}\\Faces\\{workshopId}\\{employeeId}\\{1}.jpg"); + pic1 = Convert.ToBase64String(fileContent1); + byte[] fileContent2 = System.IO.File.ReadAllBytes($"{_webHostEnvironment.ContentRootPath}\\Faces\\{workshopId}\\{employeeId}\\{2}.jpg"); + pic2 = Convert.ToBase64String(fileContent2); + } + var res = new TakePictureModel() { HasPicture = hasPicture, EmployeeId = employeeId, WorkshopId = workshopId, - Name = employeeName + Name = employeeName, + Pic1 = pic1, + Pic2 = pic2, }; + return Partial("ModalTakeImages", res); } @@ -196,19 +213,14 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall HasUploadedImage = "true", }; result = _rollCallEmployeeApplication.Create(createCommand); - - - } + _rollCallEmployeeStatusApplication.Create(new CreateRollCallEmployeeStatus() + { RollCallEmployeeId = result.SendId }); + } else { - result = new OperationResult() - { - IsSuccedded = true, - Message = "عملیات با موفقیت انجام شده است" - }; + result = _rollCallEmployeeApplication.UploadedImage(employeeId, workshopId); } - _rollCallEmployeeStatusApplication.Create(new CreateRollCallEmployeeStatus() - { RollCallEmployeeId = result.SendId }); + if (result.IsSuccedded) { return new JsonResult(new @@ -232,7 +244,8 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall return new JsonResult(new { IsSuccedded = false, - }); + Message = e.Message, + }); } } diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml.cs index 07967bd1..43558954 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml.cs +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml.cs @@ -130,7 +130,7 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall return new JsonResult(new { Success = result.IsSuccedded, - message = result.Message, + message = result.IsSuccedded ? "نام کاربری با مورد تاییداست" : result.Message, }); } } diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCameraAccount.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCameraAccount.cshtml index cc2197a0..f9da16af 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCameraAccount.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalCameraAccount.cshtml @@ -33,22 +33,25 @@
-
- -
+
+ +
- - - + + + + - - + +
-
-
+
+
@@ -155,4 +158,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/ModalTakeImages.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalTakeImages.cshtml index fdd3bccf..e7899d73 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalTakeImages.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalTakeImages.cshtml @@ -11,7 +11,7 @@
- +
@Model.Name
@@ -55,7 +55,7 @@
- +
@Model.Name
@@ -92,18 +92,18 @@
- + @if (Model.HasPicture) { - + }
- + @if (Model.HasPicture) { - + }
@@ -179,4 +179,4 @@ var antiForgeryToken = $('@Html.AntiForgeryToken()').val(); var takePictureAjax = `@Url.Page("./EmployeeUploadPicture", "TakePicture")`; - \ No newline at end of file + \ No newline at end of file diff --git a/ServiceHost/InsuranceList/546/1403_05/DSKKAR00.dbf b/ServiceHost/InsuranceList/546/1403_05/DSKKAR00.dbf new file mode 100644 index 00000000..4a6b969b Binary files /dev/null and b/ServiceHost/InsuranceList/546/1403_05/DSKKAR00.dbf differ diff --git a/ServiceHost/InsuranceList/546/1403_05/DSKWOR00.dbf b/ServiceHost/InsuranceList/546/1403_05/DSKWOR00.dbf new file mode 100644 index 00000000..91a7a905 Binary files /dev/null and b/ServiceHost/InsuranceList/546/1403_05/DSKWOR00.dbf differ diff --git a/ServiceHost/ServiceHost.csproj b/ServiceHost/ServiceHost.csproj index c08ece7e..0c2531c7 100644 --- a/ServiceHost/ServiceHost.csproj +++ b/ServiceHost/ServiceHost.csproj @@ -108,6 +108,11 @@ + + + + + @@ -249,6 +254,7 @@ + diff --git a/ServiceHost/appsettings.Development.json b/ServiceHost/appsettings.Development.json index b59efef4..9840962d 100644 --- a/ServiceHost/appsettings.Development.json +++ b/ServiceHost/appsettings.Development.json @@ -12,10 +12,10 @@ //"MesbahDb": "Data Source=DESKTOP-NUE119G\\MSNEW;Initial Catalog=Mesbah_db;Integrated Security=True" //server - // "MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;" + "MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;" //local - "MesbahDb": "Data Source=.;Initial Catalog=Mesbah_db;Integrated Security=True;TrustServerCertificate=true;" + //"MesbahDb": "Data Source=.;Initial Catalog=Mesbah_db;Integrated Security=True;TrustServerCertificate=true;" }, "GoogleRecaptchaV3": { "SiteKey": "6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH", diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/DiagramTaskModal.css b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/DiagramTaskModal.css index 37ad5cc1..fb0c49b1 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/DiagramTaskModal.css +++ b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/DiagramTaskModal.css @@ -1,4 +1,7 @@ - +.boxShadowDiagram { + +} + .infoTxt1, .infoTxt2, .infoTxt3, diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/task-manager-list.css b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/task-manager-list.css index 2f22e6e6..fd988720 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/task-manager-list.css +++ b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/task-manager-list.css @@ -715,6 +715,10 @@ font-size: 12px; } +.titleTaskList { + font-size: 14px; + font-weight: 500; +} @media(max-width: 1366px) { .btn-register, .btn-cancel2 { @@ -843,13 +847,15 @@ width: 100%; } -/* .tm-gray .btn-taskmanager-more { - width: 28px; + .btn-taskmanager-more { + width: 28px !important; } - .tm-gray .btn-taskmanager-more span{ - margin: 0 !important; - }*/ + .titleTaskList { + font-size: 12px; + } +} + @media (max-width:580px) { diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Edit.js b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Edit.js index baee6004..a5f24cbf 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Edit.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Edit.js @@ -636,7 +636,8 @@ function uploadFile(file, id, boxClass) { if (e.lengthComputable) { var percentComplete = (e.loaded / e.total) * 100; //$('#progressBar').text(Math.round(percentComplete) + '%'); - loading.css('width', Math.round(percentComplete) + '%'); + let h = Math.round(percentComplete); + loading.css('width', `${h}%`); } }); diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js index 2dfef3b3..166981a1 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js @@ -669,7 +669,7 @@ function loadMore(type) { - - `: ``}`; diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/create.js b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/create.js index 07bfed72..56f0dbac 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/create.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/create.js @@ -680,12 +680,14 @@ function uploadFile(file, id, boxClass) { var xhr = new XMLHttpRequest(); xhr.open('POST', uploadFileModalAjax, true); xhr.setRequestHeader('RequestVerificationToken', antiForgeryToken); - + console.log(loading); xhr.upload.addEventListener('progress', function (e) { if (e.lengthComputable) { var percentComplete = (e.loaded / e.total) * 100; //$('#progressBar').text(Math.round(percentComplete) + '%'); - loading.css('width', Math.round(percentComplete) + '%'); + let h = Math.round(percentComplete); + console.log(h); + loading.css('width', `${h}%`); } }); diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Ticket/js/detailTicketModal.js b/ServiceHost/wwwroot/AssetsAdminNew/Ticket/js/detailTicketModal.js index 6e50463a..4253649c 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/Ticket/js/detailTicketModal.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/Ticket/js/detailTicketModal.js @@ -139,7 +139,7 @@ function loadMessages() { $.each(responseTickets.mediaViewModels, function (i, item) { if (item.category === 'اسکرین شات') { if (item.path.endsWith(".jpg") || item.path.endsWith(".jpeg") || item.path.endsWith(".png") || item.path.endsWith(".gif") || item.path.endsWith(".webp")) { - var urlPage1 = `/AdminNew/Company/Ticket/Index?handler=ShowPicture&filePath=${item.path}`; + var urlPage1 = `/AdminNew/Company/Task/Index?handler=ShowPicture&filePath=${item.path}`; html += `
@@ -178,7 +178,7 @@ function loadMessages() { if (item.category === "صوت") { var voiceId = `waveform${item.id}`; var playPauseId = `play-pause-${item.id}`; - var voiceSrc = `/AdminNew/Company/Ticket/Index?handler=ShowVoice&filePath=${item.path}`; + var voiceSrc = `/AdminNew/Company/Task/Index?handler=ShowVoice&filePath=${item.path}`; html += `
@@ -191,7 +191,7 @@ function loadMessages() { $.each(responseTickets.mediaViewModels, function (i, item) { if (item.category === "فایل") { if (item.path.endsWith(".jpg") || item.path.endsWith(".jpeg") || item.path.endsWith(".png") || item.path.endsWith(".gif") || item.path.endsWith(".webp")) { - var urlPage1 = `/AdminNew/Company/Ticket/Index?handler=ShowPicture&filePath=${item.path}`; + var urlPage1 = `/AdminNew/Company/Task/Index?handler=ShowPicture&filePath=${item.path}`; html += `
@@ -218,7 +218,7 @@ function loadMessages() {
`; } else { - var urlPage2 = `/AdminNew/Company/Ticket/Index?handler=GetFile&filePath=${item.path}&id=${TicketId}`; + var urlPage2 = `/AdminNew/Company/Task/Index?handler=GetFile&filePath=${item.path}&id=${TicketId}`; var fileExtensions = [ ".ai", ".avi", ".bmp", ".crd", ".csv", ".dll", ".doc", ".docx", ".dwg", ".eps", ".exe", ".flv", ".giff", ".html", ".iso", ".java", ".jpg", ".mdb", @@ -258,7 +258,7 @@ function loadMessages() { if (file.category === "صوت") { var voiceId = `waveform${file.id}`; var playPauseId = `play-pause-${file.id}`; - var voiceSrc = `/AdminNew/Company/Ticket/Index?handler=ShowVoice&filePath=${file.path}`; + var voiceSrc = `/AdminNew/Company/Task/Index?handler=ShowVoice&filePath=${file.path}`; html += `
@@ -273,7 +273,7 @@ function loadMessages() { itemResponse.mediaViewModels.forEach(function (file) { if (file.category === "فایل") { if (file.path.endsWith(".jpg") || file.path.endsWith(".jpeg") || file.path.endsWith(".png") || file.path.endsWith(".gif") || file.path.endsWith(".webp")) { - var urlPage1 = `/AdminNew/Company/Ticket/Index?handler=ShowPicture&filePath=${file.path}`; + var urlPage1 = `/AdminNew/Company/Task/Index?handler=ShowPicture&filePath=${file.path}`; html += `
@@ -301,7 +301,7 @@ function loadMessages() {
`; } else { - var urlPage2 = `/AdminNew/Company/Ticket/Index?handler=GetFile&filePath=${file.path}&id=${TicketId}`; + var urlPage2 = `/AdminNew/Company/Task/Index?handler=GetFile&filePath=${file.path}&id=${TicketId}`; var fileExtensions = [ ".ai", ".avi", ".bmp", ".crd", ".csv", ".dll", ".doc", ".docx", ".dwg", ".eps", ".exe", ".flv", ".giff", ".html", ".iso", ".java", ".jpg", ".mdb", @@ -341,7 +341,7 @@ function loadMessages() { if (fileAdmin.category === "صوت") { var voiceId = `waveform${fileAdmin.id}`; var playPauseId = `play-pause-${fileAdmin.id}`; - var voiceSrc = `/AdminNew/Company/Ticket/Index?handler=ShowVoice&filePath=${fileAdmin.path}`; + var voiceSrc = `/AdminNew/Company/Task/Index?handler=ShowVoice&filePath=${fileAdmin.path}`; html += `
@@ -354,7 +354,7 @@ function loadMessages() { itemResponse.mediaViewModels.forEach(function (fileAdmin) { if (fileAdmin.category === "فایل") { if (fileAdmin.path.endsWith(".jpg") || fileAdmin.path.endsWith(".jpeg") || fileAdmin.path.endsWith(".png") || fileAdmin.path.endsWith(".gif") || fileAdmin.path.endsWith(".webp")) { - var urlPage1 = `/AdminNew/Company/Ticket/Index?handler=ShowPicture&filePath=${fileAdmin.path}`; + var urlPage1 = `/AdminNew/Company/Task/Index?handler=ShowPicture&filePath=${fileAdmin.path}`; html += `
@@ -382,7 +382,7 @@ function loadMessages() {
`; } else { - var urlPage2 = `/AdminNew/Company/Ticket/Index?handler=GetFile&filePath=${fileAdmin.path}&id=${TicketId}`; + var urlPage2 = `/AdminNew/Company/Task/Index?handler=GetFile&filePath=${fileAdmin.path}&id=${TicketId}`; var fileExtensions = [ ".ai", ".avi", ".bmp", ".crd", ".csv", ".dll", ".doc", ".docx", ".dwg", ".eps", ".exe", ".flv", ".giff", ".html", ".iso", ".java", ".jpg", ".mdb", diff --git a/ServiceHost/wwwroot/AssetsClient/css/rollcall-list.css b/ServiceHost/wwwroot/AssetsClient/css/rollcall-list.css index c3fe6c9a..4aa5e54e 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/rollcall-list.css +++ b/ServiceHost/wwwroot/AssetsClient/css/rollcall-list.css @@ -54,7 +54,7 @@ .table-rollcall .width5 { - width: 20% !important; + width: 35% !important; } .table-rollcall .Rtable-row.no-avatar { diff --git a/ServiceHost/wwwroot/AssetsClient/css/validation-style.css b/ServiceHost/wwwroot/AssetsClient/css/validation-style.css index c099066f..6f88daed 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/validation-style.css +++ b/ServiceHost/wwwroot/AssetsClient/css/validation-style.css @@ -85,7 +85,8 @@ @media (max-width: 1366px) { - .alert-msg { + .alert-msg, + .alert-success-msg { position: fixed; bottom: 15px; right: 15px; @@ -102,7 +103,8 @@ @media (max-width: 992px) { - .alert-msg { + .alert-msg, + .alert-success-msg { width: 45%; } @@ -112,14 +114,16 @@ font-weight: 600; } - .alert-msg p { + .alert-msg p, + .alert-success-msg p { font-size: 13px; } } @media (max-width: 767px) { - .alert-msg { + .alert-msg, + .alert-success-msg { width: 60%; } @@ -129,14 +133,16 @@ font-weight: 600; } - .alert-msg p { + .alert-msg p, + .alert-success-msg p { font-size: 13px; } } @media (max-width: 576px) { - .alert-msg { + .alert-msg, + .alert-success-msg { width: 70%; } @@ -145,7 +151,8 @@ font-weight: 400; } - .alert-msg p { + .alert-msg p, + .alert-success-msg p { font-size: 12px; } } diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CaseHistory.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CaseHistory.js index 4e40449b..8ad81584 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CaseHistory.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/CaseHistory.js @@ -635,22 +635,23 @@ if (hasData) { loadUntilHeightExceeds(); } -//$(window).on('scroll', function () { -// if ($(window).scrollTop() + $(window).height() >= $(document).height()) { -// caseHistoryLoadAjax(); -// } -//}); +$('.goToTop').on('click',function () { + $('html, body').animate({ scrollTop: 0 }, 360); + return false; +}); $(window).scroll(function () { - if ($(window).scrollTop() + $(window).height() > $(document).height() - 600) { - caseHistoryLoadAjax(); + if (hasData) { + if ($(window).scrollTop() + $(window).height() > $(document).height() - 600) { + caseHistoryLoadAjax(); + } } - //if ($(this).scrollTop() > 100) { - // $('.goToTop').show().fadeIn(); - //} else { - // $('.goToTop').fadeOut().hide(); - //} + if ($(this).scrollTop() > 100) { + $('.goToTop').show().fadeIn(); + } else { + $('.goToTop').fadeOut().hide(); + } }); diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/EmployeeUploadPicture.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/EmployeeUploadPicture.js index 09e7ca17..8e7ac01b 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/EmployeeUploadPicture.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/EmployeeUploadPicture.js @@ -64,7 +64,7 @@ function deactivePersonnel(id) { } function activePersonnel(id, hasUploadedImage) { - if (hasUploadedImage === "true") { + if (hasUploadedImage) { $.ajax({ async: false, dataType: 'json', diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalCameraAccount.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalCameraAccount.js index e297cd65..38fbfa2d 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalCameraAccount.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalCameraAccount.js @@ -94,42 +94,42 @@ $(document).on('click','#accountModalModal button', function() { function passFunction() { var x = document.getElementById("signupInputPassword"); -if (x.type === "password") { - x.type = "text"; -eyeShow.hide(); -eyeClose.show(); + if (x.type === "password") { + x.type = "text"; + eyeShow.hide(); + eyeClose.show(); } else { - x.type = "password"; -eyeShow.show(); -eyeClose.hide(); + x.type = "password"; + eyeShow.show(); + eyeClose.hide(); } } function rePassFunction() { var x = document.getElementById("repeat_password"); -if (x.type === "password") { - x.type = "text"; -reEyeShow.hide(); -reEyeClose.show(); + if (x.type === "password") { + x.type = "text"; + reEyeShow.hide(); + reEyeClose.show(); } else { - x.type = "password"; -reEyeShow.show(); -reEyeClose.hide(); + x.type = "password"; + reEyeShow.show(); + reEyeClose.hide(); } } function passwordCheck(password) { if (password.length >= 8) -strength += 1; -if (password.match(/(?=.*[0-9])/)) -strength += 1; -if (password.match(/(?=.*[!,%,&,@,#,$,^,*,?,_,~,<,>,])/)) -strength += 1; -if (password.match(/(?=.*[A-Z])/)) -strength += 1; + strength += 1; + if (password.match(/(?=.*[0-9])/)) + strength += 1; + if (password.match(/(?=.*[!,%,&,@,#,$,^,*,?,_,~,<,>,])/)) + strength += 1; + if (password.match(/(?=.*[A-Z])/)) + strength += 1; -displayBar(strength); + displayBar(strength); } function displayBar(strength) { @@ -138,59 +138,75 @@ function displayBar(strength) { $("#signupInputPassword").keyup(function () { strength = 0; -var password = $(this).val(); -passwordCheck(password); + var password = $(this).val(); + passwordCheck(password); }); -$(document).ready(function() { - $("#username").keyup(function () { - var username = $('#username').val(); +$(document).ready(function () { + var typingTimer; + var typingInterval = 1500; + + $("#username").on('keyup', function () { + clearTimeout(typingTimer); + var username = $('#username').val(); if (username.length >= 6) { - $.ajax({ - async: false, - dataType: 'json', - type: 'GET', - url: checkAccountAjax, - data: { username: username }, - success: function (response) { - if (response.success) { - $('#errorSvg').addClass("d-none"); - $('#successSvg').removeClass("d-none"); - $('.alert-success-msg').show(); - $('.alert-success-msg p').text(response.message); - setTimeout(function () { - $('.alert-success-msg').hide(); - $('.alert-success-msg p').text(''); - }, 2000); - } else { - $('#successSvg').addClass("d-none"); - $('#errorSvg').removeClass("d-none"); - $('.alert-msg').show(); - $('.alert-msg p').text(response.message); - setTimeout(function () { - $('.alert-msg').hide(); - $('.alert-msg p').text(''); - }, 2000); - } - }, - error: function (err) { - console.log(err); - } - }); + $('#successSvg').addClass("d-none"); + $('#errorSvg').addClass("d-none"); + $('#loadingSpinner').removeClass("d-none"); + + typingTimer = setTimeout(function () { + + $.ajax({ + async: false, + dataType: 'json', + type: 'GET', + url: checkAccountAjax, + data: { username: username }, + success: function (response) { + $('#loadingSpinner').addClass("d-none"); + + if (response.success) { + $('#errorSvg').addClass("d-none"); + $('#successSvg').removeClass("d-none"); + $('.alert-success-msg').show(); + $('.alert-success-msg p').text(response.message); + setTimeout(function () { + $('.alert-success-msg').hide(); + $('.alert-success-msg p').text(''); + }, 2000); + } else { + $('#successSvg').addClass("d-none"); + $('#errorSvg').removeClass("d-none"); + $('.alert-msg').show(); + $('.alert-msg p').text(response.message); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 2000); + } + }, + error: function (err) { + $('#loadingSpinner').addClass("d-none"); + console.log(err); + } + }); + }, typingInterval); } else { - $('.alert-msg').show(); - $('.alert-msg p').text("نام کاربری حداقل باید 6 حرف باشد"); - setTimeout(function () { - $('.alert-msg').hide(); - $('.alert-msg p').text(''); - }, 3500); - $('#successSvg').addClass("d-none"); - $('#errorSvg').removeClass("d-none"); - } - }); + $('.alert-msg').show(); + $('.alert-msg p').text("نام کاربری حداقل باید 6 حرف باشد"); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 4000); + $('#loadingSpinner').addClass("d-none"); + $('#successSvg').addClass("d-none"); + $('#errorSvg').removeClass("d-none"); + } + }); }); + function save() { $.ajax({ async: false, @@ -200,7 +216,7 @@ function save() { headers: { "RequestVerificationToken": antiForgeryToken }, data: $('#create-form').serialize(), success: function (response) { - if (response.Success) { + if (response.success) { $('.alert-success-msg').show(); $('.alert-success-msg p').text(response.message); setTimeout(function () { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js index 7c132834..7922d035 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/RollCall/js/ModalTakeImages.js @@ -252,6 +252,7 @@ let pic2 = $("#pic2").attr('src'); let workshopId = Number($('#workshopId').val()); let employeeId = Number($('#employeeId').val()); + if (pic1 != null && pic2 != null) { $.ajax({ type: 'POST', @@ -264,7 +265,7 @@ $('.alert-success-msg p').text(response.message); setTimeout(function () { $('.alert-success-msg').hide(); - $('.alert-success-msg p').text('ثبت عکس با موفقیت انجام شد'); + $('.alert-success-msg p').text(''); window.location.reload(); }, 2000); } else { @@ -272,7 +273,7 @@ $('.alert-msg p').text(response.message); setTimeout(function () { $('.alert-msg').hide(); - $('.alert-msg p').text('خطایی پیش آمده است'); + $('.alert-msg p').text(''); }, 3500); } }, @@ -282,10 +283,10 @@ }); } else { $('.alert-msg').show(); - $('.alert-msg p').text(response.message); + $('.alert-msg p').text('گرفتن دو عکس الزامیست'); setTimeout(function () { $('.alert-msg').hide(); - $('.alert-msg p').text('گرفتن دو عکس الزامیست'); + $('.alert-msg p').text(''); }, 3500); } } \ No newline at end of file