Mauricio Cattafi / autoservicio

Commit 9ac7139017d974c83908865613761436015d0c17

Authored by Marcelo Puebla 2019-09-05 16:40:26 -0300

Merge branch 'master' into 'master'

Master(efernandez)

See merge request !82

Showing 4 changed files Show diff stats

package.json

Diff comments View file @ 9ac7139

 {
   "name": "autoservicio",
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"
   },
   "private": true,
   "dependencies": {
     "@angular/animations": "^8.2.3",
     "@angular/cdk": "^8.1.3",
     "@angular/common": "~8.0.0",
     "@angular/compiler": "~8.0.0",
     "@angular/core": "~8.0.0",
     "@angular/forms": "~8.0.0",
     "@angular/material": "^8.1.3",
     "@angular/platform-browser": "~8.0.0",
     "@angular/platform-browser-dynamic": "~8.0.0",
     "@angular/router": "~8.0.0",
     "@ngx-material-keyboard/core": "^0.1.1",
     "bootstrap": "^4.3.1",
     "font-awesome": "^4.7.0",
     "jquery": "^1.12.4",
+    "lodash": "^4.17.15",
     "material-design-icons": "^3.0.1",
     "ngx-bootstrap": "^5.1.1",
     "popper.js": "^1.15.0",
     "rxjs": "~6.4.0",
     "rxjs-compat": "^6.5.2",
     "simple-keyboard": "^2.26.2",
     "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",
+    "@types/lodash": "^4.14.138",
+    "@types/node": "~8.9.4",
     "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"
   }
 }

src/app/components/comanda/comanda.component.html

Diff comments View file @ 9ac7139

 <div class="container-fluid fade-in p-0">
   <div class="row m-1 fade-in disable-user-select">
     <div
       [ngClass]="{ 'swing-out-top-bck': comanda.estado === 3 }"
       class="col-2 col-1-5 p-1" *ngFor="let comanda of comandas">
       <div
         class="card-comanda fade-in d-flex align-items-end flex-column bg-danger rounded-xs shadow-sm border-0 h-100"
         [ngClass]="
         {
           'bg-light': comanda.estado === 1,
           'bg-danger': comanda.estado === 2,
           'bg-success': comanda.estado === 3
         }">
-        <img class="card-img-top rounded-xs shadow-sm" src="{{apiImagenes}}/imagenes/cerealitas.jpg"/>
+        <img
+          class="card-img-top rounded-xs shadow-sm"
+          src="{{apiImagenes}}/imagenes/{{comanda.detalles[0].articulo.imagenes[0].imagen}}"/>
         <div class="row w-100 m-0 mt-2">
-          <p class="col-12 px-2 mb-2 m-0 h6">Title</p>
+          <p class="col-12 px-2 mb-2 m-0 h6">{{comanda.detalles[0].articulo.DetArt}}</p>
-          <p class="col-12 px-2 mb-2 m-0 h6"><small>Text</small></p>
+          <p class="col-12 px-2 mb-2 m-0 h6"><small>{{comanda.detalles[0].articulo.DET_LAR}}</small></p>
         </div>
         <div class="row w-100 m-0 mb-2 mt-auto">
           <div
             class="col-12 px-2"
             *ngIf="comanda.estado === 1">
             <button
               class="btn btn-block btn-danger shadow-sm"
               (click)="updateComanda(comanda, 2, 'En elaboracion')">
               Elaborar
             </button>
           </div>
           <div
             class="col-12 px-2"
             *ngIf="comanda.estado === 2">
             <button
               class="btn btn-block btn-success shadow-sm"
               (click)="updateComanda(comanda, 3, 'Terminado')">
               Terminado
             </button>
           </div>
         </div>
         <div
           *ngIf="comanda.estado === 2"
           class="row w-100 mx-0 mb-2">
           <div class="col-12 px-2">
             <button
               class="btn btn-block btn-light btn-sm shadow-sm p-0"
               (click)="updateComanda(comanda, 1, 'Pagado')">
               <span class="pr-1 h6"><small>En espera</small></span>
               <i class="fa fa-undo text-warning" aria-hidden="true"></i>
             </button>
           </div>
         </div>
       </div>
     </div>
   </div>
 </div>

src/app/components/comanda/comanda.component.ts

Diff comments View file @ 9ac7139

 import { Component, OnInit } from '@angular/core';
 import { appSettings } from 'src/etc/AppSettings';
 import { ComandaService } from 'src/app/services/comanda.service';
 import { Comanda } from 'src/app/wrappers/comanda';
+import * as _ from 'lodash';
 @Component({
   selector: 'app-comanda',
   templateUrl: './comanda.component.html',
   styleUrls: ['./comanda.component.scss']
 })
 export class ComandaComponent implements OnInit {
   private apiImagenes = appSettings.apiImagenes;
   private comandas: Comanda[] = [];
+  private cicloTime;
   constructor(
     private comandaService: ComandaService
   ) { }
   ngOnInit() {
+    this.buscar();
+    this.ciclo();
+  }
+  ngOnDestroy() {
+    clearTimeout(this.cicloTime);
+  }
+  buscar() {
     this.comandaService.getAll()
-      .subscribe((res: Comanda[]) => {
+    .subscribe((res: Comanda[]) => {
+      if (!_.isEqual(res, this.comandas)) {
         this.comandas = res;
-      }, e => console.error(e))
+      }
+    }, e => console.error(e))
+  }
+  ciclo() {
+    this.cicloTime = setTimeout(() => {
+      this.buscar();
+      this.ciclo();
+    }, 5000);
   }
   updateComanda(comanda: Comanda, estadoNuevo: number, observacionNueva: string) {
     this.comandaService.updateComanda(comanda.id, estadoNuevo, observacionNueva)
       .subscribe(res => {
         if (res.data) {
           comanda.estado = estadoNuevo;
           comanda.observacion = observacionNueva;
         }
       }, e => console.error(e))
   }
 }

src/app/components/pedidos-salientes/pedidos-salientes.component.ts

Diff comments View file @ 9ac7139

 import { Component, OnInit } from '@angular/core';
 import { ComandaService } from 'src/app/services/comanda.service';
 @Component({
   selector: 'app-pedidos-salientes',
   templateUrl: './pedidos-salientes.component.html',
   styleUrls: ['./pedidos-salientes.component.scss']
 })
 export class PedidosSalientesComponent implements OnInit {
   private pedidosRecientes = [];
-  private ciclo;
+  private cicloTime;
   constructor(private comandaService: ComandaService) { }
   ngOnInit() {
-    this.buscar();
-    this.ciclo = setTimeout(() => {
+    this.buscar();
-      this.buscar();
+    this.ciclo();
-    }, 5000)
   }
   ngOnDestroy() {
-    clearTimeout(this.ciclo);
+    clearTimeout(this.cicloTime);
   }
-  buscar() {
+  ciclo() {
+    this.cicloTime = setTimeout(() => {
-    this.comandaService.getPendientesEntrega()
+      this.buscar();
+      this.ciclo();
+    }, 5000)
+  }
+  buscar() {
+    this.comandaService
+      .getPendientesEntrega()
       .subscribe((pedidos: []) => {
         this.pedidosRecientes = pedidos;
       }, console.log);
   }
   rellenar(relleno, longitud) {
     relleno = '' + relleno;
     while (relleno.length < longitud) {
       relleno = '0' + relleno;
     }
     return relleno;
   }