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

arreglados buscadores de papeles en presupuesto admin

Browse Source
This commit is contained in:
Jaime Jiménez
2025-02-06 00:34:53 +01:00
parent 2a32bc0b80
commit bbe802d2b7
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ci4/app/Controllers/Presupuestos/Presupuestoadmin.php
View File

@ -1116,7 +1116,7 @@ class Presupuestoadmin extends \App\Controllers\BaseResourceController
$tirada); $tirada);
if ($this->request->getGet("q")) { if ($this->request->getGet("q")) {
$query->groupStart() $query->groupStart()
->orLike("lg_papel_generico.nombre", $this->request->getGet("q")) ->orLike("t1.nombre", $this->request->getGet("q"))
->groupEnd(); ->groupEnd();
} }
@ -1180,7 +1180,7 @@ class Presupuestoadmin extends \App\Controllers\BaseResourceController
$tirada); $tirada);
if ($this->request->getGet("q")) { if ($this->request->getGet("q")) {
$query->groupStart() $query->groupStart()
->orLike("lg_papel_impresion.gramaje", $this->request->getGet("q")) ->orLike("t2.gramaje", $this->request->getGet("q"))
->groupEnd(); ->groupEnd();
} }

32
httpdocs/assets/js/safekat/pages/presupuestoAdmin/sections/comparador.js
View File

@ -340,7 +340,9 @@ class Comparador {
}); });
this.papelSobrecubierta.init(); this.papelSobrecubierta.init();
this.gramajeSobrecubierta.init(); this.gramajeSobrecubierta.init();
this.papelSobrecubierta.onChange(() => self.gramajeSobrecubierta.empty()); this.papelSobrecubierta.item.on('select2:select', function() {
self.gramajeSobrecubierta.empty()
});
this.sobrecubierta.on('change', () => { this.sobrecubierta.on('change', () => {
if (this.sobrecubierta.select2('data')[0].id == 1) { if (this.sobrecubierta.select2('data')[0].id == 1) {
if ($('#solapas_sobrecubierta').prop('checked') == false) { if ($('#solapas_sobrecubierta').prop('checked') == false) {
@ -386,14 +388,30 @@ class Comparador {
if (this.tipo_impresion_id == 1 || this.tipo_impresion_id == 3 || this.tipo_impresion_id == 5 || this.tipo_impresion_id == 7) { if (this.tipo_impresion_id == 1 || this.tipo_impresion_id == 3 || this.tipo_impresion_id == 5 || this.tipo_impresion_id == 7) {
this.papelGuardas.init(); this.papelGuardas.init();
this.gramajeGuardas.init(); this.gramajeGuardas.init();
this.papelGuardas.onChange(() => self.gramajeGuardas.empty()); this.papelGuardas.item.on('select2:select', function() {
self.gramajeGuardas.empty()
});
} }
this.papelNegro.onChange(() => self.gramajeNegro.empty()); this.papelNegro.item.on('select2:select', function() {
this.papelNegrohq.onChange(() => self.gramajeNegrohq.empty()); self.gramajeNegro.empty()
this.papelColor.onChange(() => self.gramajeColor.empty()); });
this.papelColorhq.onChange(() => self.gramajeColorhq.empty()); this.papelNegrohq.item.on('select2:select', function() {
this.papelCubierta.onChange(() => self.gramajeCubierta.empty()); self.gramajeNegrohq.empty()
});
this.papelColor.item.on('select2:select', function(){
self.gramajeColor.empty()
});
this.papelColorhq.item.on('select2:select', function() {
self.gramajeColorhq.empty()
});
this.papelCubierta.item.on('select2:select', function() {
self.gramajeCubierta.empty()
});
this.papelFaja.item.on('select2:select', function() {
self.gramajeFaja.empty()
});
this.tipo_impresion.select2({ this.tipo_impresion.select2({