Eric Fernandez / gestion-comprobantes

Commit e77f489f6e50d66162ea2cef1e6a32bd28e2b65c

Authored by Eric Fernandez 2019-06-21 14:55:42 -0300

Exists in master

Merge branch 'master' into 'master'

Master(efernandez)

See merge request !4

Showing 14 changed files Show diff stats

.gitignore

Diff comments View file @ e77f489

1	# See http://help.github.com/ignore-files/ for more about ignoring files.	1	# See http://help.github.com/ignore-files/ for more about ignoring files.
2		2
3	# compiled output	3	# compiled output
4	/dist	4	/dist
5	/tmp	5	/tmp
6	/out-tsc	6	/out-tsc
		7
7	# Only exists if Bazel was run	8	# Only exists if Bazel was run
8	/bazel-out	9	/bazel-out
9		10
10	# dependencies	11	# dependencies
11	/node_modules	12	/node_modules
12	/www/*	13	/www/*
13	/plugins/*	14	/plugins/*
14	/platforms/*	15	/platforms/*
15		16
16	# profiling files	17	# profiling files
17	chrome-profiler-events.json	18	chrome-profiler-events.json
18	speed-measure-plugin.json	19	speed-measure-plugin.json
19		20
20	# IDEs and editors	21	# IDEs and editors
21	/.idea	22	/.idea
22	.project	23	.project
23	.classpath	24	.classpath
24	.c9/	25	.c9/
25	*.launch	26	*.launch
26	.settings/	27	.settings/
27	*.sublime-workspace	28	*.sublime-workspace
28		29
29	# IDE - VSCode	30	# IDE - VSCode
30	.vscode/*	31	.vscode/*
31	!.vscode/settings.json	32	!.vscode/settings.json
32	!.vscode/tasks.json	33	!.vscode/tasks.json
33	!.vscode/launch.json	34	!.vscode/launch.json
34	!.vscode/extensions.json	35	!.vscode/extensions.json
35	.history/*	36	.history/*
36		37
37	# misc	38	# misc
38	/.sass-cache	39	/.sass-cache
39	/connect.lock	40	/connect.lock
40	/coverage	41	/coverage
41	/libpeerconnection.log	42	/libpeerconnection.log
42	npm-debug.log	43	npm-debug.log
43	yarn-error.log	44	yarn-error.log
44	testem.log	45	testem.log
45	/typings	46	/typings
46		47
47	# System Files	48	# System Files
48	.DS_Store	49	.DS_Store
49	Thumbs.db	50	Thumbs.db
		51
		52	# config
		53	/etc/AppSeting.ts
50		54

angular.json

Diff comments View file @ e77f489

 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
     "distribucion-comprobantes": {
       "projectType": "application",
       "schematics": {},
       "root": "",
       "sourceRoot": "src",
       "prefix": "app",
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
             "outputPath": "www",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
               "src/assets"
             ],
             "styles": [
               "src/styles.css"
             ],
             "scripts": []
           },
           "configurations": {
             "production": {
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.prod.ts"
                 }
               ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
                   "maximumWarning": "2mb",
                   "maximumError": "5mb"
                 }
               ]
             }
           }
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
             "browserTarget": "distribucion-comprobantes:build"
           },
           "configurations": {
             "production": {
               "browserTarget": "distribucion-comprobantes:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
             "browserTarget": "distribucion-comprobantes:build"
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
             "main": "src/test.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
             "assets": [
               "src/favicon.ico",
               "src/assets"
             ],
             "styles": [
               "src/styles.css"
             ],
             "scripts": []
           }
         },
         "lint": {
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
             "tsConfig": [
               "tsconfig.app.json",
               "tsconfig.spec.json",
               "e2e/tsconfig.json"
             ],
             "exclude": [
               "**/node_modules/**"
             ]
           }
         },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
             "protractorConfig": "e2e/protractor.conf.js",
             "devServerTarget": "distribucion-comprobantes:serve"
           },
           "configurations": {
             "production": {
               "devServerTarget": "distribucion-comprobantes:serve:production"
             }
           }
         }
       }
     }},
   "defaultProject": "distribucion-comprobantes"
-}
+}

package.json

Diff comments View file @ e77f489

 {
   "name": "distribucion-comprobantes",
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",
-    "e2e": "ng e2e"
+    "e2e": "ng e2e",
+    "apkToDrop": "cp ./platforms/android/app/build/outputs/apk/debug/app-debug.apk C:/Users/Usuario/Dropbox/Apks_PlanexDEBO/v0.0.1"
   },
   "private": true,
   "dependencies": {
     "@angular/animations": "~8.0.0",
     "@angular/common": "~8.0.0",
     "@angular/compiler": "~8.0.0",
     "@angular/core": "~8.0.0",
     "@angular/forms": "~8.0.0",
     "@angular/platform-browser": "~8.0.0",
     "@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",
     "tslib": "^1.9.0",
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.800.0",
     "@angular/cli": "~8.0.0",
     "@angular/compiler-cli": "~8.0.0",
     "@angular/language-service": "~8.0.0",
     "@types/node": "~8.9.4",
     "@types/jasmine": "~3.3.8",
     "@types/jasminewd2": "~2.0.3",
     "codelyzer": "^5.0.0",
     "jasmine-core": "~3.4.0",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~4.1.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "~2.0.1",
     "karma-jasmine-html-reporter": "^1.4.0",
     "protractor": "~5.4.0",
     "ts-node": "~7.0.0",
     "tslint": "~5.15.0",
     "typescript": "~3.4.3"
   },
   "cordova": {
     "plugins": {
       "cordova-plugin-whitelist": {}
     },
     "platforms": [
       "android"
     ]
   }
 }

src/app/boton-service.service.ts

Diff comments View file @ e77f489

1	import { Injectable } from '@angular/core';	1	import { Injectable } from '@angular/core';
2	import { HttpClient } from '@angular/common/http';	2	// import { HttpClient } from '@angular/common/http';
3		3
4	@Injectable({	4	@Injectable({
5	providedIn: 'root'	5	providedIn: 'root'
6	})	6	})
7	export class BotonServiceService {	7	export class BotonServiceService {
8		8
9	constructor(private http: String) { }	9	constructor(/private http: String/) { }
10		10
11	getBotones() {	11	getBotones() {
12	// return this.http.get('http://localhost:5555/comprobantes');	12	// return this.http.get('http://localhost:5555/comprobantes');
13	return [1];	13	return [1];
14	}	14	}
15	}	15	}
16		16

src/app/botonera/botonera.component.html

Diff comments View file @ e77f489

1	<div class="col-6">	1	<div class="col-6">
2	<img src="assets/img/logo.png" class="botonera-principal-logo">	2	<img src="assets/img/logo.png" class="botonera-principal-logo">
3	</div>	3	</div>
4	<div class="pt-5 row">	4	<div class="pt-5 row">
5	<div class="swiper col-12">	5	<div class="swiper col-12">
6	<a class="botonera-principal-comprobante" routerLink="/comprobantes">	6	<a class="botonera-principal-comprobante" routerLink="/comprobantes">
7	<span>Lista comprobantes</span>	7	<span>Lista comprobantes</span>
8	</a>	8	</a>
9	</div>	9	</div>
10	<div class="d-none d-sm-block">	10	<div class="d-none d-sm-block">
11	<a	11	<a
12	class="btn btn-outline-dark mt-5 btn-lg"	12	class="btn btn-outline-dark mt-5 btn-lg"
13	href="javascript:void()"	13	href="javascript:void()"
14	ng-click="showTerminal()"	14	(click)="showTerminal()"
15	>	15	>
16	<i class="fa fa-info-circle" aria-hidden="true"></i>	16	<i class="fa fa-info-circle" aria-hidden="true"></i>
17	</a>	17	</a>
18	<a class="btn btn-outline-dark mt-5 btn-lg"	18	<a class="btn btn-outline-dark mt-5 btn-lg"
19	href="javascript:void()"	19	href="javascript:void()"
20	ng-click="logout()"	20	routerLink="/login"
21	>	21	>
22	<i class="fa fa-power-off" aria-hidden="true"></i>	22	<i class="fa fa-power-off" aria-hidden="true"></i>
23	</a>	23	</a>
24	</div>	24	</div>
25	<div class="row d-md-none fixed-bottom">	25	<div class="row d-md-none fixed-bottom">
26	<div class="w-100 d-flex px-3 acciones-mobile">	26	<div class="w-100 d-flex px-3 acciones-mobile">
27	<a	27	<a
28	class="btn btn-outline-dark btn-lg mr-2"	28	class="btn btn-outline-dark btn-lg mr-2"
29	href="javascript:void()"	29	href="javascript:void()"
30	ng-click="showTerminal()"	30	(click)="showTerminal()"
31	>	31	>
32	<i class="fa fa-info-circle" aria-hidden="true"></i>	32	<i class="fa fa-info-circle" aria-hidden="true"></i>
33	</a>	33	</a>
34	<a class="btn btn-outline-dark btn-lg"	34	<a class="btn btn-outline-dark btn-lg"
35	href="javascript:void()"	35	href="javascript:void()"
36	ng-click="logout()"	36	routerLink="/login"
37	>	37	>
38	<i class="fa fa-power-off" aria-hidden="true"></i>	38	<i class="fa fa-power-off" aria-hidden="true"></i>
39	</a>	39	</a>
40	</div>	40	</div>
41	</div>	41	</div>
42	</div>	42	</div>
43		43

src/app/botonera/botonera.component.ts

Diff comments View file @ e77f489

1	import { Component } from '@angular/core';	1	import { Component } from '@angular/core';
2	import { BotonServiceService } from 'src/app/boton-service.service';	2	import { BotonServiceService } from 'src/app/boton-service.service';
3		3
4	@Component({	4	@Component({
5	selector: 'app-botonera',	5	selector: 'app-botonera',
6	templateUrl: './botonera.component.html',	6	templateUrl: './botonera.component.html',
7	styleUrls: ['./botonera.component.css']	7	styleUrls: ['./botonera.component.css']
8	})	8	})
9		9
10	export class AppBotonera {	10	export class AppBotonera {
11	botones = new BotonServiceService('').getBotones();	11	botones = new BotonServiceService().getBotones();
12	paginas = [1];	12	paginas = [1];
		13
13	}	14	}
14		15

src/app/busqueda-comprobante/busqueda-comprobante.component.html

Diff comments View file @ e77f489

 <div class="modal-header py-1">
   <div class="row w-100">
     <div class="col-lg-6">
       <h5 class="modal-title">Búsqueda de Comprobantes</h5>
     </div>
   </div>
 </div>
 <div class="modal-body d-flex" id="modal-body">
   <table class="table table-striped table-sm">
     <thead>
       <tr>
         <th>Comprobante</th>
         <th>Items</th>
         <th></th>
       </tr>
     </thead>
     <tbody>
+      <tr *ngIf="!getPaginaFiltro().length">
+        <th colspan="3">Por el momento no hay elementos aqui</th>
+      </tr>
       <tr *ngFor="let comprobante of getPaginaFiltro()">
         <td>
           {{comprobante.cabecera.TCO + '-' + comprobante.cabecera.TIP + '-' + rellenar(4, comprobante.cabecera.SUC) + '-' + rellenar(8, comprobante.cabecera.NCO)}}
         </td>
         <td>{{comprobante.cuerpo.length}}</td>
         <td>
           <button type="button" class="btn btn-xs p-1 float-right btn-primary" (click)="selectItem(comprobante)">
             <i class="fa fa-circle-thin" aria-hidden="true"></i>
           </button>
         </td>
       </tr>
     </tbody>
   </table>
 </div>
 <div class="modal-footer py-1">
   <nav *ngIf="comprobantes.length > 0" class="mr-auto mb-5">
     <ul class="pagination pagination-sm justify-content mb-0">
       <li class="page-item" [ngClass]="{'disabled': paginaActiva == 1}">
         <a class="page-link" href="javascript:void();" (click)="paginaActiva = paginaActiva - 1">
           <span aria-hidden="true">&laquo;</span>
           <span class="sr-only">Anterior</span>
         </a>
       </li>
       <li
         class="page-item"
         *ngFor="let pagina of paginas; index as i"
         [ngClass]="{'active': pagina == paginaActiva}"
         >
         <a
         class="page-link"
         href="javascript:void();"
         (click)="paginaActiva = pagina"
         >{{pagina}}</a>
       </li>
       <li class="page-item" [ngClass]="{'disabled': paginaActiva == paginas.length}">
         <a class="page-link" href="javascript:void();" (click)="paginaActiva = paginaActiva + 1">
           <span aria-hidden="true">&raquo;</span>
           <span class="sr-only">Siguiente</span>
         </a>
       </li>
     </ul>
   </nav>
   <button class="btn btn-sm btn-secondary" type="button" (click)="close()">Cerrar</button>
 </div>

src/app/busqueda-comprobante/busqueda-comprobante.component.ts

Diff comments View file @ e77f489

 import { Component, OnInit} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { BusquedaComprobantesService } from './busqueda-comprobantes.service';
 @Component({
   templateUrl: './busqueda-comprobante.component.html',
   styleUrls: ['./busqueda-comprobante.component.scss'],
   providers: [BusquedaComprobantesService]
 })
 export class BusquedaComprobanteComponent implements OnInit {
   comprobantes: Array<Object> = [];
   paginaActiva = 1;
   paginas = [];
   cantidadPorPagina = 10;
   constructor(public activeModal: NgbActiveModal, public comprobanteService: BusquedaComprobantesService) { }
   ngOnInit() {
     this.comprobanteService.getComprobantes().subscribe((data: Array<Object>) => {
       this.comprobantes = data;
-      this.comprobantes.push(this.comprobantes[0]);
-      this.comprobantes.push(this.comprobantes[1]);
-      this.comprobantes.push(this.comprobantes[0]);
-      this.comprobantes.push(this.comprobantes[1]);
-      this.comprobantes.push(this.comprobantes[0]);
-      this.comprobantes.push(this.comprobantes[1]);
-      this.comprobantes.push(this.comprobantes[0]);
-      this.comprobantes.push(this.comprobantes[1]);
-      this.comprobantes.push(this.comprobantes[0]);
-      this.comprobantes.push(this.comprobantes[1]);
-      this.comprobantes.push(this.comprobantes[0]);
-      this.comprobantes.push(this.comprobantes[1]);
-      this.comprobantes.push(this.comprobantes[0]);
-      this.comprobantes.push(this.comprobantes[1]);
-      this.comprobantes.push(this.comprobantes[0]);
-      this.comprobantes.push(this.comprobantes[1]);
       this.paginar();
     });
   }
   getPaginaFiltro() {
     return this.comprobantes.slice((this.paginaActiva - 1) * this.cantidadPorPagina,
       this.paginaActiva * this.cantidadPorPagina);
   }
   paginar() {
     var cantPaginas = Math.ceil(this.comprobantes.length / this.cantidadPorPagina);
     this.paginas = [];
     for (let i = 0; i < cantPaginas; i++) {
       this.paginas.push(i + 1);
     }
   }
   rellenar(relleno: number, numero: number) {
     if (numero.toString().length >= relleno) {
       return numero;
     }
     let rellenar = '';
     for (let i = 0; i < relleno - numero.toString().length; i++) {
       rellenar += '0'
     }
     return rellenar + numero.toString();
   }
   close() {
     this.activeModal.dismiss();
   }
   selectItem(comprobante: object) {
     this.activeModal.close(comprobante);
   }
 }

src/app/comprobantes/comprobantes.component.html

Diff comments View file @ e77f489

1	<div class="row panel-informativo">	1	<div class="row panel-informativo">
2	<div class="col-12">	2	<div class="col-12">
3	<div class="row titulares">	3	<div class="row titulares">
4	<div class="col-12 col-sm numero-pedido text-center text-md-left border border-white align-middle ng-binding ng-scope">	4	<div class="col-12 col-sm numero-pedido text-center text-md-left border border-white align-middle ng-binding ng-scope">
5	Recepción	5	Recepción
6	<button	6	<button
7	class="btn btn-xs btn-outline-light float-right"	7	class="btn btn-xs btn-outline-light float-right"
8	type="button"	8	type="button"
9	(click)="busquedaComprobantes()"	9	(click)="busquedaComprobantes()"
10	title="Buscar"	10	title="Buscar"
11	>	11	>
12	<i class="fa fa-search"></i>	12	<i class="fa fa-search"></i>
13	</button>	13	</button>
14	</div>	14	</div>
15	<div class="col-7 col-sm border border-white align-middle">	15	<div class="col-7 col-sm border border-white align-middle">
16	Fecha:	16	Fecha:
17	<span	17	<span
18	ng-click="datepickerAbierto = true"	18	ng-click="datepickerAbierto = true"
19	> {{ fecha \| date: 'dd/MM/yyyy' }}</span>	19	> {{ fecha \| date: 'dd/MM/yyyy' }}</span>
20	</div>	20	</div>
21	<div class="col-5 col-sm border border-white border-right-0 align-middle">	21	<div class="col-5 col-sm border border-white border-right-0 align-middle">
22	Hora:	22	Hora:
23	<span	23	<span
24	ng-click="datepickerAbierto = true"	24	ng-click="datepickerAbierto = true"
25	> {{ fecha \| date: 'shortTime'}}</span>	25	> {{ fecha \| date: 'shortTime'}}</span>
26	</div>	26	</div>
27	</div>	27	</div>
28	</div>	28	</div>
29	</div>	29	</div>
30	<div class="row">	30	<div class="row">
31	<form class="col-12 col-sm-10">	31	<form class="col-12 col-sm-10">
32	<div class="row border">	32	<div class="row border">
33	<div class="col-6 col-sm-3 d-flex">	33	<div class="col-6 col-sm-3 d-flex">
34	<strong>Letra Factura: </strong>	34	<strong>Letra Factura: </strong>
35	<label>{{cabecera.TIP}}</label>	35	<label>{{cabecera['TIP']}}</label>
36	</div>	36	</div>
37	<div class="col-6 col-sm-3 d-flex">	37	<div class="col-6 col-sm-3 d-flex">
38	<strong>Tipo Factura: </strong>	38	<strong>Tipo Factura: </strong>
39	<label>{{cabecera.TCO}}</label>	39	<label>{{cabecera['TCO']}}</label>
40	</div>	40	</div>
41	<div class="col-6 col-sm-3 d-flex">	41	<div class="col-6 col-sm-3 d-flex">
42	<strong>Sucursal: </strong>	42	<strong>Sucursal: </strong>
43	<label>{{cabecera.SUC}}</label>	43	<label>{{cabecera['SUC']}}</label>
44	</div>	44	</div>
45	<div class="col-6 col-sm-3 d-flex">	45	<div class="col-6 col-sm-3 d-flex">
46	<strong>Número: </strong>	46	<strong>Número: </strong>
47	<label>{{cabecera.NCO}}</label>	47	<label>{{cabecera['NCO']}}</label>
48	</div>	48	</div>
49	<div class="col-6 col-sm-3 d-flex">	49	<div class="col-6 col-sm-3 d-flex">
50	<strong>Cuit: </strong>	50	<strong>Cuit: </strong>
51	<label>{{cabecera.CUI}}</label>	51	<label>{{cabecera['CUI']}}</label>
52	</div>	52	</div>
53	<div class="col-12 col-sm-6 d-flex">	53	<div class="col-12 col-sm-6 d-flex">
54	<strong>Nombre: </strong>	54	<strong>Nombre: </strong>
55	<label>{{cabecera.NOM}}</label>	55	<label>{{cabecera['NOM']}}</label>
56	</div>	56	</div>
57	</div>	57	</div>
58	<div class="row border pr-2">	58	<div class="row border pr-2">
59	<div class="col-4">	59	<div class="col-4">
60	<button	60	<button
61	type="button"	61	type="button"
62	class="btn btn-outline-secondary btn-sm"	62	class="btn btn-outline-secondary btn-sm"
63	[ngClass]="{'active': estadoArticulos == 'pendiente'}"	63	[ngClass]="{'active': estadoArticulos == 'pendiente'}"
64	(click)="estadoArticulos = 'pendiente'; paginaActiva = 1; filter = '';">	64	(click)="estadoArticulos = 'pendiente'; paginaActiva = 1; filter = '';">
65	Pendientes ({{getCantidadArticulosByEstado('pendiente')}})	65	Pendientes ({{getCantidadArticulosByEstado('pendiente')}})
66	</button>	66	</button>
67	</div>	67	</div>
68	<div class="col-4">	68	<div class="col-4">
69	<button	69	<button
70	type="button"	70	type="button"
71	class="btn btn-outline-success btn-sm"	71	class="btn btn-outline-success btn-sm"
72	[ngClass]="{'active': estadoArticulos == 'aprobado'}"	72	[ngClass]="{'active': estadoArticulos == 'aprobado'}"
73	(click)="estadoArticulos = 'aprobado'; paginaActiva = 1; filter = '';">	73	(click)="estadoArticulos = 'aprobado'; paginaActiva = 1; filter = '';">
74	Aprobados ({{getCantidadArticulosByEstado('aprobado')}})	74	Aprobados ({{getCantidadArticulosByEstado('aprobado')}})
75	</button>	75	</button>
76	</div>	76	</div>
77	<div class="col-4">	77	<div class="col-4">
78	<button	78	<button
79	type="button"	79	type="button"
80	class="btn btn-outline-danger btn-sm"	80	class="btn btn-outline-danger btn-sm"
81	[ngClass]="{'active': estadoArticulos == 'rechazado'}"	81	[ngClass]="{'active': estadoArticulos == 'rechazado'}"
82	(click)="estadoArticulos = 'rechazado'; paginaActiva = 1; filter = '';">	82	(click)="estadoArticulos = 'rechazado'; paginaActiva = 1; filter = '';">
83	Rechazados ({{getCantidadArticulosByEstado('rechazado')}})	83	Rechazados ({{getCantidadArticulosByEstado('rechazado')}})
84	</button>	84	</button>
85	</div>	85	</div>
86	</div>	86	</div>
87	<div class="row">	87	<div class="row">
88	<input	88	<input
89	type="text"	89	type="text"
90	class="form-control-sm col-12"	90	class="form-control-sm col-12"
91	placeholder="Busque producto por nombre, codigo"	91	placeholder="Busque producto por nombre, codigo"
92	[(ngModel)]="filter"	92	[(ngModel)]="filter"
93	[ngModelOptions]="{standalone: true}"/>	93	[ngModelOptions]="{standalone: true}"/>
94	</div>	94	</div>
95	<div class="row">	95	<div class="row">
96	<table class="table table-dark">	96	<table class="table table-dark">
97	<thead>	97	<thead>
98	<tr>	98	<tr>
99	<th *ngIf="estadoArticulos != 'rechazado'">Rechazar</th>	99	<th *ngIf="estadoArticulos != 'rechazado'">Rechazar</th>
100	<th>Producto</th>	100	<th>Producto</th>
101	<th>Cantidad</th>	101	<th>Cantidad</th>
102	<th *ngIf="estadoArticulos != 'aprobado'">Aceptar</th>	102	<th *ngIf="estadoArticulos != 'aprobado'">Aceptar</th>
103	</tr>	103	</tr>
104	</thead>	104	</thead>
105	<tbody>	105	<tbody>
106	<tr *ngFor="let articulo of getPaginaFiltro()" [ngClass]="{'bg-success': articulo.estado == 'aprobado'}">	106	<tr *ngFor="let articulo of getPaginaFiltro()" [ngClass]="{'bg-success': articulo.estado == 'aprobado'}">
107	<th *ngIf="estadoArticulos != 'rechazado'"><button type="button" class="" (click)="articulo.estado = 'rechazado'">	107	<th *ngIf="estadoArticulos != 'rechazado'"><button type="button" class="" (click)="articulo.estado = 'rechazado'">
108	<i class="fa fa-window-close"></i>	108	<i class="fa fa-window-close"></i>
109	</button></th>	109	</button></th>
110	<th>{{articulo.TIO}}</th>	110	<th>{{articulo.TIO}}</th>
111	<th *ngIf="!articulo.input" (click)="articulo.input = true">	111	<th *ngIf="!articulo.input" (click)="articulo.input = true">
112	{{articulo.recibido ? articulo.recibido + '/' : ''}}{{articulo.CAN}}</th>	112	{{articulo.recibido ? articulo.recibido + '/' : ''}}{{articulo.CAN}}</th>
113	<th *ngIf="articulo.input">	113	<th *ngIf="articulo.input">
114	<input	114	<input
115	class="form-control-sm col-12"	115	class="form-control-sm col-12"
116	type="number"	116	type="number"
117	(keyup.enter)="articulo.input = false"	117	(keyup.enter)="articulo.input = false"
118	[(ngModel)]="articulo.recibido"	118	[(ngModel)]="articulo.recibido"
119	[ngModelOptions]="{standalone: true}"	119	[ngModelOptions]="{standalone: true}"
120	autofocus/>	120	autofocus/>
121	/{{articulo.CAN}}	121	/{{articulo.CAN}}
122	</th>	122	</th>
123	<th *ngIf="estadoArticulos != 'aprobado'">	123	<th *ngIf="estadoArticulos != 'aprobado'">
124	<button type="button" class="" (click)="articulo.estado = 'aprobado'">	124	<button type="button" class="" (click)="articulo.estado = 'aprobado'">
125	<i class="fa fa-check"></i>	125	<i class="fa fa-check"></i>
126	</button>	126	</button>
127	</th>	127	</th>
128	</tr>	128	</tr>
129	<tr>	129	<tr>
130	<th colspan="3" *ngIf="articulosFiltro.length == 0">Por el momento no hay elementos aquí</th>	130	<th colspan="3" *ngIf="articulosFiltro.length == 0">Por el momento no hay elementos aquí</th>
131	</tr>	131	</tr>
132	</tbody>	132	</tbody>
133	<tfoot>	133	<tfoot>
134	<nav *ngIf="articulosFiltro.length > 0" class="mr-auto position-absolute mb-5">	134	<nav *ngIf="articulosFiltro.length > 0" class="mr-auto position-absolute mb-5">
135	<ul class="pagination pagination-sm justify-content mb-0">	135	<ul class="pagination pagination-sm justify-content mb-0">
136	<li class="page-item" [ngClass]="{'disabled': paginaActiva == 1}">	136	<li class="page-item" [ngClass]="{'disabled': paginaActiva == 1}">
137	<a class="page-link" href="javascript:void();" (click)="paginaActiva = paginaActiva - 1">	137	<a class="page-link" href="javascript:void();" (click)="paginaActiva = paginaActiva - 1">
138	<span aria-hidden="true">«</span>	138	<span aria-hidden="true">«</span>
139	<span class="sr-only">Anterior</span>	139	<span class="sr-only">Anterior</span>
140	</a>	140	</a>
141	</li>	141	</li>
142	<li	142	<li
143	class="page-item"	143	class="page-item"
144	*ngFor="let pagina of paginas; index as i"	144	*ngFor="let pagina of paginas; index as i"
145	[ngClass]="{'active': pagina == paginaActiva}"	145	[ngClass]="{'active': pagina == paginaActiva}"
146	>	146	>
147	<a	147	<a
148	class="page-link"	148	class="page-link"
149	href="javascript:void();"	149	href="javascript:void();"
150	(click)="paginaActiva = pagina"	150	(click)="paginaActiva = pagina"
151	>{{pagina}}</a>	151	>{{pagina}}</a>
152	</li>	152	</li>
153	<li class="page-item" [ngClass]="{'disabled': paginaActiva == paginas.length}">	153	<li class="page-item" [ngClass]="{'disabled': paginaActiva == paginas.length}">
154	<a class="page-link" href="javascript:void();" (click)="paginaActiva = paginaActiva + 1">	154	<a class="page-link" href="javascript:void();" (click)="paginaActiva = paginaActiva + 1">
155	<span aria-hidden="true">»</span>	155	<span aria-hidden="true">»</span>
156	<span class="sr-only">Siguiente</span>	156	<span class="sr-only">Siguiente</span>
157	</a>	157	</a>
158	</li>	158	</li>
159	</ul>	159	</ul>
160	</nav>	160	</nav>
161	</tfoot>	161	</tfoot>
162	</table>	162	</table>
163	</div>	163	</div>
164	</form>	164	</form>
165	<app-acciones (guardar)="guardarComprobante()" [(saveLoading)]="saveLoading"></app-acciones>	165	<app-acciones (guardar)="guardarComprobante()" [(saveLoading)]="saveLoading"></app-acciones>
166	</div>	166	</div>
167		167

src/app/comprobantes/comprobantes.component.ts

Diff comments View file @ e77f489

 import { Component, OnInit} from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { BusquedaComprobanteComponent } from '../busqueda-comprobante/busqueda-comprobante.component';
 import { ComprobanteService } from './comprobantes.service';
+import { Router } from '@angular/router';
 @Component({
   templateUrl: './comprobantes.component.html',
   styleUrls: ['./comprobantes.component.scss'],
   providers:[ ComprobanteService ]
 })
 export class ComprobantesComponent implements OnInit {
-  constructor(private modalService: NgbModal, public comprobanteService: ComprobanteService) { }
+  constructor(
+      private modalService: NgbModal,
+      public comprobanteService: ComprobanteService,
+      public router: Router) { }
   ngOnInit() { }
   filter = '';
   estadoArticulos = 'pendiente';
   comprobantes = [1, 2, 3];
   cabecera = {};
   cuerpo = [];
   articulosFiltro = [];
   paginaActiva = 1;
   paginas = [];
   saveLoading = false;
   fecha = new Date();
   paginar() {
     var cantPaginas = Math.ceil(this.articulosFiltro.length / 5);
     this.paginas = [];
     for (let i = 0; i < cantPaginas; i++) {
       this.paginas.push(i + 1);
     }
   }
   getPaginaFiltro() {
     this.articulosFiltro = this.cuerpo.filter((articulo) => {
       return articulo.estado == this.estadoArticulos &&
         (articulo.TIO.toLocaleUpperCase().includes(this.filter.toLocaleUpperCase()) ||
         articulo.codigoBarras == this.filter);
     });
     this.paginar();
     return this.articulosFiltro.slice((this.paginaActiva - 1) * 5 , this.paginaActiva * 5);
   }
   getCantidadArticulosByEstado(estado: String) {
     return this.cuerpo.filter((articulo) => {
       return articulo.estado == estado;
     }).length;
   }
-  guardarComprobante(event: any) {
+  guardarComprobante() {
     if (this.getCantidadArticulosByEstado('pendiente')) {
       alert('No deben quedar articulos pendientes');
     }
     this.comprobanteService
       .saveComprobantes({cabecera: this.cabecera, cuerpo: this.cuerpo})
       .subscribe(data => {
-        console.log(data);
+        alert('Comprobante guardado con éxito');
+        this.router.navigateByUrl('/home');
+      }, err => {
+        alert('Algo salió mal');
+        console.log(err);
       });
   }
   busquedaComprobantes() {
     this.modalService.open(BusquedaComprobanteComponent).result.then(comprobante => {
       this.cabecera = comprobante.cabecera;
       this.cuerpo = comprobante.cuerpo;
       this.cuerpo.forEach(articulo => {
         articulo['estado'] = 'pendiente';
       });
       this.getPaginaFiltro();
     }, (reason) => { });
   }
 }

src/app/login/login.component.html

Diff comments View file @ e77f489

1	<div class="d-flex justify-content-center align-items-center">	1	<div class="d-flex justify-content-center align-items-center">
2	<div class="login">	2	<div class="login">
3	<form name="login">	3	<form name="login">
4	<div class="login-titulo">	4	<div class="login-titulo">
5	<span>Ingreso de usuario</span>	5	<span>Ingreso de usuario</span>
6	</div>	6	</div>
7	<div class="login-campo">	7	<div class="login-campo">
8	<label>Usuario</label>	8	<label>Usuario</label>
9	<input	9	<input
10	type="text"	10	type="text"
11	[(ngModel)]="usuario.idUsuario"	11	[(ngModel)]="usuario['idUsuario']"
12	[ngModelOptions]="{standalone: true}"	12	[ngModelOptions]="{standalone: true}"
13	ng-keyup="$event.keyCode == 13 && irPaso(2)"	13	ng-keyup="$event.keyCode == 13 && irPaso(2)"
14	[ladda]="loginLoading"	14	[ladda]="loginLoading"
15	/>	15	/>
16	</div>	16	</div>
17	<div class="login-campo">	17	<div class="login-campo">
18	<label>Contraseña</label>	18	<label>Contraseña</label>
19	<input	19	<input
20	type="password"	20	type="password"
21	[(ngModel)]="usuario.clave"	21	[(ngModel)]="usuario['clave']"
22	[ngModelOptions]="{standalone: true}"	22	[ngModelOptions]="{standalone: true}"
23	foca-focus="paso == 2"	23	foca-focus="paso == 2"
24	ng-keyup="$event.keyCode == 13 && enviar()"	24	ng-keyup="$event.keyCode == 13 && enviar()"
25	[ladda]="loginLoading"	25	[ladda]="loginLoading"
26	/>	26	/>
27	</div>	27	</div>
28	<div class="d-flex">	28	<div class="d-flex">
29	<button	29	<button
30	type="button"	30	type="button"
31	class="btn btn-outline-dark mt-3 mr-auto"	31	class="btn btn-outline-dark mt-3 mr-auto"
32	(click)="configuracionEstacion = !configuracionEstacion"	32	(click)="configuracionEstacion = !configuracionEstacion"
33	[ngClass]="{'active': configuracionEstacion}"	33	[ngClass]="{'active': configuracionEstacion}"
34	[disabled]="loginLoading"	34	[disabled]="loginLoading"
35	>Configuración</button>	35	>Configuración</button>
36	<button	36	<button
37	type="button"	37	type="button"
38	class="btn btn-dark mt-3 ml-auto"	38	class="btn btn-dark mt-3 ml-auto"
39	(click)="ingresar()"	39	(click)="ingresar()"
40	[ladda]="loginLoading"	40	[ladda]="loginLoading"
41	>Ingresar</button>	41	>Ingresar</button>
42	</div>	42	</div>
43	<div *ngIf="configuracionEstacion" class="mt-3">	43	<div *ngIf="configuracionEstacion" class="mt-3">
44	<strong>Configuración estación</strong>	44	<strong>Configuración estación</strong>
45	<br/>	45	<br/>
46	<div>	46	<div>
47	<label class="justify-content-left">Código estación:</label>	47	<label class="justify-content-left">Código estación:</label>
48	<input	48	<input
49	class="form-control"	49	class="form-control"
50	placeholder="Código estación"	50	placeholder="Código estación"
51	[(ngModel)]="usuario.codigoEntidad"	51	[(ngModel)]="usuario['codigoEntidad']"
52	[ngModelOptions]="{standalone: true}">	52	[ngModelOptions]="{standalone: true}">
53	</div>	53	</div>
54	<div>	54	<div>
55	<label class="justify-content-left">GLN:</label>	55	<label class="justify-content-left">GLN:</label>
56	<input	56	<input
57	class="form-control"	57	class="form-control"
58	placeholder="GLN ESTACIÓN"	58	placeholder="GLN ESTACIÓN"
59	[(ngModel)]="usuario.gln"	59	[(ngModel)]="usuario['gln']"
60	[ngModelOptions]="{standalone: true}"/>	60	[ngModelOptions]="{standalone: true}"/>
61	</div>	61	</div>
62	</div>	62	</div>
63	</form>	63	</form>
64	</div>	64	</div>
65	</div>	65	</div>
66		66

src/app/login/login.component.ts

Diff comments View file @ e77f489

 import { Component, OnInit } from '@angular/core';
 import { LoginService } from './login.service';
 import { Router } from '@angular/router';
 @Component({
   templateUrl: './login.component.html',
   styleUrls: ['./login.component.scss'],
   providers: [LoginService]
 })
 export class LoginComponent implements OnInit {
   loginLoading: boolean = false;
+  configuracionEstacion: boolean = false;
   usuario: object = {};
   constructor(private loginService: LoginService, private router: Router) { }
   ngOnInit() {
     let glnPrevius = localStorage.getItem('gln')
     if (glnPrevius) {
       this.usuario['gln'] = glnPrevius;
     }
   }
   ingresar() {
     this.loginLoading = true;
       this.loginService.getLogin(this.usuario).subscribe(login => {
         if(login['data'] == 'ok') {
           localStorage.setItem('gln', this.usuario['gln'])
           this.router.navigateByUrl('/home');
         } else {
           alert('No se encontró la estación');
           this.loginLoading = false;
         }
       });
   }
 }

src/etc/AppSetings.ejemplo.ts

Diff comments View file @ e77f489

File was created	1	// export class AppSetings {
	2	// public static END_POINT='http://10.231.45.197:6060/gateway-debo';
	3	// }
	4

src/etc/AppSetings.ts

Diff comments View file @ e77f489

1	export class AppSetings {	1	export class AppSetings {
2	public static END_POINT='http://localhost:6060/gateway-debo';	2	public static END_POINT='http://10.231.45.234:6060/gateway-debo';
3	}	3	}
4		4