Skip to content

Commit

Permalink
Melhorias de layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@edersoares
edersoares committed Jul 3, 2024
1 parent a98cf1e commit 237a861
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 63 deletions.
20 changes: 10 additions & 10 deletions resources/views/enrollments/batch/enroll.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,45 @@

@section('content')
<form id="formcadastro" action="{{ Asset::get('/enturmacao-em-lote/' . $schoolClass->id) }}" method="post">
<table class="tablecadastro" width="100%" border="0" cellpadding="2" cellspacing="0" role="presentation">
<table class="tablecadastro" style="width: 100%">
<tbody>
<tr>
<td class="formdktd" colspan="2" height="24"><b>Enturmar em lote</b></td>
</tr>
<tr id="tr_nm_instituicao">
<td class="formmdtd" valign="top"><span class="form">Instituição:</span></td>
<th scope="row" class="formmdtd" valign="top"><span class="form">Instituição:</span></th>
<td class="formmdtd" valign="top"><span class="form">{{ $schoolClass->school->institution->name ?? null }}</span></td>
</tr>
<tr id="tr_nm_escola">
<td class="formlttd" valign="top"><span class="form">Escola:</span></td>
<th scope="row" class="formlttd" valign="top"><span class="form">Escola:</span></th>
<td class="formlttd" valign="top"><span class="form">{{ $schoolClass->school->person->name ?? null }}</span></td>
</tr>
<tr id="tr_nm_curso">
<td class="formmdtd" valign="top"><span class="form">Curso:</span></td>
<th scope="row" class="formmdtd" valign="top"><span class="form">Curso:</span></th>
<td class="formmdtd" valign="top"><span class="form">{{ $schoolClass->course->name ?? null }}</span></td>
</tr>
<tr id="tr_nm_serie">
<td class="formlttd" valign="top"><span class="form">Série:</span></td>
<th scope="row" class="formlttd" valign="top"><span class="form">Série:</span></th>
<td class="formlttd" valign="top"><span class="form">{{ $schoolClass->grade->name ?? null }}</span></td>
</tr>
<tr id="tr_nm_turma">
<td class="formmdtd" valign="top"><span class="form">Turma:</span></td>
<th scope="row" class="formmdtd" valign="top"><span class="form">Turma:</span></th>
<td class="formmdtd" valign="top"><span class="form">{{ $schoolClass->name ?? null }}</span></td>
</tr>
<tr id="tr_ano">
<td class="formlttd" valign="top"><span class="form">Ano:</span></td>
<th scope="row" class="formlttd" valign="top"><span class="form">Ano:</span></th>
<td class="formlttd" valign="top"><span class="form">{{ $schoolClass->year ?? null }}</span></td>
</tr>
<tr id="tr_ano">
<td class="formmdtd" valign="top"><span class="form">Total de vagas na turma:</span></td>
<th scope="row" class="formmdtd" valign="top"><span class="form">Total de vagas na turma:</span></th>
<td class="formmdtd" valign="top"><span class="form">{{ $schoolClass->max_aluno }}</span></td>
</tr>
<tr id="tr_ano">
<td class="formlttd" valign="top"><span class="form">Vagas disponíveis na turma:</span></td>
<th scope="row" class="formlttd" valign="top"><span class="form">Vagas disponíveis na turma:</span></th>
<td class="formlttd" valign="top"><span class="form">{{ $schoolClass->vacancies }}</span></td>
</tr>
<tr id="tr_ano">
<td class="formmdtd" valign="top"><span class="form">Calendário letivo:</span></td>
<th scope="row" class="formmdtd" valign="top"><span class="form">Calendário letivo:</span></th>
@if($schoolClass->begin_academic_year && $schoolClass->end_academic_year)
<td class="formmdtd" valign="top"><span class="form">{{ $schoolClass->begin_academic_year->format('d/m/Y') }} à {{ $schoolClass->end_academic_year->format('d/m/Y') }}</span></td>
@else
Expand Down
26 changes: 13 additions & 13 deletions resources/views/enrollments/enroll.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,52 @@

