Skip to content

Commit 377f8e1

Browse files
ywarnierywarnier
committed
Merge branch 'master' of github.com:chamilo/chamilo-lms
2 parents 7743e31 + 1daa83c commit 377f8e1

File tree

18 files changed

+365
-298
lines changed

18 files changed

+365
-298
lines changed

‎assets/vue/components/course/CatalogueCourseCard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<img
66
:src="course.illustrationUrl"
77
:alt="course.title"
8-
class="w-full h-40 object-cover"
8+
class="w-full object-cover"
99
/>
1010
<div class="p-4 flex flex-col flex-grow gap-2">
1111
<h3 class="text-xl font-semibold text-gray-800">{{ course.title }}</h3>

‎assets/vue/services/courseService.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,18 @@ export default {
66

77
/**
88
* @param {Object} searchParams
9+
* @param {boolean} disablePagination
910
* @returns {Promise<{totalItems, items}>}
1011
*/
11-
listAll: async (searchParams = {}) => await baseService.getCollection("/api/courses", searchParams),
12+
listAll: async (searchParams = {}, disablePagination = false) => {
13+
const params = { ...searchParams }
14+
15+
if (disablePagination) {
16+
params.pagination = false
17+
}
18+
19+
return await baseService.getCollection("/api/courses", params)
20+
},
1221

1322
/**
1423
* @param {number} cid

‎assets/vue/views/course/CatalogueCourses.vue

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<div class="flex flex-wrap justify-between items-center mb-6 gap-4">
44
<div>
55
<strong>{{ $t("Total number of courses") }}:</strong>
6-
{{ courses?.length || 0 }}<br />
6+
{{ totalVisibleCourses }}<br />
77
<strong>{{ $t("Matching courses") }}:</strong>
8-
{{ filteredCourses.length }}
8+
{{ totalVisibleCourses }}
99
</div>
1010
<div class="flex gap-3">
1111
<Button
@@ -69,11 +69,13 @@ import { useSecurityStore } from "../../store/securityStore"
6969
import CatalogueCourseCard from "../../components/course/CatalogueCourseCard.vue"
7070
import * as userRelCourseVoteService from "../../services/userRelCourseVoteService"
7171
import { useRouter } from "vue-router"
72+
import { usePlatformConfig } from "../../store/platformConfig"
7273
7374
const { showErrorNotification } = useNotification()
7475
const { findByIsoCode } = useLanguage()
7576
const router = useRouter()
7677
const securityStore = useSecurityStore()
78+
const platformConfigStore = usePlatformConfig()
7779
7880
if (!securityStore.user?.id) {
7981
router.push({ name: "Login" })
@@ -99,7 +101,7 @@ const onUserSubscribed = ({ courseId, newUser }) => {
99101
const load = async () => {
100102
status.value = true
101103
try {
102-
const { items } = await courseService.listAll()
104+
const { items } = await courseService.listAll({}, true)
103105
courses.value = items.map((course) => ({
104106
...course,
105107
courseLanguage: findByIsoCode(course.courseLanguage)?.originalName || course.courseLanguage,
@@ -157,10 +159,25 @@ const filteredCourses = computed(() => {
157159
)
158160
})
159161
162+
const visibleCoursesBase = computed(() => {
163+
const hidePrivate = platformConfigStore.getSetting("platform.course_catalog_hide_private") === "true"
164+
165+
return filteredCourses.value
166+
.filter((course) => {
167+
const visibility = Number(course.visibility)
168+
if (visibility === 0 || visibility === 4) return false
169+
if (visibility === 1 && hidePrivate) return false
170+
return true
171+
})
172+
.sort((a, b) => a.title.localeCompare(b.title, undefined, { numeric: true, sensitivity: "base" }))
173+
})
174+
160175
const visibleCourses = computed(() => {
161-
return filteredCourses.value.slice(0, visibleCount.value)
176+
return visibleCoursesBase.value.slice(0, visibleCount.value)
162177
})
163178
179+
const totalVisibleCourses = computed(() => visibleCoursesBase.value.length)
180+
164181
const handleScroll = () => {
165182
if (loadingMore.value) return
166183
@@ -170,7 +187,7 @@ const handleScroll = () => {
170187
const fullHeight = document.documentElement.scrollHeight
171188
172189
if (scrollTop + viewportHeight + threshold >= fullHeight) {
173-
if (visibleCount.value < filteredCourses.value.length) {
190+
if (visibleCount.value < visibleCoursesBase.value.length) {
174191
loadingMore.value = true
175192
setTimeout(() => {
176193
visibleCount.value += rowsPerScroll

‎public/main/admin/course_add.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
$languages = api_get_languages();
108108
if (1 === count($languages)) {
109109
// If there's only one language available, there's no point in asking
110-
$form->addElement('hidden', 'course_language', $languages[0]);
110+
$form->addElement('hidden', 'course_language', $languages);
111111
} else {
112112
$form->addSelectLanguage('course_language', get_lang('Language'));
113113
}

‎public/main/admin/course_category.php

Lines changed: 54 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,17 @@
4040
CourseCategory::reorganizeTreePos($parentId);
4141
Display::addFlash(Display::return_message(get_lang('Deleted')));
4242
}
43-
header('Location: '.api_get_self().'?category='.Security::remove_XSS($category));
43+
header('Location: '.api_get_path(WEB_CODE_PATH).'admin/course_category.php'.(
44+
!empty($parentId) ? '?id='.(int) $parentId : ''
45+
));
4446
exit;
4547
case 'export':
4648
$courses = CourseCategory::getCoursesInCategory($categoryId);
4749
if ($courses && count($courses) > 0) {
4850
$name = api_get_local_time().'_'.$categoryInfo['code'];
4951
$courseList = [];
5052

51-
/* @var \Chamilo\CoreBundle\Entity\Course $course */
53+
/* @var Course $course */
5254
foreach ($courses as $course) {
5355
$courseList[] = [$course->getTitle()];
5456
}
@@ -57,7 +59,9 @@
5759
Export::arrayToCsvSimple($courseList, $name, false, $header);
5860
} else {
5961
Display::addFlash(Display::return_message(get_lang('No courses found for this category'), 'warning'));
60-
header('Location: '.api_get_self().'?category='.Security::remove_XSS($categoryId));
62+
header('Location: '.api_get_path(WEB_CODE_PATH).'admin/course_category.php'.(
63+
!empty($parentId) ? '?id='.(int) $parentId : ''
64+
));
6165
exit;
6266
}
6367
break;
@@ -67,7 +71,19 @@
6771
} else {
6872
Display::addFlash(Display::return_message(get_lang('Cannot move category up'), 'error'));
6973
}
70-
header('Location: '.api_get_self().'?category='.Security::remove_XSS($category));
74+
header('Location: '.api_get_path(WEB_CODE_PATH).'admin/course_category.php'.(
75+
!empty($parentId) ? '?id='.(int) $parentId : ''
76+
));
77+
exit;
78+
case 'moveDown':
79+
if (CourseCategory::moveNodeDown($categoryId, $_GET['tree_pos'], $parentId)) {
80+
Display::addFlash(Display::return_message(get_lang('Update successful')));
81+
} else {
82+
Display::addFlash(Display::return_message(get_lang('Cannot move category down'), 'error'));
83+
}
84+
header('Location: '.api_get_path(WEB_CODE_PATH).'admin/course_category.php'.(
85+
!empty($parentId) ? '?id='.(int) $parentId : ''
86+
));
7187
exit;
7288
case 'add':
7389
if (isset($_POST['formSent']) && $_POST['formSent']) {
@@ -76,15 +92,15 @@
7692
$_POST['title'],
7793
$_POST['auth_course_child'],
7894
$_POST['description'],
79-
$parentId,
95+
$_POST['parent_id'] ?? null,
8096
);
8197

