From 7f0c3d9c7bba6163f742b2f67bd2a7bc4278f171 Mon Sep 17 00:00:00 2001
From: David Baldwynn <david.baldwin@alumni.ubc.ca>
Date: Fri, 17 Jun 2016 15:11:02 -0700
Subject: [PATCH] added field responses

---
 app/models/form.server.model.js               |  3 ++-
 .../forms/admin/config/i18n/english.js        |  3 ++-
 .../forms/admin/css/edit-submissions-view.css |  6 ++---
 .../edit-submissions-form.client.directive.js | 16 ++++++------
 .../edit-submissions-form.client.view.html    | 25 +++++++++++--------
 5 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js
index 7ea1aa64..44a9b038 100644
--- a/app/models/form.server.model.js
+++ b/app/models/form.server.model.js
@@ -300,12 +300,13 @@ FormSchema.virtual('analytics.fields').get(function () {
 			}
 
 			var totalViews = dropoffViews+continueViews;
+			var responses = continueViews;
 			var continueRate = continueViews/totalViews*100;
 			var dropoffRate = dropoffViews/totalViews*100;
 
 			fieldDropoffs[i] = {
 				dropoffViews: dropoffViews,
-				continueViews: continueViews,
+				responses: continueViews,
 				totalViews: totalViews,
 				continueRate: continueRate,
 				dropoffRate: dropoffRate,
diff --git a/public/modules/forms/admin/config/i18n/english.js b/public/modules/forms/admin/config/i18n/english.js
index bb282460..312117e1 100644
--- a/public/modules/forms/admin/config/i18n/english.js
+++ b/public/modules/forms/admin/config/i18n/english.js
@@ -74,7 +74,8 @@ angular.module('forms').config(['$translateProvider', function ($translateProvid
 
 		FIELD_TITLE: 'Field Title',
 		FIELD_VIEWS: 'Field Views',
-		FIELD_DROPOFF: 'Field Completion Rate',
+		FIELD_DROPOFF: 'Field Completion',
+		FIELD_RESPONSES: 'Field Responses',
 		DELETE_SELECTED: 'Delete Selected',
 		EXPORT_TO_EXCEL: 'Export to Excel',
 		EXPORT_TO_CSV: 'Export to CSV',
diff --git a/public/modules/forms/admin/css/edit-submissions-view.css b/public/modules/forms/admin/css/edit-submissions-view.css
index 9814e1b3..a8d7e09f 100644
--- a/public/modules/forms/admin/css/edit-submissions-view.css
+++ b/public/modules/forms/admin/css/edit-submissions-view.css
@@ -27,7 +27,7 @@
 	text-transform: uppercase;
 }
 
-.field-title {
+.field-title-row {
 	padding-top: 2em;
 	padding-bottom:1em;
 	border-top: #fafafa solid 1px;
@@ -35,12 +35,12 @@
 	color: #bab8b8;
 	text-transform: uppercase;
 }
-.field-row {
+.field-detailed-row {
 	font-size: 1.2em;
 	padding-bottom:0.3em;
 }
 
-.row.table-tools {
+.table-tools {
 	border-top: #fafafa solid 1px;
 	padding-top: 2.5em;
 }
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 9678865b..c02b8c70 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
@@ -56,12 +56,6 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
 				})();
 
 				$scope.DeviceStatistics = (function(){
-					var stats = {
-						desktop: null,
-						tablet: null,
-						phone: null,
-						other: null
-					};
 					var newStatItem = function(){
 						return {
 							visits: 0,
@@ -72,6 +66,13 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
 						}
 					};
 
+					var stats = {
+						desktop: newStatItem(),
+						tablet: newStatItem(),
+						phone: newStatItem(),
+						other: newStatItem()
+					};
+
 					var visitors = $scope.myform.analytics.visitors;
 
 					console.log(visitors);
@@ -79,9 +80,6 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope',
 						var visitor = visitors[i];
 						var deviceType = visitor.deviceType;
 
-						if(!stats[deviceType]){
-							stats[deviceType] = newStatItem();
-						}
 						stats[deviceType].visits++;
 
 						stats[deviceType].total_time =+ visitor.timeElapsed;
diff --git a/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
index a3a078fb..198abf55 100644
--- a/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
+++ b/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
@@ -206,29 +206,34 @@
 			</div>
 		</div>
 
-		<div class="row col-xs-12 field-title">
-			<div class="col-xs-4">
+		<div class="row col-xs-12 field-title-row">
+			<div class="col-xs-3">
 				<strong>{{ 'FIELD_TITLE' | translate }}</strong>
 			</div>
-			<div class="col-xs-4">
+			<div class="col-xs-3">
 				<strong>{{ 'FIELD_VIEWS' | translate }}</strong>
 			</div>
+			<div class="col-xs-3">
+				<strong>{{ 'FIELD_RESPONSES' | translate }}</strong>
+			</div>
 
-			<div class="col-xs-4">
+			<div class="col-xs-3">
 				<strong>{{ 'FIELD_DROPOFF' | translate }}</strong>
 			</div>
 		</div>
-		<div class="row col-xs-12 field-row" ng-repeat="fieldStats in myform.analytics.fields">
+		<div class="row col-xs-12 field-detailed-row" ng-repeat="fieldStats in myform.analytics.fields">
 
-			<div class="col-xs-4">
+			<div class="col-xs-3">
 				{{fieldStats.field.title}}
 			</div>
-			<div class="col-xs-4">
+			<div class="col-xs-3">
 				{{fieldStats.totalViews}}
 			</div>
-
-			<div class="col-xs-4">
-				{{fieldStats.dropoffRate}}%
+			<div class="col-xs-3">
+				{{fieldStats.responses}}
+			</div>
+			<div class="col-xs-3">
+				{{fieldStats.continueRate}}%
 			</div>
 		</div>
 	</div>