feat(version): bump to 0.8.104 and enhance combination exercise features
Deploy Development / deploy (push) Successful in 40s
Test Suite / pytest-backend (push) Successful in 35s
Test Suite / lint-backend (push) Successful in 0s
Test Suite / build-frontend (push) Successful in 11s
Test Suite / playwright-tests (push) Successful in 56s
Deploy Development / deploy (push) Successful in 40s
Test Suite / pytest-backend (push) Successful in 35s
Test Suite / lint-backend (push) Successful in 0s
Test Suite / build-frontend (push) Successful in 11s
Test Suite / playwright-tests (push) Successful in 56s
- Updated app version to 0.8.104, reflecting recent improvements in combination exercise handling. - Enhanced the CombinationMethodProfileEditor to support structured slot timing profiles without requiring JSON input from trainers. - Introduced quick ratio presets for circuit and interval training methods, improving user experience in setting up training profiles. - Updated documentation and changelog to reflect new features and integration details. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
1 parent
4e654e50c0
commit
435da7f17a
7 files changed
+560
-65
No files matched your search
@@ -1,10 +1,15 @@
|
||||
import React, { useMemo, useState } from 'react'
|
||||
import { archetypeCoachHint, combinationArchetypeLabel } from '../constants/combinationArchetypes'
|
||||
import { archetypeCoachHint, combinationArchetypeLabel, sortCombinationSlotsForDisplay } from '../constants/combinationArchetypes'
|
||||
import {
|
||||
METHOD_PROFILE_GUI_FIELDS,
|
||||
parseProfileJson,
|
||||
setFullProfileRawJson,
|
||||
updateProfileGuided,
|
||||
patchMethodProfile,
|
||||
readSlotProfilesV1,
|
||||
patchSlotTimingField,
|
||||
applyCircuitRotateQuickRatio,
|
||||
applyIntervalDomainQuickRatio,
|
||||
} from '../utils/combinationMethodProfileUi'
|
||||
|
||||
function clampInt(n, min, max) {
|
||||
@@ -15,13 +20,31 @@ function clampInt(n, min, max) {
|
||||
return Math.round(x)
|
||||
}
|
||||
|
||||
/** Archetypen mit klar bezifferbarer Stationslogik · alle mit Slot-Liste sinnvoll */
|
||||
const ARCHETYPES_WITH_SLOT_TIMING = new Set([
|
||||
'circuit_rotate_time',
|
||||
'sequence_linear',
|
||||
'station_parcour',
|
||||
'time_domain_interval',
|
||||
'circuit_all_parallel',
|
||||
'pair_superset',
|
||||
'free_method_block',
|
||||
])
|
||||
|
||||
/**
|
||||
* Kombination: geführtes Ablaufprofil + optionales Roh-JSON.
|
||||
* Kombination: geführtes method_profile (+ optional Stationszeilen, ohne JSON für Trainer).
|
||||
*
|
||||
* @param {boolean} [props.plannerMode] — z. B. Planungs‑Override: keine Roh‑JSON‑Sektion.
|
||||
* @param {boolean} [props.allowExpertJson] — wenn true und nicht plannerMode: Roh‑JSON (Support).
|
||||
* @param {{ slot_index?: number|string, title?: string }[]} [props.comboSlotsOutline] — für Slot‑Felder aus der Übung
|
||||
*/
|
||||
export default function CombinationMethodProfileEditor({
|
||||
methodArchetype,
|
||||
methodProfileJson,
|
||||
onChangeMethodProfileJson,
|
||||
plannerMode = false,
|
||||
allowExpertJson = false,
|
||||
comboSlotsOutline = null,
|
||||
}) {
|
||||
const arch = typeof methodArchetype === 'string' ? methodArchetype.trim() : ''
|
||||
const fieldsGui = METHOD_PROFILE_GUI_FIELDS[arch]
|
||||
@@ -29,20 +52,36 @@ export default function CombinationMethodProfileEditor({
|
||||
const parseState = useMemo(() => parseProfileJson(methodProfileJson || '{}'), [methodProfileJson])
|
||||
const [rawOpenError, setRawOpenError] = useState(null)
|
||||
const [rawDraft, setRawDraft] = useState(null)
|
||||
const [presetHint, setPresetHint] = useState(null)
|
||||
|
||||
const profileObj = parseState.ok ? parseState.obj : {}
|
||||
|
||||
const outlineSorted = useMemo(() => {
|
||||
if (!comboSlotsOutline || !Array.isArray(comboSlotsOutline) || comboSlotsOutline.length === 0) return []
|
||||
return sortCombinationSlotsForDisplay(comboSlotsOutline)
|
||||
}, [comboSlotsOutline])
|
||||
|
||||
const showSlotTiming =
|
||||
ARCHETYPES_WITH_SLOT_TIMING.has(arch) && outlineSorted.length > 0
|
||||
|
||||
const slotRowsModel = useMemo(() => readSlotProfilesV1(profileObj), [profileObj])
|
||||
|
||||
const lookupSlotTiming = (slotIndex) =>
|
||||
slotRowsModel.find((r) => Number(r.slot_index) === Number(slotIndex)) || {}
|
||||
|
||||
const applyGuided = (key, value, kind) => {
|
||||
if (kind === 'bool') {
|
||||
const res = updateProfileGuided(arch, methodProfileJson || '{}', key, value, 'bool')
|
||||
if (!res.ok) return
|
||||
onChangeMethodProfileJson(res.json)
|
||||
setPresetHint(null)
|
||||
return
|
||||
}
|
||||
if (value === '' || value === undefined || value === null) {
|
||||
const res = updateProfileGuided(arch, methodProfileJson || '{}', key, '', 'int')
|
||||
if (!res.ok) return
|
||||
onChangeMethodProfileJson(res.json)
|
||||
setPresetHint(null)
|
||||
return
|
||||
}
|
||||
const num = typeof value === 'number' ? value : parseInt(String(value), 10)
|
||||
@@ -53,6 +92,36 @@ export default function CombinationMethodProfileEditor({
|
||||
const res = updateProfileGuided(arch, methodProfileJson || '{}', key, c, 'int')
|
||||
if (!res.ok) return
|
||||
onChangeMethodProfileJson(res.json)
|
||||
setPresetHint(null)
|
||||
}
|
||||
|
||||
const onSlotField = (slotIx, field, rawStr) => {
|
||||
const patched = patchMethodProfile(methodProfileJson || '{}', (d) =>
|
||||
patchSlotTimingField(d, slotIx, field, rawStr)
|
||||
)
|
||||
if (!patched.ok) return
|
||||
onChangeMethodProfileJson(patched.json)
|
||||
setPresetHint(null)
|
||||
}
|
||||
|
||||
const runCircuitPreset = (presetId) => {
|
||||
const r = patchMethodProfile(methodProfileJson || '{}', (draft) => {
|
||||
const pr = applyCircuitRotateQuickRatio(draft, presetId)
|
||||
if (!pr.ok) setPresetHint(pr.error || '')
|
||||
else setPresetHint(null)
|
||||
})
|
||||
if (!r.ok) return
|
||||
onChangeMethodProfileJson(r.json)
|
||||
}
|
||||
|
||||
const runIntervalPreset = (presetId) => {
|
||||
const r = patchMethodProfile(methodProfileJson || '{}', (draft) => {
|
||||
const pr = applyIntervalDomainQuickRatio(draft, presetId)
|
||||
if (!pr.ok) setPresetHint(pr.error || '')
|
||||
else setPresetHint(null)
|
||||
})
|
||||
if (!r.ok) return
|
||||
onChangeMethodProfileJson(r.json)
|
||||
}
|
||||
|
||||
const archeLabel = arch ? combinationArchetypeLabel(arch) : null
|
||||
@@ -63,8 +132,14 @@ export default function CombinationMethodProfileEditor({
|
||||
setRawDraft(p.ok ? JSON.stringify(p.obj, null, 2) : String(methodProfileJson || ''))
|
||||
}
|
||||
|
||||
const showExpertSection = allowExpertJson && !plannerMode
|
||||
|
||||
return (
|
||||
<div style={{ marginTop: '10px' }}>
|
||||
{presetHint ? (
|
||||
<p style={{ fontSize: '12px', color: 'var(--danger)', margin: '0 0 8px', lineHeight: 1.4 }}>{presetHint}</p>
|
||||
) : null}
|
||||
|
||||
{arch ? (
|
||||
<p style={{ fontSize: '12px', color: 'var(--text2)', lineHeight: 1.48, margin: '0 0 12px' }}>
|
||||
<strong style={{ color: 'var(--text1)' }}>
|
||||
@@ -75,7 +150,8 @@ export default function CombinationMethodProfileEditor({
|
||||
</p>
|
||||
) : (
|
||||
<p style={{ fontSize: '12px', color: 'var(--text3)', margin: '0 0 12px' }}>
|
||||
Wähle einen Archetyp, um das Ablaufprofil strukturiert zu erfassen — oder nur das JSON weiter unten.
|
||||
Wähle einen Methoden‑Archetyp — besonders beim <strong>freien Methodenblock</strong> stehen alle
|
||||
typischen Stations‑Zeiten zur Verfügung. Ohne Archetyp keine geführten Eingaben.
|
||||
</p>
|
||||
)}
|
||||
|
||||
@@ -85,6 +161,48 @@ export default function CombinationMethodProfileEditor({
|
||||
|
||||
{fields && fields.length > 0 ? (
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: '10px', marginBottom: '12px' }}>
|
||||
{arch === 'circuit_rotate_time' ? (
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
flexWrap: 'wrap',
|
||||
gap: '6px',
|
||||
marginBottom: '4px',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
<span style={{ fontSize: '11px', color: 'var(--text3)', marginRight: '6px' }}>Schnellwahl:</span>
|
||||
<button type="button" className="btn btn-secondary framework-ctrl framework-ctrl--xs" onClick={() => runCircuitPreset('transition_equals_work')}>
|
||||
Wechsel ≈ Arbeit
|
||||
</button>
|
||||
<button type="button" className="btn btn-secondary framework-ctrl framework-ctrl--xs" onClick={() => runCircuitPreset('round_rest_equals_work')}>
|
||||
Runden‑Pause ≈ Arbeit
|
||||
</button>
|
||||
<button type="button" className="btn btn-secondary framework-ctrl framework-ctrl--xs" onClick={() => runCircuitPreset('round_rest_two_thirds_work')}>
|
||||
Runden‑Pause ≈ ⅔ Arbeit
|
||||
</button>
|
||||
</div>
|
||||
) : null}
|
||||
{arch === 'time_domain_interval' ? (
|
||||
<div
|
||||
style={{
|
||||
display: 'flex',
|
||||
flexWrap: 'wrap',
|
||||
gap: '6px',
|
||||
marginBottom: '4px',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
<span style={{ fontSize: '11px', color: 'var(--text3)', marginRight: '6px' }}>Schnellwahl:</span>
|
||||
<button type="button" className="btn btn-secondary framework-ctrl framework-ctrl--xs" onClick={() => runIntervalPreset('rest_equals_work')}>
|
||||
Erholung = Belastung
|
||||
</button>
|
||||
<button type="button" className="btn btn-secondary framework-ctrl framework-ctrl--xs" onClick={() => runIntervalPreset('rest_two_thirds_work')}>
|
||||
Erholung ≈ ⅔ Belastung
|
||||
</button>
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
{fields.map((def) => {
|
||||
if (def.kind === 'bool') {
|
||||
const ck = !!profileObj[def.key]
|
||||
@@ -125,51 +243,170 @@ export default function CombinationMethodProfileEditor({
|
||||
})}
|
||||
</div>
|
||||
) : arch && fields && fields.length === 0 ? (
|
||||
<p style={{ fontSize: '12px', color: 'var(--text3)', margin: '0 0 10px' }}>
|
||||
Für diesen Archetyp gibt es keine vorgegebenen Profilfelder — nutze die Freitexte der Kombination oder Roh‑JSON bei Bedarf.
|
||||
</p>
|
||||
<div style={{ marginBottom: '12px' }}>
|
||||
<p style={{ fontSize: '12px', color: 'var(--text3)', margin: '0 0 10px', lineHeight: 1.45 }}>
|
||||
Dieser Archetyp ist für <strong>maximal flexible</strong> Stationsblöcke gedacht — die Zeit‑Eckdaten sind
|
||||
unten je Station möglich. Freitexte der Kombination beschreiben alles Organisatorische, was nicht in
|
||||
Sekunden gefasst wird.
|
||||
</p>
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
<details
|
||||
style={{
|
||||
marginTop: '4px',
|
||||
borderRadius: '8px',
|
||||
border: '1px solid var(--border)',
|
||||
padding: '8px 10px',
|
||||
background: 'var(--surface)',
|
||||
}}
|
||||
onToggle={(ev) => {
|
||||
if (ev.target.open) openAdvanced()
|
||||
}}
|
||||
>
|
||||
<summary style={{ cursor: 'pointer', fontSize: '0.82rem', fontWeight: 600 }}>Erweitert: JSON direkt bearbeiten</summary>
|
||||
<p style={{ fontSize: '11px', color: 'var(--text3)', margin: '8px 0 6px', lineHeight: 1.4 }}>
|
||||
Zusätzliche Schlüssel (Piloten). Geführte Felder können dieselben Schlüssel beim nächsten Speichern überlagern.
|
||||
</p>
|
||||
<textarea
|
||||
className="form-input"
|
||||
rows={8}
|
||||
style={{ fontFamily: 'Consolas,monospace', fontSize: '12px' }}
|
||||
value={rawDraft != null ? rawDraft : methodProfileJson || '{}'}
|
||||
onChange={(e) => {
|
||||
setRawDraft(e.target.value)
|
||||
setRawOpenError(null)
|
||||
{showSlotTiming ? (
|
||||
<div
|
||||
style={{
|
||||
marginTop: '6px',
|
||||
marginBottom: '14px',
|
||||
padding: '12px 14px',
|
||||
borderRadius: '10px',
|
||||
border: '1px solid var(--border)',
|
||||
background: 'var(--surface)',
|
||||
}}
|
||||
spellCheck={false}
|
||||
onBlur={() => {
|
||||
const src = rawDraft != null ? rawDraft : methodProfileJson
|
||||
const res = setFullProfileRawJson(src || '{}')
|
||||
if (!res.ok) {
|
||||
setRawOpenError(res.error)
|
||||
return
|
||||
}
|
||||
setRawOpenError(null)
|
||||
setRawDraft(null)
|
||||
onChangeMethodProfileJson(res.json)
|
||||
>
|
||||
<div style={{ fontSize: '0.88rem', fontWeight: 700, marginBottom: '10px', color: 'var(--text1)' }}>
|
||||
Pro Station / Slot (Zeiten in Sekunden)
|
||||
</div>
|
||||
<p style={{ fontSize: '11px', color: 'var(--text3)', margin: '0 0 12px', lineHeight: 1.45 }}>
|
||||
Belastungsdauer, wie oft die Übung an der gleichen Station hintereinander, kurze Pause dazwischen, Zeit bis
|
||||
zur nächsten Station. Felder können leer bleiben — z. B. nutzt der Zirkel oben erst die globalen Arbeit‑/
|
||||
Rotations‑Sekunden.
|
||||
</p>
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: '12px' }}>
|
||||
{outlineSorted.map((slot) => {
|
||||
const siRaw = slot.slot_index
|
||||
const si =
|
||||
siRaw === '' || siRaw == null ? null : typeof siRaw === 'number' ? siRaw : parseInt(String(siRaw), 10)
|
||||
if (!Number.isFinite(si)) return null
|
||||
const row = lookupSlotTiming(si)
|
||||
const ttl = ((slot.title || '').trim() || `Station ${si}`).trim()
|
||||
return (
|
||||
<div
|
||||
key={`slot-timing-${si}`}
|
||||
style={{
|
||||
padding: '10px',
|
||||
borderRadius: '10px',
|
||||
border: '1px solid var(--border)',
|
||||
background: 'var(--surface2)',
|
||||
}}
|
||||
>
|
||||
<div style={{ marginBottom: '10px', fontWeight: 700, color: 'var(--text1)', fontSize: '0.9rem' }}>
|
||||
Station {si}
|
||||
<span style={{ fontWeight: 400, marginLeft: 8, color: 'var(--text2)', fontSize: '0.86rem' }}>{ttl}</span>
|
||||
</div>
|
||||
<div
|
||||
style={{
|
||||
display: 'grid',
|
||||
gridTemplateColumns: 'repeat(auto-fill, minmax(140px, 1fr))',
|
||||
gap: '10px',
|
||||
alignItems: 'end',
|
||||
}}
|
||||
>
|
||||
<div className="form-row" style={{ marginBottom: 0 }}>
|
||||
<label className="form-label" style={{ fontSize: '11px' }}>
|
||||
Belastung (s)
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
min={0}
|
||||
className="form-input"
|
||||
placeholder="–"
|
||||
value={row.load_sec != null ? String(row.load_sec) : ''}
|
||||
onChange={(e) => onSlotField(si, 'load_sec', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="form-row" style={{ marginBottom: 0 }}>
|
||||
<label className="form-label" style={{ fontSize: '11px' }}>
|
||||
Wdh. ohne Wechsel
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
min={1}
|
||||
className="form-input"
|
||||
placeholder="oft 1"
|
||||
value={row.consecutive_reps != null ? String(row.consecutive_reps) : ''}
|
||||
onChange={(e) => onSlotField(si, 'consecutive_reps', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="form-row" style={{ marginBottom: 0 }}>
|
||||
<label className="form-label" style={{ fontSize: '11px' }}>
|
||||
Pause zwischen Wdh. (s)
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
min={0}
|
||||
className="form-input"
|
||||
placeholder="–"
|
||||
value={row.intra_rep_rest_sec != null ? String(row.intra_rep_rest_sec) : ''}
|
||||
onChange={(e) => onSlotField(si, 'intra_rep_rest_sec', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
<div className="form-row" style={{ marginBottom: 0 }}>
|
||||
<label className="form-label" style={{ fontSize: '11px' }}>
|
||||
Pause / Wechsel (s)
|
||||
</label>
|
||||
<input
|
||||
type="number"
|
||||
min={0}
|
||||
className="form-input"
|
||||
placeholder="–"
|
||||
value={row.transition_after_sec != null ? String(row.transition_after_sec) : ''}
|
||||
onChange={(e) => onSlotField(si, 'transition_after_sec', e.target.value)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
{showExpertSection ? (
|
||||
<details
|
||||
style={{
|
||||
marginTop: '4px',
|
||||
borderRadius: '8px',
|
||||
border: '1px solid var(--border)',
|
||||
padding: '8px 10px',
|
||||
background: 'var(--surface2)',
|
||||
}}
|
||||
/>
|
||||
{rawOpenError ? <p style={{ color: 'var(--danger)', fontSize: '12px', marginTop: '6px' }}>{rawOpenError}</p> : null}
|
||||
</details>
|
||||
onToggle={(ev) => {
|
||||
if (ev.target.open) openAdvanced()
|
||||
}}
|
||||
>
|
||||
<summary style={{ cursor: 'pointer', fontSize: '0.82rem', fontWeight: 600 }}>
|
||||
Support / Entwicklung: Rohdaten (JSON)
|
||||
</summary>
|
||||
<p style={{ fontSize: '11px', color: 'var(--text3)', margin: '8px 0 6px', lineHeight: 1.4 }}>
|
||||
Für Migrationen und Sonderfälle. Geführte Felder setzen weiterhin gültige Standardschlüssel.
|
||||
</p>
|
||||
<textarea
|
||||
className="form-input"
|
||||
rows={8}
|
||||
style={{ fontFamily: 'Consolas,monospace', fontSize: '12px' }}
|
||||
value={rawDraft != null ? rawDraft : methodProfileJson || '{}'}
|
||||
onChange={(e) => {
|
||||
setRawDraft(e.target.value)
|
||||
setRawOpenError(null)
|
||||
}}
|
||||
spellCheck={false}
|
||||
onBlur={() => {
|
||||
const src = rawDraft != null ? rawDraft : methodProfileJson
|
||||
const res = setFullProfileRawJson(src || '{}')
|
||||
if (!res.ok) {
|
||||
setRawOpenError(res.error)
|
||||
return
|
||||
}
|
||||
setRawOpenError(null)
|
||||
setRawDraft(null)
|
||||
onChangeMethodProfileJson(res.json)
|
||||
}}
|
||||
/>
|
||||
{rawOpenError ? (
|
||||
<p style={{ color: 'var(--danger)', fontSize: '12px', marginTop: '6px' }}>{rawOpenError}</p>
|
||||
) : null}
|
||||
</details>
|
||||
) : null}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1066,6 +1066,7 @@ export default function TrainingUnitSectionsEditor({
|
||||
</button>
|
||||
</div>
|
||||
<CombinationMethodProfileEditor
|
||||
plannerMode
|
||||
methodArchetype={(it.catalog_method_archetype || '').trim()}
|
||||
methodProfileJson={comboPlanningProfileJsonForEditor(
|
||||
it.catalog_method_profile || {},
|
||||
|
||||
@@ -1031,19 +1031,10 @@ function ExerciseFormPage() {
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
<div className="form-row">
|
||||
<label className="form-label">Ablaufprofil (über Archetyp)</label>
|
||||
<CombinationMethodProfileEditor
|
||||
methodArchetype={formData.method_archetype || ''}
|
||||
methodProfileJson={formData.method_profile_json || '{}'}
|
||||
onChangeMethodProfileJson={(s) => updateFormField('method_profile_json', s)}
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<div style={{ paddingTop: '4px', borderTop: '1px dashed var(--border)', marginBottom: '10px' }}>
|
||||
<strong style={{ fontSize: '14px' }}>Stationen</strong>
|
||||
<p style={{ fontSize: '12px', color: 'var(--text2)', margin: '6px 0 10px' }}>
|
||||
Index (Reihenfolge), optional Stationstitel und kommaseparierte IDs von{' '}
|
||||
<strong>Einzelübungen</strong> im Pool (nur Übungen mit Art „Einzelübung“).
|
||||
<p style={{ fontSize: '12px', color: 'var(--text2)', margin: '6px 0 10px', lineHeight: 1.45 }}>
|
||||
Zuerst die Stationen anlegen — dann erscheinen die Zeiten darunter auch <strong>pro Slot</strong> im Ablaufprofil.
|
||||
</p>
|
||||
{(formData.combination_slots || []).map((row, idx) => (
|
||||
<div
|
||||
@@ -1146,6 +1137,15 @@ function ExerciseFormPage() {
|
||||
+ Station
|
||||
</button>
|
||||
</div>
|
||||
<div className="form-row">
|
||||
<label className="form-label">Ablaufprofil (Zeiten & Runden)</label>
|
||||
<CombinationMethodProfileEditor
|
||||
methodArchetype={formData.method_archetype || ''}
|
||||
methodProfileJson={formData.method_profile_json || '{}'}
|
||||
onChangeMethodProfileJson={(s) => updateFormField('method_profile_json', s)}
|
||||
comboSlotsOutline={formData.combination_slots || []}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
@@ -162,4 +162,149 @@ export function setFullProfileRawJson(rawEditable) {
|
||||
return { ok: true, obj: parsed.obj, json: j === '{}' ? '{}' : j }
|
||||
}
|
||||
|
||||
/**
|
||||
* Pfad für slot_profiles_v1 und ähnliche strukturierte Erweiterungen.
|
||||
* Ungültiges JSON gibt { ok:false } zurück; mutator erhält geklontes Profil‑Objekt.
|
||||
*/
|
||||
export function patchMethodProfile(rawJson, mutator) {
|
||||
const parsed = parseProfileJson(rawJson || '{}')
|
||||
if (!parsed.ok) return parsed
|
||||
const draft = { ...parsed.obj }
|
||||
mutator(draft)
|
||||
try {
|
||||
const j = JSON.stringify(draft)
|
||||
return { ok: true, obj: draft, json: j === '{}' ? '{}' : j }
|
||||
} catch {
|
||||
return { ok: false, error: 'Ablaufprofil konnte nicht gespeichert werden.' }
|
||||
}
|
||||
}
|
||||
|
||||
/** Normalisiert slot_profiles_v1 aus dem gespeicherten Profil */
|
||||
export function readSlotProfilesV1(profileObj) {
|
||||
if (!profileObj || typeof profileObj !== 'object') return []
|
||||
const raw = profileObj.slot_profiles_v1
|
||||
if (!Array.isArray(raw)) return []
|
||||
return raw.map((row) => {
|
||||
if (!row || typeof row !== 'object') return null
|
||||
const si = Number(row.slot_index)
|
||||
return {
|
||||
slot_index: Number.isFinite(si) ? si : 0,
|
||||
load_sec: normalizeOptionalNonNegInt(row.load_sec),
|
||||
consecutive_reps: normalizeOptionalPositiveInt(row.consecutive_reps),
|
||||
intra_rep_rest_sec: normalizeOptionalNonNegInt(row.intra_rep_rest_sec),
|
||||
transition_after_sec: normalizeOptionalNonNegInt(row.transition_after_sec),
|
||||
}
|
||||
}).filter(Boolean)
|
||||
}
|
||||
|
||||
function normalizeOptionalNonNegInt(v) {
|
||||
if (v === '' || v === undefined || v === null) return undefined
|
||||
const n = typeof v === 'number' ? v : parseInt(String(v), 10)
|
||||
if (!Number.isFinite(n) || n < 0) return undefined
|
||||
return Math.round(n)
|
||||
}
|
||||
|
||||
function normalizeOptionalPositiveInt(v) {
|
||||
const n = normalizeOptionalNonNegInt(v)
|
||||
if (n === undefined) return undefined
|
||||
if (n < 1) return undefined
|
||||
return n
|
||||
}
|
||||
|
||||
const SLOT_TIMING_FIELDS = /** @type {const} */ ([
|
||||
'load_sec',
|
||||
'consecutive_reps',
|
||||
'intra_rep_rest_sec',
|
||||
'transition_after_sec',
|
||||
])
|
||||
|
||||
/** '', null = Feld entfernen; sonst gültige Zahl setzen */
|
||||
export function patchSlotTimingField(profileDraft, slotIndex, field, rawInput) {
|
||||
if (!SLOT_TIMING_FIELDS.includes(field)) return
|
||||
const ix =
|
||||
typeof slotIndex === 'number' && Number.isFinite(slotIndex)
|
||||
? slotIndex
|
||||
: parseInt(String(slotIndex), 10)
|
||||
if (!Number.isFinite(ix)) return
|
||||
|
||||
let arr = Array.isArray(profileDraft.slot_profiles_v1) ? [...profileDraft.slot_profiles_v1] : []
|
||||
let found = arr.findIndex((r) => r && typeof r === 'object' && Number(r.slot_index) === ix)
|
||||
|
||||
const nextRow = {}
|
||||
if (found >= 0 && arr[found] && typeof arr[found] === 'object') {
|
||||
Object.assign(nextRow, arr[found])
|
||||
}
|
||||
nextRow.slot_index = ix
|
||||
|
||||
if (rawInput === null || rawInput === undefined || String(rawInput).trim() === '') {
|
||||
delete nextRow[field]
|
||||
} else if (field === 'consecutive_reps') {
|
||||
const n = normalizeOptionalPositiveInt(rawInput)
|
||||
if (n === undefined) delete nextRow[field]
|
||||
else nextRow[field] = n
|
||||
} else {
|
||||
const n = normalizeOptionalNonNegInt(rawInput)
|
||||
if (n === undefined) delete nextRow[field]
|
||||
else nextRow[field] = n
|
||||
}
|
||||
|
||||
const hasTiming = SLOT_TIMING_FIELDS.some((k) => nextRow[k] !== undefined && nextRow[k] !== null)
|
||||
|
||||
if (found >= 0) {
|
||||
if (!hasTiming) {
|
||||
arr = arr.filter((_, i) => i !== found)
|
||||
} else {
|
||||
arr[found] = nextRow
|
||||
}
|
||||
} else if (hasTiming) {
|
||||
arr.push(nextRow)
|
||||
}
|
||||
|
||||
arr.sort((a, b) => Number(a.slot_index) - Number(b.slot_index))
|
||||
|
||||
if (arr.length === 0) delete profileDraft.slot_profiles_v1
|
||||
else profileDraft.slot_profiles_v1 = arr
|
||||
}
|
||||
|
||||
/** Rotierender Zirkel: typische Ableitungen (setzt Sekunden konkret). */
|
||||
export function applyCircuitRotateQuickRatio(profileDraft, preset) {
|
||||
const wRaw = profileDraft.work_seconds
|
||||
const work =
|
||||
typeof wRaw === 'number' && Number.isFinite(wRaw) ? Math.round(wRaw) : parseInt(String(wRaw), 10)
|
||||
if (!Number.isFinite(work) || work <= 0)
|
||||
return { ok: false, error: 'Zuerst Arbeitszeit pro Station (Sek.) setzen.' }
|
||||
profileDraft.timing_schema = profileDraft.timing_schema ?? 1
|
||||
if (preset === 'transition_equals_work') {
|
||||
profileDraft.transition_seconds = work
|
||||
return { ok: true }
|
||||
}
|
||||
if (preset === 'round_rest_equals_work') {
|
||||
profileDraft.rest_seconds = work
|
||||
return { ok: true }
|
||||
}
|
||||
if (preset === 'round_rest_two_thirds_work') {
|
||||
profileDraft.rest_seconds = Math.round((work * 2) / 3)
|
||||
return { ok: true }
|
||||
}
|
||||
return { ok: false, error: 'Unbekannte Schnellwahl.' }
|
||||
}
|
||||
|
||||
export function applyIntervalDomainQuickRatio(profileDraft, preset) {
|
||||
const wRaw = profileDraft.work_seconds
|
||||
const work =
|
||||
typeof wRaw === 'number' && Number.isFinite(wRaw) ? Math.round(wRaw) : parseInt(String(wRaw), 10)
|
||||
if (!Number.isFinite(work) || work <= 0)
|
||||
return { ok: false, error: 'Zuerst Belastungszeit Intervall (Sek.) setzen.' }
|
||||
profileDraft.timing_schema = profileDraft.timing_schema ?? 1
|
||||
if (preset === 'rest_equals_work') {
|
||||
profileDraft.rest_seconds = work
|
||||
return { ok: true }
|
||||
}
|
||||
if (preset === 'rest_two_thirds_work') {
|
||||
profileDraft.rest_seconds = Math.round((work * 2) / 3)
|
||||
return { ok: true }
|
||||
}
|
||||
return { ok: false, error: 'Unbekannte Schnellwahl.' }
|
||||
}
|
||||
|
||||
export { parseProfileJson, INT_MAX }
|
||||
Reference in new issue
Block a user