Skip to content
Snippets Groups Projects
Commit 52667a32 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Gestion des validations automatiques

parent e8ea662b
Branches
Tags
No related merge requests found
Showing
with 93 additions and 0 deletions
......@@ -3,6 +3,20 @@ title: "Changements intervenus sur OSE"
author: Laurent Lécluse - DSI - Unicaen
...
#OSE 7.0 (en développement)
## Corrections de bugs
## Nouveautés
* Synchronisation possible de services et des volumes horaires associés (en vue d'import depuis ADE)
## Notes de mise à jour
* Modifiez la structure de votre base de données en exécutant dans SQL developer le script de mise à jour suivant :
`data/Mises à jour/07.0.sql`
#OSE 6.3.2 (en développement)
## Corrections de bugs
......
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -60,6 +60,14 @@ ALTER TABLE volume_horaire_ref ADD (
auto_validation NUMBER(1) DEFAULT 0 NOT NULL
);
ALTER TABLE tbl_validation_enseignement ADD (
auto_validation NUMBER(1) DEFAULT 0 NOT NULL
);
ALTER TABLE tbl_validation_referentiel ADD (
auto_validation NUMBER(1) DEFAULT 0 NOT NULL
);
ALTER TABLE volume_horaire ADD (
horaire DATE
);
......@@ -75,3 +83,4 @@ ALTER TABLE type_formation ADD (
ALTER TABLE fonction_referentiel ADD (
service_statutaire NUMBER(1) DEFAULT 1 NOT NULL
);
......@@ -6,6 +6,7 @@
<sequence-generator sequence-name="TBL_VALIDATION_ENS_ID_SEQ" allocation-size="1" initial-value="1"/>
</id>
<field name="autoValidation" type="boolean" column="AUTO_VALIDATION" nullable="false"/>
<many-to-one field="annee" target-entity="Application\Entity\Db\Annee" fetch="LAZY">
<join-columns>
<join-column name="ANNEE_ID" referenced-column-name="ID"/>
......
......@@ -6,6 +6,7 @@
<sequence-generator sequence-name="TBL_VALIDATION_REF_ID_SEQ" allocation-size="1" initial-value="1"/>
</id>
<field name="autoValidation" type="boolean" column="AUTO_VALIDATION" nullable="false"/>
<many-to-one field="annee" target-entity="Application\Entity\Db\Annee" fetch="LAZY">
<join-columns>
<join-column name="ANNEE_ID" referenced-column-name="ID"/>
......
......@@ -24,6 +24,11 @@ class TblValidationEnseignement
protected $id;
/**
* @var boolen
*/
protected $autoValidation = false;
/**
* @return mixed
*/
......@@ -31,4 +36,30 @@ class TblValidationEnseignement
{
return $this->id;
}
/**
* @return boolen
*/
public function getAutoValidation(): boolen
{
return $this->autoValidation;
}
/**
* @param boolen $autoValidation
*
* @return TblValidationEnseignement
*/
public function setAutoValidation(boolen $autoValidation): TblValidationEnseignement
{
$this->autoValidation = $autoValidation;
return $this;
}
}
\ No newline at end of file
<?php
namespace Application\Entity\Db;
use Application\Entity\Db\Traits\AnneeAwareTrait;
use Application\Entity\Db\Traits\IntervenantAwareTrait;
use Application\Entity\Db\Traits\ServiceReferentielAwareTrait;
......@@ -24,6 +25,13 @@ class TblValidationReferentiel
protected $id;
/**
* @var boolen
*/
protected $autoValidation = false;
/**
* @return mixed
*/
......@@ -31,5 +39,30 @@ class TblValidationReferentiel
{
return $this->id;
}
/**
* @return boolen
*/
public function getAutoValidation(): boolen
{
return $this->autoValidation;
}
/**
* @param boolen $autoValidation
*
* @return TblValidationEnseignement
*/
public function setAutoValidation(boolen $autoValidation): TblValidationEnseignement
{
$this->autoValidation = $autoValidation;
return $this;
}
}
......@@ -42,6 +42,7 @@ class ValidationEnseignementProcessus extends AbstractProcessus
LEFT JOIN tve.validation v
WHERE
tve.typeVolumeHoraire = :typeVolumeHoraire
AND tve.autoValidation = false
AND tve.intervenant = :intervenant
" . ($structure ? 'AND tve.structure = :structure' : '') . "
ORDER BY
......@@ -91,6 +92,7 @@ class ValidationEnseignementProcessus extends AbstractProcessus
LEFT JOIN tve.validation v
WHERE
tve.typeVolumeHoraire = :typeVolumeHoraire
AND vh.autoValidation = false
AND tve.intervenant = :intervenant
AND " . ($validation->getId() ? "tve.validation = :validation" : "tve.validation IS NULL AND tve.structure = :structure") . "
";
......
......@@ -36,6 +36,7 @@ class ValidationReferentielProcessus extends AbstractProcessus
LEFT JOIN tvr.validation v
WHERE
tvr.typeVolumeHoraire = :typeVolumeHoraire
AND tvr.autoValidation = false
AND tvr.intervenant = :intervenant
".($structure ? 'AND tvr.structure = :structure' : '')."
ORDER BY
......@@ -86,6 +87,7 @@ class ValidationReferentielProcessus extends AbstractProcessus
WHERE
tvr.typeVolumeHoraire = :typeVolumeHoraire
AND tvr.intervenant = :intervenant
AND vh.autoValidation = false
AND " . ($validation->getId() ? "tvr.validation = :validation" : "tvr.validation IS NULL AND tvr.structure = :structure") . "
";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment