Implement visual enhancements and logic for section drop bands in TrainingUnitSectionsEditor
Deploy Development / deploy (push) Successful in 43s
Test Suite / pytest-backend (push) Successful in 36s
Test Suite / lint-backend (push) Successful in 0s
Test Suite / build-frontend (push) Successful in 11s
Test Suite / k6 /health Baseline (push) Successful in 33s
Test Suite / playwright-tests (push) Successful in 1m20s
Deploy Development / deploy (push) Successful in 43s
Test Suite / pytest-backend (push) Successful in 36s
Test Suite / lint-backend (push) Successful in 0s
Test Suite / build-frontend (push) Successful in 11s
Test Suite / k6 /health Baseline (push) Successful in 33s
Test Suite / playwright-tests (push) Successful in 1m20s
- Added CSS styles for visual representation of section drop bands, differentiating between split and whole group regions. - Introduced a new function to determine the appropriate drop band class based on section types, improving user experience during section reordering. - Enhanced drag-and-drop functionality to support parallel phase management, allowing for more intuitive section placement within the editor. - Updated utility functions to handle the movement of parallel phase runs, ensuring proper plan location adjustments during reordering.
This commit is contained in:
1 parent
a0a0be8bef
commit
514b64682c
3 files changed
+211
-13
No files matched your search
@@ -799,8 +799,8 @@ export function movePhaseRunDownByPhaseOrder(prev, phaseOrderIndex) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Abschnitt verschieben und planLoc an der Einfügestelle an Nachbarn anpassen
|
||||
* (z. B. Ganzgruppe in parallelen Stream).
|
||||
* Abschnitt verschieben und planLoc an der Einfügestelle an Nachbarn anpassen.
|
||||
* Regel: Einfügen vor Abschnitt X übernimmt X.planLoc; am Listenende nach Parallel → neue Ganzgruppen-Phase.
|
||||
*/
|
||||
export function reorderBlocksImmutableWithPlanLoc(prev, fromI, toBeforeIdx) {
|
||||
const arr = [...prev]
|
||||
@@ -809,12 +809,32 @@ export function reorderBlocksImmutableWithPlanLoc(prev, fromI, toBeforeIdx) {
|
||||
let insertAt = toBeforeIdx
|
||||
if (fromI < toBeforeIdx) insertAt = toBeforeIdx - 1
|
||||
insertAt = Math.max(0, Math.min(insertAt, arr.length))
|
||||
const below = arr[insertAt]
|
||||
const above = arr[insertAt - 1]
|
||||
const ref = below ?? above
|
||||
|
||||
const below = insertAt < arr.length ? arr[insertAt] : undefined
|
||||
const above = insertAt > 0 ? arr[insertAt - 1] : undefined
|
||||
|
||||
let planLocNext = null
|
||||
if (below?.planLoc?.phaseKind) {
|
||||
planLocNext = { ...below.planLoc }
|
||||
} else if (insertAt === arr.length) {
|
||||
if (!above) {
|
||||
planLocNext = defaultPlanLocWholeGroup(0)
|
||||
} else if (above.planLoc?.phaseKind === 'parallel') {
|
||||
const mx = maxPhaseOrderIndexFromSections(arr)
|
||||
planLocNext = defaultPlanLocWholeGroup(mx + 1)
|
||||
} else if (above.planLoc?.phaseKind === 'whole_group') {
|
||||
planLocNext = { ...above.planLoc }
|
||||
}
|
||||
} else if (above?.planLoc?.phaseKind === 'whole_group') {
|
||||
planLocNext = { ...above.planLoc }
|
||||
} else if (above?.planLoc?.phaseKind === 'parallel') {
|
||||
const mx = maxPhaseOrderIndexFromSections(arr)
|
||||
planLocNext = defaultPlanLocWholeGroup(mx + 1)
|
||||
}
|
||||
|
||||
let nextMoved = { ...moved }
|
||||
if (ref?.planLoc?.phaseKind) {
|
||||
nextMoved = { ...moved, planLoc: { ...ref.planLoc } }
|
||||
if (planLocNext) {
|
||||
nextMoved = { ...moved, planLoc: planLocNext }
|
||||
} else {
|
||||
nextMoved = stripPlanLoc(moved)
|
||||
}
|
||||
@@ -822,6 +842,61 @@ export function reorderBlocksImmutableWithPlanLoc(prev, fromI, toBeforeIdx) {
|
||||
return arr
|
||||
}
|
||||
|
||||
/** Alle globalen Indizes einer parallelen Phase (alle Streams), sortiert. */
|
||||
export function indicesOfParallelPhase(sections, phaseOrderIndex) {
|
||||
const po = Number(phaseOrderIndex) || 0
|
||||
const out = []
|
||||
;(sections || []).forEach((s, i) => {
|
||||
const L = s?.planLoc
|
||||
if (L?.phaseKind === 'parallel' && (L.phaseOrderIndex ?? 0) === po) out.push(i)
|
||||
})
|
||||
return out.sort((a, b) => a - b)
|
||||
}
|
||||
|
||||
/** Gesamten Parallel-Block an neue Position (insertBefore globale Liste) schieben. */
|
||||
export function moveParallelPhaseRunToInsertBefore(prev, phaseOrderIndex, toBeforeIdx) {
|
||||
const po = Number(phaseOrderIndex) || 0
|
||||
const indices = indicesOfParallelPhase(prev, po)
|
||||
if (!indices.length) return prev
|
||||
const indexSet = new Set(indices)
|
||||
const blocks = indices.map((i) => prev[i])
|
||||
const without = prev.filter((_, i) => !indexSet.has(i))
|
||||
let ins = toBeforeIdx
|
||||
for (const i of indices) {
|
||||
if (i < toBeforeIdx) ins -= 1
|
||||
}
|
||||
ins = Math.max(0, Math.min(ins, without.length))
|
||||
return [...without.slice(0, ins), ...blocks, ...without.slice(ins)]
|
||||
}
|
||||
|
||||
/**
|
||||
* Nach Drag&Drop: wenn aus einer Parallelphase noch ≤1 Stream übrig ist (vorher ≥2), Rückfrage wie beim Stream-Löschen.
|
||||
*/
|
||||
export function afterSectionReorderParallelGuard(prev, next) {
|
||||
const seenPo = new Set()
|
||||
for (const s of prev || []) {
|
||||
const L = s?.planLoc
|
||||
if (L?.phaseKind !== 'parallel') continue
|
||||
seenPo.add(L.phaseOrderIndex ?? 0)
|
||||
}
|
||||
let out = next
|
||||
for (const po of seenPo) {
|
||||
const prevN = streamsForParallelPhaseOrders(prev, po).length
|
||||
if (prevN < 2) continue
|
||||
const nowN = streamsForParallelPhaseOrders(out, po).length
|
||||
if (nowN <= 1) {
|
||||
if (
|
||||
window.confirm(
|
||||
'In dieser parallelen Phase ist nur noch eine Gruppe übrig. Parallelaufbau auflösen und alle zugehörigen Abschnitte als gemeinsame Ganzgruppen-Phase führen?'
|
||||
)
|
||||
) {
|
||||
out = dissolveParallelPhaseToWholeGroup(out, po)
|
||||
}
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
function buildPhasesPayloadFromFlat(sections) {
|
||||
const norm = inheritPlanLocForPhasedSave(sections)
|
||||
const phases = []
|
||||
|
||||
Reference in new issue
Block a user