@worksafevictoria/wcl7.5 1.8.0-beta.1 → 1.8.0-beta.2

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 (5) hide show
  1. package/package.json +1 -1
  2. package/src/components/Paragraphs/Directory/HSCP/Records/SingleRecord/index.vue +1 -0
  3. package/src/components/Paragraphs/Directory/HSCP/Records/index.vue +41 -23
  4. package/src/components/Paragraphs/Directory/Records/PRS/index.stories.js +2 -2
  5. package/src/mock/course-provider.js +33 -19
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@worksafevictoria/wcl7.5",
3
- "version": "1.8.0-beta.1",
3
+ "version": "1.8.0-beta.2",
4
4
  "main": "src/index.js",
5
5
  "license": "MIT",
6
6
  "repository": {
package/src/components/Paragraphs/Directory/HSCP/Records/SingleRecord/index.vue CHANGED
@@ -9,6 +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
13
  <a v-if="item.fullAddress" target="_blank" :href="gMapLink"><span class="sr-only visually-hidden">Address</span>
13
14
  {{ item.fullAddress }}
14
15
  </a>
package/src/components/Paragraphs/Directory/HSCP/Records/index.vue CHANGED
@@ -101,23 +101,20 @@ export default {
101
101
  computed: {
102
102
 
103
103
  themeOptions() {
104
- // Requirement to remove certain values from original courses
105
- let allThemes = this.flatRecords.map(a => a.courses)
104
+ // Concatenate all themes, remove duplicates, sort and use for a drop-down list
105
+ let allThemes = this.flatRecords.map(a => a.themes)
106
106
  allThemes = allThemes.join(',')
107
- allThemes = allThemes.replace(/HSR initial/g, '')
108
- allThemes = allThemes.replace(/HSR Initial/g, '')
109
- allThemes = allThemes.replace(/HSR refresher - /g, '')
110
- allThemes = allThemes.replace(/HSR Refresher - /g, '')
111
- allThemes = allThemes.replace(/HSR refresher/g, '')
112
- allThemes = allThemes.replace(/HSR Refresher/g, '')
113
107
  allThemes = allThemes.trim()
114
108
  allThemes = allThemes.split(',')
109
+ // Change all themes to title case
110
+ for (var i = 0; i < allThemes.length; i++) {
111
+ let newVal = this.toTitleCase(allThemes[i])
112
+ allThemes[i] = newVal
113
+ }
115
114
  // Remove duplicates
116
115
  let s = new Set(allThemes)
117
116
  allThemes = [...s]
118
- // Remove blank values - not completely successful
119
- allThemes = allThemes.filter(n => n)
120
-
117
+
121
118
  // Sort the themes
122
119
  let sortedThemes = allThemes.sort((a, b) => {
123
120
  if (a.trim() < b.trim()) {
@@ -128,10 +125,8 @@ export default {
128
125
  }
129
126
  return 0;
130
127
  })
131
- if (sortedThemes[0].type === undefined) {
132
- sortedThemes.splice(0, 1)
133
- }
134
128
  allThemes = sortedThemes
129
+
135
130
  return allThemes
136
131
  },
137
132
 
@@ -152,7 +147,7 @@ export default {
152
147
  }
153
148
  if (this.searchThemes.length) {
154
149
  this.hideReset = false
155
- results = results.filter(item => item.courses.toLowerCase().includes(this.searchThemes.toLowerCase()))
150
+ results = results.filter(item => item.themes.toLowerCase().includes(this.searchThemes.toLowerCase()))
156
151
  }
157
152
  this.filteredItems = results
158
153
 
@@ -191,6 +186,7 @@ export default {
191
186
  email2: record.Contact_2_Email,
192
187
  phone2: record.Contact_2_Phone,
193
188
  courses: record.Training_courses.replace(/,$/, ''),
189
+ themes: record.Themes.replace(/,$/, ''),
194
190
  trainingVenues: record.Training_venues
195
191
  })
196
192
  })
@@ -240,6 +236,7 @@ export default {
240
236
  },
241
237
 
242
238
  reset() {
239
+ this.collapseOrgs('')
243
240
  this.hideReset = true
244
241
  this.searchOrg = ''
245
242
  this.searchCourse = ''
@@ -249,7 +246,17 @@ export default {
249
246
 
250
247
  pageChanged(ev) {
251
248
  this.page = ev - 1
252
-
249
+
250
+ if (this.searchOrg.length || this.searchSub.length || this.searchCourse.length || this.searchThemes.length) {
251
+ // don't set focus
252
+ this.collapseOrgs('')
253
+ } else {
254
+ // set focus to top element - used instead of scrollTo
255
+ this.collapseOrgs('Yes')
256
+ }
257
+ },
258
+
259
+ collapseOrgs(focusLink) {
253
260
  const aLinks = document.getElementsByName('titleLink')
254
261
  // Convert nodelist to array
255
262
  let linksArr = Array.from(aLinks)
@@ -258,14 +265,24 @@ export default {
258
265
  .filter((link) => link.getAttribute('aria-expanded') === 'true')
259
266
  .forEach((link) => link.click())
260
267
 
261
- if (this.searchOrg.length || this.searchSub.length || this.searchCourse.length || this.searchThemes.length) {
262
- // don't set focus
263
- } else {
264
- // set focus to top element - used instead of scrollTo
265
- console.log('setting focus.')
266
- linksArr[0].focus()
267
- }
268
+ if (focusLink === 'Yes') {
269
+ linksArr[0].focus()
270
+ }
268
271
  }
272
+
273
+ },
274
+
275
+ toTitleCase(strVal) {
276
+
277
+ let retVal = strVal.trim()
278
+
279
+ const firstChar = retVal.charAt(0)
280
+ const firstCharU = firstChar.toUpperCase()
281
+ const remChar = retVal.slice(1)
282
+
283
+ retVal = firstCharU + remChar
284
+
285
+ return retVal
269
286
  },
270
287
  }
271
288
  }
@@ -300,6 +317,7 @@ export default {
300
317
  margin-bottom: 16px;
301
318
  margin-right: 16px;
302
319
  transition: none;
320
+ width: 200px;
303
321
  }
304
322
 
305
323
  .grid-column {
package/src/components/Paragraphs/Directory/Records/PRS/index.stories.js CHANGED
@@ -27,8 +27,8 @@ export default {
27
27
  tags: ['autodocs']
28
28
  };
29
29
 
30
- export const CourseProvider = {};
30
+ export const PRS = {};
31
31
 
32
- CourseProvider.args = {
32
+ PRS.args = {
33
33
  item: cpData,
34
34
  };
package/src/mock/course-provider.js CHANGED
@@ -14,9 +14,9 @@ export const hscpData = [
14
14
  Contact_2_Name: 'Joey Bradford',
15
15
  Contact_2_Phone: '03 9555 0666',
16
16
  Contact_2_Email: 'jbradford@test.com.au',
17
- Training_courses: 'HSR initial, HSR refresher',
17
+ Training_courses: 'HSR initial, HSR refresher - Hazardous Manual Handling Occupational Violence and Aggression Consultation',
18
18
  Training_venues: 'Melbourne CBD, All Regional Victoria - HQ in Melbourne',
19
- id: '1'
19
+ Themes: 'General, Hazardous Manual Handling Occupational Violence and Aggression Consultation',
20
20
  },
21
21
  {
22
22
  type: 'hscp',
@@ -33,8 +33,9 @@ export const hscpData = [
33
33
  Contact_2_Name: '',
34
34
  Contact_2_Email: '',
35
35
  Contact_2_Phone: '',
36
- Training_courses: 'HSR initial, HSR refresher - Plant, HSR refresher - Work-related stress',
37
- Training_venues: 'Cranbourne, Berwick, Mornington Peninsula'
36
+ Training_courses: 'HSR initial, HSR refresher - Plant, HSR refresher - Work-related stress, HSR Refresher - Work related violence health sector, HSR refresher - Work-related violence',
37
+ Training_venues: 'Cranbourne, Berwick, Mornington Peninsula',
38
+ Themes: 'General, Work related violence health sector, Plant, Work-related stress, Work-related violence',
38
39
  },
39
40
  {
40
41
  type: 'hscp',
@@ -51,8 +52,9 @@ export const hscpData = [
51
52
  Contact_2_Name: '',
52
53
  Contact_2_Email: '',
53
54
  Contact_2_Phone: '',
54
- Training_courses: 'HSR initial, HSR refresher - Plant, HSR refresher - Work-related stress',
55
- Training_venues: 'Melbourne CBD'
55
+ Training_courses: 'HSR initial, HSR refresher - Plant, HSR refresher - Work-related violence',
56
+ Training_venues: 'Melbourne CBD',
57
+ Themes: 'General, Plant, Work-related violence',
56
58
  },
57
59
  {
58
60
  type: 'hscp',
@@ -69,8 +71,9 @@ export const hscpData = [
69
71
  Contact_2_Name: 'Leeanne Lyme',
70
72
  Contact_2_Email: 'leeanne.lyme@aigroup.com.au',
71
73
  Contact_2_Phone: '02 4925 8310',
72
- Training_courses: 'HSR refresher, HSR refresher - Work-related violence, HSR refresher - Plant, HSR refresher - Work-related stress,Onsite only',
73
- Training_venues: 'Melbourne'
74
+ Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR refresher - Plant, HSR refresher - Work-related stress',
75
+ Training_venues: 'Melbourne',
76
+ Themes: 'General, Work-related violence, Plant, Work-related stress',
74
77
  },
75
78
  {
76
79
  type: 'hscp',
@@ -87,8 +90,9 @@ export const hscpData = [
87
90
  Contact_2_Name: '',
88
91
  Contact_2_Email: '',
89
92
  Contact_2_Phone: '',
90
- Training_courses: 'HSR initial, HSR refresher',
93
+ Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
91
94
  Training_venues: '',
95
+ Themes: 'General, Work-related violence, Plant, Work-related stress',
92
96
  },
93
97
  {
94
98
  type: 'hscp',
@@ -105,8 +109,9 @@ export const hscpData = [
105
109
  Contact_2_Name: '',
106
110
  Contact_2_Email: '',
107
111
  Contact_2_Phone: '',
108
- Training_courses: 'HSR initial, HSR refresher',
112
+ Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
109
113
  Training_venues: '',
114
+ Themes: 'General, Work-related violence, Plant, Work-related stress',
110
115
  },
111
116
  {
112
117
  type: 'hscp',
@@ -123,8 +128,9 @@ export const hscpData = [
123
128
  Contact_2_Name: '',
124
129
  Contact_2_Email: '',
125
130
  Contact_2_Phone: '',
126
- Training_courses: 'HSR initial, HSR refresher',
131
+ Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
127
132
  Training_venues: '',
133
+ Themes: 'General, Work-related violence, Plant, Work-related stress',
128
134
  },
129
135
  {
130
136
  type: 'hscp',
@@ -141,8 +147,9 @@ export const hscpData = [
141
147
  Contact_2_Name: '',
142
148
  Contact_2_Email: '',
143
149
  Contact_2_Phone: '',
144
- Training_courses: 'HSR initial, HSR refresher',
150
+ Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
145
151
  Training_venues: '',
152
+ Themes: 'General, Work-related violence, Plant, Work-related stress',
146
153
  },
147
154
  {
148
155
  type: 'hscp',
@@ -159,8 +166,9 @@ export const hscpData = [
159
166
  Contact_2_Name: '',
160
167
  Contact_2_Email: '',
161
168
  Contact_2_Phone: '',
162
- Training_courses: 'HSR initial, HSR refresher',
169
+ Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
163
170
  Training_venues: '',
171
+ Themes: 'General, Work-related violence, Plant, Work-related stress',
164
172
  },
165
173
  {
166
174
  type: 'hscp',
@@ -177,8 +185,9 @@ export const hscpData = [
177
185
  Contact_2_Name: '',
178
186
  Contact_2_Email: '',
179
187
  Contact_2_Phone: '',
180
- Training_courses: 'HSR initial, HSR refresher',
188
+ Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
181
189
  Training_venues: '',
190
+ Themes: 'General, Work-related violence, Plant, Work-related stress',
182
191
  },
183
192
  {
184
193
  type: 'hscp',
@@ -195,8 +204,9 @@ export const hscpData = [
195
204
  Contact_2_Name: '',
196
205
  Contact_2_Email: '',
197
206
  Contact_2_Phone: '',
198
- Training_courses: 'HSR initial, HSR refresher',
207
+ Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
199
208
  Training_venues: '',
209
+ Themes: 'General, Work-related violence, Plant, Work-related stress',
200
210
  },
201
211
  {
202
212
  type: 'hscp',
@@ -213,8 +223,9 @@ export const hscpData = [
213
223
  Contact_2_Name: '',
214
224
  Contact_2_Email: '',
215
225
  Contact_2_Phone: '',
216
- Training_courses: 'HSR initial, HSR refresher',
226
+ Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
217
227
  Training_venues: '',
228
+ Themes: 'General, Work-related violence, Plant, Work-related stress',
218
229
  },
219
230
  {
220
231
  type: 'hscp',
@@ -231,8 +242,9 @@ export const hscpData = [
231
242
  Contact_2_Name: '',
232
243
  Contact_2_Email: '',
233
244
  Contact_2_Phone: '',
234
- Training_courses: 'HSR initial, HSR refresher',
245
+ Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
235
246
  Training_venues: '',
247
+ Themes: 'General, Work-related violence, Plant, Work-related stress',
236
248
  },
237
249
  {
238
250
  type: 'hscp',
@@ -249,8 +261,9 @@ export const hscpData = [
249
261
  Contact_2_Name: '',
250
262
  Contact_2_Email: '',
251
263
  Contact_2_Phone: '',
252
- Training_courses: 'HSR initial, HSR refresher',
264
+ Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
253
265
  Training_venues: '',
266
+ Themes: 'General, Work-related violence, Plant, Work-related stress',
254
267
  },
255
268
  {
256
269
  type: 'hscp',
@@ -267,7 +280,8 @@ export const hscpData = [
267
280
  Contact_2_Name: '',
268
281
  Contact_2_Email: '',
269
282
  Contact_2_Phone: '',
270
- Training_courses: 'HSR initial, HSR refresher',
283
+ Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
271
284
  Training_venues: '',
285
+ Themes: 'General, Work-related violence, Plant, Work-related stress',
272
286
  }
273
287
  ]