Commit 90d0175c4cb748b3d4a3ed1894a035872287aa63
1 parent
f11af7f89c
Exists in
master
Cambio en orden de codigo.
Showing
1 changed file
with
35 additions
and
31 deletions
Show diff stats
src/js/controllerCombustibles.js
| ... | ... | @@ -7,11 +7,44 @@ angular.module('focaCrearFactura') |
| 7 | 7 | function ($filter, $scope, $uibModalInstance, parametros) { |
| 8 | 8 | |
| 9 | 9 | $scope.mangueras = []; |
| 10 | - $scope.nombreProducto = parametros.nombreProducto; | |
| 11 | 10 | $scope.colorTexto = { color: 'black' }; |
| 12 | 11 | var productosByMangera = []; |
| 12 | + | |
| 13 | + config(); | |
| 14 | + | |
| 15 | + function config() { | |
| 13 | 16 | |
| 14 | - setColorNombreProducto(); | |
| 17 | + $scope.nombreProducto = parametros.nombreProducto; | |
| 18 | + setColorNombreProducto(); | |
| 19 | + parametros.despachos.forEach(function (despacho) { | |
| 20 | + | |
| 21 | + var findCsu = productosByMangera.filter(function (csu) { | |
| 22 | + return csu.csu == despacho.CSU.trim(); | |
| 23 | + })[0]; | |
| 24 | + | |
| 25 | + if (!findCsu) { | |
| 26 | + | |
| 27 | + var mangera = { | |
| 28 | + csu: despacho.CSU.trim(), | |
| 29 | + despachos: [despacho] | |
| 30 | + }; | |
| 31 | + | |
| 32 | + productosByMangera.unshift(mangera); | |
| 33 | + } else { | |
| 34 | + findCsu.despachos.push(despacho); | |
| 35 | + } | |
| 36 | + }); | |
| 37 | + } | |
| 38 | + | |
| 39 | + $scope.mangueras = productosByMangera; | |
| 40 | + | |
| 41 | + $scope.aceptar = function (despacho) { | |
| 42 | + $uibModalInstance.close(despacho); | |
| 43 | + }; | |
| 44 | + | |
| 45 | + $scope.cancel = function () { | |
| 46 | + $uibModalInstance.dismiss('cancel'); | |
| 47 | + }; | |
| 15 | 48 | |
| 16 | 49 | //TODO: Cambiar switch case con los casos de nombres de productos axion |
| 17 | 50 | function setColorNombreProducto() { |
| ... | ... | @@ -35,34 +68,5 @@ angular.module('focaCrearFactura') |
| 35 | 68 | break; |
| 36 | 69 | } |
| 37 | 70 | } |
| 38 | - | |
| 39 | - parametros.despachos.forEach(function (despacho) { | |
| 40 | - | |
| 41 | - var findCsu = productosByMangera.filter(function (csu) { | |
| 42 | - return csu.csu == despacho.CSU.trim(); | |
| 43 | - })[0]; | |
| 44 | - | |
| 45 | - if (!findCsu) { | |
| 46 | - | |
| 47 | - var mangera = { | |
| 48 | - csu: despacho.CSU.trim(), | |
| 49 | - despachos: [despacho] | |
| 50 | - }; | |
| 51 | - | |
| 52 | - productosByMangera.unshift(mangera); | |
| 53 | - } else { | |
| 54 | - findCsu.despachos.push(despacho); | |
| 55 | - } | |
| 56 | - }); | |
| 57 | - | |
| 58 | - $scope.mangueras = productosByMangera; | |
| 59 | - | |
| 60 | - $scope.aceptar = function (despacho) { | |
| 61 | - $uibModalInstance.close(despacho); | |
| 62 | - }; | |
| 63 | - | |
| 64 | - $scope.cancel = function () { | |
| 65 | - $uibModalInstance.dismiss('cancel'); | |
| 66 | - }; | |
| 67 | 71 | } |
| 68 | 72 | ]); |