Commit fb35f998 authored by Florian Joriot's avatar Florian Joriot
Browse files

Correction du mauvais recalcul des contrats apres validation

Correction de l'export qui se base sur les contrats non actualisés
parent 6cdd6406
Loading
Loading
Loading
Loading
+8 −4
Changes for module/Contrat/src/Controller/ContratController.php: 8 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -266,13 +266,12 @@ class ContratController extends AbstractController
            return new MessengerViewModel;
        }

        $tblContratContrat = $this->getServiceTblContrat()->getInformationContratById($contrat->getId());
        $contrat               = $this->getProcessusContrat()->creer($contrat, $tblContratContrat);

        if ($this->getRequest()->isPost()) {
            try {
                $contrat = $this->getProcessusContrat()->requalification($contrat);
                $this->getProcessusContrat()->valider($contrat);
                $this->updateTableauxBord($contrat->getIntervenant());
                $this->getProcessusContrat()->requalifierContratsIntervenant($contrat->getIntervenant(), $contrat);

                $this->flashMessenger()->addSuccessMessage(
                    "Validation " . lcfirst($contrat->toString(true, true)) . " enregistrée avec succès."
@@ -304,8 +303,10 @@ class ContratController extends AbstractController
            if ($this->getRequest()->isPost()) {
                try {

                    $contrat = $this->getProcessusContrat()->requalification($contrat);
                    $this->getProcessusContrat()->devalider($contrat);
                    $this->updateTableauxBord($contrat->getIntervenant());
                    $this->getProcessusContrat()->requalifierContratsIntervenant($contrat->getIntervenant(), $contrat);

                    $this->flashMessenger()->addSuccessMessage(
                        "Dévalidation " . lcfirst($contrat->toString(true, true)) . " effectuée avec succès."
@@ -381,7 +382,10 @@ class ContratController extends AbstractController
            throw new UnAuthorizedException("Génération du contrat interdite.");
        }

        $this->getServiceContrat()->generer($contrat);
        $tblContrat = $this->getServiceTblContrat()->getInformationContratById($contrat->getId());
        $isAvenant  = $tblContrat?->getTypeContrat()->estUnAvenant();

        $this->getServiceContrat()->generer($contrat, true, false, $isAvenant);
        die();
    }

+28 −3
Changes for module/Contrat/src/Processus/ContratProcessus.php: 28 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -309,15 +309,40 @@ class ContratProcessus extends AbstractProcessus
     *
     * @param Contrat $contrat
     *
     * @return $this
     * @return Contrat
     */
    public function requalification(Contrat $contrat): self
    public function requalification(Contrat $contrat): Contrat
    {
        //On recupere les informations de la tbl_contrat pour s'assurer que le contrat a les bonne données a l'enregistrement
        //Utile si un contrat a été créer depuis la création du projet par exemple
        $tblContrat = $this->getServiceTblContrat()->getInformationContratById($contrat->getId());
        if (!$tblContrat) {
            throw new LogicException("Impossible de retrouver les informations recalculées du contrat {$contrat->getId()}.");
        }

        return $this->creer($contrat, $tblContrat);

        return $contrat;
    }



    public function requalifierContratsIntervenant(Intervenant $intervenant, ?Contrat $contratExclu = null): self
    {
        $tblContrats = $this->getServiceTblContrat()->getContratsByIntervenant($intervenant);
        foreach ($tblContrats as $tblContrat) {
            $contrat = $tblContrat->getContrat();
            if (!$contrat) {
                continue;
            }
            if ($contratExclu && $contrat->getId() === $contratExclu->getId()) {
                continue;
            }

            $this->creer($contrat, $tblContrat);
            $this->getServiceContrat()->save($contrat);
        }

        return $this;
    }


+5 −3
Changes for module/Contrat/src/Service/ContratService.php: 5 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -322,14 +322,16 @@ class ContratService extends AbstractEntityService



    public function generer(Contrat $contrat, $download = true, $save = false)
    public function generer(Contrat $contrat, $download = true, $save = false, ?bool $isAvenant = null)
    {
        $fileName = sprintf(($contrat->estUnAvenant() ? 'avenant' : 'contrat') . "_%s_%s_%s.pdf",
        $isAvenant = $isAvenant ?? $contrat->estUnAvenant();

        $fileName = sprintf(($isAvenant ? 'avenant' : 'contrat') . "_%s_%s_%s.pdf",
            ($contrat->getStructure() == null ? null : $contrat->getStructure()->getCode()),
                            $contrat->getIntervenant()->getNomUsuel(),
                            $contrat->getIntervenant()->getCode());

        if ($contrat->estUnAvenant()) {
        if ($isAvenant) {
            $modele = $contrat->getIntervenant()->getStatut()->getAvenantEtatSortie();
            if (!$modele) {
                $modele = $contrat->getIntervenant()->getStatut()->getContratEtatSortie();