Skip to content

REC-199: Nuevo buscador de medicamentos genericos y comerciales #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ma7payne wants to merge 1 commit into
base: master
Choose a base branch
from
Open

REC-199: Nuevo buscador de medicamentos genericos y comerciales #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/app/interfaces/supplies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ export default interface Supplies {
quantity: string;
_id: string;
name: string;
brand?: string;
}
79 changes: 28 additions & 51 deletions src/app/professionals/components/professional-form/professional-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
</div>
<div class="link-bar-indicator-container">
<div class="indicator"
[@stepLink]="isAmbitoPublico() ?
[@stepLink]="isAmbitoPublico() ?
(currentTab === 'form' ? 'left-2' : 'right-2') :
(currentTab === 'form' ? 'left' : currentTab === 'certificates' ? 'center-left' : currentTab === 'practices' ? 'center-right' : 'right')">
</div>
</div>
<div class="pf-container">
<div fxLayout="row" fxLayoutAlign="space-evenly start" fxLayoutGap="20px" class="cards-container" fxFill
[@step]="currentTab === 'form' ? 'left' : currentTab === 'certificates' ? 'center-left' : currentTab === 'practices' ? 'center-right' : 'right'">
[@step]="currentTab === 'form' ? 'left' : currentTab === 'certificates' ? 'center-left' : currentTab === 'practices' ? 'center-right' : 'right'">
<!-- panel "Formulario receta" -->
<div class="prescription-panel" *ngIf="currentTab === 'form'">
<mat-card fxLayout="column" fxLayoutAlign="space-between" class="new-prescription">
Expand All @@ -27,19 +27,19 @@ <h2 fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="10px">

<mat-card-content>
<form [formGroup]="professionalForm" #professionalNgForm="ngForm" fxLayout="column"
(ngSubmit)="onSubmitProfessionalForm(professionalNgForm)">
(ngSubmit)="onSubmitProfessionalForm(professionalNgForm)">
<div class="sub-container" fxLayout="column" fxLayoutAlign="center" fxLayoutGap="0"
fxLayoutGap.xs="0">
fxLayoutGap.xs="0">

<div class="first-block" fxLayout="column" fxLayoutGap="10px" fxLayoutGap.xs="0">
<div fxLayout="row" fxLayoutGap="10px" fxLayoutAlign="start center"
fxLayoutAlign.xs="center center">
fxLayoutAlign.xs="center center">
<!-- Fecha de receta -->
<mat-form-field appearance="fill" fxFlex="100">
<mat-label>Fecha receta</mat-label>
<input matInput [matDatepicker]="picker1" [formControl]="date"
[min]="minDate" [max]="maxDate" autocomplete="off" required
tabIndex="-1" readonly="true">
[min]="minDate" [max]="maxDate" autocomplete="off" required
tabIndex="-1" readonly="true">
<mat-datepicker-toggle matSuffix [for]="picker1"></mat-datepicker-toggle>
<mat-datepicker [startAt]="today" #picker1></mat-datepicker>

Expand All @@ -54,54 +54,31 @@ <h2 fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="10px">
</div>

<app-patient-form #patientForm [showObraSocial]="true" [appearance]="'fill'"
[layout]="'row'" formControlName="patient">
[layout]="'row'" formControlName="patient">
</app-patient-form>
<app-organizaciones-selector *ngIf="isAmbitoPublico()" [organizacionControl]="organizacionControl">
<app-organizaciones-selector *ngIf="isAmbitoPublico()"
[organizacionControl]="organizacionControl">
</app-organizaciones-selector>
</div>
<div formArrayName="supplies" class="nested-supplies">
<div class="custom-error-container">
<mat-error
*ngIf="suppliesForm.errors?.minLengthFilled && suppliesForm.invalid && suppliesForm.touched">
*ngIf="suppliesForm.errors?.minLengthFilled && suppliesForm.invalid && suppliesForm.touched">
Debe seleccionar al menos un medicamento
</mat-error>
</div>
<!-- Medicamento -->
<div *ngFor="let control of suppliesForm.controls; let i=index" [formGroupName]="i"
fxLayout="row" fxLayoutGap="10px">
fxLayout="row" fxLayoutGap="10px">
<mat-card class="supply-card" fxFlex="100">
<div *ngIf="i>0" fxLayout="row" class="btnDelete">
<button mat-icon-button color="warn" (click)="deleteSupply(i)">
<mat-icon>delete</mat-icon>
</button>
</div>
<div fxLayout="row" fxLayoutGap="10px">
<mat-form-field appearance="fill">
<mat-label>Medicamento</mat-label>

<input type="text" [tabIndex]="4 + i" placeholder="Medicamento"
matInput [formControl]="control.get('supply.name')" required
[matAutocomplete]="supplyref">
<mat-spinner matSuffix [color]="spinnerColor" [diameter]="20"
*ngIf="supplySpinner[i].show"></mat-spinner>
<mat-autocomplete #supplyref="matAutocomplete"
(optionSelected)="onSupplySelected($event.option.value, i)">
<mat-option *ngFor="let sup of filteredSupplies" [value]="sup">
{{sup.term}}
</mat-option>
</mat-autocomplete>

