From 8b1d78e446b73a2f8347b133b9f800b34113fc8c Mon Sep 17 00:00:00 2001 From: SamSys Date: Thu, 12 Sep 2024 07:10:34 +0330 Subject: [PATCH] camera change --- .../AccountApplication.cs | 12 +- .../Repository/AccountRepository.cs | 2 +- .../IPersonnelCodeRepository.cs | 1 + .../IPersonnelCodeApplication.cs | 1 + .../PersonnelCodeApplication.cs | 5 + .../Repository/PersonnelCodeRepository.cs | 10 +- .../Accounts/Account/AccountLeftWork.cshtml | 814 +++++++++--------- ServiceHost/Areas/Camera/Pages/Index.cshtml | 510 ++++++----- .../Areas/Camera/Pages/Index.cshtml.cs | 88 +- ServiceHost/Faces/11/1/1.jpg | Bin 1936848 -> 293688 bytes ServiceHost/Faces/11/1/2.jpg | Bin 81317 -> 298520 bytes ServiceHost/Faces/11/2008/1.jpg | Bin 460350 -> 402908 bytes ServiceHost/Faces/11/2008/2.jpg | Bin 455489 -> 390381 bytes ServiceHost/Faces/11/3056/1.jpg | Bin 500546 -> 342568 bytes ServiceHost/Faces/11/3056/2.jpg | Bin 497794 -> 375753 bytes ServiceHost/Faces/11/3857/1.jpg | Bin 0 -> 369619 bytes ServiceHost/Faces/11/3857/2.jpg | Bin 0 -> 370754 bytes ServiceHost/Faces/11/41289/1.jpg | Bin 573034 -> 266242 bytes ServiceHost/Faces/11/41289/2.jpg | Bin 532885 -> 262276 bytes ServiceHost/Faces/11/41604/1.jpg | Bin 491274 -> 459811 bytes ServiceHost/Faces/11/41604/2.jpg | Bin 489999 -> 396874 bytes ServiceHost/Faces/11/42203/1.jpg | Bin 0 -> 398152 bytes ServiceHost/Faces/11/42203/2.jpg | Bin 0 -> 413812 bytes ServiceHost/Faces/11/42326/1.jpg | Bin 0 -> 229813 bytes ServiceHost/Faces/11/42326/2.jpg | Bin 0 -> 197625 bytes ServiceHost/Faces/11/42961/1.jpg | Bin 208827 -> 327174 bytes ServiceHost/Faces/11/42961/2.jpg | Bin 209431 -> 326351 bytes ServiceHost/Faces/11/42962/1.jpg | Bin 0 -> 373141 bytes ServiceHost/Faces/11/42962/2.jpg | Bin 0 -> 363949 bytes ServiceHost/Faces/11/42964/1.jpg | Bin 0 -> 366885 bytes ServiceHost/Faces/11/42964/2.jpg | Bin 0 -> 362112 bytes ServiceHost/Faces/11/42966/1.jpg | Bin 0 -> 392102 bytes ServiceHost/Faces/11/42966/2.jpg | Bin 0 -> 387040 bytes ServiceHost/Faces/11/42986/1.jpg | Bin 190501 -> 271922 bytes ServiceHost/Faces/11/42986/2.jpg | Bin 182690 -> 294205 bytes ServiceHost/Faces/11/6536/1.jpg | Bin 1736837 -> 245284 bytes ServiceHost/Faces/11/6536/2.jpg | Bin 1737521 -> 243829 bytes ServiceHost/Faces/11/7317/1.jpg | Bin 520182 -> 263194 bytes ServiceHost/Faces/11/7317/2.jpg | Bin 495246 -> 266089 bytes ServiceHost/Faces/11/7371/1.jpg | Bin 492366 -> 325928 bytes ServiceHost/Faces/11/7371/2.jpg | Bin 491234 -> 327287 bytes .../InsuranceList/11/1402_04/DSKKAR00.dbf | Bin 1326 -> 0 bytes .../InsuranceList/11/1402_04/DSKWOR00.dbf | Bin 7787 -> 0 bytes .../InsuranceList/123/1403_01/DSKKAR00.dbf | Bin 1326 -> 0 bytes .../InsuranceList/123/1403_01/DSKWOR00.dbf | Bin 5720 -> 0 bytes .../InsuranceList/139/1402_08/DSKKAR00.dbf | Bin 1326 -> 0 bytes .../InsuranceList/139/1402_08/DSKWOR00.dbf | Bin 7098 -> 0 bytes .../InsuranceList/139/1402_09/DSKKAR00.dbf | Bin 1326 -> 0 bytes .../InsuranceList/139/1402_09/DSKWOR00.dbf | Bin 8476 -> 0 bytes .../InsuranceList/211/1403_02/DSKKAR00.dbf | Bin 1326 -> 0 bytes .../InsuranceList/211/1403_02/DSKWOR00.dbf | Bin 3653 -> 0 bytes .../InsuranceList/220/1402_12/DSKKAR00.dbf | Bin 1326 -> 0 bytes .../InsuranceList/220/1402_12/DSKWOR00.dbf | Bin 2964 -> 0 bytes .../InsuranceList/423/1402_08/DSKKAR00.dbf | Bin 1326 -> 0 bytes .../InsuranceList/423/1402_08/DSKWOR00.dbf | Bin 1586 -> 0 bytes .../InsuranceList/435/1402_09/DSKKAR00.dbf | Bin 1326 -> 0 bytes .../InsuranceList/435/1402_09/DSKWOR00.dbf | Bin 15366 -> 0 bytes .../InsuranceList/54/1402_08/DSKKAR00.dbf | Bin 1326 -> 0 bytes .../InsuranceList/54/1402_08/DSKWOR00.dbf | Bin 5031 -> 0 bytes .../InsuranceList/546/1403_03/DSKKAR00.dbf | Bin 1326 -> 0 bytes .../InsuranceList/546/1403_03/DSKWOR00.dbf | Bin 7098 -> 0 bytes .../InsuranceList/546/1403_04/DSKKAR00.dbf | Bin 1326 -> 0 bytes .../InsuranceList/546/1403_04/DSKWOR00.dbf | Bin 7098 -> 0 bytes .../InsuranceList/546/1403_05/DSKKAR00.dbf | Bin 1326 -> 0 bytes .../InsuranceList/546/1403_05/DSKWOR00.dbf | Bin 7098 -> 0 bytes ServiceHost/Pages/Index.cshtml | 2 +- ServiceHost/Pages/Index.cshtml.cs | 20 +- ServiceHost/appsettings.Development.json | 4 +- 68 files changed, 807 insertions(+), 662 deletions(-) create mode 100644 ServiceHost/Faces/11/3857/1.jpg create mode 100644 ServiceHost/Faces/11/3857/2.jpg create mode 100644 ServiceHost/Faces/11/42203/1.jpg create mode 100644 ServiceHost/Faces/11/42203/2.jpg create mode 100644 ServiceHost/Faces/11/42326/1.jpg create mode 100644 ServiceHost/Faces/11/42326/2.jpg create mode 100644 ServiceHost/Faces/11/42962/1.jpg create mode 100644 ServiceHost/Faces/11/42962/2.jpg create mode 100644 ServiceHost/Faces/11/42964/1.jpg create mode 100644 ServiceHost/Faces/11/42964/2.jpg create mode 100644 ServiceHost/Faces/11/42966/1.jpg create mode 100644 ServiceHost/Faces/11/42966/2.jpg delete mode 100644 ServiceHost/InsuranceList/11/1402_04/DSKKAR00.dbf delete mode 100644 ServiceHost/InsuranceList/11/1402_04/DSKWOR00.dbf delete mode 100644 ServiceHost/InsuranceList/123/1403_01/DSKKAR00.dbf delete mode 100644 ServiceHost/InsuranceList/123/1403_01/DSKWOR00.dbf delete mode 100644 ServiceHost/InsuranceList/139/1402_08/DSKKAR00.dbf delete mode 100644 ServiceHost/InsuranceList/139/1402_08/DSKWOR00.dbf delete mode 100644 ServiceHost/InsuranceList/139/1402_09/DSKKAR00.dbf delete mode 100644 ServiceHost/InsuranceList/139/1402_09/DSKWOR00.dbf delete mode 100644 ServiceHost/InsuranceList/211/1403_02/DSKKAR00.dbf delete mode 100644 ServiceHost/InsuranceList/211/1403_02/DSKWOR00.dbf delete mode 100644 ServiceHost/InsuranceList/220/1402_12/DSKKAR00.dbf delete mode 100644 ServiceHost/InsuranceList/220/1402_12/DSKWOR00.dbf delete mode 100644 ServiceHost/InsuranceList/423/1402_08/DSKKAR00.dbf delete mode 100644 ServiceHost/InsuranceList/423/1402_08/DSKWOR00.dbf delete mode 100644 ServiceHost/InsuranceList/435/1402_09/DSKKAR00.dbf delete mode 100644 ServiceHost/InsuranceList/435/1402_09/DSKWOR00.dbf delete mode 100644 ServiceHost/InsuranceList/54/1402_08/DSKKAR00.dbf delete mode 100644 ServiceHost/InsuranceList/54/1402_08/DSKWOR00.dbf delete mode 100644 ServiceHost/InsuranceList/546/1403_03/DSKKAR00.dbf delete mode 100644 ServiceHost/InsuranceList/546/1403_03/DSKWOR00.dbf delete mode 100644 ServiceHost/InsuranceList/546/1403_04/DSKKAR00.dbf delete mode 100644 ServiceHost/InsuranceList/546/1403_04/DSKWOR00.dbf delete mode 100644 ServiceHost/InsuranceList/546/1403_05/DSKKAR00.dbf delete mode 100644 ServiceHost/InsuranceList/546/1403_05/DSKWOR00.dbf diff --git a/AccountManagement.Application/AccountApplication.cs b/AccountManagement.Application/AccountApplication.cs index f8bc94ee..39202547 100644 --- a/AccountManagement.Application/AccountApplication.cs +++ b/AccountManagement.Application/AccountApplication.cs @@ -348,16 +348,12 @@ public class AccountApplication : IAccountApplication _accountRepository.SaveChanges(); _smsService.LoginSend(phone, r); - TimeSpan delay = TimeSpan.FromSeconds(130); - await Task.Delay(delay); - - account.SetVerifyCode(""); - _accountRepository.SaveChanges(); + //TimeSpan delay = TimeSpan.FromSeconds(30); + + await _accountRepository.RemoveCode(id); + return operation.Succcedded(); - - - } diff --git a/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs b/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs index 6c448baa..e97742fe 100644 --- a/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs +++ b/AccountMangement.Infrastructure.EFCore/Repository/AccountRepository.cs @@ -172,7 +172,7 @@ public class AccountRepository : RepositoryBase, IAccountReposito public async Task RemoveCode(long id) { - TimeSpan delay = TimeSpan.FromSeconds(10); + TimeSpan delay = TimeSpan.FromSeconds(30); await Task.Delay(delay); var acc = Get(id); acc.VerifyCode = ""; diff --git a/Company.Domain/PersonnelCodeAgg/IPersonnelCodeRepository.cs b/Company.Domain/PersonnelCodeAgg/IPersonnelCodeRepository.cs index be5b42fe..2123c95b 100644 --- a/Company.Domain/PersonnelCodeAgg/IPersonnelCodeRepository.cs +++ b/Company.Domain/PersonnelCodeAgg/IPersonnelCodeRepository.cs @@ -17,4 +17,5 @@ public interface IPersonnelCodeRepository : IRepository Search(PersonnelCodeSearchModel searchModel); PersonnelCodeViewModel GetPersonnelCodeViewModel(PersonnelCodeSearchModel searchModel); + long GetEmployeeIdByPersonelCode(long personleCode, long workshopId); } \ No newline at end of file diff --git a/CompanyManagment.Application/PersonnelCodeApplication.cs b/CompanyManagment.Application/PersonnelCodeApplication.cs index d24ebaf5..da131b8e 100644 --- a/CompanyManagment.Application/PersonnelCodeApplication.cs +++ b/CompanyManagment.Application/PersonnelCodeApplication.cs @@ -71,4 +71,9 @@ public class PersonnelCodeApplication : IPersonnelCodeApplication { return _personnelCodeRepository.GetPersonnelCodeViewModel(searchModel); } + + public long GetEmployeeIdByPersonelCode(long personleCode, long workshopId) + { + return _personnelCodeRepository.GetEmployeeIdByPersonelCode(personleCode, workshopId); + } } \ No newline at end of file diff --git a/CompanyManagment.EFCore/Repository/PersonnelCodeRepository.cs b/CompanyManagment.EFCore/Repository/PersonnelCodeRepository.cs index e0f07848..30465658 100644 --- a/CompanyManagment.EFCore/Repository/PersonnelCodeRepository.cs +++ b/CompanyManagment.EFCore/Repository/PersonnelCodeRepository.cs @@ -49,7 +49,7 @@ public class PersonnelCodeRepository : RepositoryBase { query = query.Where(x => x.WorkshopId == searchModel.WorkshopId); } - + return query.OrderByDescending(x => x.Id).ToList(); } public PersonnelCodeViewModel GetPersonnelCodeViewModel(PersonnelCodeSearchModel searchModel) @@ -82,4 +82,12 @@ public class PersonnelCodeRepository : RepositoryBase { return _context.PersonnelCodeSet.FirstOrDefault(x => x.WorkshopId == workshopId && x.EmployeeId == employeeId)!.PersonnelCode; } + + public long GetEmployeeIdByPersonelCode(long personleCode, long workshopId) + { + var res =_context.PersonnelCodeSet.FirstOrDefault(x => x.PersonnelCode == personleCode && x.WorkshopId == workshopId); + if(res != null) + return res.EmployeeId; + return 0; + } } \ No newline at end of file diff --git a/ServiceHost/Areas/Admin/Pages/Accounts/Account/AccountLeftWork.cshtml b/ServiceHost/Areas/Admin/Pages/Accounts/Account/AccountLeftWork.cshtml index 75fac18a..8f97b4bf 100644 --- a/ServiceHost/Areas/Admin/Pages/Accounts/Account/AccountLeftWork.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Accounts/Account/AccountLeftWork.cshtml @@ -1,430 +1,430 @@ @model AccountManagement.Application.Contracts.Account.AccountLeftWorkViewModel @Html.AntiForgeryToken() @{ - - + + .checkbox-wrapper-26 .tick_mark:after { + left: 0; + bottom: 0; + width: 100%; + height: calc(var(--size) * .1); + box-shadow: 0 3px 5px rgba(0, 0, 0, 0.23); + transform: translateX(calc(var(--size) * .78)); + } + + .checkbox-wrapper-26 input[type="checkbox"]:checked + label { + background-color: #07d410; + box-shadow: 0 var(--shadow) #92ff97; + } + + .checkbox-wrapper-26 input[type="checkbox"]:checked + label:before { + width: 0; + height: 0; + } + + .checkbox-wrapper-26 input[type="checkbox"]:checked + label .tick_mark:before, + .checkbox-wrapper-26 input[type="checkbox"]:checked + label .tick_mark:after { + transform: translate(0); + opacity: 1; + } + + }
@@ -852,7 +852,7 @@ workshopAccountlist.Insurance = insuranceStr; workshopAccountlist.Tax = taxStr; workshopAccountlist.IsActiveSting = isActiveSt; - + var test = [{id:12,workshopAccolist :[]}] workshopAccountlistViewModel.push(workshopAccountlist); }); if (ajaxSend) { diff --git a/ServiceHost/Areas/Camera/Pages/Index.cshtml b/ServiceHost/Areas/Camera/Pages/Index.cshtml index 9834bd9a..0333349a 100644 --- a/ServiceHost/Areas/Camera/Pages/Index.cshtml +++ b/ServiceHost/Areas/Camera/Pages/Index.cshtml @@ -1,149 +1,155 @@ @page @model ServiceHost.Areas.Camera.Pages.IndexModel +@using System.Diagnostics @using Version = _0_Framework.Application.Version @{ + var watch = new Stopwatch(); Layout = "Shared/_Layout"; ViewData["Title"] = " - " + "حضور غیاب"; - + canvas { + position: absolute; + top: 0px; + right: 0px; + display: inline-block; + direction: ltr; + width: 1400px; + height: 1400px; + } + } + + .div-logout { + position: fixed; + right: -130px; + top: 110px; + } + } @section Styles @@ -151,12 +157,12 @@