sstent/alex_app1
1
0
Fork 0
mirror of https://github.com/sstent/alex_app1.git synced 2026-04-29 08:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

getting there

Browse Source
This commit is contained in:
Stuart Stent
2013-01-05 19:11:47 -05:00
parent 29873db3cf
commit 97b688d56a
4 changed files with 113 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app.js
View File

@@ -151,6 +151,7 @@ io.sockets.on('connection', function(socket) {
//////////////////////// ////////////////////////
socket.on('addactivity', function(data, docid) { socket.on('addactivity', function(data, docid) {
console.log('addactivity' + docid); console.log('addactivity' + docid);
console.log('add_activity_data' + JSON.stringify(data));
if (docid === null) { if (docid === null) {
var document_id = new BSON.ObjectID(); var document_id = new BSON.ObjectID();
} }

21
index.html
View File

@@ -18,7 +18,6 @@
<script id="movieTemplate1" type="text/x-jsrender"> <script id="movieTemplate1" type="text/x-jsrender">
<h3>{{:Activities.Activity.date}} - {{:Activities.Activity.name}}</h3> <h3>{{:Activities.Activity.date}} - {{:Activities.Activity.name}}</h3>
<div class="workoutdata"> <div class="workoutdata">
<h4>{{:Activities.Activity.date}} - {{:Activities.Activity.name}}</h4>
<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>
{{if Activities.Activity.Lap}} {{if Activities.Activity.Lap}}
@@ -39,7 +38,7 @@
<script id="DataTemplate1" type="text/x-jsrender"> <script id="DataTemplate1" type="text/x-jsrender">
<h3>{{:Activities.Activity.date}} - {{:Activities.Activity.name}}</h3> <h3>{{:Activities.Activity.date}} - {{:Activities.Activity.name}}</h3>
<div class="workoutdata"> <div class="workoutdata">
<h4>{{:Activities.Activity.date}} - {{:Activities.Activity.name}}</h4> // <h4>{{:Activities.Activity.date}} - {{:Activities.Activity.name}}</h4>
<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>
@@ -53,6 +52,7 @@
<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">
<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>
@@ -64,17 +64,22 @@
<span><a href=# class=delete>delete</a></span> <span><a href=# class=delete>delete</a></span>
</li> </li>
</ul> </ul>
<!--
<div id="tabs"> <div id="tabs">
<ul> <ul>
<li><a id="Activities_tab" href="#Activities">Workout History</a></li> <li><a id="Activities_tab" href="#Activities">Workout History</a></li>
<li><a href="#Activity">Add Workout</a></li> <li><a href="#Activity">Add Workout</a></li>
<li><a href="#ExerciseEditor">Edit Exercises</a></li> <li><a href="#ExerciseEditor">Edit Exercises</a></li>
<!-- <li><a href="#ExpressoEditor">Edit Expresso Tracks</a></li> <li><a href="#ExpressoEditor">Edit Expresso Tracks</a></li>
<li><a href="#GarminDataUpload">Upload Garmin Data</a></li> --> <li><a href="#GarminDataUpload">Upload Garmin Data</a></li>
</ul> </ul>
-->
<div id="Activities">
<ul id="ActivityList"></ul>
</div>
<div id="RightColumn">
<div id="Activity"> <div id="Activity">
<span class="ActivityID"> <span class="ActivityID">
<button class="Add" value="lap">Add Exercise</button> <button class="Add" value="lap">Add Exercise</button>
@@ -83,7 +88,7 @@
<li class="ui-state-default"><label>Activity Name</label><input type="text" name="Activities.Activity.name" placeholder="Location"><label>Date</label><input type="text" class="datepicker" name="Activities.Activity.date"></li> <li class="ui-state-default"><label>Activity Name</label><input type="text" name="Activities.Activity.name" placeholder="Location"><label>Date</label><input type="text" class="datepicker" name="Activities.Activity.date"></li>
</ul> </ul>
<button type="submit" id="save" value="Save">Save</button> <button type="submit" id="save" value="Save">Save</button>
<button style="display: none" type="submit" id="savecopy" value="Savecopy">Save Copy</button> <!-- <button style="display: none" type="submit" id="savecopy" value="Savecopy">Save Copy</button> -->
<button type="button" id="cancelform" value="Cancel"/>Cancel</button> <button type="button" id="cancelform" value="Cancel"/>Cancel</button>
</form> </form>
</span> </span>
@@ -101,11 +106,9 @@
</form> </form>
</span> </span>
</div> </div>
</div>
<div id="Activities">
<ul id="ActivityList"></ul>
</div>
</div> </div>

115
static/javascripts/script.js
View File

@@ -17,11 +17,11 @@
$( "#movieTemplate1" ).render( json ) $( "#movieTemplate1" ).render( json )
); );
$(".ui-accordion-content").css("display", "block"); $(".ui-accordion-content").css("display", "block");
$("#ActivityList").accordion('destroy').accordion({ // $("#ActivityList").accordion('destroy').accordion({
header: 'h3', // header: 'h3',
active: false, // active: false,
collapsible: true // collapsible: true
}); // });
}); });
//poulate activity by id //poulate activity by id
@@ -37,17 +37,21 @@
if ("Lap" in json.Activities.Activity) { if ("Lap" in json.Activities.Activity) {
var array = json.Activities.Activity.Lap; var array = json.Activities.Activity.Lap;
$.each(array, function(index, value) { $.each(array, function(index, value) {
////if run
if ("run" in value) { AddPopulatedLap("Run", value.run.name, value.run.time, value.run.distance, "", "" , "")};
////if bike
if ("bike" in value) { AddPopulatedLap("Bike", value.bike.name, value.bike.time, value.bike.distance, "", "" , "")};
////if cardio ////if cardio
if ("cardio" in value) { AddPopulatedLap("Cardio", value.cardio.name, value.cardio.time, value.cardio.distance, "", "" , "")}; if ("cardio" in value) {
//get exercise muscledata
var lapmuscledata = exercise_autocompletedata[value.cardio.selection].muscledata.value;
AddPopulatedLap("Cardio", value.cardio.name, value.cardio.time, value.cardio.distance, "", "" , "", lapmuscledata)
};
////if exercise ////if exercise
if ("exercise" in value) { AddPopulatedLap("Exercise", value.exercise.name, "", "", value.exercise.sets, value.exercise.reps , value.exercise.weight)}; if ("exercise" in value) {
////if rest //get exercise muscledata
if ("rest" in value) { AddPopulatedLap("Rest", "", "", "", "", "" , "")}; console.log("selction = " + value.exercise.selection);
}); var lapmuscledata = exercise_autocompletedata[value.exercise.selection].muscledata.value;
AddPopulatedLap("Exercise", value.exercise.name, "", "", value.exercise.sets, value.exercise.reps , value.exercise.weight , lapmuscledata)
};
});
}; };
$('#savecopy').attr('style', 'display: block'); $('#savecopy').attr('style', 'display: block');
@@ -59,8 +63,9 @@
}); });
function AddPopulatedLap(type, name, time, distance, sets, reps, weight) { function AddPopulatedLap(type, name, time, distance, sets, reps, weight, muscledata) {
console.log('type= ' + type); console.log('type= ' + type);
console.log('muscledata= ' + muscledata);
var newElem = $('.new-lap').clone(true).attr('style', 'display: block'); var newElem = $('.new-lap').clone(true).attr('style', 'display: block');
$(newElem).removeClass('new-lap'); $(newElem).removeClass('new-lap');
$(newElem).appendTo('#sortable'); $(newElem).appendTo('#sortable');
@@ -72,6 +77,7 @@
$(newElem).find('.sets').attr('value', sets); $(newElem).find('.sets').attr('value', sets);
$(newElem).find('.reps').attr('value', reps); $(newElem).find('.reps').attr('value', reps);
$(newElem).find('.weight').attr('value', weight); $(newElem).find('.weight').attr('value', weight);
$(newElem).find('.muscledata').attr('value', muscledata);
$(newElem).sortable( "refresh" ); $(newElem).sortable( "refresh" );
}; };
@@ -95,22 +101,23 @@
exercise_autocompletedata = array; exercise_autocompletedata = array;
$('#sortable').trigger('sortupdate'); $('#sortable').trigger('sortupdate');
$.each(array, function(index, value) { $.each(array, function(index, value) {
$( "ul#sortableexercises" ).append('<li class=ui-state-default><input type="text" name="exercise[].name" value="'+ value.name + '"><input type="text" name="exercise[].muscledata" value="'+ value.muscledata + '"><a href=# class=delete>delete</a></li>') $( "ul#sortableexercises" ).append('<li class=ui-state-default><input type="text" name="exercise[].name" value="'+ value.name + '"><input type="text" name="exercise[].class" value="'+ value.class + '"><input type="text" name="exercise[].muscledata" value="'+ value.muscledata + '"><a href=# class=delete>delete</a></li>');
}); $('#sortableexercises').trigger('sortupdate');
});
////populate expresso sortable ////populate expresso sortable
socket.on('populateexpresso', function(json) { // socket.on('populateexpresso', function(json) {
//console.log('#tracks recieved' + JSON.stringify(json, null, ' ')); // //console.log('#tracks recieved' + JSON.stringify(json, null, ' '));
var content = ""; // var content = "";
$('ul#sortableexpresso li').remove(); // $('ul#sortableexpresso li').remove();
$('span.ExpressoID').attr('docid',json[0]._id); // $('span.ExpressoID').attr('docid',json[0]._id);
var barray = json[0].track.name; // var barray = json[0].track.name;
bike_autocompletedata = barray; // bike_autocompletedata = barray;
$('#sortable').trigger('sortupdate'); // $('#sortable').trigger('sortupdate');
$.each(barray, function(index, value) { // $.each(barray, function(index, value) {
$( "ul#sortableexpresso" ).append('<li class=ui-state-default><input type="text" name="track.name[]" value="'+ value + '"></li>') // $( "ul#sortableexpresso" ).append('<li class=ui-state-default><input type="text" name="track.name[]" value="'+ value + '"></li>')
}); // });
}); // });
}); });
@@ -132,11 +139,6 @@
console.log('send stuff ' + ui.index ); console.log('send stuff ' + ui.index );
socket.emit('getexercises', 'please'); socket.emit('getexercises', 'please');
}; };
// if (ui.index == 3) {
// console.log('send stuff ' + ui.index );
// socket.emit('getexpresso', 'please');
// };
}); });
$('#ActivityList').delegate('a.activitydelete', 'click', function() { $('#ActivityList').delegate('a.activitydelete', 'click', function() {
@@ -160,12 +162,13 @@
}); });
$("#sortable").bind('sortupdate', function(event, ui) { $("#sortable").bind('sortupdate', function(event, ui) {
$('#sortable li').each(function(){ $('#sortable li').each(function(){
var itemindex= $(this).index() var itemindex= $(this).index()
$(this).children('label.uiindex').html('Exercise '+ itemindex ); $(this).children('label.uiindex').html('Exercise '+ itemindex );
$(this).find('input').each(function(){ $(this).find('input').each(function(){
var newname = $(this).attr('name').replace(/\[[0-9]*\]/,'[' + itemindex + ']'); var newname = $(this).attr('name').replace(/\[[0-9]*\]/,'[' + itemindex + ']');
//console.log('newname' + newname );
$(this).attr("name",newname); $(this).attr("name",newname);
}); });
@@ -182,7 +185,7 @@
$("#sortableexercises").bind('sortupdate', function(event, ui) { $("#sortableexercises").bind('sortupdate', function(event, ui) {
$('#sortableexercises li').each(function(){ $('#sortableexercises li').each(function(){
var itemindex= $(this).index() var itemindex= $(this).index()
$(this).find('input').each(function(){ $(this).find('input, select').each(function(){
var newname = $(this).attr('name').replace(/\[[0-9]*\]/,'[' + itemindex + ']'); var newname = $(this).attr('name').replace(/\[[0-9]*\]/,'[' + itemindex + ']');
console.log('newname' + newname ); console.log('newname' + newname );
$(this).attr("name",newname); $(this).attr("name",newname);
@@ -194,6 +197,7 @@
$('ul').on('click', '.delete',function() { $('ul').on('click', '.delete',function() {
$(this).closest('li').remove(); $(this).closest('li').remove();
$('#sortable').trigger('sortupdate') $('#sortable').trigger('sortupdate')
// $('#sortableexercises').trigger('sortupdate')
}); });
///All the Buttons ///All the Buttons
@@ -207,12 +211,15 @@
$(newElem).children('input').attr('disabled',false); $(newElem).children('input').attr('disabled',false);
$(newElem).appendTo('#sortable'); $(newElem).appendTo('#sortable');
$(newElem).sortable( "refresh" ); $(newElem).sortable( "refresh" );
$('#sortable').trigger('sortupdate'); $('#sortable').trigger('sortupdate');
$('#sortableexercises').trigger('sortupdate'); //$('#sortableexercises').trigger('sortupdate');
}); });
$("button.AddExercise").click(function() { $("button.AddExercise").click(function() {
$( "ul#sortableexercises" ).append('<li class=ui-state-default><input type="text" name="exercise[0].name" hint="Name" placeholder="Exercise Name"><input type="text" name="exercise[0].muscledata" hint="Muscle Array" placeholder="Muscle Array"><a href=# class=delete>delete</a></li>') $( "ul#sortableexercises" ).append('<li class=ui-state-default><input type="text" name="exercise[].name" hint="Name" placeholder="Exercise Name"><input type="text" name="exercise[].class" placeholder="cardio or weights"><input type="text" name="exercise[].muscledata" hint="Muscle Array" placeholder="Muscle Array"><a href=# class=delete>delete</a></li>')
$('#sortableexercises').trigger('sortupdate');
}); });
$("button.AddExpresso").click(function() { $("button.AddExpresso").click(function() {
@@ -237,7 +244,10 @@
$( "#tabs" ).tabs( "select" , 0 ) $( "#tabs" ).tabs( "select" , 0 )
$('#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());
socket.emit('getactivites', 'please');
socket.emit('getexercises', 'please');
return false; return false;
}); });
$('#savecopy').click(function() { $('#savecopy').click(function() {
@@ -265,6 +275,8 @@
// to prevent the page from changing // to prevent the page from changing
$('ul#sortableexercises li').remove(); $('ul#sortableexercises li').remove();
$( "#tabs" ).tabs( "select" , 0 ) $( "#tabs" ).tabs( "select" , 0 )
socket.emit('getactivites', 'please');
socket.emit('getexercises', 'please');
return false; return false;
}); });
@@ -289,6 +301,8 @@
$('#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());
return false; return false;
socket.emit('getactivites', 'please');
socket.emit('getexercises', 'please');
}); });
$('#my-text-link').click(function() { // bind click event to link $('#my-text-link').click(function() { // bind click event to link
@@ -299,12 +313,33 @@
$('ul').on('change', '.laptype',function() { $('ul').on('change', '.laptype',function() {
console.log ('value= ' + $(this).val() ); console.log ('value= ' + $(this).val() );
var currentselect;
switch($(this).val()) { switch($(this).val()) {
case "Cardio": case "Cardio":
$(this).siblings('span').html('<input type="text" class="lapname" name="Activities.Activity.Lap[0].cardio.name" placeholder="Machine"><input type="text" class="lapdistance" name="Activities.Activity.Lap[0].cardio.distance" placeholder="Distance"><input type="text" class="laptime" name="Activities.Activity.Lap[0].cardio.time" placeholder="hh:mm:ss"><a href=# class=delete>delete</a>'); $(this).siblings('span').html('<select class="ExerciseDropDownCardio" name="Activities.Activity.Lap[0].cardio.selection"></select><input type="text" class="lapdistance" name="Activities.Activity.Lap[0].cardio.distance" placeholder="Distance"><input type="text" class="laptime" name="Activities.Activity.Lap[0].cardio.time" placeholder="hh:mm:ss"><a href=# class=delete>delete</a>');
$(exercise_autocompletedata).each(function(index)
{
var option = $('<option />');
if (this.class == 'cardio') {
option.attr('value', index).text(this.name);
$('.ExerciseDropDownCardio').append(option);
};
});
break; break;
case "Exercise": case "Exercise":
$(this).siblings('span').html('<input type="text" class="lapname exertags" name="Activities.Activity.Lap[0].exercise.name" placeholder="Exercise Name"><input type="text" class="sets" name="Activities.Activity.Lap[0].exercise.sets" placeholder="Sets"><input type="text" class="reps" name="Activities.Activity.Lap[0].exercise.reps" placeholder="Reps"><input type="text" name="Activities.Activity.Lap[0].exercise.weight" class="weight" placeholder="Weight in KG"><a href=# class=delete>delete</a>'); $(this).siblings('span').html('<select class="ExerciseDropDown" name="Activities.Activity.Lap[0].exercise.selection"></select> <input type="text" class="sets" name="Activities.Activity.Lap[0].exercise.sets" placeholder="Sets"><input type="text" class="reps" name="Activities.Activity.Lap[0].exercise.reps" placeholder="Reps"><input type="text" name="Activities.Activity.Lap[0].exercise.weight" class="weight" placeholder="Weight in KG"><a href=# class=delete>delete</a>');
$(exercise_autocompletedata).each(function(index)
{
//console.log(this.name);
//console.log(this.muscledata);
console.log("resetingdropdown")
var option = $('<option />');
if (this.class == 'weights') {
option.attr('value', index).text(this.name);
$('.ExerciseDropDown').append(option);
};
});
break; break;
}; };
$('#sortable').trigger('sortupdate') $('#sortable').trigger('sortupdate')

36
static/stylesheets/style.css
View File

@@ -1,5 +1,5 @@
body { body {
padding: 50px; padding: 5px;
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif; font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
background: #ccc; background: #ccc;
} }
@@ -7,21 +7,22 @@ a {
color: #0069ff; color: #0069ff;
} }
#container { #container {
width: 90%; width: 95%;
height: 90%; height: 98%;
margin: 0 auto; margin: 0 auto;
padding: 40px 20px; padding: 40px 20px;
background: #fff; background: #fff;
box-shadow: 1px 3px 3px #333; box-shadow: 1px 3px 3px #333;
border-radius: 5px; border-radius: 5px;
float: left;
} }
#logo { #logo {
text-align: center; text-align: center;
} }
#display { #display {
width: 90%; width: 98%;
height: 90% height: 98%
margin: 20px 0 50px; margin: 10px 0 10px;
} }
label { label {
margin-left: 5px; margin-left: 5px;
@@ -64,12 +65,7 @@ input[type="text"] {
padding-left: 30px; padding-left: 30px;
} }
#Activity A {
position:absolute;
right:60px;
vertical-align: middle;
float: right;
}
.text-label { .text-label {
color: #cdcdcd; color: #cdcdcd;
@@ -91,12 +87,22 @@ padding-left: 1.5em;
height: 24px; height: 24px;
} }
#Activity A {
#ExerciseEditor A { /*position:absolute;*/
position:absolute;
right:60px; right:60px;
vertical-align: middle; vertical-align: middle;
float: right; float: right;
} }
#ExerciseEditor A {
/*position:absolute;*/
right:60px;
vertical-align: middle;
float: right;
}
#Activities {float:left;}
/*#ExerciseEditor {float:right;}
#Activity {float:right;}*/
#RightColumn {float:right;}