Merge branch 'master' into 'master'

resolve para modal de remito See merge request modulos-npm/foca-crear-hoja-ruta!13

Merge branch 'master' into 'master'
resolve para modal de remito See merge request modulos-npm/foca-crear-hoja-ruta!13
Nicolás Guarnieri
2 parents 9b73787b10 42502f7189
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -104,7 +104,7 @@ angular.module(&#39;focaCrearHojaRuta&#39;) .controller(&#39;hojaRutaCtrl&#39;,
                 if(!$scope.hojaRuta.chofer.id) {
                     focaModalService.alert('Ingrese Chofer');
                     return;
-                } 
+                }
  
                 if(!$scope.hojaRuta.vehiculo.id) {
                     focaModalService.alert('Ingrese Vehiculo');
@@ -126,7 +126,7 @@ angular.module(&#39;focaCrearHojaRuta&#39;) .controller(&#39;hojaRutaCtrl&#39;,
                 if(!$scope.hojaRuta.tarifario.costo) {
                     focaModalService.alert('Ingrese Tarifario');
                     return;
-                } 
+                }
  
                 var date = new Date();
                 var save = {
@@ -276,7 +276,8 @@ angular.module(&#39;focaCrearHojaRuta&#39;) .controller(&#39;hojaRutaCtrl&#39;,
                         ariaLabelledBy: 'Busqueda de Remito',
                         templateUrl: 'foca-modal-remito.html',
                         controller: 'focaModalRemitoController',
-                        size: 'lg'
+                        size: 'lg',
+                        resolve: {usadoPor: function() {return 'hojaRuta';}}
                     }
                 );
                 modalInstance.result.then(
...	...	@@ -104,7 +104,7 @@ angular.module('focaCrearHojaRuta') .controller('hojaRutaCtrl',
104	104	if(!$scope.hojaRuta.chofer.id) {
105	105	focaModalService.alert('Ingrese Chofer');
106	106	return;
107		- }
	107	+ }
108	108
109	109	if(!$scope.hojaRuta.vehiculo.id) {
110	110	focaModalService.alert('Ingrese Vehiculo');
...	...	@@ -126,7 +126,7 @@ angular.module('focaCrearHojaRuta') .controller('hojaRutaCtrl',
126	126	if(!$scope.hojaRuta.tarifario.costo) {
127	127	focaModalService.alert('Ingrese Tarifario');
128	128	return;
129		- }
	129	+ }
130	130
131	131	var date = new Date();
132	132	var save = {
...	...	@@ -276,7 +276,8 @@ angular.module('focaCrearHojaRuta') .controller('hojaRutaCtrl',
276	276	ariaLabelledBy: 'Busqueda de Remito',
277	277	templateUrl: 'foca-modal-remito.html',
278	278	controller: 'focaModalRemitoController',
279		- size: 'lg'
	279	+ size: 'lg',
	280	+ resolve: {usadoPor: function() {return 'hojaRuta';}}
280	281	}
281	282	);
282	283	modalInstance.result.then(