From 2b7f53683133b8fa91b258a7a3e0c22d4b42d093 Mon Sep 17 00:00:00 2001
From: David Baldwynn <shorerydr10@live.com>
Date: Mon, 6 Mar 2017 16:38:37 -0800
Subject: [PATCH] fixed signup password input css bug

---
 app/controllers/forms.server.controller.js         |  2 ++
 app/models/form_field.server.model.js              |  6 +-----
 public/form_modules/forms/base/css/form.css        |  2 +-
 .../admin/directives/edit-form.client.directive.js | 14 ++++++++++++--
 public/modules/forms/base/css/form.css             |  2 +-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js
index e9f33008..19305cd3 100644
--- a/app/controllers/forms.server.controller.js
+++ b/app/controllers/forms.server.controller.js
@@ -189,7 +189,9 @@ exports.readForRender = function(req, res) {
 exports.update = function(req, res) {
 	var form = req.form;
 
+
 	if (req.body.changes) {
+		console.log(req.body.changes);
 		var formChanges = req.body.changes;
 
 		formChanges.forEach(function (change) {
diff --git a/app/models/form_field.server.model.js b/app/models/form_field.server.model.js
index ec373c67..6509b16a 100644
--- a/app/models/form_field.server.model.js
+++ b/app/models/form_field.server.model.js
@@ -80,11 +80,7 @@ function BaseFieldSchema(){
 
 		logicJump: LogicJumpSchema,
 
-		ratingOptions: {
-			type: RatingFieldSchema,
-			required: false,
-			default: {}
-		},
+		ratingOptions: RatingFieldSchema,
 		fieldOptions: [FieldOptionSchema],
 		required: {
 			type: Boolean,
diff --git a/public/form_modules/forms/base/css/form.css b/public/form_modules/forms/base/css/form.css
index eb54f1ff..0260b2de 100644
--- a/public/form_modules/forms/base/css/form.css
+++ b/public/form_modules/forms/base/css/form.css
@@ -229,7 +229,7 @@ form .row.field {
         }
 
     form .row.field.dropdown > .field-input input {
-        height: 34px;
+        min-height: 34px;
 		border-width: 0 0 2px 0;
 		border-radius: 5px;
     }
diff --git a/public/modules/forms/admin/directives/edit-form.client.directive.js b/public/modules/forms/admin/directives/edit-form.client.directive.js
index 1c5d2297..b3077584 100644
--- a/public/modules/forms/admin/directives/edit-form.client.directive.js
+++ b/public/modules/forms/admin/directives/edit-form.client.directive.js
@@ -91,10 +91,11 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
                 */
                 // Add a new field
                 $scope.addNewField = function(modifyForm, fieldType){
+					console.log('fieldType:'+fieldType);
 
                     // increment lastAddedID counter
                     $scope.addField.lastAddedID++;
-                    var fieldTitle;
+                    var fieldTitle = fieldType;
 
                     for(var i = 0; i < $scope.addField.types.length; i++){
                         if($scope.addField.types[i].name === fieldType){
@@ -106,13 +107,22 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
                     var newField = {
                         title: fieldTitle + ' ' + $scope.myform.form_fields.length+1,
                         fieldType: fieldType,
-                        fieldValue: '',
+                        fieldValue: '0',
                         required: true,
                         disabled: false,
                         deletePreserved: false,
 						logicJump: {}
                     };
 
+					if(fieldType === 'rating'){
+						newField.ratingOptions = {
+							steps: 1,
+							shape: 'Heart'
+						}
+					}
+
+					console.log(newField.title);
+
 					if($scope.showAddOptions(newField)){
 						newField.fieldOptions = [];
 						newField.fieldOptions.push({
diff --git a/public/modules/forms/base/css/form.css b/public/modules/forms/base/css/form.css
index ca28de21..12b48f61 100644
--- a/public/modules/forms/base/css/form.css
+++ b/public/modules/forms/base/css/form.css
@@ -245,7 +245,7 @@ form .row.field {
         }
 
     form .row.field.dropdown > .field-input input {
-        height: 34px;
+        min-height: 34px;
 		border-width: 0 0 2px 0;
 		border-radius: 5px;
     }