From 73948afd85613cd74ae7017d5251b0bd805648e0 Mon Sep 17 00:00:00 2001
From: David Baldwynn <david.baldwin@alumni.ubc.ca>
Date: Thu, 5 Nov 2015 18:02:25 -0800
Subject: [PATCH] fixed field formatting

---
 .../admin-form.client.controller.js           |  2 -
 .../directives/edit-form.client.directive.js  | 76 +++++++++----------
 .../form/configure-form.client.view.html      |  6 +-
 3 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/public/modules/forms/controllers/admin-form.client.controller.js b/public/modules/forms/controllers/admin-form.client.controller.js
index 6421e3d2..9b0f68ac 100644
--- a/public/modules/forms/controllers/admin-form.client.controller.js
+++ b/public/modules/forms/controllers/admin-form.client.controller.js
@@ -10,8 +10,6 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope
         $rootScope.saveInProgress = false;
         CurrentForm.setForm($scope.myform);
 
-        // console.log($scope.myform);
-
         // Find a specific Form
         $scope.findOne = function(){
             Forms.get({
diff --git a/public/modules/forms/directives/edit-form.client.directive.js b/public/modules/forms/directives/edit-form.client.directive.js
index 01eca1dd..347c123e 100644
--- a/public/modules/forms/directives/edit-form.client.directive.js
+++ b/public/modules/forms/directives/edit-form.client.directive.js
@@ -61,49 +61,49 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', '$q', '$ht
                     handle: ' .handle'  
                 };
 
-                // $scope.draggable = {
-                //     connectWith: ".dropzone",
-                //     start: function (e, ui) {
-                //         // $scope.$apply(function() {
-                //         //   $scope.dragging = true
-                //         // });
-                //         $('.dropzone').sortable('refresh');
-                //     },
-                //     update: function (e, ui) {
-                //         var isInDropzone = $(e.target).parentsUntil('.panel-group').hasClass('dropzone');
+                $scope.draggable = {
+                    connectWith: ".dropzone",
+                    start: function (e, ui) {
+                        // $scope.$apply(function() {
+                        //   $scope.dragging = true
+                        // });
+                        $('.dropzone').sortable('refresh');
+                    },
+                    update: function (e, ui) {
+                        var isInDropzone = $(e.target).parentsUntil('.panel-group').hasClass('dropzone');
 
-                //         console.log('isInDropzone: '+isInDropzone);
-                //         //Disable drag and drop if we aren't in dropzone
-                //         if(!isInDropzone){
-                //             ui.item.sortable.cancel();
-                //         }
-                //     },
-                //     stop: function (e, ui) {
-                //         var isInDropzone = $(e.target).parentsUntil('.panel-group').hasClass('dropzone');
+                        console.log('isInDropzone: '+isInDropzone);
+                        //Disable drag and drop if we aren't in dropzone
+                        if(!isInDropzone){
+                            ui.item.sortable.cancel();
+                        }
+                    },
+                    stop: function (e, ui) {
+                        var isInDropzone = $(e.target).parentsUntil('.panel-group').hasClass('dropzone');
 
-                //         //Disable drag and drop if we aren't in dropzone
-                //         if(isInDropzone){
-                //             console.log($(e.target));
-                //         }
+                        //Disable drag and drop if we aren't in dropzone
+                        if(isInDropzone){
+                            console.log($(e.target));
+                        }
                         
-                //         // if (ui.item.sortable.droptarget === undefined) {
-                //         //     $scope.$apply($scope.dragging = false);
-                //         //     return;
-                //         // }else if (ui.item.sortable.droptarget[0].classList[0] === "dropzone") {
-                //         //     // run code when item is dropped in the dropzone
-                //         //     $scope.$apply($scope.dragging = false);
-                //         // }else{
-                //         //   // $scope.$apply($scope.dragging = false);
-                //         // }
-                //         // console.log('has class .dropzone :'+);
-                //         // if ($(e.target).hasClass('dropzone') && ui.item.sortable.droptarget && e.target != ui.item.sortable.droptarget[0] ) {
-                //         //     // restore original types
-                //         //     $scope.addField.types = FormFields.types;
-                //         // }
+                        // if (ui.item.sortable.droptarget === undefined) {
+                        //     $scope.$apply($scope.dragging = false);
+                        //     return;
+                        // }else if (ui.item.sortable.droptarget[0].classList[0] === "dropzone") {
+                        //     // run code when item is dropped in the dropzone
+                        //     $scope.$apply($scope.dragging = false);
+                        // }else{
+                        //   // $scope.$apply($scope.dragging = false);
+                        // }
+                        // console.log('has class .dropzone :'+);
+                        // if ($(e.target).hasClass('dropzone') && ui.item.sortable.droptarget && e.target != ui.item.sortable.droptarget[0] ) {
+                        //     // restore original types
+                        //     $scope.addField.types = FormFields.types;
+                        // }
                       
                         
-                //     }
-                // };
+                    }
+                };
 
 
                 /*
diff --git a/public/modules/forms/views/directiveViews/form/configure-form.client.view.html b/public/modules/forms/views/directiveViews/form/configure-form.client.view.html
index 1fcd950b..24ea1087 100644
--- a/public/modules/forms/views/directiveViews/form/configure-form.client.view.html
+++ b/public/modules/forms/views/directiveViews/form/configure-form.client.view.html
@@ -285,17 +285,17 @@
             </div>
             <div class="row field">
                 <div class="field-title col-sm-6">
-                    <h5>Hide Form Footer?</h5>
+                    <h5>Display Form Footer?</h5>
                 </div>
 
                 <div class="field-input col-sm-6">
                     <label>
-                        <input type="radio" data-ng-value="true" ng-model="myform.hideFooter"  ng-required="true" />
+                        <input type="radio" data-ng-value="false" ng-model="myform.hideFooter"  ng-required="true" />
                         &nbsp;<span>Yes</span>
                     </label>
 
                     <label>
-                        <input type="radio" data-ng-value="false" ng-model="myform.hideFooter"  ng-required="true" />
+                        <input type="radio" data-ng-value="true" ng-model="myform.hideFooter"  ng-required="true" />
                         &nbsp;<span>No</span>
                     </label>
                 </div>