jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'dev/proveedores'

Browse Source 
# Conflicts:
#   ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaFormItems.php
This commit is contained in:
Jaime Jimenez Ortega
2023-07-15 10:13:37 +00:00
parent 2fca432213 87ff336d30
commit 63dc8cee6a
21 changed files with 895 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php
View File

@ -2,6 +2,7 @@
<?= $this->include("themes/_commonPartialsBs/select2bs5") ?>
<?= $this->include("themes/_commonPartialsBs/sweetalert") ?>
<?= $this->extend('themes/backend/vuexy/main/defaultlayout') ?>
<?= $this->section("content") ?>
<div class="row">
<div class="col-12">
@ -9,21 +10,21 @@
<div class="card-header">
<h3 class="card-title"><?= $boxTitle ?? $pageTitle ?></h3>
</div><!--//.card-header -->
<form id="maquinaForm" method="post" action="<?= $formAction ?>">
<form id="maquinaForm" class="card-body" method="post" action="<?= $formAction ?>">
<?= csrf_field() ?>
<div class="card-body">
<?= view("themes/_commonPartialsBs/_alertBoxes") ?>
<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
<?= view("themes/backend/vuexy/form/configuracion/maquinas/_maquinaFormItems") ?>
</div><!-- /.card-body -->
<div class="card-footer">
<input type="submit"
class="btn btn-primary float-start me-sm-3 me-1"
name="save"
value="<?= lang("Basic.global.Save") ?>"
/>
<?= anchor(route_to("maquinaList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary float-start"]) ?>
</div><!-- /.card-footer -->
<div class="card-body">
<?= view("themes/_commonPartialsBs/_alertBoxes") ?>
<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
<?= view("themes/backend/vuexy/form/configuracion/maquinas/_maquinaFormItems") ?>
</div><!-- /.card-body -->
<div class="py-4">
<input type="submit"
class="btn btn-primary float-start me-sm-3 me-1"
name="save"
value="<?= lang("Basic.global.Save") ?>"
/>
<?= anchor(route_to("maquinaList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary float-start"]) ?>
</div><!-- /.card-footer -->
</form>
</div><!-- //.card -->
</div><!--//.col -->
@ -36,7 +37,7 @@
<div class="card accordion-item active">
<h2 class="accordion-header" id="headingOne">
<button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionTip1" aria-expanded="false" aria-controls="accordionTip1">
<p><?= lang("MaquinasTarifasImpresions.moduleTitle") ?></p>
<h3><?= lang("MaquinasTarifasImpresions.moduleTitle") ?></h3>
</button>
</h2>
@ -68,13 +69,12 @@
<div class="card accordion-item active">
<h2 class="accordion-header" id="headingOne">
<button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionTip2" aria-expanded="false" aria-controls="accordionTip2">
<p><?= lang("MaquinasTarifasImpresions.moduleTitle") ?></p>
<h3><?= lang("MaquinasTarifasImpresions.moduleTitle") ?></h3>
</button>
</h2>
<div id="accordionTip2" class="accordion-collapse collapse show" data-bs-parent="#accordianPapelesImpresion">
<div class="accordion-body">
<table id="tableOfPapelesImpresion" class="table table-striped table-hover" style="width: 100%;">
<thead>
<tr>
@ -174,7 +174,6 @@
});
$('#padreId').select2({
theme: 'bootstrap-5',
allowClear: false,
ajax: {
url: '<?= route_to("menuItemsOfMaquinas") ?>',
@ -365,7 +364,7 @@
searching: false,
paging: true,
info: false,
dom: "Blt",
dom: '<"mt-4"><"float-end"B><"float-start"l><t>', //"Blt",
ajax : $.fn.dataTable.pipeline( {
url: '<?= route_to('dataTableOfMaquinasTarifasImpresion') ?>',
data: {