diff --git a/backend/api/project.php b/backend/api/project.php
index 54d8227..1fea511 100644
--- a/backend/api/project.php
+++ b/backend/api/project.php
@@ -133,6 +133,63 @@ if ($method === 'POST') {
RestApi::response($result, $result['success'] ? 200 : 403);
}
+ // ==================== CRUD ОТДЕЛОВ ====================
+
+ // Добавление отдела
+ if ($action === 'add_department') {
+ $project_id = $data['project_id'] ?? null;
+ $name = trim($data['name'] ?? '');
+ $color = $data['color'] ?? '#6366f1';
+ if (!$project_id || !$name) {
+ RestApi::response(['success' => false, 'errors' => ['data' => 'Укажите project_id и name']], 400);
+ }
+ $result = Project::addDepartment($project_id, $name, $color, $user_id);
+ RestApi::response($result, $result['success'] ? 200 : 403);
+ }
+
+ // Обновление отдела
+ if ($action === 'update_department') {
+ $id = $data['id'] ?? null;
+ $name = isset($data['name']) ? trim($data['name']) : null;
+ $color = $data['color'] ?? null;
+ if (!$id) {
+ RestApi::response(['success' => false, 'errors' => ['id' => 'Укажите ID отдела']], 400);
+ }
+ $result = Project::updateDepartment($id, $name, $color, $user_id);
+ RestApi::response($result, $result['success'] ? 200 : 403);
+ }
+
+ // Получение количества задач в отделе (для подтверждения удаления)
+ if ($action === 'get_department_tasks_count') {
+ $id = $data['id'] ?? null;
+ if (!$id) {
+ RestApi::response(['success' => false, 'errors' => ['id' => 'Укажите ID отдела']], 400);
+ }
+ $count = Project::getDepartmentTasksCount($id);
+ RestApi::response(['success' => true, 'count' => $count]);
+ }
+
+ // Удаление отдела
+ if ($action === 'delete_department') {
+ $id = $data['id'] ?? null;
+ if (!$id) {
+ RestApi::response(['success' => false, 'errors' => ['id' => 'Укажите ID отдела']], 400);
+ }
+ $result = Project::deleteDepartment($id, $user_id);
+ RestApi::response($result, $result['success'] ? 200 : 403);
+ }
+
+ // Обновление порядка отделов
+ if ($action === 'update_departments_order') {
+ $project_id = $data['project_id'] ?? null;
+ $ids = $data['ids'] ?? [];
+ if (!$project_id || empty($ids)) {
+ RestApi::response(['success' => false, 'errors' => ['data' => 'Укажите project_id и ids']], 400);
+ }
+ $result = Project::updateDepartmentsOrder($project_id, $ids, $user_id);
+ RestApi::response($result, $result['success'] ? 200 : 403);
+ }
+
// Метод не указан
if (!$action) {
RestApi::response(['success' => false, 'error' => 'Укажите метод'], 400);
diff --git a/backend/app/class/enity/class_project.php b/backend/app/class/enity/class_project.php
index 3477567..fd166db 100644
--- a/backend/app/class/enity/class_project.php
+++ b/backend/app/class/enity/class_project.php
@@ -76,9 +76,11 @@ class Project extends BaseEntity {
return Database::select('departments', [
'id',
'name_departments',
- 'color'
+ 'color',
+ 'order_id'
], [
- 'id_project' => $project_id
+ 'id_project' => $project_id,
+ 'ORDER' => ['order_id' => 'ASC']
]);
}
@@ -366,6 +368,100 @@ class Project extends BaseEntity {
public static function setReadyColumn($project_id, $column_id, $user_id) {
return ['success' => false, 'errors' => ['column' => 'Изменение финальной колонки запрещено. Финальная колонка всегда последняя.']];
}
+
+ // ==================== CRUD ОТДЕЛОВ ====================
+
+ // Добавление отдела
+ public static function addDepartment($project_id, $name, $color, $user_id) {
+ if (!ProjectAccess::can($project_id, $user_id, 'manage_departments')) {
+ return ['success' => false, 'errors' => ['access' => 'Нет прав на управление отделами']];
+ }
+
+ // Получаем максимальный order_id для проекта
+ $maxOrder = (int)(Database::max('departments', 'order_id', ['id_project' => $project_id]) ?? 0);
+ $newOrderId = $maxOrder + 1;
+
+ Database::insert('departments', [
+ 'name_departments' => $name,
+ 'color' => $color ?: '#6366f1',
+ 'id_project' => $project_id,
+ 'order_id' => $newOrderId
+ ]);
+
+ $departmentId = Database::id();
+ return [
+ 'success' => true,
+ 'id' => $departmentId,
+ 'department' => [
+ 'id' => $departmentId,
+ 'name_departments' => $name,
+ 'color' => $color ?: '#6366f1',
+ 'order_id' => $newOrderId
+ ]
+ ];
+ }
+
+ // Обновление отдела
+ public static function updateDepartment($id, $name, $color, $user_id) {
+ // Получаем отдел для проверки проекта
+ $department = Database::get('departments', ['id_project'], ['id' => $id]);
+ if (!$department) {
+ return ['success' => false, 'errors' => ['department' => 'Отдел не найден']];
+ }
+
+ if (!ProjectAccess::can($department['id_project'], $user_id, 'manage_departments')) {
+ return ['success' => false, 'errors' => ['access' => 'Нет прав на управление отделами']];
+ }
+
+ $updateData = [];
+ if ($name !== null) $updateData['name_departments'] = $name;
+ if ($color !== null) $updateData['color'] = $color;
+
+ if (!empty($updateData)) {
+ Database::update('departments', $updateData, ['id' => $id]);
+ }
+
+ return ['success' => true];
+ }
+
+ // Получение количества задач в отделе
+ public static function getDepartmentTasksCount($department_id) {
+ return Database::count('cards_task', ['id_department' => $department_id]);
+ }
+
+ // Удаление отдела (обнуляет id_department у задач)
+ public static function deleteDepartment($id, $user_id) {
+ // Получаем отдел для проверки проекта
+ $department = Database::get('departments', ['id_project'], ['id' => $id]);
+ if (!$department) {
+ return ['success' => false, 'errors' => ['department' => 'Отдел не найден']];
+ }
+
+ if (!ProjectAccess::can($department['id_project'], $user_id, 'manage_departments')) {
+ return ['success' => false, 'errors' => ['access' => 'Нет прав на управление отделами']];
+ }
+
+ // Обнуляем id_department у задач (не удаляем сами задачи)
+ Database::update('cards_task', ['id_department' => null], ['id_department' => $id]);
+
+ // Удаляем отдел
+ Database::delete('departments', ['id' => $id]);
+
+ return ['success' => true];
+ }
+
+ // Обновление порядка отделов
+ public static function updateDepartmentsOrder($project_id, $ids, $user_id) {
+ if (!ProjectAccess::can($project_id, $user_id, 'manage_departments')) {
+ return ['success' => false, 'errors' => ['access' => 'Нет прав на управление отделами']];
+ }
+
+ foreach ($ids as $order => $id) {
+ Database::update('departments', ['order_id' => $order + 1], ['id' => $id, 'id_project' => $project_id]);
+ }
+
+ return ['success' => true];
+ }
}
?>
diff --git a/front_vue/src/api.js b/front_vue/src/api.js
index f844ba8..4bb8fd6 100644
--- a/front_vue/src/api.js
+++ b/front_vue/src/api.js
@@ -142,6 +142,42 @@ export const projectsApi = {
credentials: 'include',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ action: 'set_ready_column', project_id, column_id })
+ }),
+ // ==================== ОТДЕЛЫ ====================
+ // Добавление отдела
+ addDepartment: (project_id, name, color) => request('/api/project', {
+ method: 'POST',
+ credentials: 'include',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ action: 'add_department', project_id, name, color })
+ }),
+ // Обновление отдела
+ updateDepartment: (id, name, color) => request('/api/project', {
+ method: 'POST',
+ credentials: 'include',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ action: 'update_department', id, name, color })
+ }),
+ // Получение количества задач в отделе
+ getDepartmentTasksCount: (id) => request('/api/project', {
+ method: 'POST',
+ credentials: 'include',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ action: 'get_department_tasks_count', id })
+ }),
+ // Удаление отдела
+ deleteDepartment: (id) => request('/api/project', {
+ method: 'POST',
+ credentials: 'include',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ action: 'delete_department', id })
+ }),
+ // Обновление порядка отделов
+ updateDepartmentsOrder: (project_id, ids) => request('/api/project', {
+ method: 'POST',
+ credentials: 'include',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ action: 'update_departments_order', project_id, ids })
})
}
diff --git a/front_vue/src/components/ProjectPanel.vue b/front_vue/src/components/ProjectPanel.vue
index 0b617b8..76f4b0a 100644
--- a/front_vue/src/components/ProjectPanel.vue
+++ b/front_vue/src/components/ProjectPanel.vue
@@ -109,6 +109,92 @@
Добавить колонку
+
+
+
@@ -150,6 +236,16 @@
@cancel="showDeleteColumnDialog = false"
/>
+
+
+
{
return form.value.columns.length > 2
})
+// Можно ли сортировать отделы (больше 1 отдела)
+const canReorderDepartments = computed(() => {
+ return form.value.departments.length > 1
+})
+
// Has changes
const hasChanges = computed(() => {
if (!initialForm.value) return false
@@ -340,6 +451,175 @@ const confirmDeleteColumnAction = async () => {
columnToDelete.value = null
}
+// ==================== DEPARTMENTS MANAGEMENT ====================
+
+// Цвета для новых отделов
+const departmentColors = [
+ '#ef4444', '#f97316', '#f59e0b', '#eab308', '#84cc16',
+ '#22c55e', '#10b981', '#14b8a6', '#06b6d4', '#0ea5e9',
+ '#3b82f6', '#6366f1', '#8b5cf6', '#a855f7', '#d946ef',
+ '#ec4899', '#f43f5e'
+]
+
+const getRandomDepartmentColor = () => {
+ // Получаем цвета уже используемых отделов
+ const usedColors = form.value.departments.map(d => d.color)
+ // Фильтруем доступные цвета
+ const availableColors = departmentColors.filter(c => !usedColors.includes(c))
+ // Если все цвета использованы — берём из полного списка
+ const colorPool = availableColors.length > 0 ? availableColors : departmentColors
+ return colorPool[Math.floor(Math.random() * colorPool.length)]
+}
+
+// Фокус на поле названия отдела
+const focusDepartmentName = (index) => {
+ const input = departmentInputRefs.value[index]
+ if (input) {
+ input.focus()
+ const len = input.value.length
+ input.setSelectionRange(len, len)
+ }
+}
+
+const addDepartment = () => {
+ const newDepartment = {
+ tempId: `new-dept-${++tempIdCounter}`,
+ name_departments: '',
+ color: getRandomDepartmentColor(),
+ order_id: form.value.departments.length + 1
+ }
+
+ form.value.departments.push(newDepartment)
+ nextTick(refreshIcons)
+}
+
+const confirmDeleteDepartment = async (index) => {
+ const department = form.value.departments[index]
+ departmentToDelete.value = index
+
+ // Для существующих отделов проверяем количество задач
+ if (department.id) {
+ const count = await store.getDepartmentTasksCount(department.id)
+ if (count > 0) {
+ deleteDepartmentMessage.value = `В отделе ${count} задач.
Задачи не удалятся, но потеряют привязку к отделу.`
+ } else {
+ deleteDepartmentMessage.value = 'Отдел будет удалён.'
+ }
+ } else {
+ deleteDepartmentMessage.value = 'Отдел будет удалён.'
+ }
+
+ showDeleteDepartmentDialog.value = true
+}
+
+const confirmDeleteDepartmentAction = async () => {
+ const index = departmentToDelete.value
+ const department = form.value.departments[index]
+
+ // Если отдел уже существует на сервере — удаляем через API
+ if (department.id) {
+ const result = await store.deleteDepartment(department.id)
+ if (!result.success) {
+ throw new Error(result.errors?.department || 'Ошибка удаления')
+ }
+ }
+
+ // Удаляем из формы
+ form.value.departments.splice(index, 1)
+
+ departmentToDelete.value = null
+}
+
+// ==================== MOBILE: MOVE DEPARTMENTS ====================
+
+const moveDepartmentUp = (index) => {
+ if (index <= 0) return
+
+ const departments = form.value.departments
+ ;[departments[index - 1], departments[index]] = [departments[index], departments[index - 1]]
+
+ // Update order_id
+ departments.forEach((dept, idx) => {
+ dept.order_id = idx + 1
+ })
+
+ nextTick(refreshIcons)
+}
+
+const moveDepartmentDown = (index) => {
+ const lastIndex = form.value.departments.length - 1
+ if (index >= lastIndex) return
+
+ const departments = form.value.departments
+ ;[departments[index], departments[index + 1]] = [departments[index + 1], departments[index]]
+
+ // Update order_id
+ departments.forEach((dept, idx) => {
+ dept.order_id = idx + 1
+ })
+
+ nextTick(refreshIcons)
+}
+
+// ==================== DRAG AND DROP DEPARTMENTS (Desktop) ====================
+
+const handleDeptDragStart = (e, index) => {
+ deptDragIndex.value = index
+ e.dataTransfer.effectAllowed = 'move'
+ e.dataTransfer.setData('text/plain', `dept-${index}`)
+}
+
+const handleDeptDragEnd = () => {
+ deptDragIndex.value = null
+ deptDragOverIndex.value = null
+ deptDragPosition.value = null
+}
+
+const handleDeptDragOver = (e, index) => {
+ if (deptDragIndex.value === null || deptDragIndex.value === index) return
+
+ const rect = e.currentTarget.getBoundingClientRect()
+ const midY = rect.top + rect.height / 2
+
+ deptDragOverIndex.value = index
+ deptDragPosition.value = e.clientY < midY ? 'top' : 'bottom'
+}
+
+const handleDeptDragLeave = () => {
+ // Don't clear immediately to avoid flickering
+}
+
+const handleDeptDrop = (targetIndex) => {
+ if (deptDragIndex.value === null || deptDragIndex.value === targetIndex) {
+ handleDeptDragEnd()
+ return
+ }
+
+ const sourceIndex = deptDragIndex.value
+ let insertIndex = targetIndex
+
+ // Adjust insert index based on drag position
+ if (deptDragPosition.value === 'bottom') {
+ insertIndex = targetIndex + 1
+ }
+
+ // If moving down, adjust for removal
+ if (sourceIndex < insertIndex) {
+ insertIndex--
+ }
+
+ // Reorder array
+ const [movedDept] = form.value.departments.splice(sourceIndex, 1)
+ form.value.departments.splice(insertIndex, 0, movedDept)
+
+ // Update order_id
+ form.value.departments.forEach((dept, idx) => {
+ dept.order_id = idx + 1
+ })
+
+ handleDeptDragEnd()
+}
+
// ==================== MOBILE: MOVE COLUMNS ====================
const moveColumnUp = async (index) => {
@@ -536,6 +816,34 @@ const handleSave = async () => {
await store.reorderColumns(ids)
}
+ // Обрабатываем отделы
+ for (const department of form.value.departments) {
+ if (department.tempId && !department.id) {
+ // Новый отдел
+ const result = await store.addDepartment(department.name_departments, department.color)
+ if (result.success) {
+ department.id = result.id
+ delete department.tempId
+ }
+ } else if (department.id) {
+ // Проверяем изменения в существующем отделе
+ const original = initialForm.value.departments.find(d => d.id === department.id)
+ if (original) {
+ const nameChanged = department.name_departments !== original.name_departments
+ const colorChanged = department.color !== original.color
+ if (nameChanged || colorChanged) {
+ await store.updateDepartment(department.id, department.name_departments, department.color)
+ }
+ }
+ }
+ }
+
+ // Сохраняем порядок отделов
+ const deptIds = form.value.departments.filter(d => d.id).map(d => d.id)
+ if (deptIds.length > 0) {
+ await store.reorderDepartments(deptIds)
+ }
+
toast.success('Изменения сохранены')
emit('saved', props.project.id)
emit('close')
@@ -600,7 +908,8 @@ watch(() => props.show, async (newVal) => {
// Редактирование — загружаем данные
form.value = {
name: props.project.name,
- columns: JSON.parse(JSON.stringify(store.columns))
+ columns: JSON.parse(JSON.stringify(store.columns)),
+ departments: JSON.parse(JSON.stringify(store.departments))
}
} else {
// Создание — дефолтные значения (последняя колонка = финальная)
@@ -609,6 +918,9 @@ watch(() => props.show, async (newVal) => {
columns: [
{ tempId: 'new-1', name_columns: 'К выполнению', color: '#6366f1', id_order: 1 },
{ tempId: 'new-2', name_columns: 'Готово', color: '#22c55e', id_order: 2 }
+ ],
+ departments: [
+ { tempId: 'new-dept-1', name_departments: 'Отдел разработки', color: '#3b82f6', order_id: 1 }
]
}
tempIdCounter = 2
@@ -621,10 +933,14 @@ watch(() => props.show, async (newVal) => {
}
})
-// Refresh icons when columns change
+// Refresh icons when columns or departments change
watch(() => form.value.columns.length, () => {
nextTick(refreshIcons)
})
+
+watch(() => form.value.departments.length, () => {
+ nextTick(refreshIcons)
+})