Luigi / foca-modal-informe

Commit 670981d447781428bdb88195265995738f768856

Authored by Eric Fernandez 2019-03-01 12:09:38 -0300

Merge branch 'master' into 'master'

Master

See merge request !4

Showing 8 changed files Show diff stats

src/js/controller-productividad.js

Diff comments View file @ 670981d

File was created	1	angular.module('focaModalInforme')
	2	.controller('focaModalInformeProductividadController',
	3	[
	4	'$filter',
	5	'$scope',
	6	'$uibModalInstance',
	7	'focaModalInformeProductividadService',
	8	'i18nService',
	9	'focaModalService',
	10	function($filter, $scope, $uibModalInstance,
	11	focaModalInformeProductividadService, i18nService, focaModalService
	12	) {
	13	i18nService.setCurrentLang('es');
	14	var fecha = new Date();
	15	$scope.generando = false;
	16	$scope.buscar = true;
	17	$scope.informe = {};
	18	$scope.params = {
	19	fechaHasta: new Date(),
	20	fechaDesde: new Date(fecha.setMonth(fecha.getMonth() - 1)),
	21	sector: undefined,
	22	diferenciarProductos: false,
	23	diferenciarMeses: false
	24	};
	25	$scope.gridOptions = {
	26	enableGridMenu: true,
	27	exporterMenuCsv: false,
	28	exporterPdfPageSize: 'A4',
	29	exporterPdfFooter: function (currentPage, pageCount) {
	30	return {
	31	columns: [
	32	{text: $filter('date')(new Date(), 'dd/MM/yyyy'),
	33	margin: [40, 0]},
	34	{text: currentPage + ' de ' + pageCount,
	35	margin: [28, 0], alignment: 'right'}
	36	]
	37	};
	38	},
	39	columnDefs: [
	40	{
	41	field: 'cliente',
	42	enableSorting: false,
	43	cellClass: function(grid, row, col) {
	44	var value = grid.getCellValue(row,col);
	45
	46	if (value.indexOf('Vendedores') !== -1 \|\|
	47	value.indexOf('Cobradores') !== -1 \|\|
	48	value.indexOf('Transportistas') !== -1)
	49	return 'yellow w-100';
	50	if (value.indexOf('Vendedor:') !== -1 \|\|
	51	value.indexOf('Cobrador:') !== -1 \|\|
	52	value.indexOf('Transportista:') !== -1)
	53	return 'red w-100';
	54	if (value.indexOf('Fecha:') !== -1)
	55	return 'green w-100';
	56	}
	57	},
	58	{
	59	field: 'fecha',
	60	enableSorting: false,
	61	cellClass: function(grid, row, col) {
	62	if (!grid.getCellValue(row,col))
	63	return 'd-none';
	64	}
	65	},
	66	{
	67	field: 'kmRecorridos',
	68	enableSorting: false,
	69	cellClass: function(grid, row, col) {
	70	if (!grid.getCellValue(row,col))
	71	return 'd-none';
	72	}
	73	},
	74	{
	75	field: 'geolocalizacion',
	76	enableSorting: false,
	77	cellClass: function(grid, row, col) {
	78	if (!grid.getCellValue(row,col))
	79	return 'd-none';
	80	}
	81	}
	82	]
	83	};
	84	$scope.generarInforme = function() {
	85	//$scope.generando = true;
	86	focaModalInformeProductividadService
	87	.getInformeData($scope.params)
	88	.then(function(res) {
	89	var result = [];
	90	console.log(res);
	91	if (true) {
	92	result.push({
	93	cliente: 'Vendedores'
	94	});
	95	res.data.vendedores.forEach(function(vendedor) {
	96	result.push({
	97	cliente: 'Vendedor: ' + vendedor.NOM
	98	});
	99	vendedor.notasPedido.forEach(function(notaPedido) {
	100	var seguimiento = notaPedido.seguimiento;
	101	result.push({
	102	cliente: notaPedido.cliente.NOM,
	103	fecha: seguimiento ? $filter('date')(seguimiento.fecha) : $filter('date')(notaPedido.fechaCarga),
	104	kmRecorridos: seguimiento ? $filter('number')(seguimiento.kmRecorridos \|\| 0, 2) : $filter('number')(0, 2),
	105	geolocalizacion: seguimiento ? seguimiento.latitud + ', ' + seguimiento.longitud : ''
	106	});
	107	});
	108	});
	109	}
	110	if (true) {
	111	result.push({
	112	cliente: 'Cobradores'
	113	});
	114	res.data.cobradores.forEach(function(cobrador) {
	115	result.push({
	116	cliente: 'Cobrador: ' + cobrador.NOM
	117	});
	118	cobrador.cobranzas.forEach(function(cobranza) {
	119	var seguimiento = cobranza.seguimiento;
	120	result.push({
	121	cliente: cobranza.cliente.NOM,
	122	fecha: seguimiento ? $filter('date')(seguimiento.fecha, 'dd/MM/yyyy') : $filter('date')(cobranza.FEC),
	123	kmRecorridos: seguimiento ? $filter('number')(seguimiento.kmRecorridos \|\| 0, 2) : $filter('number')(0, 2),
	124	geolocalizacion: seguimiento ? seguimiento.latitud + ', ' + seguimiento.longitud : ''
	125	});
	126	});
	127	});
	128	}
	129	if (true) {
	130	result.push({
	131	cliente: 'Transportistas'
	132	});
	133	res.data.transportistas.forEach(function(transportista) {
	134	result.push({
	135	cliente: 'Transportista: ' + transportista.NOM
	136	});
	137	transportista.remitos.forEach(function(remito) {
	138	var kms = 0,
	139	geolocalizacion;
	140	remito.hojaRutaMovimiento.forEach(function(movimiento) {
	141	kms += movimiento.seguimiento.kmRecorridos \|\| 0;
	142	geolocalizacion = geolocalizacion \|\|
	143	movimiento.seguimiento.latitud + ', ' +
	144	movimiento.seguimiento.longitud;
	145	});
	146	result.push({
	147	cliente: remito.cliente.NOM,
	148	fecha: $filter('date')(remito.fechaRemito, 'dd/MM/yyyy'),
	149	kmRecorridos: $filter('number')(kms, 2),
	150	geolocalizacion: geolocalizacion
	151	});
	152	});
	153	});
	154	}
	155	$scope.gridOptions.data = result;
	156	$scope.generando = false;
	157	$scope.buscar = false;
	158	});
	159	};
	160
	161
	162	$scope.volver = function() {
	163	$scope.buscar = true;
	164	};
	165	$scope.cancel = function() {
	166	$uibModalInstance.dismiss('Cancelar');
	167	};
	168	$scope.clearSector = function() {
	169	$scope.params.sector = undefined;
	170	};
	171
	172
	173	}
	174	]
	175	);
	176

