Commit 6db77bec authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Ajout d'un libelle mission pour mieux différentier les missions avec l'offre d'emploi d'origine

parent 78f92edc
Loading
Loading
Loading
Loading
+12 −0
Changes for data/ddl/table/MISSION.php: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -57,6 +57,18 @@ return [
            'position'    => 6,
            'commentaire' => NULL,
        ],
        'LIBELLE_MISSION'           => [
            'name'        => 'LIBELLE_MISSION',
            'type'        => 'string',
            'bdd-type'    => 'VARCHAR2',
            'length'      => 4000,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 19,
            'commentaire' => NULL,
        ],
        'ETUDIANTS_SUIVIS'      => [
            'name'        => 'ETUDIANTS_SUIVIS',
            'type'        => 'string',
+30 −24
Changes for front/Mission/Mission.vue: 30 added lines, 24 removed lines.
Original line number Diff line number Diff line
<template>
    <div :id="mission.id" class="card" :class="{'bg-success':mission.valide,'bg-default':!mission.valide}">
    <div :id="mission.id" :class="{'bg-success':mission.valide,'bg-default':!mission.valide}" class="card">
        <form @submit.prevent="submitForm">
            <div class="card-header card-header-h3">
                <h5>
                    {{ mission.typeMission.libelle }}
                <h5 v-if="mission.libelleMission">
                    {{ mission.libelleMission }}
                    <span class="float-end">Du <u-date :value="mission.dateDebut"/> au <u-date
                        :value="mission.dateFin"/></span>
                </h5>
                <h6 v-if="mission.libelleMission">{{ mission.typeMission.libelle }}</h6>
                <h5 v-if="!mission.libelleMission">{{ mission.typeMission.libelle }}
                    <span class="float-end">Du <u-date :value="mission.dateDebut"/> au <u-date
                        :value="mission.dateFin"/></span></h5>
            </div>
            <div class="card-body">
                <div class="row">
@@ -26,20 +30,22 @@
                            <div class="col-md-6">
                                <label class=" form-label">Taux majoré (dimanches/jours fériés)</label>
                                <div class="form-control">
                                    {{ mission.tauxRemuMajore ? mission.tauxRemuMajore.libelle : mission.tauxRemu ? 'Idem (' +mission.tauxRemu.libelle+')' : null }}
                                    {{
                                        mission.tauxRemuMajore ? mission.tauxRemuMajore.libelle : mission.tauxRemu ? 'Idem ('+mission.tauxRemu.libelle+')' : null
                                    }}
                                </div>
                            </div>
                            <div class="col-md-7">
                                <label class=" form-label">Nombre d'heures prévisionnelles</label>
                                <div class="input-group mb-3">
                                    <div class="form-control" v-html="heuresLib"></div>
                                    <button class="input-group-btn btn btn-secondary" data-bs-toggle="modal"
                                            :data-bs-target="`#details-${mission.id}`">
                                    <button :data-bs-target="`#details-${mission.id}`" class="input-group-btn btn btn-secondary"
                                            data-bs-toggle="modal">
                                        Détails
                                    </button>
                                </div>
                            </div>
                            <div class="col-md-5" v-if="mission.typeMission.besoinFormation">
                            <div v-if="mission.typeMission.besoinFormation" class="col-md-5">
                                <label class=" form-label">Heures de formation prévues</label>
                                <div class="form-control">{{ mission.heuresFormation }}</div>
                            </div>
@@ -50,7 +56,7 @@
                                <div class="form-control">{{ mission.description }}</div>
                            </div>
                        </div>
                        <div class="row" v-if="mission.typeMission.accompagnementEtudiants">
                        <div v-if="mission.typeMission.accompagnementEtudiants" class="row">
                            <div class="col-md-12">
                                <label class=" form-label">Etudiants suivis</label>
                                <div class="form-control">
@@ -72,22 +78,22 @@
                                <a v-if="mission.canValider"
                                   :href="validerUrl"
                                   class="btn btn-secondary"
                                   data-title="Validation de la mission"
                                   data-content="Êtes-vous sur de vouloir valider la mission ?"
                                   data-title="Validation de la mission"
                                   @click.prevent="valider">Valider</a>

                                <a v-if="mission.canDevalider"
                                   :href="devaliderUrl"
                                   class="btn btn-danger"
                                   data-title="Dévalidation de la mission"
                                   data-content="Êtes-vous sur de vouloir dévalider la mission ?"
                                   data-title="Dévalidation de la mission"
                                   @click.prevent="devalider">Dévalider</a>

                                <a v-if="mission.canSupprimer"
                                   :href="supprimerUrl"
                                   class="btn btn-danger"
                                   data-title="Suppression de la mission"
                                   data-content="Êtes-vous sur de vouloir supprimer la mission ?"
                                   data-title="Suppression de la mission"
                                   @click.prevent="supprimer">Supprimer</a>
                            </div>
                        </div>
@@ -102,15 +108,15 @@
                            Créé le
                            <u-date :value="mission.histoCreation"/>
                            par
                            <utilisateur :nom="mission.histoCreateur.displayName" :mail="mission.histoCreateur.email"/>
                            <utilisateur :mail="mission.histoCreateur.email" :nom="mission.histoCreateur.displayName"/>
                        </div>
                        <div>
                            <u-icon :name="mission.valide ? 'thumbs-up' : 'thumbs-down'"
                                    :variant="mission.valide ? 'success' : 'info'"/>
                            {{ validationText }}
                            <utilisateur v-if="mission.validation && mission.validation.histoCreateur"
                                         :nom="mission.validation.histoCreateur.displayName"
                                         :mail="mission.validation.histoCreateur.email"/>
                                         :mail="mission.validation.histoCreateur.email"
                                         :nom="mission.validation.histoCreateur.displayName"/>
                        </div>
                        <div>
                            <u-icon :name="mission.contrat ? 'thumbs-up' : 'thumbs-down'"
@@ -145,8 +151,8 @@
                    <td>
                        <u-icon name="thumbs-up" variant="success"/>
                        Saisi par
                        <utilisateur :nom="vh.histoCreateur.displayName"
                                     :mail="vh.histoCreateur.email"/>
                        <utilisateur :mail="vh.histoCreateur.email"
                                     :nom="vh.histoCreateur.displayName"/>
                        le
                        <u-date :value="vh.histoCreation"/>
                        <br/>
@@ -156,31 +162,31 @@
                            vh.validation && vh.validation.id == null ? 'Autovalidé' : (!vh.validation ? 'à valider' : '')
                        }}
                        <span v-if="vh.validation && vh.validation.histoCreateur">
                            Validé par <utilisateur :nom="vh.validation.histoCreateur.displayName"
                                                    :mail="vh.validation.histoCreateur.email"/> le <u-date
                            Validé par <utilisateur :mail="vh.validation.histoCreateur.email"
                                                    :nom="vh.validation.histoCreateur.displayName"/> le <u-date
                            :value="vh.validation.histoCreation"/>
                        </span>
                    </td>
                    <td>
                        <a v-if="vh.canValider"
                           class="btn btn-secondary"
                           :data-id="vh.id"
                           data-title="Validation du volume horaire"
                           class="btn btn-secondary"
                           data-content="Êtes-vous sur de vouloir valider ce volume horaire ?"
                           data-title="Validation du volume horaire"
                           @click.prevent="volumeHoraireValider">Valider</a>

                        <a v-if="vh.canDevalider"
                           class="btn btn-danger"
                           :data-id="vh.id"
                           data-title="Dévalidation du volume horaire"
                           class="btn btn-danger"
                           data-content="Êtes-vous sur de vouloir dévalider ce volume horaire ?"
                           data-title="Dévalidation du volume horaire"
                           @click.prevent="volumeHoraireDevalider">Dévalider</a>

                        <a v-if="vh.canSupprimer"
                           class="btn btn-danger"
                           :data-id="vh.id"
                           data-title="Suppression du volume horaire"
                           class="btn btn-danger"
                           data-content="Êtes-vous sur de vouloir supprimer le volume horaire ?"
                           data-title="Suppression du volume horaire"
                           @click.prevent="volumeHoraireSupprimer">Supprimer</a>
                    </td>
                </tr>
