Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added total elevation to dashboard #162

Merged
merged 11 commits into from
Jul 23, 2022
Merged

Added total elevation to dashboard #162

merged 11 commits into from
Jul 23, 2022

Conversation

Fmstrat
Copy link
Contributor

@Fmstrat Fmstrat commented Mar 22, 2022

header

@SamR1
Copy link
Owner

SamR1 commented Mar 23, 2022

Hi,

Some feedback before review:

  • is it possible to make change from dev branch?
  • I prefer to keep 4 cards for better display.
    In this case, I think the last card (number of sports) can be removed (this information is displayed in user profile).

@Fmstrat
Copy link
Contributor Author

Fmstrat commented Mar 29, 2022

@SamR1 I've migrated this to the dev branch, however I think there may be another error preventing me from testing. Using Docker and in the client:

$ make docker-serve-client
Building with native build. Learn about native build in Compose here: https://docs.docker.com/go/compose-native-build/
fittrackee-redis is up-to-date
fittrackee-db is up-to-date
fittrackee-mailhog is up-to-date
fittrackee is up-to-date
Recreating fittrackee_client ... done
yarn run v1.22.18
$ vue-cli-service serve
 ERROR  Error loading /usr/src/app/vue.config.js:
 ERROR  TypeError: defineConfig is not a function
TypeError: defineConfig is not a function
    at Object.<anonymous> (/usr/src/app/vue.config.js:6:18)
    at Module._compile (node:internal/modules/cjs/loader:1103:14)
    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1157:10)
    at Module.load (node:internal/modules/cjs/loader:981:32)
    at Function.Module._load (node:internal/modules/cjs/loader:822:12)
    at Module.require (node:internal/modules/cjs/loader:1005:19)
    at require (node:internal/modules/cjs/helpers:102:18)
    at exports.loadModule (/usr/src/app/node_modules/@vue/cli-shared-utils/lib/module.js:79:14)
    at Service.loadUserOptions (/usr/src/app/node_modules/@vue/cli-service/lib/Service.js:330:22)
    at Service.init (/usr/src/app/node_modules/@vue/cli-service/lib/Service.js:70:30)
error Command failed with exit code 1.
info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
ERROR: 1
make: *** [Makefile:62: docker-serve-client] Error 1

This is on a fresh dev branch.

@Fmstrat
Copy link
Contributor Author

Fmstrat commented Mar 29, 2022

Here's the draft if you'd like to see it (untested of course): https://github.com/SamR1/FitTrackee/compare/dev...Fmstrat:elevation2?expand=1

@SamR1
Copy link
Owner

SamR1 commented Mar 30, 2022

Hi,

Thanks for the rebase.
Quick feedback:

  • since it's possible to add a workout without gpx, the ascent for a workout can be null in database (some tests are broken due to null values)
  • the total ascent returned by the API must be a float. I have some errors client-side.

Are you still having issues with Docker? I couldn't reproduce the errors with a fresh install.

@Fmstrat
Copy link
Contributor Author

Fmstrat commented Jul 18, 2022

Looks like pip failed installing dependencies on that last test. I think this one is good.

@SamR1 SamR1 changed the base branch from master to dev July 19, 2022 18:50
@SamR1
Copy link
Owner

SamR1 commented Jul 20, 2022

I fixed total ascent calculation when workouts without gpx exist (ascent is null in this case).

I'll probably add a preference to choose to display total ascent (in my case, ascent/descent values for some old workouts are incorrect).

@SamR1 SamR1 merged commit 856ec21 into SamR1:dev Jul 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants