Merge pull request #217 from Fmstrat/ascent_in_ft
Swapped ascent/descent from km/mi to m/ft in statistics
This commit is contained in:
Sam
GitHub
commit
64fc9f6f4b
2
fittrackee/dist/index.html
vendored
2
fittrackee/dist/index.html
vendored
@ -1 +1 @@
|
|||||||
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"/><link rel="stylesheet" href="/static/css/leaflet.css"/><title>FitTrackee</title><script defer="defer" src="/static/js/chunk-vendors.7132edc6.js"></script><script defer="defer" src="/static/js/app.5447516d.js"></script><link href="/static/css/app.f768a44b.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"/><link rel="stylesheet" href="/static/css/leaflet.css"/><title>FitTrackee</title><script defer="defer" src="/static/js/chunk-vendors.7132edc6.js"></script><script defer="defer" src="/static/js/app.7c155211.js"></script><link href="/static/css/app.f768a44b.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
||||||
2
fittrackee/dist/service-worker.js
vendored
2
fittrackee/dist/service-worker.js
vendored
File diff suppressed because one or more lines are too long
2
fittrackee/dist/service-worker.js.map
vendored
2
fittrackee/dist/service-worker.js.map
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
fittrackee/dist/static/js/app.7c155211.js.map
vendored
Normal file
1
fittrackee/dist/static/js/app.7c155211.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -1,2 +1,2 @@
|
|||||||
"use strict";(self["webpackChunkfittrackee_client"]=self["webpackChunkfittrackee_client"]||[]).push([[193],{9161:function(e,s,t){t.r(s),t.d(s,{default:function(){return A}});t(6699);var a=t(6252),r=t(2262),l=t(3577),o=t(3324),n=t(9996);const c={class:"chart-menu"},i={class:"chart-arrow"},u={class:"time-frames custom-checkboxes-group"},d={class:"time-frames-checkboxes custom-checkboxes"},p=["id","name","checked","onInput"],m={class:"chart-arrow"};var v=(0,a.aZ)({__name:"StatsMenu",emits:["arrowClick","timeFrameUpdate"],setup(e,{emit:s}){const t=(0,r.iH)("month"),o=["week","month","year"];function n(e){t.value=e,s("timeFrameUpdate",e)}return(e,r)=>((0,a.wg)(),(0,a.iD)("div",c,[(0,a._)("div",i,[(0,a._)("i",{class:"fa fa-chevron-left","aria-hidden":"true",onClick:r[0]||(r[0]=e=>s("arrowClick",!0))})]),(0,a._)("div",u,[(0,a._)("div",d,[((0,a.wg)(),(0,a.iD)(a.HY,null,(0,a.Ko)(o,(s=>(0,a._)("div",{class:"time-frame custom-checkbox",key:s},[(0,a._)("label",null,[(0,a._)("input",{type:"radio",id:s,name:s,checked:t.value===s,onInput:e=>n(s)},null,40,p),(0,a._)("span",null,(0,l.zw)(e.$t(`statistics.TIME_FRAMES.${s}`)),1)])]))),64))])]),(0,a._)("div",m,[(0,a._)("i",{class:"fa fa-chevron-right","aria-hidden":"true",onClick:r[1]||(r[1]=e=>s("arrowClick",!1))})])]))}}),k=t(3744);const _=(0,k.Z)(v,[["__scopeId","data-v-22d55de2"]]);var S=_,w=t(631);const f={class:"sports-menu"},h=["id","name","checked","onInput"],U={class:"sport-label"};var b=(0,a.aZ)({__name:"StatsSportsMenu",props:{userSports:null,selectedSportIds:{default:()=>[]}},emits:["selectedSportIdsUpdate"],setup(e,{emit:s}){const t=e,{t:n}=(0,o.QT)(),c=(0,a.f3)("sportColors"),{selectedSportIds:i}=(0,r.BK)(t),u=(0,a.Fl)((()=>(0,w.xH)(t.userSports,n)));function d(e){s("selectedSportIdsUpdate",e)}return(e,s)=>{const t=(0,a.up)("SportImage");return(0,a.wg)(),(0,a.iD)("div",f,[((0,a.wg)(!0),(0,a.iD)(a.HY,null,(0,a.Ko)((0,r.SU)(u),(e=>((0,a.wg)(),(0,a.iD)("label",{type:"checkbox",key:e.id,style:(0,l.j5)({color:e.color?e.color:(0,r.SU)(c)[e.label]})},[(0,a._)("input",{type:"checkbox",id:e.id,name:e.label,checked:(0,r.SU)(i).includes(e.id),onInput:s=>d(e.id)},null,40,h),(0,a.Wm)(t,{"sport-label":e.label,color:e.color},null,8,["sport-label","color"]),(0,a._)("span",U,(0,l.zw)(e.translatedLabel),1)],4)))),128))])}}});const I=b;var g=I,T=t(9318);const y={key:0,id:"user-statistics"};var C=(0,a.aZ)({__name:"index",props:{sports:null,user:null},setup(e){const s=e,{t:t}=(0,o.QT)(),{sports:l,user:c}=(0,r.BK)(s),i=(0,r.iH)("month"),u=(0,r.iH)(v(i.value)),d=(0,a.Fl)((()=>(0,w.xH)(s.sports,t))),p=(0,r.iH)(_(s.sports));function m(e){i.value=e,u.value=v(i.value)}function v(e){return(0,T.aZ)(new Date,e,s.user.weekm)}function k(e){u.value=(0,T.FN)(u.value,e,s.user.weekm)}function _(e){return e.map((e=>e.id))}function f(e){p.value.includes(e)?p.value=p.value.filter((s=>s!==e)):p.value.push(e)}return(0,a.YP)((()=>s.sports),(e=>{p.value=_(e)})),(e,s)=>(0,r.SU)(d)?((0,a.wg)(),(0,a.iD)("div",y,[(0,a.Wm)(S,{onTimeFrameUpdate:m,onArrowClick:k}),(0,a.Wm)(n.Z,{sports:(0,r.SU)(l),user:(0,r.SU)(c),chartParams:u.value,"displayed-sport-ids":p.value,fullStats:!0},null,8,["sports","user","chartParams","displayed-sport-ids"]),(0,a.Wm)(g,{"selected-sport-ids":p.value,"user-sports":(0,r.SU)(l),onSelectedSportIdsUpdate:f},null,8,["selected-sport-ids","user-sports"])])):(0,a.kq)("",!0)}});const F=(0,k.Z)(C,[["__scopeId","data-v-d693c7da"]]);var Z=F,x=t(5630),D=t(8602),H=t(9917);const E={id:"statistics",class:"view"},R={key:0,class:"container"};var W=(0,a.aZ)({__name:"StatisticsView",setup(e){const s=(0,H.o)(),t=(0,a.Fl)((()=>s.getters[D.YN.GETTERS.AUTH_USER_PROFILE])),o=(0,a.Fl)((()=>s.getters[D.O8.GETTERS.SPORTS].filter((e=>t.value.sports_list.includes(e.id)))));return(e,s)=>{const n=(0,a.up)("Card");return(0,a.wg)(),(0,a.iD)("div",E,[(0,r.SU)(t).username?((0,a.wg)(),(0,a.iD)("div",R,[(0,a.Wm)(n,null,{title:(0,a.w5)((()=>[(0,a.Uk)((0,l.zw)(e.$t("statistics.STATISTICS")),1)])),content:(0,a.w5)((()=>[(0,a.Wm)(Z,{class:(0,l.C_)({"stats-disabled":0===(0,r.SU)(t).nb_workouts}),user:(0,r.SU)(t),sports:(0,r.SU)(o)},null,8,["class","user","sports"])])),_:1}),0===(0,r.SU)(t).nb_workouts?((0,a.wg)(),(0,a.j4)(x.Z,{key:0})):(0,a.kq)("",!0)])):(0,a.kq)("",!0)])}}});const P=(0,k.Z)(W,[["__scopeId","data-v-2e341d4e"]]);var A=P}}]);
|
"use strict";(self["webpackChunkfittrackee_client"]=self["webpackChunkfittrackee_client"]||[]).push([[193],{9161:function(e,s,t){t.r(s),t.d(s,{default:function(){return A}});t(6699);var a=t(6252),r=t(2262),l=t(3577),o=t(3324),n=t(4998);const c={class:"chart-menu"},i={class:"chart-arrow"},u={class:"time-frames custom-checkboxes-group"},d={class:"time-frames-checkboxes custom-checkboxes"},p=["id","name","checked","onInput"],m={class:"chart-arrow"};var v=(0,a.aZ)({__name:"StatsMenu",emits:["arrowClick","timeFrameUpdate"],setup(e,{emit:s}){const t=(0,r.iH)("month"),o=["week","month","year"];function n(e){t.value=e,s("timeFrameUpdate",e)}return(e,r)=>((0,a.wg)(),(0,a.iD)("div",c,[(0,a._)("div",i,[(0,a._)("i",{class:"fa fa-chevron-left","aria-hidden":"true",onClick:r[0]||(r[0]=e=>s("arrowClick",!0))})]),(0,a._)("div",u,[(0,a._)("div",d,[((0,a.wg)(),(0,a.iD)(a.HY,null,(0,a.Ko)(o,(s=>(0,a._)("div",{class:"time-frame custom-checkbox",key:s},[(0,a._)("label",null,[(0,a._)("input",{type:"radio",id:s,name:s,checked:t.value===s,onInput:e=>n(s)},null,40,p),(0,a._)("span",null,(0,l.zw)(e.$t(`statistics.TIME_FRAMES.${s}`)),1)])]))),64))])]),(0,a._)("div",m,[(0,a._)("i",{class:"fa fa-chevron-right","aria-hidden":"true",onClick:r[1]||(r[1]=e=>s("arrowClick",!1))})])]))}}),k=t(3744);const _=(0,k.Z)(v,[["__scopeId","data-v-22d55de2"]]);var S=_,w=t(631);const f={class:"sports-menu"},h=["id","name","checked","onInput"],U={class:"sport-label"};var b=(0,a.aZ)({__name:"StatsSportsMenu",props:{userSports:null,selectedSportIds:{default:()=>[]}},emits:["selectedSportIdsUpdate"],setup(e,{emit:s}){const t=e,{t:n}=(0,o.QT)(),c=(0,a.f3)("sportColors"),{selectedSportIds:i}=(0,r.BK)(t),u=(0,a.Fl)((()=>(0,w.xH)(t.userSports,n)));function d(e){s("selectedSportIdsUpdate",e)}return(e,s)=>{const t=(0,a.up)("SportImage");return(0,a.wg)(),(0,a.iD)("div",f,[((0,a.wg)(!0),(0,a.iD)(a.HY,null,(0,a.Ko)((0,r.SU)(u),(e=>((0,a.wg)(),(0,a.iD)("label",{type:"checkbox",key:e.id,style:(0,l.j5)({color:e.color?e.color:(0,r.SU)(c)[e.label]})},[(0,a._)("input",{type:"checkbox",id:e.id,name:e.label,checked:(0,r.SU)(i).includes(e.id),onInput:s=>d(e.id)},null,40,h),(0,a.Wm)(t,{"sport-label":e.label,color:e.color},null,8,["sport-label","color"]),(0,a._)("span",U,(0,l.zw)(e.translatedLabel),1)],4)))),128))])}}});const I=b;var g=I,T=t(9318);const y={key:0,id:"user-statistics"};var C=(0,a.aZ)({__name:"index",props:{sports:null,user:null},setup(e){const s=e,{t:t}=(0,o.QT)(),{sports:l,user:c}=(0,r.BK)(s),i=(0,r.iH)("month"),u=(0,r.iH)(v(i.value)),d=(0,a.Fl)((()=>(0,w.xH)(s.sports,t))),p=(0,r.iH)(_(s.sports));function m(e){i.value=e,u.value=v(i.value)}function v(e){return(0,T.aZ)(new Date,e,s.user.weekm)}function k(e){u.value=(0,T.FN)(u.value,e,s.user.weekm)}function _(e){return e.map((e=>e.id))}function f(e){p.value.includes(e)?p.value=p.value.filter((s=>s!==e)):p.value.push(e)}return(0,a.YP)((()=>s.sports),(e=>{p.value=_(e)})),(e,s)=>(0,r.SU)(d)?((0,a.wg)(),(0,a.iD)("div",y,[(0,a.Wm)(S,{onTimeFrameUpdate:m,onArrowClick:k}),(0,a.Wm)(n.Z,{sports:(0,r.SU)(l),user:(0,r.SU)(c),chartParams:u.value,"displayed-sport-ids":p.value,fullStats:!0},null,8,["sports","user","chartParams","displayed-sport-ids"]),(0,a.Wm)(g,{"selected-sport-ids":p.value,"user-sports":(0,r.SU)(l),onSelectedSportIdsUpdate:f},null,8,["selected-sport-ids","user-sports"])])):(0,a.kq)("",!0)}});const F=(0,k.Z)(C,[["__scopeId","data-v-d693c7da"]]);var Z=F,x=t(5630),D=t(8602),H=t(9917);const E={id:"statistics",class:"view"},R={key:0,class:"container"};var W=(0,a.aZ)({__name:"StatisticsView",setup(e){const s=(0,H.o)(),t=(0,a.Fl)((()=>s.getters[D.YN.GETTERS.AUTH_USER_PROFILE])),o=(0,a.Fl)((()=>s.getters[D.O8.GETTERS.SPORTS].filter((e=>t.value.sports_list.includes(e.id)))));return(e,s)=>{const n=(0,a.up)("Card");return(0,a.wg)(),(0,a.iD)("div",E,[(0,r.SU)(t).username?((0,a.wg)(),(0,a.iD)("div",R,[(0,a.Wm)(n,null,{title:(0,a.w5)((()=>[(0,a.Uk)((0,l.zw)(e.$t("statistics.STATISTICS")),1)])),content:(0,a.w5)((()=>[(0,a.Wm)(Z,{class:(0,l.C_)({"stats-disabled":0===(0,r.SU)(t).nb_workouts}),user:(0,r.SU)(t),sports:(0,r.SU)(o)},null,8,["class","user","sports"])])),_:1}),0===(0,r.SU)(t).nb_workouts?((0,a.wg)(),(0,a.j4)(x.Z,{key:0})):(0,a.kq)("",!0)])):(0,a.kq)("",!0)])}}});const P=(0,k.Z)(W,[["__scopeId","data-v-2e341d4e"]]);var A=P}}]);
|
||||||
//# sourceMappingURL=statistics.ef50f3c2.js.map
|
//# sourceMappingURL=statistics.4d8d4299.js.map
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -55,6 +55,11 @@
|
|||||||
function getSum(total: any, value: any): number {
|
function getSum(total: any, value: any): number {
|
||||||
return getNumber(total) + getNumber(value)
|
return getNumber(total) + getNumber(value)
|
||||||
}
|
}
|
||||||
|
function getUnit(displayedData: string) {
|
||||||
|
return ['total_ascent', 'total_descent'].includes(displayedData)
|
||||||
|
? 'm'
|
||||||
|
: 'km'
|
||||||
|
}
|
||||||
const chartData: ComputedRef<ChartData<'bar'>> = computed(() => ({
|
const chartData: ComputedRef<ChartData<'bar'>> = computed(() => ({
|
||||||
labels: props.labels,
|
labels: props.labels,
|
||||||
// workaround to avoid dataset modification
|
// workaround to avoid dataset modification
|
||||||
@ -88,12 +93,13 @@
|
|||||||
props.displayedData,
|
props.displayedData,
|
||||||
+value,
|
+value,
|
||||||
props.useImperialUnits,
|
props.useImperialUnits,
|
||||||
false
|
false,
|
||||||
|
getUnit(props.displayedData)
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
afterFit: function (scale: LayoutItem) {
|
afterFit: function (scale: LayoutItem) {
|
||||||
scale.width = props.fullStats ? 75 : 60
|
scale.width = props.fullStats ? 90 : 60
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -143,7 +149,8 @@
|
|||||||
props.displayedData,
|
props.displayedData,
|
||||||
total,
|
total,
|
||||||
props.useImperialUnits,
|
props.useImperialUnits,
|
||||||
false
|
false,
|
||||||
|
getUnit(props.displayedData)
|
||||||
)
|
)
|
||||||
: null
|
: null
|
||||||
}
|
}
|
||||||
@ -172,7 +179,9 @@
|
|||||||
label += formatTooltipValue(
|
label += formatTooltipValue(
|
||||||
props.displayedData,
|
props.displayedData,
|
||||||
context.parsed.y,
|
context.parsed.y,
|
||||||
props.useImperialUnits
|
props.useImperialUnits,
|
||||||
|
true,
|
||||||
|
getUnit(props.displayedData)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
return label
|
return label
|
||||||
@ -190,7 +199,9 @@
|
|||||||
formatTooltipValue(
|
formatTooltipValue(
|
||||||
props.displayedData,
|
props.displayedData,
|
||||||
sum,
|
sum,
|
||||||
props.useImperialUnits
|
props.useImperialUnits,
|
||||||
|
true,
|
||||||
|
getUnit(props.displayedData)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|||||||
@ -6,9 +6,9 @@ export const formatTooltipValue = (
|
|||||||
displayedData: TStatisticsDatasetKeys,
|
displayedData: TStatisticsDatasetKeys,
|
||||||
value: number,
|
value: number,
|
||||||
useImperialUnits: boolean,
|
useImperialUnits: boolean,
|
||||||
formatWithUnits = true
|
formatWithUnits = true,
|
||||||
|
unitFrom = 'km'
|
||||||
): string => {
|
): string => {
|
||||||
const unitFrom = 'km'
|
|
||||||
const unitTo = useImperialUnits ? units[unitFrom].defaultTarget : unitFrom
|
const unitTo = useImperialUnits ? units[unitFrom].defaultTarget : unitFrom
|
||||||
switch (displayedData) {
|
switch (displayedData) {
|
||||||
case 'average_speed':
|
case 'average_speed':
|
||||||
@ -16,10 +16,9 @@ export const formatTooltipValue = (
|
|||||||
case 'total_duration':
|
case 'total_duration':
|
||||||
return formatDuration(value, formatWithUnits)
|
return formatDuration(value, formatWithUnits)
|
||||||
case 'total_distance':
|
case 'total_distance':
|
||||||
return `${value.toFixed(2)} ${unitTo}`
|
|
||||||
case 'total_ascent':
|
case 'total_ascent':
|
||||||
case 'total_descent':
|
case 'total_descent':
|
||||||
return `${(value / 1000).toFixed(2)} ${unitTo}`
|
return `${value.toFixed(2)} ${unitTo}`
|
||||||
default:
|
default:
|
||||||
return value.toString()
|
return value.toString()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -30,16 +30,16 @@ describe('formatTooltipValue', () => {
|
|||||||
expectedResult: '30.00 km',
|
expectedResult: '30.00 km',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
description: 'returns 0.003 km if input is total ascent',
|
description: 'returns 30 km if input is total ascent',
|
||||||
inputDisplayedData: datasetKeys[4], // 'total_distance'
|
inputDisplayedData: datasetKeys[4], // 'total_ascent'
|
||||||
inputValue: 30,
|
inputValue: 30,
|
||||||
expectedResult: '0.03 km',
|
expectedResult: '30.00 km',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
description: 'returns 0.003 km if input is total descent',
|
description: 'returns 30 km if input is total descent',
|
||||||
inputDisplayedData: datasetKeys[5], // 'total_distance'
|
inputDisplayedData: datasetKeys[5], // 'total_descent'
|
||||||
inputValue: 30,
|
inputValue: 30,
|
||||||
expectedResult: '0.03 km',
|
expectedResult: '30.00 km',
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -84,16 +84,16 @@ describe('formatTooltipValue after conversion to imperial units', () => {
|
|||||||
expectedResult: '30.00 mi',
|
expectedResult: '30.00 mi',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
description: 'returns 0.03 mi if input is total ascent',
|
description: 'returns 30 mi if input is total ascent',
|
||||||
inputDisplayedData: datasetKeys[4], // 'total_distance'
|
inputDisplayedData: datasetKeys[4], // 'total_ascent'
|
||||||
inputValue: 30,
|
inputValue: 30,
|
||||||
expectedResult: '0.03 mi',
|
expectedResult: '30.00 mi',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
description: 'returns 0.03 mi if input is total descent',
|
description: 'returns 30 mi if input is total descent',
|
||||||
inputDisplayedData: datasetKeys[5], // 'total_distance'
|
inputDisplayedData: datasetKeys[5], // 'total_descent'
|
||||||
inputValue: 30,
|
inputValue: 30,
|
||||||
expectedResult: '0.03 mi',
|
expectedResult: '30.00 mi',
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -111,6 +111,54 @@ describe('formatTooltipValue after conversion to imperial units', () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
describe('formatTooltipValue with unitFrom', () => {
|
||||||
|
const testsParams = [
|
||||||
|
{
|
||||||
|
description: 'returns 30 km if input is total ascent',
|
||||||
|
inputDisplayedData: datasetKeys[4], // 'total_ascent'
|
||||||
|
inputValue: 30,
|
||||||
|
expectedResult: '30.00 m',
|
||||||
|
useImperialUnits: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
description: 'returns 30 km if input is total descent',
|
||||||
|
inputDisplayedData: datasetKeys[5], // 'total_descent'
|
||||||
|
inputValue: 30,
|
||||||
|
expectedResult: '30.00 m',
|
||||||
|
useImperialUnits: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
description: 'returns 30 mi if input is total ascent',
|
||||||
|
inputDisplayedData: datasetKeys[4], // 'total_ascent'
|
||||||
|
inputValue: 30,
|
||||||
|
expectedResult: '30.00 ft',
|
||||||
|
useImperialUnits: true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
description: 'returns 30 mi if input is total descent',
|
||||||
|
inputDisplayedData: datasetKeys[5], // 'total_descent'
|
||||||
|
inputValue: 30,
|
||||||
|
expectedResult: '30.00 ft',
|
||||||
|
useImperialUnits: true,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
testsParams.map((testParams) => {
|
||||||
|
it(testParams.description, () => {
|
||||||
|
assert.equal(
|
||||||
|
formatTooltipValue(
|
||||||
|
testParams.inputDisplayedData,
|
||||||
|
testParams.inputValue,
|
||||||
|
testParams.useImperialUnits,
|
||||||
|
true,
|
||||||
|
'm'
|
||||||
|
),
|
||||||
|
testParams.expectedResult
|
||||||
|
)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
describe('formatTooltipValue (formatWithUnits = false)', () => {
|
describe('formatTooltipValue (formatWithUnits = false)', () => {
|
||||||
const testsParams = [
|
const testsParams = [
|
||||||
{
|
{
|
||||||
@ -138,16 +186,16 @@ describe('formatTooltipValue (formatWithUnits = false)', () => {
|
|||||||
expectedResult: '30.00 km',
|
expectedResult: '30.00 km',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
description: 'returns 0.003 km if input is total ascent',
|
description: 'returns 30 km if input is total ascent',
|
||||||
inputDisplayedData: datasetKeys[4], // 'total_distance'
|
inputDisplayedData: datasetKeys[4], // 'total_ascent'
|
||||||
inputValue: 30,
|
inputValue: 30,
|
||||||
expectedResult: '0.03 km',
|
expectedResult: '30.00 km',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
description: 'returns 0.003 km if input is total descent',
|
description: 'returns 30 km if input is total descent',
|
||||||
inputDisplayedData: datasetKeys[5], // 'total_distance'
|
inputDisplayedData: datasetKeys[5], // 'total_descent'
|
||||||
inputValue: 30,
|
inputValue: 30,
|
||||||
expectedResult: '0.03 km',
|
expectedResult: '30.00 km',
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user