Commit ce7c0988 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Changement du comptage des engagements et des avis dans le cas de rapporteurs historisés

parent b9c944bd

CHANGELOG.md

+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Journal des modifications 
-----

- [FIX] Changement de signatures de fonctions pour une meilleure compatibilité

- Ajout de la liste des soutenances à venir dans l'index de l'application

- [FIX] Changement du comptage des engagements et des avis dans le cas de rapporteurs historisés mais ayant déjà rendu quelque chose



3.0.10

-----

module/Soutenance/view/soutenance/presoutenance/partial/avis-soutenance.phtml

+2 −3
Changes for module/Soutenance/view/soutenance/presoutenance/partial/avis-soutenance.phtml: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
 * @var Avis[] $avis

 *

 * @var Evenement[] $evenementsPrerapport



 * @var bool $tousLesEngagements

 * @var bool $tousLesAvis

 */



use Application\Constants;
@@ -23,8 +24,6 @@ use Soutenance\Provider\Privilege\AvisSoutenancePrivileges; 
$canNotifierAvisSoutenance = $this->isAllowed(AvisSoutenancePrivileges::getResourceId(AvisSoutenancePrivileges::AVIS_NOTIFIER));

$canRevoquerAvisSoutenance = $this->isAllowed(AvisSoutenancePrivileges::getResourceId(AvisSoutenancePrivileges::AVIS_ANNULER));



$tousLesEngagements = count($rapporteurs) === count($engagements) ;

$tousLesAvis = count($rapporteurs) === count($avis) ;

?>

module/Soutenance/view/soutenance/presoutenance/partial/engagement-impartialite.phtml

+2 −1
Changes for module/Soutenance/view/soutenance/presoutenance/partial/engagement-impartialite.phtml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 * @var Validation[] $engagements

 *

 * @var Evenement[] $evenementsEngagement

 * @var bool $tousLesEngagements

 * @var bool $tousLesAvis

 */



use Application\Constants;
@@ -24,7 +26,6 @@ foreach ($rapporteurs as $rapporteur) { 
        break;

    }

}

$tousLesEngagements = count($rapporteurs) === count($engagements) ;



$canNotifierEngagementImpartialite      = $this->isAllowed($these, EngagementImpartialitePrivileges::ENGAGEMENT_IMPARTIALITE_NOTIFIER);

$canRevoquerEngagementImpartialite     = $this->isAllowed($these, EngagementImpartialitePrivileges::ENGAGEMENT_IMPARTIALITE_ANNULER);

module/Soutenance/view/soutenance/presoutenance/presoutenance.phtml

+39 −7
Changes for module/Soutenance/view/soutenance/presoutenance/presoutenance.phtml: 39 added lines, 7 removed lines.
Original line number Diff line number Diff line 
<?php



/**

 * @see \Soutenance\Controller\PresoutenanceController::presoutenanceAction()

 * @var Application\Entity\Db\These $these

 * @var Application\Entity\Db\Validation $validationBDD

 * @var Soutenance\Entity\Proposition $proposition

 * @var Validation $validationPDC

 * @var Membre[] $rapporteurs

 * @var Validation[] $engagements

 * @var Avis[] $avis

 * @var bool $justificatifsOk

 * @var array $justificatifs

 * @var Evenement[] $evenementsEngagement

 * @var Evenement[] $evenementsPrerapport



 *

 * @see Soutenance\Controller\PresoutenanceController::presoutenanceAction()

 */



use Application\Constants;

use Application\Entity\Db\Validation;

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;



$tousLesEngagements = true;

foreach($rapporteurs as $rapporteur) {

    $individu = $rapporteur->getIndividu();

    $found = false;

    foreach ($engagements as $engagement) {

        if ($engagement->getIndividu() === $individu) {

            $found = true;

            break;

        }

    }

    if ($found === false) {

        $tousLesEngagements = false;

        break;

    }

}



$tousLesAvis = true;

foreach($rapporteurs as $rapporteur) {

    $individu = $rapporteur->getIndividu();

    $found = false;

    foreach ($avis as $avi) {

        if ($avi->getMembre()->getIndividu() === $individu) {

            $found = true;

            break;

        }

    }

    if ($found === false) {

        $tousLesAvis = false;

        break;

    }

}



$tousLesAvis = count($rapporteurs) === count($avis) ;

$canFeuVert = ($justificatifsOk === true AND $this->isAllowed(PresoutenancePrivileges::getResourceId(PresoutenancePrivileges::PRESOUTENANCE_ASSOCIATION_MEMBRE_INDIVIDU)));

$this->headTitle('Préparation de la soutenance de '.$these->getDoctorant()->getIndividu());

$canModifierAdresse = $canFeuVert;
@@ -141,10 +169,14 @@ $canSimulerRemonter = $this->isAllowed(PresoutenancePrivileges::getResourceId(Pr 
            ?>

            <?php if ($tousLesEngagements) : ?>

                <?php if (current($validationPDC) !== null AND current($validationPDC) !== false) : ?>

                    <?php

                        /** @var Validation $validation_pdc */

                        $validation_pdc = current($validationPDC);

                    ?>

                    La page de couverture a été validée le

                    <?php echo current($validationPDC)->getHistoModification()->format(Constants::DATETIME_FORMAT); ?>

                    <?php echo $validation_pdc->getHistoModification()->format(Constants::DATETIME_FORMAT); ?>

                    par

                    <?php echo current($validationPDC)->getHistoModificateur()->getDisplayName(); ?>.

                    <?php echo $validation_pdc->getHistoModificateur()->getDisplayName(); ?>.

                <?php else : ?>

                    <div class="row">

                        <div class="col-md-8">