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

Merge branch 'master' into user_progress

Browse Source
This commit is contained in:
Fred Tempez 2024-10-24 09:47:45 +02:00
commit 3a25c33e3a
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.php
View File

@ -51,7 +51,7 @@ class common
const ACCESS_TIMER = 1800; const ACCESS_TIMER = 1800;
// Numéro de version // Numéro de version
const ZWII_VERSION = '1.14.03'; const ZWII_VERSION = '1.14.04';
// URL autoupdate // URL autoupdate
const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/'; const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/';

2
core/module/course/view/userReport/userReport.php
View File

@ -8,7 +8,7 @@
</div> </div>
<div class="col1 offset10"> <div class="col1 offset10">
<?php echo template::button('userDeleteAll', [ <?php echo template::button('userDeleteAll', [
'href' => helper::baseUrl() . 'course/userHistoryExport/' . $this->getUrl(2) . '/' . $this->getUrl(3), 'href' => helper::baseUrl() . 'course/userReportExport/' . $this->getUrl(2) . '/' . $this->getUrl(3),
'value' => template::ico('download'), 'value' => template::ico('download'),
'help' => 'Exporter', 'help' => 'Exporter',
]) ?> ]) ?>

2
core/module/course/view/users/users.php
View File

@ -8,7 +8,7 @@
</div> </div>
<div class="col1 offset8"> <div class="col1 offset8">
<?php echo template::button('userDeleteAll', [ <?php echo template::button('userDeleteAll', [
'href' => helper::baseUrl() . 'course/usersHistoryExport/' . $this->getUrl(2), 'href' => helper::baseUrl() . 'course/usersReportExport/' . $this->getUrl(2),
'value' => template::ico('download'), 'value' => template::ico('download'),
'help' => 'Exporter', 'help' => 'Exporter',
]) ?> ]) ?>

8
core/module/install/ressource/defaultdata.php
View File

@ -246,7 +246,7 @@ class init extends common
'manage' => false, 'manage' => false,
'users' => false, 'users' => false,
'userHistory' => false, 'userHistory' => false,
'userHistoryExport' => false, 'userReportExport' => false,
'usersAdd' => false, 'usersAdd' => false,
'userDelete' => false, 'userDelete' => false,
'usersDelete' => false, 'usersDelete' => false,
@ -343,7 +343,7 @@ class init extends common
'manage' => false, 'manage' => false,
'users' => false, 'users' => false,
'userHistory' => false, 'userHistory' => false,
'userHistoryExport' => false, 'userReportExport' => false,
'usersAdd' => false, 'usersAdd' => false,
'userDelete' => false, 'userDelete' => false,
'usersDelete' => false, 'usersDelete' => false,
@ -445,7 +445,7 @@ class init extends common
'manage' => true, 'manage' => true,
'users' => true, 'users' => true,
'userHistory' => true, 'userHistory' => true,
'userHistoryExport' => true, 'userReportExport' => true,
'usersAdd' => true, 'usersAdd' => true,
'userDelete' => false, 'userDelete' => false,
'usersDelete' => false, 'usersDelete' => false,
@ -543,7 +543,7 @@ class init extends common
'manage' => true, 'manage' => true,
'users' => true, 'users' => true,
'userHistory' => true, 'userHistory' => true,
'userHistoryExport' => true, 'userReportExport' => true,
'usersAdd' => true, 'usersAdd' => true,
'userDelete' => true, 'userDelete' => true,
'usersDelete' => true, 'usersDelete' => true,

4
core/module/user/user.php
View File

@ -898,7 +898,7 @@ class user extends common
// Droits spécifiques // Droits spécifiques
'users' => $this->getInput('profilEditCourseUsers', helper::FILTER_BOOLEAN), 'users' => $this->getInput('profilEditCourseUsers', helper::FILTER_BOOLEAN),
'userHistory' => $this->getInput('profilEditCourseUserHistory', helper::FILTER_BOOLEAN), 'userHistory' => $this->getInput('profilEditCourseUserHistory', helper::FILTER_BOOLEAN),
'userHistoryExport' => $this->getInput('profilEditCourseUserHistoryExport', helper::FILTER_BOOLEAN), 'userReportExport' => $this->getInput('profilEditCourseuserReportExport', helper::FILTER_BOOLEAN),
'export' => $this->getInput('profilEditCourseExport', helper::FILTER_BOOLEAN), 'export' => $this->getInput('profilEditCourseExport', helper::FILTER_BOOLEAN),
'userAdd' => $this->getInput('profilEditCourseUserAdd', helper::FILTER_BOOLEAN), 'userAdd' => $this->getInput('profilEditCourseUserAdd', helper::FILTER_BOOLEAN),
'usersAdd' => $this->getInput('profilEditCourseUsersAdd', helper::FILTER_BOOLEAN), 'usersAdd' => $this->getInput('profilEditCourseUsersAdd', helper::FILTER_BOOLEAN),
@ -1095,7 +1095,7 @@ class user extends common
// La suite // La suite
'users' => $this->getInput('profilAddCourseUsers', helper::FILTER_BOOLEAN), 'users' => $this->getInput('profilAddCourseUsers', helper::FILTER_BOOLEAN),
'userHistory' => $this->getInput('profilAddCourseUserHistory', helper::FILTER_BOOLEAN), 'userHistory' => $this->getInput('profilAddCourseUserHistory', helper::FILTER_BOOLEAN),
'userHistoryExport' => $this->getInput('profilAddCourseUserHistoryExport', helper::FILTER_BOOLEAN), 'userReportExport' => $this->getInput('profilAddCourseuserReportExport', helper::FILTER_BOOLEAN),
'export' => $this->getInput('profilAddCourseExport', helper::FILTER_BOOLEAN), 'export' => $this->getInput('profilAddCourseExport', helper::FILTER_BOOLEAN),
'userAdd' => $this->getInput('profilAddCourseUserAdd', helper::FILTER_BOOLEAN), 'userAdd' => $this->getInput('profilAddCourseUserAdd', helper::FILTER_BOOLEAN),
'usersAdd' => $this->getInput('profilAddCourseUsersAdd', helper::FILTER_BOOLEAN), 'usersAdd' => $this->getInput('profilAddCourseUsersAdd', helper::FILTER_BOOLEAN),

