admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Task bugs

Browse Source
This commit is contained in:
SamSys
2025-01-29 21:14:16 +03:30
parent 3c65140f52
commit c43425cc5d
13 changed files with 3561 additions and 3506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
AccountManagement.Application.Contracts/Task/ITaskApplication.cs
View File

@@ -63,9 +63,16 @@ public interface ITaskApplication
List<AssignViewModel> GetAssignsByTaskId(long taskId);
int RequestedAndOverdueTasksCount(long userId);
/// <summary>
///تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
int OverdueTasksCount(long userId);
//متد انتقال داده از تسک به ارجاعی ها
//OperationResult MoveDataFRomTaskToAssign();
//متد انتقال داده از تسک به ارجاعی ها
//OperationResult MoveDataFRomTaskToAssign();
}

7
AccountManagement.Application/TaskApplication.cs
View File

@@ -1007,10 +1007,15 @@ public class TaskApplication : ITaskApplication
return _assignRepository.GetAssignsByTaskId(taskId);
}
public int RequestedAndOverdueTasksCount(long userId)
{
return _taskRepository.RequestedAndOverdueTasksCount(userId);
}
public int OverdueTasksCount(long userId)
{
return _taskRepository.OverdueTasksCount(userId);
}
//public OperationResult MoveDataFRomTaskToAssign()

10
AccountManagement.Domain/TaskAgg/ITaskRepository.cs
View File

@@ -115,11 +115,11 @@ public interface ITaskRepository:IRepository<long,Tasks>
bool HasOverdueTasks(long userId);
/// <summary>
/// تعداد تسک های عقب افتاده
///مجوع تعداد تسک های عقب افتاده و درخواستی
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
int OverdueTasksCount(long userId);
int RequestedAndOverdueTasksCount(long userId);
/// <summary>
/// تعداد تسک های دارای تیکت
@@ -135,6 +135,12 @@ public interface ITaskRepository:IRepository<long,Tasks>
/// <returns></returns>
int TasksHaveTicketRequestsCount(long userId);
/// <summary>
///تعداد تسک های شخصی و دریافتی برای امروز و یا عقب افتاده
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
int OverdueTasksCount(long userId);
// گرفتن پیام های مربوط به هر تسک

5339
AccountMangement.Infrastructure.EFCore/Repository/TaskRepository.cs
View File

File diff suppressed because it is too large Load Diff

2
ServiceHost/Areas/Admin/Pages/Index.cshtml.cs
View File

@@ -75,7 +75,7 @@ namespace ServiceHost.Areas.Admin.Pages
day = todayFa.Substring(8, 2);
year = todayFa.Substring(0, 4);
TaskCount = _taskApplication.OverdueTasksCount(userId);
TaskCount = _taskApplication.RequestedAndOverdueTasksCount(userId);
TicketCount = _ticketApplication.GetAdminTicketsCount();
//foreach (string fileEntry in fileEntries)

2
ServiceHost/Areas/Admin/Pages/Shared/_Menu.cshtml
View File

@@ -29,7 +29,7 @@
}
</style>
var currentAccout = AuthHelper.CurrentAccountInfo();
int taskCount = TaskApplication.OverdueTasksCount(currentAccout.Id);
int taskCount = TaskApplication.RequestedAndOverdueTasksCount(currentAccout.Id);
int ticketCount = TicketApplication.GetAdminTicketsCount();
}
<div class="left side-menu">

8
ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml
View File

