Merge branch 'master' of http://provision-sa.co.za:3000/Provision/UnivateProperties into master

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

@@ -52,9 +52,7 @@
             >
               <option value="0">Please select type *</option>
               <option v-for="item in propertyTypes" :value="item.id" :key="item.id">
-                {{
-                item.description
-                }}
+                {{ item.description }}
               </option>
             </select>
           </div>
@@ -91,14 +89,15 @@
                     for="price"
                     class="uniSelectLabel"
                     style="text-transform:uppercase; margin-left:17px; background-color:white"
-                  >{{ salesType }} Price</label>
+                    >{{ salesType }} Price</label
+                  >
                 </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"
@@ -140,7 +139,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="streetNumber"
-                  id="unit"
+                  id="streetNumber"
                   v-model="property.streetNumber"
                 />
               </div>
@@ -154,7 +153,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="streetName"
-                  id="unit"
+                  id="streetName"
                   v-model="property.streetName"
                 />
               </div>
@@ -168,7 +167,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="suburb"
-                  id="unit"
+                  id="suburb"
                   v-model="property.suburb"
                 />
               </div>
@@ -182,7 +181,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="city"
-                  id="unit"
+                  id="city"
                   v-model="property.city"
                 />
               </div>
@@ -196,7 +195,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="province"
-                  id="unit"
+                  id="province"
                   v-model="property.province"
                 />
               </div>
@@ -210,7 +209,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="postalCode"
-                  id="unit"
+                  id="postalCode"
                   v-model="property.postalCode"
                 />
               </div>
@@ -224,14 +223,16 @@
                   class="form-control uniInput"
                   type="text"
                   name="country"
-                  id="unit"
+                  id="country"
                   v-model="property.country"
                 />
               </div>
             </div>
             <div class="row my-3">
               <div class="col-md-12">
-                <button type="button" @click="clearAddress()" class="btn-solid-blue">Clear Address</button>
+                <button type="button" @click="clearAddress()" class="btn-solid-blue">
+                  Clear Address
+                </button>
               </div>
             </div>
           </div>
@@ -253,13 +254,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">
@@ -313,9 +315,13 @@
           :savedImages="propertyImages"
           @DefaultImage="UpdateDefaultImage"
         />
-        <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">Save</button>
+        <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">
+          Save
+        </button>
         <div v-if="showPropertyTypeError">
-          <p class="alert myError">Missing fields. Please fill in all required fields. Marked with *</p>
+          <p class="alert myError">
+            Missing fields. Please fill in all required fields. Marked with *
+          </p>
         </div>
         <div v-if="wait" id="preloader"></div>
       </div>
