Skip to content

Commit 63a0447

Browse files
christianbeeznestchristianbeeznest
authored
Merge pull request #6233 from christianbeeznest/GH-5985
Course: Add improvements and fixes in category management - refs #5985
2 parents 24029a1 + 37085d0 commit 63a0447

File tree

2 files changed

+161
-37
lines changed

2 files changed

+161
-37
lines changed

‎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/inc/lib/course_category.lib.php‎

Lines changed: 107 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,12 @@ public static function getCategoryById($categoryId)
8787
public static function getAllCategories()
8888
{
8989
$tbl_category = Database::get_main_table(TABLE_MAIN_CATEGORY);
90-
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
91-
9290
$table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE_CATEGORY);
9391
$conditions = " INNER JOIN $table a ON (t1.id = a.course_category_id)";
9492
$whereCondition = " AND a.access_url_id = ".api_get_current_access_url_id();
9593
$allowBaseCategories = ('true' === api_get_setting('course.allow_base_course_category'));
9694
if ($allowBaseCategories) {
97-
$whereCondition = " AND (a.access_url_id = ".api_get_current_access_url_id()." OR a.access_url_id = 1) ";
95+
$whereCondition = " AND (a.access_url_id = ".api_get_current_access_url_id()." OR a.access_url_id = 1)";
9896
}
9997

10098
$sql = "SELECT
@@ -103,21 +101,19 @@ public static function getAllCategories()
103101
t1.code,
104102
t1.parent_id,
105103
t1.tree_pos,
106-
t1.children_count,
107-
COUNT(DISTINCT t3.code) AS number_courses
108-
FROM $tbl_category t1
109-
$conditions
110-
LEFT JOIN $tbl_course t3
111-
ON t3.category_id=t1.id
112-
WHERE 1=1
113-
$whereCondition
114-
GROUP BY
115-
t1.title,
116-
t1.code,
117-
t1.parent_id,
118-
t1.tree_pos,
119-
t1.children_count
120-
ORDER BY t1.parent_id, t1.tree_pos";
104+
t1.children_count
105+
FROM $tbl_category t1
106+
$conditions
107+
WHERE 1=1
108+
$whereCondition
109+
GROUP BY
110+
t1.id,
111+
t1.title,
112+
t1.code,
113+
t1.parent_id,
114+
t1.tree_pos,
115+
t1.children_count
116+
ORDER BY t1.parent_id, t1.tree_pos";
121117

122118
$result = Database::query($sql);
123119

@@ -205,7 +201,7 @@ public static function updateParentCategoryChildrenCount($categoryId, $delta = 1
205201
Database::query($sql);
206202
}
207203

