Marcelo Aiello / gestion-comprobantes

Download as
Browse Code »

Commit d9e6d50e16f305b3c60a2f16debb77e27964b7c4

Authored by Eric Fernandez
2 parents 204d4e3d74 1c76f818a5
Exists in master and in 1 other branch fec14082020_1215

Merge branch 'master' into 'master' 

Master(efernandez)

See merge request !9
Showing 9 changed files   Show diff stats
... ... @@ -23,9 +23,15 @@
23 23 "src/assets"
24 24 ],
25 25 "styles": [
26   - "src/styles.css"
  26 + "src/styles.css",
  27 + "node_modules/bootstrap/dist/css/bootstrap.min.css",
  28 + "node_modules/font-awesome/css/font-awesome.min.css",
  29 + "node_modules/ladda/dist/ladda.min.css"
27 30 ],
28   - "scripts": []
  31 + "scripts": [
  32 + "node_modules/jquery/jquery.min.js",
  33 + "node_modules/bootstrap/dist/js/bootstrap.min.js"
  34 + ]
29 35 },
30 36 "configurations": {
31 37 "production": {
... ... @@ -1575,6 +1575,11 @@
1575 1575 "multicast-dns-service-types": "^1.1.0"
1576 1576 }
1577 1577 },
  1578 + "bootstrap": {
  1579 + "version": "4.3.1",
  1580 + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
  1581 + "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
  1582 + },
1578 1583 "bplist-parser": {
1579 1584 "version": "0.1.1",
1580 1585 "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
... ... @@ -5523,6 +5528,11 @@
5523 5528 "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
5524 5529 "dev": true
5525 5530 },
  5531 + "jquery": {
  5532 + "version": "1.9.1",
  5533 + "resolved": "https://registry.npmjs.org/jquery/-/jquery-1.9.1.tgz",
  5534 + "integrity": "sha1-5M1INfqu+63lNYV2E8D8P/KtrzQ="
  5535 + },
5526 5536 "js-tokens": {
5527 5537 "version": "3.0.2",
5528 5538 "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
... ... @@ -7197,6 +7207,11 @@
7197 7207 "xmldom": "0.1.x"
7198 7208 }
7199 7209 },
  7210 + "popper.js": {
  7211 + "version": "1.14.7",
  7212 + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.7.tgz",
  7213 + "integrity": "sha512-4q1hNvoUre/8srWsH7hnoSJ5xVmIL4qgz+s4qf2TnJIMyZFUFMGH+9vE7mXynAlHSZ/NdTmmow86muD0myUkVQ=="
  7214 + },
7200 7215 "portfinder": {
7201 7216 "version": "1.0.20",
7202 7217 "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
... ... @@ -25,9 +25,12 @@
25 25 "@angular/router": "~8.0.0",
26 26 "@ng-bootstrap/ng-bootstrap": "^4.2.0",
27 27 "angular2-ladda": "^2.0.1",
  28 + "bootstrap": "^4.3.1",
28 29 "cordova-android": "^8.0.0",
29 30 "electron-debug": "^3.0.1",
30 31 "font-awesome": "^4.7.0",
  32 + "jquery": "^1.9.1",
  33 + "popper.js": "^1.14.7",
31 34 "rxjs": "~6.4.0",
32 35 "tslib": "^1.9.0",
33 36 "zone.js": "~0.9.1"
src/app/app-routing.module.ts
Diff comments   View file @ d9e6d50
... ... @@ -6,7 +6,7 @@ import { LoginComponent } from './login/login.component';
6 6 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
7 7  
8 8 const routes: Routes = [
9   - { path: 'comprobantes', component: ComprobantesComponent, pathMatch: 'full' },
  9 + { path: 'comprobantes', component: ComprobantesComponent},
10 10 { path: '', redirectTo: 'home', pathMatch: 'full' },
11 11 { path: 'home', component: AppBotonera },
12 12 { path: 'login', component: LoginComponent }
... ... @@ -18,11 +18,11 @@ const routes: Routes = [
18 18 })
19 19 export class AppRoutingModule {
20 20  
21   - constructor(private router: Router, private modalService: NgbModal) {
  21 + constructor(public router: Router, public modalService: NgbModal) {
22 22  
23   - router.events.subscribe(() => {
24   - modalService.dismissAll();
25   - })
  23 + this.router.events.subscribe(() => {
  24 + this.modalService.dismissAll();
  25 + });
26 26 }
27 27  
28 28 }
src/app/botonera/botonera.component.html
Diff comments   View file @ d9e6d50
... ... @@ -3,7 +3,7 @@
3 3 </div>
4 4 <div class="pt-5 row">
5 5 <div class="swiper col-12">
6   - <a class="botonera-principal-comprobante" routerLink="/comprobantes">
  6 + <a class="botonera-principal-comprobante" (click)="comprobantes()">
7 7 <span>Lista comprobantes</span>
8 8 </a>
9 9 </div>
src/app/botonera/botonera.component.ts
Diff comments   View file @ d9e6d50
1   -import { Component } from '@angular/core';
  1 +import { Component, NgZone } from '@angular/core';
2 2 import { BotonServiceService } from 'src/app/boton-service.service';
  3 +import { Router } from '@angular/router';
3 4  
4 5 @Component({
5 6 selector: 'app-botonera',
... ... @@ -11,8 +12,16 @@ export class AppBotonera {
11 12 botones = new BotonServiceService().getBotones();
12 13 paginas = [1];
13 14  
  15 + constructor(public router: Router, private ngZone: NgZone) { }
  16 +
14 17 showTerminal() {
15 18 alert('No disponible aún');
16 19 }
17 20  
  21 + comprobantes() {
  22 + this.ngZone.run(() => {
  23 + this.router.navigate(['/comprobantes']);
  24 + });
  25 + }
  26 +
18 27 }
src/etc/AppSetings.ts
View file @ d9e6d50
... ... @@ -1,3 +0,0 @@
1   -export class AppSetings {
2   - public static END_POINT='http://localhost:6060/gateway-debo';
3   -}
... ... @@ -7,9 +7,6 @@
7 7  
8 8 <meta name="viewport" content="width=device-width, initial-scale=1">
9 9 <link rel="icon" type="image/x-icon" href="assets/img/logo.png">
10   - <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
11   -
12   - <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
13 10  
14 11 <script type="text/javascript" src="cordova.js"></script>
15 12 </head>
1 1 /* You can add global styles to this file, and also import other style files */
2   -@import '../node_modules/font-awesome/css/font-awesome.min.css';
3   -@import '../node_modules/ladda/dist/ladda.min.css';
4 2  
5 3 body {
6   - background-color: #cccccc;
  4 + background-color: #cccccc !important;
7 5 }