Skip to content

A
Asistencia
Commit fbd03f73 by Billy Larru
Options

mantenimiento de sede arreglado

parent d6a70654
Showing with 41 additions and 48 deletions
src/main/webapp/js/general.js
...@@ -36,18 +36,18 @@ const URI_POLICIA_PROYECTADO_COMPARATIVO = "proyectadoComparativo"; ...@@ -36,18 +36,18 @@ const URI_POLICIA_PROYECTADO_COMPARATIVO = "proyectadoComparativo";
$.extend($.fn.dataTable.defaults, { $.extend($.fn.dataTable.defaults, {
bSort: false, // bSort: false,
bFilter: false, bFilter: false,
aaSorting: [], // aaSorting: [],
ordering: false, // ordering: false,
bLengthChange: false, bLengthChange: false,
bInfo: true, bInfo: true,
paging: true, // paging: true,
iDisplayLength: 20, iDisplayLength: 20,
bStateSave: false, // bStateSave: false,
autoWidth: false, // autoWidth: false,
responsive: true, // responsive: true,
stateSave: true, // stateSave: true,
scrollX: true, scrollX: true,
responsive: true, responsive: true,
language: { language: {
...@@ -457,6 +457,5 @@ const setTiposContratoOnSelect = (nodeIdentifier, optionAll = true) => { ...@@ -457,6 +457,5 @@ const setTiposContratoOnSelect = (nodeIdentifier, optionAll = true) => {
option += `<option value="${value.id}">${value.nombre}</option>` option += `<option value="${value.id}">${value.nombre}</option>`
}) })
$select.html(option).selectpicker() $select.html(option).selectpicker()
$select.selectpicker();
}) })
} }
\ No newline at end of file
src/main/webapp/js/pages/mantenimiento_sede.js
...@@ -18,7 +18,7 @@ function getColumns() { ...@@ -18,7 +18,7 @@ function getColumns() {
data: `montoamanecida_descripcion`, data: `montoamanecida_descripcion`,
className: 'text-center', className: 'text-center',
render: (data) => { render: (data) => {
if (data === null) { if (data) {
return "-"; return "-";
} else { } else {
return data; return data;
...@@ -30,6 +30,7 @@ function getColumns() { ...@@ -30,6 +30,7 @@ function getColumns() {
data: `estado`, data: `estado`,
className: "text-center", className: "text-center",
render: (data) => { render: (data) => {
debugger
let label = ""; let label = "";
let contenido = ""; let contenido = "";
...@@ -39,7 +40,7 @@ function getColumns() { ...@@ -39,7 +40,7 @@ function getColumns() {
} else if (data === 0) { } else if (data === 0) {
label = `label label-danger`; label = `label label-danger`;
contenido = "INACTIVO"; contenido = "INACTIVO";
} else if (data === null) { } else if (!data) {
label = `label label-primary`; label = `label label-primary`;
contenido = `NO TIENE ASIGNADO`; contenido = `NO TIENE ASIGNADO`;
} }
...@@ -52,15 +53,16 @@ function getColumns() { ...@@ -52,15 +53,16 @@ function getColumns() {
data: `estado`, data: `estado`,
className: 'text-center', className: 'text-center',
render: (data) => { render: (data) => {
debugger
let registrar = ""; let registrar = "";
let editar = ""; let editar = "";
let eliminar = ""; let eliminar = "";
if (data === null) { if (data) {
registrar = `<span data-toggle="modal" data-target="#modal_entrada_pendiente" data-placement="left" title="Editar" style="cursor: pointer"> <i class='registrar icon-plus-circle2 text-success-700'></i>&nbsp;&nbsp; </span>`;
} else {
editar = `<span data-placement="left" title="Editar" style="cursor: pointer"> <i class="editar icon-pencil text-slate-800"></i>&nbsp;&nbsp; </span>`; editar = `<span data-placement="left" title="Editar" style="cursor: pointer"> <i class="editar icon-pencil text-slate-800"></i>&nbsp;&nbsp; </span>`;
eliminar = `<span data-placement="left" title="Eliminar" style="cursor: pointer"> <i class="eliminar icon-cancel-circle2 text-danger-700"></i>&nbsp;&nbsp; </span>`; eliminar = `<span data-placement="left" title="Eliminar" style="cursor: pointer"> <i class="eliminar icon-cancel-circle2 text-danger-700"></i>&nbsp;&nbsp; </span>`;
} else {
registrar = `<span data-toggle="modal" data-target="#modal_entrada_pendiente" data-placement="left" title="Editar" style="cursor: pointer"> <i class='registrar icon-plus-circle2 text-success-700'></i>&nbsp;&nbsp; </span>`;
} }
let acciones = registrar + editar + eliminar; let acciones = registrar + editar + eliminar;
return acciones; return acciones;
...@@ -122,7 +124,7 @@ function mostrarMensajeResultadoModalRegistrar(result = {}){ ...@@ -122,7 +124,7 @@ function mostrarMensajeResultadoModalRegistrar(result = {}){
} }
function mostrarModalEdicion(data = {}) { function mostrarModalEdicion(data = {}) {
axios.get("modals/policias/mantenimientoSedes/editarConceptoSede.jsp").then((response) => { ajaxModal.get("modals/policias/mantenimientoSedes/editarConceptoSede.jsp").then((response) => {
swal({ swal({
title: '<strong>Editar</strong>', title: '<strong>Editar</strong>',
html: response.data, html: response.data,
...@@ -153,7 +155,7 @@ function mostrarModalEliminacion(data) { ...@@ -153,7 +155,7 @@ function mostrarModalEliminacion(data) {
} }
function mostrarModalRegistrar(data = {}) { function mostrarModalRegistrar(data = {}) {
axios.get("modals/policias/mantenimientoSedes/registrarConceptoSede.jsp").then((response) => { ajaxModal.get("policias/mantenimientoSedes/registrarConceptoSede.jsp").then((response) => {
swal({ swal({
title: '<strong>Asignar concepto a sede</strong>', title: '<strong>Asignar concepto a sede</strong>',
html: response.data, html: response.data,
...@@ -175,76 +177,72 @@ function mostrarModalRegistrar(data = {}) { ...@@ -175,76 +177,72 @@ function mostrarModalRegistrar(data = {}) {
} }
function listarAsignacionesConceptosSede(objParams = {}) { function listarAsignacionesConceptosSede(objParams = {}) {
axios.get(URI_POLICIA_CONCEPTOSEDES, objParams).then((response) => { ajaxWebService.get(URI_POLICIA_CONCEPTOSEDES, objParams).then((response) => {
response.data = formatResponse(response);
let columns = getColumns(); let columns = getColumns();
let columnDefs = getColumnDefs(); // let columnDefs = getColumnDefs();
let columnDefs = [];
let wrapsNameDatatable = `divDatatable`; let wrapsNameDatatable = `divDatatable`;
let classNameForDatatable = `display table table-bordered`; let classNameForDatatable = `display table table-bordered`;
let footer = false;
makeDatatable( makeDatatable(
wrapsNameDatatable,
{ {
data: response.data.data, data: response.data,
columns, columns,
columnDefs, columnDefs,
wrapsNameDatatable, },
classNameForDatatable, classNameForDatatable,
footer ).then((nodes) => {
}
).then((datatable) => {
$(datatable).on("click", ".registrar", function () { nodes.container.on("click", ".registrar", function () {
let data = $(datatable).DataTable().row($(this).parents("tr")).data(); let data = nodes.datatable.DataTable().row($(this).parents("tr")).data();
mostrarModalRegistrar(data); mostrarModalRegistrar(data);
}); });
$(datatable).on("click", ".editar", function () { nodes.container.on("click", ".editar", function () {
let data = $(datatable).DataTable().row($(this).parents("tr")).data(); let data = nodes.datatable.DataTable().row($(this).parents("tr")).data();
mostrarModalEdicion(data); mostrarModalEdicion(data);
}); });
$(datatable).on("click", ".eliminar", function () { nodes.container.on("click", ".eliminar", function () {
let data = $(datatable).DataTable().row($(this).parents("tr")).data(); let data = nodes.datatable.DataTable().row($(this).parents("tr")).data();
mostrarModalEliminacion(data); mostrarModalEliminacion(data);
}); });
}); });
}); });
} }
function listarSedes(selectorName) { function listarSedes(selectorName) {
axios.get(URI_SEDES).then((result) => { ajaxWebService.get(URI_SEDES).then((result) => {
let sedes = result.data; let sedes = result.data;
sedes = _.orderBy(sedes, s => s.descripcion); sedes = _.orderBy(sedes, s => s.descripcion);
let html = `<option value="">[TODOS]</option>`; let html = `<option value="">[TODOS]</option>`;
sedes.forEach(sede => htmlSedes += `<option value="${sede.codigo}">${sede.descripcion}</option>`); sedes.forEach(sede => htmlSedes += `<option value="${sede.codigo}">${sede.descripcion}</option>`);
html += htmlSedes; html += htmlSedes;
$(selectorName).html(html); $(selectorName).html(html).select2();
$('.select-search').select2();
}); });
} }
function listarConceptos(selectorName) { function listarConceptos(selectorName) {
axios.get(URI_POLICIA_MONTOS_AMANECIDAS).then((response) => { ajaxWebService.get(URI_POLICIA_MONTOS_AMANECIDAS).then((response) => {
let data = response.data; let data = response.data;
data = _.orderBy(data, d => d.descripcion); data = _.orderBy(data, d => d.descripcion);
let html = `<option value="">[TODOS]</option>`; let html = `<option value="">[TODOS]</option>`;
data.forEach(amanecida => htmlConceptos += `<option value="${amanecida.id}">${amanecida.descripcion}</option>`); data.forEach(amanecida => htmlConceptos += `<option value="${amanecida.id}">${amanecida.descripcion}</option>`);
html += htmlConceptos; html += htmlConceptos;
$(selectorName).html(html); $(selectorName).html(html).select2();
$('.select-search').select2();
}); });
} }
function buscar() { function buscar() {
debugger debugger
let sede_id = $("#cboSedes").val(); let sede_id = $("#cboSedes").val();
let montoamanecidas_id = $("#cboConceptos").val(); let montoamanecida_id = $("#cboConceptos").val();
let params = { let params = cleanQueryParams({
sede_id, sede_id,
montoamanecidas_id montoamanecida_id
}; });
listarAsignacionesConceptosSede({params}); listarAsignacionesConceptosSede({params});
} }
...@@ -267,7 +265,7 @@ function registrar() { ...@@ -267,7 +265,7 @@ function registrar() {
debugger debugger
axios.post(URI_POLICIA_CONCEPTOSEDES, params) ajaxWebService.post(URI_POLICIA_CONCEPTOSEDES, params)
.then((response) => { .then((response) => {
listarAsignacionesConceptosSede(); listarAsignacionesConceptosSede();
}); });
...@@ -277,7 +275,6 @@ function registrar() { ...@@ -277,7 +275,6 @@ function registrar() {
$().ready(function () { $().ready(function () {
defaultConfigDataTable();
listarSedes("#cboSedes"); listarSedes("#cboSedes");
listarConceptos("#cboConceptos"); listarConceptos("#cboConceptos");
$("#btnVerTodos").click(listarAsignacionesConceptosSede); $("#btnVerTodos").click(listarAsignacionesConceptosSede);
......
src/main/webapp/vistas/mantenimientoSede.jsp
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<div class="text-center"> <div class="text-center">
<button class="btn btn-primary" id="btnFiltro"><i class="fa fa-search"></i> Ver sede</button>&nbsp; <button class="btn btn-primary" id="btnFiltro"><i class="fa fa-search"></i> Aplicar Filtro</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="btnVerTodos"><i class="fa fa-search"></i>Mostrar todos</button>&nbsp;
</div> </div>
</div> </div>
...@@ -62,12 +62,10 @@ ...@@ -62,12 +62,10 @@
<%@include file="templates/footer-body.jsp"%> <%@include file="templates/footer-body.jsp"%>
<!--js de la pagina--> <!--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/interactions.min.js"></script>
<script src="../plantilla/assets/js/core/libraries/jquery_ui/widgets.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/sweetalert2.min.js" type="text/javascript"></script>
<script src="../js/lib/lodash.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="../js/lib/bootstrap-select/bootstrap-select.min.js"></script> <script src="../js/lib/bootstrap-select/bootstrap-select.min.js"></script>
<script src="../plantilla/assets/js/plugins/forms/selects/select2.min.js"></script> <script src="../plantilla/assets/js/plugins/forms/selects/select2.min.js"></script>
<script src="../js/pages/mantenimiento_sede.js" type="text/javascript"></script> <script src="../js/pages/mantenimiento_sede.js" type="text/javascript"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment