- Override ponctuel – laisser vide pour utiliser la moy.
- calculée
+ La valeur remplace la moyenne calculee. Le malus est
+ soustrait.
+
+ Val:
+
setAjustInputs((prev) => ({
...prev,
- [ue.id]: (e.target as HTMLInputElement).value,
+ [ue.id]: {
+ valeur: (e.target as HTMLInputElement).value,
+ malus: prev[ue.id]?.malus ?? "0",
+ },
}))}
/>
/20
+
+
+ Malus:
+
+
+ setAjustInputs((prev) => ({
+ ...prev,
+ [ue.id]: {
+ valeur: prev[ue.id]?.valeur ?? "",
+ malus: (e.target as HTMLInputElement).value,
+ },
+ }))}
+ />
+
{ajust && (
<>
@@ -380,14 +561,19 @@ export default function NoteRecap({ numEtud }: Props) {
class="btn btn-sm btn-secondary"
onClick={() => resetAjust(ue.id)}
>
- ✕ Réinitialiser
+ Reinitialiser
- Affiché à l'élève : {fmt(ajust.valeur)}
- {avg !== null ? ` (calculée : ${fmt(avg)})` : ""}
+ Affiche : {fmt(ajust.valeur)}
+ {ajust.malus > 0
+ ? ` - ${ajust.malus} = ${
+ fmt(ajust.valeur - ajust.malus)
+ }`
+ : ""}
+ {avg !== null ? ` (calculee : ${fmt(avg)})` : ""}
)}
diff --git a/routes/(apps)/notes/(_islands)/NotesView.tsx b/routes/(apps)/notes/(_islands)/NotesView.tsx
index fd77b87..6dcbf7e 100644
--- a/routes/(apps)/notes/(_islands)/NotesView.tsx
+++ b/routes/(apps)/notes/(_islands)/NotesView.tsx
@@ -1,6 +1,11 @@
import { useEffect, useState } from "preact/hooks";
-type Note = { numEtud: number; idModule: string; note: number };
+type Note = {
+ numEtud: number;
+ idModule: string;
+ note: number;
+ noteSession2: number | null;
+};
type UE = { id: number; nom: string };
type UEModule = {
idModule: string;
@@ -9,7 +14,12 @@ type UEModule = {
coeff: number;
};
type Module = { id: string; nom: string };
-type Ajustement = { numEtud: number; idUE: number; valeur: number };
+type Ajustement = {
+ numEtud: number;
+ idUE: number;
+ valeur: number;
+ malus: number;
+};
type Props = {
numEtud: number | null;
@@ -26,6 +36,11 @@ function avgClass(avg: number | null): string {
return avg >= 10 ? "avg-good" : "avg-warn";
}
+/** Returns the effective note (session 2 if exists, otherwise session 1). */
+function effectiveNote(n: Note): number {
+ return n.noteSession2 ?? n.note;
+}
+
export default function NotesView({ numEtud, prenom }: Props) {
const [notes, setNotes] = useState
([]);
const [ues, setUes] = useState([]);
@@ -47,8 +62,8 @@ export default function NotesView({ numEtud, prenom }: Props) {
try {
const [notesRes, uesRes, ueModRes, modRes, ajRes] = await Promise.all([
fetch(`/notes/api/notes?numEtud=${numEtud}`),
- fetch("/notes/api/ues"),
- fetch("/notes/api/ue-modules"),
+ fetch("/admin/api/ues"),
+ fetch("/admin/api/ue-modules"),
fetch("/admin/api/modules"),
fetch(`/notes/api/ajustements?numEtud=${numEtud}`),
]);
@@ -72,7 +87,6 @@ export default function NotesView({ numEtud, prenom }: Props) {
setModules(modData);
setAjustements(ajData);
- // Derive promos from UE-modules for this student's notes
const noteModuleIds = new Set(notesData.map((n: Note) => n.idModule));
const relevantPromos = [
...new Set(
@@ -99,7 +113,7 @@ export default function NotesView({ numEtud, prenom }: Props) {
Bonjour {prenom}{" "}
- — aucun dossier étudiant n'est associé à votre compte.
+ — aucun dossier etudiant n'est associe a votre compte.
);
@@ -108,7 +122,7 @@ export default function NotesView({ numEtud, prenom }: Props) {
if (loading) {
return (
-
Chargement…
+
Chargement...
Aucune note disponible pour cette période.
+ Aucune note disponible pour cette periode.
)}
{ueIds.map((ueId) => {
@@ -166,51 +178,65 @@ export default function NotesView({ numEtud, prenom }: Props) {
let weightedSum = 0;
let coveredCoeff = 0;
ueModsForUE.forEach((um) => {
- const note = noteMap[um.idModule];
- if (note !== undefined) {
- weightedSum += note * um.coeff;
+ const noteObj = noteMap[um.idModule];
+ if (noteObj) {
+ const val = effectiveNote(noteObj);
+ weightedSum += val * um.coeff;
coveredCoeff += um.coeff;
}
});
const avg = coveredCoeff > 0 ? weightedSum / coveredCoeff : null;
- const ajustement = ajMap[ueId] ?? null;
- const finalAvg = avg !== null && ajustement !== null
- ? avg + ajustement
- : avg;
+ const ajust = ajMap[ueId] ?? null;
+
+ // If ajust.valeur exists, it replaces the calculated average
+ // Then malus is subtracted
+ let finalAvg: number | null = avg;
+ if (ajust) {
+ finalAvg = ajust.valeur;
+ if (ajust.malus > 0) {
+ finalAvg = (finalAvg ?? 0) - ajust.malus;
+ }
+ }
return (
{ueModsForUE.map((um) => {
const mod = moduleMap[um.idModule];
- const note = noteMap[um.idModule] ?? null;
+ const noteObj = noteMap[um.idModule] ?? null;
+ const effective = noteObj ? effectiveNote(noteObj) : null;
+ const hasS2 = noteObj?.noteSession2 != null;
+
return (
{mod ? mod.id : um.idModule} —{" "}
{mod ? mod.nom : "Module inconnu"} (coef {um.coeff})
-
- {note !== null ? `${note}/20` : "—"}
+
+ {effective !== null ? `${effective}/20` : "—"}
+ {hasS2 && (
+
+ (S1: {noteObj!.note})
+
+ )}
);
diff --git a/routes/(apps)/notes/(_props)/props.ts b/routes/(apps)/notes/(_props)/props.ts
index 2e4dc98..38f1625 100644
--- a/routes/(apps)/notes/(_props)/props.ts
+++ b/routes/(apps)/notes/(_props)/props.ts
@@ -7,10 +7,9 @@ const properties: AppProperties = {
index: "Accueil",
notes: "Mes notes",
courses: "Consulter",
- ues: "UEs",
- import: "Import xlsx",
+ import: "Import Notes",
},
- adminOnly: ["courses", "ues", "import"],
+ adminOnly: ["courses", "import"],
studentOnly: ["notes"],
hint: "Student grading management",
};
diff --git a/routes/(apps)/notes/api/ajustements.ts b/routes/(apps)/notes/api/ajustements.ts
index 6239fb2..b40e61e 100644
--- a/routes/(apps)/notes/api/ajustements.ts
+++ b/routes/(apps)/notes/api/ajustements.ts
@@ -52,8 +52,12 @@ export const handler: Handlers
= {
}
try {
- const body: { numEtud: number; idUE: number; valeur: number } =
- await request.json();
+ const body: {
+ numEtud: number;
+ idUE: number;
+ valeur: number;
+ malus?: number;
+ } = await request.json();
if (!body.numEtud || !body.idUE || body.valeur === undefined) {
return new Response(
@@ -62,12 +66,23 @@ export const handler: Handlers = {
);
}
+ if (
+ body.malus !== undefined &&
+ (!Number.isInteger(body.malus) || body.malus < 0)
+ ) {
+ return new Response(
+ JSON.stringify({ error: "malus doit être un entier >= 0" }),
+ { status: 400, headers: { "content-type": "application/json" } },
+ );
+ }
+
const [created] = await db
.insert(ajustements)
.values({
numEtud: body.numEtud,
idUE: body.idUE,
valeur: body.valeur,
+ malus: body.malus ?? 0,
})
.returning();
diff --git a/routes/(apps)/notes/api/ajustements/[numEtud]/[idUE].ts b/routes/(apps)/notes/api/ajustements/[numEtud]/[idUE].ts
index a165f44..b527cdc 100644
--- a/routes/(apps)/notes/api/ajustements/[numEtud]/[idUE].ts
+++ b/routes/(apps)/notes/api/ajustements/[numEtud]/[idUE].ts
@@ -4,12 +4,13 @@ import { ajustements } from "$root/databases/schema.ts";
import { AuthenticatedState } from "$root/defaults/interfaces.ts";
import { and, eq } from "npm:drizzle-orm@0.45.2";
-const NOT_FOUND = new Response(
- JSON.stringify({ error: "Ajustement introuvable" }),
- { status: 404, headers: { "content-type": "application/json" } },
-);
+const NOT_FOUND = () =>
+ new Response(
+ JSON.stringify({ error: "Ajustement introuvable" }),
+ { status: 404, headers: { "content-type": "application/json" } },
+ );
-const FORBIDDEN = new Response(null, { status: 403 });
+const FORBIDDEN = () => new Response(null, { status: 403 });
export const handler: Handlers = {
// #50 GET /ajustements/{numEtud}/{idUE}
@@ -18,7 +19,7 @@ export const handler: Handlers = {
context: FreshContext,
): Promise {
if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
- return FORBIDDEN;
+ return FORBIDDEN();
}
const numEtud = Number(context.params.numEtud);
@@ -34,7 +35,7 @@ export const handler: Handlers = {
.where(and(eq(ajustements.numEtud, numEtud), eq(ajustements.idUE, idUE)))
.then((rows) => rows[0] ?? null);
- if (!ajustement) return NOT_FOUND;
+ if (!ajustement) return NOT_FOUND();
return new Response(JSON.stringify(ajustement), {
headers: { "content-type": "application/json" },
@@ -47,7 +48,7 @@ export const handler: Handlers = {
context: FreshContext,
): Promise {
if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
- return FORBIDDEN;
+ return FORBIDDEN();
}
const numEtud = Number(context.params.numEtud);
@@ -57,7 +58,7 @@ export const handler: Handlers = {
return new Response("Paramètres invalides", { status: 400 });
}
- const body: { valeur: number } = await request.json();
+ const body: { valeur: number; malus?: number } = await request.json();
if (body.valeur === undefined) {
return new Response(JSON.stringify({ error: "Champ requis: valeur" }), {
@@ -66,13 +67,28 @@ export const handler: Handlers = {
});
}
+ if (
+ body.malus !== undefined &&
+ (!Number.isInteger(body.malus) || body.malus < 0)
+ ) {
+ return new Response(
+ JSON.stringify({ error: "malus doit être un entier >= 0" }),
+ { status: 400, headers: { "content-type": "application/json" } },
+ );
+ }
+
+ const set: { valeur: number; malus?: number } = { valeur: body.valeur };
+ if (body.malus !== undefined) {
+ set.malus = body.malus;
+ }
+
const [updated] = await db
.update(ajustements)
- .set({ valeur: body.valeur })
+ .set(set)
.where(and(eq(ajustements.numEtud, numEtud), eq(ajustements.idUE, idUE)))
.returning();
- if (!updated) return NOT_FOUND;
+ if (!updated) return NOT_FOUND();
return new Response(JSON.stringify(updated), {
headers: { "content-type": "application/json" },
@@ -85,7 +101,7 @@ export const handler: Handlers = {
context: FreshContext,
): Promise {
if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
- return FORBIDDEN;
+ return FORBIDDEN();
}
const numEtud = Number(context.params.numEtud);
@@ -100,7 +116,7 @@ export const handler: Handlers = {
.where(and(eq(ajustements.numEtud, numEtud), eq(ajustements.idUE, idUE)))
.returning();
- if (!deleted) return NOT_FOUND;
+ if (!deleted) return NOT_FOUND();
return new Response(null, { status: 204 });
},
diff --git a/routes/(apps)/notes/api/notes.ts b/routes/(apps)/notes/api/notes.ts
index b7fd580..498d007 100644
--- a/routes/(apps)/notes/api/notes.ts
+++ b/routes/(apps)/notes/api/notes.ts
@@ -41,7 +41,7 @@ export const handler: Handlers = {
async POST(request) {
try {
const body = await request.json();
- const { note, numEtud, idModule } = body;
+ const { note, numEtud, idModule, noteSession2 } = body;
if (note === undefined || !numEtud || !idModule) {
return new Response("Champs 'note', 'numEtud' et 'idModule' requis", {
@@ -55,7 +55,32 @@ export const handler: Handlers = {
});
}
- const result = await db.insert(notes).values({ note, numEtud, idModule })
+ if (
+ noteSession2 !== undefined && noteSession2 !== null &&
+ (typeof noteSession2 !== "number" || noteSession2 < 0 ||
+ noteSession2 > 20)
+ ) {
+ return new Response(
+ "Champ 'noteSession2' doit être un nombre entre 0 et 20",
+ { status: 400 },
+ );
+ }
+
+ const values: {
+ note: number;
+ numEtud: number;
+ idModule: string;
+ noteSession2?: number | null;
+ } = {
+ note,
+ numEtud,
+ idModule,
+ };
+ if (noteSession2 !== undefined) {
+ values.noteSession2 = noteSession2;
+ }
+
+ const result = await db.insert(notes).values(values)
.returning();
return new Response(JSON.stringify(result[0]), {
diff --git a/routes/(apps)/notes/api/notes/[numEtud]/[idModule].ts b/routes/(apps)/notes/api/notes/[numEtud]/[idModule].ts
index 8618366..544e56a 100644
--- a/routes/(apps)/notes/api/notes/[numEtud]/[idModule].ts
+++ b/routes/(apps)/notes/api/notes/[numEtud]/[idModule].ts
@@ -64,13 +64,39 @@ export const handler: Handlers = {
}
const body = await request.json();
- const { note } = body;
+ const { note, noteSession2 } = body;
- if (note === undefined) {
- return new Response("Champ 'note' manquant", { status: 400 });
+ if (note === undefined && noteSession2 === undefined) {
+ return new Response("Au moins 'note' ou 'noteSession2' requis", {
+ status: 400,
+ });
}
- const result = await db.update(notes).set({ note }).where(
+ if (
+ note !== undefined &&
+ (typeof note !== "number" || note < 0 || note > 20)
+ ) {
+ return new Response("Champ 'note' doit être un nombre entre 0 et 20", {
+ status: 400,
+ });
+ }
+
+ if (
+ noteSession2 !== undefined && noteSession2 !== null &&
+ (typeof noteSession2 !== "number" || noteSession2 < 0 ||
+ noteSession2 > 20)
+ ) {
+ return new Response(
+ "Champ 'noteSession2' doit être un nombre entre 0 et 20",
+ { status: 400 },
+ );
+ }
+
+ const set: { note?: number; noteSession2?: number | null } = {};
+ if (note !== undefined) set.note = note;
+ if (noteSession2 !== undefined) set.noteSession2 = noteSession2;
+
+ const result = await db.update(notes).set(set).where(
and(
eq(notes.numEtud, numEtud),
eq(notes.idModule, idModule),
diff --git a/routes/(apps)/notes/api/notes/import-xlsx.ts b/routes/(apps)/notes/api/notes/import-xlsx.ts
index b31079b..7b01333 100644
--- a/routes/(apps)/notes/api/notes/import-xlsx.ts
+++ b/routes/(apps)/notes/api/notes/import-xlsx.ts
@@ -26,20 +26,38 @@ export const handler: Handlers = {
const rows = XLSX.utils.sheet_to_json(sheet) as {
numEtud: number;
note: number;
+ noteSession2?: number;
}[];
for (const row of rows) {
- const { numEtud, note } = row;
+ const { numEtud, note, noteSession2 } = row;
if (!numEtud || note === undefined) {
continue;
}
+ const values: {
+ numEtud: number;
+ idModule: string;
+ note: number;
+ noteSession2?: number | null;
+ } = {
+ numEtud,
+ idModule,
+ note,
+ };
+ const set: { note: number; noteSession2?: number | null } = { note };
+
+ if (noteSession2 !== undefined) {
+ values.noteSession2 = noteSession2;
+ set.noteSession2 = noteSession2;
+ }
+
await db.insert(notes)
- .values({ numEtud, idModule, note })
+ .values(values)
.onConflictDoUpdate({
target: [notes.numEtud, notes.idModule],
- set: { note },
+ set,
});
}
diff --git a/routes/(apps)/notes/partials/notes.tsx b/routes/(apps)/notes/partials/notes.tsx
index 188a05e..ec2e5d8 100644
--- a/routes/(apps)/notes/partials/notes.tsx
+++ b/routes/(apps)/notes/partials/notes.tsx
@@ -6,31 +6,52 @@ import {
getPartialsConfig,
makePartials,
} from "$root/defaults/makePartials.tsx";
-import { State } from "$root/defaults/interfaces.ts";
+import { CasContent, State } from "$root/defaults/interfaces.ts";
import NotesView from "../(_islands)/NotesView.tsx";
async function Notes(
_request: Request,
context: FreshContext,
) {
- const session =
- (context.state as unknown as { session: { sn: string; givenName: string } })
- .session;
- const { sn, givenName } = session;
+ const session = (context.state as unknown as { session: CasContent }).session;
let numEtud: number | null = null;
try {
- const student = await db
- .select()
- .from(students)
- .where(and(eq(students.nom, sn), eq(students.prenom, givenName)))
- .then((rows) => rows[0] ?? null);
- numEtud = student?.numEtud ?? null;
+ if (session.eduPersonPrimaryAffiliation === "student") {
+ // Students: uid is "21212006" in AMU CAS — strip non-digit prefix
+ const etudId = parseInt(session.uid.replace(/^\D+/, ""), 10);
+ if (!isNaN(etudId)) {
+ const student = await db
+ .select()
+ .from(students)
+ .where(eq(students.numEtud, etudId))
+ .then((rows) => rows[0] ?? null);
+ numEtud = student?.numEtud ?? null;
+ }
+ } else {
+ // Employees: look up by nom/prenom
+ const student = await db
+ .select()
+ .from(students)
+ .where(
+ and(
+ eq(students.nom, session.sn),
+ eq(students.prenom, session.givenName),
+ ),
+ )
+ .then((rows) => rows[0] ?? null);
+ numEtud = student?.numEtud ?? null;
+ }
} catch {
// DB lookup failed — island will show fallback message
}
- return ;
+ return (
+
+ );
}
export const config = getPartialsConfig();
diff --git a/routes/(apps)/students/(_islands)/ConsultStudents.tsx b/routes/(apps)/students/(_islands)/ConsultStudents.tsx
index c55ae51..86132e9 100644
--- a/routes/(apps)/students/(_islands)/ConsultStudents.tsx
+++ b/routes/(apps)/students/(_islands)/ConsultStudents.tsx
@@ -15,6 +15,9 @@ export default function ConsultStudents() {
const [error, setError] = useState(null);
const [filterPromo, setFilterPromo] = useState("");
const [filterNom, setFilterNom] = useState("");
+ const [selected, setSelected] = useState>(new Set());
+ const [bulkPromo, setBulkPromo] = useState("");
+ const [bulkBusy, setBulkBusy] = useState(false);
async function load() {
try {
@@ -44,6 +47,11 @@ export default function ConsultStudents() {
});
if (!res.ok) throw new Error("Suppression échouée");
await load();
+ setSelected((prev) => {
+ const next = new Set(prev);
+ next.delete(numEtud);
+ return next;
+ });
} catch (e) {
setError(e instanceof Error ? e.message : "Erreur");
}
@@ -56,6 +64,85 @@ export default function ConsultStudents() {
return matchPromo && matchNom;
});
+ const filteredIds = new Set(filtered.map((s) => s.numEtud));
+ const selectedInView = [...selected].filter((id) => filteredIds.has(id));
+ const allFilteredSelected = filtered.length > 0 &&
+ filtered.every((s) => selected.has(s.numEtud));
+
+ function toggleOne(numEtud: number) {
+ setSelected((prev) => {
+ const next = new Set(prev);
+ if (next.has(numEtud)) next.delete(numEtud);
+ else next.add(numEtud);
+ return next;
+ });
+ }
+
+ function toggleAll() {
+ if (allFilteredSelected) {
+ setSelected((prev) => {
+ const next = new Set(prev);
+ for (const s of filtered) next.delete(s.numEtud);
+ return next;
+ });
+ } else {
+ setSelected((prev) => {
+ const next = new Set(prev);
+ for (const s of filtered) next.add(s.numEtud);
+ return next;
+ });
+ }
+ }
+
+ async function bulkDelete() {
+ const count = selectedInView.length;
+ if (count === 0) return;
+ if (
+ !confirm(`Supprimer définitivement ${count} élève(s) sélectionné(s) ?`)
+ ) return;
+ setBulkBusy(true);
+ try {
+ const results = await Promise.all(
+ selectedInView.map((id) =>
+ fetch(`/students/api/students/${id}`, { method: "DELETE" })
+ ),
+ );
+ const failed = results.filter((r) => !r.ok).length;
+ if (failed > 0) setError(`${failed} suppression(s) échouée(s)`);
+ setSelected(new Set());
+ await load();
+ } catch (e) {
+ setError(e instanceof Error ? e.message : "Erreur");
+ } finally {
+ setBulkBusy(false);
+ }
+ }
+
+ async function bulkChangePromo() {
+ if (!bulkPromo || selectedInView.length === 0) return;
+ setBulkBusy(true);
+ try {
+ const results = await Promise.all(
+ selectedInView.map((id) =>
+ fetch(`/students/api/students/${id}`, {
+ method: "PUT",
+ headers: { "content-type": "application/json" },
+ body: JSON.stringify({ idPromo: bulkPromo }),
+ })
+ ),
+ );
+ const failed = results.filter((r) => !r.ok).length;
+ if (failed > 0) setError(`${failed} modification(s) échouée(s)`);
+ setSelected(new Set());
+ setBulkPromo("");
+ await load();
+ } catch (e) {
+ setError(e instanceof Error ? e.message : "Erreur");
+ } finally {
+ setBulkBusy(false);
+ }
+ }
+
return (
Gestion des Élèves
@@ -93,6 +180,44 @@ export default function ConsultStudents() {
/>
+ {/* Bulk actions bar */}
+ {selectedInView.length > 0 && (
+
+
+ {selectedInView.length} sélectionné(s)
+
+
+
+
+
+
+
Chargement…
: (
@@ -100,6 +225,13 @@ export default function ConsultStudents() {
+ |
+ 0}
+ onChange={toggleAll}
+ />
+ |
N° étud. |
Nom |
Prénom |
@@ -111,13 +243,23 @@ export default function ConsultStudents() {
{filtered.length === 0
? (
- |
+ |
Aucun élève trouvé
|
)
: filtered.map((s) => (
-
+
+ |
+ toggleOne(s.numEtud)}
+ />
+ |
{s.numEtud} |
{s.nom} |
{s.prenom} |
diff --git a/routes/(apps)/students/(_islands)/UploadStudents.tsx b/routes/(apps)/students/(_islands)/UploadStudents.tsx
index bf751d5..2a20255 100644
--- a/routes/(apps)/students/(_islands)/UploadStudents.tsx
+++ b/routes/(apps)/students/(_islands)/UploadStudents.tsx
@@ -2,13 +2,17 @@
import * as XLSX from "https://cdn.sheetjs.com/xlsx-0.20.3/package/xlsx.mjs";
import { useRef } from "preact/hooks";
import { useSignal } from "@preact/signals";
+import ImportResultPopup, {
+ type ImportDetail,
+ type ImportResult,
+} from "$root/defaults/ImportResultPopup.tsx";
export default function UploadStudents() {
const file = useSignal(null);
const dragging = useSignal(false);
const uploading = useSignal(false);
const error = useSignal(null);
- const success = useSignal(null);
+ const importResult = useSignal(null);
const inputRef = useRef(null);
function pickFile(f: File) {
@@ -18,7 +22,7 @@ export default function UploadStudents() {
}
file.value = f;
error.value = null;
- success.value = null;
+ importResult.value = null;
}
function onDragOver(e: DragEvent) {
@@ -46,36 +50,58 @@ export default function UploadStudents() {
if (!file.value) return;
uploading.value = true;
error.value = null;
- success.value = null;
+ importResult.value = null;
try {
const arrayBuffer = await file.value.arrayBuffer();
const workbook = XLSX.read(arrayBuffer, { type: "array" });
- let imported = 0;
- let failed = 0;
+ let added = 0;
+ let errors = 0;
+ const details: ImportDetail[] = [];
for (const sheetName of workbook.SheetNames) {
const sheet = workbook.Sheets[sheetName];
const rows = XLSX.utils.sheet_to_json<{
- numEtud: number;
nom: string;
prenom: string;
- }>(sheet, { header: ["numEtud", "nom", "prenom"], range: 1 });
+ numEtud: number;
+ idPromo: string;
+ }>(sheet, {
+ header: ["nom", "prenom", "numEtud", "idPromo"],
+ range: 2,
+ });
for (const row of rows) {
const res = await fetch("/students/api/students", {
method: "POST",
headers: { "content-type": "application/json" },
- body: JSON.stringify({ ...row, idPromo: sheetName }),
+ body: JSON.stringify(row),
});
- if (res.ok) imported++;
- else failed++;
+ if (res.ok) {
+ added++;
+ details.push({
+ type: "change",
+ message:
+ `${row.numEtud} : ${row.nom} ${row.prenom} -> ${row.idPromo}`,
+ });
+ } else {
+ errors++;
+ const body = await res.json().catch(() => ({}));
+ details.push({
+ type: "error",
+ message: `${row.numEtud} : ${body.error ?? "Erreur creation"}`,
+ });
+ }
}
}
- success.value = `Import terminé — ${imported} ajouté${
- imported !== 1 ? "s" : ""
- }${failed > 0 ? `, ${failed} erreur${failed !== 1 ? "s" : ""}` : ""}`;
+ importResult.value = {
+ added,
+ modified: 0,
+ ignored: 0,
+ errors,
+ details,
+ };
} catch {
error.value = "Erreur lors de la lecture du fichier.";
} finally {
@@ -84,10 +110,7 @@ export default function UploadStudents() {
}
function downloadTemplate() {
- const wb = XLSX.utils.book_new();
- const ws = XLSX.utils.aoa_to_sheet([["numEtud", "nom", "prenom"]]);
- XLSX.utils.book_append_sheet(wb, ws, "4A22");
- XLSX.writeFile(wb, "modele_etudiants.xlsx");
+ globalThis.open("/templates/modele_etudiants.xlsx", "_blank");
}
return (
@@ -117,10 +140,12 @@ export default function UploadStudents() {
{error.value && {error.value}
}
- {success.value && (
-
- {success.value}
-
+
+ {importResult.value && (
+ (importResult.value = null)}
+ />
)}
@@ -142,9 +167,8 @@ export default function UploadStudents() {
- Format : promo (nom de la feuille) |{" "}
- numEtud | nom |{" "}
- prénom
+ Format : Nom | Prenom |{" "}
+ Numero-etudiant | Promotion
);
diff --git a/routes/(apps)/students/(_props)/props.ts b/routes/(apps)/students/(_props)/props.ts
index 5483732..d6b498c 100644
--- a/routes/(apps)/students/(_props)/props.ts
+++ b/routes/(apps)/students/(_props)/props.ts
@@ -6,10 +6,9 @@ const properties: AppProperties = {
pages: {
index: "Accueil",
consult: "Élèves",
- promotions: "Promotions",
upload: "Import xlsx",
},
- adminOnly: ["consult", "promotions", "upload"],
+ adminOnly: ["consult", "upload"],
hint: "Create students promotion and see informations",
};
diff --git a/routes/(apps)/students/api/promotions/[idPromo].ts b/routes/(apps)/students/api/promotions/[idPromo].ts
index a206d3a..53f1d95 100644
--- a/routes/(apps)/students/api/promotions/[idPromo].ts
+++ b/routes/(apps)/students/api/promotions/[idPromo].ts
@@ -1,15 +1,25 @@
import { FreshContext, Handlers } from "$fresh/server.ts";
import { db } from "$root/databases/db.ts";
-import { promotions } from "$root/databases/schema.ts";
+import {
+ ajustements,
+ enseignements,
+ modules,
+ notes,
+ promotions,
+ students,
+ ueModules,
+ ues,
+} from "$root/databases/schema.ts";
import { AuthenticatedState } from "$root/defaults/interfaces.ts";
import { eq } from "npm:drizzle-orm@0.45.2";
-const NOT_FOUND = new Response(
- JSON.stringify({ error: "Ressource introuvable" }),
- { status: 404, headers: { "content-type": "application/json" } },
-);
+const NOT_FOUND = () =>
+ new Response(
+ JSON.stringify({ error: "Ressource introuvable" }),
+ { status: 404, headers: { "content-type": "application/json" } },
+ );
-const FORBIDDEN = new Response(null, { status: 403 });
+const FORBIDDEN = () => new Response(null, { status: 403 });
export const handler: Handlers = {
// #15 GET /promotions/{idPromo}
@@ -18,7 +28,7 @@ export const handler: Handlers = {
context: FreshContext,
): Promise {
if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
- return FORBIDDEN;
+ return FORBIDDEN();
}
const promo = await db
@@ -27,7 +37,7 @@ export const handler: Handlers = {
.where(eq(promotions.id, context.params.idPromo))
.then((rows) => rows[0] ?? null);
- if (!promo) return NOT_FOUND;
+ if (!promo) return NOT_FOUND();
return new Response(JSON.stringify(promo), {
headers: { "content-type": "application/json" },
@@ -40,7 +50,7 @@ export const handler: Handlers = {
context: FreshContext,
): Promise {
if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
- return FORBIDDEN;
+ return FORBIDDEN();
}
const body: { annee: string } = await request.json();
@@ -51,7 +61,7 @@ export const handler: Handlers = {
.where(eq(promotions.id, context.params.idPromo))
.returning();
- if (!updated) return NOT_FOUND;
+ if (!updated) return NOT_FOUND();
return new Response(JSON.stringify(updated), {
headers: { "content-type": "application/json" },
@@ -59,20 +69,104 @@ export const handler: Handlers = {
},
// #17 DELETE /promotions/{idPromo}
+ // Blocked if students are still assigned (409).
+ // Cascade: deletes linked ue_modules, enseignements, and orphaned
+ // modules (+ their notes) & UEs (+ their ajustements).
async DELETE(
_request: Request,
context: FreshContext,
): Promise {
if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
- return FORBIDDEN;
+ return FORBIDDEN();
}
- const [deleted] = await db
- .delete(promotions)
- .where(eq(promotions.id, context.params.idPromo))
- .returning();
+ const idPromo = context.params.idPromo;
- if (!deleted) return NOT_FOUND;
+ const promo = await db
+ .select()
+ .from(promotions)
+ .where(eq(promotions.id, idPromo))
+ .then((r) => r[0] ?? null);
+
+ if (!promo) return NOT_FOUND();
+
+ // Block deletion if students are still assigned
+ const assignedStudents = await db
+ .select()
+ .from(students)
+ .where(eq(students.idPromo, idPromo))
+ .then((r) => r.length);
+
+ if (assignedStudents > 0) {
+ return new Response(
+ JSON.stringify({
+ error:
+ `Impossible de supprimer : ${assignedStudents} étudiant(s) encore assigné(s) à cette promotion`,
+ }),
+ { status: 409, headers: { "content-type": "application/json" } },
+ );
+ }
+
+ await db.transaction(async (tx) => {
+ // Collect linked module IDs and UE IDs before deleting junction rows
+ const linkedUeModules = await tx
+ .select({ idModule: ueModules.idModule, idUE: ueModules.idUE })
+ .from(ueModules)
+ .where(eq(ueModules.idPromo, idPromo));
+
+ const linkedEns = await tx
+ .select({ idModule: enseignements.idModule })
+ .from(enseignements)
+ .where(eq(enseignements.idPromo, idPromo));
+
+ const moduleIds = [
+ ...new Set([
+ ...linkedUeModules.map((um) => um.idModule),
+ ...linkedEns.map((e) => e.idModule),
+ ]),
+ ];
+ const ueIds = [...new Set(linkedUeModules.map((um) => um.idUE))];
+
+ // Delete junction rows that directly reference this promo
+ await tx.delete(ueModules).where(eq(ueModules.idPromo, idPromo));
+ await tx.delete(enseignements).where(eq(enseignements.idPromo, idPromo));
+
+ // Delete orphaned modules (not used by another promo) and their notes
+ for (const modId of moduleIds) {
+ const stillInUeModules = await tx
+ .select()
+ .from(ueModules)
+ .where(eq(ueModules.idModule, modId))
+ .then((r) => r.length > 0);
+ const stillInEns = await tx
+ .select()
+ .from(enseignements)
+ .where(eq(enseignements.idModule, modId))
+ .then((r) => r.length > 0);
+
+ if (!stillInUeModules && !stillInEns) {
+ await tx.delete(notes).where(eq(notes.idModule, modId));
+ await tx.delete(modules).where(eq(modules.id, modId));
+ }
+ }
+
+ // Delete orphaned UEs (not used by another promo) and their ajustements
+ for (const ueId of ueIds) {
+ const stillUsed = await tx
+ .select()
+ .from(ueModules)
+ .where(eq(ueModules.idUE, ueId))
+ .then((r) => r.length > 0);
+
+ if (!stillUsed) {
+ await tx.delete(ajustements).where(eq(ajustements.idUE, ueId));
+ await tx.delete(ues).where(eq(ues.id, ueId));
+ }
+ }
+
+ // Delete the promotion
+ await tx.delete(promotions).where(eq(promotions.id, idPromo));
+ });
return new Response(null, { status: 204 });
},
diff --git a/routes/(apps)/students/api/students.ts b/routes/(apps)/students/api/students.ts
index 65ed62d..e2e5d38 100644
--- a/routes/(apps)/students/api/students.ts
+++ b/routes/(apps)/students/api/students.ts
@@ -44,13 +44,25 @@ export const handler: Handlers = {
idPromo: string;
} = await request.json();
- if (!body.nom || !body.prenom || !body.idPromo) {
+ if (!body.nom || !body.prenom) {
return new Response(null, { status: 400 });
}
+ const values: {
+ numEtud?: number;
+ nom: string;
+ prenom: string;
+ idPromo?: string;
+ } = {
+ nom: body.nom,
+ prenom: body.prenom,
+ };
+ if (body.numEtud) values.numEtud = body.numEtud;
+ if (body.idPromo) values.idPromo = body.idPromo;
+
const [created] = await db
.insert(students)
- .values({ nom: body.nom, prenom: body.prenom, idPromo: body.idPromo })
+ .values(values)
.returning();
return new Response(JSON.stringify(created), {
diff --git a/routes/(apps)/students/api/students/[numEtud].ts b/routes/(apps)/students/api/students/[numEtud].ts
index 3d92371..ce0f2d3 100644
--- a/routes/(apps)/students/api/students/[numEtud].ts
+++ b/routes/(apps)/students/api/students/[numEtud].ts
@@ -1,15 +1,21 @@
import { FreshContext, Handlers } from "$fresh/server.ts";
import { db } from "$root/databases/db.ts";
-import { students } from "$root/databases/schema.ts";
+import {
+ ajustements,
+ mobility,
+ notes,
+ students,
+} from "$root/databases/schema.ts";
import { AuthenticatedState } from "$root/defaults/interfaces.ts";
import { eq } from "npm:drizzle-orm@0.45.2";
-const NOT_FOUND = new Response(
- JSON.stringify({ error: "Ressource introuvable" }),
- { status: 404, headers: { "content-type": "application/json" } },
-);
+const NOT_FOUND = () =>
+ new Response(
+ JSON.stringify({ error: "Ressource introuvable" }),
+ { status: 404, headers: { "content-type": "application/json" } },
+ );
-const FORBIDDEN = new Response(null, { status: 403 });
+const FORBIDDEN = () => new Response(null, { status: 403 });
export const handler: Handlers = {
// #10 GET /students/{numEtud}
@@ -18,7 +24,7 @@ export const handler: Handlers = {
context: FreshContext,
): Promise {
if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
- return FORBIDDEN;
+ return FORBIDDEN();
}
const numEtud = Number(context.params.numEtud);
@@ -28,7 +34,7 @@ export const handler: Handlers = {
.where(eq(students.numEtud, numEtud))
.then((rows) => rows[0] ?? null);
- if (!student) return NOT_FOUND;
+ if (!student) return NOT_FOUND();
return new Response(JSON.stringify(student), {
headers: { "content-type": "application/json" },
@@ -41,20 +47,32 @@ export const handler: Handlers = {
context: FreshContext,
): Promise {
if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
- return FORBIDDEN;
+ return FORBIDDEN();
}
const numEtud = Number(context.params.numEtud);
- const body: { nom: string; prenom: string; idPromo: string } = await request
- .json();
+ const body: { nom?: string; prenom?: string; idPromo?: string } =
+ await request.json();
+
+ const set: { nom?: string; prenom?: string; idPromo?: string } = {};
+ if (body.nom !== undefined) set.nom = body.nom;
+ if (body.prenom !== undefined) set.prenom = body.prenom;
+ if (body.idPromo !== undefined) set.idPromo = body.idPromo;
+
+ if (Object.keys(set).length === 0) {
+ return new Response(
+ JSON.stringify({ error: "Au moins un champ requis" }),
+ { status: 400, headers: { "content-type": "application/json" } },
+ );
+ }
const [updated] = await db
.update(students)
- .set({ nom: body.nom, prenom: body.prenom, idPromo: body.idPromo })
+ .set(set)
.where(eq(students.numEtud, numEtud))
.returning();
- if (!updated) return NOT_FOUND;
+ if (!updated) return NOT_FOUND();
return new Response(JSON.stringify(updated), {
headers: { "content-type": "application/json" },
@@ -62,21 +80,31 @@ export const handler: Handlers = {
},
// #12 DELETE /students/{numEtud}
+ // Cascade: deletes notes, ajustements, mobility for this student.
async DELETE(
_request: Request,
context: FreshContext,
): Promise {
if (context.state.session.eduPersonPrimaryAffiliation !== "employee") {
- return FORBIDDEN;
+ return FORBIDDEN();
}
const numEtud = Number(context.params.numEtud);
- const [deleted] = await db
- .delete(students)
- .where(eq(students.numEtud, numEtud))
- .returning();
- if (!deleted) return NOT_FOUND;
+ const student = await db
+ .select()
+ .from(students)
+ .where(eq(students.numEtud, numEtud))
+ .then((r) => r[0] ?? null);
+
+ if (!student) return NOT_FOUND();
+
+ await db.transaction(async (tx) => {
+ await tx.delete(notes).where(eq(notes.numEtud, numEtud));
+ await tx.delete(ajustements).where(eq(ajustements.numEtud, numEtud));
+ await tx.delete(mobility).where(eq(mobility.studentId, numEtud));
+ await tx.delete(students).where(eq(students.numEtud, numEtud));
+ });
return new Response(null, { status: 204 });
},
diff --git a/routes/dev-login.ts b/routes/dev-login.ts
index b50898e..22058a7 100644
--- a/routes/dev-login.ts
+++ b/routes/dev-login.ts
@@ -4,41 +4,73 @@ import { createJwt } from "@popov/jwt";
import { setCookie } from "$std/http/cookie.ts";
import { getKey } from "$root/routes/_middleware.ts";
-const FAKE_ADMIN: CasContent = {
- amuCampus: "local",
- amuComposante: "local",
- amuDateValidation: "",
- coGroup: "",
- eduPersonPrimaryAffiliation: "employee",
- eduPersonPrincipalName: "admin@local",
- mail: "admin@local",
- displayName: "Admin Local",
- givenName: "Admin",
- memberOf: [],
- sn: "Local",
- supannCivilite: "",
- supannEntiteAffectation: "",
- supannEtuAnneeInscription: "",
- supannEtuEtape: "",
- uid: "admin-local",
-};
+function makeFakeUser(
+ role: "employee" | "student",
+ numEtud?: string,
+): CasContent {
+ if (role === "student" && numEtud) {
+ return {
+ amuCampus: "local",
+ amuComposante: "local",
+ amuDateValidation: "",
+ coGroup: "",
+ eduPersonPrimaryAffiliation: "student",
+ eduPersonPrincipalName: `${numEtud}@local`,
+ mail: `${numEtud}@local`,
+ displayName: `Etudiant ${numEtud}`,
+ givenName: "",
+ memberOf: [],
+ sn: "",
+ supannCivilite: "",
+ supannEntiteAffectation: "",
+ supannEtuAnneeInscription: "",
+ supannEtuEtape: "",
+ uid: `e${numEtud}`,
+ };
+ }
+ return {
+ amuCampus: "local",
+ amuComposante: "local",
+ amuDateValidation: "",
+ coGroup: "",
+ eduPersonPrimaryAffiliation: "employee",
+ eduPersonPrincipalName: "admin@local",
+ mail: "admin@local",
+ displayName: "Admin Local",
+ givenName: "Admin",
+ memberOf: [],
+ sn: "Local",
+ supannCivilite: "",
+ supannEntiteAffectation: "",
+ supannEtuAnneeInscription: "",
+ supannEtuEtape: "",
+ uid: "admin-local",
+ };
+}
export const handler: Handlers = {
- async GET(_request: Request, _context: FreshContext) {
+ async GET(request: Request, _context: FreshContext) {
if (Deno.env.get("LOCAL") !== "true") {
return new Response("Not available outside LOCAL mode.", { status: 403 });
}
+ const url = new URL(request.url);
+ const role = url.searchParams.get("role") === "student"
+ ? "student"
+ : "employee";
+ const numEtud = url.searchParams.get("numEtud") ?? undefined;
+ const user = makeFakeUser(role, numEtud);
+
const now = Math.floor(Date.now() / 1000);
const payload: LoginJWT = {
iss: "PolyMPR",
iat: now,
exp: now + 0xe10,
aud: "PolyMPR",
- user: FAKE_ADMIN,
+ user,
};
- const token = await createJwt(payload, getKey(FAKE_ADMIN.uid));
+ const token = await createJwt(payload, getKey(user.uid));
const headers = new Headers();
setCookie(headers, { name: "sessionToken", value: token });
headers.set("Location", "/apps");
diff --git a/routes/login.tsx b/routes/login.tsx
index 3b1da1e..dd35867 100644
--- a/routes/login.tsx
+++ b/routes/login.tsx
@@ -45,6 +45,8 @@ function createUserJWT(casResponse: CasResponse): Promise {
}
});
+ console.log(fullUserInfos);
+
const now = Math.floor(Date.now() / 1000);
const payload: LoginJWT = {
iss: "PolyMPR",
diff --git a/scripts/generate-templates.ts b/scripts/generate-templates.ts
new file mode 100644
index 0000000..ab2f3bc
--- /dev/null
+++ b/scripts/generate-templates.ts
@@ -0,0 +1,60 @@
+// @deno-types="https://cdn.sheetjs.com/xlsx-0.20.3/package/types/index.d.ts"
+import * as XLSX from "https://cdn.sheetjs.com/xlsx-0.20.3/package/xlsx.mjs";
+
+// --- Template 1: Students ---
+{
+ const wb = XLSX.utils.book_new();
+ const ws = XLSX.utils.aoa_to_sheet([
+ [null, null, null, "Promotion peut etre vide mais doit prealablement Exister"],
+ ["Nom", "Prenom", "Numero-etudiant", "Promotion"],
+ ["NOM", "PRENOM", 12345678, "3AFISE24-25"],
+ ]);
+ XLSX.utils.book_append_sheet(wb, ws, "Eleves");
+ XLSX.writeFile(wb, "static/templates/modele_etudiants.xlsx");
+ console.log("Created static/templates/modele_etudiants.xlsx");
+}
+
+// --- Template 2: Notes ---
+{
+ const headers = [
+ null,
+ null,
+ "MOD01 - Module 1",
+ "MOD02 - Module 2",
+ "MOD03 - Module 3",
+ ];
+ const coeffs = [null, null, 2, 3, 2];
+ const row1 = ["NOM", "PRENOM", 12, 15.5, 14];
+ const row2 = ["DUPONT", "JEAN", 8, 10, 16.5];
+
+ const wb = XLSX.utils.book_new();
+ const ws = XLSX.utils.aoa_to_sheet([headers, coeffs, row1, row2]);
+ XLSX.utils.book_append_sheet(wb, ws, "Session 1");
+ XLSX.writeFile(wb, "static/templates/modele_notes.xlsx");
+ console.log("Created static/templates/modele_notes.xlsx");
+}
+
+// --- Template 3: Maquette ---
+{
+ const data = [
+ ["Intitule du diplome", null, "Informatique - Annee 20.. - 20.."],
+ ["Description des UE du diplome", null, null, null, null, null, "Nombre d'heures"],
+ ["Annee\nSemestres", "Codes APOGEE", null, null, "Credits\n ECTS", "Coeff.", "CM", "TD", "TP"],
+ ["INFO3A", null, null, null, "ECTS", "Coef", "CM", "TD", "TP"],
+ ["SEM 5", null, null, null, 30],
+ ["UE", "CODE_UE1", "Nom de l'UE 1", null, 6],
+ [null, "MOD01", null, "Module 1", null, 2, 10, 10, 10],
+ [null, "MOD02", null, "Module 2", null, 2, 10, 10, 10],
+ [null, "MOD03", null, "Module 3", null, 2, 10, 10, 10],
+ [],
+ ["UE", "CODE_UE2", "Nom de l'UE 2", null, 4],
+ [null, "MOD04", null, "Module 4", null, 2, 10, 10, 10],
+ [null, "MOD05", null, "Module 5", null, 2, 10, 10, 10],
+ ];
+
+ const wb = XLSX.utils.book_new();
+ const ws = XLSX.utils.aoa_to_sheet(data);
+ XLSX.utils.book_append_sheet(wb, ws, "Maquette");
+ XLSX.writeFile(wb, "static/templates/modele_maquette.xlsx");
+ console.log("Created static/templates/modele_maquette.xlsx");
+}
diff --git a/scripts/inspect-maquette.ts b/scripts/inspect-maquette.ts
new file mode 100644
index 0000000..0dd3dce
--- /dev/null
+++ b/scripts/inspect-maquette.ts
@@ -0,0 +1,25 @@
+// @deno-types="https://cdn.sheetjs.com/xlsx-0.20.3/package/types/index.d.ts"
+import * as XLSX from "https://cdn.sheetjs.com/xlsx-0.20.3/package/xlsx.mjs";
+
+for (const file of ["FISE-INFO-2025.xlsx", "FISA-INFO-2025.xlsx"]) {
+ console.log(`\n=== ${file} ===`);
+ const wb = XLSX.read(Deno.readFileSync(`Excels/${file}`), { type: "array" });
+ console.log(`Sheets: ${wb.SheetNames.join(", ")}`);
+
+ for (const sheetName of wb.SheetNames) {
+ console.log(`\n--- Sheet: ${sheetName} ---`);
+ const sheet = wb.Sheets[sheetName];
+ const rows = XLSX.utils.sheet_to_json<(string | number | null)[]>(sheet, { header: 1 });
+ // Print first 5 cols of each row, mark rows that look like year/semester headers
+ for (let i = 0; i < rows.length; i++) {
+ const row = rows[i];
+ if (!row || row.length === 0) continue;
+ const col0 = row[0] != null ? String(row[0]).trim() : "";
+ // Show rows that are structural (year, semester, UE headers)
+ if (col0 || (row[1] != null && String(row[1]).trim())) {
+ const preview = row.slice(0, 6).map(c => c != null ? String(c).substring(0, 25) : "").join(" | ");
+ console.log(` [${i}] ${preview}`);
+ }
+ }
+ }
+}
diff --git a/static/styles/ui.css b/static/styles/ui.css
index a4efd9a..9d2218e 100644
--- a/static/styles/ui.css
+++ b/static/styles/ui.css
@@ -391,6 +391,54 @@
gap: 1rem;
}
+/* -------------------------------------------------------
+ Bulk actions bar
+------------------------------------------------------- */
+
+.bulk-bar {
+ display: flex;
+ align-items: center;
+ gap: 1rem;
+ padding: 0.5rem 0.75rem;
+ margin-bottom: 0.75rem;
+ border-radius: 6px;
+ background: light-dark(var(--light-accent-color), var(--dark-accent-color));
+ color: light-dark(
+ var(--light-background-color),
+ var(--dark-background-color)
+ );
+ font-size: 0.82rem;
+ flex-wrap: wrap;
+}
+
+.bulk-count {
+ font-weight: var(--font-weight-bold);
+ white-space: nowrap;
+}
+
+.bulk-actions {
+ display: flex;
+ align-items: center;
+ gap: 0.5rem;
+ margin-left: auto;
+ flex-wrap: wrap;
+}
+
+.bulk-bar .filter-select {
+ color: light-dark(
+ var(--light-foreground-color),
+ var(--dark-foreground-color)
+ );
+ font-size: 0.78rem;
+}
+
+.row-selected {
+ background: light-dark(
+ color-mix(in srgb, var(--light-accent-color) 8%, transparent),
+ color-mix(in srgb, var(--dark-accent-color) 12%, transparent)
+ );
+}
+
/* -------------------------------------------------------
Chips: perm, role, promo, module
------------------------------------------------------- */
@@ -852,6 +900,14 @@
margin-bottom: 0.75rem;
}
+.create-promo-inline {
+ margin-bottom: 1rem;
+ padding: 0.75rem;
+ border: 1px dashed
+ light-dark(var(--light-foreground-dimmer), var(--dark-foreground-dimmer));
+ border-radius: 6px;
+}
+
.upload-format {
font-size: 0.72rem;
font-family: monospace;
@@ -1008,3 +1064,140 @@
font-family: monospace;
margin-top: 0.25rem;
}
+
+/* -------------------------------------------------------
+ Import result popup
+------------------------------------------------------- */
+
+.import-popup-overlay {
+ position: fixed;
+ inset: 0;
+ background: rgba(0, 0, 0, 0.55);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ z-index: 1000;
+}
+
+.import-popup {
+ background: light-dark(
+ var(--light-background-color),
+ var(--dark-background-color)
+ );
+ border: 1px solid
+ light-dark(var(--light-border-color), var(--dark-border-color));
+ border-radius: 10px;
+ padding: 1.5rem 2rem;
+ min-width: 28rem;
+ max-width: 40rem;
+ max-height: 80vh;
+ overflow-y: auto;
+}
+
+.import-popup-header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: 1.25rem;
+}
+
+.import-popup-title {
+ font-size: 1.1rem;
+ font-weight: var(--font-weight-bold);
+ margin: 0;
+}
+
+.import-popup-badge {
+ font-size: 0.78rem;
+ font-weight: 600;
+ padding: 0.25rem 0.75rem;
+ border-radius: 4px;
+ border: 1px solid;
+}
+
+.badge-error {
+ color: #f5a623;
+ border-color: #f5a623;
+}
+
+.badge-success {
+ color: light-dark(var(--light-accent-color), var(--dark-accent-color));
+ border-color: light-dark(var(--light-accent-color), var(--dark-accent-color));
+}
+
+.import-popup-stats {
+ display: flex;
+ flex-direction: column;
+ gap: 0.6rem;
+ margin-bottom: 1.25rem;
+}
+
+.import-stat-row {
+ display: flex;
+ align-items: center;
+ gap: 1.5rem;
+}
+
+.import-stat-label {
+ min-width: 6rem;
+ font-size: 0.85rem;
+ color: light-dark(var(--light-foreground-dim), var(--dark-foreground-dim));
+}
+
+.import-stat-value {
+ font-size: 0.85rem;
+ font-family: monospace;
+ padding: 0.2rem 0.6rem;
+ border-radius: 4px;
+ border: 1px solid;
+ min-width: 8rem;
+}
+
+.stat-added {
+ color: light-dark(var(--light-accent-color), var(--dark-accent-color));
+ border-color: light-dark(var(--light-accent-color), var(--dark-accent-color));
+}
+
+.stat-modified {
+ color: light-dark(var(--light-accent-color), var(--dark-accent-color));
+ border-color: light-dark(var(--light-accent-color), var(--dark-accent-color));
+}
+
+.stat-ignored {
+ color: light-dark(var(--light-foreground-dim), var(--dark-foreground-dim));
+ border-color: light-dark(var(--light-border-color), var(--dark-border-color));
+}
+
+.stat-errors {
+ color: #f5a623;
+ border-color: #f5a623;
+}
+
+.import-popup-actions {
+ display: flex;
+ gap: 0.75rem;
+ margin-bottom: 0.75rem;
+}
+
+.import-popup-details {
+ border-top: 1px solid
+ light-dark(var(--light-border-color), var(--dark-border-color));
+ padding-top: 0.75rem;
+ font-family: monospace;
+ font-size: 0.75rem;
+ max-height: 12rem;
+ overflow-y: auto;
+}
+
+.import-detail-change {
+ margin: 0.15rem 0;
+ color: light-dark(
+ var(--light-foreground-color),
+ var(--dark-foreground-color)
+ );
+}
+
+.import-detail-error {
+ margin: 0.15rem 0;
+ color: #f5a623;
+}
diff --git a/static/templates/modele_etudiants.xlsx b/static/templates/modele_etudiants.xlsx
new file mode 100644
index 0000000..65ddb68
Binary files /dev/null and b/static/templates/modele_etudiants.xlsx differ
diff --git a/static/templates/modele_maquette.xlsx b/static/templates/modele_maquette.xlsx
new file mode 100644
index 0000000..f326c5e
Binary files /dev/null and b/static/templates/modele_maquette.xlsx differ
diff --git a/static/templates/modele_notes.xlsx b/static/templates/modele_notes.xlsx
new file mode 100644
index 0000000..55d9614
Binary files /dev/null and b/static/templates/modele_notes.xlsx differ
diff --git a/tests/e2e/robustness_test.ts b/tests/e2e/robustness_test.ts
index fb5552b..ced5ac4 100644
--- a/tests/e2e/robustness_test.ts
+++ b/tests/e2e/robustness_test.ts
@@ -21,8 +21,8 @@ import {
import { handler as modulesHandler } from "$apps/admin/api/modules.ts";
import { handler as moduleHandler } from "$apps/admin/api/modules/[idModule].ts";
import { handler as notesHandler } from "$apps/notes/api/notes.ts";
-import { handler as uesHandler } from "$apps/notes/api/ues.ts";
-import { handler as ueModulesHandler } from "$apps/notes/api/ue-modules.ts";
+import { handler as uesHandler } from "$apps/admin/api/ues.ts";
+import { handler as ueModulesHandler } from "$apps/admin/api/ue-modules.ts";
import { handler as ajustementsHandler } from "$apps/notes/api/ajustements.ts";
import { handler as enseignementsHandler } from "$apps/admin/api/enseignements.ts";
import { handler as usersHandler } from "$apps/admin/api/users.ts";
diff --git a/tests/e2e/ue_modules_test.ts b/tests/e2e/ue_modules_test.ts
index 3a921f8..30dba17 100644
--- a/tests/e2e/ue_modules_test.ts
+++ b/tests/e2e/ue_modules_test.ts
@@ -14,8 +14,8 @@ import {
seedUes,
truncateAll,
} from "../helpers/db_integration.ts";
-import { handler as ueModulesHandler } from "$apps/notes/api/ue-modules.ts";
-import { handler as ueModuleHandler } from "$apps/notes/api/ue-modules/[idModule]/[idUE]/[idPromo].ts";
+import { handler as ueModulesHandler } from "$apps/admin/api/ue-modules.ts";
+import { handler as ueModuleHandler } from "$apps/admin/api/ue-modules/[idModule]/[idUE]/[idPromo].ts";
import { ueModules as ueModulesTable } from "$root/databases/schema.ts";
import { testDb } from "../helpers/db_integration.ts";
diff --git a/tests/e2e/ues_test.ts b/tests/e2e/ues_test.ts
index 1797f8d..d5d726d 100644
--- a/tests/e2e/ues_test.ts
+++ b/tests/e2e/ues_test.ts
@@ -7,8 +7,8 @@ import {
makeJsonRequest,
} from "../helpers/handler.ts";
import { seedUes, truncateAll } from "../helpers/db_integration.ts";
-import { handler as uesHandler } from "$apps/notes/api/ues.ts";
-import { handler as ueHandler } from "$apps/notes/api/ues/[idUE].ts";
+import { handler as uesHandler } from "$apps/admin/api/ues.ts";
+import { handler as ueHandler } from "$apps/admin/api/ues/[idUE].ts";
// --- GET /ues ---