Commit eb45be50 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Correction pull foireux

parent b50c0795

front/Application/UI/UTabs.vue

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ export default { 
    methods: {

        selectTab(event){

            this.currentTab = event.target.attributes.getNamedItem('aria-controls').value;

            this.$emit('changeTab', this.currentTab);

        },

    }

}

front/Mission/Suivi.vue

+79 −13
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
    <u-calendar :date="date" @changeDate="changeDate" @addEvent="addVolumeHoraire" :events="realise"/>

    <u-modal id="suivi-form" title="Suivi">

        <template #body>

            <u-tabs tab="mission" :tabs="{mission:'Mission',formation:'Formation',conges:'Congés'}">

            <u-tabs :tab="vhr.type" @changeTab="changeTab" :tabs="{mission:'Mission',formation:'Formation',conges:'Congés'}">

                <template #mission>

                    <div class="mb-2">

                        <label for="mission" class="form-label">Mission</label>
@@ -11,23 +11,75 @@ 
                        </select>

                    </div>



                    <div class="row">

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

                            <div class="mb-2">

                                <label for="horaire-debut" class="form-label">Horaire de début</label>

                                <input type="time" name="horaire-debut" id="horaire-debut" class="form-control" v-model="vhr.horaireDebut"/>

                            </div>

                        </div>

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

                            <div class="mb-2">

                                <label for="horaire-fin" class="form-label">Horaire de fin</label>

                                <input type="time" name="horaire-fin" id="horaire-fin" class="form-control" v-model="vhr.horaireFin"/>

                            </div>

                        </div>

                    </div>

                    <div class="row">

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

                            <div class="mb-2">

                                <label for="heures" class="form-label">Nombre d'heures</label>

                                <input type="number" step="0.01" name="heures" id="heures" class="form-control" v-model="vhr.heures"/>

                            </div>

                        </div>

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

                            <div class="mb-2">

                                <label class="form-label" for="nocturne">Horaire nocturne</label><br/>

                                <div class="form-check">

                            <input type="checkbox" class="form-check-input" id="nocturne" v-model="vhr.nocturne">

                            <label class="form-label" for="nocturne">Horaire nocturne</label>

                                    <input type="checkbox" class="form-check-input" id="nocturne" v-model="vhr.nocturne"/>

                                </div>

                            </div>

                        </div>

                    </div>



                </template>

                <template #formation>

                    Formation 2

                    <div class="mb-2">

                        <label for="heures-formation" class="form-label">Nombre d'heures</label>

                        <input type="number" step="0.01" name="heures-formation" id="heures-formation" class="form-control" v-model="vhr.heuresFormation"/>

                    </div>

                </template>

                <template #conges>

                    Congés 2

                    <div>

                        <label for="periode-conges" class="form-label">Période des congés</label>

                    </div>

                    <div class="btn-group" role="group" aria-label="Période de congés">

                        <input type="radio" class="btn-check" autocomplete="off"

                               name="conges-periode" id="conges-matin" value="matin"

                               :checked="vhr.congesPeriode == 'matin'">

                        <label class="btn btn-outline-primary" for="conges-matin" @click="changeCongesPeriode" data-value="matin">Matin</label>



                        <input type="radio" class="btn-check" autocomplete="off"

                               name="conges-periode" id="conges-aprem" value="aprem"

                               :checked="vhr.congesPeriode == 'aprem'">

                        <label class="btn btn-outline-primary" for="conges-aprem" @click="changeCongesPeriode" data-value="aprem">Après-midi</label>



                        <input type="radio" class="btn-check" autocomplete="off"

                               name="conges-periode" id="conges-jour" value="jour"

                               :checked="vhr.congesPeriode == 'jour'">

                        <label class="btn btn-outline-primary" for="conges-jour" @click="changeCongesPeriode" data-value="jour">Toute la journée</label>

                    </div>

                </template>

            </u-tabs>

            <div class="mb-2">

                <label for="description" class="form-label">Description</label>

                <textarea name="description" id="description" class="form-control" v-model="vhr.description" />

            </div>



            {{ vhr }}

        </template>

        <template #footer>



            <button class="btn btn-primary">Enregistrer</button>

        </template>

    </u-modal>

