ADUANASOFT/plantillas-proyectos
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge development, resolviendo utilidades combinadas y actualizando ClassDialog

Browse Source
This commit is contained in:
Kevin_Ramirez
2026-04-16 12:13:39 -05:00
parent cd04841adc 9e91cd1791
commit b8a07b5172
4 changed files with 257 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
backend/api/v1/modules/a76/classes/service.py
View File

@@ -48,27 +48,30 @@ class ClassService:
query = query.filter(Class.company_id == company_id)
if filters:
if filters.get("q"):
search = f"%{filters['q']}%"
# Búsqueda libre: OR en clave y descripciones (selectores / listados)
search_raw = filters.get("search") or filters.get("q")
if search_raw and str(search_raw).strip():
pattern = f"%{str(search_raw).strip()}%"
query = query.filter(
or_(
Class.class_code.ilike(search),
Class.description_es.ilike(search),
Class.description_en.ilike(search)
Class.class_code.ilike(pattern),
Class.description_es.ilike(pattern),
Class.description_en.ilike(pattern),
)
)
if filters.get("class_code"):
query = query.filter(
Class.class_code.ilike(f"%{filters['class_code']}%")
)
if filters.get("description"):
description_pattern = f"%{filters['description']}%"
query = query.filter(
or_(
Class.description_es.ilike(description_pattern),
Class.description_en.ilike(description_pattern),
else:
if filters.get("class_code"):
query = query.filter(
Class.class_code.ilike(f"%{filters['class_code']}%")
)
if filters.get("description"):
description_pattern = f"%{filters['description']}%"
query = query.filter(
or_(
Class.description_es.ilike(description_pattern),
Class.description_en.ilike(description_pattern),
)
)
)
if filters.get("material_key"):
query = query.filter(
Class.material_key.ilike(f"%{filters['material_key']}%")