From 00054c944030fee00012da40fa8dc2d1d609c48b Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Mon, 6 Mar 2017 13:21:21 -0800
Subject: [PATCH] fixed desktop device detection

---
 .../analytics-service.client.directive.js        |  2 +-
 .../edit-submissions-form.client.directive.js    | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/public/form_modules/forms/directives/analytics-service.client.directive.js b/public/form_modules/forms/directives/analytics-service.client.directive.js
index cee770fd..a8066526 100644
--- a/public/form_modules/forms/directives/analytics-service.client.directive.js
+++ b/public/form_modules/forms/directives/analytics-service.client.directive.js
@@ -24,7 +24,7 @@
 				deviceType = 'tablet';
 			} else if (md.mobile()) {
 			 	deviceType = 'mobile';
-			} else if (window.screenX != 0) {
+			} else if (!md.is('bot')) {
 				deviceType = 'desktop';
 			}
 
diff --git a/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js b/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js
index 8f4d847d..9a11e42d 100644
--- a/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js
+++ b/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js
@@ -53,6 +53,8 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
 								totalTime += $scope.table.rows[i].timeElapsed;
 							}
 
+							if(numSubmissions == 0) return 0;
+
 							return totalTime/numSubmissions;
 						})();
 
@@ -83,14 +85,18 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
 									stats[deviceType].visits++;
 
 									stats[deviceType].total_time = stats[deviceType].total_time + visitor.timeElapsed;
-									stats[deviceType].average_time = stats[deviceType].total_time / stats[deviceType].visits || 0;
+
+									stats[deviceType].average_time = stats[deviceType].total_time / stats[deviceType].visits;
+									if(!stats[deviceType].average_time) stats[deviceType].average_time = 0;
 
 									if (visitor.isSubmitted) stats[deviceType].responses++;
 
-									stats[deviceType].completion = stats[deviceType].response / stats[deviceType].visits || 0;
+									stats[deviceType].completion = stats[deviceType].responses / stats[deviceType].visits;
+									if(!stats[deviceType].completion) stats[deviceType].completion = 0;
 								}
 								console.log("stats");
-								console.log(stats);
+
+
 							}
 
 							return stats;
@@ -133,9 +139,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
                 /*
                 * Form Submission Methods
                 */
-
-                //Fetch and display submissions of Form
-
+				
                 //Delete selected submissions of Form
                 $scope.deleteSelectedSubmissions = function(){