@worksafevictoria/wcl7.5 1.6.0 → 1.7.0

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

@@ -42,6 +42,10 @@ export default {
 
     .breadcrumb-item a {
       color: $black !important;
+      text-decoration: none;
+      &:hover {
+        text-decoration: underline;
+      }
     }
   }
 

package/src/components/SubComponents/FormInstance/components/renderer/index.vue

@@ -12,10 +12,14 @@
       @nextPage="next($event)"
       @prevPage="prev($event)"
     ></formio>
+    <BModal centered v-model="modal" title="File Error" ok-only>
+      {{ fileMessage }}</BModal
+    >
   </div>
 </template>
 
 <script>
+import { BModal } from 'bootstrap-vue-next'
 import { Form, Formio } from '@formio/vue'
 import '@fortawesome/fontawesome-free/css/all.min.css'
 import '@fortawesome/fontawesome-free/css/v4-shims.min.css'
@@ -23,7 +27,7 @@ import 'formiojs/dist/formio.builder.min.css'
 
 export default {
   name: 'FormRenderer',
-  components: { formio: Form },
+  components: { formio: Form, BModal },
   props: {
     formiodefinition: {
       type: Object,
@@ -46,6 +50,8 @@ export default {
       debouncedSubmission: this.debounce(this.submit, 250),
       firstEl: null,
       started: false,
+      modal: false,
+      fileMessage: '',
     }
   },
   mounted() {
@@ -100,7 +106,7 @@ export default {
         }
       }
     },
-    changed(_e, event) {
+    async changed(_e, event) {
       // File upload validation
       if (event.changed?.component.type === 'file') {
         const maxFiles = event.changed.component.fileMaxCount || 1
@@ -122,17 +128,27 @@ export default {
         const maxTotalBytes = convertToBytes(maxTotalSize)
         const files = event.changed.instance.dataValue || []
         if (files.length > maxFiles) {
-          event.changed.instance.dataValue = files.slice(0, files.length - 1)
+          event.changed.instance.dataValue = files.slice(0, maxFiles)
+          this.fileMessage = `You have exceeded the maximum number of files allowed. Only the first ${maxFiles} files have been uploaded.`
+          this.modal = true
+
           event.changed.instance.triggerChange()
           event.changed.instance.triggerRedraw()
-          alert(`You can only upload up to ${maxFiles} files.`)
         }
-        const totalSize = files.reduce((sum, file) => sum + (file.size || 0), 0)
+        let totalSize = files.reduce((sum, file) => sum + (file.size || 0), 0)
         if (totalSize > maxTotalBytes) {
-          event.changed.instance.dataValue = files.slice(0, files.length - 1)
+          let limit = []
+          while (totalSize > maxTotalBytes) {
+            const file = files.pop()
+            limit.push(file.name)
+            totalSize -= file.size
+          }
+          event.changed.instance.dataValue = files //.slice(0, files.length - 1)
+          this.fileMessage = `You have exceeded the maximum total file size allowed. Only ${files.length} files have been uploaded.`
+          this.modal = true
+          console.log('🚀 ~ changed ~ limit.length:', limit.length)
           event.changed.instance.triggerChange()
           event.changed.instance.triggerRedraw()
-          alert(`Total file size cannot exceed ${maxTotalSize}.`)
           return
         }
       }

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

@@ -39,8 +39,13 @@ export class FileFormElement extends BaseFormElement {
       webcam: false,
       multiple: true,
       description: `No more than ${this.webformElement['#multiple']} files accepted. Maximum total size is ${this.webformElement['#max_filesize']}MB.`,
-      filePattern:
-        '*.png,*.jpg,*.jpeg,*.pdf,*.doc,*.docx,*.xls,*.xlsx,*.csv,*.txt',
+      filePattern: this.webformElement['#file_extensions']
+        ? this.webformElement['#file_extensions']
+            .split(' ')
+            .map((ext) => `.${ext}`)
+            .join(',')
+        : '',
+
       fileKey: `files[${this.webformElement['#name']}]`,
       fileMaxSize: `${this.webformElement['#max_filesize']}MB`,
       fileMaxCount: this.webformElement['#multiple'],

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

@@ -16,7 +16,6 @@
           v-model="searchQuery"
           name="search"
           aria-label="searchbar"
-          debounce="600"
           autocomplete="off"
           trim
           @update="searchType !== 'googlerest' ? onChange : () => {}"
@@ -58,6 +57,7 @@ import searchIcon from '../../../assets/icons/search.svg?url'
 import SearchListing from './SearchListing/index.vue'
 import { BButton, BInputGroup, BFormInput } from 'bootstrap-vue-next'
 
+
 export default {
   components: { SearchListing, BButton, BInputGroup, BFormInput },
   props: {
@@ -235,11 +235,14 @@ export default {
       }
     },
     onSearch(e) {
+      // debugger
       const { path } = this.$route || {}
 
+     
+
       // Home page
       if (
-        (e?.type === 'click' || e?.key === 'Enter') &&
+        (e?.type === 'click' || e?.key == 'Enter') &&
         this.searchQuery &&
         this.searchQuery.length > 2 &&
         path === '/'
@@ -279,6 +282,8 @@ export default {
       }
     },
     onChange(e) {
+      //debugger
+      
       if (this.searchQuery && this.searchQuery.length > 2) {
         this.onSearch(e)
       }

package/src/index.js

@@ -30,6 +30,7 @@ import TaskFinder from './components/Paragraphs/TaskFinder/index.vue'
 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 SelectableCards from './components/Paragraphs/SelectableCards/index.vue'
 import VideoMedia from './components/Paragraphs/VideoPlayer/index.vue'
 import VideoGrid from './components/Paragraphs/VideoGrid/index.vue'
@@ -42,6 +43,7 @@ import MarketingBanner from './components/Paragraphs/MarketingBanner/index.vue'
 import RelatedInformation from './components/Paragraphs/RelatedInformation/index.vue'
 import Calculator from './components/Paragraphs/Calculator/index.vue'
 import Chart from './components/Paragraphs/Chart/index.vue'
+import GeoChart from './components/Paragraphs/Map/index.vue'
 
 // SubComponents
 import FormAddressPostcode from './components/SubComponents/FormAddressPostcode/index.vue'
@@ -96,6 +98,7 @@ export {
   ListGroup,
   ScrollSpy,
   Directory,
+  HscpDirectory,
   SelectableCards,
   Statistics,
   ProofPoints,
@@ -106,6 +109,7 @@ export {
   RelatedInformation,
   Calculator,
   Chart,
+  GeoChart,
 }
 
 // Export Sub Components

package/src/mock/course-provider.js

@@ -0,0 +1,273 @@
+export const hscpData = [
+    {
+        type: 'hscp',
+        Organisation: 'Australian Nurses and Midwifery Federation - Victorian Branch',
+        Main_office_address: 'Level 8/535 Elizabeth St Melbourne VIC 3000',
+        Organisation_acronym: 'ANMF',
+        Work_phone: '03 9555 9333',
+        Toll_free_phone: '1800 555 333',
+        Email1: 'ohs@test.com.au',
+        Website: 'https://www.anmfvic.asn.au/education-and-training/hsr-training/events',
+        Contact_1: 'Christina Groebl',
+        Contact_1_Phone: '03 9555 0222',
+        Contact_1_Email: 'cgroebl@test.com.au',
+        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_venues: 'Melbourne CBD, All Regional Victoria - HQ in Melbourne',
+        id: '1'
+    },
+    {
+        type: 'hscp',
+        Organisation: 'Chisholm Institute',
+        Organisation_acronym: 'Chisholm',
+        Main_office_address: '121 Stud Road Dandenong VIC 3175',
+        Work_phone: '03 5990 7117',
+        Toll_free_phone: '1300 244 746',
+        Email1: 'csadmin@chisholm.edu.au',
+        Website: 'https://www.chisholm.edu.au/career-fields/workplace-safety',
+        Contact_1: 'Francesca Laforgia',
+        Contact_1_Email: 'csadmin@chisholm.edu.au',
+        Contact_1_Phone: '03 5990 7117',
+        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'
+    },
+    {
+        type: 'hscp',
+        Organisation: 'Action OHS Consulting Pty Ltd',
+        Organisation_acronym: 'Action OHS',
+        Main_office_address: '5 Cubitt Street Cremorne VIC 3121',
+        Work_phone: '',
+        Toll_free_phone: '1300 101 647',
+        Email1: 'admin@actionohs.com.au',
+        Website: 'www.actionhs.com.au/training/',
+        Contact_1: '',
+        Contact_1_Email: '',
+        Contact_1_Phone: '',
+        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'
+    },
+    {
+        type: 'hscp',
+        Organisation: 'Ai Group Centre for Education and Training',
+        orgAcronyn: 'Ai Group',
+        Main_office_address: 'Level 5 441 St Kilda Road Melbourne VIC 3004',
+        Work_phone: '',
+        Toll_free_phone: '1300 55 66 77',
+        Email1: 'training@aigroup.com.au',
+        Website: 'https://www.aigroup.com.au/education-training/training-courses/health-safety/',
+        Contact_1: 'Rebecca Hayward',
+        Contact_1_Email: 'rebecca.hayward@aigroup.com.au',
+        Contact_1_Phone: '02 49258320',
+        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'
+    },
+    {
+        type: 'hscp',
+        Organisation: 'Australian Institute of Leadership and Safety Pty Ltd (AILS)',
+        Organisation_acronym: 'AILS',
+        Main_office_address: '37 Wentworth Drive Taylors Lakes VIC 3038',
+        Work_phone: '03 8385 7491',
+        Toll_free_phone: '',
+        Email1: 'admin@ails.edu.au',
+        Website: 'www.ails.edu.au/category/short-courses/work-safe/',
+        Contact_1: '',
+        Contact_1_Email: '',
+        Contact_1_Phone: '',
+        Contact_2_Name: '',
+        Contact_2_Email: '',
+        Contact_2_Phone: '',
+        Training_courses: 'HSR initial, HSR refresher',
+        Training_venues: '',
+    },
+    {
+        type: 'hscp',
+        Organisation: 'ONE Extra Australian Institute of Leadership and Safety Pty Ltd (AILS)',
+        Organisation_acronym: 'AILS',
+        Main_office_address: '37 Wentworth Drive Taylors Lakes VIC 3038',
+        Work_phone: '03 8385 7491',
+        Toll_free_phone: '',
+        email: 'admin@ails.edu.au',
+        Website: 'www.ails.edu.au/category/short-courses/work-safe/',
+        Contact_1: '',
+        Contact_1_Email: '',
+        Contact_1_Phone: '',
+        Contact_2_Name: '',
+        Contact_2_Email: '',
+        Contact_2_Phone: '',
+        Training_courses: 'HSR initial, HSR refresher',
+        Training_venues: '',
+    },
+    {
+        type: 'hscp',
+        Organisation: 'TWO Extra Australian Institute of Leadership and Safety Pty Ltd (AILS)',
+        Organisation_acronym: 'AILS',
+        Main_office_address: '37 Wentworth Drive Taylors Lakes VIC 3038',
+        Work_phone: '03 8385 7491',
+        Toll_free_phone: '',
+        Email1: 'admin@ails.edu.au',
+        Website: 'www.ails.edu.au/category/short-courses/work-safe/',
+        Contact_1: '',
+        Contact_1_Email: '',
+        Contact_1_Phone: '',
+        Contact_2_Name: '',
+        Contact_2_Email: '',
+        Contact_2_Phone: '',
+        Training_courses: 'HSR initial, HSR refresher',
+        Training_venues: '',
+    },
+    {
+        type: 'hscp',
+        Organisation: 'THREE Extra Australian Institute of Leadership and Safety Pty Ltd (AILS)',
+        Organisation_acronym: 'AILS',
+        Main_office_address: '37 Wentworth Drive Taylors Lakes VIC 3038',
+        Work_phone: '03 8385 7491',
+        Toll_free_phone: '',
+        Email1: 'admin@ails.edu.au',
+        Website: 'www.ails.edu.au/category/short-courses/work-safe/',
+        Contact_1: '',
+        Contact_1_Email: '',
+        Contact_1_Phone: '',
+        Contact_2_Name: '',
+        Contact_2_Email: '',
+        Contact_2_Phone: '',
+        Training_courses: 'HSR initial, HSR refresher',
+        Training_venues: '',
+    },
+    {
+        type: 'hscp',
+        Organisation: 'FOUR Extra Australian Institute of Leadership and Safety Pty Ltd (AILS)',
+        Organisation_acronym: 'AILS',
+        Main_office_address: '37 Wentworth Drive Taylors Lakes VIC 3038',
+        Work_phone: '03 8385 7491',
+        Toll_free_phone: '',
+        Email1: 'admin@ails.edu.au',
+        Website: 'www.ails.edu.au/category/short-courses/work-safe/',
+        Contact_1: '',
+        Contact_1_Email: '',
+        Contact_1_Phone: '',
+        Contact_2_Name: '',
+        Contact_2_Email: '',
+        Contact_2_Phone: '',
+        Training_courses: 'HSR initial, HSR refresher',
+        Training_venues: '',
+    },
+    {
+        type: 'hscp',
+        Organisation: 'FIVE Extra Australian Institute of Leadership and Safety Pty Ltd (AILS)',
+        Organisation_acronym: 'AILS',
+        Main_office_address: '37 Wentworth Drive Taylors Lakes VIC 3038',
+        Work_phone: '03 8385 7491',
+        Toll_free_phone: '',
+        Email1: 'admin@ails.edu.au',
+        Website: 'www.ails.edu.au/category/short-courses/work-safe/',
+        Contact_1: '',
+        Contact_1_Email: '',
+        Contact_1_Phone: '',
+        Contact_2_Name: '',
+        Contact_2_Email: '',
+        Contact_2_Phone: '',
+        Training_courses: 'HSR initial, HSR refresher',
+        Training_venues: '',
+    },
+    {
+        type: 'hscp',
+        Organisation: 'SIX Extra Australian Institute of Leadership and Safety Pty Ltd (AILS)',
+        Organisation_acronym: 'AILS',
+        Main_office_address: '37 Wentworth Drive Taylors Lakes VIC 3038',
+        Work_phone: '03 8385 7491',
+        Toll_free_phone: '',
+        Email1: 'admin@ails.edu.au',
+        Website: 'www.ails.edu.au/category/short-courses/work-safe/',
+        Contact_1: '',
+        Contact_1_Email: '',
+        Contact_1_Phone: '',
+        Contact_2_Name: '',
+        Contact_2_Email: '',
+        Contact_2_Phone: '',
+        Training_courses: 'HSR initial, HSR refresher',
+        Training_venues: '',
+    },
+    {
+        type: 'hscp',
+        Organisation: 'SEVEN Extra Australian Institute of Leadership and Safety Pty Ltd (AILS)',
+        Organisation_acronym: 'AILS',
+        Main_office_address: '37 Wentworth Drive Taylors Lakes VIC 3038',
+        Work_phone: '03 8385 7491',
+        Toll_free_phone: '',
+        Email1: 'admin@ails.edu.au',
+        Website: 'www.ails.edu.au/category/short-courses/work-safe/',
+        Contact_1: '',
+        Contact_1_Email: '',
+        Contact_1_Phone: '',
+        Contact_2_Name: '',
+        Contact_2_Email: '',
+        Contact_2_Phone: '',
+        Training_courses: 'HSR initial, HSR refresher',
+        Training_venues: '',
+    },
+    {
+        type: 'hscp',
+        Organisation: 'EIGHT Extra Australian Institute of Leadership and Safety Pty Ltd (AILS)',
+        Organisation_acronym: 'AILS',
+        Main_office_address: '37 Wentworth Drive Taylors Lakes VIC 3038',
+        Work_phone: '03 8385 7491',
+        Toll_free_phone: '',
+        Email1: 'admin@ails.edu.au',
+        Website: 'www.ails.edu.au/category/short-courses/work-safe/',
+        Contact_1: '',
+        Contact_1_Email: '',
+        Contact_1_Phone: '',
+        Contact_2_Name: '',
+        Contact_2_Email: '',
+        Contact_2_Phone: '',
+        Training_courses: 'HSR initial, HSR refresher',
+        Training_venues: '',
+    },
+    {
+        type: 'hscp',
+        Organisation: 'NINE Extra Australian Institute of Leadership and Safety Pty Ltd (AILS)',
+        Organisation_acronym: 'AILS',
+        Main_office_address: '37 Wentworth Drive Taylors Lakes VIC 3038',
+        Work_phone: '03 8385 7491',
+        Toll_free_phone: '',
+        Email1: 'admin@ails.edu.au',
+        Website: 'www.ails.edu.au/category/short-courses/work-safe/',
+        Contact_1: '',
+        Contact_1_Email: '',
+        Contact_1_Phone: '',
+        Contact_2_Name: '',
+        Contact_2_Email: '',
+        Contact_2_Phone: '',
+        Training_courses: 'HSR initial, HSR refresher',
+        Training_venues: '',
+    },
+    {
+        type: 'hscp',
+        Organisation: 'TEN Extra Australian Institute of Leadership and Safety Pty Ltd (AILS)',
+        Organisation_acronym: 'AILS',
+        Main_office_address: '37 Wentworth Drive Taylors Lakes VIC 3038',
+        Work_phone: '03 8385 7491',
+        Toll_free_phone: '',
+        Email1: 'admin@ails.edu.au',
+        Website: 'www.ails.edu.au/category/short-courses/work-safe/',
+        Contact_1: '',
+        Contact_1_Email: '',
+        Contact_1_Phone: '',
+        Contact_2_Name: '',
+        Contact_2_Email: '',
+        Contact_2_Phone: '',
+        Training_courses: 'HSR initial, HSR refresher',
+        Training_venues: '',
+    }
+]