Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEATURE] Pix Table sur Pix Admin épisode 9 : Utilisateurs (PIX-17141). #11782

Merged
merged 6 commits into from
Mar 24, 2025
Merged

[FEATURE] Pix Table sur Pix Admin épisode 9 : Utilisateurs (PIX-17141). #11782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7af56ac
✨ admin: pix table on users list
AndreiaPena Mar 20, 2025
3346afb
✨ admin: pix table on organization learners list
AndreiaPena Mar 20, 2025
e9a4154
✨ admin: pix table on profiles list
AndreiaPena Mar 20, 2025
d0bd145
✨ admin: pix table on campaign participations list
AndreiaPena Mar 21, 2025
9f2b844
✨ admin: pix table on orga memberships list
AndreiaPena Mar 21, 2025
6e1911c
✨ admin: pix table on certif memberships list
AndreiaPena Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 93 additions & 57 deletions admin/app/components/users/campaign-participations.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import PixButton from '@1024pix/pix-ui/components/pix-button';
import PixTable from '@1024pix/pix-ui/components/pix-table';
import PixTableColumn from '@1024pix/pix-ui/components/pix-table-column';
import { fn } from '@ember/helper';
import { action } from '@ember/object';
import { LinkTo } from '@ember/routing';
import { service } from '@ember/service';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import dayjsFormat from 'ember-dayjs/helpers/dayjs-format';
import { t } from 'ember-intl';

import ConfirmPopup from '../confirm-popup';

