Skip to content

Commit b8bd6c7

Browse files
MarianoCampetellaJuanIRamirez
authored andcommitted
IN - completar listados de internacion (#2873)
* feat(IN-454): completar listados de internacion * (IN-545): correcciones
1 parent 994a6b0 commit b8bd6c7

19 files changed

+2431
-1168
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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { DirectiveLibModule } from '../../directives/directives.module';
1515
import { BotonesAgendaPipe } from './gestor-agendas/pipes/botonesAgenda.pipe';
1616
import { BotonesAgendaGeneralPipe } from './gestor-agendas/pipes/botonesAgendaGeneral.pipe';
1717
import { BotonesTurnosPipe } from './gestor-agendas/pipes/botonesTurnos.pipe';
18+
import { AgregarSobreturnoComponent } from './gestor-agendas/operaciones-agenda/sobreturno.component';
1819

1920
@NgModule({
2021
imports: [
@@ -36,6 +37,7 @@ import { BotonesTurnosPipe } from './gestor-agendas/pipes/botonesTurnos.pipe';
3637
BotonesAgendaPipe,
3738
BotonesAgendaGeneralPipe,
3839
BotonesTurnosPipe,
40+
AgregarSobreturnoComponent,
3941
],
4042
exports: [
4143
DarTurnosComponent,
@@ -45,7 +47,8 @@ import { BotonesTurnosPipe } from './gestor-agendas/pipes/botonesTurnos.pipe';
4547
CalendarioComponent,
4648
BotonesAgendaPipe,
4749
BotonesAgendaGeneralPipe,
48-
BotonesTurnosPipe
50+
BotonesTurnosPipe,
51+
AgregarSobreturnoComponent
4952
],
5053
})
5154
export class CITASLibModule {

src/app/components/turnos/enums.ts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,31 @@ 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': {

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

Lines changed: 17 additions & 13 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
@Component({
@@ -54,6 +54,7 @@ export class GestorAgendasComponent implements OnInit, OnDestroy {
5454
public showCarpetas = false;
5555
public showSuspenderAgenda = false;
5656
public showSuspendida = false;
57+
public showSobreturno = false;
5758
public agendas: any = [];
5859
public agenda: any = {};
5960
public modelo: any = {};
@@ -226,8 +227,10 @@ export class GestorAgendasComponent implements OnInit, OnDestroy {
226227

227228
localStorage.removeItem('filtrosGestorAgendas');
228229
localStorage.removeItem('idAgenda');
230+
229231
} else {
230232
// Por defecto cargar/mostrar agendas de hoy
233+
localStorage.removeItem('verListaTurnos');
231234
this.hoy = true;
232235
this.loadAgendas();
233236
}
@@ -380,12 +383,18 @@ export class GestorAgendasComponent implements OnInit, OnDestroy {
380383
this.showAgregarNotaAgenda = true;
381384
this.showSuspenderAgenda = false;
382385
this.showSuspendida = false;
386+
this.showSobreturno = false;
383387
}
384388

385389
agregarSobreturno(agenda) {
386-
localStorage.setItem('filtrosGestorAgendas', JSON.stringify(this.parametros));
387-
localStorage.setItem('idAgenda', agenda._id);
388-
this.router.navigate(['citas/sobreturnos', agenda._id]);
390+
localStorage.setItem('verListaTurnos', '0');
391+
this.showSobreturno = true;
392+
}
393+
394+
cerrarSobreturno() {
395+
localStorage.setItem('verListaTurnos', '1');
396+
this.showSobreturno = false;
397+
this.verAgenda(this.agendasSeleccionadas[0], false, null);
389398
}
390399

391400
cancelaAgregarNotaAgenda() {
@@ -816,11 +825,6 @@ export class GestorAgendasComponent implements OnInit, OnDestroy {
816825
this.agendas[indice] = agenda;
817826
}
818827

819-
auditarFueraAgenda() {
820-
this.showGestorAgendas = false;
821-
this.showRevisionFueraAgenda = true;
822-
}
823-
824828
cargarPacientes() {
825829
this.enableQueries = true;
826830
const agenda = this.agendasSeleccionadas[0];

0 commit comments

Comments
 (0)