@worksafevictoria/wcl7.5 1.8.0-beta.14 → 1.8.0-beta.16

package/lib/utility.js

@@ -35,8 +35,6 @@ function isGovSite(url) {
 }
 
 function navigateToPath(path, newTab, nuxtRouter) {
-  debugger
-
   const url = String(path).startsWith('www.') ? `http://${path}` : path
   const isAbsolute = isAbsoluteUrl(url)
   const router = nuxtRouter ? nuxtRouter : this.$router

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worksafevictoria/wcl7.5",
-  "version": "1.8.0-beta.14",
+  "version": "1.8.0-beta.16",
   "main": "src/index.js",
   "license": "MIT",
   "repository": {

package/src/components/Common/CardGrid/index.vue

@@ -227,7 +227,6 @@ export default {
   },
   methods: {
     cardTitleSelected(selectedCard, ev) {
-      debugger;
       this.clearCards();
       selectedCard.selected = !!!selectedCard.selected;
       const selectedCardModelIndex = this.getChildIndex(selectedCard);
@@ -239,8 +238,6 @@ export default {
       });
     },
     cardSelected(selectedCard, ev) {
-      debugger;
-      console.log("cardSelected selectedCard :- ", selectedCard);
       this.clearCards();
       selectedCard.selected = !!!selectedCard.selected;
       const selectedCardModelIndex = this.getChildIndex(selectedCard);

package/src/components/Common/CardGridItem/index.vue

@@ -401,8 +401,6 @@ export default {
   },
   methods: {
     cardClicked(ev) {
-      debugger;
-
       if (this.isSelectable) {
         this.parentGrid.cardSelected(this, ev);
       }
@@ -412,7 +410,6 @@ export default {
       }
     },
     cardTitleClicked(ev) {
-      debugger;
       if (this.isCardTitleSelectable) {
         this.parentGrid.cardTitleSelected(this, ev);
       }

package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.stories.js

@@ -3,7 +3,7 @@ import arRecord from './index.vue'
 const arData = 
     {
         title: 'Ventia Utility Services Pty Limited',
-        fullAddress: 'Ventia - Cardinia Building, 25 Lucknow Street MITCHAM VIC 3132',
+        fullAddress: 'MITCHAM VIC 3132',
         workPhone: '0438531164',
         mobilePhone: '0438531164',
         email: 'daniel.dehaan@ventia.com',

package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.vue

@@ -9,7 +9,7 @@
           </a>
         </column>
         <column md="2" sm="12" class="address" >
-          <div class="label">Office address</div>
+          <div class="label">Location</div>
           <a v-if="item.fullAddress" target="_blank" :href="gMapLink"><span class="sr-only visually-hidden">Address</span>
             {{ item.fullAddress }}
           </a>

package/src/components/Paragraphs/Directory/Asbestos/Records/index.vue

@@ -13,7 +13,7 @@
         <label class="visually-hidden" for="search-directory">
           Search by suburb (typed suburb automatically filters below results)
         </label>
-        <input type="text" v-model="searchSub" placeholder="Address" class="search">
+        <input type="text" v-model="searchSub" placeholder="Location" class="search">
       </column>
       <!-- Other Filters -->
       <column xxl="2" xl="3" md="4" sm="6">
@@ -136,7 +136,7 @@ export default {
         flatRecords.push({
           type: 'ar',
           title: record.ResourceName,
-          fullAddress: record.CompanyAddress + ' ' + record.AddressLine2,
+          fullAddress: record.AddressLine2,
           workPhone: record.Phone,
           mobilePhone: record.CompanyMobile,
           email: record.CompanyEmailDisp,
@@ -172,11 +172,14 @@ export default {
 
     formatWebsite(url) {
       let startUrl = url.slice(0, 3)
+      let returnUrl = url
       if (startUrl.toLowerCase() === 'www') {
-        return 'https://' + url
-      } else {
-        return url
-      }
+        returnUrl = 'https://' + url
+      } 
+      if (startUrl.toLowerCase() !== 'htt' && startUrl.toLowerCase() !== 'www' && url !== '') {
+        returnUrl = 'https://www.' + url
+      } 
+      return returnUrl  
     },
 
     returnContact(firstN, lastN) {

package/src/components/Paragraphs/Directory/HSCP/Records/index.vue

@@ -213,11 +213,14 @@ export default {
 
     formatWebsite(url) {
       let startUrl = url.slice(0, 3)
+      let returnUrl = url
       if (startUrl.toLowerCase() === 'www') {
-        return 'https://' + url
-      } else {
-        return url
-      }
+        returnUrl = 'https://' + url
+      } 
+      if (startUrl.toLowerCase() !== 'htt' && startUrl.toLowerCase() !== 'www' && url !== '') {
+        returnUrl = 'https://www.' + url
+      } 
+      return returnUrl
     },
 
     chunkify(arr, n) {

package/src/components/SubComponents/Search/SearchListing/index.vue

@@ -151,8 +151,6 @@ export default {
       return value;
     },
     handleSelect(card) {
-      debugger;
-
       const isSolar = this.googleSearchFlag === "solar";
       const link = card?.selectedCard?.link;
       const openInNewTab = card?.ev?.ctrlKey || card?.ev?.metaKey;

package/src/components/SubComponents/Search/index.vue

@@ -274,8 +274,6 @@ export default {
       }
     },
     onChange(e) {
-      //debugger
-
       if (this.searchQuery && this.searchQuery.length > 2) {
         this.onSearch(e);
       }

package/src/mock/asbestos-removalists.js

@@ -6,7 +6,7 @@ export const arData = [
         Phone: '0404073745',
         CompanyMobile: '0404 073 745',
         CompanyEmailDisp: 'ads.asbestos@gmail.com',
-        CompanyWebURLDisp: 'www.adsasbestosremoval.com.au',
+        CompanyWebURLDisp: 'adsasbestosremoval.com.au',
         ContactFirstName: 'Ivan',
         ContactLastName: 'Silva',
         ContactPhoneDisp: '0404073745',

package/src/mock/course-provider.js

@@ -7,7 +7,7 @@ export const hscpData = [
         Work_phone: '03 9555 9333',
         Toll_free_phone: '1800 555 333',
         Email1: 'ohs@test.com.au',
-        Website: 'https://www.anmfvic.asn.au/education-and-training/hsr-training/events',
+        Website: 'anmfvic.asn.au/education-and-training/hsr-training/events',
         Contact_1: 'Christina Groebl',
         Contact_1_Phone: '03 9555 0222',
         Contact_1_Email: 'cgroebl@test.com.au',
@@ -26,7 +26,7 @@ export const hscpData = [
         Work_phone: '03 5990 7117',
         Toll_free_phone: '1300 244 746',
         Email1: 'csadmin@chisholm.edu.au',
-        Website: 'https://www.chisholm.edu.au/career-fields/workplace-safety',
+        Website: 'http://www.chisholm.edu.au/career-fields/workplace-safety',
         Contact_1: 'Francesca Laforgia',
         Contact_1_Email: 'csadmin@chisholm.edu.au',
         Contact_1_Phone: '03 5990 7117',