From 4beaafdbf57d5a296d489c0ec8a67644b829ebf7 Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Wed, 27 May 2026 14:48:53 +0300
Subject: [PATCH 01/14] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D1=8C=20"=D0=9F=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BB=D0=B5=D0=B4=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=D1=87?=
 =?UTF-8?q?=D1=91=D1=82=D1=8B"=20=D0=BD=D0=B0=20=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=86=D0=B5=20=D0=BE=D1=82=D1=87=D1=91=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/reports/ReportsView.vue         | 66 +------------------
 1 file changed, 1 insertion(+), 65 deletions(-)

diff --git a/Wintime-Control-Frontend/src/views/reports/ReportsView.vue b/Wintime-Control-Frontend/src/views/reports/ReportsView.vue
index 3b7bb61..630b406 100644
--- a/Wintime-Control-Frontend/src/views/reports/ReportsView.vue
+++ b/Wintime-Control-Frontend/src/views/reports/ReportsView.vue
@@ -72,84 +72,20 @@
         </el-button>
       </div>
     </el-card>
-
-    <!-- Последние отчёты (быстрый доступ) -->
-    <el-card>
-      <template #header>
-        <span class="font-semibold">Последние отчёты</span>
-      </template>
-
-      <el-table :data="recentReports" stripe style="width: 100%">
-        <el-table-column prop="type" label="Тип" width="200">
-          <template #default="{ row }">
-            <el-tag :type="getReportTypeTag(row.type)">
-              {{ getReportTypeLabel(row.type) }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="dateFrom" label="Период" width="200">
-          <template #default="{ row }">
-            {{ row.dateFrom }} — {{ row.dateTo }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="createdAt" label="Создан" width="180" />
-        <el-table-column label="Действия" width="150">
-          <template #default="{ row }">
-            <el-button size="small" @click="reopenReport(row)">Открыть</el-button>
-            <el-button size="small" type="success" @click="downloadReport(row)">
-              <el-icon><Download /></el-icon>
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
   </div>
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()
 const selectedType = ref(null)
 
-const recentReports = ref([
-  { type: 'daily', dateFrom: '2026-02-26', dateTo: '2026-02-26', createdAt: '26.02.2026 18:30' },
-  { type: 'equipment', dateFrom: '2026-02-01', dateTo: '2026-02-28', createdAt: '28.02.2026 17:00' },
-  { type: 'assets', dateFrom: '2026-02-01', dateTo: '2026-02-28', createdAt: '28.02.2026 16:45' }
-])
-
 const openReport = () => {
   if (!selectedType.value) return
   router.push(`/reports/${selectedType.value}`)
 }
-
-const reopenReport = (report) => {
-  router.push(`/reports/${report.type}?from=${report.dateFrom}&to=${report.dateTo}`)
-}
-
-const downloadReport = (report) => {
-  // TODO: Реализовать скачивание из истории
-  console.log('Download:', report)
-}
-
-const getReportTypeLabel = (type) => {
-  const labels = {
-    daily: 'Картина дня',
-    equipment: 'Производительность',
-    assets: 'Активы'
-  }
-  return labels[type] || type
-}
-
-const getReportTypeTag = (type) => {
-  const tags = {
-    daily: 'primary',
-    equipment: 'success',
-    assets: 'warning'
-  }
-  return tags[type] || 'info'
-}
 </script>
 
 <style scoped>

From 6aabda90e57b29969a4c6bc538ada9b6b5e6145d Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Wed, 27 May 2026 15:09:10 +0300
Subject: [PATCH 02/14] =?UTF-8?q?=D0=92=D1=8B=D1=80=D0=B0=D0=B2=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D1=87=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B5=20=D0=BF=D1=80=D0=B5=D1=81=D1=81-=D1=84=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dictionary/MoldDictionary.vue   | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/Wintime-Control-Frontend/src/views/dictionary/MoldDictionary.vue b/Wintime-Control-Frontend/src/views/dictionary/MoldDictionary.vue
index 018d581..689a553 100644
--- a/Wintime-Control-Frontend/src/views/dictionary/MoldDictionary.vue
+++ b/Wintime-Control-Frontend/src/views/dictionary/MoldDictionary.vue
@@ -58,9 +58,9 @@
       </el-table-column>
       <el-table-column label="Действия" width="220" fixed="right">
         <template #default="{ row }">
-          <div class="flex flex-col items-start gap-1">
-            <el-button size="small" style="width: 120px" @click="editMold(row)">Редактировать</el-button>
-            <el-button size="small" style="width: 120px" type="danger" @click="deleteMold(row)">Удалить</el-button>
+          <div class="flex gap-2 justify-start">
+            <el-button size="small" style="width: 105px" @click="editMold(row)">Редактировать</el-button>
+            <el-button size="small" style="width: 105px" type="danger" @click="deleteMold(row)">Удалить</el-button>
           </div>
         </template>
       </el-table-column>
@@ -112,6 +112,19 @@
           </el-col>
         </el-row>
 
+        <el-row v-if="editingMold" :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="Выполнено смыканий">
+              <span class="text-gray-800 font-medium">
+                {{ (editingMold.maxResourceCycles - editingMold.remainingResource).toLocaleString('ru-RU') }}
+              </span>
+              <span class="text-gray-400 ml-2">
+                из {{ editingMold.maxResourceCycles.toLocaleString('ru-RU') }}
+              </span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="ТО-1 (смыкания)">

From ca59e2d685a445e121db26cb9d10e61edf3c9ef8 Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Wed, 27 May 2026 15:09:31 +0300
Subject: [PATCH 03/14] =?UTF-8?q?=D0=97=D0=B0=D0=BF=D1=80=D0=B5=D1=89?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=B5=D0=B0=D0=BA=D1=82=D0=B8=D0=B2?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=BF=D1=80=D0=B5=D1=81=D1=81-=D1=84?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Wintime.Control.API/Controllers/TasksController.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Wintime.Control.API/Controllers/TasksController.cs b/Wintime.Control.API/Controllers/TasksController.cs
index 667cb14..524b8ea 100644
--- a/Wintime.Control.API/Controllers/TasksController.cs
+++ b/Wintime.Control.API/Controllers/TasksController.cs
@@ -187,6 +187,10 @@ public async Task<ActionResult<TaskDto>> GetTaskById(Guid id)
     [Authorize(Roles = $"{Roles.Admin},{Roles.Manager}")]
     public async Task<ActionResult<TaskDto>> CreateTask([FromBody] CreateTaskRequestDto request)
     {
+        var mold = await _context.Molds.FindAsync(request.MoldId);
+        if (mold == null || !mold.IsActive)
+            return BadRequest("Указана неактивная или несуществующая пресс-форма.");
+
         var task = new Core.Entities.ShiftTask
         {
             ImmId = request.ImmId,

From ee95709a9682aeefdcbc8acc903e4b89e793cc99 Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Wed, 27 May 2026 22:03:20 +0300
Subject: [PATCH 04/14] =?UTF-8?q?=D0=92=20=D0=B4=D0=B0=D1=88=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B4=D0=B5=20=D0=B2=D0=B8=D0=B4=D0=B6=D0=B5=D1=82=20?=
 =?UTF-8?q?=D0=AD=D1=84=D1=84=D0=B5=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D1=91=D0=BD?=
 =?UTF-8?q?=20=D0=B2=D0=B8=D0=B4=D0=B6=D0=B5=D1=82=D0=BE=D0=BC=20"=D0=97?=
 =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Wintime-Control-Frontend/src/api/dashboard.js | 11 ++-
 .../src/stores/dashboard.js                   | 76 ++++++++++++++--
 .../src/views/dashboard/DashboardView.vue     | 80 +++++++++++++++--
 .../Controllers/DashboardController.cs        | 86 +++++++++++++++++++
 .../DTOs/Dashboard/ShiftUtilizationDto.cs     | 16 ++++
 5 files changed, 256 insertions(+), 13 deletions(-)
 create mode 100644 Wintime.Control.API/Controllers/DashboardController.cs
 create mode 100644 Wintime.Control.Core/DTOs/Dashboard/ShiftUtilizationDto.cs

diff --git a/Wintime-Control-Frontend/src/api/dashboard.js b/Wintime-Control-Frontend/src/api/dashboard.js
index 66a7a8d..129b98a 100644
--- a/Wintime-Control-Frontend/src/api/dashboard.js
+++ b/Wintime-Control-Frontend/src/api/dashboard.js
@@ -28,8 +28,15 @@ export const dashboardApi = {
 
   // Получить активные задания
   getActiveTasks() {
-    return apiClient.get('/tasks', { 
-      params: { status: 'InProgress' } 
+    return apiClient.get('/tasks', {
+      params: { status: 'InProgress' }
+    })
+  },
+
+  // Средняя загрузка цеха за период (взвешенная по времени)
+  getShiftUtilization(from, to) {
+    return apiClient.get('/dashboard/shift-utilization', {
+      params: { from: from.toISOString(), to: to.toISOString() }
     })
   }
 }
\ No newline at end of file
diff --git a/Wintime-Control-Frontend/src/stores/dashboard.js b/Wintime-Control-Frontend/src/stores/dashboard.js
index 50c00a2..24da808 100644
--- a/Wintime-Control-Frontend/src/stores/dashboard.js
+++ b/Wintime-Control-Frontend/src/stores/dashboard.js
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import { dashboardApi } from '@/api/dashboard'
 import { immApi } from '@/api/imm'
+import { shiftsApi } from '@/api/shifts'
 
 export const useDashboardStore = defineStore('dashboard', {
   state: () => ({
@@ -13,7 +14,10 @@ export const useDashboardStore = defineStore('dashboard', {
     filters: {
       status: null,
       search: ''
-    }
+    },
+    shifts: [],
+    shiftUtilization: null,    // { utilization, machineCount, from, to }
+    shiftUtilizationLoading: false
   }),
 
   getters: {
@@ -35,12 +39,48 @@ export const useDashboardStore = defineStore('dashboard', {
     // ТПА оффлайн (Offline)
     offlineImms: (state) => state.imms.filter(i => i.status === 'Offline'),
 
-    // Общая эффективность цеха
+    // Мгновенная загрузка цеха: (Auto + Manual) / все активные
     overallEfficiency: (state) => {
-      const working = state.imms.filter(i => i.status === 'Auto')
-      if (working.length === 0) return 0
-      const avg = working.reduce((sum, i) => sum + (i.efficiency || 0), 0) / working.length
-      return Math.round(avg)
+      if (state.imms.length === 0) return 0
+      const active = state.imms.filter(i => i.status === 'Auto' || i.status === 'Manual')
+      return Math.round(active.length / state.imms.length * 100)
+    },
+
+    // Текущая смена или null
+    currentShift: (state) => {
+      if (state.shifts.length === 0) return null
+      const now = new Date()
+      const minutesNow = now.getHours() * 60 + now.getMinutes()
+      return state.shifts.find(s => {
+        const end = s.startMinutes + s.durationMinutes
+        if (end <= 1440) {
+          return minutesNow >= s.startMinutes && minutesNow < end
+        }
+        // смена переходит через полночь
+        return minutesNow >= s.startMinutes || minutesNow < (end % 1440)
+      }) ?? null
+    },
+
+    // Последняя завершённая смена (ближайшая к текущему моменту)
+    lastCompletedShift: (state) => {
+      if (state.shifts.length === 0) return null
+      const now = new Date()
+      const minutesNow = now.getHours() * 60 + now.getMinutes()
+      // Ищем смену, которая закончилась позже всего, но раньше текущего момента
+      let best = null
+      let bestEnd = -1
+      for (const s of state.shifts) {
+        const end = (s.startMinutes + s.durationMinutes) % 1440
+        // Сколько минут назад закончилась смена
+        const minutesAgo = (minutesNow - end + 1440) % 1440
+        if (minutesAgo > 0 && minutesAgo < 1440) {
+          if (best === null || minutesAgo < (minutesNow - bestEnd + 1440) % 1440) {
+            best = s
+            bestEnd = end
+          }
+        }
+      }
+      return best
     },
 
     // Фильтрованный список ТПА
@@ -68,6 +108,30 @@ export const useDashboardStore = defineStore('dashboard', {
   },
 
   actions: {
+    // Загрузка расписания смен
+    async loadShifts() {
+      try {
+        const response = await shiftsApi.getShifts()
+        this.shifts = response.data
+      } catch (error) {
+        console.error('Ошибка загрузки смен:', error)
+      }
+    },
+
+    // Загрузка средней загрузки за смену
+    async loadShiftUtilization(from, to) {
+      this.shiftUtilizationLoading = true
+      try {
+        const response = await dashboardApi.getShiftUtilization(from, to)
+        this.shiftUtilization = response.data
+      } catch (error) {
+        console.error('Ошибка загрузки загрузки смены:', error)
+        this.shiftUtilization = null
+      } finally {
+        this.shiftUtilizationLoading = false
+      }
+    },
+
     // Загрузка списка ТПА
     async loadImms() {
       this.loading = true
diff --git a/Wintime-Control-Frontend/src/views/dashboard/DashboardView.vue b/Wintime-Control-Frontend/src/views/dashboard/DashboardView.vue
index fba7548..31415f1 100644
--- a/Wintime-Control-Frontend/src/views/dashboard/DashboardView.vue
+++ b/Wintime-Control-Frontend/src/views/dashboard/DashboardView.vue
@@ -82,9 +82,18 @@
           <div class="p-3 bg-purple-100 rounded-lg">
             <el-icon class="text-purple-600 text-xl"><TrendCharts /></el-icon>
           </div>
-          <div>
-            <p class="text-sm text-gray-500">Эффективность</p>
-            <p class="text-2xl font-bold" :class="efficiencyColor">{{ dashboardStore.overallEfficiency }}%</p>
+          <div class="min-w-0">
+            <p class="text-sm text-gray-500">Текущая загрузка</p>
+            <div class="flex items-baseline gap-2 flex-wrap">
+              <p class="text-2xl font-bold" :class="efficiencyColor">
+                {{ instantUtilizationLabel }}
+              </p>
+              <span v-if="shiftEndedLabel" class="text-xs text-gray-400">{{ shiftEndedLabel }}</span>
+            </div>
+            <p v-if="shiftAvgLabel" class="text-xs text-gray-500 mt-0.5">
+              {{ shiftAvgLabel }}
+            </p>
+            <p v-if="shiftLabel" class="text-xs text-gray-400 mt-0.5">{{ shiftLabel }}</p>
           </div>
         </div>
       </div>
@@ -178,8 +187,68 @@ const efficiencyColor = computed(() => {
   return 'text-red-600'
 })
 
+// Возвращает { from, to } для смены относительно переданной даты
+function shiftBounds(shift, date) {
+  const base = new Date(date)
+  base.setHours(0, 0, 0, 0)
+  const from = new Date(base.getTime() + shift.startMinutes * 60000)
+  const to   = new Date(from.getTime() + shift.durationMinutes * 60000)
+  return { from, to }
+}
+
+// Метка мгновенной загрузки с учётом контекста смены
+const instantUtilizationLabel = computed(() => {
+  const eff = dashboardStore.overallEfficiency
+  const hasActive = dashboardStore.imms.some(i => i.status === 'Auto' || i.status === 'Manual')
+  if (!dashboardStore.currentShift && !hasActive) return '—'
+  return `${eff}%`
+})
+
+// "(смена закончилась)" — показываем когда нет текущей смены, но есть активные станки
+const shiftEndedLabel = computed(() => {
+  if (dashboardStore.currentShift) return null
+  const hasActive = dashboardStore.imms.some(i => i.status === 'Auto' || i.status === 'Manual')
+  return hasActive ? '(смена закончилась)' : null
+})
+
+// Метка средней загрузки за смену
+const shiftAvgLabel = computed(() => {
+  const u = dashboardStore.shiftUtilization
+  if (!u) return null
+  return `Ср. за смену: ${u.utilization}%`
+})
+
+// Название текущей/последней смены
+const shiftLabel = computed(() => {
+  const shift = dashboardStore.currentShift ?? dashboardStore.lastCompletedShift
+  if (!shift) return null
+  const bounds = shiftBounds(shift, new Date())
+  const fmt = (d) => dayjs(d).format('HH:mm')
+  const prefix = dashboardStore.currentShift ? 'Смена' : 'Последняя смена'
+  return `${prefix}: ${fmt(bounds.from)}–${fmt(bounds.to)}`
+})
+
+async function loadShiftUtilization() {
+  const shift = dashboardStore.currentShift ?? dashboardStore.lastCompletedShift
+  if (!shift) return
+
+  const referenceDate = new Date()
+  if (!dashboardStore.currentShift) {
+    // Для последней завершённой смены: если она ещё не начиналась сегодня — берём вчера
+    const bounds = shiftBounds(shift, referenceDate)
+    if (bounds.from > referenceDate) {
+      referenceDate.setDate(referenceDate.getDate() - 1)
+    }
+  }
+
+  const { from, to } = shiftBounds(shift, referenceDate)
+  const effectiveTo = dashboardStore.currentShift ? new Date() : to
+  await dashboardStore.loadShiftUtilization(from, effectiveTo)
+}
+
 onMounted(async () => {
-  await dashboardStore.loadImms()
+  await Promise.all([dashboardStore.loadImms(), dashboardStore.loadShifts()])
+  await loadShiftUtilization()
   dashboardStore.startAutoRefresh()
 })
 
@@ -199,7 +268,8 @@ const toggleAutoRefresh = () => {
 
 const refreshData = async () => {
   const result = await dashboardStore.refreshAll()
-  
+  await loadShiftUtilization()
+
   if (result.success) {
     ElMessage.success('Данные обновлены')
   } else if (result.isAuthError) {
diff --git a/Wintime.Control.API/Controllers/DashboardController.cs b/Wintime.Control.API/Controllers/DashboardController.cs
new file mode 100644
index 0000000..f502fdf
--- /dev/null
+++ b/Wintime.Control.API/Controllers/DashboardController.cs
@@ -0,0 +1,86 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Wintime.Control.Core.DTOs.Dashboard;
+using Wintime.Control.Infrastructure.Data;
+using Wintime.Control.Shared.Constants;
+
+namespace Wintime.Control.API.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
+[Authorize]
+public class DashboardController : ControllerBase
+{
+    private readonly ControlDbContext _context;
+
+    public DashboardController(ControlDbContext context)
+    {
+        _context = context;
+    }
+
+    /// <summary>
+    /// Средняя загрузка цеха за период (взвешенная по времени).
+    /// Загрузка = суммарное время станков в статусе Auto или Manual
+    ///            / (длительность периода × количество активных станков).
+    /// </summary>
+    [HttpGet("shift-utilization")]
+    [Authorize(Roles = $"{Roles.Admin},{Roles.Manager},{Roles.Adjuster},{Roles.Observer}")]
+    public async Task<ActionResult<ShiftUtilizationDto>> GetShiftUtilization(
+        [FromQuery] DateTime from,
+        [FromQuery] DateTime to)
+    {
+        var fromUtc = DateTime.SpecifyKind(from, DateTimeKind.Utc);
+        var toUtc   = DateTime.SpecifyKind(to,   DateTimeKind.Utc);
+
+        if (fromUtc >= toUtc)
+            return BadRequest("from должен быть меньше to");
+
+        var activeImmIds = await _context.Imms
+            .Where(i => i.IsActive)
+            .Select(i => i.Id)
+            .ToListAsync();
+
+        if (activeImmIds.Count == 0)
+            return Ok(new ShiftUtilizationDto { From = fromUtc, To = toUtc });
+
+        var segments = await _context.ImmStatusHistory
+            .Where(h => activeImmIds.Contains(h.ImmId)
+                     && h.ChangedAt < toUtc
+                     && (h.EndedAt == null || h.EndedAt > fromUtc))
+            .Select(h => new
+            {
+                h.Status,
+                ChangedAt = h.ChangedAt,
+                EndedAt   = h.EndedAt
+            })
+            .ToListAsync();
+
+        double productiveSeconds = 0;
+
+        foreach (var seg in segments)
+        {
+            if (seg.Status != "Auto" && seg.Status != "Manual")
+                continue;
+
+            var start = seg.ChangedAt < fromUtc ? fromUtc : seg.ChangedAt;
+            var end   = (seg.EndedAt == null || seg.EndedAt > toUtc) ? toUtc : seg.EndedAt.Value;
+
+            if (end > start)
+                productiveSeconds += (end - start).TotalSeconds;
+        }
+
+        var totalPossibleSeconds = (toUtc - fromUtc).TotalSeconds * activeImmIds.Count;
+        var utilization = totalPossibleSeconds > 0
+            ? Math.Round((decimal)(productiveSeconds / totalPossibleSeconds * 100), 1)
+            : 0m;
+
+        return Ok(new ShiftUtilizationDto
+        {
+            Utilization  = utilization,
+            MachineCount = activeImmIds.Count,
+            From         = fromUtc,
+            To           = toUtc
+        });
+    }
+}
diff --git a/Wintime.Control.Core/DTOs/Dashboard/ShiftUtilizationDto.cs b/Wintime.Control.Core/DTOs/Dashboard/ShiftUtilizationDto.cs
new file mode 100644
index 0000000..329f99c
--- /dev/null
+++ b/Wintime.Control.Core/DTOs/Dashboard/ShiftUtilizationDto.cs
@@ -0,0 +1,16 @@
+namespace Wintime.Control.Core.DTOs.Dashboard;
+
+public class ShiftUtilizationDto
+{
+    /// <summary>Средняя загрузка за период, % (0..100)</summary>
+    public decimal Utilization { get; set; }
+
+    /// <summary>Количество активных станков в расчёте</summary>
+    public int MachineCount { get; set; }
+
+    /// <summary>Начало периода (UTC)</summary>
+    public DateTime From { get; set; }
+
+    /// <summary>Конец периода (UTC)</summary>
+    public DateTime To { get; set; }
+}

From b7a37012af6775df496502d68f203721c9ce1353 Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Wed, 27 May 2026 23:08:03 +0300
Subject: [PATCH 05/14] =?UTF-8?q?=D0=92=20=D0=BA=D0=B0=D1=80=D1=82=D0=BE?=
 =?UTF-8?q?=D1=87=D0=BA=D0=B5=20=D0=A2=D0=9F=D0=90=20=D1=8D=D1=84=D1=84?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B0=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D1=82=D0=B5=D0=BC=D0=BF=20=D0=B8=20=D0=BF=D1=80=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B7=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dashboard/ImmCard.vue      | 43 +++++++++++++++----
 .../Controllers/ImmController.cs              |  4 ++
 Wintime.Control.Core/DTOs/Imm/ImmDto.cs       |  1 +
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/Wintime-Control-Frontend/src/components/dashboard/ImmCard.vue b/Wintime-Control-Frontend/src/components/dashboard/ImmCard.vue
index 97f9079..bb5f6cb 100644
--- a/Wintime-Control-Frontend/src/components/dashboard/ImmCard.vue
+++ b/Wintime-Control-Frontend/src/components/dashboard/ImmCard.vue
@@ -59,8 +59,8 @@
         <div class="font-semibold text-gray-800">{{ cycleTime }} сек</div>
       </div>
       <div>
-        <div class="text-gray-500 text-xs">Эффективность</div>
-        <div class="font-semibold" :class="efficiencyColor">{{ efficiency }}%</div>
+        <div class="text-gray-500 text-xs">Темп</div>
+        <div class="font-semibold text-gray-800">{{ rateLabel }}</div>
       </div>
       <div>
         <div class="text-gray-500 text-xs">Обновлено</div>
@@ -68,6 +68,13 @@
       </div>
     </div>
 
+    <!-- Прогноз окончания -->
+    <div v-if="etaLabel" class="mt-2 pt-2 border-t flex items-center gap-2 text-sm">
+      <el-icon class="text-gray-400"><Clock /></el-icon>
+      <span class="text-gray-500">Прогноз окончания:</span>
+      <span class="font-medium text-gray-800">{{ etaLabel }}</span>
+    </div>
+
     <!-- Индикатор аварии -->
     <el-alert
       v-if="imm.status === 'Alarm'"
@@ -84,6 +91,7 @@
 <script setup>
 import { computed } from 'vue'
 import ImmStatusBadge from './ImmStatusBadge.vue'
+import { Clock } from '@element-plus/icons-vue'
 
 const props = defineProps({
   imm: {
@@ -111,13 +119,32 @@ const planQuantity = computed(() => props.imm.planQuantity || 0)
 const actualQuantity = computed(() => props.imm.actualQuantity || 0)
 const cycleCount = computed(() => props.imm.cycleCount || 0)
 const cycleTime = computed(() => props.imm.currentCycleTime?.toFixed(1) || '0.0')
-const efficiency = computed(() => props.imm.efficiency?.toFixed(1) || '0.0')
 
-const efficiencyColor = computed(() => {
-  const eff = parseFloat(efficiency.value)
-  if (eff >= 85) return 'text-green-600'
-  if (eff >= 70) return 'text-yellow-600'
-  return 'text-red-600'
+// Темп производства: шт/ч на основе фактических штук и времени с начала задания
+const ratePerHour = computed(() => {
+  const actual = props.imm.actualQuantity
+  const startedAt = props.imm.taskStartedAt
+  if (!props.imm.currentTaskId || !actual || !startedAt) return null
+  const elapsedHours = (Date.now() - new Date(startedAt).getTime()) / 3_600_000
+  if (elapsedHours < 0.01) return null
+  return actual / elapsedHours
+})
+
+const rateLabel = computed(() => {
+  if (!ratePerHour.value) return '—'
+  return `${Math.round(ratePerHour.value)} шт/ч`
+})
+
+// Прогноз окончания задания
+const etaLabel = computed(() => {
+  const rate = ratePerHour.value
+  const plan = props.imm.planQuantity
+  const actual = props.imm.actualQuantity
+  if (!rate || !plan || actual == null || actual >= plan) return null
+
+  const remainingHours = (plan - actual) / rate
+  const eta = new Date(Date.now() + remainingHours * 3_600_000)
+  return eta.toLocaleTimeString('ru-RU', { hour: '2-digit', minute: '2-digit' })
 })
 
 const borderColor = computed(() => {
diff --git a/Wintime.Control.API/Controllers/ImmController.cs b/Wintime.Control.API/Controllers/ImmController.cs
index 66df610..ab92ecd 100644
--- a/Wintime.Control.API/Controllers/ImmController.cs
+++ b/Wintime.Control.API/Controllers/ImmController.cs
@@ -71,6 +71,10 @@ public async Task<ActionResult<IEnumerable<ImmDto>>> GetImmList([FromQuery] bool
                 ActualQuantity = i.Tasks
                     .Where(t => t.Status == Core.Enums.TaskStatus.InProgress || t.Status == Core.Enums.TaskStatus.Setup)
                     .Select(t => (int?)t.ActualQuantity)
+                    .FirstOrDefault(),
+                TaskStartedAt = i.Tasks
+                    .Where(t => t.Status == Core.Enums.TaskStatus.InProgress || t.Status == Core.Enums.TaskStatus.Setup)
+                    .Select(t => t.StartedAt)
                     .FirstOrDefault()
             })
             .ToListAsync();
diff --git a/Wintime.Control.Core/DTOs/Imm/ImmDto.cs b/Wintime.Control.Core/DTOs/Imm/ImmDto.cs
index 3ff6b5d..ab1349e 100644
--- a/Wintime.Control.Core/DTOs/Imm/ImmDto.cs
+++ b/Wintime.Control.Core/DTOs/Imm/ImmDto.cs
@@ -19,4 +19,5 @@ public class ImmDto
     public int? ActualQuantity { get; set; }
     public int CycleCount { get; set; }
     public decimal AvgCycleTime { get; set; }
+    public DateTime? TaskStartedAt { get; set; }
 }
\ No newline at end of file

From c5341d216699c935b963c6828eea096aa7fdd36c Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Wed, 27 May 2026 23:10:27 +0300
Subject: [PATCH 06/14] =?UTF-8?q?=D0=92=20=D0=BE=D1=82=D1=87=D1=91=D1=82?=
 =?UTF-8?q?=20"=D0=9A=D0=B0=D1=80=D1=82=D0=B8=D0=BD=D0=B0=20=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=87=D0=B5=D0=B3=D0=BE=20=D0=B4=D0=BD=D1=8F"=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BA=D0=B8=20=D1=81=D0=BC=D0=B5=D0=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/reports/GanttChart.vue     | 29 ++++++++++++++++++-
 .../src/views/reports/DailyReportView.vue     |  2 +-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/Wintime-Control-Frontend/src/components/reports/GanttChart.vue b/Wintime-Control-Frontend/src/components/reports/GanttChart.vue
index 040b1ce..e1d0b3b 100644
--- a/Wintime-Control-Frontend/src/components/reports/GanttChart.vue
+++ b/Wintime-Control-Frontend/src/components/reports/GanttChart.vue
@@ -19,6 +19,14 @@ const props = defineProps({
   data: {
     type: Array,
     default: () => []
+  },
+  shifts: {
+    type: Array,
+    default: () => []
+  },
+  date: {
+    type: String,
+    default: ''
   }
 })
 
@@ -67,6 +75,13 @@ const initChart = () => {
     })
   })
 
+  const shiftMarkLines = props.shifts
+    .filter(s => s.startTime)
+    .map(s => ({
+      name: `Смена ${s.number ?? ''} ${s.startTime}`.trim(),
+      xAxis: dayjs(`${props.date || dayjs().format('YYYY-MM-DD')} ${s.startTime}`).valueOf()
+    }))
+
   const option = {
     tooltip: {
       formatter: (params) => {
@@ -120,7 +135,19 @@ const initChart = () => {
           }
         },
         encode: { x: [1, 2], y: 0 },
-        data: seriesData
+        data: seriesData,
+        markLine: shiftMarkLines.length ? {
+          silent: true,
+          symbol: ['none', 'none'],
+          lineStyle: { color: '#374151', type: 'dashed', width: 1.5 },
+          label: {
+            position: 'insideStartTop',
+            formatter: (p) => p.name,
+            color: '#374151',
+            fontSize: 11
+          },
+          data: shiftMarkLines
+        } : undefined
       }
     ]
   }
diff --git a/Wintime-Control-Frontend/src/views/reports/DailyReportView.vue b/Wintime-Control-Frontend/src/views/reports/DailyReportView.vue
index ea4aef1..0818057 100644
--- a/Wintime-Control-Frontend/src/views/reports/DailyReportView.vue
+++ b/Wintime-Control-Frontend/src/views/reports/DailyReportView.vue
@@ -58,7 +58,7 @@
       <template #header>
         <span class="font-semibold">График работы ТПА (Гант)</span>
       </template>
-      <GanttChart :data="reportData.immData" />
+      <GanttChart :data="reportData.immData" :shifts="shifts" :date="filters.date" />
     </el-card>
 
     <!-- Таблица -->

From 76b9ff14deb3ca91ced090868ad3a9bddfb85e72 Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Thu, 28 May 2026 16:38:29 +0300
Subject: [PATCH 07/14] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B2=20CLAUDE.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore |  2 ++
 CLAUDE.md  | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/.gitignore b/.gitignore
index f39c38c..3d6eccb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,5 @@ publish/
 
 # Secrets
 .env
+docs/Rosoms_requirements.md
+docs/Modules_architecture_plan.md
diff --git a/CLAUDE.md b/CLAUDE.md
index 07d56e2..efd1580 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -111,6 +111,44 @@ Tables: `Users` (Identity), `Imms`, `Molds`, `Tasks`, `Templates`, `Events`, `Do
 
 There are no test projects. When adding tests, use xUnit for .NET and Vitest for the frontend.
 
+## Domain Rules
+
+### IsActive — архивный флаг (мягкое удаление)
+
+`IsActive` на сущностях `Imm`, `Mold`, `User` — это флаг вывода из оборота, **не** признак текущей активности.
+
+- `IsActive = true` → сущность в работе, доступна для назначения в СЗ
+- `IsActive = false` → сущность в архиве: скрыта из списков выбора, нельзя назначить в новое СЗ, исторические данные сохраняются и доступны в отчётах
+
+Никогда не удалять сущности физически — только `IsActive = false`.
+
+### Статусы ТПА
+
+Статус ТПА передаётся как строка через MQTT, хранится в `ImmStatusHistory.Status` и кешируется в `IImmStatusCache`. Фронтенд интерпретирует строку и показывает пользователю локализованное название и цвет.
+
+| Строка в коде | Отображение пользователю | Смысл                                        |
+| ------------- | ------------------------ | -------------------------------------------- |
+| `"Auto"`      | Авто                     | ТПА работает по программе (полезная работа)  |
+| `"Manual"`    | Наладка                  | ТПА в ручном режиме (наладка перед запуском) |
+| `"Idle"`      | Простой                  | ТПА включён, но не работает и не в аварии    |
+| `"Alarm"`     | Авария                   | Аварийное прерывание работы по программе     |
+| `"Offline"`   | Нет связи                | От ТПА не поступают MQTT-сообщения           |
+
+**Инфраструктура статусов:**
+- `ImmStatusHistory` — таблица в БД, хранит историю переходов статусов (открытая запись = текущий статус)
+- `IImmStatusCache` / `MemoryImmStatusCache` — in-memory singleton-кеш текущих статусов, заполняется при старте
+- `ImmStatusStartupService` — при старте приложения закрывает незавершённые записи истории и заполняет кеш из БД
+- `ImmOfflineWorker` — фоновый сервис, каждые 5 сек переводит ТПА в `Offline` если от него нет сообщений
+- `IImmStatusService.UpdateStatusAsync` — единственная точка записи нового статуса (обновляет и БД, и кеш)
+
+### Гнёздность (Cavities) и история версий пресс-формы
+
+`Mold.Cavities` — изменяемое поле (при ремонте гнёзда могут заглушаться). Нельзя использовать текущее значение для пересчёта исторических циклов.
+
+**MVP Мун:** `ImmCycle.Cavities` (int) — снапшот на момент записи цикла. Заполняется из `Mold.Cavities` при создании цикла. Fallback для старых записей (= 0) — брать из `Mold.Cavities`.
+
+**РОСОМС и далее:** заменить на `ImmCycle.MoldVersionId` → сущность `MoldVersion`, которая хранит полную конфигурацию ПФ (Cavities, веса, статус) с датой вступления в силу и причиной изменения. `MoldVersion` — фундамент журнала ремонтов и обслуживания.
+
 ## Coding Rules
 
 ### DateTime и PostgreSQL (Npgsql)

From 581f03cb9314a60bcb414f80b98ade8722a3cdda Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Thu, 28 May 2026 17:04:50 +0300
Subject: [PATCH 08/14] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5?=
 =?UTF-8?q?=D0=BD=20UI=20=D0=BE=D1=82=D1=87=D1=91=D1=82=D0=B0=20"=D0=9F?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=B4=D0=B8=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BE=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=80=D1=83=D0=B4=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/reports/EquipmentReportView.vue | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Wintime-Control-Frontend/src/views/reports/EquipmentReportView.vue b/Wintime-Control-Frontend/src/views/reports/EquipmentReportView.vue
index 2e9fd3d..5ff55ac 100644
--- a/Wintime-Control-Frontend/src/views/reports/EquipmentReportView.vue
+++ b/Wintime-Control-Frontend/src/views/reports/EquipmentReportView.vue
@@ -107,12 +107,22 @@
             {{ row.avgCycleSeconds.toFixed(1) }}
           </template>
         </el-table-column>
-        <el-table-column label="Эффективность" width="160">
+        <el-table-column label="Эффективность" width="180">
           <template #default="{ row }">
-            <el-progress
-              :percentage="Math.round(row.avgEfficiency)"
-              :status="row.avgEfficiency >= 85 ? 'success' : row.avgEfficiency >= 70 ? 'warning' : 'exception'"
-            />
+            <div class="flex items-center gap-2">
+              <el-progress
+                class="flex-1"
+                :percentage="Math.round(row.avgEfficiency)"
+                :color="[
+                  { color: '#f56c6c', percentage: 50 },
+                  { color: '#e6a23c', percentage: 70 },
+                  { color: '#409eff', percentage: 85 },
+                  { color: '#67c23a', percentage: 100 },
+                ]"
+                :show-text="false"
+              />
+              <span class="text-sm w-10 text-right">{{ Math.round(row.avgEfficiency) }}%</span>
+            </div>
           </template>
         </el-table-column>
       </el-table>

From 02ab94330c177eaa0710f4a6b1fde41ae0788728 Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Thu, 28 May 2026 19:54:45 +0300
Subject: [PATCH 09/14] =?UTF-8?q?=D0=AF=D1=87=D0=B5=D0=B9=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=AD=D1=84=D1=84=D0=B5=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=B2=20=D0=BE=D1=82=D1=87=D1=91=D1=82?=
 =?UTF-8?q?=D0=B5=20"=D0=9F=D1=80=D0=BE=D0=B8=D0=B7=D0=B2=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=BE=D1=80=D1=83=D0=B4=D0=BE=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F"=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Wintime-Control-Frontend/src/stores/tasks.js  | 11 ---
 .../src/views/tasks/TasksView.vue             | 90 ++++++++++++++++++-
 2 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/Wintime-Control-Frontend/src/stores/tasks.js b/Wintime-Control-Frontend/src/stores/tasks.js
index 8f3f5c5..8d46357 100644
--- a/Wintime-Control-Frontend/src/stores/tasks.js
+++ b/Wintime-Control-Frontend/src/stores/tasks.js
@@ -41,17 +41,6 @@ export const useTasksStore = defineStore('tasks', {
       })
     },
 
-    // Общая эффективность выполнения
-    overallProgress: (state) => {
-      const activeTasks = state.tasks.filter(t => 
-        t.status === 'InProgress' || t.status === 'Issued'
-      )
-      if (activeTasks.length === 0) return 0
-      
-      const totalProgress = activeTasks.reduce((sum, t) => sum + (t.progressPercent || 0), 0)
-      return Math.round(totalProgress / activeTasks.length)
-    },
-
     // Фильтрованный список
     filteredTasks: (state) => {
       let result = state.tasks
diff --git a/Wintime-Control-Frontend/src/views/tasks/TasksView.vue b/Wintime-Control-Frontend/src/views/tasks/TasksView.vue
index 11cb3e8..749f75a 100644
--- a/Wintime-Control-Frontend/src/views/tasks/TasksView.vue
+++ b/Wintime-Control-Frontend/src/views/tasks/TasksView.vue
@@ -68,8 +68,16 @@
             <el-icon class="text-green-600 text-xl"><TrendCharts /></el-icon>
           </div>
           <div>
-            <p class="text-sm text-gray-500">Эффективность</p>
-            <p class="text-2xl font-bold text-green-600">{{ tasksStore.overallProgress }}%</p>
+            <p class="text-sm text-gray-500">Выполнение</p>
+            <template v-if="shiftProgress.current !== null">
+              <p class="text-2xl font-bold text-green-600">{{ shiftProgress.current }}%</p>
+            </template>
+            <template v-else>
+              <p class="text-2xl font-bold text-gray-400">нет заданий</p>
+              <p v-if="shiftProgress.prev !== null" class="text-xs text-gray-400 mt-0.5">
+                Пред. смена: {{ shiftProgress.prev }}%
+              </p>
+            </template>
           </div>
         </div>
       </div>
@@ -224,6 +232,7 @@ import { ref, computed, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useTasksStore } from '@/stores/tasks'
 import { useAuthStore } from '@/stores/auth'
+import { useDashboardStore } from '@/stores/dashboard'
 import TaskFilters from '@/components/tasks/TaskFilters.vue'
 import TaskStatusBadge from '@/components/tasks/TaskStatusBadge.vue'
 import TaskProgress from '@/components/tasks/TaskProgress.vue'
@@ -233,6 +242,7 @@ import dayjs from 'dayjs'
 
 const tasksStore = useTasksStore()
 const authStore = useAuthStore()
+const dashboardStore = useDashboardStore()
 
 const formModalVisible = ref(false)
 const detailModalVisible = ref(false)
@@ -241,6 +251,81 @@ const selectedTask = ref(null)
 
 const canCreate = computed(() => authStore.isManager || authStore.isAdmin)
 
+// ── Выполнение по смене ────────────────────────────────────────────────────────
+
+const SHIFT_STATUSES = new Set(['Issued', 'InProgress', 'Completed', 'Closed'])
+
+function shiftBounds(shift, now) {
+  const midnight = new Date(now)
+  midnight.setHours(0, 0, 0, 0)
+  const minutesNow = now.getHours() * 60 + now.getMinutes()
+  const totalEnd = shift.startMinutes + shift.durationMinutes
+  if (totalEnd <= 1440) {
+    return {
+      from: new Date(midnight.getTime() + shift.startMinutes * 60000),
+      to:   new Date(midnight.getTime() + totalEnd * 60000)
+    }
+  }
+  // смена переходит через полночь
+  if (minutesNow >= shift.startMinutes) {
+    return {
+      from: new Date(midnight.getTime() + shift.startMinutes * 60000),
+      to:   new Date(midnight.getTime() + totalEnd * 60000)
+    }
+  }
+  const prevMidnight = new Date(midnight.getTime() - 86400000)
+  return {
+    from: new Date(prevMidnight.getTime() + shift.startMinutes * 60000),
+    to:   new Date(midnight.getTime() + (totalEnd % 1440) * 60000)
+  }
+}
+
+function prevShiftBounds(shift, now) {
+  const midnight = new Date(now)
+  midnight.setHours(0, 0, 0, 0)
+  const endMinutes = (shift.startMinutes + shift.durationMinutes) % 1440
+  const minutesNow = now.getHours() * 60 + now.getMinutes()
+  const endMs = endMinutes <= minutesNow
+    ? midnight.getTime() + endMinutes * 60000
+    : midnight.getTime() - 86400000 + endMinutes * 60000
+  return {
+    from: new Date(endMs - shift.durationMinutes * 60000),
+    to:   new Date(endMs)
+  }
+}
+
+function avgProgress(tasks) {
+  if (tasks.length === 0) return null
+  const total = tasks.reduce((sum, t) => sum + (t.progressPercent || 0), 0)
+  return Math.round(total / tasks.length)
+}
+
+function tasksInWindow(tasks, from, to) {
+  return tasks.filter(t => {
+    if (!SHIFT_STATUSES.has(t.status) || !t.issuedAt) return false
+    const ts = new Date(t.issuedAt).getTime()
+    return ts >= from.getTime() && ts < to.getTime()
+  })
+}
+
+const shiftProgress = computed(() => {
+  const now = new Date()
+  const curr = dashboardStore.currentShift
+  const prev = dashboardStore.lastCompletedShift
+
+  if (!curr && !prev) return { current: null, prev: null }
+
+  const currentPct = curr
+    ? avgProgress(tasksInWindow(tasksStore.tasks, ...Object.values(shiftBounds(curr, now))))
+    : null
+
+  const prevPct = prev
+    ? avgProgress(tasksInWindow(tasksStore.tasks, ...Object.values(prevShiftBounds(prev, now))))
+    : null
+
+  return { current: currentPct, prev: prevPct }
+})
+
 // ── Сортировка ────────────────────────────────────────────────────────────────
 
 const SORT_COOKIE = 'tasks_sort_v1'
@@ -303,6 +388,7 @@ onMounted(() => {
     try { sort.value = JSON.parse(saved) } catch {}
   }
   loadTasks()
+  if (dashboardStore.shifts.length === 0) dashboardStore.loadShifts()
 })
 
 const loadTasks = async () => {

From 6a546663edb7b75000839dac23cff232acf464bf Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Thu, 28 May 2026 20:49:48 +0300
Subject: [PATCH 10/14] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=BD=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=20=D0=B2=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D1=8C=20=D1=83?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=D0=BC=D0=B8.=20=D0=94?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BF=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=82=20=D0=BC=D0=B5=D0=BD=D1=8E=20"=D0=A1=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BE=D1=87=D0=BD=D0=B8=D0=BA=D0=B8=20->=20=D0=9F?=
 =?UTF-8?q?=D1=80=D0=B8=D1=87=D0=B8=D0=BD=D1=8B=20=D0=BF=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B5=D0=B2".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layouts/DefaultLayout.vue             |  4 ++-
 Wintime-Control-Frontend/src/router/index.js  |  6 ++++
 .../src/views/tasks/TaskFormModal.vue         |  2 +-
 .../src/views/tasks/TasksView.vue             | 31 +++++++++++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/Wintime-Control-Frontend/src/layouts/DefaultLayout.vue b/Wintime-Control-Frontend/src/layouts/DefaultLayout.vue
index f351d20..4829877 100644
--- a/Wintime-Control-Frontend/src/layouts/DefaultLayout.vue
+++ b/Wintime-Control-Frontend/src/layouts/DefaultLayout.vue
@@ -56,6 +56,7 @@
             <el-menu-item index="/dictionary/molds">Пресс-формы</el-menu-item>
             <el-menu-item index="/dictionary/personnel">Персонал</el-menu-item>
             <el-menu-item index="/dictionary/shifts">Смены</el-menu-item>
+            <el-menu-item index="/dictionary/downtime-reasons">Причины простоев</el-menu-item>
           </el-sub-menu>
           <!-- Смены отдельно для Observer (для Admin/Manager — внутри Справочников) -->
           <el-menu-item
@@ -172,7 +173,8 @@ const pageTitle = computed(() => {
     '/dictionary/imm': 'Справочник ТПА',
     '/dictionary/molds': 'Справочник пресс-форм',
     '/dictionary/personnel': 'Справочник персонала',
-    '/dictionary/shifts': 'Расписание смен'
+    '/dictionary/shifts': 'Расписание смен',
+    '/dictionary/downtime-reasons': 'Причины простоев'
   }
   return titles[route.path] || 'CONTROL'
 })
diff --git a/Wintime-Control-Frontend/src/router/index.js b/Wintime-Control-Frontend/src/router/index.js
index 96e9f0f..4fff8d7 100644
--- a/Wintime-Control-Frontend/src/router/index.js
+++ b/Wintime-Control-Frontend/src/router/index.js
@@ -82,6 +82,12 @@ const routes = [
             name: 'DictionaryShifts',
             component: () => import('@/views/dictionary/ShiftsDictionary.vue'),
             meta: { roles: ['Admin', 'Manager', 'Observer'] }
+          },
+          {
+            path: 'downtime-reasons',
+            name: 'DictionaryDowntimeReasons',
+            component: () => import('@/views/dictionary/DowntimeDictionary.vue'),
+            meta: { roles: ['Admin', 'Manager'] }
           }
         ]
       },
diff --git a/Wintime-Control-Frontend/src/views/tasks/TaskFormModal.vue b/Wintime-Control-Frontend/src/views/tasks/TaskFormModal.vue
index 6b2cb0c..dcfd452 100644
--- a/Wintime-Control-Frontend/src/views/tasks/TaskFormModal.vue
+++ b/Wintime-Control-Frontend/src/views/tasks/TaskFormModal.vue
@@ -128,7 +128,7 @@
     <template #footer>
       <el-button @click="visible = false">Отмена</el-button>
       <el-button type="primary" @click="handleSubmit" :loading="loading">
-        {{ editingTask ? 'Сохранить' : 'Выдать задание' }}
+        Сохранить
       </el-button>
     </template>
   </el-dialog>
diff --git a/Wintime-Control-Frontend/src/views/tasks/TasksView.vue b/Wintime-Control-Frontend/src/views/tasks/TasksView.vue
index 749f75a..6d3483e 100644
--- a/Wintime-Control-Frontend/src/views/tasks/TasksView.vue
+++ b/Wintime-Control-Frontend/src/views/tasks/TasksView.vue
@@ -233,6 +233,9 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { useTasksStore } from '@/stores/tasks'
 import { useAuthStore } from '@/stores/auth'
 import { useDashboardStore } from '@/stores/dashboard'
+import { immApi } from '@/api/imm'
+import { moldsApi } from '@/api/molds'
+import { personnelApi } from '@/api/personnel'
 import TaskFilters from '@/components/tasks/TaskFilters.vue'
 import TaskStatusBadge from '@/components/tasks/TaskStatusBadge.vue'
 import TaskProgress from '@/components/tasks/TaskProgress.vue'
@@ -455,6 +458,34 @@ const canIssueTask = (task) => {
 }
 
 const issueTask = async (task) => {
+  // Параллельно проверяем актуальность ТПА, пресс-формы и наладчика
+  const checks = [
+    immApi.getById(task.immId),
+    moldsApi.getById(task.moldId),
+    task.personnelId ? personnelApi.getById(task.personnelId) : Promise.resolve(null),
+  ]
+
+  let results
+  try {
+    results = await Promise.all(checks)
+  } catch {
+    ElMessage.error('Не удалось проверить актуальность данных задания')
+    return
+  }
+
+  const [immRes, moldRes, personnelRes] = results
+  const inactive = []
+  if (!immRes.data.isActive)        inactive.push(`ТПА «${task.immName}»`)
+  if (!moldRes.data.isActive)       inactive.push(`пресс-форма «${task.moldName}»`)
+  if (personnelRes && !personnelRes.data.isActive) inactive.push(`наладчик «${task.personnelName}»`)
+
+  if (inactive.length > 0) {
+    ElMessage.warning(`Переведено в архив: ${inactive.join(', ')}. Отредактируйте задание перед выдачей.`)
+    detailModalVisible.value = false
+    editTask(task)
+    return
+  }
+
   await tasksStore.issueTask(task.id)
   detailModalVisible.value = false
 }

From 10eec1f7a17642cfb061aff9fcfe91f503646aad Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Thu, 28 May 2026 21:08:40 +0300
Subject: [PATCH 11/14] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=BE=D0=BB=D0=BE=D0=BD=D0=BA=D0=B8?=
 =?UTF-8?q?=20=D0=B2=20=D1=82=D0=B0=D0=B1=D0=B8=D1=86=D0=B5=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D0=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/tasks/TaskDetailModal.vue       |  26 +-
 .../src/views/tasks/TasksView.vue             |  15 +-
 .../Controllers/TasksController.cs            |  12 +-
 Wintime.Control.Core/DTOs/Tasks/TaskDto.cs    |   2 +
 Wintime.Control.Core/Entities/ShiftTask.cs    |   2 +
 .../Data/ControlDbContext.cs                  |   4 +
 ...28100000_AddShiftTaskUpdatedAt.Designer.cs | 847 ++++++++++++++++++
 .../20260528100000_AddShiftTaskUpdatedAt.cs   |  29 +
 .../ControlDbContextModelSnapshot.cs          |   3 +
 9 files changed, 924 insertions(+), 16 deletions(-)
 create mode 100644 Wintime.Control.Infrastructure/Migrations/20260528100000_AddShiftTaskUpdatedAt.Designer.cs
 create mode 100644 Wintime.Control.Infrastructure/Migrations/20260528100000_AddShiftTaskUpdatedAt.cs

diff --git a/Wintime-Control-Frontend/src/views/tasks/TaskDetailModal.vue b/Wintime-Control-Frontend/src/views/tasks/TaskDetailModal.vue
index 8151dfe..af3e854 100644
--- a/Wintime-Control-Frontend/src/views/tasks/TaskDetailModal.vue
+++ b/Wintime-Control-Frontend/src/views/tasks/TaskDetailModal.vue
@@ -26,6 +26,19 @@
         <el-descriptions-item label="Начато">
           {{ formatDate(task?.startedAt) }}
         </el-descriptions-item>
+        <el-descriptions-item v-if="task?.completedAt" label="Завершено">
+          {{ formatDate(task?.completedAt) }}
+        </el-descriptions-item>
+        <el-descriptions-item v-if="task?.closedAt" label="Закрыто">
+          {{ formatDate(task?.closedAt) }}
+        </el-descriptions-item>
+        <el-descriptions-item
+          v-if="task?.closeReason"
+          :label="task?.status === 'Closed' ? 'Причина закрытия' : 'Причина недовыполнения'"
+          :span="2"
+        >
+          {{ task.closeReason }}
+        </el-descriptions-item>
       </el-descriptions>
 
       <!-- Прогресс -->
@@ -40,20 +53,11 @@
       </el-card>
 
       <!-- Примечания -->
-      <el-card v-if="task?.note || task?.closeReason">
+      <el-card v-if="task?.note">
         <template #header>
           <span class="font-semibold">Примечания</span>
         </template>
-        <div class="space-y-2">
-          <div v-if="task?.note">
-            <span class="text-gray-500">Примечание:</span>
-            <p class="text-gray-800">{{ task.note }}</p>
-          </div>
-          <div v-if="task?.closeReason">
-            <span class="text-gray-500">Причина закрытия:</span>
-            <p class="text-gray-800">{{ task.closeReason }}</p>
-          </div>
-        </div>
+        <p class="text-gray-800">{{ task.note }}</p>
       </el-card>
 
       <!-- Действия -->
diff --git a/Wintime-Control-Frontend/src/views/tasks/TasksView.vue b/Wintime-Control-Frontend/src/views/tasks/TasksView.vue
index 6d3483e..b66c891 100644
--- a/Wintime-Control-Frontend/src/views/tasks/TasksView.vue
+++ b/Wintime-Control-Frontend/src/views/tasks/TasksView.vue
@@ -158,6 +158,17 @@
           </template>
         </el-table-column>
 
+        <el-table-column width="160">
+          <template #header>
+            <span class="col-header" @click="handleSort('updatedAt')">
+              Создано/изменено <span class="sort-icon">{{ sortIcon('updatedAt') }}</span>
+            </span>
+          </template>
+          <template #default="{ row }">
+            {{ formatDate(row.updatedAt ?? row.createdAt) }}
+          </template>
+        </el-table-column>
+
         <el-table-column prop="issuedAt" width="160">
           <template #header>
             <span class="col-header" @click="handleSort('issuedAt')">
@@ -165,7 +176,7 @@
             </span>
           </template>
           <template #default="{ row }">
-            {{ formatDate(row.issuedAt) }}
+            {{ row.status === 'Draft' ? '—' : formatDate(row.issuedAt) }}
           </template>
         </el-table-column>
 
@@ -343,7 +354,7 @@ const writeCookie = (name, value) => {
   document.cookie = `${name}=${encodeURIComponent(value)};expires=${exp};path=/`
 }
 
-const sort = ref({ field: 'issuedAt', dir: 'desc' })
+const sort = ref({ field: 'updatedAt', dir: 'desc' })
 
 const handleSort = (field) => {
   if (sort.value.field !== field) {
diff --git a/Wintime.Control.API/Controllers/TasksController.cs b/Wintime.Control.API/Controllers/TasksController.cs
index 524b8ea..4b77105 100644
--- a/Wintime.Control.API/Controllers/TasksController.cs
+++ b/Wintime.Control.API/Controllers/TasksController.cs
@@ -77,7 +77,9 @@ public async Task<ActionResult<IEnumerable<TaskDto>>> GetTaskList(
             CompletedAt = t.CompletedAt,
             ClosedAt = t.ClosedAt,
             CloseReason = t.CloseReason,
-            Note = t.Note
+            Note = t.Note,
+            CreatedAt = t.CreatedAt,
+            UpdatedAt = t.UpdatedAt
         }).ToList();
 
         return Ok(dtos);
@@ -130,7 +132,9 @@ public async Task<ActionResult<IEnumerable<TaskDto>>> GetMyTasks(
             CompletedAt = t.CompletedAt,
             ClosedAt = t.ClosedAt,
             CloseReason = t.CloseReason,
-            Note = t.Note
+            Note = t.Note,
+            CreatedAt = t.CreatedAt,
+            UpdatedAt = t.UpdatedAt
         }).ToList();
 
         return Ok(dtos);
@@ -174,7 +178,9 @@ public async Task<ActionResult<TaskDto>> GetTaskById(Guid id)
             CompletedAt = task.CompletedAt,
             ClosedAt = task.ClosedAt,
             CloseReason = task.CloseReason,
-            Note = task.Note
+            Note = task.Note,
+            CreatedAt = task.CreatedAt,
+            UpdatedAt = task.UpdatedAt
         };
 
         return Ok(dto);
diff --git a/Wintime.Control.Core/DTOs/Tasks/TaskDto.cs b/Wintime.Control.Core/DTOs/Tasks/TaskDto.cs
index a4ff0ad..4e8c560 100644
--- a/Wintime.Control.Core/DTOs/Tasks/TaskDto.cs
+++ b/Wintime.Control.Core/DTOs/Tasks/TaskDto.cs
@@ -23,4 +23,6 @@ public class TaskDto
     public DateTime? ClosedAt { get; set; }
     public string? CloseReason { get; set; }
     public string? Note { get; set; }
+    public DateTime CreatedAt { get; set; }
+    public DateTime? UpdatedAt { get; set; }
 }
\ No newline at end of file
diff --git a/Wintime.Control.Core/Entities/ShiftTask.cs b/Wintime.Control.Core/Entities/ShiftTask.cs
index 2d0a313..b5707ce 100644
--- a/Wintime.Control.Core/Entities/ShiftTask.cs
+++ b/Wintime.Control.Core/Entities/ShiftTask.cs
@@ -14,6 +14,8 @@ public class ShiftTask : BaseEntity
     public string? Note { get; set; }
     public string? CloseReason { get; set; }
 
+    public DateTime? UpdatedAt { get; set; }
+
     public DateTime? PlannedDate { get; set; }
     public DateTime? IssuedAt { get; set; }
     public DateTime? SetupStartedAt { get; set; }
diff --git a/Wintime.Control.Infrastructure/Data/ControlDbContext.cs b/Wintime.Control.Infrastructure/Data/ControlDbContext.cs
index 84b4875..6fa8b10 100644
--- a/Wintime.Control.Infrastructure/Data/ControlDbContext.cs
+++ b/Wintime.Control.Infrastructure/Data/ControlDbContext.cs
@@ -30,6 +30,10 @@ public override async Task<int> SaveChangesAsync(CancellationToken cancellationT
             .Where(e => e.State == EntityState.Modified))
             entry.Entity.UpdatedAt = DateTime.UtcNow;
 
+        foreach (var entry in ChangeTracker.Entries<ShiftTask>()
+            .Where(e => e.State is EntityState.Added or EntityState.Modified))
+            entry.Entity.UpdatedAt = DateTime.UtcNow;
+
         return await base.SaveChangesAsync(cancellationToken);
     }
 
diff --git a/Wintime.Control.Infrastructure/Migrations/20260528100000_AddShiftTaskUpdatedAt.Designer.cs b/Wintime.Control.Infrastructure/Migrations/20260528100000_AddShiftTaskUpdatedAt.Designer.cs
new file mode 100644
index 0000000..a810c36
--- /dev/null
+++ b/Wintime.Control.Infrastructure/Migrations/20260528100000_AddShiftTaskUpdatedAt.Designer.cs
@@ -0,0 +1,847 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using Wintime.Control.Infrastructure.Data;
+
+#nullable disable
+
+namespace Wintime.Control.Infrastructure.Migrations
+{
+    [DbContext(typeof(ControlDbContext))]
+    [Migration("20260528100000_AddShiftTaskUpdatedAt")]
+    partial class AddShiftTaskUpdatedAt
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "9.0.15")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("integer");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("text");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("text");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("text");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.AppHeartbeat", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("LastHeartbeatAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AppHeartbeat", (string)null);
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.DowntimeReason", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DowntimeReasons");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.Event", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("EndTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("ErrorCode")
+                        .HasColumnType("text");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasColumnType("text");
+
+                    b.Property<int>("EventType")
+                        .HasColumnType("integer");
+
+                    b.Property<Guid>("ImmId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("PersonnelId")
+                        .HasColumnType("text");
+
+                    b.Property<Guid?>("ReasonId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ReasonName")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("StartTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImmId");
+
+                    b.HasIndex("PersonnelId");
+
+                    b.HasIndex("ReasonId");
+
+                    b.ToTable("Events");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.Imm", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("InventoryNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<Guid>("TemplateId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InventoryNumber")
+                        .IsUnique();
+
+                    b.HasIndex("TemplateId");
+
+                    b.ToTable("Imms", (string)null);
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.ImmCycle", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("DurationSeconds")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("EndTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("ImmId")
+                        .HasColumnType("uuid");
+
+                    b.Property<bool>("IsSuccessful")
+                        .HasColumnType("boolean");
+
+                    b.Property<Guid?>("MoldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime>("StartTime")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid?>("TaskId")
+                        .HasColumnType("uuid");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MoldId");
+
+                    b.HasIndex("TaskId");
+
+                    b.HasIndex("ImmId", "StartTime");
+
+                    b.ToTable("ImmCycles", (string)null);
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.ImmStatusHistory", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<DateTime>("ChangedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("EndedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("ImmId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImmId", "ChangedAt");
+
+                    b.ToTable("ImmStatusHistory", (string)null);
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.Mold", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("Cavities")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("DrawingPath")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FormId")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<int>("MaxResourceCycles")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("PartWeightGrams")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("PhotoPath")
+                        .HasColumnType("text");
+
+                    b.Property<decimal>("RunnerWeightGrams")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("StorageLocationIndex")
+                        .HasColumnType("text");
+
+                    b.Property<int?>("To1Cycles")
+                        .HasColumnType("integer");
+
+                    b.Property<int?>("To2Cycles")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FormId")
+                        .IsUnique();
+
+                    b.ToTable("Molds", (string)null);
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.Shift", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<int>("BreakDurationMinutes")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("BreakStartMinutes")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("DurationMinutes")
+                        .HasColumnType("integer");
+
+                    b.Property<int>("StartMinutes")
+                        .HasColumnType("integer");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Shifts");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.ShiftTask", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<decimal>("ActualMaterialWeightGrams")
+                        .HasColumnType("numeric");
+
+                    b.Property<int>("ActualQuantity")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("CloseReason")
+                        .HasColumnType("text");
+
+                    b.Property<DateTime?>("ClosedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("CompletedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("ImmId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("IssuedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<Guid>("MoldId")
+                        .HasColumnType("uuid");
+
+                    b.Property<DateTime?>("MoldVerifiedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Note")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PersonnelId")
+                        .HasColumnType("text");
+
+                    b.Property<int>("PlanQuantity")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("PlannedDate")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("SetupStartedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<DateTime?>("StartedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImmId");
+
+                    b.HasIndex("MoldId");
+
+                    b.HasIndex("PersonnelId");
+
+                    b.ToTable("Tasks", (string)null);
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.Telemetry", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<long>("Id"));
+
+                    b.Property<Guid>("ImmId")
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("ParameterName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("Timestamp")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<decimal?>("ValueNumeric")
+                        .HasColumnType("numeric");
+
+                    b.Property<string>("ValueText")
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParameterName");
+
+                    b.HasIndex("ImmId", "Timestamp");
+
+                    b.ToTable("Telemetry");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.Template", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Author")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("JsonConfig")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Manufacturer")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Model")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Templates");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.User", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("text");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("text");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("EmployeeId")
+                        .HasColumnType("text");
+
+                    b.Property<string>("FullName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("boolean");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("timestamp with time zone");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("text");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Qualification")
+                        .HasColumnType("text");
+
+                    b.Property<int>("Role")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("text");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("character varying(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("Users", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Wintime.Control.Core.Entities.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Wintime.Control.Core.Entities.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Wintime.Control.Core.Entities.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Wintime.Control.Core.Entities.User", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.Event", b =>
+                {
+                    b.HasOne("Wintime.Control.Core.Entities.Imm", "Imm")
+                        .WithMany("Events")
+                        .HasForeignKey("ImmId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Wintime.Control.Core.Entities.User", "Personnel")
+                        .WithMany("Events")
+                        .HasForeignKey("PersonnelId");
+
+                    b.HasOne("Wintime.Control.Core.Entities.DowntimeReason", "Reason")
+                        .WithMany("Events")
+                        .HasForeignKey("ReasonId");
+
+                    b.Navigation("Imm");
+
+                    b.Navigation("Personnel");
+
+                    b.Navigation("Reason");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.Imm", b =>
+                {
+                    b.HasOne("Wintime.Control.Core.Entities.Template", "Template")
+                        .WithMany("Imms")
+                        .HasForeignKey("TemplateId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Template");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.ImmCycle", b =>
+                {
+                    b.HasOne("Wintime.Control.Core.Entities.Imm", "Imm")
+                        .WithMany()
+                        .HasForeignKey("ImmId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Wintime.Control.Core.Entities.Mold", "Mold")
+                        .WithMany()
+                        .HasForeignKey("MoldId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.HasOne("Wintime.Control.Core.Entities.ShiftTask", "Task")
+                        .WithMany()
+                        .HasForeignKey("TaskId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Imm");
+
+                    b.Navigation("Mold");
+
+                    b.Navigation("Task");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.ImmStatusHistory", b =>
+                {
+                    b.HasOne("Wintime.Control.Core.Entities.Imm", "Imm")
+                        .WithMany()
+                        .HasForeignKey("ImmId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Imm");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.ShiftTask", b =>
+                {
+                    b.HasOne("Wintime.Control.Core.Entities.Imm", "Imm")
+                        .WithMany("Tasks")
+                        .HasForeignKey("ImmId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Wintime.Control.Core.Entities.Mold", "Mold")
+                        .WithMany("Tasks")
+                        .HasForeignKey("MoldId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Wintime.Control.Core.Entities.User", "Personnel")
+                        .WithMany("AssignedTasks")
+                        .HasForeignKey("PersonnelId")
+                        .OnDelete(DeleteBehavior.SetNull);
+
+                    b.Navigation("Imm");
+
+                    b.Navigation("Mold");
+
+                    b.Navigation("Personnel");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.Telemetry", b =>
+                {
+                    b.HasOne("Wintime.Control.Core.Entities.Imm", "Imm")
+                        .WithMany("Telemetry")
+                        .HasForeignKey("ImmId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Imm");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.DowntimeReason", b =>
+                {
+                    b.Navigation("Events");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.Imm", b =>
+                {
+                    b.Navigation("Events");
+
+                    b.Navigation("Tasks");
+
+                    b.Navigation("Telemetry");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.Mold", b =>
+                {
+                    b.Navigation("Tasks");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.Template", b =>
+                {
+                    b.Navigation("Imms");
+                });
+
+            modelBuilder.Entity("Wintime.Control.Core.Entities.User", b =>
+                {
+                    b.Navigation("AssignedTasks");
+
+                    b.Navigation("Events");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Wintime.Control.Infrastructure/Migrations/20260528100000_AddShiftTaskUpdatedAt.cs b/Wintime.Control.Infrastructure/Migrations/20260528100000_AddShiftTaskUpdatedAt.cs
new file mode 100644
index 0000000..b0aad20
--- /dev/null
+++ b/Wintime.Control.Infrastructure/Migrations/20260528100000_AddShiftTaskUpdatedAt.cs
@@ -0,0 +1,29 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Wintime.Control.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddShiftTaskUpdatedAt : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "UpdatedAt",
+                table: "Tasks",
+                type: "timestamp with time zone",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                table: "Tasks");
+        }
+    }
+}
diff --git a/Wintime.Control.Infrastructure/Migrations/ControlDbContextModelSnapshot.cs b/Wintime.Control.Infrastructure/Migrations/ControlDbContextModelSnapshot.cs
index 23b40ee..56998b0 100644
--- a/Wintime.Control.Infrastructure/Migrations/ControlDbContextModelSnapshot.cs
+++ b/Wintime.Control.Infrastructure/Migrations/ControlDbContextModelSnapshot.cs
@@ -479,6 +479,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<int>("Status")
                         .HasColumnType("integer");
 
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("timestamp with time zone");
+
                     b.HasKey("Id");
 
                     b.HasIndex("ImmId");

From ed362f31e7f8f4ece1c942c22c101608a0bb59e9 Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Thu, 28 May 2026 21:35:37 +0300
Subject: [PATCH 12/14] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D1=91?=
 =?UTF-8?q?=D0=BD=20=D0=BF=D0=BE=D0=B4=D1=81=D1=87=D1=91=D1=82=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D1=81=D1=80=D0=BE=D1=87=D0=B5=D0=BD=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D0=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Wintime-Control-Frontend/src/stores/tasks.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Wintime-Control-Frontend/src/stores/tasks.js b/Wintime-Control-Frontend/src/stores/tasks.js
index 8d46357..392c131 100644
--- a/Wintime-Control-Frontend/src/stores/tasks.js
+++ b/Wintime-Control-Frontend/src/stores/tasks.js
@@ -34,10 +34,13 @@ export const useTasksStore = defineStore('tasks', {
       const now = new Date()
       return state.tasks.filter(t => {
         if (t.status === 'Completed' || t.status === 'Closed') return false
+        if (t.plannedDate) {
+          const endOfDay = new Date(t.plannedDate)
+          endOfDay.setHours(23, 59, 59, 999)
+          return now > endOfDay
+        }
         if (!t.issuedAt) return false
-        const issuedDate = new Date(t.issuedAt)
-        const hoursDiff = (now - issuedDate) / (1000 * 60 * 60)
-        return hoursDiff > 12 // Более 12 часов в работе
+        return (now - new Date(t.issuedAt)) / (1000 * 60 * 60) > 12
       })
     },
 

From ea0e6d6864647817376c1bb25ef22cbaa62ca75f Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Thu, 28 May 2026 21:37:48 +0300
Subject: [PATCH 13/14] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D1=8C=20"=D0=9E=D0=B1?=
 =?UTF-8?q?=D1=89=D0=B8=D0=B5=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?=
 =?UTF-8?q?=D0=BA=D0=B8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/admin/SettingsView.vue          | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/Wintime-Control-Frontend/src/views/admin/SettingsView.vue b/Wintime-Control-Frontend/src/views/admin/SettingsView.vue
index 3cccac6..43ea7e2 100644
--- a/Wintime-Control-Frontend/src/views/admin/SettingsView.vue
+++ b/Wintime-Control-Frontend/src/views/admin/SettingsView.vue
@@ -44,25 +44,6 @@
       </el-form>
     </el-card>
 
-<el-card class="mb-6" visible="false">
-      <template #header>
-        <span class="font-semibold">Общие настройки</span>
-      </template>
-
-      <el-row :gutter="20">
-        <el-col :span="12">
-          <el-form-item label="Таймаут сессии (мин)">
-            <el-input-number v-model="settings.sessionTimeoutMinutes" :min="5" :max="1440" class="w-full" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="Интервал телеметрии (сек)">
-            <el-input-number v-model="settings.telemetryIntervalSeconds" :min="1" :max="60" class="w-full" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-card>
-
     <div class="flex justify-end gap-4">
       <el-button @click="loadSettings">Отмена</el-button>
       <el-button type="primary" @click="saveSettings" :loading="saving">Сохранить</el-button>

From 2ccd7c006eacc4e2d7df65720c5b9310148f4ac4 Mon Sep 17 00:00:00 2001
From: Alex Kalabukhov <a.v.kalabuhov@gmail.com>
Date: Thu, 28 May 2026 21:48:05 +0300
Subject: [PATCH 14/14] =?UTF-8?q?=D0=9A=D1=80=D0=B0=D1=81=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=20=D0=B2=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=85.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/admin/TemplatesView.vue                    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Wintime-Control-Frontend/src/views/admin/TemplatesView.vue b/Wintime-Control-Frontend/src/views/admin/TemplatesView.vue
index 5c8c849..a940928 100644
--- a/Wintime-Control-Frontend/src/views/admin/TemplatesView.vue
+++ b/Wintime-Control-Frontend/src/views/admin/TemplatesView.vue
@@ -18,16 +18,17 @@
       <el-table-column prop="model" label="Модель" width="150" />
       <el-table-column prop="version" label="Версия" width="100" />
       <el-table-column prop="author" label="Автор" width="150" />
-      <el-table-column prop="sensorCount" label="Датчиков" width="100" align="center" />
       <el-table-column prop="createdAt" label="Создан" width="180">
         <template #default="{ row }">
           {{ formatDate(row.createdAt) }}
         </template>
       </el-table-column>
-      <el-table-column label="Действия" width="200" fixed="right">
+      <el-table-column label="Действия" width="160" fixed="right">
         <template #default="{ row }">
-          <el-button size="small" @click="editTemplate(row)">Редактировать</el-button>
-          <el-button size="small" type="danger" @click="deleteTemplate(row)">Удалить</el-button>
+          <div class="flex flex-col gap-1">
+            <el-button size="small" style="width: 130px; margin: 0" @click="editTemplate(row)">Редактировать</el-button>
+            <el-button size="small" type="danger" style="width: 130px; margin: 0" @click="deleteTemplate(row)">Удалить</el-button>
+          </div>
         </template>
       </el-table-column>
     </el-table>