Loading CHANGELOG.md +1 −0 Changes for CHANGELOG.md: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -4,6 +4,7 @@ Journal des modifications 3.0.8 ----- - Changement pour récupération des logos sur la page de couvertures (les co-directions sont maintenant utilisée) - Le manque de justificatifs de soutenances n'est plus bloquant il s'agit plus que d'un warning - [FIX] Retrait de l'appel à un css inexistant 3.0.7 Loading module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php +8 −0 Changes for module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php: 8 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -33,6 +33,7 @@ use Soutenance\Service\Evenement\EvenementServiceAwareTrait; use Soutenance\Service\Exporter\AvisSoutenance\AvisSoutenancePdfExporter; use Soutenance\Service\Exporter\Convocation\ConvocationPdfExporter; use Soutenance\Service\Exporter\ProcesVerbal\ProcesVerbalSoutenancePdfExporter; use Soutenance\Service\Justificatif\JustificatifServiceAwareTrait; use Soutenance\Service\Membre\MembreServiceAwareTrait; use Soutenance\Service\Notifier\NotifierSoutenanceServiceAwareTrait; use Soutenance\Service\Parametre\ParametreServiceAwareTrait; Loading Loading @@ -66,6 +67,7 @@ class PresoutenanceController extends AbstractController use ParametreServiceAwareTrait; use EngagementImpartialiteServiceAwareTrait; use FichierServiceAwareTrait; use JustificatifServiceAwareTrait; use StructureDocumentServiceAwareTrait; use TokenServiceAwareTrait; use SourceServiceAwareTrait; Loading Loading @@ -95,6 +97,10 @@ class PresoutenanceController extends AbstractController $renduRapport = $proposition->getRenduRapport(); if (!$renduRapport) $this->getPropositionService()->initialisationDateRetour($proposition); /** Justificatifs attendus ---------------------------------------------------------------------------------- */ $justificatifs = $this->getJustificatifService()->generateListeJustificatif($proposition); $justificatifsOk = $this->getJustificatifService()->isJustificatifsOk($proposition, $justificatifs); /** ==> clef: Membre->getActeur()->getIndividu()->getId() <== */ $engagements = $this->getEngagementImpartialiteService()->getEngagmentsImpartialiteByThese($these); $avis = $this->getAvisService()->getAvisByThese($these); Loading @@ -113,6 +119,8 @@ class PresoutenanceController extends AbstractController 'urlFichierThese' => $this->urlFichierThese(), 'validationBDD' => $validationBDD, 'validationPDC' => $validationPDC, 'justificatifsOk' => $justificatifsOk, 'justificatifs' => $justificatifs, 'evenementsEngagement' => $this->getEvenementService()->getEvenementsByPropositionAndType($proposition, Evenement::EVENEMENT_ENGAGEMENT), 'evenementsPrerapport' => $this->getEvenementService()->getEvenementsByPropositionAndType($proposition, Evenement::EVENEMENT_PRERAPPORT), Loading module/Soutenance/src/Soutenance/Controller/PresoutenanceControllerFactory.php +4 −0 Changes for module/Soutenance/src/Soutenance/Controller/PresoutenanceControllerFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -16,6 +16,7 @@ use Soutenance\Form\DateRenduRapport\DateRenduRapportForm; use Soutenance\Service\Avis\AvisService; use Soutenance\Service\EngagementImpartialite\EngagementImpartialiteService; use Soutenance\Service\Evenement\EvenementService; use Soutenance\Service\Justificatif\JustificatifService; use Soutenance\Service\Membre\MembreService; use Soutenance\Service\Notifier\NotifierSoutenanceService; use Soutenance\Service\Parametre\ParametreService; Loading Loading @@ -52,6 +53,7 @@ class PresoutenanceControllerFactory * @var StructureDocumentService $structureDocumentService * @var TokenService $tokenService * @var SourceService $sourceService * @var JustificatifService $justificatifService */ $evenementService = $container->get(EvenementService::class); $propositionService = $container->get(PropositionService::class); Loading @@ -71,6 +73,7 @@ class PresoutenanceControllerFactory $structureDocumentService = $container->get(StructureDocumentService::class); $tokenService = $container->get(TokenService::class); $sourceService = $container->get(SourceService::class); $justificatifService = $container->get(JustificatifService::class); /** * @var DateRenduRapportForm $dateRenduRapportForm Loading Loading @@ -102,6 +105,7 @@ class PresoutenanceControllerFactory $controller->setFichierService($fichierService); $controller->setStructureDocumentService($structureDocumentService); $controller->setTokenService($tokenService); $controller->setJustificatifService($justificatifService); $controller->setDateRenduRapportForm($dateRenduRapportForm); $controller->setAdresseSoutenanceForm($adresseSoutenanceForm); Loading module/Soutenance/view/soutenance/presoutenance/presoutenance.phtml +34 −12 Changes for module/Soutenance/view/soutenance/presoutenance/presoutenance.phtml: 34 added lines, 12 removed lines. Original line number Diff line number Diff line Loading @@ -7,7 +7,8 @@ * @var Validation $validationPDC * @var Validation[] $engagements * @var Avis[] $avis * * @var bool $justificatifsOk * @var array $justificatifs * @var Evenement[] $evenementsEngagement * @var Evenement[] $evenementsPrerapport Loading @@ -21,6 +22,7 @@ use Application\Filter\TitreApogeeFilter; use Soutenance\Entity\Avis; use Soutenance\Entity\Etat; use Soutenance\Entity\Evenement; use Soutenance\Entity\Membre; use Soutenance\Provider\Privilege\PresoutenancePrivileges; Loading Loading @@ -69,17 +71,6 @@ $canSimulerRemonter = $this->isAllowed(PresoutenancePrivileges::getResourceId(Pr <?php endif; ?> <?php if ($proposition->getNouveauTitre() !== null) : ?> <!-- --><?php //$modificationFaite = ($proposition->getNouveauTitre() === $these->getTitre()); ?> <!-- <div class="box panel --><?php //echo (!$modificationFaite)?"panel-danger":"panel-success"; ?><!--">--> <!-- <div class="panel-heading">--> <!-- <h2>--> <!-- --><?php //if ($modificationFaite) : ?> <!-- Le titre a été modifiée et la saisie dans la source a été faite--> <!-- --><?php //else : ?> <!-- Le titre a été modifiée et la saisie dans la source n'a pas été faite--> <!-- --><?php //endif; ?> <!-- </h2>--> <!-- </div>--> <div class="box panel panel-warning"> <div class=" panel-heading"> <h2> Loading @@ -92,6 +83,37 @@ $canSimulerRemonter = $this->isAllowed(PresoutenancePrivileges::getResourceId(Pr </div> <?php endif; ?> <?php if ($justificatifsOk === false) : ?> <div class="box panel panel-warning"> <div class=" panel-heading"> <h2> Des justificatifs sont manquants </h2> </div> <div class="panel-body"> <span class="glyphicon glyphicon-warning-sign"></span> Liste des justificatifs manquants : <ul> <?php foreach ($justificatifs as $justificatif) : ?> <?php if($justificatif['justificatif'] === null) : ?> <li> <?php echo $justificatif['type'] ?> <?php if (isset($justificatif['membre'])) : ?> - <?php /** @var Membre $membre */ $membre = $justificatif['membre']; echo $membre->getDenomination(); ?> <?php endif; ?> </li> <?php endif; ?> <?php endforeach; ?> </ul> </div> </div> <?php endif; ?> <!-- DATE DE RENDU DE RAPPORT -----------------------------------------------------------------------------------------> <?php echo $this->partial('soutenance/presoutenance/partial/date-de-retour'); ?> Loading module/Soutenance/view/soutenance/proposition/partial/fichiers.phtml +2 −1 Changes for module/Soutenance/view/soutenance/proposition/partial/fichiers.phtml: 2 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -22,12 +22,13 @@ foreach ($proposition->getMembres() as $membre) { } ?> <div class="box panel <?php echo ($justificatifsOk)?"panel-success":"panel-danger";?>"> <div class="box panel <?php echo ($justificatifsOk)?"panel-success":"panel-warning";?>"> <div class="panel-heading"> <h2> Fichiers associés à la proposition</h2> </div> <div class="panel-body"> <?php if ($canModifier) : ?> <a href="<?php echo $this->url('soutenance/justificatif/ajouter-justificatif', ['these' => $these->getId()], [], true); ?>" class="btn btn-primary ajax-modal" data-event="modification"> Loading Loading
CHANGELOG.md +1 −0 Changes for CHANGELOG.md: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -4,6 +4,7 @@ Journal des modifications 3.0.8 ----- - Changement pour récupération des logos sur la page de couvertures (les co-directions sont maintenant utilisée) - Le manque de justificatifs de soutenances n'est plus bloquant il s'agit plus que d'un warning - [FIX] Retrait de l'appel à un css inexistant 3.0.7 Loading
module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php +8 −0 Changes for module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php: 8 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -33,6 +33,7 @@ use Soutenance\Service\Evenement\EvenementServiceAwareTrait; use Soutenance\Service\Exporter\AvisSoutenance\AvisSoutenancePdfExporter; use Soutenance\Service\Exporter\Convocation\ConvocationPdfExporter; use Soutenance\Service\Exporter\ProcesVerbal\ProcesVerbalSoutenancePdfExporter; use Soutenance\Service\Justificatif\JustificatifServiceAwareTrait; use Soutenance\Service\Membre\MembreServiceAwareTrait; use Soutenance\Service\Notifier\NotifierSoutenanceServiceAwareTrait; use Soutenance\Service\Parametre\ParametreServiceAwareTrait; Loading Loading @@ -66,6 +67,7 @@ class PresoutenanceController extends AbstractController use ParametreServiceAwareTrait; use EngagementImpartialiteServiceAwareTrait; use FichierServiceAwareTrait; use JustificatifServiceAwareTrait; use StructureDocumentServiceAwareTrait; use TokenServiceAwareTrait; use SourceServiceAwareTrait; Loading Loading @@ -95,6 +97,10 @@ class PresoutenanceController extends AbstractController $renduRapport = $proposition->getRenduRapport(); if (!$renduRapport) $this->getPropositionService()->initialisationDateRetour($proposition); /** Justificatifs attendus ---------------------------------------------------------------------------------- */ $justificatifs = $this->getJustificatifService()->generateListeJustificatif($proposition); $justificatifsOk = $this->getJustificatifService()->isJustificatifsOk($proposition, $justificatifs); /** ==> clef: Membre->getActeur()->getIndividu()->getId() <== */ $engagements = $this->getEngagementImpartialiteService()->getEngagmentsImpartialiteByThese($these); $avis = $this->getAvisService()->getAvisByThese($these); Loading @@ -113,6 +119,8 @@ class PresoutenanceController extends AbstractController 'urlFichierThese' => $this->urlFichierThese(), 'validationBDD' => $validationBDD, 'validationPDC' => $validationPDC, 'justificatifsOk' => $justificatifsOk, 'justificatifs' => $justificatifs, 'evenementsEngagement' => $this->getEvenementService()->getEvenementsByPropositionAndType($proposition, Evenement::EVENEMENT_ENGAGEMENT), 'evenementsPrerapport' => $this->getEvenementService()->getEvenementsByPropositionAndType($proposition, Evenement::EVENEMENT_PRERAPPORT), Loading
module/Soutenance/src/Soutenance/Controller/PresoutenanceControllerFactory.php +4 −0 Changes for module/Soutenance/src/Soutenance/Controller/PresoutenanceControllerFactory.php: 4 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -16,6 +16,7 @@ use Soutenance\Form\DateRenduRapport\DateRenduRapportForm; use Soutenance\Service\Avis\AvisService; use Soutenance\Service\EngagementImpartialite\EngagementImpartialiteService; use Soutenance\Service\Evenement\EvenementService; use Soutenance\Service\Justificatif\JustificatifService; use Soutenance\Service\Membre\MembreService; use Soutenance\Service\Notifier\NotifierSoutenanceService; use Soutenance\Service\Parametre\ParametreService; Loading Loading @@ -52,6 +53,7 @@ class PresoutenanceControllerFactory * @var StructureDocumentService $structureDocumentService * @var TokenService $tokenService * @var SourceService $sourceService * @var JustificatifService $justificatifService */ $evenementService = $container->get(EvenementService::class); $propositionService = $container->get(PropositionService::class); Loading @@ -71,6 +73,7 @@ class PresoutenanceControllerFactory $structureDocumentService = $container->get(StructureDocumentService::class); $tokenService = $container->get(TokenService::class); $sourceService = $container->get(SourceService::class); $justificatifService = $container->get(JustificatifService::class); /** * @var DateRenduRapportForm $dateRenduRapportForm Loading Loading @@ -102,6 +105,7 @@ class PresoutenanceControllerFactory $controller->setFichierService($fichierService); $controller->setStructureDocumentService($structureDocumentService); $controller->setTokenService($tokenService); $controller->setJustificatifService($justificatifService); $controller->setDateRenduRapportForm($dateRenduRapportForm); $controller->setAdresseSoutenanceForm($adresseSoutenanceForm); Loading
module/Soutenance/view/soutenance/presoutenance/presoutenance.phtml +34 −12 Changes for module/Soutenance/view/soutenance/presoutenance/presoutenance.phtml: 34 added lines, 12 removed lines. Original line number Diff line number Diff line Loading @@ -7,7 +7,8 @@ * @var Validation $validationPDC * @var Validation[] $engagements * @var Avis[] $avis * * @var bool $justificatifsOk * @var array $justificatifs * @var Evenement[] $evenementsEngagement * @var Evenement[] $evenementsPrerapport Loading @@ -21,6 +22,7 @@ use Application\Filter\TitreApogeeFilter; use Soutenance\Entity\Avis; use Soutenance\Entity\Etat; use Soutenance\Entity\Evenement; use Soutenance\Entity\Membre; use Soutenance\Provider\Privilege\PresoutenancePrivileges; Loading Loading @@ -69,17 +71,6 @@ $canSimulerRemonter = $this->isAllowed(PresoutenancePrivileges::getResourceId(Pr <?php endif; ?> <?php if ($proposition->getNouveauTitre() !== null) : ?> <!-- --><?php //$modificationFaite = ($proposition->getNouveauTitre() === $these->getTitre()); ?> <!-- <div class="box panel --><?php //echo (!$modificationFaite)?"panel-danger":"panel-success"; ?><!--">--> <!-- <div class="panel-heading">--> <!-- <h2>--> <!-- --><?php //if ($modificationFaite) : ?> <!-- Le titre a été modifiée et la saisie dans la source a été faite--> <!-- --><?php //else : ?> <!-- Le titre a été modifiée et la saisie dans la source n'a pas été faite--> <!-- --><?php //endif; ?> <!-- </h2>--> <!-- </div>--> <div class="box panel panel-warning"> <div class=" panel-heading"> <h2> Loading @@ -92,6 +83,37 @@ $canSimulerRemonter = $this->isAllowed(PresoutenancePrivileges::getResourceId(Pr </div> <?php endif; ?> <?php if ($justificatifsOk === false) : ?> <div class="box panel panel-warning"> <div class=" panel-heading"> <h2> Des justificatifs sont manquants </h2> </div> <div class="panel-body"> <span class="glyphicon glyphicon-warning-sign"></span> Liste des justificatifs manquants : <ul> <?php foreach ($justificatifs as $justificatif) : ?> <?php if($justificatif['justificatif'] === null) : ?> <li> <?php echo $justificatif['type'] ?> <?php if (isset($justificatif['membre'])) : ?> - <?php /** @var Membre $membre */ $membre = $justificatif['membre']; echo $membre->getDenomination(); ?> <?php endif; ?> </li> <?php endif; ?> <?php endforeach; ?> </ul> </div> </div> <?php endif; ?> <!-- DATE DE RENDU DE RAPPORT -----------------------------------------------------------------------------------------> <?php echo $this->partial('soutenance/presoutenance/partial/date-de-retour'); ?> Loading
module/Soutenance/view/soutenance/proposition/partial/fichiers.phtml +2 −1 Changes for module/Soutenance/view/soutenance/proposition/partial/fichiers.phtml: 2 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -22,12 +22,13 @@ foreach ($proposition->getMembres() as $membre) { } ?> <div class="box panel <?php echo ($justificatifsOk)?"panel-success":"panel-danger";?>"> <div class="box panel <?php echo ($justificatifsOk)?"panel-success":"panel-warning";?>"> <div class="panel-heading"> <h2> Fichiers associés à la proposition</h2> </div> <div class="panel-body"> <?php if ($canModifier) : ?> <a href="<?php echo $this->url('soutenance/justificatif/ajouter-justificatif', ['these' => $these->getId()], [], true); ?>" class="btn btn-primary ajax-modal" data-event="modification"> Loading