Skip to content

Commit

Permalink
modificaciones visuales
Browse files Browse the repository at this point in the history
  • Loading branch information
@negro89
negro89 committed Jul 19, 2024
1 parent a9ce6ac commit 90d1378
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 36 deletions.
64 changes: 37 additions & 27 deletions src/app/restriccion-huds/restriccion-huds.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
</plex-text>

<ng-container *ngIf="(usuarios$ | async) as usuarios">
<plex-table [columns]="columns" #table="plTable" *ngIf="usuarios.length > 0" [offset]="50">
<div *ngIf="!loading && !usuarios.length && search?.length >= 3" class="alert alert-danger">
<plex-icon name="account-alert"></plex-icon> No hay usuarios que coincidan con los filtros de
búsqueda
</div>

<plex-table [columns]="columns" #table="plTable" *ngIf="usuarios.length" [offset]="80">
<plex-table-columns>
</plex-table-columns>
<tr class="hover" [class.selected]="selected(user)" [class.selectable]="selectable"
Expand All @@ -24,20 +29,22 @@
</tr>
</plex-table>

<div *ngIf="usuarios.length === 0" justify="center" class="mt-5">
<plex-label *ngIf="!agendas?.length" class="flex-column" icon="account-off" size="lg" direction="column"
titulo="No hay usuarios que coincidan con los filtros de búsqueda">
<plex-loader *ngIf="loading" type="ball-pulse"></plex-loader>

<!-- Pantalla inicial listado vacio -->
<div *ngIf="!loading && !usuarios.length && search?.length < 3" justify="center" class="mt-5">
<plex-label *ngIf="!agendas?.length" type="info" class="flex-column" icon="account-search" size="lg"
direction="column" titulo="Comience filtrando por documento, nombre y/o apellido">
</plex-label>
</div>

</ng-container>
</plex-layout-main>

<plex-layout-sidebar type="invert">

<plex-layout-sidebar type="invert">
<ng-container *ngIf="userSelected">
<plex-list [selectable]="false">
<plex-title titulo="Usuario" size="lg">
<plex-title titulo="Usuario" size="md">
<plex-button size="sm" type="danger" class="mr-1" icon="close" tooltip="Cerrar"
tooltipPosition="left" (click)="cerrarSideBar()">
</plex-button>
Expand Down Expand Up @@ -65,13 +72,23 @@
</plex-item>
</plex-list>
<plex-list [selectable]="false">
<plex-title titulo="{{ !showBuscarPaciente ? 'Pacientes restringidos' : 'Buscar paciente' }}" size="md">
<plex-button *ngIf="!showBuscarPaciente" size="sm" type="primary" class="mr-1" icon="account-plus"
tooltip="Agregar" tooltipPosition="left" (click)="buscarPaciente()">
</plex-button>
<plex-button *ngIf="showBuscarPaciente" size="sm" type="danger" class="mr-1" icon="arrow-up"
tooltip="Volver" tooltipPosition="left" (click)="buscarPaciente()">
</plex-button>
<plex-title titulo="{{ !showBuscarPaciente ? 'Pacientes restringidos' : 'Buscar paciente' }}" size="sm">
<ng-container *ngIf="!showEditarPaciente && !agregarPaciente">
<plex-button *ngIf="!showBuscarPaciente" size="sm" type="primary" class="mr-1"
icon="account-plus" tooltip="Agregar" tooltipPosition="left"
(click)="buscarPaciente()">
</plex-button>
<plex-button *ngIf="showBuscarPaciente" size="sm" type="danger" class="mr-1" icon="arrow-left"
tooltip="Volver" tooltipPosition="left" (click)="buscarPaciente()">
</plex-button>
</ng-container>
<ng-container *ngIf="showEditarPaciente || agregarPaciente">
<plex-button class="mr-1" [disabled]="!observaciones" icon="check" tooltip="Guardar"
type="success" size="sm" (click)="guardar(pacienteSelected)">
</plex-button>
<plex-button icon="arrow-left" tooltip="Volver" type="danger" size="sm" (click)="onCancelar()">
</plex-button>
</ng-container>
</plex-title>
<ng-container *ngIf="restringidos.length && !showBuscarPaciente && !showEditarPaciente">
<plex-item *ngFor="let paciente of restringidos; let i = index">
Expand Down Expand Up @@ -110,7 +127,7 @@
(selected)="onSelect($event)">
</paciente-listado>
<div *ngIf="resultadoBusqueda && !resultadoBusqueda.length && !loading" class="alert">
<i class="adi adi-account-alert"></i> No se encontró ningún paciente.
<plex-icon name="account-alert"></plex-icon> No se encontró ningun paciente..
</div>
</ng-container>
<ng-container *ngIf="pacienteSelected && (showEditarPaciente || agregarPaciente)">
Expand All @@ -132,15 +149,15 @@
</plex-badge>
</plex-item>
<plex-item>
<plex-text [(ngModel)]="observaciones" name='observ' [autoFocus]="autoFocus" label="Observaciones">
<plex-icon name="account-search" left></plex-icon>
<plex-text [(ngModel)]="observaciones" name='observaciones' [autoFocus]="autoFocus"
label="Observaciones" placeholder="Ingrese una observación...">
</plex-text>
</plex-item>
</plex-list>
<plex-list [selectable]="false">
<plex-title titulo="Documentos" size="sm">
<input type="file" (change)="changeListener($event)" #upload style="display:none;">
<plex-button *ngIf="!waiting" type="primary" icon="upload" size="sm" tooltip="Seleccionar Archivo"
<plex-button *ngIf="!waiting" type="primary" icon="upload" size="sm" tooltip="Adjuntar archivo"
tooltipPosition="left" class="mr-1" (click)="upload.click()">
</plex-button>
</plex-title>
Expand All @@ -151,11 +168,10 @@
<span *ngIf="errorExt">
<plex-badge type="danger" size="sm"
hint="Estos son los archivos que podes subir: {{ extensions }}" detach="top"
hintType="danger">Archivo inválido.</plex-badge>
hintType="danger">Archivo inválido
</plex-badge>
</span>

