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

filtros columna en pedidos hecho

Browse Source
This commit is contained in:
Jaime Jiménez
2024-08-05 17:59:00 +02:00
parent d4373a401f
commit 4255b74f33
2 changed files with 59 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ci4/app/Models/Pedidos/PedidoLineaModel.php
View File

@ -14,12 +14,20 @@ class PedidoLineaModel extends \App\Models\BaseModel
protected $useAutoIncrement = true; protected $useAutoIncrement = true;
const SORTABLE = [ const SORTABLE = [
0 => "t1.id", 0 => "t2.id",
1 => "t1.estado", 1 => "t2.updated_at",
2 => "t1.total_precio", 2 => "t2.fecha_entrega_real",
3 => "t1.total_tirada", 3 => "t4.nombre",
4 => "CONCAT(t5.first_name, ' ', t5.last_name)",
5 => "t3.titulo",
6 => "t6.nombre",
7 => "t3.inc_rei",
8 => "t3.paginas",
9 => "t3.tirada",
10 => "t3.total_aceptado",
11 => "t2.estado"
]; ];
protected $allowedFields = [ protected $allowedFields = [
"pedido_id", "pedido_id",
"presupuesto_id", "presupuesto_id",
@ -40,7 +48,7 @@ class PedidoLineaModel extends \App\Models\BaseModel
public static $labelField = "id"; public static $labelField = "id";
public function getResource(string $search = "", $estado="") public function getResource($search = [], $estado="")
{ {
$builder = $this->db $builder = $this->db
->table($this->table . " t1") ->table($this->table . " t1")
@ -67,14 +75,22 @@ class PedidoLineaModel extends \App\Models\BaseModel
} }
} }
// Falta implementar la busqueda por grupos if (empty($search))
return empty($search) return $builder;
? $builder else {
: $builder $builder->groupStart();
->groupStart() foreach ($search as $col_search) {
->like("t1.id", $search) if ($col_search[0] != 1 && $col_search[0] != 2)
->orLike("t1.id", $search) $builder->like(self::SORTABLE[$col_search[0]], $col_search[2]);
->groupEnd(); else {
$dates = explode(" ", $col_search[2]);
$builder->where(self::SORTABLE[$col_search[0]] . ">=", $dates[0]);
$builder->where(self::SORTABLE[$col_search[0]] . "<=", $dates[1]);
}
}
$builder->groupEnd();
return $builder;
}
} }

42
ci4/app/Views/themes/vuexy/form/pedidos/viewPedidosList.php
View File

@ -17,7 +17,7 @@
<tr> <tr>
<th><?= lang('Pedidos.id') ?></th> <th><?= lang('Pedidos.id') ?></th>
<th><?= lang('Pedidos.fecha') ?></th> <th><?= lang('Pedidos.fecha') ?></th>
<th class='noFilter'><?= lang('Pedidos.fecha_entrega') ?></th> <th><?= lang('Pedidos.fecha_entrega') ?></th>
<th><?= lang('Pedidos.cliente') ?></th> <th><?= lang('Pedidos.cliente') ?></th>
<th><?= lang('Pedidos.comercial') ?></th> <th><?= lang('Pedidos.comercial') ?></th>
<th><?= lang('Pedidos.titulo') ?></th> <th><?= lang('Pedidos.titulo') ?></th>
@ -27,7 +27,7 @@
<th><?= lang('Pedidos.tiradas') ?></th> <th><?= lang('Pedidos.tiradas') ?></th>
<th><?= lang('Pedidos.total_presupuesto') ?></th> <th><?= lang('Pedidos.total_presupuesto') ?></th>
<th><?= lang('Pedidos.estado') ?></th> <th><?= lang('Pedidos.estado') ?></th>
<th class="text-nowrap"><?= lang('Basic.global.Action') ?></th> <th class="noFilter text-nowrap"><?= lang('Basic.global.Action') ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -62,9 +62,10 @@ $('#tableOfPedidos thead tr').clone(true).appendTo('#tableOfPedidos thead');
$('#tableOfPedidos thead tr:eq(1) th').each(function (i) { $('#tableOfPedidos thead tr:eq(1) th').each(function (i) {
if (!$(this).hasClass("noFilter")) { if (!$(this).hasClass("noFilter")) {
var title = $(this).text(); var title = $(this).text();
if(i==1){ if(i==1 || i==2){
$(this).html('<input id="bs-rangepicker-range" type="text" class="form-control " style="min-width:100px;max-width:120px;font-size:0.8rem !important;" />'); name = 'bs-rangepicker-range_' + i;
var bsRangePickerRange = $('#bs-rangepicker-range') $(this).html('<input id="'+name+'" type="text" class="form-control " style="min-width:100px;max-width:120px;font-size:0.8rem !important;" />');
var bsRangePickerRange = $('#' + name);
bsRangePickerRange.daterangepicker({ bsRangePickerRange.daterangepicker({
ranges: { ranges: {
'<?= lang('datePicker.hoy') ?>': [moment(), moment()], '<?= lang('datePicker.hoy') ?>': [moment(), moment()],
@ -106,6 +107,27 @@ $('#tableOfPedidos thead tr:eq(1) th').each(function (i) {
}); });
} }
else if (i == 11) {
// Agregar un selector en la tercera columna
$(this).html('<select class="form-control" style="min-width:100px;max-width:120px;font-size:0.8rem !important;"></select>');
// Agregar opciones al selector
var selector = $('select', this);
selector.append('<option value="">Todos</option>'); // Opción vacía
selector.append('<option value="validacion"><?= lang('Pedidos.validacion') ?></option>');
selector.append('<option value="produccion"><?= lang('Pedidos.produccion') ?></option>');
selector.append('<option value="finalizado"><?= lang('Pedidos.finalizado') ?></option>');
selector.append('<option value="enviado"><?= lang('Pedidos.enviado') ?></option>');
selector.append('<option value="cancelado"><?= lang('Pedidos.cancelado') ?></option>');
selector.on('change', function () {
var val = $.fn.dataTable.util.escapeRegex(
$(this).val()
);
theTable.column(i).search(val).draw();
});
}
else{ else{
$(this).html('<input type="text" class="form-control " style="min-width:100px;max-width:120px;font-size:0.8rem !important;" />'); $(this).html('<input type="text" class="form-control " style="min-width:100px;max-width:120px;font-size:0.8rem !important;" />');
@ -212,15 +234,9 @@ $('#tableOfPedidos thead tr:eq(1) th').each(function (i) {
}); });
theTable.on( 'draw.dt', function () { theTable.on( 'draw.dt', function () {
//const boolCols = []; const dateCols = [1,2];
const dateCols = [1];
const priceCols = [10]; const priceCols = [10];
/*for (let coln of boolCols) {
theTable.column(coln, { page: 'current' }).nodes().each( function (cell, i) {
cell.innerHTML = cell.innerHTML == '1' ? '<i class="ti ti-check"></i>' : '';
});
}*/
for (let coln of dateCols) { for (let coln of dateCols) {
theTable.column(coln, { page: 'current' }).nodes().each( function (cell, i) { theTable.column(coln, { page: 'current' }).nodes().each( function (cell, i) {
const datestr = cell.innerHTML; const datestr = cell.innerHTML;