From d8cd33732a48ec1a7b3e75790a595dfbe91f3ca7 Mon Sep 17 00:00:00 2001 From: MahanCh Date: Mon, 5 May 2025 22:24:07 +0330 Subject: [PATCH] fix deleting task schedule --- .../Repository/TaskRepository.cs | 2 +- .../wwwroot/AssetsAdminNew/Tasks/js/Index.js | 1625 ++++++++--------- 2 files changed, 813 insertions(+), 814 deletions(-) diff --git a/AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs b/AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs index 47b3420d..4a41b01e 100644 --- a/AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs +++ b/AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs @@ -1866,7 +1866,7 @@ public class TaskRepository : RepositoryBase, ITaskRepository .Include(x => x.Task).ThenInclude(x => x.TaskSchedule) .Where(x => x.Task.IsActiveString == "true" && x.Task.SenderId == accountId - && x.Task.TaskScheduleId != null && x.Task.TaskScheduleId > 0 && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest)); + && x.Task.TaskScheduleId != null && x.Task.TaskScheduleId > 0 && (!x.IsCanceledRequest && !x.TimeRequest && !x.IsDoneRequest) && x.Task.TaskSchedule.IsActive == IsActive.True); if (!string.IsNullOrWhiteSpace(searchModel.GeneralSearch)) { raw = raw.Where(x => diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js index 1dff7332..e0d15815 100644 --- a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js +++ b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js @@ -192,7 +192,7 @@ $(document).on('click', '.btn-clear-filter', function () { $('#GeneralSearch').val(filterGeneralSearch); $('#GeneralSearchMobile').val(filterGeneralSearchMobile); - if (filterEmployeeId != 0 || filterStart != '' || filterEnd != '' || filterIsDone != '' || filterGeneralSearch != '' ) { + if (filterEmployeeId != 0 || filterStart != '' || filterEnd != '' || filterIsDone != '' || filterGeneralSearch != '') { $('.btn-clear-filter').removeClass('disable'); } else { $('.btn-clear-filter').addClass('disable'); @@ -204,293 +204,293 @@ $(document).on('click', '.btn-clear-filter', function () { //******************** فراخوانی کردن ایجکس براساس کلیک روی تب یا بخش های مختلف ******************** - $(document).on('click', "#btnTaskListSelfTask", function () { - $('.titleTaskList').html('وظایف شخصی'); - //$('#btnAllTaskRequest').removeClass('active'); - $('.btnTaskFilter').removeClass('active'); - $(this).addClass('active'); +$(document).on('click', "#btnTaskListSelfTask", function () { + $('.titleTaskList').html('وظایف شخصی'); + //$('#btnAllTaskRequest').removeClass('active'); + $('.btnTaskFilter').removeClass('active'); + $(this).addClass('active'); - $('#tasksAjax').html(''); - Number($('#pageIndex').val(0)); - Number($('#AccountId').val(0)); - $('#AccountId').trigger('change'); - $('#StartDate').val(''); - $('#EndDate').val(''); + $('#tasksAjax').html(''); + Number($('#pageIndex').val(0)); + Number($('#AccountId').val(0)); + $('#AccountId').trigger('change'); + $('#StartDate').val(''); + $('#EndDate').val(''); - $('#IsDone').val(''); - $('.dropdown-IsDone .item').removeClass("active"); - $('.dropdown-IsDone .item:first').addClass("active"); - $('.selected-display').text($('.dropdown-IsDone .item:first').text()); + $('#IsDone').val(''); + $('.dropdown-IsDone .item').removeClass("active"); + $('.dropdown-IsDone .item:first').addClass("active"); + $('.selected-display').text($('.dropdown-IsDone .item:first').text()); - $('#GeneralSearch').val(''); - $('#divTaskList').show(); - $('#divTaskRequest').hide(); - loadMore('selfTask'); - }); + $('#GeneralSearch').val(''); + $('#divTaskList').show(); + $('#divTaskRequest').hide(); + loadMore('selfTask'); +}); - $(document).on('click', "#btnTaskListAllTask", function () { - $('.titleTaskList').html('کل وظایف'); - //$('#btnAllTaskRequest').removeClass('active'); - $('.btnTaskFilter').removeClass('active'); - $(this).addClass('active'); +$(document).on('click', "#btnTaskListAllTask", function () { + $('.titleTaskList').html('کل وظایف'); + //$('#btnAllTaskRequest').removeClass('active'); + $('.btnTaskFilter').removeClass('active'); + $(this).addClass('active'); - $('#tasksAjax').html(''); - Number($('#pageIndex').val(0)); - Number($('#AccountId').val(0)); - $('#AccountId').trigger('change'); - $('#StartDate').val(''); - $('#EndDate').val(''); + $('#tasksAjax').html(''); + Number($('#pageIndex').val(0)); + Number($('#AccountId').val(0)); + $('#AccountId').trigger('change'); + $('#StartDate').val(''); + $('#EndDate').val(''); - $('#IsDone').val(''); - $('.dropdown-IsDone .item').removeClass("active"); - $('.dropdown-IsDone .item:first').addClass("active"); - $('.selected-display').text($('.dropdown-IsDone .item:first').text()); + $('#IsDone').val(''); + $('.dropdown-IsDone .item').removeClass("active"); + $('.dropdown-IsDone .item:first').addClass("active"); + $('.selected-display').text($('.dropdown-IsDone .item:first').text()); - $('#GeneralSearch').val(''); - $('#divTaskList').show(); - $('#divTaskRequest').hide(); - loadMore('AllTask'); - }); - $(document).on('click', "#btnTaskListSent", function () { - $('.titleTaskList').html('وظایف ارسالی'); - //$('#btnAllTaskRequest').removeClass('active'); - $('.btnTaskFilter').removeClass('active'); - $(this).addClass('active'); + $('#GeneralSearch').val(''); + $('#divTaskList').show(); + $('#divTaskRequest').hide(); + loadMore('AllTask'); +}); +$(document).on('click', "#btnTaskListSent", function () { + $('.titleTaskList').html('وظایف ارسالی'); + //$('#btnAllTaskRequest').removeClass('active'); + $('.btnTaskFilter').removeClass('active'); + $(this).addClass('active'); - $('#tasksAjax').html(''); - Number($('#pageIndex').val(0)); - Number($('#AccountId').val(0)); - $('#AccountId').trigger('change'); - $('#StartDate').val(''); - $('#EndDate').val(''); + $('#tasksAjax').html(''); + Number($('#pageIndex').val(0)); + Number($('#AccountId').val(0)); + $('#AccountId').trigger('change'); + $('#StartDate').val(''); + $('#EndDate').val(''); - $('#IsDone').val(''); - $('.dropdown-IsDone .item').removeClass("active"); - $('.dropdown-IsDone .item:first').addClass("active"); - $('.selected-display').text($('.dropdown-IsDone .item:first').text()); + $('#IsDone').val(''); + $('.dropdown-IsDone .item').removeClass("active"); + $('.dropdown-IsDone .item:first').addClass("active"); + $('.selected-display').text($('.dropdown-IsDone .item:first').text()); - $('#GeneralSearch').val(''); - $('#divTaskList').show(); - $('#divTaskRequest').hide(); - loadMore('sent'); - }); + $('#GeneralSearch').val(''); + $('#divTaskList').show(); + $('#divTaskRequest').hide(); + loadMore('sent'); +}); - $(document).on('click', "#btnTaskListReceived", function () { - $('.titleTaskList').html('وظایف دریافتی'); - //$('#btnAllTaskRequest').removeClass('active'); - $('.btnTaskFilter').removeClass('active'); - $(this).addClass('active'); +$(document).on('click', "#btnTaskListReceived", function () { + $('.titleTaskList').html('وظایف دریافتی'); + //$('#btnAllTaskRequest').removeClass('active'); + $('.btnTaskFilter').removeClass('active'); + $(this).addClass('active'); - $('#tasksAjax').html(''); - Number($('#pageIndex').val(0)); - Number($('#AccountId').val(0)); - $('#StartDate').val(''); - $('#EndDate').val(''); + $('#tasksAjax').html(''); + Number($('#pageIndex').val(0)); + Number($('#AccountId').val(0)); + $('#StartDate').val(''); + $('#EndDate').val(''); - $('#IsDone').val(''); - $('.dropdown-IsDone .item').removeClass("active"); - $('.dropdown-IsDone .item:first').addClass("active"); - $('.selected-display').text($('.dropdown-IsDone .item:first').text()); + $('#IsDone').val(''); + $('.dropdown-IsDone .item').removeClass("active"); + $('.dropdown-IsDone .item:first').addClass("active"); + $('.selected-display').text($('.dropdown-IsDone .item:first').text()); - $('#GeneralSearch').val(''); - $('#divTaskList').show(); - $('#divTaskRequest').hide(); - loadMore('received'); - }); + $('#GeneralSearch').val(''); + $('#divTaskList').show(); + $('#divTaskRequest').hide(); + loadMore('received'); +}); - $(document).on('click', "#btnTaskList", function () { - $('.titleTaskList').html('لیست وظایف'); - //$('#btnAllTaskRequest').removeClass('active'); - $('.btnTaskFilter').removeClass('active'); - $(this).addClass('active'); +$(document).on('click', "#btnTaskList", function () { + $('.titleTaskList').html('لیست وظایف'); + //$('#btnAllTaskRequest').removeClass('active'); + $('.btnTaskFilter').removeClass('active'); + $(this).addClass('active'); - $('#tasksAjax').html(''); - Number($('#pageIndex').val(0)); - Number($('#AccountId').val(0)); - $('#AccountId').trigger('change'); - $('#StartDate').val(''); - $('#EndDate').val(''); + $('#tasksAjax').html(''); + Number($('#pageIndex').val(0)); + Number($('#AccountId').val(0)); + $('#AccountId').trigger('change'); + $('#StartDate').val(''); + $('#EndDate').val(''); - $('#IsDone').val(''); - $('.dropdown-IsDone .item').removeClass("active"); - $('.dropdown-IsDone .item:first').addClass("active"); - $('.selected-display').text($('.dropdown-IsDone .item:first').text()); + $('#IsDone').val(''); + $('.dropdown-IsDone .item').removeClass("active"); + $('.dropdown-IsDone .item:first').addClass("active"); + $('.selected-display').text($('.dropdown-IsDone .item:first').text()); - $('#GeneralSearch').val(''); - $('#divTaskList').show(); - $('#divTaskRequest').hide(); - loadMore('ticket'); - }); - $(document).on('click', "#btnTaskTicket", function () { - $('.titleTaskList').html('لیست پشتیبانی‌ها'); - //$('#btnAllTaskRequest').removeClass('active'); - $('.btnTaskFilter').removeClass('active'); - $(this).addClass('active'); + $('#GeneralSearch').val(''); + $('#divTaskList').show(); + $('#divTaskRequest').hide(); + loadMore('ticket'); +}); +$(document).on('click', "#btnTaskTicket", function () { + $('.titleTaskList').html('لیست پشتیبانی‌ها'); + //$('#btnAllTaskRequest').removeClass('active'); + $('.btnTaskFilter').removeClass('active'); + $(this).addClass('active'); - $('#tasksAjax').html(''); - Number($('#pageIndex').val(0)); - Number($('#AccountId').val(0)); - $('#AccountId').trigger('change'); - $('#StartDate').val(''); - $('#EndDate').val(''); + $('#tasksAjax').html(''); + Number($('#pageIndex').val(0)); + Number($('#AccountId').val(0)); + $('#AccountId').trigger('change'); + $('#StartDate').val(''); + $('#EndDate').val(''); - $('#IsDone').val(''); - $('.dropdown-IsDone .item').removeClass("active"); - $('.dropdown-IsDone .item:first').addClass("active"); - $('.selected-display').text($('.dropdown-IsDone .item:first').text()); + $('#IsDone').val(''); + $('.dropdown-IsDone .item').removeClass("active"); + $('.dropdown-IsDone .item:first').addClass("active"); + $('.selected-display').text($('.dropdown-IsDone .item:first').text()); - $('#GeneralSearch').val(''); - $('#divTaskList').show(); - $('#divTaskRequest').hide(); - loadMore('list'); - }); - //2 Ticket Tabs in Task field - $(document).on('click', "#btnTicketList", function () { - $('.titleTaskList').html('لیست تیکت'); - //$('#btnAllTaskRequest').removeClass('active'); - $('.btnTaskFilter').removeClass('active'); - $(this).addClass('active'); + $('#GeneralSearch').val(''); + $('#divTaskList').show(); + $('#divTaskRequest').hide(); + loadMore('list'); +}); +//2 Ticket Tabs in Task field +$(document).on('click', "#btnTicketList", function () { + $('.titleTaskList').html('لیست تیکت'); + //$('#btnAllTaskRequest').removeClass('active'); + $('.btnTaskFilter').removeClass('active'); + $(this).addClass('active'); - $('#tasksAjax').html(''); - Number($('#pageIndex').val(0)); - Number($('#AccountId').val(0)); - $('#AccountId').trigger('change'); - $('#StartDate').val(''); - $('#EndDate').val(''); + $('#tasksAjax').html(''); + Number($('#pageIndex').val(0)); + Number($('#AccountId').val(0)); + $('#AccountId').trigger('change'); + $('#StartDate').val(''); + $('#EndDate').val(''); - $('#IsDone').val(''); - $('.dropdown-IsDone .item').removeClass("active"); - $('.dropdown-IsDone .item:first').addClass("active"); - $('.selected-display').text($('.dropdown-IsDone .item:first').text()); + $('#IsDone').val(''); + $('.dropdown-IsDone .item').removeClass("active"); + $('.dropdown-IsDone .item:first').addClass("active"); + $('.selected-display').text($('.dropdown-IsDone .item:first').text()); - $('#GeneralSearch').val(''); - $('#divTaskList').show(); - $('#divTaskRequest').hide(); - loadMore('TasksHaveTicket'); - }); + $('#GeneralSearch').val(''); + $('#divTaskList').show(); + $('#divTaskRequest').hide(); + loadMore('TasksHaveTicket'); +}); $(document).on('click', "#btnScheduleTask", function () { - $('.titleTaskList').html('لیست وظایف دوره ای'); - //$('#btnAllTaskRequest').removeClass('active'); - $('.btnTaskFilter').removeClass('active'); - $(this).addClass('active'); + $('.titleTaskList').html('لیست وظایف دوره ای'); + //$('#btnAllTaskRequest').removeClass('active'); + $('.btnTaskFilter').removeClass('active'); + $(this).addClass('active'); - $('#tasksAjax').html(''); - Number($('#pageIndex').val(0)); - Number($('#AccountId').val(0)); - $('#AccountId').trigger('change'); - $('#StartDate').val(''); - $('#EndDate').val(''); + $('#tasksAjax').html(''); + Number($('#pageIndex').val(0)); + Number($('#AccountId').val(0)); + $('#AccountId').trigger('change'); + $('#StartDate').val(''); + $('#EndDate').val(''); - $('#IsDone').val(''); - $('.dropdown-IsDone .item').removeClass("active"); - $('.dropdown-IsDone .item:first').addClass("active"); - $('.selected-display').text($('.dropdown-IsDone .item:first').text()); + $('#IsDone').val(''); + $('.dropdown-IsDone .item').removeClass("active"); + $('.dropdown-IsDone .item:first').addClass("active"); + $('.selected-display').text($('.dropdown-IsDone .item:first').text()); - $('#GeneralSearch').val(''); - $('#divTaskList').show(); - $('#divTaskRequest').hide(); - loadMore('schedule'); - }); - $(document).on('click', "#btnTicketRequestList", function () { - $('.titleTaskList').html('لیست درخواست تیکت ها'); - $('.btnTaskFilter').removeClass('active'); - $(this).addClass('active'); + $('#GeneralSearch').val(''); + $('#divTaskList').show(); + $('#divTaskRequest').hide(); + loadMore('schedule'); +}); +$(document).on('click', "#btnTicketRequestList", function () { + $('.titleTaskList').html('لیست درخواست تیکت ها'); + $('.btnTaskFilter').removeClass('active'); + $(this).addClass('active'); - $('#tasksAjax').html(''); - Number($('#pageIndex').val(0)); - Number($('#AccountId').val(0)); - $('#AccountId').trigger('change'); - $('#StartDate').val(''); - $('#EndDate').val(''); + $('#tasksAjax').html(''); + Number($('#pageIndex').val(0)); + Number($('#AccountId').val(0)); + $('#AccountId').trigger('change'); + $('#StartDate').val(''); + $('#EndDate').val(''); - $('#IsDone').val(''); - $('.dropdown-IsDone .item').removeClass("active"); - $('.dropdown-IsDone .item:first').addClass("active"); - $('.selected-display').text($('.dropdown-IsDone .item:first').text()); + $('#IsDone').val(''); + $('.dropdown-IsDone .item').removeClass("active"); + $('.dropdown-IsDone .item:first').addClass("active"); + $('.selected-display').text($('.dropdown-IsDone .item:first').text()); - $('#taskRequestsAjax').html(''); - $('#GeneralSearch').val(''); - $('#divTaskList').hide(); - $('#divTaskRequest').show(); - loadMoreRequest('TaskHaveTicketRequests'); - }); + $('#taskRequestsAjax').html(''); + $('#GeneralSearch').val(''); + $('#divTaskList').hide(); + $('#divTaskRequest').show(); + loadMoreRequest('TaskHaveTicketRequests'); +}); - $(document).on('click', ".btnTaskRequest", function () { - $('.titleTaskList').html('لیست درخواست‌ها'); - $('.btnTaskFilter').removeClass('active'); - $(this).addClass('active'); - //$('#btnTaskListSelfTask').removeClass('active'); - //$('#btnTaskListAllTask').removeClass('active'); - //$('#btnTaskListSent').removeClass('active'); - //$('#btnTaskListReceived').removeClass('active'); - //$('#btnTaskList').removeClass('active'); +$(document).on('click', ".btnTaskRequest", function () { + $('.titleTaskList').html('لیست درخواست‌ها'); + $('.btnTaskFilter').removeClass('active'); + $(this).addClass('active'); + //$('#btnTaskListSelfTask').removeClass('active'); + //$('#btnTaskListAllTask').removeClass('active'); + //$('#btnTaskListSent').removeClass('active'); + //$('#btnTaskListReceived').removeClass('active'); + //$('#btnTaskList').removeClass('active'); - //$('#btnAllTaskRequest').removeClass('active'); - //$('.btnTaskRequest').addClass('active'); - $('#divTaskList').hide(); - $('#divTaskRequest').show(); + //$('#btnAllTaskRequest').removeClass('active'); + //$('.btnTaskRequest').addClass('active'); + $('#divTaskList').hide(); + $('#divTaskRequest').show(); - $('#taskRequestsAjax').html(''); - $('#GeneralSearch').val(''); + $('#taskRequestsAjax').html(''); + $('#GeneralSearch').val(''); - Number($('#pageIndex').val(0)); - Number($('#AccountId').val(0)); - $('#AccountId').trigger('change'); - $('#StartDate').val(''); - $('#EndDate').val(''); - $('#IsDone').val(''); - $('.dropdown-IsDone .item').removeClass("active"); - $('.dropdown-IsDone .item:first').addClass("active"); - $('.selected-display').text($('.dropdown-IsDone .item:first').text()); + Number($('#pageIndex').val(0)); + Number($('#AccountId').val(0)); + $('#AccountId').trigger('change'); + $('#StartDate').val(''); + $('#EndDate').val(''); + $('#IsDone').val(''); + $('.dropdown-IsDone .item').removeClass("active"); + $('.dropdown-IsDone .item:first').addClass("active"); + $('.selected-display').text($('.dropdown-IsDone .item:first').text()); - // $('#IsCanceled').val(''); - // $('#IsCancelRequest').val(''); - // $('#IsTimeRequest').val(''); - // $('#TimeRequestAccepted').val(''); + // $('#IsCanceled').val(''); + // $('#IsCancelRequest').val(''); + // $('#IsTimeRequest').val(''); + // $('#TimeRequestAccepted').val(''); - loadMoreRequest('request'); - }); + loadMoreRequest('request'); +}); - $(document).on('click', ".btnTaskRequestAll", function () { - $('.titleTaskList').html('لیست تمامی درخواست‌ها'); - $('.btnTaskFilter').removeClass('active'); - $(this).addClass('active'); - //$('#btnTaskListSelfTask').removeClass('active'); - //$('#btnTaskListAllTask').removeClass('active'); - //$('#btnTaskListSent').removeClass('active'); - //$('#btnTaskListReceived').removeClass('active'); - //$('#btnTaskList').removeClass('active'); - //$('#btnTaskRequest').removeClass('active'); - //$('#btnAllTaskRequest').addClass('active'); - $('#divTaskList').hide(); - $('#divTaskRequest').show(); +$(document).on('click', ".btnTaskRequestAll", function () { + $('.titleTaskList').html('لیست تمامی درخواست‌ها'); + $('.btnTaskFilter').removeClass('active'); + $(this).addClass('active'); + //$('#btnTaskListSelfTask').removeClass('active'); + //$('#btnTaskListAllTask').removeClass('active'); + //$('#btnTaskListSent').removeClass('active'); + //$('#btnTaskListReceived').removeClass('active'); + //$('#btnTaskList').removeClass('active'); + //$('#btnTaskRequest').removeClass('active'); + //$('#btnAllTaskRequest').addClass('active'); + $('#divTaskList').hide(); + $('#divTaskRequest').show(); - $('#taskRequestsAjax').html(''); - $('#GeneralSearch').val(''); + $('#taskRequestsAjax').html(''); + $('#GeneralSearch').val(''); - Number($('#pageIndex').val(0)); - Number($('#AccountId').val(0)); - $('#AccountId').trigger('change'); - $('#StartDate').val(''); - $('#EndDate').val(''); - $('#IsDone').val(''); - $('.dropdown-IsDone .item').removeClass("active"); - $('.dropdown-IsDone .item:first').addClass("active"); - $('.selected-display').text($('.dropdown-IsDone .item:first').text()); + Number($('#pageIndex').val(0)); + Number($('#AccountId').val(0)); + $('#AccountId').trigger('change'); + $('#StartDate').val(''); + $('#EndDate').val(''); + $('#IsDone').val(''); + $('.dropdown-IsDone .item').removeClass("active"); + $('.dropdown-IsDone .item:first').addClass("active"); + $('.selected-display').text($('.dropdown-IsDone .item:first').text()); - // $('#IsCanceled').val(''); - // $('#IsCancelRequest').val(''); - // $('#IsTimeRequest').val(''); - // $('#TimeRequestAccepted').val(''); + // $('#IsCanceled').val(''); + // $('#IsCancelRequest').val(''); + // $('#IsTimeRequest').val(''); + // $('#TimeRequestAccepted').val(''); - loadMoreRequest('allRequested'); - }); + loadMoreRequest('allRequested'); +}); @@ -577,7 +577,7 @@ function loadMore(type) { var generalSearch = $('#GeneralSearch').val(); var index = 1; var html = ''; - + if (b === 0) { // var searchModel = {}; @@ -601,10 +601,10 @@ function loadMore(type) { isDoneRequest: IsDoneRequest, isDone: IsDone, type: type, - generalSearch:generalSearch + generalSearch: generalSearch }, headers: { "RequestVerificationToken": `${antiForgeryToken}` }, - + success: function (response) { if (response.pageIndex > 0) { var n = pageIndex + 1; @@ -648,7 +648,7 @@ function loadMore(type) { `; } - + } @@ -658,7 +658,7 @@ function loadMore(type) { hightlighted = !hightlighted var successSend = item.status == "موفق" ? "successSend" : ""; - html += `
+ html += `
@@ -754,33 +754,33 @@ function loadMore(type) {
`; - switch (item.scheduleUnitType) { - case 0: - html += `روزانه`; - break; - case 1: - html += `هفتگی`; - break; - case 2: - html += `ماهانه`; - break; - case 3: - html += `سالانه`; - break; - default: - html += ``; - } - - html += `
+ switch (item.scheduleUnitType) { + case 0: + html += `روزانه`; + break; + case 1: + html += `هفتگی`; + break; + case 2: + html += `ماهانه`; + break; + case 3: + html += `سالانه`; + break; + default: + html += ``; + } + + html += `
`; html += `
`; - + if (!item.isDone && !item.isCancel) { html += ` - ${item.canDelete ? + ${//item.canDelete ? `` - : - `` + // : + // `` }
@@ -971,8 +971,7 @@ function loadMore(type) {
- ${item.canDelete ? - ``: ``} +
@@ -1320,7 +1319,7 @@ function loadMore(type) { }); } - + $('#tasksAjax').append(html); var newPageIndex = pageIndex + response.pageIndex; @@ -1640,9 +1639,9 @@ function loadMoreRequest(type) { - - - html += `${item.canCheckRequests && CheckRequestPermission === `True` ? `
+ + + html += `${item.canCheckRequests && CheckRequestPermission === `True` ? `