src/js/service.js

Diff comments View file @ 670981d

 angular.module('focaModalInforme')
     .factory('focaModalInformeChoferService', [
         '$http',
         'API_ENDPOINT',
         function($http, API_ENDPOINT) {
             return {
                 getDescargas: function(fechaDesde, fechaHasta) {
                     return $http.post(API_ENDPOINT.URL + '/informe/chofer',
                         {fechaDesde: fechaDesde, fechaHasta: fechaHasta});
                 },
                 getEmpresa: function(id) {
                     return $http.get(API_ENDPOINT.URL + '/empresa/' + id);
                 },
                 getDistanciaPorIdRemito: function(ids) {
                     return $http.post(API_ENDPOINT.URL + '/remito/distancia', {ids: ids});
                 }
             };
         }
     ])
     .factory('focaModalInformeGeneralUnidadService', [
         '$http',
         'API_ENDPOINT',
         function($http, API_ENDPOINT) {
             return {
                 getEmpresa: function(id) {
                     return $http.get(API_ENDPOINT.URL + '/empresa/' + id);
                 },
                 getInformeData: function(params) {
                     return $http.post(API_ENDPOINT.URL + '/informe/general-unidad-reparto',
                         {params: params});
                 }
             };
         }
     ])
     .factory('focaModalInformeLitrosKmUnidadService', [
         '$http',
         'API_ENDPOINT',
         function($http, API_ENDPOINT) {
             return {
                 getDescargas: function(idVehiculo, fechaDesde, fechaHasta) {
                     return $http.post(API_ENDPOINT.URL + '/informe/litros-por-km',
                         {idVehiculo: idVehiculo, fechaDesde: fechaDesde, fechaHasta: fechaHasta});
                 },
                 getEmpresa: function(id) {
                     return $http.get(API_ENDPOINT.URL + '/empresa/' + id);
                 },
                 getDistanciaPorIdRemito: function(ids) {
                     return $http.post(API_ENDPOINT.URL + '/remito/distancia', {ids: ids});
                 }
             };
         }
     ])
     .factory('focaModalInformeHojaRutaService', [
         '$http',
         'API_ENDPOINT',
         function($http, API_ENDPOINT) {
             return {
                 getHojasRuta: function(fechaDesde, fechaHasta) {
                     return $http.get(API_ENDPOINT.URL + '/hoja-ruta/listar/' +
                         fechaDesde + '/' + fechaHasta);
                 },
                 getEmpresa: function(id) {
                     return $http.get(API_ENDPOINT.URL + '/empresa/' + id);
                 }
             };
         }
     ])
     .factory('focaModalInformeRepartoOptimoService', [
         '$http',
         'API_ENDPOINT',
         function($http, API_ENDPOINT) {
             return {
                 getInformeData: function(params) {
                     return $http.post(API_ENDPOINT.URL + '/informe/reparto-optimo',
                         {params: params});
                 }
             };
         }
+    ])
+    .factory('focaModalInformeProductividadService', [
+        '$http',
+        'API_ENDPOINT',
+        function($http, API_ENDPOINT) {
+            return {
+                getInformeData: function(params) {
+                    return $http.post(API_ENDPOINT.URL + '/informe/productividad',
+                        {params: params});
+                }
+            };
+        }
     ]);

