From 71fe3ee650d56513864bc43316215fd1d0f8b164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Tempez?= Date: Fri, 7 Feb 2025 10:50:25 +0100 Subject: [PATCH] =?UTF-8?q?1.20.05=20Tri=20et=20largeur=20de=20champs=20ta?= =?UTF-8?q?ble=20des=20utilisateur=20colonne=20derni=C3=A8re=20connection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- core/core.php | 2 +- core/module/course/view/users/users.js.php | 15 ++++++++++++--- core/module/user/view/index/index.js.php | 22 ++++++++++++---------- core/module/user/view/index/index.php | 2 +- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 0d0788c..3321d55 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ZwiiCampus 1.20.04 +# ZwiiCampus 1.20.05 ZwiiCampus (Learning Management System) est logiciel auteur destiné à mettre en ligne des tutoriels. Il dispose de plusieurs modalités d'ouverture et d'accès des contenus. Basé sur la version 13 du CMS Zwii, la structure logicielle est solide, le framework de Zwii est éprouvé. diff --git a/core/core.php b/core/core.php index aa21758..cf09784 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.20.04'; + const ZWII_VERSION = '1.20.05'; // URL autoupdate const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/'; diff --git a/core/module/course/view/users/users.js.php b/core/module/course/view/users/users.js.php index 2159cea..9c65b09 100644 --- a/core/module/course/view/users/users.js.php +++ b/core/module/course/view/users/users.js.php @@ -32,9 +32,18 @@ $(document).ready((function () { "columnDefs": [ { targets: 2, - type: 'numeric', - render: function (data) { - return moment(data * 1000).format('DD/MM/YYYY HH:mm'); + type: 'datetime', + searchable: false, + render: function (data, type, row) { + if (type === 'display') { + if (typeof data === 'number' || !isNaN(data)) { + return moment(Number(data) * 1000).format('DD/MM/YYYY HH:mm'); + } else { + return data; + } + } + // Pour le tri, retournez la valeur au format ISO + return moment(Number(data) * 1000).toISOString(); } }, { diff --git a/core/module/user/view/index/index.js.php b/core/module/user/view/index/index.js.php index 7c3fdbf..69d9bb5 100644 --- a/core/module/user/view/index/index.js.php +++ b/core/module/user/view/index/index.js.php @@ -33,17 +33,19 @@ $(document).ready((function () { "columnDefs": [ { target: 4, - type: 'num', // Utilisez 'num' pour le tri - render: function (data) { - // Si data est un nombre, formatez-le en date - if (typeof data === 'number' || !isNaN(data)) { - return moment(Number(data) * 1000).format('DD/MM/YYYY HH:mm'); - } else { - return data; // Sinon, affichez le texte tel quel + type: 'datetime', // Utilisez 'datetime' pour le tri + searchable: false, + render: function (data, type, row) { + if (type === 'display') { + if (typeof data === 'number' || !isNaN(data)) { + return moment(Number(data) * 1000).format('DD/MM/YYYY HH:mm'); + } else { + return data; + } } - }, - orderable: false, - searchable: false + // Pour le tri, retournez la valeur au format ISO + return moment(Number(data) * 1000).toISOString(); + } }, { target: 5, diff --git a/core/module/user/view/index/index.php b/core/module/user/view/index/index.php index e28fa41..dc4dbdf 100644 --- a/core/module/user/view/index/index.php +++ b/core/module/user/view/index/index.php @@ -68,4 +68,4 @@ - 'dataTables'], ['name','group','profile','tag','data-timestamp','edit','delete']); ?> \ No newline at end of file + 'dataTables'], ['name','group','profile','tag','data-timestamp','edit','delete']); ?> \ No newline at end of file