Marcelo Puebla / foca-abm-vehiculo

Download as
Browse Code ยป

Commit c6f26bc623ec0c8d0423d245c045d7e275cb9eda

Authored by Eric Fernandez
2 parents bbd0bd31db 5205cd07f4
Exists in master and in 1 other branch develop

Merge branch 'master' into 'master' 

fuera cisternaCarga

See merge request !16
Showing 2 changed files   Show diff stats
... ... @@ -40,7 +40,7 @@ gulp.task('uglify', ['templates'], function() {
40 40 'tmp/views.js'
41 41 ]),
42 42 concat('foca-abm-vehiculo.js'),
43   - replace("['ngRoute', 'focaModal', 'ui.bootstrap']", '[]'),
  43 + replace("['ngRoute', 'focaModal', 'ui.bootstrap', 'focaBotoneraLateral']", '[]'),
44 44 replace("src/views/", ''),
45 45 gulp.dest(paths.tmp),
46 46 rename('foca-abm-vehiculo.min.js'),
src/js/controllerCisterna.js
Diff comments   View file @ c6f26bc
... ... @@ -6,11 +6,7 @@ angular.module('focaAbmVehiculo')
6 6 focaModalService, focaBotoneraLateralService, $timeout, $window) {
7 7 $scope.editar = false;
8 8 $scope.now = new Date();
9   - $scope.cisterna = {
10   - cisternaCarga: {
11   - articulo: {}
12   - }
13   - };
  9 + $scope.cisterna = {};
14 10  
15 11 $scope.focused = 1;
16 12 $scope.next = function(key) {
... ... @@ -63,7 +59,6 @@ angular.module('focaAbmVehiculo')
63 59 validaCodigoCapacidad().then(function() {
64 60 $scope.cisterna.idVehiculo = parseInt($routeParams.idVehiculo);
65 61 delete $scope.cisterna.vehiculo;
66   - delete $scope.cisterna.cisternaCarga.articulo;
67 62  
68 63 if($routeParams.idTemp != undefined) {
69 64 //SI SE EDITA UNA CISTERNA LOCALMENTE