bodyrep/DemoApp
1
0
Fork 0
mirror of https://github.com/bodyrep/DemoApp.git synced 2025-12-06 06:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

added methods and routes for getting an exercises history, and the sum of a workouts musclearrays -- incl a modifier

Browse Source
This commit is contained in:
Stuiart Stent
2013-01-25 00:20:32 -05:00
parent 1e3238dcc7
commit 5584faedef
10 changed files with 105 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app.js
View File

@@ -8,7 +8,6 @@ http = require('http');
routes = require('./routes');
var async = require('async');
var app = express();
var dbURL = 'mongodb://localhost/database';
var db = require('mongoose').connect(dbURL);
var qs = require('qs');

10
data/schemas/user.js
View File

@@ -1,13 +1,21 @@
var mongoose = require('mongoose');
var Schema = require('mongoose').Schema;
var ExerciseStat = new Schema({
exerciseID: { type: Schema.ObjectId, ref: 'Exercise'},
modifier: {type: Number}
});
var UserSchema = new mongoose.Schema({
username: {type: String, unique: true, required: true},
name: String,
password: String,
is_admin: {type: Boolean, 'default': false },
is_imperial: {type: Boolean, 'default': false },
favorites: [{ type: Schema.ObjectId, ref: 'Exercises'}]
favorites: [{ type: Schema.ObjectId, ref: 'Exercises'}],
exercisestats: [ExerciseStat]
});
UserSchema.methods.recentworkouts = function(callback) {

3
data/schemas/workout.js
View File

@@ -8,7 +8,8 @@ var Split = new Schema({
var Element = new Schema({
exerciseID: String,
exerciseID: { type: Schema.ObjectId, ref: 'Exercise'},
modifier: {type: Number},
splits: [Split]
});

31
public/javascripts/scripts.js
View File

@@ -66,30 +66,41 @@ $(document).ready(function() {
$("#newworkout").bind('sortupdate', function(event, ui) {
$('#exercises > li').each(function(){
var itemindex= $(this).index();
var newname = $(this).find('input, select').attr('name').replace(/elements\[[0-9]*\]/,'elements[' + itemindex + ']');
// var newname = $(this).find('input, select').attr('name').replace(/elements\[[0-9]*\]/,'elements[' + itemindex + ']');
$(this).find('input, select').each(function() {
var newname = $(this).attr('name').replace(/elements\[[0-9]*\]/,'elements[' + itemindex + ']');
$(this).attr('name', newname);
});
// $(this).find('label').each(function() {
// var value = $(this).attr('href');
// console.log ('value -' + value);
// $(this).attr('href', value.replace(/elements\[[0-9]*\]/,'elements[' + itemindex + ']'));
$(this).children('label').html(newname);
$(this).children('input').attr('name', newname);
// //var newname = $(this).html.replace(/elements\[[0-9]*\]/,'elements[' + itemindex + ']');
// //$(this).html(newname);
// });
$(this).find('ul li').each(function(){
var itemindex2= $(this).index();
$(this).children('input').each(function(){
var newname2 = $(this).attr('name').replace(/\[splits\]\[[0-9]*\]/,'[splits][' + itemindex2 + ']');
newname2 = newname2.replace(/elements\[[0-9]*\]/,'elements[' + itemindex + ']');
$(this).attr('name', newname2);
});
});
$(this).children('label').each(function(){
var newname2 = $(this).attr('name').replace(/\[splits\]\[[0-9]*\]/,'[splits][' + itemindex2 + ']');
newname2 = newname2.replace(/elements\[[0-9]*\]/,'elements[' + itemindex + ']');
$(this).children('label').each(function(){
//var newname2 = $(this).attr('name').replace(/\[splits\]\[[0-9]*\]/,'[splits][' + itemindex2 + ']');
//newname2 = newname2.replace(/elements\[[0-9]*\]/,'elements[' + itemindex + ']');
var newname2 = 'Set '+ (itemindex2 + 1 ) + '';
$(this).html(newname2);
});
});
//Only show delete if more than 1 set
if ( $(this).siblings('.set').length > 0 ) {
$(this).children('.delete').show();
console.log(">1 " + $(this).siblings('.set').length);
} else {
$(this).children('.delete').hide();
console.log("=1 " + $(this).siblings('.set').length);
}
});

45
public/javascripts/workout.js
View File

@@ -3,8 +3,11 @@
$(document).on('click', '.addthisExercise',(function() {
// $("button.addthisExercise").click(function() {
console.log("This exercise name li" + JSON.stringify($(this).closest('li').data()));
var newElem = $('<li class=ui-state-default ><label for="element">elements[0][exerciseID]<br /></label><input name="elements[][exerciseID]" class="element" value="' + $(this).closest('li').data('name') + '"><button type="button" class="addSet">Add Set</button><button type="button" class="delete">Delete Exercise</button><ul class="sets"><li class="set"><label for="element" name="elements[0][splits][0][reps]">elements[0][splits][0][reps]<br /></label><input name="elements[0][splits][0][reps]" class="element"><label for="element" name="elements[0][splits][0][weight]"><br />elements[0][splits][0][weight]<br /></label><input name="elements[0][splits][0][weight]" class="element"><button type="button" class="delete">Delete Set</button></li></ul></li>');
var newElem = $('<li class=ui-state-default ><label for="element">Name</label><input name="exercisename" class="element" value="' + $(this).closest('li').data('name') + '"><input name="elements[][exerciseID]" class="hiddenelement" value="' + $(this).closest('li').data('exid') + '"><input name="elements[][Modifier]" class="element" value="' + $(this).closest('li').data('musclearrayMod') + '"><button type="button" class="addSet">Add Set</button><button type="button" class="delete">Delete Exercise</button><ul class="sets"><li class="set"><label for="element" name="elements[0][splits][0][reps]">elements[0][splits][0][reps]<br /></label><input name="elements[0][splits][0][reps]" class="element"><label for="element" name="elements[0][splits][0][weight]"><br />elements[0][splits][0][weight]<br /></label><input name="elements[0][splits][0][weight]" class="element"><button type="button" class="delete">Delete Set</button></li></ul></li>');
$(newElem).data('musclearray', $(this).closest('li').data('musclearray'));
$(newElem).data('musclearrayMod', $(this).closest('li').data('musclearrayMod'));
$(newElem).appendTo('ul#exercises');
$( ".hiddenelement" ).hide();
$("button").button();
$( "ul#exercises" ).sortable( "refresh" );
$( "ul#sets" ).sortable( "refresh" );
@@ -16,19 +19,26 @@
//PopulateExerciseList(arr);
$(document).on('click', '.filter',(function (){
console.time('Filter');
var keyREGEX= "";
var len = $('.filter').length;
$(".filter").each(function(index, element) {
var keyREGEX= "";
if ($(".filter:checked").length > 0)
{
// any one is checked
var len = $('.filter').length;
$(".filter").each(function(index, element) {
if ($(this).is (':checked'))
{
// Do stuff
keyREGEX += '('+ $(this).val() +')';
}
});
//keyREGEX += "'";
keyREGEX = keyREGEX.replace(")(", ")|(");
} else {
// none is checked
keyREGEX = '(none is checked)';
}
if ($(this).is (':checked'))
{
// Do stuff
keyREGEX += '('+ $(this).val() +')';
}
});
//keyREGEX += "'";
keyREGEX = keyREGEX.replace(")(", ")|(");
console.log("Regex= " + keyREGEX);
filteredExerciseArray = filterarray(originalExerciselist, keyREGEX);
PopulateExerciseList(filteredExerciseArray);
@@ -59,6 +69,9 @@ function PopulateExerciseList(exerciselist) {
//console.log("Exercisename = " + item.name);
var newElem = $('<li>'+item.name + ' - ' + item.description + ' - ' + item.keywords +'<button type="button" class="addthisExercise">+</li>');
$(newElem).data('name', item.name);
$(newElem).data('exid', item._id);
$(newElem).data('musclearray', item.musclearray);
//$(newElem).data('musclearrayMod', item.musclearrayMod);
$(newElem).data('datafields', item.datafields);
newExerciselist.append(newElem);
});
@@ -74,9 +87,3 @@ function PopulateExerciseList(exerciselist) {
});
// function populateHandles() {
// var options = '';
// for (var i = 0; i < handles.length; i++) {
// options += '<option value="' + handles[i] + '">' + handles[i] + '</option>';
// }
// $('#listBox').html(options);

1
public/stylesheets/style.css
View File

@@ -15,6 +15,7 @@ list-style-type: none;
list-style-type: none;
}
#exerciselist {
width : 500px;
height : 400px;

39
routes/api.js
View File

@@ -30,4 +30,43 @@ module.exports = function(app) {
});
app.get('/api/getexercisemodifier/:userid/:exerciseid', function(req, res) {
res.contentType('json');
console.log('userID' + req.params.userid);
console.log('exerciseID' + req.params.exerciseid);
//DB search workouts
// where userid
//where exerciseid
Workout
.where('userID', req.params.userid)
.where('elements.exerciseID', req.params.exerciseid)
.select('elements')
// .exec(callback);
// workout.findOne({_id: req.params._id})
// //.populate('elements.exerciseID')
.exec(function(err, workout) {
if (err) {
return next(err);
}
if (! workout) {
return res.send('Not found', 404);
}
//need for loop for workout as it returns an array
var filteredarray = workout[0].elements.filter( function(i) {
return i.exerciseID == req.params.exerciseid;
});
// then for each in filtered array grab sets reps weight
// punch that into an array.
// res.send(filteredarray);
// //console.log("hmm" + JSON.stringify(workout[0].elements));
res.send(workout);
//next();
});
});
};

2
routes/middleware/load_workout.js
View File

@@ -3,7 +3,7 @@ var workout = require('../../data/models/workout');
function loadworkout(req, res, next) {
console.log('fetch id' + req.params._id );
workout.findOne({_id: req.params._id})
//.populate('elements')
.populate('elements.exerciseID')
.exec(function(err, workout) {
if (err) {
return next(err);

6
routes/workouts.js
View File

@@ -11,6 +11,7 @@ var loggedIn = require('./middleware/logged_in');
var maxWorkoutsPerPage = 5;
var Exercise = require('../data/models/exercise');
var loadExercise = require('./middleware/load_exercise');
var MuscleArray = require('./middleware/musclearray');
var Moment = require('moment');
module.exports = function(app) {
@@ -60,8 +61,11 @@ module.exports = function(app) {
});
app.get('/workouts/:_id', loadWorkout, function(req, res, next){
app.get('/workouts/:_id', loggedIn, loadWorkout, function(req, res, next){
console.log("time" + Moment.utc(req.workout.workoutDate).format("ddd, hA"));
var output = MuscleArray(req.workout);
console.log('output - ' + JSON.stringify(output));
res.render('workouts/workout', {title: req.workout.title,
workout: req.workout,
workouttime: Moment.utc(req.workout.workoutDate).format("ddd, hA")

2
views/workouts/new.jade
View File

@@ -10,7 +10,7 @@ block content
ul#exerciselist
div#filters
h3 Filters ( currently just placeholder )
h3 Filters
label Free Weights
input.filter(type="checkbox", checked=true, value="Free Weights")
label Bodyweight