-
Notifications
You must be signed in to change notification settings - Fork 5
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.
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
IN - Permitir anular prestaciones de internación #2658
Conversation
@@ -127,7 +131,7 @@ export class RegistrosHudsDetalleComponent implements OnInit { | |||
if (tipoPrestacion) { | |||
return fecha.isSameOrBefore(hasta, 'd') && fecha.isSameOrAfter(desde, 'd') && tipoPrestacion.conceptId === prestacion.solicitud.tipoPrestacion.conceptId; | |||
} | |||
return fecha.isSameOrBefore(hasta, 'd') && fecha.isSameOrAfter(desde, 'd'); | |||
return fecha.isSameOrBefore(hasta, 'd') && fecha.isSameOrAfter(desde, 'd') && (this.prestacionesEliminadas.findIndex(id => id === prestacion.id) === -1); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
si se quiere saber si existe en un array un elemento dada una condicion, usar some():
https://developer.mozilla.org/es/docs/Web/JavaScript/Reference/Global_Objects/Array/some
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Corregido!
@@ -115,8 +115,12 @@ export class RegistrosHudsDetalleComponent implements OnInit { | |||
this.hasta$, | |||
this.tipoPrestacion$, | |||
this.min$, | |||
this.refresh$ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Es medio confuso el nombre refresh$ si solo es un id de la prestacion que se usa para que se dispare el combineLatest, por ahi le pondria un nombre mas referido a lo que guarda
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Corregido!
Resolver conflictos |
1 similar comment
Resolver conflictos |
Resolver conflictos para subir |
6054405
to
2bf2602
Compare
Resuelto! |
# [5.100.0](v5.99.1...v5.100.0) (2022-07-06) ### Bug Fixes * **plan-indiciaciones:** scroll grilla ([#2695](#2695)) ([b6e0a41](b6e0a41)) ### Features * **CITAS:** agrega nombre del dia en listado de agendas ([#2681](#2681)) ([e1c2727](e1c2727)) * **IN-430:** Permitir anular prestaciones de internacion ([#2658](#2658)) ([c1ab483](c1ab483)) * **IN-442:** Labels de resultados en pantalla de censos ([#2672](#2672)) ([aef3a26](aef3a26)) * **INTERNACION:** cambio de lugar botones ([#2692](#2692)) ([599039f](599039f)) * **MISC-225:** Agregar filtro por conceptos en el reporte c2 ([#2634](#2634)) ([a4b9904](a4b9904)) * **RUP:** cambio condicion de required ([#2694](#2694)) ([89ec7f6](89ec7f6))
Requerimiento
https://proyectos.andes.gob.ar/browse/IN-430
Funcionalidad desarrollada
UserStory llegó a completarse
Requiere actualizaciones en la base de datos
Requiere actualizaciones en la API
Requiere actualizaciones en andes-test-integracion