sstent/alex_app1
1
0
Fork 0
mirror of https://github.com/sstent/alex_app1.git synced 2026-01-27 09:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

tidying code - removed unneccesary deps, sterted cleaning client javascript

Browse Source
This commit is contained in:
sstent
2013-01-08 14:40:40 -05:00
parent 1727a62eb4
commit e8bbb4ecf5
172 changed files with 284 additions and 38293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
static/javascripts/script.js
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