From 42b207d2a35d8129884b448191d2c7e71bce819e Mon Sep 17 00:00:00 2001
From: Tudor Stanciu <tudor.stanciu94@gmail.com>
Date: Fri, 5 Jun 2020 19:53:56 +0300
Subject: [PATCH] SessionsRunningTimeChart update

---
 public/locales/en/translations.json           |  4 +-
 public/locales/ro/translations.json           |  4 +-
 .../components/SessionsRunningTimeChart.js    | 52 ++++++++++++-------
 .../SessionsRunningTimeChartTooltip.js        | 13 +++--
 4 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/public/locales/en/translations.json b/public/locales/en/translations.json
index e1e8fa7..9d76ebf 100644
--- a/public/locales/en/translations.json
+++ b/public/locales/en/translations.json
@@ -71,8 +71,8 @@
       "Sessions": {
         "RunningTime": {
           "Title": "Sessions running time",
-          "X": "Running time",
-          "Y": "Sessions"
+          "Session": "Session",
+          "X": "Running time"
         }
       }
     }
diff --git a/public/locales/ro/translations.json b/public/locales/ro/translations.json
index 381c603..72e3bfb 100644
--- a/public/locales/ro/translations.json
+++ b/public/locales/ro/translations.json
@@ -62,8 +62,8 @@
       "Sessions": {
         "RunningTime": {
           "Title": "Timp de rulare sesiuni",
-          "X": "Timp de rulare",
-          "Y": "Sesiuni"
+          "Session": "Sesiunea",
+          "X": "Timp de rulare"
         }
       }
     }
diff --git a/src/features/charts/server/components/SessionsRunningTimeChart.js b/src/features/charts/server/components/SessionsRunningTimeChart.js
index e5f91d2..5b3cf43 100644
--- a/src/features/charts/server/components/SessionsRunningTimeChart.js
+++ b/src/features/charts/server/components/SessionsRunningTimeChart.js
@@ -12,7 +12,8 @@ import {
   Legend,
   ResponsiveContainer
 } from "recharts";
-
+import Typography from "@material-ui/core/Typography";
+import Grid from "@material-ui/core/Grid";
 import SessionsRunningTimeChartTooltip from "./SessionsRunningTimeChartTooltip";
 
 const SessionsRunningTimeChart = ({ data }) => {
@@ -43,25 +44,38 @@ const SessionsRunningTimeChart = ({ data }) => {
       {data.loading || !data.loaded ? (
         <Spinner />
       ) : (
-        <ResponsiveContainer width="100%" height={500}>
-          <BarChart
-            data={chartData}
-            margin={{
-              top: 5,
-              right: 30,
-              left: 20,
-              bottom: 5
-            }}
-          >
-            <CartesianGrid strokeDasharray="3 3" />
-            <XAxis dataKey="name" />
-            <YAxis type="number" dataKey="value" name="stature" unit="h" />
-            <Tooltip content={<CustomTooltip />} />
-            <Legend />
+        <>
+          <Grid container justify="center">
+            <Grid item>
+              <Typography gutterBottom variant="h5">
+                {t("Charts.Server.Sessions.RunningTime.Title")}
+              </Typography>
+            </Grid>
+          </Grid>
+          <ResponsiveContainer width="100%" height={500}>
+            <BarChart
+              data={chartData}
+              margin={{
+                top: 5,
+                right: 30,
+                left: 20,
+                bottom: 5
+              }}
+            >
+              <CartesianGrid strokeDasharray="3 3" />
+              <XAxis dataKey="name" />
+              <YAxis type="number" dataKey="value" name="stature" unit="h" />
+              <Tooltip content={<CustomTooltip />} />
+              <Legend />
 
-            <Bar dataKey="value" fill="#3f51b5" name="running time" />
-          </BarChart>
-        </ResponsiveContainer>
+              <Bar
+                dataKey="value"
+                fill="#3f51b5"
+                name={t("Charts.Server.Sessions.RunningTime.X")}
+              />
+            </BarChart>
+          </ResponsiveContainer>
+        </>
       )}
     </>
   );
diff --git a/src/features/charts/server/components/SessionsRunningTimeChartTooltip.js b/src/features/charts/server/components/SessionsRunningTimeChartTooltip.js
index a7f7f73..80316bb 100644
--- a/src/features/charts/server/components/SessionsRunningTimeChartTooltip.js
+++ b/src/features/charts/server/components/SessionsRunningTimeChartTooltip.js
@@ -5,12 +5,16 @@ import Chip from "@material-ui/core/Chip";
 import Grid from "@material-ui/core/Grid";
 import Divider from "@material-ui/core/Divider";
 import Typography from "@material-ui/core/Typography";
+import { useTranslation } from "react-i18next";
 
 const useStyles = makeStyles((theme) => ({
   root: {
     width: "100%",
     maxWidth: 360,
-    backgroundColor: theme.palette.background.paper
+    backgroundColor: theme.palette.background.paper,
+    borderStyle: "solid",
+    borderWidth: "1px",
+    borderColor: theme.palette.primary.main
   },
   chip: {
     margin: theme.spacing(0.5)
@@ -25,6 +29,7 @@ const useStyles = makeStyles((theme) => ({
 
 const SessionsRunningTimeChartTooltip = ({ payload }) => {
   const classes = useStyles();
+  const { t } = useTranslation();
 
   return (
     <div className={classes.root}>
@@ -32,7 +37,9 @@ const SessionsRunningTimeChartTooltip = ({ payload }) => {
         <Grid container alignItems="center">
           <Grid item xs>
             <Typography gutterBottom variant="h6">
-              {`Session ${payload.order}`}
+              {`${t("Charts.Server.Sessions.RunningTime.Session")} ${
+                payload.order
+              }`}
             </Typography>
           </Grid>
         </Grid>
@@ -43,7 +50,7 @@ const SessionsRunningTimeChartTooltip = ({ payload }) => {
       <Divider variant="middle" />
       <div className={classes.section2}>
         <Typography gutterBottom variant="body2">
-          Running time
+          {t("Charts.Server.Sessions.RunningTime.X")}
         </Typography>
         <div>
           {payload.label.split(" ").map((s) => {