montos de policias arreglado

src/main/webapp/js/pages/monto_policias.js

@@ -90,32 +90,8 @@ function getColumns() {
 	return columns;
 }
 
-function getColumnDefs() {
-    let columnDefs = [
-        {orderable: false, width: '3%', targets: 0, className: "text-center"},
-        {orderable: false, width: '10%', targets: 1, className: "text-center"},
-        {orderable: false, width: '30%', targets: 2, className: "text-center"},
-        {orderable: false, width: '7%', targets: 3, className: "text-center"},
-        {orderable: false, width: '7%', targets: 4, className: "text-center"},
-        {orderable: false, width: '3%', targets: 5, className: "text-center"},
-        {orderable: false, width: '10%', targets: 6, className: "text-center"},
-        {orderable: false, width: '30%', targets: 7, className: "text-center"},
-        {orderable: false, width: '7%', targets: 8, className: "text-center"},
-        {orderable: false, width: '7%', targets: 9, className: "text-center"},
-        {orderable: false, width: '3%', targets: 10, className: "text-center"},
-        {orderable: false, width: '10%', targets: 11, className: "text-center"},
-        {orderable: false, width: '30%', targets: 12, className: "text-center"},
-        {orderable: false, width: '7%', targets: 13, className: "text-center"},
-        {orderable: false, width: '7%', targets: 14, className: "text-center"},
-        {orderable: false, width: '7%', targets: 15, className: "text-center"},
-        {orderable: false, width: '7%', targets: 16, className: "text-center"},
-        {orderable: false, width: '7%', targets: 17, className: "text-center"},
-    ];
-    return columnDefs;
-}
-
 function listarPolicias(selectorName) {
-    axios.get(URI_POLICIAS).then((result) => {
+	ajaxWebService.get(URI_POLICIAS).then((result) => {
 		let policias = result.data;
 		policias = _.orderBy(policias, p => p.nombres);
 		let html = `<option value="">[TODOS]</option>`;
@@ -126,7 +102,7 @@ function listarPolicias(selectorName) {
 }
 
 function listarSedes(selectorName) {
-    axios.get(URI_SEDES).then((result) => {
+	ajaxWebService.get(URI_SEDES).then((result) => {
 		let sedes = result.data;
 		sedes = _.orderBy(sedes, s => s.descripcion);
 		let html = `<option value="">[TODOS]</option>`;
@@ -182,33 +158,49 @@ function defaultConfigDateRangePicker(selectorName) {
 
 
 function mostrarReporte(objParams = {}) {
-    axios.get(URI_POLICIA_REPORTE_MONTOS, objParams).then((response) => {
-        response.data = formatResponse(response);
+	ajaxWebService.get(URI_POLICIA_REPORTE_MONTOS, objParams).then((response) => {
 		let columns = getColumns();
-        let columnDefs = getColumnDefs();
 
 		let wrapsNameDatatable = `divDatatable`;
 		let classNameForDatatable = `display table table-bordered`;
-        let footer = false;
 
 		makeDatatable(
-                {
-                    data: response.data.data,
-                    columns,
-                    columnDefs,
 		  wrapsNameDatatable,
+		  {
+			  data: response.data,
+			  columns
+		  },
 		  classNameForDatatable,
-                    footer
-                }
 		  );
 	});
 }
 
 
+
+function verReporte() {
+	debugger
+	let rango_fechas = $("#dpRangoFechas").val();
+	let split_fechas = rango_fechas.split("-").map(f => f.trim());
+	let fecha_inicio = split_fechas[0];
+	let policia_nombres = $("#cboPoliciasFiltro option:selected").text();
+	let sede_descripcion = $("#cboSedesFiltro option:selected").text();
+
+	policia_nombres = policia_nombres.includes("TODOS") ? "" : policia_nombres
+	sede_descripcion = sede_descripcion.includes("TODOS") ? "" : sede_descripcion
+
+	let params = cleanQueryParams({
+		fecha_entrada: fecha_inicio,
+		policia_nombres,
+		sede_descripcion
+	});
+
+	mostrarReporte({params});
+}
+
 $().ready(function () {
-    defaultConfigDataTable();
 	listarPolicias("#cboPoliciasFiltro");
 	listarSedes("#cboSedesFiltro");
 	defaultConfigDateRangePicker("#dpRangoFechas");
 	$("#btnVerTodos").click(mostrarReporte);
+	$("#btnVerReporte").click(verReporte);
 });
\ No newline at end of file

src/main/webapp/vistas/montoPolicias.jsp

@@ -45,7 +45,7 @@
                 </div>
                 <div class="panel-footer">
                     <div class="text-center">
-                        <button class="btn btn-primary" id="btnVerRoles"><i class="icon-eye4"></i> Ver reporte</button>&nbsp;
+                        <button class="btn btn-primary" id="btnVerReporte"><i class="icon-eye4"></i> Ver reporte</button>&nbsp;
                         <button class="btn btn-primary" id="btnVerTodos"><i class="icon-eye4"></i> Ver Todos</button>&nbsp;
                     </div>
                 </div>
@@ -71,12 +71,10 @@
 
         <%@include file="templates/footer-body.jsp"%>
         <!--js de la pagina-->
-        <script src="../plantilla/assets/js/plugins/tables/datatables/datatables.min.js" type="text/javascript"></script>
         <script src="../plantilla/assets/js/core/libraries/jquery_ui/interactions.min.js"></script> 
         <script src="../plantilla/assets/js/core/libraries/jquery_ui/widgets.min.js"></script>
         <script src="../js/lib/sweetalert2.min.js" type="text/javascript"></script>
         <script src="../js/lib/lodash.js" type="text/javascript"></script>
-        <script src="../js/lib/axios.min.js" type="text/javascript"></script>
         <script src="../plantilla/assets/js/plugins/forms/inputs/formatter.min.js"></script>
         <script src="../plantilla/assets/js/plugins/forms/selects/select2.min.js"></script>
         <script src="../plantilla/assets/js/plugins/ui/moment/moment.min.js"></script>