sstent/alex_app1
1
0
Fork 0
mirror of https://github.com/sstent/alex_app1.git synced 2025-12-06 08:02:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixinging various issues

Browse Source
This commit is contained in:
Stuart Stent
2013-01-10 00:03:21 -05:00
parent 4aebfbf83d
commit 10ff5096ff
5 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app.js
View File

@@ -114,7 +114,7 @@ io.sockets.on('connection', function(socket) {
if (err) throw err; if (err) throw err;
itemx.exercisename = exresult.exercise.name; itemx.exercisename = exresult.exercise.name;
itemx.exercisemuscledata = exresult.exercise.muscledata; itemx.exercisemuscledata = exresult.exercise.muscledata;
itemx.exerciseclass = exresult.exercise.type; itemx.exercisetype = exresult.exercise.type;
callback3(); callback3();
}); });
}, function(err){ }, function(err){
@@ -139,16 +139,18 @@ io.sockets.on('connection', function(socket) {
testcollection.findById(id, function(err, result) { testcollection.findById(id, function(err, result) {
if (err) throw err; if (err) throw err;
async.forEachSeries(item.Activities.Activity.Lap, async.forEachSeries(result.Activities.Activity.Lap,
function(itemx,callback3){ function(itemx,callback3){
exercisecollection.findById(itemx.selection, function(err, exresult) { exercisecollection.findById(itemx.selection, function(err, exresult) {
if (err) throw err; if (err) throw err;
itemx.exercisename = exresult.exercise.name; itemx.exercisename = exresult.exercise.name;
itemx.exercisemuscledata = exresult.exercise.muscledata; itemx.exercisemuscledata = exresult.exercise.muscledata;
itemx.exerciseclass = exresult.exercise.type; itemx.exercisetype = exresult.exercise.type;
callback3(); callback3();
}); });
}, function(err){callback2();}); }, function(err){
socket.emit('populateactivitybyid', result);
});
}); });
}); });

18
index.html
View File

@@ -33,22 +33,20 @@
</script> </script>
<script id="DataTemplate1" type="text/x-jsrender"> <script id="DataTemplate1" type="text/x-jsrender">
<h3>{{:Activities.Activity.date}}</h3> // <h3>{{:Activities.Activity.date}}</h3>
<div class="workoutdata"> // <div class="workoutdata">
<a href=# class="activitydelete" title="{{:_id}}" >Delete</a> // <a href=# class="activitydelete" title="{{:_id}}" >Delete</a>
<a href=# class="activityedit" title="{{:_id}}" >Edit</a> // <a href=# class="activityedit" title="{{:_id}}" >Edit</a>
</div> // </div>
</script>
// </script>
</head> </head>
<body> <body>
<div id="container"> <div id="container">
<div id="logo"><H1>BodyREP Demo</h1></div> <div id="logo"><H1>BodyREP Demo</h1></div>
<div id="display"> <div id="display">
<button type="button" id="openactivities" value="AddExercise"/>Add New Workout</button>
<ul> <ul>
<li style="display: none" class="new-lap ui-state-default removable"> <li style="display: none" class="new-lap ui-state-default removable">
<label class="uiindex"></label> <label class="uiindex"></label>
@@ -65,7 +63,6 @@
<ul id="ActivityList"></ul> <ul id="ActivityList"></ul>
</div> </div>
<div id="RightColumn">
<div id="Activity"> <div id="Activity">
<span class="ActivityID"> <span class="ActivityID">
<form id="myForm"> <form id="myForm">
@@ -82,7 +79,6 @@
</div>
</div> </div>
</div> </div>

47
static/javascripts/script.js
View File

