Skip to content

GitLab

Commit f8605b4d authored by alissonalbuquerque's avatar alissonalbuquerque
Browse files

Merge branch 'main' into feat_task_time

parents 92bb9a49 f49e28fd
Hide whitespace changes
Inline Side-by-side
resources/views/layouts/user-dashboard/dashboard_coordinator.blade.php
View file @ f8605b4d
......@@ -14,8 +14,8 @@
</div>
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-top">
<ul class="inf-list">
<li><a href="" rel="noopener" target="_blank">Cronograma de atividades PAD 2022</a></li>
<li><a href="" rel="noopener" target="_blank">Informações sobre o processo PAD 2022</a></li>
<li><a href="" rel="noopener" target="_blank">Cronograma de atividades PDA 2023</a></li>
<li><a href="" rel="noopener" target="_blank">Informações sobre o processo PDA 2023</a></li>
</ul>
</div>
</div>
......@@ -23,7 +23,7 @@
<div class="tab-pane" id="pad" role="tabpanel" aria-labelledby="pad-tab">
<div
class="d-flex flex-column justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
<h1 class="h2">Dimenções-PAD</h1>
<h1 class="h2">Dimenções-PDA</h1>
</div>
<div class="d-flex justify-content-start ">
<div class="card text-center" style="width: 18rem;">
......
resources/views/layouts/user-dashboard/dashboard_teacher.blade.php
View file @ f8605b4d
......@@ -22,7 +22,7 @@
<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"> PDA: {{ $userPad->pad->nome }} </h4>
<div class="text-center">
<h4 class="h5"> <span class="badge bg-primary">Horas: {{ $userPad->totalHoras() }}</span> </h4>
</div>
......
resources/views/layouts/user-navigation/navigation_teacher.blade.php
View file @ f8605b4d
......@@ -7,6 +7,7 @@
$home_active = $menu == Menu::HOME ? 'active' : '';
$pads_active = $menu == Menu::PADS ? 'active' : '';
$download_active = $menu == Menu::FILES ? 'active' : '';
@endphp
<!-- SidebarMenu : Vertical Options -->
......@@ -23,4 +24,10 @@
PDAs
</a>
</li>
<li class="nav-item">
<a href="{{ route('download_index') }}" class="custom-nav-link {{ $download_active }}">
<i class="bi bi-file-earmark-arrow-down-fill"></i>
Arquivos
</a>
</li>
</ul>
resources/views/pad/admin/create.blade.php
View file @ f8605b4d
......@@ -19,7 +19,7 @@
<div>
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="pad-tab" data-bs-toggle="tab" data-bs-target="#pad-container" type="button" role="tab" aria-controls="pad-container" arial-selected="true"> PAD </button>
<button class="nav-link active" id="pad-tab" data-bs-toggle="tab" data-bs-target="#pad-container" type="button" role="tab" aria-controls="pad-container" arial-selected="true"> PDA </button>
</li>
</ul>
</div>
......
resources/views/pad/admin/edit.blade.php
View file @ f8605b4d
......@@ -21,7 +21,7 @@
<div>
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="pad-tab" data-bs-toggle="tab" data-bs-target="#pad-container" type="button" role="tab" aria-controls="pad-container" arial-selected="true"> PAD </button>
<button class="nav-link active" id="pad-tab" data-bs-toggle="tab" data-bs-target="#pad-container" type="button" role="tab" aria-controls="pad-container" arial-selected="true"> PDA </button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link" id="user_pad-tab" data-bs-toggle="tab" data-bs-target="#user_pad-container" type="button" role="tab" aria-controls="user_pad-container" arial-selected="false"> Professores </button>
......@@ -121,7 +121,7 @@
<thead>
<tr>
<th scope="col"> Professor </th>
<th scope="col"> PAD </th>
<th scope="col"> PDA </th>
<th scope="col"> C.H </th>
<th scope="col"> Opções </th>
</tr>
......@@ -169,7 +169,7 @@
<thead>
<tr>
<th scope="col"> Avaliador </th>
<th scope="col"> PAD </th>
<th scope="col"> PDA </th>
<th scope="col"> Dimensão </th>
<th scope="col"> Opções </th>
</tr>
......
resources/views/pad/anexo.blade.php
View file @ f8605b4d
......@@ -14,7 +14,7 @@
@section('body')
<div class="content">
<div class="header" id="bordcab">
<h1 class="titulo pt-4 pb-4 mb-3 border-bottom">PLANO DE ATIVIDADES DOCENTES (PAD)</h1>
<h1 class="titulo pt-4 pb-4 mb-3 border-bottom">PLANO DE ATIVIDADES DOCENTES (PDA)</h1>
<p class="pb-4 mb-3 text-center text-muted align-items-center">ANEXO B</p>
<p class="pb-4 mb-3 text-center text-muted align-items-center">
Insira os dados correspondentes nos campos exibidos abaixo
......
resources/views/pad/avaliacao/index.blade.php
View file @ f8605b4d
......@@ -14,7 +14,7 @@
@section('body')
@include('components.alerts')
<div class="d-flex justify-content-between align-items-center border-bottom">
<h2 class="">PADs</h2>
<h2 class="">PDAs</h2>
</div>
<!-- Tabela -->
......
resources/views/pad/components/confirm_save.blade.php
View file @ f8605b4d
......@@ -13,7 +13,7 @@
<button class="btn btn-l btn-success"
onclick="location.href='{{route('user-pad_pdf', ['user_pad_id' => $user_pad_id])}}'"
data-bs-dismiss="modal">
Sim, salvar PAD
Sim, salvar PDA
</button>
</div>
......
resources/views/pad/relatorio/index.blade.php
View file @ f8605b4d
......@@ -20,7 +20,7 @@
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3">
<h3>
<i class="bi bi-exclamation-octagon-fill"></i>
PADs com Relatórios Disponíveis
PDAs com Relatórios Disponíveis
</h3>
</div>
<div class="d-flex">
......
resources/views/pad/relatorio/relatorio.blade.php
View file @ f8605b4d
......@@ -28,7 +28,7 @@
</div>
<div class="card d-flex">
<div class="card-head d-flex justify-content-center" style="background-color:#dfdfdf; padding-top:10px;">
<h6 class="card-title" style="font-weight:bold;">PROFESSORES QUE NÃO ENVIARAM O PAD</h6>
<h6 class="card-title" style="font-weight:bold;">PROFESSORES QUE NÃO ENVIARAM O PDA</h6>
</div>
<div class="card-body">
......@@ -66,7 +66,7 @@
<div class="card d-flex" style='margin-top:20px;'>
<div class="card-head d-flex justify-content-center" style="background-color:#dfdfdf; padding-top:10px;">
<h6 class="card-title" style="font-weight:bold;">RELAÇÃO DOS PROFESSORES QUE ENVIARAM O PAD</h6>
<h6 class="card-title" style="font-weight:bold;">RELAÇÃO DOS PROFESSORES QUE ENVIARAM O PDA</h6>
</div>
<div class="card-body">
......
resources/views/pad/teacher/index.blade.php
View file @ f8605b4d
......@@ -4,7 +4,7 @@
use App\Models\Util\Status;
@endphp
@section('title', 'PADs')
@section('title', 'PDAs')
@section('header')
@include('layouts.header', [
......
resources/views/pad/teacher/report_pdf.blade.php
View file @ f8605b4d
......@@ -6,7 +6,7 @@
</div>
<div style="display: flex; flex-direction: column">
<p style="margin: 1.1mm"><span>Autor do PAD: {{$data['user']['nome']}}</span></p>
<p style="margin: 1.1mm"><span>Autor do PDA: {{$data['user']['nome']}}</span></p>
<p style="margin: 1.1mm"><span>E-mail do Autor: {{$data['user']['email']}}</span></p>
<p style="margin: 1.1mm"><span>PDF gerado em: {{$data['date']}}</span></p>
</div>
......
resources/views/pad/teacher/view.blade.php
View file @ f8605b4d
......@@ -21,7 +21,7 @@
<h3 class="h3"> DIMENSÕES </h3>
<button class="btn btn-outline-success btn-m btn-save_pad" style="margin-right: 1.2rem">
<i class="bi bi-check-square"></i>
Enviar PAD
Enviar PDA
</button>
</div>
......@@ -75,7 +75,7 @@
<div class="card-body">
<h2 class="text-center"> <i class="bi bi-clock"></i> </h2>
<h3 class="text-center">Horário</h3>
<a class="stretched-link btn-pad-horario" href="{{ route('TaskTimeIndex', ['user_pad_id' => $user_pad_id]) }}"></a>
<a class="stretched-link btn-pad-horario" href="{{ route('task_time_index', ['user_pad_id' => $user_pad_id]) }}"></a>
</div>
</div>
......@@ -100,7 +100,7 @@
<div class="card mx-2" style="width: 10rem;">
<div class="card-body bg-primary">
<h1 class="text-center"> <i class="bi bi-cloud-arrow-down-fill" style="color: #F1F1F1"></i> </h1>
<h5 class="text-center text-white"> Baixar PAD </h4>
<h5 class="text-center text-white"> Baixar PDA </h4>
<div class="text-center">
<h4 class="h5"> <span class="badge" style="color: #32415c;background-color: #fd9d0d">Horas: {{ $ensinoTotalHoras + $gestaoTotalHoras + $pesquisaTotalHoras + $extensaoTotalHoras }}</span> </h4>
</div>
......@@ -111,7 +111,7 @@
@include('components.modal', [
'size' => 'modal-lg',
'header' => 'Salvar PAD?'
'header' => 'Salvar PDA?'
])
@endsection
......
resources/views/task-time/create.blade.php
View file @ f8605b4d
......@@ -2,7 +2,7 @@
use App\Models\TaskTime;
@endphp
<form id="task-time-form" action="{{ route('TaskTimeSave') }}" method="post">
<form id="task-time-form" action="{{ route('task_time_save') }}" method="post">
@csrf
@method('POST')
......@@ -94,7 +94,7 @@
@include('pad.components.scripts.ajaxValidation', [
'btn_submit_id' => 'btn_submit',
'form_id' => 'task-time-form',
'route' => route('TaskTimeValidation'),
'route' => route('task_time_validation'),
'form_type' => 'create',
])
......@@ -117,7 +117,7 @@
}
},
ajax: {
url: '{{ route("TaskSearch") }}',
url: '{{ route("task_search") }}',
data: function(params) {
return {
q: params.term,
......@@ -150,7 +150,7 @@
tarefa_id.val(_tarefa_id)
$.ajax({
url: '{{ route("TaskTimeSearchTask") }}',
url: '{{ route("task_time_search") }}',
type: 'GET',
data: {
tarefa_id: _tarefa_id,
......
resources/views/task-time/index.blade.php
View file @ f8605b4d
......@@ -27,50 +27,29 @@
@php
use App\Models\TaskTime;
// $hours = ['07:30', '08:20', '09:10', '10:00', '10:50', '11:40', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '19:00', '19:45', '20:30', '21:15'];
$rangeHours = [
['07:30', '08:20'],
['08:20', '09:10'],
['09:10', '10:00'],
['10:00', '10:50'],
['10:50', '11:40'],
['11:40', '12:30'],
['12:30', '13:30'],
['13:30', '14:30'],
['14:30', '15:30'],
['15:30', '16:30'],
['16:30', '17:30'],
['17:30', '19:00'],
['19:00', '19:45'],
['19:45', '20:30'],
['20:30', '21:15'],
['21:15', '21:15'],
];
$calendar = [];
$row = [];
foreach ($rangeHours as $rangeHour)
{
$start_time = $rangeHour[0];
$end_time = $rangeHour[1];
$row[0] = $start_time;
foreach (array_keys(TaskTime::listWeekDays()) as $weekday)
{
$row[$weekday] =
TaskTime::where('user_pad_id', '=', $user_pad_id)
->where('weekday', '=', $weekday)
->where(function($query) use ($rangeHour) {
$query->orWhereBetween('start_time', $rangeHour)->orWhereBetween('end_time', $rangeHour);
})->first();
$row[$weekday] = $row[$weekday] ? $row[$weekday] : '';
$weekColumns = [];
$max_len_column = 0;
foreach (array_keys(TaskTime::listWeekDays()) as $weekday) {
$weekColumns[$weekday] =
TaskTime::whereWeekday($weekday)
->orderBy('start_time', 'ASC')
->get();
if(count($weekColumns[$weekday]) > $max_len_column) {
$max_len_column = count($weekColumns[$weekday]);
}
}
foreach (range(0, $max_len_column-1) as $i) {
$row = [];
foreach (array_keys(TaskTime::listWeekDays()) as $weekday) {
isset($weekColumns[$weekday][$i]) ? array_push($row, $weekColumns[$weekday][$i]) : array_push($row, null);
}
$calendar[] = $row;
}
@endphp
......@@ -80,25 +59,33 @@
<table class="table table-hover">
<thead>
<tr>
@foreach(TaskTime::listWeekDaysTable() as $key => $weekday)
<th scope="col">{{$weekday}}</th>
@foreach(TaskTime::listWeekDays() as $key => $weekday)
<th scope="col" class="text-center">{{$weekday}}</th>
@endforeach
</tr>
</thead>
<tbody>
@foreach($calendar as $rowHour)
@foreach($calendar as $row)
<tr>
@foreach ($rowHour as $model)
@if(gettype($model) == 'string')
<th scope="col">{{ $model }}</th>
@endif
@foreach ($row as $model)
@if(gettype($model) == 'object')
@if($model !== null)
<td>
<a href="#modal" class="btn btn-edit_task" id="{{ $model->id }}">
{{ "{$model->getCode()} : {$model->getName()}" }}
</a>
<div class="card">
<div class="card-header">
<p class="text-center"> <i class="bi bi-clock"></i> {{ $model->formatStartTime() }} </p>
</div>
<div class="card-body">
<div class="text-center">
<a href="#modal" class="btn btn-edit_task" id="{{ $model->id }}">
{{ "{$model->getCode()} : {$model->getName()}" }} <i class="bi bi-pencil"></i>
</a>
</div>
</div>
<div class="card-header">
<p class="text-center"> <i class="bi bi-clock-fill"></i> {{ $model->formatEndTime() }} </p>
</div>
</div>
</td>
@endif
......@@ -119,39 +106,14 @@
@include('pad.components.scripts.dimensao.ensino.show_modal', [
'modal_id' => 'modal',
'route' => route('TaskTimeCreate', ['user_pad_id' => $user_pad_id]),
'route' => route('task_time_create', ['user_pad_id' => $user_pad_id]),
'btn_class' => 'task-time-create',
])
@include('pad.components.scripts.dimensao.ensino.show_modal', [
'modal_id' => 'modal',
'route' => route('TaskTimeEdit'),
'route' => route('task_time_edit'),
'btn_class' => 'btn-edit_task',
])
@endsection
{{-- @include('components.buttons.btn-edit', [
'route' => route('TaskTimeEdit', ['id' => $model->id])
])
@include('components.buttons.btn-delete', [
'id' => $model->id,
'route' => route('TaskTimeDelete', ['id' => $model->id])
]) --}}
{{-- @foreach($listTaskTime as $key => $taskTimes)
<tr>
@foreach($taskTimes as $model)
@if(gettype($model) == 'string')
<th>{{ $model }}</th>
@endif
@if(gettype($model) == 'object')
@endif
@endforeach
</tr>
@endforeach --}}
\ No newline at end of file
@endsection
\ No newline at end of file
resources/views/task-time/update.blade.php
View file @ f8605b4d
......@@ -6,12 +6,12 @@
*/
@endphp
<form id="form-delete-{{$model->id}}" action="{{ route('TaskTimeDelete', ['id' => $model->id]) }}" method="post">
<form id="form-delete-{{$model->id}}" action="{{ route('task_time_delete', ['id' => $model->id]) }}" method="post">
@method('DELETE')
@csrf
</form>
<form id="task-time-update-form" action="{{ route('TaskTimeUpdate', ['id' => $model->id]) }}" method="post">
<form id="task-time-update-form" action="{{ route('task_time_update', ['id' => $model->id]) }}" method="post">
@csrf
@method('POST')
......@@ -115,7 +115,7 @@
@include('pad.components.scripts.ajaxValidation', [
'btn_submit_id' => 'btn_submit',
'form_id' => 'task-time-update-form',
'route' => route('TaskTimeValidation'),
'route' => route('task_time_validation'),
'form_type' => 'update',
])
......@@ -138,7 +138,7 @@
}
},
ajax: {
url: '{{ route("TaskSearch") }}',
url: '{{ route("task_search") }}',
data: function(params) {
return {
q: params.term,
......@@ -171,7 +171,7 @@
tarefa_id.val(_tarefa_id)
$.ajax({
url: '{{ route("TaskTimeSearchTask") }}',
url: '{{ route("task_time_search") }}',
type: 'GET',
data: {
tarefa_id: _tarefa_id,
......
resources/views/user-pad/create.blade.php
View file @ f8605b4d
<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">
......
routes/Task.php
View file @ f8605b4d
......@@ -4,6 +4,6 @@ use App\Http\Controllers\TaskController;
use Illuminate\Support\Facades\Route;
Route::prefix('/tarefa/geral')->group(function () {
Route::get('/search', [TaskController::class, 'search'])->name('TaskSearch');
Route::get('/search-by-id', [TaskController::class, 'searchById'])->name('TaskSearchById');
Route::get('/search', [TaskController::class, 'search'])->name('task_search');
Route::get('/search-by-id', [TaskController::class, 'searchById'])->name('task_search_by_id');
});
\ No newline at end of file
routes/TaskTime.php → routes/task_time.php
View file @ f8605b4d
......@@ -4,12 +4,12 @@ use App\Http\Controllers\TaskTimeController;
use Illuminate\Support\Facades\Route;
Route::prefix('/tarefa/horario')->group(function () {
Route::get('/index/{user_pad_id}', [TaskTimeController::class, 'index'])->name('TaskTimeIndex');
Route::get('/create/{user_pad_id}', [TaskTimeController::class, 'create'])->name('TaskTimeCreate');
Route::post('/save', [TaskTimeController::class, 'save'])->name('TaskTimeSave');
Route::get('/edit/{id?}', [TaskTimeController::class, 'edit'])->name('TaskTimeEdit');
Route::post('/update/{id}', [TaskTimeController::class, 'update'])->name('TaskTimeUpdate');
Route::delete('/delete/{id}', [TaskTimeController::class, 'delete'])->name('TaskTimeDelete');
Route::get('/search-task', [TaskTimeController::class, 'searchTask'])->name('TaskTimeSearchTask');
Route::post('/validation', [TaskTimeController::class, 'ajaxValidation'])->name('TaskTimeValidation');
Route::get('/index/{user_pad_id}', [TaskTimeController::class, 'index'])->name('task_time_index');
Route::get('/create/{user_pad_id}', [TaskTimeController::class, 'create'])->name('task_time_create');
Route::post('/save', [TaskTimeController::class, 'save'])->name('task_time_save');
Route::get('/edit/{id?}', [TaskTimeController::class, 'edit'])->name('task_time_edit');
Route::post('/update/{id}', [TaskTimeController::class, 'update'])->name('task_time_update');
Route::delete('/delete/{id}', [TaskTimeController::class, 'delete'])->name('task_time_delete');
Route::get('/search-task', [TaskTimeController::class, 'searchTask'])->name('task_time_search');
Route::post('/validation', [TaskTimeController::class, 'ajaxValidation'])->name('task_time_validation');
});
routes/web.php
View file @ f8605b4d
......@@ -7,10 +7,11 @@ use App\Http\Controllers\CoordenadorController;
use App\Http\Controllers\DiretorController;
use App\Http\Controllers\ProfessorController;
use App\Http\Controllers\AvaliadorController;
use App\Http\Controllers\DownloadFileController;
use App\Http\Controllers\PadController;
use App\Http\Controllers\PDFController;
use FontLib\Table\Type\name;
use Illuminate\Support\Facades\Route;
/*
......@@ -48,7 +49,7 @@ require __DIR__ . '/user_type.php';
require __DIR__ . '/Task.php';
require __DIR__ . '/TaskTime.php';
require __DIR__ . '/task_time.php';
require __DIR__ . '/dimensao/dimensao.php';
......@@ -107,5 +108,11 @@ Route::prefix('/user')->group(function () {
Route::post('/update/password', [UserController::class, 'updatePassword'])->name('update_password');
});
Route::prefix('/download')->group(function() {
Route::get('/index', [DownloadFileController::class, 'index'])->name('download_index');
Route::get('/grade-horario', [DownloadFileController::class, 'degreeSchedule'])->name('download_grade_horario');
Route::get('/manual', [DownloadFileController::class, 'manual'])->name('download_manual');
});
// Simple concept test of creating a LOREM IPSUM With Barryvdh-DomPDF
Route::get('generate-pdf',[PDFController::class, 'generatePDF']);
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