Suivi de mission (WIP) (d98de10d) · Commits · open-source / OSE

front/Application/UI/UCalendar.vue

+21 −2

Original line number	Diff line number	Diff line
		@@ -29,9 +29,15 @@
		<div class="num-jour badge bg-secondary rounded-circle">{{ jour < 10 ? '0' + jour.toString() : jour }}</div>
		</th>
		<td>
		<div v-for="event in eventsByJour(jour)">
		<div>
		<div class="alert alert-info" v-for="event in eventsByJour(jour)">
		<component :is="event.component" :event="event"/>
		</div>
		</div>

		<div v-if="canAddEvent">
		<button @click="addEvent" :data-jour="jour" class="btn btn-light btn-sm"><u-icon name="plus" /> Nouvel événement</button>
		</div>
		</td>
		</tr>
		</table>
		@@ -45,6 +51,7 @@ export default {
		props: {
		date: {type: Date, required: true},
		events: {type: Array, required: true},
		canAddEvent: {type: Boolean, required: true, default: true},
		},
		data()
		{
		@@ -138,6 +145,14 @@ export default {
		return dateObj.getDate();
		},

		addEvent(event)
		{
		const dateObj = new Date(this.date);
		dateObj.setDate(event.target.dataset.jour);

		this.$emit('addEvent', dateObj);
		},

		prevMois()
		{
		const dateObj = new Date(this.date);
		@@ -176,6 +191,10 @@ export default {

		<style scoped>

		.table-hover tr:hover {
		background-color:lightyellow;
		}

		.recherche {
		text-align: center;
		}

+7 −2

Original line number	Diff line number	Diff line
		<template>
		<u-calendar :date="date" @changeDate="changeDate" :events="realise" />
		<u-calendar :date="date" @changeDate="changeDate" @addEvent="addVolumeHoraire" :events="realise" />
		<button @click="test()">Test</button>
		</template>

		@@ -51,7 +51,12 @@ export default {
		{
		console.log(dateObj);
		this.date = dateObj;
		}
		},

		addVolumeHoraire(dateObj)
		{
		console.log(dateObj);
		},
		}
		}
		</script>

+2 −0

Original line number	Diff line number	Diff line
		<template>
		{{ event.texte }}
		<button class="btn btn-light"><u-icon name="pen-to-square" /></button>
		<button class="btn btn-light"><u-icon name="trash-can" /></button>
		</template>

		<script>

+7 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,13 @@ return [
		'privileges' => Privileges::MISSION_EDITION_REALISE,
		//'assertion' => Assertion\MissionAssertion::class,
		],
		'missions-suivi-data' => [
		'route' => '/:intervenant/missions-suivi-data',
		'controller' => MissionController::class,
		'action' => 'suivi-data',
		'privileges' => Privileges::MISSION_VISUALISATION,
		//'assertion' => Assertion\MissionAssertion::class,
		],
		],
		],
		'mission' => [

+28 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ use Mission\Entity\Db\Mission;
		use Mission\Entity\Db\VolumeHoraireMission;
		use Mission\Form\MissionFormAwareTrait;
		use Mission\Service\MissionServiceAwareTrait;
		use Service\Entity\Db\TypeVolumeHoraire;


		/**
		@@ -57,6 +58,33 @@ class MissionController extends AbstractController



		public function suiviDataAction()
		{
		/* @var $intervenant Intervenant */
		$intervenant = $this->getEvent()->getParam('intervenant');

		$dql = "
		SELECT
		vhm, m
		FROM
		".VolumeHoraireMission::class." vhm
		JOIN vhm.typeVolumeHoraire tvh WITH tvh.code = :typeVolumeHoraireRealise
		JOIN vhm.mission m
		WHERE
		vhm.histoDestruction IS NULL
		";

		$parameters = [
		'typeVolumeHoraireRealise' => TypeVolumeHoraire::CODE_REALISE,
		];
		$query = $this->em()->createQuery($dql)->setParameters($parameters)->execute();


		return $this->axios()->send($query);
		}



		/**
		* Ajoute une nouvelle mission (form)
		*