npm - @worksafevictoria/wcl7.5 - Versions diffs - 1.8.0-beta.1 → 1.8.0-beta.10 - Mend

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

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 (22) hide show

package/src/components/SubComponents/FormInstance/models/overrides/file.js CHANGED Viewed

@@ -6,6 +6,7 @@ export class FileFormElement extends BaseFormElement {
   }
   async transformSubmissionValue(value, axios) {
+    const apiUrl = this.getFormSettingsMeta().contentApiUrl
     const promises = await Promise.all(
       value.map((file) => {
         const base64Data = file.url.split(',')[1]
@@ -18,7 +19,7 @@ export class FileFormElement extends BaseFormElement {
         const blob = new Blob([byteArray], { type: 'text/plain' })
         return axios.post(
-          `https://content-dev-v2.api.worksafe.vic.gov.au/webform_rest/${this.webformElement['#webform']}/upload/${this.webformElement['#webform_key']}`,
+          `${apiUrl}/webform_rest/${this.webformElement['#webform']}/upload/${this.webformElement['#webform_key']}`,
           blob,
           {
             headers: {

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

@@ -22,8 +22,9 @@
       :size="'full'"
       :row-spacing="'none'"
       :no-padding-top="true"
-      @selected="onSelectResult"
-      @selected-title="onSelectCardTitle"
+      :google-search-flag="googleSearchFlag"
+      @selected="handleSelect"
+      @selected-title="handleSelect"
     >
       <template v-slot:cardItem="{ card }">
         <card-grid-item
@@ -38,6 +39,7 @@
               ? truncate(card.description, 144)
               : card.htmlSnippet || ''
           "
+          :link="card.link ? card.link : false"
           :strip-description-html="true"
           :taxonomies="{
             industry: card.industry,
@@ -133,6 +135,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    googleSearchFlag: {
+      type: String,
+      default: "solar",
+    },
   },
   methods: {
     onClickItem(event, item, index) {
@@ -144,31 +150,29 @@ export default {
       }
       return value;
     },
-    onSelectCardTitle(card) {
+    handleSelect(card) {
       debugger;
-      navigateToPath.call(
-        this,
-        card?.selectedCard?.link.match(/https?:\/\/[^\/]+(\/[^?#]*)/)[1], // open link in current environment
-        card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
-      );
-      this.$nextTick(() => this.$emit("selected-title"));
-      if (this.$gtm) {
-        this.fireGTM(card);
+      const isSolar = this.googleSearchFlag === "solar";
+      const link = card?.selectedCard?.link;
+      const openInNewTab = card?.ev?.ctrlKey || card?.ev?.metaKey;
+      // Extract pathname only for solar
+      const finalLink = isSolar ? link : link?.match(/https?:\/\/[^\/]+(\/[^?#]*)/)?.[1];
+      if (finalLink) {
+        navigateToPath.call(this, finalLink, openInNewTab);
       }
-    },
-    onSelectResult(card) {
-      navigateToPath.call(
-        this,
-        card?.selectedCard?.link.match(/https?:\/\/[^\/]+(\/[^?#]*)/)[1], // title click is used for search result, but change also included here
-        card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
-      );
-      this.$nextTick(() => this.$emit("selected"));
+      this.$nextTick(() => {
+        this.$emit(isSolar ? "selected" : "selected-title");
+      });
       if (this.$gtm) {
         this.fireGTM(card);
       }
     },
     fireGTM(card) {
       let attrs = {
         location:

package/src/components/SubComponents/Search/index.stories.js CHANGED Viewed

@@ -5,7 +5,8 @@ const contentParser = () => {
     results: [
       {
         title: 'Content title 1',
-        description: 'Content description 2'
+        description: 'Content description 2',
+        link: '/mental-health'
       }
     ],
     offset: 0,

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

@@ -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,15 @@
         :offset="searchResults && searchResults.offset"
         :page-limit="pageLimit"
         :content-parser="contentParser"
-        :is-selectable="searchType === 'googlerest' ? false : true"
-        :is-card-title-selectable="searchType === 'googlerest' ? true : false"
+        :google-search-flag="searchType"
+        :is-selectable="searchType === 'solar'"
+        :is-card-title-selectable="searchType !== 'solar'"
         @selected="$emit('selected')"
         @pageChanged="pageChanged"
       />
     </template>
   </div>
 </template>
 <script>
 import axios from "axios";
 import searchIcon from "../../../assets/icons/search.svg?url";
@@ -236,9 +234,6 @@ export default {
       }
     },
     onSearch(e) {
-      debugger;
-      console.log("this.searchType:- ", this.searchType);
       const { path } = this.$route || {};
       // Home page

package/src/index.js CHANGED Viewed

@@ -31,6 +31,7 @@ import ListGroup from './components/Paragraphs/ListGroup/index.vue'
 import ScrollSpy from './components/Paragraphs/ScrollSpy/index.vue'
 import Directory from './components/Paragraphs/Directory/index.vue'
 import HscpDirectory from './components/Paragraphs/Directory/HSCP/Records/index.vue'
+import ArDirectory from './components/Paragraphs/Directory/Asbestos/Records/index.vue'
 import SelectableCards from './components/Paragraphs/SelectableCards/index.vue'
 import VideoMedia from './components/Paragraphs/VideoPlayer/index.vue'
 import VideoGrid from './components/Paragraphs/VideoGrid/index.vue'
@@ -99,6 +100,7 @@ export {
   ScrollSpy,
   Directory,
   HscpDirectory,
+  ArDirectory,
   SelectableCards,
   Statistics,
   ProofPoints,

package/src/mock/asbestos-removalists.js ADDED Viewed

@@ -0,0 +1,226 @@
+export const arData = [
+    {
+        ResourceName: 'A.D.S. Asbestos Removal Pty Ltd',
+        CompanyAddress: '62 Webber Parade',
+        AddressLine2: 'KEILOR EAST VIC 3033',
+        Phone: '0404073745',
+        CompanyMobile: '0404 073 745',
+        CompanyEmailDisp: 'ads.asbestos@gmail.com',
+        CompanyWebURLDisp: 'www.adsasbestosremoval.com.au',
+        ContactFirstName: 'Ivan',
+        ContactLastName: 'Silva',
+        ContactPhoneDisp: '0404073745',
+        ContactEmail: 'ads.asbestos@gmail.com',
+        ContactMobileDisp: '1300 064 277',
+        ServiceAll: 'Class A - Restricted - Asbestos Removalists',
+        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.',
+    },
+    {
+        ResourceName: 'AAA ASBESTOS SOLUTIONS PTY LTD',
+        CompanyAddress: '9 Ewens Court',
+        AddressLine2: 'MOUNT GAMBIER VIC 5290',
+        Phone: '0418 854 443',
+        CompanyMobile: '0418 854 443',
+        CompanyEmailDisp: 'nieto4@bigpond.net.au',
+        CompanyWebURLDisp: '',
+        ContactFirstName: 'ERIC',
+        ContactLastName: 'NIETO',
+        ContactPhoneDisp: '0418 854 443',
+        ContactEmail: 'nieto4@bigpond.net.au',
+        ContactMobileDisp: '0418 854 443',
+        ServiceAll: 'Class B Asbestos Removalists',
+        ServicesAll: 'All types of non-friable asbestos containing material (eg. cement sheeting or vinyl tiles)',
+    },
+    {
+        ResourceName: 'Aaron John Field',
+        CompanyAddress: '44 Townsent Street',
+        AddressLine2: 'Howlong NSW 2643',
+        Phone: '',
+        CompanyMobile: '0408474707',
+        CompanyEmailDisp: 'azz_317@homail.com',
+        CompanyWebURLDisp: '',
+        ContactFirstName: 'Aaron',
+        ContactLastName: 'Field',
+        ContactPhoneDisp: '',
+        ContactEmail: 'azz_317@homail.com',
+        ContactMobileDisp: '0408474707',
+        ServiceAll: 'Class B Asbestos Removalists',
+        ServicesAll: 'All types of non-friable asbestos containing material (eg. cement sheeting or vinyl tiles),Telecommunication Asbestos cement pits and pipes',
+     },
+    {
+        ResourceName: 'Al Baarini Ahmad',
+        CompanyAddress: '13 Rudkin Court',
+        AddressLine2: 'Hoppers Crossing VIC 3029',
+        Phone: '0421 280 732',
+        CompanyMobile: '0401 016 565',
+        CompanyEmailDisp: 'CITYWIDEDEMOLITION@HOTMAIL.COM',
+        CompanyWebURLDisp: 'www.citywidedemolition.com.au',
+        ContactFirstName: 'Eman',
+        ContactLastName: 'Al Baarini',
+        ContactPhoneDisp: '0421 280 732',
+        ContactEmail: 'CITYWIDEDEMOLITION@HOTMAIL.COM',
+        ContactMobileDisp: '0421 280 732',
+        ServiceAll: 'Class B Asbestos Removalists',
+        ServicesAll: 'All types of non-friable asbestos containing material (eg. cement sheeting or vinyl tiles)',
+     },
+    {
+        ResourceName: 'Ashcorp Holdings Pty Ltd',
+        CompanyAddress: '17 Rohs Road',
+        AddressLine2: 'EAST BENDIGO VIC 3550',
+        Phone: '(03) 5444 3261',
+        CompanyMobile: '0409 012 780',
+        CompanyEmailDisp: 'admin@ashworthdemolition.com.au',
+        CompanyWebURLDisp: '',
+        ContactFirstName: 'Dean',
+        ContactLastName: 'Ashworth',
+        ContactPhoneDisp: '(03) 5444 3261',
+        ContactEmail: 'info@ashworthdemolition.com.au',
+        ContactMobileDisp: '0409012780',
+        ServiceAll: 'Class A - Restricted - Asbestos Removalists',
+        ServicesAll: 'removal of all types of non-friable asbestos containing material,removal of asbestos containing gaskets and ropes,removal of friable asbestos containing material from soil that does not require an enclosure with negative air unit(s),removal of any asbestos containing material that was previously non-friable but has become friable as a result of a fire,The Licence is restricted to removal of asbestos containing material that does not require an enclosure with a negative air unit(s).'
+    },
+    {
+        ResourceName: 'Ventia Utility Services Pty Limited',
+        CompanyAddress: 'Ventia - Cardinia Building, 25 Lucknow Street',
+        AddressLine2: 'MITCHAM VIC 3132',
+        Phone: '0438531164',
+        CompanyMobile: '',
+        CompanyEmailDisp: 'daniel.dehaan@ventia.com',
+        CompanyWebURLDisp: 'www.ventia.com.au',
+        ContactFirstName: 'Daniel',
+        ContactLastName: 'DeHaan',
+        ContactPhoneDisp: '0438531164',
+        ContactEmail: 'daniel.dehaan@ventia.com',
+        ContactMobileDisp: '0438531164',
+        ServiceAll: 'Class B - Restricted - Asbestos Removalists',
+        ServicesAll: 'Bituminous coal tar coatings,Non-friable Asbestos Cement Water Pipes and Associated Fittings ONLY,Non-friable Asbetos Containing Bituminous Coating on Mild Steel Pipes',
+     },
+    {
+        ResourceName: 'ONE A.D.S Asbestos Removal Pty Ltd',
+        CompanyAddress: '62 Webber Parade',
+        AddressLine2: 'KEILOR EAST VIC 3033',
+        Phone: '0404073745',
+        CompanyMobile: '0404 073 745',
+        CompanyEmailDisp: 'ads.asbestos@gmail.com',
+        CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
+        ContactFirstName: 'Ivan',
+        ContactLastName: 'Silva',
+        ContactPhoneDisp: '0404073745',
+        ContactEmail: 'ads.asbestos@gmail.com',
+        ContactMobileDisp: '1300 064 277',
+        ServiceAll: 'Class A - Restricted - Asbestos Removalists',
+        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.',
+     },
+    {
+        ResourceName: 'TWO A.D.S Asbestos Removal Pty Ltd',
+        CompanyAddress: '62 Webber Parade',
+        AddressLine2: 'KEILOR EAST VIC 3033',
+        Phone: '0404073745',
+        CompanyMobile: '0404 073 745',
+        CompanyEmailDisp: 'ads.asbestos@gmail.com',
+        CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
+        ContactFirstName: 'Ivan',
+        ContactLastName: 'Silva',
+        ContactPhoneDisp: '0404073745',
+        ContactEmail: 'ads.asbestos@gmail.com',
+        ContactMobileDisp: '1300 064 277',
+        ServiceAll: 'Class A - Restricted - Asbestos Removalists',
+        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.',
+     },
+    {
+        ResourceName: 'Three A.D.S Asbestos Removal Pty Ltd',
+        CompanyAddress: '62 Webber Parade',
+        AddressLine2: 'KEILOR EAST VIC 3033',
+        Phone: '0404073745',
+        CompanyMobile: '0404 073 745',
+        CompanyEmailDisp: 'ads.asbestos@gmail.com',
+        CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
+        ContactFirstName: 'Ivan',
+        ContactLastName: 'Silva',
+        ContactPhoneDisp: '0404073745',
+        ContactEmail: 'ads.asbestos@gmail.com',
+        ContactMobileDisp: '1300 064 277',
+        ServiceAll: 'Class A - Restricted - Asbestos Removalists',
+        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.',
+     },
+    {
+        ResourceName: 'FOUR A.D.S Asbestos Removal Pty Ltd',
+        CompanyAddress: '62 Webber Parade',
+        AddressLine2: 'KEILOR EAST VIC 3033',
+        Phone: '0404073745',
+        CompanyMobile: '0404 073 745',
+        CompanyEmailDisp: 'ads.asbestos@gmail.com',
+        CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
+        ContactFirstName: 'Ivan',
+        ContactLastName: 'Silva',
+        ContactPhoneDisp: '0404073745',
+        ContactEmail: 'ads.asbestos@gmail.com',
+        ContactMobileDisp: '1300 064 277',
+        ServiceAll: 'Class A - Restricted - Asbestos Removalists',
+        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.',
+     },
+    {
+        ResourceName: 'Five A.D.S Asbestos Removal Pty Ltd',
+        CompanyAddress: '62 Webber Parade',
+        AddressLine2: 'KEILOR EAST VIC 3033',
+        Phone: '0404073745',
+        CompanyMobile: '0404 073 745',
+        CompanyEmailDisp: 'ads.asbestos@gmail.com',
+        CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
+        ContactFirstName: 'Ivan',
+        ContactLastName: 'Silva',
+        ContactPhoneDisp: '0404073745',
+        ContactEmail: 'ads.asbestos@gmail.com',
+        ContactMobileDisp: '1300 064 277',
+        ServiceAll: 'Class A - Restricted - Asbestos Removalists',
+        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.',
+     },
+    {
+        ResourceName: 'SIX A.D.S Asbestos Removal Pty Ltd',
+        CompanyAddress: '62 Webber Parade',
+        AddressLine2: 'KEILOR EAST VIC 3033',
+        Phone: '0404073745',
+        CompanyMobile: '0404 073 745',
+        CompanyEmailDisp: 'ads.asbestos@gmail.com',
+        CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
+        ContactFirstName: 'Ivan',
+        ContactLastName: 'Silva',
+        ContactPhoneDisp: '0404073745',
+        ContactEmail: 'ads.asbestos@gmail.com',
+        ContactMobileDisp: '1300 064 277',
+        ServiceAll: 'Class A - Restricted - Asbestos Removalists',
+        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.',
+     },
+    {
+        ResourceName: 'SSM Asbestos Removal Pty Ltd',
+        CompanyAddress: '90 Marriage Lane',
+        AddressLine2: 'HILLSIDE VIC 3875',
+        Phone: '0405 083 197',
+        CompanyMobile: '0405 083 197',
+        CompanyEmailDisp: 'steve@ssmasbestos.com.au',
+        CompanyWebURLDisp: 'www.ssm-asbestosremoval.com',
+        ContactFirstName: 'Steven',
+        ContactLastName: 'McCarthy',
+        ContactPhoneDisp: '0405 083 197',
+        ContactEmail: 'steve@ssmasbestos.com.au',
+        ContactMobileDisp: '0405 083 197',
+        ServiceAll: 'Class A Asbestos Removalists',
+        ServicesAll: 'All types of Asbestos containing material (friable & non-friable)',
+     },
+    {
+        ResourceName: 'Golden Plains Asbestos PTY LTD',
+        CompanyAddress: '165 Grevillea Drive',
+        AddressLine2: 'ENFIELD VIC 3352',
+        Phone: '0450582103',
+        CompanyMobile: '0450582103',
+        CompanyEmailDisp: 'gpasbestos@outlook.com',
+        CompanyWebURLDisp: '',
+        ContactFirstName: 'Carlos',
+        ContactLastName: 'Rios',
+        ContactPhoneDisp: '0450582103',
+        ContactEmail: 'gpasbestos@outlook.com',
+        ContactMobileDisp: '0450582103',
+        ServiceAll: 'Class A Asbestos Removalists',
+        ServicesAll: 'All types of Asbestos containing material (friable & non-friable)',
+     }
+]

package/src/mock/course-provider.js CHANGED Viewed

@@ -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',
     }
 ]