Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 13:54:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

automatic rearrange code (indentation: 3)

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-08-11 09:37:39 +02:00 committed by Marc Ducobu
parent d0fa28db2a
commit 8d98a144fd
4 changed files with 492 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
View File

@ -8,25 +8,25 @@
<div id="startDate"> <div id="startDate">
<label>{{ $t('startDate') }}</label> <label>{{ $t('startDate') }}</label>
<input type="date" v-model="startDate" /> <input v-model="startDate" type="date"/>
</div> </div>
<div id="endDate"> <div id="endDate">
<label>{{ $t('endDate') }}</label> <label>{{ $t('endDate') }}</label>
<input type="date" v-model="endDate" /> <input v-model="endDate" type="date"/>
</div> </div>
<div id="comment"> <div id="comment">
<label>{{ $t('comments') }}</label> <label>{{ $t('comments') }}</label>
<ckeditor <ckeditor
:editor="editor"
v-model="note" v-model="note"
:editor="editor"
tag-name="textarea" tag-name="textarea"
></ckeditor> ></ckeditor>
</div> </div>
<div id="objectives" class="objectives_list"> <div id="objectives" class="objectives_list">
<div class="title" aria="hidden"> <div aria="hidden" class="title">
<div><h3>{{ $t('goals_title') }}</h3></div> <div><h3>{{ $t('goals_title') }}</h3></div>
<div><h3>{{ $t('results_title') }}</h3></div> <div><h3>{{ $t('results_title') }}</h3></div>
</div> </div>
@ -44,13 +44,13 @@
<!-- results which **are** attached to an objective --> <!-- results which **are** attached to an objective -->
<div v-for="g in goalsPicked"> <div v-for="g in goalsPicked">
<div> <div>
<div @click="removeGoal(g)" class="objective-title"> <div class="objective-title" @click="removeGoal(g)">
<i class="fa fa-times"></i> <i class="fa fa-times"></i>
{{ g.goal.title.fr }} {{ g.goal.title.fr }}
</div> </div>
</div> </div>
<div> <div>
<add-result destination="goal" :goal="g.goal"></add-result> <add-result :goal="g.goal" destination="goal"></add-result>
</div> </div>
</div> </div>
@ -59,10 +59,10 @@
<div> <div>
<div v-if="showAddObjective"> <div v-if="showAddObjective">
<p>{{ $t('available_goals_text')}}</p> <p>{{ $t('available_goals_text') }}</p>
<ul class="list-objectives"> <ul class="list-objectives">
<li v-for="g in availableForCheckGoal" @click="addGoal(g)" class="badge bg-primary"> <li v-for="g in availableForCheckGoal" class="badge bg-primary" @click="addGoal(g)">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
{{ g.title.fr }} {{ g.title.fr }}
</li> </li>
@ -70,7 +70,8 @@
</div> </div>
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<button @click="toggleAddObjective" class="btn btn-create" :title="$t('add_an_objective')"></button> <button :title="$t('add_an_objective')" class="btn btn-create"
@click="toggleAddObjective"></button>
</li> </li>
</ul> </ul>
</div> </div>
@ -79,7 +80,7 @@
</div> </div>
<div id="evaluations"> <div id="evaluations">
<div class="title" aria="hidden"> <div aria="hidden" class="title">
<div><h3>{{ $t('Evaluations') }}</h3></div> <div><h3>{{ $t('Evaluations') }}</h3></div>
</div> </div>
@ -99,9 +100,9 @@
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<button <button
:title="$t('add_an_evaluation')"
class="btn btn-create" class="btn btn-create"
@click="toggleAddEvaluation" @click="toggleAddEvaluation">
:title="$t('add_an_evaluation')">
</button> </button>
</li> </li>
</ul> </ul>
@ -113,7 +114,7 @@
<ul> <ul>
<li v-for="p in personsReachables" :key="p.id"> <li v-for="p in personsReachables" :key="p.id">
<input type="checkbox" :value="p.id" v-model="personsPicked"> <input v-model="personsPicked" :value="p.id" type="checkbox">
<person :person="p"></person> <person :person="p"></person>
</li> </li>
</ul> </ul>
@ -130,12 +131,12 @@
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<add-persons <add-persons
ref="handlingThirdPartyPicker"
v-bind:key="handlingThirdPartyPicker.key"
v-bind:buttonTitle="$t('precise_handling_thirdparty')" v-bind:buttonTitle="$t('precise_handling_thirdparty')"
v-bind:modalTitle="$t('choose_a_thirdparty')" v-bind:modalTitle="$t('choose_a_thirdparty')"
v-bind:key="handlingThirdPartyPicker.key"
v-bind:options="handlingThirdPartyPicker.options" v-bind:options="handlingThirdPartyPicker.options"
@addNewPersons="setHandlingThirdParty" @addNewPersons="setHandlingThirdParty"> <!-- to cast child method -->
ref="handlingThirdPartyPicker"> <!-- to cast child method -->
</add-persons> </add-persons>
</li> </li>
</ul> </ul>
@ -146,7 +147,8 @@
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<button class="btn btn-remove" @click="removeHandlingThirdParty" :title="$t('remove_handling_thirdparty')"></button> <button :title="$t('remove_handling_thirdparty')" class="btn btn-remove"
@click="removeHandlingThirdParty"></button>
</li> </li>
</ul> </ul>
</div> </div>
@ -167,7 +169,8 @@
<show-address :address="t.address"></show-address> <show-address :address="t.address"></show-address>
<ul class="record_actions"> <ul class="record_actions">
<button class="btn btn-remove" @click="removeThirdParty(t)" :title="$t('remove_thirdparty')"></button> <button :title="$t('remove_thirdparty')" class="btn btn-remove"
@click="removeThirdParty(t)"></button>
</ul> </ul>
</li> </li>
</ul> </ul>
@ -176,18 +179,18 @@
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
<add-persons <add-persons
ref="thirdPartyPicker"
v-bind:key="thirdPartyPicker.key"
v-bind:buttonTitle="$t('add_thirdparties')" v-bind:buttonTitle="$t('add_thirdparties')"
v-bind:modalTitle="$t('choose_thirdparties')" v-bind:modalTitle="$t('choose_thirdparties')"
v-bind:key="thirdPartyPicker.key"
v-bind:options="thirdPartyPicker.options" v-bind:options="thirdPartyPicker.options"
@addNewPersons="addThirdParties" @addNewPersons="addThirdParties"> <!-- to cast child method -->
ref="thirdPartyPicker"> <!-- to cast child method -->
</add-persons> </add-persons>
</li> </li>
</ul> </ul>
</div> </div>
<div id="errors" v-if="errors.length > 0"> <div v-if="errors.length > 0" id="errors">
<p>{{ $t('fix_these_errors') }}</p> <p>{{ $t('fix_these_errors') }}</p>
<ul> <ul>
<li v-for="e in errors">{{ e }}</li> <li v-for="e in errors">{{ e }}</li>
@ -213,8 +216,8 @@
</template> </template>
<script> <script>
import { mapState, mapGetters, } from 'vuex'; import {mapState, mapGetters,} from 'vuex';
import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js'; import {dateToISO, ISOToDate, ISOToDatetime} from 'ChillMainAssets/chill/js/date.js';
import CKEditor from '@ckeditor/ckeditor5-vue'; import CKEditor from '@ckeditor/ckeditor5-vue';
import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js'; import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
import AddResult from './components/AddResult.vue'; import AddResult from './components/AddResult.vue';
@ -252,7 +255,7 @@ const i18n = {
choose_thirdparties: "Choisir des tiers", choose_thirdparties: "Choisir des tiers",
fix_these_errors: "Veuillez corriger les erreurs suivantes :", fix_these_errors: "Veuillez corriger les erreurs suivantes :",
} }
} }
}; };
export default { export default {
@ -275,7 +278,7 @@ export default {
handlingThirdPartyPicker: { handlingThirdPartyPicker: {
key: 'handling-third-party', key: 'handling-third-party',
options: { options: {
type: [ 'thirdparty' ], type: ['thirdparty'],
priority: null, priority: null,
uniq: true, uniq: true,
button: { button: {
@ -286,7 +289,7 @@ export default {
thirdPartyPicker: { thirdPartyPicker: {
key: 'third-party', key: 'third-party',
options: { options: {
type: [ 'thirdparty' ], type: ['thirdparty'],
priority: null, priority: null,
uniq: false, uniq: false,
button: { button: {
@ -375,7 +378,7 @@ export default {
toggleAddEvaluation() { toggleAddEvaluation() {
this.showAddEvaluation = !this.showAddEvaluation; this.showAddEvaluation = !this.showAddEvaluation;
}, },
setHandlingThirdParty({ selected, modal }) { setHandlingThirdParty({selected, modal}) {
console.log('setHandlingThirdParty', selected); console.log('setHandlingThirdParty', selected);
this.$store.commit('setHandlingThirdParty', selected.shift().result); this.$store.commit('setHandlingThirdParty', selected.shift().result);
this.$refs.handlingThirdPartyPicker.resetSearch(); this.$refs.handlingThirdPartyPicker.resetSearch();
@ -385,7 +388,7 @@ export default {
console.log('removeHandlingThirdParty'); console.log('removeHandlingThirdParty');
this.$store.commit('setHandlingThirdParty', null); this.$store.commit('setHandlingThirdParty', null);
}, },
addThirdParties({ selected, modal}) { addThirdParties({selected, modal}) {
console.log('addThirdParties', selected); console.log('addThirdParties', selected);
this.$store.commit('addThirdParties', selected.map(r => r.result)); this.$store.commit('addThirdParties', selected.map(r => r.result));
this.$refs.thirdPartyPicker.resetSearch(); this.$refs.thirdPartyPicker.resetSearch();
@ -434,21 +437,26 @@ export default {
.action_title_label { .action_title_label {
margin-bottom: 0; margin-bottom: 0;
} }
.action_title { .action_title {
margin-top: 0; margin-top: 0;
font-weight: bold; font-weight: bold;
font-size: 1.5rem; font-size: 1.5rem;
} }
} }
#startDate { #startDate {
grid-area: startDate; grid-area: startDate;
} }
#endDate { #endDate {
grid-area: endDate; grid-area: endDate;
} }
#comment { #comment {
grid-area: comment; grid-area: comment;
} }
#objectives { #objectives {
grid-area: objectives; grid-area: objectives;
@ -528,6 +536,7 @@ export default {
} }
} }
#objectives, #evaluations { #objectives, #evaluations {
padding: 0; padding: 0;
@ -540,22 +549,28 @@ export default {
} }
} }
} }
#evaluations { #evaluations {
grid-area: evaluations; grid-area: evaluations;
& > div { & > div {
@include border-collapse; @include border-collapse;
padding: 1em; padding: 1em;
} }
} }
#persons { #persons {
grid-area: persons; grid-area: persons;
} }
#handlingThirdParty { #handlingThirdParty {
grid-area: handling; grid-area: handling;
} }
#thirdParties { #thirdParties {
grid-area: tparties; grid-area: tparties;
} }
#errors { #errors {
grid-area: errors; grid-area: errors;
} }

