From 2fe9607e43e55c02006918112b4911b213ade544 Mon Sep 17 00:00:00 2001
From: Toan Vo <toanalien@gmail.com>
Date: Sun, 23 Oct 2016 11:31:18 +0700
Subject: [PATCH 1/3] fix jshint

---
 .jshintrc                                     |   2 +-
 app/models/form_submission.server.model.js    | 138 +++++++++---------
 config/strategies/local.js                    |  10 +-
 public/dist/form-application.js               |   2 +-
 .../forms/config/forms.client.routes.js       |   2 +-
 5 files changed, 78 insertions(+), 76 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index a023b266..afb53268 100755
--- a/.jshintrc
+++ b/.jshintrc
@@ -8,7 +8,7 @@
 	"curly": false, // Require {} for every new block or scope.
 	"eqeqeq": true, // Require triple equals i.e. `===`.
 	"immed": true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
-	"latedef": true, // Prohibit variable use before definition.
+	"latedef": false, // Prohibit variable use before definition.
 	"newcap": false, // Require capitalization of all constructor functions e.g. `new F()`.
 	"noarg": true, // Prohibit use of `arguments.caller` and `arguments.callee`.
 	"quotmark": "single", // Define quotes to string values.
diff --git a/app/models/form_submission.server.model.js b/app/models/form_submission.server.model.js
index 5e089b16..f96d40b4 100644
--- a/app/models/form_submission.server.model.js
+++ b/app/models/form_submission.server.model.js
@@ -45,8 +45,8 @@ var newDemoTemplate = {
 
 
 // Setter function for form_fields
-function formFieldsSetter(form_fields){
-	for(var i=0; i<form_fields.length; i++){
+function formFieldsSetter(form_fields) {
+	for (var i = 0; i < form_fields.length; i++) {
 		form_fields[i].isSubmission = true;
 		form_fields[i].submissionId = form_fields[i]._id;
 		form_fields[i]._id = new mongoose.mongo.ObjectID();
@@ -143,9 +143,11 @@ FormSubmissionSchema.pre('save', function (next) {
 
 	var self = this;
 
-	if(this.hasPlugins.oscarhost){
-		mongoose.model('Form').findById(self.form, function(err, _form){
-			var form_ids = _.map(_.pluck(_form.form_fields, '_id'), function(id){ return ''+id;}),
+	if (this.hasPlugins.oscarhost) {
+		mongoose.model('Form').findById(self.form, function (err, _form) {
+			var form_ids = _.map(_.pluck(_form.form_fields, '_id'), function (id) {
+					return '' + id;
+				}),
 				submission_ids = _.pluck(self.form_fields, '_id');
 
 			// console.log('Form form_field ids\n--------');
@@ -153,59 +155,59 @@ FormSubmissionSchema.pre('save', function (next) {
 			// console.log('FormSubmission [form_field ids]\n--------');
 			// console.log(submission_ids);
 
-			if(err) return next(err);
+			if (err) return next(err);
 			// console.log(_form);
 			// console.log('should push to api');
 			// console.log( (!this.oscarDemoNum && !!_form.plugins.oscarhost.baseUrl && !!_form.plugins.oscarhost.settings.fieldMap) );
-			if(!this.oscarDemoNum && _form.plugins.oscarhost.baseUrl && _form.plugins.oscarhost.settings.fieldMap){
+			if (!this.oscarDemoNum && _form.plugins.oscarhost.baseUrl && _form.plugins.oscarhost.settings.fieldMap) {
 				console.log('OSCARHOST API HOOK');
-		 		var url_login = _form.plugins.oscarhost.baseUrl+'/LoginService?wsdl',
-		 			url_demo = _form.plugins.oscarhost.baseUrl+'/DemographicService?wsdl';
+				var url_login = _form.plugins.oscarhost.baseUrl + '/LoginService?wsdl',
+					url_demo = _form.plugins.oscarhost.baseUrl + '/DemographicService?wsdl';
 
-		 		var args_login = {arg0: config.oscarhost.auth.user, arg1: config.oscarhost.auth.pass};
+				var args_login = {arg0: config.oscarhost.auth.user, arg1: config.oscarhost.auth.pass};
 
-		 		var options = {
-		 		    ignoredNamespaces: {
-		 		        namespaces: ['targetNamespace', 'typedNamespace'],
-		 		        override: true
-		 		    }
-		 		};
-		 		// console.log(self.form_fields);
+				var options = {
+					ignoredNamespaces: {
+						namespaces: ['targetNamespace', 'typedNamespace'],
+						override: true
+					}
+				};
+				// console.log(self.form_fields);
 
-		 		//Generate demographics from hashmap
-		 		var generateDemo = function(formFields, conversionMap, demographicsTemplate){
-		 			console.log('generating Demo fields');
-		 			console.log(conversionMap);
-		 			var _generatedDemo = {}, currField, propertyName;
+				//Generate demographics from hashmap
+				var generateDemo = function (formFields, conversionMap, demographicsTemplate) {
+					console.log('generating Demo fields');
+					console.log(conversionMap);
+					var _generatedDemo = {}, currField, propertyName;
 
-		 			for(var y=0; y<formFields.length; y++){
-		 				currField = formFields[y];
-		 				propertyName = conversionMap[currField._id];
+					for (var y = 0; y < formFields.length; y++) {
+						currField = formFields[y];
+						propertyName = conversionMap[currField._id];
 
-		 				if(demographicsTemplate.hasOwnProperty(conversionMap[currField._id])){
-		 					_generatedDemo[propertyName] = currField.fieldValue+'';
-		 				}else if(propertyName === 'DOB'){
-	 						var date = new Date(currField.fieldValue);
-	 						_generatedDemo.dateOfBirth = date.getDate()+'';
-	 						_generatedDemo.yearOfBirth = date.getFullYear()+'';
-	 						_generatedDemo.monthOfBirth = date.getMonth()+'';
-		 				}
-		 			}
-		 			var currDate = new Date();
-		 			var dateString = currDate.toISOString().split('T')[0] + ' ' + currDate.toISOString().split('T')[1].slice(0,8);
-		 			_generatedDemo.lastUpdateDate = currDate.toISOString();
-		 			return _generatedDemo;
-		 		};
+						if (demographicsTemplate.hasOwnProperty(conversionMap[currField._id])) {
+							_generatedDemo[propertyName] = currField.fieldValue + '';
+						} else if (propertyName === 'DOB') {
+							var date = new Date(currField.fieldValue);
+							_generatedDemo.dateOfBirth = date.getDate() + '';
+							_generatedDemo.yearOfBirth = date.getFullYear() + '';
+							_generatedDemo.monthOfBirth = date.getMonth() + '';
+						}
+					}
+					var currDate = new Date();
+					var dateString = currDate.toISOString().split('T')[0] + ' ' + currDate.toISOString().split('T')[1].slice(0, 8);
+					_generatedDemo.lastUpdateDate = currDate.toISOString();
+					return _generatedDemo;
+				};
 
-		 		var submissionDemographic = generateDemo(self.form_fields, _form.plugins.oscarhost.settings.fieldMap, newDemoTemplate);
+				var submissionDemographic = generateDemo(self.form_fields, _form.plugins.oscarhost.settings.fieldMap, newDemoTemplate);
 
-		 		console.log(submissionDemographic);
+				console.log(submissionDemographic);
 				async.waterfall([
 					function (callback) {
 						//Authenticate with API
-						soap.createClient(url_login, options, function(err, client) {
+						soap.createClient(url_login, options, function (err, client) {
 							client.login(args_login, function (err, result) {
-								if(err) return callback(err);
+								if (err) return callback(err);
 								console.log('SOAP authenticated');
 								return callback(null, result.return);
 							});
@@ -214,46 +216,46 @@ FormSubmissionSchema.pre('save', function (next) {
 
 					function (security_obj, callback) {
 						//Force Add Demographic
-						if(_form.plugins.oscarhost.settings.updateType === 'force_add'){
-							soap.createClient(url_demo, options, function(err, client) {
-								if(err) return callback(err);
-								client.setSecurity(new OscarSecurity(security_obj.securityId, security_obj.securityTokenKey) );
+						if (_form.plugins.oscarhost.settings.updateType === 'force_add') {
+							soap.createClient(url_demo, options, function (err, client) {
+								if (err) return callback(err);
+								client.setSecurity(new OscarSecurity(security_obj.securityId, security_obj.securityTokenKey));
 
-								client.addDemographic({ arg0: submissionDemographic }, function (err, result) {
+								client.addDemographic({arg0: submissionDemographic}, function (err, result) {
 									console.log('FORCE ADDING DEMOGRAPHIC \n');
 									// console.log(result.return);
-									if(err) return callback(err);
+									if (err) return callback(err);
 									return callback(null, result);
 								});
 							});
 						}
 					}
 
-				], function(err, result) {
-					if(err) return next(err);
+				], function (err, result) {
+					if (err) return next(err);
 
 					self.oscarDemoNum = parseInt(result.return, 10);
-					console.log('self.oscarDemoNum: '+self.oscarDemoNum);
+					console.log('self.oscarDemoNum: ' + self.oscarDemoNum);
 					return next();
 				});
-			}else{
+			} else {
 				return next();
 			}
 		});
-	}else{
+	} else {
 		return next();
 	}
 
 });
 
 //Check for IP Address of submitting person
-FormSubmissionSchema.pre('save', function (next){
+FormSubmissionSchema.pre('save', function (next) {
 	var self = this;
-	if(this.ipAddr){
-		if(this.isModified('ipAddr') || !this.geoLocation){
-			freegeoip.getLocation(this.ipAddr, function(err, location){
-				if(err) return next(err);
-				self.geoLocation = location
+	if (this.ipAddr) {
+		if (this.isModified('ipAddr') || !this.geoLocation) {
+			freegeoip.getLocation(this.ipAddr, function (err, location) {
+				if (err) return next(err);
+				self.geoLocation = location;
 				return next();
 			});
 		}
@@ -267,19 +269,19 @@ FormSubmissionSchema.pre('save', function (next) {
 		self = this,
 		_form = this.form;
 
-	if(this.pdf && this.pdf.path){
-		dest_filename = self.title.replace(/ /g,'')+'_submission_'+Date.now()+'.pdf';
-		var __path = this.pdf.path.split('/').slice(0,this.pdf.path.split('/').length-1).join('/');
+	if (this.pdf && this.pdf.path) {
+		dest_filename = self.title.replace(/ /g, '') + '_submission_' + Date.now() + '.pdf';
+		var __path = this.pdf.path.split('/').slice(0, this.pdf.path.split('/').length - 1).join('/');
 		dest_path = path.join(__path, dest_filename);
 
 		self.pdfFilePath = dest_path;
 
-		pdfFiller.fillForm(self.pdf.path, dest_path, self.fdfData, function(err){
-			if(err) {
-				console.log('\n err.message: '+err.message);
-				return next( new Error(err.message) );
+		pdfFiller.fillForm(self.pdf.path, dest_path, self.fdfData, function (err) {
+			if (err) {
+				console.log('\n err.message: ' + err.message);
+				return next(new Error(err.message));
 			}
-			console.log('Field data from Form: '+self.title.replace(/ /g,'')+' outputed to new PDF: '+dest_path);
+			console.log('Field data from Form: ' + self.title.replace(/ /g, '') + ' outputed to new PDF: ' + dest_path);
 			return next();
 		});
 	} else {
diff --git a/config/strategies/local.js b/config/strategies/local.js
index cfafa966..fda5a728 100755
--- a/config/strategies/local.js
+++ b/config/strategies/local.js
@@ -7,19 +7,19 @@ var passport = require('passport'),
 	LocalStrategy = require('passport-local').Strategy,
 	User = require('mongoose').model('User');
 
-module.exports = function() {
+module.exports = function () {
 	// Use local strategy
 	passport.use(new LocalStrategy({
 			usernameField: 'username',
 			passwordField: 'password'
 		},
-		function(username, password, done) {
+		function (username, password, done) {
 			User.findOne({
 				$or: [
-					{ "username": username},
-					{ "email": username}
+					{'username': username},
+					{'email': username}
 				]
-			}, function(err, user) {
+			}, function (err, user) {
 				if (err) {
 					return done(err);
 				}
diff --git a/public/dist/form-application.js b/public/dist/form-application.js
index 3278ba49..be48c4e9 100644
--- a/public/dist/form-application.js
+++ b/public/dist/form-application.js
@@ -409,7 +409,7 @@ angular.module('view-form').config(['$stateProvider',
 			},
 			controller: 'SubmitFormController',
 			controllerAs: 'ctrl'
-		})
+		});
 	}
 ]);
 
diff --git a/public/form_modules/forms/config/forms.client.routes.js b/public/form_modules/forms/config/forms.client.routes.js
index b0e0efb5..4cc33b77 100644
--- a/public/form_modules/forms/config/forms.client.routes.js
+++ b/public/form_modules/forms/config/forms.client.routes.js
@@ -17,6 +17,6 @@ angular.module('view-form').config(['$stateProvider',
 			},
 			controller: 'SubmitFormController',
 			controllerAs: 'ctrl'
-		})
+		});
 	}
 ]);

From 486a1dba94dd4d6894b6b6699afaf33c92650ca7 Mon Sep 17 00:00:00 2001
From: Toan Vo <toanalien@gmail.com>
Date: Sun, 23 Oct 2016 12:18:47 +0700
Subject: [PATCH 2/3] fix username

---
 scripts/setup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/setup.js b/scripts/setup.js
index 0fee840c..de8f6385 100644
--- a/scripts/setup.js
+++ b/scripts/setup.js
@@ -3,7 +3,7 @@
 /**
  * Module dependencies.
  */
-process.env.NODE_ENV = 'production';
+process.env.NODE_ENV = 'product	ion';
 
 var init = require('../config/init')(),
 	config = require('../config/config'),
@@ -190,7 +190,7 @@ if(!fs.existsSync('./\.env')) {
 				answers['SIGNUP_DISABLED'] = false ? answers['SIGNUP_DISABLED'] === false : true;
 
 				var email = answers['email'];
-				var username = answers['email'];
+				var username = answers['username'];
 				var pass = answers['password'];
 				delete answers['email'];
 				delete answers['password'];

From 2d1797d407d5aec292aea475eaf0922823939f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thi=C3=AAn=20To=C3=A1n?= <toanalien@gmail.com>
Date: Sun, 23 Oct 2016 17:01:07 +0700
Subject: [PATCH 3/3] Update setup.js

---
 scripts/setup.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/setup.js b/scripts/setup.js
index de8f6385..bfd63b2d 100644
--- a/scripts/setup.js
+++ b/scripts/setup.js
@@ -3,7 +3,7 @@
 /**
  * Module dependencies.
  */
-process.env.NODE_ENV = 'product	ion';
+process.env.NODE_ENV = 'production';
 
 var init = require('../config/init')(),
 	config = require('../config/config'),