control de asistencia arreglado

src/main/webapp/js/pages/control_asistencia_policias.js

@@ -166,19 +166,18 @@ function getColumns() {
 
 function getColumnDefs() {
 	let columnDefs = [
-        {orderable: false, width: '5%', targets: 0, className: "text-center"},
-        {orderable: false, width: '5%', targets: 1},
-        {orderable: false, width: '30%', targets: 2, className: "text-center"},
-        {orderable: false, width: '7%', targets: 3, className: "text-center"},
+		{orderable: false, width: '1%', targets: 0, className: "text-center"},
+		{orderable: false, width: '13%', targets: 1},
+		{orderable: false, width: '8%', targets: 2, className: "text-center"},
+		{orderable: false, width: '5%', targets: 3, className: "text-center"},
 		{orderable: false, width: '7%', targets: 4, className: "text-center"},
-        {orderable: false, width: '10%', targets: 5, className: "text-center"},
-        {orderable: false, width: '8%', targets: 6, className: "text-center"},
-        {orderable: false, width: '8%', targets: 7, className: "text-center"},
-        {orderable: false, width: '8%', targets: 8, className: "text-center"},
-        {orderable: false, width: '8%', targets: 9, className: "text-center"},
-        {orderable: false, width: '8%', targets: 10, className: "text-center"},
+		{orderable: false, width: '5%', targets: 5, className: "text-center"},
+		{orderable: false, width: '6%', targets: 6, className: "text-center"},
+		{orderable: false, width: '3%', targets: 7, className: "text-center"},
+		{orderable: false, width: '3%', targets: 8, className: "text-center"},
+		{orderable: false, width: '6%', targets: 9, className: "text-center"},
+		{orderable: false, width: '5%', targets: 10, className: "text-center"},
 		{orderable: false, width: '8%', targets: 11, className: "text-center"},
-        {orderable: false, width: '8%', targets: 12, className: "text-center"}
 	];
 	return columnDefs;
 }
@@ -237,27 +236,25 @@ function listarAsistencias(objParams = {}) {
 	ajaxWebService.get(URI_POLICIAS_ASISTENCIA, objParams).then((response) => {
 		let columns = getColumns();
 		let columnDefs = getColumnDefs();
-
 		let wrapsNameDatatable = `divAsistencias`;
 		let classNameForDatatable = `display table table-bordered`;
-        let footer = false;
-debugger
+		debugger
 		makeDatatable(
+		  wrapsNameDatatable,
 		  {
 			  data: response.data,
 			  columns,
 			  columnDefs,
-                    wrapsNameDatatable,
-                    classNameForDatatable,
-                    footer
-                }
-        ).then((datatable) => {
-            $(datatable).on("click", ".registrar", function () {
-                let data = $(datatable).DataTable().row($(this).parents("tr")).data();
+		  },
+		  classNameForDatatable
+		  ).then((nodes) => {
+			nodes.container.on("click", ".registrar", function () {
+				let data = nodes.datatable.DataTable().row($(this).parents("tr")).data();
 				mostrarModalRegistroAsistencia(data);
 			});
 		});
-    });
+	}
+	);
 }
 
 function listarSedes(selectorName) {
@@ -377,31 +374,7 @@ $().ready(function () {
 		backgroundColor: "#fff"
 	});
 
-    $("#dpFechaInicio").datepicker({
-        minDate: new Date(2000, 1 - 1, 1), maxDate: new Date(2018, 6, 31),
-        dateFormat: 'dd/mm/yy',
-//        defaultDate: new Date(),
-        changeMonth: true,
-        changeYear: true,
-        yearRange: '-18:0',
-        onSelect: function () {
-//        $(this).valid();
-        }
-    });
-    $("#dpFechaInicio").datepicker('setDate', 'now');
-
-    $("#dpFechaFin").datepicker({
-        minDate: new Date(2000, 1 - 1, 1), maxDate: new Date(2018, 6, 31),
-        dateFormat: 'dd/mm/yy',
-        defaultDate: new Date(),
-        changeMonth: true,
-        changeYear: true,
-        yearRange: '-18:+0',
-        onSelect: function () {
-//        $(this).valid();
-        }
-    });
-    $("#dpFechaFin").datepicker('setDate', 'now');
+	initDatePicker("#dpFechaInicio", "#dpFechaFin");
 	$("#btnVerTodos").click(listarAsistencias);
 	$("#btnVerAsistencias").click(buscarAsistencias);
 });

src/main/webapp/vistas/controlAsistenciaPolicias.jsp

@@ -66,8 +66,8 @@
                     </div>
                     <div class="panel-footer">
                         <div class="text-center">
-                            <button class="btn btn-primary" id="btnVerAsistencias"><i class="fa fa-search"></i> Ver Asistencias</button>&nbsp;
-                            <button class="btn btn-primary" id="btnVerTodos"><i class="fa fa-search"></i> Ver Todos</button>&nbsp;
+                            <button class="btn btn-primary" id="btnVerAsistencias"><i class="fa fa-search"></i> Aplicar filtro</button>&nbsp;
+                            <button class="btn btn-primary" id="btnVerTodos"><i class="fa fa-search"></i> Mostrar todos</button>&nbsp;
                         </div>
                     </div>
 
@@ -360,7 +360,6 @@
 
         <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="../plantilla/assets/js/plugins/tables/datatables/datatables.min.js" type="text/javascript"></script>
         <script src="../js/lib/bootstrap-select/bootstrap-select.min.js" type="text/javascript"></script>
         <!--<script src="../plantilla/assets/js/plugins/pickers/datepicker.js" type="text/javascript"></script>-->
         <script src="../plantilla/assets/js/plugins/pickers/daterangepicker.js"></script>
@@ -368,7 +367,6 @@
         <script src="../plantilla/assets/js/plugins/extensions/contextmenu.js"></script>
         <script src="../js/lib/lodash.js" type="text/javascript"></script>
         <script src="../js/lib/sweetalert2.min.js" type="text/javascript"></script>
-        <script src="../js/lib/axios.min.js" type="text/javascript"></script> 
         <script src="../js/pages/control_asistencia_policias.js" type="text/javascript"></script>
         <!--js-->   
     </body>