Fix timelimit rendering

Author: goomseo

src/components/CutoffTimeLimitPanel/CutoffTimeLimitPanel.tsx

@@ -42,34 +42,49 @@ export function CutoffTimeLimitPanel({
             </span>
           )}
 
-          {timeLimit && timeLimit?.cumulativeRoundIds.length > 0 && (
-            <div className="px-2">
-              <Trans
-                i18nKey={'common.wca.cumulativeTimelimit'}
-                values={{ time: timelimitTime }}
-                components={{ b: <span className="font-semibold" /> }}
-              />
-              {': '}
-              <span>
-                {timeLimit.cumulativeRoundIds
-                  .filter((activityCode) => activityCode !== round.id)
-                  .map((activityCode, i, arry) => {
-                    const { eventId, roundNumber } = parseActivityCode(activityCode);
-                    return (
-                      <Link
-                        key={activityCode}
-                        to={`/competitions/${wcif?.id}/events/${activityCode}`}>
-                        <span
-                          className={`cubing-icon event-${eventId} mx-1 before:-ml-1 before:mr-2`}>
-                          {t('common.activityCodeToName.round', { roundNumber })}
-                          {i < arry.length - 1 ? ', ' : ''}
-                        </span>
-                      </Link>
-                    );
-                  })}
+          {timeLimit &&
+            timeLimit?.cumulativeRoundIds.length > 0 &&
+            timeLimit.cumulativeRoundIds.filter((activityCode) => activityCode !== round.id)
+              .length === 0 && (
+              <span className="px-2">
+                <Trans
+                  i18nKey={'common.wca.cumulativeTimelimit'}
+                  values={{ time: timelimitTime }}
+                  components={{ b: <span className="font-semibold" /> }}
+                />
               </span>
-            </div>
-          )}
+            )}
+
+          {timeLimit &&
+            timeLimit?.cumulativeRoundIds.length > 0 &&
+            timeLimit.cumulativeRoundIds.filter((activityCode) => activityCode !== round.id)
+              .length > 0 && (
+              <div className="px-2">
+                <span>
+                  <Trans
+                    i18nKey={'common.wca.cumulativeTimelimitWithrounds'}
+                    values={{ time: timelimitTime }}
+                    components={{ b: <span className="font-semibold" /> }}
+                  />
+                  {timeLimit.cumulativeRoundIds
+                    .filter((activityCode) => activityCode !== round.id)
+                    .map((activityCode, i, arry) => {
+                      const { eventId, roundNumber } = parseActivityCode(activityCode);
+                      return (
+                        <Link
+                          key={activityCode}
+                          to={`/competitions/${wcif?.id}/events/${activityCode}`}>
+                          <span
+                            className={`cubing-icon event-${eventId} mx-1 before:-ml-1 before:mr-2`}>
+                            {t('common.activityCodeToName.round', { roundNumber })}
+                            {i < arry.length - 1 ? ', ' : ''}
+                          </span>
+                        </Link>
+                      );
+                    })}
+                </span>
+              </div>
+            )}
         </div>
         {round.advancementCondition && (
           <div>

src/i18n/en/translation.yaml

@@ -28,7 +28,8 @@ common:
       'other-mbld': 'MBLD Submission'
     timeLimit: 'Time Limit'
     cutoff: 'Cutoff'
-    cumulativeTimelimit: Time Limit <b>{{time}}</b> with rounds
+    cumulativeTimelimit: 'Time Limit: <b>{{time}} Cumulative</b>'
+    cumulativeTimelimitWithrounds: 'Time Limit: <b>{{time}} Total</b> with: '
     advancement:
       ranking: 'Top <b>{{level}}</b> to next round'
       percent: 'Top <b>{{level}}%</b> to next round'

src/lib/results.ts

@@ -29,15 +29,17 @@ export const renderCutoff = (cutoff: Cutoff) => {
     return '-';
   }
 
-  return `${formatCentiseconds(cutoff.attemptResult).replace(/\.00+$/, '')}`;
+  return `${formatCentiseconds(cutoff.attemptResult)}`;
 };
 
 export const renderCentiseconds = (centiseconds: number) => {
-  if (centiseconds >= 60000) {
+  if (centiseconds >= 360000) {
     const hours = Math.floor(centiseconds / 360000);
-    const centi = formatCentiseconds(centiseconds - hours * 360000).replace(/\.00+$/, '');
-    return hours ? `${hours}:${centi}` : centi;
+    const minutes = Math.floor((centiseconds % 360000) / 6000);
+    const seconds = Math.floor((centiseconds % 6000) / 100);
+    const centis = centiseconds % 100;
+    return `${hours}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}.${centis.toString().padStart(2, '0')}`;
   }
 
-  return formatCentiseconds(centiseconds).replace(/\.00+$/, '');
+  return formatCentiseconds(centiseconds);
 };