@@ -340,7 +346,7 @@ export default {
     ImageLoad,
     VueEditor,
     carouselSection,
-    mapSection,
+    mapSection
   },
   data() {
     return {
@@ -353,22 +359,17 @@ export default {
       customToolbar: [
         [{ header: [false, 1, 2, 3, 4, 5, 6] }],
         ["bold", "italic", "underline", "strike"],
-        [
-          { align: "" },
-          { align: "center" },
-          { align: "right" },
-          { align: "justify" },
-        ],
+        [{ align: "" }, { align: "center" }, { align: "right" }, { align: "justify" }],
         [{ list: "ordered" }, { list: "bullet" }, { list: "check" }],
         [{ script: "sub" }, { script: "super" }],
-        [{ indent: "-1" }, { indent: "+1" }],
+        [{ indent: "-1" }, { indent: "+1" }]
       ],
       error: "",
       addressSet: false,
       showPropertyTypeError: false,
       showDateError: false,
       user: Log.getUser(),
-      mayEdit: Log.isLoggedIn(),
+      mayEdit: Log.isLoggedIn()
     };
   },
   methods: {
@@ -383,7 +384,7 @@ export default {
       "getPropertyEditDisplay",
       "getPropertySavedOverviewFields",
       "getPropertySavedFields",
-      "getSavedPropertyData",
+      "getSavedPropertyData"
     ]),
     updateLocation(place) {
       this.addressSet = true;
@@ -400,15 +401,13 @@ export default {
     TypeChanged() {
       this.property.propertyUsageType = this.propertyType;
     },
+
     SubmitData() {
       if (this.property.propertyTypeId === 0) {
         this.showPropertyTypeError = true;
       }
 
-      if (
-        this.salesType === "Rental" &&
-        this.property.dateAvailable === "undef"
-      ) {
+      if (this.salesType === "Rental" && this.property.dateAvailable === "undef") {
         this.showDateError = true;
       }
 
@@ -432,7 +431,7 @@ export default {
         }
         this.property.propertyImages.push({
           image: this.images[i],
-          isDefault: setAsDefault,
+          isDefault: setAsDefault
         });
       }
       this.property.propertyUserFields = this.propertyFieldValues;
@@ -441,7 +440,7 @@ export default {
         this.property.userId = this.user.id;
       }
 
-      this.property.propertyUserFields.forEach((item) => {
+      this.property.propertyUserFields.forEach(item => {
         if (item.value === true) {
           item.value = "yes";
         } else if (item.value === false) {
@@ -452,12 +451,10 @@ export default {
       console.log(this.property);
 
       this.saveProperty(this.property)
-        .then((fulfilled) => {
-          this.$router.push(
-            `/property/commercial/property/${fulfilled.data.id}`
-          );
+        .then(fulfilled => {
+          this.$router.push(`/property/commercial/property/${fulfilled.data.id}`);
         })
-        .catch((error) => {
+        .catch(error => {
           console.log(error.message);
         });
     },
@@ -479,7 +476,7 @@ export default {
     },
     UpdateUserDefinedFields(item) {
       let update = false;
-      this.propertyFieldValues.forEach((element) => {
+      this.propertyFieldValues.forEach(element => {
         if (element.userDefinedFieldId === item.userDefinedFieldId) {
           element.value = item.value;
           update = true;
@@ -503,7 +500,7 @@ export default {
       this.property.postalCode = undefined;
       this.property.addressUrl = undefined;
       this.property.propertCoords = undefined;
-    },
+    }
   },
   mounted() {
     this.wait = false;
@@ -536,10 +533,18 @@ export default {
       "propertyOverviewFields",
       "propertyFields",
       "property",
-      "propertyImages",
+      "propertyImages"
     ]),
     ...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;
@@ -557,13 +562,13 @@ export default {
       this.getPropertyTypes(this.propertyType);
 
       return this.propertyType;
-    },
+    }
   },
   watch: {
     SalesTypeChanged() {
       return null;
-    },
-  },
+    }
+  }
 };
 </script>
 

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

@@ -52,9 +52,7 @@
             >
               <option value="0">Please select type *</option>
               <option v-for="item in propertyTypes" :value="item.id" :key="item.id">
-                {{
-                item.description
-                }}
+                {{ item.description }}
               </option>
             </select>
           </div>
@@ -77,18 +75,14 @@
                     for="price"
                     class="uniSelectLabel"
                     style="text-transform:uppercase; margin-left:17px; background-color:white"
-                  >{{ salesType }} Price</label>
+                    >{{ salesType }} Price</label
+                  >
                 </div>
                 <float-label label="Price">
-                  <currency-input
-                    onclick="this.setSelectionRange(0, this.value.length)"
-                    name="price"
-                    :value="value"
-                    @input="value = $event"
-                    v-model="property.price"
-                    id="price"
-                    class="form-control uniInput"
-                  />
+                  <currency-input <<<<<<< HEAD ======= onclick="this.setSelectionRange(0,
+                  this.value.length)" >>>>>>> 6bbfd86e089da859d019dcbda5cc0fe053af8db2 name="price"
+                  :value="property.price" @input="property.price = $event" v-model="property.price"
+                  id="price" class="form-control uniInput" />
                 </float-label>
               </div>
               <div v-if="salesType === 'Rental'" class="col-md-6">
@@ -126,7 +120,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="streetNumber"
-                  id="unit"
+                  id="streetNumber"
                   v-model="property.streetNumber"
                 />
               </div>
@@ -140,7 +134,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="streetName"
-                  id="unit"
+                  id="streetName"
                   v-model="property.streetName"
                 />
               </div>
@@ -154,7 +148,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="suburb"
-                  id="unit"
+                  id="suburb"
                   v-model="property.suburb"
                 />
               </div>
@@ -168,7 +162,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="city"
-                  id="unit"
+                  id="city"
                   v-model="property.city"
                 />
               </div>
@@ -182,7 +176,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="province"
-                  id="unit"
+                  id="province"
                   v-model="property.province"
                 />
               </div>
@@ -196,7 +190,7 @@
                   class="form-control uniInput"
                   type="text"
                   name="postalCode"
-                  id="unit"
+                  id="postalCode"
                   v-model="property.postalCode"
                 />
               </div>
@@ -210,14 +204,16 @@
                   class="form-control uniInput"
                   type="text"
                   name="country"
-                  id="unit"
+                  id="country"
                   v-model="property.country"
                 />
               </div>
             </div>
             <div class="row my-3">
               <div class="col-md-12">
-                <button type="button" @click="clearAddress()" class="btn-solid-blue">Clear Address</button>
+                <button type="button" @click="clearAddress()" class="btn-solid-blue">
+                  Clear Address
+                </button>
               </div>
             </div>
           </div>
@@ -253,8 +249,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">
@@ -326,9 +322,13 @@
           :savedImages="propertyImages"
           @DefaultImage="UpdateDefaultImage"
         />
-        <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">Save</button>
+        <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">
+          Save
+        </button>
         <div v-if="showPropertyTypeError">
-          <p class="alert myError">Missing fields. Please fill in all required fields. Marked with *</p>
+          <p class="alert myError">
+            Missing fields. Please fill in all required fields. Marked with *
+          </p>
         </div>
         <div v-if="wait" id="preloader"></div>
       </div>
@@ -353,7 +353,7 @@ export default {
     ImageLoad,
     VueEditor,
     carouselSection,
-    mapSection,
+    mapSection
   },
   data() {
     return {
@@ -366,22 +366,17 @@ export default {
       customToolbar: [
         [{ header: [false, 1, 2, 3, 4, 5, 6] }],
         ["bold", "italic", "underline", "strike"],
-        [
-          { align: "" },
-          { align: "center" },
-          { align: "right" },
-          { align: "justify" },
-        ],
+        [{ align: "" }, { align: "center" }, { align: "right" }, { align: "justify" }],
         [{ list: "ordered" }, { list: "bullet" }, { list: "check" }],
         [{ script: "sub" }, { script: "super" }],
-        [{ indent: "-1" }, { indent: "+1" }],
+        [{ indent: "-1" }, { indent: "+1" }]
       ],
       error: "",
       addressSet: false,
       showPropertyTypeError: false,
       showDateError: false,
       user: Log.getUser(),
-      mayEdit: Log.isLoggedIn(),
+      mayEdit: Log.isLoggedIn()
     };
   },
   methods: {
@@ -396,7 +391,7 @@ export default {
       "getPropertyEditDisplay",
       "getPropertySavedOverviewFields",
       "getPropertySavedFields",
-      "getSavedPropertyData",
+      "getSavedPropertyData"
     ]),
     updateLocation(place) {
       this.addressSet = true;
@@ -418,10 +413,7 @@ export default {
         this.showPropertyTypeError = true;
       }
 
-      if (
-        this.salesType === "Rental" &&
-        this.property.dateAvailable === "undef"
-      ) {
+      if (this.salesType === "Rental" && this.property.dateAvailable === "undef") {
         this.showDateError = true;
       }
 
@@ -445,7 +437,7 @@ export default {
         }
         this.property.propertyImages.push({
           image: this.images[i],
-          isDefault: setAsDefault,
+          isDefault: setAsDefault
         });
       }
       this.property.propertyUserFields = this.propertyFieldValues;
@@ -453,7 +445,7 @@ export default {
       if (this.user) {
         this.property.userId = this.user.id;
       }
-      this.property.propertyUserFields.forEach((item) => {
+      this.property.propertyUserFields.forEach(item => {
         if (item.value === true) {
           item.value = "yes";
         } else if (item.value === false) {
@@ -462,12 +454,10 @@ export default {
       });
 
       this.saveProperty(this.property)
-        .then((fulfilled) => {
-          this.$router.push(
-            `/property/residential/property/${fulfilled.data.id}`
-          );
+        .then(fulfilled => {
+          this.$router.push(`/property/residential/property/${fulfilled.data.id}`);
         })
-        .catch((error) => {
+        .catch(error => {
           console.log(error.message);
         });
     },
@@ -489,7 +479,7 @@ export default {
     },
     UpdateUserDefinedFields(item) {
       let update = false;
-      this.propertyFieldValues.forEach((element) => {
+      this.propertyFieldValues.forEach(element => {
         console.log(element);
 
         if (element.userDefinedFieldId === item.userDefinedFieldId) {
@@ -525,7 +515,7 @@ export default {
         fields.push(arr.slice(i, (i += len)));
       }
       return fields;
-    },
+    }
   },
   mounted() {
     console.log(this.propertyFields);
@@ -562,10 +552,13 @@ export default {
       "propertyOverviewFields",
       "propertyFields",
       "property",
-      "propertyImages",
+      "propertyImages"
     ]),
     ...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;
@@ -584,13 +577,13 @@ export default {
     },
     userFieldsArr() {
       return this.userFieldsArrFunc(this.propertyFields, 4);
-    },
+    }
   },
   watch: {
     SalesTypeChanged() {
       return null;
-    },
-  },
+    }
+  }
 };
 </script>
 

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
       },