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

add thirdparty comment in acccourse resources

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-12-09 16:17:25 +01:00
parent 5fdbba9ef5
commit 62b8b3e6b7
5 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
View File

@ -14,9 +14,6 @@
}"> }">
<template v-slot:record-actions> <template v-slot:record-actions>
<ul class="record_actions"> <ul class="record_actions">
<!--
<button-location v-if="hasCurrentHouseholdAddress" :person="resource.resource"></button-location>
-->
<li> <li>
<on-the-fly <on-the-fly
:type="resource.resource.type" :type="resource.resource.type"
@ -51,6 +48,7 @@
addId : false, addId : false,
addEntity: true, addEntity: true,
addInfo: false, addInfo: false,
//addComment: true,
hLevel: 3 hLevel: 3
}"> }">
<template v-slot:record-actions> <template v-slot:record-actions>

1
src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
View File

@ -126,6 +126,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
/** /**
* @ORM\Column(name="comment", type="text", nullable=true) * @ORM\Column(name="comment", type="text", nullable=true)
* @Groups({"read"})
*/ */
private ?string $comment = null; private ?string $comment = null;

3
src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
View File

@ -91,6 +91,9 @@
</li> </li>
--> -->
</ul> </ul>
<div v-if="options.addComment && !thirdparty.contactDataAnonymous && thirdparty.comment">
<blockquote class="chill-user-quote">{{ thirdparty.comment }}</blockquote>
</div>
</div> </div>
</div> </div>
</div> </div>

1
src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
View File

@ -14,6 +14,7 @@
hLevel: 3, hLevel: 3,
addCenter: true, addCenter: true,
addNoData: true, addNoData: true,
addComment: true,
isMultiline: true isMultiline: true
}" }"
></third-party-render-box> ></third-party-render-box>

1
src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
View File

@ -45,6 +45,7 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context), 'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context), 'civility' => $this->normalizer->normalize($thirdParty->getCivility(), $format, $context),
'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(), 'contactDataAnonymous' => $thirdParty->isContactDataAnonymous(),
'comment' => $thirdParty->getComment(),
]; ];
} }