fh-forms - npm Package Compare versions

Comparing version 0.2.27 to 0.2.28

lib/impl/getForm.js

 var models = require('../common/models.js')();
 var validate = require('../common/validate.js');
+var misc = require('../common/misc.js');
 var async = require('async');
@@ -82,17 +83,8 @@ var groups = require('./groups.js');
     async.eachSeries(populatedForms, function(formToReturn, cb){
-      var pageRef = {};
-      var fieldRef = {};
-
-
+      var genratedRefs = misc.generatePageAndFieldRefs(formToReturn);
+      var pageRef = genratedRefs.pageRef;
+      var fieldRef = genratedRefs.fieldRef;
       var fullyPopulatedForm;
       //Generating a handy page ref to use for getting page numbers.
-      for(var pageIndex = 0; pageIndex < formToReturn.pages.length; pageIndex++){
-        pageRef[formToReturn.pages[pageIndex]._id] = pageIndex;
 
-        for(var fieldIndex = 0; fieldIndex < formToReturn.pages[pageIndex].fields.length; fieldIndex++){
-          fieldRef[formToReturn.pages[pageIndex].fields[fieldIndex]._id] = {};
-          fieldRef[formToReturn.pages[pageIndex].fields[fieldIndex]._id].page = pageIndex;
-          fieldRef[formToReturn.pages[pageIndex].fields[fieldIndex]._id].field = fieldIndex;
-        }
-      }
 
@@ -99,0 +91,0 @@ //AppsUsing

lib/impl/submitFormData.js

 var models = require('../common/models.js')();
 var validate = require('../common/validate.js');
+var misc = require('../common/misc.js');
 var formsRulesEngine = require('../common/forms-rule-engine.js');
@@ -28,13 +29,22 @@ var async = require('async');
     //console.log("Ready to finish:", err);
-    if(err) return cb(err);
+    if(err) {
+      resultJSON.error = err.message ? err.message : err;
+    }
 
     if(submissionFlags.updateForm === true){//Need to send a form definition back.
       //Should send back an updated version of the form in the response.
-      resultJSON.updatedFormDefinition = formSubmittedAgainst.toJSON();
+
+      var fullyPopulatedForm = formSubmittedAgainst.toJSON();
+      var pageAndFieldRefs = misc.generatePageAndFieldRefs(formSubmittedAgainst);
+      fullyPopulatedForm.pageRef = pageAndFieldRefs.pageRef;
+      fullyPopulatedForm.fieldRef = pageAndFieldRefs.fieldRef;
+
+      resultJSON.updatedFormDefinition = fullyPopulatedForm;
     }
-    resultJSON.submissionId = formSubmission._id;
-    resultJSON.submissionStartedTimestamp = formSubmission.submissionStartedTimestamp;
-    resultJSON.formSubmission = formSubmission;
+    if(formSubmission){
+      resultJSON.submissionId = formSubmission._id;
+      resultJSON.submissionStartedTimestamp = formSubmission.submissionStartedTimestamp;
+      resultJSON.formSubmission = formSubmission;
+    }
 
-
     cb(undefined, resultJSON);
@@ -41,0 +51,0 @@ });

package.json

 {
   "name": "fh-forms",
-  "version": "0.2.27",
+  "version": "0.2.28",
   "description": "Cloud Forms API for form submission",
@@ -5,0 +5,0 @@ "main": "lib/forms.js",

VERSION.txt

@@ -1,1 +0,1 @@
-0.2.27-6
+0.2.28-7

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

202273

increased by0.36%

Number of package files

35

increased by2.94%

Lines of code

5441

increased by0.29%

No dependency changes