bryan
/
BangleApps_old
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor workout json loading. Fix file name matching bug

master
Paul Cockrell 2020-04-23 11:18:10 +01:00
parent edd1b73bc0
commit f8590bdcf5
3 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/buffgym/buffgym-exercise.js
View File

@ -4,10 +4,10 @@ exports = class Exercise {
this.sets = []; this.sets = [];
this.title = params.title; this.title = params.title;
this.weight = params.weight; this.weight = params.weight;
this.weightIncrement = params.weightIncrement;
this.unit = params.unit; this.unit = params.unit;
this.restPeriod = params.restPeriod; this.restPeriod = params.restPeriod;
this._originalRestPeriod = params.restPeriod; this._originalRestPeriod = params.restPeriod;
this._weightIncrement = params.weightIncrement;
this._restTimeout = null; this._restTimeout = null;
this._restInterval = null; this._restInterval = null;
this._state = null; this._state = null;
@ -50,7 +50,7 @@ exports = class Exercise {
setCompleted() { setCompleted() {
if (!this.canSetCompleted()) throw "All sets must be completed"; if (!this.canSetCompleted()) throw "All sets must be completed";
if (this.canProgress()) this.weight += this._weightIncrement; if (this.canProgress()) this.weight += this.weightIncrement;
this.completed = true; this.completed = true;
} }

25
apps/buffgym/buffgym-workout.js
View File

@ -27,8 +27,30 @@ exports = class Workout {
return !!this.completed; return !!this.completed;
} }
static fromJSON(workout) { static fromJSON(workoutJSON) {
const Set = require("buffgym-set.js");
const Exercise = require("buffgym-exercise.js");
const workout = new this({
title: workoutJSON.title,
});
const exercises = workoutJSON.exercises.map(exerciseJSON => {
const exercise = new Exercise({
title: exerciseJSON.title,
weight: exerciseJSON.weight,
weightIncrement: exerciseJSON.weightIncrement,
unit: exerciseJSON.unit,
restPeriod: exerciseJSON.restPeriod,
});
exerciseJSON.sets.forEach(setJSON => {
exercise.addSet(new Set(setJSON));
});
return exercise;
});
workout.addExercises(exercises);
return workout;
} }
toJSON() { toJSON() {
@ -38,6 +60,7 @@ exports = class Workout {
return { return {
title: exercise.title, title: exercise.title,
weight: exercise.weight, weight: exercise.weight,
weightIncrement: exercise.weightIncrement,
unit: exercise.unit, unit: exercise.unit,
sets: exercise.sets.map(set => set.maxReps), sets: exercise.sets.map(set => set.maxReps),
restPeriod: exercise.restPeriod, restPeriod: exercise.restPeriod,

23
apps/buffgym/buffgym.app.js
View File

@ -246,34 +246,15 @@ function getWorkoutIndex() {
} }
function buildWorkout(fName) { function buildWorkout(fName) {
const Set = require("buffgym-set.js");
const Exercise = require("buffgym-exercise.js");
const Workout = require("buffgym-workout.js"); const Workout = require("buffgym-workout.js");
const workoutJSON = require("Storage").readJSON(fName); const workoutJSON = require("Storage").readJSON(fName);
const workout = new Workout({ const workout = Workout.fromJSON(workoutJSON);
title: workoutJSON.title,
});
const exercises = workoutJSON.exercises.map(exerciseJSON => {
const exercise = new Exercise({
title: exerciseJSON.title,
weight: exerciseJSON.weight,
weightIncrement: exerciseJSON.weightIncrement,
unit: exerciseJSON.unit,
restPeriod: exerciseJSON.restPeriod,
});
exerciseJSON.sets.forEach(setJSON => {
exercise.addSet(new Set(setJSON));
});
return exercise;
});
workout.addExercises(exercises);
return workout; return workout;
} }
function saveWorkout(workout) { function saveWorkout(workout) {
const fName = getWorkoutIndex().find(workout => workout.title === workout.title).file; const fName = getWorkoutIndex().find(w => w.title === workout.title).file;
require("Storage").writeJSON(fName, workout.toJSON()); require("Storage").writeJSON(fName, workout.toJSON());
} }