IHM suivi OK (cb5cfeaf) · Commits · open-source / OSE

code/test2.php

+17 −5

Changes for code/test2.php: 17 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -10,9 +10,21 @@ use Unicaen\OpenDocument\Calc;
		* @var $viewFile string
		*/

		$date1 = \DateTime::createFromFormat('Y-m-d H:i:s', '2023-03-30 10:00:00');
		$date2 = \DateTime::createFromFormat('Y-m-d H:i:s','2023-03-31 14:30:00');
		$interval = $date1->diff($date2);
		$minutes = ($date2->getTimestamp() - $date1->getTimestamp()) / 60;
		?>

		echo "Il y a $minutes minutes de différences";
		<button onclick="ts()">Suceess</button>
		<button onclick="te()">Error</button>

		<script>

		function ts()
		{
		unicaenVue.flashMessenger.toast('Mon message uh iuh iuhx iscuh sqidhf zihuf azif rhaoqh foaizuhf oqh foiazer hoiuzhq oiazuh oizhu iqduhf', 'success');
		}

		function te()
		{
		unicaenVue.flashMessenger.toast('Mon erreur', 'error');
		}

		</script>

composer.lock

+43 −43

Changes for composer.lock: 43 added lines, 43 removed lines.
Original line number	Diff line number	Diff line
		@@ -1663,16 +1663,16 @@
		},
		{
		"name": "laminas/laminas-cache",
		"version": "3.10.0",
		"version": "3.10.1",
		"source": {
		"type": "git",
		"url": "https://github.com/laminas/laminas-cache.git",
		"reference": "5807c51b92fd256bbf58eda6df4c1d27148bbfb8"
		"reference": "7bda6c5b500b916cbb03d0504069865d31b3efa5"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/laminas/laminas-cache/zipball/5807c51b92fd256bbf58eda6df4c1d27148bbfb8",
		"reference": "5807c51b92fd256bbf58eda6df4c1d27148bbfb8",
		"url": "https://api.github.com/repos/laminas/laminas-cache/zipball/7bda6c5b500b916cbb03d0504069865d31b3efa5",
		"reference": "7bda6c5b500b916cbb03d0504069865d31b3efa5",
		"shasum": ""
		},
		"require": {
		@@ -1759,7 +1759,7 @@
		"type": "community_bridge"
		}
		],
		"time": "2023-01-10T14:17:43+00:00"
		"time": "2023-03-31T18:59:17+00:00"
		},
		{
		"name": "laminas/laminas-cache-storage-adapter-memory",
		@@ -2808,16 +2808,16 @@
		},
		{
		"name": "laminas/laminas-i18n",
		"version": "2.22.0",
		"version": "2.22.1",
		"source": {
		"type": "git",
		"url": "https://github.com/laminas/laminas-i18n.git",
		"reference": "fc13d1314941bd9acda3861883cd9139d747f98f"
		"reference": "075bec49f777698c6fc229eecefbe7a2364cd18e"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/fc13d1314941bd9acda3861883cd9139d747f98f",
		"reference": "fc13d1314941bd9acda3861883cd9139d747f98f",
		"url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/075bec49f777698c6fc229eecefbe7a2364cd18e",
		"reference": "075bec49f777698c6fc229eecefbe7a2364cd18e",
		"shasum": ""
		},
		"require": {
		@@ -2890,7 +2890,7 @@
		"type": "community_bridge"
		}
		],
		"time": "2023-03-12T01:03:50+00:00"
		"time": "2023-03-31T12:31:38+00:00"
		},
		{
		"name": "laminas/laminas-i18n-resources",
		@@ -2953,16 +2953,16 @@
		},
		{
		"name": "laminas/laminas-inputfilter",
		"version": "2.24.0",
		"version": "2.24.1",
		"source": {
		"type": "git",
		"url": "https://github.com/laminas/laminas-inputfilter.git",
		"reference": "01c56c11904565b0f594c9cb745b5457a0e390eb"
		"reference": "c5a53b1e72a2270b441391728291f7136e9461d1"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/01c56c11904565b0f594c9cb745b5457a0e390eb",
		"reference": "01c56c11904565b0f594c9cb745b5457a0e390eb",
		"url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/c5a53b1e72a2270b441391728291f7136e9461d1",
		"reference": "c5a53b1e72a2270b441391728291f7136e9461d1",
		"shasum": ""
		},
		"require": {
		@@ -3023,7 +3023,7 @@
		"type": "community_bridge"
		}
		],
		"time": "2023-02-01T17:22:43+00:00"
		"time": "2023-04-05T08:44:05+00:00"
		},
		{
		"name": "laminas/laminas-json",
		@@ -4906,16 +4906,16 @@
		},
		{
		"name": "mpdf/mpdf",
		"version": "v8.1.4",
		"version": "v8.1.5",
		"source": {
		"type": "git",
		"url": "https://github.com/mpdf/mpdf.git",
		"reference": "add590e93b7502efafd9839a68cff99f3497b318"
		"reference": "c264ce27af0d794ecd04e201b7e37a06b8a9d720"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/mpdf/mpdf/zipball/add590e93b7502efafd9839a68cff99f3497b318",
		"reference": "add590e93b7502efafd9839a68cff99f3497b318",
		"url": "https://api.github.com/repos/mpdf/mpdf/zipball/c264ce27af0d794ecd04e201b7e37a06b8a9d720",
		"reference": "c264ce27af0d794ecd04e201b7e37a06b8a9d720",
		"shasum": ""
		},
		"require": {
		@@ -4979,7 +4979,7 @@
		"type": "custom"
		}
		],
		"time": "2022-12-15T11:24:39+00:00"
		"time": "2023-04-04T15:06:48+00:00"
		},
		{
		"name": "myclabs/deep-copy",
		@@ -5428,25 +5428,25 @@
		},
		{
		"name": "psr/http-message",
		"version": "1.0.1",
		"version": "1.1",
		"source": {
		"type": "git",
		"url": "https://github.com/php-fig/http-message.git",
		"reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
		"reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
		"reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
		"url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
		"reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
		"shasum": ""
		},
		"require": {
		"php": ">=5.3.0"
		"php": "^7.2 \|\| ^8.0"
		},
		"type": "library",
		"extra": {
		"branch-alias": {
		"dev-master": "1.0.x-dev"
		"dev-master": "1.1.x-dev"
		}
		},
		"autoload": {
		@@ -5475,9 +5475,9 @@
		"response"
		],
		"support": {
		"source": "https://github.com/php-fig/http-message/tree/master"
		"source": "https://github.com/php-fig/http-message/tree/1.1"
		},
		"time": "2016-08-06T14:39:51+00:00"
		"time": "2023-04-04T09:50:52+00:00"
		},
		{
		"name": "psr/log",
		@@ -5801,16 +5801,16 @@
		},
		{
		"name": "symfony/console",
		"version": "v5.4.21",
		"version": "v5.4.22",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/console.git",
		"reference": "c77433ddc6cdc689caf48065d9ea22ca0853fbd9"
		"reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/symfony/console/zipball/c77433ddc6cdc689caf48065d9ea22ca0853fbd9",
		"reference": "c77433ddc6cdc689caf48065d9ea22ca0853fbd9",
		"url": "https://api.github.com/repos/symfony/console/zipball/3cd51fd2e6c461ca678f84d419461281bd87a0a8",
		"reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8",
		"shasum": ""
		},
		"require": {
		@@ -5875,12 +5875,12 @@
		"homepage": "https://symfony.com",
		"keywords": [
		"cli",
		"command line",
		"command-line",
		"console",
		"terminal"
		],
		"support": {
		"source": "https://github.com/symfony/console/tree/v5.4.21"
		"source": "https://github.com/symfony/console/tree/v5.4.22"
		},
		"funding": [
		{
		@@ -5896,7 +5896,7 @@
		"type": "tidelift"
		}
		],
		"time": "2023-02-25T16:59:41+00:00"
		"time": "2023-03-25T09:27:28+00:00"
		},
		{
		"name": "symfony/deprecation-contracts",
		@@ -7298,7 +7298,7 @@
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/vue.git",
		"reference": "6dbdd1a9f23c225eb39a04e5f88c70ffacacf3d7"
		"reference": "c3de98637d9f5654486e9cbb099f40dd0ccbe6fd"
		},
		"type": "library",
		"autoload": {
		@@ -7310,7 +7310,7 @@
		]
		},
		"description": "Module pour utiliser Vue.js",
		"time": "2023-03-30T07:44:01+00:00"
		"time": "2023-04-05T13:52:02+00:00"
		},
		{
		"name": "unicaen/zfc-user",
		@@ -8292,16 +8292,16 @@
		},
		{
		"name": "phpstan/phpdoc-parser",
		"version": "1.16.1",
		"version": "1.17.1",
		"source": {
		"type": "git",
		"url": "https://github.com/phpstan/phpdoc-parser.git",
		"reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571"
		"reference": "d3753fcb3abc6f78f5de6f72153d4b9c99c72dee"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/e27e92d939e2e3636f0a1f0afaba59692c0bf571",
		"reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571",
		"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/d3753fcb3abc6f78f5de6f72153d4b9c99c72dee",
		"reference": "d3753fcb3abc6f78f5de6f72153d4b9c99c72dee",
		"shasum": ""
		},
		"require": {
		@@ -8331,9 +8331,9 @@
		"description": "PHPDoc parser with support for nullable, intersection and generic types",
		"support": {
		"issues": "https://github.com/phpstan/phpdoc-parser/issues",
		"source": "https://github.com/phpstan/phpdoc-parser/tree/1.16.1"
		"source": "https://github.com/phpstan/phpdoc-parser/tree/1.17.1"
		},
		"time": "2023-02-07T18:11:17+00:00"
		"time": "2023-04-04T11:11:22+00:00"
		},
		{
		"name": "sabre/event",

front/Application/UI/UCalendar.vue

+1 −1

Changes for front/Application/UI/UCalendar.vue: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		<div class="num-jour badge bg-secondary rounded-circle">{{ jour < 10 ? '0' + jour.toString() : jour }}</div>
		</th>
		<td>
		<div class="event" :style="'border-color:'+event.color" v-for="(event, index) in eventsByJour(jour)" :key="index">
		<div class="event" :style="'border-color:'+event.color+';background-color:'+event.bgcolor" v-for="(event, index) in eventsByJour(jour)" :key="index">
		<component :is="event.component" :event="event"></component>
		</div>

front/Mission/Suivi.vue

+7 −4

Changes for front/Mission/Suivi.vue: 7 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		<template>
		<u-calendar :date="date" @changeDate="changeDate" @addEvent="ajoutVolumeHoraire" :can-add-event="true" :events="suivi"/>
		<u-calendar :date="date" @changeDate="changeDate" @addEvent="ajouter" :can-add-event="true" :events="suivi"/>
		</template>

		<script>
		@@ -22,7 +22,7 @@ export default {
		{
		return {
		date: new Date(),
		suivi: [],
		suivi: []
		};
		},
		methods: {
		@@ -31,7 +31,7 @@ export default {
		this.date = dateObj;
		},

		ajoutVolumeHoraire(dateObj, event)
		ajouter(dateObj, event)
		{
		const urlParams = {
		intervenant: this.intervenant,
		@@ -59,7 +59,7 @@ export default {
		let missionsColors = [];

		unicaenVue.axios.get(
		unicaenVue.url("mission/suivi/data/:intervenant", {intervenant: this.intervenant})
		unicaenVue.url("mission/suivi/liste/:intervenant", {intervenant: this.intervenant})
		).then(response => {
		let newSuivi = [];
		for (let i in response.data) {
		@@ -69,6 +69,9 @@ export default {
		missionsColors[missionSuivi.mission.id] = colors[colorIndex];
		colorIndex++;
		}
		if (missionSuivi.valide){
		missionSuivi.bgcolor = '#d0eddb';
		}
		missionSuivi.color = missionsColors[missionSuivi.mission.id];
		missionSuivi.component = markRaw(SuiviEvent);
		missionSuivi.date = new Date(missionSuivi.date);

front/Mission/SuiviEvent.vue

+15 −10

Changes for front/Mission/SuiviEvent.vue: 15 added lines, 10 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		<div class="event-content">
		<p class="mission">{{ event.mission.libelleCourt }}</p>
		<p class="horaires">
		de {{ heureDebut }} à {{ heureFin }}, soient {{ heures }} heures
		de {{ heureDebut }} à {{ heureFin }}, soi{{ heures < 2 ? '' : 'en'}}t {{ heures }} heure{{ heures < 2 ? '' : 's' }}
		<b-badge v-if="event.nocturne">Nocturne</b-badge>
		<b-badge v-if="event.formation">En formation</b-badge>
		</p>
		@@ -10,17 +10,17 @@
		</div>
		<div class="event-actions">
		<div class="btn-group btn-group-sm">
		<button class="btn btn-light" @click="modifier" title="Modifier le suivi">
		<button v-if="event.canEdit" class="btn btn-light" @click="modifier" title="Modifier le suivi" :data-url="modifierUrl">
		<u-icon name="pen-to-square"/>
		</button>
		<button class="btn btn-light" @click="valider" title="Valider le suivi">
		<button v-if="event.canValider" class="btn btn-light" @click="valider" title="Valider le suivi" :data-url="validerUrl">
		<u-icon name="check" class="text-success"/>
		</button>
		<button class="btn btn-light" @click="devalider" title="Dévalider le suivi"
		<button v-if="event.canDevalider" class="btn btn-light" @click="devalider" title="Dévalider le suivi" :data-url="devaliderUrl"
		data-content="Voulez-vous vraiment dévalider ce suivi ?">
		<u-icon name="xmark" class="text-danger"/>
		</button>
		<button class="btn btn-light" @click="supprimer" title="Supprimer le suivi"
		<button v-if="event.canSupprimer" class="btn btn-light" @click="supprimer" title="Supprimer le suivi" :data-url="supprimerUrl"
		data-content="Voulez-vous vraiment supprimer ce suivi ?">
		<u-icon name="trash-can" class="text-danger"/>
		</button>
		@@ -38,6 +38,10 @@ export default {
		{
		return {
		suivi: this.$parent.$parent,
		modifierUrl: unicaenVue.url('mission/suivi/modifier/:id', {id: this.event.id}),
		supprimerUrl: unicaenVue.url('mission/suivi/supprimer/:id', {id: this.event.id}),
		validerUrl: unicaenVue.url('mission/suivi/valider/:id', {id: this.event.id}),
		devaliderUrl: unicaenVue.url('mission/suivi/devalider/:id', {id: this.event.id}),
		};
		},
		computed: {
		@@ -57,11 +61,6 @@ export default {
		methods: {
		modifier(event)
		{
		const urlParams = {
		intervenant: this.event.intervenant,
		id: this.event.id
		};
		event.currentTarget.dataset.url = unicaenVue.url('mission/suivi/modification/:id', urlParams);
		modAjax(event.currentTarget, (widget) => {
		this.suivi.refresh();
		});
		@@ -76,7 +75,9 @@ export default {

		valider(event)
		{
		unicaenVue.axios.get(this.validerUrl).then(response => {
		this.suivi.refresh();
		});
		},

		devalider(event)
		@@ -96,6 +97,10 @@ export default {
		flex-grow: 1;
		}

		.event-content.valide {
		background-color:yellow;
		}

		.event-content p {
		margin-bottom: .2rem;
		}