src/views/informe-chofer.html

Diff comments View file @ 670981d

 <div class="modal-header py-1">
     <div class="row w-100">
         <div class="col-12"><h5 class="modal-title">Informe de choferes</h5></div>
         <div class="col-12" ng-hide="buscar">
             Filtros: Fecha desde: {{fechaDesde | date: 'dd/MM/yyyy'}},
             Fecha hasta: {{fechaHasta | date: 'dd/MM/yyyy'}}
         </div>
     </div>
 </div>
 <div class="modal-body" id="modal-body">
     <div class="input-group row"
         ng-show="buscar">
         <small class="col-md-2 col-4 text-left my-1">Fecha Desde</small>
         <div class="col-md-4 col-8 input-group mb-2">
             <div class="input-group-prepend">
                 <div class="input-group-text form-control-sm">
                     <i class="fa fa-calendar"></i>
                 </div>
             </div>
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 type="text"
                 ng-model="fechaDesde"
                 ng-required="true"
                 uib-datepicker-popup="dd/MM/yyyy"
                 show-button-bar="false"
                 is-open="datepickerOpen"
                 on-open-focus="false"
                 ng-focus="datepickerOpen = true"
                 datepicker-options="dateOptions"
             />
         </div>
         <small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small>
         <div class="col-md-4 col-8 input-group mb-2">
             <div class="input-group-prepend">
                 <div class="input-group-text form-control-sm">
                     <i class="fa fa-calendar"></i>
                 </div>
             </div>
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 type="text"
                 ng-model="fechaHasta"
                 ng-required="true"
                 uib-datepicker-popup="dd/MM/yyyy"
                 show-button-bar="false"
                 is-open="datepicker2Open"
                 on-open-focus="false"
                 ng-focus="datepicker2Open = true"
             />
         </div>
     </div>
     <div
         ng-if="!buscar"
         class="row">
         <div class="col-12">
             <div
                 class="gridInforme"
                 ui-grid="gridOptions"
                 ui-grid-exporter
                 ui-grid-resize-columns
                 ></div>
         </div>
     </div>
 </div>
 <div class="modal-footer py-1">
