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

social issue added to title

Browse Source
This commit is contained in:
Julie Lenaerts 2021-12-10 17:01:06 +01:00
parent 6016038813
commit 4645ede7d1
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,13 @@
<template> <template>
<div id="workEditor" class="my-4"> <div id="workEditor" class="my-4">
<div id="title" class="action-row"> <div id="title" class="action-row">
<div>
<p class="wl-item social-issues">
<span class="chill-entity entity-social-issue">
<span class="badge bg-chill-l-gray text-dark">{{ work.socialAction.issue.text }}</span>
</span>
</p>
</div>
<h2 class="badge-title"> <h2 class="badge-title">
<span class="title_label">Action</span> <span class="title_label">Action</span>
<span class="title_action">{{ work.socialAction.text }}</span> <span class="title_action">{{ work.socialAction.text }}</span>
@ -110,9 +116,9 @@
<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> <div v-else>
<span class="chill-no-data-statement">{{ $t('no_evaluations_available') }}</span> <span class="chill-no-data-statement">{{ $t('no_evaluations_available') }}</span>
</div> </div>
</div> </div>
</div> </div>
@ -186,8 +192,10 @@
> >
<template v-slot:record-actions> <template v-slot:record-actions>
<ul class="record_actions"> <ul class="record_actions">
<li><on-the-fly :type="thirdparty.type" :id="thirdparty.id" action="show"></on-the-fly></li>
<li><on-the-fly :type="thirdparty.type" :id="thirdparty.id" action="edit" @saveFormOnTheFly="saveFormOnTheFly"></on-the-fly></li>
<li> <li>
<button :title="$t('remove_thirdparty')" class="btn btn-remove" @click="removeThirdParty(thirdparty)" /> <button :title="$t('remove_thirdparty')" class="btn btn-sm btn-remove" @click="removeThirdParty(thirdparty)" />
</li> </li>
</ul> </ul>
</template> </template>
@ -258,6 +266,7 @@ import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue'; import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
import ThirdPartyRenderBox from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyRenderBox.vue'; import ThirdPartyRenderBox from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyRenderBox.vue';
import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue'; import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
const i18n = { const i18n = {
messages: { messages: {
@ -306,6 +315,7 @@ export default {
AddressRenderBox, AddressRenderBox,
PickTemplate, PickTemplate,
ThirdPartyRenderBox, ThirdPartyRenderBox,
OnTheFly
}, },
i18n, i18n,
data() { data() {
@ -358,6 +368,7 @@ export default {
startDate: { startDate: {
get() { get() {
//console.log('get start date', this.$store.state.startDate); //console.log('get start date', this.$store.state.startDate);
console.log(this.work);
return dateToISO(this.$store.state.startDate); return dateToISO(this.$store.state.startDate);
}, },
set(v) { set(v) {
@ -448,6 +459,18 @@ export default {
beforeGenerateTemplate() { beforeGenerateTemplate() {
console.log('before generate'); console.log('before generate');
return Promise.resolve(); return Promise.resolve();
},
saveFormOnTheFly(payload) {
console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
payload.target = 'resource';
this.$store.dispatch('patchOnTheFly', payload)
.catch(({name, violations}) => {
if (name === 'ValidationException' || name === 'AccessException') {
violations.forEach((violation) => this.$toast.open({message: violation}));
} else {
this.$toast.open({message: 'An error occurred'})
}
});
} }
} }
}; };
@ -505,7 +528,7 @@ div#workEditor {
p { p {
margin-top: 0; margin-top: 0;
font-weight: bold; font-weight: bold;
font-size: 1.5rem; font-size: 1rem;
} }
} }

1
src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
View File

@ -39,6 +39,7 @@ class SocialActionNormalizer implements NormalizerAwareInterface, NormalizerInte
'parent' => $this->normalizer->normalize($socialAction->getParent(), $format, $context), 'parent' => $this->normalizer->normalize($socialAction->getParent(), $format, $context),
'desactivationDate' => $this->normalizer->normalize($socialAction->getDesactivationDate(), $format, $context), 'desactivationDate' => $this->normalizer->normalize($socialAction->getDesactivationDate(), $format, $context),
'title' => $socialAction->getTitle(), 'title' => $socialAction->getTitle(),
'issue' => $this->normalizer->normalize($socialAction->getIssue(), $format, $context),
]; ];
case 'docgen': case 'docgen':