agregacion de la migracion para tabla de color

migrations/m240806_220757_tabla_color.php

@@ -3,9 +3,9 @@
 use yii\db\Migration;
 
 /**
- * Class m240806_220757_tabla_color
+ * Class m240814_003026_Color_tabla_actualizada
  */
-class m240806_220757_tabla_color extends Migration
+class m240814_003026_Color_tabla_actualizada extends Migration
 {
     /**
      * {@inheritdoc}
@@ -16,7 +16,7 @@ class m240806_220757_tabla_color extends Migration
             "id" => $this->string(36),
             "clave" => $this->string(100)->notNull(),
             "color" => $this->string(100)->notNull(),
-            "descripcion" => $this->string(100)->notNull(),
+            "descripcion" => $this->string(100),
             "creado" => $this->timestamp()->append(" with time zone"),
             "modificado" => $this->timestamp()->append(" with time zone"),
             "eliminado" => $this->timestamp()->append(" with time zone"),
@@ -33,6 +33,7 @@ class m240806_220757_tabla_color extends Migration
         $this->dropTable("Color");
     }
 
+
     /*
     // Use up()/down() to run migration code without a transaction.
     public function up()
@@ -42,7 +43,7 @@ class m240806_220757_tabla_color extends Migration
 
     public function down()
     {
-        echo "m240806_220757_tabla_color cannot be reverted.\n";
+        echo "m240814_003026_Color_tabla_actualizada cannot be reverted.\n";
 
         return false;
     }

migrations/m240814_004515_Actualizar_columna_descripcion_color.php

@@ -0,0 +1,40 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Class m240814_004515_Actualizar_columna_descripcion_color
+ */
+class m240814_004515_Actualizar_columna_descripcion_color extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->alterColumn('Color', 'descripcion', $this->string()->null());
+    }
+
+    public function safeDown()
+    {
+        // Revertir los cambios en caso de rollback
+        // Aquí volvemos a agregar la restricción NOT NULL a la columna "descripcion"
+        $this->alterColumn('Color', 'descripcion', $this->string()->notNull());
+    }
+
+
+    /*
+    // Use up()/down() to run migration code without a transaction.
+    public function up()
+    {
+
+    }
+
+    public function down()
+    {
+        echo "m240814_004515_Actualizar_columna_descripcion_color cannot be reverted.\n";
+
+        return false;
+    }
+    */
+}

models/Color.php

@@ -8,9 +8,9 @@ use Yii;
  * This is the model class for table "Color".
  *
  * @property string $id
- * @property string $clave
- * @property string $color
- * @property string $descripcion
+ * @property string|null $clave
+ * @property string|null $color
+ * @property string|null $descripcion
  * 
  */
 class Color extends ModeloBase
@@ -29,11 +29,10 @@ class Color extends ModeloBase
     public function rules()
     {
         return [
-            [['id', 'clave', 'color'], 'required'],
-            [['descripcion'], 'string'],
+            [['id', 'clave'], 'required'],
             [['creado', 'modificado', 'eliminado'], 'safe'],
             [['id'], 'string', 'max' => 36],
-            [['clave', 'color'], 'string', 'max' => 100],
+            [['clave', 'color','descripcion'], 'string', 'max' => 100],
             [['id'], 'unique'],
         ];
     }

modules/v1/controllers/ServicioController.php

@@ -20,7 +20,7 @@ class ServicioController extends AuthController {
     $fin= trim($this-> req->get("fin", ""));
     $query = $this->queryInicial 
     -> innerJoin("Vehiculo","{{Vehiculo}}.id = {{Servicio}}.[[idVehiculo]]")
-    ->innerJoin("Marca","{{Marca}}.id = {{Vehiculo}}.[[marca]]")
+    ->innerJoin("Marca","{{Marca}}.id = {{Vehiculo}}.[[idMarca]]")
     ->innerJoin("Taller","{{Taller}}.id = {{Servicio}}.[[idTaller]]");
     
 
@@ -35,9 +35,9 @@ class ServicioController extends AuthController {
     if($vehiculo !== "") {
         $query->andWhere(["{{Vehiculo}}.id" => $vehiculo]);
     }
-    if($marca !== "") {
+   /* if($marca !== "") {
       $query->andWhere(["{{Marca}}.id" => $marca]);
-  }
+  }*/
     if($inicio !=="" && $fin !==""){
       $query->andWhere(["between", "[[fechaServicio]]", $inicio,$fin]);
     }