From 8f52efbacad85d4ab7f704b0569783cc3e808fc2 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Fri, 13 Aug 2021 16:33:36 -0700 Subject: [PATCH] IO-1289 Resolve scoreboard UI issues. --- bodyshop_translations.babel | 31 +++++++++++++++++++++++ client/src/graphql/scoreboard.queries.js | 5 +++- client/src/translations/en_us/common.json | 5 ++++ client/src/translations/es/common.json | 5 ++++ client/src/translations/fr/common.json | 5 ++++ 5 files changed, 50 insertions(+), 1 deletion(-) diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index d2694e8ff..bb60832a7 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -35194,6 +35194,37 @@ + + scoredboard + + + successes + + + updated + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + + + tech diff --git a/client/src/graphql/scoreboard.queries.js b/client/src/graphql/scoreboard.queries.js index fc3627ac2..1132fd65d 100644 --- a/client/src/graphql/scoreboard.queries.js +++ b/client/src/graphql/scoreboard.queries.js @@ -2,7 +2,10 @@ import { gql } from "@apollo/client"; export const SUBSCRIPTION_SCOREBOARD = gql` subscription SUBSCRIPTION_SCOREBOARD($start: date!, $end: date!) { - scoreboard(where: { _and: { date: { _gte: $start, _lte: $end } } }) { + scoreboard( + where: { _and: { date: { _gte: $start, _lte: $end } } } + order_by: { date: asc } + ) { id painthrs bodyhrs diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index e0d383298..e29ff3cbf 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -2112,6 +2112,11 @@ "updated": "Scoreboard updated." } }, + "scoredboard": { + "successes": { + "updated": "Scoreboard entry updated." + } + }, "tech": { "fields": { "employeeid": "Employee ID", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 10257da69..f40d9dd17 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -2112,6 +2112,11 @@ "updated": "" } }, + "scoredboard": { + "successes": { + "updated": "" + } + }, "tech": { "fields": { "employeeid": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index b170e2669..54818c3f3 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -2112,6 +2112,11 @@ "updated": "" } }, + "scoredboard": { + "successes": { + "updated": "" + } + }, "tech": { "fields": { "employeeid": "",