Loading front/Mission/Mission.vue +34 −13 Changes for front/Mission/Mission.vue: 34 added lines, 13 removed lines. Original line number Diff line number Diff line Loading @@ -4,7 +4,8 @@ <div class="card-header card-header-h3"> <h5> {{ mission.typeMission.libelle }} <span class="float-end">Du <u-date :value="mission.dateDebut" /> au <u-date :value="mission.dateFin" /></span> <span class="float-end">Du <u-date :value="mission.dateDebut"/> au <u-date :value="mission.dateFin"/></span> </h5> </div> <div class="card-body"> Loading @@ -18,15 +19,22 @@ </div> </div> <div class="row"> <div class="col-md-5"> <div class="col-md-6"> <label class=" form-label">Taux de rémunération</label> <div class="form-control">{{ mission.tauxRemu ? mission.tauxRemu.libelle : null }}</div> </div> <div class="col-md-6"> <label class=" form-label">Taux majoré (dimanches/jf)</label> <div class="form-control"> {{ 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 class="input-group-btn btn btn-secondary" data-bs-toggle="modal" :data-bs-target="`#details-${mission.id}`"> Détails </button> </div> Loading @@ -41,7 +49,9 @@ <div class="row" v-if="mission.typeMission.accompagnementEtudiants"> <div class="col-md-12"> <label class=" form-label">Etudiants suivis</label> <div class="form-control"><pre>{{ mission.etudiantsSuivis }}</pre></div> <div class="form-control"> <pre>{{ mission.etudiantsSuivis }}</pre> </div> </div> </div> <div class="row"> Loading Loading @@ -85,21 +95,27 @@ </div> <div> <u-icon name="thumbs-up" variant="success"/> Créé le <u-date :value="mission.histoCreation" /> par Créé le <u-date :value="mission.histoCreation"/> par <utilisateur :nom="mission.histoCreateur.displayName" :mail="mission.histoCreateur.email"/> </div> <div> <u-icon :name="mission.valide ? 'thumbs-up' : 'thumbs-down'" :variant="mission.valide ? 'success' : 'info'"/> <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" <utilisateur v-if="mission.validation && mission.validation.histoCreateur" :nom="mission.validation.histoCreateur.displayName" :mail="mission.validation.histoCreateur.email"/> </div> <div> <u-icon :name="mission.contrat ? 'thumbs-up' : 'thumbs-down'" :variant="mission.contrat ? 'success' : 'info'"/> <u-icon :name="mission.contrat ? 'thumbs-up' : 'thumbs-down'" :variant="mission.contrat ? 'success' : 'info'"/> {{ mission.contrat ? 'Contrat établi' : 'Pas de contrat' }} </div> <div> {{ mission.heuresRealisees}} heure{{ mission.heuresRealisees < 2 ? '' : 's' }} réalisée{{ mission.heuresRealisees < 2 ? '' : 's' }} {{ mission.heuresRealisees }} heure{{ mission.heuresRealisees < 2 ? '' : 's' }} réalisée{{ mission.heuresRealisees < 2 ? '' : 's' }} </div> </div> </div> Loading Loading @@ -127,13 +143,18 @@ Saisi par <utilisateur :nom="vh.histoCreateur.displayName" :mail="vh.histoCreateur.email"/> le <u-date :value="vh.histoCreation" /> le <u-date :value="vh.histoCreation"/> <br/> <u-icon :name="vh.valide ? 'thumbs-up' : 'thumbs-down'" :variant="vh.valide ? 'success' : 'info'"/> {{ vh.validation && vh.validation.id == null ? 'Autovalidé' : (!vh.validation ? 'à valider' : '') }} <u-icon :name="vh.valide ? 'thumbs-up' : 'thumbs-down'" :variant="vh.valide ? 'success' : 'info'"/> {{ 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 :value="vh.validation.histoCreation" /> :mail="vh.validation.histoCreateur.email"/> le <u-date :value="vh.validation.histoCreation"/> </span> </td> <td> Loading module/Mission/src/Form/MissionForm.php +8 −1 Changes for module/Mission/src/Form/MissionForm.php: 8 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -34,7 +34,11 @@ class MissionForm extends AbstractForm } $this->spec(Mission::class, ['intervenant', 'autoValidation']); $this->spec(['description' => ['type' => 'Textarea'], 'etudiantsSuivis' => ['type' => 'Textarea']]); $this->spec([ 'description' => ['type' => 'Textarea'], 'etudiantsSuivis' => ['type' => 'Textarea'], 'tauxRemuMajore' => ['input' => ['required' => false]], ]); $this->build(); $this->setValueOptions('typeMission', Util::collectionAsOptions($typesMissions)); Loading @@ -42,6 +46,8 @@ class MissionForm extends AbstractForm $trDql = "SELECT mtr FROM " . TauxRemu::class . " mtr"; $this->setValueOptions('tauxRemu', $trDql); $this->setValueOptions('tauxRemuMajore', $trDql); $this->get('tauxRemuMajore')->setEmptyOption('- Aucune majoration -'); $sDql = "SELECT s FROM " . Structure::class . " s WHERE s.histoDestruction IS NULL"; $this->setValueOptions('structure', $sDql); Loading @@ -50,6 +56,7 @@ class MissionForm extends AbstractForm 'structure' => 'Composante en charge du suivi de mission', 'typeMission' => 'Type de mission', 'tauxRemu' => 'Taux de rémunération', 'tauxRemuMajore' => 'Taux majoré (heures nocturnes et dimanches/jf)', 'dateDebut' => 'Date de début', 'dateFin' => 'Date de fin', 'description' => 'Descriptif de la mission', Loading module/Mission/src/Service/MissionService.php +1 −0 Changes for module/Mission/src/Service/MissionService.php: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -87,6 +87,7 @@ class MissionService extends AbstractEntityService 'dateFin', ['structure', ['libelle']], ['tauxRemu', ['libelle']], ['tauxRemuMajore', ['libelle']], 'description', 'histoCreation', 'histoCreateur', Loading module/Mission/view/mission/saisie/saisie.phtml +3 −0 Changes for module/Mission/view/mission/saisie/saisie.phtml: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -29,6 +29,9 @@ echo '<div class="col-md-6">'; echo $this->formControlGroup($form->get('tauxRemu')); echo '</div>'; echo '<div class="col-md-6">'; echo $this->formControlGroup($form->get('tauxRemuMajore')); echo '</div>'; echo '<div class="col-md-6">'; echo $this->formControlGroup($form->get('heures')); echo '</div>'; Loading Loading
front/Mission/Mission.vue +34 −13 Changes for front/Mission/Mission.vue: 34 added lines, 13 removed lines. Original line number Diff line number Diff line Loading @@ -4,7 +4,8 @@ <div class="card-header card-header-h3"> <h5> {{ mission.typeMission.libelle }} <span class="float-end">Du <u-date :value="mission.dateDebut" /> au <u-date :value="mission.dateFin" /></span> <span class="float-end">Du <u-date :value="mission.dateDebut"/> au <u-date :value="mission.dateFin"/></span> </h5> </div> <div class="card-body"> Loading @@ -18,15 +19,22 @@ </div> </div> <div class="row"> <div class="col-md-5"> <div class="col-md-6"> <label class=" form-label">Taux de rémunération</label> <div class="form-control">{{ mission.tauxRemu ? mission.tauxRemu.libelle : null }}</div> </div> <div class="col-md-6"> <label class=" form-label">Taux majoré (dimanches/jf)</label> <div class="form-control"> {{ 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 class="input-group-btn btn btn-secondary" data-bs-toggle="modal" :data-bs-target="`#details-${mission.id}`"> Détails </button> </div> Loading @@ -41,7 +49,9 @@ <div class="row" v-if="mission.typeMission.accompagnementEtudiants"> <div class="col-md-12"> <label class=" form-label">Etudiants suivis</label> <div class="form-control"><pre>{{ mission.etudiantsSuivis }}</pre></div> <div class="form-control"> <pre>{{ mission.etudiantsSuivis }}</pre> </div> </div> </div> <div class="row"> Loading Loading @@ -85,21 +95,27 @@ </div> <div> <u-icon name="thumbs-up" variant="success"/> Créé le <u-date :value="mission.histoCreation" /> par Créé le <u-date :value="mission.histoCreation"/> par <utilisateur :nom="mission.histoCreateur.displayName" :mail="mission.histoCreateur.email"/> </div> <div> <u-icon :name="mission.valide ? 'thumbs-up' : 'thumbs-down'" :variant="mission.valide ? 'success' : 'info'"/> <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" <utilisateur v-if="mission.validation && mission.validation.histoCreateur" :nom="mission.validation.histoCreateur.displayName" :mail="mission.validation.histoCreateur.email"/> </div> <div> <u-icon :name="mission.contrat ? 'thumbs-up' : 'thumbs-down'" :variant="mission.contrat ? 'success' : 'info'"/> <u-icon :name="mission.contrat ? 'thumbs-up' : 'thumbs-down'" :variant="mission.contrat ? 'success' : 'info'"/> {{ mission.contrat ? 'Contrat établi' : 'Pas de contrat' }} </div> <div> {{ mission.heuresRealisees}} heure{{ mission.heuresRealisees < 2 ? '' : 's' }} réalisée{{ mission.heuresRealisees < 2 ? '' : 's' }} {{ mission.heuresRealisees }} heure{{ mission.heuresRealisees < 2 ? '' : 's' }} réalisée{{ mission.heuresRealisees < 2 ? '' : 's' }} </div> </div> </div> Loading Loading @@ -127,13 +143,18 @@ Saisi par <utilisateur :nom="vh.histoCreateur.displayName" :mail="vh.histoCreateur.email"/> le <u-date :value="vh.histoCreation" /> le <u-date :value="vh.histoCreation"/> <br/> <u-icon :name="vh.valide ? 'thumbs-up' : 'thumbs-down'" :variant="vh.valide ? 'success' : 'info'"/> {{ vh.validation && vh.validation.id == null ? 'Autovalidé' : (!vh.validation ? 'à valider' : '') }} <u-icon :name="vh.valide ? 'thumbs-up' : 'thumbs-down'" :variant="vh.valide ? 'success' : 'info'"/> {{ 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 :value="vh.validation.histoCreation" /> :mail="vh.validation.histoCreateur.email"/> le <u-date :value="vh.validation.histoCreation"/> </span> </td> <td> Loading
module/Mission/src/Form/MissionForm.php +8 −1 Changes for module/Mission/src/Form/MissionForm.php: 8 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -34,7 +34,11 @@ class MissionForm extends AbstractForm } $this->spec(Mission::class, ['intervenant', 'autoValidation']); $this->spec(['description' => ['type' => 'Textarea'], 'etudiantsSuivis' => ['type' => 'Textarea']]); $this->spec([ 'description' => ['type' => 'Textarea'], 'etudiantsSuivis' => ['type' => 'Textarea'], 'tauxRemuMajore' => ['input' => ['required' => false]], ]); $this->build(); $this->setValueOptions('typeMission', Util::collectionAsOptions($typesMissions)); Loading @@ -42,6 +46,8 @@ class MissionForm extends AbstractForm $trDql = "SELECT mtr FROM " . TauxRemu::class . " mtr"; $this->setValueOptions('tauxRemu', $trDql); $this->setValueOptions('tauxRemuMajore', $trDql); $this->get('tauxRemuMajore')->setEmptyOption('- Aucune majoration -'); $sDql = "SELECT s FROM " . Structure::class . " s WHERE s.histoDestruction IS NULL"; $this->setValueOptions('structure', $sDql); Loading @@ -50,6 +56,7 @@ class MissionForm extends AbstractForm 'structure' => 'Composante en charge du suivi de mission', 'typeMission' => 'Type de mission', 'tauxRemu' => 'Taux de rémunération', 'tauxRemuMajore' => 'Taux majoré (heures nocturnes et dimanches/jf)', 'dateDebut' => 'Date de début', 'dateFin' => 'Date de fin', 'description' => 'Descriptif de la mission', Loading
module/Mission/src/Service/MissionService.php +1 −0 Changes for module/Mission/src/Service/MissionService.php: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -87,6 +87,7 @@ class MissionService extends AbstractEntityService 'dateFin', ['structure', ['libelle']], ['tauxRemu', ['libelle']], ['tauxRemuMajore', ['libelle']], 'description', 'histoCreation', 'histoCreateur', Loading
module/Mission/view/mission/saisie/saisie.phtml +3 −0 Changes for module/Mission/view/mission/saisie/saisie.phtml: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -29,6 +29,9 @@ echo '<div class="col-md-6">'; echo $this->formControlGroup($form->get('tauxRemu')); echo '</div>'; echo '<div class="col-md-6">'; echo $this->formControlGroup($form->get('tauxRemuMajore')); echo '</div>'; echo '<div class="col-md-6">'; echo $this->formControlGroup($form->get('heures')); echo '</div>'; Loading