Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
leximpact-dotations-ui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
leximpact
Simulateur dotations aux communes
leximpact-dotations-ui
Commits
01b6b6a5
Commit
01b6b6a5
authored
1 month ago
by
sandcha
Browse files
Options
Downloads
Patches
Plain Diff
Supprime la carte de commune et met à jour l'état de l'app au clic sur la croix
parent
00d4fcea
No related branches found
No related tags found
1 merge request
!24
Corrige l'affichage sur petit écran, corrige l'ordre d'affichage des impacts et permet la suppression de carte communale
Pipeline
#21523
failed
1 month ago
Stage: install
Stage: check
Stage: deploy
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/lib/components/impact/Card.svelte
+10
-9
10 additions, 9 deletions
src/lib/components/impact/Card.svelte
src/lib/components/impact/CardsBoard.svelte
+1
-6
1 addition, 6 deletions
src/lib/components/impact/CardsBoard.svelte
src/lib/state.svelte.ts
+6
-0
6 additions, 0 deletions
src/lib/state.svelte.ts
with
17 additions
and
15 deletions
src/lib/components/impact/Card.svelte
+
10
−
9
View file @
01b6b6a5
<script
lang=
"ts"
>
import
{
removeBaseCasType
}
from
"
$lib/state.svelte
"
import
Accordion
from
"
../common/accordion/Accordion.svelte
"
import
AccordionItem
from
"
../common/accordion/AccordionItem.svelte
"
...
...
@@ -14,7 +15,6 @@
iconAltDescription
=
""
,
accordion
=
false
,
showDeleteButton
=
false
,
onDeleteButtonClick
,
headerBackgroundColor
=
"
bg-white
"
,
children
,
}:
{
...
...
@@ -25,25 +25,26 @@
iconAltDescription
?:
string
accordion
?:
boolean
showDeleteButton
?:
boolean
onDeleteButtonClick
?:
()
=>
void
headerBackgroundColor
?:
string
children
():
any
}
=
$props
()
//contentComponent: typeof Table | typeof Summary | undefined
$inspect
(
title
,
subTitle
)
function
onDeleteButtonClick
()
{
// TODO utiliser le code INSEE pour plus de précision
// (et contourner l'erreur communes nouvelles de territoires :
// https://git.leximpact.dev/leximpact/territoires/territoires/-/issues/4)
removeBaseCasType
(
title
)
}
</script>
{
#snippet
deleteButton
()
}
<button
class=
"text-gray-400 hover:text-le-bleu focus:outline-none"
aria-label=
"Supprimer la carte"
onclick=
{
()
=>
onDeleteButtonClick
?
onDeleteButtonClick
()
:
console
.
error
(
"
Erreur inattendue. Aucune fonction n'est rattachée au bouton de suppression de la carte.
"
,
)
}
onclick=
{
()
=>
onDeleteButtonClick
()
}
>
<iconify-icon
icon=
"ri-close-line"
class=
"max-h-40 align-[-0.2rem] text-xl"
></iconify-icon>
...
...
@@ -94,7 +95,7 @@
<span
class=
"flex w-full justify-between text-xl font-bold text-gray-600"
>
{
title
}
{
title
.
toUpperCase
()
}
{
#if
showDeleteButton
}
{
@
render
deleteButton
()
}
{
/if
}
...
...
This diff is collapsed.
Click to expand it.
src/lib/components/impact/CardsBoard.svelte
+
1
−
6
View file @
01b6b6a5
...
...
@@ -130,10 +130,6 @@
function
keepOneDecimal
(
value
:
number
)
{
return
Math
.
round
(
value
*
10
)
/
10
}
function
onDeleteButtonClick
()
{
alert
(
"
fermer
"
)
}
</script>
<div
class=
"flex w-full justify-center"
>
...
...
@@ -219,7 +215,7 @@
En lien avec une erreur sur le communes nouvelles de l'API territoires.
-->
<Card
title=
{
commune
.
nomCommune
.
toUpperCase
()
}
title=
{
commune
.
nomCommune
}
subTitle=
{
commune
.
codeInseeDepartement
&&
commune
.
codeInseeDepartement
!=
"
None
"
?
"
Département
"
+
commune
.
codeInseeDepartement
...
...
@@ -227,7 +223,6 @@
icon=
{
undefined
}
iconAltDescription=
{
undefined
}
showDeleteButton=
{
true
}
{
onDeleteButtonClick
}
accordion=
{
false
}
headerBackgroundColor=
"bg-le-gris-commune"
>
...
...
This diff is collapsed.
Click to expand it.
src/lib/state.svelte.ts
+
6
−
0
View file @
01b6b6a5
...
...
@@ -122,6 +122,12 @@ export function updateBaseCasTypes(newCasTypes: Commune[]) {
userState
.
base
.
casTypes
=
newCasTypes
}
export
function
removeBaseCasType
(
communeName
:
string
)
{
userState
.
base
.
casTypes
=
userState
.
base
.
casTypes
.
filter
(
(
c
)
=>
c
.
nomCommune
!==
communeName
)
}
export
function
amendementExists
():
boolean
{
return
(
userState
.
amendement
&&
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment