+
diff --git a/src/app/audit/components/audit-form/audit-form.component.sass b/src/app/audit/components/audit-form/audit-form.component.sass
new file mode 100644
index 00000000..1efb951f
--- /dev/null
+++ b/src/app/audit/components/audit-form/audit-form.component.sass
@@ -0,0 +1,104 @@
+@import 'styles/_variables'
+
+$panels-height: 294px
+$panels-height-xl: 325px
+
+:host
+ display: block
+ width: 100%
+ height: 100%
+
+.cards-container
+ margin-top: 20px
+ @media (min-width: $small-devices) and (max-width: $medium-devices)
+ flex-direction: column!important
+ @media (min-width: $x-small-devices) and (max-width: $small-devices)
+ flex-direction: column!important
+ .search-panel
+ order: 1
+ .prescription-panel
+ order: 2
+ .insurance-panel
+ order: 3
+
+ .first-panel
+ width: 35%
+ display: flex
+ flex-direction: column
+ .search-panel
+ margin-bottom: 20px
+ .search-panel,.insurance-panel
+ width: 100%
+ @media (min-width: $small-devices) and (max-width: $medium-devices)
+ width: 100%
+ flex-direction: row
+ .search-panel
+ margin-right: 20px
+ .search-panel,.insurance-panel
+ width: 50%
+ @media (min-width: $x-small-devices) and (max-width: $small-devices)
+ width: 100%
+ flex-direction: column
+ .search-panel,.insurance-panel
+ width: 100%
+ margin-bottom: 20px
+
+ .prescription-panel
+ width: 65%
+ @media (min-width: $x-small-devices) and (max-width: $medium-devices)
+ width: 100%
+
+
+
+ .search-panel, .prescription-panel, .insurance-panel
+ mat-card
+ box-sizing: content-box!important
+ height: auto
+ mat-card-title, mat-card-content
+ margin: 0!important
+
+ mat-card-actions
+ padding: 0!important
+ margin: 0!important
+ @media (min-width: $x-small-devices) and (max-width: $larger-devices)
+ flex-direction: column!important
+ a.btn-link
+ max-width: 100%!important
+ margin: 10px 0!important
+
+
+
+
+.mat-table
+ overflow: auto
+ max-height: 500px
+
+
+.element-row
+ position: relative
+
+
+.element-row:not(.expanded)
+ cursor: pointer
+
+
+.element-row:not(.expanded):hover
+ background: #f5f5f5
+
+
+.element-row.expanded
+ border-bottom-color: transparent
+
+.cdk-column-expandedDetail
+ border-left-style: solid
+ border-color:#c9c9ca
+ border-width: 1px
+ margin-left: 24px
+ outline: 1px
+ outline-offset: -2px
+
+.insurances-container
+ display: flex
+ flex-direction: column
+ max-height: 500px
+ min-width: 300px
diff --git a/src/app/audit/components/audit-form/audit-form.component.spec.ts b/src/app/audit/components/audit-form/audit-form.component.spec.ts
new file mode 100644
index 00000000..08028243
--- /dev/null
+++ b/src/app/audit/components/audit-form/audit-form.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+
+import { PharmacistsFormComponent } from './pharmacists-form.component';
+
+describe('PharmacistsFormComponent', () => {
+ let component: PharmacistsFormComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ search
+
+ Buscar farmacia
+
+
+
+
+ Seleccione un rango de fechas y presione Descargar
+
+
+ Desde
+
+ DD/MM/YYYY
+
+
+
+ Hasta
+
+ DD/MM/YYYY
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/audit/components/dialog-report/dialog-report.component.ts b/src/app/audit/components/dialog-report/dialog-report.component.ts
new file mode 100644
index 00000000..1c849612
--- /dev/null
+++ b/src/app/audit/components/dialog-report/dialog-report.component.ts
@@ -0,0 +1,28 @@
+import { Component, Inject } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+
+export interface DialogData {
+ fechaDesde: Date;
+ fechaHasta: Date;
+ pharmacistId: string;
+}
+
+@Component({
+ selector: 'app-dialog-report',
+ templateUrl: './dialog-report.component.html'
+})
+export class DialogReportComponent {
+ constructor(
+ public dialogRef: MatDialogRef
+
+
diff --git a/src/app/audit/components/dialog/dialog.component.sass b/src/app/audit/components/dialog/dialog.component.sass
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/audit/components/dialog/dialog.component.spec.ts b/src/app/audit/components/dialog/dialog.component.spec.ts
new file mode 100644
index 00000000..7a5ff84a
--- /dev/null
+++ b/src/app/audit/components/dialog/dialog.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+
+import { DialogComponent } from './dialog.component';
+
+describe('DialogComponent', () => {
+ let component: DialogComponent;
+ let fixture: ComponentFixture
+
+
+error Error
+
+
+ {{data.text}}
+
+
+
+
+ gesture
+
+ Recetas dispensadas por {{dataSource.data[0].dispensedBy.businessName}},
+ CUIT {{dataSource.data[0].dispensedBy.cuil}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Profesional | +{{ + element.professional.businessName.toUpperCase() }} | +Fecha | ++ {{element.date | date : 'dd/MM/yyyy' }} | +Estado | +{{ element.status }} + | +Insumos | ++ {{element.supplies.length}} | +Acción | +
+
+ |
+ + | + + | +
+
+
+
+
+
+
+
+ {{ supp.supply.name }}
+
+
+ Diagnóstico: {{element.diagnostic}}
+
+ Observaciones: {{element.observation}}
+
+ |
+
|---|
+
+ prescription-printer works!
diff --git a/src/app/audit/components/prescription-printer/prescription-printer.component.sass b/src/app/audit/components/prescription-printer/prescription-printer.component.sass new file mode 100644 index 00000000..e69de29b diff --git a/src/app/audit/components/prescription-printer/prescription-printer.component.spec.ts b/src/app/audit/components/prescription-printer/prescription-printer.component.spec.ts new file mode 100644 index 00000000..dd6b98da --- /dev/null +++ b/src/app/audit/components/prescription-printer/prescription-printer.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; + +import { PrescriptionPrinterComponent } from './prescription-printer.component'; + +describe('PrescriptionPrinterComponent', () => { + let component: PrescriptionPrinterComponent; + let fixture: ComponentFixture
+
\ No newline at end of file
diff --git a/src/app/audit/components/user-list/users-list.component.sass b/src/app/audit/components/user-list/users-list.component.sass
new file mode 100644
index 00000000..65a2eb04
--- /dev/null
+++ b/src/app/audit/components/user-list/users-list.component.sass
@@ -0,0 +1,308 @@
+@import 'styles/_variables'
+
+$panels-height: 294px
+$panels-height-xl: 325px
+
+:host
+ display: block
+ width: 100%
+ height: 100%
+
+.cards-container
+ margin-top: 20px
+ @media (min-width: $small-devices) and (max-width: $medium-devices)
+ flex-direction: column!important
+ @media (min-width: $x-small-devices) and (max-width: $small-devices)
+ flex-direction: column!important
+ .search-panel
+ order: 1
+ .user-panel
+ order: 2
+ .insurance-panel
+ order: 3
+
+ .user-panel
+ width: 65%
+ @media (min-width: $x-small-devices) and (max-width: $medium-devices)
+ width: 100%
+
+
+
+ .search-panel, .user-panel, .insurance-panel
+ mat-card
+ box-sizing: content-box!important
+ height: auto
+ mat-card-title, mat-card-content
+ margin: 0!important
+
+ mat-card-actions
+ padding: 0!important
+ margin: 0!important
+ @media (min-width: $x-small-devices) and (max-width: $larger-devices)
+ flex-direction: column!important
+ a.btn-link
+ max-width: 100%!important
+ margin: 10px 0!important
+
+
+
+
+.mat-table
+ overflow: auto
+ max-height: 500px
+
+
+.element-row
+ position: relative
+
+
+.element-row:not(.expanded)
+ cursor: pointer
+
+
+.element-row:not(.expanded):hover
+ background: #f5f5f5
+
+
+.element-row.expanded
+ border-bottom-color: transparent
+
+.cdk-column-expandedDetail
+ border-left-style: solid
+ border-color:#c9c9ca
+ border-width: 1px
+ margin-left: 24px
+ outline: 1px
+ outline-offset: -2px
+
+.insurances-container
+ display: flex
+ flex-direction: column
+ max-height: 500px
+ min-width: 300px
+
+
+mat-card-content
+ .loading-users
+ padding: 30px
+
+table
+ width: 100%
+
+ tr.detail-row
+ height: 0
+
+
+ tr.element-row:not(.expanded-row):hover
+ background: whitesmoke
+
+
+ tr.element-row:not(.expanded-row):active
+ background: #efefef
+
+ .title-cell
+ width: 200px
+
+ .mat-icon
+ display: inline-flex
+ vertical-align: top
+ font-size: 18px
+ color: #000000
+
+ .element-row td
+ border-bottom-width: 0
+
+
+ .element-detail
+ overflow: hidden
+ padding: 0px 5px
+ border-left: 1px solid #ccc
+
+ .element-diagram
+ padding: 8px
+ font-weight: lighter
+
+ .supplies-list
+ margin: 5px 0px
+ .supply-description
+ display: flex
+ border-bottom: 1px solid #ccc
+ justify-content: space-between
+ align-items: center
+ padding-bottom: 2px
+ margin-top: 5px
+
+ span
+ margin-right: 20px
+ mat-chip
+ padding: 5px
+ width: 20px
+ border-radius: 50%
+ text-align: center
+
+ .element-description
+ margin: 5px 0px
+ .description-title
+ font-weight: bold
+
+
+ .mat-row
+ &:hover
+ background-color: #e9f3ff
+ td.mat-column-arrow
+ text-align: center
+ th.mat-column-action
+ text-align: center
+ th.mat-column-supplies, td.mat-column-supplies
+ text-align: center
+ @media (min-width: $x-small-devices) and (max-width: $small-devices)
+ text-align: left
+
+ td.mat-column-action
+ .action-buttons
+ justify-content: center
+ td.mat-column-arrow
+ width: 45px
+ button
+ width: auto
+ padding: 0px 5px
+ margin-right: 0px
+ mat-icon
+ padding: 0px
+ margin-right: 0px
+ td.mat-column-action
+ width: 100px
+ padding-right: 8px !important
+ button
+ width: auto
+ padding: 0px 5px
+ mat-icon
+ padding: 0px 5px
+ margin-right: 0px
+ color: #3e3e3e!important
+
+
+ .menu-collapse
+ display: none
+
+ .mat-icon
+ color: #3e75ff
+
+ // @media (min-width: $x-small-devices) and (max-width: $small-devices)
+
+.mat-form-field
+ font-size: 14px
+ width: 100%
+
+
+.mat-paginator
+ margin-top: 24px
+
+@media (min-width: $x-small-devices) and (max-width: $small-devices)
+ .mat-elevation-z8
+ background: transparent
+ box-shadow: none
+ margin: 0px -16px
+
+ .mat-header-row
+ display: none
+
+ td.mat-column-supply_count
+ text-align: start!important
+ td.mat-column-action
+ .menu-collapse
+ display: flex!important
+ position: absolute
+ top: 0
+ right: 10px
+ width: auto
+ margin: 0
+ height: 44px!important
+ mat-icon
+ padding: 0!important
+ .action-buttons
+ display: none!important
+ td.mat-column-arrow
+ button
+ position: absolute
+ top: 0
+ right: 44px
+ height: 44px!important
+ display: flex
+
+
+ tbody
+ display: block
+ width: 100%
+
+
+ .mat-table
+ background: transparent
+ *
+ box-sizing: border-box
+
+
+ .mat-row
+ display: block
+ overflow: hidden
+ height: auto
+ position: relative
+ clear: both
+ // box-shadow: 0 2px 1px -1px rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 1px 3px 0 rgba(0,0,0,.12)
+ background-color: #fff
+ border-radius: 3px
+ + .mat-row
+ margin-top: 24px
+
+ .detail-row
+ box-shadow: 0 2px 1px -1px rgba(0,0,0,.2), 0 1px 1px 0 rgba(0,0,0,.14), 0 1px 3px 0 rgba(0,0,0,.12)
+ margin-top: 0px!important
+ td.mat-column-expandedDetail
+ margin: 0px!important
+ padding: 0px 10px!important
+ mat-chip
+ width: 30px!important
+
+ .mat-cell
+ display: block
+ width: 100%
+ padding: 0 16px
+ margin: 16px 0
+ border: 0 none
+ &:first-child
+ padding: 0 48px 0 16px
+ a
+ font-size: 20px
+ // font-weight: 400
+ color: inherit
+
+ &:before
+ display: none
+
+
+ &.m-card-sub-title
+ margin-top: -8px
+ padding: 0 48px 0 16px
+ color: rgba(0,0,0,.54)
+
+
+
+ .has_label_on_mobile
+ &:before
+ content: attr(data-label)
+ display: inline
+ font-weight: normal
+
+
+
+ .mat-column-star
+ width: auto
+ padding: 8px 0 0 !important
+ margin: 0
+ position: absolute
+ top: 0
+ right: 0
+ &:before
+ display: none
+
+
diff --git a/src/app/audit/components/user-list/users-list.component.spec.ts b/src/app/audit/components/user-list/users-list.component.spec.ts
new file mode 100644
index 00000000..fa916225
--- /dev/null
+++ b/src/app/audit/components/user-list/users-list.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+
+import { UsersListComponent } from './users-list.component';
+
+describe('UsersListComponent', () => {
+ let component: UsersListComponent;
+ let fixture: ComponentFixture
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ person
+
+ Usuarios
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Nombre | +
+ |
+ CUIL | ++ {{ element.cuil }} + | +Matricula | ++ {{ element.enrollment }} + | ++ | + + + | +Ultimo inicio de sesión | ++ {{ element.lastLogin | date : 'dd/MM/yyyy' }} + | +
|---|
+
+
+ 
+
+
+
+ RecetAR
+
+
+
+
diff --git a/src/app/auth/components/forgot/forgot.component.sass b/src/app/auth/components/forgot/forgot.component.sass
new file mode 100644
index 00000000..b7720c51
--- /dev/null
+++ b/src/app/auth/components/forgot/forgot.component.sass
@@ -0,0 +1,66 @@
+// component selector
+@import 'styles/_variables'
+
+$panels-height: 294px
+$panels-height-xl: 325px
+
+:host
+ display: block
+ width: 100%
+ height: 100%
+
+.cards-container
+ margin-bottom: 4em
+
+
+ .form-panel
+ width: calc(100% / 3)
+ mat-card
+ box-sizing: content-box!important
+ height: 18.21rem
+ height: calc(#{$panels-height} - 32px)
+ // @media (min-width: $larger-devices) and (max-width: $x-larger-devices)
+ // height: calc(#{$panels-height-xl} - 32px)
+
+ @media (min-width: $x-small-devices) and (max-width: $larger-devices)
+ height: auto
+ mat-card-title, mat-card-content
+ margin: 0!important
+ .login-action
+ margin-top: 20px
+ @media (min-width: $larger-devices) and (max-width: $x-larger-devices)
+ margin-top: 40px
+
+ @media (min-width: $larger-devices) and (max-width: $xx-larger-devices)
+ .login-error
+ margin-bottom: -15px!important
+
+ mat-card-actions
+ padding: 0!important
+ margin: 0!important
+ @media (min-width: $x-small-devices) and (max-width: $larger-devices)
+ flex-direction: column!important
+ a.btn-link
+ max-width: 100%!important
+ margin: 10px 0!important
+
+ @media (min-width: $medium-devices) and (max-width: $larger-devices)
+ width: 310px
+ @media (min-width: $small-devices) and (max-width: $medium-devices)
+ width: 310px
+ @media (min-width: $x-small-devices) and (max-width: $small-devices)
+ width: 480px
+ max-width: calc(100% - 10px)
+ margin: 10px auto!important
+
+
+.logo
+ margin-bottom: 2em
+ @media (min-width: $x-small-devices) and (max-width: $small-devices)
+ margin-bottom: 1em
+ .icon-login
+ width: 100px
+ height: 100px
+ .title-login
+ color: white
+ font-family: roboto
\ No newline at end of file
diff --git a/src/app/auth/components/forgot/forgot.component.ts b/src/app/auth/components/forgot/forgot.component.ts
new file mode 100644
index 00000000..eda0fdbe
--- /dev/null
+++ b/src/app/auth/components/forgot/forgot.component.ts
@@ -0,0 +1,82 @@
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup, Validators, AbstractControl, FormGroupDirective } from '@angular/forms';
+import { AuthService } from '@auth/services/auth.service';
+import { Router } from '@angular/router';
+import { ThemePalette } from '@angular/material/core';
+import { DialogComponent } from '@auth/components/dialog/dialog.component';
+// Material
+import { MatDialog } from '@angular/material/dialog';
+import { MatSnackBar } from '@angular/material/snack-bar';
+
+@Component({
+ selector: 'app-forgot',
+ templateUrl: './forgot.component.html',
+ styleUrls: ['./forgot.component.sass']
+})
+export class ForgotComponent implements OnInit {
+
+ forgotForm: FormGroup;
+ hide: boolean = true;
+ error: string;
+ readonly spinnerColor: ThemePalette = 'primary';
+ readonly spinnerDiameter: number = 30;
+ showSubmit: boolean = false;
+ mailEnviado: boolean;
+
+ constructor(
+ private fBuilder: FormBuilder,
+ private authService: AuthService,
+ private router: Router,
+ private _snackBar: MatSnackBar,
+ public dialog: MatDialog
+ ) { }
+
+ ngOnInit(): void {
+ this.initforgotForm();
+ }
+
+ initforgotForm(): void {
+ this.forgotForm = this.fBuilder.group({
+ usuario: ['', [
+ Validators.required
+ ]]
+ });
+ }
+
+ cancelar() {
+ this.router.navigate(['/auth/login']);
+ }
+
+ onSubmitEvent(resetForm: FormGroup, resetNgForm: FormGroupDirective): void {
+ if (this.forgotForm.valid) {
+ this.showSubmit = true;
+ this.authService.setValidationTokenAndNotify(this.forgotForm.value).subscribe(
+ data => {
+ if (data.status === 'ok') {
+ this.mailEnviado = true;
+ this.openSnackBar(data.msg, "Cerrar");
+ } else {
+ this.openSnackBar(data.msg, "Cerrar");
+ }
+ this.showSubmit = false;
+ },
+ err => {
+ resetNgForm.resetForm();
+ resetForm.reset();
+ this.error = err;
+ this.showSubmit = false;
+ })
+ }
+ }
+
+ // Show a notification
+ openSnackBar(message: string, action: string) {
+ this._snackBar.open(message, action, {
+ duration: 5000
+ });
+ }
+
+ get usuario(): AbstractControl {
+ return this.forgotForm.get('usuario');
+ }
+}
diff --git a/src/app/auth/components/login/login.component.html b/src/app/auth/components/login/login.component.html
index f653f4f9..3206cb43 100644
--- a/src/app/auth/components/login/login.component.html
+++ b/src/app/auth/components/login/login.component.html
@@ -1,102 +1,101 @@
+
+
+
+
+
+
+
+
+ Restablecer contraseña
+
+
-
-
+ RecetAR
+
-
-
+
- RecetAR
+
+
+
+
+
+
+
+
+
+
+ remove_red_eye Ver resolución
+
+
+
+
- ¡Bienvenidos a RecetAr, la página web de Receta Electrónica de Neuquén!
+En el marco de la nueva Ley Nacional de Receta Electrónica, el Decreto 345/2024 establece un cambio + fundamental: las prescripciones médicas dejarán de ser en papel para adoptarse a plataformas digitales. En + este contexto, el Ministerio de Salud de la Provincia de Neuquén pone en funcionamiento el sistema RecetAr, + accesible para profesionales de la salud y farmacias, tanto públicas como privadas.
+¡Acompañanos en este avance hacia una práctica más eficiente y moderna en el cuidado de la salud!
+
-
-
@@ -31,6 +30,15 @@
-
-
-
-
- En el marco de la emergencia sanitaria que atraviesa el país por
- la pandemia provocada por el Coronavirus COVID-19, y atento al Decreto
- del poder ejecutivo nacional N.o 297/20, medida de aislamiento social,
- preventivo y obligatorio, han sido afectadas las formas habituales de
- interrelación entre los pacientes, médicos y establecimientos
- farmacéuticos, haciendo necesaria la utilización de herramientas
- tecnológicas para asegurar la continuidad de los tratamientos crónicos y
- agudos de los pacientes.
-
-
-
- remove_red_eye Ver resolución
-
-
- info Leer importante
-
-
-
-
+
+ Bienvenido a RecetAR
-
+
+
+
-
- ;
- beforeEach(async(() => {
+ beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ LoginComponent ]
})
diff --git a/src/app/auth/components/login/login.component.ts b/src/app/auth/components/login/login.component.ts
index fe1cd7e6..6b04dee5 100644
--- a/src/app/auth/components/login/login.component.ts
+++ b/src/app/auth/components/login/login.component.ts
@@ -1,10 +1,10 @@
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators, AbstractControl, FormGroupDirective } from '@angular/forms';
import { AuthService } from '@auth/services/auth.service';
+import { AmbitoService } from '@auth/services/ambito.service';
import { Router } from '@angular/router';
-import {ThemePalette} from '@angular/material/core';
+import { ThemePalette } from '@angular/material/core';
import { DialogComponent } from '@auth/components/dialog/dialog.component';
-// Material
import { MatDialog } from '@angular/material/dialog';
@Component({
@@ -15,15 +15,20 @@ import { MatDialog } from '@angular/material/dialog';
export class LoginComponent implements OnInit {
loginForm: FormGroup;
- hide: boolean = true;
error: string;
readonly spinnerColor: ThemePalette = 'primary';
readonly spinnerDiameter: number = 30;
- showSubmit: boolean = false;
+ showSubmit = false;
+ randomId = Math.random().toString(36).substring(7);
+ passwordFieldName: string = 'field_' + Math.random().toString(36).substring(7);
+ passwordFieldKey: string = 'pwd_1';
+ passwordName: string = 'pwd_' + Math.random().toString(36).substring(7);
+ hide = true;
constructor(
- private fBuilder: FormBuilder,
- private authService: AuthService,
+ private fBuilder: FormBuilder,
+ private authService: AuthService,
+ private ambitoSrevice: AmbitoService,
private router: Router,
public dialog: MatDialog
) { }
@@ -32,7 +37,7 @@ export class LoginComponent implements OnInit {
this.initLoginForm();
}
- initLoginForm(): void{
+ initLoginForm(): void {
this.loginForm = this.fBuilder.group({
identifier: ['', [
Validators.required
@@ -43,16 +48,28 @@ export class LoginComponent implements OnInit {
});
}
- onSubmitEvent(loginForm: FormGroup, loginNgForm: FormGroupDirective): void{
- if(this.loginForm.valid){
+ onSubmitEvent(loginForm: FormGroup, loginNgForm: FormGroupDirective): void {
+ if (this.loginForm.valid) {
this.showSubmit = true;
this.authService.login(this.loginForm.value).subscribe(
res => {
- if(this.authService.isPharmacistsRole()){
- this.router.navigate(['/farmacias/recetas/dispensar']);
- } else if(this.authService.isProfessionalRole()){
+ if (this.authService.isProfessionalBothRoles()) {
+ this.router.navigate(['/profesionales/seleccionador-ambito']);
+ } else if (this.authService.isProfessionalPublicRole()) {
+ this.ambitoSrevice.setAmbito('publico');
this.router.navigate(['/profesionales/recetas/nueva']);
+ } else if (this.authService.isProfessionalRole()) {
+ this.ambitoSrevice.setAmbito('privado');
+ this.router.navigate(['/profesionales/recetas/nueva']);
+ } else if (this.authService.isPharmacistsPublicRole()) {
+ this.ambitoSrevice.setAmbito('publico');
+ this.router.navigate(['/farmacias/recetas/dispensar']);
+ } else if (this.authService.isPharmacistsRole()) {
+ this.ambitoSrevice.setAmbito('privado');
+ this.router.navigate(['/farmacias/recetas/dispensar']);
+ } else if (this.authService.isAuditRole()) {
+ this.router.navigate(['/audit/recetas/auditar']);
}
this.showSubmit = false;
},
@@ -61,11 +78,10 @@ export class LoginComponent implements OnInit {
loginForm.reset();
this.error = err;
this.showSubmit = false;
- });
+ });
}
}
- // Show a dialog
openDialog(): void {
const dialogRef = this.dialog.open(DialogComponent, {
width: '800px'
@@ -76,15 +92,40 @@ export class LoginComponent implements OnInit {
});
}
- showInformation(): void{
+ showInformation(): void {
this.openDialog();
}
- get identifier(): AbstractControl{
+ get identifier(): AbstractControl {
return this.loginForm.get('identifier');
}
- get password(): AbstractControl{
+ get password(): AbstractControl {
return this.loginForm.get('password');
}
+
+ forgot() {
+ this.router.navigate(['/auth/forgot-password']);
+ }
+
+ newUser() {
+ this.router.navigate(['/auth/new-user']);
+ }
+
+ newUserPharmacist() {
+ this.router.navigate(['/auth/new-user-pharmacist']);
+ }
+
+ updateInputType(inputElement: HTMLInputElement) {
+ if (this.hide) {
+ inputElement.type = inputElement.value.length ? 'password' : 'text';
+ } else {
+ inputElement.type = 'text';
+ }
+ }
+
+ toggleVisibility(inputElement: HTMLInputElement) {
+ this.hide = !this.hide;
+ this.updateInputType(inputElement);
+ }
}
diff --git a/src/app/auth/components/new-user-pharmacist/new-user-pharmacist.component.html b/src/app/auth/components/new-user-pharmacist/new-user-pharmacist.component.html
new file mode 100644
index 00000000..9d50b8ea
--- /dev/null
+++ b/src/app/auth/components/new-user-pharmacist/new-user-pharmacist.component.html
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/auth/components/new-user-pharmacist/new-user-pharmacist.component.sass b/src/app/auth/components/new-user-pharmacist/new-user-pharmacist.component.sass
new file mode 100644
index 00000000..c9918088
--- /dev/null
+++ b/src/app/auth/components/new-user-pharmacist/new-user-pharmacist.component.sass
@@ -0,0 +1,33 @@
+@import 'styles/_variables'
+
+$panels-height: 294px
+$panels-height-xl: 325px
+
+mat-card
+ width:75%
+ margin: auto
+ padding-top: 1rem
+
+mat-card-content
+ border-radius: 0.25rem
+
+mat-datepicker-toggle
+ button
+ width: 1em
+
+.form-container
+ padding:1rem
+
+.botones
+ margin-top:0.5rem
+
+.logo
+ @media (min-width: $x-small-devices) and (max-width: $small-devices)
+ margin-bottom: 1em
+ .icon-login
+ width: 100px
+ height: 100px
+ .title-login
+ color: black
+ font-family: roboto
+ margin:0
diff --git a/src/app/auth/components/new-user-pharmacist/new-user-pharmacist.component.ts b/src/app/auth/components/new-user-pharmacist/new-user-pharmacist.component.ts
new file mode 100644
index 00000000..6fa3f7f9
--- /dev/null
+++ b/src/app/auth/components/new-user-pharmacist/new-user-pharmacist.component.ts
@@ -0,0 +1,138 @@
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup, Validators, AbstractControl, FormGroupDirective } from '@angular/forms';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { AuthService } from '@auth/services/auth.service';
+import { PharmacistsService } from '../../../services/pharmacists.service';
+import * as moment from 'moment';
+import { Router } from '@angular/router';
+
+@Component({
+ selector: 'app-new-user',
+ templateUrl: './new-user-pharmacist.component.html',
+ styleUrls: ['./new-user-pharmacist.component.sass'],
+})
+export class NewUserPharmacistComponent implements OnInit {
+
+ public newUserForm: FormGroup;
+ public error: string;
+ public roleSelected: 'pharmacist';
+ public regexPassword = /^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?!.* ).{8,}$/;
+ public regexEmail = '^[a-z0-9._%+-]+@[a-z0-9.-]+[\.]{1}[a-z]{2,4}$';
+ public minDate = new Date();
+ public siteKey = '0x4AAAAAAAhL2mZAyxFj63Dw';
+
+ constructor(
+ private fBuilder: FormBuilder,
+ private authService: AuthService,
+ private _snackBar: MatSnackBar,
+ private pharmacistsService: PharmacistsService,
+ private router: Router
+ ) { }
+
+ ngOnInit(): void {
+ this.initNewUserForm();
+ }
+
+ initNewUserForm(): void {
+ this.newUserForm = this.fBuilder.group({
+ cuil: [''],
+ username: [''],
+ disposicionHabilitacion: [''],
+ enrollment: [''], // matriculaDTResponsable
+ vencimientoHabilitacion: [''],
+ email: ['', Validators.required],
+ businessName: [''],
+ password: ['', Validators.required],
+ roleType: ['pharmacist', Validators.required],
+ captcha: ['', Validators.required],
+ });
+ }
+
+ checkUser() {
+ this.newUserForm.controls.username.setValue(this.newUserForm.get('cuil').value);
+ }
+
+ onSubmitEvent(newUserForm: FormGroup, newUserNgForm: FormGroupDirective) {
+
+ if (this.newUserForm.valid) {
+ this.checkUser();
+ const params = {
+ cuil: newUserForm.get('cuil').value,
+ disposicionHabilitacion: newUserForm.get('disposicionHabilitacion').value
+ };
+ this.pharmacistsService.getPharmacistByCuit(params).subscribe(res => {
+ if (res.length) {
+ const pharmacist = res[0];
+ if (this.checkDisposicionFarmacia(pharmacist) && this.checkMatricula(pharmacist) && this.checkVencimientoHabilitacion(pharmacist)) {
+ this.userRegister(newUserForm, newUserNgForm);
+ } else {
+ if (!this.checkDisposicionFarmacia(pharmacist)) {
+ this._snackBar.open('El número de disposicion no es correcto', 'cerrar', {
+ duration: 5000
+ });
+ }
+ if (!this.checkMatricula(pharmacist)) {
+ this._snackBar.open('El número de matricula no es correcto', 'cerrar', {
+ duration: 5000
+ });
+ }
+ if (!this.checkVencimientoHabilitacion(pharmacist)) {
+ this._snackBar.open('La fecha de vencimiento de habilitación no es correcta', 'cerrar', {
+ duration: 5000
+ });
+ }
+ }
+ } else {
+ this._snackBar.open('La farmacia no se encuentra registrada, contáctese con fiscalización para corroborar sus datos', 'cerrar', {
+ duration: 5000
+ });
+ }
+ });
+ } else {
+ this._snackBar.open('Los campos deben estar completos y ser válidos', 'cerrar', {
+ duration: 5000
+ });
+ }
+ }
+
+ userRegister(newUserForm: FormGroup, newUserNgForm: FormGroupDirective) {
+ this.authService.register(this.newUserForm.value).subscribe
+ (() => {
+ this.cancelar();
+ this._snackBar.open('La cuenta ha sido creada exitosamente', 'cerrar', {
+ duration: 5000
+ });
+ newUserNgForm.resetForm();
+ newUserForm.reset();
+ },
+ err => {
+ this._snackBar.open(`Ha ocurrido un error al intentar crear la cuenta: ${JSON.stringify(err)}'`, 'cerrar', {
+ duration: 5000
+ });
+ });
+ }
+
+ checkDisposicionFarmacia(pharmacist) {
+ const disposicionHabilitacion = this.newUserForm.get('disposicionHabilitacion').value;
+ const salida = pharmacist.disposicionHabilitacion === disposicionHabilitacion ? true : false;
+ return salida;
+ }
+
+ checkMatricula(pharmacist) {
+ const matriculaDTResponsable = this.newUserForm.get('enrollment').value;
+ const salida = pharmacist.matriculaDTResponsable === matriculaDTResponsable ? true : false;
+ return salida;
+ }
+
+ checkVencimientoHabilitacion(pharmacist) {
+ const vencimientoHabilitacionForm = this.newUserForm.get('vencimientoHabilitacion').value;
+ const vencimientoHabilitacionAndes = moment(pharmacist.vencimientoHabilitacion);
+ const diferencia = vencimientoHabilitacionForm.diff(vencimientoHabilitacionAndes, 'days');
+ const salida = diferencia === 0 ? true : false;
+ return salida;
+ }
+
+ cancelar() {
+ this.router.navigate(['/auth/login']);
+ }
+}
diff --git a/src/app/auth/components/new-user/new-user.component.html b/src/app/auth/components/new-user/new-user.component.html
new file mode 100644
index 00000000..3617c0c5
--- /dev/null
+++ b/src/app/auth/components/new-user/new-user.component.html
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/auth/components/new-user/new-user.component.sass b/src/app/auth/components/new-user/new-user.component.sass
new file mode 100644
index 00000000..eb198130
--- /dev/null
+++ b/src/app/auth/components/new-user/new-user.component.sass
@@ -0,0 +1,32 @@
+@import 'styles/_variables'
+
+$panels-height: 294px
+$panels-height-xl: 325px
+
+mat-card
+ width:75%
+ margin: auto
+ padding-top: 1rem
+
+mat-card-content
+ border-radius: 0.25rem
+
+.form-container
+ padding:1rem
+
+.botones
+ margin-top:0.5rem
+
+.logo
+ @media (min-width: $x-small-devices) and (max-width: $small-devices)
+ margin-bottom: 1em
+ .icon-login
+ width: 100px
+ height: 100px
+ .title-login
+ color: black
+ font-family: roboto
+ margin:0
+::ng-deep .success-snackbar
+ background: #1fcd98 !important
+ white-space: pre-wrap
\ No newline at end of file
diff --git a/src/app/auth/components/new-user/new-user.component.ts b/src/app/auth/components/new-user/new-user.component.ts
new file mode 100644
index 00000000..7e84824b
--- /dev/null
+++ b/src/app/auth/components/new-user/new-user.component.ts
@@ -0,0 +1,124 @@
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup, Validators, AbstractControl, FormGroupDirective } from '@angular/forms';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { cuilValidator } from '../../../utils/custome-validators/cuil.validator';
+import { fechaValida } from '../../../utils/custome-validators/date.validator';
+import { AuthService } from '@auth/services/auth.service';
+import { ProfessionalsService } from '../../../services/professionals.service';
+import * as moment from 'moment';
+import { Router } from '@angular/router';
+
+@Component({
+ selector: 'app-new-user',
+ templateUrl: './new-user.component.html',
+ styleUrls: ['./new-user.component.sass']
+})
+export class NewUserComponent implements OnInit {
+
+ public newUserForm: FormGroup;
+ public error: string;
+ public roleSelected: 'professional';
+ public regexPassword = /^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?!.* ).{8,}$/;
+ public regexEmail = '^[a-z0-9._%+-]+@[a-z0-9.-]+[\.]{1}[a-z]{2,4}$';
+ public siteKey = '0x4AAAAAAAhL2mZAyxFj63Dw';
+ public minDate = new Date();
+ public authorizedProfessions: any[] = [];
+
+ constructor(
+ private fBuilder: FormBuilder,
+ private authService: AuthService,
+ private _snackBar: MatSnackBar,
+ private professionalsService: ProfessionalsService,
+ private router: Router
+ ) { }
+
+ ngOnInit(): void {
+ this.initNewUserForm();
+ this.professionalsService.getAuthorizedProfessions().subscribe(
+ res => {
+ this.authorizedProfessions = res;
+ }
+ );
+ }
+
+ initNewUserForm(): void {
+ this.newUserForm = this.fBuilder.group({
+ dni: ['', [Validators.required, Validators.pattern(/^\d{5,8}$/)]],
+ cuil: ['', [Validators.required, cuilValidator]],
+ username: [''],
+ enrollment: ['', [Validators.required, Validators.pattern(/^\d{2,10}$/)]],
+ email: ['', Validators.required],
+ businessName: [''],
+ password: ['', Validators.required],
+ roleType: ['professional', Validators.required],
+ profesion: ['', Validators.required],
+ fechaEgreso: ['', [Validators.required, fechaValida]],
+ fechaMatVencimiento: ['', [Validators.required, fechaValida]],
+ captcha: ['', Validators.required]
+ });
+ }
+
+ checkUser() {
+ this.newUserForm.controls.username.setValue(this.newUserForm.get('dni').value);
+ }
+
+ onSubmitEvent(newUserForm: FormGroup, newUserNgForm: FormGroupDirective) {
+ if (this.newUserForm.valid) {
+ this.checkUser();
+ const selectedProf = newUserForm.get('profesion').value;
+ const params = {
+ documento: newUserForm.get('dni').value,
+ email: newUserForm.get('email').value,
+ matricula: newUserForm.get('enrollment').value,
+ profesionCodigo: selectedProf ? selectedProf.codigoProfesion : null,
+ cuil: newUserForm.get('cuil').value,
+ fechaEgreso: moment(newUserForm.get('fechaEgreso').value).format('DD-MM-YYYY'),
+ fechaMatVencimiento: moment(newUserForm.get('fechaMatVencimiento').value).format('DD-MM-YYYY')
+ };
+ this.userRegister(newUserForm, newUserNgForm);
+ } else {
+ this._snackBar.open('Los campos deben estar completos y ser válidos', 'cerrar', {
+ duration: 5000
+ });
+ }
+ this.newUserForm.get('captcha')?.reset();
+
+ }
+
+ userRegister(newUserForm: FormGroup, newUserNgForm: FormGroupDirective) {
+ this.authService.register(this.newUserForm.value).subscribe
+ (user => {
+ this.cancelar();
+ const selectedProf = this.newUserForm.get('profesion').value;
+ const mensaje = `La cuenta ha sido creada exitosamente
+ Nombre: ${user.newUser.businessName}
+ Usuario: ${this.newUserForm.get('username').value}
+ Profesión: ${selectedProf?.profesion || 'No especificada'}
+ Matrícula: ${this.newUserForm.get('enrollment').value}`;
+ this._snackBar.open(mensaje, 'cerrar', {
+ duration: 12000,
+ panelClass: ['success-snackbar']
+
+ });
+ newUserNgForm.resetForm();
+ newUserForm.reset();
+ },
+ err => {
+ this._snackBar.open(`Ha ocurrido un error al intentar crear la cuenta: ${JSON.stringify(err)}'`, 'cerrar', {
+ duration: 5000
+ });
+ });
+ }
+
+
+ checkPersona(profesional) {
+ const cuil = this.newUserForm.get('cuil').value;
+ const salida = profesional.cuit == cuil ? true : false;
+ return salida;
+ }
+
+ cancelar() {
+ this.router.navigate(['/auth/login']);
+ }
+
+}
diff --git a/src/app/auth/components/recovery-password/recovery-password.component.html b/src/app/auth/components/recovery-password/recovery-password.component.html
new file mode 100644
index 00000000..85916c76
--- /dev/null
+++ b/src/app/auth/components/recovery-password/recovery-password.component.html
@@ -0,0 +1,61 @@
+;
- beforeEach(async(() => {
+ beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ ResetPasswordComponent ]
})
diff --git a/src/app/auth/guards/role-audit.guard.spec.ts b/src/app/auth/guards/role-audit.guard.spec.ts
new file mode 100644
index 00000000..4905f2fb
--- /dev/null
+++ b/src/app/auth/guards/role-audit.guard.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { RoleAuditGuard } from './role-audit.guard';
+
+describe('RoleAuditGuard', () => {
+ let guard: RoleAuditGuard;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ guard = TestBed.inject(RoleAuditGuard);
+ });
+
+ it('should be created', () => {
+ expect(guard).toBeTruthy();
+ });
+});
diff --git a/src/app/auth/guards/role-audit.guard.ts b/src/app/auth/guards/role-audit.guard.ts
new file mode 100644
index 00000000..b3b75280
--- /dev/null
+++ b/src/app/auth/guards/role-audit.guard.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, UrlTree, Router } from '@angular/router';
+import { Observable } from 'rxjs';
+import { AuthService } from '@auth/services/auth.service';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class RoleAuditGuard implements CanActivate {
+
+ constructor(private authService: AuthService, private router: Router){}
+
+ canActivate(): Observable | Promise | boolean | UrlTree {
+ if (!this.authService.isAuditRole() && (this.authService.isPharmacistsRole() || this.authService.isPharmacistsPublicRole())) {
+ this.router.navigate(['/farmacias/recetas/dispensar']);
+ return false;
+ } else if (!this.authService.isAuditRole() && (this.authService.isProfessionalRole() || this.authService.isProfessionalPublicRole())) {
+ this.router.navigate(['/profesionales/recetas/nueva']);
+ return false;
+ }
+ return true;
+ }
+
+}
diff --git a/src/app/auth/guards/role-pharmacist.guard.ts b/src/app/auth/guards/role-pharmacist.guard.ts
index cf5a83fe..2241eea7 100644
--- a/src/app/auth/guards/role-pharmacist.guard.ts
+++ b/src/app/auth/guards/role-pharmacist.guard.ts
@@ -11,9 +11,12 @@ export class RolePharmacistGuard implements CanActivate {
constructor(private authService: AuthService, private router: Router){}
canActivate(): Observable | Promise | boolean | UrlTree {
- if (!this.authService.isPharmacistsRole()) {
+ if (!(this.authService.isPharmacistsRole() || this.authService.isPharmacistsPublicRole()) && (this.authService.isProfessionalRole() || this.authService.isProfessionalPublicRole())) {
this.router.navigate(['/profesionales/recetas/nueva']);
return false;
+ } else if (!(this.authService.isPharmacistsRole() || this.authService.isPharmacistsPublicRole()) && this.authService.isAuditRole()) {
+ this.router.navigate(['/audit/recetas/auditar']);
+ return false;
}
return true;
}
diff --git a/src/app/auth/guards/role-professional.guard.ts b/src/app/auth/guards/role-professional.guard.ts
index ce9ad293..733243c6 100644
--- a/src/app/auth/guards/role-professional.guard.ts
+++ b/src/app/auth/guards/role-professional.guard.ts
@@ -11,9 +11,12 @@ export class RoleProfessionalGuard implements CanActivate {
constructor(private authService: AuthService, private router: Router){}
canActivate(): Observable | Promise | boolean | UrlTree {
- if (!this.authService.isProfessionalRole()) {
+ if (!(this.authService.isProfessionalRole() || this.authService.isProfessionalPublicRole()) && this.authService.isPharmacistsRole()) {
this.router.navigate(['/farmacias/recetas/dispensar']);
return false;
+ } else if (!(this.authService.isProfessionalRole || this.authService.isProfessionalPublicRole())&& this.authService.isAuditRole()) {
+ this.router.navigate(['/audit/recetas/auditar']);
+ return false;
}
return true;
}
diff --git a/src/app/auth/services/ambito.service.ts b/src/app/auth/services/ambito.service.ts
new file mode 100644
index 00000000..13ebb9c0
--- /dev/null
+++ b/src/app/auth/services/ambito.service.ts
@@ -0,0 +1,61 @@
+import { Injectable } from "@angular/core";
+import { Observable, BehaviorSubject } from 'rxjs';
+
+
+@Injectable({
+ providedIn: "root",
+})
+export class AmbitoService {
+ private readonly STORAGE_KEY = 'ambito_seleccionado';
+ private ambitoSeleccionado: "publico" | "privado" | null = null;
+ private ambitoSeleccionado$: BehaviorSubject<"publico" | "privado" | null>;
+
+ constructor() {
+ // Cargar el ámbito desde localStorage al inicializar el servicio
+ this.loadAmbitoFromStorage();
+ this.ambitoSeleccionado$ = new BehaviorSubject<"publico" | "privado" | null>(this.ambitoSeleccionado);
+ }
+
+ private loadAmbitoFromStorage(): void {
+ try {
+ const storedAmbito = localStorage.getItem(this.STORAGE_KEY);
+ if (storedAmbito && (storedAmbito === 'publico' || storedAmbito === 'privado')) {
+ this.ambitoSeleccionado = storedAmbito as "publico" | "privado";
+ }
+ } catch (error) {
+ console.warn('Error al cargar ámbito desde localStorage:', error);
+ }
+ }
+
+ private saveAmbitoToStorage(ambito: "publico" | "privado" | null): void {
+ try {
+ if (ambito) {
+ localStorage.setItem(this.STORAGE_KEY, ambito);
+ } else {
+ localStorage.removeItem(this.STORAGE_KEY);
+ }
+ } catch (error) {
+ console.warn('Error al guardar ámbito en localStorage:', error);
+ }
+ }
+
+ get getAmbitoSeleccionado(): Observable<"publico" | "privado" | null> {
+ return this.ambitoSeleccionado$.asObservable();
+ }
+
+ setAmbito(ambito: "publico" | "privado"): void {
+ this.ambitoSeleccionado = ambito;
+ this.saveAmbitoToStorage(ambito);
+ this.ambitoSeleccionado$.next(ambito);
+ }
+
+ getAmbito(): "publico" | "privado" | null {
+ return this.ambitoSeleccionado;
+ }
+
+ clearAmbito(): void {
+ this.ambitoSeleccionado = null;
+ this.saveAmbitoToStorage(null);
+ this.ambitoSeleccionado$.next(null);
+ }
+}
\ No newline at end of file
diff --git a/src/app/auth/services/auth.service.ts b/src/app/auth/services/auth.service.ts
index e49994fb..fc26d951 100644
--- a/src/app/auth/services/auth.service.ts
+++ b/src/app/auth/services/auth.service.ts
@@ -19,6 +19,8 @@ export class AuthService {
private readonly apiEndPoint = environment.API_END_POINT;
private loggedIn: BehaviorSubject;
private businessName: BehaviorSubject;
+ private isAudit: BehaviorSubject;
+ private isProfessionalBothRolesO: BehaviorSubject;
constructor(
@@ -28,21 +30,23 @@ export class AuthService {
this.loggedIn = new BehaviorSubject(this.tokensExists());
this.businessName = new BehaviorSubject(this.getLoggedBusinessName());
+ this.isAudit = new BehaviorSubject(this.isAuditRole());
+ this.isProfessionalBothRolesO = new BehaviorSubject(this.isProfessionalBothRoles());
}
- async load(): Promise{
- if(this.tokensExists()){
+ async load(): Promise {
+ if (this.tokensExists()) {
const resp = await this.http.get(`${this.apiEndPoint}/auth/jwt-login`).pipe(
- tap(tokens => this.doLoginUser(tokens)),
- mapTo(true),
- catchError(async (error) => {
- const success = await this.logout().toPromise();
- if(success) this.router.navigate(['/auth/login']);
- return of(false);
- })
- ).toPromise();
+ tap(tokens => this.doLoginUser(tokens)),
+ mapTo(true),
+ catchError(async (error) => {
+ const success = await this.logout().toPromise();
+ if (success) this.router.navigate(['/auth/login']);
+ return of(false);
+ })
+ ).toPromise();
}
}
@@ -66,10 +70,18 @@ export class AuthService {
);
}
- resetPassword(passwords: {oldPassword: string, newPassword: string}){
+ resetPassword(passwords: { oldPassword: string, newPassword: string }) {
return this.http.post(`${this.apiEndPoint}/auth/reset-password`, passwords);
}
+ recoverPassword(data) {
+ return this.http.post(`${this.apiEndPoint}/auth/recovery-password`, data);
+ }
+
+ register(data) {
+ return this.http.post(`${this.apiEndPoint}/auth/register`, data);
+ }
+
get isLoggedIn() {
return this.loggedIn.asObservable();
}
@@ -78,6 +90,14 @@ export class AuthService {
return this.businessName.asObservable();
}
+ get getIsAudit() {
+ return this.isAudit.asObservable();
+ }
+
+ get getIsProfessionalBothRoles() {
+ return this.isProfessionalBothRolesO.asObservable();
+ }
+
refreshToken() {
return this.http.post(`${this.apiEndPoint}/auth/refresh`, {
'refreshToken': this.getRefreshToken()
@@ -92,39 +112,84 @@ export class AuthService {
return localStorage.getItem(this.JWT_TOKEN);
}
- getLoggedUsername(): string{
+ getLoggedUsername(): string {
const payLoadJwt: any = this.getDecodeJwt();
return payLoadJwt.usrn;
}
- getLoggedUserId(): string{
+ getLoggedUserId(): string {
const payLoadJwt: any = this.getDecodeJwt();
return payLoadJwt.sub;
}
- getLoggedBusinessName(): string{
+ getLoggedBusinessName(): string {
const payLoadJwt: any = this.getDecodeJwt();
return payLoadJwt.bsname;
}
isPharmacistsRole(): boolean {
const roles: string[] = this.getLoggedRole();
- return roles.some( (role: string) => role === 'pharmacist');
- // return this.getLoggedRole() === 'pharmacist';
+ if (!roles?.length) {
+ return false;
+ }
+ return roles.some((role: string) => role === 'pharmacist');
+ }
+
+ isPharmacistsPublicRole(): boolean {
+ const roles: string[] = this.getLoggedRole();
+ if (!roles?.length) {
+ return false;
+ }
+ return roles.some((role: string) => role === 'pharmacist-public');
}
isProfessionalRole(): boolean {
const roles: string[] = this.getLoggedRole();
- return roles.some( (role: string) => role === 'professional');
+ if (!roles?.length) {
+ return false;
+ }
+ return roles.some((role: string) => role === 'professional');
+ }
+
+ isProfessionalPublicRole(): boolean {
+ const roles: string[] = this.getLoggedRole();
+ if (!roles?.length) {
+ return false;
+ }
+ return roles.some((role: string) => role === 'professional-public');
+ }
+
+ isProfessionalBothRoles(): boolean {
+ return this.isProfessionalRole() && this.isProfessionalPublicRole();
+ }
+
+ isAuditRole(): boolean {
+ const roles: string[] = this.getLoggedRole();
+ if (!roles?.length){
+ return false;
+ }
+ return roles.some((role: string) => role === 'auditor');
}
- getLoggedRole(): string[]{
+ isAdminRole(): boolean {
+ const roles: string[] = this.getLoggedRole();
+ if (!roles?.length) {
+ return false;
+ }
+ return roles.some((role: string) => role === 'admin');
+ }
+ getLoggedRole(): string[] {
const payLoadJwt: any = this.getDecodeJwt();
return payLoadJwt.rl;
}
- private getDecodeJwt(){
- if(!!this.getJwtToken()){
+ // Metodo que invoca a la api para realizar el recovering de la password
+ setValidationTokenAndNotify(usuario: Number): Observable {
+ return this.http.post(`${this.apiEndPoint}/auth/setValidationTokenAndNotify`, usuario);
+ }
+
+ private getDecodeJwt() {
+ if (!!this.getJwtToken()) {
const token = this.getJwtToken();
const tokenPayload = decode(token);
return tokenPayload;
@@ -136,12 +201,14 @@ export class AuthService {
this.storeTokens(tokens);
this.businessName.next(this.getLoggedBusinessName());
this.loggedIn.next(this.tokensExists());
+ this.isAudit.next(this.isAuditRole());
}
private doLogoutUser() {
this.prescriptionsService.cleanPrescriptions();
this.removeTokens();
this.loggedIn.next(this.tokensExists());
+ this.isAudit.next(this.isAuditRole());
}
private getRefreshToken() {
@@ -162,7 +229,3 @@ export class AuthService {
localStorage.removeItem(this.REFRESH_TOKEN);
}
}
-
-
-
-
diff --git a/src/app/auth/token-interceptor.service.ts b/src/app/auth/token-interceptor.service.ts
index 4cea8460..e89cee71 100644
--- a/src/app/auth/token-interceptor.service.ts
+++ b/src/app/auth/token-interceptor.service.ts
@@ -9,73 +9,72 @@ import { environment } from '@root/environments/environment';
@Injectable()
export class TokenInterceptorService implements HttpInterceptor {
- private isRefreshing = false;
- private refreshTokenSubject: BehaviorSubject = new BehaviorSubject(null);
+ private isRefreshing = false;
+ private refreshTokenSubject: BehaviorSubject = new BehaviorSubject(null);
- constructor(private authService: AuthService, private router: Router ) { }
+ constructor(private authService: AuthService, private router: Router) { }
- intercept(request: HttpRequest, next: HttpHandler): Observable> {
+ intercept(request: HttpRequest, next: HttpHandler): Observable> {
+ const urlPublica = request.headers.get('public') === 'true';
+ if (!urlPublica && this.authService.getJwtToken()) {
+ request = this.addToken(request, this.authService.getJwtToken());
+ }
- if (this.authService.getJwtToken()) {
- request = this.addToken(request, this.authService.getJwtToken());
+ return next.handle(request).pipe(catchError(error => {
+ if (error instanceof HttpErrorResponse && error.status === 406) {
+ return this.handle406Error(request, next);
+ } else if (error instanceof HttpErrorResponse && error.status === 417) {
+ this.handle417Error(request, next);
+ return throwError(error.error.message);
+ } else {
+ return this.errorHandler(error);
+ }
+ }));
}
- return next.handle(request).pipe(catchError(error => {
- if (error instanceof HttpErrorResponse && error.status === 406) {
- return this.handle406Error(request, next);
- } else if (error instanceof HttpErrorResponse && error.status === 417){
- this.handle417Error(request, next);
- return throwError(error.error.message);
- }
- else {
- return this.errorHandler(error);
- }
- }));
- }
+ errorHandler(err: HttpErrorResponse) {
+ if (err.status == 422) {
+ return throwError(err);
+ }
+ return throwError(err.error.message || 'Server Error');
+ }
- errorHandler(err: HttpErrorResponse){
- if(err.status == 422){
- return throwError(err);
+ private addToken(request: HttpRequest, token: string) {
+ return request.clone({
+ setHeaders: {
+ 'Authorization': `Bearer ${token}`
+ }
+ });
}
- return throwError(err.error.message || "Server Error");
- }
- private addToken(request: HttpRequest, token: string) {
- return request.clone({
- setHeaders: {
- 'Authorization': `Bearer ${token}`
- }
- })
- }
+ // expired token handler
+ private handle406Error(request: HttpRequest, next: HttpHandler) {
+ if (!this.isRefreshing) {
+ this.isRefreshing = true;
+ this.refreshTokenSubject.next(null);
- // expired token handler
- private handle406Error(request: HttpRequest, next: HttpHandler) {
- if (!this.isRefreshing) {
- this.isRefreshing = true;
- this.refreshTokenSubject.next(null);
+ return this.authService.refreshToken().pipe(
+ switchMap((token: any) => {
+ this.isRefreshing = false;
+ this.refreshTokenSubject.next(token.jwt);
+ return next.handle(this.addToken(request, token.jwt));
+ }));
- return this.authService.refreshToken().pipe(
- switchMap((token: any) => {
- this.isRefreshing = false;
- this.refreshTokenSubject.next(token.jwt);
- return next.handle(this.addToken(request, token.jwt));
- }));
-
- } else {
- return this.refreshTokenSubject.pipe(
- filter(token => token != null),
- take(1),
- switchMap(jwt => {
- return next.handle(this.addToken(request, jwt));
- }));
+ } else {
+ return this.refreshTokenSubject.pipe(
+ filter(token => token != null),
+ take(1),
+ switchMap(jwt => {
+ return next.handle(this.addToken(request, jwt));
+ }));
+ }
}
- }
- // user credentials handler
- private handle417Error(request: HttpRequest, next: HttpHandler) {
- return this.authService.logout().subscribe(success => {
- if(success) this.router.navigate(['/auth/login']);
- });
- }
+ // user credentials handler
+ private handle417Error(request: HttpRequest, next: HttpHandler) {
+ return this.authService.logout().subscribe(success => {
+ if (success) { this.router.navigate(['/auth/login']); }
+ });
+ }
}
diff --git a/src/app/interfaces/andesPrescriptions.ts b/src/app/interfaces/andesPrescriptions.ts
new file mode 100644
index 00000000..932f4fcb
--- /dev/null
+++ b/src/app/interfaces/andesPrescriptions.ts
@@ -0,0 +1,170 @@
+import SnomedConcept from './snomedConcept';
+
+export class Medicamento {
+ cantidad: number;
+ descripcion: string;
+ medicamento: any;
+ presentacion: string;
+ unidades: string;
+ cantidadEnvases: number;
+ observacion?: {
+ type: string;
+ };
+}
+
+export class Dispensa {
+ descripcion: string;
+ cantidad: number;
+ medicamento: Medicamento[];
+ presentacion: string;
+ unidades: string;
+ cantidadEnvases: number;
+ organizacion: {
+ id: string;
+ nombre: string;
+ };
+}
+export default class AndesPrescriptions {
+ _id: string;
+ idAndes: string;
+ idReceta?: string;
+ organizacion: {
+ id: string;
+ nombre: string;
+ };
+ profesional: {
+ id: string;
+ nombre: string;
+ apellido: string;
+ documento: string;
+ profesion: string;
+ especialidad: string;
+ matricula: number;
+ };
+ diagnostico: {
+ descripcion?: string;
+ term?: string;
+ fsn?: string;
+ conceptId?: string;
+ semanticTag?: string;
+ };
+ fechaRegistro: Date;
+ fechaPrestacion: Date;
+ idPrestacion: string;
+ idRegistro: string;
+ medicamento: {
+ concepto: {
+ conceptId: string;
+ term: string;
+ fsn: string;
+ semanticTag: string;
+ };
+ dosisDiaria: {
+ dosis: string;
+ intervalo: {
+ id: string;
+ key: string;
+ nombre: string;
+ source: string;
+ type: string;
+ };
+ dias: number;
+ notaMedica: string;
+ };
+ presentacion: string;
+ unidades: string;
+ cantidad: number;
+ cantEnvases: number;
+ tratamientoProlongado: Boolean;
+ tiempoTratamiento: any;
+ tipoReceta: 'simple' | 'duplicado' | 'triplicado';
+ };
+ dispensa: Dispensa[];
+ estados: [
+ {
+ id: string;
+ tipo: 'vigente' | 'finalizada' | 'vencida' | 'suspendida' | 'rechazada';
+ createdAt: Date;
+ createdBy: {
+ nombre: string;
+ apellido: string;
+ organizacion: {
+ nombre: string;
+ };
+ };
+ }
+ ];
+ estadosDispensa: [
+ {
+ id: string;
+ tipo: 'sin dispensa' | 'dispensada' | 'dispensa-parcial';
+ fecha: Date;
+ sistema?: 'sifaho' | 'recetar';
+ }
+ ];
+ appNotificada: [
+ {
+ id: string;
+ fecha: Date;
+ }
+ ];
+ estadoActual: {
+ id: string;
+ tipo: string;
+ createdAt: Date;
+ createdBy: {
+ nombre: string;
+ apellido: string;
+ organizacion: {
+ nombre: string;
+ };
+ };
+
+ };
+ estadoDispensaActual: {
+ tipo: string;
+ fecha: Date;
+ id: string;
+ };
+ paciente: {
+ carpetaEfectores: [];
+ id: string;
+ nombre: string;
+ apellido: string;
+ documento: string;
+ sexo: string;
+ fechaNacimiento: Date;
+ obraSocial: {
+ codigoPuco: number;
+ nombre: string;
+ financiador?: string;
+ origen?: string;
+ fechaActualizacion?: Date;
+ prepaga?: Boolean;
+ numeroAfiliado?: string;
+ };
+ genero: string;
+ nombreCompleto: string;
+ edad: number;
+ edadReal: {
+ valor: number;
+ unidad: string;
+ };
+ };
+ createdAt: Date;
+ createdBy: {
+ nombre: string;
+ apellido: string;
+ organizacion: {
+ nombre: string;
+ };
+ };
+ updatedAt: Date;
+ updatedBy: {
+ nombre: string;
+ apellido: string;
+ organizacion: {
+ nombre: string;
+ };
+ };
+}
diff --git a/src/app/interfaces/certificate.ts b/src/app/interfaces/certificate.ts
new file mode 100644
index 00000000..8f20d853
--- /dev/null
+++ b/src/app/interfaces/certificate.ts
@@ -0,0 +1,35 @@
+import { Patient } from '@interfaces/patients';
+
+export class Certificate {
+ _id?: string;
+ patient: Patient;
+ certificate: string;
+ startDate: Date;
+ cantDias: number;
+ createdAt: Date;
+ updatedAt: Date;
+ status?: string;
+ anulateDate?: Date;
+ anulateReason?:string;
+ professional: {
+ userId: string;
+ enrollment?: string;
+ cuil: string;
+ businessName: string;
+ profesionGrado?: [{
+ profesion:string ,
+ codigoProfesion: string ,
+ numeroMatricula: string
+ }]
+ };
+
+ get endDate(): Date {
+ if (!this.startDate || !this.cantDias) {
+ return null;
+ }
+ const endDate = new Date(this.startDate);
+ endDate.setDate(endDate.getDate() + this.cantDias - 1);
+ endDate.setHours(23, 59, 59, 999);
+ return endDate;
+ }
+}
diff --git a/src/app/interfaces/patients.ts b/src/app/interfaces/patients.ts
index 18749b9e..08802efd 100644
--- a/src/app/interfaces/patients.ts
+++ b/src/app/interfaces/patients.ts
@@ -9,7 +9,15 @@ export class Patient {
public status?: string,
public dni?: string,
public createdAt?: Date,
- public _id?: string
+ public _id?: string,
+ public fechaNac?: Date,
+ public obraSocial?: {
+ _id: string;
+ nombre?: string;
+ codigoPuco?: string;
+ numeroAfiliado?: string;
+ },
+ public idMPI?: string,
) {}
}
diff --git a/src/app/interfaces/pharmacists.ts b/src/app/interfaces/pharmacists.ts
new file mode 100644
index 00000000..5768f678
--- /dev/null
+++ b/src/app/interfaces/pharmacists.ts
@@ -0,0 +1,40 @@
+import { Injectable } from "@angular/core";
+import { Adapter } from "./adapter";
+
+export class Pharmacists {
+ // Cambiar campos
+ constructor(
+ public andes_id: string,
+ public first_name: string,
+ public sex: string,
+ public last_name: string,
+ public dni: string,
+ public nationality: string,
+ public enrollment: string,
+ public createdAt: Date
+ ) {}
+ public _id: number;
+
+ public getEnrollmentAndFullname(): String {
+ return `${this.enrollment} ${this.last_name} ${this.first_name}`
+ };
+}
+
+@Injectable({
+ providedIn: "root"
+})
+export class PharmacistsAdapter implements Adapter {
+ adapt(item: any): Pharmacists {
+ // Cambiar campos
+ return new Pharmacists(
+ item.id,
+ item.nombre,
+ item.sexo,
+ item.apellido,
+ item.documento,
+ item.nacionalidad,
+ item.profesiones[0].matriculacion[0].matriculaNumero,
+ new Date(item.created)
+ );
+ }
+}
\ No newline at end of file
diff --git a/src/app/interfaces/practices.ts b/src/app/interfaces/practices.ts
new file mode 100644
index 00000000..0e0d6178
--- /dev/null
+++ b/src/app/interfaces/practices.ts
@@ -0,0 +1,74 @@
+
+export class Practice {
+ _id?: string;
+ date: Date;
+ patient: {
+ dni: string;
+ sex: string;
+ lastName: string;
+ firstName: string;
+ otraOS?: boolean;
+ obraSocial?: {
+ nombre: string;
+ codigoPuco: string;
+ numeroAfiliado: string;
+ };
+ };
+ professional: {
+ userId: string;
+ enrollment?: string;
+ cuil: string;
+ businessName: string;
+ profesionGrado?: [{
+ profesion:string ,
+ codigoProfesion: string ,
+ numeroMatricula: string
+ }]
+ };
+ practice: string;
+ diagnostic: string;
+ indications: string;
+ createdAt?: Date;
+ updatedAt?: Date;
+ status?: 'active' | 'completed' | 'cancelled';
+
+ constructor(
+ date: Date,
+ patient: {
+ dni: string;
+ sex: string;
+ lastName: string;
+ firstName: string;
+ otraOS?: boolean;
+ obraSocial?: {
+ nombre: string;
+ codigoPuco: string;
+ numeroAfiliado: string;
+ };
+ },
+ professional: {
+ userId: string;
+ enrollment: string;
+ cuil: string;
+ businessName: string;
+ },
+ practice: string,
+ diagnostic: string,
+ indications: string,
+ _id?: string,
+ createdAt?: Date,
+ updatedAt?: Date,
+ status?: 'active' | 'completed' | 'cancelled'
+ ) {
+ this.date = date;
+ this.patient = patient;
+ this.professional = professional;
+ this.practice = practice;
+ this.diagnostic = diagnostic;
+ this.indications = indications;
+ this._id = _id;
+ this.createdAt = createdAt;
+ this.updatedAt = updatedAt;
+ this.status = status || 'active';
+ }
+}
diff --git a/src/app/interfaces/prescriptions.ts b/src/app/interfaces/prescriptions.ts
index c552349e..da929807 100644
--- a/src/app/interfaces/prescriptions.ts
+++ b/src/app/interfaces/prescriptions.ts
@@ -1,27 +1,60 @@
-import Supply from '@interfaces/supplies'
-import { Patient } from '@interfaces/patients'
+import Supply from '@interfaces/supplies';
+import { Patient } from '@interfaces/patients';
+import AndesPrescriptions from './andesPrescriptions';
+
+// Interfaz para la respuesta mixta de prescripciones
+export interface PrescriptionsResponse {
+ prescriptions: (Prescriptions | AndesPrescriptions)[];
+ total: number;
+ offset: number;
+ limit: number;
+ sources?: {
+ local: number;
+ andes: number;
+ };
+}
export class Prescriptions {
- _id: string;
- patient: Patient;
- professional: {
- userId: string,
- enrollment: string,
- cuil: string,
- businessName: string,
- };
- dispensedBy?: {
- userId: string,
- cuil: string,
- businessName: string,
- };
- dispensedAt?: Date;
- supplies: Array<{supply: Supply, quantity: number}>;
- status: string;
- date: Date;
+ _id: string;
+ prescriptionId?: string;
+ patient: Patient;
+ professional: {
+ userId: string;
+ enrollment: string;
+ cuil: string;
+ businessName: string;
+ profesionGrado: [{
+ profesion:string ,
+ codigoProfesion: string ,
+ numeroMatricula: string
+ }]
+ };
+ dispensedBy?: {
+ userId: string;
+ cuil: string;
+ businessName: string;
+ };
+ dispensedAt?: Date;
+ supplies: Array<{
+ supply: Supply;
+ quantity: number;
+ quantityPresentation?: string;
+ diagnostic?: string;
+ indication?: string;
+ duplicate?: boolean;
+ triplicate?: boolean;
+ triplicateData?: {
+ serie: string;
+ numero: number;
+ };
+ }>;
+ status: string;
+ date: Date;
- diagnostic?: string;
- observation?: string;
- createdAt?: Date;
- updatedAt?: Date;
+ diagnostic?: string;
+ observation?: string;
+ createdAt?: Date;
+ updatedAt?: Date;
+ triple?: boolean;
+ triplicado?: boolean;
}
diff --git a/src/app/interfaces/snomedConcept.ts b/src/app/interfaces/snomedConcept.ts
new file mode 100644
index 00000000..0a796c06
--- /dev/null
+++ b/src/app/interfaces/snomedConcept.ts
@@ -0,0 +1,8 @@
+
+export default interface SnomedConcept {
+ conceptId: string;
+ term: string;
+ fsn: string;
+ semanticTag: string;
+}
+
\ No newline at end of file
diff --git a/src/app/interfaces/supplies.ts b/src/app/interfaces/supplies.ts
index a3bfc636..087270a6 100644
--- a/src/app/interfaces/supplies.ts
+++ b/src/app/interfaces/supplies.ts
@@ -1,4 +1,6 @@
+import SnomedConcept from './snomedConcept';
export default interface Supplies {
+ snomedConcept: SnomedConcept;
supply: any;
quantity: string;
_id: string;
diff --git a/src/app/interfaces/users.ts b/src/app/interfaces/users.ts
index 734f30f1..2a2d4f50 100644
--- a/src/app/interfaces/users.ts
+++ b/src/app/interfaces/users.ts
@@ -4,4 +4,15 @@ export class User {
businessName: string;
email: string;
cuil: string;
+ username?: string;
+ roles?: Array<{ _id: string, role: string }>;
+ isActive?: boolean;
+ lastLogin?: Date;
+ createdAt?: Date;
+ updatedAt?: Date;
+ profesionGrado?: Array<{
+ profesion: string;
+ codigoProfesion: string;
+ numeroMatricula: string;
+ }>;
}
\ No newline at end of file
diff --git a/src/app/pharmacists/components/andes-prescription-printer/andes-prescription-printer.component.html b/src/app/pharmacists/components/andes-prescription-printer/andes-prescription-printer.component.html
new file mode 100644
index 00000000..bf49662a
--- /dev/null
+++ b/src/app/pharmacists/components/andes-prescription-printer/andes-prescription-printer.component.html
@@ -0,0 +1 @@
+;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ AndesPrescriptionPrinterComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(AndesPrescriptionPrinterComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/pharmacists/components/andes-prescription-printer/andes-prescription-printer.component.ts b/src/app/pharmacists/components/andes-prescription-printer/andes-prescription-printer.component.ts
new file mode 100644
index 00000000..3f5d48e1
--- /dev/null
+++ b/src/app/pharmacists/components/andes-prescription-printer/andes-prescription-printer.component.ts
@@ -0,0 +1,23 @@
+import { Component, OnInit } from '@angular/core';
+import AndesPrescriptions from '@interfaces/andesPrescriptions';
+import { UnifiedPrinterComponent } from '@shared/components/unified-printer/unified-printer.component';
+
+@Component({
+ selector: 'app-prescription-printer',
+ templateUrl: './andes-prescription-printer.component.html',
+ styleUrls: ['./andes-prescription-printer.component.sass']
+})
+export class AndesPrescriptionPrinterComponent implements OnInit {
+
+ constructor(
+ private unifiedPrinter: UnifiedPrinterComponent
+ ) { }
+
+ ngOnInit(): void {
+ }
+
+ async print(prescription: AndesPrescriptions) {
+ await this.unifiedPrinter.printAndesPrescription(prescription);
+ }
+
+}
diff --git a/src/app/pharmacists/components/dialog-report/dialog-report.component.html b/src/app/pharmacists/components/dialog-report/dialog-report.component.html
new file mode 100644
index 00000000..b91e7cca
--- /dev/null
+++ b/src/app/pharmacists/components/dialog-report/dialog-report.component.html
@@ -0,0 +1,24 @@
+,
+ @Inject(MAT_DIALOG_DATA) public data: DialogData,
+ ) { }
+
+ onNoClick(): void {
+ this.dialogRef.close();
+ }
+
+ enableDownload() {
+ return this.data.fechaDesde && this.data.fechaHasta;
+ }
+
+}
diff --git a/src/app/pharmacists/components/dialog/dialog.component.html b/src/app/pharmacists/components/dialog/dialog.component.html
index 75e57a30..c0c7009a 100644
--- a/src/app/pharmacists/components/dialog/dialog.component.html
+++ b/src/app/pharmacists/components/dialog/dialog.component.html
@@ -16,7 +16,6 @@
Login
+
-
-
+
\ No newline at end of file
diff --git a/src/app/auth/components/login/login.component.sass b/src/app/auth/components/login/login.component.sass
index 38a66491..b027ad30 100644
--- a/src/app/auth/components/login/login.component.sass
+++ b/src/app/auth/components/login/login.component.sass
@@ -10,7 +10,7 @@ $panels-height-xl: 325px
height: 100%
.cards-container
- margin-bottom: 4em
+ margin-bottom: 1em
@media (min-width: $x-small-devices) and (max-width: $small-devices)
flex-direction: column!important
.welcome-panel
@@ -24,18 +24,12 @@ $panels-height-xl: 325px
width: calc(100% / 3)
mat-card
box-sizing: content-box!important
- height: calc(#{$panels-height} - 32px)
- @media (min-width: $larger-devices) and (max-width: $x-larger-devices)
- height: calc(#{$panels-height-xl} - 32px)
+ height: 20.21rem
@media (min-width: $x-small-devices) and (max-width: $larger-devices)
height: auto
mat-card-title, mat-card-content
margin: 0!important
- .login-action
- margin-top: 20px
- @media (min-width: $larger-devices) and (max-width: $x-larger-devices)
- margin-top: 40px
@media (min-width: $larger-devices) and (max-width: $xx-larger-devices)
.login-error
@@ -44,6 +38,10 @@ $panels-height-xl: 325px
mat-card-actions
padding: 0!important
margin: 0!important
+ a.btn-link
+ margin: 10px 0!important
+ min-height: 35px !important
+
@media (min-width: $x-small-devices) and (max-width: $larger-devices)
flex-direction: column!important
a.btn-link
@@ -61,8 +59,7 @@ $panels-height-xl: 325px
.logo
- margin-top: 4em
- margin-bottom: 4em
+ margin-top: 0em
@media (min-width: $x-small-devices) and (max-width: $small-devices)
margin-bottom: 1em
.icon-login
@@ -70,4 +67,19 @@ $panels-height-xl: 325px
height: 100px
.title-login
color: white
- font-family: roboto
\ No newline at end of file
+ font-family: roboto
+
+.hover
+ cursor: pointer
+ float: right
+
+.boton-iniciar-sesion
+ background:#00da93
+ color:#ffffff
+
+.boton-olvidar-clave
+ padding-top: 0.2rem
+ padding-bottom:1rem
+
+mat-card-content
+ margin-bottom:0px!important
\ No newline at end of file
diff --git a/src/app/auth/components/login/login.component.spec.ts b/src/app/auth/components/login/login.component.spec.ts
index d6d85a84..eb0c71a9 100644
--- a/src/app/auth/components/login/login.component.spec.ts
+++ b/src/app/auth/components/login/login.component.spec.ts
@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { LoginComponent } from './login.component';
@@ -6,7 +6,7 @@ describe('LoginComponent', () => {
let component: LoginComponent;
let fixture: ComponentFixtureLogin
+ RecetAR
+
+ RecetAR
+
+
+
+ lock Reestablecer contraseña
+
+
+
+
+
+
diff --git a/src/app/auth/components/recovery-password/recovery-password.component.sass b/src/app/auth/components/recovery-password/recovery-password.component.sass
new file mode 100644
index 00000000..65a919a7
--- /dev/null
+++ b/src/app/auth/components/recovery-password/recovery-password.component.sass
@@ -0,0 +1,14 @@
+:host
+ display: block
+ width: 100%
+ height: 100%
+
+ .form-container
+ padding: 10px
+ width: 95%
+
+ .spinner-container
+ padding: 5px
+
+.container
+ margin-top: 2em
diff --git a/src/app/auth/components/recovery-password/recovery-password.component.ts b/src/app/auth/components/recovery-password/recovery-password.component.ts
new file mode 100644
index 00000000..4b7d7780
--- /dev/null
+++ b/src/app/auth/components/recovery-password/recovery-password.component.ts
@@ -0,0 +1,109 @@
+import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup, AbstractControl, FormGroupDirective, Validators, ValidationErrors } from '@angular/forms';
+import { AuthService } from '@auth/services/auth.service';
+import { Router, ActivatedRoute } from '@angular/router';
+import { Location } from '@angular/common';
+import { ThemePalette } from '@angular/material/core/common-behaviors/color';
+import { MatSnackBar } from '@angular/material/snack-bar';
+
+@Component({
+ selector: 'app-recovery-password',
+ templateUrl: './recovery-password.component.html',
+ styleUrls: ['./recovery-password.component.sass']
+})
+export class RecoveryComponent implements OnInit {
+
+ recoveryForm: FormGroup;
+ hideOldPassword: boolean = true;
+ hideNewPassword: boolean = true;
+ error: string;
+ showSubmit: boolean = false;
+ readonly spinnerColor: ThemePalette = 'primary';
+ readonly spinnerDiameter: number = 30;
+ private token;
+
+ constructor(
+ private fBuild: FormBuilder,
+ private authService: AuthService,
+ private router: Router,
+ private _snackBar: MatSnackBar,
+ private _location: Location,
+ private activateRouter: ActivatedRoute
+ ) { }
+
+ ngOnInit(): void {
+ this.initrecoveryForm();
+ }
+
+ initrecoveryForm() {
+ this.token = this.activateRouter.snapshot.paramMap.get('token');
+ this.recoveryForm = this.fBuild.group({
+ newPassword: ['', [
+ Validators.required,
+ Validators.minLength(8)
+ ]],
+ confirmPassword: ['', [
+ Validators.required,
+ this.matchValues('newPassword'),
+ ]]
+ },
+ { validators: this.checkPasswords });
+ }
+
+ onSubmitEvent(recoveryForm: FormGroup, recoveryNgForm: FormGroupDirective): void {
+ if (this.recoveryForm.valid) {
+ this.showSubmit = true;
+ this.authService.recoverPassword({ newPassword: this.newPassword.value, authenticationToken: this.token }).subscribe(
+ res => {
+ // menssage
+ this.showSubmit = false;
+ setTimeout(() => {
+ this.router.navigate(['/auth/login']);
+ }, 3000);
+ this.openSnackBar(res, "Cerrar");
+ },
+ err => {
+ recoveryNgForm.resetForm();
+ recoveryForm.reset();
+ this.error = err;
+ this.showSubmit = false;
+ });
+ }
+ }
+
+ checkPasswords(group: FormGroup) {
+ const password = group.get('newPassword').value;
+ const confirmPassword = group.get('confirmPassword').value;
+
+ return password === confirmPassword ? null : { notSame: true }
+ }
+
+ matchValues(matchTo: string): (AbstractControl) => ValidationErrors | null {
+ return (control: AbstractControl): ValidationErrors | null => {
+ return !!control.parent &&
+ !!control.parent.value &&
+ control.value === control.parent.controls[matchTo].value
+ ? null
+ : { isMatching: false };
+ };
+ }
+
+ // Show a notification
+ openSnackBar(message: string, action: string) {
+ this._snackBar.open(message, action, {
+ duration: 5000
+ });
+ }
+
+ backClicked() {
+ this._location.back();
+ }
+
+ get confirmPassword(): AbstractControl {
+ return this.recoveryForm.get('confirmPassword');
+ }
+
+ get newPassword(): AbstractControl {
+ return this.recoveryForm.get('newPassword');
+ }
+}
diff --git a/src/app/auth/components/reset-password/reset-password.component.spec.ts b/src/app/auth/components/reset-password/reset-password.component.spec.ts
index 3f034711..f3d34814 100644
--- a/src/app/auth/components/reset-password/reset-password.component.spec.ts
+++ b/src/app/auth/components/reset-password/reset-password.component.spec.ts
@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { ResetPasswordComponent } from './reset-password.component';
@@ -6,7 +6,7 @@ describe('ResetPasswordComponent', () => {
let component: ResetPasswordComponent;
let fixture: ComponentFixtureprescription-printer works!
diff --git a/src/app/pharmacists/components/andes-prescription-printer/andes-prescription-printer.component.sass b/src/app/pharmacists/components/andes-prescription-printer/andes-prescription-printer.component.sass new file mode 100644 index 00000000..e69de29b diff --git a/src/app/pharmacists/components/andes-prescription-printer/andes-prescription-printer.component.spec.ts b/src/app/pharmacists/components/andes-prescription-printer/andes-prescription-printer.component.spec.ts new file mode 100644 index 00000000..50edae94 --- /dev/null +++ b/src/app/pharmacists/components/andes-prescription-printer/andes-prescription-printer.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; + +import { AndesPrescriptionPrinterComponent } from './andes-prescription-printer.component'; + +describe('AndesPrescriptionPrinterComponent', () => { + let component: AndesPrescriptionPrinterComponent; + let fixture: ComponentFixtureSeleccione un rango de fechas y presione Descargar
+
+
+ Desde
+
+ DD/MM/YYYY
+
+
+
+ Hasta
+
+ DD/MM/YYYY
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pharmacists/components/dialog-report/dialog-report.component.ts b/src/app/pharmacists/components/dialog-report/dialog-report.component.ts
new file mode 100644
index 00000000..93d4c43b
--- /dev/null
+++ b/src/app/pharmacists/components/dialog-report/dialog-report.component.ts
@@ -0,0 +1,28 @@
+import { Component, Inject } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+
+export interface DialogData {
+ fechaDesde: Date;
+ fechaHasta: Date;
+ pharmacistId: string;
+}
+
+@Component({
+ selector: 'app-dialog-report',
+ templateUrl: './dialog-report.component.html'
+})
+export class DialogReportComponent {
+ constructor(
+ public dialogRef: MatDialogRefcheck Dispensada
La receta de {{data.text}} se ha dispensado correctamente!
-
check Dispensa cancelada
+
+
;
- beforeEach(async(() => {
+ beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ PharmacistsFormComponent ]
})
diff --git a/src/app/pharmacists/components/pharmacists-form/pharmacists-form.component.ts b/src/app/pharmacists/components/pharmacists-form/pharmacists-form.component.ts
index 6cfd4ca6..5177b5f9 100644
--- a/src/app/pharmacists/components/pharmacists-form/pharmacists-form.component.ts
+++ b/src/app/pharmacists/components/pharmacists-form/pharmacists-form.component.ts
@@ -1,10 +1,12 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { FormBuilder, FormGroup, AbstractControl, Validators } from '@angular/forms';
-import { Observable } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+import { Observable, combineLatest, forkJoin, of } from 'rxjs';
// Services
import { PrescriptionsService } from '@services/prescriptions.service';
import { InsurancesService } from '@services/insurance.service';
+import { AndesPrescriptionsService } from '@services/andesPrescription.service';
// Interfaces
import { Patient } from '@interfaces/patients';
@@ -39,60 +41,60 @@ export class PharmacistsFormComponent implements OnInit {
dniShowSpinner: boolean = false;
dateShowSpinner: boolean = false;
private lastDni: string;
+ private lastSexo: string;
private lastDate: string;
constructor(
private fBuilder: FormBuilder,
private apiPrescriptions: PrescriptionsService,
+ private apiAndesPrescriptions: AndesPrescriptionsService,
private apiInsurances: InsurancesService,
public dialog: MatDialog,
){}
- ngOnInit(): void{
+ ngOnInit(): void {
this.initFilterPrescriptionForm();
+ }
- this.prescriptionForm.valueChanges.subscribe(
- values => {
- const digestDate = typeof(values.dateFilter) !== 'undefined' && values.dateFilter != null && values.dateFilter !== '' ? values.dateFilter.format('YYYY-MM-DD') : '';
-
- if(typeof(values.patient_dni) !== 'undefined' && values.patient_dni.length === 8){
-
- this.dniShowSpinner = this.lastDni != values.patient_dni;
- this.dateShowSpinner = this.lastDate != digestDate;
-
- this.apiPrescriptions.getFromDniAndDate({patient_dni: values.patient_dni, dateFilter: digestDate}).subscribe(
- success => {
- this.lastDni = values.patient_dni;
- this.lastDate = digestDate;
-
- this.dniShowSpinner = false;
- this.dateShowSpinner = false;
-
- if(!success){
- this.openDialog("noPrescriptions");
- }
- }
- );
-
- if(values.patient_dni !== this.lastDniConsult){
- this.lastDniConsult = values.patient_dni;
- this.apiInsurances.getInsuranceByPatientDni(values.patient_dni).subscribe(
- res => {
- this.insurances = res;
- });
- }
-
+ searchPrescriptions(): void {
+ const values = this.prescriptionForm.value;
+ const digestDate = typeof(values.dateFilter) !== 'undefined' && values.dateFilter != null && values.dateFilter !== '' ? values.dateFilter.format('YYYY-MM-DD') : '';
+
+ if (typeof(values.patient_dni) !== 'undefined' && values.patient_dni.length >= 7) {
+ this.dniShowSpinner = this.lastDni != values.patient_dni;
+ this.dateShowSpinner = this.lastDate != digestDate;
+
+ forkJoin([
+ this.apiPrescriptions.getFromDniAndDate({ patient_dni: values.patient_dni, dateFilter: digestDate }).pipe(catchError(() => of(false))),
+ this.apiAndesPrescriptions.getPrescriptionsFromAndes({ patient_dni: values.patient_dni, patient_sex: values.patient_sexo }).pipe(catchError(() => of(false)))
+ ]).subscribe(([prescriptionsSuccess, andesPrescriptionsSuccess]) => {
+ this.lastDni = values.patient_dni;
+ this.lastDate = digestDate;
+ this.dniShowSpinner = false;
+ this.dateShowSpinner = false;
+ if (!prescriptionsSuccess && !andesPrescriptionsSuccess) {
+ this.openDialog("noPrescriptions");
}
- }
- )
+ });
+
+ // if (values.patient_dni !== this.lastDniConsult) {
+ // this.lastDniConsult = values.patient_dni;
+ // this.apiInsurances.getInsuranceByPatientDni(values.patient_dni).subscribe(
+ // res => {
+ // this.insurances = res;
+ // }
+ // );
+ // }
+ }
}
initFilterPrescriptionForm(){
this.prescriptionForm = this.fBuilder.group({
patient_dni: ['', [
Validators.required,
- Validators.minLength(8)
+ Validators.minLength(7)
]],
+ patient_sexo: [''],
dateFilter: ['', [
]],
});
@@ -120,6 +122,10 @@ export class PharmacistsFormComponent implements OnInit {
return this.prescriptionForm.get('patient_dni');
}
+ get patient_sexo(): AbstractControl{
+ return this.prescriptionForm.get('patient_sexo');
+ }
+
get dateFilter(): AbstractControl{
return this.prescriptionForm.get('dateFilter');
}
diff --git a/src/app/pharmacists/components/prescription-list/prescription-list.component.html b/src/app/pharmacists/components/prescription-list/prescription-list.component.html
index 7aa6d0b8..746aebc8 100644
--- a/src/app/pharmacists/components/prescription-list/prescription-list.component.html
+++ b/src/app/pharmacists/components/prescription-list/prescription-list.component.html
@@ -1,122 +1,198 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/src/app/pharmacists/components/prescription-list/prescription-list.component.spec.ts b/src/app/pharmacists/components/prescription-list/prescription-list.component.spec.ts
index 08da58d0..746cbe2f 100644
--- a/src/app/pharmacists/components/prescription-list/prescription-list.component.spec.ts
+++ b/src/app/pharmacists/components/prescription-list/prescription-list.component.spec.ts
@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { PrescriptionListComponent } from './prescription-list.component';
@@ -6,7 +6,7 @@ describe('PrescriptionListComponent', () => {
let component: PrescriptionListComponent;
let fixture: ComponentFixture;
- beforeEach(async(() => {
+ beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ PrescriptionListComponent ]
})
diff --git a/src/app/pharmacists/components/prescription-list/prescription-list.component.ts b/src/app/pharmacists/components/prescription-list/prescription-list.component.ts
index db899663..319b9a55 100644
--- a/src/app/pharmacists/components/prescription-list/prescription-list.component.ts
+++ b/src/app/pharmacists/components/prescription-list/prescription-list.component.ts
@@ -1,166 +1,334 @@
-import { Component, OnInit, Input, AfterContentInit, ViewChild } from '@angular/core';
+import { Component, OnInit, AfterContentInit, ViewChild, OnDestroy } from '@angular/core';
import { Prescriptions } from '@interfaces/prescriptions';
+import AndesPrescriptions from '@interfaces/andesPrescriptions';
import { PrescriptionsService } from '@services/prescriptions.service';
+import { AndesPrescriptionsService } from '@services/andesPrescription.service';
import { MatDialog } from '@angular/material/dialog';
-import {MatTableDataSource} from '@angular/material/table';
-import {MatPaginator} from '@angular/material/paginator';
-import {MatSort} from '@angular/material/sort';
+import { MatTableDataSource } from '@angular/material/table';
+import { MatPaginator } from '@angular/material/paginator';
+import { MatSort } from '@angular/material/sort';
import * as moment from 'moment';
import { DialogComponent } from '@pharmacists/components/dialog/dialog.component';
import { AuthService } from '@auth/services/auth.service';
-import { PrescriptionPrinterComponent } from '@pharmacists/components/prescription-printer/prescription-printer.component';
import { detailExpand, arrowDirection } from '@animations/animations.template';
+import { DialogReportComponent } from '../dialog-report/dialog-report.component';
+import { combineLatest, Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+import { UnifiedPrinterComponent } from '@shared/components/unified-printer/unified-printer.component';
@Component({
- selector: 'app-prescription-list',
- templateUrl: './prescription-list.component.html',
- styleUrls: ['./prescription-list.component.sass'],
- animations: [
- detailExpand,
- arrowDirection
- ],
- providers: [PrescriptionPrinterComponent]
+ selector: 'app-prescription-list',
+ templateUrl: './prescription-list.component.html',
+ styleUrls: ['./prescription-list.component.sass'],
+ animations: [
+ detailExpand,
+ arrowDirection
+ ],
+
})
-export class PrescriptionListComponent implements OnInit, AfterContentInit {
-
- @Input() prescriptions: Prescriptions[];
-
- displayedColumns: string[] = ['professional', 'date', 'status', 'supplies', 'action', 'arrow'];
- dataSource = new MatTableDataSource([]);
- expandedElement: Prescriptions | null;
- loadingPrescriptions: boolean;
- lapseTime: number = 2; // lapse of time that a dispensed prescription can been undo action, and put it back as "pendiente"
- pharmacistId: string;
-
- @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator;
- @ViewChild(MatSort, {static: true}) sort: MatSort;
-
- constructor(
- private authService: AuthService,
- private prescriptionService: PrescriptionsService,
- private prescriptionPrinter: PrescriptionPrinterComponent,
- public dialog: MatDialog ) { };
-
- ngOnInit(): void {
- this.loadingPrescriptions = true;
- this.prescriptionService.prescriptions.subscribe((prescriptions: Prescriptions[]) => {
- this.dataSource = new MatTableDataSource(prescriptions);
- // sort after populate dataSource
- this.dataSource.sortingDataAccessor = (item, property) => {
- switch(property) {
- case 'patient': return item.patient.lastName + item.patient.firstName;
- case 'prescription_date': return new Date(item.date).getTime();
- default: return item[property];
+export class PrescriptionListComponent implements OnInit, AfterContentInit, OnDestroy {
+ private destroy$ = new Subject();
+
+ displayedColumns: string[] = ['medicamento', 'date', 'status', 'action', 'arrow'];
+ dataSource = new MatTableDataSource([]);
+ expandedElement: Prescriptions | null;
+ loadingPrescriptions: boolean;
+ lapseTime = 2;
+ pharmacistId: string;
+ isAdmin = false;
+ fechaDesde: Date;
+ fechaHasta: Date;
+
+ canDispenseMap = new Map();
+ isStatusMap = new Map();
+ canCounterMap = new Map();
+
+ @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
+ @ViewChild(MatSort, { static: true }) sort: MatSort;
+
+ constructor(
+ private authService: AuthService,
+ private prescriptionService: PrescriptionsService,
+ private andesPrescriptionService: AndesPrescriptionsService,
+ private unifiedPrinter: UnifiedPrinterComponent,
+ public dialog: MatDialog) { };
+
+ ngOnInit(): void {
+ this.pharmacistId = this.authService.getLoggedUserId();
+ this.isAdmin = this.authService.isAdminRole();
+ this.initDataSource();
+ this.loadPrescriptions();
+ }
+
+ private initDataSource(): void {
+ this.dataSource.sortingDataAccessor = (item, property) => {
+ switch (property) {
+ case 'patient': return item.patient?.lastName + item.patient?.firstName;
+ case 'prescription_date': return new Date(item.date || item.fechaPrestacion).getTime();
+ default: return item[property];
+ }
+ };
+ this.dataSource.sort = this.sort;
+ }
+
+ private loadPrescriptions(offset: number = 0, limit: number = 10): void {
+ this.loadingPrescriptions = true;
+
+ combineLatest([
+ this.andesPrescriptionService.prescriptions,
+ this.prescriptionService.prescriptions
+ ]).pipe(
+ takeUntil(this.destroy$)
+ ).subscribe(([andesPrescriptions, prescriptions]) => {
+ const previousDataLength = this.dataSource.data.length;
+ const newData = [...andesPrescriptions, ...prescriptions];
+
+ this.dataSource.data = newData;
+ this.updateMaps();
+
+ if (previousDataLength !== newData.length || previousDataLength === 0) {
+ setTimeout(() => {
+ if (this.paginator) {
+ this.dataSource.paginator = this.paginator;
+ this.paginator.page.pipe(
+ takeUntil(this.destroy$)
+ ).subscribe((pageEvent) => {
+ });
+ }
+ });
+ }
+
+ this.loadingPrescriptions = false;
+ });
+ }
+
+ ngOnDestroy(): void {
+ this.destroy$.next();
+ this.destroy$.complete();
+ }
+
+ /**
+ * Refresca las prescripciones desde los servicios
+ */
+ refreshPrescriptions(): void {
+ this.loadingPrescriptions = true;
+ this.updateMaps();
+ this.loadingPrescriptions = false;
+ }
+
+ ngAfterContentInit() {
+ this.paginator._intl.itemsPerPageLabel = 'Prescripciones por página';
+ this.paginator._intl.firstPageLabel = 'Primer página';
+ this.paginator._intl.lastPageLabel = 'Última página';
+ this.paginator._intl.nextPageLabel = 'Siguiente';
+ this.paginator._intl.previousPageLabel = 'Anterior';
+ this.paginator._intl.getRangeLabel = (page: number, pageSize: number, length: number): string => {
+ if (length === 0 || pageSize === 0) {
+ return `0 de ${length}`;
+ }
+ length = Math.max(length, 0);
+ const startIndex = page * pageSize;
+ const endIndex = startIndex < length ? Math.min(startIndex + pageSize, length) : startIndex + pageSize;
+ return `${startIndex + 1} – ${endIndex} de ${length}`;
+ };
+ }
+
+ applyFilter(filterValue: string) {
+ this.dataSource.filterPredicate = (data: Prescriptions, filter: string) => {
+ const accumulator = (currentTerm, key) => {
+ // enable filter by lastName / firstName / date
+ return currentTerm + data.status + moment(data.date, 'YYYY-MM-DD').format('DD/MM/YYY').toString();
+ };
+
+ const dataStr = Object.keys(data).reduce(accumulator, '').toLowerCase();
+ // Transform the filter by converting it to lowercase and removing whitespace.
+ const transformedFilter = filter.trim().toLowerCase();
+ return dataStr.indexOf(transformedFilter) !== -1;
+ };
+ this.dataSource.filter = filterValue.trim().toLowerCase();
+ if (this.dataSource.paginator) {
+ this.dataSource.paginator.firstPage();
+ }
+ }
+
+ dispense(prescription: Prescriptions | AndesPrescriptions) {
+ if ('status' in prescription) {
+ this.prescriptionService.dispense(prescription._id, this.pharmacistId).subscribe(
+ success => {
+ if (success) {
+ // Actualizar los mapas después de la operación exitosa
+ this.updateMaps();
+ this.openDialog('dispensed', prescription, prescription.professional.businessName);
+ }
+ },
+ error => {
+ this.openDialog('error-dispensed', prescription, error.message || 'Error al dispensar la prescripción');
+ }
+ );
+ } else if ('estadoActual' in prescription) {
+ this.andesPrescriptionService.dispense(prescription, this.pharmacistId).subscribe(
+ success => {
+ if (success) {
+ // Actualizar los mapas después de la operación exitosa
+ this.updateMaps();
+ this.openDialog('dispensed', prescription, prescription.profesional.nombre);
+ }
+ },
+ error => {
+ this.openDialog('error-dispensed', prescription, error.message || 'Error al dispensar la prescripción');
+ }
+ );
+ }
+ }
+
+ cancelDispense(prescription: Prescriptions | AndesPrescriptions) {
+ if ('status' in prescription) {
+ this.prescriptionService.cancelDispense(prescription._id, this.pharmacistId).subscribe(
+ success => {
+ if (success) {
+ this.updateMaps();
+ this.openDialog('cancel-dispensed', prescription);
+ }
+ },
+ error => {
+ this.openDialog('error-cancel-dispensed', prescription, error.message || 'Error al cancelar la dispensación');
+ }
+ );
+ } else if ('estadoActual' in prescription) {
+ this.andesPrescriptionService.cancelDispense(prescription._id, this.pharmacistId).subscribe(
+ success => {
+ if (success) {
+ this.updateMaps();
+ this.openDialog('cancel-dispensed', prescription);
+ }
+ },
+ error => {
+ this.openDialog('error-cancel-dispensed', prescription, error.message || 'Error al cancelar la dispensación');
+ }
+ );
+ }
+ }
+
+ // Show a dialog
+ openDialog(aDialogType: string, aPrescription?: Prescriptions | AndesPrescriptions, aText?: string): void {
+ const dialogRef = this.dialog.open(DialogComponent, {
+ width: '400px',
+ data: { dialogType: aDialogType, prescription: aPrescription, text: aText }
+ });
+
+ dialogRef.afterClosed().subscribe(result => {
+ // eslint-disable-next-line no-console
+ console.log('The dialog was closed');
+ });
+ }
+
+ canPrint(prescription: Prescriptions): boolean {
+ return (prescription.status === 'Dispensada') && (prescription.dispensedBy?.userId === this.authService.getLoggedUserId());
+ }
+
+ canDispense(prescription: Prescriptions | AndesPrescriptions): boolean {
+ const canDispenseFromMap = this.canDispenseMap.get(prescription._id);
+ if (canDispenseFromMap !== undefined) {
+ return canDispenseFromMap;
+ }
+ return this.calculateCanDispense(prescription);
+ }
+
+ async printPrescription(prescription: Prescriptions | AndesPrescriptions) {
+ if ('status' in prescription) {
+ await this.unifiedPrinter.printPrescription(prescription);
+ } else if ('estadoActual' in prescription) {
+ await this.unifiedPrinter.printAndesPrescription(prescription);
}
- };
- this.dataSource.sort = this.sort;
- this.dataSource.paginator = this.paginator;
- this.loadingPrescriptions = false;
- });
- this.pharmacistId = this.authService.getLoggedUserId();
- }
-
- ngAfterContentInit(){
- this.paginator._intl.itemsPerPageLabel = "Prescripciones por página";
- this.paginator._intl.firstPageLabel = "Primer página";
- this.paginator._intl.lastPageLabel = "Última página";
- this.paginator._intl.nextPageLabel = "Siguiente";
- this.paginator._intl.previousPageLabel = "Anterior";
- this.paginator._intl.getRangeLabel = (page: number, pageSize: number, length: number): string => {
- if (length == 0 || pageSize == 0)
- {
- return `0 de ${length}`;
- }
- length = Math.max(length, 0);
- const startIndex = page * pageSize;
- const endIndex = startIndex < length ? Math.min(startIndex + pageSize, length) : startIndex + pageSize;
- return `${startIndex + 1} – ${endIndex} de ${length}`;
- }
- }
-
- applyFilter(filterValue: string) {
- this.dataSource.filterPredicate = (data: Prescriptions, filter: string) => {
- const accumulator = (currentTerm, key) => {
- // enable filter by lastName / firstName / date
- return currentTerm + data.status + moment(data.date, 'YYYY-MM-DD').format('DD/MM/YYY').toString()
- };
-
- const dataStr = Object.keys(data).reduce(accumulator, '').toLowerCase();
- // Transform the filter by converting it to lowercase and removing whitespace.
- const transformedFilter = filter.trim().toLowerCase();
- return dataStr.indexOf(transformedFilter) !== -1;
- };
- this.dataSource.filter = filterValue.trim().toLowerCase();
- if (this.dataSource.paginator) {
- this.dataSource.paginator.firstPage();
- }
- }
-
- // Dispense prescription, but if was, update table with the correct status.
- dispense(prescription: Prescriptions){
- this.prescriptionService.dispense(prescription._id, this.pharmacistId).subscribe(
- success => {
- if(success){
- this.openDialog("dispensed", prescription, prescription.professional.businessName);
+ }
+
+ isStatus(prescription: Prescriptions | AndesPrescriptions, status: string): boolean {
+ if (status === 'Vencida') {
+ const isExpiredFromMap = this.isStatusMap.get(prescription._id);
+ if (isExpiredFromMap !== undefined) {
+ return isExpiredFromMap;
+ }
}
- }
- );
- }
-
- // Dispense prescription, but if was, update table with the correct status.
- cancelDispense(e){
- this.prescriptionService.cancelDispense(e, this.pharmacistId).subscribe(
- success => {
- if(success){
- this.openDialog("cancel-dispensed");
+ return this.calculateIsStatus(prescription, status);
+ }
+
+ canCounter(prescription: Prescriptions | AndesPrescriptions): boolean {
+ const canCounterFromMap = this.canCounterMap.get(prescription._id);
+ if (canCounterFromMap !== undefined) {
+ return canCounterFromMap;
}
- }
- );
- }
-
-
- // Show a dialog
- openDialog(aDialogType: string, aPrescription?: Prescriptions, aText?: string): void {
- const dialogRef = this.dialog.open(DialogComponent, {
- width: '400px',
- data: {dialogType: aDialogType, prescription: aPrescription, text: aText }
- });
-
- dialogRef.afterClosed().subscribe(result => {
- console.log('The dialog was closed');
- });
- }
-
- // Return true if was dispensed and is seeing who dispensed the prescription
- canPrint(prescription: Prescriptions): boolean{
- return (prescription.status === "Dispensada") && (prescription.dispensedBy?.userId === this.authService.getLoggedUserId());
- }
-
- canDispense(prescription: Prescriptions): boolean{
- return prescription.status === "Pendiente";
- }
-
- printPrescription(prescription: Prescriptions){
- this.prescriptionPrinter.print(prescription);
- }
-
- isStatus(prescritpion: Prescriptions, status: string): boolean{
- return prescritpion.status === status;
- }
-
- // Return boolean, accordding with dispensed time plus 2 hours is greater than now
- canCounter(prescription: Prescriptions): boolean{
- if(prescription.status === 'Dispensada' &&
- typeof prescription.dispensedAt !== 'undefined' &&
- prescription.dispensedBy?.userId === this.pharmacistId){
-
- const dispensedAt = moment(prescription.dispensedAt);
- const now = moment();
- // dispensedAt.add(10, 'seconds');
- dispensedAt.add(this.lapseTime, 'hours');
- return dispensedAt.isAfter(now);
-
- }
- return false
- }
+ return this.calculateCanCounter(prescription);
+ }
+
+ generateReport() {
+ const dialogReport = this.dialog.open(DialogReportComponent, {
+ width: '400px',
+ data: { fechaDesde: this.fechaDesde, fechaHasta: this.fechaHasta, pharmacistId: this.pharmacistId }
+ });
+
+ dialogReport.afterClosed().subscribe(result => {
+ if (result) {
+ this.prescriptionService.getCsv(result).subscribe();
+ }
+ });
+ }
+
+ updateMaps() {
+ // Limpiar mapas existentes
+ this.isStatusMap.clear();
+ this.canDispenseMap.clear();
+ this.canCounterMap.clear();
+
+ // Recalcular todos los valores para las prescripciones actuales
+ this.dataSource.data.forEach(prescription => {
+ if (prescription && prescription._id) {
+ this.isStatusMap.set(prescription._id, this.calculateIsStatus(prescription, 'Vencida'));
+ this.canDispenseMap.set(prescription._id, this.calculateCanDispense(prescription));
+ this.canCounterMap.set(prescription._id, this.calculateCanCounter(prescription));
+ }
+ });
+ }
+
+ calculateCanDispense(prescription: Prescriptions | AndesPrescriptions): boolean {
+ if ('status' in prescription) {
+ return prescription.status === 'Pendiente' && moment() >= moment(prescription.date);
+ } else if ('estadoActual' in prescription) {
+ return prescription.estadoActual.tipo === 'vigente';
+ }
+ return false;
+ }
+
+ calculateIsStatus(prescription: Prescriptions | AndesPrescriptions, status: string): boolean {
+ if ('estadoActual' in prescription) {
+ return prescription.estadoActual.tipo.toLowerCase() === status.toLowerCase();
+ } else if ('status' in prescription) {
+ return prescription.status.toLowerCase() === status.toLowerCase();
+ }
+ return false;
+ }
+
+ calculateCanCounter(prescription: Prescriptions | AndesPrescriptions): boolean {
+ if ('status' in prescription) {
+ if (prescription.status === 'Dispensada' &&
+ typeof prescription.dispensedAt !== 'undefined' &&
+ prescription.dispensedBy?.userId === this.pharmacistId) {
+
+ const dispensedAt = moment(prescription.dispensedAt);
+ const now = moment();
+ dispensedAt.add(this.lapseTime, 'hours');
+ return dispensedAt.isAfter(now);
+ }
+ } else if ('estadoActual' in prescription) {
+ if (prescription.estadoActual.tipo === 'finalizada' && prescription.estadoDispensaActual.tipo === 'dispensada' &&
+ typeof prescription.estadoDispensaActual.fecha !== 'undefined' &&
+ prescription.dispensa[0].organizacion.id === this.pharmacistId) {
+
+ const dispensedAt = moment(prescription.estadoDispensaActual.fecha);
+ const now = moment();
+ dispensedAt.add(this.lapseTime, 'hours');
+ return dispensedAt.isAfter(now);
+ }
+ }
+ return false;
+ }
}
diff --git a/src/app/pharmacists/components/prescription-printer/prescription-printer.component.spec.ts b/src/app/pharmacists/components/prescription-printer/prescription-printer.component.spec.ts
index dd9470fa..dd6b98da 100644
--- a/src/app/pharmacists/components/prescription-printer/prescription-printer.component.spec.ts
+++ b/src/app/pharmacists/components/prescription-printer/prescription-printer.component.spec.ts
@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { PrescriptionPrinterComponent } from './prescription-printer.component';
@@ -6,7 +6,7 @@ describe('PrescriptionPrinterComponent', () => {
let component: PrescriptionPrinterComponent;
let fixture: ComponentFixture;
- beforeEach(async(() => {
+ beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ PrescriptionPrinterComponent ]
})
diff --git a/src/app/pharmacists/components/prescription-printer/prescription-printer.component.ts b/src/app/pharmacists/components/prescription-printer/prescription-printer.component.ts
index 2abf9340..935eadbe 100644
--- a/src/app/pharmacists/components/prescription-printer/prescription-printer.component.ts
+++ b/src/app/pharmacists/components/prescription-printer/prescription-printer.component.ts
@@ -1,73 +1,224 @@
import { Component, OnInit } from '@angular/core';
-import { PdfMakeWrapper, Txt, Canvas, Line, Img, Table, Columns } from 'pdfmake-wrapper';
+import { PdfMakeWrapper, Txt, Canvas, Line, Img, Table, Columns, Stack } from 'pdfmake-wrapper';
import * as pdfFontsX from 'pdfmake-unicode/dist/pdfmake-unicode.js';
import { DatePipe } from '@angular/common';
import { Prescriptions } from '@interfaces/prescriptions';
+import { BarcodeService } from '@services/barcode.service';
PdfMakeWrapper.setFonts(pdfFontsX);
@Component({
- selector: 'app-prescription-printer',
- templateUrl: './prescription-printer.component.html',
- styleUrls: ['./prescription-printer.component.sass']
+ selector: 'app-prescription-printer',
+ templateUrl: './prescription-printer.component.html',
+ styleUrls: ['./prescription-printer.component.sass']
})
export class PrescriptionPrinterComponent implements OnInit {
- prescription: Prescriptions;
-
- constructor(
- private datePipe: DatePipe
- ){}
-
- ngOnInit(): void {
- }
-
- // Print a prescription as PDF
- async print(prescription: Prescriptions){
- const pdf: PdfMakeWrapper = new PdfMakeWrapper();
- pdf.info({
- title: "Receta digital "+prescription.professional.businessName,
- author: 'RecetAR'
- });
- // Header
- pdf.add(await new Img('assets/img/LogoPdf.jpg').fit([60, 60]).build());
- pdf.add(new Txt('RECETA DIGITAL').bold().alignment('center').end);
- pdf.add(pdf.ln(2));
- pdf.add(new Txt(""+this.datePipe.transform(prescription.date, 'dd/MM/yyyy')).alignment('right').end);
- // Professional
- pdf.add(new Columns([ new Txt("Profesional").bold().end, new Txt("Matrícula").bold().end ]).end);
- pdf.add(new Columns([ new Txt(""+prescription.professional.businessName).end, new Txt(""+prescription.professional.enrollment).end ]).end);
- pdf.add(pdf.ln(2));
- // Patient
- pdf.add(new Columns([ new Txt("Paciente").bold().end, new Txt("DNI").bold().end ]).end);
- pdf.add(new Columns([ new Txt(""+prescription.patient.lastName.toUpperCase()+", "+prescription.patient.firstName.toUpperCase()).end, new Txt(""+prescription.patient.dni) .end ]).end);
- pdf.add(new Canvas([ new Line(10, [500, 10]).end ]).end);
- // Supplies
- pdf.add(pdf.ln(1));
- prescription.supplies.forEach(supply => {
- pdf.add(new Txt(""+supply.supply.name+", cantidad: "+supply.quantity).end); // Marca error pero funciona bien
- pdf.add(pdf.ln(1));
- });
- pdf.add(new Canvas([ new Line(10, [500, 10]).end]).end);
- if(prescription.diagnostic){
- pdf.add(pdf.ln(1));
- pdf.add(new Txt("Diagnóstico").bold().end);
- pdf.add(new Txt(""+prescription.diagnostic).end);
+ prescription: Prescriptions;
+
+ constructor(
+ private datePipe: DatePipe,
+ private barcodeService: BarcodeService
+ ) { }
+
+ ngOnInit(): void {
}
- if(prescription.observation){
- pdf.add(pdf.ln(1));
- pdf.add(new Txt("Observaciones").bold().end);
- pdf.add(new Txt(""+prescription.observation).end);
+
+ // Print a prescription as PDF
+ async print(prescription: Prescriptions) {
+ const pdf: PdfMakeWrapper = new PdfMakeWrapper();
+
+ // Primera página
+ await this.addPage(pdf, prescription);
+
+ // Duplicado
+ if (prescription.supplies.some(s => s.duplicate)) {
+ pdf.add({ text: '', pageBreak: 'after' });
+ await this.addPage(pdf, prescription, 'DUPLICADO');
+ }
+
+ pdf.create().open();
}
- pdf.add(pdf.ln(2));
- // Pharmacy
- pdf.add(new Columns([ new Txt("Dispensado por").bold().end, new Txt("CUIL").bold().end ]).end);
- pdf.add(new Columns([ new Txt(""+prescription.dispensedBy.businessName.toUpperCase()).end, new Txt(""+prescription.dispensedBy.cuil).end ]).end);
+ private async addPage(pdf: PdfMakeWrapper, prescription: Prescriptions, label?: string) {
+
+ if (prescription.status === 'Vencida') {
+ pdf.watermark({
+ text: 'Receta no valida para dispensa',
+ color: 'grey',
+ opacity: 0.3,
+ bold: true,
+ fontSize: 60
+ });
+ }
+ if (prescription.status === 'Dispensada') {
+ pdf.watermark({
+ text: 'DISPENSADA',
+ color: 'grey',
+ opacity: 0.3,
+ bold: true,
+ fontSize: 100
+ });
+ }
+
+ const barcodeBase64 = await this.barcodeService.generateBarcodeBase64(prescription._id);
+ const barcodeImg = await new Img(barcodeBase64).fit([230, 60]).alignment('center').margin([0, 20]).build();
+
+ // Segundo código de barras para prescriptionId
+ let prescriptionIdBarcodeImg = null;
+ let prescriptionIdLabel = null;
+ if (prescription.prescriptionId) {
+ const prescriptionIdBarcodeBase64 = await this.barcodeService.generateBarcodeBase64(prescription.prescriptionId);
+ prescriptionIdLabel = new Txt('Número de receta:').fontSize(9).bold().alignment('center').margin([0, 5, 0, 0]).end;
+ prescriptionIdBarcodeImg = await new Img(prescriptionIdBarcodeBase64).fit([230, 60]).alignment('center').margin([0, 5]).build();
+ }
+ pdf.info({
+ title: 'Receta digital ' + prescription.professional.businessName,
+ author: 'RecetAR'
+ });
+ // Header
+ pdf.add(new Columns([
+ await new Img('assets/img/LogoPdf.jpg').fit([60, 60]).build(),
+ new Txt('RECETA').bold().fontSize(20).alignment('center').end,
+ new Txt(label ? `${label}` : '').bold().italics().fontSize(20).alignment('right').opacity(0.6).end]).end);
+ pdf.add(new Txt('\n').end);
+ pdf.add(new Columns([new Txt('RECETAR').bold().alignment('left').end, new Txt(`Fecha prescripción: ${this.datePipe.transform(prescription.date, 'dd/MM/yyyy')}`).alignment('right').end]).end);
+ pdf.add(new Canvas([new Line(1, [515, 1]).end]).end);
+ pdf.add(new Txt('\n').end);
- pdf.footer(new Txt("Esta receta se registró en recetar.andes.gob.ar").italics().alignment('center').end);
+ // Patient
+ pdf.add(new Txt([
+ { text: 'Paciente: ' },
+ { text: `${prescription.patient.lastName.toUpperCase()} ${prescription.patient.firstName.toUpperCase()}`, bold: true }
+ ]).end);
+ pdf.add(new Txt('\n').end);
- pdf.create().open();
- }
+ pdf.add(new Txt([
+ { text: 'DNI: ' },
+ { text: `${prescription.patient.dni}`, bold: true }
+ ]).end);
+ pdf.add(new Txt('\n').end);
+ if (prescription.patient.fechaNac) {
+ pdf.add(new Txt([
+ { text: 'Fecha Nacimiento: ' },
+ { text: `${this.datePipe.transform(prescription.patient.fechaNac, 'dd/MM/yyyy')}`, bold: true }
+ ]).end);
+ pdf.add(new Txt('\n').end);
+ }
+ pdf.add(new Txt([
+ { text: 'Sexo: ' },
+ { text: `${prescription.patient.sex}`, bold: true }
+ ]).end);
+ pdf.add(new Txt('\n').end);
+ let obraSocial = '';
+ let numeroAfiliado = '';
+ if (prescription.patient.obraSocial?.nombre) {
+ obraSocial = prescription.patient.obraSocial.nombre;
+ numeroAfiliado = prescription.patient.obraSocial.numeroAfiliado || '';
+ }
+ pdf.add(new Txt([
+ { text: 'Obra Social / Plan de salud : ' }, { text: `${(obraSocial)}`, bold: true }
+ ]).end);
+ if (obraSocial) {
+ pdf.add(new Txt([
+ { text: 'Número de afiliado: ' }, { text: `${numeroAfiliado || 'No informado'}`, bold: true }
+ ]).end);
+ }
+ pdf.add(new Txt('\n').end);
+
+ pdf.add(new Canvas([new Line(1, [515, 1]).end]).end);
+ pdf.add(new Txt('\n').end);
+ pdf.add(new Columns([new Txt('Medicamento').end, new Columns([new Txt('').end]).end]).end);
+ pdf.add(new Canvas([new Line(1, [515, 1]).end]).end);
+ // Supplies
+ pdf.add(new Txt('\n').end);
+
+ prescription.supplies.forEach(supply => {
+ const cant = supply.quantityPresentation ? `${supply.quantity} envase(s) de ${supply.quantityPresentation} unidades` : `x ${supply.quantity}`;
+ pdf.add(new Columns([new Txt('' + supply.supply.name).bold().end,
+ new Txt(' ').end,
+ new Columns([new Txt(`${cant} `).bold().end]).end]).end);
+ pdf.add(new Txt('\n').end);
+
+ if (supply.diagnostic) {
+ pdf.add(new Txt('\n').end);
+ pdf.add(new Txt('Diagnóstico').bold().end);
+ pdf.add(new Txt('' + supply.diagnostic ? supply.diagnostic : 'Sin datos registrados').end);
+ }
+ });
+ if (prescription.observation) {
+ pdf.add(new Txt('\n').end);
+ pdf.add(new Txt('Observaciones').bold().end);
+ pdf.add(new Txt('' + prescription.observation).end);
+ }
+ pdf.add(new Txt('\n').end);
+ pdf.add(new Txt('\n').end);
+ pdf.add(new Txt('\n').end);
+ pdf.add(new Txt('\n').end);
+ pdf.add(new Txt('\n').end);
+ pdf.add(new Txt('\n').end);
+ pdf.add(new Txt('\n').end);
+
+
+ // Barcode
+ if (prescriptionIdBarcodeImg) {
+ // Si hay prescriptionId, mostrar ambos códigos en columnas
+ pdf.add(new Columns([
+ {
+ stack: [barcodeImg],
+ alignment: 'left',
+ width: '55%'
+ },
+ {
+ stack: [prescriptionIdLabel, prescriptionIdBarcodeImg],
+ alignment: 'right',
+ width: '45%'
+ }
+ ]).alignment('center').width('100%').end);
+
+ // Firma del profesional debajo cuando hay prescriptionId
+ pdf.add(new Txt([
+ { text: 'Este documento ha sido firmado \n electrónicamente por Dr.:', fontSize: 9, bold: true, italics: true },
+ { text: '\n', fontSize: 3 },
+ { text: `\n ${prescription.professional.businessName}`, fontSize: 14, bold: true },
+ { text: `\n MP ${prescription.professional.enrollment}`, bold: true, fontSize: 9 }
+ ]).alignment('center').margin([0, 25, 0, 0]).end);
+ } else {
+ // Si no hay prescriptionId, mostrar código de barras y firma en columnas
+ pdf.add(new Columns([
+ {
+ stack: [barcodeImg],
+ alignment: 'center',
+ width: '50%'
+ },
+ {
+ stack: [
+ new Txt([
+ { text: 'Este documento ha sido firmado \n electrónicamente por Dr.:', fontSize: 9, bold: true, italics: true },
+ { text: '\n', fontSize: 3 },
+ { text: `\n ${prescription.professional.businessName}`, fontSize: 14, bold: true },
+ { text: `\n MP ${prescription.professional.enrollment}`, bold: true, fontSize: 9 }
+ ]).alignment('center').margin([0, 25, 0, 0]).end
+ ],
+ alignment: 'center',
+ width: '50%'
+ }
+ ]).alignment('center').width('100%').end);
+ }
+
+ // Pharmacy
+ if (prescription.status === 'Dispensada') {
+ pdf.add(new Txt('\n').margin([0, 10]).end);
+ pdf.add(new Columns([new Txt('Dispensado por').bold().alignment('center').end, new Txt('CUIL').bold().alignment('center').end]).alignment('center').end);
+ pdf.add(new Columns([new Txt('' + prescription.dispensedBy.businessName.toUpperCase()).alignment('center').end, new Txt('' + prescription.dispensedBy.cuil).alignment('center').end]).alignment('center').end);
+ pdf.add(new Txt('\n').margin([0, 5]).end);
+ pdf.add(new Txt(`Fecha dispensación: ${this.datePipe.transform(prescription.dispensedAt, 'dd/MM/yyyy')}`).alignment('center').end);
+ }
+
+ pdf.footer(new Txt([
+ { text: ' Esta receta fue creada por emisor inscripto y válido en el Registro de Recetarios Electrónicos \n del Ministerio de Salud de la Nación - ', italics: true },
+ { text: 'RL-2025-63212094-APN-SSVEIYES#MS ', bold: true }
+ ]).fontSize(11).alignment('center').end);
+ }
}
diff --git a/src/app/pharmacists/components/prescription-undo/prescription-undo.component.html b/src/app/pharmacists/components/prescription-undo/prescription-undo.component.html
index d3a4869e..9b3870a6 100644
--- a/src/app/pharmacists/components/prescription-undo/prescription-undo.component.html
+++ b/src/app/pharmacists/components/prescription-undo/prescription-undo.component.html
@@ -1,5 +1,5 @@
-
error Error
+
+
+ No se ha podido dispensar la receta de {{data.text}}. Inténtelo de nuevo más tarde.
+
+
+
+
error_outline Atención
diff --git a/src/app/pharmacists/components/dialog/dialog.component.spec.ts b/src/app/pharmacists/components/dialog/dialog.component.spec.ts
index a6bce8db..7a5ff84a 100644
--- a/src/app/pharmacists/components/dialog/dialog.component.spec.ts
+++ b/src/app/pharmacists/components/dialog/dialog.component.spec.ts
@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { DialogComponent } from './dialog.component';
@@ -6,7 +6,7 @@ describe('DialogComponent', () => {
let component: DialogComponent;
let fixture: ComponentFixture;
- beforeEach(async(() => {
+ beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ DialogComponent ]
})
diff --git a/src/app/pharmacists/components/dialog/dialog.component.ts b/src/app/pharmacists/components/dialog/dialog.component.ts
index 0037bed0..4a7eb711 100644
--- a/src/app/pharmacists/components/dialog/dialog.component.ts
+++ b/src/app/pharmacists/components/dialog/dialog.component.ts
@@ -4,7 +4,7 @@ import { fadeInOnEnterAnimation, fadeOutOnLeaveAnimation } from 'angular-animati
import { Prescriptions } from '@interfaces/prescriptions';
import {MatIconModule} from '@angular/material/icon';
import { animate, state, style, transition, trigger } from '@angular/animations';
-import { PrescriptionPrinterComponent } from '../prescription-printer/prescription-printer.component';
+import { UnifiedPrinterComponent } from '@shared/components/unified-printer/unified-printer.component';
@Component({
@@ -14,15 +14,14 @@ import { PrescriptionPrinterComponent } from '../prescription-printer/prescripti
animations: [
fadeInOnEnterAnimation(),
fadeOutOnLeaveAnimation()
- ],
- providers: [PrescriptionPrinterComponent]
+ ]
})
export class DialogComponent implements OnInit {
constructor(
public dialogRef: MatDialogRef,
@Inject(MAT_DIALOG_DATA) public data: DialogData,
- private prescriptionPrinter: PrescriptionPrinterComponent
+ private unifiedPrinter: UnifiedPrinterComponent
) {}
ngOnInit(): void {
@@ -32,9 +31,6 @@ export class DialogComponent implements OnInit {
this.dialogRef.close();
}
- printPrescription(prescription: Prescriptions){
- this.prescriptionPrinter.print(prescription);
- }
}
export interface DialogData {
diff --git a/src/app/pharmacists/components/pharmacists-form/pharmacists-form.component.html b/src/app/pharmacists/components/pharmacists-form/pharmacists-form.component.html
index fb3c3d86..5dbcbd3f 100644
--- a/src/app/pharmacists/components/pharmacists-form/pharmacists-form.component.html
+++ b/src/app/pharmacists/components/pharmacists-form/pharmacists-form.component.html
@@ -31,7 +31,19 @@
diff --git a/src/app/pharmacists/components/pharmacists-form/pharmacists-form.component.spec.ts b/src/app/pharmacists/components/pharmacists-form/pharmacists-form.component.spec.ts
index 39de25e7..08028243 100644
--- a/src/app/pharmacists/components/pharmacists-form/pharmacists-form.component.spec.ts
+++ b/src/app/pharmacists/components/pharmacists-form/pharmacists-form.component.spec.ts
@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { PharmacistsFormComponent } from './pharmacists-form.component';
@@ -6,7 +6,7 @@ describe('PharmacistsFormComponent', () => {
let component: PharmacistsFormComponent;
let fixture: ComponentFixture
- Debe ingresar 8 digitos
+ Debe ingresar al menos 7 dígitos
+
+
+
+
+
+ Sexo paciente
+
+ Masculino
+ Femenino
+
+
+ Debe seleccionar el sexo del paciente
@@ -51,6 +63,11 @@
- gesture
-
- Recetas de {{dataSource.data[0].patient.lastName}}, {{dataSource.data[0].patient.firstName}} DNI {{dataSource.data[0].patient.dni}}
-
-
-
-
-
-
+
-
-
-
-
-
-
-
- | Profesional | -{{ element.professional.businessName.toUpperCase() }} | -Fecha | -{{element.date | date : 'dd/MM/yyyy' }} | -Estado | -{{ element.status }} | -Insumos | -{{element.supplies.length}} | -Acción | -
-
- |
- - | - - | -
-
-
-
+
-
-
- {{ supp.supply.name }}
- Diagnóstico: {{element.diagnostic}}
- Observaciones: {{element.observation}}
-
+
+ |
-
|---|
| Medicamento | ++ {{ element.medicamento?.concepto?.term || (element.supplies?.length ? + element.supplies[0]?.supply?.name : '') }} + | +Fecha | ++ {{element.date | date : 'dd/MM/yyyy'}} + + {{(element.fechaRegistro || element.fechaPrestacion)| date : 'dd/MM/yyyy'}} + + | +Estado | +{{ + element.estadoActual?.tipo?.toUpperCase() || + (element.status === 'pendiente' ? 'VIGENTE' : (element.status === 'finalizada' ? + 'DISPENSADA' : element.status?.toUpperCase())) }} + | +Insumos | ++ {{element.supplies?.length || element.medicamento?.cantidad}} envases | +Acción | +
+
+ |
+ + | + + | +
+
+
+
+
+
+
+
+
+ {{ supp.supply.name }} x {{supp.quantityPresentation}}
+
+ {{ supp.supply.name }} x
+ {{supp.quantity}}
+
+
+
+ Cantidad de envases: {{supp.quantity}}
+
+
+ Diagnóstico: {{element.supplies[0]?.diagnostic}}
+
+ Observaciones: {{element.observation}}
+
+
+ Profesional:
+ {{ element.professional?.businessName}}
+
+
+
+
+
+
+
+
+
+
+ {{ element.medicamento?.concepto?.term }} x {{
+ element.medicamento?.cantidad }}
+
+
+
+ Cantidad de envases: {{ element.medicamento?.cantEnvases }}
+
+
+ Diagnóstico: {{element.diagnostico?.term||
+ element.diagnostico.descripcion}}
+
+ Observaciones:
+ {{element.medicamento?.dosisDiaria?.notaMedica}}
+
+
+ Profesional:
+ {{ element.profesional?.nombre }}
+
+ |
+
|---|
-
-
+
+