commit 848184895c87fc85233d43d8bc114cfdb4d03972
author Steven Burrows <sburrows@villa-technologies.com> Thu Sep 29 15:33:46 2016 -0700
committer Steven Burrows <sburrows@villa-technologies.com> Thu Sep 29 16:18:48 2016 -0700
tree 9e102180513e09d8fdcffdbf0dcab38ad4db7321
parent 1d68985f50c64bfc01bc8dff7a88f2f37fcf0a60

CORD-467: Enable ordering on xosForm Fields

Change-Id: I77979b56f7996315b4405b065c4e1e55b68cb6c3

src/services/helpers/ui/form.helpers.js

diff --git a/src/services/helpers/ui/form.helpers.js b/src/services/helpers/ui/form.helpers.js
index 28d4a18..331cdb0 100644
--- a/src/services/helpers/ui/form.helpers.js
+++ b/src/services/helpers/ui/form.helpers.js
@@ -1,5 +1,5 @@
 (function () {
-  
+
   angular.module('xos.uiComponents')
 
   /**
@@ -93,14 +93,22 @@
     * ```
     **/
 
-    this.buildFormStructure = (modelField, customField, model) => {
+    this.buildFormStructure = (modelField, customField, model, order) => {
+
+      const orderedForm = {};
 
       modelField = angular.extend(modelField, customField);
       customField = customField || {};
 
-      return _.reduce(Object.keys(modelField), (form, f) => {
+      if (order) {
+        _.each(order, function (key) {
+          orderedForm[key] = {};
+        });
+      }
 
-        form[f] = {
+      _.each(Object.keys(modelField), (f) => {
+
+        orderedForm[f] = {
           label: (customField[f] && customField[f].label) ? `${customField[f].label}:` : LabelFormatter.format(f),
           type: (customField[f] && customField[f].type) ? customField[f].type : this._getFieldFormat(model[f]),
           validators: (customField[f] && customField[f].validators) ? customField[f].validators : {},
@@ -108,21 +116,21 @@
         };
 
         if(customField[f] && customField[f].options){
-          form[f].options = customField[f].options;
+          orderedForm[f].options = customField[f].options;
         }
         if(customField[f] && customField[f].properties){
-          form[f].properties = customField[f].properties;
+          orderedForm[f].properties = customField[f].properties;
         }
-        if(form[f].type === 'date'){
+        if(orderedForm[f].type === 'date'){
           model[f] = new Date(model[f]);
         }
 
-        if(form[f].type === 'number'){
+        if(orderedForm[f].type === 'number'){
           model[f] = parseInt(model[f], 10);
         }
+      });
 
-        return form;
-      }, {});
+      return orderedForm;
     };
 
     /**
@@ -154,4 +162,4 @@
     }
 
   });
-})();
\ No newline at end of file
+})();

src/ui_components/dumbComponents/form/form.component.js

diff --git a/src/ui_components/dumbComponents/form/form.component.js b/src/ui_components/dumbComponents/form/form.component.js
index 9fedb3c..ecdddc6 100644
--- a/src/ui_components/dumbComponents/form/form.component.js
+++ b/src/ui_components/dumbComponents/form/form.component.js
@@ -62,7 +62,7 @@
     * @requires xos.uiComponents.XosFormHelpers
     * @requires xos.helpers._
     * @example
-    
+
     Autogenerated form
 
   <example module="sampleForm">
@@ -275,7 +275,7 @@
         }
         let diff = _.difference(Object.keys(model), this.excludedField);
         let modelField = XosFormHelpers.parseModelField(diff);
-        this.formField = XosFormHelpers.buildFormStructure(modelField, this.config.fields, model);
+        this.formField = XosFormHelpers.buildFormStructure(modelField, this.config.fields, model, this.config.order);
       });
 
     }