dayowe/sundog-calculator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(kaya): lock Fred & Felia kcal/100g (always 115)

Browse Source
This commit is contained in:
Dayowe 2026-02-06 12:52:13 +01:00
parent 19592f2230
commit 68d5527a89
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
iframe.html
View File

@ -2239,11 +2239,13 @@ const CALCULATOR_CONFIG = {
state.foodSources.forEach(saved => { state.foodSources.forEach(saved => {
// Back-compat: older Kaya state stored Fred & Felia as `chartType: "gc"`. // Back-compat: older Kaya state stored Fred & Felia as `chartType: "gc"`.
const chartType = saved.chartType === 'gc' ? 'mer' : (saved.chartType || null); const chartType = saved.chartType === 'gc' ? 'mer' : (saved.chartType || null);
const normalizedEnergy = chartType === 'mer' ? '115' : (saved.energy || '');
const normalizedEnergyUnit = chartType === 'mer' ? 'kcal100g' : (saved.energyUnit || 'kcal100g');
const fs = { const fs = {
id: saved.id || this.generateFoodSourceId(), id: saved.id || this.generateFoodSourceId(),
name: saved.name || 'Food Source', name: saved.name || 'Food Source',
energy: saved.energy || '', energy: normalizedEnergy,
energyUnit: saved.energyUnit || 'kcal100g', energyUnit: normalizedEnergyUnit,
percentage: typeof saved.percentage === 'number' ? saved.percentage : 0, percentage: typeof saved.percentage === 'number' ? saved.percentage : 0,
isLocked: !!saved.isLocked, isLocked: !!saved.isLocked,
chartType: chartType, chartType: chartType,
@ -2796,7 +2798,7 @@ const CALCULATOR_CONFIG = {
const container = document.getElementById('foodSources'); const container = document.getElementById('foodSources');
if (!container) return; if (!container) return;
const isChart = foodSource.chartType === 'kibble'; const isChart = foodSource.chartType === 'kibble' || foodSource.chartType === 'mer';
const energyReadonlyAttr = isChart ? 'readonly' : ''; const energyReadonlyAttr = isChart ? 'readonly' : '';
const energyTitle = isChart ? 'Chart-based food: kcal locked' : 'Enter energy content'; const energyTitle = isChart ? 'Chart-based food: kcal locked' : 'Enter energy content';
const unitDisabledAttr = isChart ? 'disabled' : ''; const unitDisabledAttr = isChart ? 'disabled' : '';

8
src/js/calculator.js
View File

@ -131,11 +131,13 @@
state.foodSources.forEach(saved => { state.foodSources.forEach(saved => {
// Back-compat: older Kaya state stored Fred & Felia as `chartType: "gc"`. // Back-compat: older Kaya state stored Fred & Felia as `chartType: "gc"`.
const chartType = saved.chartType === 'gc' ? 'mer' : (saved.chartType || null); const chartType = saved.chartType === 'gc' ? 'mer' : (saved.chartType || null);
const normalizedEnergy = chartType === 'mer' ? '115' : (saved.energy || '');
const normalizedEnergyUnit = chartType === 'mer' ? 'kcal100g' : (saved.energyUnit || 'kcal100g');
const fs = { const fs = {
id: saved.id || this.generateFoodSourceId(), id: saved.id || this.generateFoodSourceId(),
name: saved.name || 'Food Source', name: saved.name || 'Food Source',
energy: saved.energy || '', energy: normalizedEnergy,
energyUnit: saved.energyUnit || 'kcal100g', energyUnit: normalizedEnergyUnit,
percentage: typeof saved.percentage === 'number' ? saved.percentage : 0, percentage: typeof saved.percentage === 'number' ? saved.percentage : 0,
isLocked: !!saved.isLocked, isLocked: !!saved.isLocked,
chartType: chartType, chartType: chartType,
@ -688,7 +690,7 @@
const container = document.getElementById('foodSources'); const container = document.getElementById('foodSources');
if (!container) return; if (!container) return;
const isChart = foodSource.chartType === 'kibble'; const isChart = foodSource.chartType === 'kibble' || foodSource.chartType === 'mer';
const energyReadonlyAttr = isChart ? 'readonly' : ''; const energyReadonlyAttr = isChart ? 'readonly' : '';
const energyTitle = isChart ? 'Chart-based food: kcal locked' : 'Enter energy content'; const energyTitle = isChart ? 'Chart-based food: kcal locked' : 'Enter energy content';
const unitDisabledAttr = isChart ? 'disabled' : ''; const unitDisabledAttr = isChart ? 'disabled' : '';