fix date formats

pkp · Jan 21, 2025 · 0f28282 · 0f28282
1 parent b007e2e
commit 0f28282
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/pages/acceptInvitation/AcceptInvitationUserRoles.vue b/src/pages/acceptInvitation/AcceptInvitationUserRoles.vue
@@ -14,8 +14,10 @@
 				<TableCell :is-row-header="true">
 					{{ row.userGroupName }}
 				</TableCell>
-				<TableCell>{{ row.dateStart }}</TableCell>
-				<TableCell>{{ row.dateEnd ? row.dateEnd : '---' }}</TableCell>
+				<TableCell>{{ formatShortDate(row.dateStart) }}</TableCell>
+				<TableCell>
+					{{ row.dateEnd ? formatShortDate(row.dateEnd) : '---' }}
+				</TableCell>
 				<TableCell>
 					{{
 						row.masthead
@@ -38,9 +40,11 @@ import TableColumn from '@/components/Table/TableColumn.vue';
 import TableBody from '@/components/Table/TableBody.vue';
 import TableRow from '@/components/Table/TableRow.vue';
 import {defineProps} from 'vue';
+import {useDate} from '@/composables/useDate';
 
 defineProps({
 	userGroupsToAdd: {type: Array, required: true},
 });
 const {t} = useLocalize();
+const {formatShortDate} = useDate();
 </script>
diff --git a/src/pages/userInvitation/UserInvitationUserGroupsTable.vue b/src/pages/userInvitation/UserInvitationUserGroupsTable.vue
@@ -19,13 +19,25 @@
 					{{ currentUserGroup.name }}
 				</TableCell>
 				<TableCell>
-					{{ currentUserGroup.dateStart ? currentUserGroup.dateStart : '---' }}
+					{{
+						currentUserGroup.dateStart
+							? formatShortDate(currentUserGroup.dateStart)
+							: '---'
+					}}
 				</TableCell>
 				<TableCell>
-					{{ currentUserGroup.dateEnd ? currentUserGroup.dateEnd : '---' }}
+					{{
+						currentUserGroup.dateEnd
+							? formatShortDate(currentUserGroup.dateEnd)
+							: '---'
+					}}
 				</TableCell>
 				<TableCell>
-					{{ currentUserGroup.masthead ? currentUserGroup.masthead : '---' }}
+					{{
+						currentUserGroup.masthead
+							? t('invitation.masthead.show')
+							: t('invitation.masthead.hidden')
+					}}
 				</TableCell>
 				<TableCell v-if="!currentUserGroup.dateEnd">
 					<PkpButton