completed
This commit is contained in:
25
public/ui.js
25
public/ui.js
@@ -108,12 +108,20 @@ function renderDocumentFields(taskId, fields) {
|
||||
function renderTasks() {
|
||||
const container = document.getElementById('tasks-list');
|
||||
const showDeleted = document.getElementById('show-deleted')?.checked || false;
|
||||
// Получаем выбранное значение из селекта статусов
|
||||
const statusFilter = document.getElementById('status-filter')?.value;
|
||||
|
||||
let filteredTasks = window.tasks;
|
||||
if (!showDeleted) {
|
||||
filteredTasks = window.tasks.filter(task => task.status === 'active');
|
||||
}
|
||||
|
||||
|
||||
if (statusFilter !== 'completed') {
|
||||
filteredTasks = filteredTasks.filter(task => {
|
||||
const myAssignment = task.assignments?.find(a => parseInt(a.user_id) === currentUser.id);
|
||||
return !myAssignment || myAssignment.status !== 'completed';
|
||||
});
|
||||
}
|
||||
if (filteredTasks.length === 0) {
|
||||
container.innerHTML = '<div class="loading">Задачи не найдены</div>';
|
||||
return;
|
||||
@@ -240,13 +248,22 @@ ${task.assignments && task.assignments.length > 0 ?
|
||||
function renderTasksInContainer(containerId, tasksArray) {
|
||||
const container = document.getElementById(containerId);
|
||||
if (!container) return;
|
||||
|
||||
if (!tasksArray || tasksArray.length === 0) {
|
||||
|
||||
let filteredTasks = tasksArray;
|
||||
if (containerId === 'runtasks-list' && window.currentTaskView === 'assigned_to_me' && currentUser) {
|
||||
filteredTasks = tasksArray.filter(task => {
|
||||
const myAssignment = task.assignments?.find(a => parseInt(a.user_id) === currentUser.id);
|
||||
console.log('Task', task.id, 'myAssignment status:', myAssignment?.status);
|
||||
return !myAssignment || myAssignment.status !== 'completed';
|
||||
});
|
||||
}
|
||||
|
||||
if (!filteredTasks || filteredTasks.length === 0) {
|
||||
container.innerHTML = '<div class="loading">Задачи не найдены</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
container.innerHTML = tasksArray.map(task => {
|
||||
container.innerHTML = filteredTasks.map(task => {
|
||||
const isExpanded = expandedTasks.has(task.id);
|
||||
const overallStatus = getTaskOverallStatus(task);
|
||||
const statusClass = getStatusClass(overallStatus);
|
||||
|
||||
Reference in New Issue
Block a user