10
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
View File

@ -1,18 +1,18 @@
<template> <template>
affiche les évaluations affiche les évaluations
<div class="addEvaluation" v-if="hasEvaluation"> <div v-if="hasEvaluation" class="addEvaluation">
<p class="chill-no-data-statement" v-if="pickedEvaluations.length === 0"> <p v-if="pickedEvaluations.length === 0" class="chill-no-data-statement">
{{ $t('no_evaluation_associated') }} {{ $t('no_evaluation_associated') }}
</p> </p>
<ul class="list-evaluations"> <ul class="list-evaluations">
<li v-for="e in pickedEvaluations" @click="removeEvaluation(e)" class="badge bg-primary"> <li v-for="e in pickedEvaluations" class="badge bg-primary" @click="removeEvaluation(e)">
<i class="fa fa-times"></i> <i class="fa fa-times"></i>
{{ e.id }} {{ e.id }}
</li> </li>
<template v-if="isExpanded"> <template v-if="isExpanded">
<li v-for="e in availableForCheckEvaluations" @click="addEvaluation(e)" class="badge bg-primary"> <li v-for="e in availableForCheckEvaluations" class="badge bg-primary" @click="addEvaluation(e)">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
{{ e.id }} {{ e.id }}
</li> </li>
@ -26,7 +26,7 @@
</ul> </ul>
</div> </div>
<div class="noEvaluation" v-if="!hasEvaluation"> <div v-if="!hasEvaluation" class="noEvaluation">
<div class="chill-no-data-statement"> <div class="chill-no-data-statement">
{{ $t('evaluation_has_no_evaluation') }} {{ $t('evaluation_has_no_evaluation') }}
</div> </div>

