Merge remote-tracking branch 'upstream/master' into ras-22644

Author: christianbeeznest

assets/css/app.scss

@@ -820,6 +820,11 @@ form .field {
   }
 }
 
+img.course-tool__icon {
+  @apply w-full h-full shadow object-cover;
+  border-radius: 0.5rem;
+}
+
 .row {
   @apply flex flex-wrap -mx-4;
 }

assets/vue/components/basecomponents/BaseTinyEditor.vue

@@ -214,14 +214,15 @@ const editorConfig = computed(() => ({
   ...defaultEditorConfig,
   ...props.editorConfig,
   file_picker_callback: filePickerCallback,
+  setup(editor) {
+    editor.on("GetContent", (e) => {
+      if (!e.content.includes("tiny-content")) {
+        e.content = `<div class="tiny-content">${e.content}</div>`
+      }
+    })
+  },
 }))
 
-watch(modelValue, (newValue) => {
-  if (newValue && !newValue.includes("tiny-content")) {
-    modelValue.value = `<div class="tiny-content">${newValue}</div>`
-  }
-})
-
 async function filePickerCallback(callback, value, meta) {
   let url = getUrlForTinyEditor()
   if ("image" === meta.filetype) {

assets/vue/components/links/LinkForm.vue

@@ -48,13 +48,10 @@
       v-if="formData.showOnHomepage"
       class="mt-4 space-y-4"
     >
-      <div
-        v-if="formData.customImageUrl"
-        class="mb-2"
-      >
+      <div v-if="currentPreviewImage">
         <p class="text-gray-600 font-semibold">{{ t("Current icon") }}</p>
         <img
-          :src="formData.customImageUrl"
+          :src="currentPreviewImage"
           alt="Custom Image"
           class="w-24 h-24 object-cover rounded-xl border shadow"
         />
@@ -75,6 +72,7 @@
           proudlyDisplayPoweredByUppy: false,
           height: 350,
           hideUploadButton: true,
+          autoOpenFileEditor: true,
           note: t('Click the image to crop it (1:1 ratio, 120x120 px recommended).'),
         }"
       />
@@ -109,7 +107,7 @@ import { RESOURCE_LINK_PUBLISHED } from "../../constants/entity/resourcelink"
 import linkService from "../../services/linkService"
 import { useRoute, useRouter } from "vue-router"
 import { useI18n } from "vue-i18n"
-import { onMounted, reactive, ref } from "vue"
+import { computed, onMounted, reactive, ref, watch } from "vue"
 import { useCidReq } from "../../composables/cidReq"
 import BaseButton from "../basecomponents/BaseButton.vue"
 import { required, url } from "@vuelidate/validators"
@@ -133,7 +131,22 @@ const { cid, sid } = useCidReq()
 const router = useRouter()
 const route = useRoute()
 const selectedFile = ref(null)
-const uppy = new Uppy({ restrictions: { maxNumberOfFiles: 1, allowedFileTypes: ["image/*"] } })
+const objectUrl = ref(null)
+
+const currentPreviewImage = computed(() => {
+  if (selectedFile.value) {
+    if (objectUrl.value) window.URL.revokeObjectURL(objectUrl.value)
+    objectUrl.value = window.URL.createObjectURL(selectedFile.value)
+    return objectUrl.value
+  }
+  return formData.customImageUrl
+})
+
+const uppy = new Uppy({
+  restrictions: { maxNumberOfFiles: 1, allowedFileTypes: ["image/*"] },
+  autoProceed: false,
+  debug: false,
+})
   .use(ImageEditor, {
     actions: {
       revert: true,
@@ -142,18 +155,34 @@ const uppy = new Uppy({ restrictions: { maxNumberOfFiles: 1, allowedFileTypes: [
       zoomIn: true,
       zoomOut: true,
     },
+    quality: 1,
+    cropperOptions: {
+      aspectRatio: 1,
+      croppedCanvasOptions: {
+        width: 120,
+        height: 120,
+        imageSmoothingEnabled: true,
+        imageSmoothingQuality: "high",
+      },
+    },
   })
   .on("file-added", async (file) => {
-    selectedFile.value = file.data
     formData.removeImage = false
 
-    const imageEditor = uppy.getPlugin("ImageEditor")
-    if (imageEditor) {
-      await imageEditor.openEditor(file.id)
+    const editor = uppy.getPlugin("ImageEditor")
+    if (editor?.openEditor) await editor.openEditor(file.id)
+  })
+  .on("file-editor:complete", (updatedFile) => {
+    if (updatedFile?.data) {
+      const uniqueName = `customicon-${Date.now()}.png`
+      selectedFile.value = new File([updatedFile.data], uniqueName, {
+        type: updatedFile.type || "image/png",
+      })
     }
   })
   .on("file-removed", () => {
     selectedFile.value = null
+    formData.removeImage = true
   })
 
 const props = defineProps({
@@ -171,7 +200,7 @@ const resourceLinkList = ref(
     {
       sid,
       cid,
-      visibility: RESOURCE_LINK_PUBLISHED, // visible by default
+      visibility: RESOURCE_LINK_PUBLISHED,
     },
   ]),
 )
@@ -198,6 +227,13 @@ const rules = {
 }
 const v$ = useVuelidate(rules, formData)
 
+watch(selectedFile, (file, oldFile) => {
+  if (!file && objectUrl.value) {
+    window.URL.revokeObjectURL(objectUrl.value)
+    objectUrl.value = null
+  }
+})
+
 onMounted(() => {
   fetchCategories()
   fetchLink()
@@ -279,15 +315,7 @@ const submitForm = async () => {
       formDataImage.append("removeImage", formData.removeImage ? "true" : "false")
 
       if (selectedFile.value) {
-        let fileToUpload = selectedFile.value
-
-        if (!(fileToUpload instanceof File)) {
-          fileToUpload = new File([fileToUpload], "custom-icon.png", {
-            type: fileToUpload.type || "image/png",
-          })
-        }
-
-        formDataImage.append("customImage", fileToUpload)
+        formDataImage.append("customImage", selectedFile.value)
       }
 
       await linkService.uploadImage(linkId, formDataImage)

assets/vue/components/social/SocialWallPost.vue

@@ -13,7 +13,7 @@
         />
 
         <div class="flex flex-col">
-          <div v-if="null === post.userReceiver || post.sender['@id'] === post.userReceiver['@id']">
+          <div v-if="!post.userReceiver || post.sender['@id'] === post.userReceiver?.['@id']">
             <BaseAppLink :to="{ name: 'SocialWall', query: { id: post.sender['@id'] } }">
               {{ post.sender.fullName }}
             </BaseAppLink>

assets/vue/composables/formatDate.js

@@ -1,13 +1,29 @@
 import { DateTime } from "luxon"
 import { useLocale } from "./locale"
+import { usePlatformConfig } from "../store/platformConfig"
+import { useSecurityStore } from "../store/securityStore"
 
 export function useFormatDate() {
   const { appParentLocale } = useLocale()
+  const platformConfigStore = usePlatformConfig()
+  const securityStore = useSecurityStore()
+
+  function getCurrentTimezone() {
+    const allowUserTimezone = platformConfigStore.getSetting("profile.use_users_timezone") === "true"
+    const userTimezone = securityStore.user?.timezone
+    const platformTimezone = platformConfigStore.getSetting("platform.timezone")
+
+    if (allowUserTimezone && userTimezone) {
+      return userTimezone
+    }
+
+    if (platformTimezone && platformTimezone !== "false") {
+      return platformTimezone
+    }
+
+    return Intl.DateTimeFormat().resolvedOptions().timeZone
+  }
 
-  /**
-   * @param {Date|string} datetime
-   * @returns {DateTime|null}
-   */
   function getDateTimeObject(datetime) {
     if (!datetime) {
       return null
@@ -16,16 +32,18 @@ export function useFormatDate() {
     let dt
 
     if (typeof datetime === "string") {
-      dt = DateTime.fromISO(datetime)
-    } else if (typeof datetime === "object") {
-      dt = DateTime.fromJSDate(datetime)
+      dt = DateTime.fromISO(datetime, { zone: "utc" })
+    } else if (datetime instanceof Date) {
+      dt = DateTime.fromJSDate(datetime, { zone: "utc" })
+    } else {
+      return null
     }
 
     if (!dt.isValid) {
       return null
     }
 
-    return dt.setLocale(appParentLocale.value)
+    return dt.setZone(getCurrentTimezone()).setLocale(appParentLocale.value)
   }
 
   const abbreviatedDatetime = (datetime) =>
@@ -34,10 +52,12 @@ export function useFormatDate() {
       month: "long",
     })
 
-  const relativeDatetime = (datetime) => getDateTimeObject(datetime)?.toRelative()
+  const relativeDatetime = (datetime) =>
+    getDateTimeObject(datetime)?.toRelative()
 
   return {
     abbreviatedDatetime,
     relativeDatetime,
+    getCurrentTimezone,
   }
 }

assets/vue/utils/dates.js

@@ -1,15 +1,30 @@
-const { DateTime } = require("luxon")
+import { DateTime } from "luxon"
+import { useFormatDate } from "../composables/formatDate"
 
-const formatDateTime = function (date) {
-  if (!date) return null
+const { getCurrentTimezone } = useFormatDate()
 
-  return DateTime(date).format("DD/MM/YYYY")
+/**
+ * Format a JS Date object to string using the current or provided timezone.
+ * @param {Date} date - JavaScript Date object
+ * @param {string} [timezone] - Optional timezone (e.g. "America/Lima")
+ * @returns {string}
+ */
+const formatDateTime = function (date, timezone) {
+  if (!date) return ""
+  const tz = timezone || getCurrentTimezone()
+  return DateTime.fromJSDate(date, { zone: "utc" }).setZone(tz).toFormat("dd/LL/yyyy HH:mm")
 }
 
-const formatDateTimeFromISO = function (dateStr) {
+/**
+ * Format an ISO string to readable string using the current or provided timezone.
+ * @param {string} dateStr - ISO date string (e.g. "2025-06-17T14:00:00Z")
+ * @param {string} [timezone] - Optional timezone
+ * @returns {string}
+ */
+const formatDateTimeFromISO = function (dateStr, timezone) {
   if (!dateStr) return ""
-
-  return DateTime.fromISO(dateStr).toFormat("dd/LL/yyyy HH:mm")
+  const tz = timezone || getCurrentTimezone()
+  return DateTime.fromISO(dateStr, { zone: "utc" }).setZone(tz).toFormat("dd/LL/yyyy HH:mm")
 }
 
 export { formatDateTime, formatDateTimeFromISO }

assets/vue/views/ccalendarevent/CCalendarEventList.vue

@@ -150,16 +150,15 @@ import { useCalendarEvent } from "../../composables/calendar/calendarEvent"
 import resourceLinkService from "../../services/resourceLinkService"
 import { useSecurityStore } from "../../store/securityStore"
 import { useCourseSettings } from "../../store/courseSettingStore"
+import { DateTime } from "luxon"
 
 const store = useStore()
 const securityStore = useSecurityStore()
 const confirm = useConfirm()
 const cidReqStore = useCidReqStore()
 
 const { course, session, group } = storeToRefs(cidReqStore)
-
-const { abbreviatedDatetime } = useFormatDate()
-
+const { abbreviatedDatetime, getCurrentTimezone } = useFormatDate()
 const { showAddButton } = useCalendarActionButtons()
 
 const { isEditableByUser, allowSubscribeToEvent, allowUnsubscribeToEvent } = useCalendarEvent()
@@ -235,13 +234,15 @@ async function getCalendarEvents({ start, end }) {
   const calendarEvents = await cCalendarEventService.findAll({ params }).then((response) => response.json())
 
   return calendarEvents["hydra:member"].map((event) => {
-    let color = event.color || "#007BFF"
+    const timezone = getCurrentTimezone()
+    const start = DateTime.fromISO(event.startDate, { zone: "utc" }).setZone(timezone)
+    const end = DateTime.fromISO(event.endDate, { zone: "utc" }).setZone(timezone)
 
     return {
       ...event,
-      start: event.startDate,
-      end: event.endDate,
-      color,
+      start: start.toString(),
+      end: end.toString(),
+      color: event.color || "#007BFF",
     }
   })
 }
@@ -257,16 +258,9 @@ const showAddEventDialog = () => {
 
   dialog.value = true
 }
-
-const goToMyStudentsSchedule = () => {
-  window.location.href = "/main/calendar/planification.php"
-}
-
-const goToSessionPanning = () => {
-  window.location.href = "/main/my_space/calendar_plan.php"
-}
-
+const timezone = getCurrentTimezone()
 const calendarOptions = ref({
+  timeZone: timezone,
   plugins: [dayGridPlugin, timeGridPlugin, interactionPlugin],
   locales: allLocales,
   locale: calendarLocale?.code ?? "en-GB",

public/main/gradebook/gradebook_display_certificate.php

@@ -335,7 +335,11 @@ function confirmation() {
             echo '<td width="50%">'.get_lang('Score').' : '.$valueCertificate['score_certificate'].'</td>';
             echo '<td width="30%">'.get_lang('Date').' : '.api_convert_and_format_date($valueCertificate['created_at']).'</td>';
             echo '<td width="20%">';
-            $url = api_get_path(WEB_PATH).'certificates/index.php?id='.$valueCertificate['id'].'&user_id='.$value['user_id'];
+            $url = '';
+            if (!empty($valueCertificate['path_certificate']) && $valueCertificate['publish']) {
+                $hash = pathinfo($valueCertificate['path_certificate'], PATHINFO_FILENAME);
+                $url = api_get_path(WEB_PATH).'certificates/'.$hash.'.html';
+            }
             $certificateUrl = Display::url(
                 get_lang('Certificate'),
                 $url,