Merge remote-tracking branch 'upstream/master' into GH-7121

Author: christianbeeznest

README.md

@@ -59,9 +59,9 @@ Install the software stack and Chamilo using the commands below.
 apt update && apt -y upgrade
 apt install -y apache2 libapache2-mod-php mariadb-client mariadb-server redis php-pear php-{apcu,bcmath,cli,curl,dev,gd,intl,ldap,mbstring,mysql,redis,soap,xml,zip} git unzip curl certbot
 mysql -e "GRANT ALL PRIVILEGES ON chamilo2.* TO chamilo2@localhost IDENTIFIED BY 'chamilo2';"
-cd /var/www && wget https://github.com/chamilo/chamilo-lms/releases/download/v2.0.0-alpha.2/chamilo-2.0.0-alpha.2.tar.gz
-tar zxf chamilo-2.0.0-alpha.2.tar.gz
-mv chamilo-2.0.0-alpha.2 chamilo
+cd /var/www && wget https://github.com/chamilo/chamilo-lms/releases/download/v2.0.0-beta.1/chamilo-2.0.0-beta.1.tar.gz
+tar zxf chamilo-2.0.0-beta.1.tar.gz
+mv chamilo-2.0.0-beta.1 chamilo
 cd chamilo
 cp public/main/install/apache.dist.conf /etc/apache2/sites-available/my.chamilo.net.conf
 a2ensite my.chamilo.net

assets/vue/components/Breadcrumb.vue