@section('content')
<form id="enrollments-enroll" action="{{ Asset::get('/matricula/' . $registration->id . '/enturmar/' . $schoolClass->id)}}" method="post">
<table class="table-default" role="presentation">
<table class="table-default">
<thead>
<tr>
<td colspan="2"><b>Enturmar</b></td>
</tr>
</thead>
<tbody>
<tr>
<td>Nome do aluno:</td>
<th scope="row">Nome do aluno:</th>
<td>{{ $registration->student->person->name ?? null }}</td>
</tr>
<tr>
<td>Escola:</td>
<th scope="row">Escola:</th>
<td>{{ $schoolClass->school->person->name ?? null }}</td>
</tr>
<tr>
<td>Curso:</td>
<th scope="row">Curso:</th>
<td>{{ $schoolClass->course->name ?? null }}</td>
</tr>
<tr>
<td>Série:</td>
<th scope="row">Série:</th>
<td>{{ $registration->grade->name ?? null }}</td>
</tr>
<tr>
<td>Turma selecionada:</td>
<th scope="row">Turma selecionada:</th>
<td>{{ $schoolClass->name ?? null }}</td>
</tr>
<tr>
<td>Total de vagas:</td>
<th scope="row">Total de vagas:</th>
<td>{{ $schoolClass->max_aluno }}</td>
</tr>
<tr>
<td>Vagas disponíveis:</td>
<th scope="row">Vagas disponíveis:</th>
<td>{{ $schoolClass->vacancies }}</td>
</tr>
<tr>
<td>Alunos enturmados:</td>
<th scope="row">Alunos enturmados:</th>
<td>{{ $schoolClass->getTotalEnrolled() }}</td>
</tr>
<tr>
<td>Período de enturmação:</td>
<th scope="row">Período de enturmação:</th>
<td>{{ $schoolClass->begin_academic_year->format('d/m/Y') }} à {{ $schoolClass->end_academic_year->format('d/m/Y') }}</td>
</tr>
@if($enrollments->count())
<tr>
<td>Turma de origem:</td>
<th scope="row">Turma de origem:</th>
<td>
<select name="enrollment_from_id" class="select-default">
@foreach($enrollments as $enrollment)
Expand All @@ -68,11 +68,11 @@
</tr>
@endif
<tr>
<td>
<th scope="row">
Data da enturmação/saída<span class="campo_obrigatorio">*</span>
<br>
<small class="text-muted">dd/mm/aaaa</small>
</td>
</th>
<td>
<input name="enrollment_date" value="{{ old('enrollment_date') }}" onkeypress="formataData(this, event);" class="form-input {{ $errors->has('enrollment_date') ? 'error' : '' }}" type="text" maxlength="10">
</td>
Expand Down
26 changes: 13 additions & 13 deletions resources/views/enrollments/enrollmentFormativeItinerary.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@
@section('content')
<form >
<div>
<table class="table-default" role="presentation">
<table class="table-default">
<thead>
<tr>
<td colspan="2"><strong>Novo</strong></td>
</tr>
</thead>
<tbody>
<tr>
<td>Aluno:</td>
<th scope="row">Aluno:</th>
<td>{{ $enrollment->studentName ?? null }}</td>
</tr>
<tr>
<td>Turma:</td>
<th scope="row">Turma:</th>
<td>{{ $enrollment->schoolClass->name ?? null }}</td>
</tr>
<tr id="tr_itinerary_type">
<td>
<th scope="row">
Trilha de aprofundamento do itinerário formativo:
</td>
</th>
<td>
@php
$types = $enrollment->tipo_itinerario;
Expand All @@ -44,9 +44,9 @@
</td>
</tr>
<tr id="tr_itinerary_composition">
<td>
<th scope="row">
Composição do itinerário formativo integrado (entre as áreas de conhecimento ou entre as áreas de conhecimento e a formação técnica profissional):
</td>
</th>
<td>
@php
$compositions = $enrollment->composicao_itinerario;
Expand All @@ -59,7 +59,7 @@
</td>
</tr>
<tr id="tr_itinerary_course">
<td>Tipo do curso do itinerário de formação técnica e profissional:</td>
<th scope="row">Tipo do curso do itinerário de formação técnica e profissional:</th>
<td>
<select name="itinerary_course" id="itinerary_course" class="select-default">
<option value="">Selecione</option>
Expand All @@ -70,9 +70,9 @@
</td>
</tr>
<tr id="tr_technical_course">
<td>
<th scope="row">
Código do curso técnico:
</td>
</th>
<td>
<select name="technical_course" id="technical_course" class="select-default">
<option value="">Selecione</option>
Expand All @@ -83,7 +83,7 @@
</td>
</tr>
<tr id="tr_concomitant_itinerary">
<td>Itinerário concomitante intercomplementar à matrícula de formação geral básica:</td>
<th scope="row">Itinerário concomitante intercomplementar à matrícula de formação geral básica:</th>
<td>
<select name="concomitant_itinerary" id="concomitant_itinerary" class="select-default">
<option value="">Selecione</option>
Expand All @@ -94,9 +94,9 @@
</tr>
<input type="hidden" name="show_concomitant_itinerary" id="show_concomitant_itinerary" value="{{ $showConcomitantItinerary ? 1 : 0 }}">
<tr>
<td colspan="2">
<th scope="row" colspan="2">
<input type="hidden" id="enrollment_id" name="enrollment_id" value="{{ $enrollment->id }}">
</td>
</th>
</tr>
</tbody>
<tr>
Expand Down
12 changes: 6 additions & 6 deletions resources/views/enrollments/enrollmentFormativeItineraryList.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@

