complete previous commit (+dirty auto corrections from IDE)

This commit is contained in:
2021-07-23 15:19:57 +02:00
parent 8384508c1a
commit b0ef9b6612
16 changed files with 66 additions and 241 deletions

View File

@@ -14,7 +14,7 @@
</div>
<div id="comment">
<label>Commentaire</label>
<ckeditor
<ckeditor
:editor="editor"
v-model="note"
tag-name="textarea"
@@ -32,9 +32,9 @@
{{ $t('results_without_objective') }}
</div>
<div>
<add-result :availableResults="resultsForAction" destination="action"></add-result>
<add-result :availableResults="resultsForAction" destination="action"></add-result>
</div>
</div>
</div>
<!-- results which **are** attached to an objective -->
<div v-for="g in goalsPicked">
@@ -42,10 +42,10 @@
<div @click="removeGoal(g)" class="objective-title">
<i class="fa fa-times"></i>
{{ g.goal.title.fr }}
</div>
</div>
</div>
<div>
<add-result destination="goal" :goal="g.goal"></add-result>
<add-result destination="goal" :goal="g.goal"></add-result>
</div>
</div>
@@ -59,7 +59,7 @@
<ul class="list-objectives">
<li v-for="g in availableForCheckGoal" @click="addGoal(g)" class="badge bg-primary">
<i class="fa fa-plus"></i>
{{ g.title.fr }}
{{ g.title.fr }}
</li>
</ul>
</div>
@@ -163,7 +163,7 @@
<p>Veuillez corriger les erreurs suivantes:</p>
<ul>
<li v-for="e in errors">{{ e }}</li>
</ul>
</ul>
</div>
</div>
@@ -192,7 +192,7 @@
#workEditor {
display: grid;
grid-template-areas:
grid-template-areas:
"title title"
"startDate endDate"
"comment comment"
@@ -205,7 +205,7 @@
grid-template-columns: 50%;
column-gap: 1rem;
#title {
grid-area: title;
@@ -330,9 +330,9 @@
<script>
import { mapState, mapGetters, } from 'vuex';
import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/js/date.js';
import { dateToISO, ISOToDate, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
import CKEditor from '@ckeditor/ckeditor5-vue';
import ClassicEditor from 'ChillMainAssets/modules/ckeditor5/index.js';
import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
import AddResult from './components/AddResult.vue';
import Person from 'ChillPersonAssets/vuejs/_components/Person/Person.vue';
import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
@@ -440,7 +440,7 @@ export default {
return s;
},
set(v) {
console.log('persons picked', v);
console.log('persons picked', v);
this.$store.commit('setPersonsPickedIds', v);
}
},

View File

@@ -1,5 +1,5 @@
import { createStore } from 'vuex';
import { datetimeToISO, ISOToDatetime } from 'ChillMainAssets/js/date.js';
import { datetimeToISO, ISOToDatetime } from 'ChillMainAssets/chill/js/date.js';
import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
@@ -42,7 +42,7 @@ const store = createStore({
},
resultsPickedForGoal: (state) => (goal) => {
let found = state.goalsPicked.find(g => g.goal.id === goal.id);
return found === undefined ? [] : found.results;
},
hasHandlingThirdParty(state) {