<!-- <shared-galeria-archivos *ngIf="archivos?.length" [files]="getArchivos()" [readonly]="false"
(remove)="removeArchivo($event)"></shared-galeria-archivos> -->
<plex-grid size="md" type="auto" *ngIf="files?.length">
<plex-card *ngFor="let archivo of files; let i = index">
<img [src]="archivo.url" alt="" *ngIf="archivo.isImage" (click)="open(i)" width="100px">
Expand All @@ -178,15 +194,9 @@
(click)="removeArchivo(archivo)" tooltip="Eliminar"></plex-button>
</plex-card>
</plex-grid>
<!-- ... -->

</plex-item>
</plex-list>
<br />
<plex-button [disabled]="!observaciones" label="Guardar" type="success" size="sm"
(click)="guardar(pacienteSelected)"></plex-button>
<plex-button label="Cancelar" type="danger" size="sm" (click)="Cancelar()"
class="float-right mr-1"></plex-button>
</ng-container>
</plex-layout-sidebar>
</plex-layout>
25 changes: 16 additions & 9 deletions src/app/restriccion-huds/restriccion-huds.ts
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component, OnInit, ChangeDetectorRef, ElementRef, ViewChild } from '@angular/core';
import { Plex } from '@andes/plex';
import { Router, ActivatedRoute } from '@angular/router';
import { merge, BehaviorSubject } from 'rxjs';
import { switchMap, tap, distinctUntilChanged, debounceTime } from 'rxjs/operators';
import { merge, BehaviorSubject, of } from 'rxjs';
import { switchMap, tap, distinctUntilChanged, debounceTime, map } from 'rxjs/operators';
import { PermisosService } from '../services/permisos.service';
import { UsuariosHttp } from '../services/usuarios.service';
import { asObject, mergeObject, cache, Unsubscribe } from '@andes/shared';
Expand Down Expand Up @@ -103,9 +103,10 @@ export class restriccionHudsComponent implements OnInit {

this.usuarios$ = this.permisosService.organizaciones().pipe(
switchMap(() => {
this.loading = true;
return merge(
this.refresh$,
this.search$.pipe(asObject('search', t => t.length ? t : null)) // ,
this.search$.pipe(asObject('search', t => t.length ? t : null))
);
}),
mergeObject(),
Expand All @@ -118,13 +119,18 @@ export class restriccionHudsComponent implements OnInit {
});
}),
switchMap((query: any) => {
query = { ...query };
if (query.search) {
if (query.search?.length > 2) {
query = { ...query };
query.search = '^' + query.search;
return this.usuariosService.find({ ...query, fields: '-password -permisosGlobales', limit: 50 });
}
return this.usuariosService.find({ ...query, fields: '-password -permisosGlobales', limit: 50 });
return of([]);
}),
map(response => {
this.userSelected = null;
this.loading = false;
return response;
}),
tap(() => this.userSelected = null),
cache()
);

Expand Down Expand Up @@ -209,6 +215,7 @@ export class restriccionHudsComponent implements OnInit {
}
if (select) {
this.pacienteSelected = paciente;
this.showBuscarPaciente = false;
this.agregarPaciente = true;
this.files = this.getArchivos();
this.filesAdd = [];
Expand Down Expand Up @@ -314,13 +321,13 @@ export class restriccionHudsComponent implements OnInit {
this.cancelar();
}

Cancelar() {
onCancelar() {
this.cancelar();
this.eliminarAgregados();
this.backFilesDel();
}

cancelar() {
private cancelar() {
this.resultadoBusqueda = null;
this.showBuscarPaciente = false;
this.showEditarPaciente = false;
Expand Down

0 comments on commit 90d1378

Please sign in to comment.