Merge pull request #673 from portabilis/portabilis-patch-2019-10-25

[2.2] Portabilis patch 25/10/2019

app/Models/LegacyRegistration.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App_Model_MatriculaSituacao;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -11,6 +12,8 @@
  * LegacyRegistration
  *
  * @property int $id
+ * @property boolean isTransferred
+ * @property boolean isAbandoned
  *
  */
 class LegacyRegistration extends Model
@@ -119,4 +122,14 @@ public function exemptions()
     {
         return $this->hasMany(LegacyDisciplineExemption::class, 'ref_cod_matricula', 'cod_matricula');
     }
+
+    public function getIsTransferredAttribute()
+    {
+        return $this->aprovado == App_Model_MatriculaSituacao::TRANSFERIDO;
+    }
+
+    public function getIsAbandonedAttribute()
+    {
+        return $this->aprovado == App_Model_MatriculaSituacao::ABANDONO;
+    }
 }

app/Process.php

@@ -17,6 +17,7 @@ class Process
 
     const ENROLLMENT_HISTORY = 1001;
     const ATTENDED_CANDIDATE = 1002;
+    const BACK_TO_QUEUE = 1003;
     const UNDO_STUDENT_UNIFICATION = 2001;
     const EXEMPTION_LIST = 2002;
 }

app/Services/StudentService.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\Student;
+
+class StudentService
+{
+    /**
+     * Verifica se o aluno tem alguma matricula em andamento
+     *
+     * @param int $studentId
+     * @param int|null $levelId
+     * @return boolean
+     */
+    public function hasInProgressRegistration($studentId, $levelId = null)
+    {
+        $student = Student::find($studentId);
+
+        if (!$student) {
+            return false;
+        }
+
+        $query = $student->registrations()->where('status', 3);
+
+        if ($levelId) {
+            $query->where('level_id', $levelId);
+        }
+
+        return $query->orderBy('year', 'desc')
+            ->exists();
+    }
+}

composer.json

@@ -3,7 +3,7 @@
     "description": "Software livre de gestão escolar",
     "type": "project",
     "license": "GPL-2.0-or-later",
-    "version": "2.2.10",
+    "version": "2.2.11",
     "keywords": [
         "Portabilis",
         "i-Educar"

database/migrations/2019_10_24_083313_cria_parametro_ordena_alunos_por_sequencial_enturmacao.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CriaParametroOrdenaAlunosPorSequencialEnturmacao extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('pmieducar.instituicao', function (Blueprint $table) {
+            $table->boolean('ordenar_alunos_sequencial_enturmacao')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('pmieducar.instituicao', function (Blueprint $table) {
+            $table->dropColumn('ordenar_alunos_sequencial_enturmacao');
+        });
+    }
+}