2
core/module/user/view/profilAdd/profilAdd.php
View File

@ -196,7 +196,7 @@
<?php echo template::checkbox('profilAddCourseUserHistory', true, 'Voir historique d\'un participant'); ?> <?php echo template::checkbox('profilAddCourseUserHistory', true, 'Voir historique d\'un participant'); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::checkbox('profilAddCourseUserHistoryExport', true, 'Exporter historique d\'un participant'); ?> <?php echo template::checkbox('profilAddCourseuserReportExport', true, 'Exporter historique d\'un participant'); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::checkbox('profilAddCourseUserDelete', true, 'Désinscrire un participant'); ?> <?php echo template::checkbox('profilAddCourseUserDelete', true, 'Désinscrire un participant'); ?>

8
core/module/user/view/profilEdit/profilEdit.js.php
View File

@ -56,10 +56,10 @@ $(document).ready(function () {
if ($('#profilEditCourseUsers').is(':checked')) { if ($('#profilEditCourseUsers').is(':checked')) {
// Activer les autres checkboxes // Activer les autres checkboxes
$('#profilEditCourseUserHistory, #profilEditCourseUserHistoryExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('disabled', false); $('#profilEditCourseUserHistory, #profilEditCourseuserReportExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('disabled', false);
} else { } else {
// Désactiver les autres checkboxes // Désactiver les autres checkboxes
$('#profilEditCourseUserHistory, #profilEditCourseUserHistoryExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('checked', false).prop('disabled', true); $('#profilEditCourseUserHistory, #profilEditCourseuserReportExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('checked', false).prop('disabled', true);
// Désactiver les modules et tout décocher // Désactiver les modules et tout décocher
$(".courseContainer").slideUp(); $(".courseContainer").slideUp();
$('.courseContainer input[type="checkbox"]').prop('checked', false); $('.courseContainer input[type="checkbox"]').prop('checked', false);
@ -135,11 +135,11 @@ $(document).ready(function () {
$('#profilEditCourseUsers').change(function () { $('#profilEditCourseUsers').change(function () {
if ($(this).is(':checked')) { if ($(this).is(':checked')) {
// Activer les autres checkboxes // Activer les autres checkboxes
$('#profilEditCourseUserHistory, #profilEditCourseUserHistoryExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('disabled', false); $('#profilEditCourseUserHistory, #profilEditCourseuserReportExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('disabled', false);
} else { } else {
// Désactiver les autres checkboxes // Désactiver les autres checkboxes
$('#profilEditCourseUserHistory, #profilEditCourseUserHistoryExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('checked', false).prop('disabled', true); $('#profilEditCourseUserHistory, #profilEditCourseuserReportExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('checked', false).prop('disabled', true);
// Désactiver les modules et tout décocher // Désactiver les modules et tout décocher
$(".courseContainer").slideUp(); $(".courseContainer").slideUp();
$('.courseContainer input[type="checkbox"]').prop('checked', false); $('.courseContainer input[type="checkbox"]').prop('checked', false);

4
core/module/user/view/profilEdit/profilEdit.php
View File

@ -291,8 +291,8 @@
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">
<?php echo template::checkbox('profilEditCourseUserHistoryExport', true, 'Exporter historique d\'un participant', [ <?php echo template::checkbox('profilEditCourseuserReportExport', true, 'Exporter historique d\'un participant', [
'checked' => $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'course', 'userHistoryExport']), 'checked' => $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'course', 'userReportExport']),
]); ?> ]); ?>
</div> </div>
<div class="col3"> <div class="col3">