'.get_lang('ThematicAdvanceHistory').' |
@@ -49,7 +49,7 @@ if ($history) {
$user_info = api_get_user_info();
if (isset($descriptions) && count($descriptions) > 0) {
- foreach ($descriptions as $id => $description) {
+ foreach ($descriptions as $id => $description) {
if (!empty($description)) {
$actions = '';
if (api_is_allowed_to_edit(null, true) && !$history) {
diff --git a/main/document/document_quota.php b/main/document/document_quota.php
index 8087ab1645..39267aa45f 100755
--- a/main/document/document_quota.php
+++ b/main/document/document_quota.php
@@ -1,5 +1,6 @@
['status', 'studentfollowup']);
$result = api_get_settings_params_simple($params);
+ $plugin = StudentFollowUpPlugin::create();
if (!empty($result) && $result['selected_value'] === 'installed') {
$navigation['follow_up']['url'] = api_get_path(WEB_PLUGIN_PATH).'studentfollowup/posts.php';
- $navigation['follow_up']['title'] = get_lang('MyDossier');
+ $navigation['follow_up']['title'] = $plugin->get_lang('CareDetailView');
$navigation['follow_up']['key'] = 'homepage';
$navigation['follow_up']['icon'] = 'homepage.png';
}
@@ -363,8 +364,7 @@ function return_navigation_array()
// Reports
if (!empty($possible_tabs['reports'])) {
if (api_get_setting('show_tabs', 'reports') == 'true') {
- if (
- (api_is_platform_admin() || api_is_drh() || api_is_session_admin())
+ if ((api_is_platform_admin() || api_is_drh() || api_is_session_admin())
&& Rights::hasRight('show_tabs:reports')
) {
$navigation['reports'] = $possible_tabs['reports'];
diff --git a/main/inc/lib/course_home.lib.php b/main/inc/lib/course_home.lib.php
index 8f986a4431..a4f06363f3 100755
--- a/main/inc/lib/course_home.lib.php
+++ b/main/inc/lib/course_home.lib.php
@@ -2,6 +2,7 @@
/* For licensing terms, see /license.txt */
use Chamilo\CourseBundle\Entity\CTool;
+use Chamilo\CourseBundle\Entity\CLpCategory;
/**
* Class CourseHome
@@ -461,6 +462,8 @@ class CourseHome
// Condition for the session
$session_id = $sessionId ?: api_get_session_id();
$course_id = $courseId ?: api_get_course_int_id();
+ $userId = api_get_user_id();
+ $user = api_get_user_entity($userId);
$condition_session = api_get_session_condition(
$session_id,
true,
@@ -572,12 +575,12 @@ class CourseHome
$lp = new learnpath(
api_get_course_id(),
$lp_id,
- api_get_user_id()
+ $userId
);
$path = $lp->get_preview_image_path(ICON_SIZE_BIG);
$add = learnpath::is_lp_visible_for_student(
$lp_id,
- api_get_user_id(),
+ $userId,
api_get_course_id(),
api_get_session_id()
);
@@ -586,6 +589,16 @@ class CourseHome
}
}
+ if ($temp_row['image'] === 'lp_category.gif') {
+ $lpCategory = self::getPublishedLpCategoryFromLink(
+ $temp_row['link']
+ );
+ $add = learnpath::categoryIsVisibleForStudent(
+ $lpCategory,
+ $user
+ );
+ }
+
if ($add) {
$all_tools_list[] = $temp_row;
}
@@ -675,7 +688,7 @@ class CourseHome
WHERE blog_id =".$blog_id;
} else {
$sql_blogs = "SELECT * FROM $tbl_blogs_rel_user blogs_rel_user
- WHERE blog_id =".$blog_id." AND user_id = ".api_get_user_id();
+ WHERE blog_id =".$blog_id." AND user_id = ".$userId;
}
$result_blogs = Database::query($sql_blogs);
@@ -1173,6 +1186,25 @@ class CourseHome
return $lp_id;
}
+ /**
+ * Get published learning path category from link inside course home
+ * @param string $link
+ * @return CLpCategory
+ */
+ public static function getPublishedLpCategoryFromLink($link)
+ {
+ $query = parse_url($link, PHP_URL_QUERY);
+ parse_str($query, $params);
+
+ $id = isset($params['id']) ? (int) $params['id'] : 0;
+
+ $em = Database::getManager();
+ /** @var CLpCategory $category */
+ $category = $em->find('ChamiloCourseBundle:CLpCategory', $id);
+
+ return $category;
+ }
+
/**
* @param bool $include_admin_tools
* @return array
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index aea15044f0..f2c5ebca88 100755
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -427,6 +427,7 @@ class Template
$show_course_navigation_menu = null;
if (!empty($this->course_id) && $this->user_is_logged_in) {
+
if (api_get_setting('show_toolshortcuts') != 'false') {
//Course toolbar
$show_course_shortcut = CourseHome::show_navigation_tool_shortcuts();
diff --git a/main/install/install.lib.php b/main/install/install.lib.php
index 3cbe625deb..d0b2815e67 100755
--- a/main/install/install.lib.php
+++ b/main/install/install.lib.php
@@ -2918,8 +2918,7 @@ function finishInstallation(
$files = $finder->files()->in($path);
// Needed for chash
- $sql = 'CREATE TABLE IF NOT EXISTS version (id int unsigned NOT NULL AUTO_INCREMENT, version varchar(255), PRIMARY KEY(id), UNIQUE(version));';
- Database::query($sql);
+ createVersionTable();
foreach ($files as $version) {
$version = str_replace(['Version', '.php'], '', $version->getFilename());
@@ -2928,6 +2927,24 @@ function finishInstallation(
}
}
+/**
+ * Creates 'version' table
+ */
+function createVersionTable()
+{
+ $sql = getVersionTable();
+ Database::query($sql);
+}
+
+/**
+ * Get version creation table query
+ * @return string
+ */
+function getVersionTable()
+{
+ return 'CREATE TABLE IF NOT EXISTS version (id int unsigned NOT NULL AUTO_INCREMENT, version varchar(20), PRIMARY KEY(id), UNIQUE(version));';
+}
+
/**
* Update settings based on installation profile defined in a JSON file
* @param string $installationProfile The name of the JSON file in main/install/profiles/ folder
diff --git a/main/lp/learnpath.class.php b/main/lp/learnpath.class.php
index 32aeb01b08..b1e71271ef 100755
--- a/main/lp/learnpath.class.php
+++ b/main/lp/learnpath.class.php
@@ -9,6 +9,8 @@ use Gedmo\Sortable\Entity\Repository\SortableRepository;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Finder\Finder;
use Chamilo\CourseBundle\Entity\CLp;
+use Chamilo\CourseBundle\Entity\CTool;
+use Chamilo\UserBundle\Entity\User;
/**
* Class learnpath
@@ -4145,6 +4147,8 @@ class learnpath
foreach ($learPaths as $lp) {
learnpath::toggle_visibility($lp['iid'], 0);
}
+
+ learnpath::toggleCategoryPublish($id, 0);
}
return api_item_property_update(
@@ -4247,6 +4251,178 @@ class learnpath
}
}
+ /**
+ * Generate the link for a learnpath category as course tool
+ * @param int $categoryId
+ * @return string
+ */
+ private static function getCategoryLinkForTool($categoryId)
+ {
+ $link = 'lp/lp_controller.php?'.api_get_cidreq().'&'
+ .http_build_query(
+ [
+ 'action' => 'view_category',
+ 'id' => $categoryId
+ ]
+ );
+
+ return $link;
+ }
+
+ /**
+ * Publishes a learnpath.
+ * Show or hide the learnpath category on the course homepage
+ * @param int $id
+ * @param int $setVisibility
+ * @return bool
+ */
+ public static function toggleCategoryPublish($id, $setVisibility = 1)
+ {
+ $courseId = api_get_course_int_id();
+ $sessionId = api_get_session_id();
+ $sessionCondition = api_get_session_condition($sessionId, true, false, 't.sessionId');
+
+ $em = Database::getManager();
+
+ /** @var CLpCategory $category */
+ $category = $em->find('ChamiloCourseBundle:CLpCategory', $id);
+
+ if (!$category) {
+ return false;
+ }
+
+ $link = self::getCategoryLinkForTool($id);
+
+ /** @var CTool $tool */
+ $tool = $em
+ ->createQuery("
+ SELECT t FROM ChamiloCourseBundle:CTool t
+ WHERE
+ t.cId = :course AND
+ t.link = :link1 AND
+ t.image = 'lp_category.gif' AND
+ t.link LIKE :link2
+ $sessionCondition
+ ")
+ ->setParameters([
+ 'course' => (int) $courseId,
+ 'link1' => $link,
+ 'link2' => "$link%"
+ ])
+ ->getOneOrNullResult();
+
+ if ($setVisibility == 0 && $tool) {
+ $em->remove($tool);
+ $em->flush();
+
+ return true;
+ }
+
+ if ($setVisibility == 1 && !$tool) {
+ $tool = new CTool();
+ $tool
+ ->setCategory('authoring')
+ ->setCId($courseId)
+ ->setName(strip_tags($category->getName()))
+ ->setLink($link)
+ ->setImage('lp_category.gif')
+ ->setVisibility(1)
+ ->setAdmin(0)
+ ->setAddress('pastillegris.gif')
+ ->setAddedTool(0)
+ ->setSessionId($sessionId)
+ ->setTarget('_self');
+
+ $em->persist($tool);
+ $em->flush();
+
+ $tool->setId($tool->getIid());
+
+ $em->persist($tool);
+ $em->flush();
+
+ return true;
+ }
+
+ if ($setVisibility == 1 && $tool) {
+ $tool
+ ->setName(strip_tags($category->getName()))
+ ->setVisibility(1);
+
+ $em->persist($tool);
+ $em->flush();
+
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Check if the learnpath category is visible for a user
+ * @param CLpCategory $category
+ * @param User $user
+ * @return bool
+ */
+ public static function categoryIsVisibleForStudent(
+ CLpCategory $category,
+ User $user
+ )
+ {
+ $isAllowedToEdit = api_is_allowed_to_edit(null, true);
+
+ if ($isAllowedToEdit) {
+ return true;
+ }
+
+ $users = $category->getUsers();
+
+ if (empty($users) || !$users->count()) {
+ return true;
+ }
+
+ if ($category->hasUserAdded($user)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Check if a learnpath category is published as course tool
+ * @param CLpCategory $category
+ * @param int $courseId
+ * @return bool
+ */
+ public static function categoryIsPusblished(
+ CLpCategory $category,
+ $courseId
+ )
+ {
+ $link = self::getCategoryLinkForTool($category->getId());
+ $em = Database::getManager();
+
+ $tools = $em
+ ->createQuery("
+ SELECT t FROM ChamiloCourseBundle:CTool t
+ WHERE t.cId = :course AND
+ t.name = :name AND
+ t.image = 'lp_category.gif' AND
+ t.link LIKE :link
+ ")
+ ->setParameters([
+ 'course' => $courseId,
+ 'name' => strip_tags($category->getName()),
+ 'link' => "$link%"
+ ])
+ ->getResult();
+
+ /** @var CTool $tool */
+ $tool = current($tools);
+
+ return $tool ? $tool->getVisibility() : false;
+ }
+
/**
* Restart the whole learnpath. Return the URL of the first element.
* Make sure the results are saved with anoter method. This method should probably be
diff --git a/main/lp/lp_add_category.php b/main/lp/lp_add_category.php
index ab72405203..d683a7ada9 100644
--- a/main/lp/lp_add_category.php
+++ b/main/lp/lp_add_category.php
@@ -31,8 +31,17 @@ $form = new FormValidator(
$form->addElement('header', null, get_lang('AddLPCategory'));
// Title
-$form->addElement('text', 'name', api_ucfirst(get_lang('Name')));
-$form->addRule('name', get_lang('ThisFieldIsRequired'), 'required');
+if (api_get_configuration_value('save_titles_as_html')) {
+ $form->addHtmlEditor(
+ 'name',
+ get_lang('Name'),
+ true,
+ false,
+ ['ToolbarSet' => 'Minimal']
+ );
+} else {
+ $form->addText('name', get_lang('Name'), true);
+}
$form->addElement('hidden', 'action', 'add_lp_category');
$form->addElement('hidden', 'c_id', api_get_course_int_id());
diff --git a/main/lp/lp_controller.php b/main/lp/lp_controller.php
index b99f5f7b53..8cd585b93c 100755
--- a/main/lp/lp_controller.php
+++ b/main/lp/lp_controller.php
@@ -334,9 +334,11 @@ if (isset($_SESSION['oLP'])) {
}
if (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'true') {
- if (isset($_REQUEST['action']) && !in_array($_REQUEST['action'], ['list', 'view'])) {
+ if (isset($_REQUEST['action']) && !in_array($_REQUEST['action'], ['list', 'view', 'view_category'])) {
if (!empty($_REQUEST['lp_id'])) {
$_REQUEST['action'] = 'view';
+ } elseif($_REQUEST['action'] == 'view_category') {
+ $_REQUEST['action'] = 'view_category';
} else {
$_REQUEST['action'] = 'list';
}
@@ -873,6 +875,14 @@ switch ($action) {
require 'lp_list.php';
}
break;
+ case 'toggle_category_publish':
+ if (!$is_allowed_to_edit) {
+ api_not_allowed(true);
+ }
+
+ learnpath::toggleCategoryPublish($_REQUEST['id'], $_REQUEST['new_status']);
+ require 'lp_list.php';
+ break;
case 'toggle_publish':
// Change lp published status (visibility on homepage).
if (!$is_allowed_to_edit) {
diff --git a/main/lp/lp_edit_item_prereq.php b/main/lp/lp_edit_item_prereq.php
index 9c8ebd3f45..84475b65c8 100755
--- a/main/lp/lp_edit_item_prereq.php
+++ b/main/lp/lp_edit_item_prereq.php
@@ -91,6 +91,7 @@ echo '