Fix to images & UDFs

src/components/processFlow/makeOffer.vue

@@ -10,7 +10,9 @@
         class="btn btn-b-n"
         style="width: 150px; height:40px;"
         data-dismiss="modal"
-      >OK</button>
+      >
+        OK
+      </button>
     </div>
     <div v-else>
       <div v-if="!isSaved">
@@ -78,30 +80,39 @@
             ></textarea>
           </div>
         </div>
+        <div class="form-group row">
+          <div class="col-md-12">
+            <p>
+              *Occupation for the current year is not guaranteed, Uni-Vate Properties will confirm
+              upon reply.
+            </p>
+          </div>
+        </div>
       </div>
       <div v-if="!isSaved" class="container">
         <div class="row">
           <div algin="center" class="col">
-            <button
-              v-if="isMakeOffer"
-              type="button"
-              @click="SendOffer()"
-              class="btn-solid-blue"
-            >Send Offer</button>
+            <button v-if="isMakeOffer" type="button" @click="SendOffer()" class="btn-solid-blue">
+              Send Offer
+            </button>
             <button
               v-if="!isMakeOffer && !isDecline && canEdit"
               type="submit"
               @click="Accept()"
               class="btn btn-b-n"
               style="width: 150px; height:40px;"
-            >Accept</button>
+            >
+              Accept
+            </button>
             <button
               v-if="!isMakeOffer && !isDecline && canEdit"
               type="button"
               @click="Decline()"
               class="btn btn-b-n"
               style="width: 150px; height:40px;"
-            >Decline</button>
+            >
+              Decline
+            </button>
           </div>
         </div>
       </div>
@@ -123,7 +134,9 @@
         @click="Complete()"
         class="btn btn-b-n"
         style="width: 150px; height:40px;"
-      >Complete</button>
+      >
+        Complete
+      </button>
       <div v-if="isSaved">
         <div class="form-group row">
           <br />
@@ -137,7 +150,9 @@
           class="btn btn-b-n"
           style="width: 150px; height:40px;"
           data-dismiss="modal"
-        >OK</button>
+        >
+          OK
+        </button>
       </div>
     </div>
   </div>
@@ -156,7 +171,7 @@ export default {
     canEdit: Boolean,
     item: Object,
     bidId: Number,
-    updateItem: Function,
+    updateItem: Function
   },
   data() {
     return {
@@ -164,7 +179,7 @@ export default {
       isSaved: false,
       message: "",
       isInfo: true,
-      isLoggedIn: Log.isLoggedIn(),
+      isLoggedIn: Log.isLoggedIn()
     };
   },
   methods: {
@@ -203,17 +218,17 @@ export default {
 
       const decline = {
         id: this.item.id,
-        comment: this.item.declineReason,
+        comment: this.item.declineReason
       };
 
       this.declineBid(decline);
       this.isSaved = true;
       this.message = "Offer Declined.";
       this.isInfo = false;
-    },
+    }
   },
   computed: {
-    ...mapState("bid", ["bidItem"]),
+    ...mapState("bid", ["bidItem"])
   },
   mounted() {
     this.getTemplate();
@@ -222,8 +237,8 @@ export default {
     item() {
       this.isSaved = false;
       this.canEdit = this.item.statusCode === "E1";
-    },
-  },
+    }
+  }
 };
 </script>
 

src/components/property/commercial/singleView/carouselSection.vue

@@ -16,7 +16,7 @@
           class="item"
           style="object-fit:cover"
           v-for="(image, i) in propertyImages"
-          :src="image"
+          :src="image.image"
           :key="i"
         />
       </carousel>

src/components/property/commercial/singleView/contentSection.vue

@@ -18,20 +18,20 @@
                 <img
                   v-if="i === 0"
                   style="width:100%; height:201px;object-fit: cover"
-                  :src="image"
+                  :src="image.image"
                 />
                 <div v-else-if="i !== 0">
                   <img
                     v-if="i % 2 === 0"
                     style="width:50%; height:140px; float:right;"
-                    :src="image"
+                    :src="image.image"
                   />
-                  <img v-else style="width:50%; height:140px; float:left" :src="image" />
+                  <img v-else style="width:50%; height:140px; float:left" :src="image.image" />
                 </div>
               </div>
             </div>
 
-            <gallery :images="propertyImages" :index="index" @close="index = null"></gallery>
+            <gallery :images="Images" :index="index" @close="index = null"></gallery>
           </div>
 
           <div class="panel-left p-5" style="margin-top:140px;">
