✨ feat: mejoras de ux en las academias

AbdielRD · AbdielRD · commit 5b94b295a4de · 2025-12-07T15:05:57.000-06:00
diff --git a/lib/features/dashboard/viewmodels/bulk_upload_viewmodel.dart b/lib/features/dashboard/viewmodels/bulk_upload_viewmodel.dart
@@ -164,7 +164,7 @@ class BulkUploadViewModel extends ChangeNotifier {
 
     } catch (e) {
       _errorMessage = "Error: $e";
-      print("Error BulkUpload: $e");
+      debugPrint("Error BulkUpload: $e");
     } finally {
       _isLoading = false;
       notifyListeners();
diff --git a/lib/features/dashboard/views/academy_home_view.dart b/lib/features/dashboard/views/academy_home_view.dart
@@ -130,6 +130,137 @@ class AcademyHomeView extends StatelessWidget {
             ),
           ],
         ),
+<<<<<<< HEAD
+=======
+        const Divider(height: 1, indent: 16, endIndent: 16),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4),
+          child: TextButton.icon(
+            icon: const Icon(Icons.add_circle_outline, size: 18),
+            label: const Text("Asignar Materia"),
+            style: TextButton.styleFrom(foregroundColor: AppTheme.bluePrimary),
+            onPressed: onAssign,
+          ),
+        )
+      ]),
+    );
+  }
+}
+
+class _AssignmentForm extends StatefulWidget {
+  final UserModel student;
+  const _AssignmentForm({required this.student});
+
+  @override
+  State<_AssignmentForm> createState() => _AssignmentFormState();
+}
+
+class _AssignmentFormState extends State<_AssignmentForm> {
+  final _scheduleCtrl = TextEditingController();
+  final _salonCtrl = TextEditingController();
+  SubjectModel? _selectedSubject;
+  ProfessorModel? _selectedProfessor;
+  bool _isSaving = false;
+
+  @override
+  void initState() {
+    super.initState();
+    // Auto-select the subject if there's only one available
+    final vm = context.read<AcademyViewModel>();
+    if (vm.availableSubjectsForStudent.length == 1) {
+      _selectedSubject = vm.availableSubjectsForStudent.first;
+    }
+  }
+
+  @override
+  void dispose() {
+    _scheduleCtrl.dispose();
+    _salonCtrl.dispose();
+    super.dispose();
+  }
+
+  void _submit() async {
+    final vm = context.read<AcademyViewModel>();
+    if (_selectedSubject == null || _selectedProfessor == null || _salonCtrl.text.isEmpty) {
+      if(mounted) ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text("Todos los campos son obligatorios")));
+      return;
+    }
+
+    setState(() => _isSaving = true);
+    final success = await vm.assignSubject(
+      studentId: widget.student.id,
+      subjectName: _selectedSubject!.name,
+      professorName: _selectedProfessor!.name,
+      schedule: _selectedProfessor!.schedule,
+      salon: _salonCtrl.text,
+    );
+
+    if (mounted && success){
+      Navigator.pop(context);
+    } else if(mounted) {
+      setState(() => _isSaving = false);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final vm = context.watch<AcademyViewModel>();
+    final bottomPadding = MediaQuery.of(context).viewInsets.bottom;
+
+    return SingleChildScrollView(
+      padding: EdgeInsets.fromLTRB(24, 24, 24, 24 + bottomPadding),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text("Asignar Materia y Profesor", style: Theme.of(context).textTheme.titleLarge),
+          Text("Alumno: ${widget.student.name}", style: const TextStyle(color: Colors.grey)),
+          const SizedBox(height: 20),
+
+          // --- FIX: Use the filtered list of subjects ---
+          DropdownButtonFormField<SubjectModel>(
+            key: ValueKey(_selectedSubject),
+            initialValue: _selectedSubject,
+            decoration: const InputDecoration(labelText: "Materia", border: OutlineInputBorder()),
+            items: vm.availableSubjectsForStudent.map((s) => DropdownMenuItem(value: s, child: Text(s.name))).toList(),
+            onChanged: (val) => setState(() {
+              _selectedSubject = val;
+              _selectedProfessor = null;
+              _scheduleCtrl.clear();
+            }),
+          ),
+          const SizedBox(height: 15),
+
+          DropdownButtonFormField<ProfessorModel>(
+            key: ValueKey(_selectedProfessor),
+            decoration: const InputDecoration(labelText: "Profesor", border: OutlineInputBorder()),
+            items: _selectedSubject?.professors.map((p) => DropdownMenuItem(value: p, child: Text(p.name))).toList(),
+            onChanged: (val) => setState(() {
+              _selectedProfessor = val;
+              _scheduleCtrl.text = val?.schedule ?? '';
+            }),
+          ),
+          const SizedBox(height: 15),
+
+          Row(children: [
+            Expanded(child: TextField(controller: _scheduleCtrl, readOnly: true, decoration: const InputDecoration(labelText: "Horario", border: OutlineInputBorder()))),
+            const SizedBox(width: 10),
+            Expanded(child: TextField(controller: _salonCtrl, decoration: const InputDecoration(labelText: "Salón", hintText: "Ej. A-04", border: OutlineInputBorder()))),
+          ]),
+          const SizedBox(height: 25),
+          SizedBox(
+            width: double.infinity,
+            height: 50,
+            child: _isSaving
+                ? const Center(child: CircularProgressIndicator())
+                : ElevatedButton(
+              style: ElevatedButton.styleFrom(backgroundColor: AppTheme.bluePrimary, foregroundColor: Colors.white),
+              onPressed: _submit,
+              child: const Text("Guardar Asignación"),
+            ),
+          )
+        ],
+>>>>>>> b02e3f38a199391d13e8c793264fe648935ec0f9
       ),
     );
   }