-    <button
-        class="btn btn-sm btn-secondary"
-        type="button"
-        ng-click="cancel()"
-        ng-show="buscar">Cancelar</button>
     <button
         ladda="generando"
         class="btn btn-sm btn-secondary"
         type="button"
         ng-click="generarInforme()"
         ng-show="buscar">Generar</button>
+    <button
+        class="btn btn-sm btn-secondary"
+        type="button"
+        ng-click="cancel()"
+        ng-show="buscar">Salir</button>
     <button
         class="btn btn-sm btn-secondary"

src/views/informe-general-unidad.html

Diff comments View file @ 670981d

 <div class="modal-header py-1">
     <div class="row w-100">
         <div class="col-12"><h5 class="modal-title">Informe general por unidad de reparto</h5></div>
         <div class="col-12" ng-hide="buscar">
             Filtros: Fecha desde: {{params.fechaDesde | date: 'dd/MM/yyyy'}},
             Fecha hasta: {{params.fechaHasta | date: 'dd/MM/yyyy'}}
             <span ng-if="params.sector">, Sector: {{params.sector.NOMBRE}}</span>
             <span ng-if="params.diferenciarProductos">, Productos diferenciados</span>
             <span ng-if="params.diferenciarMeses">, Meses diferenciados</span>
         </div>
     </div>
 </div>
 <div class="modal-body" id="modal-body">
     <div class="input-group row"
         ng-show="buscar">
         <small class="col-md-2 col-4 text-left my-1">Fecha Desde</small>
         <div class="col-md-4 col-8 input-group mb-2">
             <div class="input-group-prepend">
                 <div class="input-group-text form-control-sm">
                     <i class="fa fa-calendar"></i>
                 </div>
             </div>
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 type="text"
                 ng-model="params.fechaDesde"
                 ng-required="true"
                 uib-datepicker-popup="dd/MM/yyyy"
                 show-button-bar="false"
                 is-open="datepickerOpen"
                 on-open-focus="false"
                 ng-focus="datepickerOpen = true"
                 datepicker-options="dateOptions"
             />
         </div>
         <small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small>
         <div class="col-md-4 col-8 input-group mb-2">
             <div class="input-group-prepend">
                 <div class="input-group-text form-control-sm">
                     <i class="fa fa-calendar"></i>
                 </div>
             </div>
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 type="text"
                 ng-model="params.fechaHasta"
                 ng-required="true"
                 uib-datepicker-popup="dd/MM/yyyy"
                 show-button-bar="false"
                 is-open="datepicker2Open"
                 on-open-focus="false"
                 ng-focus="datepicker2Open = true"
             />
         </div>
         <small class="col-md-2 col-4 text-left my-1">Sector</small>
         <div class="col-md-4 col-8 input-group mb-2">
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 type="text"
                 ng-model="params.sector.NOMBRE"
                 ng-required="true"
                 ng-keypress="seleccionarSector($event.keyCode)"
             />
             <button type="button" class="clear-input text-danger" ng-click="clearSector()">
                 <i class="fa fa-times"></i>
             </button>
             <div class="input-group-append">
                 <div class="input-group-append" ng-hide="ingreso">
                     <button
                         ladda="searchLoading"
                         data-spinner-color="#FF0000"
                         class="btn btn-outline-secondary"
                         type="button"
                         ng-click="seleccionarSector(13)">
                         <i class="fa fa-search" aria-hidden="true"></i>
                     </button>
                 </div>
             </div>
         </div>
         <small class="col-md-4 col-8 text-left my-1">Diferenciar productos</small>
         <div class="col-md-2 col-4 input-group mb-2">
             <div class="custom-control custom-checkbox ml-auto">
                 <input
                     type="checkbox"
                     class="custom-control-input"
                     ng-model="params.diferenciarProductos"
                     id="customCheck1">
                 <label class="custom-control-label" for="customCheck1"></label>
             </div>
         </div>
         <small class="col-md-4 col-8 text-left my-1">Detallar por mes</small>
         <div class="col-md-2 col-4 input-group mb-2">
             <div class="custom-control custom-checkbox ml-auto">
                 <input
                     type="checkbox"
                     class="custom-control-input"
                     ng-model="params.diferenciarMeses"
                     id="customCheck2">
                 <label class="custom-control-label" for="customCheck2"></label>
             </div>
         </div>
     </div>
     <div
         ng-if="!buscar"
         class="row">
         <div class="col-12">
             <div
                 class="gridInforme"
                 ui-grid="gridOptions"
                 ui-grid-exporter
                 ui-grid-resize-columns
                 ></div>
         </div>
     </div>
 </div>
 <div class="modal-footer py-1">
