From eb658af30d804c4b2835e701777fc96e4a6a376c Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Mon, 20 Nov 2017 21:04:07 -0800 Subject: [PATCH] got jshint to pass --- .jshintrc | 1 + app/controllers/forms.server.controller.js | 52 +++++++++++----------- app/libs/send-email-notifications.js | 4 +- config/config.js | 2 +- 4 files changed, 31 insertions(+), 28 deletions(-) diff --git a/.jshintrc b/.jshintrc index 94d52d77..73f3a588 100755 --- a/.jshintrc +++ b/.jshintrc @@ -21,6 +21,7 @@ "globals": { // Globals variables. "jasmine": true, "angular": true, + "devel": false, "_": true, "saveAs": true, "ApplicationConfiguration": true, diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js index bf984797..143aed0f 100644 --- a/app/controllers/forms.server.controller.js +++ b/app/controllers/forms.server.controller.js @@ -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 -1){ forms[i].submissionNum = results[currIndex].responses; } else { diff --git a/app/libs/send-email-notifications.js b/app/libs/send-email-notifications.js index 95a9ccbf..010148a4 100644 --- a/app/libs/send-email-notifications.js +++ b/app/libs/send-email-notifications.js @@ -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(''+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]; } diff --git a/config/config.js b/config/config.js index d304f42b..bc5a4c8e 100755 --- a/config/config.js +++ b/config/config.js @@ -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/'); };