Expand Down Expand Up @@ -38,69 +41,102 @@ export default class CampaignParticipation extends Component {
Attention toute modification sur une participation nécessite un accord écrit du prescripteur et du prescrit.
</p>

<div class="content-text content-text--small">
<table class="table-admin">
<thead>
<tr>
<th>Prescrit</th>
<th>Campagne</th>
<th>Identifiant externe</th>
<th>Date de début</th>
<th>Statut</th>
<th>Date d'envoi</th>
<th>Supprimé le</th>
{{#if this.accessControl.hasAccessToUsersActionsScope}}
<th>Actions</th>
{{/if}}
</tr>
</thead>
<tbody>
{{#each @participations as |participation|}}
<tr aria-label="Participation">
<td>{{participation.organizationLearnerFullName}}</td>
<td>
<LinkTo @route="authenticated.campaigns.campaign" @model={{participation.campaignId}}>
{{participation.campaignCode}}
</LinkTo>
</td>
{{#if @participations}}
<PixTable
@variant="primary"
@data={{@participations}}
@caption={{t "components.users.campaign-participations.table.caption"}}
>
<:columns as |participation context|>
<PixTableColumn @context={{context}} class="break-word">
<:header>
Prescrit
</:header>
<:cell>
{{participation.organizationLearnerFullName}}
</:cell>
</PixTableColumn>
<PixTableColumn @context={{context}} class="break-word">
<:header>
Campagne
</:header>
<:cell>
<LinkTo @route="authenticated.campaigns.campaign" @model={{participation.campaignId}}>
{{participation.campaignCode}}
</LinkTo>
</:cell>
</PixTableColumn>
<PixTableColumn @context={{context}} class="break-word">
<:header>
Identifiant externe
</:header>
<:cell>
{{#if participation.participantExternalId}}
<td>{{participation.participantExternalId}}</td>
{{participation.participantExternalId}}
{{else}}
<td>-</td>
-
{{/if}}
<td>{{dayjsFormat participation.createdAt "DD/MM/YYYY"}}</td>
<td>{{participation.displayedStatus}}</td>
<td>
{{if participation.sharedAt (dayjsFormat participation.sharedAt "DD/MM/YYYY") "-"}}
</td>
</:cell>
</PixTableColumn>
<PixTableColumn @context={{context}}>
<:header>
Date de début
</:header>
<:cell>
{{dayjsFormat participation.createdAt "DD/MM/YYYY"}}
</:cell>
</PixTableColumn>
<PixTableColumn @context={{context}}>
<:header>
Statut
</:header>
<:cell>
{{participation.displayedStatus}}
</:cell>
</PixTableColumn>
<PixTableColumn @context={{context}}>
<:header>
Date d'envoi
</:header>
<:cell>
{{if participation.sharedAt (dayjsFormat participation.sharedAt "DD/MM/YYYY") "-"}}
</:cell>
</PixTableColumn>
<PixTableColumn @context={{context}}>
<:header>
Supprimé le
</:header>
<:cell>
{{#if participation.deletedAt}}
<td>
{{dayjsFormat participation.deletedAt "DD/MM/YYYY"}}
</td>
{{dayjsFormat participation.deletedAt "DD/MM/YYYY"}}
{{else}}
<td>-</td>
-
{{/if}}
{{#if this.accessControl.hasAccessToUsersActionsScope}}
<td>
{{#unless participation.deletedAt}}
<PixButton
@triggerAction={{fn this.toggleDisplayRemoveParticipationModal participation}}
@size="small"
@variant="error"
>
Supprimer
</PixButton>
{{/unless}}
</td>
{{/if}}
</tr>
{{/each}}
</tbody>
</table>
{{#unless @participations}}
<div class="table__empty">Aucune participation</div>
{{/unless}}
</div>
</:cell>
</PixTableColumn>
{{#if this.accessControl.hasAccessToUsersActionsScope}}
<PixTableColumn @context={{context}}>
<:header>
Actions
</:header>
<:cell>
{{#unless participation.deletedAt}}
<PixButton
@triggerAction={{fn this.toggleDisplayRemoveParticipationModal participation}}
@size="small"
@variant="error"
>
Supprimer
</PixButton>
{{/unless}}
</:cell>
</PixTableColumn>
{{/if}}
</:columns>
</PixTable>
{{else}}
<div class="table__empty">Aucune participation</div>
{{/if}}

<ConfirmPopup
@message="Vous êtes sur le point de supprimer la ou les participation(s) de {{this.participationToDelete.organizationLearnerFullName}} (y compris celles améliorées), celle-ci ne sera plus visible ni comprise dans les statistiques de la campagne de Pix Orga. Le participant pourra terminer son parcours mais ne pourra plus envoyer ses résultats. Il ne pourra pas non plus participer de nouveau à cette campagne."
Expand Down
69 changes: 55 additions & 14 deletions admin/app/components/users/certification-centers/membership-item.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import PixTableColumn from '@1024pix/pix-ui/components/pix-table-column';
import { fn } from '@ember/helper';
import { action } from '@ember/object';
import { LinkTo } from '@ember/routing';
import { service } from '@ember/service';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { t } from 'ember-intl';

import MembershipItemActions from './membership-item-actions';
import MembershipItemRole from './membership-item-role';
Expand Down Expand Up @@ -41,31 +43,70 @@ export default class UsersCertificationCentersMembershipItemComponent extends Co
}

<template>
<tr
aria-label="Informations du Centre de certification {{@certificationCenterMembership.certificationCenter.name}}"
>
<td>{{@certificationCenterMembership.id}}</td>
<td class="table__column table__column--id">
<PixTableColumn @context={{@context}}>
<:header>
{{t "components.users.certification-centers.memberships.table-headers.member-id"}}
</:header>
<:cell>
{{@certificationCenterMembership.id}}
</:cell>
</PixTableColumn>
<PixTableColumn @context={{@context}}>
<:header>
{{t "components.users.certification-centers.memberships.table-headers.center-id"}}
</:header>
<:cell>
<LinkTo
@route="authenticated.certification-centers.get"
@model={{@certificationCenterMembership.certificationCenter.id}}
>
{{@certificationCenterMembership.certificationCenter.id}}
</LinkTo>
</td>
<td>{{@certificationCenterMembership.certificationCenter.name}}</td>
<td>{{@certificationCenterMembership.certificationCenter.type}}</td>
<td>{{@certificationCenterMembership.certificationCenter.externalId}}</td>
<td>
</:cell>
</PixTableColumn>
<PixTableColumn @context={{@context}} class="break-word">
<:header>
{{t "components.users.certification-centers.memberships.table-headers.center-name"}}
</:header>
<:cell>
{{@certificationCenterMembership.certificationCenter.name}}
</:cell>
</PixTableColumn>
<PixTableColumn @context={{@context}}>
<:header>
{{t "components.users.certification-centers.memberships.table-headers.center-type"}}
</:header>
<:cell>
{{@certificationCenterMembership.certificationCenter.type}}
</:cell>
</PixTableColumn>
<PixTableColumn @context={{@context}} class="break-word">
<:header>
{{t "components.users.certification-centers.memberships.table-headers.center-external-id"}}
</:header>
<:cell>
{{@certificationCenterMembership.certificationCenter.externalId}}
</:cell>
</PixTableColumn>
<PixTableColumn @context={{@context}}>
<:header>
{{t "components.users.certification-centers.memberships.table-headers.role-label"}}
</:header>
<:cell>
<MembershipItemRole
@isEditionMode={{this.isEditionMode}}
@certificationCenterRoles={{this.certificationCenterRoles}}
@role={{@certificationCenterMembership.role}}
@roleLabelKey={{@certificationCenterMembership.roleLabelKey}}
@onRoleSelected={{this.onRoleSelected}}
/>
</td>
<td>
</:cell>
</PixTableColumn>
<PixTableColumn @context={{@context}}>
<:header>
{{t "components.users.certification-centers.memberships.table-headers.actions-label"}}
</:header>
<:cell>
<MembershipItemActions
@isEditionMode={{this.isEditionMode}}
@onDeactivateMembershipButtonClicked={{fn
Expand All @@ -76,7 +117,7 @@ export default class UsersCertificationCentersMembershipItemComponent extends Co
@onSaveRoleButtonClicked={{this.saveMembershipRole}}
@onCancelButtonClicked={{this.cancelMembershipRoleEditing}}
/>
</td>
</tr>
</:cell>
</PixTableColumn>
</template>
}
53 changes: 19 additions & 34 deletions admin/app/components/users/certification-centers/memberships.gjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import PixTable from '@1024pix/pix-ui/components/pix-table';
import Component from '@glimmer/component';
import { t } from 'ember-intl';

Expand All @@ -12,40 +13,24 @@ export default class Memberships extends Component {
<header class="page-section__header">
<h2 class="page-section__title">{{t "components.users.certification-centers.memberships.section-title"}}</h2>
</header>
<div class="content-text content-text--small">
<div class="table-admin">
<table>
<thead>
<tr>
<th class="table__column table__column--id">{{t
"components.users.certification-centers.memberships.table-headers.member-id"
}}</th>
<th>{{t "components.users.certification-centers.memberships.table-headers.center-id"}}</th>
<th>{{t "components.users.certification-centers.memberships.table-headers.center-name"}}</th>
<th>{{t "components.users.certification-centers.memberships.table-headers.center-type"}}</th>
<th>{{t "components.users.certification-centers.memberships.table-headers.center-external-id"}}</th>
<th>{{t "components.users.certification-centers.memberships.table-headers.role-label"}}</th>
<th>{{t "components.users.certification-centers.memberships.table-headers.actions-label"}}</th>
</tr>
</thead>

{{#if this.orderedCertificationCenterMemberships}}
<tbody>
{{#each this.orderedCertificationCenterMemberships as |certificationCenterMembership|}}
<MembershipItem
@certificationCenterMembership={{certificationCenterMembership}}
@onCertificationCenterMembershipRoleChange={{@onCertificationCenterMembershipRoleChange}}
@disableCertificationCenterMembership={{@disableCertificationCenterMembership}}
/>
{{/each}}
</tbody>
{{/if}}
</table>

</div>
{{#unless this.orderedCertificationCenterMemberships}}
<div class="table__empty">{{t "components.users.certification-centers.memberships.empty-table"}}</div>
{{/unless}}
</div>
{{#if this.orderedCertificationCenterMemberships}}
<PixTable
@variant="primary"
@data={{this.orderedCertificationCenterMemberships}}
@caption={{t "components.users.certification-centers.memberships.caption"}}
>
<:columns as |certificationCenterMembership context|>
<MembershipItem
@certificationCenterMembership={{certificationCenterMembership}}
@context={{context}}
@onCertificationCenterMembershipRoleChange={{@onCertificationCenterMembershipRoleChange}}
@disableCertificationCenterMembership={{@disableCertificationCenterMembership}}
/>
</:columns>
</PixTable>
{{else}}
<div class="table__empty">{{t "components.users.certification-centers.memberships.empty-table"}}</div>
{{/if}}
</template>
}
Loading