208-
public static function edit($categoryId, $name, $canHaveCourses, $code, $description): ?CourseCategoryEntity
204+
public static function edit($categoryId, $name, $canHaveCourses, $code, $description, $parentId = null): ?CourseCategoryEntity
209205
{
210206
$repo = Container::getCourseCategoryRepository();
211207
$category = $repo->find($categoryId);
@@ -221,6 +217,10 @@ public static function edit($categoryId, $name, $canHaveCourses, $code, $descrip
221217
->setAuthCourseChild($canHaveCourses)
222218
;
223219

220+
if (!empty($parentId)) {
221+
$category->setParent(Container::getCourseCategoryRepository()->find($parentId));
222+
}
223+
224224
$repo->save($category);
225225

226226
// Updating children
@@ -272,6 +272,38 @@ public static function moveNodeUp($categoryId, $treePos, $parentId): bool
272272
return true;
273273
}
274274

275+
public static function moveNodeDown($categoryId, $treePos, $parentId): bool
276+
{
277+
$table = Database::get_main_table(TABLE_MAIN_CATEGORY);
278+
$categoryId = (int) $categoryId;
279+
$treePos = (int) $treePos;
280+
281+
$parentIdCondition = "parent_id IS NULL";
282+
if (!empty($parentId)) {
283+
$parentIdCondition = "parent_id = '".Database::escape_string($parentId)."'";
284+
}
285+
286+
self::reorganizeTreePos($parentId);
287+
288+
$sql = "SELECT id, tree_pos
289+
FROM $table
290+
WHERE $parentIdCondition AND tree_pos > $treePos
291+
ORDER BY tree_pos ASC
292+
LIMIT 1";
293+
294+
$result = Database::query($sql);
295+
$nextCategory = Database::fetch_array($result);
296+
297+
if (!$nextCategory) {
298+
return false;
299+
}
300+
301+
Database::query("UPDATE $table SET tree_pos = {$nextCategory['tree_pos']} WHERE id = $categoryId");
302+
Database::query("UPDATE $table SET tree_pos = $treePos WHERE id = {$nextCategory['id']}");
303+
304+
return true;
305+
}
306+
275307
public static function reorganizeTreePos($parentId): void
276308
{
277309
$table = Database::get_main_table(TABLE_MAIN_CATEGORY);
@@ -384,21 +416,51 @@ public static function listCategories(array $categorySource = []): string
384416
$column++;
385417
}
386418
$row++;
387-
$mainUrl = api_get_path(WEB_CODE_PATH).'admin/course_category.php?category='.$categoryCode;
419+
$baseUrl = api_get_path(WEB_CODE_PATH).'admin/course_category.php';
420+
$baseParams = [];
421+
if (!empty($categorySource['id'])) {
422+
$baseParams['id'] = (int) $categorySource['id'];
423+
}
388424

389425
$editIcon = Display::getMdiIcon(ActionIcon::EDIT, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Edit'));
390426
$exportIcon = Display::getMdiIcon(ActionIcon::EXPORT_CSV, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('ExportAsCSV'));
391427
$deleteIcon = Display::getMdiIcon(ActionIcon::DELETE, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Delete'));
392-
$moveIcon = Display::getMdiIcon(ActionIcon::UP, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Up in same level'));
393-
394428
$urlId = api_get_current_access_url_id();
429+
430+
$positions = array_map(fn($c) => $c->getTreePos(), $categories);
431+
$minTreePos = min($positions);
432+
$maxTreePos = max($positions);
433+
395434
foreach ($categories as $category) {
396435
$categoryId = $category->getId();
397436
$code = $category->getCode();
398-
$editUrl = $mainUrl.'&id='.$categoryId.'&action=edit';
399-
$moveUrl = $mainUrl.'&id='.$categoryId.'&action=moveUp&tree_pos='.$category->getTreePos();
400-
$deleteUrl = $mainUrl.'&id='.$categoryId.'&action=delete';
401-
$exportUrl = $mainUrl.'&id='.$categoryId.'&action=export';
437+
$treePos = $category->getTreePos();
438+
$editUrl = $baseUrl.'?'.http_build_query(array_merge($baseParams, [
439+
'action' => 'edit',
440+
'id' => $categoryId,
441+
]));
442+
443+
$moveUpUrl = $baseUrl.'?'.http_build_query(array_merge($baseParams, [
444+
'action' => 'moveUp',
445+
'id' => $categoryId,
446+
'tree_pos' => $treePos,
447+
]));
448+
449+
$moveDownUrl = $baseUrl.'?'.http_build_query(array_merge($baseParams, [
450+
'action' => 'moveDown',
451+
'id' => $categoryId,
452+
'tree_pos' => $treePos,
453+
]));
454+
455+
$deleteUrl = $baseUrl.'?'.http_build_query(array_merge($baseParams, [
456+
'action' => 'delete',
457+
'id' => $categoryId,
458+
]));
459+
460+
$exportUrl = $baseUrl.'?'.http_build_query(array_merge($baseParams, [
461+
'action' => 'export',
462+
'id' => $categoryId,
463+
]));
402464

403465
$actions = [];
404466

@@ -410,7 +472,25 @@ function ($entry) use ($urlId) {
410472

411473
if ($inUrl->count() > 0) {
412474
$actions[] = Display::url($editIcon, $editUrl);
413-
$actions[] = Display::url($moveIcon, $moveUrl);
475+
476+
if ($treePos > $minTreePos) {
477+
$actions[] = Display::url(
478+
Display::getMdiIcon(ActionIcon::UP, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Move up')),
479+
$moveUpUrl
480+
);
481+
} else {
482+
$actions[] = Display::getMdiIcon(ActionIcon::UP, 'ch-tool-icon-disabled', null, ICON_SIZE_SMALL, get_lang('Move up'));
483+
}
484+
485+
if ($treePos < $maxTreePos) {
486+
$actions[] = Display::url(
487+
Display::getMdiIcon(ActionIcon::DOWN, 'ch-tool-icon', null, ICON_SIZE_SMALL, get_lang('Move down')),
488+
$moveDownUrl
489+
);
490+
} else {
491+
$actions[] = Display::getMdiIcon(ActionIcon::DOWN, 'ch-tool-icon-disabled', null, ICON_SIZE_SMALL, get_lang('Move down'));
492+
}
493+
414494
$actions[] = Display::url($exportIcon, $exportUrl);
415495
$actions[] = Display::url(
416496
$deleteIcon,

0 commit comments

Comments
 (0)