diff --git a/ServiceHost/Areas/Client/Pages/Company/Employees/ContractCheckoutStatus.cshtml b/ServiceHost/Areas/Client/Pages/Company/Employees/ContractCheckoutStatus.cshtml index f7732cef..00d958e1 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Employees/ContractCheckoutStatus.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Employees/ContractCheckoutStatus.cshtml @@ -442,6 +442,16 @@ top: -3px; z-index: 4; } + + .modal-dialog { + max-width: 1140px; + margin: 2rem auto; + } + + .modal-xxl { + max-width: 1140px; + --bs-modal-width: 1140px; + }
diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/CameraAccounts.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/CameraAccounts.cshtml index 0ffac596..4ef4f25a 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/CameraAccounts.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/CameraAccounts.cshtml @@ -203,6 +203,10 @@ var antiForgeryToken = $('@Html.AntiForgeryToken()').val(); var loadCameraAccountsAjax = `@Url.Page("CameraAccounts", "CameraAccounts")`; var changeCameraAccountStatusAjax = `@Url.Page("./CameraAccounts", "CameraAccountChangeStatus")`; + + // check and show modal Camera Account And Workshop Setting + var statusCameraAccountAndWorkshopSettingUrl = `@Url.Page("./Index", "StatusCameraAccountAndWorkshopSetting")`; + var saveCameraAccountUrl = `@Url.Page("./Index", "SaveCameraAccountAndWorkshopSetting")`; } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml index 0519eab5..20073466 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/CaseHistory.cshtml @@ -169,8 +169,8 @@
@@ -328,8 +328,8 @@ @@ -407,6 +407,10 @@ // var dateIndex = 0; var deleteRollCallData = `@Url.Page("./CaseHistory", "RemoveEmployeeRollCallsInDate")`; + + // check and show modal Camera Account And Workshop Setting + var statusCameraAccountAndWorkshopSettingUrl = `@Url.Page("./Index", "StatusCameraAccountAndWorkshopSetting")`; + var saveCameraAccountUrl = `@Url.Page("./Index", "SaveCameraAccountAndWorkshopSetting")`; } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml index 1aa2cc64..156858ff 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/CurrentDay.cshtml @@ -4,6 +4,8 @@ @{ ViewData["Title"] = " - " + "لیست حضور و غیاب جاری"; + + string clientVersion = _0_Framework.Application.Version.StyleVersion; int index = 1; int indexAbsent = 1; int indexLeave = 1; @@ -11,15 +13,15 @@ } @section Styles { - - - - - + + + + + - + - + } @@ -45,22 +47,22 @@ -
-
-
-
-
+
+
+
+
+
-
- - -
+
+ + +
- @*
-
-
- -
-
- - -
-
-
-
-
-
- -
-
ردیف
-
نام پرسنل
-
شماره پرسنلی
-
تاخیر در ورود
-
ورود
-
خروج
-
تجمیع در خروج
-
مجموع ساعات کاری
-
- - @if (@Model.RollCallViewModels.PresentEmployees.Any()) - { - @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 - } -
-
-
- -
- } - } - 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 - { - - } -
-
-
-
-
-
-
-
- -
-
-
-
- - - -
-
-
-
-
-
-
@@ -352,12 +79,328 @@
+ +
+
+
+
+
+
+ +
+
ردیف
+
نام پرسنل
+
شماره پرسنلی
+
تاخیر در ورود
+
ورود
+
خروج
+
تعجیل در خروج
+
مجموع ساعات کاری
+
+ + @if (@Model.RollCallViewModels.PresentEmployees.Any()) + { + @foreach (var item in Model.RollCallViewModels.PresentEmployees) + { +
+
+
+ ردیف +
+
+
+ @(index++) +
+
+
+ +
+
نام پرسنل
+
+ @item.EmployeeFullName +
+
+ +
+
+
شماره پرسنلی:
+
@item.PersonnelCode
+
+
+ +
+
+
تاخیر در ورود:
+
+ @foreach (var itemTime in item.RollCallTimesList) + { + string entryTimeDiff = string.IsNullOrEmpty(itemTime.EntryTimeDifferences) ? "-" : itemTime.EntryTimeDifferences; + string entryCssClass = entryTimeDiff != "-" && entryTimeDiff.Contains("-") ? "negative-time" : + entryTimeDiff != "-" && entryTimeDiff.Contains("+") ? "positive-time" : ""; + + if (entryTimeDiff != "-") + { + entryTimeDiff = entryTimeDiff.TrimEnd('+', '-'); + } + +
@entryTimeDiff
+ } +
+
+
+ +
+ @foreach (var itemTime in item.RollCallTimesList) + { +
ساعت ورود
+
+
@(itemTime.StartDate ?? "-")
+
+ } +
+ +
+ @foreach (var itemTime in item.RollCallTimesList) + { +
ساعت خروج
+
+
@(itemTime.EndDate ?? "-")
+
+ } +
+ +
+
+
تعجیل در خروج:
+
+ @foreach (var itemTime in item.RollCallTimesList) + { + string exitTimeDiff = string.IsNullOrEmpty(itemTime.ExitTimeDifferences) ? "-" : itemTime.ExitTimeDifferences; + string exitCssClass = exitTimeDiff != "-" && exitTimeDiff.Contains("-") ? "negative-time" : + exitTimeDiff != "-" && exitTimeDiff.Contains("+") ? "positive-time" : ""; + + if (exitTimeDiff != "-") + { + exitTimeDiff = exitTimeDiff.TrimEnd('+', '-'); + } + +
@exitTimeDiff
+ } +
+
+
+ +
+
+
مجموع ساعات کاری:
+
+ @if (item.RollCallTimesList.Last().EndDate == null) + { + + + + + + + } + else + { + @item.TotalWorkingHours + } +
+
+
+ +
+ } + } + 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/EmployeeUploadPicture.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml index 5be0c2ba..d4506d9e 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/EmployeeUploadPicture.cshtml @@ -200,6 +200,9 @@ var deActivePersonnelAjax = `@Url.Page("./EmployeeUploadPicture", "DeActivePersonnel")`; var activePersonnelAjax = `@Url.Page("./EmployeeUploadPicture", "ActivePersonnel")`; + // check and show modal Camera Account And Workshop Setting + var statusCameraAccountAndWorkshopSettingUrl = `@Url.Page("./Index", "StatusCameraAccountAndWorkshopSetting")`; + var saveCameraAccountUrl = `@Url.Page("./Index", "SaveCameraAccountAndWorkshopSetting")`; } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/Grouping.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/Grouping.cshtml index ca5a2afd..0a53a295 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/Grouping.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/Grouping.cshtml @@ -161,6 +161,10 @@ var workshopSettingId = Number((@Model.RollCallWorkshopSettings.Id)); var isShiftChangedGlobal = false; var titleOfGroup = ""; + + // check and show modal Camera Account And Workshop Setting + var statusCameraAccountAndWorkshopSettingUrl = `@Url.Page("./Index", "StatusCameraAccountAndWorkshopSetting")`; + var saveCameraAccountUrl = `@Url.Page("./Index", "SaveCameraAccountAndWorkshopSetting")`; } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml index 7f40f891..6f2d83ee 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml @@ -307,16 +307,16 @@
- - @section Script { - - + + + + } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml.cs b/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml.cs index 3f7b549f..65c2f5cd 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml.cs +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/Index.cshtml.cs @@ -60,10 +60,9 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall var rollCallWorkshopSetting = _customizeWorkshopSettingsApplication.GetWorkshopSettingsByWorkshopId(workshopId, account); HasRollCallWorkshopSetting = rollCallWorkshopSetting.ArePropertiesEqual(new CustomizeWorkshopSettingsViewModel()) ? "false" : "true"; - var workshopInfo = _workshopApplication.GetWorkshopInfo(workshopId); - WorkshopFullName = _authHelper.GetWorkshopName(); + WorkshopFullName =_authHelper.GetWorkshopName(); - HasRollCallCustomizeWorkshopSetting = _customizeWorkshopSettingsApplication.GetWorkshopSettingsDetails(workshopId).Id == 0 ? "false" : "true"; + HasRollCallCustomizeWorkshopSetting = _customizeWorkshopSettingsApplication.GetWorkshopSettingsDetails(workshopId).Id == 0 ? "false" : "true"; var hasBeforeService = _rollCallServiceApplication.GetAllServiceByWorkshopId(workshopId).Any(); var rollCall = _rollCallServiceApplication.GetActiveServiceByWorkshopId(workshopId); @@ -90,7 +89,46 @@ namespace ServiceHost.Areas.Client.Pages.Company.RollCall return Page(); } - public IActionResult OnGetSaveCameraAccountAndWorkshopSetting() + public IActionResult OnGetStatusCameraAccountAndWorkshopSetting() + { + var account = _authHelper.CurrentAccountInfo(); + var workshopSlug = User.FindFirstValue("WorkshopSlug"); + var workshopId = _passwordHasher.SlugDecrypt(workshopSlug); + + if (workshopId < 0) + return BadRequest(); + + var workshopSettings = _customizeWorkshopSettingsApplication.GetWorkshopSettingsByWorkshopId(workshopId, account); + var hasRollCallWorkshopSetting = !workshopSettings.ArePropertiesEqual(new CustomizeWorkshopSettingsViewModel()); + + var allServices = _rollCallServiceApplication.GetAllServiceByWorkshopId(workshopId); + var hasPreviousService = allServices.Any(); + + var activeService = _rollCallServiceApplication.GetActiveServiceByWorkshopId(workshopId); + var hasRollCallService = activeService != null; + + bool hasCameraAccount; + if (hasRollCallService) + { + var accountId = _authHelper.CurrentAccountId(); + var cameraAccountExists = _cameraAccountApplication.HasCameraAccount(workshopId, accountId); + + hasCameraAccount = cameraAccountExists && hasPreviousService; + } + else + { + hasCameraAccount = !hasPreviousService; + } + + return new JsonResult(new + { + hasRollCallWorkshopSetting, + hasCameraAccount, + hasRollCallService + }); + } + + public IActionResult OnGetSaveCameraAccountAndWorkshopSetting() { var account = _authHelper.CurrentAccountInfo(); diff --git a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalSettingWorkTime.cshtml b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalSettingWorkTime.cshtml index 48daf878..08a631b9 100644 --- a/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalSettingWorkTime.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/RollCall/ModalSettingWorkTime.cshtml @@ -200,7 +200,7 @@
- +
@* *@ diff --git a/ServiceHost/Areas/Client/Pages/Company/Workshop/ContractCheckoutYearlyStatus.cshtml b/ServiceHost/Areas/Client/Pages/Company/Workshop/ContractCheckoutYearlyStatus.cshtml index 5ae558c1..5650eceb 100644 --- a/ServiceHost/Areas/Client/Pages/Company/Workshop/ContractCheckoutYearlyStatus.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/Workshop/ContractCheckoutYearlyStatus.cshtml @@ -13,6 +13,17 @@ + + } diff --git a/ServiceHost/Areas/Client/Pages/Index.cshtml b/ServiceHost/Areas/Client/Pages/Index.cshtml index 5ecb9f72..a495b020 100644 --- a/ServiceHost/Areas/Client/Pages/Index.cshtml +++ b/ServiceHost/Areas/Client/Pages/Index.cshtml @@ -5,6 +5,7 @@ string clientVersion = _0_Framework.Application.Version.StyleVersion; +