@@ -2,21 +2,21 @@ $(document).ready(function() {
//makes buttons buttons //makes buttons buttons
$("button").button(); $("button").button();
// $("#Activity").dialog({ autoOpen: false }); $("#Activity").dialog({ autoOpen: false });
// $( "#Activity" ).dialog( "option", "minHeight", 330 ); $( "#Activity" ).dialog( "option", "minHeight", 330 );
// $( "#Activity" ).dialog( "option", "minWidth", 730 ); $( "#Activity" ).dialog( "option", "minWidth", 830 );
// $( "#Activity" ).dialog({ buttons: [ $( "#Activity" ).dialog({ buttons: [
// { {
// text: "Close/Cancel", text: "Close/Cancel",
// click: function() { $(this).dialog("close"); } click: function() { $(this).dialog("close"); }
// } }
// ] ]
// }); });
// $("button#openactivities").click(function() { $("button#openactivities").click(function() {
// // //
// $("#Activity").dialog("open"); $("#Activity").dialog("open");
// }); });
@@ -60,7 +60,7 @@ $(document).ready(function() {
$('#Activity').find('input').attr('value',''); $('#Activity').find('input').attr('value','');
$('#Activity').find('input.datepicker').datepicker(); $('#Activity').find('input.datepicker').datepicker();
$('#Activity').find('input.datepicker').datepicker('setDate', new Date()); $('#Activity').find('input.datepicker').datepicker('setDate', new Date());
console.log('populateactivity' + JSON.stringify(json));
//set document id //set document id
$('span.ActivityID').attr('docid',json._id); $('span.ActivityID').attr('docid',json._id);
//poulate name //poulate name
@@ -73,12 +73,12 @@ $(document).ready(function() {
var array = json.Activities.Activity.Lap; var array = json.Activities.Activity.Lap;
$.each(array, function(index, value) { $.each(array, function(index, value) {
////if cardio ////if cardio
if (value.type == "Cardio" ) { if (value.exercisetype == "Cardio" ) {
//get exercise muscledata //get exercise muscledata
AddPopulatedLap("Cardio", value.name, value.time, value.distance, "", "" , "", value.exercisemuscledata); AddPopulatedLap("Cardio", value.name, value.time, value.distance, "", "" , "", value.exercisemuscledata);
} }
////if exercise ////if exercise
if (value.type == "Exercise" ) { if (value.exercisetype == "Exercise" ) {
//get exercise muscledata //get exercise muscledata
console.log("selction = " + value.selection); console.log("selction = " + value.selection);
AddPopulatedLap("Exercise", value.name, "", "", value.sets, value.reps , value.weight , value.exercisemuscledata); AddPopulatedLap("Exercise", value.name, "", "", value.sets, value.reps , value.weight , value.exercisemuscledata);
@@ -214,13 +214,18 @@ $(document).ready(function() {
var currentselect; var currentselect;
switch($(this).val()) { switch($(this).val()) {
case "Cardio": case "Cardio":
$(this).siblings('span').html('<select class="ExerciseDropDownCardio" name="Activities.Activity.Lap[0].selection"></select><input type="text" class="lapdistance" name="Activities.Activity.Lap[0].distance" placeholder="Distance"><input type="text" class="laptime" name="Activities.Activity.Lap[0].time" placeholder="hh:mm:ss"><input style="display: none" type=text class="muscledata" name="Activities.Activity.Lap[0].muscledata"><a href=# class=delete>delete</a>'); // var newElem = $('<select class="ExerciseDropDownCardio" name="Activities.Activity.Lap[0].selection"></select>');
// $(newElem).append('<input type="text" class="lapdistance" name="Activities.Activity.Lap[0].distance" placeholder="Distance">');
socket.emit('getexerciselist', 'Cardio'); // $(newElem).append('<input type="text" class="laptime" name="Activities.Activity.Lap[0].time" placeholder="hh:mm:ss">');
// $(newElem).append('<a href=# class=delete>delete</a>');
// $(this).siblings('span').append(newElem);
$(this).siblings('span').html('<select class="ExerciseDropDownCardio" name="Activities.Activity.Lap[0].selection"></select><input type="text" class="lapdistance" name="Activities.Activity.Lap[0].distance" placeholder="Distance"><input type="text" class="laptime" name="Activities.Activity.Lap[0].time" placeholder="hh:mm:ss"><a href=# class=delete>delete</a>');
socket.emit('getexerciselist', 'Cardio');
break; break;
case "Exercise": case "Exercise":
$(this).siblings('span').html('<select class="ExerciseDropDownWeights" name="Activities.Activity.Lap[0].selection"></select> <input type="text" class="sets" name="Activities.Activity.Lap[0].sets" placeholder="Sets"><input type="text" class="reps" name="Activities.Activity.Lap[0].reps" placeholder="Reps"><input type="text" name="Activities.Activity.Lap[0].weight" class="weight" placeholder="Weight in KG"><input style="display: none" type=text class="muscledata" name="Activities.Activity.Lap[0].muscledata"><a href=# class=delete>delete</a>'); $(this).siblings('span').html('<select class="ExerciseDropDownWeights" name="Activities.Activity.Lap[0].selection"></select> <input type="text" class="sets" name="Activities.Activity.Lap[0].sets" placeholder="Sets"><input type="text" class="reps" name="Activities.Activity.Lap[0].reps" placeholder="Reps"><input type="text" name="Activities.Activity.Lap[0].weight" class="weight" placeholder="Weight in KG"><a href=# class=delete>delete</a>');
socket.emit('getexerciselist', 'Exercise'); socket.emit('getexerciselist', 'Exercise');
break; break;
} }

8
static/javascripts/script_admin.js
View File

@@ -24,9 +24,9 @@ $(document).ready(function() {
// socket.emit('getexercises', 'please'); // socket.emit('getexercises', 'please');
$('ul#editexercise li').remove(); $('ul#editexercise li').remove();
$('span.EditExerciseID').removeAttr('docid'); $('span.EditExerciseID').removeAttr('docid');
var newElem = $('<li><label>Name</label><input type="text" name="exercise.name" value=""></li>'); var newElem = $('<li><label class="nofloat">Name</label><input type="text" name="exercise.name" value=""></li>');
newElem.append('<li><label>exercise.type</label><select name="exercise.type" ><option value="">Select...</option><option value="Cardio">Cardio</option><option value="Exercise">Weights</option></select></li>'); newElem.append('<li><label class="nofloat">exercise.type</label><select name="exercise.type" ><option value="">Select...</option><option value="Cardio">Cardio</option><option value="Exercise">Weights</option></select></li>');
newElem.append('<li><label>Muscle Data Array</label><input type="text" name="exercise.muscledata" value=""></li>'); newElem.append('<li><label class="nofloat">Muscle Data Array</label><input type="text" name="exercise.muscledata" value=""></li>');
$(newElem).appendTo('#editexercise'); $(newElem).appendTo('#editexercise');
$("#ExerciseEditorForm").dialog("open"); $("#ExerciseEditorForm").dialog("open");
}); });
@@ -53,7 +53,7 @@ $(document).ready(function() {
var array = json; var array = json;
exercise_autocompletedata = array; exercise_autocompletedata = array;
$.each(json, function(index, array) { $.each(json, function(index, array) {
$( "ul#exercises" ).append('<li><label>Exercise Name</label> '+ array.exercise.name + '<label>Exercise Name</label>'+ array.exercise.type + '<label>Muscle Data</label>'+ array.exercise.muscledata + '<a href=# class="exercisedelete" title="' + array._id +'" >Delete</a><a href=# class="exerciseedit" title="' + array._id +'" >Edit</a></li>'); $( "ul#exercises" ).append('<li> Exercice Name - '+ array.exercise.name + ' - Exercise Type - ' + array.exercise.type + ' - Muscle Data - '+ array.exercise.muscledata + '<a href=# class="exercisedelete" title="' + array._id +'" >Delete</a><a href=# class="exerciseedit" title="' + array._id +'" >Edit</a></li>');
}) })
; ;
}); });

2
static/stylesheets/style.css
View File

@@ -30,6 +30,7 @@ a {
margin: 10px 0 10px; margin: 10px 0 10px;
} }
label { label {
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
@@ -44,7 +45,6 @@ label {
text-align:center; text-align:center;
} }
.uiindex { .uiindex {
margin-left: 20px; margin-left: 20px;
width: 70px; width: 70px;