@section('content')
<div>
<table class="tablelistagem" width="100%" role="presentation">
<table class="tablelistagem" style="width: 100%">
<tbody>
<tr>
<td class="titulo-tabela-listagem" colspan="13">Lista de enturmações da matrícula</td>
</tr>
<tr>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Sequencial</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Turma</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Ativo</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Data de enturmação</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Data de saída</td>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Sequencial</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Turma</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Ativo</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Data de enturmação</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Data de saída</th>
</tr>
@foreach($registration->enrollments->sortBy('sequencial') as $enrollment)
<tr>
Expand Down
42 changes: 21 additions & 21 deletions resources/views/enrollments/enrollmentHistory.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@
</thead>
<tbody>
<tr>
<td>Escola:</td>
<th scope="row">Escola:</th>
<td>{{ $registration->school->name ?? null }}</td>
</tr>
<tr>
<td>Nome do aluno:</td>
<th scope="row">Nome do aluno:</th>
<td>{{ $registration->student->person->name ?? null }}</td>
</tr>
<tr>
<td>Matrícula:</td>
<th scope="row">Matrícula:</th>
<td>{{ $registration->id ?? null }}</td>
</tr>
<tr>
<td>Situação:</td>
<th scope="row">Situação:</th>
<td>{{ $registration->status_description ?? null }}</td>
</tr>
<tr>
<td>Data saída:</td>
<th scope="row">Data saída:</th>
<td>{{ dataToBrasil($registration->data_cancel) ?? null }}</td>
</tr>
</tbody>
Expand All @@ -40,28 +40,28 @@
</table>
</div>
<div>
<table class="tablelistagem" width="100%" role="presentation">
<table class="tablelistagem" style="width: 100%">
<tbody>
<tr>
<td class="titulo-tabela-listagem" colspan="14">Lista de enturmações da matrícula</td>
</tr>
<tr>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Sequencial</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Turma</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Turno do aluno</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Ativo</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Data de enturmação</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Data de saída</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Transferido</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Remanejado</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Reclassificado</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Abandono</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Falecido</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Usuário criou</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">Usuário editou</td>
<td class="formdktd" valign="top" align="left" style="font-weight:bold;">
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Sequencial</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Turma</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Turno do aluno</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Ativo</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Data de enturmação</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Data de saída</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Transferido</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Remanejado</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Reclassificado</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Abandono</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Falecido</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Usuário criou</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">Usuário editou</th>
<th scope="col" class="formdktd" valign="top" align="left" style="font-weight:bold;">
Editar
</td>
</th>
</tr>
@foreach($registration->enrollments->sortBy('sequencial') as $enrollment)
<tr>
Expand Down

0 comments on commit 237a861

Please sign in to comment.