Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
SIGPUBLIC
unantes-orientation-active
Commits
d46e1cee
Commit
d46e1cee
authored
Jul 15, 2021
by
Kevin Robert
Browse files
UNOTOPLYS-278 : divers correctifs d'affichages.
parent
fc1a7301
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/main/webapp/app/components/screen-item/conditions/hasanswer-condition/hasanswer-condition.vue
View file @
d46e1cee
...
...
@@ -2,8 +2,8 @@
<div>
<autocomplete
:items=
"questions"
:label=
"$t('screen.item.conditions.answer.question.label')"
:helpText=
"$t('screen.item.conditions.answer.question.helpText')"
:label=
"$t('screen.item.conditions.answer
s
.question.label')"
:helpText=
"$t('screen.item.conditions.answer
s
.question.helpText')"
:value=
"selectedQuestionLabel"
@
selected=
"selectQuestion"
/>
...
...
src/main/webapp/app/components/screen-item/conditions/hasnoanswer-condition/hasnoanswer-condition.vue
View file @
d46e1cee
<
template
>
<autocomplete
:items=
"questions"
:label=
"$t('screen.item.conditions.answer.question.label')"
:helpText=
"$t('screen.item.conditions.answer.question.helpText')"
:label=
"$t('screen.item.conditions.answer
s
.question.label')"
:helpText=
"$t('screen.item.conditions.answer
s
.question.helpText')"
:value=
"selectedQuestionLabel"
@
selected=
"selectQuestion"
/>
...
...
src/main/webapp/app/components/screen-item/item-conditions.component.ts
View file @
d46e1cee
...
...
@@ -43,10 +43,20 @@ export default class ItemConditions extends Vue {
document
.
removeEventListener
(
'
click
'
,
this
.
handleClickOutside
);
}
/**
* Récupération des conditions affichables.
*/
public
get
conditionTypes
()
{
return
ConditionTypes
;
}
/**
* Vérification du type de condition pour savoir s'il est ajoutable.
*/
public
isAddable
(
conditionType
)
{
return
conditionType
!==
ConditionTypes
.
ADVANCED
;
}
public
handleClickOutside
(
event
)
{
if
(
!
this
.
$el
.
contains
(
event
.
target
))
{
this
.
displayAddCondition
=
false
;
...
...
src/main/webapp/app/components/screen-item/item-conditions.vue
View file @
d46e1cee
...
...
@@ -40,7 +40,7 @@
<
/button
>
<
div
class
=
"
relative
"
>
<
ul
class
=
"
absolute pb-2 bottom-10 text-sm bg-white border rounded-md
"
id
=
"
pop0
"
v
-
show
=
"
displayAddCondition
"
>
<
li
v
-
for
=
"
(type, key) in conditionTypes
"
:
key
=
"
key
"
>
<
li
v
-
for
=
"
(type, key) in conditionTypes
"
:
key
=
"
key
"
v
-
if
=
"
isAddable(type)
"
>
<
button
class
=
"
w-full px-4 py-1 text-left text-blue-600 hover:bg-blue-100 hover:text-blue-900
"
@
click
=
"
addCondition(type)
"
>
{{
$t
(
`screen.item.conditions.types.${type
}
`
)
}}
<
/button
>
...
...
src/main/webapp/i18n/fr/screen.json
View file @
d46e1cee
...
...
@@ -75,7 +75,7 @@
"advanced"
:
"Autre cas (saisie manuelle)"
,
"answers"
:
"Réponses sélectionnées"
,
"hasAnswer"
:
"Question répondue"
,
"
notHas
Answer"
:
"Question non répondue"
,
"
hasNo
Answer"
:
"Question non répondue"
,
"value"
:
"Valeur d’une variable"
},
"advanced"
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment