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

Author: ywarnier

assets/css/scss/molecules/_course_tool.scss

@@ -11,14 +11,17 @@
   }
 
   &__shadow {
-    @apply absolute w-16 h-16 text-support-1;
+    @apply absolute w-16 h-16 text-primary;
+
+    padding: 1px;
+    opacity: 0.08;
   }
 
   &__icon {
     @apply text-transparent bg-clip-text bg-gradient-to-br from-primary to-primary-gradient leading-none;
 
     &.mdi {
-      font-size: 52px;
+      font-size: 44px;
     }
   }
 

assets/vue/components/admin/ColorThemePreview.vue

@@ -220,8 +220,20 @@ provide("isCustomizing", isCustomizing)
     </div>
     <div>
       <p class="mb-3 text-lg">{{ t("Some more elements") }}</p>
+
       <div class="course-tool cursor-pointer">
         <div class="course-tool__link hover:primary-gradient hover:bg-primary-gradient/10">
+          <svg
+            class="course-tool__shadow"
+            fill="none"
+            viewBox="0 0 117 105"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              class="fill-current"
+              d="M104.167 20.2899C104.167 43.3465 116.11 59.1799 116.11 70.2899C116.11 81.3999 109.723 104.733 58.6133 104.733C7.50333 104.733 0 73.3432 0 61.1232C0 3.89987 104.167 -20.5435 104.167 20.2899Z"
+            />
+          </svg>
           <span
             aria-hidden="true"
             class="course-tool__icon mdi mdi-bookshelf"

assets/vue/components/assignments/AssignmentsForm.vue

@@ -102,6 +102,30 @@
         name="allow_text_assignment"
         label=""
       />
+
+      <BaseCheckbox
+        id="require_extension"
+        v-model="chkRequireExtension"
+        :label="t('Require specific file format')"
+        name="require_extension"
+      />
+
+      <div v-if="chkRequireExtension">
+       <BaseMultiSelect
+         v-model="assignment.allowedExtensions"
+         :options="predefinedExtensions"
+         :label="t('Select allowed file formats')"
+         input-id="allowed-file-extensions"
+         />
+
+        <BaseInputText
+          v-if="assignment.allowedExtensions.includes('other')"
+          id="custom-extensions"
+          v-model="assignment.customExtensions"
+          :label="t('Custom extensions (separated by space)')"
+        />
+
+      </div>
     </BaseAdvancedSettingsButton>
 
     <div class="flex justify-end space-x-2 mt-4">
@@ -123,6 +147,7 @@ import BaseAdvancedSettingsButton from "../basecomponents/BaseAdvancedSettingsBu
 import BaseButton from "../basecomponents/BaseButton.vue"
 import BaseCheckbox from "../basecomponents/BaseCheckbox.vue"
 import BaseSelect from "../basecomponents/BaseSelect.vue"
+import BaseMultiSelect from "../basecomponents/BaseMultiSelect.vue";
 import BaseInputNumber from "../basecomponents/BaseInputNumber.vue"
 import BaseTinyEditor from "../basecomponents/BaseTinyEditor.vue"
 import useVuelidate from "@vuelidate/core"
@@ -162,6 +187,17 @@ const documentTypes = ref([
   { label: t("Allow only files"), value: 2 },
 ])
 
+const chkRequireExtension = ref(false)
+const predefinedExtensions = ref ([
+  {name: 'PDF', id: 'pdf'},
+  {name: 'DOCX', id: 'docx'},
+  {name: 'XLSX', id: 'xlsx'},
+  {name: 'ZIP', id: 'zip'},
+  {name: 'MP3', id: 'mp3'},
+  {name: 'MP4', id: 'mp4'},
+  {name: t('Other extensions'), id: 'other'},
+])
+
 const assignment = reactive({
   title: "",
   description: "",
@@ -172,6 +208,8 @@ const assignment = reactive({
   endsOn: new Date(),
   addToCalendar: false,
   allowTextAssignment: 2,
+  allowedExtensions: [],
+  customExtensions:'',
 })
 
 watchEffect(() => {
@@ -198,13 +236,41 @@ watchEffect(() => {
 
   assignment.allowTextAssignment = def.allowTextAssignment
 
+
+  if (def.extensions) {
+    const extensionsArray = def.extensions
+      .split(' ')
+      .map(ext => ext.trim())
+      .filter(ext => ext.length > 0)
+
+    if (extensionsArray.length > 0) {
+      chkRequireExtension.value = true
+
+      const predefinedIds = predefinedExtensions.value
+        .map(e => e.id)
+        .filter(id => id !== 'other')
+
+      const predefined = extensionsArray.filter(ext => predefinedIds.includes(ext))
+      const custom = extensionsArray.filter(ext => !predefinedIds.includes(ext))
+      if (assignment.allowedExtensions.length === 0) {
+      assignment.allowedExtensions = predefined
+
+      if (custom.length > 0) {
+        assignment.allowedExtensions.push('other')
+        assignment.customExtensions = custom.join(' ')
+      }
+      }
+    }
+  }
+
   if (
     def.qualification ||
     def.assignment.eventCalendarId ||
     def.weight ||
     def.assignment.expiresOn ||
     def.assignment.endsOn ||
-    def.allowTextAssignment !== undefined
+    def.allowTextAssignment !== undefined ||
+    (def.allowedExtensions)
   ) {
     showAdvancedSettings.value = true
   }
@@ -256,6 +322,26 @@ async function onSubmit() {
   if (chkEndsOn.value) {
     payload.endsOn = assignment.endsOn.toISOString()
   }
+  if (chkRequireExtension.value && assignment.allowedExtensions.length > 0) {
+    let extensions = []
+
+    assignment.allowedExtensions.forEach(ext => {
+      if (ext !== 'other') {
+        extensions.push(ext)
+      }
+    })
+    if (assignment.allowedExtensions.includes('other') && assignment.customExtensions) {
+      const customExts = assignment.customExtensions
+        .split(' ')
+        .map(ext => ext.trim().toLowerCase().replace('.', ''))
+        .filter(ext => ext.length > 0)
+      extensions.push(...customExts)
+    }
+
+    if (extensions.length > 0) {
+      payload.extensions = extensions.join(' ')  // "pdf docx rar ai"
+    }
+  }
   if (props.defaultAssignment?.["@id"]) {
     payload["@id"] = props.defaultAssignment["@id"]
   }

assets/vue/components/course/CourseCard.vue

@@ -93,6 +93,7 @@ import { useI18n } from "vue-i18n"
 import { useCourseRequirementStatus } from "../../composables/course/useCourseRequirementStatus"
 import BaseButton from "../basecomponents/BaseButton.vue"
 import CatalogueRequirementModal from "./CatalogueRequirementModal.vue"
+import { useUserSessionSubscription } from "../../composables/userPermissions"
 
 const { abbreviatedDatetime } = useFormatDate()
 
@@ -120,25 +121,66 @@ const props = defineProps({
 
 const { t } = useI18n()
 const platformConfigStore = usePlatformConfig()
+const { isCoach } = useUserSessionSubscription(props.session, props.course)
+
 const showRemainingDays = computed(
   () => platformConfigStore.getSetting("session.session_list_view_remaining_days") === "true",
 )
 
 const daysRemainingText = computed(() => {
-  if (!showRemainingDays.value || !props.session?.displayEndDate) return null
+  if (!showRemainingDays.value || !props.session?.displayEndDate) {
+    return null
+  }
 
   const endDate = new Date(props.session.displayEndDate)
-  if (isNaN(endDate)) return null
+  if (isNaN(endDate)) {
+    return null
+  }
 
   const today = new Date()
   const diff = Math.floor((endDate - today) / (1000 * 60 * 60 * 24))
 
-  if (diff > 1) return `${diff} days remaining`
-  if (diff === 1) return t("Ends tomorrow")
-  if (diff === 0) return t("Ends today")
+  if (diff > 1) {
+    return `${diff} days remaining`
+  }
+  if (diff === 1) {
+    return t("Ends tomorrow")
+  }
+  if (diff === 0) {
+    return t("Ends today")
+  }
+
   return t("Expired")
 })
 
+const sessionDurationText = computed(() => {
+  // Only show duration in days when the setting is enabled and the user is a coach
+  if (!showRemainingDays.value || !isCoach.value) {
+    return null
+  }
+
+  if (!props.session?.displayStartDate || !props.session?.displayEndDate) {
+    return null
+  }
+
+  const start = new Date(props.session.displayStartDate)
+  const end = new Date(props.session.displayEndDate)
+
+  if (isNaN(start) || isNaN(end)) {
+    return null
+  }
+
+  const msPerDay = 1000 * 60 * 60 * 24
+  const rawDiff = Math.floor((end - start) / msPerDay) + 1
+  const days = rawDiff > 0 ? rawDiff : 1
+
+  if (days === 1) {
+    return "1 day duration"
+  }
+
+  return `${days} days duration`
+})
+
 const showCourseDuration = computed(() => platformConfigStore.getSetting("course.show_course_duration") === "true")
 
 const teachers = computed(() => {
@@ -159,11 +201,23 @@ const teachers = computed(() => {
 })
 
 const sessionDisplayDate = computed(() => {
-  if (daysRemainingText.value) return daysRemainingText.value
+  // When setting is enabled, decide between duration (for coaches) and remaining days (for regular users)
+  if (sessionDurationText.value) {
+    return sessionDurationText.value
+  }
+
+  if (daysRemainingText.value) {
+    return daysRemainingText.value
+  }
 
+  // Fallback: show the original date range
   const parts = []
-  if (props.session?.displayStartDate) parts.push(abbreviatedDatetime(props.session.displayStartDate))
-  if (props.session?.displayEndDate) parts.push(abbreviatedDatetime(props.session.displayEndDate))
+  if (props.session?.displayStartDate) {
+    parts.push(abbreviatedDatetime(props.session.displayStartDate))
+  }
+  if (props.session?.displayEndDate) {
+    parts.push(abbreviatedDatetime(props.session.displayEndDate))
+  }
 
   return parts.join(" — ")
 })