-    <button
-        class="btn btn-sm btn-secondary"
-        type="button"
-        ng-click="cancel()"
-        ng-show="buscar">Cancelar</button>
     <button
         ladda="generando"
         class="btn btn-sm btn-secondary"
         type="button"
         ng-click="generarInforme()"
         ng-show="buscar">Generar</button>
+    <button
+        class="btn btn-sm btn-secondary"
+        type="button"
+        ng-click="cancel()"
+        ng-show="buscar">Salir</button>
     <button
         class="btn btn-sm btn-secondary"

src/views/informe-hoja-ruta.html

Diff comments View file @ 670981d

 <div class="modal-header py-1">
     <div class="row w-100">
         <div class="col-12"><h5 class="modal-title">Informe de correlatividad de hojas de ruta</h5></div>
         <div class="col-12" ng-hide="buscar">
             Filtros: Fecha desde: {{fechaDesde | date: 'dd/MM/yyyy'}},
             Fecha hasta: {{fechaHasta | date: 'dd/MM/yyyy'}}
         </div>
     </div>
 </div>
 <div class="modal-body" id="modal-body">
     <div class="input-group row"
         ng-show="buscar">
         <small class="col-md-2 col-4 text-left my-1">Fecha Desde</small>
         <div class="col-md-4 col-8 input-group mb-2">
             <div class="input-group-prepend">
                 <div class="input-group-text form-control-sm">
                     <i class="fa fa-calendar"></i>
                 </div>
             </div>
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 ladda="searchLoading"
                 type="text"
                 ng-model="fechaDesde"
                 ng-required="true"
                 uib-datepicker-popup="dd/MM/yyyy"
                 show-button-bar="false"
                 is-open="datepickerOpen"
                 on-open-focus="false"
                 ng-focus="datepickerOpen = true"
                 datepicker-options="dateOptions"
             />
         </div>
         <small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small>
         <div class="col-md-4 col-8 input-group mb-2">
             <div class="input-group-prepend">
                 <div class="input-group-text form-control-sm">
                     <i class="fa fa-calendar"></i>
                 </div>
             </div>
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 ladda="searchLoading"
                 type="text"
                 ng-model="fechaHasta"
                 ng-required="true"
                 uib-datepicker-popup="dd/MM/yyyy"
                 show-button-bar="false"
                 is-open="datepicker2Open"
                 on-open-focus="false"
                 ng-focus="datepicker2Open = true"
             />
         </div>
     </div>
     <div
         ng-if="!buscar"
         class="row">
         <div class="col-12">
             <div
                 class="gridInforme"
                 ui-grid="gridOptions"
                 ui-grid-exporter
                 ui-grid-resize-columns
                 ></div>
         </div>
     </div>
 </div>
 <div class="modal-footer py-1">
-    <button
-        class="btn btn-sm btn-secondary"
-        type="button"
-        ng-click="cancel()"
-        ng-show="buscar">Cancelar</button>
     <button
         class="btn btn-sm btn-secondary"
         type="button"
         ng-click="generarInforme()"
         ng-show="buscar">Generar</button>
+    <button
+        class="btn btn-sm btn-secondary"
+        type="button"
+        ng-click="cancel()"
+        ng-show="buscar">Salir</button>
     <button
         class="btn btn-sm btn-secondary"

src/views/informe-litros-km-unidad.html

