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

various fixes accompanying period

Browse Source
This commit is contained in:
Julien Fastré 2021-08-20 15:07:24 +02:00
parent 026ac91e69
commit bf0a24b38e
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
View File

@ -120,7 +120,8 @@ class AccompanyingPeriodWorkEvaluation implements TrackUpdateInterface, TrackCre
* @var Collection * @var Collection
* @ORM\OneToMany( * @ORM\OneToMany(
* targetEntity=AccompanyingPeriodWorkEvaluationDocument::class, * targetEntity=AccompanyingPeriodWorkEvaluationDocument::class,
* mappedBy="accompanyingPeriodWorkEvaluation" * mappedBy="accompanyingPeriodWorkEvaluation",
* cascade={"remove"}
* ) * )
* @Serializer\Groups({"read"}) * @Serializer\Groups({"read"})
*/ */

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

@ -68,12 +68,15 @@
</li> </li>
</ul> </ul>
</div> </div>
<ul class="record_actions"> <ul class="record_actions" v-if="availableForCheckGoal.length > 0">
<li> <li>
<button :title="$t('add_an_objective')" class="btn btn-create" <button :title="$t('add_an_objective')" class="btn btn-create"
@click="toggleAddObjective"></button> @click="toggleAddObjective"></button>
</li> </li>
</ul> </ul>
<div v-else>
<span class="chill-no-data-statement">{{ $t('no_goals_available') }}</span>
</div>
</div> </div>
<div><!-- empty for results --></div> <div><!-- empty for results --></div>
</div> </div>
@ -102,11 +105,14 @@
</li> </li>
</ul> </ul>
</div> </div>
<ul class="record_actions"> <ul class="record_actions" v-if="evaluationsForAction.length > 0">
<li> <li>
<button :title="$t('add_an_evaluation')" class="btn btn-create" @click="toggleAddEvaluation"></button> <button :title="$t('add_an_evaluation')" class="btn btn-create" @click="toggleAddEvaluation"></button>
</li> </li>
</ul> </ul>
<div v-else>
<span class="chill-no-data-statement">{{ $t('no_evaluations_available') }}</span>
</div>
</div> </div>
</div> </div>
@ -255,6 +261,8 @@ 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 :",
available_evaluations_text: "Évaluations disponibles pour ajout :", available_evaluations_text: "Évaluations disponibles pour ajout :",
no_evaluations_available: "Aucune évaluation disponible",
no_goals_available: "Aucun objectif disponible",
} }
} }
}; };

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

@ -19,11 +19,11 @@
<dt v-if="evaluation.warningInterval">{{ $t('warningInterval') }} :</dt> <dt v-if="evaluation.warningInterval">{{ $t('warningInterval') }} :</dt>
<dd v-if="evaluation.warningInterval">{{ evaluation.warningInterval }}</dd> <dd v-if="evaluation.warningInterval">{{ evaluation.warningInterval }}</dd>
<template v-if="evaluation.documents.length > 1"> <template v-if="evaluation.documents.length > 0">
<dt>{{ $t('documents') }} :</dt> <dt>{{ $t('documents') }} :</dt>
<dd> <dd>
<ul> <ul>
<li v-for="d in evaluation.documents" :key="d.id"> <li v-for="d in evaluation.documents">
{{ d.template.name.fr }} {{ d.template.name.fr }}
<a :href="buildEditLink(d.storedObject)" class="btn btn-action btn-sm"> <a :href="buildEditLink(d.storedObject)" class="btn btn-action btn-sm">
<i class="fa fa-edit"></i> <i class="fa fa-edit"></i>