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
@@ -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