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

Réduction de la largeur tableau suivi #139

Merged
merged 3 commits into from
Jan 2, 2025
Merged

Réduction de la largeur tableau suivi #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e8a13e
Fusion colonnes phase et prochaine action attendue de dans le tableau…
DavidBruant Dec 19, 2024
740171c
Tag enjeu
DavidBruant Dec 19, 2024
0ea0fd2
Retire des imports inutiles
Ynote Jan 2, 2025
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
57 changes: 57 additions & 0 deletions scripts/front-end/components/TagEnjeu.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<script>
//@ts-check
/** @type {'écologique' | 'politique'} */
export let enjeu
// https://www.systeme-de-design.gouv.fr/composants-et-modeles/composants/tag/
/** @type {'SM' | 'MD'} */
export let taille = 'MD'
/** @type {string[]} */
export let classes = []
/** @type {Map<typeof enjeu, string>} */
const enjeuToClass = new Map([
['écologique', 'enjeu--écologique'],
['politique', 'enjeu--politique'],
])
/** @type {Map<typeof taille, string>} */
const tailleToClass = new Map([
['SM', 'fr-tag--sm'],
['MD', 'fr-tag--md']
])
$: allClasses = [
'fr-tag',
tailleToClass.get(taille),
enjeuToClass.get(enjeu),
...classes
].filter(x => !!x)
</script>

<p class={allClasses.join(' ')}>{enjeu}</p>

<style lang="scss">
$couleur-enjeu-écologique: var(--background-flat-green-emeraude);
$couleur-enjeu-politique: var(--background-flat-blue-ecume);
p{
white-space: nowrap;
}
p{
&.enjeu--écologique{
background-color: $couleur-enjeu-écologique;
color: var(--text-inverted-blue-ecume);
}
&.enjeu--politique{
background-color: $couleur-enjeu-politique;
color: var(--text-inverted-green-emeraude);
}
}
</style>
9 changes: 3 additions & 6 deletions scripts/front-end/components/screens/Dossier.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import Squelette from '../Squelette.svelte'
import TagPhase from '../TagPhase.svelte'
import TagEnjeu from '../TagEnjeu.svelte'

import {formatLocalisation, formatDéposant, phases, prochaineActionAttendue, prochaineActionAttenduePar} from '../../affichageDossier.js'
import { modifierDossier } from '../../actions/dossier.js';
Expand Down Expand Up @@ -160,15 +161,11 @@
<li>
<strong>Enjeux</strong> :
{#if dossier.enjeu_politique}
<span class="fr-badge fr-badge--sm fr-badge--blue-ecume">
Enjeu politique
</span>
<TagEnjeu enjeu="politique" taille='SM' classes={["fr-mb-1w"]}></TagEnjeu>
{/if}

{#if dossier.enjeu_écologique}
<span class="fr-badge fr-badge--sm fr-badge--green-emeraude">
Enjeu écologique
</span>
<TagEnjeu enjeu="écologique" taille='SM' classes={["fr-mb-1w"]}></TagEnjeu>
{/if}
</li>
{/if}
Expand Down
21 changes: 11 additions & 10 deletions scripts/front-end/components/screens/SuiviInstruction.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import BarreRecherche from '../BarreRecherche.svelte'
import EnteteAvecTri from '../EnteteAvecTri.svelte'
import TagPhase from '../TagPhase.svelte'
import TagEnjeu from '../TagEnjeu.svelte'
import {formatLocalisation, formatDéposant, phases, prochaineActionAttenduePar} from '../../affichageDossier.js'
import {trouverDossiersIdCorrespondantsÀTexte} from '../../rechercherDansDossier.js'
import {retirerAccents} from '../../../commun/manipulationStrings.js'
Expand Down Expand Up @@ -347,8 +348,11 @@
</th>
<th>Enjeux</th>
<th>Rattaché au régime AE</th>
<th>Phase</th>
<th>Prochaine action attendue</th>
<th>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Phase<br>
<br>
Prochaine action attendue de
</th>
</tr>
</thead>
<tbody>
Expand All @@ -366,25 +370,22 @@
<td>{nom_dossier || ''}</td>
<td>
{#if enjeu_politique}
<p class="fr-badge fr-badge--sm fr-badge--blue-ecume">
Enjeu politique
</p>
<TagEnjeu enjeu="politique" taille='SM' classes={["fr-mb-1w"]}></TagEnjeu>
{/if}

{#if enjeu_écologique}
<p class="fr-badge fr-badge--sm fr-badge--green-emeraude">
Enjeu écologique
</p>
<TagEnjeu enjeu="écologique" taille='SM' classes={["fr-mb-1w"]}></TagEnjeu>
{/if}

</td>
<td>
{rattaché_au_régime_ae ? "oui" : "non"}
</td>
<td>
<TagPhase {phase} taille='SM'></TagPhase>
{#if prochaine_action_attendue_par}
<p class="fr-tag fr-tag--sm fr-mt-1w">{prochaine_action_attendue_par}</p>
{/if}
</td>
<td>{prochaine_action_attendue_par || ''}</td>
</tr>
{/each}
</tbody>
Expand Down
Loading