diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js index 6a4595c3..68242775 100755 --- a/app/controllers/users/users.authentication.server.controller.js +++ b/app/controllers/users/users.authentication.server.controller.js @@ -58,17 +58,11 @@ config_nev(); var smtpTransport = nodemailer.createTransport(config.mailer.options); exports.validateVerificationToken = function(req, res){ - // console.log('validateVerificationToken'); - // console.log('token: '+req.params.token+'\n\n'); - - console.log('res.headerSent: '+res.headersSent); nev.confirmTempUser(req.params.token, function(err, user) { if(err) { console.log(errorHandler.getErrorMessage(err)); - console.log(err) return res.status(500).send( {message: errorHandler.getErrorMessage(err) } ); } - else if (user){ return res.status(200).send('User successfully verified'); }else { diff --git a/app/models/form_submission.server.model.js b/app/models/form_submission.server.model.js index 24cda177..4d0e9eff 100644 --- a/app/models/form_submission.server.model.js +++ b/app/models/form_submission.server.model.js @@ -31,7 +31,7 @@ var newDemoTemplate = { officialLanguage: 'English', phone: '250-', phone2: '', - postal: "S4M 7T8", + postal: 'S4M 7T8', province: 'BC', sex: 'F', sexDesc: 'Female', diff --git a/package.json b/package.json index d0e130be..633eeb50 100644 --- a/package.json +++ b/package.json @@ -28,17 +28,6 @@ "chalk": "~1.1.1", "compression": "~1.6.0", "connect-flash": "~0.1.1", -<<<<<<< HEAD - "connect-mongo": "~0.8.1", - "consolidate": "~0.10.0", - "cookie-parser": "~1.3.2", - "email-verification": "whitef0x0/node-email-verification", - "express": "~4.10.1", - "express-session": "~1.9.1", - "forever": "~0.11.0", - "fs-extra": "~0.18.3", - "glob": "~4.0.5", -======= "connect-mongo": "~0.8.2", "consolidate": "~0.13.1", "cookie-parser": "~1.4.0", @@ -48,7 +37,6 @@ "forever": "~0.15.1", "fs-extra": "~0.26.2", "glob": "~5.0.15", ->>>>>>> draggable_fields "grunt": "~0.4.1", "grunt-cli": "~0.1.13", "grunt-concurrent": "~2.0.4", diff --git a/public/modules/forms/controllers/list-forms.client.controller.js b/public/modules/forms/controllers/list-forms.client.controller.js index 13bb8ca6..4b429bbc 100644 --- a/public/modules/forms/controllers/list-forms.client.controller.js +++ b/public/modules/forms/controllers/list-forms.client.controller.js @@ -43,9 +43,11 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope $scope.myforms.splice(form_index+1, 0, data); }).error(function(errorResponse){ console.error(errorResponse); - if(errorResponse == null) $scope.error = errorResponse.data.message; + if(errorResponse === null){ + $scope.error = errorResponse.data.message; + } }); - } + }; // Create new Form $scope.createNewForm = function(){ @@ -76,9 +78,7 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope $http.delete('/forms/'+$scope.myforms[form_index]._id) .success(function(data, status, headers){ console.log('form deleted successfully'); - $scope.myforms.splice(form_index, 1); - }).error(function(error){ console.log('ERROR: Form could not be deleted.'); console.error(error); diff --git a/public/modules/forms/directives/auto-save.client.directive.js b/public/modules/forms/directives/auto-save.client.directive.js index 23adfb6b..b266e7ba 100644 --- a/public/modules/forms/directives/auto-save.client.directive.js +++ b/public/modules/forms/directives/auto-save.client.directive.js @@ -26,6 +26,7 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun $rootScope.finishedRender = false; $scope.$on('editFormFields Started', function(ngRepeatFinishedEvent) { + // console.log('hello'); $rootScope.finishedRender = false; }); $scope.$on('editFormFields Finished', function(ngRepeatFinishedEvent) { @@ -97,6 +98,7 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun // console.log('oldValue: '+oldValue); // console.log(oldValue.form_fields); // console.log(newValue.form_fields); + if(oldValue.form_fields.length === 0) { $rootScope.finishedRender = true } diff --git a/public/modules/forms/directives/field.client.directive.js b/public/modules/forms/directives/field.client.directive.js index 9071fbe1..3360b700 100644 --- a/public/modules/forms/directives/field.client.directive.js +++ b/public/modules/forms/directives/field.client.directive.js @@ -13,7 +13,6 @@ angular.module('forms').directive('fieldDirective', ['$templateCache', '$http', var getTemplateUrl = function(field) { - console.log(field.validFieldTypes); var type = field.fieldType; var templateUrl = 'modules/forms/views/directiveViews/field/'; var supported_fields = [ diff --git a/public/modules/forms/directives/on-finish-render.client.directive.js b/public/modules/forms/directives/on-finish-render.client.directive.js index 722d3eb7..d45ba885 100644 --- a/public/modules/forms/directives/on-finish-render.client.directive.js +++ b/public/modules/forms/directives/on-finish-render.client.directive.js @@ -5,10 +5,8 @@ angular.module('forms').directive('onFinishRender', function ($rootScope, $timeo restrict: 'A', link: function (scope, element, attrs) { - // $rootScope.$broadcast(' Started'); - //Don't do anything if we don't have a ng-repeat on the current element - if(!element.attr('ng-repeat')){ + if(!element.attr('ng-repeat') && !element.attr('data-ng-repeat')){ return; } diff --git a/public/modules/forms/views/directiveViews/form/edit-form.client.view.html b/public/modules/forms/views/directiveViews/form/edit-form.client.view.html index 33ac80c2..79d57ad9 100644 --- a/public/modules/forms/views/directiveViews/form/edit-form.client.view.html +++ b/public/modules/forms/views/directiveViews/form/edit-form.client.view.html @@ -1,4 +1,3 @@ -