feat: Permettre l'import d'enseignants via fichier CSV ou XLSX
L'établissement a besoin d'importer en masse ses enseignants depuis les exports des logiciels de vie scolaire (Pronote, EDT, etc.), comme c'est déjà possible pour les élèves. Le wizard en 4 étapes (upload → mapping → aperçu → import) réutilise l'architecture de l'import élèves tout en ajoutant la gestion des matières et des classes enseignées. Corrections de la review #2 intégrées : - La commande ImportTeachersCommand est routée en async via Messenger pour ne pas bloquer la requête HTTP sur les gros fichiers. - Le handler est protégé par un try/catch Throwable pour marquer le batch en échec si une erreur inattendue survient, évitant qu'il reste bloqué en statut "processing". - Les domain events (UtilisateurInvite) sont dispatchés sur l'event bus après chaque création d'utilisateur, déclenchant l'envoi des emails d'invitation. - L'option "mettre à jour les enseignants existants" (AC5) permet de choisir entre ignorer ou mettre à jour nom/prénom et ajouter les affectations manquantes pour les doublons détectés par email.
This commit is contained in:
@@ -81,11 +81,16 @@
|
||||
<span class="action-label">Identité visuelle</span>
|
||||
<span class="action-hint">Logo et couleurs</span>
|
||||
</a>
|
||||
<div class="action-card disabled" aria-disabled="true">
|
||||
<a class="action-card" href="/admin/import/students">
|
||||
<span class="action-icon">📤</span>
|
||||
<span class="action-label">Importer des données</span>
|
||||
<span class="action-hint">Bientôt disponible</span>
|
||||
</div>
|
||||
<span class="action-label">Importer des élèves</span>
|
||||
<span class="action-hint">CSV ou XLSX</span>
|
||||
</a>
|
||||
<a class="action-card" href="/admin/import/teachers">
|
||||
<span class="action-icon">📤</span>
|
||||
<span class="action-label">Importer des enseignants</span>
|
||||
<span class="action-hint">CSV ou XLSX</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -198,18 +203,13 @@
|
||||
transition: all 0.2s;
|
||||
}
|
||||
|
||||
.action-card:not(.disabled):hover {
|
||||
.action-card:hover {
|
||||
border-color: #3b82f6;
|
||||
background: #eff6ff;
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.action-card.disabled {
|
||||
opacity: 0.6;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.action-icon {
|
||||
font-size: 2rem;
|
||||
}
|
||||
|
||||
187
frontend/src/lib/features/import/api/teacherImport.ts
Normal file
187
frontend/src/lib/features/import/api/teacherImport.ts
Normal file
@@ -0,0 +1,187 @@
|
||||
import { getApiBaseUrl } from '$lib/api';
|
||||
import { authenticatedFetch } from '$lib/auth';
|
||||
|
||||
// === Types ===
|
||||
|
||||
export interface UploadResult {
|
||||
id: string;
|
||||
filename: string;
|
||||
totalRows: number;
|
||||
columns: string[];
|
||||
detectedFormat: string;
|
||||
suggestedMapping: Record<string, string>;
|
||||
preview: PreviewRow[];
|
||||
}
|
||||
|
||||
export interface PreviewRow {
|
||||
line: number;
|
||||
data: Record<string, string>;
|
||||
valid: boolean;
|
||||
errors: RowError[];
|
||||
}
|
||||
|
||||
export interface RowError {
|
||||
column: string;
|
||||
message: string;
|
||||
}
|
||||
|
||||
export interface MappingResult {
|
||||
id: string;
|
||||
mapping: Record<string, string>;
|
||||
totalRows: number;
|
||||
}
|
||||
|
||||
export interface PreviewResult {
|
||||
id: string;
|
||||
totalRows: number;
|
||||
validCount: number;
|
||||
errorCount: number;
|
||||
rows: PreviewRow[];
|
||||
unknownSubjects: string[];
|
||||
unknownClasses: string[];
|
||||
}
|
||||
|
||||
export interface ConfirmResult {
|
||||
id: string;
|
||||
status: string;
|
||||
message: string;
|
||||
}
|
||||
|
||||
export interface ImportStatus {
|
||||
id: string;
|
||||
status: 'pending' | 'processing' | 'completed' | 'failed';
|
||||
totalRows: number;
|
||||
importedCount: number;
|
||||
errorCount: number;
|
||||
progression: number;
|
||||
completedAt: string | null;
|
||||
}
|
||||
|
||||
export interface ImportReport {
|
||||
id: string;
|
||||
status: string;
|
||||
totalRows: number;
|
||||
importedCount: number;
|
||||
errorCount: number;
|
||||
report: string[];
|
||||
errors: { line: number; errors: RowError[] }[];
|
||||
}
|
||||
|
||||
// === API Functions ===
|
||||
|
||||
/**
|
||||
* Upload un fichier CSV ou XLSX pour l'import d'enseignants.
|
||||
*/
|
||||
export async function uploadFile(file: File): Promise<UploadResult> {
|
||||
const apiUrl = getApiBaseUrl();
|
||||
const formData = new FormData();
|
||||
formData.append('file', file);
|
||||
|
||||
const response = await authenticatedFetch(`${apiUrl}/import/teachers/upload`, {
|
||||
method: 'POST',
|
||||
body: formData
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const data = await response.json().catch(() => null);
|
||||
throw new Error(
|
||||
data?.['hydra:description'] ?? data?.message ?? data?.detail ?? "Erreur lors de l'upload"
|
||||
);
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
}
|
||||
|
||||
/**
|
||||
* Applique le mapping des colonnes.
|
||||
*/
|
||||
export async function applyMapping(
|
||||
batchId: string,
|
||||
mapping: Record<string, string>,
|
||||
format: string
|
||||
): Promise<MappingResult> {
|
||||
const apiUrl = getApiBaseUrl();
|
||||
const response = await authenticatedFetch(`${apiUrl}/import/teachers/${batchId}/mapping`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ mapping, format })
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const data = await response.json().catch(() => null);
|
||||
throw new Error(
|
||||
data?.['hydra:description'] ?? data?.message ?? data?.detail ?? 'Erreur lors du mapping'
|
||||
);
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère la preview avec validation.
|
||||
*/
|
||||
export async function fetchPreview(batchId: string): Promise<PreviewResult> {
|
||||
const apiUrl = getApiBaseUrl();
|
||||
const response = await authenticatedFetch(`${apiUrl}/import/teachers/${batchId}/preview`);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('Erreur lors de la validation');
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
}
|
||||
|
||||
/**
|
||||
* Confirme et lance l'import.
|
||||
*/
|
||||
export async function confirmImport(
|
||||
batchId: string,
|
||||
options: { createMissingSubjects: boolean; importValidOnly: boolean; updateExisting: boolean }
|
||||
): Promise<ConfirmResult> {
|
||||
const apiUrl = getApiBaseUrl();
|
||||
const response = await authenticatedFetch(`${apiUrl}/import/teachers/${batchId}/confirm`, {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(options)
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
const data = await response.json().catch(() => null);
|
||||
throw new Error(
|
||||
data?.['hydra:description'] ??
|
||||
data?.message ??
|
||||
data?.detail ??
|
||||
'Erreur lors de la confirmation'
|
||||
);
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère le statut et la progression de l'import.
|
||||
*/
|
||||
export async function fetchImportStatus(batchId: string): Promise<ImportStatus> {
|
||||
const apiUrl = getApiBaseUrl();
|
||||
const response = await authenticatedFetch(`${apiUrl}/import/teachers/${batchId}/status`);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('Erreur lors de la récupération du statut');
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère le rapport détaillé de l'import.
|
||||
*/
|
||||
export async function fetchImportReport(batchId: string): Promise<ImportReport> {
|
||||
const apiUrl = getApiBaseUrl();
|
||||
const response = await authenticatedFetch(`${apiUrl}/import/teachers/${batchId}/report`);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('Erreur lors de la récupération du rapport');
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
}
|
||||
@@ -69,6 +69,22 @@
|
||||
let createMissingClasses = $state(false);
|
||||
let importValidOnly = $state(true);
|
||||
|
||||
// Adjusted preview rows: when createMissingClasses is checked, treat class-not-found errors as resolved
|
||||
let adjustedPreviewRows = $derived.by(() => {
|
||||
if (!previewResult) return [];
|
||||
if (!createMissingClasses) return previewResult.rows;
|
||||
return previewResult.rows.map((row) => {
|
||||
if (row.valid) return row;
|
||||
const remainingErrors = row.errors.filter((e) => e.column !== 'className');
|
||||
return { ...row, valid: remainingErrors.length === 0, errors: remainingErrors };
|
||||
});
|
||||
});
|
||||
let adjustedValidCount = $derived(adjustedPreviewRows.filter((r) => r.valid).length);
|
||||
let adjustedErrorCount = $derived(adjustedPreviewRows.filter((r) => !r.valid).length);
|
||||
let duplicateCount = $derived(
|
||||
adjustedPreviewRows.filter((r) => r.errors.some((e) => e.column === '_duplicate')).length
|
||||
);
|
||||
|
||||
// === Step 4: Confirmation ===
|
||||
let isConfirming = $state(false);
|
||||
let importStatus = $state<ImportStatus | null>(null);
|
||||
@@ -395,6 +411,7 @@
|
||||
ondragover={handleDragOver}
|
||||
ondragleave={handleDragLeave}
|
||||
ondrop={handleDrop}
|
||||
onclick={() => fileInput?.click()}
|
||||
role="button"
|
||||
tabindex="0"
|
||||
aria-label="Zone de dépôt de fichier"
|
||||
@@ -596,13 +613,19 @@
|
||||
<!-- Summary -->
|
||||
<div class="preview-summary">
|
||||
<div class="summary-card valid">
|
||||
<span class="summary-number">{previewResult.validCount}</span>
|
||||
<span class="summary-number">{adjustedValidCount}</span>
|
||||
<span class="summary-label">Lignes valides</span>
|
||||
</div>
|
||||
<div class="summary-card error">
|
||||
<span class="summary-number">{previewResult.errorCount}</span>
|
||||
<span class="summary-number">{adjustedErrorCount}</span>
|
||||
<span class="summary-label">Lignes en erreur</span>
|
||||
</div>
|
||||
{#if duplicateCount > 0}
|
||||
<div class="summary-card duplicate">
|
||||
<span class="summary-number">{duplicateCount}</span>
|
||||
<span class="summary-label">Doublons détectés</span>
|
||||
</div>
|
||||
{/if}
|
||||
<div class="summary-card total">
|
||||
<span class="summary-number">{previewResult.totalRows}</span>
|
||||
<span class="summary-label">Total</span>
|
||||
@@ -611,9 +634,14 @@
|
||||
|
||||
<!-- Unknown classes -->
|
||||
{#if previewResult.unknownClasses.length > 0}
|
||||
<div class="unknown-classes">
|
||||
<h3>Classes non trouvées</h3>
|
||||
<p>Les classes suivantes n'existent pas encore dans Classeo :</p>
|
||||
<div class="unknown-classes" class:resolved={createMissingClasses}>
|
||||
{#if createMissingClasses}
|
||||
<h3>Classes qui seront créées</h3>
|
||||
<p>Les classes suivantes seront créées automatiquement lors de l'import :</p>
|
||||
{:else}
|
||||
<h3>Classes non trouvées</h3>
|
||||
<p>Les classes suivantes n'existent pas encore dans Classeo :</p>
|
||||
{/if}
|
||||
<div class="class-tags">
|
||||
{#each previewResult.unknownClasses as cls}
|
||||
<span class="class-tag">{cls}</span>
|
||||
@@ -627,11 +655,11 @@
|
||||
{/if}
|
||||
|
||||
<!-- Import options -->
|
||||
{#if previewResult.errorCount > 0}
|
||||
{#if adjustedErrorCount > 0}
|
||||
<div class="import-options">
|
||||
<label class="radio-label">
|
||||
<input type="radio" name="importMode" value={true} bind:group={importValidOnly} />
|
||||
Importer uniquement les {previewResult.validCount} lignes valides
|
||||
Importer uniquement les {adjustedValidCount} lignes valides
|
||||
</label>
|
||||
<label class="radio-label">
|
||||
<input type="radio" name="importMode" value={false} bind:group={importValidOnly} />
|
||||
@@ -656,7 +684,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{#each previewResult.rows as row}
|
||||
{#each adjustedPreviewRows as row}
|
||||
<tr class:row-valid={row.valid} class:row-error={!row.valid}>
|
||||
<td>{row.line}</td>
|
||||
<td>{row.data['lastName'] ?? ''}</td>
|
||||
@@ -698,12 +726,12 @@
|
||||
<button
|
||||
class="btn-primary"
|
||||
onclick={launchImport}
|
||||
disabled={isConfirming || (previewResult.validCount === 0 && importValidOnly)}
|
||||
disabled={isConfirming || (adjustedValidCount === 0 && importValidOnly)}
|
||||
>
|
||||
{#if isConfirming}
|
||||
Lancement...
|
||||
{:else}
|
||||
Lancer l'import ({importValidOnly ? previewResult.validCount : previewResult.totalRows} élèves)
|
||||
Lancer l'import ({importValidOnly ? adjustedValidCount : previewResult.totalRows} élèves)
|
||||
{/if}
|
||||
</button>
|
||||
</div>
|
||||
@@ -1316,6 +1344,11 @@
|
||||
border-color: #fecaca;
|
||||
}
|
||||
|
||||
.summary-card.duplicate {
|
||||
background: #fffbeb;
|
||||
border-color: #fde68a;
|
||||
}
|
||||
|
||||
.summary-card.total {
|
||||
background: #f9fafb;
|
||||
}
|
||||
@@ -1334,6 +1367,10 @@
|
||||
color: #dc2626;
|
||||
}
|
||||
|
||||
.summary-card.duplicate .summary-number {
|
||||
color: #d97706;
|
||||
}
|
||||
|
||||
.summary-label {
|
||||
font-size: 0.75rem;
|
||||
color: #6b7280;
|
||||
@@ -1390,6 +1427,11 @@
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
|
||||
.unknown-classes.resolved {
|
||||
background: #f0fdf4;
|
||||
border-color: #bbf7d0;
|
||||
}
|
||||
|
||||
.unknown-classes h3 {
|
||||
font-size: 0.9375rem;
|
||||
font-weight: 600;
|
||||
@@ -1397,12 +1439,20 @@
|
||||
margin: 0 0 0.5rem;
|
||||
}
|
||||
|
||||
.unknown-classes.resolved h3 {
|
||||
color: #166534;
|
||||
}
|
||||
|
||||
.unknown-classes p {
|
||||
font-size: 0.8125rem;
|
||||
color: #92400e;
|
||||
margin: 0 0 0.75rem;
|
||||
}
|
||||
|
||||
.unknown-classes.resolved p {
|
||||
color: #166534;
|
||||
}
|
||||
|
||||
.class-tags {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
|
||||
1729
frontend/src/routes/admin/import/teachers/+page.svelte
Normal file
1729
frontend/src/routes/admin/import/teachers/+page.svelte
Normal file
File diff suppressed because it is too large
Load Diff
@@ -515,10 +515,15 @@
|
||||
<h1>Gestion des utilisateurs</h1>
|
||||
<p class="subtitle">Invitez et gérez les utilisateurs de votre établissement</p>
|
||||
</div>
|
||||
<button class="btn-primary" onclick={openCreateModal}>
|
||||
<span class="btn-icon">+</span>
|
||||
Inviter un utilisateur
|
||||
</button>
|
||||
<div class="header-actions">
|
||||
<a href="/admin/import/teachers" class="btn-secondary">
|
||||
Importer enseignants (CSV)
|
||||
</a>
|
||||
<button class="btn-primary" onclick={openCreateModal}>
|
||||
<span class="btn-icon">+</span>
|
||||
Inviter un utilisateur
|
||||
</button>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{#if error}
|
||||
@@ -942,6 +947,13 @@
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
|
||||
.header-actions {
|
||||
display: flex;
|
||||
gap: 0.75rem;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
/* Buttons */
|
||||
.btn-primary {
|
||||
display: inline-flex;
|
||||
|
||||
Reference in New Issue
Block a user