Commit 243f2e883dd96727ca552ae7ef82e1bb8821a01b
1 parent
95869a524d
Exists in
master
and in
1 other branch
Agregado data a la vista de ultimos despachos.
Showing
2 changed files
with
16 additions
and
31 deletions
Show diff stats
src/js/controllerUltimosDespachos.js
... | ... | @@ -7,8 +7,6 @@ angular.module('focaCrearFactura') |
7 | 7 | 'parametros', |
8 | 8 | function ($filter, $scope, $uibModalInstance, crearFacturaService, parametros) { |
9 | 9 | |
10 | - $scope.colorTexto = { color: 'black' }; | |
11 | - | |
12 | 10 | config(); |
13 | 11 | |
14 | 12 | function config() { |
... | ... | @@ -26,27 +24,5 @@ angular.module('focaCrearFactura') |
26 | 24 | $uibModalInstance.dismiss('cancel'); |
27 | 25 | }; |
28 | 26 | |
29 | - //TODO: Cambiar switch case con los casos de nombres de productos axion | |
30 | - function setColorNombreProducto() { | |
31 | - | |
32 | - // Diesel #FF852E | Euro+Diesel #6C389A | Premium #00A857 | Super #175AA5 | |
33 | - switch ($scope.nombreProducto) { | |
34 | - case 'NAFTA SUPER XXI': | |
35 | - $scope.colorTexto = { color: '#FF852E' }; | |
36 | - break; | |
37 | - case 'GO-INFINIA DIESEL': | |
38 | - $scope.colorTexto = { color: '#6C389A' }; | |
39 | - break; | |
40 | - case 'ULTRADIESEL XXI - RED': | |
41 | - $scope.colorTexto = { color: '#00A857' }; | |
42 | - break; | |
43 | - case 'NAFTA INFINIA': | |
44 | - $scope.colorTexto = { color: '#175AA5' }; | |
45 | - break; | |
46 | - default: | |
47 | - $scope.colorTexto = { color: 'black' }; | |
48 | - break; | |
49 | - } | |
50 | - } | |
51 | 27 | } |
52 | 28 | ]); |
src/views/modal-ultimos-despachos.html
1 | 1 | <div class="modal-header py-1"> |
2 | 2 | <div class="row w-100"> |
3 | 3 | <div class="col-lg-6"> |
4 | - <h5 class="modal-title my-1"><b>Despachos Disponibles</b></h5> | |
4 | + <h5 class="modal-title my-1"><b>Últimos Despachos</b></h5> | |
5 | 5 | </div> |
6 | 6 | </div> |
7 | 7 | </div> |
8 | 8 | <div class="modal-body" id="modal-body"> |
9 | 9 | <div ng-repeat="(key, producto) in productos"> |
10 | + <div class="row pb-2 border-bottom"> | |
11 | + <div class="col"> | |
12 | + <p class="m-1 h6"> | |
13 | + <b> | |
14 | + <i class="fa fa-circle" aria-hidden="true"></i> {{producto.DetArt}} | |
15 | + </b> | |
16 | + </p> | |
17 | + </div> | |
18 | + </div> | |
10 | 19 | <div class="row my-2"> |
11 | 20 | <div class="col"> |
12 | 21 | <label> |
13 | 22 | <img class="w-50" ng-src="./img/surtidor.png" alt=""> |
14 | - {{manguera.csu}} | |
23 | + {{producto.despachos[0].CSU}} | |
15 | 24 | </label> |
16 | 25 | <button |
17 | 26 | type="button" |
... | ... | @@ -22,16 +31,16 @@ |
22 | 31 | </button> |
23 | 32 | <table class="table table-sm table-striped" ng-show="manguera.show"> |
24 | 33 | <tbody> |
25 | - <tr ng-repeat="(key, despacho) in manguera.despachos"> | |
26 | - <td class="py-2 py-sm-1" ng-bind="despacho.FEC | date:'dd/MM/yyyy hh:MM:ss'"></td> | |
27 | - <td class="py-2 py-sm-1" ng-bind="despacho.LTS"></td> | |
28 | - <td class="py-2 py-sm-1" ng-bind="despacho.IMP | currency: '$'"></td> | |
34 | + <tr> | |
35 | + <td class="py-2 py-sm-1" ng-bind="producto.despachos[0].FEC | date:'dd/MM/yyyy hh:MM:ss'"></td> | |
36 | + <td class="py-2 py-sm-1" ng-bind="producto.despachos[0].LTS"></td> | |
37 | + <td class="py-2 py-sm-1" ng-bind="producto.despachos[0].IMP | currency: '$'"></td> | |
29 | 38 | <td class="py-2 py-sm-1"> |
30 | 39 | <button |
31 | 40 | type="button" |
32 | 41 | class="btn btn-default btn-xs p-1 float-right" |
33 | 42 | title="Seleccionar" |
34 | - ng-click="aceptar(despacho)" | |
43 | + ng-click="aceptar(producto)" | |
35 | 44 | ><i class="fa fa-circle-thin" aria-hidden="true"></i> |
36 | 45 | </button> |
37 | 46 | </td> |