</template>
@@ -47,8 +99,16 @@ export default { 
        return {

            date: new Date(),

            vhr: {

                date: null,

                horaireDebut: null,

                horaireFin: null,

                type: "mission",

                missionId: null,

                nocturne: false,

                heures: null,

                heuresFormation: null,

                congesPeriode: "jour",

                description: null,

            },

            realise: [

                {
@@ -75,20 +135,26 @@ export default { 
        };

    },

    methods: {

        test()

        {

            console.log(this.lignes());

        },



        changeDate(dateObj)

        {

            console.log(dateObj);

            this.date = dateObj;

        },



        changeTab(tab)

        {

            this.vhr.type = tab;

        },



        changeCongesPeriode(event)

        {

            this.vhr.congesPeriode = event.target.dataset['value'];

        },



        addVolumeHoraire(dateObj)

        {

            console.log(dateObj);



        },

    }

}

module/Mission/config/module.config.php

+0 −1
Original line number Diff line number Diff line
@@ -212,6 +212,5 @@ return [ 
    ],



    'view_helpers' => [



    ],

];
 
 No newline at end of file

module/Mission/src/Controller/MissionController.php

+0 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


namespace Mission\Controller;



use Application\Constants;

use Application\Controller\AbstractController;

use Application\Entity\Db\Intervenant;

use Application\Provider\Privilege\Privileges;
@@ -16,7 +15,6 @@ use Mission\Entity\Db\VolumeHoraireMission; 
use Mission\Form\MissionFormAwareTrait;

use Mission\Form\MissionSuiviFormAwareTrait;

use Mission\Service\MissionServiceAwareTrait;

use Service\Entity\Db\TypeVolumeHoraire;





/**

public/css/app.css

+56 −56
Original line number Diff line number Diff line
@@ -3196,7 +3196,7 @@ textarea.form-control-lg { 
  --mdb-dropdown-border-radius: 0.5rem;

  --mdb-dropdown-border-width: 1px;

  --mdb-dropdown-inner-border-radius: calc(0.5rem - 1px);

  --mdb-dropdown-divider-bg: hsl(0deg, 0%, 96%);

  --mdb-dropdown-divider-bg: hsl(0, 0%, 96%);

  --mdb-dropdown-divider-margin-y: 0.5rem;

  --mdb-dropdown-box-shadow: 0 2px 15px -3px rgba(0, 0, 0, 0.07), 0 10px 20px -2px rgba(0, 0, 0, 0.04);

  --mdb-dropdown-link-color: #262626;
@@ -3465,7 +3465,7 @@ textarea.form-control-lg { 
  --mdb-dropdown-box-shadow: ;

  --mdb-dropdown-link-color: #e0e0e0;

  --mdb-dropdown-link-hover-color: #fff;

  --mdb-dropdown-divider-bg: hsl(0deg, 0%, 96%);

  --mdb-dropdown-divider-bg: hsl(0, 0%, 96%);

  --mdb-dropdown-link-hover-bg: rgba(255, 255, 255, 0.15);

  --mdb-dropdown-link-active-color: #fff;

  --mdb-dropdown-link-active-bg: #3b71ca;
@@ -5269,12 +5269,12 @@ textarea.form-control-lg { 
  --mdb-modal-header-padding-x: 1rem;

  --mdb-modal-header-padding-y: 1rem;

  --mdb-modal-header-padding: 1rem 1rem;

  --mdb-modal-header-border-color: hsl(0deg, 0%, 96%);

  --mdb-modal-header-border-color: hsl(0, 0%, 96%);

  --mdb-modal-header-border-width: 2px;

  --mdb-modal-title-line-height: 1.6;

  --mdb-modal-footer-gap: 0.5rem;

  --mdb-modal-footer-bg: ;

  --mdb-modal-footer-border-color: hsl(0deg, 0%, 96%);

  --mdb-modal-footer-border-color: hsl(0, 0%, 96%);

  --mdb-modal-footer-border-width: 2px;

  position: fixed;

  top: 0;
@@ -5553,7 +5553,7 @@ textarea.form-control-lg { 
  --mdb-popover-font-size: 0.875rem;

  --mdb-popover-bg: #fff;

  --mdb-popover-border-width: 1px;

  --mdb-popover-border-color: hsl(0deg, 0%, 96%);

  --mdb-popover-border-color: hsl(0, 0%, 96%);

  --mdb-popover-border-radius: 0.5rem;

  --mdb-popover-inner-border-radius: calc(0.5rem - 1px);

  --mdb-popover-box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.07), 0 2px 2px 0 rgba(0, 0, 0, 0.04);
@@ -12052,10 +12052,10 @@ textarea.form-control-lg { 








hr:not([size]).hr {









  --mdb-divider-height: 2px;









  --mdb-divider-bg: hsl(0deg, 0%, 96%);









  --mdb-divider-bg: hsl(0, 0%, 96%);









  --mdb-divider-opacity: 1;









  --mdb-divider-blurry-bg: transparent;









  --mdb-divider-blurry-bg-image: linear-gradient(90deg, transparent, hsl(0deg, 0%, 40%), transparent);









  --mdb-divider-blurry-bg-image: linear-gradient(90deg, transparent, hsl(0, 0%, 40%), transparent);









  --mdb-divider-blurry-height: 1px;









  --mdb-divider-blurry-opacity: 0.25;









  height: var(--mdb-divider-height);










@@ -12079,7 +12079,7 @@ hr.vr {















.vr {









  --mdb-divider-width: 2px;









  --mdb-divider-bg: hsl(0deg, 0%, 96%);









  --mdb-divider-bg: hsl(0, 0%, 96%);









  --mdb-divider-opacity: 1;









  width: var(--mdb-divider-width);









  background-color: var(--mdb-divider-bg);










@@ -12087,7 +12087,7 @@ hr.vr {







}

















.vr-blurry {









  --mdb-divider-blurry-vr-bg-image: linear-gradient(180deg, transparent, hsl(0deg, 0%, 40%), transparent);









  --mdb-divider-blurry-vr-bg-image: linear-gradient(180deg, transparent, hsl(0, 0%, 40%), transparent);









  --mdb-divider-blurry-vr-width: 1px;









  --mdb-divider-blurry-opacity: 0.25;









  background-image: var(--mdb-divider-blurry-vr-bg-image);










@@ -14791,7 +14791,7 @@ input[type=file].form-control.is-invalid:focus-within ~ .form-file-label .form-f







  --mdb-btn-font-weight: 500;









  --mdb-btn-color: #3b71ca;









  --mdb-btn-hover-color: #386bc0;









  --mdb-btn-hover-bg: hsl(0deg, 0%, 96%);









  --mdb-btn-hover-bg: hsl(0, 0%, 96%);









  --mdb-btn-focus-color: #3566b6;









  --mdb-btn-active-color: #3260ac;









  --mdb-btn-disabled-color: #9e9e9e;










@@ -15049,12 +15049,12 @@ hr.divider-horizontal:not([size]) {







}

















hr.divider-horizontal-blurry {









  background-image: linear-gradient(90deg, transparent, hsl(0deg, 0%, 40%), transparent);









  background-image: linear-gradient(90deg, transparent, hsl(0, 0%, 40%), transparent);









  background-color: transparent;









}

















hr.divider-vertical-blurry {









  background-image: linear-gradient(180deg, transparent, hsl(0deg, 0%, 40%), transparent);









  background-image: linear-gradient(180deg, transparent, hsl(0, 0%, 40%), transparent);









  background-color: transparent;









  width: 1px;









  top: 0;










@@ -15171,7 +15171,7 @@ hr.divider-vertical-blurry {















.dropdown-divider {









  --mdb-dropdown-divider-border-top-width: 2px;









  --mdb-dropdown-divider-border-top-bg: hsl(0deg, 0%, 96%);









  --mdb-dropdown-divider-border-top-bg: hsl(0, 0%, 96%);









  border-top: var(--mdb-dropdown-divider-border-top-width) solid var(--mdb-dropdown-divider-border-top-bg);









  opacity: 1;









}










@@ -15415,7 +15415,7 @@ fieldset:disabled .btn-group-vertical > .btn {















.card-header {









  --mdb-card-header-border-width: 2px;









  --mdb-card-header-border-color: hsl(0deg, 0%, 96%);









  --mdb-card-header-border-color: hsl(0, 0%, 96%);









  border-bottom: var(--mdb-card-header-border-width) solid var(--mdb-card-header-border-color);









}


















@@ -15425,7 +15425,7 @@ fieldset:disabled .btn-group-vertical > .btn {







}

















.card-footer {









  --mdb-card-footer-border-color: hsl(0deg, 0%, 96%);









  --mdb-card-footer-border-color: hsl(0, 0%, 96%);









  --mdb-card-footer-border-width: 2px;









  border-top: var(--mdb-card-footer-border-width) solid var(--mdb-card-footer-border-color);









}










@@ -15757,7 +15757,7 @@ fieldset:disabled .btn-group-vertical > .btn {















.list-group-light {









  --mdb-list-group-light-item-py: 1rem;









  --mdb-list-group-light-item-border: 2px solid hsl(0deg, 0%, 96%);









  --mdb-list-group-light-item-border: 2px solid hsl(0, 0%, 96%);









  --mdb-list-group-light-item-border-width: 2px;









  --mdb-list-group-light-active-border-radius: 0.5rem;









  --mdb-list-group-light-active-bg: rgb(223, 231, 246);










@@ -15900,75 +15900,75 @@ fieldset:disabled .btn-group-vertical > .btn {







}

















.toast-primary {









  background-color: hsl(219deg, 56.1%, 92%);









  color: hsl(217deg, 56.9%, 40%);









  border-color: hsl(218deg, 57.7%, 86.1%);









  background-color: hsl(219, 56.1%, 92%);









  color: hsl(217, 56.9%, 40%);









  border-color: hsl(218, 57.7%, 86.1%);









}









.toast-primary i {









  color: hsl(217deg, 56.9%, 50%);









  color: hsl(217, 56.9%, 50%);









}

















.toast-secondary {









  background-color: hsl(210deg, 11.1%, 92.9%);









  color: hsl(216deg, 10.5%, 28%);









  border-color: hsl(206deg, 10.4%, 86.9%);









  background-color: hsl(210, 11.1%, 92.9%);









  color: hsl(216, 10.5%, 28%);









  border-color: hsl(206, 10.4%, 86.9%);









}









.toast-secondary i {









  color: hsl(218deg, 11.3%, 38%);









  color: hsl(218, 11.3%, 38%);









}

















.toast-success {









  background-color: hsl(143deg, 46.4%, 89%);









  color: hsl(144deg, 77.8%, 22.9%);









  border-color: hsl(145deg, 44.8%, 82.9%);









  background-color: hsl(143, 46.4%, 89%);









  color: hsl(144, 77.8%, 22.9%);









  border-color: hsl(145, 44.8%, 82.9%);









}









.toast-success i {









  color: hsl(144deg, 77.5%, 33.1%);









  color: hsl(144, 77.5%, 33.1%);









}

















.toast-danger {









  background-color: hsl(350deg, 66.7%, 92.9%);









  color: hsl(350deg, 66.7%, 41.2%);









  border-color: hsl(350deg, 66.7%, 87.1%);









  background-color: hsl(350, 66.7%, 92.9%);









  color: hsl(350, 66.7%, 41.2%);









  border-color: hsl(350, 66.7%, 87.1%);









}









.toast-danger i {









  color: hsl(350deg, 67.2%, 51%);









  color: hsl(350, 67.2%, 51%);









}

















.toast-warning {









  background-color: hsl(40deg, 80.5%, 92%);









  color: hsl(40deg, 79.7%, 25.1%);









  border-color: hsl(39deg, 83.1%, 86.1%);









  background-color: hsl(40, 80.5%, 92%);









  color: hsl(40, 79.7%, 25.1%);









  border-color: hsl(39, 83.1%, 86.1%);









}









.toast-warning i {









  color: hsl(40deg, 79.9%, 35.1%);









  color: hsl(40, 79.9%, 35.1%);









}

















.toast-info {









  background-color: hsl(194deg, 61%, 92%);









  color: hsl(195deg, 63.4%, 30%);









  border-color: hsl(195deg, 60.6%, 86.1%);









  background-color: hsl(194, 61%, 92%);









  color: hsl(195, 63.4%, 30%);









  border-color: hsl(195, 60.6%, 86.1%);









}









.toast-info i {









  color: hsl(195deg, 62.7%, 40%);









  color: hsl(195, 62.7%, 40%);









}

















.toast-light {









  background-color: hsl(0deg, 0%, 96.1%);









  color: hsl(0deg, 0%, 31%);









  border-color: hsl(0deg, 0%, 90.2%);









  background-color: hsl(0, 0%, 96.1%);









  color: hsl(0, 0%, 31%);









  border-color: hsl(0, 0%, 90.2%);









}









.toast-light i {









  color: hsl(0deg, 0%, 54.9%);









  color: hsl(0, 0%, 54.9%);









}

















.toast-dark {









  background-color: hsl(0deg, 5.2%, 19%);









  color: hsl(0deg, 0%, 96.1%);









  border-color: hsl(0deg, 6.3%, 25.1%);









  background-color: hsl(0, 5.2%, 19%);









  color: hsl(0, 0%, 96.1%);









  border-color: hsl(0, 6.3%, 25.1%);









}









.toast-dark i {









  color: hsl(0deg, 0%, 91%);









  color: hsl(0, 0%, 91%);









}

















.tooltip {










@@ -16171,8 +16171,8 @@ fieldset:disabled .btn-group-vertical > .btn {







}

















.accordion-flush {









  --mdb-accordion-flush-btn-box-shadow: inset 0 -2px 0 hsl(0deg, 0%, 96%);









  --mdb-accordion-flush-border-bottom: 2px solid hsl(0deg, 0%, 96%);









  --mdb-accordion-flush-btn-box-shadow: inset 0 -2px 0 hsl(0, 0%, 96%);









  --mdb-accordion-flush-border-bottom: 2px solid hsl(0, 0%, 96%);









}









.accordion-flush .accordion-button:not(.collapsed) {









  box-shadow: var(--mdb-accordion-flush-btn-box-shadow);










@@ -19649,7 +19649,7 @@ textarea.form-control-lg {







  height: 0;









  margin: 0.5rem 0;









  overflow: hidden;









  border-top: 1px solid hsl(0deg, 0%, 96%);









  border-top: 1px solid hsl(0, 0%, 96%);









}

















.dropdown-item {










@@ -19718,7 +19718,7 @@ textarea.form-control-lg {







  color: #9e9e9e;









}









.dropdown-menu-dark .dropdown-divider {









  border-color: hsl(0deg, 0%, 96%);









  border-color: hsl(0, 0%, 96%);









}









.dropdown-menu-dark .dropdown-item-text {









  color: #e0e0e0;










@@ -21286,7 +21286,7 @@ textarea.form-control-lg {







  align-items: center;









  justify-content: space-between;









  padding: 1rem 1rem;









  border-bottom: 2px solid hsl(0deg, 0%, 96%);









  border-bottom: 2px solid hsl(0, 0%, 96%);









  border-top-left-radius: calc(0.5rem - 1px);









  border-top-right-radius: calc(0.5rem - 1px);









}










@@ -21313,7 +21313,7 @@ textarea.form-control-lg {







  align-items: center;









  justify-content: flex-end;









  padding: 0.75rem;









  border-top: 2px solid hsl(0deg, 0%, 96%);









  border-top: 2px solid hsl(0, 0%, 96%);









  border-bottom-right-radius: calc(0.5rem - 1px);









  border-bottom-left-radius: calc(0.5rem - 1px);









}










@@ -21606,7 +21606,7 @@ textarea.form-control-lg {







  word-wrap: break-word;









  background-color: #fff;









  background-clip: padding-box;









  border: 1px solid hsl(0deg, 0%, 96%);









  border: 1px solid hsl(0, 0%, 96%);









  border-radius: 0.5rem;









  box-shadow: 0 0px 3px 0 rgba(0, 0, 0, 0.07), 0 2px 2px 0 rgba(0, 0, 0, 0.04);









}










@@ -21699,7 +21699,7 @@ textarea.form-control-lg {







  margin-bottom: 0;









  font-size: 0.9rem;









  background-color: #fff;









  border-bottom: 1px solid hsl(0deg, 0%, 96%);









  border-bottom: 1px solid hsl(0, 0%, 96%);









  border-top-left-radius: calc(0.5rem - 1px);









  border-top-right-radius: calc(0.5rem - 1px);









}