Merge branch 'main' into portabilis-2023-07-07

portabilis · Sep 7, 2023 · d3926fe · d3926fe
2 parents 243d2f7 + edc9876
commit d3926fe
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -50,7 +50,7 @@ jobs:
 
     steps:
       - name: Setup PHP
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: shivammathur/setup-php@v2
         with:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.build
 /database/backups
 /database/data
 /database/migrations/extras

diff --git a/app/Models/Enums/AbsenceDelayType.php b/app/Models/Enums/AbsenceDelayType.php
@@ -19,6 +19,6 @@ public function name(): string
 
     public static function getDescriptiveValues(): Collection
     {
-        return collect(self::cases())->map(fn ($item) => $item->name());
+        return collect(self::cases())->mapWithKeys(fn (AbsenceDelayType $type) => [$type->value => $type->name()]);
     }
 }
diff --git a/composer.json b/composer.json
@@ -139,7 +139,8 @@
         "sort-packages": true,
         "optimize-autoloader": true,
         "allow-plugins": {
-            "dex/composer-plug-and-play": true
+            "dex/composer-plug-and-play": true,
+            "pestphp/pest-plugin": true
         }
     },
     "minimum-stability": "dev",

diff --git a/database/factories/LegacyCourseFactory.php b/database/factories/LegacyCourseFactory.php
@@ -29,6 +29,7 @@ public function definition(): array
             'hora_falta' => 0.75,
             'ativo' => 1,
             'modalidade_curso' => ModalidadeCurso::ENSINO_REGULAR,
+            'data_cadastro' => now(),
         ];
     }
 

diff --git a/database/factories/LegacyIndividualFactory.php b/database/factories/LegacyIndividualFactory.php
@@ -42,6 +42,24 @@ public function current(): LegacyIndividual
         ]);
     }
 
+    public function withName(string $name): static
+    {
+        return $this->afterCreating(function (LegacyIndividual $individual) use ($name) {
+            $individual->person->nome = $name;
+        });
+    }
+
+    public function withDocument(?string $rg = null, ?string $birthCertificate = null): static
+    {
+        return $this->afterCreating(function (LegacyIndividual $individual) use ($rg, $birthCertificate) {
+            LegacyDocumentFactory::new()->create([
+                'idpes' => $individual->getKey(),
+                'rg' => $rg,
+                'certidao_nascimento' => $birthCertificate,
+            ]);
+        });
+    }
+
     public function withAge(int $age): static
     {
         $year = now()->year - $age;

diff --git a/ieducar/intranet/educar_falta_atraso_cad.php b/ieducar/intranet/educar_falta_atraso_cad.php
@@ -232,8 +232,6 @@ public function Editar()
             return false;
         }
 
-        dd('eu');
-
         $this->data_falta_atraso = Portabilis_Date_Utils::brToPgSQL($this->data_falta_atraso);
         if ($this->tipo == 1) {
             $obj = LegacyAbsenceDelay::find($this->cod_falta_atraso);