@@ -41,7 +41,7 @@
             <div v-if="property.displayData.length > 0">
               <div v-for="(data, i) in property.displayData" :key="i">
                 <div v-for="field in data.values" :key="field.id">
-                  <p v-if="field.name === 'Floor Size'">{{ field.value }}M<sup>2</sup></p>
+                  <p v-if="field.name === 'Floor Size'">{{ field.value }}</p>
                 </div>
               </div>
             </div>
@@ -88,7 +88,7 @@
           <div v-if="property.displayData.length > 0">
             <div v-for="(data, i) in property.displayData" :key="i" class="row my-3">
               <div v-for="(field, j) in data.values" :key="j" class="col-md-6">
-                <div v-if="field.value.toUpperCase() != 'YES'">
+                <div v-if="field.value.toUpperCase() != 'TRUE'">
                   <i class="fa fa-check-circle"></i> {{ field.value }} {{ field.name }}
                 </div>
                 <div v-else><i class="fa fa-check-circle"></i> {{ field.name }}</div>
@@ -185,6 +185,15 @@ export default {
       index: null,
       date: new Date()
     };
+  },
+  computed: {
+    Images() {
+      const list = [];
+      for (let i = 0; i < this.propertyImages.length; i++) {
+        list.push(this.propertyImages[i].image);
+      }
+      return list;
+    }
   }
 };
 </script>

src/components/property/editProperty/editProperty.vue

@@ -66,11 +66,9 @@
                     :disabled="!canEdit"
                   >
                     <option value="0">Please select type *</option>
-                    <option
-                      v-for="item in propertyTypes"
-                      :value="item.id"
-                      :key="item.id"
-                    >{{ item.description }}</option>
+                    <option v-for="item in propertyTypes" :value="item.id" :key="item.id">{{
+                      item.description
+                    }}</option>
                   </select>
                 </div>
                 <div v-if="property.propertyUsageType === 'Commercial'" class="col-md-2">
@@ -110,7 +108,8 @@
                           for="price"
                           class="uniSelectLabel"
                           style="text-transform:uppercase; margin-left:17px; background-color:white"
-                        >{{ property.salesTypeString }} Price</label>
+                          >{{ property.salesTypeString }} Price</label
+                        >
                       </div>
                       <input
                         class="form-control uniInput"
@@ -256,11 +255,9 @@
                   </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>
@@ -295,15 +292,20 @@
                         :disabled="!canEdit"
                       />
                     </div>
-                    <div v-else class="display:none"></div>
-                    <div v-if="field.type === 'yesno'">
+                    <div v-else-if="field.type === 'text'">
                       {{ field.name }}
                       <input
-                        type="checkbox"
+                        type="text"
+                        class="form-control uniInput"
                         v-model="field.value"
                         :disabled="!canEdit"
                       />
                     </div>
+                    <div v-else-if="field.type === 'yesno'">
+                      {{ field.name }}
+                      <input type="checkbox" v-model="field.value" :disabled="!canEdit" />
+                    </div>
+                    <div v-else class="display:none"></div>
                   </div>
                 </div>
               </div>
@@ -360,12 +362,16 @@
                 @DeleteImage="DeleteImage"
                 :mayEdit="canEdit"
               />
-              <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">Save</button>
-              <button v-if="!wait" type="button" @click="Close()" class="btn-solid-blue">Close</button>
+              <button v-if="!wait" type="button" @click="SubmitData()" class="btn-solid-blue">
+                Save
+              </button>
+              <button v-if="!wait" type="button" @click="Close()" class="btn-solid-blue">
+                Close
+              </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="!addressSet">
                 <p class="alert myError">Please enter an address.</p>
