Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Client - use user sports colors in charts

Browse Source
This commit is contained in:
Sam
2021-11-12 18:55:15 +01:00
parent 7c49fd31ad
commit a6566c133c
15 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee_client/src/components/Statistics/StatsSportsMenu.vue
View File

@ -4,7 +4,7 @@
v-for="sport in translatedSports"
type="checkbox"
:key="sport.id"
:style="{ color: sportColors[sport.label] }"
:style="{ color: sport.color ? sport.color : sportColors[sport.label] }"
>
<input
type="checkbox"

5
fittrackee_client/src/utils/sports.ts
View File

@ -18,7 +18,10 @@ export const sportColors: Record<string, string> = {
export const sportIdColors = (sports: ISport[]): Record<number, string> => {
const colors: Record<number, string> = {}
sports.map((sport) => (colors[sport.id] = sportColors[sport.label]))
sports.map(
(sport) =>
(colors[sport.id] = sport.color ? sport.color : sportColors[sport.label])
)
return colors
}

2
fittrackee_client/src/utils/statistics.ts
View File

@ -84,7 +84,7 @@ export const getDatasets = (displayedSports: ISport[]): TStatisticsDatasets => {
total_descent: [],
}
displayedSports.map((sport) => {
const color = sportColors[sport.label]
const color = sport.color ? sport.color : sportColors[sport.label]
datasets.nb_workouts.push(getStatisticsChartDataset(sport.label, color))
datasets.total_distance.push(getStatisticsChartDataset(sport.label, color))
datasets.total_duration.push(getStatisticsChartDataset(sport.label, color))

30
fittrackee_client/tests/unit/utils/statistics.spec.ts
View File

@ -175,7 +175,7 @@ describe('getDatasets', () => {
},
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [],
},
{
@ -192,7 +192,7 @@ describe('getDatasets', () => {
},
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [],
},
{
@ -209,7 +209,7 @@ describe('getDatasets', () => {
},
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [],
},
{
@ -226,7 +226,7 @@ describe('getDatasets', () => {
},
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [],
},
{
@ -243,7 +243,7 @@ describe('getDatasets', () => {
},
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [],
},
{
@ -260,35 +260,35 @@ describe('getDatasets', () => {
nb_workouts: [
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [],
},
],
total_distance: [
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [],
},
],
total_duration: [
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [],
},
],
total_ascent: [
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [],
},
],
total_descent: [
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [],
},
],
@ -334,35 +334,35 @@ describe('formatStats', () => {
nb_workouts: [
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [0, 0, 0],
},
],
total_distance: [
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [0, 0, 0],
},
],
total_duration: [
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [0, 0, 0],
},
],
total_ascent: [
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [0, 0, 0],
},
],
total_descent: [
{
label: 'Cycling (Transport)',
backgroundColor: ['#88af98'],
backgroundColor: ['#000000'],
data: [0, 0, 0],
},
],