Commit 144e1fd1 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'missions' of https://git.unicaen.fr/open-source/OSE into missions

parents e73c8cd3 dd08bab1
Loading
Loading
Loading
Loading
+1
Changes for data/ddl/unique-constraint/MISSION_TAUX_REMU_VALEUR_UN.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ return [
    'index'   => 'MISSION_TAUX_REMU_VALEUR_UN',
    'columns' => [
        'DATE_EFFET',
        'MISSION_TAUX_REMU_ID',
    ],
];

+3 −2
Changes for module/Mission/src/Controller/MissionTauxController.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -68,13 +68,14 @@ class MissionTauxController extends AbstractController
    public function saisirValeurAction(): array
    {

        $tauxRemuValeur = $this->getEvent()->getParam('missionTauxRemuValeur');
        $tauxRemuValeurId = $this->params()->fromRoute('missionTauxRemuValeur');
        $form           = $this->getFormMissionTauxValeur();

        if (empty($tauxRemuValeur)) {
        if (empty($tauxRemuValeurId)) {
            $title = "Création d'une nouvelle valeur";
            $tauxRemuValeur = $this->getServiceMissionTaux()->newEntityValeur();
        } else {
            $tauxRemuValeur = $this->getServiceMissionTaux()->getTauxRemusValeur($tauxRemuValeurId);
            $title = "Édition d'une valeur";
        }

+8 −5
Changes for module/Mission/src/Service/MissionTauxService.php: 8 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -58,12 +58,15 @@ class MissionTauxService extends AbstractEntityService

    public function getTauxRemusValeur(mixed $tauxRemuValeurId)
    {
        $dql   = "SELECT mtrv
                 FROM " . MissionTauxRemuValeur::class . " mtrv
                 WHERE mtrv.histoDestruction IS NULL
                 AND mtrv.id = ".$tauxRemuValeurId;
        $dql   = "SELECT mtr
                 FROM " . MissionTauxRemuValeur::class . " mtr
                 WHERE mtr.id =".$tauxRemuValeurId;
        $query = $this->getEntityManager()->createQuery($dql);
        return $query->getResult();
        $result = $query->getResult() ;
        if(!empty($result)){
            return $result[0];
        }
        return null;
    }


+1 −1
Changes for module/Mission/view/mission/mission-taux/index.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ $anneeSplit = explode('/', $annee); ?>
                        <?php $newDate = $tauxRemuValeur->getDateEffet()->format('d/m/Y'); ?>

                        <a class="ajax-modal " data-event="taux-valeur-edition"
                           href="<?= $this->url("missions-taux/saisir-valeur", ['missionTauxRemuValeur' => $tauxRemuValeur->getId()], ['query' => ['missionTauxRemu' => $tauxRemu->getId()]]) ?>"
                           href="<?= $this->url("missions-taux/saisir-valeur", ['missionTauxRemu'=>$tauxRemu,'missionTauxRemuValeur' => $tauxRemuValeur->getId()]) ?>"
                           title="Modifier la valeur du taux">
                            <?php echo $tauxRemuValeur->getValeur() ?> - <?php echo $newDate ?><br>
                        </a>