Commit dd2d3cf7 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

fix suppression financements qui ne marchait pas, remove unused imports/var/files

parent 9db70737
Loading
Loading
Loading
Loading
+1 −8
Changes for module/These/config/others/these-saisie.config.php: 1 added line, 8 removed lines.
Original line number Diff line number Diff line
@@ -32,10 +32,6 @@ use These\Fieldset\Structures\StructuresFieldset;
use These\Fieldset\Structures\StructuresFieldsetFactory;
use These\Fieldset\TitreAcces\TitreAccesFieldset;
use These\Fieldset\TitreAcces\TitreAccesFieldsetFactory;
use These\Fieldset\TitreAcces\TitreAccesHydrator;
use These\Fieldset\TitreAcces\TitreAccesHydratorFactory;
use These\Form\TheseFormsManager;
use These\Form\TheseFormsManagerFactory;
use These\Form\TheseSaisie\TheseSaisieForm;
use These\Form\TheseSaisie\TheseSaisieFormFactory;
use These\Form\TheseSaisie\TheseSaisieHydrator;
@@ -164,13 +160,10 @@ return [
            GeneralitesHydrator::class => GeneralitesHydratorFactory::class,
            DirectionHydrator::class => DirectionHydratorFactory::class,
            FinancementHydrator::class => FinancementHydratorFactory::class,
            TitreAccesHydrator::class => TitreAccesHydratorFactory::class,
        ],
    ],
    'service_manager' => [
        'factories' => [
            TheseFormsManager::class => TheseFormsManagerFactory::class,
        ],
        'factories' => [],
    ],
    'view_helpers' => [
        'factories' => [],
+0 −10
Changes for module/These/src/These/Controller/Factory/TheseSaisieControllerFactory.php: 0 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -3,13 +3,11 @@
namespace These\Controller\Factory;

use Application\Service\Role\RoleService;
use Application\Service\Source\SourceService;
use Doctorant\Service\DoctorantService;
use Individu\Service\IndividuService;
use Interop\Container\ContainerInterface;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Structure\Service\Etablissement\EtablissementService;
use These\Controller\TheseSaisieController;
use These\Form\TheseSaisie\TheseSaisieForm;
use These\Service\These\TheseService;
@@ -26,25 +24,18 @@ class TheseSaisieControllerFactory
    public function __invoke(ContainerInterface $container): TheseSaisieController
    {
        /**
         * @var EtablissementService $etablissementService
         * @var IndividuService $individuService
         * @var SourceService $sourceService
         * @var TheseService $theseService
         * @var TheseSaisieForm $theseSaisieForm
         */
        $etablissementService = $container->get(EtablissementService::class);
        $individuService = $container->get(IndividuService::class);
        $theseService = $container->get(TheseService::class);
        $theseSaisieForm = $container->get('FormElementManager')->get(TheseSaisieForm::class);
        /** @var SourceService $sourceService */
        $sourceService = $container->get(SourceService::class);

        $controller = new TheseSaisieController();
        $controller->setEtablissementService($etablissementService);
        $controller->setIndividuService($individuService);
        $controller->setTheseService($theseService);
        $controller->setTheseSaisieForm($theseSaisieForm);
        $controller->setSourceService($sourceService);

        /** @var DoctorantService $doctorantService */
        $doctorantService = $container->get(DoctorantService::class);
@@ -54,7 +45,6 @@ class TheseSaisieControllerFactory
        $roleService = $container->get(RoleService::class);
        $controller->setRoleService($roleService);

        $controller->setSource($sourceService->fetchApplicationSource());
        return $controller;
    }
}
 No newline at end of file
+1 −17
Changes for module/These/src/These/Controller/TheseSaisieController.php: 1 added line, 17 removed lines.
Original line number Diff line number Diff line
@@ -5,30 +5,20 @@ namespace These\Controller;
use Application\Controller\AbstractController;
use Application\Entity\Db\Role;
use Application\Service\Role\RoleServiceAwareTrait;
use Application\Service\Source\SourceServiceAwareTrait;
use Application\SourceCodeStringHelperAwareTrait;
use Doctorant\Service\DoctorantServiceAwareTrait;
use Individu\Service\IndividuServiceAwareTrait;
use Laminas\Form\FieldsetInterface;
use Laminas\Form\Form;
use Laminas\View\Model\ViewModel;
use Structure\Service\Etablissement\EtablissementServiceAwareTrait;
use These\Entity\Db\These;
use These\Form\TheseSaisie\TheseSaisieFormAwareTrait;
use These\Service\These\TheseServiceAwareTrait;
use UnicaenApp\Form\Element\Collection;
use UnicaenDbImport\Entity\Db\Traits\SourceAwareTrait;

class TheseSaisieController extends AbstractController
{
    use EtablissementServiceAwareTrait;
    use IndividuServiceAwareTrait;
    use TheseServiceAwareTrait;
    use TheseSaisieFormAwareTrait;
    use SourceAwareTrait;
    use TheseServiceAwareTrait;
    use SourceServiceAwareTrait;
    use SourceCodeStringHelperAwareTrait;
    use DoctorantServiceAwareTrait;
    use RoleServiceAwareTrait;

@@ -36,13 +26,12 @@ class TheseSaisieController extends AbstractController
    {
        $request = $this->getRequest();
        $form = $this->getTheseSaisieForm();
        $form->bind($this->theseService->newThese());

        $viewModel = new ViewModel([
            'form' => $form,
        ]);

        $form->bind($this->theseService->newThese());

        if (!$request->isPost()) {
            return $viewModel;
        }
@@ -55,11 +44,6 @@ class TheseSaisieController extends AbstractController
            return $viewModel;
        }

        /** @var These $these */
        $these = $form->getData();
        $these->setSource($this->source);
        $these->setSourceCode(uniqid());

        /** @var These $these */
        $these = $form->getData();
        $individu = $data["generalites"]['doctorant']["id"] ? $this->individuService->getRepository()->find($data["generalites"]['doctorant']["id"]) : null;
+1 −1
Changes for module/These/src/These/Entity/Db/Mapping/These.Entity.Db.These.dcm.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@
            </join-columns>
        </many-to-one>

        <one-to-many target-entity="Application\Entity\Db\Financement" field="financements" mapped-by="these"/>
        <one-to-many target-entity="Application\Entity\Db\Financement" field="financements" mapped-by="these" orphan-removal="true"/>
        <one-to-many target-entity="Soutenance\Entity\Proposition" field="propositions" mapped-by="these"/>

    </entity>
+3 −2
Changes for module/These/src/These/Entity/Db/These.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1751,14 +1751,15 @@ class These implements HistoriqueAwareInterface, ResourceInterface
    /**
     * Add financement.
     *
     * @param Financement $financements
     * @param Collection $financements
     *
     * @return These
     */
    public function addFinancements(Collection $financements)
    {
        foreach ($financements as $f) {
            $this->financements->add($f);
            $f->setThese($this);
            $this->financements[] = $f;
        }

        return $this;
Loading