VKT(Frontend & Backend): Order enrollements by created_at and show se…

…conds
Opetushallitus · Nov 22, 2024 · 5fffca5 · 5fffca5
1 parent 8fb722c
commit 5fffca5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/backend/vkt/src/main/java/fi/oph/vkt/model/ExamEvent.java b/backend/vkt/src/main/java/fi/oph/vkt/model/ExamEvent.java
@@ -10,6 +10,7 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
 import jakarta.persistence.Table;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -53,6 +54,7 @@ public class ExamEvent extends BaseEntity {
   private long maxParticipants;
 
   @OneToMany(mappedBy = "examEvent")
+  @OrderBy("createdAt")
   private List<Enrollment> enrollments = new ArrayList<>();
 
   @OneToMany(mappedBy = "examEvent")

diff --git a/frontend/packages/vkt/public/i18n/fi-FI/common.json b/frontend/packages/vkt/public/i18n/fi-FI/common.json
@@ -46,6 +46,7 @@
       },
       "dates": {
         "dateTimeFormat": "l [klo] HH.mm",
+        "dateTimeFormatPrecise": "l [klo] HH.mm.ss",
         "timeFormat": "[klo] HH.mm",
         "dateFormat": "l",
         "registrationOpensAt": "klo 10.00",

diff --git a/frontend/packages/vkt/public/i18n/sv-SE/common.json b/frontend/packages/vkt/public/i18n/sv-SE/common.json
@@ -46,6 +46,7 @@
       },
       "dates": {
         "dateTimeFormat": "l [kl.] HH.mm",
+        "dateTimeFormatPrecise": "l [kl.] HH.mm.ss",
         "dateFormat": "l",
         "timeFormat": "[kl.] HH.mm",
         "registrationOpensAt": "kl. 10.00",

diff --git a/frontend/packages/vkt/src/components/clerkEnrollment/listing/ClerkEnrollmentListingRow.tsx b/frontend/packages/vkt/src/components/clerkEnrollment/listing/ClerkEnrollmentListingRow.tsx
@@ -88,7 +88,9 @@ export const ClerkEnrollmentListingRow = ({
           <Text>{getSelectedPartialExamsText()}</Text>
         </TableCell>
         <TableCell>
-          <Text>{DateTimeUtils.renderDateTime(enrollment.enrollmentTime)}</Text>
+          <Text>
+            {DateTimeUtils.renderDateTimePrecise(enrollment.enrollmentTime)}
+          </Text>
         </TableCell>
         <TableCell sx={{ width: '20%' }} align="right">
           {[

diff --git a/frontend/packages/vkt/src/utils/dateTime.ts b/frontend/packages/vkt/src/utils/dateTime.ts
@@ -13,6 +13,15 @@ export class DateTimeUtils {
     );
   }
 
+  static renderDateTimePrecise(dateTime?: Dayjs) {
+    const t = translateOutsideComponent();
+
+    return DateUtils.formatOptionalDateTime(
+      dateTime,
+      t('vkt.common.dates.dateTimeFormatPrecise'),
+    );
+  }
+
   static renderOpenDateTime(dateTime?: Dayjs) {
     const t = translateOutsideComponent();