Merge branch 'dev/ui-papeles-impresion' into 'main'

Cambiado Swal y referencia propia del CSS

See merge request jjimenez/safekat!48
This commit is contained in:
Ignacio Martinez Navajas
2023-08-11 16:02:07 +00:00
3 changed files with 7 additions and 30 deletions

View File

@ -231,16 +231,9 @@
]
} );
editor.on( 'initCreate', function () {
if ($('#tableOfPapelimpresiontipologias').DataTable().data().count() >= 3){
Swal.fire({
title: '<?= lang('Basic.global.sweet.maxRowsReached') ?>',
icon: 'info',
confirmButtonColor: '#3085d6',
confirmButtonText: '<?= lang('Basic.global.Close') ?>',
});
popErrorAlert(<?= lang('Basic.global.sweet.maxRowsReached') ?>);
}
} );
@ -495,11 +488,7 @@
yeniden(json.<?= csrf_token() ?>);
if(json.error){
document.getElementById("check_" + json.data.papel_impresion_id).checked = false;
Swal.fire({
icon: 'error',
title: '<?= lang('Basic.global.sweet.error_tittle') ?>',
text: json.error,
});
popErrorAlert(json.error);
}
});
@ -511,8 +500,7 @@
.submit();
} );
// Para los calculos del precio
// Calculos del precio
$("#ancho").on('input', function () {
updateValue();
});
@ -546,22 +534,14 @@
$('#precioPliego').val(value2);
}
<?= $this->endSection() ?>
<?=$this->section('css') ?>
<?php /*
<link rel="stylesheet" href="<?= site_url('themes/vuexy/ccs/datatables-editor/editor.dataTables.min.css') ?>">
-*/ ?>
<link rel="stylesheet" href="https://editor.datatables.net/extensions/Editor/css/editor.dataTables.min.css">
<link rel="stylesheet" href="<?= site_url('themes/vuexy/css/datatables-editor/editor.dataTables.min.css') ?>">
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.2.3/css/buttons.bootstrap5.min.css">
<?=$this->endSection() ?>
<?= $this->section('additionalExternalJs') ?>
<script src="https://cdn.datatables.net/buttons/2.2.3/js/dataTables.buttons.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.2.3/js/buttons.bootstrap5.min.js"></script>
@ -570,8 +550,6 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.0/jszip.min.js" integrity="sha512-xcHCGC5tQ0SHlRX8Anbz6oy/OullASJkEhb4gjkneVpGE3/QGYejf14CUO5n5q5paiHfRFTa9HKgByxzidw2Bw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.5/pdfmake.min.js" integrity="sha512-rDbVu5s98lzXZsmJoMa0DjHNE+RwPJACogUCLyq3Xxm2kJO6qsQwjbE5NDk2DqmlKcxDirCnU1wAzVLe12IM3w==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.5/vfs_fonts.js" integrity="sha512-cktKDgjEiIkPVHYbn8bh/FEyYxmt4JDJJjOCu5/FQAkW4bc911XtKYValiyzBiJigjVEvrIAyQFEbRJZyDA1wQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="<?= site_url('themes/vuexy/js/datatables-editor/dataTables.editor.js') ?>"></script>
<?=$this->endSection() ?>

View File

@ -66,8 +66,7 @@
lengthMenu: [ 5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500 ],
pageLength: 10,
lengthChange: true,
"dom": 'lfBrtip', // 'lfBrtip', // you can try different layout combinations by uncommenting one or the other
// "dom": '<"top"lf><"clear">rt<"bottom"ipB><"clear">', // remember to comment this line if you uncomment the above
"dom": 'lfBrtip',
"buttons": [
'copy', 'csv', 'excel', 'print', {
extend: 'pdfHtml5',

View File

@ -115,7 +115,7 @@
theTable.row($(row)).invalidate().draw();
popSuccessAlert(data.msg ?? jqXHR.statusText);
}).fail((jqXHR, textStatus, errorThrown) => {
popErrorAlert(jqXHR.responseJSON.messages.error)
popErrorAlert(jqXHR.responseJSON.messages.error);
})
}
});