ZwiiCMS-Team/ZwiiCampus
ZwiiCMS-Team/ZwiiCampus
8
6
Fork 1
Code Releases 79 Activity

1.14.09 Suivi de la progression dans enrolment en suspend.

Browse Source
This commit is contained in:
Fred Tempez 2024-12-05 17:55:27 +01:00
parent 1debefc9ab
commit 0c8c9f89fd
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/class/router.class.php
View File

@ -532,8 +532,8 @@ class core extends common
and $this->getData(['course', self::$siteContent, 'enrolment']) > 0
) {
$course = new course();
self::$userProgress = $course->userProgress(self::$siteContent, $this->getUser('id'));
$this->setData(['enrolment', self::$siteContent, $this->getUser('id'), 'progress', self::$userProgress ]);
$userProgress = $course->userProgress(self::$siteContent, $this->getUser('id'));
$this->setData(['enrolment', self::$siteContent, $this->getUser('id'), 'progress', $userProgress ]);
}
}

4
core/core.php
View File

@ -51,7 +51,7 @@ class common
const ACCESS_TIMER = 1800;
// Numéro de version
const ZWII_VERSION = '1.14.08';
const ZWII_VERSION = '1.14.09';
// URL autoupdate
const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/';
@ -178,7 +178,7 @@ class common
// Espace, contenu sélectionné
public static $siteContent = 'home';
// Progression d'un participant
public static $userProgress = '';
// public static $userProgress = '';
public static $languages = [
'de' => 'Deutsch',

18
core/module/course/course.php
View File

@ -738,11 +738,13 @@ class course extends common
* Soit avec l'ancienne méthode qui consiste à recalculer la progression.
* TRANSITOIRE A SUPPRIMER EN FIN D'ANNEE
**/
/*
'value' => array_key_exists('progress', $userValue)
? $userValue['progress']
: ($viewPages ? min(round(($viewPages * 100) / $sumPages, 1), 100) . ' %' : '0%'),
'disable' => empty($userValue['datePageView']),
//'value' => $viewPages ? min(round(($viewPages * 100) / $sumPages, 1), 100) . ' %' : '0%',
*/
'value' => $viewPages ? min(round(($viewPages * 100) / $sumPages, 1), 100) . ' %' : '0%',
//'disable' => empty($viewPages)
]),
template::button('userDelete' . $userId, [
@ -2062,7 +2064,7 @@ class course extends common
return true;
case self::COURSE_ACCESS_DATE:
return (
time() >= $this->getData(['course', $courseId, 'openingDate']) &&
time() >= $this->getData(['course', $courseId, 'openingDate']) &&
time() <= $this->getData(['course', $courseId, 'closingDate'])
);
case self::COURSE_ACCESS_CLOSE:
@ -2073,7 +2075,7 @@ class course extends common
/**
* Méthode externe pour afficher la progression dans les espaces.
* Méthode externe pour calculer la progression dans les espaces et la stocker dans enrolment
*
* @param mixed $courseId
* @param mixed $userId
@ -2091,10 +2093,14 @@ class course extends common
0;
// Nombre de pages vues
$sumPages = $this->countPages($this->getData(['page']));
// Calcule le ratio
$ratio = number_format(min(round(($viewPages * 100) / $sumPages, 1) / 100, 1), 2, ',');
$ratio = ($viewPages *100) / $sumPages;
// Arrondi le ratio à deux décimales
$ratio = round($ratio, 2);
// Transforme le ratio en pourcentage
$ratio = number_format($ratio) . ' %';
return $ratio;
}