Skip to content
GitLab
Commit c21b5c03 authored by Laurent Lécluse's avatar Laurent Lécluse
Browse files

distinction prévu/réalise pour le service et le référentiel

parent 3398a95b
Hide whitespace changes
Inline Side-by-side
data/ddl/table/STATUT.php
View file @ c21b5c03
......@@ -765,8 +765,8 @@ return [
'position' => 7,
'commentaire' => NULL,
],
'REFERENTIEL' => [
'name' => 'REFERENTIEL',
'REFERENTIEL_PREVU' => [
'name' => 'REFERENTIEL_PREVU',
'type' => 'bool',
'bdd-type' => 'NUMBER',
'length' => 0,
......@@ -777,8 +777,8 @@ return [
'position' => 55,
'commentaire' => NULL,
],
'REFERENTIEL_EDITION' => [
'name' => 'REFERENTIEL_EDITION',
'REFERENTIEL_PREVU_EDITION' => [
'name' => 'REFERENTIEL_PREVU_EDITION',
'type' => 'bool',
'bdd-type' => 'NUMBER',
'length' => 0,
......@@ -789,8 +789,8 @@ return [
'position' => 57,
'commentaire' => NULL,
],
'REFERENTIEL_VISUALISATION' => [
'name' => 'REFERENTIEL_VISUALISATION',
'REFERENTIEL_PREVU_VISU' => [
'name' => 'REFERENTIEL_PREVU_VISU',
'type' => 'bool',
'bdd-type' => 'NUMBER',
'length' => 0,
......@@ -801,8 +801,71 @@ return [
'position' => 56,
'commentaire' => NULL,
],
'SERVICE' => [
'name' => 'SERVICE',
'REFERENTIEL_REALISE' => [
'name' => 'REFERENTIEL_REALISE',
'type' => 'bool',
'bdd-type' => 'NUMBER',
'length' => 0,
'scale' => '0',
'precision' => 1,
'nullable' => FALSE,
'default' => '0',
'position' => 55,
'commentaire' => NULL,
],
'REFERENTIEL_REALISE_EDITION' => [
'name' => 'REFERENTIEL_REALISE_EDITION',
'type' => 'bool',
'bdd-type' => 'NUMBER',
'length' => 0,
'scale' => '0',
'precision' => 1,
'nullable' => FALSE,
'default' => '1',
'position' => 57,
'commentaire' => NULL,
],
'REFERENTIEL_REALISE_VISU' => [
'name' => 'REFERENTIEL_REALISE_VISU',
'type' => 'bool',
'bdd-type' => 'NUMBER',
'length' => 0,
'scale' => '0',
'precision' => 1,
'nullable' => FALSE,
'default' => '1',
'position' => 56,
'commentaire' => NULL,
],
'SERVICE_PREVU' => [
'name' => 'SERVICE_PREVU',
'type' => 'bool',
'bdd-type' => 'NUMBER',
'length' => 0,
'scale' => '0',
'precision' => 1,
'nullable' => FALSE,
'default' => '1',
'position' => 51,
'commentaire' => NULL,
],
'SERVICE_PREVU_EDITION' => [
'name' => 'SERVICE_PREVU_EDITION',
'type' => 'bool',
'bdd-type' => 'NUMBER',
'length' => 0,
'scale' => '0',
'precision' => 1,
'nullable' => FALSE,
'default' => '1',
'position' => 53,
'commentaire' => NULL,
],
'SERVICE_REALISE' => [
'name' => 'SERVICE_REALISE',
'type' => 'bool',
'bdd-type' => 'NUMBER',
'length' => 0,
......@@ -813,8 +876,8 @@ return [
'position' => 51,
'commentaire' => NULL,
],
'SERVICE_EDITION' => [
'name' => 'SERVICE_EDITION',
'SERVICE_REALISE_EDITION' => [
'name' => 'SERVICE_REALISE_EDITION',
'type' => 'bool',
'bdd-type' => 'NUMBER',
'length' => 0,
......@@ -825,6 +888,7 @@ return [
'position' => 53,
'commentaire' => NULL,
],
'SERVICE_EXTERIEUR' => [
'name' => 'SERVICE_EXTERIEUR',
'type' => 'bool',
......@@ -849,8 +913,21 @@ return [
'position' => 8,
'commentaire' => NULL,
],
'SERVICE_VISUALISATION' => [
'name' => 'SERVICE_VISUALISATION',
'SERVICE_PREVU_VISU' => [
'name' => 'SERVICE_PREVU_VISU',
'type' => 'bool',
'bdd-type' => 'NUMBER',
'length' => 0,
'scale' => '0',
'precision' => 1,
'nullable' => FALSE,
'default' => '1',
'position' => 52,
'commentaire' => NULL,
],
'SERVICE_REALISE_VISU' => [
'name' => 'SERVICE_REALISE_VISU',
'type' => 'bool',
'bdd-type' => 'NUMBER',
'length' => 0,
......@@ -861,6 +938,7 @@ return [
'position' => 52,
'commentaire' => NULL,
],
'TAUX_CHARGES_PATRONALES' => [
'name' => 'TAUX_CHARGES_PATRONALES',
'type' => 'float',
......
data/ddl_columns_pos.php
View file @ c21b5c03
......@@ -1321,10 +1321,16 @@ return [
'CONTRAT',
'CONTRAT_VISUALISATION',
'CONTRAT_DEPOT',
'SERVICE',
'SERVICE_VISUALISATION',
'SERVICE_EDITION',
'SERVICE_PREVU',
'SERVICE_PREVU_VISU',
'SERVICE_PREVU_EDITION',
'SERVICE_REALISE',
'SERVICE_REALISE_VISU',
'SERVICE_REALISE_EDITION',
'SERVICE_EXTERIEUR',
'REFERENTIEL_PREVU',
'REFERENTIEL_PREVU_VISU',
'REFERENTIEL_PREVU_EDITION',
'REFERENTIEL',
'REFERENTIEL_VISUALISATION',
'REFERENTIEL_EDITION',
......
module/Intervenant/src/Entity/Db/Mapping/Intervenant.Entity.Db.Statut.dcm.xml
View file @ c21b5c03
......@@ -67,14 +67,20 @@
<field name="contratVisualisation" type="boolean" column="CONTRAT_VISUALISATION" nullable="false"/>
<field name="contratDepot" type="boolean" column="CONTRAT_DEPOT" nullable="false"/>
<field name="service" type="boolean" column="SERVICE" nullable="false"/>
<field name="serviceVisualisation" type="boolean" column="SERVICE_VISUALISATION" nullable="false"/>
<field name="serviceEdition" type="boolean" column="SERVICE_EDITION" nullable="false"/>
<field name="servicePrevu" type="boolean" column="SERVICE_PREVU" nullable="false"/>
<field name="servicePrevuVisualisation" type="boolean" column="SERVICE_PREVU_VISU" nullable="false"/>
<field name="servicePrevuEdition" type="boolean" column="SERVICE_PREVU_EDITION" nullable="false"/>
<field name="serviceRealise" type="boolean" column="SERVICE_REALISE" nullable="false"/>
<field name="serviceRealiseVisualisation" type="boolean" column="SERVICE_REALISE_VISU" nullable="false"/>
<field name="serviceRealiseEdition" type="boolean" column="SERVICE_REALISE_EDITION" nullable="false"/>
<field name="serviceExterieur" type="boolean" column="SERVICE_EXTERIEUR" nullable="false"/>
<field name="referentiel" type="boolean" column="REFERENTIEL" nullable="false"/>
<field name="referentielVisualisation" type="boolean" column="REFERENTIEL_VISUALISATION" nullable="false"/>
<field name="referentielEdition" type="boolean" column="REFERENTIEL_EDITION" nullable="false"/>
<field name="referentielPrevu" type="boolean" column="REFERENTIEL_PREVU" nullable="false"/>
<field name="referentielPrevuVisualisation" type="boolean" column="REFERENTIEL_PREVU_VISU" nullable="false"/>
<field name="referentielPrevuEdition" type="boolean" column="REFERENTIEL_PREVU_EDITION" nullable="false"/>
<field name="referentielRealise" type="boolean" column="REFERENTIEL_REALISE" nullable="false"/>
<field name="referentielRealiseVisualisation" type="boolean" column="REFERENTIEL_REALISE_VISU" nullable="false"/>
<field name="referentielRealiseEdition" type="boolean" column="REFERENTIEL_REALISE_EDITION" nullable="false"/>
<field name="cloture" type="boolean" column="CLOTURE" nullable="false"/>
......
module/Intervenant/src/Entity/Db/Statut.php
View file @ c21b5c03
......@@ -18,6 +18,10 @@ class Statut implements ParametreEntityInterface, RoleInterface
const CODE_AUTRES = 'AUTRES';
const CODE_NON_AUTORISE = 'NON_AUTORISE';
const ETAT_ACTIF = 'actif';
const ETAT_VISUALISATION = 'visu';
const ETAT_EDITION = 'edit';
use ParametreEntityTrait;
use TypeIntervenantAwareTrait;
......@@ -116,19 +120,31 @@ class Statut implements ParametreEntityInterface, RoleInterface
private bool $contratDepot = true;
private bool $service = true;
private bool $servicePrevu = true;
private bool $servicePrevuVisualisation = true;
private bool $servicePrevuEdition = true;
private bool $serviceVisualisation = true;
private bool $serviceRealise = true;
private bool $serviceEdition = true;
private bool $serviceRealiseVisualisation = true;
private bool $serviceRealiseEdition = true;
private bool $serviceExterieur = true;
private bool $referentiel = true;
private bool $referentielPrevu = true;
private bool $referentielPrevuVisualisation = true;
private bool $referentielVisualisation = true;
private bool $referentielPrevuEdition = true;
private bool $referentielEdition = true;
private bool $referentielRealise = true;
private bool $referentielRealiseVisualisation = true;
private bool $referentielRealiseEdition = true;
private bool $cloture = true;
......@@ -214,9 +230,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return string|null
*/
public function getCode(): ?string
{
return $this->code;
......@@ -224,11 +237,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param string|null $code
*
* @return Statut
*/
public function setCode(?string $code): Statut
{
$this->code = $code;
......@@ -238,9 +246,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return string|null
*/
public function getLibelle(): ?string
{
return $this->libelle;
......@@ -248,11 +253,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param string|null $libelle
*
* @return Statut
*/
public function setLibelle(?string $libelle): Statut
{
$this->libelle = $libelle;
......@@ -262,9 +262,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return int
*/
public function getOrdre(): int
{
return $this->ordre;
......@@ -272,11 +269,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param int $ordre
*
* @return Statut
*/
public function setOrdre(int $ordre): Statut
{
$this->ordre = $ordre;
......@@ -286,9 +278,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getPrioritaireIndicateurs(): bool
{
return $this->prioritaireIndicateurs;
......@@ -296,11 +285,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $prioritaireIndicateurs
*
* @return Statut
*/
public function setPrioritaireIndicateurs(bool $prioritaireIndicateurs): Statut
{
$this->prioritaireIndicateurs = $prioritaireIndicateurs;
......@@ -310,22 +294,14 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return float|int
*/
public function getServiceStatutaire(): float|int
public function getServiceStatutaire(): float
{
return $this->serviceStatutaire;
}
/**
* @param float|int $serviceStatutaire
*
* @return Statut
*/
public function setServiceStatutaire(float|int $serviceStatutaire): Statut
public function setServiceStatutaire(float $serviceStatutaire): Statut
{
$this->serviceStatutaire = $serviceStatutaire;
......@@ -334,9 +310,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getDepassementServiceDuSansHc(): bool
{
return $this->depassementServiceDuSansHc;
......@@ -344,11 +317,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $depassementServiceDuSansHc
*
* @return Statut
*/
public function setDepassementServiceDuSansHc(bool $depassementServiceDuSansHc): Statut
{
$this->depassementServiceDuSansHc = $depassementServiceDuSansHc;
......@@ -358,9 +326,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return float
*/
public function getTauxChargesPatronales(): float
{
return $this->tauxChargesPatronales;
......@@ -368,11 +333,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param float $tauxChargesPatronales
*
* @return Statut
*/
public function setTauxChargesPatronales(float $tauxChargesPatronales): Statut
{
$this->tauxChargesPatronales = $tauxChargesPatronales;
......@@ -382,9 +342,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getDossier(): bool
{
return $this->dossier;
......@@ -392,11 +349,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $dossier
*
* @return Statut
*/
public function setDossier(bool $dossier): Statut
{
$this->dossier = $dossier;
......@@ -406,9 +358,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getDossierVisualisation(): bool
{
return $this->dossierVisualisation;
......@@ -416,11 +365,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $dossierVisualisation
*
* @return Statut
*/
public function setDossierVisualisation(bool $dossierVisualisation): Statut
{
$this->dossierVisualisation = $dossierVisualisation;
......@@ -430,9 +374,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getDossierEdition(): bool
{
return $this->dossierEdition;
......@@ -440,11 +381,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $dossierEdition
*
* @return Statut
*/
public function setDossierEdition(bool $dossierEdition): Statut
{
$this->dossierEdition = $dossierEdition;
......@@ -454,9 +390,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getDossierSelectionnable(): bool
{
return $this->dossierSelectionnable;
......@@ -464,11 +397,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $dossierSelectionnable
*
* @return Statut
*/
public function setDossierSelectionnable(bool $dossierSelectionnable): Statut
{
$this->dossierSelectionnable = $dossierSelectionnable;
......@@ -478,9 +406,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getDossierIdentiteComplementaire(): bool
{
return $this->dossierIdentiteComplementaire;
......@@ -488,11 +413,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $dossierIdentiteComplementaire
*
* @return Statut
*/
public function setDossierIdentiteComplementaire(bool $dossierIdentiteComplementaire): Statut
{
$this->dossierIdentiteComplementaire = $dossierIdentiteComplementaire;
......@@ -502,9 +422,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getDossierContact(): bool
{
return $this->dossierContact;
......@@ -512,11 +429,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $dossierContact
*
* @return Statut
*/
public function setDossierContact(bool $dossierContact): Statut
{
$this->dossierContact = $dossierContact;
......@@ -526,9 +438,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getDossierTelPerso(): bool
{
return $this->dossierTelPerso;
......@@ -536,11 +445,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $dossierTelPerso
*
* @return Statut
*/
public function setDossierTelPerso(bool $dossierTelPerso): Statut
{
$this->dossierTelPerso = $dossierTelPerso;
......@@ -550,9 +454,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getDossierEmailPerso(): bool
{
return $this->dossierEmailPerso;
......@@ -560,11 +461,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $dossierEmailPerso
*
* @return Statut
*/
public function setDossierEmailPerso(bool $dossierEmailPerso): Statut
{
$this->dossierEmailPerso = $dossierEmailPerso;
......@@ -574,9 +470,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getDossierAdresse(): bool
{
return $this->dossierAdresse;
......@@ -584,11 +477,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $dossierAdresse
*
* @return Statut
*/
public function setDossierAdresse(bool $dossierAdresse): Statut
{
$this->dossierAdresse = $dossierAdresse;
......@@ -598,9 +486,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getDossierBanque(): bool
{
return $this->dossierBanque;
......@@ -608,11 +493,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $dossierBanque
*
* @return Statut
*/
public function setDossierBanque(bool $dossierBanque): Statut
{
$this->dossierBanque = $dossierBanque;
......@@ -622,9 +502,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @return bool
*/
public function getDossierInsee(): bool
{
return $this->dossierInsee;
......@@ -632,11 +509,6 @@ class Statut implements ParametreEntityInterface, RoleInterface
/**
* @param bool $dossierInsee
*
* @return Statut
*/
public function setDossierInsee(bool $dossierInsee): Statut
{
$this->dossierInsee = $dossierInsee;
......@@ -646,9 +518,6 @@ class Statut implements ParametreEntityInterface, RoleInterface