Merge branch 'master' into 'master'

Master See merge request !2

Merge branch 'master' into 'master'
Master See merge request !2
Nicolás Guarnieri
2 parents 1302ac2eee 17f57ee95f
Showing 2 changed files Show diff stats
src/js/controller.js
src/js/service.js
@@ -25,5 +25,15 @@ angular.module(&#39;focaInformes&#39;)
                     }
                 );
             };
+            $scope.seleccionarChoferes = function() {
+                $uibModal.open(
+                    {
+                        ariaLabelledBy: 'Informes de choferes',
+                        templateUrl: 'modal-informe-chofer.html',
+                        controller: 'focaModalInformeChoferController',
+                        size: 'lg'
+                    }
+                );
+            };
         }
     ]);
@@ -6,6 +6,10 @@ angular.module(&#39;focaInformes&#39;)
                     {
                         label: 'Hojas de ruta',
                         image: 'cliente.png'
+                    },
+                    {
+                        label: 'Choferes',
+                        image: 'chofer.png'
                     }
                 ];
                 return result;
...	...	@@ -25,5 +25,15 @@ angular.module('focaInformes')
25	25	}
26	26	);
27	27	};
	28	+ $scope.seleccionarChoferes = function() {
	29	+ $uibModal.open(
	30	+ {
	31	+ ariaLabelledBy: 'Informes de choferes',
	32	+ templateUrl: 'modal-informe-chofer.html',
	33	+ controller: 'focaModalInformeChoferController',
	34	+ size: 'lg'
	35	+ }
	36	+ );
	37	+ };
28	38	}
29	39	]);
...	...	@@ -6,6 +6,10 @@ angular.module('focaInformes')
6	6	{
7	7	label: 'Hojas de ruta',
8	8	image: 'cliente.png'
	9	+ },
	10	+ {
	11	+ label: 'Choferes',
	12	+ image: 'chofer.png'
9	13	}
10	14	];
11	15	return result;