20
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue
View File

@ -1,15 +1,15 @@
<template> <template>
<div class="addResult" v-if="hasResult"> <div v-if="hasResult" class="addResult">
<p class="chill-no-data-statement" v-if="pickedResults.length ===0"> <p v-if="pickedResults.length ===0" class="chill-no-data-statement">
Aucun résultat associé Aucun résultat associé
</p> </p>
<ul class="list-results"> <ul class="list-results">
<li v-for="r in pickedResults" @click="removeResult(r)" class="badge bg-primary"> <li v-for="r in pickedResults" class="badge bg-primary" @click="removeResult(r)">
<i class="fa fa-times"></i> <i class="fa fa-times"></i>
{{ r.title.fr }} {{ r.title.fr }}
</li> </li>
<template v-if="isExpanded"> <template v-if="isExpanded">
<li v-for="r in availableForCheckResults" @click="addResult(r)" class="badge bg-primary"> <li v-for="r in availableForCheckResults" class="badge bg-primary" @click="addResult(r)">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
{{ r.title.fr }} {{ r.title.fr }}
</li> </li>
@ -17,19 +17,19 @@
</ul> </ul>
<ul class="record_actions"> <ul class="record_actions">
<li v-if="isExpanded"> <li v-if="isExpanded">
<button @click="toggleSelect" class="btn btn-hide" > <button class="btn btn-hide" @click="toggleSelect">
<i class="fa fa-eye-slash"></i> <i class="fa fa-eye-slash"></i>
Masquer résultats et orientations disponibles Masquer résultats et orientations disponibles
</button> </button>
</li> </li>
<li v-else> <li v-else>
<button @click="toggleSelect" class="btn btn-show"> <button class="btn btn-show" @click="toggleSelect">
Afficher résultats et orientations disponibles Afficher résultats et orientations disponibles
</button> </button>
</li> </li>
</ul> </ul>
</div> </div>
<div class="noResult" v-if="!hasResult"> <div v-if="!hasResult" class="noResult">
<div class="chill-no-data-statement"> <div class="chill-no-data-statement">
{{ $t('goal_has_no_result') }} {{ $t('goal_has_no_result') }}
</div> </div>
@ -48,7 +48,7 @@ const i18n = {
export default { export default {
name: "AddResult", name: "AddResult",
props: [ 'destination', 'goal', 'availableResults' ], props: ['destination', 'goal', 'availableResults'],
i18n, i18n,
data() { data() {
return { return {
@ -106,7 +106,7 @@ export default {
this.$store.commit('addResultPicked', r); this.$store.commit('addResultPicked', r);
return; return;
} else if (this.destination === 'goal') { } else if (this.destination === 'goal') {
this.$store.commit('addResultForGoalPicked', { goal: this.goal, result: r }); this.$store.commit('addResultForGoalPicked', {goal: this.goal, result: r});
return; return;
} }
throw Error(`this.destination is not implemented: ${this.destination}`); throw Error(`this.destination is not implemented: ${this.destination}`);
@ -117,7 +117,7 @@ export default {
this.$store.commit('removeResultPicked', r); this.$store.commit('removeResultPicked', r);
return; return;
} else if (this.destination === 'goal') { } else if (this.destination === 'goal') {
this.$store.commit('removeResultForGoalPicked', { goal: this.goal, result: r }); this.$store.commit('removeResultForGoalPicked', {goal: this.goal, result: r});
return; return;
} }
throw Error(`this.destination is not implemented: ${this.destination}`); throw Error(`this.destination is not implemented: ${this.destination}`);

10
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/NewEvaluation.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<div> <div>
<h3> <h3>
{{ $t('evaluation_title') }} {{ $t('evaluation_title') }}
</h3> </h3>
</div> </div>
<pre> <pre>
{{ $t('evaluation_status') }} {{ $t('evaluation_status') }}
{{ $t('evaluation_choose_a_status') }} {{ $t('evaluation_choose_a_status') }}
{{ $t('evaluation_startdate') }} {{ $t('evaluation_startdate') }}
@ -47,9 +47,7 @@ export default {
props: [], props: [],
i18n, i18n,
data() { data() {
return { return {}
}
}, },
computed: {}, computed: {},
methods: {} methods: {}