Diff comments View file @ 670981d

 <div class="modal-header py-1">
     <div class="row w-100">
         <div class="col-12"><h5 class="modal-title">Informe de litros por km recorrido por unidad de reparto</h5></div>
         <div class="col-12" ng-hide="buscar">
             Filtros: Fecha desde: {{fechaDesde | date: 'dd/MM/yyyy'}},
             Fecha hasta: {{fechaHasta | date: 'dd/MM/yyyy'}},
             Transportista : {{transportista.NOM}},
             Unidad: {{unidad.codigo}}
         </div>
     </div>
 </div>
 <div class="modal-body" id="modal-body">
     <div class="input-group row"
         ng-show="buscar">
         <small class="col-md-2 col-4 text-left my-1">Fecha Desde</small>
         <div class="col-md-4 col-8 input-group mb-2">
             <div class="input-group-prepend">
                 <div class="input-group-text form-control-sm">
                     <i class="fa fa-calendar"></i>
                 </div>
             </div>
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 type="text"
                 ng-model="fechaDesde"
                 ng-required="true"
                 uib-datepicker-popup="dd/MM/yyyy"
                 show-button-bar="false"
                 is-open="datepickerOpen"
                 on-open-focus="false"
                 ng-focus="datepickerOpen = true"
                 datepicker-options="dateOptions"
             />
         </div>
         <small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small>
         <div class="col-md-4 col-8 input-group mb-2">
             <div class="input-group-prepend">
                 <div class="input-group-text form-control-sm">
                     <i class="fa fa-calendar"></i>
                 </div>
             </div>
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 type="text"
                 ng-model="fechaHasta"
                 ng-required="true"
                 uib-datepicker-popup="dd/MM/yyyy"
                 show-button-bar="false"
                 is-open="datepicker2Open"
                 on-open-focus="false"
                 ng-focus="datepicker2Open = true"
             />
         </div>
         <small class="col-md-2 col-4 text-left my-1">Unidad</small>
         <div class="col-md-4 col-8 input-group mb-2">
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 type="text"
                 ng-model="unidad.codigo"
                 ng-required="true"
                 ng-keypress="seleccionarUnidad($event.keyCode)"
             />
             <div class="input-group-append">
                 <div class="input-group-append" ng-hide="ingreso">
                     <button
                         ladda="searchLoading"
                         data-spinner-color="#FF0000"
                         class="btn btn-outline-secondary"
                         type="button"
                         ng-click="seleccionarUnidad(13)">
                         <i class="fa fa-search" aria-hidden="true"></i>
                     </button>
                 </div>
             </div>
         </div>
     </div>
     <div
         ng-if="!buscar"
         class="row">
         <div class="col-12">
             <div
                 class="gridInforme"
                 ui-grid="gridOptions"
                 ui-grid-exporter
                 ui-grid-resize-columns
                 ></div>
         </div>
     </div>
 </div>
 <div class="modal-footer py-1">
-    <button
-        class="btn btn-sm btn-secondary"
-        type="button"
-        ng-click="cancel()"
-        ng-show="buscar">Cancelar</button>
     <button
         ladda="generando"
         class="btn btn-sm btn-secondary"
         type="button"
         ng-click="generarInforme()"
         ng-show="buscar">Generar</button>
+    <button
+        class="btn btn-sm btn-secondary"
+        type="button"
+        ng-click="cancel()"
+        ng-show="buscar">Salir</button>
     <button
         class="btn btn-sm btn-secondary"

src/views/informe-productividad.html

Diff comments View file @ 670981d

