cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-19 14:14:17 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix danger time not shown (#775)

Browse Source 
* wrong order of operations

* chore: version bump
This commit is contained in:
Fabian Posenau
2024-02-14 12:44:06 +01:00
committed by GitHub
parent d1ae407996
commit debdbd1c5a
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "ontime-ui", "name": "ontime-ui",
"version": "2.28.16", "version": "2.28.17",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@chakra-ui/react": "^2.7.0", "@chakra-ui/react": "^2.7.0",
apps/client/src/features/viewers/minimal-timer/MinimalTimer.tsx
+1 -1
View File
@@ -142,8 +142,8 @@ export default function MinimalTimer(props: MinimalTimerProps) {
const showBlackout = pres.timerBlackout; const showBlackout = pres.timerBlackout;
let timerColor = viewSettings.normalColor; let timerColor = viewSettings.normalColor;
if (!timerIsTimeOfDay && showProgress && showDanger) timerColor = viewSettings.dangerColor;
if (!timerIsTimeOfDay && showProgress && showWarning) timerColor = viewSettings.warningColor; if (!timerIsTimeOfDay && showProgress && showWarning) timerColor = viewSettings.warningColor;
if (!timerIsTimeOfDay && showProgress && showDanger) timerColor = viewSettings.dangerColor;
const stageTimer = getTimerByType(time); const stageTimer = getTimerByType(time);
let display = formatTimerDisplay(stageTimer); let display = formatTimerDisplay(stageTimer);
apps/client/src/features/viewers/timer/Timer.tsx
+1 -1
View File
@@ -107,8 +107,8 @@ export default function Timer(props: TimerProps) {
const showExternal = external.visible && external.text; const showExternal = external.visible && external.text;
let timerColor = viewSettings.normalColor; let timerColor = viewSettings.normalColor;
if (!timerIsTimeOfDay && showProgress && showDanger) timerColor = viewSettings.dangerColor;
if (!timerIsTimeOfDay && showProgress && showWarning) timerColor = viewSettings.warningColor; if (!timerIsTimeOfDay && showProgress && showWarning) timerColor = viewSettings.warningColor;
if (!timerIsTimeOfDay && showProgress && showDanger) timerColor = viewSettings.dangerColor;
const stageTimer = getTimerByType(time); const stageTimer = getTimerByType(time);
let display = formatTimerDisplay(stageTimer); let display = formatTimerDisplay(stageTimer);
apps/electron/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "ontime", "name": "ontime",
"version": "2.28.16", "version": "2.28.17",
"author": "Carlos Valente", "author": "Carlos Valente",
"description": "Time keeping for live events", "description": "Time keeping for live events",
"repository": "https://github.com/cpvalente/ontime", "repository": "https://github.com/cpvalente/ontime",
apps/server/package.json
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "ontime-server", "name": "ontime-server",
"type": "module", "type": "module",
"main": "src/index.ts", "main": "src/index.ts",
"version": "2.28.16", "version": "2.28.17",
"exports": "./src/index.js", "exports": "./src/index.js",
"dependencies": { "dependencies": {
"@googleapis/sheets": "^5.0.5", "@googleapis/sheets": "^5.0.5",
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "ontime", "name": "ontime",
"version": "2.28.16", "version": "2.28.17",
"description": "Time keeping for live events", "description": "Time keeping for live events",
"keywords": [ "keywords": [
"lightdev", "lightdev",