beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

updated eslint

Browse source
This commit is contained in:
David Baldwynn 2016-04-28 23:00:41 -07:00
parent ed9eb42468
commit 3afc770153
18 changed files with 152 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/forms.server.controller.js
View file

@ -33,9 +33,9 @@ exports.uploadPDF = function(req, res, next) {
if (req.file.size === 0) {
next(new Error('File uploaded is EMPTY'));
return next(new Error('File uploaded is EMPTY'));
}else if(req.file.size > 100000000){
next(new Error('File uploaded exceeds MAX SIZE of 100MB'));
return next(new Error('File uploaded exceeds MAX SIZE of 100MB'));
}else {
fs.exists(_path, function(exists) {
@ -52,14 +52,14 @@ exports.uploadPDF = function(req, res, next) {
if (stat && !stat.isDirectory()) {
console.log('Directory cannot be created');
next(new Error('Directory cannot be created because an inode of a different type exists at "' + newDestination + '"'));
return next(new Error('Directory cannot be created because an inode of a different type exists at "' + newDestination + '"'));
}
console.log(path.join(newDestination, pdfFile.filename));
fs.move(pdfFile.path, path.join(newDestination, pdfFile.filename), function (err) {
if (err) {
next(new Error(err.message));
return next(new Error(err.message));
}
pdfFile.path = path.join(newDestination, pdfFile.filename);
console.log(pdfFile.filename + ' uploaded to ' + pdfFile.path);
@ -67,12 +67,12 @@ exports.uploadPDF = function(req, res, next) {
});
} else {
next(new Error('Did NOT get your file!'));
return next(new Error('Did NOT get your file!'));
}
});
}
}else {
next(new Error('Uploaded files were NOT detected'));
return next(new Error('Uploaded files were NOT detected'));
}
};
@ -303,7 +303,7 @@ exports.formByID = function(req, res, next, id) {
else {
Form.findById(id).populate('admin').exec(function(err, form) {
if (err) {
return next(err);
return return next(err);
} else if (form === undefined || form === null) {
res.status(400).send({
message: 'Form not found'
@ -316,7 +316,7 @@ exports.formByID = function(req, res, next, id) {
form.provider = undefined;
req.form = form;
next();
return next();
}
});
}
@ -332,5 +332,5 @@ exports.hasAuthorization = function(req, res, next) {
message: 'User '+req.user.username+' is not authorized to edit Form: '+form.title
});
}
next();
return next();
};

72
app/models/form.server.model.js
View file

@ -241,31 +241,31 @@ function getDeletedIndexes(needle, haystack){
FormSchema.pre('save', function (next) {
var that = this;
async.series([function(cb) {
async.series([function(return cb) {
that.constructor
.findOne({_id: that._id}).exec(function (err, original) {
if (err) {
console.log(err);
cb(err);
return cb(err);
} else {
_original = original;
//console.log('_original');
//console.log(_original);
cb(null);
return cb(null);
}
});
}, function(cb) {
}, function(return cb) {
//DAVID: TODO: Make this so we don't have to update the validFields property ever save
if (that.plugins.oscarhost.hasOwnProperty('baseUrl')) {
var validUpdateTypes = mongoose.model('Form').schema.path('plugins.oscarhost.settings.updateType').enumValues;
that.plugins.oscarhost.settings.validUpdateTypes = validUpdateTypes;
}
cb(null);
return cb(null);
},
function(cb) {
function(return cb) {
if (that.pdf) {
async.series([
function (callback) {
function (return callback) {
if (that.isModified('pdf') && that.pdf.path) {
var new_filename = that.title.replace(/ /g, '') + '_template.pdf';
@ -279,26 +279,26 @@ FormSchema.pre('save', function (next) {
mkdirp.sync(newDestination);
}
if (stat && !stat.isDirectory()) {
return callback(new Error('Directory cannot be created because an inode of a different type exists at "' + config.pdfUploadPath + '"'), null);
return return callback(new Error('Directory cannot be created because an inode of a different type exists at "' + config.pdfUploadPath + '"'), null);
}
var old_path = that.pdf.path;
fs.move(old_path, path.join(newDestination, new_filename), {clobber: true}, function (err) {
if (err) {
console.error(err);
callback(new Error(err.message), 'task1');
return callback(new Error(err.message), 'task1');
} else {
that.pdf.path = path.join(newDestination, new_filename);
that.pdf.name = new_filename;
callback(null, 'task1');
return callback(null, 'task1');
}
});
} else {
callback(null, 'task1');
return callback(null, 'task1');
}
},
function (callback) {
function (return callback) {
if (that.isGenerated) {
that.pdf.path = config.pdfUploadPath + that.admin.username.replace(/ /g, '') + '/' + that.title.replace(/ /g, '') + '/' + that.title.replace(/ /g, '') + '_template.pdf';
that.pdf.name = that.title.replace(/ /g, '') + '_template.pdf';
@ -318,9 +318,9 @@ FormSchema.pre('save', function (next) {
//console.log(that.pdf.path);
if (err) {
callback(new Error(err.message), null);
return callback(new Error(err.message), null);
} else if (!_form_fields.length || _form_fields === undefined || _form_fields === null) {
callback(new Error('Generated formfields is empty'), null);
return callback(new Error('Generated formfields is empty'), null);
}
console.log('autogenerating form');
@ -347,36 +347,36 @@ FormSchema.pre('save', function (next) {
that.form_fields = _form_fields;
that.isGenerated = false;
callback(null, 'task2');
return callback(null, 'task2');
});
} else {
callback(null, 'task2');
return callback(null, 'task2');
}
}
], function (err, results) {
if (err) {
cb(new Error({
return cb(new Error({
message: err.message
}));
} else {
//console.log('ending form save1');
cb();
return cb();
}
});
}
else if (_original) {
if (_original.hasOwnProperty('pdf')) {
fs.remove(_original.pdf.path, function (err) {
if (err) cb(err);
if (err) return cb(err);
console.log('file at ' + _original.pdf.path + ' successfully deleted');
cb();
return cb();
});
}
else cb();
else return cb();
}
else cb();
else return cb();
},
function(cb) {
function(return cb) {
if(that.isModified('form_fields') && that.form_fields && _original){
@ -391,7 +391,7 @@ FormSchema.pre('save', function (next) {
var modifiedSubmissions = [];
async.forEachOfSeries(deletedIds,
function (deletedIdIndex, key, cb_id) {
function (deletedIdIndex, key, return cb_id) {
var deleted_id = old_ids[deletedIdIndex];
@ -401,7 +401,7 @@ FormSchema.pre('save', function (next) {
exec(function(err, submissions){
if(err) {
console.error(err);
cb_id(err);
return cb_id(err);
} else {
//Delete field if there are no submission(s) found
if (submissions.length) {
@ -409,18 +409,18 @@ FormSchema.pre('save', function (next) {
modifiedSubmissions.push.apply(modifiedSubmissions, submissions);
}
cb_id(null);
return cb_id(null);
}
});
},
function (err) {
if(err){
console.error(err.message);
cb(err);
return cb(err);
} else {
//Iterate through all submissions with modified form_fields
async.forEachOfSeries(modifiedSubmissions, function (submission, key, callback) {
async.forEachOfSeries(modifiedSubmissions, function (submission, key, return callback) {
//Iterate through ids of deleted fields
for (var i = 0; i < deletedIds.length; i++) {
@ -450,27 +450,27 @@ FormSchema.pre('save', function (next) {
}
submission.save(function (err) {
if (err) callback(err);
else callback(null);
if (err) return callback(err);
else return callback(null);
});
}, function (err) {
if (err) {
console.error(err.message);
cb(err);
return cb(err);
}
else cb();
else return cb();
});
}
}
);
}
else cb(null);
else return cb(null);
}
else cb(null);
else return cb(null);
}],
function(err, results){
if (err) next(err);
next();
if (err) return next(err);
return next();
});
});

2
app/tests/form_submission.model.test.js
View file

@ -106,7 +106,7 @@ describe('FormSubmission Model Unit Tests:', function() {
{'fieldType':'textfield', 'title':'And your last name', 'fieldValue': ''},
{'fieldType':'radio', 'title':'And your sex', 'fieldOptions': [{ 'option_id': 0, 'option_title': 'Male', 'option_value': 'M' }, { 'option_id': 1, 'option_title': 'Female', 'option_value': 'F' }], 'fieldValue': ''},
{'fieldType':'date', 'title':'When were you born?', 'fieldValue': ''},
{'fieldType':'number', 'title':'What\'s your phone #?', 'fieldValue': ''},
{'fieldType':'number', 'title':'What\'s your phone #?', 'fieldValue': ''}
],
plugins: {
oscarhost: {

18
docs/Node-Rules/rules.logic-jump.js
View file

@ -9,18 +9,18 @@ var multiFact = {
{
left:"user 4",
right:"something something user something",
logicOp: "AND",
logicOp: "AND"
},
{
left:"something something user something",
right:"something",
logicOp: "OR",
logicOp: "OR"
}
],
left:"",
right:"",
logicOp:"",
prevResult: null,
prevResult: null
};
var _globalRules = function(){};
@ -59,7 +59,7 @@ _globalRules.NotEqual = {
"consequence" : function(R) {
this.result = false;
R.next();
},
}
};
_globalRules.AND = {
"condition" : function(R) {
@ -74,7 +74,7 @@ _globalRules.AND = {
"consequence" : function(R) {
this.result = false;
R.next();
},
}
};
_globalRules.OR = {
"condition" : function(R) {
@ -157,7 +157,7 @@ _stringRules.EndsWith = {
"consequence" : function(R) {
this.result = false;
R.next();
},
}
};
var _numberRules = function(){};
@ -176,7 +176,7 @@ _numberRules.GreaterThan = {
"consequence" : function(R) {
this.result = false;
R.next();
},
}
};
_numberRules.SmallerThan = {
"condition" : function(R) {
@ -208,7 +208,7 @@ _numberRules.GreaterThanOrEqual = {
"consequence" : function(R) {
this.result = false;
R.next();
},
}
};
_numberRules.SmallerThanOrEqual = {
@ -225,7 +225,7 @@ _numberRules.SmallerThanOrEqual = {
"consequence" : function(R) {
this.result = false;
R.next();
},
}
};
module.exports = {

2
public/modules/core/services/menus.client.service.js
View file

@ -13,7 +13,7 @@ angular.module('core').service('Menus', [
// A private function for rendering decision
var shouldRender = function(user) {
if (user) {
if (!!~this.roles.indexOf('*')) {
if (~this.roles.indexOf('*')) {
return true;
} else {
for (var userRoleIndex in user.roles) {

8
public/modules/forms/controllers/admin-form.client.controller.js
View file

@ -18,15 +18,15 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
},
{
heading: 'Design',
route: 'viewForm.design',
route: 'viewForm.design'
},
{
heading: 'Configure',
route: 'viewForm.configure',
route: 'viewForm.configure'
},
{
heading: 'Analyze',
route: 'viewForm.analyze',
route: 'viewForm.analyze'
}
];
@ -116,7 +116,7 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
if(!updateImmediately){$rootScope.saveInProgress = false; }
if( (typeof cb) === 'function'){
cb(err);
return cb(err);
}
});
}

2
public/modules/forms/directives/configure-form.client.directive.js
View file

@ -77,7 +77,7 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$htt
console.log('Error occured during upload.\n');
console.log(resp.status);
}, function (evt) {
var progressPercentage = parseInt(100.0 * evt.loaded / evt.total);
var progressPercentage = parseInt(100.0 * evt.loaded / evt.total, 10);
$scope.log = 'progress: ' + progressPercentage + '% ' +
evt.config.data.file.name + '\n' + $scope.log;

8
public/modules/forms/directives/edit-form.client.directive.js
View file

@ -6,7 +6,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
templateUrl: 'modules/forms/views/directiveViews/form/edit-form.client.view.html',
restrict: 'E',
scope: {
myform:'=',
myform:'='
},
controller: function($scope){
var field_ids = _($scope.myform.form_fields).pluck('_id');
@ -59,7 +59,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
$scope.dropzone = {
handle: ' .handle',
containment: '.dropzoneContainer',
cursor: 'grabbing',
cursor: 'grabbing'
};
/*
@ -175,7 +175,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
var newOption = {
'option_id' : Math.floor(100000*Math.random()),
'option_title' : 'Option '+lastOptionID,
'option_value' : 'Option ' +lastOptionID,
'option_value' : 'Option ' +lastOptionID
};
// put new option into fieldOptions array
@ -208,7 +208,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
}
};
},
}
};
}

2
public/modules/forms/directives/edit-submissions-form.client.directive.js
View file

@ -105,7 +105,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
var fileMIMETypeMap = {
'xls': 'vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'json': 'json',
'csv': 'csv',
'csv': 'csv'
};
var blob = new Blob([document.getElementById('table-submission-data').innerHTM], {

1
public/modules/forms/directives/field.client.directive.js
View file

@ -32,7 +32,6 @@ angular.module('forms').directive('fieldDirective', ['$http', '$compile', '$root
if (__indexOf.call(supported_fields, type) >= 0) {
templateUrl = templateUrl+type+'.html';
}
return $templateCache.get('../public/'+templateUrl);
};

18
public/modules/forms/directives/submit-form.client.directive.js
View file

@ -48,28 +48,30 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
$scope.fieldBottom = elemBox.bottom;
//console.log($scope.forms.myForm);
var field_id;
var field_index;
if(!$scope.noscroll){
//Focus on submit button
if( $scope.selected.index === $scope.myform.form_fields.length-1 && $scope.fieldBottom < 200){
var field_index = $scope.selected.index+1;
var field_id = 'submit_field';
field_index = $scope.selected.index+1;
field_id = 'submit_field';
$scope.setActiveField(field_id, field_index, false);
}
//Focus on field above submit button
else if($scope.selected.index === $scope.myform.form_fields.length){
if($scope.fieldTop > 200){
var field_index = $scope.selected.index-1;
var field_id = $scope.myform.form_fields[field_index]._id;
field_index = $scope.selected.index-1;
field_id = $scope.myform.form_fields[field_index]._id;
$scope.setActiveField(field_id, field_index, false);
}
}else if( $scope.fieldBottom < 0){
var field_index = $scope.selected.index+1;
var field_id = $scope.myform.form_fields[field_index]._id;
field_index = $scope.selected.index+1;
field_id = $scope.myform.form_fields[field_index]._id;
$scope.setActiveField(field_id, field_index, false);
}else if ( $scope.selected.index !== 0 && $scope.fieldTop > 0) {
var field_index = $scope.selected.index-1;
var field_id = $scope.myform.form_fields[field_index]._id;
field_index = $scope.selected.index-1;
field_id = $scope.myform.form_fields[field_index]._id;
$scope.setActiveField(field_id, field_index, false);
}
//console.log('$scope.selected.index: '+$scope.selected.index);

2
public/modules/forms/tests/unit/controllers/list-forms.client.controller.test.js
View file

@ -205,7 +205,7 @@
$modelValue: 'Test Form5'
},
$dirty: true,
$valid: true,
$valid: true
};
//Set $state transition

2
public/modules/forms/tests/unit/controllers/submit-form.client.controller.test.js
View file

@ -38,7 +38,7 @@
{'fieldType':'textfield', 'title':'First Name', 'fieldValue': '', 'deletePreserved': false},
{'fieldType':'checkbox', 'title':'nascar', 'fieldValue': '', 'deletePreserved': false},
{'fieldType':'checkbox', 'title':'hockey', 'fieldValue': '', 'deletePreserved': false}
],
]
};
//Mock Users Service

4
public/modules/forms/tests/unit/directives/configure-form.client.directive.test.js
View file

@ -14,7 +14,7 @@
password: 'password',
provider: 'local',
roles: ['user'],
_id: 'ed873933b1f1dea0ce12fab9',
_id: 'ed873933b1f1dea0ce12fab9'
};
var pdfObj = {
@ -48,7 +48,7 @@
isGenerated: false,
isLive: false,
autofillPDFs: false,
_id: '525a8422f6d0f87f0e407a33',
_id: '525a8422f6d0f87f0e407a33'
};
// The $resource service augments the response object with methods for updating and deleting the resource.

4
public/modules/forms/tests/unit/directives/edit-form-submissions.client.directive.test.js
View file

@ -14,7 +14,7 @@
password: 'password',
provider: 'local',
roles: ['user'],
_id: 'ed873933b1f1dea0ce12fab9',
_id: 'ed873933b1f1dea0ce12fab9'
};
var pdfObj = {
@ -48,7 +48,7 @@
isGenerated: false,
isLive: false,
autofillPDFs: false,
_id: '525a8422f6d0f87f0e407a33',
_id: '525a8422f6d0f87f0e407a33'
};
var sampleSubmission = {

4
public/modules/forms/tests/unit/directives/submit-form.client.directive.test.js
View file

@ -14,7 +14,7 @@
password: 'password',
provider: 'local',
roles: ['user'],
_id: 'ed873933b1f1dea0ce12fab9',
_id: 'ed873933b1f1dea0ce12fab9'
};
var pdfObj = {
@ -51,7 +51,7 @@
isGenerated: false,
isLive: false,
autofillPDFs: false,
_id: '525a8422f6d0f87f0e407a33',
_id: '525a8422f6d0f87f0e407a33'
};
var sampleSubmission = {

2
public/modules/users/services/auth.client.service.js
View file

@ -64,7 +64,7 @@ angular.module('users').factory('Auth', ['$window',
$window.user = null;
userState.isLoggedIn = false;
service._currentUser = null;
},
}
};
return service;

2
public/modules/users/services/user.client.service.js
View file

@ -106,7 +106,7 @@ angular.module('users').factory('User', ['$window', '$q', '$timeout', '$http', '
});
return deferred.promise;
},
}
};