diff --git a/ci4/app/Language/en/Presupuestos.php b/ci4/app/Language/en/Presupuestos.php index 6c0706cf..3442f0a4 100644 --- a/ci4/app/Language/en/Presupuestos.php +++ b/ci4/app/Language/en/Presupuestos.php @@ -58,6 +58,9 @@ return [ 'retractilado5' => 'Shrink-wrapping in packs of 5', 'Guardas' => 'Endpapers', 'fajaColor' => 'Print color band ', + 'cubierta' => 'Cover', + 'sobrecubierta' => 'Dust jacket', + 'encuadernacion' => 'Binding', /* '4x0' => '4x0', '4x4' => '4x4', diff --git a/ci4/app/Language/es/Presupuestos.php b/ci4/app/Language/es/Presupuestos.php index 39743e9b..44429022 100644 --- a/ci4/app/Language/es/Presupuestos.php +++ b/ci4/app/Language/es/Presupuestos.php @@ -78,7 +78,9 @@ return [ 'totalTinta' => 'Total tinta', 'totalCorte' => 'Total corte', 'total' => 'Total', - + 'cubierta' => 'Cubierta', + 'sobrecubierta' => 'Sobrecubierta', + 'encuadernacion' => 'Encuadernación', /* '4x0' => '4x0', '4x4' => '4x4', diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php index a58df93d..5ef9c22b 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php @@ -67,12 +67,12 @@ -
+

- +
+
+
+
+ +
+
+ +
+
+
+
+
+

- +
+
+ + +
+
+
+ + + \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php new file mode 100644 index 00000000..37982a92 --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php @@ -0,0 +1,33 @@ +
+
+

+ +

+ +
+
+
+
+ + + +
+
+
+
+
+
\ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/comparador.js b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/comparador.js index 5e0fe188..cae85a3a 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/comparador.js +++ b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/comparador.js @@ -34,13 +34,13 @@ $('.accordion-button').on('click', function (e) { function init_comparador() { updatePapelesComparador(); const paginasColor = document.getElementById('compCalPaginasColor'); - if(paginasColor.value.length >0){ + if (paginasColor.value.length > 0) { computarPaginasColor(paginasColor.value); } } -function computarPaginasColor(string){ +function computarPaginasColor(string) { const numbers = []; for (const [, beginStr, endStr] of string.matchAll(/(\d+)(?:-(\d+))?/g)) { @@ -48,8 +48,8 @@ function computarPaginasColor(string){ numbers.push(begin); if (endStr !== undefined) { for (let num = begin + 1; num <= end; num++) { - numbers.push(num); - } + numbers.push(num); + } } } calPagesTextarea = document.getElementById('compCalPaginasColor'); @@ -58,7 +58,7 @@ function computarPaginasColor(string){ } function checkRetractiladoComparador(element) { - + switch (element.id) { case 'compRetractilado': if (document.getElementById(element.id).checked) { @@ -79,18 +79,40 @@ function checkRetractiladoComparador(element) { function updatePapelesComparador() { var e = document.getElementById("tipoImpresion"); - elements = document.getElementsByClassName('comp-color-selected'); + elements_negro = document.getElementsByClassName('comp-negro-selected'); + elements_color = document.getElementsByClassName('comp-color-selected'); + elements_bicolor = document.getElementsByClassName('comp-bicolor-selected'); switch (e.value) { case "negro": case "negrohq": - Array.from(elements).forEach(element => { + Array.from(elements_color).forEach(element => { element.style.display = "none"; }); + Array.from(elements_bicolor).forEach(element => { + element.style.display = "none"; + }); + Array.from(elements_negro).forEach(element => { + element.style.display = "flex"; + }); break; case "color": case "colorhq": + Array.from(elements_negro).forEach(element => { + element.style.display = "flex"; + }); + Array.from(elements_color).forEach(element => { + element.style.display = "flex"; + }); + break; + case "bicolor": - Array.from(elements).forEach(element => { + Array.from(elements_negro).forEach(element => { + element.style.display = "none"; + }); + Array.from(elements_color).forEach(element => { + element.style.display = "none"; + }); + Array.from(elements_bicolor).forEach(element => { element.style.display = "flex"; }); break; @@ -100,4 +122,6 @@ function updatePapelesComparador() { } + + } diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php index eb4122c7..185b495e 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php @@ -16,6 +16,7 @@ getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> +
endSection() ?> @@ -155,15 +168,6 @@ language: { url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" }, - "columnDefs": [{ - targets : '_all', - className: "dt-head-center" - }, - { - targets : '_all', - className: "dt-body-center" - } - ], }); @@ -173,17 +177,31 @@ paging: false, info: false, ordering: false, + responsive: true, language: { url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" }, }); - var tableCompIntCubiertaSobrecubierta = new DataTable('#tableCompCubiertaSobrecubierta',{ + var tableCompIntCubierta = new DataTable('#tableCompCubierta',{ scrollX: true, searching: false, paging: false, info: false, ordering: false, + responsive: true, + language: { + url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" + }, + }); + + var tableCompIntSobrecubierta = new DataTable('#tableCompSobrecubierta',{ + scrollX: true, + searching: false, + paging: false, + info: false, + ordering: false, + responsive: true, language: { url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" }, diff --git a/httpdocs/themes/vuexy/css/sk-datatables.css b/httpdocs/themes/vuexy/css/sk-datatables.css index 2901e5cb..00678af4 100644 --- a/httpdocs/themes/vuexy/css/sk-datatables.css +++ b/httpdocs/themes/vuexy/css/sk-datatables.css @@ -1,22 +1,22 @@ - /* Overwrite datatables styles */ -table.dataTable.table-striped > tbody > tr.odd.selected > * { +table.dataTable.table-striped>tbody>tr.odd.selected>* { box-shadow: inset 0 0 0 9999px rgba(13, 110, 253, 0.5); } -table.dataTable > tbody > tr.selected > * { +table.dataTable>tbody>tr.selected>* { box-shadow: inset 0 0 0 9999px rgba(13, 110, 253, 0.5); color: white; } -table.dataTable.table-hover > tbody > tr.selected:hover > * { +table.dataTable.table-hover>tbody>tr.selected:hover>* { box-shadow: inset 0 0 0 9999px rgba(13, 110, 253, 0.65); } -.comparator-table th, .comparator-table td { +.comparator-table th, +.comparator-table td { padding-left: 0.6em; - padding-right: 0.6em; + padding-right: 0.6em; } @@ -24,10 +24,20 @@ table.dataTable.table-hover > tbody > tr.selected:hover > * { font-size: 0.65em; } -.comparator-table th{ +.comparator-table th { font-size: 0.6em; } +.comparator-table td.dt-result { + font-size: 0.9em; + font-weight: bold; + text-transform: uppercase; +} +.comparator-table td.dt-result-text { + text-align: right; +} - +.comparator-table td.dt-result-value { + text-align: left; +} \ No newline at end of file