Skip to content

COM - 124 : Descarga de historial de solicitud #2320

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
aldoEMatamala wants to merge 1 commit into
base: master
Choose a base branch
from
Open

COM - 124 : Descarga de historial de solicitud #2320

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
52 changes: 47 additions & 5 deletions modules/descargas/com/derivacion-body.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,45 @@ export class DerivacionBody extends HTMLComponent {
</div>
{{/if}}

{{#if historial}}
<br><br>
<div class="row">
<div class="col">
<span><b>HISTORIAL DE DERIVACIÓN</b></span>
</div>
</div>
<br>
{{#each historial}}
<div class="row" style="margin-bottom: 8px;">
<div class="col">
<span>FECHA: {{ fechaCreacion }} hs</span><br>
{{#if estado}}
<span>Pasa a <b>{{ estado }}</b> por {{ createdBy.nombreCompleto }}{{#if createdBy.organizacion.nombre}} de {{ createdBy.organizacion.nombre }}{{/if}}</span><br>
{{else}}
<span>Actualizado por {{ createdBy.nombreCompleto }}{{#if createdBy.organizacion.nombre}} de {{ createdBy.organizacion.nombre }}{{/if}}</span><br>
{{/if}}
{{#if observacion}}
<span>Observaciones: {{ observacion }}</span><br>
{{/if}}
{{#if dispositivo}}
<span>Dispositivo de soporte de oxígeno: {{ dispositivo.nombre }}: {{ dispositivo.descripcion }}</span><br>
{{/if}}
{{#if prioridad}}
{{#if reporteCOM}}
<span>Nueva prioridad: {{ prioridad }}</span><br>
{{/if}}
{{/if}}
{{#if organizacionDestino}}
<span>Destino: {{ organizacionDestino.nombre }}</span><br>
{{/if}}
{{#if unidadDestino}}
<span>Unidad Destino: {{ unidadDestino.term }}</span><br>
{{/if}}
</div>
</div>
{{/each}}
{{/if}}

{{#if firmaHTML}}
{{{ firmaHTML }}}
{{/if}}
Expand Down Expand Up @@ -259,7 +298,7 @@ export class DerivacionBody extends HTMLComponent {
datosSolicitud,
firmaHTML,
historial,
reporteCOM: organizacion?.esCOM
reporteCOM: organizacion ? Boolean(organizacion.esCOM) : true
};
}

Expand All @@ -274,15 +313,18 @@ export class DerivacionBody extends HTMLComponent {
}

async getHistorialDerivacion(organizacion, derivacion) {
derivacion.historial.shift();
let historial = organizacion.esCOM ? derivacion.historial : derivacion.historial.filter((h) => h.createdBy.organizacion.id === organizacion.id);
const copyHistorial = [...(derivacion.historial || [])];
const esCOM = organizacion ? Boolean(organizacion.esCOM) : true;
let historial = esCOM
? copyHistorial
: copyHistorial.filter((h) => h.createdBy?.organizacion?.id?.toString() === organizacion?.id?.toString());
historial = historial.filter(h => !h.eliminado);
historial.forEach(h => {
h.fechaCreacion = moment(h.createdAt).locale('es').format('DD/MM/YYYY HH:mm');
h.reporteCOM = organizacion.esCOM;
h.reporteCOM = esCOM;
h.esActualizacion = !h?.estado;
});
return historial.sort((a, b) => b.createdAt - a.createdAt);
return historial.sort((a, b) => moment(b.createdAt).diff(moment(a.createdAt)));
}

async getDatosSolicitud(derivacion) {
Expand Down
Loading