kalugin66/minicrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r

Browse Source
This commit is contained in:
kalugin66
2025-12-14 13:31:28 +05:00
parent 54e7544274
commit 145d12f130
4 changed files with 330 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
public/script.js
View File

@@ -3,7 +3,6 @@ let users = [];
let tasks = [];
let filteredUsers = [];
// Инициализация при загрузке
document.addEventListener('DOMContentLoaded', function() {
checkAuth();
setupEventListeners();
@@ -33,7 +32,6 @@ function showMainInterface() {
document.getElementById('login-modal').style.display = 'none';
document.querySelector('.container').style.display = 'block';
// Формируем информацию о пользователе
let userInfo = `Вы вошли как: ${currentUser.name}`;
if (currentUser.auth_type === 'ldap') {
userInfo += ` (LDAP)`;
@@ -44,10 +42,8 @@ function showMainInterface() {
document.getElementById('current-user').textContent = userInfo;
// Показываем фильтры ВСЕМ пользователям, а не только администраторам
document.getElementById('tasks-controls').style.display = 'block';
// Чекбокс удаленных задач показываем только администраторам
const showDeletedLabel = document.querySelector('.show-deleted-label');
if (showDeletedLabel) {
if (currentUser.role === 'admin') {
@@ -135,12 +131,30 @@ async function loadUsers() {
renderUsersChecklist();
renderEditUsersChecklist();
renderCopyUsersChecklist();
populateFilterDropdowns();
} catch (error) {
console.error('Ошибка загрузки пользователей:', error);
}
}
// Фильтрация пользователей
function populateFilterDropdowns() {
const creatorFilter = document.getElementById('creator-filter');
const assigneeFilter = document.getElementById('assignee-filter');
creatorFilter.innerHTML = '<option value="">Все заказчики</option>';
assigneeFilter.innerHTML = '<option value="">Все исполнители</option>';
users.forEach(user => {
const creatorOption = document.createElement('option');
creatorOption.value = user.id;
creatorOption.textContent = `${user.name} (${user.login})`;
creatorFilter.appendChild(creatorOption.cloneNode(true));
const assigneeOption = creatorOption.cloneNode(true);
assigneeFilter.appendChild(assigneeOption);
});
}
function filterUsers() {
const search = document.getElementById('user-search').value.toLowerCase();
filteredUsers = users.filter(user =>
@@ -175,18 +189,23 @@ async function loadTasks() {
try {
const search = document.getElementById('search-tasks')?.value || '';
const statusFilter = document.getElementById('status-filter')?.value || 'active,in_progress,assigned,overdue,rework';
const creatorFilter = document.getElementById('creator-filter')?.value || '';
const assigneeFilter = document.getElementById('assignee-filter')?.value || '';
const deadlineFilter = document.getElementById('deadline-filter')?.value || '';
const showDeleted = document.getElementById('show-deleted')?.checked || false;
let url = '/api/tasks?';
if (search) url += `search=${encodeURIComponent(search)}&`;
if (statusFilter) url += `status=${encodeURIComponent(statusFilter)}&`;
if (creatorFilter) url += `creator=${encodeURIComponent(creatorFilter)}&`;
if (assigneeFilter) url += `assignee=${encodeURIComponent(assigneeFilter)}&`;
if (deadlineFilter) url += `deadline=${encodeURIComponent(deadlineFilter)}&`;
if (showDeleted) url += `showDeleted=true&`;
const response = await fetch(url);
tasks = await response.json();
renderTasks();
// Загружаем файлы для каждой задачи
tasks.forEach(task => {
loadTaskFiles(task.id);
});
@@ -273,6 +292,8 @@ function renderTasks() {
const canEdit = canUserEditTask(task);
const isCopy = task.original_task_id !== null;
const timeLeftInfo = getTimeLeftInfo(task);
return `
<div class="task-card ${isDeleted ? 'deleted' : ''} ${isClosed ? 'closed' : ''}">
<div class="task-actions">
@@ -297,6 +318,7 @@ function renderTasks() {
${isDeleted ? '<span class="deleted-badge">Удалена</span>' : ''}
${isClosed ? '<span class="closed-badge">Закрыта</span>' : ''}
${isCopy ? '<span class="copy-badge">Копия</span>' : ''}
${timeLeftInfo ? `<span class="deadline-badge ${timeLeftInfo.class}">${timeLeftInfo.text}</span>` : ''}
<span class="role-badge ${getRoleBadgeClass(userRole)}">${userRole}</span>
</div>
<div class="task-status ${statusClass}">${getStatusText(overallStatus)}</div>
@@ -318,7 +340,7 @@ function renderTasks() {
${task.start_date || task.due_date ? `
<div class="task-dates">
${task.start_date ? `<div><strong>Начать:</strong> ${formatDateTime(task.start_date)}</div>` : ''}
<div><strong>Создана:</strong> ${formatDateTime(task.start_date || task.created_at)}</div>
${task.due_date ? `<div><strong>Выполнить до:</strong> ${formatDateTime(task.due_date)}</div>` : ''}
</div>
` : ''}
@@ -346,21 +368,49 @@ function renderTasks() {
}).join('');
}
function getTimeLeftInfo(task) {
if (!task.due_date || task.closed_at) return null;
const dueDate = new Date(task.due_date);
const now = new Date();
const timeLeft = dueDate.getTime() - now.getTime();
const hoursLeft = Math.floor(timeLeft / (60 * 60 * 1000));
if (hoursLeft <= 0) return null;
if (hoursLeft <= 24) {
return {
text: `Менее 24ч`,
class: 'deadline-24h'
};
} else if (hoursLeft <= 48) {
return {
text: `Менее 48ч`,
class: 'deadline-48h'
};
}
return null;
}
function renderAssignment(assignment, taskId, canEdit) {
const statusClass = getStatusClass(assignment.status);
const isCurrentUser = assignment.user_id === currentUser.id;
const isOverdue = assignment.status === 'overdue';
const isRework = assignment.status === 'rework';
const timeLeftInfo = getAssignmentTimeLeftInfo(assignment);
return `
<div class="assignment ${isOverdue ? 'overdue' : ''} ${isRework ? 'rework' : ''}">
<span class="assignment-status ${statusClass}"></span>
<div style="flex: 1;">
<strong>${assignment.user_name}</strong>
${isCurrentUser ? '<small>(Вы)</small>' : ''}
${timeLeftInfo ? `<span class="deadline-indicator ${timeLeftInfo.class}">${timeLeftInfo.text}</span>` : ''}
${assignment.start_date || assignment.due_date ? `
<div class="assignment-dates">
${assignment.start_date ? `<small>Начать: ${formatDateTime(assignment.start_date)}</small>` : ''}
${assignment.start_date ? `<small>Начало: ${formatDateTime(assignment.start_date)}</small>` : ''}
${assignment.due_date ? `<small>Выполнить до: ${formatDateTime(assignment.due_date)}</small>` : ''}
</div>
` : ''}
@@ -382,6 +432,31 @@ function renderAssignment(assignment, taskId, canEdit) {
`;
}
function getAssignmentTimeLeftInfo(assignment) {
if (!assignment.due_date || assignment.status === 'completed') return null;
const dueDate = new Date(assignment.due_date);
const now = new Date();
const timeLeft = dueDate.getTime() - now.getTime();
const hoursLeft = Math.floor(timeLeft / (60 * 60 * 1000));
if (hoursLeft <= 0) return null;
if (hoursLeft <= 24) {
return {
text: `Осталось ${hoursLeft}ч`,
class: 'deadline-24h'
};
} else if (hoursLeft <= 48) {
return {
text: `Осталось ${hoursLeft}ч`,
class: 'deadline-48h'
};
}
return null;
}
async function createTask(event) {
event.preventDefault();
@@ -394,12 +469,18 @@ async function createTask(event) {
formData.append('title', document.getElementById('title').value);
formData.append('description', document.getElementById('description').value);
const startDate = document.getElementById('start-date').value;
const dueDate = document.getElementById('due-date').value;
if (startDate) formData.append('startDate', startDate);
if (dueDate) formData.append('dueDate', dueDate);
if (!dueDate) {
alert('Дата и время выполнения обязательны');
return;
}
formData.append('dueDate', dueDate);
const assignedUsers = document.querySelectorAll('#users-checklist input[name="assignedUsers"]:checked');
if (assignedUsers.length === 0) {
alert('Выберите хотя бы одного исполнителя');
return;
}
assignedUsers.forEach(checkbox => {
formData.append('assignedUsers', checkbox.value);
});
@@ -446,7 +527,6 @@ async function openEditModal(taskId) {
const task = await response.json();
// Дополнительная проверка прав на клиенте
if (!canUserEditTask(task)) {
alert('У вас нет прав для редактирования этой задачи');
return;
@@ -456,11 +536,8 @@ async function openEditModal(taskId) {
document.getElementById('edit-title').value = task.title;
document.getElementById('edit-description').value = task.description || '';
// Заполняем даты
document.getElementById('edit-start-date').value = task.start_date ? formatDateTimeForInput(task.start_date) : '';
document.getElementById('edit-due-date').value = task.due_date ? formatDateTimeForInput(task.due_date) : '';
// Отмечаем текущих исполнителей
const checkboxes = document.querySelectorAll('#edit-users-checklist input[name="assignedUsers"]');
checkboxes.forEach(checkbox => {
checkbox.checked = task.assignments?.some(assignment =>
@@ -488,9 +565,13 @@ async function updateTask(event) {
const taskId = document.getElementById('edit-task-id').value;
const title = document.getElementById('edit-title').value;
const description = document.getElementById('edit-description').value;
const startDate = document.getElementById('edit-start-date').value;
const dueDate = document.getElementById('edit-due-date').value;
if (!dueDate) {
alert('Дата и время выполнения обязательны');
return;
}
const assignedUsers = document.querySelectorAll('#edit-users-checklist input[name="assignedUsers"]:checked');
const assignedUserIds = Array.from(assignedUsers).map(cb => parseInt(cb.value));
@@ -498,8 +579,7 @@ async function updateTask(event) {
formData.append('title', title);
formData.append('description', description);
formData.append('assignedUsers', JSON.stringify(assignedUserIds));
if (startDate) formData.append('startDate', startDate);
if (dueDate) formData.append('dueDate', dueDate);
formData.append('dueDate', dueDate);
const files = document.getElementById('edit-files').files;
for (let i = 0; i < files.length; i++) {
@@ -542,8 +622,13 @@ async function copyTask(event) {
event.preventDefault();
const taskId = document.getElementById('copy-task-id').value;
const startDate = document.getElementById('copy-start-date').value;
const dueDate = document.getElementById('copy-due-date').value;
if (!dueDate) {
alert('Дата и время выполнения обязательны для копии задачи');
return;
}
const checkboxes = document.querySelectorAll('#copy-users-checklist input[name="assignedUsers"]:checked');
const assignedUserIds = Array.from(checkboxes).map(cb => parseInt(cb.value));
@@ -560,8 +645,7 @@ async function copyTask(event) {
},
body: JSON.stringify({
assignedUsers: assignedUserIds,
startDate: startDate || null,
dueDate: dueDate || null
dueDate: dueDate
})
});
@@ -589,7 +673,6 @@ function openEditAssignmentModal(taskId, userId) {
document.getElementById('edit-assignment-task-id').value = taskId;
document.getElementById('edit-assignment-user-id').value = userId;
document.getElementById('edit-assignment-start-date').value = assignment.start_date ? formatDateTimeForInput(assignment.start_date) : '';
document.getElementById('edit-assignment-due-date').value = assignment.due_date ? formatDateTimeForInput(assignment.due_date) : '';
document.getElementById('edit-assignment-modal').style.display = 'block';
@@ -604,9 +687,13 @@ async function updateAssignment(event) {
const taskId = document.getElementById('edit-assignment-task-id').value;
const userId = document.getElementById('edit-assignment-user-id').value;
const startDate = document.getElementById('edit-assignment-start-date').value;
const dueDate = document.getElementById('edit-assignment-due-date').value;
if (!dueDate) {
alert('Дата и время выполнения обязательны');
return;
}
try {
const response = await fetch(`/api/tasks/${taskId}/assignment/${userId}`, {
method: 'PUT',
@@ -614,8 +701,7 @@ async function updateAssignment(event) {
'Content-Type': 'application/json',
},
body: JSON.stringify({
startDate: startDate || null,
dueDate: dueDate || null
dueDate: dueDate
})
});
@@ -787,7 +873,7 @@ async function updateStatus(taskId, userId, status) {
function getTaskOverallStatus(task) {
if (task.status === 'deleted') return 'deleted';
if (task.closed_at) return 'closed'; // Закрытые задачи всегда имеют статус 'closed'
if (task.closed_at) return 'closed';
if (!task.assignments || task.assignments.length === 0) return 'unassigned';
const assignments = task.assignments;
@@ -857,7 +943,6 @@ function getUserRoleInTask(task) {
if (currentUser.role === 'admin') return 'Администратор';
if (parseInt(task.created_by) === currentUser.id) return 'Заказчик';
// Проверяем является ли пользователь исполнителем
if (task.assignments) {
const isExecutor = task.assignments.some(assignment =>
parseInt(assignment.user_id) === currentUser.id
@@ -880,8 +965,8 @@ function getRoleBadgeClass(role) {
function canUserEditTask(task) {
if (!currentUser) return false;
if (currentUser.role === 'admin') return true; // Администратор
if (parseInt(task.created_by) === currentUser.id) return true; // Заказчик
if (currentUser.role === 'admin') return true;
if (parseInt(task.created_by) === currentUser.id) return true;
return false;
}