trabajando tabla tiradas!

2025-07-25 22:52:08 +00:00 · 2023-08-09 09:58:11 +02:00
parent 80cc5abe4a
commit 7a4891af63
21 changed files with 542 additions and 126 deletions
--- a/ci4/app/Models/Tarifas/TarifaAcabadoLineaModel.php
+++ b/ci4/app/Models/Tarifas/TarifaAcabadoLineaModel.php
@ -13,16 +13,16 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
    protected $useAutoIncrement = true;

    const SORTABLE = [
-        0 => "t1.paginas_min",
-        1 => "t1.paginas_max",
+        0 => "t1.tirada_min",
+        1 => "t1.tirada_max",
        2 => "t1.precio_min",
        3 => "t1.precio_max",
        4 => "t1.margen",
    ];

    protected $allowedFields = [
-        "paginas_min",
-        "paginas_max",
+        "tirada_min",
+        "tirada_max",
        "precio_min",
        "precio_max",
        "margen",
@ -53,11 +53,11 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
            "label" => "TarifaAcabadoLineas.precioMin",
            "rules" => "required|decimal",
        ],
-        "paginas_max" => [
+        "tirada_max" => [
            "label" => "TarifaAcabadoLineas.tiradaMax",
            "rules" => "required|integer",
        ],
-        "paginas_min" => [
+        "tirada_min" => [
            "label" => "TarifaAcabadoLineas.tiradaMin",
            "rules" => "required|integer",
        ],
@ -80,13 +80,13 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
            "decimal" => "TarifaAcabadoLineas.validation.precio_min.decimal",
            "required" => "TarifaAcabadoLineas.validation.precio_min.required",
        ],
-        "paginas_max" => [
-            "integer" => "TarifaAcabadoLineas.validation.paginas_max.integer",
-            "required" => "TarifaAcabadoLineas.validation.paginas_max.required",
+        "tirada_max" => [
+            "integer" => "TarifaAcabadoLineas.validation.tirada_max.integer",
+            "required" => "TarifaAcabadoLineas.validation.tirada_max.required",
        ],
-        "paginas_min" => [
-            "integer" => "TarifaAcabadoLineas.validation.paginas_min.integer",
-            "required" => "TarifaAcabadoLineas.validation.paginas_min.required",
+        "tirada_min" => [
+            "integer" => "TarifaAcabadoLineas.validation.tirada_min.integer",
+            "required" => "TarifaAcabadoLineas.validation.tirada_min.required",
        ],
        "margen" => [
            "integer" => "TarifaAcabadoLineas.validation.margen.integer",
@ -131,7 +131,7 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
        $builder = $this->db
            ->table($this->table . " t1")
            ->select(
-                "t1.id AS id, t1.paginas_min AS paginas_min, t1.paginas_max AS paginas_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.margen AS margen, t2.id AS tarifa_acabado"
+                "t1.id AS id, t1.tirada_min AS tirada_min, t1.tirada_max AS tirada_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.margen AS margen, t2.id AS tarifa_acabado"
            );

        //JJO
@ -145,12 +145,12 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
            ? $builder
            : $builder
                ->groupStart()
-                ->like("t1.paginas_min", $search)
-                ->orLike("t1.paginas_max", $search)
+                ->like("t1.tirada_min", $search)
+                ->orLike("t1.tirada_max", $search)
                ->orLike("t1.precio_min", $search)
                ->orLike("t1.precio_max", $search)
-                ->orLike("t1.paginas_min", $search)
-                ->orLike("t1.paginas_max", $search)
+                ->orLike("t1.tirada_min", $search)
+                ->orLike("t1.tirada_max", $search)
                ->orLike("t1.precio_min", $search)
                ->orLike("t1.precio_max", $search)
                ->groupEnd();
@ -172,13 +172,13 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
        
        helper('general');

-        if(floatval($data["paginas_min"])>= floatval($data["paginas_max"])){
-            return lang('TarifaAcabadoLineas.validation.error_paginas_range');
+        if(floatval($data["tirada_min"])>= floatval($data["tirada_max"])){
+            return lang('TarifaAcabadoLineas.validation.error_tirada_range');
        }

        $rows = $this->db
            ->table($this->table)
-            ->select("id, paginas_min, paginas_max")
+            ->select("id, tirada_min, tirada_max")
            ->where("is_deleted", 0)
            ->where("tarifa_acabado_id", $id_tarifa_acabado)
            ->get()->getResultObject();
@ -190,9 +190,9 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
                    continue;
                }
            }
-            if(check_overlap(floatval($data["paginas_min"]), floatval($data["paginas_max"]),
-                                $row->paginas_min, $row->paginas_max)){
-                    return lang('TarifaAcabadoLineas.validation.error_paginas_overlap');
+            if(check_overlap(floatval($data["tirada_min"]), floatval($data["tirada_max"]),
+                                $row->tirada_min, $row->tirada_max)){
+                    return lang('TarifaAcabadoLineas.validation.error_tirada_overlap');
            }
        }

--- a/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php
+++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php
@ -20,7 +20,7 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
    ];

    protected $allowedFields = [
-        "tarifa_encuadernacion_id",
+        "tirada_encuadernacion_id",
        "paginas_min",
        "paginas_max",
        "precio_min",
@ -29,7 +29,7 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
        "is_deleted",

    ];
-    protected $returnType = "App\Entities\Tarifas\TarifaManipuladoLinea";
+    protected $returnType = "App\Entities\Tarifas\TarifaEncuadernacionLinea";

    protected $useTimestamps = true;
    protected $useSoftDeletes = false;
@ -38,51 +38,51 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel

    protected $updatedField = "updated_at";

-    public static $labelField = "tarifa_encuadernacion_id";
+    public static $labelField = "tirada_encuadernacion_id";

    protected $validationRules = [
        "precio_max" => [
-            "label" => "TarifaManipuladoLineas.precioMax",
+            "label" => "TarifaEncuadernacionLineas.precioMax",
            "rules" => "required|decimal",
        ],
        "precio_min" => [
-            "label" => "TarifaManipuladoLineas.precioMin",
+            "label" => "TarifaEncuadernacionLineas.precioMin",
            "rules" => "required|decimal",
        ],
        "paginas_max" => [
-            "label" => "TarifaManipuladoLineas.paginasMax",
+            "label" => "TarifaEncuadernacionLineas.paginasMax",
            "rules" => "required|decimal",
        ],
        "paginas_min" => [
-            "label" => "TarifaManipuladoLineas.paginasMin",
+            "label" => "TarifaEncuadernacionLineas.paginasMin",
            "rules" => "required|decimal",
        ],
        "margen" => [
-            "label" => "TarifaManipuladoLineas.margen",
+            "label" => "TarifaEncuadernacionLineas.margen",
            "rules" => "required|decimal",
        ],
    ];

    protected $validationMessages = [
        "precio_max" => [
-            "decimal" => "TarifaManipuladoLineas.validation.precio_max.decimal",
-            "required" => "TarifaManipuladoLineas.validation.precio_max.required",
+            "decimal" => "TarifaEncuadernacionLineas.validation.precio_max.decimal",
+            "required" => "TarifaEncuadernacionLineas.validation.precio_max.required",
        ],
        "precio_min" => [
-            "decimal" => "TarifaManipuladoLineas.validation.precio_min.decimal",
-            "required" => "TarifaManipuladoLineas.validation.precio_min.required",
+            "decimal" => "TarifaEncuadernacionLineas.validation.precio_min.decimal",
+            "required" => "TarifaEncuadernacionLineas.validation.precio_min.required",
        ],
        "paginas_max" => [
-            "decimal" => "TarifaManipuladoLineas.validation.paginas_max.decimal",
-            "required" => "TarifaManipuladoLineas.validation.paginas_max.required",
+            "decimal" => "TarifaEncuadernacionLineas.validation.paginas_max.decimal",
+            "required" => "TarifaEncuadernacionLineas.validation.paginas_max.required",
        ],
        "paginas_min" => [
-            "decimal" => "TarifaManipuladoLineas.validation.paginas_min.decimal",
-            "required" => "TarifaManipuladoLineas.validation.paginas_min.required",
+            "decimal" => "TarifaEncuadernacionLineas.validation.paginas_min.decimal",
+            "required" => "TarifaEncuadernacionLineas.validation.paginas_min.required",
        ],
        "margen" => [
-            "decimal" => "TarifaManipuladoLineas.validation.margen.decimal",
-            "required" => "TarifaManipuladoLineas.validation.margen.required",
+            "decimal" => "TarifaEncuadernacionLineas.validation.margen.decimal",
+            "required" => "TarifaEncuadernacionLineas.validation.margen.required",
        ],
    ];

@ -93,18 +93,18 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
     *
     * @return \CodeIgniter\Database\BaseBuilder
     */
-    public function getResource(string $search = "", $tarifa_encuadernacion_id = -1)
+    public function getResource(string $search = "", $tirada_encuadernacion_id = -1)
    {
        $builder = $this->db
            ->table($this->table . " t1")
            ->select(
-                "t1.id AS id, t1.tarifa_encuadernacion_id AS tarifa_encuadernacion_id, t1.paginas_min AS paginas_min, t1.paginas_max AS paginas_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.margen AS margen, t2.id AS tarifa_encuadernacion"
+                "t1.id AS id, t1.tirada_encuadernacion_id AS tirada_encuadernacion_id, t1.paginas_min AS paginas_min, t1.paginas_max AS paginas_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.margen AS margen, t2.id AS tarifa_encuadernacion"
            );
        //JJO
-        $builder->where('tarifa_encuadernacion_id', $tarifa_encuadernacion_id);    
+        $builder->where('tirada_encuadernacion_id', $tirada_encuadernacion_id);    
        $builder->where("t1.is_deleted", 0);

-        $builder->join("tarifa_encuadernacion t2", "t1.tarifa_encuadernacion_id = t2.id", "left");
+        $builder->join("tarifa_encuadernacion_tiradas    t2", "t1.tirada_encuadernacion_id = t2.id", "left");


        return empty($search)
@ -112,13 +112,13 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
            : $builder
                ->groupStart()
                ->like("t1.id", $search)
-                ->orLike("t1.tarifa_encuadernacion_id", $search)
+                ->orLike("t1.tirada_encuadernacion_id", $search)
                ->orLike("t1.paginas_min", $search)
                ->orLike("t1.paginas_max", $search)
                ->orLike("t1.precio_min", $search)
                ->orLike("t1.precio_max", $search)
                ->orLike("t1.id", $search)
-                ->orLike("t1.tarifa_encuadernacion_id", $search)
+                ->orLike("t1.tirada_encuadernacion_id", $search)
                ->orLike("t1.paginas_min", $search)
                ->orLike("t1.paginas_max", $search)
                ->orLike("t1.precio_min", $search)
@ -126,19 +126,19 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
                ->groupEnd();
    }

-    public function checkIntervals($data = [], $id_linea = null, $id_tarifa_encuadernacion = null){
+    public function checkIntervals($data = [], $id_linea = null, $tirada_encuadernacion_id = null){
        
        helper('general');

        if(floatval($data["paginas_min"])>= floatval($data["paginas_max"])){
-            return lang('TarifaManipuladoLineas.validation.error_paginas_range');
+            return lang('TarifaEncuadernacionLineas.validation.error_paginas_range');
        }

        $rows = $this->db
            ->table($this->table)
            ->select("id, paginas_min, paginas_max")
            ->where("is_deleted", 0)
-            ->where("tarifa_encuadernacion_id", $id_tarifa_encuadernacion)
+            ->where("tirada_encuadernacion_id", $tirada_encuadernacion_id)
            ->get()->getResultObject();


@ -150,7 +150,7 @@ class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
            }
            if(check_overlap(floatval($data["paginas_min"]), floatval($data["paginas_max"]),
                                $row->paginas_min, $row->paginas_max)){
-                    return lang('TarifaManipuladoLineas.validation.error_paginas_overlap');
+                    return lang('TarifaEncuadernacionLineas.validation.error_paginas_overlap');
            }
        }

--- a/ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php
+++ b/ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php
@ -0,0 +1,134 @@
+<?php
+namespace App\Models\Tarifas;
+
+class TarifaEncuadernacionLineaModel extends \App\Models\GoBaseModel
+{
+    protected $table = "tarifa_encuadernacion_tiradas";
+
+    /**
+     * Whether primary key uses auto increment.
+     *
+     * @var bool
+     */
+    protected $useAutoIncrement = true;
+
+    const SORTABLE = [
+        1 => "t3.nombre",
+        2 => "t1.tirada_min",
+        3 => "t1.tirada_max",
+        
+    ];
+
+    protected $allowedFields = [
+        "tarifa_encuadernacion_id",
+        "tirada_min",
+        "tirada_max",
+        "proveedor_id", 
+        "user_created_id",
+        "user_updated_id",
+        "is_deleted",
+        "deleted_at",
+
+    ];
+    protected $returnType = "App\Entities\Tarifas\TarifaEncuadernacionTirada";
+
+    protected $useTimestamps = true;
+    protected $useSoftDeletes = false;
+
+    protected $createdField = "created_at";
+
+    protected $updatedField = "updated_at";
+
+    public static $labelField = "tarifa_encuadernacion_id";
+
+    protected $validationRules = [
+        "tirada_max" => [
+            "label" => "TarifaEncuadernacionTiradas.tiradaMax",
+            "rules" => "required|integer",
+        ],
+        "tirada_min" => [
+            "label" => "TarifaEncuadernacionTiradas.tiradaMin",
+            "rules" => "required|integer",
+        ]
+    ];
+
+    protected $validationMessages = [
+        "tirada_max" => [
+            "integer" => "TarifaEncuadernacionTiradas.validation.tirada_max.integer",
+            "required" => "TarifaEncuadernacionTiradas.validation.tirada_max.required",
+        ],
+        "tirada_min" => [
+            "integer" => "TarifaEncuadernacionTiradas.validation.tirada_min.integer",
+            "required" => "TarifaEncuadernacionTiradas.validation.tirada_min.required",
+        ]
+    ];
+
+    /**
+     * Get resource data.
+     *
+     * @param string $search
+     *
+     * @return \CodeIgniter\Database\BaseBuilder
+     */
+    public function getResource(string $search = "", $tarifa_encuadernacion_id = -1)
+    {
+        $builder = $this->db
+            ->table($this->table . " t1")
+            ->select(
+                "t1.id AS id, t1.tarifa_encuadernacion_id AS tarifa_encuadernacion_id, t1.tirada_min AS tirada_min, 
+                t1.tirada_max AS tirada_max, t3.nombre AS proveedor, t2.id AS tarifa_encuadernacion"
+            );
+        //JJO
+        $builder->where('tarifa_encuadernacion_id', $tarifa_encuadernacion_id);    
+        $builder->where("t1.is_deleted", 0);
+
+        $builder->join("tarifa_encuadernacion t2", "t1.tarifa_encuadernacion_id = t2.id", "left");
+        $builder->join("lg_proveedores t3", "t1.proveedor_id = t3.id", "left");
+
+
+        return empty($search)
+            ? $builder
+            : $builder
+                ->groupStart()
+                ->like("t1.id", $search)
+                ->orLike("t1.tirada_min", $search)
+                ->orLike("t1.tirada_max", $search)
+                ->orLike("t3.nombre", $search)
+                ->orLike("t1.id", $search)
+                ->orLike("t1.tirada_min", $search)
+                ->orLike("t1.tirada_max", $search)
+                ->orLike("t3.nombre", $search)
+                ->groupEnd();
+    }
+
+    public function checkIntervals($data = [], $id_linea = null, $tarifa_encuadernacion_id = null){
+        
+        helper('general');
+
+        if(floatval($data["tirada_min"])>= floatval($data["tirada_max"])){
+            return lang('TarifaEncuadernacionTiradas.validation.error_tirada_range');
+        }
+
+        $rows = $this->db
+            ->table($this->table)
+            ->select("id, tirada_min, tirada_max")
+            ->where("is_deleted", 0)
+            ->where("tarifa_encuadernacion_id", $tarifa_encuadernacion_id)
+            ->get()->getResultObject();
+
+
+        foreach ($rows as $row) {
+            if (!is_null($id_linea)){
+                if($row->id == $id_linea){
+                    continue;
+                }
+            }
+            if(check_overlap(floatval($data["tirada_min"]), floatval($data["tirada_max"]),
+                                $row->tirada_min, $row->tirada_max)){
+                    return lang('TarifaEncuadernacionTiradas.validation.error_tirada_overlap');
+            }
+        }
+
+        return "";
+    }
+}
--- a/ci4/app/Models/Tarifas/TarifaManipuladoLineaModel.php
+++ b/ci4/app/Models/Tarifas/TarifaManipuladoLineaModel.php
@ -13,16 +13,16 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
    protected $useAutoIncrement = true;

    const SORTABLE = [
-        0 => "t1.paginas_min",
-        1 => "t1.paginas_max",
+        0 => "t1.tirada_min",
+        1 => "t1.tirada_max",
        2 => "t1.precio_min",
        3 => "t1.precio_max",
    ];

    protected $allowedFields = [
        "tarifa_manipulado_id",
-        "paginas_min",
-        "paginas_max",
+        "tirada_min",
+        "tirada_max",
        "precio_min",
        "precio_max",
        "user_created_id",
@ -49,12 +49,12 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
            "label" => "TarifaManipuladoLineas.precioMin",
            "rules" => "required|decimal",
        ],
-        "paginas_max" => [
-            "label" => "TarifaManipuladoLineas.paginasMax",
+        "tirada_max" => [
+            "label" => "TarifaManipuladoLineas.tiradaMax",
            "rules" => "required|decimal",
        ],
-        "paginas_min" => [
-            "label" => "TarifaManipuladoLineas.paginasMin",
+        "tirada_min" => [
+            "label" => "TarifaManipuladoLineas.tiradaMin",
            "rules" => "required|decimal",
        ],
        "margen" => [
@ -72,13 +72,13 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
            "decimal" => "TarifaManipuladoLineas.validation.precio_min.decimal",
            "required" => "TarifaManipuladoLineas.validation.precio_min.required",
        ],
-        "paginas_max" => [
-            "decimal" => "TarifaManipuladoLineas.validation.paginas_max.decimal",
-            "required" => "TarifaManipuladoLineas.validation.paginas_max.required",
+        "tirada_max" => [
+            "decimal" => "TarifaManipuladoLineas.validation.tirada_max.decimal",
+            "required" => "TarifaManipuladoLineas.validation.tirada_max.required",
        ],
-        "paginas_min" => [
-            "decimal" => "TarifaManipuladoLineas.validation.paginas_min.decimal",
-            "required" => "TarifaManipuladoLineas.validation.paginas_min.required",
+        "tirada_min" => [
+            "decimal" => "TarifaManipuladoLineas.validation.tirada_min.decimal",
+            "required" => "TarifaManipuladoLineas.validation.tirada_min.required",
        ],
        "margen" => [
            "decimal" => "TarifaManipuladoLineas.validation.margen.decimal",
@ -98,7 +98,7 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
        $builder = $this->db
            ->table($this->table . " t1")
            ->select(
-                "t1.id AS id, t1.tarifa_manipulado_id AS tarifa_manipulado_id, t1.paginas_min AS paginas_min, t1.paginas_max AS paginas_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.margen AS margen, t2.id AS tarifa_manipulado"
+                "t1.id AS id, t1.tarifa_manipulado_id AS tarifa_manipulado_id, t1.tirada_min AS tirada_min, t1.tirada_max AS tirada_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.margen AS margen, t2.id AS tarifa_manipulado"
            );
        //JJO
        $builder->where('tarifa_manipulado_id', $tarifa_manipulado_id);    
@ -113,14 +113,14 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
                ->groupStart()
                ->like("t1.id", $search)
                ->orLike("t1.tarifa_manipulado_id", $search)
-                ->orLike("t1.paginas_min", $search)
-                ->orLike("t1.paginas_max", $search)
+                ->orLike("t1.tirada_min", $search)
+                ->orLike("t1.tirada_max", $search)
                ->orLike("t1.precio_min", $search)
                ->orLike("t1.precio_max", $search)
                ->orLike("t1.id", $search)
                ->orLike("t1.tarifa_manipulado_id", $search)
-                ->orLike("t1.paginas_min", $search)
-                ->orLike("t1.paginas_max", $search)
+                ->orLike("t1.tirada_min", $search)
+                ->orLike("t1.tirada_max", $search)
                ->orLike("t1.precio_min", $search)
                ->orLike("t1.precio_max", $search)
                ->groupEnd();
@ -130,13 +130,13 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
        
        helper('general');

-        if(floatval($data["paginas_min"])>= floatval($data["paginas_max"])){
-            return lang('TarifaManipuladoLineas.validation.error_paginas_range');
+        if(floatval($data["tirada_min"])>= floatval($data["tirada_max"])){
+            return lang('TarifaManipuladoLineas.validation.error_tirada_range');
        }

        $rows = $this->db
            ->table($this->table)
-            ->select("id, paginas_min, paginas_max")
+            ->select("id, tirada_min, tirada_max")
            ->where("is_deleted", 0)
            ->where("tarifa_manipulado_id", $id_tarifa_manipulado)
            ->get()->getResultObject();
@ -148,9 +148,9 @@ class TarifaManipuladoLineaModel extends \App\Models\GoBaseModel
                    continue;
                }
            }
-            if(check_overlap(floatval($data["paginas_min"]), floatval($data["paginas_max"]),
-                                $row->paginas_min, $row->paginas_max)){
-                    return lang('TarifaManipuladoLineas.validation.error_paginas_overlap');
+            if(check_overlap(floatval($data["tirada_min"]), floatval($data["tirada_max"]),
+                                $row->tirada_min, $row->tirada_max)){
+                    return lang('TarifaManipuladoLineas.validation.error_tirada_overlap');
            }
        }