parent
a84cab6bbf
commit
8dd8f786ef
12
ViewBest.tsx
12
ViewBest.tsx
|
@ -42,18 +42,24 @@ export default function ViewBest() {
|
||||||
.addGroupBy(`STRFTIME('${group}', created)`)
|
.addGroupBy(`STRFTIME('${group}', created)`)
|
||||||
switch (metric) {
|
switch (metric) {
|
||||||
case Metrics.Weight:
|
case Metrics.Weight:
|
||||||
builder.addSelect('MAX(weight)', 'weight').getRawMany().then(setWeights)
|
builder
|
||||||
|
.addSelect('ROUND(MAX(weight), 2)', 'weight')
|
||||||
|
.getRawMany()
|
||||||
|
.then(setWeights)
|
||||||
break
|
break
|
||||||
case Metrics.Volume:
|
case Metrics.Volume:
|
||||||
builder
|
builder
|
||||||
.addSelect('SUM(weight * reps)', 'value')
|
.addSelect('ROUND(SUM(weight * reps), 2)', 'value')
|
||||||
.getRawMany()
|
.getRawMany()
|
||||||
.then(setVolumes)
|
.then(setVolumes)
|
||||||
break
|
break
|
||||||
default:
|
default:
|
||||||
// Brzycki formula https://en.wikipedia.org/wiki/One-repetition_maximum#Brzycki
|
// Brzycki formula https://en.wikipedia.org/wiki/One-repetition_maximum#Brzycki
|
||||||
builder
|
builder
|
||||||
.addSelect('MAX(weight / (1.0278 - 0.0278 * reps))', 'weight')
|
.addSelect(
|
||||||
|
'ROUND(MAX(weight / (1.0278 - 0.0278 * reps)), 2)',
|
||||||
|
'weight',
|
||||||
|
)
|
||||||
.getRawMany()
|
.getRawMany()
|
||||||
.then(newWeights => {
|
.then(newWeights => {
|
||||||
console.log({weights: newWeights})
|
console.log({weights: newWeights})
|
||||||
|
|
|
@ -41,8 +41,8 @@ android {
|
||||||
missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
|
missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 36151
|
versionCode 36152
|
||||||
versionName "1.125"
|
versionName "1.126"
|
||||||
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
|
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
|
||||||
|
|
||||||
if (isNewArchitectureEnabled()) {
|
if (isNewArchitectureEnabled()) {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "massive",
|
"name": "massive",
|
||||||
"version": "1.125",
|
"version": "1.126",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user