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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/package.json +1 -1
  2. package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.stories.js +1 -1
  3. package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.vue +1 -1
  4. package/src/components/Paragraphs/Directory/Asbestos/Records/index.vue +9 -6
  5. package/src/components/Paragraphs/Directory/HSCP/Records/index.vue +7 -4
  6. package/src/mock/asbestos-removalists.js +1 -1
  7. package/src/mock/course-provider.js +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@worksafevictoria/wcl7.5",
3
- "version": "1.8.0-beta.15",
3
+ "version": "1.8.0-beta.16",
4
4
  "main": "src/index.js",
5
5
  "license": "MIT",
6
6
  "repository": {
package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.stories.js CHANGED
@@ -3,7 +3,7 @@ import arRecord from './index.vue'
3
3
  const arData =
4
4
  {
5
5
  title: 'Ventia Utility Services Pty Limited',
6
- fullAddress: 'Ventia - Cardinia Building, 25 Lucknow Street MITCHAM VIC 3132',
6
+ fullAddress: 'MITCHAM VIC 3132',
7
7
  workPhone: '0438531164',
8
8
  mobilePhone: '0438531164',
9
9
  email: 'daniel.dehaan@ventia.com',
package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.vue CHANGED
@@ -9,7 +9,7 @@
9
9
  </a>
10
10
  </column>
11
11
  <column md="2" sm="12" class="address" >
12
- <div class="label">Office address</div>
12
+ <div class="label">Location</div>
13
13
  <a v-if="item.fullAddress" target="_blank" :href="gMapLink"><span class="sr-only visually-hidden">Address</span>
14
14
  {{ item.fullAddress }}
15
15
  </a>
package/src/components/Paragraphs/Directory/Asbestos/Records/index.vue CHANGED
@@ -13,7 +13,7 @@
13
13
  <label class="visually-hidden" for="search-directory">
14
14
  Search by suburb (typed suburb automatically filters below results)
15
15
  </label>
16
- <input type="text" v-model="searchSub" placeholder="Address" class="search">
16
+ <input type="text" v-model="searchSub" placeholder="Location" class="search">
17
17
  </column>
18
18
  <!-- Other Filters -->
19
19
  <column xxl="2" xl="3" md="4" sm="6">
@@ -136,7 +136,7 @@ export default {
136
136
  flatRecords.push({
137
137
  type: 'ar',
138
138
  title: record.ResourceName,
139
- fullAddress: record.CompanyAddress + ' ' + record.AddressLine2,
139
+ fullAddress: record.AddressLine2,
140
140
  workPhone: record.Phone,
141
141
  mobilePhone: record.CompanyMobile,
142
142
  email: record.CompanyEmailDisp,
@@ -172,11 +172,14 @@ export default {
172
172
 
173
173
  formatWebsite(url) {
174
174
  let startUrl = url.slice(0, 3)
175
+ let returnUrl = url
175
176
  if (startUrl.toLowerCase() === 'www') {
176
- return 'https://' + url
177
- } else {
178
- return url
179
- }
177
+ returnUrl = 'https://' + url
178
+ }
179
+ if (startUrl.toLowerCase() !== 'htt' && startUrl.toLowerCase() !== 'www' && url !== '') {
180
+ returnUrl = 'https://www.' + url
181
+ }
182
+ return returnUrl
180
183
  },
181
184
 
182
185
  returnContact(firstN, lastN) {
package/src/components/Paragraphs/Directory/HSCP/Records/index.vue CHANGED
@@ -213,11 +213,14 @@ export default {
213
213
 
214
214
  formatWebsite(url) {
215
215
  let startUrl = url.slice(0, 3)
216
+ let returnUrl = url
216
217
  if (startUrl.toLowerCase() === 'www') {
217
- return 'https://' + url
218
- } else {
219
- return url
220
- }
218
+ returnUrl = 'https://' + url
219
+ }
220
+ if (startUrl.toLowerCase() !== 'htt' && startUrl.toLowerCase() !== 'www' && url !== '') {
221
+ returnUrl = 'https://www.' + url
222
+ }
223
+ return returnUrl
221
224
  },
222
225
 
223
226
  chunkify(arr, n) {
package/src/mock/asbestos-removalists.js CHANGED
@@ -6,7 +6,7 @@ export const arData = [
6
6
  Phone: '0404073745',
7
7
  CompanyMobile: '0404 073 745',
8
8
  CompanyEmailDisp: 'ads.asbestos@gmail.com',
9
- CompanyWebURLDisp: 'www.adsasbestosremoval.com.au',
9
+ CompanyWebURLDisp: 'adsasbestosremoval.com.au',
10
10
  ContactFirstName: 'Ivan',
11
11
  ContactLastName: 'Silva',
12
12
  ContactPhoneDisp: '0404073745',
package/src/mock/course-provider.js CHANGED
@@ -7,7 +7,7 @@ export const hscpData = [
7
7
  Work_phone: '03 9555 9333',
8
8
  Toll_free_phone: '1800 555 333',
9
9
  Email1: 'ohs@test.com.au',
10
- Website: 'https://www.anmfvic.asn.au/education-and-training/hsr-training/events',
10
+ Website: 'anmfvic.asn.au/education-and-training/hsr-training/events',
11
11
  Contact_1: 'Christina Groebl',
12
12
  Contact_1_Phone: '03 9555 0222',
13
13
  Contact_1_Email: 'cgroebl@test.com.au',
@@ -26,7 +26,7 @@ export const hscpData = [
26
26
  Work_phone: '03 5990 7117',
27
27
  Toll_free_phone: '1300 244 746',
28
28
  Email1: 'csadmin@chisholm.edu.au',
29
- Website: 'https://www.chisholm.edu.au/career-fields/workplace-safety',
29
+ Website: 'http://www.chisholm.edu.au/career-fields/workplace-safety',
30
30
  Contact_1: 'Francesca Laforgia',
31
31
  Contact_1_Email: 'csadmin@chisholm.edu.au',
32
32
  Contact_1_Phone: '03 5990 7117',