Skip to content

Commit 5014d0c

Browse files
plammelnegro89
authored andcommitted
CIT-Nuevo submódulo Auditoría de Agendas #2882
--------- Co-authored-by: juan I. Ramirez
1 parent 8f08aa1 commit 5014d0c

19 files changed

+2465
-1202
lines changed

src/app/app.module.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ import { MapaEspacioFisicoComponent } from './components/turnos/configuracion/ma
9999
import { EstadisticasAgendasComponent } from './components/turnos/dashboard/estadisticas-agendas.component';
100100
import { EstadisticasPacientesComponent } from './components/turnos/dashboard/estadisticas-pacientes.component';
101101
import { GestorAgendasComponent } from './components/turnos/gestor-agendas/gestor-agendas.component';
102+
import { AuditoriaAgendasComponent } from './components/turnos/gestor-agendas/operaciones-agenda/auditoria-agendas.component';
102103
import { AgregarPacienteComponent } from './components/turnos/gestor-agendas/operaciones-agenda/agregar-paciente.component';
103104
import { BuscadorCie10Component } from './components/turnos/gestor-agendas/operaciones-agenda/buscador-cie10.component';
104105
import { ClonarAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/clonar-agenda';
@@ -110,7 +111,6 @@ import { AgregarNotaAgendaComponent } from './components/turnos/gestor-agendas/o
110111
import { PanelAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/panel-agenda.component';
111112
import { PlanificarAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/planificar-agenda.component';
112113
import { RevisionAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/revision-agenda.component';
113-
import { AgregarSobreturnoComponent } from './components/turnos/gestor-agendas/operaciones-agenda/sobreturno.component';
114114
import { SuspenderAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/suspender-agenda.component';
115115
import { AgregarNotaTurnoComponent } from './components/turnos/gestor-agendas/operaciones-turnos/agregar-nota-turno.component';
116116
import { LiberarTurnoComponent } from './components/turnos/gestor-agendas/operaciones-turnos/liberar-turno.component';
@@ -265,8 +265,8 @@ registerLocaleData(localeEs, 'es');
265265
MapsComponent,
266266
PlanificarAgendaComponent,
267267
BuscadorCie10Component, PanelEspacioComponent, EspacioFisicoComponent, EditEspacioFisicoComponent, FiltrosMapaEspacioFisicoComponent,
268-
GestorAgendasComponent, TurnosComponent, ClonarAgendaComponent, ModalAgendaComponent,
269-
RevisionAgendaComponent, AgregarSobreturnoComponent, RevisionFueraAgendaComponent,
268+
GestorAgendasComponent, AuditoriaAgendasComponent, TurnosComponent, ClonarAgendaComponent, ModalAgendaComponent,
269+
RevisionAgendaComponent, RevisionFueraAgendaComponent,
270270
LiberarTurnoComponent, SuspenderTurnoComponent, AgregarNotaTurnoComponent, AgregarNotaAgendaComponent,
271271
PanelAgendaComponent,
272272
AgregarPacienteComponent,

src/app/app.routing.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ import { EncabezadoReportesComponent } from './components/reportes/encabezadoRep
2424
import { EspacioFisicoComponent } from './components/turnos/configuracion/espacio-fisico/espacio-fisico.component';
2525
import { PanelEspacioComponent } from './components/turnos/configuracion/espacio-fisico/panel-espacio.component';
2626
import { MapaEspacioFisicoVistaComponent } from './components/turnos/configuracion/mapa-espacio-fisico/mapa-espacio-fisico-vista.component';
27+
// ... CITAS
2728
import { DarTurnosComponent } from './components/turnos/dar-turnos/dar-turnos.component';
2829
import { GestorAgendasComponent } from './components/turnos/gestor-agendas/gestor-agendas.component';
30+
import { AuditoriaAgendasComponent } from './components/turnos/gestor-agendas/operaciones-agenda/auditoria-agendas.component';
2931
import { AgregarPacienteComponent } from './components/turnos/gestor-agendas/operaciones-agenda/agregar-paciente.component';
3032
import { ClonarAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/clonar-agenda';
31-
// ... CITAS
3233
import { PlanificarAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/planificar-agenda.component';
3334
import { RevisionAgendaComponent } from './components/turnos/gestor-agendas/operaciones-agenda/revision-agenda.component';
3435
import { AgregarSobreturnoComponent } from './components/turnos/gestor-agendas/operaciones-agenda/sobreturno.component';
@@ -67,6 +68,7 @@ const appRoutes: Routes = [
6768
{ path: 'citas', component: PuntoInicioTurnosComponent, canActivate: [RoutingNavBar, RoutingGuard] },
6869
{ path: 'citas/clonarAgenda', component: ClonarAgendaComponent, canActivate: [RoutingNavBar, RoutingGuard] },
6970
{ path: 'citas/gestor_agendas', component: GestorAgendasComponent, canActivate: [RoutingNavBar, RoutingGuard] },
71+
{ path: 'citas/auditoria_agendas', component: AuditoriaAgendasComponent, canActivate: [RoutingNavBar, RoutingGuard] },
7072

7173
{
7274
path: 'citas',

src/app/components/turnos/citas.module.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { BotonesAgendaGeneralPipe } from './gestor-agendas/pipes/botonesAgendaGe
1717
import { BotonesTurnosPipe } from './gestor-agendas/pipes/botonesTurnos.pipe';
1818
import { InfoAgendaComponent } from './gestor-agendas/info-agenda.component';
1919
import { SeleccionarFinanciadorComponent } from './dar-turnos/seleccionar-financiador.component';
20+
import { AgregarSobreturnoComponent } from './gestor-agendas/operaciones-agenda/sobreturno.component';
2021

2122
@NgModule({
2223
imports: [
@@ -39,7 +40,8 @@ import { SeleccionarFinanciadorComponent } from './dar-turnos/seleccionar-financ
3940
BotonesAgendaGeneralPipe,
4041
BotonesTurnosPipe,
4142
InfoAgendaComponent,
42-
SeleccionarFinanciadorComponent
43+
SeleccionarFinanciadorComponent,
44+
AgregarSobreturnoComponent
4345
],
4446
exports: [
4547
DarTurnosComponent,
@@ -51,7 +53,8 @@ import { SeleccionarFinanciadorComponent } from './dar-turnos/seleccionar-financ
5153
BotonesAgendaGeneralPipe,
5254
BotonesTurnosPipe,
5355
InfoAgendaComponent,
54-
SeleccionarFinanciadorComponent
56+
SeleccionarFinanciadorComponent,
57+
AgregarSobreturnoComponent
5558
],
5659
})
5760
export class CITASLibModule {

src/app/components/turnos/enums.ts

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,39 @@ export const EstadosAgenda: IEnum = {
3535
}
3636
};
3737

38+
export const EstadosAgendaAuditoria: IEnum = {
39+
'pendienteAsistencia': {
40+
nombre: 'Pendiente Asistencia',
41+
class: 'warning'
42+
},
43+
'pendienteAuditoria': {
44+
nombre: 'Pendiente Auditoria',
45+
class: 'warning'
46+
},
47+
'auditada': {
48+
nombre: 'Auditada',
49+
class: 'info'
50+
}
51+
};
52+
53+
export const EstadosFueraAgenda: IEnum = {
54+
'pendienteAuditoria': {
55+
nombre: 'Pendiente Auditoria',
56+
class: 'warning'
57+
},
58+
'auditada': {
59+
nombre: 'Auditada',
60+
class: 'info'
61+
}
62+
};
3863

3964
export const EstadosAsistencia: IEnum = {
4065
'asistio': {
41-
nombre: 'Asistio',
66+
nombre: 'Asistió',
4267
class: 'success'
4368
},
4469
'noAsistio': {
45-
nombre: 'No Asistio',
70+
nombre: 'No Asistió',
4671
class: 'danger'
4772
},
4873
'sinDatos': {

src/app/components/turnos/gestor-agendas/gestor-agendas.component.ts

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import { QueriesService } from 'src/app/services/query.service';
1010
import { ITurno } from '../../../interfaces/turnos/ITurno';
1111
import { InstitucionService } from '../../../services/turnos/institucion.service';
1212
import { enumToArray } from '../../../utils/enums';
13-
import { IAgenda } from './../../../interfaces/turnos/IAgenda';
14-
import { ProfesionalService } from './../../../services/profesional.service';
15-
import { AgendaService } from './../../../services/turnos/agenda.service';
16-
import { EspacioFisicoService } from './../../../services/turnos/espacio-fisico.service';
17-
import * as enumerado from './../enums';
13+
import { IAgenda } from '../../../interfaces/turnos/IAgenda';
14+
import { ProfesionalService } from '../../../services/profesional.service';
15+
import { AgendaService } from '../../../services/turnos/agenda.service';
16+
import { EspacioFisicoService } from '../../../services/turnos/espacio-fisico.service';
17+
import * as enumerado from '../enums';
1818
import { BreakpointObserver } from '@angular/cdk/layout';
1919
import { NgForm } from '@angular/forms';
2020

@@ -249,8 +249,10 @@ export class GestorAgendasComponent implements OnInit, OnDestroy {
249249

250250
localStorage.removeItem('filtrosGestorAgendas');
251251
localStorage.removeItem('idAgenda');
252+
252253
} else {
253254
// Por defecto cargar/mostrar agendas de hoy
255+
localStorage.removeItem('verListaTurnos');
254256
this.hoy = true;
255257
this.loadAgendas();
256258
}
@@ -403,8 +405,19 @@ export class GestorAgendasComponent implements OnInit, OnDestroy {
403405
this.showAgregarNotaAgenda = true;
404406
this.showSuspenderAgenda = false;
405407
this.showSuspendida = false;
408+
this.showSobreturno = false;
406409
}
407410

411+
// agregarSobreturno(agenda) {
412+
// localStorage.setItem('verListaTurnos', '0');
413+
// this.showSobreturno = true;
414+
// }
415+
416+
cerrarSobreturno() {
417+
localStorage.setItem('verListaTurnos', '1');
418+
this.showSobreturno = false;
419+
this.verAgenda(this.agendasSeleccionadas[0], false, null);
420+
}
408421

409422
cancelaAgregarNotaAgenda() {
410423
this.showTurnos = true;
@@ -851,11 +864,6 @@ export class GestorAgendasComponent implements OnInit, OnDestroy {
851864
this.agendas[indice] = agenda;
852865
}
853866

854-
auditarFueraAgenda() {
855-
this.showGestorAgendas = false;
856-
this.showRevisionFueraAgenda = true;
857-
}
858-
859867
cargarPacientes() {
860868
this.enableQueries = true;
861869
const agenda = this.agendasSeleccionadas[0];

0 commit comments

Comments
 (0)