Commit 2c7f6e7e authored by Julien BOUYER's avatar Julien BOUYER
Browse files

Merge branch 'develop' into feature/spel_expression_handling

parents 266dcb0a 966c3162
This diff is collapsed.
......@@ -18,6 +18,11 @@ public class MultipleChoiceItem extends AbstractQuestion {
*/
protected String question = StringUtils.EMPTY;
/**
* Permet de savoir si la réponse est obligatoire.
*/
protected boolean required = false;
/**
* Les choix.
*/
......@@ -58,5 +63,11 @@ public class MultipleChoiceItem extends AbstractQuestion {
this.question = question;
}
public boolean isRequired() {
return required;
}
public void setRequired(boolean required) {
this.required = required;
}
}
......@@ -26,6 +26,7 @@ public class Workspace implements Serializable {
private Long id;
@NotNull
@NotEmpty
@Column(name = "name", nullable = false, unique = true)
private String name;
......
......@@ -27,6 +27,14 @@
</ul>
<component :is="componentForItem" :item="item" @itemEdit="editItem" v-show="itemTab === MAIN_TAB" />
<div v-show="itemTab === SETTINGS_TAB">
<oa-input
v-if="item.type === 'radio' || item.type === 'checkbox'"
:label="$t('screen.item.common.required')"
:value="item.required"
required="true"
type="checkbox"
@update="editItem({ required: $event })"
/>
<oa-input
:label="$t('screen.item.common.reference.label')"
:value="item.reference"
......
......@@ -23,6 +23,7 @@
<tr class="border-b-2">
<th class="p-2 text-left">{{ $t('user.table.nom') }}</th>
<th class="p-2 text-left">{{ $t('user.table.email') }}</th>
<th class="p-2 text-left">{{ $t('user.table.active') }}</th>
<th class="p-2 text-center">{{ $t('user.table.actions') }}</th>
</tr>
</thead>
......@@ -34,6 +35,9 @@
<td class="p-2 text-left">
<a :href="getUserEditLink(user.id)">{{ user.email }}</a>
</td>
<td class="p-2">
<a :href="getUserEditLink(user.id)"><input type="checkbox" :checked="user.activated" disabled /></a>
</td>
<td class="p-2 text-center">
<delete-button :title="$t('variable.confirm.delete')" @confirm="deletePermission(user)" />
</td>
......
......@@ -18,7 +18,7 @@
<a :href="getUserEditLink(user.id)">{{ user.email }}</a>
</td>
<td class="p-2">
<a :href="getUserEditLink(user.id)">{{ user.activated }}</a>
<a :href="getUserEditLink(user.id)"><input type="checkbox" :checked="user.activated" disabled /></a>
</td>
</tr>
</tbody>
......
......@@ -4,7 +4,6 @@
<h1 class="flex-auto text-4xl">{{ $t('variable.settings.title') }}</h1>
</div>
<form v-on:submit.prevent="save()">
<oa-input v-if="idVariable" id="id" label="ID" type="text" :value="variable.id" required="true" disabled="true"></oa-input>
<oa-input id="name" :label="$t('variable.name')" type="text" :value="variable.name" required="true" @update="setName"></oa-input>
<oa-input
id="reference"
......
......@@ -41,6 +41,7 @@
"label": "Référence",
"helpText": "Cette information technique sera notamment utilisée dans les formules"
},
"required": "Réponse obligatoire",
"linkedLabel": {
"label": "Libellé associé",
"helpText": "Ce libellé sera notamment utilisé pour l'export des résultats du questionnaire"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment