From a98839585ddf9de7e98756d3ec39c339f73b73f3 Mon Sep 17 00:00:00 2001
From: AG <odulov@gmail.com>
Date: Fri, 28 Nov 2025 20:52:11 +0200
Subject: [PATCH] Hidden field values do not messup logged set

---
 components/History.tsx |  14 +++----
 components/Tracker.tsx |  88 +++++++++++++++++++++++++++++++++--------
 server/prisma/dev.db   | Bin 61440 -> 61440 bytes
 3 files changed, 79 insertions(+), 23 deletions(-)

diff --git a/components/History.tsx b/components/History.tsx
index 2b9530c..0092963 100644
--- a/components/History.tsx
+++ b/components/History.tsx
@@ -271,7 +271,7 @@ const History: React.FC<HistoryProps> = ({ sessions, onUpdateSession, onDeleteSe
                                                 <input
                                                     type="number"
                                                     className="w-full bg-transparent text-sm text-on-surface focus:outline-none"
-                                                    value={set.weight ?? ''}
+                                                    value={set.weight === 0 ? '' : (set.weight ?? '')}
                                                     onChange={(e) => handleUpdateSet(set.id, 'weight', parseFloat(e.target.value))}
                                                 />
                                             </div>
@@ -282,8 +282,8 @@ const History: React.FC<HistoryProps> = ({ sessions, onUpdateSession, onDeleteSe
                                                 <input
                                                     type="number"
                                                     className="w-full bg-transparent text-sm text-on-surface focus:outline-none"
-                                                    value={set.reps ?? ''}
-                                                    onChange={(e) => handleUpdateSet(set.id, 'reps', parseFloat(e.target.value))}
+                                                    value={set.reps === 0 ? '' : (set.reps ?? '')}
+                                                    onChange={(e) => handleUpdateSet(set.id, 'reps', parseInt(e.target.value))}
                                                 />
                                             </div>
                                         )}
@@ -293,7 +293,7 @@ const History: React.FC<HistoryProps> = ({ sessions, onUpdateSession, onDeleteSe
                                                 <input
                                                     type="number"
                                                     className="w-full bg-transparent text-sm text-on-surface focus:outline-none"
-                                                    value={set.bodyWeightPercentage ?? 100}
+                                                    value={set.bodyWeightPercentage === 0 ? '' : (set.bodyWeightPercentage ?? 100)}
                                                     onChange={(e) => handleUpdateSet(set.id, 'bodyWeightPercentage', parseFloat(e.target.value))}
                                                 />
                                             </div>
@@ -304,7 +304,7 @@ const History: React.FC<HistoryProps> = ({ sessions, onUpdateSession, onDeleteSe
                                                 <input
                                                     type="number"
                                                     className="w-full bg-transparent text-sm text-on-surface focus:outline-none"
-                                                    value={set.durationSeconds ?? ''}
+                                                    value={set.durationSeconds === 0 ? '' : (set.durationSeconds ?? '')}
                                                     onChange={(e) => handleUpdateSet(set.id, 'durationSeconds', parseFloat(e.target.value))}
                                                 />
                                             </div>
@@ -315,7 +315,7 @@ const History: React.FC<HistoryProps> = ({ sessions, onUpdateSession, onDeleteSe
                                                 <input
                                                     type="number"
                                                     className="w-full bg-transparent text-sm text-on-surface focus:outline-none"
-                                                    value={set.distanceMeters ?? ''}
+                                                    value={set.distanceMeters === 0 ? '' : (set.distanceMeters ?? '')}
                                                     onChange={(e) => handleUpdateSet(set.id, 'distanceMeters', parseFloat(e.target.value))}
                                                 />
                                             </div>
@@ -326,7 +326,7 @@ const History: React.FC<HistoryProps> = ({ sessions, onUpdateSession, onDeleteSe
                                                 <input
                                                     type="number"
                                                     className="w-full bg-transparent text-sm text-on-surface focus:outline-none"
-                                                    value={set.height ?? ''}
+                                                    value={set.height === 0 ? '' : (set.height ?? '')}
                                                     onChange={(e) => handleUpdateSet(set.id, 'height', parseFloat(e.target.value))}
                                                 />
                                             </div>
diff --git a/components/Tracker.tsx b/components/Tracker.tsx
index 2d3b2a8..c9ab2b9 100644
--- a/components/Tracker.tsx
+++ b/components/Tracker.tsx
@@ -121,14 +121,31 @@ const Tracker: React.FC<TrackerProps> = ({ userId, userWeight, activeSession, ac
                 setLastSet(set);
 
                 if (set) {
-                    if (set.weight != null) setWeight(set.weight.toString());
-                    if (set.reps != null) setReps(set.reps.toString());
-                    if (set.durationSeconds != null) setDuration(set.durationSeconds.toString());
-                    if (set.distanceMeters != null) setDistance(set.distanceMeters.toString());
-                    if (set.height != null) setHeight(set.height.toString());
+                    setWeight(set.weight?.toString() || '');
+                    setReps(set.reps?.toString() || '');
+                    setDuration(set.durationSeconds?.toString() || '');
+                    setDistance(set.distanceMeters?.toString() || '');
+                    setHeight(set.height?.toString() || '');
                 } else {
                     setWeight(''); setReps(''); setDuration(''); setDistance(''); setHeight('');
                 }
+
+                // Clear fields not relevant to the selected exercise type
+                if (selectedExercise.type !== ExerciseType.STRENGTH && selectedExercise.type !== ExerciseType.BODYWEIGHT) {
+                    setWeight('');
+                }
+                if (selectedExercise.type !== ExerciseType.STRENGTH && selectedExercise.type !== ExerciseType.BODYWEIGHT && selectedExercise.type !== ExerciseType.PLYOMETRIC) {
+                    setReps('');
+                }
+                if (selectedExercise.type !== ExerciseType.CARDIO && selectedExercise.type !== ExerciseType.STATIC) {
+                    setDuration('');
+                }
+                if (selectedExercise.type !== ExerciseType.CARDIO && selectedExercise.type !== ExerciseType.LONG_JUMP) {
+                    setDistance('');
+                }
+                if (selectedExercise.type !== ExerciseType.HIGH_JUMP) {
+                    setHeight('');
+                }
             }
         };
         updateSelection();
@@ -158,14 +175,37 @@ const Tracker: React.FC<TrackerProps> = ({ userId, userWeight, activeSession, ac
             exerciseName: selectedExercise.name,
             type: selectedExercise.type,
             timestamp: Date.now(),
-            ...(weight && { weight: parseFloat(weight) }),
-            ...(reps && { reps: parseInt(reps) }),
-            ...(duration && { durationSeconds: parseInt(duration) }),
-            ...(distance && { distanceMeters: parseFloat(distance) }),
-            ...(height && { height: parseFloat(height) }),
-            ...((selectedExercise.type === ExerciseType.BODYWEIGHT || selectedExercise.type === ExerciseType.STATIC) && { bodyWeightPercentage: parseFloat(bwPercentage) || 100 })
         };
 
+        switch (selectedExercise.type) {
+            case ExerciseType.STRENGTH:
+                if (weight) newSet.weight = parseFloat(weight);
+                if (reps) newSet.reps = parseInt(reps);
+                break;
+            case ExerciseType.BODYWEIGHT:
+                if (weight) newSet.weight = parseFloat(weight);
+                if (reps) newSet.reps = parseInt(reps);
+                newSet.bodyWeightPercentage = parseFloat(bwPercentage) || 100;
+                break;
+            case ExerciseType.CARDIO:
+                if (duration) newSet.durationSeconds = parseInt(duration);
+                if (distance) newSet.distanceMeters = parseFloat(distance);
+                break;
+            case ExerciseType.STATIC:
+                if (duration) newSet.durationSeconds = parseInt(duration);
+                newSet.bodyWeightPercentage = parseFloat(bwPercentage) || 100;
+                break;
+            case ExerciseType.HIGH_JUMP:
+                if (height) newSet.height = parseFloat(height);
+                break;
+            case ExerciseType.LONG_JUMP:
+                if (distance) newSet.distanceMeters = parseFloat(distance);
+                break;
+            case ExerciseType.PLYOMETRIC:
+                if (reps) newSet.reps = parseInt(reps);
+                break;
+        }
+
         onSetAdded(newSet);
 
         if (activePlan) {
@@ -564,11 +604,27 @@ const Tracker: React.FC<TrackerProps> = ({ userId, userWeight, activeSession, ac
                                                 <div>
                                                     <div className="text-base font-medium text-on-surface">{set.exerciseName}</div>
                                                     <div className="text-sm text-on-surface-variant">
-                                                        {set.weight != null && `${set.weight}kg `}
-                                                        {set.reps != null && `x ${set.reps}`}
-                                                        {set.distanceMeters != null && `${set.distanceMeters}m`}
-                                                        {set.durationSeconds != null && `${set.durationSeconds}s`}
-                                                        {set.height != null && `${set.height}cm`}
+                                                        {set.type === ExerciseType.STRENGTH &&
+                                                            `${set.weight ? `${set.weight}kg` : ''} ${set.reps ? `x ${set.reps}` : ''}`.trim()
+                                                        }
+                                                        {set.type === ExerciseType.BODYWEIGHT &&
+                                                            `${set.weight ? `${set.weight}kg` : ''} ${set.reps ? `x ${set.reps}` : ''}`.trim()
+                                                        }
+                                                        {set.type === ExerciseType.CARDIO &&
+                                                            `${set.durationSeconds ? `${set.durationSeconds}s` : ''} ${set.distanceMeters ? `/ ${set.distanceMeters}m` : ''}`.trim()
+                                                        }
+                                                        {set.type === ExerciseType.STATIC &&
+                                                            `${set.durationSeconds ? `${set.durationSeconds}s` : ''}`.trim()
+                                                        }
+                                                        {set.type === ExerciseType.HIGH_JUMP &&
+                                                            `${set.height ? `${set.height}cm` : ''}`.trim()
+                                                        }
+                                                        {set.type === ExerciseType.LONG_JUMP &&
+                                                            `${set.distanceMeters ? `${set.distanceMeters}m` : ''}`.trim()
+                                                        }
+                                                        {set.type === ExerciseType.PLYOMETRIC &&
+                                                            `${set.reps ? `x ${set.reps}` : ''}`.trim()
+                                                        }
                                                     </div>
                                                 </div>
                                             )}
diff --git a/server/prisma/dev.db b/server/prisma/dev.db
index 509834d67c0c9f3fddfa386a22e10c7a7a20b766..c829101903f94f2a70dafe091a13914e1246a17d 100644
GIT binary patch
delta 2821
zcma)7OKcTY7`~UjxV`h}gHnn>OT1Ok95}Bz=ZxVY4a!3kOv5b^1Ucu-8Eis;f<g<J
z!b0MTwB8s?LyRPB4KddZM%iFoNZ1-SCg{Qy8%@-hxbUAzY8!$wncRC9^UZg^^UwEv
z|D}g5mmapvtX@`bnO!pi-(MWPxv$n$nJtCaJrg_#CW5m6iT{%KUG=YUOZDUGrq1s>
z->UpwnQeA=jaSfkS4X}6;`;J(NfKeBNTVo?V#JxH$QX{1NuoqhOsy88F+Et@wfp4h
z@$)B7ysM87jh;MrW@O*aHxInBXV>oiJC20F)dyTgM{ycCj6`ZI;*zB(Hk<*gpezw7
zcE)8~TXv40T0-#l@c;-25a7f)nXm*=#WdnLl}JTtMnx^hByy3+3HH8v8k7vZ?#{Z?
zL!)~9j9Wr?(D*>N7U*I{5<;CrGRa7AjFIAwp_I5Nl}uZWqfAfl8}FTY2i2Eq+R@x}
z=!e!?mp@SoX8gOswxBQM!7+a#yyZXg=fekKHM|lY4sHiO!$9}=jhU;h(?w?4wV|b6
zE;6Vv0~Q%bkO8x!u7BED{bt{ZU&|{tl)}%#mxG7FUjIw)j=$gAQ2huFF<ISwxwo@Y
zueY_8OZCl0Qo(sdkxgTQxQh+ahA~8(bMPW8mbCHH*TY_U{@%U8+wgt=tF4W7?+fp8
zZ{=T-#y3}MjUyLdXovgPhCj^iH}70L*s?6FHoJ$;2HDt#3;a{u*}Q%AwQ|cqYk#9-
z=GiqJr`msSKi^(z`=G7bI@{V`-nw`-y1V||KRMW0uh+|^a;a1?78|OpMowUZxCKKP
zk!U0w2WL8mIZ;J4G=l53u{N(%T6T1SS}8?c!Yxw9NT6l}#R-#$3Xw`1+ce=xVd_?(
zF8`8I!*2!aI7t&lk%kN+P9udBiy5*pB}^HvDUpS!Z_L-mT6%!;_=0MwQW{xESRyfG
zKGF;sLL?#t3msz%nJqSu?Q^xUW$hsMw|c#jtF}@r3e!cBX0C}-f=ntk^neoBi8xi5
z6;)ja(WR++eR=*CX(}AkU_h3V6mbm=qlv(X3F$DyjuRXeV%|PCj3);c?ZLFvm<fSm
z&<2t%lpl#BM6Jcj8fK`}nUBYc#Jl26u3DrfR@xLkh$c9K3}KF9mQWN4VYG3AW2$oM
zB89NLGTFaK?W~5z<^<_D0#iE*U8@{HE=`zVT*pi#Idzc=>1dx?nNyduyhv`ar71=!
zrUFb&Eab&<#55*KD#{dN8TEl8{n{Q>C;Jv<OJki@7Gi=8xSAPg6-M9`j2bTD2;7rT
zr19yY8g28YRxHXQG>JKlQ^dGZh$~9LRTM)jxma_fb;R=bR7h59;7#=|$SPMDvyqCO
zMl$O;PGy3$;II@E6-fdHi{kvqSp~2bZ{1YS;<J<*f-O-9IuR^S6NR$Pf>@$B;mSHe
za5k>Sjrr$D&$;gG$x3c%84;E(Oq8U`WjTb13!7wNPaScvMI(_vxqXh*q?U=$TB6uV
zj5vfJ#i@=_l=Tdj0yDJ$9&Y|P_k7350Q8A>-`falYY^5I_vgJoyi&HZg1%tJyWsB*
z5Bn3|&G3r<DA?xT4R3`HywRl>Y=v(-^VL?QLkA(Q_lq>*Iso1*(r;@4cp+=6>8I7z
z8bFQ~DW7KmxUoo=tj^ZzLN`qRUpWk9$Rbf+l>v(cw?6|ejp6iv<#1(=ED)-`Tx5X=
nt;m3n=VAIuf#}VUMcm($i!5OF?i~08qjx>-^yanCkB$5T1uoTS

delta 529
zcmZp8z})bFd4d!Z!>WlgPC#;F!V-TO9&SAb{y98Jd^h+C`51Yp^IGv7<NnES!#$N-
zZ?m8PANOXx=xZzjJba=Id=vQW_(b_l_|o~;Z<a|2<(;@-&EyGvESn|s-ZF{+jak6&
z!1sX9i+2mpKHd->J?=?B11h);8ihGILql0v85u(LQxlC0latJibuE(3Omt0>Q_XZO
zlhaIe6Vr^1Qw@yGER2&<CiB;;a|(X^#yD%g;GZ9p<!a6N8ihH4Ml|w*4PuyVP!j|a
z-n_3SikXRT!e&8*GCq(?G>I{uQ-e8_aq___Dw`knDKjz)vcI0pK0z7i)Pw8><$_$H
zp`n}%j0_B%iI!%@Nfw4ix&~>MDY_<U28p_fiKzy<CMKz-W{D<-=BCM}AY&%m&oER;
zHaAO2N;9?4O-?bk&^0kiGSy8oG&Rt*OtUmHN;Wo1Ni{cyDpuWmcZNE<njo(S1281H
z`Av9d@$KY$#3#x(fj^eNjrR?&2X7&t9q(cO_53%0&XVH=dCiv?=LmwlMvPN7&s>}C
F1ON@=mOKCe