@@ -910,35 +949,47 @@ export default function TrainingFrameworkProgramEditPage() {
/>
Sichtbarkeit
diff --git a/frontend/src/pages/TrainingFrameworkProgramsListPage.jsx b/frontend/src/pages/TrainingFrameworkProgramsListPage.jsx
index a1f86c9..9374e96 100644
--- a/frontend/src/pages/TrainingFrameworkProgramsListPage.jsx
+++ b/frontend/src/pages/TrainingFrameworkProgramsListPage.jsx
@@ -15,8 +15,18 @@ function FrameworkSummaryMeta({ r }) {
typeof r.training_type_names_agg === 'string' ? r.training_type_names_agg.trim() : ''
const targetGroups =
typeof r.target_group_names_agg === 'string' ? r.target_group_names_agg.trim() : ''
- const styleDir = typeof r.style_direction_name === 'string' ? r.style_direction_name.trim() : ''
- const focus = typeof r.focus_area_name === 'string' ? r.focus_area_name.trim() : ''
+ const styleDir =
+ typeof r.style_direction_names_agg === 'string'
+ ? r.style_direction_names_agg.trim()
+ : typeof r.style_direction_name === 'string'
+ ? r.style_direction_name.trim()
+ : ''
+ const focus =
+ typeof r.focus_area_names_agg === 'string'
+ ? r.focus_area_names_agg.trim()
+ : typeof r.focus_area_name === 'string'
+ ? r.focus_area_name.trim()
+ : ''
const rowStyle = {
display: 'grid',
@@ -33,12 +43,10 @@ function FrameworkSummaryMeta({ r }) {
Fokusbereich
{dashIfEmpty(focus)}
- {styleDir ? (
-
-
Stilrichtung
- {styleDir}
-
- ) : null}
+
+
Stilrichtungen
+ {dashIfEmpty(styleDir)}
+
Trainingsarten
{trainingTypes.length ? trainingTypes : '—'}
diff --git a/frontend/src/utils/trainingDurationUtils.js b/frontend/src/utils/trainingDurationUtils.js
new file mode 100644
index 0000000..9b84f8e
--- /dev/null
+++ b/frontend/src/utils/trainingDurationUtils.js
@@ -0,0 +1,82 @@
+/**
+ * Eingabe/Ausgabe geplanter Trainingsdauer (Minuten intern, Anzeige z. B. 1,5 h).
+ */
+
+export function parseDurationInput(raw) {
+ if (raw === '' || raw == null) return null
+ const s = String(raw).trim().toLowerCase().replace(/\s+/g, '')
+ if (!s) return null
+
+ const hMatch = s.match(/^(\d+(?:[.,]\d+)?)\s*h(?:\s*(\d{1,2}))?$/)
+ if (hMatch) {
+ const h = parseFloat(hMatch[1].replace(',', '.'))
+ const extraMin = hMatch[2] ? parseInt(hMatch[2], 10) : 0
+ if (!Number.isFinite(h) || h < 0) return null
+ const total = Math.round(h * 60) + (Number.isFinite(extraMin) ? extraMin : 0)
+ return total > 0 ? total : null
+ }
+
+ if (/^\d+(?:[.,]\d+)?$/.test(s)) {
+ const n = parseFloat(s.replace(',', '.'))
+ if (!Number.isFinite(n) || n <= 0) return null
+ if (s.includes(',') || s.includes('.') || n < 8) {
+ return Math.round(n * 60)
+ }
+ return Math.round(n)
+ }
+
+ const minMatch = s.match(/^(\d+)\s*min?$/)
+ if (minMatch) {
+ const m = parseInt(minMatch[1], 10)
+ return Number.isFinite(m) && m > 0 ? m : null
+ }
+
+ return null
+}
+
+export function formatDurationDisplay(minutes, { empty = '—' } = {}) {
+ if (minutes == null || minutes === '') return empty
+ const m = Number(minutes)
+ if (!Number.isFinite(m) || m <= 0) return empty
+ if (m % 60 === 0) return `${m / 60} h`
+ if (m >= 60) {
+ const h = Math.floor(m / 60)
+ const rest = m % 60
+ return `${h} h ${rest} Min`
+ }
+ return `${m} Min`
+}
+
+/** Formularfeld: Minuten → Anzeige-String (z. B. 90 → "1,5") */
+export function minutesToDurationFieldValue(minutes) {
+ if (minutes == null || minutes === '') return ''
+ const m = Number(minutes)
+ if (!Number.isFinite(m) || m <= 0) return ''
+ if (m % 60 === 0) return String(m / 60)
+ if (m >= 60) {
+ const h = m / 60
+ return Number.isInteger(h) ? String(h) : String(Math.round(h * 10) / 10).replace('.', ',')
+ }
+ return String(m)
+}
+
+export function sumExercisePlannedMinutes(sections) {
+ let sum = 0
+ for (const sec of sections || []) {
+ for (const it of sec.items || []) {
+ if (it.item_type !== 'exercise') continue
+ const n = parseDurationInput(it.planned_duration_min)
+ if (n != null) sum += n
+ }
+ }
+ return sum
+}
+
+export function sumSectionPlannedMinutes(sections) {
+ let sum = 0
+ for (const sec of sections || []) {
+ const n = parseDurationInput(sec.planned_duration_min)
+ if (n != null) sum += n
+ }
+ return sum
+}
diff --git a/frontend/src/utils/trainingUnitEditorCore.js b/frontend/src/utils/trainingUnitEditorCore.js
index a03a905..91150e0 100644
--- a/frontend/src/utils/trainingUnitEditorCore.js
+++ b/frontend/src/utils/trainingUnitEditorCore.js
@@ -1,5 +1,6 @@
import { buildPlanPayloadForSave, defaultSection } from './trainingUnitSectionsForm'
import { sessionAssignDefaults } from './trainingPlanningPageHelpers'
+import { minutesToDurationFieldValue, parseDurationInput } from './trainingDurationUtils'
/** Leeres Formular für neue Einheit (ohne async Varianten-Anreicherung). */
export function createEmptyTrainingUnitFormData({
@@ -13,6 +14,7 @@ export function createEmptyTrainingUnitFormData({
planned_date: plannedDate || '',
planned_time_start: timeStart || '',
planned_time_end: timeEnd || '',
+ planned_duration_min: '',
planned_focus: '',
actual_date: '',
actual_time_start: '',
@@ -52,6 +54,7 @@ export function trainingUnitToFormFields(fullUnit, sections) {
planned_date: fullUnit.planned_date || '',
planned_time_start: fullUnit.planned_time_start?.slice?.(0, 5) || fullUnit.planned_time_start || '',
planned_time_end: fullUnit.planned_time_end?.slice?.(0, 5) || fullUnit.planned_time_end || '',
+ planned_duration_min: minutesToDurationFieldValue(fullUnit.planned_duration_min),
planned_focus: fullUnit.planned_focus || '',
actual_date: fullUnit.actual_date || '',
actual_time_start: fullUnit.actual_time_start?.slice?.(0, 5) || fullUnit.actual_time_start || '',
@@ -84,6 +87,7 @@ export function buildTrainingUnitSavePayload(formData, { editingUnit = null, dra
planned_date: formData.planned_date,
planned_time_start: formData.planned_time_start || null,
planned_time_end: formData.planned_time_end || null,
+ planned_duration_min: parseDurationInput(formData.planned_duration_min),
planned_focus: formData.planned_focus || null,
actual_date: formData.actual_date || null,
actual_time_start: formData.actual_time_start || null,
diff --git a/frontend/src/utils/trainingUnitSectionsForm.js b/frontend/src/utils/trainingUnitSectionsForm.js
index 54423cd..56b4827 100644
--- a/frontend/src/utils/trainingUnitSectionsForm.js
+++ b/frontend/src/utils/trainingUnitSectionsForm.js
@@ -2,7 +2,7 @@ import api from './api'
import { sortCombinationSlotsForDisplay } from '../constants/combinationArchetypes'
export function defaultSection(title = 'Hauptteil') {
- return { title, guidance_notes: '', items: [] }
+ return { title, guidance_notes: '', planned_duration_min: '', items: [] }
}
/** Standard-`planLoc` für eine Ganzgruppen-Phase (Editor-Breakout-UI). */
@@ -440,6 +440,10 @@ function normalizePhasesToFormSections(fullUnit) {
out.push({
title: sec.title,
guidance_notes: sec.guidance_notes || '',
+ planned_duration_min:
+ sec.planned_duration_min != null && sec.planned_duration_min !== undefined
+ ? String(sec.planned_duration_min)
+ : '',
items: formItemsFromApiItems(sec.items),
planLoc: { ...streamLoc },
})
@@ -459,6 +463,10 @@ function normalizePhasesToFormSections(fullUnit) {
out.push({
title: sec.title,
guidance_notes: sec.guidance_notes || '',
+ planned_duration_min:
+ sec.planned_duration_min != null && sec.planned_duration_min !== undefined
+ ? String(sec.planned_duration_min)
+ : '',
items: formItemsFromApiItems(sec.items),
planLoc: { ...loc },
})
@@ -476,6 +484,10 @@ export function normalizeUnitToForm(fullUnit) {
return fullUnit.sections.map((sec) => ({
title: sec.title,
guidance_notes: sec.guidance_notes || '',
+ planned_duration_min:
+ sec.planned_duration_min != null && sec.planned_duration_min !== undefined
+ ? String(sec.planned_duration_min)
+ : '',
items: formItemsFromApiItems(sec.items),
}))
}
@@ -665,6 +677,7 @@ export function buildOneSectionPayload(sec, orderIndex) {
order_index: orderIndex,
title: (sec.title || '').trim() || 'Abschnitt',
guidance_notes: sec.guidance_notes?.trim() ? sec.guidance_notes.trim() : null,
+ planned_duration_min: parseMin(sec.planned_duration_min),
items: (sec.items || [])
.map((it, ii) => {
if (it.item_type === 'note') {
@@ -1173,6 +1186,7 @@ export function templateSectionsPayloadFromFormSections(sections) {
order_index: si,
title: (s.title || '').trim() || `Abschnitt ${si + 1}`,
guidance_text: s.guidance_notes?.trim() ? s.guidance_notes.trim() : null,
+ planned_duration_min: parseMin(s.planned_duration_min),
phase_kind: pk,
phase_order_index: poi,
parallel_stream_order_index: pso,
@@ -1263,6 +1277,10 @@ export function formSectionsFromPlanTemplateRows(templateSections) {
return {
title: s.title || 'Abschnitt',
guidance_notes: s.guidance_text || '',
+ planned_duration_min:
+ s.planned_duration_min != null && s.planned_duration_min !== undefined
+ ? String(s.planned_duration_min)
+ : '',
items: [],
planLoc,
}
@@ -1342,9 +1360,34 @@ export async function insertTrainingModuleIntoPlanningSections({
}
export function sectionPlannedMinutes(sec) {
+ const sectionMin = parseMin(sec?.planned_duration_min)
+ if (sectionMin != null && sectionMin > 0) return sectionMin
return (sec.items || []).reduce((sum, it) => {
if (it.item_type !== 'exercise') return sum
const m = parseMin(it.planned_duration_min)
return sum + (m || 0)
}, 0)
}
+
+/** Abschnitt unterhalb einer Parallel-Phase in die Ganzgruppe darunter verschieben. */
+export function reorderSectionAfterParallelRunAsWholeGroup(prev, fromI, phaseOrderIndex) {
+ const po = Number(phaseOrderIndex) || 0
+ const idxs = indicesOfParallelPhase(prev, po)
+ if (!idxs.length || fromI < 0 || fromI >= (prev?.length ?? 0)) return prev
+ const lg = idxs[idxs.length - 1]
+ const arr = [...prev]
+ const [moved] = arr.splice(fromI, 1)
+ let insertAt = lg + 1
+ if (fromI < insertAt) insertAt -= 1
+ insertAt = Math.max(0, Math.min(insertAt, arr.length))
+ const below = insertAt < arr.length ? arr[insertAt] : undefined
+ let planLocNext
+ if (below?.planLoc?.phaseKind === 'whole_group') {
+ planLocNext = { ...below.planLoc }
+ } else {
+ const mx = maxPhaseOrderIndexFromSections(arr)
+ planLocNext = defaultPlanLocWholeGroup(mx + 1)
+ }
+ arr.splice(insertAt, 0, { ...moved, planLoc: planLocNext })
+ return arr
+}