task

public/ui.js

@@ -62,7 +62,14 @@ function renderTasks() {
                             <span class="role-badge ${getRoleBadgeClass(userRole)}">${userRole}</span>
     ${task.assignments && task.assignments.length > 0 ? `<span class="task-number">${task.assignments.map(a => a.user_login || a.user_name).join(', ')}</span>` : ''}
                         </div>
-                        <div class="task-status ${statusClass}">${getStatusText(overallStatus)}</div>
+                        <!--
+                        <div class="task-status ${statusClass}">
+                        ${getStatusText(overallStatus)}
+                        </div>
+                        -->
+                        <span class="task-status ${statusClass}">
+                        Выполнить до: ${formatDateTime(task.due_date || task.created_at)}
+                        </span>
                         <div class="expand-icon" style="margin-left: 10px; transition: transform 0.3s; transform: rotate(${isExpanded ? '180deg' : '0deg'});">
                             ▼
                         </div>
@@ -100,12 +107,7 @@ function renderTasks() {
                         </div>
                     ` : ''}
                     
-                    <div class="task-dates-files">
-                        <div class="task-dates">
-                            <strong>Создана:</strong> ${formatDateTime(task.start_date || task.created_at)}
-                            ${task.due_date ? ` | <strong>Выполнить до:</strong> ${formatDateTime(task.due_date)}` : ''}
-                            ${showingTasksWithoutDate ? '<span class="no-date-badge">Без срока</span>' : ''}
-                        </div>
+                    
                         <div class="file-list" id="files-${task.id}">
                             <strong>Файлы:</strong> 
                             ${task.files && task.files.length > 0 ? 
@@ -113,7 +115,7 @@ function renderTasks() {
                                 '<span class="no-files">нет файлов</span>'
                             }
                         </div>
-                    </div>
+                    
                     
                     <div class="task-assignments">
                         <strong>Исполнители:</strong>
@@ -124,7 +126,7 @@ ${task.assignments && task.assignments.length > 0 ?
                     </div>
                     
                     <div class="task-meta">
-                        <small>Создана: ${formatDateTime(task.created_at)} | Автор: ${task.creator_name}</small>
+                        <small>Создана: ${formatDateTime(task.start_date || task.created_at)} | Выполнить до: ${formatDateTime(task.due_date || task.created_at)} | Автор: ${task.creator_name} </small>
                         ${task.deleted_at ? `<br><small>Удалена: ${formatDateTime(task.deleted_at)}</small>` : ''}
                         ${task.closed_at ? `<br><small>Закрыта: ${formatDateTime(task.closed_at)}</small>` : ''}
                     </div>
@@ -244,7 +246,7 @@ function renderAssignment(assignment, taskId, canEdit) {
                 ${assignment.start_date || assignment.due_date ? `
                     <div class="assignment-dates">
                         ${assignment.start_date ? `<small>Начало: ${formatDateTime(assignment.start_date)}</small>` : ''}
-                        ${assignment.due_date ? `<small>Выполнить до: ${formatDateTime(assignment.due_date)}</small>` : ''}
+                        ${assignment.due_date ? `<small>2Выполнить до: ${formatDateTime(assignment.due_date)}</small>` : ''}
                     </div>
                 ` : ''}
                 ${assignment.rework_comment ? `