diff --git a/app/app.js b/app/app.js index 501a127..30881ca 100644 --- a/app/app.js +++ b/app/app.js @@ -61,12 +61,22 @@ io.sockets.on('connection', function(socket) { console.log('Client connected'); // socket.on('getactivites', function(data) { - console.log('getactivites') +// console.log('getactivites') +// testcollection.find().toArray(function(err, result) { +// if (err) throw err; + // socket.emit('populateactivities', result); + // }); +// }); + + socket.on('getactivites', function(data) { + console.log('getactivitesoooo') testcollection.find().toArray(function(err, result) { if (err) throw err; socket.emit('populateactivities', result); }); -// }); + }); + + //////////////////////// socket.on('addactivity', function(data) { console.log('addactivity' + JSON.stringify(data)) @@ -90,15 +100,15 @@ io.sockets.on('connection', function(socket) { }); /////////////////// socket.on('getexercises', function(data) { - console.log('getactivites') + console.log('emit exercises') exercisecollection.find().toArray(function(err, result) { if (err) throw err; socket.emit('populateexercises', result); }); }); //////////////// - socket.on('getexpressotracks', function(data) { - console.log('getactivites') + socket.on('getexpresso', function(data) { + console.log('emit expresso') expressocollection.find().toArray(function(err, result) { if (err) throw err; socket.emit('populateexpresso', result); diff --git a/app/index.html b/app/index.html index c5fe935..3f35df4 100644 --- a/app/index.html +++ b/app/index.html @@ -37,7 +37,7 @@ $(document).ready(function() { var socket = io.connect(); - socket.emit('populateactivities', 'please'); + socket.emit('getactivites', 'please'); socket.on('populateactivities', function(json) { console.log('#poulate recieved'); @@ -69,8 +69,34 @@ // ); +$( "#tabs" ).tabs(); +$( "#tabs" ).tabs('select' , 0); +//sets buttons to be jquery buttons +$("button").button(); +//sets datepickers +$( "#datepicker" ).datepicker(); + - + $( "#tabs" ).bind( "tabsselect", function(event, ui) { + //console.log('index ' + ui.index ); + //console.log('tab ' + ui.tab ); + //console.log('panel ' + ui.panel ); + if (ui.index == 0) { + console.log('send stuff ' + ui.index ); + socket.emit('getactivites', 'please'); + }; + if (ui.index == 2) { + console.log('send stuff ' + ui.index ); + socket.emit('getexercises', 'please'); + }; + if (ui.index == 3) { + console.log('send stuff ' + ui.index ); + socket.emit('getexpresso', 'please'); + }; + + }); + + $('#ActivityList').delegate('a.activitydelete', 'click', function() { @@ -111,12 +137,7 @@ $('ul').on('click', '.delete',function() { }); - $( "#tabs" ).tabs(); - $( "#tabs" ).tabs('select' , 0); -//sets buttons to be jquery buttons -$("button").button(); -//sets datepickers -$( "#datepicker" ).datepicker(); + $("button").button(); //adds selectable element @@ -172,7 +193,7 @@ $("button").click(function() {
- +