Skip to content
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

Jump to bottom

Refactoring Cuenta Corriente Proveedor #170

Merged
merged 11 commits into from
Sep 3, 2023
Merged

Refactoring Cuenta Corriente Proveedor #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
15625ac
In cuenta-corriente-proveedor component, removes supplier's name from…
facundososalopez Jul 7, 2023
a1a3eb0
In cuenta-corriente-proveedor, changes label "SALDO" to "ÚLTIMO SALDO".
facundososalopez Jul 7, 2023
d7dd5b6
In cuenta-corriente-proveedor, removes top pagination.
facundososalopez Jul 7, 2023
797fb09
In cuenta-corriente-proveedor component, changes label "Suc" to "Sucu…
facundososalopez Jul 7, 2023
d1f14c4
In cuenta-corriente-proveedor component, rearrange row buttons.
facundososalopez Jul 7, 2023
9b63b31
- In cuenta-corriente-proveedor component, relabels "Nota de Debito" …
facundososalopez Jul 7, 2023
4d79581
Refactors cuenta-corriente-cliente component with ListadoDirective.
facundososalopez Aug 29, 2023
4b0b9d6
Refactors cuenta-corriente-proveedor component with ListadoDirective.
facundososalopez Aug 29, 2023
db09ffd
Fixes SonarCloud code smells.
facundososalopez Aug 29, 2023
ce24245
Adds logic for previous url to cuenta-corriente-cliente and cuenta-co…
facundososalopez Sep 2, 2023
48f1e54
Merge branch 'master' into issue169
facundososalopez Sep 2, 2023
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
6 changes: 5 additions & 1 deletion src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Component } from '@angular/core';
import { environment } from '../environments/environment';
import { StorageKeys, StorageService } from './services/storage.service';
import { PreviousRouteService } from './services/previous-route.service';

@Component({
selector: 'app-root',
Expand All @@ -10,8 +11,11 @@ import { StorageKeys, StorageService } from './services/storage.service';
export class AppComponent {
envQA = environment.qa;
title = 'ops-web';
constructor(private storageService: StorageService) {

constructor(private storageService: StorageService,
private previousRouteService: PreviousRouteService) {
this.checkAppVersion();
this.previousRouteService.init();
}

checkAppVersion() {
Expand Down
24 changes: 13 additions & 11 deletions src/app/components/cuenta-corriente-cliente/cuenta-corriente-cliente.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,15 @@ <h1 class="h3 m-0 flex-fill text-truncate">
</div>
<app-cliente-detalle [cliente]="ccc.cliente"></app-cliente-detalle>
<div class="text-end mx-2">
ULTIMO SALDO: <span class="fw-bold">{{ saldo | currency:'ARS':'symbol':'1.0-2' }}</span>
ÚLTIMO SALDO: <span class="fw-bold">{{ saldo | currency:'ARS':'symbol':'1.0-2' }}</span>
</div>
<!-- Template para las actions porque se renderizan dos veces y es para no repetir y equivorcarse -->

<!-- Template para las actions porque se renderizan dos veces y es para no repetir y equivorcarse -->
<ng-template #actions let-r="r">
<button class="btn btn-primary me-2" type="button" *ngIf="hasRoleToVerDetalle"
ngbPopover="Ver Detalle" placement="left" triggers="mouseenter:mouseleave" (click)="verDetalle(r)">
<fa-icon [icon]="['far', 'eye']"></fa-icon>
</button>
<button class="btn btn-primary me-2" type="button" ngbPopover="Nueva Nota de Crédito" placement="left" triggers="mouseenter:mouseleave"
(click)="crearNotaCreditoFactura(r)" *ngIf="hasRoleToCrearNota && tcParaNotasDeCredito.indexOf(r.tipoComprobante) >= 0">
<fa-icon [icon]="['fas', 'balance-scale-left']"></fa-icon>
Expand All @@ -46,17 +51,13 @@ <h1 class="h3 m-0 flex-fill text-truncate">
ngbPopover="Autorizar" placement="left" triggers="mouseenter:mouseleave" (click)="autorizar(r)">
<fa-icon [icon]="['fas', 'file-signature']"></fa-icon>
</button>
<button class="btn btn-primary me-2" type="button" *ngIf="hasRoleToVerDetalle"
ngbPopover="Ver Detalle" placement="left" triggers="mouseenter:mouseleave" (click)="verDetalle(r)">
<fa-icon [icon]="['far', 'eye']"></fa-icon>
</button>
<button class="btn btn-primary me-2" type="button" *ngIf="hasRoleToDelete"
ngbPopover="Eliminar" placement="left" triggers="mouseenter:mouseleave" (click)="eliminar(r)">
<fa-icon [icon]="['fas', 'trash']"></fa-icon>
</button>
</ng-template>

<div class="table-responsive" *ngIf="renglones.length">
<div class="table-responsive" *ngIf="items.length">
<table class="table table-bordered table-sm">
<caption class="sr-only">Movimientos</caption>
<thead>
Expand All @@ -69,14 +70,14 @@ <h1 class="h3 m-0 flex-fill text-truncate">
</tr>
</thead>
<tbody>
<ng-template ngFor let-r [ngForOf]="renglones">
<ng-template ngFor let-r [ngForOf]="items">
<tr>
<td>
<div class="d-flex flex-row align-items-center flex-wrap">
<span class="badge text-bg-secondary me-2">
<fa-icon [icon]="['fas', 'calendar']"></fa-icon> {{ r.fecha | date:'dd/MM/yyyy HH:mm' }}
</span>
<span class="badge text-bg-pill text-bg-light border border-dark me-2 my-1">
<span class="badge text-bg-pill text-bg-light text-wrap border border-dark me-2 my-1">
{{ helper.tipoComprobanteLabel(r.tipoComprobante) }}
</span>
<span class="text-nowrap fw-bold">Nº {{ r.serie }}-{{ r.numero }}</span>
Expand Down Expand Up @@ -104,8 +105,9 @@ <h1 class="h3 m-0 flex-fill text-truncate">
</tbody>
</table>
</div>
<div class="alert alert-info lead fst-italic" *ngIf="!loadingOverlayService.isActive() && renglones.length <= 0">Sin Movimientos.</div>
<ngb-pagination [pageSize]="size" [collectionSize]="totalElements" [(page)]="displayPage"

<div class="alert alert-info lead fst-italic" *ngIf="!loadingOverlayService.isActive() && items.length <= 0">Sin Movimientos.</div>
<ngb-pagination [pageSize]="size" [collectionSize]="totalElements" [page]="displayPage"
[maxSize]="1" [rotate]="false" [ellipses]="false" [boundaryLinks]="true" (pageChange)="loadPage($event)"
*ngIf="totalPages > 1" class="d-flex justify-content-center my-2"></ngb-pagination>
</div>
Loading
Loading