Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Amélioration UI liste des aides #4672

Open
wants to merge 1 commit into
base: refacto-back-button
Choose a base branch
from
Open

Amélioration UI liste des aides #4672

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 82 additions & 35 deletions src/views/liste-aides.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,64 @@
>
Retour à l'accueil
</BackButton>
<p>Total: {{ benefitsCount }} aides</p>
<div class="fr-form-group">
<div class="fr-container fr-px-0">
<div class="fr-grid-row">
<div class="fr-col-12">
<label class="fr-label" for="cp-input"
>Filtrer par code postal ou mots-clés :</label
>
</div>
<div class="fr-col-12 fr-col-md-6 fr-col-lg-4">
<input
id="cp-input"
v-model="zipCode"
type="text"
class="fr-input"
@keyup.enter="computeDataSelected"
/>
</div>
<div v-if="selectedCommune" class="fr-col-12">
<p class="fr-text--bold fr-mt-2w"
>{{ countFilteredBenefits() }} aides disponibles pour la commune
de {{ selectedCommune.nom }}</p
>
</div>
<div>
<p class="fr-badge fr-mb-2w">Total : {{ benefitsCount }} aides</p>
</div>
<div class="fr-grid-row fr-grid-row--gutters">
<div class="fr-col-12 fr-col-md-6">
<div class="fr-form-group">
<label class="fr-label" for="zipcode-input"
>Filtrer par code postal :</label
>
<input
id="zipcode-input"
v-model="zipCode"
type="text"
class="fr-input"
placeholder="Ex: 75001"
maxlength="5"
@input="computeZipCode"
/>
</div>
</div>
<div class="fr-col-12 fr-col-md-6">
<div class="fr-form-group">
<label class="fr-label" for="keyword-input"
>Rechercher par mots-clés :</label
>
<input
id="keyword-input"
v-model="searchTerms"
type="text"
class="fr-input"
placeholder="Ex: logement, vélo, bafa"
@input="computeKeywords"
/>
</div>
</div>
</div>

<div
v-if="selectedCommune || searchTerms"
class="fr-alert fr-mt-3w"
:class="alertClass"
>
<p v-if="countFilteredBenefits() > 0">
{{ countFilteredBenefits() }} aides disponibles
<span v-if="selectedCommune">
pour la commune de {{ selectedCommune.nom }}
</span>
<span v-else-if="searchTerms">
pour la recherche "{{ searchTerms }}"
</span>
</p>
<p v-else>
Aucune aide trouvée
<span v-if="selectedCommune"> pour le code postal {{ zipCode }} </span>
<span v-else-if="searchTerms"> pour "{{ searchTerms }}" </span>
</p>
</div>

<div v-for="(institutions, type) in institutionsGroups" :key="type">
<h2 :id="`liste_${type}`">{{ types[type] }}</h2>
<p>
Expand Down Expand Up @@ -94,9 +124,9 @@ import { Commune } from "@lib/types/commune.d.js"
import { capitalize } from "@lib/utils.js"
import BackButton from "@/components/buttons/back-button.vue"

const zipCode = ref("")
const selectedCommune = ref<Commune | null>()
const searchTerms = ref<string | null>()
const zipCode = ref<string | null>(null)
const selectedCommune = ref<Commune | null>(null)
const searchTerms = ref<string | null>(null)
const benefitsCount = ref(process.env.VITE_BENEFIT_COUNT)
const types = {
national: "Aides nationales",
Expand Down Expand Up @@ -152,18 +182,31 @@ const institutionsGroups = computed(() => {
}
return institutionsBenefits
})
async function computeDataSelected() {
if (zipCode.value.match(/^[0-9]{5}$/)) {

async function computeZipCode() {
if (zipCode.value && zipCode.value.length > 2) {
const res = await CommuneMethods.get(zipCode.value)
selectedCommune.value = res[0]
} else {
selectedCommune.value = null
searchTerms.value = zipCode.value.toLowerCase()
}
}
watch(zipCode, (newZipCode: string) => {
if (newZipCode.length > 2) {
computeDataSelected()

async function computeKeywords() {
if (searchTerms.value && searchTerms.value.length > 2) {
const res = await CommuneMethods.get(searchTerms.value)
selectedCommune.value = res[0]
}
}

watch(zipCode, (newZipCode: string | null) => {
if (newZipCode && newZipCode.length > 2) {
computeZipCode()
searchTerms.value = null
}
})
watch(searchTerms, (newSearchTerms: string | null) => {
if (newSearchTerms && newSearchTerms.length > 2) {
computeKeywords()
zipCode.value = null
}
})
function countFilteredBenefits(): number {
Expand All @@ -178,4 +221,8 @@ function countFilteredBenefits(): number {
)
}, 0)
}

const alertClass = computed(() =>
countFilteredBenefits() > 0 ? "fr-alert--success" : "fr-alert--error"
)
</script>
Loading