From d63f03f83e8554cdb4a515226bcda696595eb733 Mon Sep 17 00:00:00 2001
From: David Baldwynn <david.baldwin@alumni.ubc.ca>
Date: Wed, 2 Aug 2017 19:10:42 -0400
Subject: [PATCH] fixed division by zero error for form field statistics

---
 app/models/form.server.model.js   | 11 ++++++++---
 app/views/form.server.view.html   |  5 ++++-
 app/views/layout.server.view.html |  4 ++--
 config/express.js                 |  4 +++-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js
index 5f5c8066..8f884061 100644
--- a/app/models/form.server.model.js
+++ b/app/models/form.server.model.js
@@ -256,9 +256,14 @@ FormSchema.virtual('analytics.fields').get(function () {
 			}
 
 			var totalViews = dropoffViews+continueViews;
-			var continueRate = (continueViews/totalViews*100).toFixed(0);
-			var dropoffRate = (dropoffViews/totalViews*100).toFixed(0);
-
+			var continueRate = 0;
+			var dropoffRate = 0;
+			
+			if(totalViews > 0){
+				continueRate = (continueViews/totalViews*100).toFixed(0);
+				dropoffRate = (dropoffViews/totalViews*100).toFixed(0);
+			}
+			
 			fieldDropoffs[i] = {
 				dropoffViews: dropoffViews,
 				responses: continueViews,
diff --git a/app/views/form.server.view.html b/app/views/form.server.view.html
index 0ca15feb..079d6eda 100644
--- a/app/views/form.server.view.html
+++ b/app/views/form.server.view.html
@@ -98,7 +98,10 @@
 <script type="text/javascript">
 	var user = {{ user | json | safe }};
 	var signupDisabled = {{signupDisabled | safe}};
-	var socketPort = {{socketPort | safe}};
+	var socketPort = false;
+	{% if socketPort %}
+		socketPort = {{socketPort | safe }};
+	{% endif %}
 	var socketUrl = "{{socketUrl | safe}}";
 	var subdomainsDisabled = {{subdomainsDisabled | safe}};
 </script>
diff --git a/app/views/layout.server.view.html b/app/views/layout.server.view.html
index 639a78d2..0106d6f3 100755
--- a/app/views/layout.server.view.html
+++ b/app/views/layout.server.view.html
@@ -72,8 +72,8 @@
 	<!--Embedding The signupDisabled Boolean-->
 	<script type="text/javascript">
 		var signupDisabled = {{signupDisabled | safe}};
-		var socketPort = {{socketPort | safe}};
-		var socketUrl = "{{socketUrl | safe}}";
+		var socketPort = {{socketPort | safe}} || false;
+		var socketUrl = "{{socketUrl | safe}}" || false;
 		var subdomainsDisabled = {{subdomainsDisabled | safe}};
 	</script>
 
diff --git a/config/express.js b/config/express.js
index 05f18b26..af955864 100755
--- a/config/express.js
+++ b/config/express.js
@@ -58,11 +58,13 @@ module.exports = function(db) {
 
 	if(config.socketPort && process.env.NODE_ENV !== 'production'){
 		app.locals.socketPort = config.socketPort;
+	} else {
+		app.locals.socketPort = "";
 	}
 
 	if(config.socketUrl){
 		app.locals.socketUrl = config.socketUrl;
-	}
+	} 
 
 	app.locals.bowerJSFiles = config.getBowerJSAssets();
 	app.locals.bowerCssFiles = config.getBowerCSSAssets();