Skip to content

Commit 3c23b91

Browse files
authored
Merge pull request #376 from AgenceBio/maud/retours_hors_ligne_thomas
Petits fix sur le hors-ligne
2 parents 3b72be5 + 5182de2 commit 3c23b91

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

src/components/ActionDropdown.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ const { direction, lengthY } = useSwipe(
3434
} else {
3535
down.value = '16px'
3636
}
37-
console.log(down.value)
3837
},
3938
onSwipeEnd: () => {
4039
if (lengthY.value < -30) {

src/components/MainHeader.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
<div class="fr-notice__body">
157157
<p class="fr-notice__title">
158158
<b>Vous êtes actuellement hors ligne.</b> Seules les exploitations dont le parcellaire a été
159-
téléchargé en amont sont visibles. Certaines fonctionnalités être indisponibles.
159+
téléchargé en amont sont visibles. Certaines fonctionnalités sont indisponibles.
160160
</p>
161161
</div>
162162
</div>

src/main.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,13 @@ router.isReady().then(() => {
149149
})
150150

151151
router.beforeEach(async (to) => {
152+
const { useRecordStore } = await import('@/stores/record.js')
153+
const recordStore = useRecordStore()
152154
// Preload stores for checking permissions
153155
if (to.params.recordId) {
154-
const { useRecordStore } = await import('@/stores/record.js')
155-
const recordStore = useRecordStore()
156156
await recordStore.ready(to.params.recordId) // will load also the operator
157157
} else if (to.params.numeroBio) {
158+
recordStore.$reset()
158159
const { useOperatorStore } = await import('@/stores/operator.js')
159160
const operatorStore = useOperatorStore()
160161
await operatorStore.ready(to.params.numeroBio)

src/pages/certification/exploitations/index.vue

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,12 @@ meta:
5555
<col width="30%" />
5656
</colgroup>
5757
<thead>
58-
<th scope="col" :aria-sort="sortAttribute('nom')" class="table-header-nom"><TableSort :show-control="showOptionalControl" code="nom" v-model="sortOrder" @update:modelValue="v => updateQuery({ ...v, page: 1 })">Exploitation</TableSort></th>
59-
<th scope="col" :aria-sort="sortAttribute('engagement_date')" class="table-header-engagement_date fr-text--align-right"><TableSort :show-control="showOptionalControl" code="engagement_date" v-model="sortOrder" @update:modelValue="v => updateQuery({ ...v, page: 1 })">Début de conversion</TableSort></th>
60-
<th scope="col" :aria-sort="sortAttribute('audit_date')" class="table-header-audit_date fr-text--align-right"><TableSort code="audit_date" v-model="sortOrder" @update:modelValue="v => updateQuery({ ...v, page: 1 })">Date de l'audit</TableSort></th>
61-
<th scope="col" :aria-sort="sortAttribute('statut')" class="table-header-statut fr-text--align-right"><TableSort code="statut" v-model="sortOrder" @update:modelValue="v => updateQuery({ ...v, page: 1 })">Statut</TableSort></th>
58+
<tr>
59+
<th scope="col" :aria-sort="sortAttribute('nom')" class="table-header-nom"><TableSort :show-control="showOptionalControl" code="nom" v-model="sortOrder" @update:modelValue="v => updateQuery({ ...v, page: 1 })">Exploitation</TableSort></th>
60+
<th scope="col" :aria-sort="sortAttribute('engagement_date')" class="table-header-engagement_date fr-text--align-right"><TableSort :show-control="showOptionalControl" code="engagement_date" v-model="sortOrder" @update:modelValue="v => updateQuery({ ...v, page: 1 })">Début de conversion</TableSort></th>
61+
<th scope="col" :aria-sort="sortAttribute('audit_date')" class="table-header-audit_date fr-text--align-right"><TableSort code="audit_date" v-model="sortOrder" @update:modelValue="v => updateQuery({ ...v, page: 1 })">Date de l'audit</TableSort></th>
62+
<th scope="col" :aria-sort="sortAttribute('statut')" class="table-header-statut fr-text--align-right"><TableSort code="statut" v-model="sortOrder" @update:modelValue="v => updateQuery({ ...v, page: 1 })">Statut</TableSort></th>
63+
</tr>
6264
</thead>
6365
<tbody aria-live="polite">
6466
<tr v-if="isSearching">
@@ -195,7 +197,7 @@ const error = ref('')
195197
const isSearching = ref(false)
196198
const searchResults = ref([])
197199
const operators = computed(() => isOnline.value ? searchResults.value : Object.entries(storage.operators).map(
198-
([, { operator }]) => operator
200+
([, { records, operator }]) => ({ ...operator, ...records[0] })
199201
))
200202
201203
// controlled by the form

0 commit comments

Comments
 (0)