+1 −2
Changes for module/Application/view/error/index.phtml: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
<?php

$this->headTitle()->append($title = 'An error occurred');
$this->headTitle()->append($title = 'Information importante');
$details = AppConfig::get('global', 'affichageErreurs') && isset($this->exception) && ($this->exception instanceof Error || $this->exception instanceof Exception);

?>
<div class="alert alert-danger exception" role="alert">
    <i class="fas fa-triangle-exclamation"></i>
    <h1><?= $this->translate($title) ?> :</h1>
    <?= $this->exception->getMessage() ?>
    <?php if ($details): ?>
+6 −1
Changes for module/Intervenant/src/Controller/NoteController.php: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class NoteController extends AbstractController
        /* @var $intervenant \Application\Entity\Db\Intervenant */

        if (!$intervenant) {
            throw new \Exception('Intervenant introuvable');
            throw new \Exception();
        }

        $notes  = $this->getServiceNote()->getByIntervenant($intervenant, 'note');
@@ -45,6 +45,7 @@ class NoteController extends AbstractController
    }



    public function saisirAction ()
    {

@@ -82,6 +83,7 @@ class NoteController extends AbstractController
    }



    public function voirAction ()
    {
        $intervenant = $this->getEvent()->getParam('intervenant');
@@ -93,6 +95,7 @@ class NoteController extends AbstractController
    }



    public function supprimerAction ()
    {
        $intervenant = $this->getEvent()->getParam('intervenant');
@@ -116,6 +119,7 @@ class NoteController extends AbstractController
    }



    public function envoyerEmailAction ()
    {
        $intervenant = $this->getEvent()->getParam('intervenant');
@@ -139,6 +143,7 @@ class NoteController extends AbstractController
                $this->flashMessenger()->addErrorMessage($this->translate($e));
            }
        }

        return compact('intervenant', 'form', 'title');
    }
}
+3 −1
Changes for module/Mission/src/Entity/Db/Mapping/Mission.Entity.Db.Mission.dcm.xml: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<doctrine-mapping xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
    <entity name="Mission\Entity\Db\Mission" table="MISSION">
        <id name="id" type="integer" column="ID">
@@ -24,6 +24,8 @@
        <field name="dateFin" type="datetime" column="DATE_FIN" nullable="false"/>
        <field name="heuresFormation" type="float" column="HEURES_FORMATION" precision="126" scale="0" nullable="true"/>
        <field name="description" type="string" column="DESCRIPTION" length="4000" nullable="true"/>
        <field name="libelleMission" type="string" column="LIBELLE_MISSIOn" length="4000" nullable="true"/>

        <field name="etudiantsSuivis" type="string" column="ETUDIANTS_SUIVIS" length="4000" nullable="true"/>
        <one-to-many field="miseEnPaiement" target-entity="Paiement\Entity\Db\MiseEnPaiement" mapped-by="mission"/>

Loading