fixed bugs

icpc · Dec 23, 2023 · 45c2a6c · 45c2a6c
1 parent 6630f77
commit 45c2a6c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/frontend/admin/src/components/TickerTableRow.js b/src/frontend/admin/src/components/TickerTableRow.js
@@ -46,7 +46,11 @@ export function TickerTableRow({ data, onShow, onEdit, onDelete }) {
                         <Box onSubmit={onSubmitEdit} component="form" type="submit">
                             <TextField autoFocus hiddenLabel fullWidth defaultValue={data.settings.timeZone}
                                 id="filled-hidden-label-small" type="text" size="small" sx={{ width: 1 }}
-                                onChange={onChangeFieldEventHandler(setEditData, "timeZone")}/>
+                                onChange={(event) => {
+                                    if (event.target.value.match(/^utc((\\+|-)\\d\\d?)?$/g) || event.target.value === "") {
+                                        onChangeFieldEventHandler(setEditData, "timeZone")(event);
+                                    }
+                                }}/>
                         </Box>)
                     )}
                 {data.settings.type === "text" &&

diff --git a/src/frontend/overlay/src/components/molecules/Clock.jsx b/src/frontend/overlay/src/components/molecules/Clock.jsx
@@ -13,7 +13,7 @@ export const ContestClock = ({
     globalTimeMode = false,
     contestCountdownMode = false,
     quietMode = false,
-    timeZone = ""
+    timeZone = null
 }) => {
     const formatTime = (time, fullFormat = false) => {
         if (!fullFormat && quietMode && time > 5 * 60 * 1000) {
@@ -34,13 +34,12 @@ export const ContestClock = ({
 
     const getDateTimeNowWithCustomTimeZone = (zone) =>
         DateTime.now().setZone(zone).toFormat(quietMode ? "HH:mm" : "HH:mm:ss");
-
     const getStatus = useCallback(() => {
-        if (globalTimeMode === true ) {
-            return getDateTimeNowWithCustomTimeZone(new SystemZone());
+        if (globalTimeMode === true) {
+            return getDateTimeNowWithCustomTimeZone(timeZone ?? new SystemZone());
         }
 
-        if (timeZone !== "") {
+        if (timeZone !== null) {
             return getDateTimeNowWithCustomTimeZone(timeZone);
         }
 

diff --git a/src/frontend/overlay/src/components/organisms/tickers/Clock.jsx b/src/frontend/overlay/src/components/organisms/tickers/Clock.jsx
@@ -5,7 +5,7 @@ import ContestClock from "../../molecules/Clock";
 export const Clock = ({tickerSettings, part}) => {
     return <TextWrap>
         <ContestClock
-            timeZone={tickerSettings.timeZone}
+            timeZone={tickerSettings.timeZone.length === 0 ? null : tickerSettings.timeZone}
         />
     </TextWrap>;
 };

diff --git a/...n/org/icpclive/sniper/SniperColibrator.kt → ...n/org/icpclive/sniper/SniperCalibrator.kt b/...n/org/icpclive/sniper/SniperColibrator.kt → ...n/org/icpclive/sniper/SniperCalibrator.kt