Skip to content

AM - Agregar leyenda para turnos de prestaciones asincrónicas #2297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fabio-Ramirez wants to merge 2 commits into
base: master
Choose a base branch
from
Open

AM - Agregar leyenda para turnos de prestaciones asincrónicas #2297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d08e6d
AM - Agregar leyenda para turnos de prestaciones asincrónicas
Fabio-Ramirez Aug 19, 2026
bf001a7
Se agrega fix para ver la videollamada y filtro para permitir el turn…
Fabio-Ramirez Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions modules/mobileApp/routes/turnos.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,23 +64,39 @@ router.get('/turnos', async (req: any, res, next) => {
if (req.query.codificado) {
matchTurno['bloques.turnos.diagnosticos.0'] = { $exists: true };
}
const matchTurnoPost = { ...matchTurno };

if (req.query.horaInicio) {
matchTurno['bloques.turnos.horaInicio'] = { $gte: new Date(req.query.horaInicio) };
// Incluir agendas cuya horaFin esté hasta 1 hora después del inicio solicitado
const horaInicioDate = new Date(req.query.horaInicio);
const horaInicioMenos1Hora = new Date(horaInicioDate.getTime() + 60 * 60 * 1000);
matchTurno['horaFin'] = { $gte: horaInicioMenos1Hora };
matchTurnoPost['$expr'] = {
$gte: [
{
$add: [
'$bloques.turnos.horaInicio',
{ $multiply: ['$bloques.duracionTurno', 60, 1000] }
]
},
horaInicioDate
]
};
}

if (req.query.horaFinal) {
matchTurno['bloques.turnos.horaInicio'] = { $lt: new Date(req.query.horaFinal) };
matchTurno['horaInicio'] = { $lt: new Date(req.query.horaFinal) };
matchTurnoPost['bloques.turnos.horaInicio'] = { $lt: new Date(req.query.horaFinal) };
}

if (req.query.tiposTurno) {
matchTurno['bloques.turnos.tipoTurno'] = { $in: req.query.tiposTurno };
matchTurnoPost['bloques.turnos.tipoTurno'] = { $in: req.query.tiposTurno };
}

pipelineTurno.push({ $match: matchTurno });
pipelineTurno.push({ $unwind: '$bloques' });
pipelineTurno.push({ $unwind: '$bloques.turnos' });
pipelineTurno.push({ $match: matchTurno });
pipelineTurno.push({ $match: matchTurnoPost });
pipelineTurno.push({
$group: {
_id: { id: '$_id', bloqueId: '$bloques._id' },
Expand Down Expand Up @@ -124,10 +140,12 @@ router.get('/turnos', async (req: any, res, next) => {
turno.duracionTurno = elem.duracionTurno;
turno.bloque_id = elem.bloque_id;
turno.agenda_estado = elem.agenda_estado;
turno.webexLinks = elem.bloques.turnos.webexLinks;

delete turno.updatedBy;
delete turno.updatedAt;


/* Busco el turno anterior cuando fue reasignado */
const reasignado = turno.reasignado && turno.reasignado.siguiente;

Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
},
"scripts": {
"startNode": "tsc && gulp && concurrently \"npm run node\" ",
"start": "DEBUG=andes concurrently -r \"npm run tsc:w\" \"npm run node\" ",
"start": "set DEBUG=andes && concurrently -r \"npm run tsc:w\" \"npm run node\" ",
"node": "nodemon -q ./index.js",
"tsc": "tsc",
"tsc:w": "tsc -w",
Expand Down Expand Up @@ -187,4 +187,4 @@
"ts-jest": "^24.1.0",
"tslint-eslint-rules": "^4.1.1"
}
}
}
Loading