@worksafevictoria/wcl7.5 1.8.0-beta.10 → 1.8.0-beta.11

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 (6) hide show
  1. package/package.json +1 -1
  2. package/src/components/Common/CardGridItem/index.vue +1 -3
  3. package/src/components/Containers/Subheader/index.vue +1 -0
  4. package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.vue +8 -8
  5. package/src/components/Paragraphs/Directory/Asbestos/Records/index.vue +6 -1
  6. package/src/mock/asbestos-removalists.js +10 -10
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@worksafevictoria/wcl7.5",
3
- "version": "1.8.0-beta.10",
3
+ "version": "1.8.0-beta.11",
4
4
  "main": "src/index.js",
5
5
  "license": "MIT",
6
6
  "repository": {
package/src/components/Common/CardGridItem/index.vue CHANGED
@@ -117,10 +117,8 @@
117
117
  </card-grid-item-icon>
118
118
  <span v-if="pillText" class="visually-hidden">{{ pillText }}</span>
119
119
  </div>
120
- <span class="d-none">Description :- {{ description }}</span>
121
- <span class="d-none">stripDescriptionHtml :- {{ stripDescriptionHtml }}</span>
122
120
  <b-card-text
123
- v-if="$slots.cardDescription || description || stripDescriptionHtml"
121
+ v-if="$slots.cardDescription || description"
124
122
  tag="div"
125
123
  class="card-grid-item__body"
126
124
  :class="{
package/src/components/Containers/Subheader/index.vue CHANGED
@@ -17,6 +17,7 @@
17
17
  >
18
18
  <template v-slot:cardItem="{ card }">
19
19
  <card-grid-item
20
+ v-if="card.description"
20
21
  :show-divider="!singleLineCards"
21
22
  :card-header-title="singleLineCards ? null : card.title"
22
23
  :header-size="card.titleSize"
package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.vue CHANGED
@@ -65,34 +65,34 @@
65
65
  </column>
66
66
  </row>
67
67
  <row v-if="item.contact1 !== ''">
68
- <column sm="2" class="label" v-if="item.contact1 !== ''">
68
+ <column sm="2" class="label" >
69
69
  Contact
70
70
  </column>
71
- <column sm="4" class="dir-additional-records" v-if="item.contact1 !== ''">
71
+ <column sm="4" class="dir-additional-records">
72
72
  {{item.contact1}}
73
73
  </column>
74
74
  </row>
75
75
  <row v-if="item.phone1 !== ''">
76
- <column sm="2" class="label" v-if="item.phone1 !== ''">
76
+ <column sm="2" class="label" >
77
77
  Phone
78
78
  </column>
79
- <column sm="4" class="dir-additional-records" v-if="item.phone1 !== ''">
79
+ <column sm="4" class="dir-additional-records" >
80
80
  {{item.phone1}}
81
81
  </column>
82
82
  </row>
83
83
  <row v-if="item.mobile1 !== ''">
84
- <column sm="2" class="label" v-if="item.mobile1 !== ''">
84
+ <column sm="2" class="label" >
85
85
  Mobile
86
86
  </column>
87
- <column sm="4" class="dir-additional-records" v-if="item.mobile1 !== ''">
87
+ <column sm="4" class="dir-additional-records" >
88
88
  {{item.mobile1}}
89
89
  </column>
90
90
  </row>
91
91
  <row v-if="item.email1 !== ''">
92
- <column sm="2" class="label" v-if="item.email1 !== ''">
92
+ <column sm="2" class="label" >
93
93
  Email
94
94
  </column>
95
- <column sm="4" class="dir-additional-records" v-if="item.email1 !== ''">
95
+ <column sm="4" class="dir-additional-records">
96
96
  {{item.email1}}
97
97
  </column>
98
98
  </row>
package/src/components/Paragraphs/Directory/Asbestos/Records/index.vue CHANGED
@@ -141,7 +141,7 @@ export default {
141
141
  mobilePhone: record.CompanyMobile,
142
142
  email: record.CompanyEmailDisp,
143
143
  website: this.formatWebsite(record.CompanyWebURLDisp),
144
- contact1: record.ContactFirstName + ' ' + record.ContactLastName,
144
+ contact1: this.returnContact(record.ContactFirstName, record.ContactLastName),
145
145
  email1: record.ContactEmail,
146
146
  phone1: record.ContactPhoneDisp,
147
147
  mobile1: record.ContactMobileDisp,
@@ -179,6 +179,11 @@ export default {
179
179
  }
180
180
  },
181
181
 
182
+ returnContact(firstN, lastN) {
183
+ let retContact = [firstN, lastN].filter(Boolean).join(' ')
184
+ return retContact
185
+ },
186
+
182
187
  chunkify(arr, n) {
183
188
  if (arr) {
184
189
  const chunked = arr.reduce(
package/src/mock/asbestos-removalists.js CHANGED
@@ -103,8 +103,8 @@ export const arData = [
103
103
  CompanyMobile: '0404 073 745',
104
104
  CompanyEmailDisp: 'ads.asbestos@gmail.com',
105
105
  CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
106
- ContactFirstName: 'Ivan',
107
- ContactLastName: 'Silva',
106
+ ContactFirstName: '',
107
+ ContactLastName: '',
108
108
  ContactPhoneDisp: '0404073745',
109
109
  ContactEmail: 'ads.asbestos@gmail.com',
110
110
  ContactMobileDisp: '1300 064 277',
@@ -121,7 +121,7 @@ export const arData = [
121
121
  CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
122
122
  ContactFirstName: 'Ivan',
123
123
  ContactLastName: 'Silva',
124
- ContactPhoneDisp: '0404073745',
124
+ ContactPhoneDisp: '',
125
125
  ContactEmail: 'ads.asbestos@gmail.com',
126
126
  ContactMobileDisp: '1300 064 277',
127
127
  ServiceAll: 'Class A - Restricted - Asbestos Removalists',
@@ -138,7 +138,7 @@ export const arData = [
138
138
  ContactFirstName: 'Ivan',
139
139
  ContactLastName: 'Silva',
140
140
  ContactPhoneDisp: '0404073745',
141
- ContactEmail: 'ads.asbestos@gmail.com',
141
+ ContactEmail: '',
142
142
  ContactMobileDisp: '1300 064 277',
143
143
  ServiceAll: 'Class A - Restricted - Asbestos Removalists',
144
144
  ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
@@ -155,7 +155,7 @@ export const arData = [
155
155
  ContactLastName: 'Silva',
156
156
  ContactPhoneDisp: '0404073745',
157
157
  ContactEmail: 'ads.asbestos@gmail.com',
158
- ContactMobileDisp: '1300 064 277',
158
+ ContactMobileDisp: '',
159
159
  ServiceAll: 'Class A - Restricted - Asbestos Removalists',
160
160
  ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
161
161
  },
@@ -167,11 +167,11 @@ export const arData = [
167
167
  CompanyMobile: '0404 073 745',
168
168
  CompanyEmailDisp: 'ads.asbestos@gmail.com',
169
169
  CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
170
- ContactFirstName: 'Ivan',
171
- ContactLastName: 'Silva',
172
- ContactPhoneDisp: '0404073745',
173
- ContactEmail: 'ads.asbestos@gmail.com',
174
- ContactMobileDisp: '1300 064 277',
170
+ ContactFirstName: '',
171
+ ContactLastName: '',
172
+ ContactPhoneDisp: '',
173
+ ContactEmail: '',
174
+ ContactMobileDisp: '',
175
175
  ServiceAll: 'Class A - Restricted - Asbestos Removalists',
176
176
  ServicesAll: 'removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire and does not require an enclosure with a negative air unit(s) to perform the work.',
177
177
  },