Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: AngelFQC

assets/vue/components/layout/TopbarLoggedIn.vue

@@ -97,33 +97,44 @@ const ticketUrl = computed(() => {
 })
 
 const elUserSubmenu = ref(null)
-const userSubmenuItems = computed(() => [
-  {
-    label: props.currentUser.fullName,
-    items: [
-      {
-        label: t("My profile"),
-        url: router.resolve({ name: "AccountHome" }).href,
-      },
-      {
-        label: t("My General Certificate"),
-        url: "/main/social/my_skills_report.php?a=generate_custom_skill",
-      },
-      {
-        label: t("My skills"),
-        url: "/main/social/my_skills_report.php",
-      },
-      {
-        separator: true,
-      },
-      {
-        label: t("Sign out"),
-        url: "/logout",
-        icon: "mdi mdi-logout-variant",
-      },
-    ],
-  },
-])
+const userSubmenuItems = computed(() => {
+  const items = [
+    {
+      label: props.currentUser.fullName,
+      items: [
+        {
+          label: t("My profile"),
+          url: router.resolve({ name: "AccountHome" }).href,
+        },
+      ],
+    },
+  ]
+
+  if (platformConfigStore.getSetting("platform.show_tabs").indexOf("topbar_certificate") > -1) {
+    items[0].items.push({
+      label: t("My General Certificate"),
+      url: "/main/social/my_skills_report.php?a=generate_custom_skill",
+    })
+  }
+
+  if (platformConfigStore.getSetting("platform.show_tabs").indexOf("topbar_skills") > -1) {
+    items[0].items.push({
+      label: t("My skills"),
+      url: "/main/social/my_skills_report.php",
+    })
+  }
+
+  items[0].items.push(
+    { separator: true },
+    {
+      label: t("Sign out"),
+      url: "/logout",
+      icon: "mdi mdi-logout-variant",
+    }
+  )
+
+  return items
+})
 
 function toggleUserMenu(event) {
   elUserSubmenu.value.toggle(event)

assets/vue/composables/sidebarMenu.js

@@ -25,24 +25,29 @@ export function useSidebarMenu() {
     return false
   }
 
-  const menuItemsBeforeMyCourse = computed(() => {
-    const items = []
-
-    if (showTabsSetting.indexOf("campus_homepage") > -1) {
-      items.push({
-        icon: "mdi mdi-home",
-        label: t("Home"),
-        route: { name: "Home" },
-      })
+  const createMenuItem = (key, icon, label, routeName, subItems = null) => {
+    if (showTabsSetting.indexOf(key) > -1) {
+      const item = {
+        icon: `mdi ${icon}`,
+        label: t(label),
+      }
+      if (routeName) item.route = { name: routeName }
+      if (subItems) item.items = subItems
+      return item
     }
+    return null
+  }
 
-    return items
+  const menuItemsBeforeMyCourse = computed(() => {
+    const items = []
+    items.push(createMenuItem("campus_homepage", "mdi-home", "Home", "Home"))
+    return items.filter(Boolean)
   })
 
   const menuItemMyCourse = computed(() => {
     const items = []
 
-    if (securityStore.isAuthenticated) {
+    if (securityStore.isAuthenticated && showTabsSetting.indexOf("my_courses") > -1) {
       const courseItems = []
 
       if (enrolledStore.isEnrolledInCourses) {
@@ -76,33 +81,33 @@ export function useSidebarMenu() {
   const menuItemsAfterMyCourse = computed(() => {
     const items = []
 
-    if (showCatalogue > -1) {
+    if (showTabsSetting.indexOf("catalogue") > -1) {
       if (showCatalogue == 0 || showCatalogue == 2) {
-        items.push({
-          icon: "mdi mdi-bookmark-multiple",
-          label: t("Explore more courses"),
-          route: { name: "CatalogueCourses" },
-        })
+        items.push(
+          createMenuItem(
+            "catalogue",
+            "mdi-bookmark-multiple",
+            "Explore more courses",
+            "CatalogueCourses"
+          )
+        )
       }
       if (showCatalogue > 0) {
-        items.push({
-          icon: "mdi mdi-bookmark-multiple-outline",
-          label: t("Sessions catalogue"),
-          route: { name: "CatalogueSessions" },
-        })
+        items.push(
+          createMenuItem(
+            "catalogue",
+            "mdi-bookmark-multiple-outline",
+            "Sessions catalogue",
+            "CatalogueSessions"
+          )
+        )
       }
     }
 
-    if (showTabsSetting.indexOf("my_agenda") > -1) {
-      items.push({
-        icon: "mdi mdi-calendar-text",
-        label: t("Events"),
-        route: { name: "CCalendarEventList" },
-      })
-    }
+    items.push(createMenuItem("my_agenda", "mdi-calendar-text", "Events", "CCalendarEventList"))
 
     if (showTabsSetting.indexOf("reporting") > -1) {
-      let subItems = []
+      const subItems = []
 
       if (securityStore.isTeacher || securityStore.isHRM || securityStore.isSessionAdmin) {
         subItems.push({
@@ -155,75 +160,58 @@ export function useSidebarMenu() {
       })
     }
 
-    if (platformConfigStore.plugins?.bbb?.show_global_conference_link) {
-      items.push({
-        icon: "mdi mdi-video",
-        label: t("Videoconference"),
-        url: platformConfigStore.plugins.bbb.listingURL,
-      })
-    }
-
-    if (securityStore.isStudentBoss || securityStore.isStudent) {
-      items.push({
-        icon: "mdi mdi-text-box-search",
-        items: [
-          {
-            label: t("Diagnosis Management"),
-            url: "/main/search/load_search.php",
-            visible: securityStore.isStudentBoss,
-          },
-          {
-            label: t("Diagnostic Form"),
-            url: "/main/search/search.php",
-          },
-        ],
-        label: t("Diagnosis"),
-      })
-    }
-
-    if (securityStore.isAdmin || securityStore.isSessionAdmin) {
-      const adminItems = [
+    items.push(
+      createMenuItem(
+        "videoconference",
+        "mdi-video",
+        "Videoconference",
+        null,
+        platformConfigStore.plugins?.bbb?.show_global_conference_link
+          ? [
+            {
+              label: t("Conference Room"),
+              url: platformConfigStore.plugins.bbb.listingURL,
+            },
+          ]
+          : null
+      )
+    )
+
+    items.push(
+      createMenuItem("diagnostics", "mdi-text-box-search", "Diagnosis Management", null, [
         {
-          label: t("Administration"),
-          route: { name: "AdminIndex" },
+          label: t("Diagnosis Management"),
+          url: "/main/search/load_search.php",
+          visible: securityStore.isStudentBoss,
         },
-      ]
-
-      if (
-        securityStore.isSessionAdmin &&
-        "true" === platformConfigStore.getSetting("session.limit_session_admin_list_users")
-      ) {
-        adminItems.push({
-          label: t("Add user"),
-          url: "/main/admin/user_add.php",
-        })
-      } else {
-        adminItems.push({
-          label: t("Users"),
-          url: "/main/admin/user_list.php",
-        })
-      }
+        {
+          label: t("Diagnostic Form"),
+          url: "/main/search/search.php",
+        },
+      ])
+    )
+
+    if (showTabsSetting.indexOf("platform_administration") > -1) {
+      if (securityStore.isAdmin || securityStore.isSessionAdmin) {
+        const adminItems = [
+          { label: t("Administration"), route: { name: "AdminIndex" } },
+          ...(securityStore.isSessionAdmin &&
+          "true" === platformConfigStore.getSetting("session.limit_session_admin_list_users")
+            ? [{ label: t("Add user"), url: "/main/admin/user_add.php" }]
+            : [{ label: t("Users"), url: "/main/admin/user_list.php" }]),
+          { label: t("Courses"), url: "/main/admin/course_list.php" },
+          { label: t("Sessions"), url: "/main/session/session_list.php" },
+        ]
 
-      if (securityStore.isAdmin) {
-        adminItems.push({
-          label: t("Courses"),
-          url: "/main/admin/course_list.php",
+        items.push({
+          icon: "mdi mdi-cog",
+          items: adminItems,
+          label: t("Administration"),
         })
       }
-
-      adminItems.push({
-        label: t("Sessions"),
-        url: "/main/session/session_list.php",
-      })
-
-      items.push({
-        icon: "mdi mdi-cog",
-        items: adminItems,
-        label: t("Administration"),
-      })
     }
 
-    return items
+    return items.filter(Boolean)
   })
 
   async function initialize() {

public/main/admin/course_user_import.php

@@ -163,7 +163,7 @@ function parse_csv_data($file)
 $form->addElement('header', '', $tool_name);
 $form->addElement('file', 'import_file', get_lang('Import marks in an assessment'));
 $form->addElement('checkbox', 'subscribe', get_lang('Action'), get_lang('Add user in the course only if not yet in'));
-$form->addElement('checkbox', 'unsubscribe', '', get_lang('Remove user from course if his name is not in the list'));
+$form->addElement('checkbox', 'unsubscribe', '', get_lang('Remove users from any courses that are not mentioned explicitly in this file'));
 $form->addButtonImport(get_lang('Import'));
 $form->setDefaults(['subscribe' => '1', 'unsubscribe' => 1]);
 $errors = [];
@@ -174,7 +174,7 @@ function parse_csv_data($file)
     if (0 == count($errors)) {
         $inserted_in_course = save_data($users_courses);
         // Build the alert message in case there were visual codes subscribed to.
-        if ($_POST['subscribe']) {
+        if (isset($_POST['subscribe']) && $_POST['subscribe']) {
             //$warn = get_lang('The users have been subscribed to the following courses because several courses share the same visual code').': ';
         } else {
             $warn = get_lang('The users have been unsubscribed from the following courses because several courses share the same visual code').': ';

public/main/exercise/question_list_admin.inc.php

@@ -135,11 +135,7 @@
 //deletes a session when using don't know question type (ugly fix)
 Session::erase('less_answer');
 
-// If we are in a test
-$inATest = isset($exerciseId) && $exerciseId > 0;
-if (!$inATest) {
-    echo Display::return_message(get_lang('Choose question type'), 'warning');
-} else {
+if (isset($exerciseId) && $exerciseId > 0) {
     if ($nbrQuestions) {
         // In the building exercise mode show question list ordered as is.
         $objExercise->setCategoriesGrouping(false);
@@ -149,32 +145,14 @@
         $objExercise->questionSelectionType = EX_Q_SELECTION_ORDERED;
         $allowQuestionOrdering = true;
         $showPagination = api_get_setting('exercise.show_question_pagination');
+        $length = api_get_setting('exercise.question_pagination_length');
+        $page = isset($_GET['page']) ? (int)$_GET['page'] : 1;
+
         if (!empty($showPagination) && $nbrQuestions > $showPagination) {
-            $length = api_get_setting('exercise.question_pagination_length');
-            $url = api_get_self().'?'.api_get_cidreq();
-            // Use pagination for exercise with more than 200 questions.
             $allowQuestionOrdering = false;
             $start = ($page - 1) * $length;
-            $questionList = $objExercise->getQuestionForTeacher($start, $length);
-            $paginator = new Knp\Component\Pager\Paginator();
-            $pagination = $paginator->paginate([]);
-            $pagination->setTotalItemCount($nbrQuestions);
-            $pagination->setItemNumberPerPage($length);
-            $pagination->setCurrentPageNumber($page);
-            $pagination->renderer = function ($data) use ($url) {
-                $render = '<ul class="pagination">';
-                for ($i = 1; $i <= $data['pageCount']; $i++) {
-                    $pageContent = '<li><a href="'.$url.'&page='.$i.'">'.$i.'</a></li>';
-                    if ($data['current'] == $i) {
-                        $pageContent = '<li class="active"><a href="#" >'.$i.'</a></li>';
-                    }
-                    $render .= $pageContent;
-                }
-                $render .= '</ul>';
-
-                return $render;
-            };
-            echo $pagination;
+            $questionList = $objExercise->selectQuestionList(true, true);
+            $questionList = array_slice($questionList, $start, $length);
         } else {
             // Classic order
             $questionList = $objExercise->selectQuestionList(true, true);
@@ -331,7 +309,17 @@
         }
 
         echo '</div>'; //question list div
+        // Pagination navigation
+        $totalPages = ceil($nbrQuestions / $length);
+        echo '<div class="pagination flex justify-center mt-4">';
+        for ($i = 1; $i <= $totalPages; $i++) {
+            $isActive = ($i == $page) ? 'bg-primary text-white' : 'border-gray-300 text-gray-700 hover:bg-gray-200';
+            echo '<a href="?'.http_build_query(array_merge($_GET, ['page' => $i])).'" class="mx-1 px-4 py-2 border '.$isActive.' rounded">'.$i.'</a>';
+        }
+        echo '</div>';
     } else {
         echo Display::return_message(get_lang('Questions list (there is no question so far).'), 'warning');
     }
+} else {
+    echo Display::return_message(get_lang('Choose question type'), 'warning');
 }

src/CoreBundle/Component/Utils/ActionIcon.php

@@ -160,4 +160,8 @@ enum ActionIcon: string
     case EDIT_BADGE = 'shield-edit-outline';
 
     case ADD_EVENT_REMINDER = 'alarm-plus';
+
+    case SWAP_FILE = 'file-swap';
+
+    case ADD_FILE_VARIATION = 'file-replace';
 }