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

añadidos los ficheros de papel impresion margenes. Faltan rutas y js del formulario

Browse Source
This commit is contained in:
Jaime Jimenez
2023-08-21 18:36:56 +02:00
parent aab3b89cfc
commit 71044d1e14
9 changed files with 800 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
ci4/app/Models/Configuracion/PapelImpresionModel.php
View File

@ -21,35 +21,7 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
5 => "t1.cubierta",
6 => "t1.sobrecubierta",
7 => "t1.rotativa",
8 => "t1.isActivo",
/*1 => "t1.id",
2 => "t1.papel_generico_id",
3 => "t1.nombre",
4 => "t1.defecto",
5 => "t1.referencia",
6 => "t1.ancho",
7 => "t1.alto",
8 => "t1.mano",
9 => "t1.espesor",
10 => "t1.gramaje",
11 => "t1.precio_tonelada",
12 => "t1.margen",
13 => "t1.peso_por_pliego",
14 => "t1.precio_pliego",
15 => "t1.bn",
16 => "t1.color",
17 => "t1.portada",
18 => "t1.cubierta",
19 => "t1.rotativa",
20 => "t2.nombre",*/
];
const SORTABLE2 = [
0 => "t1.defecto",
1 => "t1.nombre",
2 => "t1.gramaje",
8 => "t1.isActivo"
];
@ -58,15 +30,10 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
"nombre",
"defecto",
"referencia",
"ancho",
"alto",
"mano",
"espesor",
"gramaje",
"precio_tonelada",
"margen",
"peso_por_pliego",
"precio_pliego",
"bn",
"color",
"cubierta",
@ -89,14 +56,6 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
public static $labelField = "nombre";
protected $validationRules = [
"alto" => [
"label" => "PapelImpresion.alto",
"rules" => "required|decimal",
],
"ancho" => [
"label" => "PapelImpresion.ancho",
"rules" => "required|decimal",
],
"espesor" => [
"label" => "PapelImpresion.espesor",
"rules" => "required|decimal",
@ -109,22 +68,10 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
"label" => "PapelImpresion.mano",
"rules" => "required|decimal",
],
"margen" => [
"label" => "PapelImpresion.margen",
"rules" => "required|max_length[31]",
],
"nombre" => [
"label" => "PapelImpresion.nombre",
"rules" => "trim|required|max_length[255]",
],
"peso_por_pliego" => [
"label" => "PapelImpresion.pesoPorPliego",
"rules" => "required|decimal",
],
"precio_pliego" => [
"label" => "PapelImpresion.precioPliego",
"rules" => "required|decimal",
],
"precio_tonelada" => [
"label" => "PapelImpresion.precioTonelada",
"rules" => "required|decimal",
@ -136,14 +83,6 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
];
protected $validationMessages = [
"alto" => [
"decimal" => "PapelImpresion.validation.alto.decimal",
"required" => "PapelImpresion.validation.alto.required",
],
"ancho" => [
"decimal" => "PapelImpresion.validation.ancho.decimal",
"required" => "PapelImpresion.validation.ancho.required",
],
"espesor" => [
"decimal" => "PapelImpresion.validation.espesor.decimal",
"required" => "PapelImpresion.validation.espesor.required",
@ -156,22 +95,10 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
"decimal" => "PapelImpresion.validation.mano.decimal",
"required" => "PapelImpresion.validation.mano.required",
],
"margen" => [
"max_length" => "PapelImpresion.validation.margen.max_length",
"required" => "PapelImpresion.validation.margen.required",
],
"nombre" => [
"max_length" => "PapelImpresion.validation.nombre.max_length",
"required" => "PapelImpresion.validation.nombre.required",
],
"peso_por_pliego" => [
"decimal" => "PapelImpresion.validation.peso_por_pliego.decimal",
"required" => "PapelImpresion.validation.peso_por_pliego.required",
],
"precio_pliego" => [
"decimal" => "PapelImpresion.validation.precio_pliego.decimal",
"required" => "PapelImpresion.validation.precio_pliego.required",
],
"precio_tonelada" => [
"decimal" => "PapelImpresion.validation.precio_tonelada.decimal",
"required" => "PapelImpresion.validation.precio_tonelada.required",
@ -215,7 +142,10 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.nombre AS nombre, t1.defecto AS defecto, t1.referencia AS referencia, t1.ancho AS ancho, t1.alto AS alto, t1.mano AS mano, t1.espesor AS espesor, t1.gramaje AS gramaje, t1.precio_tonelada AS precio_tonelada, t1.margen AS margen, t1.peso_por_pliego AS peso_por_pliego, t1.precio_pliego AS precio_pliego, t1.bn AS bn, t1.color AS color, t1.cubierta AS cubierta, t1.sobrecubierta AS sobrecubierta, t1.rotativa AS rotativa, t1.isActivo AS isActivo, t2.nombre AS papel_generico_id"
"t1.id AS id, t1.nombre AS nombre, t1.defecto AS defecto, t1.referencia AS referencia, t1.mano AS mano,
t1.espesor AS espesor, t1.gramaje AS gramaje, t1.precio_tonelada AS precio_tonelada,
t1.bn AS bn, t1.color AS color, t1.cubierta AS cubierta, t1.sobrecubierta AS sobrecubierta, t1.rotativa AS rotativa,
t1.isActivo AS isActivo, t2.nombre AS papel_generico_id"
);
$builder->join("lg_papel_generico t2", "t1.papel_generico_id = t2.id", "left");