From 66ac0743d68e685a57dfaf320f66ada9513e6a2e Mon Sep 17 00:00:00 2001 From: SamSys Date: Wed, 16 Oct 2024 20:39:42 +0330 Subject: [PATCH] camera new logout and som changes from teamwork --- .../Repository/CameraAccountRepository.cs | 3 +- ServiceHost/Areas/Admin/Pages/Index.cshtml | 15 +- .../Pages/Company/Task/CreateModal.cshtml | 2 +- .../Pages/Company/Ticket/Index.cshtml | 70 +- .../Camera/Pages/AddPasswordModal.cshtml | 122 +++ ServiceHost/Areas/Camera/Pages/Index.cshtml | 911 ++++++------------ .../Areas/Camera/Pages/Index.cshtml.cs | 36 +- .../Company/Employees/CreateLeave.cshtml | 672 ++----------- .../Pages/Company/Employees/Leave.cshtml | 112 ++- ServiceHost/Pages/Index.cshtml.cs | 6 +- ServiceHost/ServiceHost.csproj | 1 + .../AssetsAdminNew/Tasks/css/DetailModal.css | 4 +- .../wwwroot/AssetsAdminNew/Tasks/js/create.js | 4 +- .../Ticket/js/detailTicketModal.js | 5 +- .../wwwroot/AssetsCamera/css/Index.css | 233 ++++- .../wwwroot/AssetsCamera/css/Index.min.css | 1 + ServiceHost/wwwroot/AssetsCamera/js/Index.js | 31 +- .../wwwroot/AssetsCamera/js/Index.min.js | 17 + .../AssetsClient/images/icons/headphone.png | Bin 0 -> 25046 bytes .../pages/Employees/js/createleave.js | 521 ++++++++++ 20 files changed, 1434 insertions(+), 1332 deletions(-) create mode 100644 ServiceHost/Areas/Camera/Pages/AddPasswordModal.cshtml create mode 100644 ServiceHost/wwwroot/AssetsCamera/css/Index.min.css create mode 100644 ServiceHost/wwwroot/AssetsCamera/js/Index.min.js create mode 100644 ServiceHost/wwwroot/AssetsClient/images/icons/headphone.png create mode 100644 ServiceHost/wwwroot/AssetsClient/pages/Employees/js/createleave.js diff --git a/AccountMangement.Infrastructure.EFCore/Repository/CameraAccountRepository.cs b/AccountMangement.Infrastructure.EFCore/Repository/CameraAccountRepository.cs index a5a43ef6..1ab391e0 100644 --- a/AccountMangement.Infrastructure.EFCore/Repository/CameraAccountRepository.cs +++ b/AccountMangement.Infrastructure.EFCore/Repository/CameraAccountRepository.cs @@ -40,7 +40,8 @@ public class CameraAccountRepository : RepositoryBase, ICam WorkshopId = x.WorkshopId, WorkshopName = x.WorkshopName, AccountId = x.AccountId, - IsActiveString = x.IsActiveSting + IsActiveString = x.IsActiveSting, + Password = x.Password }).FirstOrDefault(x => x.Id == id); } diff --git a/ServiceHost/Areas/Admin/Pages/Index.cshtml b/ServiceHost/Areas/Admin/Pages/Index.cshtml index fefe13bf..e4d9c345 100644 --- a/ServiceHost/Areas/Admin/Pages/Index.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Index.cshtml @@ -125,7 +125,7 @@

وظایف

-
+
@Model.TaskRequestCount