diff --git a/package-lock.json b/package-lock.json index c323c68..4f69ac8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -932,6 +932,14 @@ } } }, + "angular2-ladda": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/angular2-ladda/-/angular2-ladda-2.0.1.tgz", + "integrity": "sha512-o0etA77PienX2sHD9fGHjGeg5fmzYpnUPVm/92f6fEVuNQ31OaRxFPVJ8S8ZDEWlq6YFpwkv/ytHFz4NAQ6MdQ==", + "requires": { + "ladda": "^2.0.1" + } + }, "ansi": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz", @@ -5545,6 +5553,14 @@ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true }, + "ladda": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ladda/-/ladda-2.0.1.tgz", + "integrity": "sha512-ynRaMdW9y9ABRdTUWa60HSQjtTkoEZMiQDzzYsX8yxIEm7mxL/sxpvoLutYox1XluRif3DxLDg+3Dl1wurjnJg==", + "requires": { + "spin.js": "^4.0.0" + } + }, "lcid": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", @@ -8546,6 +8562,11 @@ "chalk": "^2.0.1" } }, + "spin.js": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/spin.js/-/spin.js-4.0.0.tgz", + "integrity": "sha512-uJN9Q4/I4I7PRZAp1c5reoY89thAfvFB5thbJncAwkPjPhqCfUrCooJc8GMN8q8WKFGIMy+JMf477RW7deCInA==" + }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", diff --git a/package.json b/package.json index c600223..8db8df8 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "@angular/platform-browser-dynamic": "~8.0.0", "@angular/router": "~8.0.0", "@ng-bootstrap/ng-bootstrap": "^4.2.0", + "angular2-ladda": "^2.0.1", "cordova-android": "^8.0.0", "font-awesome": "^4.7.0", "rxjs": "~6.4.0", @@ -55,4 +56,4 @@ "android" ] } -} \ No newline at end of file +} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index bd1f704..83f7231 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,26 +3,30 @@ import { NgModule } from '@angular/core'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { HttpClientModule } from '@angular/common/http'; import { FormsModule } from '@angular/forms'; +import { LaddaModule } from 'angular2-ladda'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { AppBotonera } from './botonera/botonera.component'; import { ComprobantesComponent } from './comprobantes/comprobantes.component'; import { NombreEmpresaComponent } from './nombre-empresa/nombre-empresa.component'; +import { AccionesComponent } from './acciones/acciones.component'; @NgModule({ declarations: [ AppComponent, AppBotonera, ComprobantesComponent, - NombreEmpresaComponent + NombreEmpresaComponent, + AccionesComponent ], imports: [ BrowserModule, AppRoutingModule, NgbModule, HttpClientModule, - FormsModule + FormsModule, + LaddaModule ], providers: [], bootstrap: [AppComponent] diff --git a/src/app/comprobantes/comprobantes.component.html b/src/app/comprobantes/comprobantes.component.html index 474b7d2..170abd1 100644 --- a/src/app/comprobantes/comprobantes.component.html +++ b/src/app/comprobantes/comprobantes.component.html @@ -28,138 +28,140 @@ - -
-
-
- Letra Factura:  - -
-
- Tipo Factura:  - -
-
- Sucursal:  - -
-
- Número:  - -
-
- Cuit:  - -
-
- Nombre:  - +
+ +
+
+ Letra Factura:  + +
+
+ Tipo Factura:  + +
+
+ Sucursal:  + +
+
+ Número:  + +
+
+ Cuit:  + +
+
+ Nombre:  + +
-
-
-
-
-
+ type="button" + class="btn btn-outline-danger btn-sm" + [ngClass]="{'active': estadoArticulos == 'rechazado'}" + (click)="estadoArticulos = 'rechazado'; paginaActiva = 1; filter = '';"> + Rechazados ({{getCantidadArticulosByEstado('rechazado')}}) +
-
- +
+ -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
RechazarProductoCantidadAceptar
{{articulo.LI0}} - {{articulo.recibido ? articulo.recibido + '/' : ''}}{{articulo.CAN}} - - /{{articulo.CAN}} - - -
Por el momento no hay elementos aquí
-
- +
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
RechazarProductoCantidadAceptar
{{articulo.LI0}} + {{articulo.recibido ? articulo.recibido + '/' : ''}}{{articulo.CAN}} + + /{{articulo.CAN}} + + +
Por el momento no hay elementos aquí
+
+ + +
diff --git a/src/app/comprobantes/comprobantes.component.ts b/src/app/comprobantes/comprobantes.component.ts index aadbc26..09721e4 100644 --- a/src/app/comprobantes/comprobantes.component.ts +++ b/src/app/comprobantes/comprobantes.component.ts @@ -52,6 +52,10 @@ export class ComprobantesComponent implements OnInit { }).length; } + guardarComprobante(event: any) { + alert('Guardando'); + } + obtenerConsulta() { setTimeout(() => { diff --git a/src/index.html b/src/index.html index fbd6bdd..b2725aa 100644 --- a/src/index.html +++ b/src/index.html @@ -8,7 +8,7 @@ - + diff --git a/src/styles.css b/src/styles.css index 2112649..75b00d2 100644 --- a/src/styles.css +++ b/src/styles.css @@ -1,5 +1,6 @@ /* You can add global styles to this file, and also import other style files */ @import '../node_modules/font-awesome/css/font-awesome.min.css'; +@import '../node_modules/ladda/dist/ladda.min.css'; body { background-color: #cccccc;