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

Author: AngelFQC

assets/vue/components/assignments/AssignmentsForm.vue

@@ -157,7 +157,7 @@ import BaseTinyEditor from "../basecomponents/BaseTinyEditor.vue"
 import ResourceLanguageSelector from "../resources/ResourceLanguageSelector.vue"
 import useVuelidate from "@vuelidate/core"
 import { computed, reactive, ref, watchEffect } from "vue"
-import { maxValue, minValue, required } from "@vuelidate/validators"
+import { helpers, required } from "@vuelidate/validators"
 import { useI18n } from "vue-i18n"
 import { useRoute } from "vue-router"
 import { RESOURCE_LINK_PUBLISHED } from "../../constants/entity/resourcelink"
@@ -301,6 +301,26 @@ watchEffect(() => {
   }
 })
 
+function truncateToMinute(date) {
+  const d = new Date(date)
+  d.setSeconds(0, 0)
+  return d
+}
+
+function maxDateByMinute(max) {
+  return helpers.withMessage(
+    t("Expiration date must be before or equal to end date"),
+    (value) => !value || !max || +truncateToMinute(value) <= +truncateToMinute(max),
+  )
+}
+
+function minDateByMinute(min) {
+  return helpers.withMessage(
+    t("End date must be after or equal to expiration date"),
+    (value) => !value || !min || +truncateToMinute(value) >= +truncateToMinute(min),
+  )
+}
+
 const rules = computed(() => {
   const r = { title: { required, $autoDirty: true } }
   if (showAdvancedSettings.value) {
@@ -310,11 +330,11 @@ const rules = computed(() => {
     }
     if (chkExpiresOn.value) {
       r.expiresOn = { required, $autoDirty: true }
-      if (chkEndsOn.value) r.expiresOn.maxValue = maxValue(assignment.endsOn)
+      if (chkEndsOn.value) r.expiresOn.maxValue = maxDateByMinute(assignment.endsOn)
     }
     if (chkEndsOn.value) {
       r.endsOn = { required, $autoDirty: true }
-      if (chkExpiresOn.value) r.endsOn.minValue = minValue(assignment.expiresOn)
+      if (chkExpiresOn.value) r.endsOn.minValue = minDateByMinute(assignment.expiresOn)
     }
     r.allowTextAssignment = { required }
   }

src/CoreBundle/Controller/Admin/SessionListController.php

@@ -73,6 +73,26 @@ public function __construct(
         private readonly SettingsManager $settingsManager,
     ) {}
 
+    private function resolvePlatformTimezone(): DateTimeZone
+    {
+        $tz = (string) ($this->settingsManager->getSetting('platform.timezone', false, 'timezones') ?? '');
+
+        try {
+            return new DateTimeZone('' !== $tz ? $tz : 'UTC');
+        } catch (\Throwable) {
+            return new DateTimeZone('UTC');
+        }
+    }
+
+    private function formatSessionDate(?DateTime $date, DateTimeZone $tz): ?string
+    {
+        if (null === $date) {
+            return null;
+        }
+
+        return (clone $date)->setTimezone($tz)->format('Y-m-d H:i');
+    }
+
     #[Route('', name: 'admin_session_list_data', methods: ['GET'])]
     public function list(Request $request): JsonResponse
     {
@@ -180,14 +200,16 @@ public function list(Request $request): JsonResponse
             $tutorsMap = $this->getTutorsBySessionIds($sessionIds);
         }
 
+        $tz = $this->resolvePlatformTimezone();
+
         $items = [];
         foreach ($rows as $row) {
             $item = [
                 'id' => $row['id'],
                 'title' => $row['title'],
                 'categoryName' => $row['categoryName'] ?? '',
-                'displayStartDate' => $row['displayStartDate'] ? $row['displayStartDate']->format('Y-m-d H:i') : null,
-                'displayEndDate' => $row['displayEndDate'] ? $row['displayEndDate']->format('Y-m-d H:i') : null,
+                'displayStartDate' => $this->formatSessionDate($row['displayStartDate'], $tz),
+                'displayEndDate' => $this->formatSessionDate($row['displayEndDate'], $tz),
                 'visibility' => $row['visibility'],
                 'visibilityLabel' => self::VISIBILITY_LABELS[$row['visibility']] ?? 'Unknown',
                 'status' => $row['status'],
@@ -492,14 +514,16 @@ private function enrichWithChildSessions(array $items, bool $showCountUsers): ar
             $childTutorsMap = $this->getTutorsBySessionIds($childIds);
         }
 
+        $tz = $this->resolvePlatformTimezone();
+
         $childMap = [];
         foreach ($children as $child) {
             $childItem = [
                 'id' => $child['id'],
                 'title' => '-- '.$child['title'],
                 'categoryName' => $child['categoryName'] ?? '',
-                'displayStartDate' => $child['displayStartDate'] ? $child['displayStartDate']->format('Y-m-d H:i') : null,
-                'displayEndDate' => $child['displayEndDate'] ? $child['displayEndDate']->format('Y-m-d H:i') : null,
+                'displayStartDate' => $this->formatSessionDate($child['displayStartDate'], $tz),
+                'displayEndDate' => $this->formatSessionDate($child['displayEndDate'], $tz),
                 'visibility' => $child['visibility'],
                 'visibilityLabel' => self::VISIBILITY_LABELS[$child['visibility']] ?? 'Unknown',
                 'status' => $child['status'],

src/CourseBundle/Entity/CQuizQuestion.php

@@ -389,7 +389,12 @@ public function getResourceIdentifier(): int|Uuid
 
     public function getResourceName(): string
     {
-        return $this->getQuestion();
+        $question = $this->getQuestion();
+        if ('' !== $question) {
+            return $question;
+        }
+
+        return 'question-'.($this->iid ?? 'unknown');
     }
 
     public function setResourceName(string $name): self