Commit 1a90822e authored by Julien BOUYER's avatar Julien BOUYER
Browse files

Merge branch 'develop' into feature/UNOTOPLYS-172_suppression_ecran

parents 8983876c f7f82a73
......@@ -46,7 +46,7 @@ def orientationActiveDeploymentStep = { defaultStep ->
]
pipelineParams.HELM_TEMPLATE_NAME_APP = 'kosmos-releases/unantes-orientation-active-app'
pipelineParams.HELM_TEMPLATE_VERSION_APP = '0.1.2'
pipelineParams.HELM_TEMPLATE_VERSION_APP = '0.1.3'
defaultStep()
}
......
This diff is collapsed.
insert into scope (id_user, id_role, wildcard) values (3, 4, false);
<<<<<<< HEAD
insert into scope_form (id_scope, id_form) SELECT currval('scope_id_seq'), 1101;
=======
insert into scope_form (id_scope, id_form) (SELECT currval('scope_id_seq'), 1101 where exists (select 1 from form where id = 1101));
>>>>>>> develop
import Vue from 'vue';
import { uuid } from 'vue-uuid';
import { Prop } from 'vue-property-decorator';
export default abstract class AbstractFormComponent extends Vue {
@Prop()
@Prop({
default() {
return uuid.v1();
},
})
public id: string;
@Prop()
......
<template>
<div :class="['mb-8', disabled ? 'opacity-40' : '']">
<oa-label :id="this.id" :label="label" :required="required" />
<oa-label :id="id" :label="label" :required="required" />
<input
class="w-full px-6 py-4 text-lg transition bg-white border rounded-md outline-none ring-inset focus:ring"
:type="type || 'text'"
:aria-describedby="helpTextId"
:id="this.id"
:id="id"
:placeholder="placeholder"
:required="required"
:disabled="disabled"
......
<template>
<main>
<div class="mb-8 border-b-2">
<oa-input id="type" :label="$t('screen.item.message.type')" :value="configuration.type" required="true" disabled="true" />
<oa-textarea
id="content"
:label="$t('screen.item.message.content')"
:value="configuration.content"
required="true"
@update="setContent"
/>
<oa-input
id="reference"
:label="$t('screen.item.message.reference')"
:value="configuration.reference"
required="true"
@update="setReference"
/>
<oa-input :label="$t('screen.item.message.type')" :value="configuration.type" required="true" disabled="true" />
<oa-textarea :label="$t('screen.item.message.content')" :value="configuration.content" required="true" @update="setContent" />
<oa-input :label="$t('screen.item.message.reference')" :value="configuration.reference" required="true" @update="setReference" />
<oa-input
id="displayCondition"
:label="$t('screen.item.message.displayCondition')"
:value="configuration.displayCondition"
required="true"
@update="setDisplayCondition"
/>
<oa-input
id="style"
:label="$t('screen.item.message.style')"
:value="configuration.style"
required="true"
@update="setStyleAffichage"
/>
<oa-input :label="$t('screen.item.message.style')" :value="configuration.style" required="true" @update="setStyleAffichage" />
</div>
</main>
</template>
......
<template>
<main>
<div class="mb-8 border-b-2">
<oa-input id="type" :label="$t('screen.item.radio.type')" :value="configuration.type" required="true" disabled="true" />
<oa-input :label="$t('screen.item.radio.type')" :value="configuration.type" required="true" disabled="true" />
<oa-input :label="$t('screen.item.radio.question')" :value="configuration.question" required="true" @update="setQuestion" />
<oa-input :label="$t('screen.item.radio.reference')" :value="configuration.reference" required="true" @update="setReference" />
<oa-input
id="question"
:label="$t('screen.item.radio.question')"
:value="configuration.question"
required="true"
@update="setQuestion"
/>
<oa-input
id="reference"
:label="$t('screen.item.radio.reference')"
:value="configuration.reference"
required="true"
@update="setReference"
/>
<oa-input
id="displayCondition"
:label="$t('screen.item.radio.displayCondition')"
:value="configuration.displayCondition"
required="true"
......
......@@ -6,7 +6,7 @@ export interface IScreen {
description?: any;
defaultNextScreenReference?: any;
items?: any;
itemsList?: [];
itemsList?: { type: string }[];
index?: number;
previousName?: string;
previousId?: number;
......
<template>
<main>
<section class="max-w-4xl mx-auto p-9">
<h2 class="mb-4 text-2xl" id="s1" v-text="$t('form.settings.title')">Informations générales</h2>
<h2 class="mb-4 text-2xl" v-text="$t('form.settings.title')">Informations générales</h2>
<form v-on:submit.prevent="save()">
<oa-input id="id" :label="$t('form.settings.id')" type="text" :value="form.id" required="true" disabled="true"></oa-input>
<oa-input id="identifiant" :label="$t('form.settings.id')" type="text" :value="form.id" required="true" disabled="true"></oa-input>
<oa-input
id="reference"
:label="$t('form.settings.reference')"
......
......@@ -2,16 +2,16 @@
<main>
<section class="max-w-4xl mx-auto p-9">
<h1 class="mb-6 text-3xl">{{ $t('screen.label.step', { num: stepNum }) }}</h1>
<oa-input id="0" :label="$t('screen.label.title')" required="true" @update="screen.name = $event" />
<oa-input id="0" :label="$t('screen.label.titleBo')" required="true" @update="screen.nameBo = $event" />
<oa-input id="title" :label="$t('screen.label.title')" required="true" @update="screen.name = $event" />
<oa-input id="titleBo" :label="$t('screen.label.titleBo')" required="true" @update="screen.nameBo = $event" />
<oa-input
id="1"
id="reference"
:label="$t('screen.label.reference.label')"
required="true"
@update="screen.reference = $event"
:helpText="$t('screen.label.reference.helpText')"
/>
<oa-textarea id="2" :label="$t('screen.label.description')" @update="screen.description = $event" />
<oa-textarea id="description" :label="$t('screen.label.description')" @update="screen.description = $event" />
<div class="flex items-center">
<div class="text-right flex-grow">
<oa-button type="submit" variant="primary" :label="$t('button.save')" @click="save" />
......
......@@ -9,6 +9,8 @@ import OaTextarea from '@/components/forms/textarea/oa-textarea.vue';
import { IScreen, Screen, screenValidate } from '@/shared/model/screen.model';
import ScreenService from '@/entities/screen/screen.service';
import Icon from '@/components/icon/icon.vue';
import { TABS } from '@/shared/service/tabs-constants';
import HeaderService from '@/shared/service/header-service';
@Component({
components: {
......@@ -23,6 +25,9 @@ import Icon from '@/components/icon/icon.vue';
export default class ScreenEdit extends Vue {
@Inject('screenService') private screenService: () => ScreenService;
@Inject('headerService')
private headerService: () => HeaderService;
public items: any = [{}]; // TODO récupérer les items dans le store
public screen: IScreen = new Screen();
......@@ -32,6 +37,10 @@ export default class ScreenEdit extends Vue {
beforeRouteEnter(to, from, next) {
next(vm => {
vm.handleNavigationChange(to.params);
vm.headerService().filArianeForForm(to.params.idForm);
if (to.params.idForm) {
vm.headerService().updateTabsForFormId(to.params.idWorkspace, to.params.idForm, TABS.KEY_VIEW);
}
});
}
......
......@@ -12,7 +12,7 @@
@update="setReference"
:helpText="$t('screen.label.reference.helpText')"
/>
<oa-textarea id="2" :label="$t('screen.label.description')" :value="screen.description" @update="setDescription" />
<oa-textarea id="description" :label="$t('screen.label.description')" :value="screen.description" @update="setDescription" />
<ul class="flex justify-center border-b-2 mb-8">
<li>
......@@ -28,7 +28,13 @@
<screen-item-edit :componentConfiguration="item" @itemEdit="saveItemChange"></screen-item-edit>
</div>
<div class="p-2 bg-blue-100">
<oa-input id="0" :label="$t('screen.label.newItemType')" :value="newItemType" required="true" @update="setNewItemType" />
<oa-input
id="newItemType"
:label="$t('screen.label.newItemType')"
:value="newItemType"
required="true"
@update="setNewItemType"
/>
<button @click="addItem" class="flex items-center p-2 text-red-600 transition hover:bg-red-600 focus:ring hover:text-red-100">
<icon name="add"></icon>
</button>
......
......@@ -3,7 +3,14 @@
<section class="max-w-4xl mx-auto p-9">
<h2 class="mb-4 text-2xl" v-text="$t('form.settings.title')">Informations générales</h2>
<form v-on:submit.prevent="save()">
<oa-input id="id" :label="$t('form.settings.id')" type="text" :value="workspace.id" required="true" disabled="true"></oa-input>
<oa-input
id="identifiant"
:label="$t('form.settings.id')"
type="text"
:value="workspace.id"
required="true"
disabled="true"
></oa-input>
<oa-input
id="name"
:label="$t('form.settings.name')"
......
Markdown is supported
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