diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js index bce14420..6695d55b 100644 --- a/app/controllers/forms.server.controller.js +++ b/app/controllers/forms.server.controller.js @@ -128,8 +128,9 @@ exports.createSubmission = function(req, res) { } submission.save(function(err, submission){ - // console.log('in submissions.save()\n submission: '+JSON.stringify(submission) ); + // console.log('in submissions.save()\n submission: '+JSON.stringify(submission) ) if(err){ + console.log(err.message); res.status(400).send({ message: errorHandler.getErrorMessage(err) }); diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js index c9376666..c4eda095 100644 --- a/app/models/form.server.model.js +++ b/app/models/form.server.model.js @@ -211,6 +211,7 @@ FormSchema.pre('save', function (next) { 'spokenLanguage', 'title', 'DOB']; + next(); }); //Delete template PDF of current Form FormSchema.pre('remove', function (next) { diff --git a/app/models/form_field.server.model.js b/app/models/form_field.server.model.js index daf4647f..02ee0fbb 100644 --- a/app/models/form_field.server.model.js +++ b/app/models/form_field.server.model.js @@ -103,9 +103,10 @@ FormFieldSchema.plugin(mUtilities.timestamp, { useVirtual: false }); -// FormFieldSchema.pre('init', function (next){ -// this.validFieldTypes = Field.schema.path('fieldType').enumValues; -// }); +FormFieldSchema.pre('save', function (next){ + this.validFieldTypes = mongoose.model('Field').schema.path('fieldType').enumValues; + next(); +}); mongoose.model('Field', FormFieldSchema); diff --git a/app/models/form_submission.server.model.js b/app/models/form_submission.server.model.js index b20879e7..ffeddde9 100644 --- a/app/models/form_submission.server.model.js +++ b/app/models/form_submission.server.model.js @@ -154,7 +154,9 @@ FormSubmissionSchema.pre('save', function (next) { _generatedDemo['monthOfBirth'] = date.getMonth()+''; } } - _generatedDemo['lastUpdateDate'] = Date.now(); + var currDate = new Date(); + var dateString = currDate.toISOString().split('T')[0] + ' ' + currDate.toISOString().split('T')[1].slice(0,8); + _generatedDemo['lastUpdateDate'] = currDate.toISOString(); return _generatedDemo; }; @@ -193,7 +195,7 @@ FormSubmissionSchema.pre('save', function (next) { if(err) next(err); self.oscarDemoNum = parseInt(result.return, 10); - // console.log('self.oscarDemoNum: '+self.oscarDemoNum); + console.log('self.oscarDemoNum: '+self.oscarDemoNum); next(); }); }else{ diff --git a/app/tests/form_submission.model.test.js b/app/tests/form_submission.model.test.js index 00fee0bc..c5c90be4 100644 --- a/app/tests/form_submission.model.test.js +++ b/app/tests/form_submission.model.test.js @@ -24,7 +24,7 @@ var exampleDemo = { firstName: 'Test User', hin: '', lastName: 'AddDemographic', - lastUpdateDate: Date.now(), + lastUpdateDate: '2014-10-01 00:00:00', monthOfBirth: '05', officialLanguage: 'English', phone: '250-222-2222', diff --git a/public/modules/forms/controllers/admin-form.client.controller.js b/public/modules/forms/controllers/admin-form.client.controller.js index dfaf00f1..6421e3d2 100644 --- a/public/modules/forms/controllers/admin-form.client.controller.js +++ b/public/modules/forms/controllers/admin-form.client.controller.js @@ -93,7 +93,7 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope $rootScope.myform = $scope.myform = response.data; // console.log(response.data); }).catch(function(response){ - // console.log('Error occured during form UPDATE.\n'); + console.log('Error occured during form UPDATE.\n'); // console.log(response.data); err = response.data; }).finally(function() { diff --git a/public/modules/forms/directives/auto-save.client.directive.js b/public/modules/forms/directives/auto-save.client.directive.js index d73e14dd..abea89d0 100644 --- a/public/modules/forms/directives/auto-save.client.directive.js +++ b/public/modules/forms/directives/auto-save.client.directive.js @@ -64,8 +64,8 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun //Update/Save Form if any Form fields are Dirty and Touched $scope.$watch(function(newValue, oldValue) { // console.log($scope); - // console.log($scope.$parent.editForm); - if($rootScope.finishedRender && $scope.anyDirtyAndTouched($scope.$parent.editForm) && !$rootScope.saveInProgress){ + console.log($scope.editForm); + if($rootScope.finishedRender && $scope.anyDirtyAndTouched($scope.editForm) && !$rootScope.saveInProgress){ console.log('Form saving started'); debounceSave(); } @@ -98,18 +98,19 @@ 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 //Save form ONLY IF rendering is finished, form_fields have been changed AND currently not save in progress - if($rootScope.finishedRender && ((changedFields && !$formCtrl.$dirty) || changedFieldMap) && !$rootScope.saveInProgress) { + if( $rootScope.finishedRender && ((changedFields && !$formCtrl.$dirty) || changedFieldMap) && !$rootScope.saveInProgress) { - console.log('saving form now'); + // console.log('saving form now'); if(savePromise) { $timeout.cancel(savePromise); savePromise = null; } savePromise = $timeout(function() { - console.log('Saving Form'); + // console.log('Saving Form'); debounceSave(); }); } diff --git a/public/modules/forms/directives/edit-form.client.directive.js b/public/modules/forms/directives/edit-form.client.directive.js index 3e11461a..e9f36833 100644 --- a/public/modules/forms/directives/edit-form.client.directive.js +++ b/public/modules/forms/directives/edit-form.client.directive.js @@ -144,7 +144,6 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', '$q', '$ht // Delete particular field on button click $scope.deleteField = function (field_index){ - $scope.myform.plugins.oscarhost.settings.fieldMap = {}; //Delete field from field map var currFieldId = $scope.myform.form_fields[field_index]._id delete $scope.myform.plugins.oscarhost.settings.fieldMap[currFieldId]; 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 07d62a33..722d3eb7 100644 --- a/public/modules/forms/directives/on-finish-render.client.directive.js +++ b/public/modules/forms/directives/on-finish-render.client.directive.js @@ -22,7 +22,7 @@ angular.module('forms').directive('onFinishRender', function ($rootScope, $timeo }else if(scope.$last) { scope.$evalAsync(function () { // element.ready(function () { - // console.log(broadcastMessage+'Finished'); + console.log(broadcastMessage+'Finished'); // console.log(Date.now()); $rootScope.$broadcast(broadcastMessage+' Finished'); // }); diff --git a/public/modules/forms/views/directiveViews/field/radio.html b/public/modules/forms/views/directiveViews/field/radio.html index 22a1b7a9..a21c3fd6 100755 --- a/public/modules/forms/views/directiveViews/field/radio.html +++ b/public/modules/forms/views/directiveViews/field/radio.html @@ -5,13 +5,13 @@