Skip to main content
Homepage
Explore
Search or go to…
/
Register
Sign in
Explore
Primary navigation
Project
L
leximpact-socio-fiscal-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
?
Collapse sidebar
Snippets
Groups
Projects
Show more breadcrumbs
leximpact
Simulateur socio-fiscal
leximpact-socio-fiscal-ui
Commits
9e98d0ed
Commit
9e98d0ed
authored
Sep 9, 2021
by
Dorine Lambinet
Browse files
Options
Downloads
Patches
Plain Diff
Réduit la hauteur de l'éditeur de cas type
parent
79139db6
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!37
Améliore l'UI d'édition du cas type
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/lib/components/test_cases/RolePersonsEdit.svelte
+1
-1
1 addition, 1 deletion
src/lib/components/test_cases/RolePersonsEdit.svelte
src/lib/components/test_cases/TestCaseEdit.svelte
+145
-141
145 additions, 141 deletions
src/lib/components/test_cases/TestCaseEdit.svelte
with
146 additions
and
142 deletions
src/lib/components/test_cases/RolePersonsEdit.svelte
+
1
−
1
View file @
9e98d0ed
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
{
#each
[...
iterItemIdAndPersonCouples
(
personById
,
items
)]
as
{
id
,
person
}
(
id
)
}
{
#each
[...
iterItemIdAndPersonCouples
(
personById
,
items
)]
as
{
id
,
person
}
(
id
)
}
<li
<li
animate:flip=
{
{
duration
:
flipDurationMs
}}
animate:flip=
{
{
duration
:
flipDurationMs
}}
class
=
"
bg-gray-200 rounded-3xl w-28
py-1
text-center text-gray-700
text-sm font-semibold my-
2
"
class
=
"
bg-gray-200 rounded-3xl w-28 text-center text-gray-700 text-sm font-semibold my-
1
"
>
>
<
div
class
=
"
group flex items-center justify-between ml-4 mr-2
"
>
<
div
class
=
"
group flex items-center justify-between ml-4 mr-2
"
>
<
div
>
<
div
>
...
...
...
...
This diff is collapsed.
Click to expand it.
src/lib/components/test_cases/TestCaseEdit.svelte
+
145
−
141
View file @
9e98d0ed
...
@@ -394,12 +394,14 @@
...
@@ -394,12 +394,14 @@
</script>
</script>
<h3
class=
"font-bold text-xl mx-5"
>
Composition du cas type
:
</h3>
<h3
class=
"font-bold text-xl mx-5"
>
Composition du cas type
:
</h3>
<section
class=
"bg-white border-gray-200 p-2 m-3 rounded-sm mx-5"
>
<section
class=
"bg-gray-100 border-gray-200 rounded-sm mx-5 my-2 py-2"
>
<div
class=
"flex justify-center gap-2"
>
<div
class=
"flex items-center"
>
<div
class=
"flex items-center"
>
<label
class=
"ml-2 mr-2"
>
<PictoFemme
/>
<label
class=
"mx-2 text-sm"
>
Nombre d'adultes
Nombre d'adultes
<input
<input
class=
"w-10 p-1 rounded
mt-2
focus:border-le-bleu focus:text-le-bleu"
class=
"
text-base
w-10 p-1 rounded focus:border-le-bleu focus:text-le-bleu"
min=
{
1
}
min=
{
1
}
on:change=
{
changeAdultsCount
}
on:change=
{
changeAdultsCount
}
step=
"1"
step=
"1"
...
@@ -407,13 +409,13 @@
...
@@ -407,13 +409,13 @@
value=
{
adultsId
.
length
}
value=
{
adultsId
.
length
}
/>
/>
</label>
</label>
<PictoFemme
/>
</div>
</div>
<div
class=
"flex items-center"
>
<div
class=
"flex items-center"
>
<label
class=
"ml-2 mr-2"
>
<PictoEnfant
/>
<label
class=
"mx-2 text-sm"
>
Nombre d'enfants
Nombre d'enfants
<input
<input
class=
"w-10 p-1 rounded
mt-2
focus:border-le-bleu focus:text-le-bleu"
class=
"
text-base
w-10 p-1 rounded focus:border-le-bleu focus:text-le-bleu"
min=
{
0
}
min=
{
0
}
on:change=
{
changeChildrenCount
}
on:change=
{
changeChildrenCount
}
step=
"1"
step=
"1"
...
@@ -421,13 +423,14 @@
...
@@ -421,13 +423,14 @@
value=
{
childrenId
.
length
}
value=
{
childrenId
.
length
}
/>
/>
</label>
</label>
<
PictoEnfant
/
>
<
/div
>
</div>
</div>
<div
class=
"flex justify-center"
>
{
#each
[...
iterGroupEntities
(
entityByKey
)]
as
groupEntity
}
{
#each
[...
iterGroupEntities
(
entityByKey
)]
as
groupEntity
}
{
#if
!
hiddenEntitiesKeyPlural
.
includes
(
groupEntity
.
key_plural
)
}
{
#if
!
hiddenEntitiesKeyPlural
.
includes
(
groupEntity
.
key_plural
)
}
<section>
<section
class=
"m-2"
>
<h1
class=
"font-bold mt-4 mb-1 text-
lg
"
>
<h1
class=
"font-bold mt-4 mb-1 text-
base
"
>
{
groupEntity
.
composition_label
??
{
groupEntity
.
composition_label
??
groupEntity
.
label_plural
??
groupEntity
.
label_plural
??
groupEntity
.
key_plural
}
:
groupEntity
.
key_plural
}
:
...
@@ -437,7 +440,7 @@
...
@@ -437,7 +440,7 @@
{/if} -->
{/if} -->
{
#if
countGroups
(
situation
,
groupEntity
)
===
1
}
{
#if
countGroups
(
situation
,
groupEntity
)
===
1
}
<div
class=
"mb-3"
>
<div
class=
"mb-3"
>
<label
class=
"text-
base
"
>
<label
class=
"text-
sm
"
>
<input
<input
checked
checked
class=
"rounded"
class=
"rounded"
...
@@ -449,11 +452,11 @@
...
@@ -449,11 +452,11 @@
</label>
</label>
</div>
</div>
{
/if
}
{
/if
}
<ul
class=
"m
l-4
"
>
<ul
class=
"m
r-2
"
>
{
#each
[...
iterGroups
(
situation
,
groupEntity
)]
as
[
groupId
,
group
],
index
(
`${groupEntity.key_plural}.${index}`
)
}
{
#each
[...
iterGroups
(
situation
,
groupEntity
)]
as
[
groupId
,
group
],
index
(
`${groupEntity.key_plural}.${index}`
)
}
<li>
<li>
{
#if
countGroups
(
situation
,
groupEntity
)
>
1
}
{
#if
countGroups
(
situation
,
groupEntity
)
>
1
}
<div
class=
"flex items-center
font-bold mt-4
"
>
<div
class=
"flex items-center
mt-2 text-sm
"
>
<div>
<div>
{
group
.
name
??
groupId
}
:
{
group
.
name
??
groupId
}
:
</div>
</div>
...
@@ -488,9 +491,9 @@
...
@@ -488,9 +491,9 @@
</div>
</div>
{
/if
}
{
/if
}
<dl
class=
"border-l
-2
pl-
4
border-black"
>
<dl
class=
"
ml-2
border-l pl-
2 mt-2
border-black"
>
{
#each
groupEntity
.
roles
as
role
}
{
#each
groupEntity
.
roles
as
role
}
<dt
class=
""
>
<dt
class=
"
text-sm
"
>
{
role
.
label
??
{
role
.
label
??
(
role
.
max
===
undefined
||
role
.
max
>
1
(
role
.
max
===
undefined
||
role
.
max
>
1
?
role
.
key_plural
?
role
.
key_plural
...
@@ -518,11 +521,11 @@
...
@@ -518,11 +521,11 @@
</ul>
</ul>
{
#if
countGroups
(
situation
,
groupEntity
)
>
1
}
{
#if
countGroups
(
situation
,
groupEntity
)
>
1
}
<button
<button
class=
"text-black hover:text-le-bleu
w-64 ml-2
"
class=
"text-black hover:text-le-bleu "
on:click=
{
()
=>
addGroup
(
groupEntity
.
key
)
}
on:click=
{
()
=>
addGroup
(
groupEntity
.
key
)
}
type=
"button"
type=
"button"
>
>
<div
class=
"mt-2 text-
base
flex items-center"
>
<div
class=
"mt-2 text-
sm
flex items-center"
>
<svg
<svg
class=
"fill-current inline mr-1"
class=
"fill-current inline mr-1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns=
"http://www.w3.org/2000/svg"
...
@@ -540,6 +543,7 @@
...
@@ -540,6 +543,7 @@
</section>
</section>
{
/if
}
{
/if
}
{
/each
}
{
/each
}
</div>
</section>
</section>
<section
class=
"border-t border-b-0 border-r-0 border-l-0 mt-5 mx-5"
>
<section
class=
"border-t border-b-0 border-r-0 border-l-0 mt-5 mx-5"
>
...
...
...
...
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