mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
Different approach to creating acpw selector
This commit is contained in:
parent
555bbca59b
commit
d683fe002d
@ -266,27 +266,6 @@
|
||||
data-label="{{ form.vars['label']|trans|escape('html_attr') }}"></div>
|
||||
{% endblock %}
|
||||
|
||||
{% block pick_linked_entities_row %}
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
{{ form_label(form) }}
|
||||
{{ form_help(form) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="row justify-content-end">
|
||||
<div class="col-md-7 col-sm-12">
|
||||
{{ form_widget(form) }}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block pick_linked_entities_widget %}
|
||||
<input type="hidden" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value|escape('html_attr') }}" {% endif %} data-input-uniqid="{{ form.vars['uniqid'] }}"/>
|
||||
<div data-module="pick-linked-entities"
|
||||
data-suggested="{{ form.vars['suggested']|json_encode|escape('html_attr') }}"
|
||||
></div>
|
||||
{% endblock %}
|
||||
|
||||
{% block pick_postal_code_widget %}
|
||||
{{ form_help(form)}}
|
||||
<input type="hidden" {{ block('widget_attributes') }} {% if value is not empty %}value="{{ value }}" {% endif %} data-input-uniqid="{{ form.vars['uniqid'] }}"/>
|
||||
|
||||
@ -11,30 +11,38 @@ declare(strict_types=1);
|
||||
|
||||
namespace Chill\PersonBundle\Controller;
|
||||
|
||||
use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork;
|
||||
use Chill\PersonBundle\Form\FindAccompanyingPeriodWorkType;
|
||||
use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\Routing\Annotation\Route;
|
||||
use Symfony\Component\Serializer\Serializer;
|
||||
use Symfony\Component\Serializer\SerializerInterface;
|
||||
use Symfony\Contracts\Translation\TranslatorInterface;
|
||||
|
||||
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
|
||||
class AccompanyingPeriodWorkDuplicateController extends AbstractController
|
||||
{
|
||||
public function __construct(private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository, private readonly TranslatorInterface $translator) {}
|
||||
public function __construct(private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository, private readonly TranslatorInterface $translator, private readonly SerializerInterface $serializer) {}
|
||||
|
||||
/**
|
||||
* @ParamConverter("accompanyingPeriodWork", options={"id": "acpw_id"})
|
||||
*/
|
||||
#[Route(path: '{_locale}/person/accompanying-period/work/{id}/assign-duplicate', name: 'chill_person_accompanying_period_work_assign_duplicate', methods: ['GET'])]
|
||||
public function assignDuplicate(int $id, Request $request)
|
||||
public function assignDuplicate(AccompanyingPeriodWork $acpw, Request $request)
|
||||
{
|
||||
$acpw1= $this->accompanyingPeriodWorkRepository->find($id);
|
||||
$accompanyingPeriod = $acpw1->getAccompanyingPeriod();
|
||||
$accompanyingPeriod = $acpw->getAccompanyingPeriod();
|
||||
|
||||
if (null === $acpw1) {
|
||||
throw $this->createNotFoundException("Accompanying period work with id {$id} not".' found on this server');
|
||||
}
|
||||
$acpwList = $this->accompanyingPeriodWorkRepository->findByAccompanyingPeriod($accompanyingPeriod);
|
||||
|
||||
$acpwListArray = $this->serializer->normalize($acpwList, 'json', ['groups' => ['read']]);
|
||||
$acpwListJson = json_encode($acpwListArray);
|
||||
|
||||
dump($acpwListJson);
|
||||
|
||||
$this->denyAccessUnlessGranted(
|
||||
'CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE',
|
||||
$acpw1,
|
||||
$acpw,
|
||||
'You are not allowed to merge this accompanying period work'
|
||||
);
|
||||
|
||||
@ -46,23 +54,23 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController
|
||||
$acpw2 = $form->get('person')->getData();
|
||||
|
||||
// Validation: Ensure person1 is not the same as person2
|
||||
if ($acpw1->getId() === $acpw2->getId()) {
|
||||
if ($acpw->getId() === $acpw2->getId()) {
|
||||
$this->addFlash('error', $this->translator->trans('The entities you are trying to merge cannot be the same'));
|
||||
|
||||
return $this->redirectToRoute('chill_person_accompanying_period_work_show', ['id' => $acpw1->getId()]);
|
||||
return $this->redirectToRoute('chill_person_accompanying_period_work_show', ['id' => $acpw->getId()]);
|
||||
}
|
||||
|
||||
$direction = $form->get('direction')->getData();
|
||||
|
||||
if ('starting' === $direction) {
|
||||
$params = [
|
||||
'acpw1_id' => $acpw1->getId(),
|
||||
'acpw1_id' => $acpw->getId(),
|
||||
'acpw2_id' => $acpw2->getId(),
|
||||
];
|
||||
} else {
|
||||
$params = [
|
||||
'acpw1_id' => $acpw2->getId(),
|
||||
'acpw2_id' => $acpw1->getId(),
|
||||
'acpw2_id' => $acpw->getId(),
|
||||
];
|
||||
}
|
||||
|
||||
@ -70,8 +78,9 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController
|
||||
}
|
||||
|
||||
return $this->render('@ChillPerson/AccompanyingPeriodWorkDuplicate/assign_acpw_duplicate.html.twig', [
|
||||
'accompanyingCourse' => $acpw1->getAccompanyingPeriod(),
|
||||
'acpw' => $acpw1,
|
||||
'accompanyingCourse' => $acpw->getAccompanyingPeriod(),
|
||||
'acpwListJson' => $acpwListJson,
|
||||
'acpw' => $acpw,
|
||||
'form' => $form->createView(),
|
||||
]);
|
||||
}
|
||||
|
||||
@ -31,10 +31,8 @@ class FindAccompanyingPeriodWorkType extends AbstractType
|
||||
$suggestedAcpw = $this->repository->findByAccompanyingPeriod($accompanyingPeriod);
|
||||
|
||||
$builder
|
||||
->add('acpw', PickLinkedAccompanyingPeriodWorkType::class, [
|
||||
->add('acpw', HiddenType::class, [
|
||||
'label' => 'Accompanying period work',
|
||||
'suggested' => $suggestedAcpw,
|
||||
'multiple' => false,
|
||||
])
|
||||
->add('direction', HiddenType::class, [
|
||||
'data' => 'starting',
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace Chill\PersonBundle\Form\Type;
|
||||
|
||||
use Chill\MainBundle\Form\Type\DataTransformer\EntityToJsonTransformer;
|
||||
use Symfony\Component\Form\AbstractType;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\Form\FormInterface;
|
||||
use Symfony\Component\Form\FormView;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
|
||||
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
|
||||
use Symfony\Component\Serializer\SerializerInterface;
|
||||
|
||||
class PickLinkedAccompanyingPeriodWorkType extends AbstractType
|
||||
{
|
||||
public function __construct(private readonly NormalizerInterface $normalizer) {}
|
||||
|
||||
public function buildView(FormView $view, FormInterface $form, array $options)
|
||||
{
|
||||
$view->vars['multiple'] = $options['multiple'];
|
||||
$view->vars['types'] = ['acpw'];
|
||||
$view->vars['uniqid'] = uniqid('pick_acpw_dyn');
|
||||
$view->vars['suggested'] = [];
|
||||
$view->vars['as_id'] = true === $options['as_id'] ? '1' : '0';
|
||||
$view->vars['submit_on_adding_new_entity'] = false;
|
||||
|
||||
foreach ($options['suggested'] as $suggestion) {
|
||||
$view->vars['suggested'][] = $this->normalizer->normalize($suggestion, 'json', ['groups' => 'read']);
|
||||
}
|
||||
}
|
||||
|
||||
public function configureOptions(OptionsResolver $resolver)
|
||||
{
|
||||
$resolver
|
||||
->setDefault('multiple', false)
|
||||
->setAllowedTypes('multiple', ['bool'])
|
||||
->setDefault('compound', false)
|
||||
->setDefault('suggested', [])
|
||||
->setDefault('as_id', false)
|
||||
->setAllowedTypes('as_id', ['bool'])
|
||||
->setDefault('submit_on_adding_new_entity', false)
|
||||
->setAllowedTypes('submit_on_adding_new_entity', ['bool']);
|
||||
}
|
||||
|
||||
public function getBlockPrefix()
|
||||
{
|
||||
return 'pick_linked_entities';
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,10 +1,12 @@
|
||||
import { createApp } from 'vue';
|
||||
import AccompanyingPeriodWorkSelectorModal from "../../vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue";
|
||||
import AccompanyingPeriodWorkSelector from "../../vuejs/_components/DuplicateSelector/AccompanyingPeriodWorkSelector.vue";
|
||||
|
||||
|
||||
document.addEventListener("DOMContentLoaded", () => {
|
||||
const el = document.getElementById('linked-acpw-selector');
|
||||
if (el) {
|
||||
const acpwList = JSON.parse(el.dataset.acpwList);
|
||||
createApp(AccompanyingPeriodWorkSelectorModal, { acpwList }).mount(el);
|
||||
createApp(AccompanyingPeriodWorkSelector, {
|
||||
acpwList: JSON.parse(el.dataset.acpwList)
|
||||
}).mount(el);
|
||||
}
|
||||
});
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
<template>
|
||||
<div>
|
||||
<h3>Select an Accompanying Period Work</h3>
|
||||
<ul>
|
||||
<li v-for="acpw in acpwList" :key="acpw.id">
|
||||
<input
|
||||
type="radio"
|
||||
:value="acpw.id"
|
||||
v-model="selectedAcpw"
|
||||
/>
|
||||
<accompanying-period-work-render-box :accompanying-period-work="acpw"/>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<!-- <input type="hidden" name="form[acpw]" :value="selectedAcpw" />-->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref } from "vue";
|
||||
import AccompanyingPeriodWorkRenderBox from "../Entity/AccompanyingPeriodWorkRenderBox.vue";
|
||||
import { AccompanyingPeriodWork } from "../../../types";
|
||||
|
||||
const props = defineProps<{ acpwList: AccompanyingPeriodWork[] }>();
|
||||
|
||||
const acpwList = props.acpwList;
|
||||
const selectedAcpw = ref(null);
|
||||
|
||||
const selectAcpw = (id) => {
|
||||
selectedAcpw.value = id;
|
||||
};
|
||||
</script>
|
||||
|
||||
@ -1,22 +1,42 @@
|
||||
<template>
|
||||
<div class="item-row">
|
||||
<div class="item-row">
|
||||
<div class="item-col">
|
||||
<h4 class="badge-title">
|
||||
<span class="title_action">
|
||||
{{ accompanyingPeriodWork.socialAction.title.fr }}
|
||||
|
||||
</span>
|
||||
</h4>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import TypeAccompanyingPeriodWork from "ChillPersonAssets/vuejs/_components/AddPersons/TypeAccompanyingPeriodWork.vue";
|
||||
import { AccompanyingPeriodWork } from "../../../types";
|
||||
|
||||
const props = defineProps({
|
||||
accompanyingPeriodWork: TypeAccompanyingPeriodWork
|
||||
})
|
||||
const props = defineProps<{
|
||||
accompanyingPeriodWork: AccompanyingPeriodWork;
|
||||
}>();
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.item-row {
|
||||
display: flex;
|
||||
padding: 10px;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 8px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.item-col {
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
.badge-title {
|
||||
font-size: 1.2em;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.title_action {
|
||||
color: #007bff;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -9,8 +9,10 @@
|
||||
<div class="person-duplicate">
|
||||
|
||||
<h1>{{ 'Assign an accompanying period work duplicate'|trans }}</h1>
|
||||
|
||||
{{ form_start(form) }}
|
||||
{%- if form.acpw is defined -%}
|
||||
<div id="linked-acpw-selector" data-acpw-list="{{ acpwListJson|raw }}"></div>
|
||||
{% endif %}
|
||||
{{ form_rest(form) }}
|
||||
|
||||
<ul class="record_actions sticky-form-buttons">
|
||||
@ -30,9 +32,9 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block js %}
|
||||
{{ encore_entry_script_tags('mod_pickentity_type') }}
|
||||
{{ encore_entry_script_tags('mod_duplicate_selector') }}
|
||||
{% endblock %}
|
||||
|
||||
{% block css %}
|
||||
{{ encore_entry_link_tags('mod_pickentity_type') }}
|
||||
{{ encore_entry_link_tags('mod_duplicate_selector') }}
|
||||
{% endblock %}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user