Merge branch 'main' of https://github.com/bcgov/EDUC-SDCI into extrac…

…tfixes
bcgov · Nov 16, 2023 · 3c83cb8 · 3c83cb8
2 parents 0bfbb82 + 0785025
commit 3c83cb8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/frontend/src/index.d.ts b/frontend/src/index.d.ts
@@ -1 +1 @@
-declare module 'jsonexport/dist';
+declare module 'jsonexport/dist';
diff --git a/frontend/src/views/AuthorityView.vue b/frontend/src/views/AuthorityView.vue
@@ -5,7 +5,7 @@ import router from '@/router'
 import { useAppStore } from '@/stores/app'
 import { useRoute } from 'vue-router'
 import { formatPhoneNumber } from '@/utils/common'
-import * as jsonexport from 'jsonexport/dist'
+import jsonexport from 'jsonexport/dist'
 import type { Authority, School, Address } from '@/types/types.d.ts'
 import { useSanitizeURL } from '@/composables/string'
 

diff --git a/frontend/src/views/ContactsView.vue b/frontend/src/views/ContactsView.vue
@@ -2,7 +2,7 @@
 import { useAppStore } from '@/stores/app'
 import { ref } from 'vue'
 import InstituteService from '@/services/InstituteService'
-import * as jsonexport from 'jsonexport/dist'
+import jsonexport from 'jsonexport/dist'
 
 const appStore = useAppStore()
 // used for open and close modal
@@ -68,7 +68,14 @@ const searchContact = async () => {
       operation: 'eq',
       value: selectedContactType.value,
       valueType: 'STRING',
-      condition: 'OR'
+      condition: 'AND'
+    })
+    params[0].searchCriteriaList.push({
+      key: 'expiryDate',
+      operation: 'eq',
+      value: null,
+      valueType: 'STRING',
+      condition: 'AND'
     })
   }
   const jsonString = JSON.stringify(params)

diff --git a/frontend/src/views/DistrictView.vue b/frontend/src/views/DistrictView.vue
@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router'
 import router from '@/router'
 import { formatPhoneNumber } from '@/utils/common'
 import type { District, School, Grade, Address, Contact } from '@/types/types.d.ts'
-import * as jsonexport from 'jsonexport/dist'
+import jsonexport from 'jsonexport/dist'
 import { useSanitizeURL } from '@/composables/string'
 // import common components
 import DisplayAddress from '@/components/common/DisplayAddress.vue'

diff --git a/frontend/src/views/SchoolView.vue b/frontend/src/views/SchoolView.vue
@@ -5,7 +5,7 @@ import router from '@/router'
 import InstituteService from '@/services/InstituteService'
 import { useAppStore } from '@/stores/app'
 import type { School, Grade } from '@/types/types.d.ts'
-import * as jsonexport from 'jsonexport/dist'
+import jsonexport from 'jsonexport/dist'
 import { distNumberFromMincode, formatPhoneNumber } from '@/utils/common'
 import DisplayAddress from '@/components/common/DisplayAddress.vue'
 import { useSanitizeURL } from '@/composables/string'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		declare module 'jsonexport/dist';
		declare module 'jsonexport/dist';