Open modal to select acpw

This commit is contained in:
Julie Lenaerts 2025-03-04 19:12:18 +01:00
parent d683fe002d
commit ef5eb5b907
7 changed files with 79 additions and 49 deletions

View File

@ -11,19 +11,18 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Controller; namespace Chill\PersonBundle\Controller;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
use Chill\PersonBundle\Form\FindAccompanyingPeriodWorkType; use Chill\PersonBundle\Form\FindAccompanyingPeriodWorkType;
use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository; use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Serializer\Serializer;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
class AccompanyingPeriodWorkDuplicateController extends AbstractController class AccompanyingPeriodWorkDuplicateController extends AbstractController
{ {
public function __construct(private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository, private readonly TranslatorInterface $translator, private readonly SerializerInterface $serializer) {} public function __construct(private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository, private readonly TranslatorInterface $translator, private readonly TranslatableStringHelperInterface $stringHelper) {}
/** /**
* @ParamConverter("accompanyingPeriodWork", options={"id": "acpw_id"}) * @ParamConverter("accompanyingPeriodWork", options={"id": "acpw_id"})
@ -35,10 +34,14 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController
$acpwList = $this->accompanyingPeriodWorkRepository->findByAccompanyingPeriod($accompanyingPeriod); $acpwList = $this->accompanyingPeriodWorkRepository->findByAccompanyingPeriod($accompanyingPeriod);
$acpwListArray = $this->serializer->normalize($acpwList, 'json', ['groups' => ['read']]); $acpwArray = array_map(function ($acpw) {
$acpwListJson = json_encode($acpwListArray); return [
'id' => $acpw->getId(),
dump($acpwListJson); 'socialAction' => $this->stringHelper->localize($acpw->getSocialAction()->getTitle()),
'start_date' => $acpw->getStartDate(),
'end_date' => $acpw->getEndDate(),
];
}, $acpwList);
$this->denyAccessUnlessGranted( $this->denyAccessUnlessGranted(
'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE', 'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE',
@ -62,7 +65,7 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController
$direction = $form->get('direction')->getData(); $direction = $form->get('direction')->getData();
if ('starting' === $direction) { /* if ('starting' === $direction) {
$params = [ $params = [
'acpw1_id' => $acpw->getId(), 'acpw1_id' => $acpw->getId(),
'acpw2_id' => $acpw2->getId(), 'acpw2_id' => $acpw2->getId(),
@ -72,14 +75,14 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController
'acpw1_id' => $acpw2->getId(), 'acpw1_id' => $acpw2->getId(),
'acpw2_id' => $acpw->getId(), 'acpw2_id' => $acpw->getId(),
]; ];
} }*/
// return $this->redirectToRoute('chill_person_acpw_duplicate_confirm', $params); // return $this->redirectToRoute('chill_person_acpw_duplicate_confirm', $params);
} }
return $this->render('@ChillPerson/AccompanyingPeriodWorkDuplicate/assign_acpw_duplicate.html.twig', [ return $this->render('@ChillPerson/AccompanyingPeriodWorkDuplicate/assign_acpw_duplicate.html.twig', [
'accompanyingCourse' => $acpw->getAccompanyingPeriod(), 'accompanyingCourse' => $acpw->getAccompanyingPeriod(),
'acpwListJson' => $acpwListJson, 'acpwList' => $acpwArray,
'acpw' => $acpw, 'acpw' => $acpw,
'form' => $form->createView(), 'form' => $form->createView(),
]); ]);

View File

@ -1,12 +1,10 @@
import { createApp } from 'vue'; import { createApp } from 'vue';
import AccompanyingPeriodWorkSelector from "../../vuejs/_components/DuplicateSelector/AccompanyingPeriodWorkSelector.vue"; import AccompanyingPeriodWorkSelectorModal from "../../vuejs/_components/DuplicateSelector/AccompanyingPeriodWorkSelectorModal.vue";
document.addEventListener("DOMContentLoaded", () => { document.addEventListener("DOMContentLoaded", () => {
const el = document.getElementById('linked-acpw-selector'); const el = document.getElementById('linked-acpw-selector');
if (el) { if (el) {
createApp(AccompanyingPeriodWorkSelector, { const acpwList = JSON.parse(el.dataset.acpwList);
acpwList: JSON.parse(el.dataset.acpwList) createApp(AccompanyingPeriodWorkSelectorModal, { acpwList }).mount(el);
}).mount(el);
} }
}); });

View File

