added vacations index

abarnhard · Aug 19, 2014 · 5a3e725 · 5a3e725
1 parent 521bdc9
commit 5a3e725
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/app/controllers/vacations.js b/app/controllers/vacations.js
@@ -1,11 +1,22 @@
 'use strict';
 
+var Vacation = require('../models/vacation');
+
 exports.init = function(req, res){
   res.render('vacations/init');
 };
 
-
 exports.create = function(req, res){
-  console.log(req.body);
+  // console.log(req.body);
+  Vacation.save(req.body, function(){
+    res.redirect('/vacations');
+  });
+};
+
+exports.index = function(req, res){
+  Vacation.all(function(err, vacations){
+    // console.log(vacations);
+    res.render('vacations/index', {vacations:vacations});
+  });
 };
 
diff --git a/app/models/vacation.js b/app/models/vacation.js
@@ -25,4 +25,8 @@ Vacation.save = function(o, cb){
 };
 
 module.exports = Vacation;
-
+/* Will need later:
+Vacation.collection.update({_id:id}, {$set:{balance:a.balance}, $inc:{numTransacts:1}, $push:{transactions:t}}, function(){
+  if(cb){cb();}
+});
+*/
diff --git a/app/routes/routes.js b/app/routes/routes.js
@@ -21,6 +21,7 @@ module.exports = function(app, express){
 
   app.get('/vacations/new', vacations.init);
   app.post('/vacations', vacations.create);
+  app.get('/vacations', vacations.index);
 
   console.log('Routes Loaded');
 };

diff --git a/app/views/shared/nav.jade b/app/views/shared/nav.jade
@@ -12,5 +12,6 @@ nav.navbar.navbar-default(role='navigation')
         li: a(href='/about') About
         li: a(href='/faq') FAQ
         li: a(href='/contact') Contact
+        li: a(href='/vacations') View Vacations
         li: a(href='/vacations/new') Add Vacation
 
diff --git a/app/views/vacations/index.jade b/app/views/vacations/index.jade