tidying code - removed unneccesary deps, sterted cleaning client javascript

This commit is contained in:
2013-01-08 14:40:40 -05:00
parent 1727a62eb4
commit e8bbb4ecf5
172 changed files with 284 additions and 38293 deletions

View File

@@ -1,24 +1,7 @@
$(document).ready(function() {
//makes buttons buttons
//makes buttons buttons
$("button").button();
// $("#ExerciseEditor").dialog({ autoOpen: false });
// $( "#ExerciseEditor" ).dialog( "option", "minHeight", 330 );
// $( "#ExerciseEditor" ).dialog( "option", "minWidth", 630 );
// $( "#ExerciseEditor" ).dialog({ buttons: [
// {
// text: "Close/Cancel",
// click: function() { $(this).dialog("close"); }
// }
// ]
// });
// $("button#openexercises").click(function() {
// socket.emit('getexercises', 'please');
// $("#ExerciseEditor").dialog("open");
// });
// $("#Activity").dialog({ autoOpen: false });
// $( "#Activity" ).dialog( "option", "minHeight", 330 );
// $( "#Activity" ).dialog( "option", "minWidth", 730 );
@@ -27,12 +10,12 @@ $(document).ready(function() {
// text: "Close/Cancel",
// click: function() { $(this).dialog("close"); }
// }
// ]
// ]
// });
// $("button#openactivities").click(function() {
// $("button#openactivities").click(function() {
// //
// $("#Activity").dialog("open");
// $("#Activity").dialog("open");
// });
@@ -40,33 +23,35 @@ $(document).ready(function() {
//makes datepickers
$( "#datepicker" ).datepicker();
$('#Activity').find('input.datepicker').datepicker();
$('#Activity').find('input.datepicker').datepicker('setDate', new Date());
$('#Activity').find('input.datepicker').datepicker('setDate', new Date());
var socket = io.connect();
exercise_autocompletedata = "unset";
bike_autocompletedata = "unset";
//exercise_autocompletedata = "unset";
//bike_autocompletedata = "unset";
//get intial data
socket.emit('getactivites', 'please');
socket.emit('getexercises', 'please');
socket.emit('getexerciselist', 'cardio');
socket.emit('getexerciselist', 'weights');
//socket.emit('getexercises', 'please');
socket.emit('getexerciselist', 'Cardio');
socket.emit('getexerciselist', 'Exercise');
socket.on('populateactivities', function(json) {
console.log('#poulate recieved');
var content = "";
$(".workoutdata").hide();
$('#ActivityList').empty();
$(".workoutdata").hide();
$('#ActivityList').empty();
$( "#ActivityList" ).html(
$( "#movieTemplate1" ).render( json )
);
$(".ui-accordion-content").css("display", "block");
// $("#ActivityList").accordion('destroy').accordion({
// header: 'h3',
// $("#ActivityList").accordion('destroy').accordion({
// header: 'h3',
// active: false,
// collapsible: true
// });
});
//poulate activity by id
socket.on('populateactivitybyid', function(json) {
// clear it first
@@ -75,36 +60,34 @@ $(document).ready(function() {
$('#Activity').find('input').attr('value','');
$('#Activity').find('input.datepicker').datepicker();
$('#Activity').find('input.datepicker').datepicker('setDate', new Date());
//set document id
$('span.ActivityID').attr('docid',json._id);
//poulate name
// $('input[name="Activities.Activity.name"]').attr('value', json.Activities.Activity.name)
//poulate date
$('input[name="Activities.Activity.date"]').attr('value', json.Activities.Activity.date)
$('input[name="Activities.Activity.date"]').attr('value', json.Activities.Activity.date);
// Activities.Activity.date
// for each lap
if ("Lap" in json.Activities.Activity) {
var array = json.Activities.Activity.Lap;
$.each(array, function(index, value) {
////if cardio
if (value.class == "Cardio" ) {
if (value.type == "Cardio" ) {
//get exercise muscledata
var lapmuscledata = "123123";
AddPopulatedLap("Cardio", value.name, value.time, value.distance, "", "" , "", lapmuscledata)
};
AddPopulatedLap("Cardio", value.name, value.time, value.distance, "", "" , "", value.exercisemuscledata);
}
////if exercise
if (value.class == "Exercise" ) {
if (value.type == "Exercise" ) {
//get exercise muscledata
console.log("selction = " + value.selection);
var lapmuscledata = "123123";
AddPopulatedLap("Exercise", value.name, "", "", value.sets, value.reps , value.weight , lapmuscledata)
};
});
};
AddPopulatedLap("Exercise", value.name, "", "", value.sets, value.reps , value.weight , value.exercisemuscledata);
}
});
}
///refresh table
$('#sortable').trigger('sortupdate');
$('#sortable').trigger('sortupdate');
});
@@ -124,68 +107,68 @@ $(document).ready(function() {
$(newElem).find('.weight').attr('value', weight);
$(newElem).find('.muscledata').attr('value', muscledata);
$(newElem).sortable( "refresh" );
};
}
socket.on('populateexerciselist', function(data, result) {
if ("cardio" == data) {
if ("Cardio" == data) {
//create cardiodropdownlist
$( ".ExerciseDropDownCardio" ).remove('option');
$.each(result, function(index, array) {
$( ".ExerciseDropDownCardio" ).append('<option value="' + array._id +'" > '+ array.exercise.name +'</option>');
})
};
if ("weights" == data) {
});
}
if ("Exercise" == data) {
$( ".ExerciseDropDownWeights" ).remove('option');
$.each(result, function(index, array) {
$( ".ExerciseDropDownWeights" ).append('<option value="' + array._id +'" > '+ array.exercise.name +'</option>');
})
};
});
}
});
});
//THe Sortable Stuff
//THe Sortable Stuff
$("#sortable").sortable({
placeholder: "ui-state-highlight",
revert: true,
stop: function(event, ui) {
$('#sortable').trigger('sortupdate')
},
$('#sortable').trigger('sortupdate');
}
});
});
$("#sortable").bind('sortupdate', function(event, ui) {
$('#sortable li').each(function(){
var itemindex= $(this).index()
var itemindex= $(this).index();
$(this).children('label.uiindex').html('Exercise '+ itemindex );
$(this).find('input, select').each(function(){
var newname = $(this).attr('name').replace(/\[[0-9]*\]/,'[' + itemindex + ']');
$(this).attr("name",newname);
});
$(this).find('input.exertags').autocomplete({source: exercise_autocompletedata});
//$(this).find('input.exertags').autocomplete({source: exercise_autocompletedata});
});
});
$('#ActivityList').delegate('a.activitydelete', 'click', function() {
socket.emit('delactivity', $(this).attr('title'));
$('#ActivityList').delegate('a.activitydelete', 'click', function() {
socket.emit('delactivity', $(this).attr('title'));
return false;
});
$('#ActivityList').delegate('a.activityedit', 'click', function() {
$('#ActivityList').delegate('a.activityedit', 'click', function() {
socket.emit('getactivitybyid', $(this).attr('title'));
$("#Activity").dialog("open");
$("#Activity").dialog("open");
return false;
});
});
// $('ul').on('click', '.delete',function() {
// $(this).closest('li').remove();
// $('#sortable').trigger('sortupdate')
// });
//adds selectable element
$("button").click(function() {
$("button").click(function() {
var addtype = $(this).attr('value');
var newElem = $('.new-' + addtype).clone(true).attr('style', 'display: block');
$(newElem).removeClass("new-" + addtype);
@@ -195,11 +178,11 @@ $(document).ready(function() {
$('#sortable').trigger('sortupdate');
});
$('#save').click(function() {
var docid =$(this).closest('span').attr('docid');
var selector= "#myForm"
var selector= "#myForm";
var formDataAll = $(selector).toObject({mode: 'all'});
socket.emit('addactivity', formDataAll[0], docid);
$('ul#sortable li').remove('.removable');
@@ -212,36 +195,36 @@ $(document).ready(function() {
return false;
});
$('#cancelform').click(function() {
$('ul#sortable li').remove('.removable');
$('span.ActivityID').removeAttr('docid');
$('#Activity').find('input').attr('value','');
$('#Activity').find('input.datepicker').datepicker();
$('#Activity').find('input.datepicker').datepicker('setDate', new Date());
return false;
socket.emit('getactivites', 'please');
socket.emit('getexercises', 'please');
return false;
});
$('ul').on('change', '.laptype',function() {
console.log ('value= ' + $(this).val() );
var currentselect;
switch($(this).val()) {
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>');
socket.emit('getexerciselist', 'cardio');
socket.emit('getexerciselist', 'Cardio');
break;
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>');
socket.emit('getexerciselist', 'weights');
socket.emit('getexerciselist', 'Exercise');
break;
};
$('#sortable').trigger('sortupdate')
}
$('#sortable').trigger('sortupdate');
});
//document closing

View File

@@ -1,158 +1,83 @@
$(document).ready(function() {
//makes buttons buttons
//makes buttons buttons
$("button").button();
$("#ExerciseEditorForm").dialog({ autoOpen: false });
$( "#ExerciseEditorForm" ).dialog( "option", "minHeight", 330 );
$( "#ExerciseEditorForm" ).dialog( "option", "minWidth", 630 );
$( "#ExerciseEditorForm" ).dialog({ buttons: [
{
text: "Close/Cancel",
click: function() { $(this).dialog("close"); }
click: function() {
$('#editexercise li').children('input').attr('value','');
$('span.EditExerciseID').removeAttr('docid');
socket.emit('getexercises', 'please');
$(this).dialog("close"); }
}
]
]
});
$("button#addexerciseformopen").click(function() {
$("button#addexerciseformopen").click(function() {
// socket.emit('getexercises', 'please');
$('ul#editexercise li').remove();
$('span.EditExerciseID').removeAttr('docid');
var newElem = $('<li><label>Name</label><input type="text" name="exercise.name" value=""></li>');
newElem.append('<li><label>Exercise Class</label><input type="text" name="exercise.class" 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>exercise.type</label><input type="text" name="exercise.type" value=""></li>');
newElem.append('<li><label>Muscle Data Array</label><input type="text" name="exercise.muscledata" value=""></li>');
$(newElem).appendTo('#editexercise');
$("#ExerciseEditorForm").dialog("open");
$(newElem).appendTo('#editexercise');
$("#ExerciseEditorForm").dialog("open");
});
// $("#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"); }
// }
// ]
// });
// $("button#openactivities").click(function() {
// //
// $("#Activity").dialog("open");
// });
//makes datepickers
$( "#datepicker" ).datepicker();
$('#Activity').find('input.datepicker').datepicker();
$('#Activity').find('input.datepicker').datepicker('setDate', new Date());
// $( "#datepicker" ).datepicker();
// $('#Activity').find('input.datepicker').datepicker();
// $('#Activity').find('input.datepicker').datepicker('setDate', new Date());
var socket = io.connect();
exercise_autocompletedata = "unset";
bike_autocompletedata = "unset";
socket.emit('getactivites', 'please');
//exercise_autocompletedata = "unset";
//bike_autocompletedata = "unset";
//socket.emit('getactivites', 'please');
socket.emit('getexercises', 'please');
socket.emit('getexerciselist', 'cardio');
socket.emit('getexerciselist', 'weights');
socket.on('populateactivities', function(json) {
console.log('#poulate recieved');
var content = "";
$(".workoutdata").hide();
$('#ActivityList').empty();
$( "#ActivityList" ).html(
$( "#movieTemplate1" ).render( json )
);
$(".ui-accordion-content").css("display", "block");
// $("#ActivityList").accordion('destroy').accordion({
// header: 'h3',
// active: false,
// collapsible: true
// });
});
//socket.emit('getexerciselist', 'cardio');
//socket.emit('getexerciselist', 'weights');
// socket.on('populateactivities', function(json) {
// console.log('#poulate recieved');
// var content = "";
// $(".workoutdata").hide();
// $('#ActivityList').empty();
// $( "#ActivityList" ).html(
// $( "#movieTemplate1" ).render( json )
// );
// $(".ui-accordion-content").css("display", "block");
// // $("#ActivityList").accordion('destroy').accordion({
// // header: 'h3',
// // active: false,
// // collapsible: true
// // });
// });
//poulate activity by id
socket.on('populateactivitybyid', function(json) {
// clear it first
$('ul#sortable li').remove('.removable');
$('span.ActivityID').removeAttr('docid');
$('#Activity').find('input').attr('value','');
$('#Activity').find('input.datepicker').datepicker();
$('#Activity').find('input.datepicker').datepicker('setDate', new Date());
//set document id
$('span.ActivityID').attr('docid',json._id);
//poulate name
// $('input[name="Activities.Activity.name"]').attr('value', json.Activities.Activity.name)
//poulate date
$('input[name="Activities.Activity.date"]').attr('value', json.Activities.Activity.date)
// Activities.Activity.date
// for each lap
if ("Lap" in json.Activities.Activity) {
var array = json.Activities.Activity.Lap;
$.each(array, function(index, value) {
////if cardio
if ("cardio" in value) {
//get exercise muscledata
var lapmuscledata = exercise_autocompletedata[value.cardio.selection].muscledata;
AddPopulatedLap("Cardio", value.cardio.name, value.cardio.time, value.cardio.distance, "", "" , "", exercise_autocompletedata[value.cardio.selection].muscledata)
};
////if exercise
if ("exercise" in value) {
//get exercise muscledata
console.log("selction = " + value.exercise.selection);
var lapmuscledata = exercise_autocompletedata[value.exercise.selection].muscledata;
AddPopulatedLap("Exercise", value.exercise.name, "", "", value.exercise.sets, value.exercise.reps , value.exercise.weight , lapmuscledata)
};
});
};
///refresh table
$('#sortable').trigger('sortupdate');
});
socket.on('populateexercisebyid', function(array) {
// clear it first
$('ul#editexercise li').remove();
$('span.EditExerciseID').removeAttr('docid');
//set document id
//set document id
$('span.EditExerciseID').attr('docid',array._id);
console.log('name= ' + array.exercise.name);
console.log('class= ' + array.exercise.class);
console.log('class= ' + array.exercise.type);
console.log('muscledata= ' + array.exercise.muscledata);
var newElem = $('<li><input type="text" name="exercise.name" value="'+ array.exercise.name + '"><input type="text" name="exercise.class" value="'+ array.exercise.class + '"><input type="text" name="exercise.muscledata" value="'+ array.exercise.muscledata + '"></li>');
$(newElem).appendTo('#editexercise');
var newElem = $('<li><input type="text" name="exercise.name" value="'+ array.exercise.name + '"><input type="text" name="exercise.type" value="'+ array.exercise.type + '"><input type="text" name="exercise.muscledata" value="'+ array.exercise.muscledata + '"></li>');
$(newElem).appendTo('#editexercise');
});
function AddPopulatedLap(type, name, time, distance, sets, reps, weight, muscledata) {
console.log('type= ' + type);
console.log('muscledata= ' + muscledata);
var newElem = $('.new-lap').clone(true).attr('style', 'display: block');
$(newElem).removeClass('new-lap');
$(newElem).appendTo('#sortable');
$(newElem).children('.laptype').val(type).trigger('change');
$(newElem).children('input').attr('disabled',false);
$(newElem).find('.lapname').attr('value', name);
$(newElem).find('.lapdistance').attr('value', distance);
$(newElem).find('.laptime').attr('value', time);
$(newElem).find('.sets').attr('value', sets);
$(newElem).find('.reps').attr('value', reps);
$(newElem).find('.weight').attr('value', weight);
$(newElem).find('.muscledata').attr('value', muscledata);
$(newElem).sortable( "refresh" );
};
function AddPopulatedExercise(name, exclass, muscledata) {
//$(newElem).sortable( "refresh" );
};
////populate exercise tables
socket.on('populateexercises', function(json) {
var content = "";
@@ -161,95 +86,95 @@ $(document).ready(function() {
var array = json;
exercise_autocompletedata = array;
$.each(json, function(index, array) {
$( "ul#exercises" ).append('<li><input type="text" name="exercise.name" value="'+ array.exercise.name + '"><input type="text" name="exercise.class" value="'+ array.exercise.class + '"><input type="text" name="exercise.muscledata" value="'+ 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><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>');
})
;
});
//THe Sortable Stuff
$("#sortable").sortable({
placeholder: "ui-state-highlight",
revert: true,
stop: function(event, ui) {
$('#sortable').trigger('sortupdate')
},
});
$("#sortable").bind('sortupdate', function(event, ui) {
$('#sortable li').each(function(){
var itemindex= $(this).index()
$(this).children('label.uiindex').html('Exercise '+ itemindex );
$(this).find('input, select').not('.laptype').each(function(){
var newname = $(this).attr('name').replace(/\[[0-9]*\]/,'[' + itemindex + ']');
$(this).attr("name",newname);
});
$(this).find('input.exertags').autocomplete({source: exercise_autocompletedata});
});
;
});
// //THe Sortable Stuff
// $("#sortable").sortable({
// placeholder: "ui-state-highlight",
// revert: true,
// stop: function(event, ui) {
// $('#sortable').trigger('sortupdate');
// }
$("#sortableexercises").bind('sortupdate', function(event, ui) {
$('#sortableexercises li').each(function(){
var itemindex= $(this).index()
$(this).find('input, select').each(function(){
var newname = $(this).attr('name').replace(/\[[0-9]*\]/,'[' + itemindex + ']');
$(this).attr("name",newname);
});
});
});
// });
$('#ActivityList').delegate('a.activitydelete', 'click', function() {
socket.emit('delactivity', $(this).attr('title'));
return false;
});
// $("#sortable").bind('sortupdate', function(event, ui) {
// $('#sortable li').each(function(){
// var itemindex= $(this).index();
// $(this).children('label.uiindex').html('Exercise '+ itemindex );
// $(this).find('input, select').not('.laptype').each(function(){
// var newname = $(this).attr('name').replace(/\[[0-9]*\]/,'[' + itemindex + ']');
// $(this).attr("name",newname);
// });
// $(this).find('input.exertags').autocomplete({source: exercise_autocompletedata});
// });
// });
$('#ActivityList').delegate('a.activityedit', 'click', function() {
socket.emit('getactivitybyid', $(this).attr('title'));
$("#Activity").dialog("open");
return false;
});
$('#exercises').delegate('a.exercisedelete', 'click', function() {
// $("#sortableexercises").bind('sortupdate', function(event, ui) {
// $('#sortableexercises li').each(function(){
// var itemindex= $(this).index();
// $(this).find('input, select').each(function(){
// var newname = $(this).attr('name').replace(/\[[0-9]*\]/,'[' + itemindex + ']');
// $(this).attr("name",newname);
// });
// });
// });
// $('#ActivityList').delegate('a.activitydelete', 'click', function() {
// socket.emit('delactivity', $(this).attr('title'));
// return false;
// });
// $('#ActivityList').delegate('a.activityedit', 'click', function() {
// socket.emit('getactivitybyid', $(this).attr('title'));
// $("#Activity").dialog("open");
// return false;
// });
$('#exercises').delegate('a.exercisedelete', 'click', function() {
console.log("exercisedelete_click");
socket.emit('delexercise', $(this).attr('title'));
socket.emit('delexercise', $(this).attr('title'));
return false;
});
$('#exercises').delegate('a.exerciseedit', 'click', function() {
$('#exercises').delegate('a.exerciseedit', 'click', function() {
console.log("exerciseedit_click");
socket.emit('getexercisebyid', $(this).attr('title'));
$("#ExerciseEditorForm").dialog("open");
$("#ExerciseEditorForm").dialog("open");
return false;
});
$('ul').on('click', '.delete',function() {
$(this).closest('li').remove();
$('#sortable').trigger('sortupdate')
});
// $('ul').on('click', '.delete',function() {
// $(this).closest('li').remove();
// $('#sortable').trigger('sortupdate');
// });
//adds selectable element
$("button").click(function() {
var addtype = $(this).attr('value');
var newElem = $('.new-' + addtype).clone(true).attr('style', 'display: block');
$(newElem).removeClass("new-" + addtype);
$(newElem).children('input').attr('disabled',false);
$(newElem).appendTo('#sortable');
$(newElem).sortable( "refresh" );
// $("button").click(function() {
// var addtype = $(this).attr('value');
// var newElem = $('.new-' + addtype).clone(true).attr('style', 'display: block');
// $(newElem).removeClass("new-" + addtype);
// $(newElem).children('input').attr('disabled',false);
// $(newElem).appendTo('#sortable');
// $(newElem).sortable( "refresh" );
$('#sortable').trigger('sortupdate');
//$('#sortableexercises').trigger('sortupdate');
});
// //$('#sortable').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[].name" hint="Name" placeholder="Exercise Name"><input type="text" name="exercise[].class" placeholder="cardio or weights"><input class="addexercisemusclearray" type="text" name="exercise[].muscledata" hint="Muscle Array" placeholder="Muscle Array"><a href=# class=delete>delete</a></li>')
// $('#sortableexercises').trigger('sortupdate');
// });
// $('#sortableexercises').trigger('sortupdate');
// });
// $('#save').click(function() {
// var docid =$(this).closest('span').attr('docid');
// var selector= "#myForm"
@@ -265,33 +190,36 @@ $(document).ready(function() {
// return false;
// });
$('#saveexercises').click(function() {
console.log("saving exercise");
var docid =$(this).closest('span').attr('docid');
var selector= "#EditExerciseForm"
var selector= "#EditExerciseForm";
var formDataAll = $(selector).toObject({mode: 'all'});
socket.emit('updateexercises', formDataAll[0], docid);
//cleanup[]
$('ul#newexercises').find('input').attr('value','');
$('ul#newexercises').find('select').attr('selected','');
$('#editexercise li').children('input').attr('value','');
$('#editexercise li').children('select').attr('value','');
$('span.EditExerciseID').removeAttr('docid');
socket.emit('getexercises', 'please');
//$('ul#newexercises').find('input').attr('value','');
//$('ul#newexercises').find('select').attr('selected','');
//socket.emit('getactivites', 'please');
socket.emit('getexercises', 'please');
return false;
});
$('#cancelform').click(function() {
$('ul#sortable li').remove('.removable');
$('span.ActivityID').removeAttr('docid');
$('#Activity').find('input').attr('value','');
$('#Activity').find('input.datepicker').datepicker();
$('#Activity').find('input.datepicker').datepicker('setDate', new Date());
return false;
socket.emit('getactivites', 'please');
socket.emit('getexercises', 'please');
});
// $('#cancelform').click(function() {
// $('ul#sortable li').remove('.removable');
// $('span.ActivityID').removeAttr('docid');
// $('#Activity').find('input').attr('value','');
// $('#Activity').find('input.datepicker').datepicker();
// $('#Activity').find('input.datepicker').datepicker('setDate', new Date());
// socket.emit('getactivites', 'please');
// socket.emit('getexercises', 'please');
// return false;
// });
$('#cancelexerciseform').click(function(){
//$('ul#editexercise li').remove();
$('#editexercise li').children('input').attr('value','');
@@ -299,38 +227,6 @@ $(document).ready(function() {
socket.emit('getexercises', 'please');
//return false;
});
$('ul').on('change', '.laptype',function() {
console.log ('value= ' + $(this).val() );
var currentselect;
switch($(this).val()) {
case "Cardio":
$(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"><input style="display: none" type=text class="muscledata" name="Activities.Activity.Lap[0].cardio.muscledata"><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;
case "Exercise":
$(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"><input style="display: none" type=text class="muscledata" name="Activities.Activity.Lap[0].exercise.muscledata"><a href=# class=delete>delete</a>');
$(exercise_autocompletedata).each(function(index)
{
console.log("resetingdropdown")
var option = $('<option />');
if (this.class == 'weights') {
option.attr('value', index).text(this.name);
$('.ExerciseDropDown').append(option);
};
});
break;
};
$('#sortable').trigger('sortupdate')
});
//document closing
});

View File

@@ -3,9 +3,11 @@ body {
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
background: #ccc;
}
a {
color: #0069ff;
}
#container {
width: 95%;
height: 98%;
@@ -16,14 +18,18 @@ a {
border-radius: 5px;
float: left;
}
#logo {
text-align: center;
}
#display {
width: 98%;
height: 98%
height: 98%;
margin: 10px 0 10px;
}
label {
margin-left: 5px;
margin-right: 5px;
@@ -37,7 +43,9 @@ label {
vertical-align: middle;
text-align:center;
}
label.uiindex {
.uiindex {
margin-left: 20px;
width: 70px;
}
@@ -61,7 +69,7 @@ input[type="text"] {
vertical-align: middle;
}
#employees h3{
#employees{
padding-left: 30px;
}