diff --git a/app/app.js b/app/app.js
index 30881ca..3d16806 100644
--- a/app/app.js
+++ b/app/app.js
@@ -4,6 +4,8 @@
*/
var fs = require('fs');
var path = require('path');
+var mongo = require('mongodb');
+var BSON = mongo.BSONPure;
var db = require('mongoskin').db('localhost:27017/test');
var testcollection = db.collection('testcollection');
var exercisecollection = db.collection('exercisecollection');
@@ -106,6 +108,33 @@ io.sockets.on('connection', function(socket) {
socket.emit('populateexercises', result);
});
});
+ socket.on('updateexercises', function(data) {
+ console.log('updateexecises' + JSON.stringify(data))
+ if (data[0]._id == 'undefined') {
+ delete data[0]._id
+ console.log('edited updateexecises' + JSON.stringify(data))
+ exercisecollection.insert(data, function(err, result) {
+ if (err) throw err;
+ exercisecollection.find().toArray(function(err, result) {
+ if (err) throw err;
+ socket.emit('populateexercises', result);
+ });
+ });
+ }
+ else {
+ var document_id = new BSON.ObjectID(data[0]._id);
+ delete data[0]._id;
+ exercisecollection.update({_id:document_id}, data[0],{upsert:true} , function(err, result) {
+ if (err) throw err;
+ exercisecollection.find().toArray(function(err, result) {
+ if (err) throw err;
+ console.log('populateexercises');
+ socket.emit('populateexercises', result);
+ });
+ });
+
+ };
+ });
////////////////
socket.on('getexpresso', function(data) {
console.log('emit expresso')
diff --git a/app/index.html b/app/index.html
index 3f35df4..d9df8f5 100644
--- a/app/index.html
+++ b/app/index.html
@@ -56,17 +56,23 @@
});
////populate exercise sortable
-// socket.on('populateexercises', function(json) {
- // console.log('#exercises recieved');
- /// var content = "";
- // $(".workoutdata").hide();
- // $('#ActivityList').empty();
+ socket.on('populateexercises', function(json) {
+ console.log('#exercises recieved' + JSON.stringify(json, null, ' '));
+ var content = "";
+ $('ul#sortableexercises li').remove();
+ $( "ul#sortableexercises" ).append('
')
///// for loop
- //create html with cvaraible $( "#sortableexercises" ).html("" + exercise+"")
- //append to sortable
+ var array = json[0].exercise.name;
+ console.log('#exercises recieved' + array );
+ $.each(array, function(index, value) {
+ console.log('beep' + value );
+ console.log('index-' + index);
+ console.log('value-' + value);
+ $( "ul#sortableexercises" ).append('')
+ });
//end for
//create sortable
- // );
+});
$( "#tabs" ).tabs();
@@ -99,11 +105,10 @@ $( "#datepicker" ).datepicker();
- $('#ActivityList').delegate('a.activitydelete', 'click', function() {
- console.log('delete clicked' + $(this).attr('title'));
- socket.emit('delactivity', $(this).attr('title'));
- return false;
- });
+$('#ActivityList').delegate('a.activitydelete', 'click', function() {
+ socket.emit('delactivity', $(this).attr('title'));
+ return false;
+});
@@ -125,14 +130,17 @@ $("#sortable").bind('sortupdate', function(event, ui) {
$(this).attr("name",newname);
});
});
+});
-
-
-});
+ $("#sortableexercises").sortable({
+ placeholder: "ui-state-highlight",
+ revert: true,
+});
+
//Removes slectable element
$('ul').on('click', '.delete',function() {
- $(this).parent().remove();
+ $(this).closest('li').remove();
$('#sortable').trigger('sortupdate')
});
@@ -144,7 +152,7 @@ $("button").button();
$("button").click(function() {
var addtype = $(this).attr('value');
console.log('click');
- var newElem = $('.new-' + addtype).clone().attr('style', 'display: block');
+ var newElem = $('.new-' + addtype).clone(true).attr('style', 'display: block');
$(newElem).removeClass("new-" + addtype);
$(newElem).children('input').attr('disabled',false);
$(newElem).appendTo('#sortable');
@@ -152,6 +160,10 @@ $("button").click(function() {
$('#sortable').trigger('sortupdate');
});
+$("button.AddExercise").click(function() {
+$( "ul#sortableexercises" ).append('')
+});
+
$('#Activity').find('input.datepicker').datepicker();
$('#Activity').find('input.datepicker').datepicker('setDate', new Date());
@@ -172,6 +184,20 @@ $("button").click(function() {
$('#Activity').find('input.datepicker').datepicker('setDate', new Date());
return false;
});
+
+ $('#saveexercises').click(function() {
+ var selector= "#ExerciseForm"
+ //var formDataFirst = $(selector).toObject({mode: 'first'});
+ var formDataAll = $(selector).toObject({mode: 'all'});
+ socket.emit('updateexercises', formDataAll);
+
+ console.log('All ', JSON.stringify(formDataAll, null, ' '));
+ // to prevent the page from changing
+ $('ul#sortableexercises li').remove();
+ return false;
+ });
+
+
$('#cancelform').click(function() {
@@ -185,6 +211,28 @@ $("button").click(function() {
});
+$('ul').on('change', '.laptype',function() {
+ console.log ('value= ' + $(this).val() );
+ switch($(this).val()) {
+ case "Run":
+ $(this).siblings('span').html('delete');
+ break;
+ case "Bike":
+ $(this).siblings('span').html(' delete');
+ break;
+ case "Cardio":
+ $(this).siblings('span').html('delete');
+ break;
+ case "Exercise":
+ $(this).siblings('span').html(' delete');
+ break;
+ case "Rest":
+ $(this).siblings('span').html('delete');
+ break;
+ };
+
+ });
+
});
@@ -196,37 +244,19 @@ $("button").click(function() {
Workout Tracker
@@ -239,11 +269,7 @@ $("button").click(function() {
-
-
-
-
-
+
+
Cancel
CODE FOR EDITING EXERCISES
+
@@ -278,4 +309,4 @@ $("button").click(function() {