diff --git a/src/assets/scss/components/evaluation.scss b/src/assets/scss/components/evaluation.scss index d0e8997..77232b1 100644 --- a/src/assets/scss/components/evaluation.scss +++ b/src/assets/scss/components/evaluation.scss @@ -15,4 +15,17 @@ display: flex; flex-direction: column; gap: 7px; + padding: 10px; + background-color: #efefef; + font-size: 14px; + + ul { + margin: 0; + padding-left: 15px; + + li a { + text-decoration: underline; + color: var(--global-textColor); + } + } } \ No newline at end of file diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js index 62af681..576f38d 100644 --- a/src/pages/DomandaEditPreInstructor/index.js +++ b/src/pages/DomandaEditPreInstructor/index.js @@ -186,19 +186,32 @@ const DomandaEditPreInstructor = () => { const displayCriterionData = (id) => { const criterion = head(data.criteria.filter(o => o.id === id)); - console.log(id, criterion); setCriterionDataTitle(criterion.label); const content =

{__('I campi correlati')}

- {criterion.criteriaMappedFields.map(o =>
- {o.fieldLabel} - {o.fieldValue} -
)} + {criterion.criteriaMappedFields.map(o => criteriaDataItem(o))}
; setCriterionDataContent(content); setIsVisibleCriterionData(id); } + const criteriaDataItem = (item) => { + const content = is(String, item.fieldValue) + ? item.fieldValue + : item.fieldValue && item.fieldValue.length + ? + : null; + + return
+ {item.fieldLabel} + {content} +
+ } + const hideCriterionData = () => { setIsVisibleCriterionData(0); setCriterionDataTitle('');