@ -59,7 +59,7 @@ export interface AccompanyingPeriodWork {
privateComment: PrivateCommentEmbeddable; privateComment: PrivateCommentEmbeddable;
referrersHistory: AccompanyingPeriodWorkReferrerHistory[]; referrersHistory: AccompanyingPeriodWorkReferrerHistory[];
results: Result[]; results: Result[];
socialAction?: SocialAction; socialAction: SocialAction;
startDate?: string; startDate?: string;
thirdParties: Thirdparty[]; thirdParties: Thirdparty[];
updatedAt?: string; updatedAt?: string;

View File

@ -1,33 +1,25 @@
<template> <template>
<div> <div>
<h3>Select an Accompanying Period Work</h3> <ul class="acpwList">
<ul>
<li v-for="acpw in acpwList" :key="acpw.id"> <li v-for="acpw in acpwList" :key="acpw.id">
<input <input type="radio" :value="acpw.id" v-model="selectedAcpw" />
type="radio" <accompanying-period-work-render-box :acpw="acpw" />
:value="acpw.id"
v-model="selectedAcpw"
/>
<accompanying-period-work-render-box :accompanying-period-work="acpw"/>
</li> </li>
</ul> </ul>
<!-- <input type="hidden" name="form[acpw]" :value="selectedAcpw" />-->
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref } from "vue"; import { ref, defineProps, defineModel } from "vue";
import AccompanyingPeriodWorkRenderBox from "../Entity/AccompanyingPeriodWorkRenderBox.vue"; import AccompanyingPeriodWorkRenderBox from "../Entity/AccompanyingPeriodWorkRenderBox.vue";
import { AccompanyingPeriodWork } from "../../../types"; import { AccompanyingPeriodWork } from "../../../types";
const props = defineProps<{ acpwList: AccompanyingPeriodWork[] }>(); const props = defineProps<{ acpwList: AccompanyingPeriodWork[] }>();
const selectedAcpw = defineModel<number | null>("selectedAcpw", { default: null });
const acpwList = props.acpwList;
const selectedAcpw = ref(null);
const selectAcpw = (id) => {
selectedAcpw.value = id;
};
</script> </script>
<style>
.acpwList {
list-style-type: none;
}
</style>

View File

@ -0,0 +1,46 @@
<template>
<div>
<button type="button" class="btn btn-primary" @click="openModal">
acpw_duplicate.Select accompanying period work
</button>
<teleport to="body">
<modal v-if="showModal" @close="closeModal">
<template #header>
<h3>acpw_duplicate.Select accompanying period work</h3>
</template>
<template #body>
<accompanying-period-work-selector
:acpw-list="acpwList"
v-model:selectedAcpw="selectedAcpw"
/>
</template>
<template #footer>
<button type="button" class="btn btn-cancel" @click="closeModal">Cancel</button>
<button type="button" class="btn btn-save" @click="confirmSelection">Confirm</button>
</template>
</modal>
</teleport>
<input type="hidden" name="form[acpw]" :value="selectedAcpw" />
</div>
</template>
<script setup lang="ts">
import { ref } from "vue";
import Modal from "ChillMainAssets/vuejs/_components/Modal.vue"
import AccompanyingPeriodWorkSelector from "./AccompanyingPeriodWorkSelector.vue";
import { AccompanyingPeriodWork } from "../../../types";
const props = defineProps<{ acpwList: AccompanyingPeriodWork[] }>();
const selectedAcpw = ref(null);
const showModal = ref(false);
const openModal = () => (showModal.value = true);
const closeModal = () => (showModal.value = false);
const confirmSelection = () => {
closeModal();
};
</script>

View File

@ -1,20 +1,12 @@
<template> <template>
<div class="item-row"> <span>{{ acpw.socialAction }}</span>
<div class="item-col">
<h4 class="badge-title">
<span class="title_action">
</span>
</h4>
</div>
</div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { AccompanyingPeriodWork } from "../../../types"; import { AccompanyingPeriodWork } from "../../../types";
const props = defineProps<{ const props = defineProps<{
accompanyingPeriodWork: AccompanyingPeriodWork; acpw: AccompanyingPeriodWork;
}>(); }>();
</script> </script>

View File

@ -4,14 +4,13 @@
{% block title %}{{ 'Assign an accompanying period work duplicate' }}{% endblock %} {% block title %}{{ 'Assign an accompanying period work duplicate' }}{% endblock %}
{% block content %} {% block content %}
<div class="person-duplicate"> <div class="person-duplicate">
<h1>{{ 'Assign an accompanying period work duplicate'|trans }}</h1> <h1>{{ 'acpw_duplicate.Assign duplicate'|trans }}</h1>
{{ form_start(form) }} {{ form_start(form) }}
{%- if form.acpw is defined -%} {%- if form.acpw is defined -%}
<div id="linked-acpw-selector" data-acpw-list="{{ acpwListJson|raw }}"></div> <div id="linked-acpw-selector" data-acpw-list='{{ acpwList|json_encode|raw }}'></div>
{% endif %} {% endif %}
{{ form_rest(form) }} {{ form_rest(form) }}