bodyrep/DemoApp
1
0
Fork 0
mirror of https://github.com/bodyrep/DemoApp.git synced 2026-01-25 22:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed newexercise labels, added body to single workout page, added delete function for workouts

Browse Source
This commit is contained in:
Stuiart Stent
2013-04-07 12:42:48 -04:00
parent 55a51ad1e1
commit 8dd478bbe2
24 changed files with 147 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
public/javascripts/scripts.js
View File

@@ -1,13 +1,49 @@
$(document).ready(function() {
//makes buttons buttons
$("button").button();
//makes datepickers
$( ".datepicker" ).datepicker();
$('.datepicker').datepicker('setDate', new Date());
//just everything works better when synchro
$.ajax({async:false});
// $.widget( "ui.timespinner", $.ui.spinner, {
// options: {
// // seconds
// step: 60 * 1000,
// // hours
// page: 60,
// culture: "en-US",
// spin : function(event, ui) {
// console.log("SPINN!");
// return false;
// },
// change: function( event, ui ) {
// console.log("change!");
// return false;
// }
// }
// _parse: function( value ) {
// if ( typeof value === "string" ) {
// // already a timestamp
// if ( Number( value ) == value ) {
// return Number( value );
// }
// return +Globalize.parseDate( value );
// }
// return value;
// },
// _format: function( value ) {
// return Globalize.format( new Date(value), "t" );
// }
// });
// $( "#culture" ).change(function() {
// var current = $( "#spinner" ).timespinner( "value" );
// Globalize.culture( $(this).val() );
// $( "#spinner" ).timespinner( "value", current );
// });
// });
jQuery.extend({
getValues: function(url) {
@@ -81,7 +117,7 @@ $(document).ready(function() {
});
$(document).on('click', '.addSet',(function() {
var newElem = $('<li class="set"><label for="element" name="elements[0][splits][0][reps]">elements[0][splits][0][reps]<br /></label><input name="elements[0][splits][0][reps]" class="element"><label for="element" name="elements[0][splits][0][weight]"><br />elements[0][splits][0][weight]<br /></label><input name="elements[0][splits][0][weight]" class="element"><button type="button" class="delete">Delete Set</button></li>');
var newElem = $('<li class="set"><label for="element" name="elements[0][splits][0][reps]">Reps</label><input name="elements[0][splits][0][reps]" class="element"><label for="element" name="elements[0][splits][0][weight]">Weight</label><input name="elements[0][splits][0][weight]" class="element"><button type="button" class="delete">Delete Set</button></li>');
$(this).siblings('ul.sets').append(newElem);
$("button").button();
$("ul.sets").sortable({
@@ -108,40 +144,7 @@ $(document).ready(function() {
$("#newworkout").bind('sortupdate', function(event, ui) {
$('#exercises > li').each(function(){
var itemindex= $(this).index();
$(this).find('input, select').each(function() {
var newname = $(this).attr('name').replace(/elements\[[0-9]*\]/,'elements[' + itemindex + ']');
$(this).attr('name', newname);
});
$(this).find('ul li').each(function(){
var itemindex2= $(this).index();
$(this).children('input').each(function(){
var newname2 = $(this).attr('name').replace(/\[splits\]\[[0-9]*\]/,'[splits][' + itemindex2 + ']');
newname2 = newname2.replace(/elements\[[0-9]*\]/,'elements[' + itemindex + ']');
$(this).attr('name', newname2);
});
$(this).children('label').each(function(){
var newname2 = 'Set '+ (itemindex2 + 1 ) + '';
$(this).html(newname2);
});
//Only show delete if more than 1 set
if ( $(this).siblings('.set').length > 0 ) {
$(this).children('.delete').show();
} else {
$(this).children('.delete').hide();
}
});
});
});
@@ -162,7 +165,52 @@ $(document).ready(function() {
$("#Leftpane").delegate("button.newex-link", "click",function () {
var id = $(this).attr('value');
$('div#Rightpane').empty().load(id);
$('div#Rightpane').empty().load(id, function(){
//$( "#timespinner" ).timespinner();
//makes datepickers
$( ".datepicker" ).datepicker();
$('.datepicker').datepicker('setDate', new Date());
$("#newworkout").bind('sortupdate', function(event, ui) {
console.log('sortupdate called');
$('#exercises > li').each(function(){
var itemindex= $(this).index();
$(this).find('input, select').each(function() {
var newname = $(this).attr('name').replace(/elements\[[0-9]*\]/,'elements[' + itemindex + ']');
$(this).attr('name', newname);
});
$(this).find('ul li').each(function(){
var itemindex2= $(this).index();
$(this).children('input').each(function(){
var newname2 = $(this).attr('name').replace(/\[splits\]\[[0-9]*\]/,'[splits][' + itemindex2 + ']');
newname2 = newname2.replace(/elements\[[0-9]*\]/,'elements[' + itemindex + ']');
$(this).attr('name', newname2);
});
// $(this).children('label').each(function(){
// var newname2 = 'Set '+ (itemindex2 + 1 ) + '';
// $(this).html(newname2);
// });
//Only show delete if more than 1 set
if ( $(this).siblings('.set').length > 0 ) {
$(this).children('.delete').show();
} else {
$(this).children('.delete').hide();
}
});
});
});
});
$('div#Leftpane').empty().load("/workouts/filters", function(){
$('span.SVGBODYFilter').empty().load("/images/BlankBody.svg", function(){
//$("button").button();
@@ -193,6 +241,7 @@ $(document).ready(function() {
$("button").button();
$('span.SVGBODY').empty().load("/images/BlankBody.svg", function(){
});
LoadBodyHistory();
});
$('div#Leftpane').empty().load("/users/"+ id + "/sidebar", function(){
$("button").button();
@@ -203,7 +252,9 @@ $(document).ready(function() {
var id = $(this).attr('href');
$('div#Rightpane').empty().load(id , function(){
$("button").button();
LoadBodyHistory();
});
return false;
});
@@ -212,12 +263,13 @@ $(document).ready(function() {
$('div#Rightpane').empty().load(id , function(){
$("button").button();
$( ".buttonset" ).buttonset();
});
});
$(document).on('click', '.addthisExercise',(function() {
var newElem = $('<li class=ui-state-default ><label for="element">Name</label><input name="exercisename" class="element" value="' + $(this).closest('li').data('name') + '"><input name="elements[][exerciseID]" class="hiddenelement" value="' + $(this).closest('li').data('exid') + '"><input name="elements[][Modifier]" class="element" value="' + $(this).closest('li').data('musclearrayMod') + '"><button type="button" class="addSet">Add Set</button><button type="button" class="delete">Delete Exercise</button><ul class="sets"><li class="set"><label for="element" name="elements[0][splits][0][reps]">elements[0][splits][0][reps]<br /></label><input name="elements[0][splits][0][reps]" class="element"><label for="element" name="elements[0][splits][0][weight]"><br />elements[0][splits][0][weight]<br /></label><input name="elements[0][splits][0][weight]" class="element"><button type="button" class="delete">Delete Set</button></li></ul></li>');
var newElem = $('<li class=ui-state-default ><label for="element">Name</label><input name="exercisename" class="element" value="' + $(this).closest('li').data('name') + '"><input name="elements[][exerciseID]" class="hiddenelement" value="' + $(this).closest('li').data('exid') + '"><input name="elements[][Modifier]" class="element" value="' + $(this).closest('li').data('musclearrayMod') + '"><button type="button" class="addSet">Add Set</button><button type="button" class="delete">Delete Exercise</button><ul class="sets"><li class="set"><label for="element" name="elements[0][splits][0][reps]">Reps</label><input name="elements[0][splits][0][reps]" class="element"><label for="element" name="elements[0][splits][0][weight]">Weight</label><input name="elements[0][splits][0][weight]" class="element"><button type="button" class="delete">Delete Set</button></li></ul></li>');
$(newElem).data('musclearray', $(this).closest('li').data('musclearray'));
$(newElem).data('musclearrayMod', $(this).closest('li').data('musclearrayMod'));
$(newElem).appendTo('ul#exercises');

5
public/stylesheets/style.css
View File

@@ -39,6 +39,9 @@ li.floatleft {
float: left;
}
.workoutentry {
width: 250px;
}
#Leftpane {
display: block;
@@ -52,7 +55,7 @@ li.floatleft {
display: block;
float: left;
overflow: hidden;
width: 80%;
wxxxidth: 80%;
}
#userphoto {