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

Author: christianbeeznest

assets/css/scss/_reporting.scss

@@ -104,5 +104,6 @@
 @include meta.load-css('chat');
 @include meta.load-css('blog');
 @include meta.load-css('course_maintenance');
+@include meta.load-css('reporting');
 
 @include meta.load-css("libs/mediaelementjs/styles");

assets/css/scss/index.scss

@@ -1198,5 +1198,23 @@
     "Admin Incomplete Courses": "Admin Incomplete Courses",
     "Admin Restart Courses": "Admin Restart Courses",
     "Admin Dashboard": "Admin Dashboard",
-    "New messages": "New messages"
-}
+    "New messages": "New messages",
+    "Authentication source": "Authentication source",
+    "Assign authentication sources to users": "Assign authentication sources to users",
+    "Back to user assignment page": "Back to user assignment page",
+    "Authentication sources assigned successfully": "Authentication sources assigned successfully",
+    "Tip: choose “— Just upload —” to store without sending to anyone.": "Tip: choose “— Just upload —” to store without sending to anyone.",
+    "Please select at least one recipient (“— Just upload —” or any user)": "Please select at least one recipient (“— Just upload —” or any user)",
+    "Sharing": "Sharing",
+    "Overwrite previous versions of same document?": "Overwrite previous versions of same document?",
+    "Selected files": "Selected files",
+    "Hide password": "Hide password",
+    "Show password": "Show password",
+    "Upload SVG logo for e-mails": "Upload SVG logo for e-mails",
+    "You must move or remove all learning paths from this category before deleting it.": "You must move or remove all learning paths from this category before deleting it.",
+    "Clear filters": "Clear filters",
+    "Attendances (tablet)": "Attendances (tablet)",
+    "Exit tablet mode": "Exit tablet mode",
+    "Attended": "Attended",
+    "No members found.": "No members found."
+}

assets/locales/en.json

@@ -182,11 +182,11 @@
 
       <section class="grid grid-cols-1 gap-3">
         <div>
-          <label class="text-xs block mb-1">{{ t('Upload email SVG') }}</label>
+          <label class="text-xs block mb-1">{{ t('Upload SVG logo for e-mails') }}</label>
           <input type="file" accept=".svg,image/svg+xml" @change="onPick($event, 'emailSvg')" />
         </div>
         <div>
-          <label class="text-xs block mb-1">{{ t('Upload email PNG (~540 px width)') }}</label>
+          <label class="text-xs block mb-1">{{ t('Upload PNG logo for e-mails (~540 px width)') }}</label>
           <input type="file" accept="image/png" @change="onPick($event, 'emailPng', { recommendW:540 })" />
         </div>
       </section>

assets/vue/components/admin/BrandingSection.vue