8298
if (isset($_FILES['image']) && $categoryEntity) {
8399
$crop = $_POST['picture_crop_result'] ?? '';
84100
CourseCategory::saveImage($categoryEntity, $_FILES['image'], $crop);
85101
}
86102
Display::addFlash(Display::return_message(get_lang('Item added')));
87-
header('Location: '.api_get_path(WEB_CODE_PATH).'admin/course_category.php?id='.$parentId);
103+
header('Location: '.api_get_path(WEB_CODE_PATH).'admin/course_category.php'.(!empty($_POST['parent_id']) ? '?id='.(int) $_POST['parent_id'] : ''));
88104
exit;
89105
}
90106
break;
@@ -95,7 +111,8 @@
95111
$_REQUEST['title'],
96112
$_REQUEST['auth_course_child'],
97113
$_REQUEST['code'],
98-
$_REQUEST['description']
114+
$_REQUEST['description'],
115+
$_REQUEST['parent_id'] ?? null
99116
);
100117

101118
// Delete Picture Category
@@ -111,7 +128,7 @@
111128
}
112129

113130
Display::addFlash(Display::return_message(get_lang('Update successful')));
114-
header('Location: '.api_get_path(WEB_CODE_PATH).'admin/course_category.php?id='.$parentId);
131+
header('Location: '.api_get_path(WEB_CODE_PATH).'admin/course_category.php'.(!empty($_POST['parent_id']) ? '?id='.(int) $_POST['parent_id'] : ''));
115132
exit;
116133
}
117134
break;
@@ -173,7 +190,24 @@
173190
),
174191
];
175192
$form->addGroup($group, null, get_lang('Allow adding courses in this category?'));
176-
193+
if ('add' === $action && !empty($categoryId)) {
194+
$form->addHidden('parent_id', $categoryId);
195+
$form->addLabel(get_lang('Parent category'), $parentInfo['title'].' ('.$parentInfo['code'].')');
196+
} else {
197+
$allCategories = CourseCategory::getAllCategories();
198+
$parentOptions = ['' => get_lang('No parent')];
199+
foreach ($allCategories as $cat) {
200+
if ('edit' === $action && $cat['id'] == $categoryId) {
201+
continue;
202+
}
203+
$parentOptions[$cat['id']] = '('.$cat['code'].') '.$cat['title'];
204+
}
205+
$form->addSelect(
206+
'parent_id',
207+
get_lang('Parent category'),
208+
$parentOptions
209+
);
210+
}
177211
$form->addHtmlEditor(
178212
'description',
179213
get_lang('Description'),
@@ -199,10 +233,20 @@
199233
if ('edit' === $action && !empty($categoryInfo)) {
200234
$text = get_lang('Save');
201235
$form->setDefaults($categoryInfo);
236+
$form->setDefaults([
237+
'parent_id' => $categoryInfo['parent_id'] ?? '',
238+
]);
202239
$form->addButtonSave($text);
203240
} else {
204241
$text = get_lang('Add category');
205-
$form->setDefaults(['auth_course_child' => 'TRUE']);
242+
$defaultValues = [
243+
'auth_course_child' => 'TRUE',
244+
];
245+
246+
if ('add' === $action && !empty($categoryId)) {
247+
$defaultValues['parent_id'] = $categoryId;
248+
}
249+
$form->setDefaults($defaultValues);
206250
$form->addButtonCreate($text);
207251
}
208252
$form->display();

‎public/main/gradebook/lib/be/category.class.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,8 @@ public function add()
520520
$category = new GradebookCategory();
521521
$category->setTitle($this->name);
522522
$category->setDescription($this->description);
523+
$userId = is_numeric($this->user_id) ? (int) $this->user_id : api_get_user_id();
524+
$category->setUser(api_get_user_entity($userId));
523525
$category->setUser(api_get_user_entity($this->user_id));
524526
$category->setCourse($course);
525527
$category->setParent($parent);
@@ -613,7 +615,8 @@ public function save()
613615

614616
$category->setTitle($this->name);
615617
$category->setDescription($this->description);
616-
$category->setUser(api_get_user_entity($this->user_id));
618+
$userId = is_numeric($this->user_id) ? (int) $this->user_id : api_get_user_id();
619+
$category->setUser(api_get_user_entity($userId));
617620
$category->setCourse($course);
618621
$category->setParent($parent);
619622
$category->setWeight($this->weight);

0 commit comments

Comments
 (0)