Skip to content

REC-212 - Implementa nueva muestra de historial de recetas #3341

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

Merged
negro89 merged 1 commit into from
Oct 9, 2026
Merged

REC-212 - Implementa nueva muestra de historial de recetas #3341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/app/modules/rup/components/ejecucion/hudsBusqueda.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,14 +1359,14 @@ export class HudsBusquedaComponent implements AfterContentInit, OnInit, OnDestro
}

checkDispensaAnticipada(receta) {
if (receta.estadoDispensaActual && receta.estadoDispensaActual.fecha) {
if (receta?.estadoDispensaActual?.tipo && receta.estadoDispensaActual.tipo !== 'sin-dispensa' && receta.estadoDispensaActual.fecha) {
const fechaDispensa = moment(receta.estadoDispensaActual.fecha);
const fechaRegistro = moment(receta.fechaRegistro);

if (fechaDispensa.isBefore(fechaRegistro)) {
if (receta.estadoActual.tipo === 'finalizada') {
if (receta.estadoActual?.tipo === 'finalizada') {
return 'dispensa anticipada';
} else if (receta.estadoActual.tipo === 'pendiente') {
} else if (receta.estadoActual?.tipo === 'pendiente') {
return 'dispensa parcial anticipada';
}
}
Expand Down
17 changes: 10 additions & 7 deletions src/app/modules/rup/components/ejecucion/hudsBusqueda.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,16 @@ <h6 class="titulo-filtro {{filtroActual}}">{{ getTitulo(filtroActual) | uppercas
{{ grupo.recetaVisible?.estadoActual?.tipo.replace('-', ' ')
}}
</plex-badge>
<plex-badge size="sm"
[type]="estadoDispensa[grupo.recetaVisible?.estadoDispensaActual.tipo]">
{{
grupo.recetaVisible?.estadoDispensaActual?.tipo.replace('-',
' ')
}}
</plex-badge>
<plex-badge *ngIf="!checkDispensaAnticipada(grupo.recetaVisible)" size="sm"
[type]="estadoDispensa[grupo.recetaVisible?.estadoDispensaActual.tipo]">
{{
grupo.recetaVisible?.estadoDispensaActual?.tipo.replace('-',
' ')
}}
</plex-badge>
<plex-badge *ngIf="checkDispensaAnticipada(grupo.recetaVisible)" size="sm" type="warning">
{{ checkDispensaAnticipada(grupo.recetaVisible) }}
</plex-badge>
</div>
</div>
</div>
Expand Down
Loading
Loading