From 58e947b73f7beccf7394f24526526392d2fcb2b7 Mon Sep 17 00:00:00 2001
From: fredtempez <frederic.tempez@outlook.com>
Date: Thu, 19 Oct 2023 15:27:57 +0200
Subject: [PATCH] v46 workshop lien manquant

---
 core/core.php                          |  2 +-
 module/workshop/view/config/config.php |  4 ++--
 module/workshop/view/index/index.php   | 14 ++++++++++++++
 module/workshop/workshop.php           |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/core/core.php b/core/core.php
index ba253af..ac339cb 100644
--- a/core/core.php
+++ b/core/core.php
@@ -50,7 +50,7 @@ class common
 	const ACCESS_TIMER = 1800;
 
 	// Numéro de version
-	const ZWII_VERSION = '1.0.45';
+	const ZWII_VERSION = '1.0.46';
 
 	// URL autoupdate
 	const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/update/raw/branch/master/lms/';
diff --git a/module/workshop/view/config/config.php b/module/workshop/view/config/config.php
index c831adb..3768742 100644
--- a/module/workshop/view/config/config.php
+++ b/module/workshop/view/config/config.php
@@ -66,9 +66,9 @@
 			</div>
 			<div class="row">
 				<div class="col12">
-					<?php echo template::text('coursesConfigUrlText', [
+					<?php echo template::text('coursesConfigCaption', [
 						'label' => 'Texte du lien vers le cours',
-						'value' => $this->getData(['module', $this->getUrl(0), 'config', 'urlText'])
+						'value' => $this->getData(['module', $this->getUrl(0), 'config', 'caption'])
 					]); ?>
 				</div>
 			</div>
diff --git a/module/workshop/view/index/index.php b/module/workshop/view/index/index.php
index 1cea9f2..481af78 100644
--- a/module/workshop/view/index/index.php
+++ b/module/workshop/view/index/index.php
@@ -48,12 +48,26 @@
                     </p>
                 <?php endif; ?>
 
+                <!-- Lien -->
+                <?php if (
+                    $courseValue['access'] === self::COURSE_ACCESS_OPEN
+                    ||
+                    ($courseValue['access'] === self::COURSE_ACCESS_DATE && time() >= $courseValue['openingDate'] && time() <= $courseValue['closingDate'])
+                ): ?>
+                    <a href="<?php echo helper::baseUrl();?>course/swap/<?php echo $courseId; ?>">
+                        <?php echo $this->getData(['module', $this->getUrl(0), 'config', 'caption']); ?>
+                    </a>
+                <?php endif; ?>
+
                 <!-- Modalité d'inscription -->
                 <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'author']) === true): ?>
                     <p>
                         <?php echo helper::translate('Inscription : ') . $module::$coursesEnrolment[$courseValue['enrolment']]; ?>
                     </p>
                 <?php endif; ?>
+
+                <!-- Lien d'accès -->
+
                 <!-- Fin du bloc et bordure -->
                 <?php if ($this->getData(['module', $this->getUrl(0), 'config', 'template']) === true): ?>
                 </div>
diff --git a/module/workshop/workshop.php b/module/workshop/workshop.php
index 69495e0..8d182bf 100644
--- a/module/workshop/workshop.php
+++ b/module/workshop/workshop.php
@@ -74,7 +74,7 @@ class workshop extends common
 					'openingdate' => $this->getInput('coursesConfigShowOpeningDate', helper::FILTER_BOOLEAN),
 					'closingdate' => $this->getInput('coursesConfigShowClosingDate', helper::FILTER_BOOLEAN),
 					'enrolment' => $this->getInput('coursesConfigShowEnrolment', helper::FILTER_BOOLEAN),
-					'urlText' => $this->getInput('coursesConfigUrlText', helper::FILTER_STRING_SHORT),
+					'caption' => $this->getInput('coursesConfigCaption', helper::FILTER_STRING_SHORT),
 					'layout' => $this->getInput('coursesConfigLayout', helper::FILTER_INT),
 					'template' => $this->getInput('coursesConfigTemplate', helper::FILTER_BOOLEAN),
 				]