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

Amélioration de la récupération des corps/correspondances/gardes

parent 772eddc7
Loading
Loading
Loading
Loading
+1 −1
Changes for documentation/release/3.1.4.md: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@

* Retrait de mention UniCaen dans la fiche de poste pour des termes plus généraux
* Ajout de la raison d'être sur les fiches metiers

* Amélioration de la récupération des corps/correspondances/gardes

**Modifications de la base de donnée**

+0 −5
Changes for module/Carriere/src/Carriere/Controller/CorrespondanceController.php: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -22,13 +22,8 @@ class CorrespondanceController extends AbstractActionController
        $bool = ($avecAgent) && ($avecAgent->getValeur() === "true");
        $correspondances = $this->getCorrespondanceService()->getCorrespondances('libelleLong', 'ASC', $bool);

        $agentGrades = [];
        foreach ($correspondances as $correspondance) {
            $agentGrades[$correspondance->getId()] = $this->getAgentGradeService()->getAgentGradesByCorrespondance($correspondance);
        }
        return new ViewModel([
            'correspondances' => $correspondances,
            'agentGrades' => $agentGrades,
        ]);
    }

+1 −1
Changes for module/Carriere/src/Carriere/Controller/GradeController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ namespace Carriere\Controller;

use Carriere\Provider\Parametre\CarriereParametres;
use Carriere\Service\Grade\GradeServiceAwareTrait;
use UnicaenParametre\Service\Parametre\ParametreServiceAwareTrait;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\Model\ViewModel;
use UnicaenParametre\Service\Parametre\ParametreServiceAwareTrait;

class GradeController extends AbstractActionController {
    use GradeServiceAwareTrait;
+4 −1
Changes for module/Carriere/src/Carriere/Entity/Db/Corps.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,14 +3,17 @@
namespace Carriere\Entity\Db;

use Application\Entity\Db\AgentGrade;
use Application\Entity\Db\Interfaces\HasPeriodeInterface;
use Application\Entity\Db\Traits\DbImportableAwareTrait;
use Application\Entity\Db\Traits\HasPeriodeTrait;
use DateTime;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;

class Corps
class Corps implements HasPeriodeInterface
{
    use DbImportableAwareTrait;
    use HasPeriodeTrait;

    private ?int $id = null;
    private ?string $code = null;
+4 −1
Changes for module/Carriere/src/Carriere/Entity/Db/Grade.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,13 +3,16 @@
namespace Carriere\Entity\Db;

use Application\Entity\Db\AgentGrade;
use Application\Entity\Db\Interfaces\HasPeriodeInterface;
use Application\Entity\Db\Traits\DbImportableAwareTrait;
use Application\Entity\Db\Traits\HasPeriodeTrait;
use DateTime;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;

class Grade  {
class Grade  implements HasPeriodeInterface {
    use DbImportableAwareTrait;
    use HasPeriodeTrait;

    private ?int $id = null;
    private ?string $libelleCourt = null;
Loading