Skip to content

Commit

Permalink
CIT-Nuevo submódulo Auditoría de Agendas #2882
Browse files Browse the repository at this point in the history
---------

Co-authored-by: juan I. Ramirez
  • Loading branch information
plammel authored and negro89 committed Jan 25, 2024
1 parent 8f08aa1 commit 5014d0c
Show file tree
Hide file tree
Showing 19 changed files with 2,465 additions and 1,202 deletions.
6 changes: 3 additions & 3 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ import { MapaEspacioFisicoComponent } from './components/turnos/configuracion/ma
import { EstadisticasAgendasComponent } from './components/turnos/dashboard/estadisticas-agendas.component';
import { EstadisticasPacientesComponent } from './components/turnos/dashboard/estadisticas-pacientes.component';
import { GestorAgendasComponent } from './components/turnos/gestor-agendas/gestor-agendas.component';
import { AuditoriaAgendasComponent } from './components/turnos/gestor-agendas/operaciones-agenda/auditoria-agendas.component';
import { AgregarPacienteComponent } from './components/turnos/gestor-agendas/operaciones-agenda/agregar-paciente.component';
import { BuscadorCie10Component } from './components/turnos/gestor-agendas/operaciones-agenda/buscador-cie10.component';
import { ClonarAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/clonar-agenda';
Expand All @@ -110,7 +111,6 @@ import { AgregarNotaAgendaComponent } from './components/turnos/gestor-agendas/o
import { PanelAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/panel-agenda.component';
import { PlanificarAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/planificar-agenda.component';
import { RevisionAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/revision-agenda.component';
import { AgregarSobreturnoComponent } from './components/turnos/gestor-agendas/operaciones-agenda/sobreturno.component';
import { SuspenderAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/suspender-agenda.component';
import { AgregarNotaTurnoComponent } from './components/turnos/gestor-agendas/operaciones-turnos/agregar-nota-turno.component';
import { LiberarTurnoComponent } from './components/turnos/gestor-agendas/operaciones-turnos/liberar-turno.component';
Expand Down Expand Up @@ -265,8 +265,8 @@ registerLocaleData(localeEs, 'es');
MapsComponent,
PlanificarAgendaComponent,
BuscadorCie10Component, PanelEspacioComponent, EspacioFisicoComponent, EditEspacioFisicoComponent, FiltrosMapaEspacioFisicoComponent,
GestorAgendasComponent, TurnosComponent, ClonarAgendaComponent, ModalAgendaComponent,
RevisionAgendaComponent, AgregarSobreturnoComponent, RevisionFueraAgendaComponent,
GestorAgendasComponent, AuditoriaAgendasComponent, TurnosComponent, ClonarAgendaComponent, ModalAgendaComponent,
RevisionAgendaComponent, RevisionFueraAgendaComponent,
LiberarTurnoComponent, SuspenderTurnoComponent, AgregarNotaTurnoComponent, AgregarNotaAgendaComponent,
PanelAgendaComponent,
AgregarPacienteComponent,
Expand Down
4 changes: 3 additions & 1 deletion src/app/app.routing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ import { EncabezadoReportesComponent } from './components/reportes/encabezadoRep
import { EspacioFisicoComponent } from './components/turnos/configuracion/espacio-fisico/espacio-fisico.component';
import { PanelEspacioComponent } from './components/turnos/configuracion/espacio-fisico/panel-espacio.component';
import { MapaEspacioFisicoVistaComponent } from './components/turnos/configuracion/mapa-espacio-fisico/mapa-espacio-fisico-vista.component';
// ... CITAS
import { DarTurnosComponent } from './components/turnos/dar-turnos/dar-turnos.component';
import { GestorAgendasComponent } from './components/turnos/gestor-agendas/gestor-agendas.component';
import { AuditoriaAgendasComponent } from './components/turnos/gestor-agendas/operaciones-agenda/auditoria-agendas.component';
import { AgregarPacienteComponent } from './components/turnos/gestor-agendas/operaciones-agenda/agregar-paciente.component';
import { ClonarAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/clonar-agenda';
// ... CITAS
import { PlanificarAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/planificar-agenda.component';
import { RevisionAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/revision-agenda.component';
import { AgregarSobreturnoComponent } from './components/turnos/gestor-agendas/operaciones-agenda/sobreturno.component';
Expand Down Expand Up @@ -67,6 +68,7 @@ const appRoutes: Routes = [
{ path: 'citas', component: PuntoInicioTurnosComponent, canActivate: [RoutingNavBar, RoutingGuard] },
{ path: 'citas/clonarAgenda', component: ClonarAgendaComponent, canActivate: [RoutingNavBar, RoutingGuard] },
{ path: 'citas/gestor_agendas', component: GestorAgendasComponent, canActivate: [RoutingNavBar, RoutingGuard] },
{ path: 'citas/auditoria_agendas', component: AuditoriaAgendasComponent, canActivate: [RoutingNavBar, RoutingGuard] },

{
path: 'citas',
Expand Down
7 changes: 5 additions & 2 deletions src/app/components/turnos/citas.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { BotonesAgendaGeneralPipe } from './gestor-agendas/pipes/botonesAgendaGe
import { BotonesTurnosPipe } from './gestor-agendas/pipes/botonesTurnos.pipe';
import { InfoAgendaComponent } from './gestor-agendas/info-agenda.component';
import { SeleccionarFinanciadorComponent } from './dar-turnos/seleccionar-financiador.component';
import { AgregarSobreturnoComponent } from './gestor-agendas/operaciones-agenda/sobreturno.component';

@NgModule({
imports: [
Expand All @@ -39,7 +40,8 @@ import { SeleccionarFinanciadorComponent } from './dar-turnos/seleccionar-financ
BotonesAgendaGeneralPipe,
BotonesTurnosPipe,
InfoAgendaComponent,
SeleccionarFinanciadorComponent
SeleccionarFinanciadorComponent,
AgregarSobreturnoComponent
],
exports: [
DarTurnosComponent,
Expand All @@ -51,7 +53,8 @@ import { SeleccionarFinanciadorComponent } from './dar-turnos/seleccionar-financ
BotonesAgendaGeneralPipe,
BotonesTurnosPipe,
InfoAgendaComponent,
SeleccionarFinanciadorComponent
SeleccionarFinanciadorComponent,
AgregarSobreturnoComponent
],
})
export class CITASLibModule {
Expand Down
29 changes: 27 additions & 2 deletions src/app/components/turnos/enums.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,39 @@ export const EstadosAgenda: IEnum = {
}
};

export const EstadosAgendaAuditoria: IEnum = {
'pendienteAsistencia': {
nombre: 'Pendiente Asistencia',
class: 'warning'
},
'pendienteAuditoria': {
nombre: 'Pendiente Auditoria',
class: 'warning'
},
'auditada': {
nombre: 'Auditada',
class: 'info'
}
};

export const EstadosFueraAgenda: IEnum = {
'pendienteAuditoria': {
nombre: 'Pendiente Auditoria',
class: 'warning'
},
'auditada': {
nombre: 'Auditada',
class: 'info'
}
};

export const EstadosAsistencia: IEnum = {
'asistio': {
nombre: 'Asistio',
nombre: 'Asistió',
class: 'success'
},
'noAsistio': {
nombre: 'No Asistio',
nombre: 'No Asistió',
class: 'danger'
},
'sinDatos': {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import { QueriesService } from 'src/app/services/query.service';
import { ITurno } from '../../../interfaces/turnos/ITurno';
import { InstitucionService } from '../../../services/turnos/institucion.service';
import { enumToArray } from '../../../utils/enums';
import { IAgenda } from './../../../interfaces/turnos/IAgenda';
import { ProfesionalService } from './../../../services/profesional.service';
import { AgendaService } from './../../../services/turnos/agenda.service';
import { EspacioFisicoService } from './../../../services/turnos/espacio-fisico.service';
import * as enumerado from './../enums';
import { IAgenda } from '../../../interfaces/turnos/IAgenda';
import { ProfesionalService } from '../../../services/profesional.service';
import { AgendaService } from '../../../services/turnos/agenda.service';
import { EspacioFisicoService } from '../../../services/turnos/espacio-fisico.service';
import * as enumerado from '../enums';
import { BreakpointObserver } from '@angular/cdk/layout';
import { NgForm } from '@angular/forms';

Expand Down Expand Up @@ -249,8 +249,10 @@ export class GestorAgendasComponent implements OnInit, OnDestroy {

localStorage.removeItem('filtrosGestorAgendas');
localStorage.removeItem('idAgenda');

} else {
// Por defecto cargar/mostrar agendas de hoy
localStorage.removeItem('verListaTurnos');
this.hoy = true;
this.loadAgendas();
}
Expand Down Expand Up @@ -403,8 +405,19 @@ export class GestorAgendasComponent implements OnInit, OnDestroy {
this.showAgregarNotaAgenda = true;
this.showSuspenderAgenda = false;
this.showSuspendida = false;
this.showSobreturno = false;
}

// agregarSobreturno(agenda) {
// localStorage.setItem('verListaTurnos', '0');
// this.showSobreturno = true;
// }

cerrarSobreturno() {
localStorage.setItem('verListaTurnos', '1');
this.showSobreturno = false;
this.verAgenda(this.agendasSeleccionadas[0], false, null);
}

cancelaAgregarNotaAgenda() {
this.showTurnos = true;
Expand Down Expand Up @@ -851,11 +864,6 @@ export class GestorAgendasComponent implements OnInit, OnDestroy {
this.agendas[indice] = agenda;
}

auditarFueraAgenda() {
this.showGestorAgendas = false;
this.showRevisionFueraAgenda = true;
}

cargarPacientes() {
this.enableQueries = true;
const agenda = this.agendasSeleccionadas[0];
Expand Down
Loading

0 comments on commit 5014d0c

Please sign in to comment.