@worksafevictoria/wcl7.5 1.8.0-beta.9 → 1.9.0-beta.1

package/lib/utility.js

@@ -35,8 +35,6 @@ function isGovSite(url) {
 }
 
 function navigateToPath(path, newTab, nuxtRouter) {
-  debugger
-
   const url = String(path).startsWith('www.') ? `http://${path}` : path
   const isAbsolute = isAbsoluteUrl(url)
   const router = nuxtRouter ? nuxtRouter : this.$router

package/package.json

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

package/src/components/Common/CardGrid/index.vue

@@ -227,7 +227,6 @@ export default {
   },
   methods: {
     cardTitleSelected(selectedCard, ev) {
-      debugger;
       this.clearCards();
       selectedCard.selected = !!!selectedCard.selected;
       const selectedCardModelIndex = this.getChildIndex(selectedCard);
@@ -239,8 +238,6 @@ export default {
       });
     },
     cardSelected(selectedCard, ev) {
-      debugger;
-      console.log("cardSelected selectedCard :- ", selectedCard);
       this.clearCards();
       selectedCard.selected = !!!selectedCard.selected;
       const selectedCardModelIndex = this.getChildIndex(selectedCard);

package/src/components/Common/CardGridItem/index.vue

@@ -126,7 +126,6 @@
           }"
         >
           <div
-            v-if="$slots.cardDescription || description"
             class="card-grid-item__description"
             :class="{
               [descriptionClass]: !!descriptionClass,
@@ -402,8 +401,6 @@ export default {
   },
   methods: {
     cardClicked(ev) {
-      debugger;
-
       if (this.isSelectable) {
         this.parentGrid.cardSelected(this, ev);
       }
@@ -413,7 +410,6 @@ export default {
       }
     },
     cardTitleClicked(ev) {
-      debugger;
       if (this.isCardTitleSelectable) {
         this.parentGrid.cardTitleSelected(this, ev);
       }

package/src/components/Containers/Subheader/index.vue

@@ -11,12 +11,11 @@
     :is-selectable="true"
     :row-spacing="isSingleColumn && !singleLineCards ? 'large' : 'small'"
     @selected="selectedCard"
-    @gridColumnSize="
-      (gridColumnSize) => (isSingleColumn = gridColumnSize === 1)
-    "
+    @gridColumnSize="(gridColumnSize) => (isSingleColumn = gridColumnSize === 1)"
   >
     <template v-slot:cardItem="{ card }">
       <card-grid-item
+        v-if="card.description"
         :show-divider="!singleLineCards"
         :card-header-title="singleLineCards ? null : card.title"
         :header-size="card.titleSize"
@@ -38,10 +37,7 @@
               [`w-100 text-left`]: alignLeft,
             }"
           >
-            <strong
-              v-if="singleLineCards && card.title"
-              v-html="card.title + ': '"
-            >
+            <strong v-if="singleLineCards && card.title" v-html="card.title + ': '">
             </strong>
             <span v-html="card.description"></span>
           </div>
@@ -51,12 +47,12 @@
   </card-grid>
 </template>
 <script>
-import { navigateToPath, isGovSite } from '../../../../lib/utility'
-import CardGrid from '../../Common/CardGrid/index.vue'
-import CardGridItem from '../../Common/CardGridItem/index.vue'
+import { navigateToPath, isGovSite } from "../../../../lib/utility";
+import CardGrid from "../../Common/CardGrid/index.vue";
+import CardGridItem from "../../Common/CardGridItem/index.vue";
 
 export default {
-  name: 'Subheader',
+  name: "Subheader",
   components: { CardGrid, CardGridItem },
   props: {
     itemList: {
@@ -72,11 +68,11 @@ export default {
     },
     background: {
       type: String,
-      default: 'none',
+      default: "none",
     },
     heading: {
       type: String,
-      default: '',
+      default: "",
     },
     alignLeft: {
       type: Boolean,
@@ -91,48 +87,46 @@ export default {
     },
     type: {
       type: String,
-      default: '',
+      default: "",
     },
   },
   data() {
     return {
       isSingleColumn: false,
-    }
+    };
   },
   methods: {
     selectedCard(card) {
       // Some custom logic for gov caretaker logic
       if (
-        (this.$config
-          ? this.$config.public.caretaker
-          : process.env.CARETAKER) === 'true'
+        (this.$config ? this.$config.public.caretaker : process.env.CARETAKER) === "true"
       ) {
         if (!isGovSite(card?.selectedCard?.linkHref)) {
           // this.$store.commit('page/SET_CARETAKER_REF', 'subheader')
           // this.$root.$emit('caretaker-open', card?.selectedCard?.linkHref)
           if (this.$pageStore) {
-            this.$pageStore.caretaker.referrer = 'subheader'
+            this.$pageStore.caretaker.referrer = "subheader";
           }
           if (this.$bus) {
-            this.$bus.$emit('caretaker-open', card?.selectedCard?.linkHref)
+            this.$bus.$emit("caretaker-open", card?.selectedCard?.linkHref);
           }
         } else {
           navigateToPath.call(
             this,
             card?.selectedCard?.linkHref,
-            card?.ev?.ctrlKey === true || card?.ev?.metaKey === true,
-          )
+            card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
+          );
         }
       } else {
         navigateToPath.call(
           this,
           card?.selectedCard?.linkHref,
-          card?.ev?.ctrlKey === true || card?.ev?.metaKey === true,
-        )
+          card?.ev?.ctrlKey === true || card?.ev?.metaKey === true
+        );
       }
     },
   },
-}
+};
 </script>
 <style lang="scss" scoped>
 .subheader {

package/src/components/Paragraphs/Directory/Asbestos/Records/SingleRecord/index.stories.js

@@ -3,7 +3,7 @@ import arRecord from './index.vue'
 const arData = 
     {
         title: 'Ventia Utility Services Pty Limited',
-        fullAddress: 'Ventia - Cardinia Building, 25 Lucknow Street MITCHAM VIC 3132',
+        fullAddress: 'MITCHAM VIC 3132',
         workPhone: '0438531164',
         mobilePhone: '0438531164',
         email: 'daniel.dehaan@ventia.com',

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

@@ -9,7 +9,7 @@
           </a>
         </column>
         <column md="2" sm="12" class="address" >
-          <div class="label">Office address</div>
+          <div class="label">Location</div>
           <a v-if="item.fullAddress" target="_blank" :href="gMapLink"><span class="sr-only visually-hidden">Address</span>
             {{ item.fullAddress }}
           </a>
@@ -65,34 +65,34 @@
         </column>
       </row>
       <row v-if="item.contact1 !== ''">
-        <column sm="2" class="label" v-if="item.contact1 !== ''">
+        <column sm="2" class="label" >
           Contact
         </column>
-        <column sm="4" class="dir-additional-records" v-if="item.contact1 !== ''">
+        <column sm="4" class="dir-additional-records">
           {{item.contact1}}
         </column>
       </row>
       <row v-if="item.phone1 !== ''">
-        <column sm="2" class="label" v-if="item.phone1 !== ''">
+        <column sm="2" class="label" >
           Phone
         </column>
-        <column sm="4" class="dir-additional-records" v-if="item.phone1 !== ''">
+        <column sm="4" class="dir-additional-records" >
           {{item.phone1}}
         </column>
       </row>
       <row v-if="item.mobile1 !== ''">
-        <column sm="2" class="label" v-if="item.mobile1 !== ''">
+        <column sm="2" class="label" >
           Mobile
         </column>
-        <column sm="4" class="dir-additional-records" v-if="item.mobile1 !== ''">
+        <column sm="4" class="dir-additional-records" >
           {{item.mobile1}}
         </column>
       </row>
       <row v-if="item.email1 !== ''">
-        <column sm="2" class="label" v-if="item.email1 !== ''">
+        <column sm="2" class="label" >
           Email
         </column>
-        <column sm="4" class="dir-additional-records" v-if="item.email1 !== ''">
+        <column sm="4" class="dir-additional-records">
           {{item.email1}}
         </column>
       </row>
@@ -145,7 +145,7 @@ export default {
   },
   computed: {
     gMapLink() {
-      return `https://google.com/maps?q=${this.item.title}%20${this.item.fullAddress}`
+      return `https://google.com/maps?q=${this.item.fullAddress}`
     },
     validContacts() {
       if (this.item.contact1 === '' && this.item.phone1 === '' && this.item.email1 === '' && this.item.mobile1 === '') {

package/src/components/Paragraphs/Directory/Asbestos/Records/index.vue

@@ -13,7 +13,7 @@
         <label class="visually-hidden" for="search-directory">
           Search by suburb (typed suburb automatically filters below results)
         </label>
-        <input type="text" v-model="searchSub" placeholder="Address" class="search">
+        <input type="text" v-model="searchSub" placeholder="Location" class="search">
       </column>
       <!-- Other Filters -->
       <column xxl="2" xl="3" md="4" sm="6">
@@ -136,12 +136,12 @@ export default {
         flatRecords.push({
           type: 'ar',
           title: record.ResourceName,
-          fullAddress: record.CompanyAddress + ' ' + record.AddressLine2,
+          fullAddress: record.AddressLine2,
           workPhone: record.Phone,
           mobilePhone: record.CompanyMobile,
           email: record.CompanyEmailDisp,
           website: this.formatWebsite(record.CompanyWebURLDisp),
-          contact1: record.ContactFirstName + ' ' + record.ContactLastName,
+          contact1: this.returnContact(record.ContactFirstName, record.ContactLastName),
           email1: record.ContactEmail,
           phone1: record.ContactPhoneDisp,
           mobile1: record.ContactMobileDisp,
@@ -172,11 +172,19 @@ export default {
 
     formatWebsite(url) {
       let startUrl = url.slice(0, 3)
+      let returnUrl = url
       if (startUrl.toLowerCase() === 'www') {
-        return 'https://' + url
-      } else {
-        return url
-      }
+        returnUrl = 'https://' + url
+      } 
+      if (startUrl.toLowerCase() !== 'htt' && startUrl.toLowerCase() !== 'www' && url !== '') {
+        returnUrl = 'https://www.' + url
+      } 
+      return returnUrl  
+    },
+
+    returnContact(firstN, lastN) {
+      let retContact = [firstN, lastN].filter(Boolean).join(' ')
+      return retContact
     },
 
     chunkify(arr, n) {

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

@@ -213,11 +213,14 @@ export default {
 
     formatWebsite(url) {
       let startUrl = url.slice(0, 3)
+      let returnUrl = url
       if (startUrl.toLowerCase() === 'www') {
-        return 'https://' + url
-      } else {
-        return url
-      }
+        returnUrl = 'https://' + url
+      } 
+      if (startUrl.toLowerCase() !== 'htt' && startUrl.toLowerCase() !== 'www' && url !== '') {
+        returnUrl = 'https://www.' + url
+      } 
+      return returnUrl
     },
 
     chunkify(arr, n) {

package/src/components/Paragraphs/Map/index.vue

@@ -40,7 +40,9 @@
           />
           <CustomControl position="BOTTOM_CENTER">
             <h4 v-if="unknownLGA">
-              <BBadge variant="light"> Unknown LGA {{ unknownLGA }} </BBadge>
+              <BBadge variant="light">
+                Unspecified locations {{ unknownLGA }}
+              </BBadge>
             </h4>
           </CustomControl>
           <AdvancedMarker

package/src/components/Paragraphs/ScrollSpy/index.stories.js

@@ -4,40 +4,38 @@ import { BCol, BRow, BContainer } from 'bootstrap-vue-next'
 const englishItemList = [
   {
     text: 'Section one heading',
-    id: 'item-1'
+    id: 'item-1',
   },
   {
     text: 'Section two heading spans over two lines',
-    id: 'item-2'
+    id: 'item-2',
   },
   {
-    text:
-      'Section three heading spans over three lines and is active yellow or green',
-    id: 'item-3'
+    text: 'Section three heading spans over three lines and is active yellow or green',
+    id: 'item-3',
   },
   {
     text: 'Section four heading',
-    id: 'item-4'
-  }
+    id: 'item-4',
+  },
 ]
 const arabicItemList = [
   {
     text: 'عنوان القسم الأول',
-    id: 'item-1'
+    id: 'item-1',
   },
   {
     text: 'يمتد عنوان القسم الثاني على سطرين',
-    id: 'item-2'
+    id: 'item-2',
   },
   {
-    text:
-      'يمتد عنوان القسم الثالث على ثلاثة أسطر ويكون نشطًا باللون الأصفر أو الأخضر',
-    id: 'item-3'
+    text: 'يمتد عنوان القسم الثالث على ثلاثة أسطر ويكون نشطًا باللون الأصفر أو الأخضر',
+    id: 'item-3',
   },
   {
     text: 'عنوان الباب الرابع',
-    id: 'item-4'
-  }
+    id: 'item-4',
+  },
 ]
 export default {
   title: 'Paragraphs/ScrollSpy',
@@ -45,16 +43,16 @@ export default {
   tags: ['autodocs'],
   argTypes: {
     itemList: {
-      table: {disable: true}
-    }
+      table: { disable: true },
+    },
   },
   args: {
     title: 'On this page',
-    itemListEnglish:  englishItemList,
+    itemListEnglish: englishItemList,
     itemListArabic: arabicItemList,
     rtl: false,
-    scrollSpy: { element: 'scrollspy-nested', offset: 100, method: 'auto' }
-    }
+    scrollSpy: { element: 'scrollspy-nested', offset: 100, method: 'auto' },
+  },
 }
 const DefaultContent = (args) => ({
   components: { ScrollSpy, BCol, BRow, BContainer },
@@ -75,7 +73,7 @@ const DefaultContent = (args) => ({
         `,
       arabicText: `هنالك العديد من الأنواع المتوفرة لنصوص لوريم إيبسوم، ولكن الغالبية تم تعديلها بشكل ما عبر إدخال بعض النوادر أو الكلمات العشوائية إلى النص. إن كنت تريد أن تستخدم نص لوريم إيبسوم ما، عليك أن تتحقق أولاً أن ليس هناك أي كلمات أو عبارات محرجة أو غير لائقة مخبأة في هذا النص. بينما تعمل جميع مولّدات نصوص لوريم إيبسوم على الإنترنت على إعادة تكرار مقاطع من نص لوريم إيبسوم نفسه عدة مرات بما تتطلبه الحاجة، يقوم مولّدنا هذا باستخدام كلمات من قاموس يحوي على أكثر من 200 كلمة لا تينية، مضاف إليها مجموعة من الجمل النموذجية، لتكوين نص لوريم إيبسوم ذو شكل منطقي قريب إلى النص الحقيقي. وبالتالي يكون النص الناتح خالي من التكرار، أو أي كلمات أو عبارات غير لائقة أو ما شابه. وهذا ما يجعله أول مولّد نص لوريم إيبسوم حقيقي على الإنترنت.`,
       englishItemList,
-      arabicItemList
+      arabicItemList,
     }
   },
   template: `
@@ -85,7 +83,7 @@ const DefaultContent = (args) => ({
         <div
           id="scrollspy-nested"
         >
-          <h4 id="item-1">Section one heading</h4>
+          <h2 id="item-1">Section one heading</h2>
           <p>{{ text }}</p>
           <p>{{ text }}</p>
           <p>{{ text }}</p>
@@ -94,7 +92,7 @@ const DefaultContent = (args) => ({
           <p>{{ text }}</p>
           <p>{{ text }}</p>
           <p>{{ text }}</p>
-          <h4 id="item-2">Section two heading spans over two lines</h4>
+          <h2 id="item-2">Section two heading spans over two lines</h2>
           <p>{{ text }}</p>
           <p>{{ text }}</p>
           <p>{{ text }}</p>
@@ -102,7 +100,7 @@ const DefaultContent = (args) => ({
           <p>{{ text }}</p>
           <p>{{ text }}</p>
           <p>{{ text }}</p>
-          <h4 id="item-3">Section three heading spans over three lines and is active yellow or green</h4>
+          <h2 id="item-3">Section three heading spans over three lines and is active yellow or green</h2>
           <p>{{ text }}</p>
           <p>{{ text }}</p>
           <p>{{ text }}</p>
@@ -110,7 +108,7 @@ const DefaultContent = (args) => ({
           <p>{{ text }}</p>
           <p>{{ text }}</p>
           <p>{{ text }}</p>
-          <h4 id="item-4">Section four heading</h4>
+          <h2 id="item-4">Section four heading</h2>
           <p>{{ text }}</p>
           <p>{{ text }}</p>
           <p>{{ text }}</p>
@@ -172,7 +170,7 @@ const DefaultContent = (args) => ({
       <scroll-spy v-bind="args" :item-list="args.arabicItemList" />
       </b-col>
     </b-row>
-    </b-container>`
+    </b-container>`,
 })
 
 export const Default = DefaultContent.bind({})

package/src/components/Paragraphs/ScrollSpy/index.vue

@@ -17,55 +17,48 @@
   </section-group>
 </template>
 
-<script>
+<script setup>
 import SectionGroup from '../../Containers/SectionGroup/index.vue'
+import { defineProps } from 'vue'
 import {
   BNavbar,
   BListGroup,
   BListGroupItem,
-  vBScrollspy,
+  vBScrollspy as vBScrollspy,
 } from 'bootstrap-vue-next'
 
-export default {
-  name: 'ScrollSpy',
-  components: { SectionGroup, BNavbar, BListGroup, BListGroupItem },
-  directives: { 'b-scrollspy': vBScrollspy },
-  props: {
-    title: {
-      type: String,
-      default: 'On this page',
-    },
-    itemList: {
-      type: Array,
-      required: true,
-    },
-    rtl: {
-      type: Boolean,
-      default: false,
-    },
-    scrollSpy: {
-      type: Object,
-      default: () => {
-        return {
-          element: 'body',
-          offset: 100,
-          method: 'auto',
-          contentQuery: '[id]',
-        }
-      },
-    },
+const { title, itemList, rtl, scrollSpy } = defineProps({
+  title: {
+    type: String,
+    default: 'On this page',
   },
-  methods: {
-    scrollToAnchor(anchor) {
-      const anchorElement = document.getElementById(anchor)
-      if (anchorElement) {
-        anchorElement.focus()
-        anchorElement.scrollIntoView({
-          behavior: 'smooth',
-        })
-      }
-    },
+  itemList: {
+    type: Array,
+    required: true,
+  },
+  rtl: {
+    type: Boolean,
+    default: false,
+  },
+  scrollSpy: {
+    type: Object,
+    default: () => ({
+      element: 'body',
+      offset: 100,
+      method: 'auto',
+      contentQuery: 'h2[id]',
+    }),
   },
+})
+
+const scrollToAnchor = (anchor) => {
+  const anchorElement = document.getElementById(anchor)
+  if (anchorElement) {
+    anchorElement.focus()
+    anchorElement.scrollIntoView({
+      behavior: 'smooth',
+    })
+  }
 }
 </script>
 

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

@@ -284,7 +284,8 @@ export default {
           this.type === "paragraph--resource_group" ||
           this.type === "paragraph--resource_list"
         ) {
-          allCards.cards = this.sortByDate(allCards.cards);
+          // allCards.cards = this.sortByDate(allCards.cards);
+          allCards.cards = allCards.cards;
         }
       }
       return allCards;

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

@@ -151,8 +151,6 @@ export default {
       return value;
     },
     handleSelect(card) {
-      debugger;
-
       const isSolar = this.googleSearchFlag === "solar";
       const link = card?.selectedCard?.link;
       const openInNewTab = card?.ev?.ctrlKey || card?.ev?.metaKey;

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

@@ -274,8 +274,6 @@ export default {
       }
     },
     onChange(e) {
-      //debugger
-
       if (this.searchQuery && this.searchQuery.length > 2) {
         this.onSearch(e);
       }

package/src/mock/asbestos-removalists.js

@@ -6,7 +6,7 @@ export const arData = [
         Phone: '0404073745',
         CompanyMobile: '0404 073 745',
         CompanyEmailDisp: 'ads.asbestos@gmail.com',
-        CompanyWebURLDisp: 'www.adsasbestosremoval.com.au',
+        CompanyWebURLDisp: 'adsasbestosremoval.com.au',
         ContactFirstName: 'Ivan',
         ContactLastName: 'Silva',
         ContactPhoneDisp: '0404073745',
@@ -103,8 +103,8 @@ export const arData = [
         CompanyMobile: '0404 073 745',
         CompanyEmailDisp: 'ads.asbestos@gmail.com',
         CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
-        ContactFirstName: 'Ivan',
-        ContactLastName: 'Silva',
+        ContactFirstName: '',
+        ContactLastName: '',
         ContactPhoneDisp: '0404073745',
         ContactEmail: 'ads.asbestos@gmail.com',
         ContactMobileDisp: '1300 064 277',
@@ -121,7 +121,7 @@ export const arData = [
         CompanyWebURLDisp: 'http://www.adsasbestosremoval.com.au',
         ContactFirstName: 'Ivan',
         ContactLastName: 'Silva',
-        ContactPhoneDisp: '0404073745',
+        ContactPhoneDisp: '',
         ContactEmail: 'ads.asbestos@gmail.com',
         ContactMobileDisp: '1300 064 277',
         ServiceAll: 'Class A - Restricted - Asbestos Removalists',
@@ -138,7 +138,7 @@ export const arData = [
         ContactFirstName: 'Ivan',
         ContactLastName: 'Silva',
         ContactPhoneDisp: '0404073745',
-        ContactEmail: 'ads.asbestos@gmail.com',
+        ContactEmail: '',
         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.',
@@ -155,7 +155,7 @@ export const arData = [
         ContactLastName: 'Silva',
         ContactPhoneDisp: '0404073745',
         ContactEmail: 'ads.asbestos@gmail.com',
-        ContactMobileDisp: '1300 064 277',
+        ContactMobileDisp: '',
         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.',
      },
@@ -167,11 +167,11 @@ export const arData = [
         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',
+        ContactFirstName: '',
+        ContactLastName: '',
+        ContactPhoneDisp: '',
+        ContactEmail: '',
+        ContactMobileDisp: '',
         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.',
      },

package/src/mock/course-provider.js

@@ -7,7 +7,7 @@ export const hscpData = [
         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',
+        Website: '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',
@@ -26,7 +26,7 @@ export const hscpData = [
         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',
+        Website: 'http://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',