Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivateProperties

src/components/timeshare/buy/weekListComponent.vue

     </div>
     <div v-else>
       <div class="row">
-        <div class="col-md-12">
-          <hr />No Results Found
-          <hr />
+        <hr />
+        <div class="col-md-12" v-if="status !== '' && status !== undefined">
+          <b>{{status}}</b>
         </div>
+        <div class="col-md-12" v-if="status !== '' && status !== undefined">
+          <img
+            class="img-fluid"
+            src="/img/kloader.gif"
+            alt="UVProp logo"
+            style="width:400px;height:364px;"
+          />
+        </div>
+        <div v-else>No Results Found</div>
+        <hr />
       </div>
     </div>
   </div>
   },
   components: {},
   computed: {
-    ...mapState('weekList', ['weeks']),
+    ...mapState('weekList', ['weeks', 'status']),
     ...mapGetters({
       filteredWeeks: 'weekList/filteredWeeks',
+      getRegions: 'weekList/getRegions',
     }),
   },
   mounted() {
   },
   methods: {
     View(item) {
-      console.log(item);
       this.$router.push(`/resort/${item.resort.resortCode}/${item.id}`);
     },
     ...mapActions('weekList', ['getWeeks', 'applyResortFilter']),

src/store/modules/timeshare/timeshare.js

     },
   },
   getters: {
-
+    getRegionCode(state) {
+      return (value) => {
+        const reg = state.detailedRegion.find(region => region.children.some(resort => resort
+          .resortCode === value));
+        if (reg && reg.region) {
+          return reg.region.regionCode;
+        }
+        return '';
+      };
+    },
+    getResortName(state) {
+      return (value) => {
+        const res = state.resorts.find(resort => resort.resortCode === value);
+        if (res) {
+          return res.resortName;
+        }
+      };
+    },
   },
   actions: {
     initTimeshare({

src/store/modules/timeshare/weekList.js

+/* eslint-disable no-unused-expressions */
 /* eslint-disable eqeqeq */
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable guard-for-in */
   namespaced: true,
   state: {
     weeks: [],
+    status: undefined,
     filter: {
+      status: undefined,
       region: undefined,
       resort: undefined,
       bedrooms: undefined,
     difFilter: undefined,
   },
   mutations: {
+    onLoading(state) {
+      state.status = 'Loading...';
+    },
+    onError(state) {
+      state.status = 'Error occurred getting data.';
+    },
     onClearFilter(state, filter) {
       state.filter[filter] = undefined;
     },
     setWeeks(state, weeks) {
       state.weeks = weeks;
+      state.status = '';
     },
     addWeek(state, week) {
       state.weeks.push(week);
       const {
         filter,
       } = state;
-      // console.log(JSON.stringify(weekList));
       if (filter) {
         if (filter.keyword) {
           const list = [];
             const item = weekList[i];
             for (const r in item) {
               const innerItem = item[r];
-              if (innerItem && JSON.stringify(innerItem).toLowerCase().includes(filter.keyword
-                .toLowerCase())) {
+              if (
+                innerItem
+                && JSON.stringify(innerItem)
+                  .toLowerCase()
+                  .includes(filter.keyword.toLowerCase())
+              ) {
                 list.push(item);
                 break;
               }
           weekList = list;
         }
         if (filter.region) {
-          weekList = _.filter(weekList, x => x.region && x.region.regionCode === filter.region
-            .regionCode);
+          weekList = _.filter(
+            weekList,
+            x => x.region && x.region.regionCode === filter.region.regionCode,
+          );
         }
         if (filter.resort) {
-          weekList = _.filter(weekList, x => x.resort.resortCode
-            && x.resort.resortCode === filter.resort.resortCode);
+          weekList = _.filter(
+            weekList,
+            x => x.resort.resortCode && x.resort.resortCode === filter.resort.resortCode,
+          );
         }
         if (filter.bedrooms) {
           weekList = _.filter(weekList, x => x.bedrooms && x.bedrooms == filter.bedrooms);
           minDate.setDate(minDate.getDate() - 7);
           const maxDate = new Date(filter.date);
           maxDate.setDate(maxDate.getDate() + 7);
-          weekList = _.filter(weekList, x => new Date(x.arrivalDate)
+          weekList = _.filter(
+            weekList,
+            x => new Date(x.arrivalDate)
             && new Date(x.departureDate)
             && new Date(x.arrivalDate) >= minDate
-            && new Date(x.arrivalDate) <= maxDate);
+            && new Date(x.arrivalDate) <= maxDate,
+          );
         }
         if (filter.minPrice && filter.minPrice !== 0) {
-          weekList = _.filter(weekList, x => x.sellPrice
-            && x.sellPrice >= filter.minPrice);
+          weekList = _.filter(weekList, x => x.sellPrice && x.sellPrice >= filter.minPrice);
         }
         if (filter.maxPrice && filter.maxPrice !== 0) {
-          weekList = _.filter(weekList, x => x.sellPrice
-            && x.sellPrice <= filter.maxPrice);
+          weekList = _.filter(weekList, x => x.sellPrice && x.sellPrice <= filter.maxPrice);
         }
       }
-      return weekList;
+      return _.sortBy((_.sortBy(weekList, 'arrivalDate')), 'resort.resortName');
+    },
+    getRegions(state, getters, rootState, rootGetters) {
+      return rootGetters['timeshare/getRegionCode']('KK');
     },
   },
   actions: {
     },
     getWeeks({
       commit,
+      rootGetters,
     }) {
+      commit('onLoading');
       axios
         .get('/api/timeshareweek')
-        .then(result => commit('setWeeks', result.data))
+        .then((result) => {
+          const arr2 = result.data.filter(x => x.region !== null);
+          const arr3 = result.data.filter(x => x.region === null);
+          for (const item in arr3) {
+            const myItem = arr3[item];
+            if (myItem !== undefined) {
+              const code = myItem.resort.resortCode;
+              myItem.region = {
+                regionName: rootGetters['timeshare/getRegionCode'](code),
+              };
+              myItem.resort = {
+                resortName: rootGetters['timeshare/getResortName'](code),
+                resortCode: code,
+              };
+              arr2.push(myItem);
+            }
+          }
+          commit('setWeeks', arr2);
+        })
         .catch(console.error);
     },
     clearFilter({

vue.config.js

         target: 'http://192.168.6.188:5000',
         changeOrigin: true,
       },
+      '/nph-srep': {
+        target: 'http://www.unipoint-consoft.co.za',
+        changeOrigin: true,
+      },
     },
   },
 };