@@ -390,7 +396,7 @@ export default {
   name: "PropertyEditPage",
   components: {
     mapSection,
-    ImageLoad,
+    ImageLoad
   },
   data() {
     return {
@@ -398,7 +404,7 @@ export default {
       defaultImage: 0,
       images: [],
       wait: false,
-      canEdit: true,
+      canEdit: true
     };
   },
   methods: {
@@ -406,7 +412,7 @@ export default {
       "getProperty",
       "getPropertyTypes",
       "getPropertyFields",
-      "updateProperty",
+      "updateProperty"
     ]),
     StatusChanged(item) {
       if (
@@ -469,7 +475,7 @@ export default {
         }
         this.property.newImages.push({
           image: this.images[i],
-          isDefault: setAsDefault,
+          isDefault: setAsDefault
         });
       }
 
@@ -477,7 +483,7 @@ export default {
 
       //console.log(JSON.stringify(this.property));
 
-      this.updateProperty(this.property).then((fulfilled) => {
+      this.updateProperty(this.property).then(fulfilled => {
         this.$router.push("/PropertyAdmin");
       });
     },
@@ -498,10 +504,10 @@ export default {
     },
     DeleteImage(item) {
       this.propertyImages[item].isDeleted = true;
-    },
+    }
   },
   mounted() {
-    this.getProperty(this.$route.params.id).then((fulfilled) => {
+    this.getProperty(this.$route.params.id).then(fulfilled => {
       this.wait = false;
       if (
         this.property.statusString === "Offer Pending" ||
@@ -520,7 +526,7 @@ export default {
       "propertyTypes",
       "propertyImages",
       "propertyFields",
-      "statuses",
+      "statuses"
     ]),
     savedImages() {
       const list = [];
@@ -528,8 +534,8 @@ export default {
         list.push(this.proeprtyImages[i].image);
       }
       return list;
-    },
-  },
+    }
+  }
 };
 </script>
 

src/components/property/residential/singleView/carouselSection.vue

@@ -16,7 +16,7 @@
           class="item"
           style="object-fit:cover"
           v-for="(image, i) in propertyImages"
-          :src="image"
+          :src="image.image"
           :key="i"
         />
       </carousel>

src/components/property/residential/singleView/contentSection.vue

@@ -15,19 +15,19 @@
             ></iframe>
             <div v-for="(image, i) in propertyImages" @click="index = i" :key="i">
               <div v-if="i < 3">
-                <img v-if="i === 0" style="width:100%" :src="image" />
+                <img v-if="i === 0" style="width:100%" :src="image.image" />
                 <div v-else-if="i !== 0">
                   <img
                     v-if="i % 2 === 0"
                     style="width:50%; height:140px; float:right;"
-                    :src="image"
+                    :src="image.image"
                   />
-                  <img v-else style="width:50%; height:140px; float:left" :src="image" />
+                  <img v-else style="width:50%; height:140px; float:left" :src="image.image" />
                 </div>
               </div>
             </div>
 
-            <gallery :images="propertyImages" :index="index" @close="index = null"></gallery>
+            <gallery :images="Images" :index="index" @close="index = null"></gallery>
           </div>
           <div class="panel-left p-5" style="margin-top:130px">
             <h2>Property Detial</h2>
@@ -39,7 +39,7 @@
             <p>{{ property.city }}, {{ property.suburb }}</p>
             <div v-for="(data, i) in property.displayData" :key="i">
               <div v-for="field in data.values" :key="field.id">
-                <p v-if="field.name === 'Floor Size'">{{ field.value }}M<sup>2</sup></p>
+                <p v-if="field.name === 'Floor Size'">{{ field.value }}</p>
                 <p v-if="field.name === 'Bedrooms'">Bedrooms {{ field.value }}</p>
                 <p v-if="field.name === 'Bathrooms'">Bathrooms {{ field.value }}</p>
               </div>
@@ -102,7 +102,7 @@
 
             <div v-for="(data, i) in property.displayData" :key="i" class="row my-3">
               <div v-for="(field, j) in data.values" :key="j" class="col-md-6">
-                <div v-if="field.value.toUpperCase() != 'YES'">
+                <div v-if="field.value.toUpperCase() != 'TRUE'">
                   <i class="fa fa-check-circle"></i> {{ field.value }} {{ field.name }}
                 </div>
                 <div v-else><i class="fa fa-check-circle"></i> {{ field.name }}</div>
@@ -185,6 +185,13 @@ export default {
         return url;
       }
       return "";
+    },
+    Images() {
+      const list = [];
+      for (let i = 0; i < this.propertyImages.length; i++) {
+        list.push(this.propertyImages[i].image);
+      }
+      return list;
     }
   }
 };

src/components/property/residential/singleView/singleResidentialPage.vue

@@ -44,7 +44,7 @@ export default {
       }
     }, 100);
 
-    this.mayEditProperty(this.$route.params.id);
+    //this.mayEditProperty(this.$route.params.id);
   },
   computed: {
     ...mapState("property", ["property", "propertyImages"]),