Skip to content

Commit 6c35a9d

Browse files
merge
1 parent ca36930 commit 6c35a9d

File tree

5 files changed

+40
-38
lines changed

5 files changed

+40
-38
lines changed

app/src/components/searchfilters/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<template lang="pug" @keypress="addFilter">
1+
<template lang="pug" @keypress.enter="addFilter">
22
.q-ma-sm
33
tk-SearchfiltersMain(ref="mainData")
44
//Filters chips

app/src/layouts/default.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template lang="pug">
22
q-layout
3-
tk-appbar
4-
q-page-container
5-
nuxt-page
6-
tk-footer
3+
tk-appbar
4+
q-page-container
5+
nuxt-page
6+
tk-footer
77
</template>

app/src/pages/ticket/[id].vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<template lang="pug">
22
.column
3-
.row.q-gutter-lg.items-center
3+
.row.q-my-md.q-px-sm
44
q-breadcrumbs
55
q-breadcrumbs-el(to="/") Accueil
66
q-breadcrumbs-el(to="/tickets") Tickets
77
q-breadcrumbs-el(:label="ticketData.data.sequence")
8-
.row.q-gutter-md.col-11
8+
.row.q-gutter-md(style={'min-height': 'auto'})
99
.col-2
1010
tk-ticketLeftPanel
1111
.col-6
@@ -21,7 +21,9 @@ import { useHttpApi } from '~/composables/useHttpApi';
2121
2222
const route = useRoute()
2323
const id = ref<string>('')
24-
const { data: ticketData } = await useHttpApi(`tickets/ticket/${route.params.id}`)
24+
const { data: ticketData } = await useHttpApi(`/tickets/ticket/${route.params.id}`, {
25+
method: 'get'
26+
})
2527
2628
onMounted(async () => {
2729

app/src/pages/tickets.vue

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -80,27 +80,27 @@ const route = useRoute()
8080
const router = useRouter()
8181
8282
const { data: tickets, pending, refresh, error } = await useHttpApi('/tickets/ticket', {
83-
method: 'get',
84-
query: computed(() => {
85-
return {
86-
...route.query,
87-
}
88-
})
89-
})
83+
method: 'get',
84+
query: computed(() => {
85+
return {
86+
...route.query,
87+
}
88+
})
89+
}).catch((err) => console.error(err))
9090
const { data: categories, pending: categoriesPending, refresh: categoriesRefresh, error: categoriesError } = await useHttpApi('/core/categories', {
91-
method: 'get',
91+
method: 'get'
9292
})
9393
const { data: states, pending: statesPending, refresh: statesRefresh, error: statesError } = await useHttpApi('/tickets/state', {
94-
method: 'get',
94+
method: 'get'
9595
})
9696
9797
onMounted(async () => {
98-
pagination.value!.rowsNumber = tickets.total
99-
const query = { ...route.query }
100-
const limit = query.limit ?? 10
101-
const skip = query.skip ?? 0
102-
pagination.value!.rowsPerPage = parseInt(limit as string)
103-
pagination.value!.page = parseInt(skip as string) / parseInt(limit as string) + 1
98+
pagination.value!.rowsNumber = tickets.value?.total
99+
const query = { ...route.query }
100+
const limit = query.limit ?? 10
101+
const skip = query.skip ?? 0
102+
pagination.value!.rowsPerPage = parseInt(limit as string)
103+
pagination.value!.page = parseInt(skip as string) / parseInt(limit as string) + 1
104104
105105
let sortKey = 'updatedAt'
106106
let sortDirection = 'desc'
@@ -225,13 +225,13 @@ const pagination = ref<QTableProps['pagination']>({
225225
})
226226
227227
const onRequest = async (props: any) => {
228-
const { page, rowsPerPage, sortBy, descending } = props.pagination
229-
pagination.value!.rowsNumber = tickets.total
230-
pagination.value!.page = page
231-
pagination.value!.rowsPerPage = rowsPerPage
232-
pagination.value!.sortBy = sortBy
233-
pagination.value!.descending = descending
234-
paginationQuery()
228+
const { page, rowsPerPage, sortBy, descending } = props.pagination
229+
pagination.value!.rowsNumber = tickets.value?.total
230+
pagination.value!.page = page
231+
pagination.value!.rowsPerPage = rowsPerPage
232+
pagination.value!.sortBy = sortBy
233+
pagination.value!.descending = descending
234+
paginationQuery()
235235
}
236236
237237
const paginationQuery = () => {
@@ -282,10 +282,10 @@ const fieldsList = computed(() => {
282282
})
283283
284284
const getState = (state: { id: string, name: string }) => {
285-
const findedState = states.value.data.find((s: any) => {
286-
return s._id === state.id
287-
})
288-
return findedState
285+
const findedState = states.value?.data.find((s: any) => {
286+
return s._id === state.id
287+
})
288+
return findedState
289289
}
290290
291291
const getType = (type: number) => {

service/src/app.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ import { EventEmitterModule } from '@nestjs/event-emitter'
8989
providers: [
9090
AppService,
9191
ShutdownService,
92-
{
93-
provide: APP_GUARD,
94-
useClass: AuthGuard,
95-
},
92+
// {
93+
// provide: APP_GUARD,
94+
// useClass: AuthGuard,
95+
// },
9696
{
9797
provide: APP_FILTER,
9898
useClass: MongooseValidationFilter,

0 commit comments

Comments
 (0)