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

algunos cambios de nomenclatura en la bbdd de papeles impresion

Browse Source
This commit is contained in:
Jaime Jiménez
2023-06-27 14:36:15 +02:00
parent a9ea464b05
commit 38dd7cdadf
6 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ci4/app/Entities/Configuracion/PapelImpresion.php
View File

@ -22,8 +22,8 @@ class PapelImpresion extends \CodeIgniter\Entity\Entity
"precio_pliego" => null, "precio_pliego" => null,
"bn" => true, "bn" => true,
"color" => true, "color" => true,
"portada" => false,
"cubierta" => false, "cubierta" => false,
"sobrecubierta" => false,
"rotativa" => false, "rotativa" => false,
"is_deleted" => 0, "is_deleted" => 0,
"created_at" => null, "created_at" => null,
@ -42,8 +42,8 @@ class PapelImpresion extends \CodeIgniter\Entity\Entity
"precio_pliego" => "float", "precio_pliego" => "float",
"bn" => "boolean", "bn" => "boolean",
"color" => "boolean", "color" => "boolean",
"portada" => "boolean",
"cubierta" => "boolean", "cubierta" => "boolean",
"sobrecubierta" => "boolean",
"rotativa" => "boolean", "rotativa" => "boolean",
"is_deleted" => "int", "is_deleted" => "int",
]; ];

2
ci4/app/Language/en/PapelImpresion.php
View File

