Merge branch 'main' into feat_task_time

app/Http/Controllers/AvaliadorPadController.php

@@ -120,7 +120,7 @@ class AvaliadorPadController extends Controller
         $users = User::all();
         $dimensoes = Dimensao::listDimensao();
 
-        return view('avaliator-pad.create', [
+        return view('avaliator_pad.create', [
             'pad' => $pad,
             'model' => $model,
             'users' => $users,
@@ -139,7 +139,7 @@ class AvaliadorPadController extends Controller
         $users = User::all();
         $dimensoes = Dimensao::listDimensao();
 
-        return view('avaliator-pad.update', [
+        return view('avaliator_pad.update', [
             'pad' => $pad,
             'model' => $model,
             'users' => $users,

app/Http/Controllers/DashboardController.php

@@ -17,10 +17,8 @@ use Illuminate\Support\Facades\Auth;
 
 class DashboardController extends Controller
 {
-
     public function index()
-    {
-
+    {   
         $user = Auth::user();
 
         if ($user->isTypeAdmin()) {
@@ -28,6 +26,7 @@ class DashboardController extends Controller
         }
 
         if ($user->isTypeTeacher()) {
+
             $userPads = UserPad::whereUserId($user->id)->whereStatus(Status::ATIVO)->get();
 
             return view('dashboard', ['userPads' => $userPads, 'menu' => Menu::HOME]);
@@ -50,7 +49,5 @@ class DashboardController extends Controller
 
             return view('dashboard', ['userPads' => $userPads, 'menu' => Menu::HOME]);
         }
-
-        //return redirect()->route('login');
     }
 }

app/Http/Controllers/DownloadFileController.php

+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Util\Menu;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+
+class DownloadFileController extends Controller
+{   
+    public function index() {
+        return view('download.index', [
+            'menu' => Menu::FILES,
+        ]);
+    }
+
+    public function degreeSchedule() {
+        return Storage::download('public/grade_horario.docx');
+    }
+    
+    public function manual() {
+        return Storage::download('public/manual.pdf');
+    }
+}

app/Http/Controllers/TaskTimeController.php

@@ -32,7 +32,7 @@ class TaskTimeController extends Controller
 
         if($model->save()) {
             return redirect()
-                ->route('TaskTimeIndex', ['user_pad_id' => $model->user_pad_id])
+                ->route('task_time_index', ['user_pad_id' => $model->user_pad_id])
                 ->with('success', 'Cadastro realizado com sucesso!');
         }
     }
@@ -54,12 +54,12 @@ class TaskTimeController extends Controller
 
         if($model->save()) {
             return redirect()
-                ->route('TaskTimeIndex', ['user_pad_id' => $model->user_pad_id])
+                ->route('task_time_index', ['user_pad_id' => $model->user_pad_id])
                 ->with('success', 'Atualizado com sucesso!');
         }
 
         return redirect()
-            ->route('TaskTimeIndex', ['user_pad_id' => $model->user_pad_id])
+            ->route('task_time_index', ['user_pad_id' => $model->user_pad_id])
             ->with('fail', 'Erro ao Atualizar!');
         
     }
@@ -70,12 +70,12 @@ class TaskTimeController extends Controller
 
         if($model->delete()) {
             return redirect()
-                ->route('TaskTimeIndex', ['user_pad_id' => $model->user_pad_id])
+                ->route('task_time_index', ['user_pad_id' => $model->user_pad_id])
                 ->with('success', 'Deletado com sucesso!');
         }
 
         return redirect()
-            ->route('TaskTimeIndex', ['user_pad_id' => $model->user_pad_id])
+            ->route('task_time_index', ['user_pad_id' => $model->user_pad_id])
             ->with('fail', 'Erro ao Deletar!');
 
     }

app/Models/TaskTime.php

@@ -30,6 +30,7 @@ use App\Models\Tabelas\Pesquisa\PesquisaOrientacao;
 use App\Models\Tabelas\Pesquisa\PesquisaOutros;
 use App\Rules\ValidationGreaterThanTime;
 use App\Rules\ValidationLimitTime;
+use Carbon\Carbon;
 use DateInterval;
 use DateTime;
 use Illuminate\Database\Eloquent\Model;
@@ -376,6 +377,14 @@ class TaskTime extends Model
         return $dateTime->format($format);
     }
 
+    public function formatStartTime() {
+        return Carbon::createFromFormat('H:i:s', $this->start_time)->format('H:i');
+    }
+
+    public function formatEndTime() {
+        return Carbon::createFromFormat('H:i:s', $this->end_time)->format('H:i');
+    }
+
     /**
      * STATIC METHODS
      */

app/Models/User.php

@@ -192,8 +192,8 @@ class User extends Authenticatable
      * @return UserType|Null
      */
     public function profileSelected()
-    {   
-        return $this->profiles()->whereSelected(true)->first();
+    {
+        return $this->profiles()->first();
     }
 
     /**

app/Models/Util/Menu.php

@@ -11,9 +11,5 @@ class Menu
     const CURSOS = 5;
     const UNIDADES = 6;
     const PADS = 7;
-    
-    //Deletar depois
-    const DIRETORES = 4;
-    const COORDENADORES = 5;
-    const PROFESSORES = 7;
+    const FILES = 8;
 }
\ No newline at end of file

app/Providers/AppServiceProvider.php

@@ -6,6 +6,7 @@ use Illuminate\Pagination\Paginator;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Collection;
 use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Routing\UrlGenerator;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -24,8 +25,12 @@ class AppServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function boot()
+    public function boot(UrlGenerator $url)
     {
+        if (env('APP_ENV') !== 'local') { //so you can work on it locally
+            $url->forceScheme('https');
+        }
+
         Paginator::useBootstrap();
 
         Collection::macro('paginate', function($perPage, $total = null, $page = null, $pageName = 'page'): LengthAwarePaginator {

resources/views/auth/main.blade.php

 <!doctype html>
 <html lang="pt-br">
 <head>
-    <title>PAD - Plano de Avaliação Docente </title>
+    <title>PDA - Plano de Avaliação Docente </title>
 
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
@@ -15,14 +15,9 @@
 
     <header>
         <div class="navbar shadow-sm" alt="Max-width 100%">
-            <div class="container d-flex justify-content-between">
-                <a class="navbar-brand d-flex align-items-center" href="#">
-                    <img src="http://www.avaliacaodocente.upe.br/assets/img/logo-upe.png" class="img-fluid"
-                        width="128" height="93" alt="" />
-                </a>
-                <a class="navbar-brand d-flex align-items-center" href="#">
-                    <img src="https://www.gestaododesempenho.pe.gov.br/AvaliacaoDesempenho/public/resources/images/logos-direita.png"
-                        class="img-fluid" width="268" height="100" alt="" />
+            <div class="">
+                <a class="navbar-brand p-3" href="#">
+                    <img src="{{url('images/estado_pe_logo.png')}}" alt="Logo do Estado" class="img-fluid" width="300" height="100"/>
                 </a>
             </div>
         </div>

resources/views/avaliador-pad/create.blade.php

 
 <div class="mb-3">
-    <h3 class="h3"> Cadastrar Professor (PAD) </h3>
+    <h3 class="h3"> Cadastrar Professor (PDA) </h3>
 </div>
 
 <form id="form-user_pad" action="{{ route('user-pad_store') }}" method="post">

resources/views/avaliator-pad/create.blade.php → resources/views/avaliator_pad/create.blade.php

-
 <div class="mb-3">
-    <h3 class="h3"> Cadastrar Avaliador (PAD) </h3>
+    <h3 class="h3"> Cadastrar Avaliador (PDA) </h3>
 </div>
 
-<form id="form-user_pad" action="{{ route('avaliator-pad_store') }}" method="post">
-    @csrf
+<form id="form-user_pad" action="{{ route('avaliator-pad_store') }}" method="POST">
     @method('POST')
+    @csrf
 
-    @include('avaliator-pad.form', [
+    @include('avaliator_pad.form', [
         'pad' => $pad,
         'model' => $model,
         'users' => $users,

resources/views/avaliator-pad/form.blade.php → resources/views/avaliator_pad/form.blade.php

@@ -30,7 +30,7 @@
     </div>
 
     <div class="mb-3 col-sm-6">
-        <label class="form-label" for="pad_name"> PAD </label>
+        <label class="form-label" for="pad_name"> PDA </label>
         <input class="form-control" type="text" disabled value="{{ $pad->nome }}">
     </div>
 

resources/views/avaliator-pad/update.blade.php → resources/views/avaliator_pad/update.blade.php

 
 <div class="mb-3">
-    <h3 class="h3"> Atualizar Avaliador (PAD) </h3>
+    <h3 class="h3"> Atualizar Avaliador (PDA) </h3>
 </div>
 
 <form id="form-user_pad" action="{{ route('avaliator-pad_update', ['id' => $model->id]) }}" method="post">
     @csrf
     @method('POST')
 
-    @include('avaliator-pad.form', [
+    @include('avaliator_pad.form', [
         'pad' => $pad,
         'model' => $model,
         'users' => $users,

resources/views/components/cards/avaliador_pad.blade.php

@@ -5,7 +5,7 @@
 <div class="card mx-2" style="width: 12rem;">
     <div class="card-body">
         <h3 class="text-center"> <i class="bi bi-book-half"></i> </h3>
-        <h5 class="text-center"> PAD: {{ $userPad->pad->nome }} </h4>
+        <h5 class="text-center"> PDA: {{ $userPad->pad->nome }} </h4>
         <h5 class="text-center"> Status: {{ $userPad->pad->statusAsString() }} </h4>
         <a class="stretched-link" href="{{ route('pad_professores', ['id' => $userPad->id]) }}"></a>
     </div>

resources/views/components/cards/file_view.blade.php

+<div class="card mx-2" style="width: 12rem;">
+    <div class="card-body">
+        <h3 class="text-center"> <i class="bi bi-file-earmark-arrow-down-fill"></i> </h3>
+        <h5 class="text-center"> {{ $title }} </h4>
+        <a class="stretched-link" href="{{ route($route) }}"></a>
+    </div>
+</div>

resources/views/components/cards/relatorio_pad.blade.php

@@ -2,6 +2,7 @@
     <div class="card-body">
         <h3 class="text-center"> <i class="bi bi-file-earmark-word-fill"></i> </h3>
         <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_relatório', ['id' => $userPad->id]) }}"></a>
     </div>

resources/views/dashboard.blade.php

@@ -7,7 +7,7 @@
             @endif
 
             @if(Auth::user()->isTypeTeacher())
-                @include('layouts.user-dashboard.dashboard_teacher', ['user' => Auth::user(), 'userPads => $userPads'])
+                @include('layouts.user-dashboard.dashboard_teacher', ['user' => Auth::user(), 'userPads' => $userPads])
             @endif
 
             @if(Auth::user()->isTypeDirector())

resources/views/download/index.blade.php

+@extends('layouts.main')
+
+@section('title', 'Arquivos')
+@section('header')
+    @include('layouts.header', [
+        'user' => Auth::user(),
+    ])
+@endsection
+@section('nav')
+    @include('layouts.navigation', [
+        'menu' => $menu,
+    ])
+@endsection
+@section('body')
+
+    <div class="d-flex">
+
+        @include('components.cards.file_view', [
+            'title' => 'Grade de Horário (.docx)',
+            'route' => 'download_grade_horario'
+        ])
+
+        @include('components.cards.file_view', [
+            'title' => 'Manual (.pdf)',
+            'route' => 'download_manual'
+        ])
+        
+    </div>
+
+@endsection

resources/views/layouts/guest.blade.php

@@ -3,7 +3,7 @@
 
 <head>
 
-    <title>Avaliação de Desempanho Docente - PAD</title>
+    <title>Avaliação de Desempanho Docente - PDA</title>
 
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
@@ -32,7 +32,7 @@
 
     <div class="stylo p-3 n-flex">
         <h2>Portal de acesso ao</h2>
-        <h3>Plano de Atividades Docentes - PAD</h3>
+        <h3>Plano de Atividades Docentes - PDA</h3>
     </div>
 
     <section class="ftco-section">