File was created	1	<div class="modal-header py-1">
	2	<div class="row w-100">
	3	<div class="col-12"><h5 class="modal-title">Informe de productividad</h5></div>
	4	<div class="col-12" ng-hide="buscar">
	5	Filtros: Fecha desde: {{params.fechaDesde \| date: 'dd/MM/yyyy'}},
	6	Fecha hasta: {{params.fechaHasta \| date: 'dd/MM/yyyy'}}
	7	<span ng-if="params.sector">, Sector: {{params.sector.NOMBRE}}</span>
	8	<span ng-if="params.diferenciarProductos">, Productos diferenciados</span>
	9	<span ng-if="params.diferenciarMeses">, Meses diferenciados</span>
	10	</div>
	11	</div>
	12	</div>
	13	<div class="modal-body" id="modal-body">
	14
	15	<div class="input-group row"
	16	ng-show="buscar">
	17	<small class="col-md-2 col-4 text-left my-1">Fecha Desde</small>
	18	<div class="col-md-4 col-8 input-group mb-2">
	19	<div class="input-group-prepend">
	20	<div class="input-group-text form-control-sm">
	21	<i class="fa fa-calendar"></i>
	22	</div>
	23	</div>
	24	<input
	25	class="form-control form-control-sm"
	26	id="inlineFormInputGroup"
	27	type="text"
	28	ng-model="params.fechaDesde"
	29	ng-required="true"
	30	uib-datepicker-popup="dd/MM/yyyy"
	31	show-button-bar="false"
	32	is-open="datepickerOpen"
	33	on-open-focus="false"
	34	ng-focus="datepickerOpen = true"
	35	datepicker-options="dateOptions"
	36	/>
	37	</div>
	38	<small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small>
	39	<div class="col-md-4 col-8 input-group mb-2">
	40	<div class="input-group-prepend">
	41	<div class="input-group-text form-control-sm">
	42	<i class="fa fa-calendar"></i>
	43	</div>
	44	</div>
	45	<input
	46	class="form-control form-control-sm"
	47	id="inlineFormInputGroup"
	48	type="text"
	49	ng-model="params.fechaHasta"
	50	ng-required="true"
	51	uib-datepicker-popup="dd/MM/yyyy"
	52	show-button-bar="false"
	53	is-open="datepicker2Open"
	54	on-open-focus="false"
	55	ng-focus="datepicker2Open = true"
	56	/>
	57	</div>
	58	<small class="col-md-2 col-4 text-left my-1">Entidad</small>
	59	<div class="col-md-4 col-8 input-group mb-2">
	60	<select class="form-control">
	61	<option value="0">Todos</option>
	62	<option value="1">Vendedores</option>
	63	<option value="2">Cobradores</option>
	64	<option value="3">Transportistas</option>
	65	</select>
	66	<button type="button" class="clear-input text-danger" ng-click="clearSector()">
	67	<i class="fa fa-times"></i>
	68	</button>
	69	<!-- <div class="input-group-append">
	70	<div class="input-group-append" ng-hide="ingreso">
	71	<button
	72	ladda="searchLoading"
	73	data-spinner-color="#FF0000"
	74	class="btn btn-outline-secondary"
	75	type="button"
	76	ng-click="seleccionarSector(13)">
	77	<i class="fa fa-search" aria-hidden="true"></i>
	78	</button>
	79	</div>
	80	</div> -->
	81	</div>
	82	</div>
	83	<div
	84	ng-if="!buscar"
	85	class="row">
	86	<div class="col-12">
	87	<div
	88	class="gridInforme"
	89	ui-grid="gridOptions"
	90	ui-grid-exporter
	91	ui-grid-resize-columns
	92	></div>
	93	</div>
	94	</div>
	95	</div>
	96	<div class="modal-footer py-1">
	97	<button
	98	ladda="generando"
	99	class="btn btn-sm btn-secondary"
	100	type="button"
	101	ng-click="generarInforme()"
	102	ng-show="buscar">Generar</button>
	103	<button
	104	class="btn btn-sm btn-secondary"
	105	type="button"
	106	ng-click="cancel()"
	107	ng-show="buscar">Salir</button>
	108	<button
	109	class="btn btn-sm btn-secondary"
	110	type="button"
	111	ng-click="volver()"
	112	ng-hide="buscar">Volver</button>
	113	</div>
	114

src/views/informe-reparto-optimo.html