@@ -303,7 +303,8 @@ watchEffect(() => {
     const toolBase = matchedRoutes[0]
     const currentMatched = matchedRoutes[matchedRoutes.length - 1]
 
-    let toolLabel = formatToolName(mainToolName)
+    let toolLabel = toolBase.meta?.breadcrumb || formatToolName(mainToolName)
+
     if (mainToolName === "ccalendarevent") {
       const cid = Number(route.query?.cid || 0)
       const gid = Number(route.query?.gid || 0)

assets/vue/components/lp/LpCategorySection.vue

@@ -22,43 +22,60 @@ const props = defineProps({
   buildDates: { type: Function, required: false },
 })
 const emit = defineEmits([
-  "open","edit","report","settings","build",
-  "toggle-visible","toggle-publish","delete",
-  "export-scorm","export-pdf",
-  "reorder","toggle-auto-launch",
+  "open",
+  "edit",
+  "report",
+  "settings",
+  "build",
+  "toggle-visible",
+  "toggle-publish",
+  "delete",
+  "export-scorm",
+  "export-pdf",
+  "reorder",
+  "toggle-auto-launch",
 ])
 
 const displayTitle = computed(() => props.title || t("Learning path categories"))
 
 const localList = ref([...(props.list ?? [])])
 const dragging = ref(false)
 
-watch(() => props.list, (nv) => {
-  if (dragging.value) return
-  localList.value = [...(nv ?? [])]
-}, { immediate: true })
+watch(
+  () => props.list,
+  (nv) => {
+    if (dragging.value) return
+    localList.value = [...(nv ?? [])]
+  },
+  { immediate: true },
+)
 
 function onEndCat() {
   dragging.value = false
-  emit("reorder", localList.value.map(i => i.iid))
+  emit(
+    "reorder",
+    localList.value.map((i) => i.iid),
+  )
 }
 
 const route = useRoute()
-const cid  = computed(() => Number(route.query?.cid ?? 0) || undefined)
-const sid  = computed(() => Number(route.query?.sid ?? 0) || undefined)
+const cid = computed(() => Number(route.query?.cid ?? 0) || undefined)
+const sid = computed(() => Number(route.query?.sid ?? 0) || undefined)
 const node = computed(() => Number(route.params?.node ?? 0) || undefined)
 
 const goCat = (action, extraParams = {}) => {
   const url = lpService.buildLegacyActionUrl(action, {
-    cid: cid.value, sid: sid.value, node: node.value,
+    cid: cid.value,
+    sid: sid.value,
+    node: node.value,
     params: { id: props.category.iid, ...extraParams },
   })
   window.location.assign(url)
 }
-const onCatEdit             = () => goCat("add_lp_category")
-const onCatAddUsers         = () => goCat("add_users_to_category")
+const onCatEdit = () => goCat("add_lp_category")
+const onCatAddUsers = () => goCat("add_users_to_category")
 const onCatToggleVisibility = () => {
-  const vis  = props.category.visibility ?? props.category.visible
+  const vis = props.category.visibility ?? props.category.visible
   const next = typeof vis === "number" ? (vis ? 0 : 1) : 1
   goCat("toggle_category_visibility", { new_status: next })
 }
@@ -70,6 +87,12 @@ const onCatTogglePublish = () => {
   goCat("toggle_category_publish", { new_status: next })
 }
 const onCatDelete = () => {
+  // Do not allow deletion if category is not empty
+  if (localList.value.length > 0) {
+    alert(t("You must move or remove all learning paths from this category before deleting it."))
+    return
+  }
+
   const label = (props.category.title || "").trim() || t("Category")
   const msg = `${t("Are you sure you want to delete")} ${label}?`
   if (confirm(msg)) {
@@ -83,41 +106,82 @@ onMounted(() => {
   const saved = localStorage.getItem(storageKey.value)
   if (saved !== null) isOpen.value = saved === "1"
 })
-watch(isOpen, v => localStorage.setItem(storageKey.value, v ? "1" : "0"))
+watch(isOpen, (v) => localStorage.setItem(storageKey.value, v ? "1" : "0"))
 const panelId = computed(() => `cat-panel-${props.category?.iid || props.title}`)
-const toggleOpen = () => { if (localList.value.length) isOpen.value = !isOpen.value }
-function onChangeCat() {
-  emit("reorder", localList.value.map(i => i.iid))
+const toggleOpen = () => {
+  if (localList.value.length) isOpen.value = !isOpen.value
 }
 </script>
 
 <template>
   <section class="relative ml-2 rounded-2xl shadow-lg">
     <header class="relative bg-support-6 rounded-t-2xl flex items-center justify-between pl-0 pr-4 py-3">
-      <span class="pointer-events-none absolute inset-y-0 -left-1.5 w-1.5 bg-support-5 rounded-l-2xl" aria-hidden />
+      <span
+        class="pointer-events-none absolute inset-y-0 -left-1.5 w-1.5 bg-support-5 rounded-l-2xl"
+        aria-hidden
+      />
       <div class="flex items-center gap-3">
         <template v-if="canEdit">
           <button
             class="w-8 h-8 grid place-content-center rounded-lg text-gray-50 hover:bg-gray-15 hover:text-gray-90"
-            :title="t('Drag to reorder')" :aria-label="t('Drag to reorder')"
+            :title="t('Drag to reorder')"
+            :aria-label="t('Drag to reorder')"
           >
-            <svg width="14" height="14" viewBox="0 0 14 14" fill="currentColor" aria-hidden>
-              <circle cx="4" cy="3" r="1.2" /><circle cx="4" cy="7" r="1.2" /><circle cx="4" cy="11" r="1.2" />
-              <circle cx="10" cy="3" r="1.2" /><circle cx="10" cy="7" r="1.2" /><circle cx="10" cy="11" r="1.2" />
+            <svg
+              width="14"
+              height="14"
+              viewBox="0 0 14 14"
+              fill="currentColor"
+              aria-hidden
+            >
+              <circle
+                cx="4"
+                cy="3"
+                r="1.2"
+              />
+              <circle
+                cx="4"
+                cy="7"
+                r="1.2"
+              />
+              <circle
+                cx="4"
+                cy="11"
+                r="1.2"
+              />
+              <circle
+                cx="10"
+                cy="3"
+                r="1.2"
+              />
+              <circle
+                cx="10"
+                cy="7"
+                r="1.2"
+              />
+              <circle
+                cx="10"
+                cy="11"
+                r="1.2"
+              />
             </svg>
           </button>
         </template>
         <template v-else>
-          <span class="inline-block w-8 h-8" aria-hidden></span>
+          <span
+            class="inline-block w-8 h-8"
+            aria-hidden
+          ></span>
         </template>
 
         <h2 class="text-body-1 font-semibold text-gray-90">{{ displayTitle }}</h2>
       </div>
 
       <div class="flex items-center gap-2">
-        <div class="text-tiny text-gray-50">{{ localList.length }} {{ t('Learning paths') }}</div>
+        <div class="text-tiny text-gray-50">{{ localList.length }} {{ t("Learning paths") }}</div>
 
-        <BaseDropdownMenu v-if="canEdit"
+        <BaseDropdownMenu
+          v-if="canEdit"
           :dropdown-id="`category-${category.iid}`"
           class="relative z-30"
         >
@@ -127,18 +191,48 @@ function onChangeCat() {
               :title="t('Options')"
               :aria-label="t('Options')"
             >
-              <i class="mdi mdi-dots-vertical text-lg" aria-hidden></i>
+              <i
+                class="mdi mdi-dots-vertical text-lg"
+                aria-hidden
+              ></i>
             </span>
           </template>
           <template #menu>
-            <div class="absolute right-0 top-full mt-2 w-60 bg-white border border-gray-25 rounded-xl shadow-xl p-1 z-50">
-              <button class="w-full text-left px-3 py-2 rounded hover:bg-gray-15" @click="onCatEdit">{{ t('Edit category') }}</button>
-              <button class="w-full text-left px-3 py-2 rounded hover:bg-gray-15" @click="onCatAddUsers">{{ t('Subscribe users to category') }}</button>
+            <div
+              class="absolute right-0 top-full mt-2 w-60 bg-white border border-gray-25 rounded-xl shadow-xl p-1 z-50"
+            >
+              <button
+                class="w-full text-left px-3 py-2 rounded hover:bg-gray-15"
+                @click="onCatEdit"
+              >
+                {{ t("Edit category") }}
+              </button>
+              <button
+                class="w-full text-left px-3 py-2 rounded hover:bg-gray-15"
+                @click="onCatAddUsers"
+              >
+                {{ t("Subscribe users to category") }}
+              </button>
               <div class="my-1 h-px bg-gray-15"></div>
-              <button class="w-full text-left px-3 py-2 rounded hover:bg-gray-15" @click="onCatToggleVisibility">{{ t('Toggle visibility') }}</button>
-              <button class="w-full text-left px-3 py-2 rounded hover:bg-gray-15" @click="onCatTogglePublish">{{ t('Publish / Hide') }}</button>
+              <button
+                class="w-full text-left px-3 py-2 rounded hover:bg-gray-15"
+                @click="onCatToggleVisibility"
+              >
+                {{ t("Toggle visibility") }}
+              </button>
+              <button
+                class="w-full text-left px-3 py-2 rounded hover:bg-gray-15"
+                @click="onCatTogglePublish"
+              >
+                {{ t("Publish / Hide") }}
+              </button>
               <div class="my-1 h-px bg-gray-15"></div>
-              <button class="w-full text-left px-3 py-2 rounded hover:bg-gray-15 text-danger" @click="onCatDelete">{{ t('Delete') }}</button>
+              <button
+                class="w-full text-left px-3 py-2 rounded hover:bg-gray-15 text-danger"
+                @click="onCatDelete"
+              >
+                {{ t("Delete") }}
+              </button>
             </div>
           </template>
         </BaseDropdownMenu>
@@ -151,16 +245,31 @@ function onChangeCat() {
           :title="t('Expand') / t('Collapse')"
           @click="toggleOpen"
         >
-          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor"
-               class="transition-transform duration-200"
-               :class="isOpen ? 'rotate-180' : ''">
-            <path d="M6 9l6 6 6-6" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+          <svg
+            width="18"
+            height="18"
+            viewBox="0 0 24 24"
+            fill="none"
+            stroke="currentColor"
+            class="transition-transform duration-200"
+            :class="isOpen ? 'rotate-180' : ''"
+          >
+            <path
+              d="M6 9l6 6 6-6"
+              stroke-width="2"
+              stroke-linecap="round"
+              stroke-linejoin="round"
+            />
           </svg>
         </button>
       </div>
     </header>
 
-    <div v-if="isOpen && localList.length" :id="panelId" class="sm:px-4 sm:pb-4 px-2 pb-2 bg-white rounded-b-2xl">
+    <div
+      v-if="isOpen && localList.length"
+      :id="panelId"
+      class="sm:px-4 sm:pb-4 px-2 pb-2 bg-white rounded-b-2xl"
+    >
       <Draggable
         v-model="localList"
         item-key="iid"
@@ -189,17 +298,17 @@ function onChangeCat() {
             :canExportPdf="canExportPdf"
             :canAutoLaunch="canAutoLaunch"
             :buildDates="buildDates"
-          @toggle-auto-launch="$emit('toggle-auto-launch', element)"
-          @open="$emit('open', element)"
-          @edit="$emit('edit', element)"
-          @report="$emit('report', element)"
-          @settings="$emit('settings', element)"
-          @build="$emit('build', element)"
-          @toggle-visible="$emit('toggle-visible', element)"
-          @toggle-publish="$emit('toggle-publish', element)"
-          @delete="$emit('delete', element)"
-          @export-scorm="$emit('export-scorm', element)"
-          @export-pdf="$emit('export-pdf', element)"
+            @toggle-auto-launch="$emit('toggle-auto-launch', element)"
+            @open="$emit('open', element)"
+            @edit="$emit('edit', element)"
+            @report="$emit('report', element)"
+            @settings="$emit('settings', element)"
+            @build="$emit('build', element)"
+            @toggle-visible="$emit('toggle-visible', element)"
+            @toggle-publish="$emit('toggle-publish', element)"
+            @delete="$emit('delete', element)"
+            @export-scorm="$emit('export-scorm', element)"
+            @export-pdf="$emit('export-pdf', element)"
           />
         </template>
       </Draggable>

assets/vue/router/lp.js

@@ -1,10 +1,21 @@
 export default {
   path: "/resources/lp/:node(\\d+)",
-  meta: { requiresAuth: true, showBreadcrumb: true },
   name: "lp",
+  meta: {
+    requiresAuth: true,
+    showBreadcrumb: true,
+    breadcrumb: "Learning paths",
+  },
   component: () => import("../components/lp/LpLayout.vue"),
   redirect: { name: "LpList" },
   children: [
-    { name: "LpList", path: "", component: () => import("../views/lp/LpList.vue") },
+    {
+      name: "LpList",
+      path: "",
+      component: () => import("../views/lp/LpList.vue"),
+      meta: {
+        breadcrumb: "",
+      },
+    },
   ],
 }

assets/vue/services/courseService.js

@@ -73,10 +73,12 @@ export default {
    * @returns {Promise<Object>}
    */
   updateToolOrder: async (tool, newIndex, courseId, sessionId = 0) => {
-    const { data } = await api.post(`/course/${courseId}/home.json?sid=${sessionId}`, {
+    const payload = {
+      toolId: tool.iid,
       index: newIndex,
-      toolItem: tool,
-    })
+    }
+
+    const { data } = await api.post(`/course/${courseId}/home.json?sid=${sessionId}`, payload)
 
     return data
   },

assets/vue/views/course/CourseHome.vue

@@ -444,18 +444,14 @@ watch(isSorting, (isSortingEnabled) => {
 })
 
 async function updateDisplayOrder(htmlItem, newIndex) {
-  const tool = htmlItem.dataset.tool
-  let toolItem = null
-
-  if (typeof tools.value !== "undefined" && Array.isArray(tools.value)) {
-    const toolList = tools.value
-    toolItem = toolList.find((element) => element.title === tool)
-  } else {
-    console.error("Error: tools.value is undefined")
+  const toolTitle = htmlItem.dataset.tool
+  const toolItem = tools.value.find((element) => element.title === toolTitle)
+
+  if (!toolItem || !toolItem.iid) {
+    console.error("[CourseHome] Tool item or iid missing", toolItem)
     return
   }
 
-  console.log(toolItem, newIndex)
 
   // Send the updated values to the server
   await courseService.updateToolOrder(toolItem, newIndex, course.value.id, session.value?.id)