Commit 9dab9e5f authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge branch 'refs/heads/b24'

parents 91afadff 026fca9d
Loading
Loading
Loading
Loading
Loading
+6 −0
Changes for front/Employeur/ListeEmployeur.vue: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@
        </tr>
        </tbody>
    </u-table-ajax>
    <a class="btn btn-primary" @click.prevent="saisie"
       :href="this.dataNewEmployeur"
       title="Ajouter un employeur"><i
        class="fas fa-plus"></i>
        Ajout d'un employeur</a>
</template>

<script>
@@ -36,6 +41,7 @@ export default {
    {
        return {
            dataUrl: unicaenVue.url('employeur/get-data'),
            dataNewEmployeur: unicaenVue.url('employeur/saisie'),
            lines: [],
        };
    },
+1 −0
Changes for module/Dossier/src/Service/EmployeurService.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ class EmployeurService extends AbstractEntityService
                JOIN source s ON e.source_id = s.id
                WHERE
                  lower(e.critere_recherche) like :search
                ORDER BY raison_sociale ASC
                ";

        $em = $this->getEntityManager();
+1 −0
Changes for module/Dossier/view/dossier/employeur/saisie.phtml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
/**
 * @var $this  \Application\View\Renderer\PhpRenderer
 */
echo $this->tag('h1', ['class' => 'page-header'])->html($title);;

echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
echo $this->form($form);
+6 −2
Changes for module/ExportRh/src/Connecteur/Siham/SihamConnecteur.php: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ use ExportRh\Service\ExportRhServiceAwareTrait;
use Intervenant\Entity\Db\Intervenant;
use Intervenant\Service\SituationMatrimonialeServiceAwareTrait;
use Mission\Entity\Db\Mission;
use Paiement\Entity\Db\TauxRemu;
use Paiement\Service\TauxRemuServiceAwareTrait;
use UnicaenApp\Service\EntityManagerAwareTrait;
use Laminas\Form\Fieldset;
@@ -459,12 +460,15 @@ class SihamConnecteur implements ConnecteurRhInterface
            }
        } else {
            $infos['totalHeure'] = str_replace(',', '.', $mission->getHeures());
            $infos['taux'] = 0;
            //On va chercher la valeur du taux de la mission
            $dateDebutMission = $mission->getDateDebut();
            $idTauxRemu       = $mission->getTauxRemu()->getId();
            $valeurTaux       = $this->getServiceTauxRemu()->getTauxRemuValeur($idTauxRemu)->getValeur();
            $tauxRemu = $mission->getTauxRemu();
            if ($tauxRemu instanceof TauxRemu) {
                $valeurTaux    = $this->getServiceTauxRemu()->tauxValeur($tauxRemu, $dateDebutMission);
                $infos['taux'] = str_replace(',', '.', $valeurTaux);
            }
        }

        return $infos;
    }
+7 −1
Changes for module/Paiement/src/Form/TauxForm.php: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -30,7 +30,13 @@ class TauxForm extends AbstractForm
        $this->setValueOptions('tauxRemu', $this->getServiceTauxRemu()->getTauxRemusIndexable());
        $this->get('tauxRemu')->setEmptyOption("");
        $this->get('tauxRemu')->setLabel('Taux de référence');

        $this->add([
                       'name'    => 'valeur',
                       'type'    => 'Number',
                       'options' => [
                           'label' => 'Valeur a la date d\'effet',
                       ],
                   ]);
        $this->add([
            'name'    => 'date',
            'type'    => 'Date',
Loading