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

package/package.json

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

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

@@ -9,6 +9,7 @@
           </a>
         </column>
         <column md="2" sm="12" class="address" >
+          <div class="label">Office address</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/HSCP/Records/index.vue

@@ -101,23 +101,20 @@ export default {
   computed: {
 
     themeOptions() {
-      // Requirement to remove certain values from original courses
-      let allThemes = this.flatRecords.map(a => a.courses)
+      // Concatenate all themes, remove duplicates, sort and use for a drop-down list
+      let allThemes = this.flatRecords.map(a => a.themes)
       allThemes = allThemes.join(',')
-      allThemes = allThemes.replace(/HSR initial/g, '')
-      allThemes = allThemes.replace(/HSR Initial/g, '')
-      allThemes = allThemes.replace(/HSR refresher - /g, '')
-      allThemes = allThemes.replace(/HSR Refresher - /g, '')
-      allThemes = allThemes.replace(/HSR refresher/g, '')
-      allThemes = allThemes.replace(/HSR Refresher/g, '')
       allThemes = allThemes.trim()
       allThemes = allThemes.split(',')
+      // Change all themes to title case
+      for (var i = 0; i < allThemes.length; i++) {
+        let newVal = this.toTitleCase(allThemes[i])
+        allThemes[i] = newVal
+      }
       // Remove duplicates
       let s = new Set(allThemes)
       allThemes = [...s]
-      // Remove blank values - not completely successful
-      allThemes = allThemes.filter(n => n)
-      
+
       // Sort the themes
       let sortedThemes = allThemes.sort((a, b) => {
         if (a.trim() < b.trim()) {
@@ -128,10 +125,8 @@ export default {
         }
         return 0;
       })
-      if (sortedThemes[0].type === undefined) {
-        sortedThemes.splice(0, 1)
-      }
       allThemes = sortedThemes
+
       return allThemes
     },
 
@@ -152,7 +147,7 @@ export default {
       }
       if (this.searchThemes.length) {
         this.hideReset = false
-        results = results.filter(item => item.courses.toLowerCase().includes(this.searchThemes.toLowerCase()))
+        results = results.filter(item => item.themes.toLowerCase().includes(this.searchThemes.toLowerCase()))
       }
       this.filteredItems = results
 
@@ -191,6 +186,7 @@ export default {
           email2: record.Contact_2_Email,
           phone2: record.Contact_2_Phone,
           courses: record.Training_courses.replace(/,$/, ''),
+          themes: record.Themes.replace(/,$/, ''),
           trainingVenues: record.Training_venues
         })
       })
@@ -240,6 +236,7 @@ export default {
     },
     
     reset() {
+      this.collapseOrgs('')
       this.hideReset = true
       this.searchOrg = ''
       this.searchCourse = ''
@@ -249,7 +246,17 @@ export default {
 
     pageChanged(ev) {
       this.page = ev - 1
-      
+
+      if (this.searchOrg.length || this.searchSub.length || this.searchCourse.length || this.searchThemes.length) {
+          // don't set focus
+          this.collapseOrgs('')
+        } else {
+          // set focus to top element - used instead of scrollTo
+          this.collapseOrgs('Yes')
+        } 
+    },
+
+    collapseOrgs(focusLink) {
       const aLinks = document.getElementsByName('titleLink')
       // Convert nodelist to array
       let linksArr = Array.from(aLinks)
@@ -258,14 +265,24 @@ export default {
           .filter((link) => link.getAttribute('aria-expanded') === 'true')
           .forEach((link) => link.click())
 
-        if (this.searchOrg.length || this.searchSub.length || this.searchCourse.length || this.searchThemes.length) {
-          // don't set focus
-        } else {
-          // set focus to top element - used instead of scrollTo
-          console.log('setting focus.')
-          linksArr[0].focus()
-        } 
+          if (focusLink === 'Yes') {
+            linksArr[0].focus()
+          }
       }
+
+    },
+
+    toTitleCase(strVal) {
+
+      let retVal = strVal.trim()
+
+      const firstChar = retVal.charAt(0)
+      const firstCharU = firstChar.toUpperCase()
+      const remChar = retVal.slice(1)
+
+      retVal = firstCharU + remChar
+
+      return retVal
     },
   }
 }
