diff --git a/app.js b/app.js index 05c349f..6e0c215 100644 --- a/app.js +++ b/app.js @@ -114,7 +114,7 @@ io.sockets.on('connection', function(socket) { if (err) throw err; itemx.exercisename = exresult.exercise.name; itemx.exercisemuscledata = exresult.exercise.muscledata; - itemx.exerciseclass = exresult.exercise.type; + itemx.exercisetype = exresult.exercise.type; callback3(); }); }, function(err){ @@ -139,16 +139,18 @@ io.sockets.on('connection', function(socket) { testcollection.findById(id, function(err, result) { if (err) throw err; - async.forEachSeries(item.Activities.Activity.Lap, + async.forEachSeries(result.Activities.Activity.Lap, function(itemx,callback3){ exercisecollection.findById(itemx.selection, function(err, exresult) { if (err) throw err; itemx.exercisename = exresult.exercise.name; itemx.exercisemuscledata = exresult.exercise.muscledata; - itemx.exerciseclass = exresult.exercise.type; + itemx.exercisetype = exresult.exercise.type; callback3(); }); - }, function(err){callback2();}); + }, function(err){ + socket.emit('populateactivitybyid', result); + }); }); }); diff --git a/index.html b/index.html index ff8dce6..87d8dac 100644 --- a/index.html +++ b/index.html @@ -33,22 +33,20 @@ - + //

{{:Activities.Activity.date}}

+ //
+ // Delete + // Edit + //
+ //
- +
-
@@ -82,7 +79,6 @@ -
diff --git a/static/javascripts/script.js b/static/javascripts/script.js index 900a2ae..b503147 100644 --- a/static/javascripts/script.js +++ b/static/javascripts/script.js @@ -2,21 +2,21 @@ $(document).ready(function() { //makes buttons buttons $("button").button(); -// $("#Activity").dialog({ autoOpen: false }); -// $( "#Activity" ).dialog( "option", "minHeight", 330 ); -// $( "#Activity" ).dialog( "option", "minWidth", 730 ); -// $( "#Activity" ).dialog({ buttons: [ -// { -// text: "Close/Cancel", -// click: function() { $(this).dialog("close"); } -// } -// ] -// }); +$("#Activity").dialog({ autoOpen: false }); + $( "#Activity" ).dialog( "option", "minHeight", 330 ); + $( "#Activity" ).dialog( "option", "minWidth", 830 ); + $( "#Activity" ).dialog({ buttons: [ + { + text: "Close/Cancel", + click: function() { $(this).dialog("close"); } + } + ] + }); -// $("button#openactivities").click(function() { -// // -// $("#Activity").dialog("open"); -// }); + $("button#openactivities").click(function() { +// + $("#Activity").dialog("open"); + }); @@ -60,7 +60,7 @@ $(document).ready(function() { $('#Activity').find('input').attr('value',''); $('#Activity').find('input.datepicker').datepicker(); $('#Activity').find('input.datepicker').datepicker('setDate', new Date()); - + console.log('populateactivity' + JSON.stringify(json)); //set document id $('span.ActivityID').attr('docid',json._id); //poulate name @@ -73,12 +73,12 @@ $(document).ready(function() { var array = json.Activities.Activity.Lap; $.each(array, function(index, value) { ////if cardio - if (value.type == "Cardio" ) { + if (value.exercisetype == "Cardio" ) { //get exercise muscledata AddPopulatedLap("Cardio", value.name, value.time, value.distance, "", "" , "", value.exercisemuscledata); } ////if exercise - if (value.type == "Exercise" ) { + if (value.exercisetype == "Exercise" ) { //get exercise muscledata console.log("selction = " + value.selection); AddPopulatedLap("Exercise", value.name, "", "", value.sets, value.reps , value.weight , value.exercisemuscledata); @@ -214,13 +214,18 @@ $(document).ready(function() { var currentselect; switch($(this).val()) { case "Cardio": - $(this).siblings('span').html('delete'); - - socket.emit('getexerciselist', 'Cardio'); + // var newElem = $(''); + // $(newElem).append(''); + // $(newElem).append(''); + // $(newElem).append('delete'); + // $(this).siblings('span').append(newElem); + $(this).siblings('span').html('delete'); + + socket.emit('getexerciselist', 'Cardio'); break; case "Exercise": - $(this).siblings('span').html(' delete'); + $(this).siblings('span').html(' delete'); socket.emit('getexerciselist', 'Exercise'); break; } diff --git a/static/javascripts/script_admin.js b/static/javascripts/script_admin.js index c0796f5..d46fd5e 100644 --- a/static/javascripts/script_admin.js +++ b/static/javascripts/script_admin.js @@ -24,9 +24,9 @@ $(document).ready(function() { // socket.emit('getexercises', 'please'); $('ul#editexercise li').remove(); $('span.EditExerciseID').removeAttr('docid'); - var newElem = $('
    • '); - newElem.append('
    • '); - newElem.append('
    • '); + var newElem = $('
    • '); + newElem.append('
    • '); + newElem.append('
    • '); $(newElem).appendTo('#editexercise'); $("#ExerciseEditorForm").dialog("open"); }); @@ -53,7 +53,7 @@ $(document).ready(function() { var array = json; exercise_autocompletedata = array; $.each(json, function(index, array) { - $( "ul#exercises" ).append('
  • '+ array.exercise.name + ''+ array.exercise.type + ''+ array.exercise.muscledata + 'DeleteEdit
    • '); + $( "ul#exercises" ).append('
  • Exercice Name - '+ array.exercise.name + ' - Exercise Type - ' + array.exercise.type + ' - Muscle Data - '+ array.exercise.muscledata + 'DeleteEdit
    • '); }) ; }); diff --git a/static/stylesheets/style.css b/static/stylesheets/style.css index 1b96b71..0ec4f7c 100644 --- a/static/stylesheets/style.css +++ b/static/stylesheets/style.css @@ -30,6 +30,7 @@ a { margin: 10px 0 10px; } + label { margin-left: 5px; margin-right: 5px; @@ -44,7 +45,6 @@ label { text-align:center; } - .uiindex { margin-left: 20px; width: 70px;