Commit 182fb4d3 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Remonter des emploi types

parent 8225a2cc

documentation/002_DB_EMC2_CARRIERE.sql

+13 −0
Original line number Diff line number Diff line
@@ -102,6 +102,19 @@ create table carriere_grade 
    histo_destructeur_id  bigint

);



create table carriere_emploitype

(

    id            bigint not null unique constraint emploitype_pk primary key,

    code          varchar(64)             not null,

    libelle_court varchar(256)            not null,

    libelle_long  varchar(1024)           not null,

    date_debut    timestamp default now() not null,

    date_fin      timestamp,

    created_on    timestamp default now() not null,

    updated_on    timestamp,

    deleted_on    timestamp,

    source_id     varchar(128)

);



-------------------------------------------------------------------------------------------------------------

-- DATA -----------------------------------------------------------------------------------------------------

documentation/XXX_VUE_SIRH.sql

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ create table individu_grade 
    structure_id      bigint,

    corps_id          integer,

    grade_id          integer,

    emploitype_id     integer,

    correspondance_id integer,

    d_debut           date,

    d_fin             date

documentation/release/3.2.4.md

+22 −1
Original line number Diff line number Diff line
@@ -5,12 +5,33 @@ Version 3.2.4 (XX/XX/2023) 
---

- Modification de Unicaen/Aide

- Modification de SynchroOctopus pour utiliser le nouveau système de synchronisation



- Remonter des emploi-types et ajout dans les agents grades



Modification en BD

---



```postgresql



-- Remonter des emploi type

create table carriere_emploitype

(

    id            bigint not null unique constraint emploitype_pk primary key,

    code          varchar(64)             not null,

    libelle_court varchar(256)            not null,

    libelle_long  varchar(1024)           not null,

    date_debut    timestamp default now() not null,

    date_fin      timestamp,

    created_on    timestamp default now() not null,

    updated_on    timestamp,

    deleted_on    timestamp,

    source_id     varchar(128)

);



alter table agent_carriere_grade add emploitype_id integer;

--alter table agent_carriere_grade add constraint agent_carriere_grade_carriere_emploitype_id_fk foreign key (emploitype_id) references carriere_emploitype on delete set null;







```



Evolution des librairies

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

+7 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Application\Entity\Db\Traits\DbImportableAwareTrait; 
use Application\Entity\Db\Traits\HasPeriodeTrait;

use Carriere\Entity\Db\Corps;

use Carriere\Entity\Db\Correspondance;

use Carriere\Entity\Db\EmploiType;

use Carriere\Entity\Db\Grade;

use Structure\Entity\Db\Structure;
@@ -24,6 +25,7 @@ class AgentGrade implements HasPeriodeInterface { 
    private ?Corps $corps = null;

    private ?Grade $grade = null;

    private ?Correspondance $correspondance = null;

    private ?EmploiType $emploiType = null;



    public function getId() : string

    {
@@ -54,4 +56,9 @@ class AgentGrade implements HasPeriodeInterface { 
    {

        return $this->correspondance;

    }



    public function getEmploiType() : ?EmploiType

    {

        return $this->emploiType;

    }

}
 
 No newline at end of file

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

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ 
            <join-column name="bap_id" referenced-column-name="id"/>

        </many-to-one>



        <many-to-one target-entity="Carriere\Entity\Db\EmploiType"  field="emploiType">

            <join-column name="emploitype_id" referenced-column-name="id"/>

        </many-to-one>



        <field name="dateDebut"     type="datetime"                 column="d_debut"     nullable="false"/>

        <field name="dateFin"       type="datetime"                 column="d_fin"       nullable="false"/>