@@ -300,6 +317,7 @@ export default {
     margin-bottom: 16px;
     margin-right: 16px;
     transition: none;
+    width: 200px;
   }
  
   .grid-column {

package/src/components/Paragraphs/Directory/Records/PRS/index.stories.js

@@ -27,8 +27,8 @@ export default {
     tags: ['autodocs']
 };
 
-export const CourseProvider = {};
+export const PRS = {};
 
-CourseProvider.args = {
+PRS.args = {
     item: cpData,    
 };

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

@@ -6,7 +6,6 @@
       </div>
     </template>
     <template v-else>
-      ELSE :- searchType :- {{ searchType }}
       <b-input-group>
         <label class="visually-hidden" for="site-search"
           >Search by keyword (Typed keyword automatically filters below results)</label
@@ -18,8 +17,8 @@
           aria-label="searchbar"
           autocomplete="off"
           trim
-          @update="searchType !== 'googlerest' ? onChange : () => {}"
-          @keyup.enter="searchType === 'googlerest' ? onChange : () => {}"
+          @update="onChange"
+          @keyup.enter="onChange"
         ></b-form-input>
         <template #append>
           <b-button size="sm" class="search-button" @click="onSearch"
@@ -28,7 +27,6 @@
           /></b-button>
         </template>
       </b-input-group>
-      searchType:- {{ searchType }} <br />
       <search-listing
         v-if="loadSearchList && (searchResults || isLoading)"
         :class="{
@@ -44,15 +42,14 @@
         :offset="searchResults && searchResults.offset"
         :page-limit="pageLimit"
         :content-parser="contentParser"
-        :is-selectable="searchType === 'googlerest' ? false : true"
-        :is-card-title-selectable="searchType === 'googlerest' ? true : false"
+        :is-selectable="true"
+        :is-card-title-selectable="true"
         @selected="$emit('selected')"
         @pageChanged="pageChanged"
       />
     </template>
   </div>
 </template>
-
 <script>
 import axios from "axios";
 import searchIcon from "../../../assets/icons/search.svg?url";

package/src/mock/course-provider.js

@@ -14,9 +14,9 @@ export const hscpData = [
         Contact_2_Name: 'Joey Bradford',
         Contact_2_Phone: '03 9555 0666',
         Contact_2_Email: 'jbradford@test.com.au',
-        Training_courses: 'HSR initial, HSR refresher',
+        Training_courses: 'HSR initial, HSR refresher - Hazardous Manual Handling Occupational Violence and Aggression Consultation',
         Training_venues: 'Melbourne CBD, All Regional Victoria - HQ in Melbourne',
-        id: '1'
+        Themes: 'General, Hazardous Manual Handling Occupational Violence and Aggression Consultation',
     },
     {
         type: 'hscp',
@@ -33,8 +33,9 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher - Plant, HSR refresher - Work-related stress',
-        Training_venues: 'Cranbourne, Berwick, Mornington Peninsula'
+        Training_courses: 'HSR initial, HSR refresher - Plant, HSR refresher - Work-related stress, HSR Refresher - Work related violence health sector, HSR refresher - Work-related violence',
+        Training_venues: 'Cranbourne, Berwick, Mornington Peninsula',
+        Themes: 'General, Work related violence health sector, Plant, Work-related stress, Work-related violence',
     },
     {
         type: 'hscp',
@@ -51,8 +52,9 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher - Plant, HSR refresher - Work-related stress',
-        Training_venues: 'Melbourne CBD'
+        Training_courses: 'HSR initial, HSR refresher - Plant, HSR refresher - Work-related violence',
+        Training_venues: 'Melbourne CBD',
+        Themes: 'General, Plant, Work-related violence',
     },
     {
         type: 'hscp',
@@ -69,8 +71,9 @@ export const hscpData = [
         Contact_2_Name: 'Leeanne Lyme',
         Contact_2_Email: 'leeanne.lyme@aigroup.com.au',
         Contact_2_Phone: '02 4925 8310',
-        Training_courses: 'HSR refresher, HSR refresher - Work-related violence, HSR refresher - Plant, HSR refresher - Work-related stress,Onsite only',
-        Training_venues: 'Melbourne'
+        Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR refresher - Plant, HSR refresher - Work-related stress',
+        Training_venues: 'Melbourne',
+        Themes: 'General, Work-related violence, Plant, Work-related stress',
     },
     {
         type: 'hscp',
@@ -87,8 +90,9 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher',
+        Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
         Training_venues: '',
+        Themes: 'General, Work-related violence, Plant, Work-related stress',
     },
     {
         type: 'hscp',
@@ -105,8 +109,9 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher',
+        Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
         Training_venues: '',
+        Themes: 'General, Work-related violence, Plant, Work-related stress',
     },
     {
         type: 'hscp',
@@ -123,8 +128,9 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher',
+        Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
         Training_venues: '',
+        Themes: 'General, Work-related violence, Plant, Work-related stress',
     },
     {
         type: 'hscp',
@@ -141,8 +147,9 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher',
+        Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
         Training_venues: '',
+        Themes: 'General, Work-related violence, Plant, Work-related stress',
     },
     {
         type: 'hscp',
@@ -159,8 +166,9 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher',
+        Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
         Training_venues: '',
+        Themes: 'General, Work-related violence, Plant, Work-related stress',
     },
     {
         type: 'hscp',
@@ -177,8 +185,9 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher',
+        Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
         Training_venues: '',
+        Themes: 'General, Work-related violence, Plant, Work-related stress',
     },
     {
         type: 'hscp',
@@ -195,8 +204,9 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher',
+        Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
         Training_venues: '',
+        Themes: 'General, Work-related violence, Plant, Work-related stress',
     },
     {
         type: 'hscp',
@@ -213,8 +223,9 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher',
+        Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
         Training_venues: '',
+        Themes: 'General, Work-related violence, Plant, Work-related stress',
     },
     {
         type: 'hscp',
@@ -231,8 +242,9 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher',
+        Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
         Training_venues: '',
+        Themes: 'General, Work-related violence, Plant, Work-related stress',
     },
     {
         type: 'hscp',
@@ -249,8 +261,9 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher',
+        Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
         Training_venues: '',
+        Themes: 'General, Work-related violence, Plant, Work-related stress',
     },
     {
         type: 'hscp',
@@ -267,7 +280,8 @@ export const hscpData = [
         Contact_2_Name: '',
         Contact_2_Email: '',
         Contact_2_Phone: '',
-        Training_courses: 'HSR initial, HSR refresher',
+        Training_courses: 'HSR initial, HSR refresher - Work-related violence, HSR Refresh - Plant, HSR Refresher - Work-related stress',
         Training_venues: '',
+        Themes: 'General, Work-related violence, Plant, Work-related stress',
     }
 ]