SekiDesu01/KSNE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add companion2 support, fix UI rendering, and update test data generator

Browse Source
This commit is contained in:
weko
2026-06-22 02:31:08 -04:00
parent 81251fb869
commit ac0dd65efa
10 changed files with 268 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/rendiciones_service.py
View File

@@ -31,6 +31,7 @@ def get_filtered_rendiciones(fecha_inicio, fecha_fin, zona_id, modulo_id):
fin = datetime.strptime(fecha_fin, '%Y-%m-%d').date()
Companion = aliased(Worker)
Companion2 = aliased(Worker)
filters = [
Rendicion.fecha >= inicio,
@@ -52,11 +53,14 @@ def get_filtered_rendiciones(fecha_inicio, fecha_fin, zona_id, modulo_id):
Companion.name.label('companion_name'),
Rendicion.worker_id, Rendicion.companion_id, Rendicion.modulo_id,
Rendicion.worker_comision, Rendicion.companion_comision,
Companion2.name.label('companion2_name'),
Rendicion.companion2_id, Rendicion.companion2_comision,
Rendicion.boletas_debito, Rendicion.boletas_credito,
Rendicion.boletas_mp, Rendicion.boletas_efectivo,
).join(Worker, Rendicion.worker_id == Worker.id
).join(Modulo, Rendicion.modulo_id == Modulo.id
).outerjoin(Companion, Rendicion.companion_id == Companion.id
).outerjoin(Companion2, Rendicion.companion2_id == Companion2.id
).filter(*filters
).order_by(Rendicion.fecha.desc(), Rendicion.id.desc()).all()