diff --git a/lib/features/dashboard/views/student_list_view.dart b/lib/features/dashboard/views/student_list_view.dart
@@ -30,6 +30,7 @@ class StudentListView extends StatelessWidget {
                 return Card(
                   margin: const EdgeInsets.only(bottom: 12),
                   shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+<<<<<<< HEAD
                   elevation: 1,
                   child: ListTile(
                     leading: CircleAvatar(
@@ -43,6 +44,40 @@ class StudentListView extends StatelessWidget {
                       Navigator.push(
                         context,
                         MaterialPageRoute(builder: (context) => StudentDetailView(student: student)),
+=======
+                  clipBehavior: Clip.antiAlias,
+                  child: ExpansionTile(
+                    key: PageStorageKey(academy),
+                    leading: const Icon(Icons.school_outlined, color: AppTheme.blueDark, size: 28),
+                    title: Text(academy, style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 18, color: AppTheme.blueDark)),
+                    backgroundColor: AppTheme.blueSoft.withValues(alpha:0.2),
+                    children: subjects.entries.map((subjectEntry) {
+                      final subject = subjectEntry.key;
+                      final studentList = subjectEntry.value;
+
+                      return ExpansionTile(
+                        key: PageStorageKey('$academy-$subject'),
+                        tilePadding: const EdgeInsets.only(left: 48, right: 24),
+                        leading: const Icon(Icons.menu_book_outlined, color: AppTheme.bluePrimary),
+                        title: Text(subject, style: TextStyle(color: Colors.grey.shade800, fontWeight: FontWeight.w600, fontSize: 16)),
+                        backgroundColor: AppTheme.baseLight.withValues(alpha:0.5),
+                        children: studentList.map((student) {
+                          // --- FIX: Remove toUpperCase() ---
+                          return ListTile(
+                            contentPadding: const EdgeInsets.only(left: 56, right: 16, top: 4, bottom: 4),
+                            leading: const Icon(Icons.person_outline, color: Colors.grey),
+                            title: Text(student.name),
+                            subtitle: Text('Boleta: ${student.boleta}'),
+                            trailing: const Icon(Icons.chevron_right, size: 18),
+                            onTap: () {
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(builder: (context) => StudentDetailView(student: student)),
+                              );
+                            },
+                          );
+                        }).toList(),
+>>>>>>> b02e3f38a199391d13e8c793264fe648935ec0f9
                       );
                     },
                   ),
diff --git a/lib/features/login/views/forgot_password_view.dart b/lib/features/login/views/forgot_password_view.dart
@@ -200,7 +200,7 @@ class ForgotPasswordView extends StatelessWidget {
                   try {
                     for (var userData in usersToCreate) {
                       try {
-                        print("Procesando: ${userData['email']}...");
+                        debugPrint("Procesando: ${userData['email']}...");
 
                         // 2. Crear usuario en la instancia SECUNDARIA
                         // Esto loguea al usuario en 'tempAuth', pero NO en la app principal.
@@ -223,15 +223,15 @@ class ForgotPasswordView extends StatelessWidget {
                             'createdAt': FieldValue.serverTimestamp(),
                           });
                           createdCount++;
-                          print("--> ÉXITO: ${userData['email']}");
+                          debugPrint("--> ÉXITO: ${userData['email']}");
 
                           // Ya no necesitamos signOut() porque 'tempAuth' no afecta la UI
                           // Pero lo hacemos por limpieza interna de la instancia temporal
                           await tempAuth.signOut();
                         }
 
                       } catch (e) {
-                        print("--> ERROR en ${userData['email']}: $e");
+                        debugPrint("--> ERROR en ${userData['email']}: $e");
                         // Si el error es "email-already-in-use", podríamos intentar
                         // actualizar solo el Firestore buscando el UID por email,
                         // pero eso requiere Admin SDK. Aquí solo saltamos.
diff --git a/pubspec.lock b/pubspec.lock
@@ -402,10 +402,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_launcher_icons
-      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
+      sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.1"
+    version: "0.14.4"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -729,10 +729,10 @@ packages:
     dependency: "direct main"
     description:
       name: smooth_page_indicator
-      sha256: b21ebb8bc39cf72d11c7cfd809162a48c3800668ced1c9da3aade13a32cf6c1c
+      sha256: "4b497e9898d095de40d246db943371183fa7482492a88391cfa8415ef94d57ba"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "2.0.1"
   source_gen:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -20,7 +20,7 @@ dependencies:
   provider: ^6.1.2
   intl: ^0.20.2
   url_launcher: ^6.3.0
-  smooth_page_indicator: ^1.1.0
+  smooth_page_indicator: ^2.0.1
 
   collection: ^1.19.0
 
@@ -36,7 +36,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_launcher_icons: "^0.13.1"
+  flutter_launcher_icons: ^0.14.4
   flutter_lints: ^6.0.0
   mockito: ^5.4.4
   build_runner: ^2.4.8