Diff comments View file @ 670981d

 <div class="modal-header py-1">
         <div class="row w-100">
             <div class="col-12"><h5 class="modal-title">Informe de reparto óptimo detallado</h5></div>
             <div class="col-12" ng-hide="buscar">
                 Filtros: Fecha desde: {{fechaDesde | date: 'dd/MM/yyyy'}},
                 Fecha hasta: {{fechaHasta | date: 'dd/MM/yyyy'}},
                 Transportista : {{transportista.NOM}},
                 Unidad: {{unidad.codigo}}
             </div>
         </div>
     </div>
     <div class="modal-body" id="modal-body">
         <div class="input-group row"
             ng-show="buscar">
             <small class="col-md-2 col-4 text-left my-1">Fecha Desde</small>
             <div class="col-md-4 col-8 input-group mb-2">
                 <div class="input-group-prepend">
                     <div class="input-group-text form-control-sm">
                         <i class="fa fa-calendar"></i>
                     </div>
                 </div>
                 <input
                     class="form-control form-control-sm"
                     id="inlineFormInputGroup"
                     type="text"
                     ng-model="params.fechaDesde"
                     ng-required="true"
                     uib-datepicker-popup="dd/MM/yyyy"
                     show-button-bar="false"
                     is-open="datepickerOpen"
                     on-open-focus="false"
                     ng-focus="datepickerOpen = true"
                     datepicker-options="dateOptions"
                 />
             </div>
             <small class="col-md-2 col-4 text-left my-1">Fecha Hasta</small>
             <div class="col-md-4 col-8 input-group mb-2">
                 <div class="input-group-prepend">
                     <div class="input-group-text form-control-sm">
                         <i class="fa fa-calendar"></i>
                     </div>
                 </div>
                 <input
                     class="form-control form-control-sm"
                     id="inlineFormInputGroup"
                     type="text"
                     ng-model="params.fechaHasta"
                     ng-required="true"
                     uib-datepicker-popup="dd/MM/yyyy"
                     show-button-bar="false"
                     is-open="datepicker2Open"
                     on-open-focus="false"
                     ng-focus="datepicker2Open = true"
                 />
             </div>
             <small class="col-md-2 col-4 text-left my-1">Sector</small>
             <div class="col-md-4 col-8 input-group mb-2">
                 <input
                     class="form-control form-control-sm"
                     id="inlineFormInputGroup"
                     type="text"
                     ng-model="params.sector.NOMBRE"
                     ng-required="true"
                     ng-keypress="seleccionarSector($event.keyCode)"
                 />
                 <button type="button" class="clear-input text-danger" ng-click="clearSector()">
                     <i class="fa fa-times"></i>
                 </button>
                 <div class="input-group-append">
                     <div class="input-group-append" ng-hide="ingreso">
                         <button
                             ladda="searchLoading"
                             data-spinner-color="#FF0000"
                             class="btn btn-outline-secondary"
                             type="button"
                             ng-click="seleccionarSector(13)">
                             <i class="fa fa-search" aria-hidden="true"></i>
                         </button>
                     </div>
                 </div>
             </div>
             <small class="col-md-4 col-8 text-left my-1">Diferenciar productos</small>
             <div class="col-md-2 col-4 input-group mb-2">
                 <div class="custom-control custom-checkbox ml-auto">
                     <input
                         type="checkbox"
                         class="custom-control-input"
                         ng-model="params.diferenciarProductos"
                         id="customCheck1">
                     <label class="custom-control-label" for="customCheck1"></label>
                 </div>
             </div>
             <small class="col-md-4 col-8 text-left my-1">Detallar por mes</small>
             <div class="col-md-2 col-4 input-group mb-2">
                 <div class="custom-control custom-checkbox ml-auto">
                     <input
                         type="checkbox"
                         class="custom-control-input"
                         ng-model="params.diferenciarMeses"
                         id="customCheck2">
                     <label class="custom-control-label" for="customCheck2"></label>
                 </div>
             </div>
         </div>
         <div
             ng-if="!buscar"
             class="row">
             <div class="col-12">
                 <div
                     class="gridInforme"
                     ui-grid="gridOptions"
                     ui-grid-exporter
                     ui-grid-resize-columns
                     ></div>
             </div>
         </div>
     </div>
     <div class="modal-footer py-1">
-        <button
-            class="btn btn-sm btn-secondary"
-            type="button"
-            ng-click="cancel()"
-            ng-show="buscar">Cancelar</button>
         <button
             ladda="generando"
             class="btn btn-sm btn-secondary"
             type="button"
             ng-click="generarInforme()"
             ng-show="buscar">Generar</button>
+        <button
+            class="btn btn-sm btn-secondary"
+            type="button"
+            ng-click="cancel()"
+            ng-show="buscar">Salir</button>
         <button
             class="btn btn-sm btn-secondary"