Skip to content

Commit de7e810

Browse files
[FEATURE] Ne pas afficher l'heure sur les dates de dernier accès dans PIX Admin (PIX-17281)
#11935
2 parents 848e3f2 + 4b45c34 commit de7e810

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

admin/app/components/certification-centers/membership-item.gjs

+7-7
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ export default class CertificationCentersMembershipItemComponent extends Compone
7171
{{@certificationCenterMembership.user.email}}
7272
</:cell>
7373
</PixTableColumn>
74+
<PixTableColumn @context={{@context}}>
75+
<:header>Date de rattachement</:header>
76+
<:cell>
77+
{{dayjsFormat @certificationCenterMembership.createdAt "DD-MM-YYYY - HH:mm:ss"}}
78+
</:cell>
79+
</PixTableColumn>
7480
<PixTableColumn @context={{@context}}>
7581
<:header>Rôle</:header>
7682
<:cell>
@@ -86,18 +92,12 @@ export default class CertificationCentersMembershipItemComponent extends Compone
8692
<:header>Dernier accès</:header>
8793
<:cell>
8894
{{#if @certificationCenterMembership.lastAccessedAt}}
89-
{{dayjsFormat @certificationCenterMembership.lastAccessedAt "DD-MM-YYYY - HH:mm:ss"}}
95+
{{dayjsFormat @certificationCenterMembership.lastAccessedAt "DD-MM-YYYY"}}
9096
{{else}}
9197
{{t "components.certification-centers.membership-item.no-last-connection-date-info"}}
9298
{{/if}}
9399
</:cell>
94100
</PixTableColumn>
95-
<PixTableColumn @context={{@context}}>
96-
<:header>Date de rattachement</:header>
97-
<:cell>
98-
{{dayjsFormat @certificationCenterMembership.createdAt "DD-MM-YYYY - HH:mm:ss"}}
99-
</:cell>
100-
</PixTableColumn>
101101
<PixTableColumn @context={{@context}}>
102102
<:header>Actions</:header>
103103
<:cell>

admin/app/components/organizations/member-item.gjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default class MemberItem extends Component {
1313
if (!this.args.organizationMembership.lastAccessedAt) {
1414
return this.intl.t('components.organizations.member-items.no-last-connection-date-info');
1515
}
16-
return dayjs(this.args.organizationMembership.lastAccessedAt).format('DD/MM/YYYY HH:mm');
16+
return dayjs(this.args.organizationMembership.lastAccessedAt).format('DD/MM/YYYY');
1717
}
1818

1919
<template>

admin/tests/integration/components/certification-centers/membership-item-test.gjs

+2-4
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,15 @@ module('Integration | Component | certification-centers/membership-item', funct
5151
);
5252

5353
// then
54-
const expectedLastAccessDate = dayjs(certificationCenterMembership.lastAccessedAt).format(
55-
'DD-MM-YYYY - HH:mm:ss',
56-
);
54+
const expectedLastAccessedAtDate = dayjs(certificationCenterMembership.lastAccessedAt).format('DD-MM-YYYY');
5755
const expectedCreationDate = dayjs(certificationCenterMembership.createdAt).format('DD-MM-YYYY - HH:mm:ss');
5856

5957
assert.dom(screen.getByRole('link', { name: certificationCenterMembership.id })).exists();
6058
assert.dom(screen.getByRole('cell', { name: user.firstName })).exists();
6159
assert.dom(screen.getByRole('cell', { name: user.lastName })).exists();
6260
assert.dom(screen.getByRole('cell', { name: user.email })).exists();
6361
assert.dom(screen.getByRole('cell', { name: 'Membre' })).exists();
64-
assert.dom(screen.getByRole('cell', { name: expectedLastAccessDate })).exists();
62+
assert.dom(screen.getByRole('cell', { name: expectedLastAccessedAtDate })).exists();
6563
assert.dom(screen.getByRole('cell', { name: expectedCreationDate })).exists();
6664
assert.dom(screen.getByRole('button', { name: 'Modifier le rôle' })).exists();
6765
assert.dom(screen.getByRole('button', { name: 'Désactiver' })).exists();

admin/tests/integration/components/organizations/member-item-test.gjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module('Integration | Component | MemberItem', function (hooks) {
4343
assert.dom(screen.getByRole('cell', { name: 'John' })).exists();
4444
assert.dom(screen.getByRole('cell', { name: 'Doe' })).exists();
4545
assert.dom(screen.getByRole('cell', { name: 'toto@example.net' })).exists();
46-
assert.dom(screen.getByRole('cell', { name: dayjs(now).format('DD/MM/YYYY HH:mm') })).exists();
46+
assert.dom(screen.getByRole('cell', { name: dayjs(now).format('DD/MM/YYYY') })).exists();
4747
});
4848
module('if there is no last access date', function () {
4949
test('displays default last access date', async function (assert) {

0 commit comments

Comments
 (0)