Matthew first edit

app/controllers/applications.js

@@ -135,6 +135,7 @@ function filterApplications(req, res, cb) {
                         ID: bioApp.userstudentid,
                         FirstName: bioApp.userfname,
                         LastName: bioApp.userlname,
+                        PhoneNumber: bioApp.phonenumber,
                         'BIO GPA': bioApp.programgpa,
                         Concentration: bioApp.major,
                         'Expected Graduation': bioApp.expectedGraduationSemester + ' ' + bioApp.expectedGraduationYear,
@@ -144,7 +145,7 @@ function filterApplications(req, res, cb) {
                     appArray.push(bioJson);
                 });
 
-                fields = ['ID', 'FirstName', 'LastName', 'BIO GPA', 'Concentration',
+                fields = ['ID', 'FirstName', 'LastName', 'PhoneNumber', 'BIO GPA', 'Concentration',
                     'Expected Graduation', 'Semester', 'Year'];
 
                 cb(null, {
@@ -170,6 +171,7 @@ function filterApplications(req, res, cb) {
                         ID: itecApp.userstudentid,
                         FirstName: itecApp.userfname,
                         LastName: itecApp.userlname,
+                        PhoneNumber: itecApp.phonenumber,
                         'ITEC GPA': itecApp.itecgpa,
                         Concentration: itecApp.major,
                         'Expected Graduation': itecApp.expectedGraduationSemester + ' ' + itecApp.expectedGraduationYear,
@@ -180,7 +182,7 @@ function filterApplications(req, res, cb) {
                     appArray.push(itecJson);
                 });
 
-                fields = ['ID', 'FirstName', 'LastName', 'ITEC GPA', 'Concentration',
+                fields = ['ID', 'FirstName', 'LastName', 'PhoneNumber', 'ITEC GPA', 'Concentration',
                     'Expected Graduation', 'Programming', 'Semester', 'Year'];
 
                 cb(null, {
@@ -223,6 +225,7 @@ module.exports.filterApplications = function (req, res) {
     }
 }
 
+
 function write(fileName, csv, req, res) {
     fs.writeFile(fileName, csv, function (err) {
         if (err) {
@@ -234,6 +237,7 @@ function write(fileName, csv, req, res) {
         }
     });
 }
+//passes in comma seperated file
 
 function download(csvPath, req, res) {
     res.download(csvPath, function (err) {
@@ -269,13 +273,19 @@ module.exports.getSpecificBioApplication = function (req, res) {
         if (err) throw err;
         Document.getBioDocumentsForUser(bioApp.useremail, function (incomingDocuments) {
             documents = incomingDocuments;
-            res.render('applicationdetails.ejs', {
-                application: bioApp,
-                documents: documents,
-                user: req.user,
-                successMessage: req.flash('success'),
-                failureMessage: req.flash('failure')
-            });
+            User.findOne({_id: req.user._id}, function(err, user) {
+                if (err) {
+                    throw err;
+                }
+                res.render('applicationdetails.ejs', {
+                    application: bioApp,
+                    documents: documents,
+                    user: user,
+                    // userPhoneNumber: user.local.phone,
+                    successMessage: req.flash('success'),
+                    failureMessage: req.flash('failure')
+                });
+            })
         });
     });
 };
@@ -293,13 +303,19 @@ module.exports.getSpecificItecApplication = function (req, res) {
         if (err) throw err;
         Document.getItecDocumentsForUser(itecApp.useremail, function (incomingDocuments) {
             documents = incomingDocuments;
-            res.render('applicationdetails.ejs', {
-                application: itecApp,
-                documents: documents,
-                user: req.user,
-                successMessage: req.flash('success'),
-                failureMessage: req.flash('failure')
-            });
+            User.findOne({_id: req.user._id}, function(err, user) {
+                if (err) {
+                    throw err;
+                }
+                res.render('applicationdetails.ejs', {
+                    application: itecApp,
+                    documents: documents,
+                    user: user,
+                    // userPhoneNumber: user.local.phone,
+                    successMessage: req.flash('success'),
+                    failureMessage: req.flash('failure')
+                });
+            })
         });
     });
 }
@@ -686,6 +702,7 @@ module.exports.postItecApplication = function (req, res) {
             itecapp.userstudentid = req.user.studentid;
             itecapp.userfname = req.user.fname;
             itecapp.userlname = req.user.lname;
+            itecapp.userphone = req.user.phone;
             itecapp.useraddress = req.user.address;
             itecapp.usercity = req.user.city;
             itecapp.userstate = req.user.state;
@@ -718,6 +735,7 @@ module.exports.postBioApplication = function (req, res) {
             bioapp.userstudentid = req.user.studentid;
             bioapp.userfname = req.user.fname;
             bioapp.userlname = req.user.lname;
+            bioapp.userphone = req.user.phone;
             bioapp.useraddress = req.user.address;
             bioapp.usercity = req.user.city;
             bioapp.userstate = req.user.state;

app/controllers/editApplications.js

@@ -4,39 +4,53 @@
     - Logic for routes: getEditBio, getEditItec, updateBioApp, updateItecApp
        - Loads the user's submitted bio/itec application and then updates
 */
-
+var User = require('../models/user');
 var Bio = require('../models/bio');
 var Itec = require('../models/itec');
 
 module.exports.getEditBio = function(req, res) {
     Bio.getUsersBioApp(req.user.email, function(foundBioApp) {
-        res.render('editbio', {
-            application: foundBioApp,
-            user : req.user,
-            successMessage: req.flash('success'),
-            failureMessage: req.flash('failure')
-        });
+        User.findOne({_id: req.user._id}, function(err, user) {
+            res.render('editbio', {
+                application: foundBioApp,
+                user : user,
+                successMessage: req.flash('success'),
+                failureMessage: req.flash('failure')
+            });
+        })
     });
 }
 
 module.exports.getEditItec = function(req, res) {
     Itec.getUsersItecApp(req.user.email, function(foundItecApp) {
-        res.render('editItec', {
-            application: foundItecApp,
-            user : req.user,
-            successMessage: req.flash('success'),
-            failureMessage: req.flash('failure')
-        });
+        User.findOne({_id: req.user._id}, function(err, user) {
+            res.render('editItec', {
+                application: foundItecApp,
+                user : user,
+                successMessage: req.flash('success'),
+                failureMessage: req.flash('failure')
+            });
+        })
     });
 }
 
+
+module.exports.updateAppStatusItec = function (req, res){
+    newItecapp.applicationstatus = oldItecApp.applicationstatusItec;
+}
+
+module.exports.updateAppStatusBio = function (req, res){
+    newBioapp.applicationstatus = oldBioApp.applicationstatusBio;
+}
+
 module.exports.updateBioApp = function(req, res) {
 
     var newBioapp = new Bio(req.body);
     newBioapp.useremail = req.user.email;
     newBioapp.userstudentid = req.user.studentid;
     newBioapp.userfname = req.user.fname;
     newBioapp.userlname = req.user.lname;
+    newBioapp.userphone = req.user.phone;
     newBioapp.useraddress = req.user.address;
     newBioapp.usercity = req.user.city;
     newBioapp.userstate = req.user.state;
@@ -68,6 +82,7 @@ module.exports.updateItecApp = function(req, res) {
     newItecapp.userstudentid = req.user.studentid;
     newItecapp.userfname = req.user.fname;
     newItecapp.userlname = req.user.lname;
+    newItecapp.userphone = req.user.phone;
     newItecapp.useraddress = req.user.address;
     newItecapp.usercity = req.user.city;
     newItecapp.userstate = req.user.state;

app/controllers/editprofile.js

@@ -29,6 +29,7 @@ module.exports.getEditProfile = function(req, res) {
     HTTP Req: POST
     URL: '/editprofile'
 */
+
 module.exports.updateProfile = function(req, res) {
     User.update({'local.email' : req.user.email}, {
         'local.studentid' : req.body.studentid,
@@ -38,7 +39,8 @@ module.exports.updateProfile = function(req, res) {
         'local.city' : req.body.city,
         'local.state' : req.body.state,
         'local.zipcode' : req.body.zipcode,
-        'local.discipline' : req.body.discipline
+        'local.discipline' : req.body.discipline,
+        'local.phone' : req.body.phone
     }, function(err) {
         if (err) {
             res.flash('failure', 'An error has occured, your profile could not be updated.');

app/controllers/export.js

@@ -124,6 +124,7 @@ module.exports.exportExport = function (req, res) {
                         ID: bioApp.userstudentid,
                         FirstName: bioApp.userfname,
                         LastName: bioApp.userlname,
+                        PhoneNumber: bioApp.userphone,
                         'BIO GPA': bioApp.programgpa,
                         Concentration: bioApp.major,
                         'Expected Graduation': bioApp.expectedGraduationSemester + ' ' + bioApp.expectedGraduationYear,
@@ -133,7 +134,7 @@ module.exports.exportExport = function (req, res) {
                     appArray.push(bioJson);
                 });
 
-                fields = ['ID', 'FirstName', 'LastName', 'BIO GPA', 'Concentration',
+                fields = ['ID', 'FirstName', 'LastName', 'PhoneNumber', 'BIO GPA', 'Concentration',
                     'Expected Graduation', 'Semester', 'Year'];
 
                 var csv = json2csv({ data: appArray, fields: fields });
@@ -155,6 +156,7 @@ module.exports.exportExport = function (req, res) {
                         ID: itecApp.userstudentid,
                         FirstName: itecApp.userfname,
                         LastName: itecApp.userlname,
+                        PhoneNumber: itecApp.userphone,
                         'ITEC GPA': itecApp.itecgpa,
                         Concentration: itecApp.major,
                         'Expected Graduation': itecApp.expectedGraduationSemester + ' ' + itecApp.expectedGraduationYear,
@@ -165,7 +167,7 @@ module.exports.exportExport = function (req, res) {
                     appArray.push(itecJson);
                 });
 
-                fields = ['ID', 'FirstName', 'LastName', 'ITEC GPA', 'Concentration',
+                fields = ['ID', 'FirstName', 'LastName', 'PhoneNumber', 'ITEC GPA', 'Concentration',
                     'Expected Graduation', 'Programming', 'Semester', 'Year'];
 
                 var csv = json2csv({ data: appArray, fields: fields });
@@ -531,6 +533,7 @@ module.exports.postItecApplication = function (req, res) {
             itecapp.userstudentid = req.user.studentid;
             itecapp.userfname = req.user.fname;
             itecapp.userlname = req.user.lname;
+            itecapp.userphone = req.user.phone;
             itecapp.useraddress = req.user.address;
             itecapp.usercity = req.user.city;
             itecapp.userstate = req.user.state;
@@ -563,6 +566,7 @@ module.exports.postBioApplication = function (req, res) {
             bioapp.userstudentid = req.user.studentid;
             bioapp.userfname = req.user.fname;
             bioapp.userlname = req.user.lname;
+            bioapp.userphone = req.user.phone;
             bioapp.useraddress = req.user.address;
             bioapp.usercity = req.user.city;
             bioapp.userstate = req.user.state;

app/controllers/support.js

@@ -0,0 +1,18 @@
+/*
+    Controller functions containing the logic for the support routes
+    Authors : Matthew Rosario
+*/
+
+/*
+    HTTP Req: GET
+    URL: '/support'
+*/
+module.exports.getSupport = function(req, res) {
+    if (req.isAuthenticated()) {
+        res.render('support.ejs', {
+            user: req.user
+        });
+    } else {
+        res.render('support.ejs');
+    }
+};

app/models/bio.js

@@ -11,7 +11,7 @@ var bioSchema = mongoose.Schema({
     },
     phonenumber: {
         type: String,
-        required: false
+        required: true
 },
     emergencycontactname: {
         type: String,
@@ -213,6 +213,10 @@ var bioSchema = mongoose.Schema({
             type: String,
             required: false
         },
+        userphone: {
+        type: String,
+        required: false
+    },
         useraddress: {
             type: String,
             required: false

app/models/document.js

@@ -1,5 +1,6 @@
 var mongoose = require('mongoose');
 
+
 var documentSchema = mongoose.Schema({
     user: {
         user_id : {

app/models/itec.js

@@ -23,7 +23,7 @@ var itecSchema = mongoose.Schema({
         },
         phonenumber: {
                 type: String,
-                required: false
+                required: true
         },
         classification: {
                 type: String,
@@ -175,6 +175,10 @@ var itecSchema = mongoose.Schema({
             type: String,
             required: false
         },
+        userphone: {
+        type: String,
+        required: false
+        },
         useraddress: {
             type: String,
             required: false

app/models/user.js

@@ -39,6 +39,10 @@ var userSchema = mongoose.Schema({
             type: String,
             required: true
         },
+        phone: {
+            type: String,
+            required: true
+        },
         address: {
             type: String,
             required: true

app/routes/index.js

@@ -24,6 +24,8 @@ var ctrlMongoToCsv = require('../controllers/mongoToCsv');
 var ctrlUpload = require('../controllers/documentUpload');
 var ctrlDelete = require('../controllers/documentDelete');
 var ctrlSiteNotes = require('../controllers/sitenotes');
+var ctrlSupport = require('../controllers/support');
+
 
 
 
@@ -187,10 +189,10 @@ module.exports = function (app, passport) {
     app.get('/site/contacts/:siteid/:documentid', isLoggedIn, isAdminOrInstructor, ctrlSites.deleteSiteContact);
     app.get('/site/edit/:siteid', isLoggedIn, isAdminOrInstructor, ctrlSites.getSiteToEdit);
     app.get('/site/:siteid', isLoggedIn, isAdminOrInstructor, ctrlSites.getSiteDetails);
-    app.post('/addSite', isLoggedIn, isAdmin, ctrlSites.postAddSite);
+    app.post('/addSite', isLoggedIn, isAdminOrInstructor, ctrlSites.postAddSite);
     app.post('/site/:siteid', isLoggedIn, isAdminOrInstructor, ctrlSites.addSiteContact);
-    app.post('/site/edit/:siteid', isLoggedIn, isAdmin, ctrlSites.updateSite);
-    app.post('/site/delete/:siteid', isLoggedIn, isAdmin, ctrlSites.deleteSite);
+    app.post('/site/edit/:siteid', isLoggedIn, isAdminOrInstructor, ctrlSites.updateSite);
+    app.post('/site/delete/:siteid', isLoggedIn, isAdminOrInstructor, ctrlSites.deleteSite);
     app.get('/site/:siteId/export/contacts', makeCSVDirectory, isLoggedIn, isAdminOrInstructor, ctrlSites.exportContacts);
 
     /* Promote page */
@@ -204,6 +206,9 @@ module.exports = function (app, passport) {
     /* FAQ page */
     app.get('/faq', ctrlFAQ.getFAQ);
 
+    /* Support Page */
+    app.get('/support', ctrlSupport.getSupport);
+
     /* Help page */
     app.get('/help', ctrlHelp.getHelp);
     app.get('/admininstructorhelp', ctrlHelp.getAdminInstructorHelp);

config/passport.js

@@ -23,6 +23,7 @@ var User = require('../app/models/user');
             studentid: user.local.studentid,
             fname: user.local.fname,
             lname: user.local.lname,
+            phone: user.local.phone,
             address: user.local.address,
             city: user.local.city,
             state: user.local.state,
@@ -83,6 +84,7 @@ var User = require('../app/models/user');
                         newUser.local.studentid = req.body.studentid;
                         newUser.local.fname = req.body.fname;
                         newUser.local.lname = req.body.lname;
+                        newUser.local.phone = req.body.phone;
                         newUser.local.address = req.body.address;
                         newUser.local.city = req.body.city;
                         newUser.local.state = req.body.state;

development/css/main.css

@@ -15,7 +15,7 @@ body {
 .scrollable {
     overflow-y: scroll;
     height: 100px;
-    resize: none; /* Remove this if you want the user to resize the textarea */
+    resize: none;  /*Remove this if you want the user to resize the textarea */
 }
 
 .otherLabel {