Commit 6830ba6d authored by Thomas Hamel's avatar Thomas Hamel
Browse files

css, ajout de champs dans titreAcces et Financement, fix champs required dans...

css, ajout de champs dans titreAcces et Financement, fix champs required dans directionfieldset, suppression datePrevisionnelSoutenance
parent 327f5b37
Loading
Loading
Loading
Loading
+8 −1
Changes for doc/release-notes/8.x.0/01_saisie_these.sql: 8 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ ALTER TABLE these DROP COLUMN besoin_expurge;
ALTER TABLE these DROP COLUMN cod_unit_rech;
ALTER TABLE these DROP COLUMN lib_unit_rech;
ALTER TABLE these DROP COLUMN source_code_sav;
-- Supprimer la vue utilisant le champ date_autoris_soutenance
DROP VIEW v_diff_these;
ALTER TABLE these DROP COLUMN date_autoris_soutenance;
ALTER TABLE these DROP COLUMN date_prop;

-- Ajout de la nouvelle colone etab_cotut_id
ALTER TABLE these ADD COLUMN etab_cotut_id bigint;
@@ -207,7 +211,7 @@ ALTER TABLE titre_acces
    ADD CONSTRAINT fk_etab_id
        FOREIGN KEY (etab_id) REFERENCES etablissement(id);

-- Ajout de la nouvelle colone pays_id
-- Ajout de la nouvelle colonne pays_id
ALTER TABLE titre_acces ADD COLUMN pays_id bigint;

ALTER TABLE titre_acces
@@ -244,3 +248,6 @@ SET pays_id_nationalite = (SELECT p.id
                                 lower(SUBSTRING(unaccent(i.nationalite), 2)))
WHERE i.nationalite IS NOT NULL
  and i.pays_id_nationalite is null;

-- Ajout de la nouvelle colonne pays_naissance_id
alter table individu add pays_naissance_id bigint REFERENCES pays (id);
+0 −1
Changes for module/Application/src/Application/Controller/ExportController.php: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ class ExportController extends AbstractController
            'Date de première inscription'                  => fn($r) => $r['date_prem_insc'],
            "Date d'abandon"                                => fn($r) => $r['date_abandon'],
            'Date de transfert'                             => fn($r) => $r['date_transfert'],
            'Date de prévisionnel de soutenance'            => fn($r) => $r['date_prev_soutenance'],
            'Date de soutenance'                            => fn($r) => $r['date_soutenance'],
            'Date de fin de confientialité'                 => fn($r) => $r['date_fin_confid'],
            'Date de dépôt version initiale'                => fn($r) => $r['date_depot_vo'],
+1 −1
Changes for module/Application/src/Application/Entity/Db/Repository/VariableRepository.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class VariableRepository extends DefaultEntityRepository
     */
    public function findOneByCodeAndThese(string $code, These $these): ?Variable
    {
        $dateObservation = $these->getDateSoutenance() ?: $these->getDatePrevisionSoutenance();
        $dateObservation = $these->getDateSoutenance() ?: null;

        return $this->findOneByCodeAndEtab(
            $code,
+1 −1
Changes for module/Depot/src/Depot/Controller/DepotController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1373,7 +1373,7 @@ class DepotController extends AbstractController
        /** @var \Depot\Form\Diffusion\DiffusionTheseForm $form */
        $form = $this->diffusionTheseForm;

        $dateObs = $these->getDateSoutenance() ?: $these->getDatePrevisionSoutenance();
        $dateObs = $these->getDateSoutenance() ?: null;
        $variableRepo = $this->variableService->getRepository();
        $ETB_LIB = $variableRepo->findOneByCodeAndEtab(Variable::CODE_ETB_LIB, $these->getEtablissement(), $dateObs);
        $ETB_ART_ETB_LIB = $variableRepo->findOneByCodeAndEtab(Variable::CODE_ETB_ART_ETB_LIB, $these->getEtablissement(), $dateObs);
+1 −1
Changes for module/Depot/src/Depot/Filter/NomFichierTheseFormatter.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class NomFichierTheseFormatter extends AbstractNomFichierFormatter

        $parts = [];

        $date = $fichierThese->getThese()->getDateSoutenance() ?: $fichierThese->getThese()->getDatePrevisionSoutenance();
        $date = $fichierThese->getThese()->getDateSoutenance() ?: null;
        $parts['annee'] = $date ? $date->format('Y') : date('Y');

        $parts['nomDoctorant']    = $this->normalizedString($doctorant->getIndividu()->getNomUsuel());
Loading