@@ -57,7 +57,9 @@
@if (Model.UserPositionValue == 1)
{
<div class="d-flex">
<button type="button" class="btnTaskFilter btnTaskListSelfTask me-1 active" id="btnTaskListSelfTask" onclick="loadMore('selfTask');">وظایف شخصی</button>
<button type="button" class="btnTaskFilter btnTaskListSelfTask me-1 active" id="btnTaskListSelfTask" onclick="loadMore('selfTask');">وظایف شخصی
<span class="badge bg-danger rounded-pill me-1 " id="badgeOverdueCount1"></span>
</button>
<button type="button" class="btnTaskFilter btnTaskListSent me-1" id="btnTaskListSent" onclick="loadMore('sent');">وظایف ارسالی</button>
@* <button type="button" class="btnTaskTicket me-1 d-flex align-items-center" id="btnTaskTicket" onclick="loadMore('ticket');">لیست پشتیبانی‌ها</button> *@
<button type="button" class="btnTaskFilter btnTaskRequest me-1 d-flex align-items-center" id="btnTaskRequest" permission="9012">
@@ -80,7 +82,9 @@
else
{
<div class="d-flex justify-content-start gap-2">
<button type="button" class="btnTaskFilter btnTaskListReceived me-1 active" id="btnTaskListReceived" onclick="loadMore('received');">وظایف دریافتی</button>
<button type="button" class="btnTaskFilter btnTaskListReceived me-1 active" id="btnTaskListReceived" onclick="loadMore('received');">وظایف دریافتی
<span class="badge bg-danger rounded-pill me-1 " id="badgeOverdueCount2"></span>
</button>
<button type="button" class="btnTaskFilter btnTaskListSent me-1" id="btnTaskListSent" onclick="loadMore('sent');">وظایف ارسالی</button>
@* <button type="button" class="btnTaskTicket me-1 d-flex align-items-center" id="btnTaskTicket" onclick="loadMore('ticket');">لیست پشتیبانی‌ها</button> *@
<button type="button" class="btnTaskFilter btnTaskRequest me-1 d-flex align-items-center" id="btnTaskRequest" permission="9012">

1678
ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml.cs
View File

File diff suppressed because it is too large Load Diff

2
ServiceHost/Areas/AdminNew/Pages/Shared/_Menu.cshtml
View File

@@ -12,7 +12,7 @@
@{
var currentAccout = AuthHelper.CurrentAccountInfo();
int taskCount = TaskApplication.OverdueTasksCount(currentAccout.Id);
int taskCount = TaskApplication.RequestedAndOverdueTasksCount(currentAccout.Id);
int ticketCount = TicketApplication.GetAdminTicketsCount();

BIN
ServiceHost/Storage/Ticket/43/screenshot_638737819107504668.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 394 KiB

4
ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/DetailModal.js
View File

@@ -192,8 +192,6 @@ $(document).ready(function () {
}
});
function updateDateInput(daysToAdd) {
var today = new Date();
today.setDate(today.getDate() + daysToAdd);
@@ -319,6 +317,8 @@ function saveAjax(url, data) {
$(`.section-btns-task button.active`).click();
$('#MainModal').modal('toggle');
loadTicketAndRequestCount();
} else {
$('.alert-msg').show();
$('.alert-msg p').text(response.message);

1
ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/DetailModalSender.js
View File

@@ -308,6 +308,7 @@ function saveAjax(url, data) {
$('#MainModal').modal('toggle');
}, 1500);
loadTicketAndRequestCount();
} else {
$('.alert-msg').show();

3
ServiceHost/wwwroot/AssetsAdminNew/Tasks/js/Index.js
View File

@@ -993,10 +993,13 @@ function loadTicketAndRequestCount() {
$("#badgeRequestCount1").text(response.requestCount == 0 ? "" : response.requestCount);
$("#badgeTicketCount1").text(response.resultTicketCount == 0 ? "" : response.resultTicketCount);
$("#badgeTicketRequesttCount1").text(response.resultRequestTicketCount == 0 ? "" : response.resultRequestTicketCount);
$("#badgeOverdueCount1").text(response.resultOverdueTasks == 0 ? "" : response.resultOverdueTasks);
$("#badgeRequestCount2").text(response.requestCount == 0 ? "" : response.requestCount);
$("#badgeTicketCount2").text(response.resultTicketCount == 0 ? "" : response.resultTicketCount);
$("#badgeTicketRequesttCount2").text(response.resultRequestTicketCount == 0 ? "" : response.resultRequestTicketCount);
$("#badgeOverdueCount2").text(response.resultOverdueTasks == 0 ? "" : response.resultOverdueTasks);
} else {
$('.alert-msg').show();