Loading data/ddl/view/V_CONTRAT_MAIN.sql +5 −1 Changes for data/ddl/view/V_CONTRAT_MAIN.sql: 5 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -57,6 +57,8 @@ SELECT ct.annee_id, ct."enteteAutresHeures", ct."missionNom", ct."tauxNom", ct."debutValidite", ct."finValidite", CASE ct.est_contrat WHEN 1 THEN -- contrat 'Contrat de travail' Loading Loading @@ -131,7 +133,9 @@ FROM ( SELECT c.*, CASE WHEN c.contrat_id IS NULL THEN 1 ELSE 0 END est_contrat, CASE WHEN v.id IS NULL THEN 1 ELSE 0 END est_projet, CASE WHEN LOWER(si.codes_corresp_2) = 'oui' THEN 1 ELSE 0 END est_atv, tm.libelle "missionNom" tm.libelle "missionNom", c.debut_validite "debutValidite", c.fin_validite "finValidite" FROM contrat c JOIN type_contrat tc ON tc.id = c.type_contrat_id Loading module/Contrat/src/Entity/Db/Contrat.php +50 −0 Changes for module/Contrat/src/Entity/Db/Contrat.php: 50 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -55,6 +55,56 @@ class Contrat implements HistoriqueAwareInterface, ResourceInterface */ private $dateRetourSigne; /** * @return \DateTime */ public function getDebutValidite(): \DateTime { return $this->debutValidite; } /** * @param \DateTime $debutValidite */ public function setDebutValidite(\DateTime $debutValidite): void { $this->debutValidite = $debutValidite; } /** * @return \DateTime */ public function getFinValidite(): \DateTime { return $this->finValidite; } /** * @param \DateTime $finValidite */ public function setFinValidite(\DateTime $finValidite): void { $this->finValidite = $finValidite; } /** * @var \DateTime */ private $debutValidite; /** * @var \DateTime */ private $finValidite; /** * @var \DateTime */ Loading module/Contrat/src/Entity/Db/Mapping/Contrat.Entity.Db.Contrat.dcm.xml +2 −0 Changes for module/Contrat/src/Entity/Db/Mapping/Contrat.Entity.Db.Contrat.dcm.xml: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -14,6 +14,8 @@ </id> <field name="numeroAvenant" type="integer" column="NUMERO_AVENANT" nullable="false"/> <field name="dateRetourSigne" type="datetime" column="DATE_RETOUR_SIGNE" nullable="true"/> <field name="debutValidite" type="datetime" column="DEBUT_VALIDITE" nullable="true"/> <field name="finValidite" type="datetime" column="FIN_VALIDITE" nullable="true"/> <field name="dateEnvoiEmail" type="datetime" column="DATE_ENVOI_EMAIL" nullable="true"/> <field name="totalHetd" type="float" column="TOTAL_HETD" precision="126" scale="0" nullable="true"/> <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/> Loading module/Contrat/src/Processus/ContratProcessus.php +2 −0 Changes for module/Contrat/src/Processus/ContratProcessus.php: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -236,6 +236,8 @@ class ContratProcessus extends AbstractProcessus $contrat->setTotalHetd($this->getIntervenantTotalHetd($intervenant)); if($mission != null){ $contrat->setMission($mission); $contrat->setDebutValidite($mission->getDateDebut()); $contrat->setFinValidite($mission->getDateFin()); } $this->qualification($contrat, $mission); // init contrat/avenant Loading Loading
data/ddl/view/V_CONTRAT_MAIN.sql +5 −1 Changes for data/ddl/view/V_CONTRAT_MAIN.sql: 5 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -57,6 +57,8 @@ SELECT ct.annee_id, ct."enteteAutresHeures", ct."missionNom", ct."tauxNom", ct."debutValidite", ct."finValidite", CASE ct.est_contrat WHEN 1 THEN -- contrat 'Contrat de travail' Loading Loading @@ -131,7 +133,9 @@ FROM ( SELECT c.*, CASE WHEN c.contrat_id IS NULL THEN 1 ELSE 0 END est_contrat, CASE WHEN v.id IS NULL THEN 1 ELSE 0 END est_projet, CASE WHEN LOWER(si.codes_corresp_2) = 'oui' THEN 1 ELSE 0 END est_atv, tm.libelle "missionNom" tm.libelle "missionNom", c.debut_validite "debutValidite", c.fin_validite "finValidite" FROM contrat c JOIN type_contrat tc ON tc.id = c.type_contrat_id Loading
module/Contrat/src/Entity/Db/Contrat.php +50 −0 Changes for module/Contrat/src/Entity/Db/Contrat.php: 50 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -55,6 +55,56 @@ class Contrat implements HistoriqueAwareInterface, ResourceInterface */ private $dateRetourSigne; /** * @return \DateTime */ public function getDebutValidite(): \DateTime { return $this->debutValidite; } /** * @param \DateTime $debutValidite */ public function setDebutValidite(\DateTime $debutValidite): void { $this->debutValidite = $debutValidite; } /** * @return \DateTime */ public function getFinValidite(): \DateTime { return $this->finValidite; } /** * @param \DateTime $finValidite */ public function setFinValidite(\DateTime $finValidite): void { $this->finValidite = $finValidite; } /** * @var \DateTime */ private $debutValidite; /** * @var \DateTime */ private $finValidite; /** * @var \DateTime */ Loading
module/Contrat/src/Entity/Db/Mapping/Contrat.Entity.Db.Contrat.dcm.xml +2 −0 Changes for module/Contrat/src/Entity/Db/Mapping/Contrat.Entity.Db.Contrat.dcm.xml: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -14,6 +14,8 @@ </id> <field name="numeroAvenant" type="integer" column="NUMERO_AVENANT" nullable="false"/> <field name="dateRetourSigne" type="datetime" column="DATE_RETOUR_SIGNE" nullable="true"/> <field name="debutValidite" type="datetime" column="DEBUT_VALIDITE" nullable="true"/> <field name="finValidite" type="datetime" column="FIN_VALIDITE" nullable="true"/> <field name="dateEnvoiEmail" type="datetime" column="DATE_ENVOI_EMAIL" nullable="true"/> <field name="totalHetd" type="float" column="TOTAL_HETD" precision="126" scale="0" nullable="true"/> <field name="histoCreation" type="datetime" column="HISTO_CREATION" nullable="false"/> Loading
module/Contrat/src/Processus/ContratProcessus.php +2 −0 Changes for module/Contrat/src/Processus/ContratProcessus.php: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -236,6 +236,8 @@ class ContratProcessus extends AbstractProcessus $contrat->setTotalHetd($this->getIntervenantTotalHetd($intervenant)); if($mission != null){ $contrat->setMission($mission); $contrat->setDebutValidite($mission->getDateDebut()); $contrat->setFinValidite($mission->getDateFin()); } $this->qualification($contrat, $mission); // init contrat/avenant Loading