Skip to content

GitLab

Commit 9e356588 authored by alissonalbuquerque's avatar alissonalbuquerque
Browse files

add correções temporarias de layout e UserPad

parent 10815e2a
Show whitespace changes
Inline Side-by-side
app/Http/Controllers/DashboardController.php
View file @ 9e356588
......@@ -28,11 +28,7 @@ class DashboardController extends Controller
if($user->isTypeTeacher())
{
$userPads =
UserPad::initQuery()
->whereUser($user->id)
->wherePadStatus(Status::ATIVO)
->get();
$userPads = UserPad::whereUserId($user->id)->whereStatus(Status::ATIVO)->get();
return view('dashboard', ['userPads' => $userPads, 'menu'=> Menu::HOME]);
}
......
app/Http/Controllers/Dimensao/Tabelas/Ensino/EnsinoAtendimentoDiscenteController.php
View file @ 9e356588
......@@ -30,7 +30,6 @@ class EnsinoAtendimentoDiscenteController extends Controller
->orderBy('cod_atividade')
->get();
$niveis = Nivel::listNivel();
$modalidades = Modalidade::listModalidade();
$divs = PadTables::tablesEnsino($user_pad_id);
......
app/Http/Controllers/PadController.php
View file @ 9e356588
......@@ -41,7 +41,7 @@ class PadController extends Controller
if(Auth::user()->isTypeTeacher())
{
$menu = Menu::PADS;
$userPads = UserPad::initQuery()->whereUser(Auth::user()->id)->get();
$userPads = UserPad::whereUserId(Auth::user()->id)->get();
return view('pad.teacher.index', ['menu' => $menu, 'userPads' => $userPads]);
}
......
resources/views/auth/login.blade.php
View file @ 9e356588
......@@ -15,19 +15,19 @@
<x-auth-validation-errors class="alert alert-danger mb-2" :errors="$errors" />
<form action="{{ route('login') }}" method="POST" class="signin-form d-md-flex">
@csrf
<!-- Informações -->
<div class="half p-4 py-md-5 bg-primary">
<div class="w-100">
<h4 class="mb-4"> Informações </h4>
</div>
<p class="w-100 text-center"> Bem Vindo ao PAD </p>
<p class="w-100 text-center text-danger"> Serviço em ajuste. Em breve, será novamente liberado </p>
<!-- <p class="w-100 text-center"> O primeiro acesso deve ser realizado utilizando o seu e-mail institucional como login e parte local do email como senha. </p>
<p class="w-100 text-center"> Bem-Vindo(a) ao PAD </p>
<!-- <p class="w-100 text-center text-danger"> Serviço em ajuste. Em breve, será novamente liberado </p> -->
<p class="w-100 text-center"> O primeiro acesso deve ser realizado utilizando o seu e-mail institucional como login e parte local do email como senha. </p>
<p class="w-100 font-weight-bold"> Exemplo: </p>
<p class="w-100 font-weight-bold"> <span class="bold"> Login: </span> usuario.email@upe.br </p>
<p class="w-100 font-weight-bold"> <span class="bold"> Senha: </span> usuario.email </p> -->
<p class="w-100 font-weight-bold"> <span class="bold"> Senha: </span> usuario.email </p>
<!-- <p class="w-100 text-center">O primeiro acesso deve ser realizado utilizando seu e-mail
e CPF, nos campos de login e senha respectivamente</p> -->
......
resources/views/layouts/user-dashboard/dashboard_teacher.blade.php
View file @ 9e356588
@php
use App\Models\Util\Status;
@endphp
<div class="tab-pane active" id="home" role="tabpanel" aria-labelledby="home-tab">
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">Bem Vindo ao PAD</h1>
......@@ -10,16 +14,20 @@
</div>
<div class="d-flex">
@foreach($userPads as $userPad)
@if($userPad->pad->status === Status::ATIVO)
<div class="card mx-2" style="width: 12rem;">
<div class="card-body">
<h3 class="text-center"> <i class="bi bi-book-half"></i> </h3>
<div class="card-body">
<div class="text-end">
<span class="badge bg-primary">{{ $userPad->pad->statusAsString() }}</span>
</div>
<h1 class="text-center"> <i class="bi bi-book-half"></i> </h1>
<h5 class="text-center"> PAD: {{ $userPad->pad->nome }} </h4>
<h5 class="text-center"> Status: {{ $userPad->pad->statusAsString() }} </h4>
<a class="stretched-link" href="{{ route('pad_view', ['id' => $userPad->id]) }}"></a>
</div>
</div>
@endif
@endforeach
</div>
</div>
resources/views/pad/teacher/index.blade.php
View file @ 9e356588
......@@ -21,18 +21,29 @@
@section('body')
<div class="d-flex">
@foreach($userPads as $userPad)
@if($userPad->pad->status === Status::ATIVO || $userPad->pad->status === Status::ARQUIVADO)
<div class="card mx-2" style="width: 12rem;">
<div class="card-body">
@if($userPad->pad->status === Status::ATIVO)
<div class="card-body">
<div class="text-end">
<span class="badge bg-primary">{{ $userPad->pad->statusAsString() }}</span>
</div>
<h1 class="text-center"> <i class="bi bi-book-half"></i> </h1>
<h5 class="text-center"> PAD: {{ $userPad->pad->nome }} </h4>
<a class="stretched-link" href="{{ route('pad_view', ['id' => $userPad->id]) }}"></a>
</div>
@else
<div class="card-body">
<div class="text-end">
<span class="badge bg-secondary">{{ $userPad->pad->statusAsString() }}</span>
</div>
<h1 class="text-center"> <i class="bi bi-journal-bookmark-fill"></i> </h1>
@endif
<h5 class="text-center"> PAD: {{ $userPad->pad->nome }} </h4>
<h5 class="text-center"> Status: {{ $userPad->pad->statusAsString() }} </h4>
<a class="stretched-link" href="{{ route('pad_view', ['id' => $userPad->id]) }}"></a>
</div>
@endif
</div>
@endif
@endforeach
</div>
@endsection
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment