Merge branch 'master' into 'master'

Master See merge request !6

Merge branch 'master' into 'master'
Master See merge request !6
Nicolás Guarnieri
2 parents fdf3951dbb 05c2d28e89
Showing 2 changed files Show diff stats
src/js/controller.js
src/js/service.js
@@ -79,5 +79,21 @@ angular.module(&#39;focaInformes&#39;)
                     focaBotoneraLateralService.showTeclado(true);
                 });
             };
+            $scope.seleccionarInformeDeRepartoÓptimoDetallado = function() {
+                focaBotoneraLateralService.showTeclado(false);
+                $uibModal.open(
+                    {
+                        ariaLabelledBy: 'Informe de reparto óptimo detallado',
+                        templateUrl: 'informe-reparto-optimo.html',
+                        controller: 'focaModalInformeRepartoOptimoController',
+                        size: 'xl'
+                    }
+                )
+                .result.then(function(){
+                    focaBotoneraLateralService.showTeclado(true);
+                }, function(){
+                    focaBotoneraLateralService.showTeclado(true);
+                });
+            };
         }
     ]);
@@ -18,6 +18,10 @@ angular.module(&#39;focaInformes&#39;)
                     {
                         label: 'Informe general por unidad de reparto',
                         image: 'flete.png'
+                    },
+                    {
+                        label: 'Informe de reparto óptimo detallado',
+                        image: 'flete.png'
                     }
                 ];
                 return result;
...	...	@@ -79,5 +79,21 @@ angular.module('focaInformes')
79	79	focaBotoneraLateralService.showTeclado(true);
80	80	});
81	81	};
	82	+ $scope.seleccionarInformeDeRepartoÓptimoDetallado = function() {
	83	+ focaBotoneraLateralService.showTeclado(false);
	84	+ $uibModal.open(
	85	+ {
	86	+ ariaLabelledBy: 'Informe de reparto óptimo detallado',
	87	+ templateUrl: 'informe-reparto-optimo.html',
	88	+ controller: 'focaModalInformeRepartoOptimoController',
	89	+ size: 'xl'
	90	+ }
	91	+ )
	92	+ .result.then(function(){
	93	+ focaBotoneraLateralService.showTeclado(true);
	94	+ }, function(){
	95	+ focaBotoneraLateralService.showTeclado(true);
	96	+ });
	97	+ };
82	98	}
83	99	]);
...	...	@@ -18,6 +18,10 @@ angular.module('focaInformes')
18	18	{
19	19	label: 'Informe general por unidad de reparto',
20	20	image: 'flete.png'
	21	+ },
	22	+ {
	23	+ label: 'Informe de reparto óptimo detallado',
	24	+ image: 'flete.png'
21	25	}
22	26	];
23	27	return result;