Merge branch 'master' into 'develop'

Master See merge request !12

Merge branch 'master' into 'develop'
Master See merge request !12
Eric Fernandez
2 parents be4dfba45b 901fea4ec2
Showing 2 changed files Show diff stats
src/js/controller-litros-km-unidad.js
src/views/informe-litros-km-unidad.html
@@ -18,6 +18,9 @@ angular.module(&#39;focaModalInforme&#39;)
                 $scope.fechaHasta = new Date();
                 $scope.fechaDesde = new Date(fecha.setMonth(fecha.getMonth() - 1));
                 $scope.buscar = true;
+                $scope.unidad = {
+                    codigo: ''
+                };
                 $scope.informe = {};
                 i18nService.setCurrentLang('es');
                 $scope.gridOptions = {
@@ -142,7 +145,7 @@ angular.module(&#39;focaModalInforme&#39;)
                     };
                     return focaModalService.modal(parametrosModal)
                 };
-    
+
                 $scope.seleccionarUnidad = function(key) {
                     if (key === 13) {
                         $scope.seleccionarTransportista().then(
@@ -71,6 +71,14 @@
                 ng-required="true"
                 ng-keypress="seleccionarUnidad($event.keyCode)"
             />
+            <button 
+                    ng-show="unidad.codigo.length >= 1"
+                    type="button"
+                    class="clear-input"
+                    ng-click="unidad.codigo = ''"
+                >
+                    <i class="fa fa-times"></i>
+            </button>
             <div class="input-group-append">
                 <div class="input-group-append" ng-hide="ingreso">
                     <button
...	...	@@ -18,6 +18,9 @@ angular.module('focaModalInforme')
18	18	$scope.fechaHasta = new Date();
19	19	$scope.fechaDesde = new Date(fecha.setMonth(fecha.getMonth() - 1));
20	20	$scope.buscar = true;
	21	+ $scope.unidad = {
	22	+ codigo: ''
	23	+ };
21	24	$scope.informe = {};
22	25	i18nService.setCurrentLang('es');
23	26	$scope.gridOptions = {
...	...	@@ -142,7 +145,7 @@ angular.module('focaModalInforme')
142	145	};
143	146	return focaModalService.modal(parametrosModal)
144	147	};
145		-
	148	+
146	149	$scope.seleccionarUnidad = function(key) {
147	150	if (key === 13) {
148	151	$scope.seleccionarTransportista().then(
...	...	@@ -71,6 +71,14 @@
71	71	ng-required="true"
72	72	ng-keypress="seleccionarUnidad($event.keyCode)"
73	73	/>
	74	+ <button
	75	+ ng-show="unidad.codigo.length >= 1"
	76	+ type="button"
	77	+ class="clear-input"
	78	+ ng-click="unidad.codigo = ''"
	79	+ >
	80	+ <i class="fa fa-times"></i>
	81	+ </button>
74	82	<div class="input-group-append">
75	83	<div class="input-group-append" ng-hide="ingreso">
76	84	<button