Skip to content

Restaura o filtro de situação na listagem de alunos #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
msoares94 wants to merge 1 commit into
base: 2.12
Choose a base branch
from
+13 −3
Open

Restaura o filtro de situação na listagem de alunos #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions app/Models/Builders/LegacyStudentBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
namespace App\Models\Builders;

use App\Models\DataSearch\StudentFilter;
use App\Models\RegistrationStatus;
use iEducar\Modules\Enrollments\Model\EnrollmentStatusFilter;
use Illuminate\Database\Eloquent\Relations\BelongsTo;

class LegacyStudentBuilder extends LegacyBuilder
Expand Down Expand Up @@ -149,17 +151,20 @@ public function whereWithoutReport(): self
});
}

public function whereRegistration($year, $course, $grade, $school)
public function whereRegistration($year, $course, $grade, $school, $status = null)
{
return $this->where(function ($query) use ($year, $course, $grade, $school) {
return $this->where(function ($query) use ($year, $course, $grade, $school, $status) {
$query->whereHas(
'registrations',
function ($query) use ($year, $course, $grade, $school) {
function ($query) use ($year, $course, $grade, $school, $status) {
$query->active();
$query->when($year, fn ($q) => $q->where('ano', $year));
$query->when($course, fn ($q) => $q->where('ref_cod_curso', $course));
$query->when($school, fn ($q) => $q->where('ref_ref_cod_escola', $school));
$query->when($grade, fn ($q) => $q->where('ref_ref_cod_serie', $grade));
$query->when($status, fn ($q) => (int) $status === EnrollmentStatusFilter::EXCEPT_TRANSFERRED_OR_ABANDONMENT
? $q->whereNotIn('aprovado', [RegistrationStatus::TRANSFERRED, RegistrationStatus::ABANDONED])
: $q->where('aprovado', $status));
}
);
});
Expand Down Expand Up @@ -198,6 +203,7 @@ public function findStudentWithMultipleSearch(StudentFilter $studentFilter)
'course' => $studentFilter->course,
'school' => $studentFilter->school,
'year' => $studentFilter->year,
'status' => $studentFilter->enrollmentStatus,
],
]
)
Expand Down
1 change: 1 addition & 0 deletions app/Models/DataSearch/StudentFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public function __construct(
public readonly ?int $school = null,
public readonly ?int $course = null,
public readonly ?int $grade = null,
public readonly ?int $enrollmentStatus = null,
public readonly ?int $perPage = null,
public readonly ?string $pageName = null,
public readonly ?bool $similarity = null,
Expand Down
3 changes: 3 additions & 0 deletions ieducar/intranet/educar_aluno_lst.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use App\Models\DataSearch\StudentFilter;
use App\Models\LegacyStudent;
use iEducar\Modules\Enrollments\Model\EnrollmentStatusFilter;

return new class extends clsListagem
{
Expand Down Expand Up @@ -100,6 +101,7 @@ public function Gerar()
$this->inputsHelper()->dynamic(helperNames: 'escolaSemFiltroPorUsuario', inputOptions: ['required' => false, 'value' => $this->ref_cod_escola, 'label_hint' => 'Retorna alunos com matrículas na escola selecionada']);
$this->inputsHelper()->dynamic(helperNames: 'curso', inputOptions: ['required' => false, 'label_hint' => 'Retorna alunos com matrículas no curso selecionado']);
$this->inputsHelper()->dynamic(helperNames: 'serie', inputOptions: ['required' => false, 'label_hint' => 'Retorna alunos com matrículas na série selecionada']);
$this->inputsHelper()->dynamic(helperNames: 'situacaoMatricula', inputOptions: ['required' => false, 'label_hint' => 'Retorna alunos com matrículas compatíveis com esta situação']);

$obj_permissoes = new clsPermissoes;
$cod_escola = $obj_permissoes->getEscola(int_idpes_usuario: $this->pessoa_logada);
Expand Down Expand Up @@ -134,6 +136,7 @@ public function Gerar()
$dataFilter = [
'rg' => preg_replace(pattern: '/\D/', replacement: '', subject: $this->rg_aluno),
'year' => $this->ano,
'enrollmentStatus' => ((int) $this->situacao_matricula_id && (int) $this->situacao_matricula_id !== EnrollmentStatusFilter::ALL) ? (int) $this->situacao_matricula_id : null,
'cpf' => preg_replace(pattern: '/\D/', replacement: '', subject: $this->cpf_aluno),
'inep' => $this->cod_inep,
'grade' => $this->ref_cod_serie,
Expand Down