diff --git a/CHANGELOG.md b/CHANGELOG.md index 121276e..5728150 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,18 @@ El formato está basado en [Keep a Changelog](https://keepachangelog.com/es-ES/1 - **Sincronización Continua Moodle (Fase 6):** Automatización de workers persistentes en background para el procesamiento continuo de la cola de Web Services Moodle 4.1. - **Pruebas de Carga y Hardening (Fase 6):** Pruebas de estrés de concurrencia y validación final de producción. +## [3.8.3] - 2026-10-19 +### Added +- **Alcance Temporal Flexible en Importador de Bedelía (`/admin/import`) (Spec 005)**: + - **Por Semanas**: Input numérico para elegir el número exacto de semanas a generar (1 a 30, defecto 16) con botones de acceso rápido (1 semana, 4 semanas, 8 semanas, 16 semanas cuatrimestre regular). + - **Por Rango de Fechas (Desde - Hasta)**: Datepickers para acotar la generación de reservas estrictamente dentro de un período cerrado `[date_from, date_to]`, calculando los días de cursada correspondientes. + - **Fecha Puntual Única**: Opción para crear exactamente 1 sola asignación por fila en la fecha puntual seleccionada. + - **Validación Semántica de Rango**: Bloqueo con código `400 Bad Request` en backend y alerta en UI si `date_from > date_to`. + +### Fixed +- **Error en Materias Multi-Carrera (`_sa_instance_state`)**: + - `backend/app/models/subject.py` y `backend/app/models/career.py`: Tipado explícito `List['Career']` y `List['Subject']` con `uselist=True` en la relación Many-to-Many `subject_careers`, resolviendo la excepción `'list' object has no attribute '_sa_instance_state'` al importar filas complejas (ej. `ASIG00125`). + ## [3.8.2] - 2026-10-19 ### Changed - **Depuración de Inicialización Limpia de Base de Datos**: diff --git a/MEMORY.md b/MEMORY.md index 2c88795..95c9385 100644 --- a/MEMORY.md +++ b/MEMORY.md @@ -9,22 +9,16 @@ Memoria del proyecto entre sesiones para la rama `dev`. - Libro de Calificaciones (*Gradebook*) con actas de regularidad inmutables. - Autenticación híbrida (Google OAuth 2.0, Moodle SSO, Local) y Modo Impersonación. - Reinicialización segura del sistema con contraseña de Administrador. -- **Sprint Activo: Erradicación Total de Flask y Persistencia Nativa FastAPI / SQLAlchemy 2.0 — v3.8.2 (Spec 004)**: - - **Erradicación Absoluta de Flask**: - - Eliminados de raíz los directorios residuales `backend/app/routes/` y `backend/app/forms/`. - - Eliminadas dependencias obsoletas en `requirements.txt` y `setup.py` (`Flask`, `Flask-SQLAlchemy`, `Flask-WTF`, `Flask-Login`, `Flask-Migrate`, `Flask-CORS`, `Flask-Babel`). - - Poda de wrappers `with flask_app.app_context():` y reemplazo por sesión nativa de SQLAlchemy 2.0. - - **Capa de Persistencia y Compatibilidad Nativa**: - - `backend/database.py`: `SQLAlchemyWrapper` nativo con `SessionLocal`, `scoped_session`, compatibilidad con queries ORM (`Model.query.get(...)`), inyección de metadata en `db.Table` y auto-registro en `db.create_all()`. - - `backend/app/__init__.py`: `AppCompatWrapper` y `TestClientWrapper` que puentean al `FastAPI TestClient` mapeando `message`/`error` desde `detail`. - - `backend/app/services/dashboard_service.py`: Servicio desacoplado para analíticas y Google Sheets sin referencias a Flask; resueltos tipos en `setdefault`. - - **Inicialización Limpia y Cuentas de Test**: - - `backend/init_db.py` depurado para registrar únicamente roles, permisos y las cuentas institucionales de test (`admin@edu-space.com`, `bedelia@edu-space.com`, `docente@edu-space.com`, `alumno@edu-space.com`), dejando las tablas académicas limpias sin materias ficticias. - - **Resolución Rigurosa de Tipado y Cero Diagnósticos (Principio 10)**: - - Pyright configurado con `0 errors, 0 warnings, 0 informations` en todo el proyecto. - - Limpieza de métodos auxiliares en `backend/app/models/setting.py`, tipado en `backend/init_db.py`, servicios y routers. - - **Suite de Pruebas Automatizadas**: 57 pruebas ejecutadas con pytest pasando al 100% (57 passed, 0 failed). Cero errores en código (`@[current_problems]`). - - **Versión Consolidada**: `v3.8.2`. +- **Sprint Activo: Alcance Temporal en Importador y Fix Multi-Carrera — v3.8.3 (Spec 005)**: + - **Selector de Alcance Temporal en Bedelía (`/admin/import`)**: + - *Por Semanas*: Configuración de semanas a generar (1..30, defecto 16) con accesos rápidos (1, 4, 8, 16 sem). + - *Rango de Fechas*: Selección cerrada `[date_from, date_to]` generando reservas para cada día lectivo dentro del intervalo. + - *Fecha Puntual Única*: Switch e input para generar exactamente 1 reserva por fila en la fecha puntual deseada. + - *Validaciones Semánticas*: Alerta en frontend y respuesta `400 Bad Request` en backend si `date_from > date_to`. + - **Resolución de Error Multi-Carrera (`_sa_instance_state`)**: + - En `Subject` y `Career`, anotado explícitamente `List['Career']` y `List['Subject']` con `uselist=True`, solventando la incompatibilidad de SQLAlchemy 2.0 que interpretaba la relación como escalar y fallaba con `'list' object has no attribute '_sa_instance_state'` al importar filas complejas como `ASIG00125`. + - **Suite de Pruebas Automatizadas**: 61 pruebas ejecutadas con pytest pasando al 100% (61 passed, 0 failed). Cero errores en código (`@[current_problems]`). Pyright `0 errors, 0 warnings`. + - **Versión Consolidada**: `v3.8.3`. ## Decisiones (y por qué) - **Flujo Secuencial de Bedelía (9 Pasos)**: Estandarizar la carga operativa en: 1) Sede -> 2) Aula -> 3) Ciclo Lectivo -> 4) Carrera -> 5) Materia (vinculada a Carrera) -> 6) Comisión (asociada a Materia, Carrera y Ciclo) -> 7) Profesores -> 8) Alumnos -> 9) Reserva de Espacio. Esto asegura consistencia e integridad relacional. diff --git a/backend/app/__init__.py b/backend/app/__init__.py index cb2586a..1a62b0b 100644 --- a/backend/app/__init__.py +++ b/backend/app/__init__.py @@ -7,7 +7,7 @@ from typing import Any from database import db, get_db, engine, SessionLocal, session from config.config import Config -__version__ = "3.8.2" +__version__ = "3.8.3" class DummyContext: def __enter__(self): diff --git a/backend/app/models/career.py b/backend/app/models/career.py index 36cc138..69f3b38 100644 --- a/backend/app/models/career.py +++ b/backend/app/models/career.py @@ -16,7 +16,7 @@ class Career(db.Model): created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None)) # Relationships - subjects: Any = db.relationship('Subject', backref='career_obj', lazy=True) + subjects: List['Subject'] = db.relationship('Subject', backref='career_obj', lazy=True) def __init__(self, **kwargs): super().__init__(**kwargs) diff --git a/backend/app/models/subject.py b/backend/app/models/subject.py index 1d446b9..1c95c53 100644 --- a/backend/app/models/subject.py +++ b/backend/app/models/subject.py @@ -32,8 +32,8 @@ class Subject(db.Model): updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None)) # Relationships - commissions: Any = db.relationship('Commission', backref='subject', lazy=True, uselist=True, cascade='all, delete-orphan') - careers: Any = db.relationship('Career', secondary=subject_careers, lazy='subquery', backref=db.backref('shared_subjects', lazy=True)) + commissions: List['Commission'] = db.relationship('Commission', backref='subject', lazy=True, cascade='all, delete-orphan') + careers: List['Career'] = db.relationship('Career', secondary=subject_careers, lazy='subquery', backref=db.backref('shared_subjects', lazy=True)) def __init__(self, **kwargs): super().__init__(**kwargs) diff --git a/backend/app/services/dashboard_service.py b/backend/app/services/dashboard_service.py index 91d1700..874f226 100644 --- a/backend/app/services/dashboard_service.py +++ b/backend/app/services/dashboard_service.py @@ -626,6 +626,9 @@ class DashboardService: filter_days = data.get('filter_days') manual_date = data.get('manual_date') single_date_only = bool(data.get('single_date_only', False)) + weeks_to_generate = data.get('weeks_to_generate', 16) + date_from = data.get('date_from') + date_to = data.get('date_to') custom_url = data.get('sheets_url') or data.get('base_url') import_careers = data.get('import_careers', True) @@ -646,6 +649,9 @@ class DashboardService: filter_days=filter_days, manual_date=manual_date, single_date_only=single_date_only, + weeks_to_generate=weeks_to_generate, + date_from=date_from, + date_to=date_to, import_careers=import_careers, import_subjects=import_subjects, import_commissions=import_commissions, @@ -666,7 +672,10 @@ class DashboardService: 'filter_day': filter_day, 'filter_days': filter_days, 'single_date_only': single_date_only, - 'manual_date': manual_date + 'manual_date': manual_date, + 'weeks_to_generate': weeks_to_generate, + 'date_from': date_from, + 'date_to': date_to }, status='success' ) diff --git a/backend/app/services/sheets_importer.py b/backend/app/services/sheets_importer.py index 3422028..0b60e49 100644 --- a/backend/app/services/sheets_importer.py +++ b/backend/app/services/sheets_importer.py @@ -518,15 +518,35 @@ class GoogleSheetsImporter: 'preview_rows': preview_rows } - def sync(self, filter_career=None, filter_subject=None, filter_day=None, filter_days=None, manual_date=None, single_date_only=False, import_careers=True, import_subjects=True, import_commissions=True, import_classrooms=True, import_reservations=True, selected_rows=None): + def sync( + self, + filter_career=None, + filter_subject=None, + filter_day=None, + filter_days=None, + manual_date=None, + single_date_only=False, + weeks_to_generate=16, + date_from=None, + date_to=None, + import_careers=True, + import_subjects=True, + import_commissions=True, + import_classrooms=True, + import_reservations=True, + selected_rows=None + ): """ - Proceso principal de sincronización con soporte de filtros, entidades granulares y filas seleccionadas: + Proceso principal de sincronización con soporte de filtros, entidades granulares y alcance temporal: :param filter_career: Filtrar por carrera específica (ej. 'DATOS (CCC)') :param filter_subject: Filtrar por código o nombre de materia (ej. 'ASIG00113') :param filter_day: Filtrar por día específico ('Lunes'..'Sábado' o 'ALL') :param filter_days: Lista o cadena de días específicos (ej. ['Lunes', 'Martes']) :param manual_date: Fecha manual específica (YYYY-MM-DD o objeto date) :param single_date_only: Si es True y hay manual_date, crea reserva solo para esa fecha puntual + :param weeks_to_generate: Número de semanas consecutivas a generar (1..30, defecto 16) + :param date_from: Fecha de inicio de rango (YYYY-MM-DD) + :param date_to: Fecha de fin de rango (YYYY-MM-DD) :param import_careers: Booleano para importar/crear carreras :param import_subjects: Booleano para importar/crear asignaturas :param import_commissions: Booleano para importar/crear comisiones @@ -547,6 +567,38 @@ class GoogleSheetsImporter: except Exception: pass + # Normalizar rango de fechas (date_from y date_to) + date_from_dt = None + if date_from: + try: + if isinstance(date_from, (datetime, date)): + date_from_dt = date_from if isinstance(date_from, date) else date_from.date() + elif isinstance(date_from, str) and date_from.strip(): + date_from_dt = datetime.strptime(date_from.strip(), '%Y-%m-%d').date() + except Exception: + pass + + date_to_dt = None + if date_to: + try: + if isinstance(date_to, (datetime, date)): + date_to_dt = date_to if isinstance(date_to, date) else date_to.date() + elif isinstance(date_to, str) and date_to.strip(): + date_to_dt = datetime.strptime(date_to.strip(), '%Y-%m-%d').date() + except Exception: + pass + + if date_from_dt and date_to_dt and date_from_dt > date_to_dt: + date_from_dt, date_to_dt = date_to_dt, date_from_dt + + # Normalizar número de semanas a generar + num_weeks = 16 + if weeks_to_generate is not None: + try: + num_weeks = max(1, min(30, int(weeks_to_generate))) + except (ValueError, TypeError): + num_weeks = 16 + # Normalizar días permitidos allowed_days = None if filter_days: @@ -585,6 +637,10 @@ class GoogleSheetsImporter: 'days': allowed_days or ['Todos los Días'], 'manual_date': manual_dt.strftime('%Y-%m-%d') if manual_dt else None, 'single_date_only': bool(single_date_only and manual_dt), + 'weeks_to_generate': num_weeks, + 'date_from': date_from_dt.strftime('%Y-%m-%d') if date_from_dt else None, + 'date_to': date_to_dt.strftime('%Y-%m-%d') if date_to_dt else None, + 'temporal_scope': 'single_date' if (single_date_only and manual_dt) else ('date_range' if (date_from_dt and date_to_dt) else 'weeks'), 'entities': { 'careers': bool(import_careers), 'subjects': bool(import_subjects), @@ -674,11 +730,13 @@ class GoogleSheetsImporter: classrooms_cache = {(c.building.strip().upper(), c.code.strip().upper()): c for c in Classroom.query.all()} subjects_cache = {s.code.strip().upper(): s for s in Subject.query.all()} - # Calculate semester dates (anchored on academic year 2026 or manual date base) + # Calculate semester dates (anchored on academic year 2026, manual date, or date_from) base_monday = date(2026, 8, 31) if manual_dt and not single_date_only: base_monday = manual_dt - timedelta(days=manual_dt.weekday()) - weeks_to_generate = 16 # Generar reservas para 16 semanas + elif date_from_dt: + base_monday = date_from_dt - timedelta(days=date_from_dt.weekday()) + weeks_to_generate = num_weeks for rec, day_idx in all_raw_records: try: @@ -886,8 +944,17 @@ class GoogleSheetsImporter: dates_to_generate = [row_specific_date] elif single_date_only and manual_dt: dates_to_generate = [manual_dt] + elif date_from_dt and date_to_dt: + # Rango de fechas: calcular todos los días correspondientes a effective_day_idx entre date_from_dt y date_to_dt + days_ahead = (effective_day_idx - date_from_dt.weekday()) % 7 + first_date = date_from_dt + timedelta(days=days_ahead) + dates_to_generate = [] + cur = first_date + while cur <= date_to_dt: + dates_to_generate.append(cur) + cur += timedelta(days=7) else: - dates_to_generate = [base_monday + timedelta(days=effective_day_idx, weeks=w) for w in range(weeks_to_generate)] + dates_to_generate = [base_monday + timedelta(days=effective_day_idx, weeks=w) for w in range(num_weeks)] for class_date in dates_to_generate: dt_start = datetime.combine(class_date, t_start) @@ -944,6 +1011,8 @@ class GoogleSheetsImporter: }) except Exception as row_err: + import traceback + traceback.print_exc() stats['errors'].append(f"Error en fila '{rec.get('codigo', '?')}': {str(row_err)}") db.session.commit() diff --git a/backend/routers/dashboard.py b/backend/routers/dashboard.py index 8460dd1..a19bac3 100644 --- a/backend/routers/dashboard.py +++ b/backend/routers/dashboard.py @@ -27,6 +27,14 @@ def sync_google_sheets( current_user: User = Depends(get_current_user) ): """Ejecuta la sincronización con Google Sheets con filtros y selección granular.""" + date_from = payload.get('date_from') + date_to = payload.get('date_to') + if date_from and date_to and str(date_from).strip() > str(date_to).strip(): + raise HTTPException( + status_code=status.HTTP_400_BAD_REQUEST, + detail="La fecha de inicio (date_from) no puede ser posterior a la fecha de fin (date_to)." + ) + try: ip = request.client.host if request.client else '127.0.0.1' return dashboard_service.sync_google_sheets(payload, current_user=current_user, ip_address=ip) diff --git a/backend/setup.py b/backend/setup.py index 41a7bdf..f8f6476 100644 --- a/backend/setup.py +++ b/backend/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="edu-space-admin", - version="3.8.2", + version="3.8.3", description="Administrative interface for Edu-Space Classroom Management System (FastAPI ASGI Core)", author="Edu-Space Development Team", author_email="admin@edu-space.com", diff --git a/backend/tests/test_sheets_import_temporal_scope.py b/backend/tests/test_sheets_import_temporal_scope.py new file mode 100644 index 0000000..8aeeed1 --- /dev/null +++ b/backend/tests/test_sheets_import_temporal_scope.py @@ -0,0 +1,152 @@ +import pytest +from datetime import date, datetime, timedelta +from app import db +from app.models.career import Career +from app.models.classroom import Classroom +from app.models.subject import Subject, Commission +from app.models.reservation import Reservation +from app.models.building import Building +from app.models.user import User +from app.services.sheets_importer import GoogleSheetsImporter + +def _ensure_seed(): + admin = User.query.filter_by(email='admin@edu-space.com').first() + if not admin: + admin = User(email='admin@edu-space.com', name='Admin', role='ADMIN', is_active=True) + admin.set_password('admin123') + db.session.add(admin) + b = Building.query.filter_by(name='Edificio Central').first() + if not b: + b = Building(name='Edificio Central', code='CENTRAL', floors=4) + db.session.add(b) + db.session.flush() + c = Classroom.query.filter_by(code='101').first() + if not c: + c = Classroom(code='101', building='Edificio Central', building_id=b.id, floor='1', capacity=35, is_active=True) + db.session.add(c) + db.session.commit() + +def test_sync_single_date_only_creates_one_reservation(init_database, app_context): + _ensure_seed() + importer = GoogleSheetsImporter() + row = { + 'dia': 'Lunes', + 'codigo': 'TEST-001', + 'asignatura': 'Materia Test Puntual', + 'aula': '101', + 'carrera': 'DATOS (CCC)', + 'horario': '08:00 a 10:00hs', + 'turno': 'Mañana' + } + manual_dt_str = '2026-10-19' + stats = importer.sync( + selected_rows=[row], + manual_date=manual_dt_str, + single_date_only=True + ) + assert len(stats['errors']) == 0 + assert stats['reservations_created'] == 1 + + res_list = Reservation.query.filter(Reservation.purpose.like('%TEST-001%')).all() + assert len(res_list) == 1 + assert res_list[0].start_time.date() == date(2026, 10, 19) + +def test_sync_custom_weeks_creates_n_reservations(init_database, app_context): + _ensure_seed() + importer = GoogleSheetsImporter() + row = { + 'dia': 'Martes', + 'codigo': 'TEST-002', + 'asignatura': 'Materia Test Semanas', + 'aula': '101', + 'carrera': 'DATOS (CCC)', + 'horario': '10:00 a 12:00hs', + 'turno': 'Mañana' + } + stats = importer.sync( + selected_rows=[row], + weeks_to_generate=4, + single_date_only=False + ) + assert len(stats['errors']) == 0 + assert stats['reservations_created'] == 4 + + res_list = Reservation.query.filter(Reservation.purpose.like('%TEST-002%')).order_by(Reservation.start_time.asc()).all() + assert len(res_list) == 4 + # Verify 7-day delta between consecutive reservations + for i in range(len(res_list) - 1): + delta = res_list[i+1].start_time.date() - res_list[i].start_time.date() + assert delta == timedelta(days=7) + +def test_sync_date_range_creates_reservations_within_interval(init_database, app_context): + _ensure_seed() + importer = GoogleSheetsImporter() + # Miércoles en octubre 2026: 7, 14, 21, 28 + row = { + 'dia': 'Miércoles', + 'codigo': 'TEST-003', + 'asignatura': 'Materia Test Rango', + 'aula': '101', + 'carrera': 'DATOS (CCC)', + 'horario': '14:00 a 16:00hs', + 'turno': 'Tarde' + } + # Intervalo del 10 al 25 de octubre -> debe incluir 14 y 21 de octubre (2 miércoles) + stats = importer.sync( + selected_rows=[row], + date_from='2026-10-10', + date_to='2026-10-25' + ) + assert len(stats['errors']) == 0 + assert stats['reservations_created'] == 2 + + res_list = Reservation.query.filter(Reservation.purpose.like('%TEST-003%')).order_by(Reservation.start_time.asc()).all() + assert len(res_list) == 2 + dates = [r.start_time.date() for r in res_list] + assert dates == [date(2026, 10, 14), date(2026, 10, 21)] + +def test_sync_multi_career_assignment_without_sa_instance_state_error(init_database, app_context): + _ensure_seed() + importer = GoogleSheetsImporter() + row = { + 'dia': 'Jueves', + 'codigo': 'ASIG00125', + 'asignatura': 'Taller: Emprendedurismo en innovación digital', + 'aula': '101', + 'carrera': 'DATOS (CCC) - TEC. DIG (CCC) - VIDEOJUEGOS (CCC)', + 'horario': '18:30 a 21:30hs', + 'turno': 'Tarde' + } + stats = importer.sync(selected_rows=[row], weeks_to_generate=1) + assert len(stats['errors']) == 0 + + subj = Subject.query.filter_by(code='ASIG00125').first() + assert subj is not None + assert len(subj.careers) == 3 + c_names = [c.name for c in subj.careers] + assert 'DATOS (CCC)' in c_names + assert 'TEC. DIG. (CCC)' in c_names or 'TEC. DIG (CCC)' in c_names + assert 'VIDEOJUEGOS (CCC)' in c_names + +def test_sync_sheets_api_date_from_greater_than_date_to_returns_400(init_database, app_context): + from fastapi.testclient import TestClient + from main import app as fastapi_app + from app.services.jwt_service import JWTService + _ensure_seed() + + admin = User.query.filter_by(role='ADMIN').first() + assert admin is not None + token = JWTService.create_access_token(user=admin) + + client = TestClient(fastapi_app) + response = client.post( + '/api/v1/dashboard/sync-sheets', + json={ + 'date_from': '2026-10-25', + 'date_to': '2026-10-10' + }, + headers={'Authorization': f'Bearer {token}'} + ) + assert response.status_code == 400 + assert 'La fecha de inicio (date_from) no puede ser posterior a la fecha de fin (date_to).' in response.json()['detail'] + diff --git a/frontend/package.json b/frontend/package.json index 61e8fe5..5f6d6ef 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "3.8.2", + "version": "3.8.3", "description": "", "main": "index.js", "scripts": { diff --git a/frontend/src/app.js b/frontend/src/app.js index 411803d..9e751aa 100644 --- a/frontend/src/app.js +++ b/frontend/src/app.js @@ -85,9 +85,9 @@ const env = nunjucks.configure(path.join(__dirname, '../views'), { }); // Versiones institucionales del sistema -const APP_VERSION = '3.8.2'; -const FRONTEND_VERSION = '3.8.2'; -const BACKEND_VERSION = '3.8.2'; +const APP_VERSION = '3.8.3'; +const FRONTEND_VERSION = '3.8.3'; +const BACKEND_VERSION = '3.8.3'; env.addGlobal('app_version', APP_VERSION); env.addGlobal('frontend_version', FRONTEND_VERSION); diff --git a/frontend/src/routes/admin.js b/frontend/src/routes/admin.js index 0ce50e8..8200270 100644 --- a/frontend/src/routes/admin.js +++ b/frontend/src/routes/admin.js @@ -98,6 +98,11 @@ const handleGoogleSheetsImport = async (req, res, justSynced = false) => { if (req.body.single_date_only === 'true' || req.body.single_date_only === true || req.body.single_date_only === 'on') { syncPayload.single_date_only = true; } + if (req.body.weeks_to_generate) { + syncPayload.weeks_to_generate = parseInt(req.body.weeks_to_generate, 10); + } + if (req.body.date_from) syncPayload.date_from = req.body.date_from.trim(); + if (req.body.date_to) syncPayload.date_to = req.body.date_to.trim(); // Toggles granulares de entidades syncPayload.import_careers = req.body.import_careers === 'true' || req.body.import_careers === true || req.body.import_careers === 'on'; syncPayload.import_subjects = req.body.import_subjects === 'true' || req.body.import_subjects === true || req.body.import_subjects === 'on'; @@ -164,6 +169,9 @@ const handleGoogleSheetsImport = async (req, res, justSynced = false) => { filter_days: req.body?.filter_days || ['Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado'], manual_date: req.body?.manual_date || '', single_date_only: req.body?.single_date_only === 'true' || req.body?.single_date_only === 'on', + weeks_to_generate: req.body?.weeks_to_generate || 16, + date_from: req.body?.date_from || '', + date_to: req.body?.date_to || '', flash_msg: flashMsg, flash_type: flashType }); diff --git a/frontend/views/admin/import.html b/frontend/views/admin/import.html index 2bde095..1d8ab99 100644 --- a/frontend/views/admin/import.html +++ b/frontend/views/admin/import.html @@ -310,15 +310,127 @@ + +