UserField Ranks

src/components/property/commercial/createProperty/commercialCreateNew.vue

@@ -96,8 +96,8 @@
                   <currency-input
                     onClick="this.setSelectionRange(0, this.value.length)"
                     name="price"
-                    :value="value"
-                    @input="value = $event"
+                    :value="property.price"
+                    @input="property.price = $event"
                     v-model="property.price"
                     id="price"
                     class="form-control uniInput"
@@ -139,7 +139,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="streetNumber"
-                  id="unit"
+                  id="streetNumber"
                   v-model="property.streetNumber"
                   disabled
                 />
@@ -154,7 +154,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="streetName"
-                  id="unit"
+                  id="streetName"
                   v-model="property.streetName"
                   disabled
                 />
@@ -169,7 +169,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="suburb"
-                  id="unit"
+                  id="suburb"
                   v-model="property.suburb"
                   disabled
                 />
@@ -184,7 +184,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="city"
-                  id="unit"
+                  id="city"
                   v-model="property.city"
                   disabled
                 />
@@ -199,7 +199,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="province"
-                  id="unit"
+                  id="province"
                   v-model="property.province"
                   disabled
                 />
@@ -214,7 +214,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="postalCode"
-                  id="unit"
+                  id="postalCode"
                   v-model="property.postalCode"
                   disabled
                 />
@@ -229,7 +229,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="country"
-                  id="unit"
+                  id="country"
                   v-model="property.country"
                   disabled
                 />
@@ -261,13 +261,14 @@
         <div v-for="item in propertyFields" :key="item.id">
           <div v-if="item.name === 'Commercial Fields'">
             <UserField
-              :fields="item.fields"
+              :fields="sortFields"
               :id="item.name"
               @UpdateUserDefinedFields="UpdateUserDefinedFields"
               :fieldValues="item.fields"
             />
           </div>
         </div>
+
         <div class="row">
           <div class="col-sm-12">
             <div class="section-header">
@@ -374,7 +375,7 @@ export default {
       addressSet: false,
       showPropertyTypeError: false,
       showDateError: false,
-      user: Log.getUser(),
+      userParam: Log.getUser(),
       mayEdit: Log.isLoggedIn()
     };
   },
@@ -407,6 +408,7 @@ export default {
     TypeChanged() {
       this.property.propertyUsageType = this.propertyType;
     },
+
     SubmitData() {
       if (this.property.propertyTypeId === 0) {
         this.showPropertyTypeError = true;
@@ -542,6 +544,14 @@ export default {
     ]),
     ...mapState("authentication", ["user"]),
     ...mapGetters("fees", ["getListingFee"]),
+    sortFields() {
+      var display = [];
+
+      display = this.propertyFields[0].fields.sort((a, b) => (a.rank > b.rank ? 1 : -1));
+      console.log(display);
+
+      return display;
+    },
     SalesTypeChanged() {
       // eslint-disable-next-line vue/no-side-effects-in-computed-properties
       // this.propertyType = this.$route.params.propType;

src/components/property/residential/createProperty/residentialCreateNew.vue

@@ -80,10 +80,9 @@
                 </div>
                 <float-label label="Price">
                   <currency-input
-                    onClick="this.setSelectionRange(0, this.value.length)"
                     name="price"
-                    :value="value"
-                    @input="value = $event"
+                    :value="property.price"
+                    @input="property.price = $event"
                     v-model="property.price"
                     id="price"
                     class="form-control uniInput"
@@ -125,7 +124,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="streetNumber"
-                  id="unit"
+                  id="streetNumber"
                   v-model="property.streetNumber"
                   disabled
                 />
@@ -140,7 +139,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="streetName"
-                  id="unit"
+                  id="streetName"
                   v-model="property.streetName"
                   disabled
                 />
@@ -155,7 +154,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="suburb"
-                  id="unit"
+                  id="suburb"
                   v-model="property.suburb"
                   disabled
                 />
@@ -170,7 +169,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="city"
-                  id="unit"
+                  id="city"
                   v-model="property.city"
                   disabled
                 />
@@ -185,7 +184,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="province"
-                  id="unit"
+                  id="province"
                   v-model="property.province"
                   disabled
                 />
@@ -200,7 +199,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="postalCode"
-                  id="unit"
+                  id="postalCode"
                   v-model="property.postalCode"
                   disabled
                 />
@@ -215,7 +214,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="country"
-                  id="unit"
+                  id="country"
                   v-model="property.country"
                   disabled
                 />
@@ -261,8 +260,8 @@
           :fields="propertyOverviewFields[0].fields"
           @UpdateUserDefinedFields="UpdateUserDefinedFields"
           :id="1"
-        ></UserField>
-        <div class="row">
+        ></UserField> -->
+        <!-- <div class="row">
           <div class="col-md-12">
             <div v-for="item in propertyFields" :key="item.id">
               <div class="row">
@@ -387,7 +386,7 @@ export default {
       addressSet: false,
       showPropertyTypeError: false,
       showDateError: false,
-      user: Log.getUser(),
+      userParam: Log.getUser(),
       mayEdit: Log.isLoggedIn()
     };
   },
@@ -568,6 +567,9 @@ export default {
     ]),
     ...mapState("authentication", ["user"]),
     ...mapGetters("fees", ["getListingFee"]),
+    sortFields() {
+      return this.propertyFields[0].fields.sort((a, b) => (a.rank > b.rank ? 1 : -1));
+    },
     SalesTypeChanged() {
       // eslint-disable-next-line vue/no-side-effects-in-computed-properties
       // this.propertyType = this.$route.params.propType;

vue.config.js

@@ -2,7 +2,7 @@ module.exports = {
   devServer: {
     proxy: {
       "/api": {
-        // target: "http://localhost:57260/",
+        //target: "http://localhost:57260/",
         target: "http://training.provision-sa.com:82",
         changeOrigin: true
       },