diff --git a/src/App.vue b/src/App.vue
index 20a9d70..8db07b8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,6 +12,7 @@ import FormReply from "@/components/FormReply.vue";
import TicketApi from "@/services/TicketApi.js";
import FetchIcon from "@/components/base/FetchIcon.vue";
import FormSearch from "@/components/FormSearch.vue";
+import {apiCounter} from "@/setup/global.js";
const store = useGlobalStore()
const storeTicket = useTicketStore();
@@ -25,7 +26,7 @@ const {
currentTicket,
} = storeToRefs(storeTicket)
-const apiCounter = ref(0)
+
const archivePeriod = ref('ALL')
const archiveFetching = ref(false)
@@ -177,7 +178,7 @@ const refreshTicketList = async () => {
diff --git a/src/components/FormSearch.vue b/src/components/FormSearch.vue
index 464e00e..681022e 100644
--- a/src/components/FormSearch.vue
+++ b/src/components/FormSearch.vue
@@ -2,31 +2,35 @@
import BaseInput from "@/components/BaseElements/BaseInput.vue";
import {ref} from "vue";
import TicketApi from "@/services/TicketApi.js";
+import {useTicketStore} from "@/stores/ticket.js";
+const storeTicket = useTicketStore();
+import {apiCounter} from "@/setup/global.js";
-const lastName = ref(null)
-const firstName = ref(null)
-const email = ref(null)
-const id = ref(null)
-const dateFrom = ref(null)
-const dateTo = ref(null)
+const lastName = ref('')
+const firstName = ref('')
+const email = ref('')
+const codeFiche = ref('')
+const dateFrom = ref('')
+const dateTo = ref('')
const search =async () => {
- await TicketApi.searchTickets(lastName.value, firstName.value, email.value, id.value, null, null)
+ storeTicket.ticketList['search_tickets'] = await TicketApi.searchTickets(lastName.value, firstName.value, email.value, codeFiche.value, dateFrom.value, dateTo.value)
+ apiCounter.value++
}
-
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/src/services/TicketApi.js b/src/services/TicketApi.js
index 65f3836..86f916a 100644
--- a/src/services/TicketApi.js
+++ b/src/services/TicketApi.js
@@ -177,7 +177,7 @@ export default {
async archiveTickets(archivePeriod) {
return Api.get('TicketingController', 'archiveTickets', '&archivage_from='+archivePeriod)
},
- async searchTickets(lastName, firstName, email, id, dateFrom, dateTo) {
- return Api.get('TicketingController', 'searchTickets', '&lastName='+lastName+'&firstName='+firstName+'&email='+email+'&id='+id+'&dateFrom='+dateFrom+'&dateTo='+dateTo)
+ async searchTickets(lastName, firstName, email, codeFiche, dateFrom, dateTo) {
+ return Api.get('TicketingController', 'searchTickets', '&lastName='+lastName+'&firstName='+firstName+'&email='+email+'&codeFiche='+codeFiche+'&dateFrom='+dateFrom+'&dateTo='+dateTo)
}
}
diff --git a/src/setup/global.js b/src/setup/global.js
index f26ae74..b08f87c 100644
--- a/src/setup/global.js
+++ b/src/setup/global.js
@@ -6,6 +6,8 @@ export const hideModal = ref(0)
export const suspens = ref(false)
export const messages = ref([])
+export const apiCounter = ref(0)
+
export const moveToBottom = async (id) => {
await nextTick()
const objDiv = document.getElementById(id);
diff --git a/src/stores/ticket.js b/src/stores/ticket.js
index a782fe4..ad302f0 100644
--- a/src/stores/ticket.js
+++ b/src/stores/ticket.js
@@ -11,9 +11,9 @@ export const useTicketStore = defineStore('ticket', {
originFilter: 'ALL',
idTicket: 0,
codeTicket: 0,
- searchTickets: [],
}),
getters: {
+ searchTickets: (state) => splitTicketList(state.ticketList, 'search_tickets', state.originFilter),
newTickets: (state) => splitTicketList(state.ticketList, 'new_tickets', state.originFilter),
pendingTickets: (state) => splitTicketList(state.ticketList, 'pending_tickets', state.originFilter),
myTickets: (state) => splitTicketList(state.ticketList, 'my_tickets', state.originFilter),