Commit 3f392265 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

WIP nouveau module rapport d'activite : diverses tâches

parent 21180033

module/Formation/src/Formation/Service/Exporter/Emargement/emargement.phtml

+1 −1
Changes for module/Formation/src/Formation/Service/Exporter/Emargement/emargement.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ $formateurs = $session->getFormateurs(); 
                $ecoles[$ecole] = $ecole;

                $unite = ($these->getUniteRecherche())?$these->getUniteRecherche()->getStructure()->getSigle():"Unité de recherche non renseignée";

                $unites[$unite] = $unite;

                $anneet = $these->getNbInscription($annee);

                $anneet = $these->getAnneesUnivInscriptionCount($annee);

                $anneets[$these->getId()] = $anneet;

            }

        ?>

module/Formation/src/Formation/View/Helper/partial/inscription.phtml

+1 −1
Changes for module/Formation/src/Formation/View/Helper/partial/inscription.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ $these = current($doctorant->getTheses()); 
            echo " - ";

            echo $this->site($these->getUniteRecherche());

            echo " - ";

            echo "D" . $these->getNbInscription($annee);

            echo "D" . $these->getAnneesUnivInscriptionCount($annee);

        }

    }

    ?>

module/RapportActivite/config/module.config.php

+1 −0
Changes for module/RapportActivite/config/module.config.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ return [ 
        'template' => [

            // templates .phtml

            'template_path' => __DIR__ . '/../view/rapport-activite/rapport-activite/pdf/template.phtml',

            'header_path' => 'header.phtml',

            'footer_path' => 'footer.phtml',

            // feuille de styles

            'css_path' => [

module/RapportActivite/data/install_module_v2.sql

+1 −1
Changes for module/RapportActivite/data/install_module_v2.sql: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ update type_validation 
set code = 'RAPPORT_ACTIVITE_AUTO', libelle = 'Validation finale du rapport d''activité non dématérialisé (ancien module)'

where code = 'RAPPORT_ACTIVITE';

insert into type_validation(id, code, libelle)

select nextval('type_validation_id_seq'), 'RAPPORT_ACTIVITE_DOCTORANT', 'Validation du rapport d''activité';

select nextval('type_validation_id_seq'), 'RAPPORT_ACTIVITE_DOCTORANT', 'Validation électronique du rapport d''activité';



INSERT INTO type_validation (id, code, libelle)

select nextval('type_validation_id_seq'), 'RAPPORT_ACTIVITE', 'Validation finale du rapport d''activité non dématérialisé (ancien module)';

module/RapportActivite/src/RapportActivite/Entity/Db/RapportActivite.php

+3 −1
Changes for module/RapportActivite/src/RapportActivite/Entity/Db/RapportActivite.php: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -328,7 +328,9 @@ class RapportActivite implements ResourceInterface, HistoriqueAwareInterface 


    public function getCalendrierPrevionnelFinalisationEnabled(): bool

    {

        return !$this->estFinContrat();

        return

            !$this->estFinContrat() &&

            $this->getThese()->getAnneesUnivInscriptionCount() >= 3; // à partir de la 3ème année d'inscription

    }



    public function getCalendrierPrevionnelFinalisation(): ?string