@@ -178,7 +178,7 @@ const onCancelClick = () => {
               class="base-calendar-footer__button base-calendar-footer__button--primary"
               @click="onApplyClick"
             >
-              {{ t("Ok") }}
+              {{ t("OK") }}
             </button>
           </div>
         </template>

assets/vue/components/basecomponents/BaseCalendar.vue

@@ -25,10 +25,14 @@ export default {
   },
   computed: {
     getDataType() {
-      if (this.resource.resourceNode.firstResourceFile.image) {
+      const node = this.resource && this.resource.resourceNode
+      const file = node && node.firstResourceFile
+
+      if (file && file.image) {
         return "image"
       }
-      if (this.resource.resourceNode.firstResourceFile.video) {
+
+      if (file && file.video) {
         return "video"
       }
 

assets/vue/components/documents/ResourceFileLink.vue

@@ -4,19 +4,19 @@
     icon="folder-generic"
   />
   <BaseIcon
-    v-else-if="resourceData.resourceNode.firstResourceFile.image"
+    v-else-if="isImage(resourceData)"
     icon="file-image"
   />
   <BaseIcon
-    v-else-if="resourceData.resourceNode.firstResourceFile.video"
+    v-else-if="isVideo(resourceData)"
     icon="file-video"
   />
   <BaseIcon
-    v-else-if="resourceData.resourceNode.firstResourceFile.text"
+    v-else-if="hasTextFlag"
     icon="file-text"
   />
   <BaseIcon
-    v-else-if="'application/pdf' === resourceData.resourceNode.firstResourceFile.mimeType"
+    v-else-if="isPdfFile"
     icon="file-pdf"
   />
   <BaseIcon
@@ -30,15 +30,33 @@
 </template>
 
 <script setup>
+import { computed } from "vue"
 import BaseIcon from "../basecomponents/BaseIcon.vue"
 import { useFileUtils } from "../../composables/fileUtils"
 
-const { isAudio } = useFileUtils()
+const { isImage, isVideo, isAudio } = useFileUtils()
 
-defineProps({
+const props = defineProps({
   resourceData: {
     type: Object,
     required: true,
   },
 })
+
+const hasTextFlag = computed(() => {
+  const file = props.resourceData?.resourceNode?.firstResourceFile
+  return !!file && !!file.text
+})
+
+const isPdfFile = computed(() => {
+  const file = props.resourceData?.resourceNode?.firstResourceFile
+
+  if (!file || !file.mimeType) {
+    return false
+  }
+
+  const mime = String(file.mimeType).split(";")[0].trim().toLowerCase()
+
+  return mime === "application/pdf"
+})
 </script>

assets/vue/components/documents/ResourceIcon.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, watch, onMounted } from "vue"
+import { computed, onMounted, ref, watch } from "vue"
 import { useRoute } from "vue-router"
 import Draggable from "vuedraggable"
 import LpCardItem from "./LpCardItem.vue"
@@ -20,6 +20,7 @@ const props = defineProps({
   ringDash: { type: Function, required: true },
   ringValue: { type: Function, required: true },
   buildDates: { type: Function, required: false },
+  isSessionCategory: { type: Boolean, default: false },
 })
 const emit = defineEmits([
   "open",
@@ -117,22 +118,22 @@ const toggleOpen = () => {
   <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
+        class="pointer-events-none absolute inset-y-0 -left-1.5 w-1.5 bg-support-5 rounded-l-2xl"
       />
       <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')"
+            class="w-8 h-8 grid place-content-center rounded-lg text-gray-50 hover:bg-gray-15 hover:text-gray-90"
           >
             <svg
-              width="14"
+              aria-hidden
+              fill="currentColor"
               height="14"
               viewBox="0 0 14 14"
-              fill="currentColor"
-              aria-hidden
+              width="14"
             >
               <circle
                 cx="4"
@@ -169,12 +170,21 @@ const toggleOpen = () => {
         </template>
         <template v-else>
           <span
-            class="inline-block w-8 h-8"
             aria-hidden
+            class="inline-block w-8 h-8"
           ></span>
         </template>
 
-        <h2 class="text-body-1 font-semibold text-gray-90">{{ displayTitle }}</h2>
+        <h2 class="text-body-1 font-semibold text-gray-90">
+          <span>{{ displayTitle }}</span>
+          <!-- Display the star if it's a session category; remove the check on category.type -->
+          <span
+            v-if="isSessionCategory"
+            class="ml-2 text-warning"
+            title="Category created for a session"
+            >★</span
+          >
+        </h2>
       </div>
 
       <div class="flex items-center gap-2">
@@ -187,13 +197,13 @@ const toggleOpen = () => {
         >
           <template #button>
             <span
-              class="list-none w-8 h-8 grid place-content-center rounded-lg border border-gray-25 hover:bg-gray-15 cursor-pointer"
-              :title="t('Options')"
               :aria-label="t('Options')"
+              :title="t('Options')"
+              class="list-none w-8 h-8 grid place-content-center rounded-lg border border-gray-25 hover:bg-gray-15 cursor-pointer"
             >
               <i
-                class="mdi mdi-dots-vertical text-lg"
                 aria-hidden
+                class="mdi mdi-dots-vertical text-lg"
               ></i>
             </span>
           </template>
@@ -239,26 +249,26 @@ const toggleOpen = () => {
 
         <button
           v-if="localList.length"
-          :aria-expanded="isOpen ? 'true' : 'false'"
           :aria-controls="panelId"
-          class="w-8 h-8 grid place-content-center rounded-lg border border-gray-25 hover:bg-gray-15 transition"
+          :aria-expanded="isOpen ? 'true' : 'false'"
           :title="t('Expand') / t('Collapse')"
+          class="w-8 h-8 grid place-content-center rounded-lg border border-gray-25 hover:bg-gray-15 transition"
           @click="toggleOpen"
         >
           <svg
-            width="18"
-            height="18"
-            viewBox="0 0 24 24"
+            :class="isOpen ? 'rotate-180' : ''"
+            class="transition-transform duration-200"
             fill="none"
+            height="18"
             stroke="currentColor"
-            class="transition-transform duration-200"
-            :class="isOpen ? 'rotate-180' : ''"
+            viewBox="0 0 24 24"
+            width="18"
           >
             <path
               d="M6 9l6 6 6-6"
-              stroke-width="2"
               stroke-linecap="round"
               stroke-linejoin="round"
+              stroke-width="2"
             />
           </svg>
         </button>
@@ -272,41 +282,41 @@ const toggleOpen = () => {
     >
       <Draggable
         v-model="localList"
-        item-key="iid"
-        :disabled="!canEdit"
-        handle=".drag-handle2"
         :animation="180"
-        tag="div"
-        class="grid gap-4 lg:grid-cols-2 xl:grid-cols-3 mt-5"
-        ghost-class="ghosting"
+        :disabled="!canEdit"
+        :empty-insert-threshold="10"
+        :fallback-on-body="true"
+        :force-fallback="true"
+        :prevent-on-filter="true"
         chosen-class="chosen"
+        class="grid gap-4 lg:grid-cols-2 xl:grid-cols-3 mt-5"
         drag-class="dragging"
-        :prevent-on-filter="true"
-        :force-fallback="true"
-        :fallback-on-body="true"
-        :empty-insert-threshold="10"
-        @start="dragging = true"
+        ghost-class="ghosting"
+        handle=".drag-handle"
+        item-key="iid"
+        tag="div"
         @end="onEndCat"
+        @start="dragging = true"
       >
         <template #item="{ element }">
           <LpCardItem
-            :lp="element"
+            :buildDates="buildDates"
+            :canAutoLaunch="canAutoLaunch"
             :canEdit="canEdit"
+            :canExportPdf="canExportPdf"
+            :canExportScorm="canExportScorm"
+            :lp="element"
             :ringDash="ringDash"
             :ringValue="ringValue"
-            :canExportScorm="canExportScorm"
-            :canExportPdf="canExportPdf"
-            :canAutoLaunch="canAutoLaunch"
-            :buildDates="buildDates"
-            @toggle-auto-launch="$emit('toggle-auto-launch', element)"
-            @open="$emit('open', element)"
+            @build="$emit('build', element)"
+            @delete="$emit('delete', element)"
             @edit="$emit('edit', element)"
+            @open="$emit('open', element)"
             @report="$emit('report', element)"
             @settings="$emit('settings', element)"
-            @build="$emit('build', element)"
+            @toggle-auto-launch="$emit('toggle-auto-launch', 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)"
           />