From 63541cf83aef4e16553c7817f9982fcb1b0b590a Mon Sep 17 00:00:00 2001
From: Fred Tempez <frederic.tempez@outlook.com>
Date: Tue, 2 Apr 2024 18:25:39 +0200
Subject: [PATCH] =?UTF-8?q?1.7.08=20worhsop=20liend=20e=20d=C3=A9sinscript?=
 =?UTF-8?q?ion=20dans=20les=20options?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                          |  2 +-
 module/workshop/view/config/config.php | 22 ++++++++++++----------
 module/workshop/view/index/index.php   |  9 ++++++---
 module/workshop/workshop.php           |  8 +++++---
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/core/core.php b/core/core.php
index bc1c7bd..41aff3a 100644
--- a/core/core.php
+++ b/core/core.php
@@ -51,7 +51,7 @@ class common
 	const ACCESS_TIMER = 1800;
 
 	// Numéro de version
-	const ZWII_VERSION = '1.7.07';
+	const ZWII_VERSION = '1.7.08';
 
 	// URL autoupdate
 	const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/';
diff --git a/module/workshop/view/config/config.php b/module/workshop/view/config/config.php
index 307e6d4..c25c655 100644
--- a/module/workshop/view/config/config.php
+++ b/module/workshop/view/config/config.php
@@ -26,15 +26,13 @@
 				<?php echo helper::translate('Elements à afficher'); ?>
 			</h4>
 			<div class="row">
-				<div class="col12">
+				<div class="col6">
 					<?php echo template::checkbox('coursesConfigShowTitle', true, 'Titre', [
 						'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'title']),
 						'help' => 'Classe CSS de l\'élément en ligne : workshopTitle'
 					]); ?>
 				</div>
-			</div>
-			<div class="row">
-				<div class="col12">
+				<div class="col6">
 					<?php echo template::checkbox('coursesConfigShowAuthor', true, 'Signature de l\'auteur', [
 						'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'author']),
 						'help' => 'Classe CSS de l\'élément en ligne : workshopTitle'
@@ -42,28 +40,32 @@
 				</div>
 			</div>
 			<div class="row">
-				<div class="col12">
+				<div class="col6">
 					<?php echo template::checkbox('coursesConfigShowDescription', true, 'Description', [
 						'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'description']),
 						'help' => 'Classe CSS de l\'élément en ligne : workshopDescription'
 					]); ?>
 				</div>
-			</div>
-			<div class="row">
-				<div class="col4">
+				<div class="col6">
 					<?php echo template::checkbox('coursesConfigShowAccess', true, 'Modalités d\'ouverture', [
 						'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'access']),
-						'help' => 'Classes CSS de la division workshopAccessContainer, élément en ligne workshopAccess'
+						'help' => 'Classe CSS de la division : workshopAccessContainer, élément en ligne : workshopAccess'
 					]); ?>
 				</div>
 			</div>
 			<div class="row">
-				<div class="col12">
+				<div class="col6">
 					<?php echo template::checkbox('coursesConfigShowEnrolment', true, 'Modalités d\'inscription', [
 						'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'enrolment']),
 						'help' => 'Classe CSS de l\'élément en ligne : workshopEnrolment'
 					]); ?>
 				</div>
+				<div class="col6">
+					<?php echo template::checkbox('coursesConfigShowUnsuscribe', true, 'Désinscription', [
+						'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'unsuscribe']),
+						'help' => 'Classe CSS de l\'élément en ligne : workshopUnsuscribe'
+					]); ?>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/module/workshop/view/index/index.php b/module/workshop/view/index/index.php
index 6d7b7a6..2bf0ef9 100644
--- a/module/workshop/view/index/index.php
+++ b/module/workshop/view/index/index.php
@@ -4,7 +4,7 @@
     <?php if (
         $this->getData(['module', $this->getUrl(0), 'config', 'category']) !== 'all' &&
         $courseValue['category'] !== $this->getData(['module', $this->getUrl(0), 'config', 'category'])
-        ): ?>
+    ): ?>
         <?php continue; ?>
     <?php endif; ?>
     <?php if ($startRow === 0): ?>
@@ -53,7 +53,7 @@
                     <div class="workshopAccessContainer">
                         <p>
                             <span class="workshopAccess">
-                                <?php echo sprintf(helper::translate($module::$coursesAccess[$courseValue['access']]), helper::dateUTF8('%d %B %Y', $courseValue['openingDate']) . helper::translate(' à ') . helper::dateUTF8('%H:%M', $courseValue['openingDate']) , helper::dateUTF8('%d %B %Y', $courseValue['closingDate']) . helper::translate(' à ') . helper::dateUTF8('%H:%M', $courseValue['closingDate'])) ?>
+                                <?php echo sprintf(helper::translate($module::$coursesAccess[$courseValue['access']]), helper::dateUTF8('%d %B %Y', $courseValue['openingDate']) . helper::translate(' à ') . helper::dateUTF8('%H:%M', $courseValue['openingDate']), helper::dateUTF8('%d %B %Y', $courseValue['closingDate']) . helper::translate(' à ') . helper::dateUTF8('%H:%M', $courseValue['closingDate'])) ?>
                             </span>
                         </p>
                     </div>
@@ -92,7 +92,10 @@
                     </div>
                     <div class="col6 textAlignRight">
                         <!-- Lien désinscription-->
-                        <?php if ($this->getData(['enrolment', $courseId, $this->getUser('id')])): ?>
+                        <?php if (
+                            $this->getData(['enrolment', $courseId, $this->getUser('id')])
+                            && $this->getData(['module', $this->getUrl(0), 'config', 'unsuscribe']) === true
+                        ): ?>
                             <span class="workshopUnsuscribe">
                                 <a href="<?php echo helper::baseUrl(); ?>course/unsuscribe/<?php echo $courseId; ?>">
                                     <?php echo $this->getData(['module', $this->getUrl(0), 'caption', 'unsuscribe']); ?>
diff --git a/module/workshop/workshop.php b/module/workshop/workshop.php
index 3cb12de..99909f6 100644
--- a/module/workshop/workshop.php
+++ b/module/workshop/workshop.php
@@ -15,8 +15,8 @@
 
 class workshop extends common
 {
-	const VERSION = '1.0';
-	const REALNAME = 'Liste des contenus';
+	const VERSION = '1.01';
+	const REALNAME = 'Liste des espaces';
 	const DATADIRECTORY = ''; // Contenu localisé inclus par défaut (page.json et module.json)
 
 	public static $actions = [
@@ -49,7 +49,8 @@ class workshop extends common
 			'access' => true,
 			'enrolment' => true,
 			'layout' => 6,
-			'template' => true
+			'template' => true,
+			'unsuscribe' => false,
 		),
 		'caption' => array(
 			'accessopen' => 'Ouvert',
@@ -88,6 +89,7 @@ class workshop extends common
 					'title' => $this->getInput('coursesConfigShowTitle', helper::FILTER_BOOLEAN),
 					'author' => $this->getInput('coursesConfigShowAuthor', helper::FILTER_BOOLEAN),
 					'description' => $this->getInput('coursesConfigShowDescription', helper::FILTER_BOOLEAN),
+					'unsuscribe'=> $this->getInput('coursesConfigShowUnsuscribe', helper::FILTER_BOOLEAN),
 					'access' => $this->getInput('coursesConfigShowAccess', helper::FILTER_BOOLEAN),
 					'openingdate' => $this->getInput('coursesConfigShowOpeningDate', helper::FILTER_BOOLEAN),
 					'closingdate' => $this->getInput('coursesConfigShowClosingDate', helper::FILTER_BOOLEAN),