Commit 4628175e81b8cbec00a62a3712ca45fe8a687cd1
Exists in
master
Merge branch 'master' into 'master'
Master See merge request !5
Showing
2 changed files
Show diff stats
src/js/controller.js
| ... | ... | @@ -80,7 +80,7 @@ angular.module('focaEstadoCisternas') |
| 80 | 80 | |
| 81 | 81 | $scope.seleccionarGrafico = function() { |
| 82 | 82 | if(!$scope.cisternas.length){ |
| 83 | - focaModalService.alert('Primero seleccione un vehículo'); | |
| 83 | + focaModalService.alert('Primero seleccione un vehículo con cisternas'); | |
| 84 | 84 | return; |
| 85 | 85 | } |
| 86 | 86 | $uibModal.open( |
src/views/foca-estado-cisterna.html
| 1 | 1 | <div class="row"> |
| 2 | 2 | <foca-cabecera-facturador |
| 3 | - titulo="'Estado de cisternas'" | |
| 3 | + titulo="'Control de stock de vehículos'" | |
| 4 | 4 | fecha="now" |
| 5 | 5 | class="mb-0 col-lg-12" |
| 6 | 6 | ></foca-cabecera-facturador> |
| ... | ... | @@ -16,20 +16,20 @@ |
| 16 | 16 | <table class="table table-default table-hover table-sm table-abm table-striped mb-0"> |
| 17 | 17 | <thead> |
| 18 | 18 | <tr> |
| 19 | - <th>Código</th> | |
| 19 | + <th>Cisterna</th> | |
| 20 | + <th>Producto</th> | |
| 20 | 21 | <th>Capacidad total</th> |
| 21 | 22 | <th>Carga</th> |
| 22 | 23 | <th>Disponible</th> |
| 23 | - <th>Producto</th> | |
| 24 | 24 | </tr> |
| 25 | 25 | </thead> |
| 26 | 26 | <tbody> |
| 27 | 27 | <tr ng-repeat="cisterna in cisternas"> |
| 28 | 28 | <td ng-bind="cisterna.codigo"></td> |
| 29 | + <td ng-bind="(cisterna.estado.producto) ? cisterna.estado.producto.DetArt : '-'"></td> | |
| 29 | 30 | <td ng-bind="cisterna.capacidad + ' ' + cisterna.unidadMedida.NOM"></td> |
| 30 | 31 | <td ng-bind="cisterna.estado.cantidad"></td> |
| 31 | 32 | <td ng-bind="cisterna.capacidad - cisterna.estado.cantidad"></td> |
| 32 | - <td ng-bind="(cisterna.estado.producto) ? cisterna.estado.producto.DetArt : '-'"></td> | |
| 33 | 33 | </tr> |
| 34 | 34 | </body> |
| 35 | 35 | </table> |