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

fixes for adding evaluation document

Browse Source
This commit is contained in:
Julien Fastré 2022-02-25 16:13:31 +01:00
parent c1f5730c4d
commit af0d7765ff
3 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php
View File

@ -83,12 +83,12 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct
private ?DocGeneratorTemplate $template = null; private ?DocGeneratorTemplate $template = null;
/** /**
* @ORM\Column(type="text", nullable=true) * @ORM\Column(type="text", nullable=false, options={"default": ""})
* @Serializer\Groups({"read"}) * @Serializer\Groups({"read"})
* @Serializer\Groups({"write"}) * @Serializer\Groups({"write"})
* @Serializer\Groups({"accompanying_period_work_evaluation:create"}) * @Serializer\Groups({"accompanying_period_work_evaluation:create"})
*/ */
private ?string $title = null; private ?string $title = '';
/** /**
* @ORM\Column(type="date_immutable", nullable=true, options={"default": null}) * @ORM\Column(type="date_immutable", nullable=true, options={"default": null})

59
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
View File

@ -67,42 +67,36 @@
<div class="flex-table"> <div class="flex-table">
<div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="i"> <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="i">
<div class="item-row"> <div class="item-row">
<div class="item-col" style="margin-right: 6px;"> <div class="input-group input-group-lg mb-3">
<label class="col-form-label">
{{ $t('document_title') }}
</label>
<div> <div>
<input <input
class="form-control form-control-sm" class="form-control form-control-lg"
type="string" style="font-weight: bold;"
:value=d.title type="text"
:id=d.id :value="d.title"
:id="d.id"
@input="onInputDocumentTitle"/> @input="onInputDocumentTitle"/>
</div> </div>
<div v-if="d.template">
<label class="col-form-label">
{{ $t('template_title') }}
</label>
<div>{{ d.template.name.fr }}</div>
</div>
</div>
<div class="item-col">
<p v-if="d.createdBy">Créé par {{ d.createdBy.text }}<br/>
Le {{ $d(ISOToDatetime(d.createdAt.datetime), 'long') }}</p>
</div> </div>
</div> </div>
<div class="item-row"> <div class="item-row">
<ul class="record_actions" > <div class="item-col item-meta">
<li> <p v-if="d.createdBy" class="createdBy">Créé par {{ d.createdBy.text }}<br/>
<a :href="buildEditLink(d.storedObject)" class="btn btn-action btn-sm"> Le {{ $d(ISOToDatetime(d.createdAt.datetime), 'long') }}</p>
<i class="fa fa-edit"></i> </div>
</a> <div class="item-col">
</li> <ul class="record_actions" >
<li> <li>
<a class="btn btn-sm btn-delete" @click="removeDocument(d)"> <a :href="buildEditLink(d.storedObject)" class="btn btn-action btn-sm">
</a> <i class="fa fa-edit"></i>
</li> </a>
</ul> </li>
<li>
<a class="btn btn-sm btn-delete" @click="removeDocument(d)">
</a>
</li>
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -276,12 +270,15 @@ export default {
addDocument(storedObject) { addDocument(storedObject) {
let document = { let document = {
type: 'accompanying_period_work_evaluation_document', type: 'accompanying_period_work_evaluation_document',
storedObject: storedObject storedObject: storedObject,
title: 'Nouveau document',
}; };
this.$store.commit('addDocument', {key: this.evaluation.key, document: document}); this.$store.commit('addDocument', {key: this.evaluation.key, document: document});
}, },
removeDocument(document) { removeDocument(document) {
this.$store.commit('removeDocument', {key: this.evaluation.key, document: document}); if (window.confirm("Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre \"" + document.title +"\" ?")) {
this.$store.commit('removeDocument', {key: this.evaluation.key, document: document});
}
} }
}, },
} }

4
src/Bundle/ChillPersonBundle/migrations/Version20220224145951.php
View File

@ -31,6 +31,8 @@ final class Version20220224145951 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
$this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ADD title TEXT DEFAULT NULL'); $this->addSql('ALTER TABLE chill_person_accompanying_period_work_evaluation_document ADD title TEXT NOT NULL DEFAULT \'\'');
$this->addSql('UPDATE chill_person_accompanying_period_work_evaluation_document SET title=name->>\'fr\'
FROM chill_docgen_template cdt WHERE cdt.id = chill_person_accompanying_period_work_evaluation_document.template_id');
} }
} }