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

src/App.vue

@@ -136,6 +136,14 @@ html {
   background-color: #ff8344;
   color: white;
 }
+.redText {
+  background-color: #eb5252;
+  color: white;
+}
+.greenText {
+  background-color: #43e243;
+  color: white;
+}
 .noWeeks {
   background-color: #ff4444;
 }

src/components/admin/property/propertyList.vue

@@ -276,14 +276,16 @@ export default {
       }
     });
   },
-  // watch: {
-  //   sortKey: {
-  //     immediate: true,
-  //     handler(val, oldVal) {
-  //       return this.FilteredProperties;
-  //     },
-  //   },
-  // },
+  watch: {
+    filter: {
+      immediate: true,
+      handler(val, oldVal) {
+        if (val != oldVal) {
+          this.currentPage = 1;
+        }
+      },
+    },
+  },
 };
 </script>
 

src/components/property/editProperty/editProperty.vue

@@ -26,7 +26,7 @@
                     v-model="property.statusString"
                     @change="StatusChanged"
                   >
-                    <option v-for="(item, i) in statuses" :key="i">{{ item }}</option>
+                    <option v-for="(item, i) in Statuses" :key="i">{{ item }}</option>
                   </select>
                 </div>
               </div>
@@ -135,8 +135,9 @@
                       </select>
                     </div>
                   </div>
-                  <div class="row my-3">
+                  <div v-if="!property.isSale" class="row my-3">
                     <div class="col-md-12">
+                      Date Available
                       <input
                         type="date"
                         class="form-control uniInput"
@@ -146,6 +147,21 @@
                       />
                     </div>
                   </div>
+                  <div
+                    class="row my-3"
+                    v-if="property.statusString === 'Sold' || property.statusString ==='Rented Out'"
+                  >
+                    <div class="col-md-12">
+                      Hide Property After
+                      <input
+                        type="date"
+                        class="form-control uniInput"
+                        name="date"
+                        v-model="property.cutOffDisplayDateString"
+                      />
+                    </div>
+                  </div>
+
                   <div class="row my-3">
                     <br />
                   </div>
@@ -540,6 +556,18 @@ export default {
       }
       return list;
     },
+    Statuses() {
+      const list = [];
+      for (let i = 0; i < this.statuses.length; i++) {
+        if (this.property.isSale && this.statuses[i] !== "Rented Out") {
+          list.push(this.statuses[i]);
+        }
+        if (!this.property.isSale && this.statuses[i] !== "Sold") {
+          list.push(this.statuses[i]);
+        }
+      }
+      return list;
+    },
   },
 };
 </script>

src/components/property/propertyCard.vue

@@ -14,7 +14,7 @@
                   <h3>{{ currentProperty.displayPrice }}</h3>
                   <div>
                     <img
-                      style="max-height:165px; object-fit: cover;"
+                      style="height:165px; object-fit: cover;"
                       :src="currentProperty.displayImage"
                       alt
                     />
@@ -26,16 +26,10 @@
                   {{ currentProperty.propertyReference }}
                 </p>
                 <p
-                  v-if="!currentProperty.isSale"
-                  :class="[currentProperty.hasPendingOffer ? 'pendingOffer' : 'normalText']"
+                  v-if="currentProperty.displayText != ''"
+                  :class="[currentProperty.displayColor === 'green' ? 'greenText' : currentProperty.displayColor === 'orange' ? 'pendingOffer' : currentProperty.displayColor === 'red' ? 'redText' : 'normalText']"
                 >
-                  <strong>{{ currentProperty.available }}</strong>
-                </p>
-                <p
-                  v-if="currentProperty.isSale && currentProperty.hasPendingOffer"
-                  class="pendingOffer"
-                >
-                  <strong>{{ currentProperty.available }}</strong>
+                  <strong>{{ currentProperty.displayText }}</strong>
                 </p>
               </div>
             </router-link>
@@ -46,7 +40,7 @@
                 <div class="feature-top pt-3 mb-2">
                   <h3>{{ currentProperty.displayPrice }}</h3>
                   <img
-                    style="max-height:165px; object-fit: cover;"
+                    style="height:165px; object-fit: cover;"
                     :src="currentProperty.displayImage"
                     alt
                   />
@@ -56,6 +50,12 @@
                   <strong>Property Reference</strong>
                   {{ currentProperty.propertyReference }}
                 </p>
+                <p
+                  v-if="currentProperty.displayText != ''"
+                  :class="[currentProperty.displayColor === 'green' ? 'greenText' : currentProperty.displayColor === 'orange' ? 'pendingOffer' : currentProperty.displayColor === 'red' ? 'redText' : 'normalText']"
+                >
+                  <strong>{{ currentProperty.displayText }}</strong>
+                </p>
               </div>
             </router-link>
           </div>
@@ -73,7 +73,7 @@ export default {
   props: {
     properties: { type: Array, default: () => [] },
     showSort: { type: Boolean, default: true },
-    salesType: { type: String, default: "Rent" }
+    salesType: { type: String, default: "Rent" },
   },
   methods: {
     sortHighPrice() {
@@ -111,8 +111,8 @@ export default {
       }
 
       return this.properties.sort(compare);
-    }
-  }
+    },
+  },
 };
 </script>
 

src/components/property/propertyCardSearch.vue

@@ -13,7 +13,7 @@
                 <div class="feature-top pt-3 mb-2">
                   <h3 style="color:white !important">{{ currentProperty.displayPrice }}</h3>
                   <img
-                    style="max-height:165px; object-fit: cover;"
+                    style="height:165px; object-fit: cover;"
                     :src="currentProperty.displayImage"
                     alt
                   />
@@ -24,16 +24,10 @@
                   {{ currentProperty.propertyReference }}
                 </p>
                 <p
-                  v-if="!currentProperty.isSale"
-                  :class="[currentProperty.hasPendingOffer ? 'pendingOffer' : 'normalText']"
+                  v-if="currentProperty.displayText != ''"
+                  :class="[currentProperty.displayColor === 'green' ? 'greenText' : currentProperty.displayColor === 'orange' ? 'pendingOffer' : currentProperty.displayColor === 'red' ? 'redText' : 'normalText']"
                 >
-                  <strong>{{ currentProperty.available }}</strong>
-                </p>
-                <p
-                  v-if="currentProperty.isSale && currentProperty.hasPendingOffer"
-                  class="pendingOffer"
-                >
-                  <strong>{{ currentProperty.available }}</strong>
+                  <strong>{{ currentProperty.displayText }}</strong>
                 </p>
               </div>
             </router-link>
@@ -44,7 +38,7 @@
                 <div class="feature-top pt-3 mb-2">
                   <h3>{{ currentProperty.displayPrice }}</h3>
                   <img
-                    style="max-height:165px; object-fit: cover;"
+                    style="height:165px; object-fit: cover;"
                     :src="currentProperty.displayImage"
                     alt
                   />
@@ -71,7 +65,7 @@ export default {
   props: {
     properties: { type: Array, default: () => [] },
     showSort: { type: Boolean, default: true },
-    salesType: { type: String, default: "Rent" }
+    salesType: { type: String, default: "Rent" },
   },
   methods: {
     sortHighPrice() {
@@ -109,8 +103,8 @@ export default {
       }
 
       return this.properties.sort(compare);
-    }
-  }
+    },
+  },
 };
 </script>