got jshint to pass

This commit is contained in:
David Baldwynn 2017-11-20 21:04:07 -08:00
parent a165cdc242
commit eb658af30d
4 changed files with 31 additions and 28 deletions

View file

@ -21,6 +21,7 @@
"globals": { // Globals variables.
"jasmine": true,
"angular": true,
"devel": false,
"_": true,
"saveAs": true,
"ApplicationConfiguration": true,

View file

@ -76,7 +76,7 @@ exports.createSubmission = function(req, res) {
message: errorHandler.getErrorMessage(err)
});
}
var form = req.body
var form = req.body;
var formFieldDict = emailNotifications.createFieldDict(form.form_fields);
async.waterfall([
@ -105,7 +105,6 @@ exports.createSubmission = function(req, res) {
if (form.respondentNotifications && form.respondentNotifications.enabled && form.respondentNotifications.toField) {
form.respondentNotifications.toEmails = formFieldDict[form.respondentNotifications.toField];
debugger;
emailNotifications.send(form.respondentNotifications, formFieldDict, smtpTransport, function(err){
if(err){
return callback({
@ -158,7 +157,7 @@ exports.getVisitorData = function(req, res) {
},
{
$facet: {
"deviceStatistics": [
'deviceStatistics': [
{
$unwind: '$analytics.visitors'
},
@ -188,22 +187,22 @@ exports.getVisitorData = function(req, res) {
},
{
$group: {
_id: "$deviceType",
total_time: { $sum: "$SubmittedTimeElapsed" },
responses: { $sum: "$SubmittedResponses" },
_id: '$deviceType',
total_time: { $sum: '$SubmittedTimeElapsed' },
responses: { $sum: '$SubmittedResponses' },
visits: { $sum: 1 }
}
},
{
$project: {
total_time: "$total_time",
responses: "$responses",
visits: "$visits",
total_time: '$total_time',
responses: '$responses',
visits: '$visits',
average_time: {
$cond: [
{ $eq: [ "$responses", 0 ] },
{ $eq: [ '$responses', 0 ] },
0,
{ $divide: ["$total_time", "$responses"] }
{ $divide: ['$total_time', '$responses'] }
]
},
conversion_rate: {
@ -211,9 +210,9 @@ exports.getVisitorData = function(req, res) {
100,
{
$cond: [
{ $eq: [ "$visits", 0 ] },
{ $eq: [ '$visits', 0 ] },
0,
{ $divide: ["$responses", "$visits"] }
{ $divide: ['$responses', '$visits'] }
]
}
]
@ -221,7 +220,7 @@ exports.getVisitorData = function(req, res) {
}
}
],
"globalStatistics": [
'globalStatistics': [
{
$unwind: '$analytics.visitors'
},
@ -252,22 +251,22 @@ exports.getVisitorData = function(req, res) {
{
$group: {
_id: null,
total_time: { $sum: "$SubmittedTimeElapsed" },
responses: { $sum: "$SubmittedResponses" },
total_time: { $sum: '$SubmittedTimeElapsed' },
responses: { $sum: '$SubmittedResponses' },
visits: { $sum: 1 }
}
},
{
$project: {
_id: 0,
total_time: "$total_time",
responses: "$responses",
visits: "$visits",
total_time: '$total_time',
responses: '$responses',
visits: '$visits',
average_time: {
$cond: [
{ $eq: [ "$responses", 0 ] },
{ $eq: [ '$responses', 0 ] },
0,
{ $divide: ["$total_time", "$responses"] }
{ $divide: ['$total_time', '$responses'] }
]
},
conversion_rate: {
@ -275,9 +274,9 @@ exports.getVisitorData = function(req, res) {
100,
{
$cond: [
{ $eq: [ "$visits", 0 ] },
{ $eq: [ '$visits', 0 ] },
0,
{ $divide: ["$responses", "$visits"] }
{ $divide: ['$responses', '$visits'] }
]
}
]
@ -483,13 +482,16 @@ exports.list = function(req, res) {
});
}
const result_ids = results.map(function(result){ return ''+result._id });
const result_ids = results.map(function(result){
return ''+result._id;
});
var currIndex = -1;
for(var i=0; i<forms.length; i++){
forms[i] = helpers.removeSensitiveModelData('private_form', forms[i]);
currIndex = result_ids.indexOf(forms[i]._id)
currIndex = result_ids.indexOf(forms[i]._id);
if(currIndex > -1){
forms[i].submissionNum = results[currIndex].responses;
} else {

View file

@ -1,5 +1,5 @@
'use strict';
const jsdom = require("jsdom");
const jsdom = require('jsdom');
var JSDOM = jsdom.JSDOM;
module.exports = {
@ -24,7 +24,7 @@ module.exports = {
var dom = new JSDOM('<!doctype html>'+emailTemplate);
Object.keys(emailTemplateVars).forEach(function (key) {
var elem = dom.window.document.querySelector("span.placeholder-tag[data-id='" + key + "']");
var elem = dom.window.document.querySelector('span.placeholder-tag[data-id=\'' + key + '\']');
if(elem !== null){
elem.outerHTML = emailTemplateVars[key];
}

View file

@ -64,7 +64,7 @@ module.exports.removeRootDir = function(files, removeRoot, addRoot) {
*/
module.exports.getBowerFormJSAssets = function() {
if(process.env.NODE_ENV === 'production'){
return '/static/dist/vendor.min.js'
return '/static/dist/vendor.min.js';
}
return this.removeRootDir(minBowerFiles('**/**.js'), 'public/', 'static/');
};