<mat-error *ngIf="control.get('supply.name').hasError('required')">
Debe seleccionar un medicamento
</mat-error>
<mat-error
*ngIf="control.get('supply.name').hasError('medicationNotSelected')">
Debe seleccionar un medicamento del listado
</mat-error>
<mat-error *ngIf="control.get('supply.name').hasError('invalid')">
{{ control.get('supply').getError('invalid') }}
</mat-error>
</mat-form-field>
<app-supply-search fxFlex="100"
[parentForm]="control.get('supply')"></app-supply-search>

</div>

Expand All @@ -110,13 +87,13 @@ <h2 fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="10px">
<mat-form-field appearance="fill">
<mat-label>Cantidad</mat-label>
<input [tabIndex]="5 + i" type="number" matInput
formControlName="quantityPresentation" required>
formControlName="quantityPresentation" required>
<mat-error
*ngIf="control.get('quantityPresentation').hasError('required')">
*ngIf="control.get('quantityPresentation').hasError('required')">
Debe ingresar una cantidad
</mat-error>
<mat-error
*ngIf="control.get('quantityPresentation').hasError('min')">
*ngIf="control.get('quantityPresentation').hasError('min')">
Debe ingresar un mínimo de
{{control.get('quantityPresentation').errors?.min.min}}
</mat-error>
Expand All @@ -128,7 +105,7 @@ <h2 fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="10px">
<mat-form-field appearance="fill">
<mat-label>Cantidad de envases</mat-label>
<input [tabIndex]="5 + i" type="number" matInput
formControlName="quantity" required>
formControlName="quantity" required>
<mat-error *ngIf="control.get('quantity').hasError('required')">
Debe ingresar una cantidad
</mat-error>
Expand All @@ -154,17 +131,17 @@ <h2 fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="10px">
<mat-form-field appearance="fill" fxFlex="50%">
<mat-label>Serie</mat-label>
<input type="text" matInput formControlName="serie"
maxlength="1" placeholder="Ingrese una letra" required>
maxlength="1" placeholder="Ingrese una letra" required>
</mat-form-field>
<mat-form-field appearance="fill" fxFlex="50%">
<mat-label>Número</mat-label>
<input type="number" matInput formControlName="numero"
placeholder="Ingrese un número" required>
placeholder="Ingrese un número" required>
</mat-form-field>
</div>
</div>
<span *ngIf="control.get('triplicate')?.value"
style="position: relative; font-style: italic; bottom: 15px;">
style="position: relative; font-style: italic; bottom: 15px;">
Recuerde que sigue
siendo
obligatoria la
Expand All @@ -173,7 +150,7 @@ <h2 fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="10px">
<mat-form-field appearance="fill">
<mat-label>Diagnóstico</mat-label>
<textarea matInput placeholder="Diagnóstico"
formControlName="diagnostic" required></textarea>
formControlName="diagnostic" required></textarea>
<mat-error *ngIf="control.get('diagnostic').hasError('required')">
Debe ingresar un diagnóstico
</mat-error>
Expand All @@ -184,22 +161,22 @@ <h2 fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="10px">
<mat-form-field appearance="fill">
<mat-label>Indicaciones</mat-label>
<textarea matInput placeholder="Indicaciones"
formControlName="indication"></textarea>
formControlName="indication"></textarea>
</mat-form-field>
</mat-card>
</div>
</div>
<button mat-raised-button color="primary" type="button" (click)="addSupply()"
*ngIf="suppliesForm.controls.length < maxQSupplies">
*ngIf="suppliesForm.controls.length < maxQSupplies">
Agregar medicamento
</button>
</div>

<div fxLayout="row" fxLayoutAlign="center">
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="20px" *ngIf="!isSubmit"
fxFlex="100%">
fxFlex="100%">
<button mat-raised-button type="button" *ngIf="isEdit" fxFlex="100%"
(click)="clearForm(professionalNgForm)">
(click)="clearForm(professionalNgForm)">
Cancelar
</button>

Expand All @@ -224,11 +201,11 @@ <h2 fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="10px">

<div class="my-prescriptions-panel" *ngIf="currentTab === 'list'">
<app-prescriptions-list (editPrescriptionEvent)="editPrescription($event)"
(anulateCertificateEvent)="showCertificados()"></app-prescriptions-list>
(anulateCertificateEvent)="showCertificados()"></app-prescriptions-list>
</div>

<div class="certificates-panel" *ngIf="currentTab === 'certificates'">
<app-certificate-form (anulateCertificateEvent)="anulateCertificate()"
(certificateCreatedEvent)="onCertificateCreated()"></app-certificate-form>
(certificateCreatedEvent)="onCertificateCreated()"></app-certificate-form>
</div>
</div>
Loading
Loading