Finalisation fusion contrats => états de sortie (60688aec) · Commits · open-source / OSE

module/Application/autoload_classmap.php

+0 −5

Original line number	Diff line number	Diff line
		@@ -139,7 +139,6 @@ return [
		'Application\Entity\Db\IntervenantDossier' => __DIR__ . '/src/Entity/Db/IntervenantDossier.php',
		'Application\Entity\Db\MiseEnPaiement' => __DIR__ . '/src/Entity/Db/MiseEnPaiement.php',
		'Application\Entity\Db\MiseEnPaiementIntervenantStructure' => __DIR__ . '/src/Entity/Db/MiseEnPaiementIntervenantStructure.php',
		'Application\Entity\Db\ModeleContrat' => __DIR__ . '/src/Entity/Db/ModeleContrat.php',
		'Application\Entity\Db\ModificationServiceDu' => __DIR__ . '/src/Entity/Db/ModificationServiceDu.php',
		'Application\Entity\Db\Modulateur' => __DIR__ . '/src/Entity/Db/Modulateur.php',
		'Application\Entity\Db\MotifModificationServiceDu' => __DIR__ . '/src/Entity/Db/MotifModificationServiceDu.php',
		@@ -223,8 +222,6 @@ return [
		'Application\Form\Chargens\ScenarioForm' => __DIR__ . '/src/Form/Chargens/ScenarioForm.php',
		'Application\Form\Contrat\EnvoiMailContratForm' => __DIR__ . '/src/Form/Contrat/EnvoiMailContratForm.php',
		'Application\Form\Contrat\Factory\EnvoiMailContratFormFactory' => __DIR__ . '/src/Form/Contrat/Factory/EnvoiMailContratFormFactory.php',
		'Application\Form\Contrat\Factory\ModeleFormFactory' => __DIR__ . '/src/Form/Contrat/Factory/ModeleFormFactory.php',
		'Application\Form\Contrat\ModeleForm' => __DIR__ . '/src/Form/Contrat/ModeleForm.php',
		'Application\Form\DisciplineForm' => __DIR__ . '/src/Form/DisciplineForm.php',
		'Application\Form\DomaineFonctionnel\DomaineFonctionnelSaisieForm' => __DIR__ . '/src/Form/DomaineFonctionnel/DomaineFonctionnelSaisieForm.php',
		'Application\Form\Droits\AffectationForm' => __DIR__ . '/src/Form/Droits/AffectationForm.php',
		@@ -392,7 +389,6 @@ return [
		'Application\Service\Factory\FormuleServiceFactory' => __DIR__ . '/src/Service/Factory/FormuleServiceFactory.php',
		'Application\Service\Factory\FormuleTestIntervenantServiceFactory' => __DIR__ . '/src/Service/Factory/FormuleTestIntervenantServiceFactory.php',
		'Application\Service\Factory\IntervenantServiceFactory' => __DIR__ . '/src/Service/Factory/IntervenantServiceFactory.php',
		'Application\Service\Factory\ModeleContratServiceFactory' => __DIR__ . '/src/Service/Factory/ModeleContratServiceFactory.php',
		'Application\Service\Factory\PrivilegeServiceFactory' => __DIR__ . '/src/Service/Factory/PrivilegeServiceFactory.php',
		'Application\Service\Factory\SeuilChargeServiceFactory' => __DIR__ . '/src/Service/Factory/SeuilChargeServiceFactory.php',
		'Application\Service\Factory\UtilisateurServiceFactory' => __DIR__ . '/src/Service/Factory/UtilisateurServiceFactory.php',
		@@ -412,7 +408,6 @@ return [
		'Application\Service\LocalContextService' => __DIR__ . '/src/Service/LocalContextService.php',
		'Application\Service\MiseEnPaiementIntervenantStructureService' => __DIR__ . '/src/Service/MiseEnPaiementIntervenantStructureService.php',
		'Application\Service\MiseEnPaiementService' => __DIR__ . '/src/Service/MiseEnPaiementService.php',
		'Application\Service\ModeleContratService' => __DIR__ . '/src/Service/ModeleContratService.php',
		'Application\Service\ModificationServiceDuService' => __DIR__ . '/src/Service/ModificationServiceDuService.php',
		'Application\Service\ModulateurService' => __DIR__ . '/src/Service/ModulateurService.php',
		'Application\Service\MotifModificationServiceDuService' => __DIR__ . '/src/Service/MotifModificationServiceDuService.php',

module/Application/config/contrat.config.php

+0 −3

Original line number	Diff line number	Diff line
		@@ -274,9 +274,6 @@ return [
		],
		],
		'form_elements' => [
		'factories' => [
		Form\Contrat\ModeleForm::class => Form\Contrat\Factory\ModeleFormFactory::class,
		],
		'invokables' => [
		Form\Intervenant\ContratValidation::class => Form\Intervenant\ContratValidation::class, /** @todo à supprimer ? */
		Form\Intervenant\ContratRetour::class => Form\Intervenant\ContratRetour::class,

module/Application/src/Controller/ContratController.php

+1 −4

Original line number	Diff line number	Diff line
		@@ -5,14 +5,12 @@ namespace Application\Controller;
		use Application\Assertion\ContratAssertion;
		use Application\Entity\Db\Fichier;
		use Application\Entity\Db\Intervenant;
		use Application\Entity\Db\ModeleContrat;
		use Application\Entity\Db\Parametre;
		use Application\Entity\Db\Service;
		use Application\Entity\Db\Structure;
		use Application\Entity\Db\Validation;
		use Application\Entity\Db\VolumeHoraire;
		use Application\Form\Contrat\Traits\EnvoiMailContratFormAwareTrait;
		use Application\Form\Contrat\Traits\ModeleFormAwareTrait;
		use Application\Form\Intervenant\Traits\ContratRetourAwareTrait;
		use Application\Processus\Traits\ContratProcessusAwareTrait;
		use Application\Provider\Privilege\Privileges;
		@@ -57,7 +55,6 @@ class ContratController extends AbstractController
		use TauxHoraireHETDServiceAwareTrait;
		use DossierServiceAwareTrait;
		use WorkflowServiceAwareTrait;
		use ModeleFormAwareTrait;
		use EnvoiMailContratFormAwareTrait;
		use NoteServiceAwareTrait;

		@@ -374,7 +371,7 @@ class ContratController extends AbstractController
		throw new UnAuthorizedException("Génération du contrat interdite.");
		}

		$this->getServiceModeleContrat()->generer($contrat);
		$this->getServiceContrat()->generer($contrat);
		die();
		}

module/Application/src/Entity/Db/Mapping/Application.Entity.Db.ModeleContrat.dcm.xml

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
		xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
		<entity name="Application\Entity\Db\ModeleContrat" table="MODELE_CONTRAT">
		<id name="id" type="integer" column="ID">
		<generator strategy="SEQUENCE"/>
		</id>
		<field name="libelle" type="string" column="LIBELLE" nullable="false"/>
		<field name="fichier" type="blob" column="FICHIER" nullable="false"/>
		<field name="requete" type="string" column="REQUETE" nullable="false"/>
		<field name="bloc1Nom" type="string" column="BLOC1_NOM" nullable="true"/>
		<field name="bloc1Requete" type="string" column="BLOC1_REQUETE" nullable="true"/>
		<field name="bloc2Nom" type="string" column="BLOC2_NOM" nullable="true"/>
		<field name="bloc2Requete" type="string" column="BLOC2_REQUETE" nullable="true"/>
		<field name="bloc3Nom" type="string" column="BLOC3_NOM" nullable="true"/>
		<field name="bloc3Requete" type="string" column="BLOC3_REQUETE" nullable="true"/>
		<field name="bloc4Nom" type="string" column="BLOC4_NOM" nullable="true"/>
		<field name="bloc4Requete" type="string" column="BLOC4_REQUETE" nullable="true"/>
		<field name="bloc5Nom" type="string" column="BLOC5_NOM" nullable="true"/>
		<field name="bloc5Requete" type="string" column="BLOC5_REQUETE" nullable="true"/>
		<field name="bloc6Nom" type="string" column="BLOC6_NOM" nullable="true"/>
		<field name="bloc6Requete" type="string" column="BLOC6_REQUETE" nullable="true"/>
		<field name="bloc7Nom" type="string" column="BLOC7_NOM" nullable="true"/>
		<field name="bloc7Requete" type="string" column="BLOC7_REQUETE" nullable="true"/>
		<field name="bloc8Nom" type="string" column="BLOC8_NOM" nullable="true"/>
		<field name="bloc8Requete" type="string" column="BLOC8_REQUETE" nullable="true"/>
		<field name="bloc9Nom" type="string" column="BLOC9_NOM" nullable="true"/>
		<field name="bloc9Requete" type="string" column="BLOC9_REQUETE" nullable="true"/>
		<field name="bloc10Nom" type="string" column="BLOC10_NOM" nullable="true"/>
		<field name="bloc10Requete" type="string" column="BLOC10_REQUETE" nullable="true"/>
		<many-to-one field="statut" target-entity="Intervenant\Entity\Db\Statut">
		<join-columns>
		<join-column name="STATUT_ID" referenced-column-name="ID"/>
		</join-columns>
		</many-to-one>
		<many-to-one field="structure" target-entity="Application\Entity\Db\Structure">
		<join-columns>
		<join-column name="STRUCTURE_ID" referenced-column-name="ID"/>
		</join-columns>
		</many-to-one>
		</entity>
		</doctrine-mapping>

module/Application/src/Entity/Db/ModeleContrat.php

deleted100644 → 0

+0 −296

Original line number	Diff line number	Diff line
		<?php

		namespace Application\Entity\Db;

		use Intervenant\Entity\Db\StatutAwareTrait;
		use Application\Entity\Db\Traits\StructureAwareTrait;

		/**
		* ModeleContrat
		*/
		class ModeleContrat
		{
		use StatutAwareTrait;
		use StructureAwareTrait;

		/**
		* @var integer
		*/
		protected $id;

		/**
		* @var string
		*/
		protected $libelle;

		/**
		* @var string
		*/
		protected $fichier;

		/**
		* @var string
		*/
		protected $requete;

		/**
		* @var string
		*/
		protected $bloc1Nom;

		/**
		* @var string
		*/
		protected $bloc1Requete;

		/**
		* @var string
		*/
		protected $bloc2Nom;

		/**
		* @var string
		*/
		protected $bloc2Requete;

		/**
		* @var string
		*/
		protected $bloc3Nom;

		/**
		* @var string
		*/
		protected $bloc3Requete;

		/**
		* @var string
		*/
		protected $bloc4Nom;

		/**
		* @var string
		*/
		protected $bloc4Requete;

		/**
		* @var string
		*/
		protected $bloc5Nom;

		/**
		* @var string
		*/
		protected $bloc5Requete;

		/**
		* @var string
		*/
		protected $bloc6Nom;

		/**
		* @var string
		*/
		protected $bloc6Requete;

		/**
		* @var string
		*/
		protected $bloc7Nom;

		/**
		* @var string
		*/
		protected $bloc7Requete;

		/**
		* @var string
		*/
		protected $bloc8Nom;

		/**
		* @var string
		*/
		protected $bloc8Requete;

		/**
		* @var string
		*/
		protected $bloc9Nom;

		/**
		* @var string
		*/
		protected $bloc9Requete;

		/**
		* @var string
		*/
		protected $bloc10Nom;

		/**
		* @var string
		*/
		protected $bloc10Requete;



		/**
		* @return int
		*/
		public function getId()
		{
		return $this->id;
		}



		/**
		* @param int $id
		*
		* @return ModeleContrat
		*/
		public function setId($id): ModeleContrat
		{
		$this->id = $id;

		return $this;
		}



		/**
		* @return string
		*/
		public function getLibelle()
		{
		return $this->libelle;
		}



		/**
		* @param string $libelle
		*
		* @return ModeleContrat
		*/
		public function setLibelle($libelle): ModeleContrat
		{
		$this->libelle = $libelle;

		return $this;
		}



		/**
		* @return string
		*/
		public function getFichier()
		{
		return $this->fichier;
		}



		/**
		* @return bool
		*/
		public function hasFichier(): bool
		{
		if (is_resource($this->fichier)) {
		return !empty(stream_get_contents($this->fichier, 1));
		} else {
		return !empty($this->fichier);
		}
		}



		/**
		* @param string $fichier
		*
		* @return ModeleContrat
		*/
		public function setFichier($fichier): ModeleContrat
		{
		$this->fichier = $fichier;

		return $this;
		}



		/**
		* @return string
		*/
		public function getRequete()
		{
		return $this->requete;
		}



		/**
		* @param string $requete
		*
		* @return ModeleContrat
		*/
		public function setRequete($requete): ModeleContrat
		{
		$this->requete = $requete;

		return $this;
		}



		public function getBlocs(): array
		{
		$blocs = [];

		for ($i = 1; $i <= 10; $i++) {
		$nomVar = "bloc$i" . "Nom";
		$requeteVar = "bloc$i" . "Requete";
		if ($this->{$nomVar} && $this->{$requeteVar}) {
		$blocs[$this->{$nomVar}] = $this->{$requeteVar};
		}
		}

		return $blocs;
		}



		public function setBlocs(array $blocs): ModeleContrat
		{
		$i = 1;
		foreach ($blocs as $nom => $requete) {
		$nomVar = "bloc$i" . "Nom";
		$requeteVar = "bloc$i" . "Requete";
		$this->{$nomVar} = $nom;
		$this->{$requeteVar} = $requete;
		$i++;
		}
		for (null; $i <= 10; $i++) { // on vide le reste!!
		$nomVar = "bloc$i" . "Nom";
		$requeteVar = "bloc$i" . "Requete";
		$this->{$nomVar} = null;
		$this->{$requeteVar} = null;
		}

		return $this;
		}



		/**
		* Retourne la représentation littérale de cet objet.
		*
		* @return string
		*/
		public function __toString()
		{
		return $this->getLibelle();
		}
		}