diff --git a/ServiceHost/Areas/Client/Pages/Index.cshtml b/ServiceHost/Areas/Client/Pages/Index.cshtml index a495b020..9632088c 100644 --- a/ServiceHost/Areas/Client/Pages/Index.cshtml +++ b/ServiceHost/Areas/Client/Pages/Index.cshtml @@ -116,10 +116,10 @@ } - - - -
+ + + +
@@ -362,26 +362,26 @@ }); }); - var hasCompletedDashboardTour = localStorage.getItem('hasCompletedDashboardTour'); - if (!hasCompletedDashboardTour) { - introJs().setOptions({ - nextLabel: 'بعد', - prevLabel: 'قبل', - doneLabel: 'اتمام', - showBullets: false, - steps: [ - { - title: 'خوش آمدید به سامانه گزارشگیر 👋', - intro: 'برای آموزش این صفحه با ما همراه باشید.' - }, - { - title: 'عملیات مربوط به مرخصی', - element: document.querySelector('#btnCardLeaveIntro'), - intro: 'برای عملیات دسترسی سریع دکمه‌های مربوط به مرخصی مانند ثبت مرخصی و لیست مرخصی میتوانید از این روش استفاده نمایید.' - } - ] - }).start(); - localStorage.setItem('hasCompletedDashboardTour', true); - } + // var hasCompletedDashboardTour = localStorage.getItem('hasCompletedDashboardTour'); + // if (!hasCompletedDashboardTour) { + // introJs().setOptions({ + // nextLabel: 'بعد', + // prevLabel: 'قبل', + // doneLabel: 'اتمام', + // showBullets: false, + // steps: [ + // { + // title: 'خوش آمدید به سامانه گزارشگیر 👋', + // intro: 'برای آموزش این صفحه با ما همراه باشید.' + // }, + // { + // title: 'عملیات مربوط به مرخصی', + // element: document.querySelector('#btnCardLeaveIntro'), + // intro: 'برای عملیات دسترسی سریع دکمه‌های مربوط به مرخصی مانند ثبت مرخصی و لیست مرخصی میتوانید از این روش استفاده نمایید.' + // } + // ] + // }).start(); + // localStorage.setItem('hasCompletedDashboardTour', true); + // } } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Shared/_ClientLayout.cshtml b/ServiceHost/Areas/Client/Pages/Shared/_ClientLayout.cshtml index ccd0e369..26b73405 100644 --- a/ServiceHost/Areas/Client/Pages/Shared/_ClientLayout.cshtml +++ b/ServiceHost/Areas/Client/Pages/Shared/_ClientLayout.cshtml @@ -8,44 +8,44 @@ @{ - string clientVersion = _0_Framework.Application.Version.StyleVersion; - var currentAccount = AuthHelper.CurrentAccountInfo(); - int countWorkFlow = 0;/* await WorkFlowApplication.GetCountAllWorkFlows(workshopId); */ - var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary()) { { "countWorkFlow", countWorkFlow } }; + string clientVersion = _0_Framework.Application.Version.StyleVersion; + var currentAccount = AuthHelper.CurrentAccountInfo(); + int countWorkFlow = 0;/* await WorkFlowApplication.GetCountAllWorkFlows(workshopId); */ + var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary()) { { "countWorkFlow", countWorkFlow } }; } - - - + + + - گزارشگیر @ViewData["Title"] + گزارشگیر @ViewData["Title"] - - - @* + + + @* *@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - @RenderSection("Styles", false) + + @RenderSection("Styles", false) @@ -53,166 +53,185 @@ - -
- - - - + +
+ + + + - - - - @RenderBody() + + + + @RenderBody() - - - + + + - + - + - + - - - - - - - - - - + + + + + + + + + + + function _RefreshCountRollCallMenu() { + $.ajax({ + async: true, + dataType: 'json', + url: '/Client/Company/WorkFlow?handler=CountRollCall', + headers: { "RequestVerificationToken": antiForgeryTokenLayout }, + type: 'GET', + success: function (response) { + console.log(response); + if (response.success) { + $('#spinnerRollCall').hide(); + if (response.countWorkFlow === 0) { + $('#_countRollCallMenuSubmenu').hide(); + } else { + $('#_countRollCallMenuSubmenu').css('display', 'flex').text(response.countWorkFlow); + } + } + }, + error: function (xhr, status, error) { + console.error(xhr.responseText); + } + }); + } - - @RenderSection("Script", false) + function _RefreshCountEmployeeDocumentsMenu() { + $.ajax({ + async: true, + dataType: 'json', + url: '/Client/Company/WorkFlow?handler=CountEmployeeDocuments', + headers: { "RequestVerificationToken": antiForgeryTokenLayout }, + type: 'GET', + success: function (response) { + console.log(response); + if (response.success) { + $('#spinnerEmployeeDocuments').hide(); + if (response.countWorkFlow === 0) { + $('#_countEmployeeDocumentsMenuSubmenu').hide(); + } else { + $('#_countEmployeeDocumentsMenuSubmenu').css('display', 'flex').text(response.countWorkFlow); + } + } + }, + error: function (xhr, status, error) { + console.error(xhr.responseText); + } + }); + } - + // Override the global fetch function to handle errors + // const originalErrorHandler = $.ajaxSetup().error; + $.ajaxSetup({ + error: function (jqXHR, textStatus, errorThrown) { + if (jqXHR.status === 500) { + try { + const errorData = jqXHR.responseJSON; + $('.alert-msg').show(); + $('.alert-msg p').text(errorData.message || "خطای سمت سرور"); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3500); + } catch (e) { + $('.alert-msg').show(); + $('.alert-msg p').text("خطای سمت سرور"); + setTimeout(function () { + $('.alert-msg').hide(); + $('.alert-msg p').text(''); + }, 3500); + console.error("Error parsing response:", e); + } + } + } + }); + + + + + @RenderSection("Script", false) + + \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml b/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml index bd1e7c9c..c06850d9 100644 --- a/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml +++ b/ServiceHost/Areas/Client/Pages/Shared/_headerAndFooter.cshtml @@ -189,14 +189,14 @@ تنظیمات حساب کاربری -
  • + @*
  • راهنما -
    • + *@
  • diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/WorkshopSettingGrouping.js b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/WorkshopSettingGrouping.js index 167c2288..45fd14d1 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/WorkshopSettingGrouping.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Employees/js/WorkshopSettingGrouping.js @@ -1,4 +1,4 @@ -let currentUrlGroup = window.location.href; +var currentUrlGroup = window.location.href; $(document).ready(function () { $(document).on("click", ".btn-cancel2", function () {