feat: Add bulk student enrollment functionality to courses with new API endpoint and UI.
This commit is contained in:
@@ -43,6 +43,7 @@ El proyecto ha sido optimizado para reducir la complejidad de la infraestructura
|
||||
- **Interactive Gradebook**: Libro de calificaciones avanzado con filtrado por cohortes y exportación a CSV.
|
||||
- **Content Libraries**: Repositorio centralizado de bloques y lecciones reutilizables entre múltiples cursos.
|
||||
- **Advanced Grading (Rubrics)**: Sistema de evaluación basado en rúbricas detalladas con indicadores de desempeño por criterio.
|
||||
- **Learning Sequences**: Gestión de prerrequisitos entre lecciones con cumplimiento forzado en el LMS.
|
||||
|
||||
## Requisitos del Sistema
|
||||
|
||||
@@ -326,6 +327,22 @@ Genera un quiz basado en el contenido de la lección.
|
||||
}
|
||||
```
|
||||
|
||||
#### POST /lessons/{id}/dependencies
|
||||
Asigna una lección como prerrequisito de otra.
|
||||
- **Cuerpo ( LessonDependencyRequest ):**
|
||||
```json
|
||||
{
|
||||
"prerequisite_lesson_id": "uuid",
|
||||
"min_score_percentage": "number (opcional)"
|
||||
}
|
||||
```
|
||||
|
||||
#### GET /lessons/{id}/dependencies
|
||||
Lista los prerrequisitos de una lección específica.
|
||||
|
||||
#### DELETE /lessons/{lesson_id}/dependencies/{prereq_id}
|
||||
Elimina un prerrequisito de una lección.
|
||||
|
||||
#### DELETE /courses/{id}
|
||||
Elimina un curso y todos sus contenidos relacionados (módulos, lecciones, assets).
|
||||
|
||||
@@ -601,6 +618,7 @@ Obtiene una lista de todas las organizaciones registradas.
|
||||
- **Student Notes Panel**: Anotaciones personales con interfaz glassmorphism y autoguardado inteligente.
|
||||
- **Cohort Management**: Sistema de gestión de grupos con seguimiento de progreso por cohorte.
|
||||
- **Advanced Gradebook**: Seguimiento del desempeño estudiantil con analíticas y filtrado avanzado.
|
||||
- **Learning Sequences UI**: Interfaz visual para gestionar dependencias y visualización de bloqueos con iconos de candado.
|
||||
|
||||
## 📄 Licencia
|
||||
Este proyecto es código abierto y está disponible bajo los términos de la licencia especificada en el repositorio.
|
||||
+5
-5
@@ -185,7 +185,7 @@
|
||||
- [x] **Cohorts & Groups**: Segmentación de estudiantes con contenido específico.
|
||||
- [x] **Content Libraries**: Repositorio reutilizable de bloques y lecciones.
|
||||
- [x] **Advanced Grading**: Rúbricas detalladas y workflows de calificación.
|
||||
- [ ] **Learning Sequences**: Prerequisitos y rutas condicionales entre lecciones.
|
||||
- [x] **Learning Sequences**: Prerequisitos y rutas condicionales entre lecciones.
|
||||
- [ ] **Bulk Operations**: Inscripción masiva, exportación de calificaciones, comunicación masiva.
|
||||
- [ ] **Course Teams**: Múltiples instructores con roles y permisos granulares.
|
||||
- [ ] **Course Preview**: Vista previa de lecciones sin inscripción.
|
||||
@@ -215,9 +215,9 @@
|
||||
|
||||
---
|
||||
|
||||
**Estado Actual**: La plataforma cuenta con un motor de IA avanzado, gestión multi-tenant completa, tutoría inteligente con memoria histórica, una **interfaz 100% responsiva**, flujos de autenticación diferenciados, **sistema de foros de discusión funcional**, **gestión de anuncios**, **monetización integrada con Mercado Pago**, **Librerías de Contenido reutilizables** y **Sistema de Rúbricas Avanzado**.
|
||||
**Estado Actual**: La plataforma cuenta con un motor de IA avanzado, gestión multi-tenant completa, tutoría inteligente con memoria histórica, una **interfaz 100% responsiva**, flujos de autenticación diferenciados, **sistema de foros de discusión funcional**, **gestión de anuncios**, **monetización integrada con Mercado Pago**, **Librerías de Contenido reutilizables**, **Sistema de Rúbricas Avanzado** y **Secuencias de Aprendizaje (Prerrequisitos)**.
|
||||
|
||||
**Próximas Prioridades**:
|
||||
1. **Learning Sequences**: Prerequisitos y rutas condicionales entre lecciones.
|
||||
2. **Bulk Operations**: Inscripción masiva y exportación avanzada de datos.
|
||||
3. **Course Teams**: Gestión de múltiples instructores por curso.
|
||||
1. **Bulk Operations**: Inscripción masiva y exportación avanzada de datos.
|
||||
2. **Course Teams**: Gestión de múltiples instructores por curso.
|
||||
3. **Course Preview**: Vista previa de lecciones sin inscripción.
|
||||
|
||||
@@ -15,6 +15,105 @@ use sqlx::{PgPool, Row};
|
||||
use std::env;
|
||||
use uuid::Uuid;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct BulkEnrollPayload {
|
||||
pub course_id: Uuid,
|
||||
pub emails: Vec<String>,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
pub struct BulkEnrollResponse {
|
||||
pub successful_emails: Vec<String>,
|
||||
pub failed_emails: Vec<String>,
|
||||
pub already_enrolled_emails: Vec<String>,
|
||||
}
|
||||
|
||||
pub async fn bulk_enroll_users(
|
||||
Org(org_ctx): Org,
|
||||
claims: Claims,
|
||||
State(pool): State<PgPool>,
|
||||
Json(payload): Json<BulkEnrollPayload>,
|
||||
) -> Result<Json<BulkEnrollResponse>, StatusCode> {
|
||||
if claims.role != "admin" && claims.role != "instructor" {
|
||||
return Err(StatusCode::FORBIDDEN);
|
||||
}
|
||||
|
||||
let mut successful_emails = Vec::new();
|
||||
let mut failed_emails = Vec::new();
|
||||
let mut already_enrolled_emails = Vec::new();
|
||||
|
||||
for email in payload.emails {
|
||||
// 1. Find user by email in the organization
|
||||
let user: Option<User> = sqlx::query_as("SELECT * FROM users WHERE email = $1")
|
||||
.bind(&email)
|
||||
.fetch_optional(&pool)
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
match user {
|
||||
Some(user) => {
|
||||
// 2. Check if already enrolled
|
||||
let is_enrolled: bool = sqlx::query_scalar(
|
||||
"SELECT EXISTS(SELECT 1 FROM enrollments WHERE user_id = $1 AND course_id = $2)"
|
||||
)
|
||||
.bind(user.id)
|
||||
.bind(payload.course_id)
|
||||
.fetch_one(&pool)
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
if is_enrolled {
|
||||
already_enrolled_emails.push(email);
|
||||
continue;
|
||||
}
|
||||
|
||||
// 3. Enroll (Admin enrollment ignores payment)
|
||||
let mut tx = pool
|
||||
.begin()
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
// Set session context for audit
|
||||
crate::db_util::set_session_context(
|
||||
&mut tx,
|
||||
Some(claims.sub),
|
||||
Some(org_ctx.id),
|
||||
None,
|
||||
None,
|
||||
Some("BULK_ENROLL".to_string()),
|
||||
)
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
|
||||
let res = sqlx::query("SELECT * FROM fn_enroll_student($1, $2, $3)")
|
||||
.bind(org_ctx.id)
|
||||
.bind(user.id)
|
||||
.bind(payload.course_id)
|
||||
.execute(&mut *tx)
|
||||
.await;
|
||||
|
||||
if res.is_ok() {
|
||||
tx.commit()
|
||||
.await
|
||||
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
|
||||
successful_emails.push(email);
|
||||
} else {
|
||||
failed_emails.push(email);
|
||||
}
|
||||
}
|
||||
None => {
|
||||
failed_emails.push(email);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(Json(BulkEnrollResponse {
|
||||
successful_emails,
|
||||
failed_emails,
|
||||
already_enrolled_emails,
|
||||
}))
|
||||
}
|
||||
|
||||
pub async fn enroll_user(
|
||||
Org(org_ctx): Org,
|
||||
claims: Claims,
|
||||
|
||||
@@ -51,6 +51,7 @@ async fn main() {
|
||||
|
||||
let protected_routes = Router::new()
|
||||
.route("/enroll", post(handlers::enroll_user))
|
||||
.route("/bulk-enroll", post(handlers::bulk_enroll_users))
|
||||
.route("/enrollments/{id}", get(handlers::get_user_enrollments))
|
||||
.route(
|
||||
"/payments/preference",
|
||||
|
||||
@@ -14,7 +14,11 @@ import {
|
||||
AlertCircle,
|
||||
User,
|
||||
Mail,
|
||||
Clock
|
||||
Clock,
|
||||
Users,
|
||||
X,
|
||||
AlertTriangle,
|
||||
Loader2
|
||||
} from "lucide-react";
|
||||
|
||||
export default function GradebookPage() {
|
||||
@@ -28,6 +32,14 @@ export default function GradebookPage() {
|
||||
const [searchQuery, setSearchQuery] = useState("");
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [courseTitle, setCourseTitle] = useState("");
|
||||
const [showBulkEnroll, setShowBulkEnroll] = useState(false);
|
||||
const [bulkEmails, setBulkEmails] = useState("");
|
||||
const [bulkResults, setBulkResults] = useState<{
|
||||
successful_emails: string[];
|
||||
failed_emails: string[];
|
||||
already_enrolled_emails: string[];
|
||||
} | null>(null);
|
||||
const [bulkLoading, setBulkLoading] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
if (!user) return;
|
||||
@@ -94,6 +106,32 @@ export default function GradebookPage() {
|
||||
document.body.removeChild(link);
|
||||
};
|
||||
|
||||
const handleBulkEnroll = async () => {
|
||||
if (!bulkEmails.trim()) return;
|
||||
|
||||
const emails = bulkEmails
|
||||
.split(/[\n,]/)
|
||||
.map(e => e.trim())
|
||||
.filter(e => e.length > 0 && e.includes("@"));
|
||||
|
||||
if (emails.length === 0) return;
|
||||
|
||||
try {
|
||||
setBulkLoading(true);
|
||||
const results = await lmsApi.bulkEnroll(id, emails);
|
||||
setBulkResults(results);
|
||||
// Refresh list if any were successful
|
||||
if (results.successful_emails.length > 0) {
|
||||
const refreshedGrades = await lmsApi.getCourseGrades(id, selectedCohortId || undefined);
|
||||
setStudents(refreshedGrades);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("Bulk enrollment failed", err);
|
||||
} finally {
|
||||
setBulkLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
if (loading && students.length === 0) return (
|
||||
<div className="min-h-screen bg-[#0f1115] flex items-center justify-center">
|
||||
<div className="w-12 h-12 border-4 border-blue-500/20 border-t-blue-500 rounded-full animate-spin"></div>
|
||||
@@ -120,6 +158,12 @@ export default function GradebookPage() {
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center gap-4">
|
||||
<button
|
||||
onClick={() => setShowBulkEnroll(true)}
|
||||
className="bg-white/5 hover:bg-white/10 border border-white/10 px-4 py-2 rounded-xl flex items-center gap-2 transition-all font-medium"
|
||||
>
|
||||
<Users size={16} /> Bulk Enroll
|
||||
</button>
|
||||
<button
|
||||
onClick={exportCSV}
|
||||
className="btn-premium px-4 flex items-center gap-2"
|
||||
@@ -129,6 +173,110 @@ export default function GradebookPage() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Bulk Enroll Modal */}
|
||||
{showBulkEnroll && (
|
||||
<div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/60 backdrop-blur-sm">
|
||||
<div className="bg-[#1a1d23] border border-white/10 rounded-2xl w-full max-w-2xl overflow-hidden shadow-2xl animate-in fade-in zoom-in duration-200">
|
||||
<div className="p-6 border-b border-white/5 flex items-center justify-between">
|
||||
<h3 className="text-xl font-bold flex items-center gap-2">
|
||||
<Users className="text-blue-400" /> Bulk Student Enrollment
|
||||
</h3>
|
||||
<button
|
||||
onClick={() => {
|
||||
setShowBulkEnroll(false);
|
||||
setBulkResults(null);
|
||||
setBulkEmails("");
|
||||
}}
|
||||
className="p-1 hover:bg-white/5 rounded-lg transition-colors"
|
||||
>
|
||||
<X size={20} />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="p-8 space-y-6">
|
||||
{!bulkResults ? (
|
||||
<>
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-400 mb-2">
|
||||
Enter email addresses (separated by commas or new lines)
|
||||
</label>
|
||||
<textarea
|
||||
value={bulkEmails}
|
||||
onChange={(e) => setBulkEmails(e.target.value)}
|
||||
placeholder="student1@example.com student2@example.com"
|
||||
className="w-full h-48 bg-black/20 border border-white/10 rounded-xl p-4 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500/50 text-white placeholder-gray-600 resize-none font-mono"
|
||||
/>
|
||||
</div>
|
||||
<div className="bg-blue-500/10 border border-blue-500/20 rounded-xl p-4 flex gap-3 italic text-sm text-blue-400">
|
||||
<AlertTriangle size={18} className="shrink-0" />
|
||||
Students must already have an account in this organization to be enrolled.
|
||||
</div>
|
||||
</>
|
||||
) : (
|
||||
<div className="space-y-6">
|
||||
<div className="grid grid-cols-3 gap-4">
|
||||
<div className="bg-green-500/10 border border-green-500/20 rounded-xl p-4 text-center">
|
||||
<div className="text-2xl font-black text-green-400">{bulkResults.successful_emails.length}</div>
|
||||
<div className="text-xs uppercase tracking-widest text-gray-500 font-bold mt-1">Enrolled</div>
|
||||
</div>
|
||||
<div className="bg-yellow-500/10 border border-yellow-500/20 rounded-xl p-4 text-center">
|
||||
<div className="text-2xl font-black text-yellow-400">{bulkResults.already_enrolled_emails.length}</div>
|
||||
<div className="text-xs uppercase tracking-widest text-gray-500 font-bold mt-1">Skipped</div>
|
||||
</div>
|
||||
<div className="bg-red-500/10 border border-red-500/20 rounded-xl p-4 text-center">
|
||||
<div className="text-2xl font-black text-red-400">{bulkResults.failed_emails.length}</div>
|
||||
<div className="text-xs uppercase tracking-widest text-gray-500 font-bold mt-1">Failed</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{bulkResults.failed_emails.length > 0 && (
|
||||
<div>
|
||||
<p className="text-xs font-bold text-gray-500 uppercase tracking-widest mb-2">Failed Emails (Not Found):</p>
|
||||
<div className="bg-black/20 rounded-xl p-3 text-xs text-red-400 max-h-32 overflow-y-auto font-mono">
|
||||
{bulkResults.failed_emails.map(e => (
|
||||
<div key={e}>{e}</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="p-6 bg-white/5 border-t border-white/5 flex justify-end gap-3">
|
||||
{!bulkResults ? (
|
||||
<>
|
||||
<button
|
||||
onClick={() => setShowBulkEnroll(false)}
|
||||
className="px-6 py-2 rounded-xl hover:bg-white/5 transition-colors font-medium"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
<button
|
||||
onClick={handleBulkEnroll}
|
||||
disabled={bulkLoading || !bulkEmails.trim()}
|
||||
className="btn-premium px-8 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed"
|
||||
>
|
||||
{bulkLoading ? <Loader2 className="animate-spin w-4 h-4" /> : 'Process Enrollment'}
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<button
|
||||
onClick={() => {
|
||||
setShowBulkEnroll(false);
|
||||
setBulkResults(null);
|
||||
setBulkEmails("");
|
||||
}}
|
||||
className="btn-premium px-8"
|
||||
>
|
||||
Done
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<CourseEditorLayout activeTab="grades">
|
||||
<div className="p-8 space-y-8">
|
||||
{/* Controls & Stats */}
|
||||
|
||||
@@ -448,6 +448,12 @@ export interface StudentGradeReport {
|
||||
last_active_at: string | null;
|
||||
}
|
||||
|
||||
export interface BulkEnrollResponse {
|
||||
successful_emails: string[];
|
||||
failed_emails: string[];
|
||||
already_enrolled_emails: string[];
|
||||
}
|
||||
|
||||
export interface CourseSubmission {
|
||||
id: string;
|
||||
user_id: string;
|
||||
@@ -734,10 +740,12 @@ export const lmsApi = {
|
||||
addMember: (cohortId: string, userId: string): Promise<UserCohort> => apiFetch(`/cohorts/${cohortId}/members`, { method: 'POST', body: JSON.stringify({ user_id: userId }) }, true),
|
||||
removeMember: (cohortId: string, userId: string): Promise<void> => apiFetch(`/cohorts/${cohortId}/members/${userId}`, { method: 'DELETE' }, true),
|
||||
getMembers: (id: string): Promise<string[]> => apiFetch(`/cohorts/${id}/members`, {}, true),
|
||||
getGrades: (id: string, cohortId?: string): Promise<any> => {
|
||||
getCourseGrades: (id: string, cohortId?: string): Promise<StudentGradeReport[]> => {
|
||||
const query = cohortId ? `?cohort_id=${cohortId}` : '';
|
||||
return apiFetch(`/courses/${id}/grades${query}`, {}, true);
|
||||
},
|
||||
bulkEnroll: (courseId: string, emails: string[]): Promise<BulkEnrollResponse> =>
|
||||
apiFetch('/bulk-enroll', { method: 'POST', body: JSON.stringify({ course_id: courseId, emails }) }, true),
|
||||
// Peer Assessment
|
||||
submitAssignment: (courseId: string, lessonId: string, content: string): Promise<CourseSubmission> =>
|
||||
apiFetch(`/courses/${courseId}/lessons/${lessonId}/submit`, { method: 'POST', body: JSON.stringify({ content }) }, true),
|
||||
|
||||
Reference in New Issue
Block a user