@ -9,6 +9,7 @@ return [
'color' => 'Colour', 'color' => 'Colour',
'createdAt' => 'Created At', 'createdAt' => 'Created At',
'cubierta' => 'Cover', 'cubierta' => 'Cover',
'sobrecubierta' => 'Dust jacket',
'defecto' => 'Default', 'defecto' => 'Default',
'deletedAt' => 'Deleted At', 'deletedAt' => 'Deleted At',
'espesor' => 'Thickness', 'espesor' => 'Thickness',
@ -25,7 +26,6 @@ return [
'papelesImpresion' => 'Print papers', 'papelesImpresion' => 'Print papers',
'papelesimpresion' => 'Print papers', 'papelesimpresion' => 'Print papers',
'pesoPorPliego' => 'Weight per sheet', 'pesoPorPliego' => 'Weight per sheet',
'portada' => 'Cover',
'precioPliego' => 'Sheet price', 'precioPliego' => 'Sheet price',
'precioTonelada' => 'Ton price', 'precioTonelada' => 'Ton price',
'referencia' => 'Reference', 'referencia' => 'Reference',

2
ci4/app/Language/es/PapelImpresion.php
View File

@ -9,6 +9,7 @@ return [
'color' => 'Color', 'color' => 'Color',
'createdAt' => 'Creado en', 'createdAt' => 'Creado en',
'cubierta' => 'Cubierta', 'cubierta' => 'Cubierta',
'sobrecubierta' => 'Sobrecubierta',
'defecto' => 'Por defecto', 'defecto' => 'Por defecto',
'deletedAt' => 'Borrado en', 'deletedAt' => 'Borrado en',
'espesor' => 'Espesor', 'espesor' => 'Espesor',
@ -25,7 +26,6 @@ return [
'papelesImpresion' => 'Papeles Impresion', 'papelesImpresion' => 'Papeles Impresion',
'papelesimpresion' => 'Papeles Impresion', 'papelesimpresion' => 'Papeles Impresion',
'pesoPorPliego' => 'Peso Por Pliego', 'pesoPorPliego' => 'Peso Por Pliego',
'portada' => 'Portada',
'precioPliego' => 'Precio Pliego', 'precioPliego' => 'Precio Pliego',
'precioTonelada' => 'Precio Tonelada', 'precioTonelada' => 'Precio Tonelada',
'referencia' => 'Referencia', 'referencia' => 'Referencia',

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

@ -63,8 +63,8 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
"precio_pliego", "precio_pliego",
"bn", "bn",
"color", "color",
"portada",
"cubierta", "cubierta",
"sobrecubierta",
"rotativa", "rotativa",
"isActivo", "isActivo",
"deleted_at", "deleted_at",
@ -84,95 +84,95 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
protected $validationRules = [ protected $validationRules = [
"alto" => [ "alto" => [
"label" => "PapelImpresions.alto", "label" => "PapelImpresion.alto",
"rules" => "required|decimal", "rules" => "required|decimal",
], ],
"ancho" => [ "ancho" => [
"label" => "PapelImpresions.ancho", "label" => "PapelImpresion.ancho",
"rules" => "required|decimal", "rules" => "required|decimal",
], ],
"espesor" => [ "espesor" => [
"label" => "PapelImpresions.espesor", "label" => "PapelImpresion.espesor",
"rules" => "required|decimal", "rules" => "required|decimal",
], ],
"gramaje" => [ "gramaje" => [
"label" => "PapelImpresions.gramaje", "label" => "PapelImpresion.gramaje",
"rules" => "required|decimal", "rules" => "required|decimal",
], ],
"mano" => [ "mano" => [
"label" => "PapelImpresions.mano", "label" => "PapelImpresion.mano",
"rules" => "required|decimal", "rules" => "required|decimal",
], ],
"margen" => [ "margen" => [
"label" => "PapelImpresions.margen", "label" => "PapelImpresion.margen",
"rules" => "required|max_length[31]", "rules" => "required|max_length[31]",
], ],
"nombre" => [ "nombre" => [
"label" => "PapelImpresions.nombre", "label" => "PapelImpresion.nombre",
"rules" => "trim|required|max_length[255]", "rules" => "trim|required|max_length[255]",
], ],
"peso_por_pliego" => [ "peso_por_pliego" => [
"label" => "PapelImpresions.pesoPorPliego", "label" => "PapelImpresion.pesoPorPliego",
"rules" => "required|decimal", "rules" => "required|decimal",
], ],
"precio_pliego" => [ "precio_pliego" => [
"label" => "PapelImpresions.precioPliego", "label" => "PapelImpresion.precioPliego",
"rules" => "required|decimal", "rules" => "required|decimal",
], ],
"precio_tonelada" => [ "precio_tonelada" => [
"label" => "PapelImpresions.precioTonelada", "label" => "PapelImpresion.precioTonelada",
"rules" => "required|decimal", "rules" => "required|decimal",
], ],
"referencia" => [ "referencia" => [
"label" => "PapelImpresions.referencia", "label" => "PapelImpresion.referencia",
"rules" => "trim|required|max_length[13]", "rules" => "trim|max_length[13]",
], ],
]; ];
protected $validationMessages = [ protected $validationMessages = [
"alto" => [ "alto" => [
"decimal" => "PapelImpresions.validation.alto.decimal", "decimal" => "PapelImpresion.validation.alto.decimal",
"required" => "PapelImpresions.validation.alto.required", "required" => "PapelImpresion.validation.alto.required",
], ],
"ancho" => [ "ancho" => [
"decimal" => "PapelImpresions.validation.ancho.decimal", "decimal" => "PapelImpresion.validation.ancho.decimal",
"required" => "PapelImpresions.validation.ancho.required", "required" => "PapelImpresion.validation.ancho.required",
], ],
"espesor" => [ "espesor" => [
"decimal" => "PapelImpresions.validation.espesor.decimal", "decimal" => "PapelImpresion.validation.espesor.decimal",
"required" => "PapelImpresions.validation.espesor.required", "required" => "PapelImpresion.validation.espesor.required",
], ],
"gramaje" => [ "gramaje" => [
"decimal" => "PapelImpresions.validation.gramaje.decimal", "decimal" => "PapelImpresion.validation.gramaje.decimal",
"required" => "PapelImpresions.validation.gramaje.required", "required" => "PapelImpresion.validation.gramaje.required",
], ],
"mano" => [ "mano" => [
"decimal" => "PapelImpresions.validation.mano.decimal", "decimal" => "PapelImpresion.validation.mano.decimal",
"required" => "PapelImpresions.validation.mano.required", "required" => "PapelImpresion.validation.mano.required",
], ],
"margen" => [ "margen" => [
"max_length" => "PapelImpresions.validation.margen.max_length", "max_length" => "PapelImpresion.validation.margen.max_length",
"required" => "PapelImpresions.validation.margen.required", "required" => "PapelImpresion.validation.margen.required",
], ],
"nombre" => [ "nombre" => [
"max_length" => "PapelImpresions.validation.nombre.max_length", "max_length" => "PapelImpresion.validation.nombre.max_length",
"required" => "PapelImpresions.validation.nombre.required", "required" => "PapelImpresion.validation.nombre.required",
], ],
"peso_por_pliego" => [ "peso_por_pliego" => [
"decimal" => "PapelImpresions.validation.peso_por_pliego.decimal", "decimal" => "PapelImpresion.validation.peso_por_pliego.decimal",
"required" => "PapelImpresions.validation.peso_por_pliego.required", "required" => "PapelImpresion.validation.peso_por_pliego.required",
], ],
"precio_pliego" => [ "precio_pliego" => [
"decimal" => "PapelImpresions.validation.precio_pliego.decimal", "decimal" => "PapelImpresion.validation.precio_pliego.decimal",
"required" => "PapelImpresions.validation.precio_pliego.required", "required" => "PapelImpresion.validation.precio_pliego.required",
], ],
"precio_tonelada" => [ "precio_tonelada" => [
"decimal" => "PapelImpresions.validation.precio_tonelada.decimal", "decimal" => "PapelImpresion.validation.precio_tonelada.decimal",
"required" => "PapelImpresions.validation.precio_tonelada.required", "required" => "PapelImpresion.validation.precio_tonelada.required",
], ],
"referencia" => [ "referencia" => [
"max_length" => "PapelImpresions.validation.referencia.max_length", "max_length" => "PapelImpresion.validation.referencia.max_length",
"required" => "PapelImpresions.validation.referencia.required", //"required" => "PapelImpresion.validation.referencia.required",
], ],
]; ];
@ -209,7 +209,7 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
$builder = $this->db $builder = $this->db
->table($this->table . " t1") ->table($this->table . " t1")
->select( ->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.portada AS portada, t1.cubierta AS cubierta, 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.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"
); );
$builder->join("lg_papel_generico t2", "t1.papel_generico_id = t2.id", "left"); $builder->join("lg_papel_generico t2", "t1.papel_generico_id = t2.id", "left");

16
ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php
View File

@ -10,9 +10,9 @@
<div class="mb-3"> <div class="mb-3">
<label for="referencia" class="form-label"> <label for="referencia" class="form-label">
<?= lang('PapelImpresion.referencia') ?>* <?= lang('PapelImpresion.referencia') ?>
</label> </label>
<input type="text" id="referencia" name="referencia" required maxLength="13" class="form-control" value="<?= old('referencia', $papelImpresion->referencia) ?>"> <input type="text" id="referencia" name="referencia" maxLength="13" class="form-control" value="<?= old('referencia', $papelImpresion->referencia) ?>">
</div><!--//.mb-3 --> </div><!--//.mb-3 -->
<div class="mb-3"> <div class="mb-3">
@ -56,9 +56,9 @@
<div class="mb-3"> <div class="mb-3">
<div class="form-check"> <div class="form-check">
<label for="portada" class="form-check-label"> <label for="cubierta" class="form-check-label">
<input type="checkbox" id="portada" name="portada" value="1" class="form-check-input" <?= $papelImpresion->portada == true ? 'checked' : ''; ?>> <input type="checkbox" id="cubierta" name="cubierta" value="1" class="form-check-input" <?= $papelImpresion->cubierta == true ? 'checked' : ''; ?>>
<?= lang('PapelImpresion.portada') ?> <?= lang('PapelImpresion.cubierta') ?>
</label> </label>
</div><!--//.form-check --> </div><!--//.form-check -->
</div><!--//.mb-3 --> </div><!--//.mb-3 -->
@ -152,9 +152,9 @@
<div class="mb-3"> <div class="mb-3">
<div class="form-check"> <div class="form-check">
<label for="cubierta" class="form-check-label"> <label for="sobrecubierta" class="form-check-label">
<input type="checkbox" id="cubierta" name="cubierta" value="1" class="form-check-input" <?= $papelImpresion->cubierta == true ? 'checked' : ''; ?>> <input type="checkbox" id="sobrecubierta" name="sobrecubierta" value="1" class="form-check-input" <?= $papelImpresion->sobrecubierta == true ? 'checked' : ''; ?>>
<?= lang('PapelImpresion.cubierta') ?> <?= lang('PapelImpresion.sobrecubierta') ?>
</label> </label>
</div><!--//.form-check --> </div><!--//.form-check -->
</div><!--//.mb-3 --> </div><!--//.mb-3 -->

4
ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php
View File

@ -22,8 +22,8 @@
<th><?= lang('PapelImpresion.gramaje') ?></th> <th><?= lang('PapelImpresion.gramaje') ?></th>
<th><?= lang('PapelImpresion.bn') ?></th> <th><?= lang('PapelImpresion.bn') ?></th>
<th><?= lang('PapelImpresion.color') ?></th> <th><?= lang('PapelImpresion.color') ?></th>
<th><?= lang('PapelImpresion.portada') ?></th>
<th><?= lang('PapelImpresion.cubierta') ?></th> <th><?= lang('PapelImpresion.cubierta') ?></th>
<th><?= lang('PapelImpresion.sobrecubierta') ?></th>
<th><?= lang('PapelImpresion.rotativa') ?></th> <th><?= lang('PapelImpresion.rotativa') ?></th>
<th><?= lang('PapelImpresion.activo') ?></th> <th><?= lang('PapelImpresion.activo') ?></th>
<th class="text-nowrap"><?= lang('Basic.global.Action') ?></th> <th class="text-nowrap"><?= lang('Basic.global.Action') ?></th>
@ -97,8 +97,8 @@
{ 'data': 'gramaje' }, { 'data': 'gramaje' },
{ 'data': 'bn' }, { 'data': 'bn' },
{ 'data': 'color' }, { 'data': 'color' },
{ 'data': 'portada' },
{ 'data': 'cubierta' }, { 'data': 'cubierta' },
{ 'data': 'sobrecubierta' },
{ 'data': 'rotativa' }, { 'data': 'rotativa' },
{ 'data': 'isActivo' }, { 'data': 'isActivo' },
{ 'data': actionBtns } { 'data': actionBtns }