Skip to content

GitLab

"app/Http/vscode:/vscode.git/clone" did not exist on "c60a8fb935bdb2d39a2e61d8e4d9e6ff4e61e5f7"
Commit a23c72a9 authored by alissonalbuquerque's avatar alissonalbuquerque
Browse files

Merge branch 'avaliacao_de_tarefas' into anexoB

parents b0eb270d da6b6a26
Show whitespace changes
Inline Side-by-side
app/Http/Controllers/AvaliadorController.php
View file @ a23c72a9
...@@ -2,10 +2,12 @@ ...@@ -2,10 +2,12 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Models\Avaliacao;
use App\Models\User; use App\Models\User;
use App\Models\Curso; use App\Models\Curso;
use App\Models\Util\MenuItemsAvaliador; use App\Models\Util\MenuItemsAvaliador;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
class AvaliadorController extends Controller class AvaliadorController extends Controller
...@@ -24,21 +26,50 @@ class AvaliadorController extends Controller ...@@ -24,21 +26,50 @@ class AvaliadorController extends Controller
]); ]);
} }
public function avaliar() public function avaliar(Request $req)
{ {
// $professores = User::where('type', '=', User::->isTypeTeacher())->get(); $validated = $req->validate(
return view('pad.avaliacao.dimensao.ensino', [ [
'index_menu' => MenuItemsAvaliador::PADs, 'tarefa_id' => ['required', 'integer'],
'user_pad_id' => 1 'status' => ['required', 'integer'],
]); 'professor_id' => ['required', 'integer'],
'atividade_type' => ['required', 'integer'],
'descricao' => ['nullable', 'string'],
'hora_reajuste' => ['nullable', 'integer'],
],
[
'required' => 'O campo de :attribute é obrigatório',
]
);
if ($validated) {
$user = Auth::user();
$avaliacao = Avaliacao::where(function ($query) use ($req) {
$query->where('tarefa_id', '=', $req->tarefa_id);
$query->where('type', '=', $req->atividade_type);
})->first();
if (!$avaliacao) {
dd('Avaliação não encontrada');
}
$avaliacao->status = $req->status;
$avaliacao->avaliador_id = $user->id;
$avaliacao->descricao = $req->descricao ? $req->descricao : NULL;
$avaliacao->horas_reajuste = $req->hora_reajuste;
if ($avaliacao->save()) {
return redirect()->back();
}
}
} }
/** /**
* @param integer $id * @param integer $id
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function view($id) { public function view($id)
{
} }
/** /**
...@@ -48,7 +79,6 @@ class AvaliadorController extends Controller ...@@ -48,7 +79,6 @@ class AvaliadorController extends Controller
*/ */
public function create() public function create()
{ {
} }
/** /**
...@@ -57,12 +87,11 @@ class AvaliadorController extends Controller ...@@ -57,12 +87,11 @@ class AvaliadorController extends Controller
*/ */
public function store(Request $request) public function store(Request $request)
{ {
} }
public function anexo() public function anexo()
{ {
return view('pad.anexo', ['index_menu' => 1 ]); return view('pad.anexo', ['index_menu' => 1]);
} }
/** /**
...@@ -87,8 +116,8 @@ class AvaliadorController extends Controller ...@@ -87,8 +116,8 @@ class AvaliadorController extends Controller
} }
public function delete($id) { public function delete($id)
{
} }
/** /**
...@@ -99,6 +128,5 @@ class AvaliadorController extends Controller ...@@ -99,6 +128,5 @@ class AvaliadorController extends Controller
*/ */
public function destroy($id) public function destroy($id)
{ {
} }
} }
app/Http/Controllers/AvaliadorPadController.php
View file @ a23c72a9
...@@ -153,10 +153,12 @@ class AvaliadorPadController extends Controller ...@@ -153,10 +153,12 @@ class AvaliadorPadController extends Controller
return Response::json(['message' => true, 'status' => 200]); return Response::json(['message' => true, 'status' => 200]);
$validator = Validator::make( $validator = Validator::make(
$request->all(), AvaliadorPad::rules(), AvaliadorPad::messages() $request->all(),
AvaliadorPad::rules(),
AvaliadorPad::messages()
); );
if($validator->passes()) { if ($validator->passes()) {
return Response::json(['message' => true, 'status' => 200]); return Response::json(['message' => true, 'status' => 200]);
} }
......
app/Http/Controllers/DashboardController.php
View file @ a23c72a9
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Models\AvaliadorPad;
use App\Models\Pad; use App\Models\Pad;
use App\Models\Tabelas\Constants; use App\Models\Tabelas\Constants;
use App\Models\UserPad; use App\Models\UserPad;
...@@ -17,41 +18,37 @@ use Illuminate\Support\Facades\Auth; ...@@ -17,41 +18,37 @@ use Illuminate\Support\Facades\Auth;
class DashboardController extends Controller class DashboardController extends Controller
{ {
public function index() { public function index()
{
$user = Auth::user(); $user = Auth::user();
if($user->isTypeAdmin()) if ($user->isTypeAdmin()) {
{ return view('dashboard', ['menu' => Menu::HOME]);
return view('dashboard',['menu' => Menu::HOME]);
} }
if($user->isTypeTeacher()) if ($user->isTypeTeacher()) {
{
$userPads = UserPad::whereUserId($user->id)->whereStatus(Status::ATIVO)->get(); $userPads = UserPad::whereUserId($user->id)->whereStatus(Status::ATIVO)->get();
return view('dashboard', ['userPads' => $userPads, 'menu'=> Menu::HOME]); return view('dashboard', ['userPads' => $userPads, 'menu' => Menu::HOME]);
} }
if($user->isTypeDirector()) if ($user->isTypeDirector()) {
{ return view('dashboard', ['PADs' => Pad::all(), 'menu' => Menu::HOME]);
return view('dashboard', ['PADs' => Pad::all(), 'menu'=> Menu::HOME]);
} }
if($user->isTypeCoordinator()) if ($user->isTypeCoordinator()) {
{ return view('dashboard', ['PADs' => Pad::all(), 'menu' => Menu::HOME]);
return view('dashboard', ['PADs' => Pad::all(), 'menu'=> Menu::HOME]);
} }
if($user->isTypeEvaluator()) if ($user->isTypeEvaluator()) {
{
$userPads = $userPads =
UserPad::initQuery() AvaliadorPad::where('user_id', '=', $user->id)
->whereUser($user->id) ->join('pad', 'avaliador_pad.pad_id', '=', 'pad.id')
->wherePadStatus(Status::ATIVO) ->where('pad.status', '=', Status::ATIVO)
->get(); ->get();
return view('dashboard', ['userPads' => $userPads, 'menu'=> Menu::HOME]); return view('dashboard', ['userPads' => $userPads, 'menu' => Menu::HOME]);
} }
//return redirect()->route('login'); //return redirect()->route('login');
......
app/Http/Controllers/PadController.php
View file @ a23c72a9
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\AvaliadorPad;
use App\Models\AvaliadorPadDimensao;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Models\Pad; use App\Models\Pad;
use App\Models\Tabelas\Constants; use App\Models\Tabelas\Constants;
...@@ -34,10 +36,13 @@ use App\Models\User; ...@@ -34,10 +36,13 @@ use App\Models\User;
use App\Models\UserPad; use App\Models\UserPad;
use App\Models\UserType; use App\Models\UserType;
use App\Models\UserTypePad; use App\Models\UserTypePad;
use App\Models\Util\Avaliacao as AvaliacaoUtil;
use App\Models\Util\Dimensao;
use App\Models\Util\Menu; use App\Models\Util\Menu;
use App\Models\Util\MenuItemsAdmin; use App\Models\Util\MenuItemsAdmin;
use App\Models\Util\MenuItemsTeacher; use App\Models\Util\MenuItemsTeacher;
use App\Models\Util\Status; use App\Models\Util\Status;
use App\Models\Util\MenuItemsAvaliador;
use Database\Seeders\PadSeeder; use Database\Seeders\PadSeeder;
use Exception; use Exception;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
...@@ -54,16 +59,14 @@ class PadController extends Controller ...@@ -54,16 +59,14 @@ class PadController extends Controller
*/ */
public function index() public function index()
{ {
if(Auth::user()->isTypeAdmin()) if (Auth::user()->isTypeAdmin()) {
{
$users = User::initQuery()->whereType(UserType::TEACHER)->get(); $users = User::initQuery()->whereType(UserType::TEACHER)->get();
$pads = Pad::all(); $pads = Pad::all();
$menu = Menu::PADS; $menu = Menu::PADS;
return view('pad.admin.index', ['menu' => $menu, 'pads' => $pads]); return view('pad.admin.index', ['menu' => $menu, 'pads' => $pads]);
} }
if(Auth::user()->isTypeTeacher()) if (Auth::user()->isTypeTeacher()) {
{
$menu = Menu::PADS; $menu = Menu::PADS;
$userPads = UserPad::whereUserId(Auth::user()->id)->get(); $userPads = UserPad::whereUserId(Auth::user()->id)->get();
...@@ -145,7 +148,8 @@ class PadController extends Controller ...@@ -145,7 +148,8 @@ class PadController extends Controller
*/ */
public function store(Request $request) public function store(Request $request)
{ {
$validated = $request->validate([ $validated = $request->validate(
[
'nome' => ['required', 'string', 'min:6', 'max:255'], 'nome' => ['required', 'string', 'min:6', 'max:255'],
'status' => ['required', 'integer'], 'status' => ['required', 'integer'],
'data_inicio' => ['required', 'date', 'before_or_equal:data_fim'], 'data_inicio' => ['required', 'date', 'before_or_equal:data_fim'],
...@@ -157,24 +161,21 @@ class PadController extends Controller ...@@ -157,24 +161,21 @@ class PadController extends Controller
'nome.max' => 'O campo de :attribute deve ter no máximo 255 letras', 'nome.max' => 'O campo de :attribute deve ter no máximo 255 letras',
'data_inicio.before_or_equal' => 'A :attribute deve ser uma data anterior ou igual a data de fim', 'data_inicio.before_or_equal' => 'A :attribute deve ser uma data anterior ou igual a data de fim',
'data_fim.after_or_equal' => 'A :attribute deve ser uma data posterior ou igual a data de início', 'data_fim.after_or_equal' => 'A :attribute deve ser uma data posterior ou igual a data de início',
]); ]
);
if($validated) if ($validated) {
{
$model = new Pad($request->all()); $model = new Pad($request->all());
$users = User::initQuery()->whereType(UserType::TEACHER)->get(); $users = User::initQuery()->whereType(UserType::TEACHER)->get();
if($model->save()) if ($model->save()) {
{
$users = User::initQuery()->whereType(UserType::TEACHER)->get(); $users = User::initQuery()->whereType(UserType::TEACHER)->get();
foreach($users as $user) foreach ($users as $user) {
{
$profile = $user->profile(UserType::TEACHER); $profile = $user->profile(UserType::TEACHER);
if($profile) if ($profile) {
{
$userPad = new UserPad(); $userPad = new UserPad();
$userPad->pad_id = $model->id; $userPad->pad_id = $model->id;
$userPad->user_id = $user->id; $userPad->user_id = $user->id;
...@@ -189,12 +190,11 @@ class PadController extends Controller ...@@ -189,12 +190,11 @@ class PadController extends Controller
return redirect()->route('pad_index')->with('success', 'Erro ao cadastrar o PAD!'); return redirect()->route('pad_index')->with('success', 'Erro ao cadastrar o PAD!');
} }
} }
} }
public function anexo() public function anexo()
{ {
return view('pad.anexo', ['index_menu' => 1 ]); return view('pad.anexo', ['index_menu' => 1]);
} }
/** /**
...@@ -237,7 +237,8 @@ class PadController extends Controller ...@@ -237,7 +237,8 @@ class PadController extends Controller
*/ */
public function update(Request $request, $id) public function update(Request $request, $id)
{ {
$validated = $request->validate([ $validated = $request->validate(
[
'nome' => ['required', 'string', 'min:6', 'max:255'], 'nome' => ['required', 'string', 'min:6', 'max:255'],
'status' => ['required', 'integer'], 'status' => ['required', 'integer'],
'data_inicio' => ['required', 'date', 'before_or_equal:data_fim'], 'data_inicio' => ['required', 'date', 'before_or_equal:data_fim'],
...@@ -249,13 +250,14 @@ class PadController extends Controller ...@@ -249,13 +250,14 @@ class PadController extends Controller
'nome.max' => 'O campo de :attribute deve ter no máximo 255 letras', 'nome.max' => 'O campo de :attribute deve ter no máximo 255 letras',
'data_inicio.before_or_equal' => 'A :attribute deve ser uma data anterior ou igual a data de fim', 'data_inicio.before_or_equal' => 'A :attribute deve ser uma data anterior ou igual a data de fim',
'data_fim.after_or_equal' => 'A :attribute deve ser uma data posterior ou igual a data de início', 'data_fim.after_or_equal' => 'A :attribute deve ser uma data posterior ou igual a data de início',
]); ]
);
if($validated) { if ($validated) {
$model = Pad::find($id); $model = Pad::find($id);
$model->fill($request->all()); $model->fill($request->all());
if($model->save()) { if ($model->save()) {
return redirect()->route('pad_index')->with('success', 'PAD atualizado com sucesso!'); return redirect()->route('pad_index')->with('success', 'PAD atualizado com sucesso!');
} else { } else {
return redirect()->route('pad_index')->with('success', 'Erro ao atualizar o PAD!'); return redirect()->route('pad_index')->with('success', 'Erro ao atualizar o PAD!');
...@@ -264,10 +266,11 @@ class PadController extends Controller ...@@ -264,10 +266,11 @@ class PadController extends Controller
} }
public function delete($id) { public function delete($id)
{
$model = Pad::find($id); $model = Pad::find($id);
if($model->delete()) { if ($model->delete()) {
return redirect()->route('pad_index')->with('success', 'PAD removido com sucesso!'); return redirect()->route('pad_index')->with('success', 'PAD removido com sucesso!');
} else { } else {
return redirect()->route('pad_index')->with('fail', 'Não foi possível remover o PAD!'); return redirect()->route('pad_index')->with('fail', 'Não foi possível remover o PAD!');
...@@ -287,4 +290,103 @@ class PadController extends Controller ...@@ -287,4 +290,103 @@ class PadController extends Controller
return redirect('/pad/index'); return redirect('/pad/index');
} }
public function professores($id)
{
$user = Auth::user();
$pad = Pad::find($id);
$index_menu = MenuItemsAvaliador::HOME;
$professores = User::join('user_pad', 'user_pad.user_id', '=', 'users.id')
->join('pad', 'user_pad.pad_id', '=', 'pad.id')
->where(function ($query) use ($user, $id) {
$query->where('pad.status', '=', Status::ATIVO);
$query->where('users.campus_id', '=', $user->campus_id);
$query->where('users.id', '!=', $user->id);
$query->where('pad.id', '=', $id);
})
->select('users.id', 'users.name')
->get();
return view("pad.avaliacao.professores", compact('professores', 'pad', 'index_menu'));
}
public function professor_atividades($id, $professor_id)
{
$pad = Pad::find($id);
$user = Auth::user();
$index_menu = MenuItemsAvaliador::HOME;
$avaliador_pad = AvaliadorPad::where(function ($query) use ($pad, $user) {
$query->where('user_id', '=', $user->id);
$query->where('pad_id', '=', $pad->id);
})->first();
$dimensoes_permitidas = AvaliadorPadDimensao::where('avaliador_pad_id', '=', $avaliador_pad->id)
->select('avaliador_pad_dimensao.dimensao')->get();
$dimensoes = [];
foreach ($dimensoes_permitidas as $dimensao) {
array_push($dimensoes, $dimensao->dimensao);
}
$professor = User::find($professor_id);
$user_pad = UserPad::where(function ($query) use ($pad, $professor) {
$query->where('user_id', '=', $professor->id);
$query->where('pad_id', '=', $pad->id);
})->first();
$niveis = Constants::listNivel();
$modalidades = Constants::listModalidade();
$status = Status::listStatus();
$ensino = [];
$pesquisa = [];
$extensao = [];
$gestao = [];
if (in_array(Dimensao::ENSINO, $dimensoes)) {
$ensino = array_merge($ensino, self::add_tipo_atividade(EnsinoAtendimentoDiscente::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::ENSINO_ATENDIMENTO_DISCENTE)->toArray());
$ensino = array_merge($ensino, self::add_tipo_atividade(EnsinoAula::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::ENSINO_AULA)->toArray());
$ensino = array_merge($ensino, self::add_tipo_atividade(EnsinoCoordenacaoRegencia::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::ENSINO_COORDENACAO_REGENCIA)->toArray());
$ensino = array_merge($ensino, self::add_tipo_atividade(EnsinoMembroDocente::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::ENSINO_MEMBRO_DOCENTE)->toArray());
$ensino = array_merge($ensino, self::add_tipo_atividade(EnsinoOrientacao::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::ENSINO_ORIENTACAO)->toArray());
$ensino = array_merge($ensino, self::add_tipo_atividade(EnsinoOutros::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::ENSINO_OUTROS)->toArray());
$ensino = array_merge($ensino, self::add_tipo_atividade(EnsinoParticipacao::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::ENSINO_PARTICIPACAO)->toArray());
$ensino = array_merge($ensino, self::add_tipo_atividade(EnsinoProjeto::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::ENSINO_PROJETO)->toArray());
$ensino = array_merge($ensino, self::add_tipo_atividade(EnsinoSupervisao::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::ENSINO_SUPERVISAO)->toArray());
}
if (in_array(Dimensao::PESQUISA, $dimensoes)) {
$pesquisa = array_merge($pesquisa, self::add_tipo_atividade(PesquisaCoordenacao::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::PESQUISA_COORDENACAO)->toArray());
$pesquisa = array_merge($pesquisa, self::add_tipo_atividade(PesquisaLideranca::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::PESQUISA_LIDERANCA)->toArray());
$pesquisa = array_merge($pesquisa, self::add_tipo_atividade(PesquisaOrientacao::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::PESQUISA_ORIENTACAO)->toArray());
$pesquisa = array_merge($pesquisa, self::add_tipo_atividade(PesquisaOutros::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::PESQUISA_OUTROS)->toArray());
}
if (in_array(Dimensao::EXTENSAO, $dimensoes)) {
$extensao = array_merge($extensao, self::add_tipo_atividade(ExtensaoCoordenacao::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::EXTENSAO_COORDENACAO)->toArray());
$extensao = array_merge($extensao, self::add_tipo_atividade(ExtensaoOrientacao::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::EXTENSAO_ORIENTACAO)->toArray());
$extensao = array_merge($extensao, self::add_tipo_atividade(ExtensaoOutros::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::EXTENSAO_OUTROS)->toArray());
}
if (in_array(Dimensao::GESTAO, $dimensoes)) {
$gestao = array_merge($gestao, self::add_tipo_atividade(GestaoCoordenacaoLaboratoriosDidaticos::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::GESTAO_COORDENACAO_LABORATORIOS_DIDATICOS)->toArray());
$gestao = array_merge($gestao, self::add_tipo_atividade(GestaoCoordenacaoProgramaInstitucional::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::GESTAO_COORDENACAO_PROGRAMA_INSTITUCIONAL)->toArray());
$gestao = array_merge($gestao, self::add_tipo_atividade(GestaoMembroCamaras::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::GESTAO_MEMBRO_CAMARAS)->toArray());
$gestao = array_merge($gestao, self::add_tipo_atividade(GestaoMembroComissao::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::GESTAO_MEMBRO_COMISSAO)->toArray());
$gestao = array_merge($gestao, self::add_tipo_atividade(GestaoMembroConselho::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::GESTAO_MEMBRO_CONSELHO)->toArray());
$gestao = array_merge($gestao, self::add_tipo_atividade(GestaoMembroTitularConselho::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::GESTAO_MEMBRO_TITULAR_CONSELHO)->toArray());
$gestao = array_merge($gestao, self::add_tipo_atividade(GestaoOutros::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::GESTAO_OUTROS)->toArray());
$gestao = array_merge($gestao, self::add_tipo_atividade(GestaoRepresentanteUnidadeEducacao::where('user_pad_id', '=', $user_pad->id)->get(), AvaliacaoUtil::GESTAO_REPRESENTANTE_UNIDADE_EDUCACAO)->toArray());
}
return view('pad.avaliacao.taferas_professor', compact('pad', 'index_menu', 'professor', 'ensino', 'pesquisa', 'extensao', 'gestao', 'niveis', 'modalidades'));
}
private function add_tipo_atividade($query, $type)
{
foreach ($query as &$atividade) {
$atividade['tipo_atividade'] = $type;
}
return $query;
}
} }
app/Models/Avaliacao.php
View file @ a23c72a9
...@@ -11,7 +11,7 @@ class Avaliacao extends Model ...@@ -11,7 +11,7 @@ class Avaliacao extends Model
protected $table = 'avaliacao'; protected $table = 'avaliacao';
protected $fillable = ['tarefa_id', 'avaliador_id', 'type', 'status', 'descricao', 'ch_semanal']; protected $fillable = ['tarefa_id', 'avaliador_id', 'type', 'status', 'descricao', 'ch_semanal', 'hora_reajuste'];
public function tarefa() { public function tarefa() {
......
app/Models/Util/Status.php
View file @ a23c72a9
...@@ -10,8 +10,11 @@ class Status ...@@ -10,8 +10,11 @@ class Status
const PENDENTE = 3; const PENDENTE = 3;
const ARQUIVADO = 4; const ARQUIVADO = 4;
const FINALIZADO = 5; const FINALIZADO = 5;
const REPROVADO = 6;
const APROVADO = 7;
public static function listStatus($value = null) { public static function listStatus($value = null)
{
$values = [ $values = [
self::ATIVO => 'Ativo', self::ATIVO => 'Ativo',
...@@ -19,18 +22,21 @@ class Status ...@@ -19,18 +22,21 @@ class Status
self::PENDENTE => 'Pendente', self::PENDENTE => 'Pendente',
self::ARQUIVADO => 'Arquivado', self::ARQUIVADO => 'Arquivado',
self::FINALIZADO => 'Finalizado', self::FINALIZADO => 'Finalizado',
self::REPROVADO => 'Reprovado',
self::APROVADO => 'Aprovado'
]; ];
return $value !== null? $values[$value] : $values; return $value !== null ? $values[$value] : $values;
} }
public static function listUserTypeStatus($value = null) { public static function listUserTypeStatus($value = null)
{
$values = [ $values = [
self::ATIVO => 'Ativo', self::ATIVO => 'Ativo',
self::INATIVO => 'Inativo', self::INATIVO => 'Inativo',
]; ];
return $value !== null? $values[$value] : $values; return $value !== null ? $values[$value] : $values;
} }
} }
composer.lock
View file @ a23c72a9
...@@ -373,16 +373,16 @@ ...@@ -373,16 +373,16 @@
}, },
{ {
"name": "doctrine/dbal", "name": "doctrine/dbal",
"version": "3.5.3", "version": "3.6.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/dbal.git", "url": "https://github.com/doctrine/dbal.git",
"reference": "88fa7e5189fd5ec6682477044264dc0ed4e3aa1e" "reference": "57815c7bbcda3cd18871d253c1dd8cbe56f8526e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/88fa7e5189fd5ec6682477044264dc0ed4e3aa1e", "url": "https://api.github.com/repos/doctrine/dbal/zipball/57815c7bbcda3cd18871d253c1dd8cbe56f8526e",
"reference": "88fa7e5189fd5ec6682477044264dc0ed4e3aa1e", "reference": "57815c7bbcda3cd18871d253c1dd8cbe56f8526e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -395,13 +395,14 @@ ...@@ -395,13 +395,14 @@
"psr/log": "^1|^2|^3" "psr/log": "^1|^2|^3"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "11.0.0", "doctrine/coding-standard": "11.1.0",
"fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2022.3", "jetbrains/phpstorm-stubs": "2022.3",
"phpstan/phpstan": "1.9.4", "phpstan/phpstan": "1.10.3",
"phpstan/phpstan-strict-rules": "^1.4", "phpstan/phpstan-strict-rules": "^1.5",
"phpunit/phpunit": "9.5.27", "phpunit/phpunit": "9.6.4",
"psalm/plugin-phpunit": "0.18.4", "psalm/plugin-phpunit": "0.18.4",
"squizlabs/php_codesniffer": "3.7.1", "squizlabs/php_codesniffer": "3.7.2",
"symfony/cache": "^5.4|^6.0", "symfony/cache": "^5.4|^6.0",
"symfony/console": "^4.4|^5.4|^6.0", "symfony/console": "^4.4|^5.4|^6.0",
"vimeo/psalm": "4.30.0" "vimeo/psalm": "4.30.0"
...@@ -464,7 +465,7 @@ ...@@ -464,7 +465,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/doctrine/dbal/issues", "issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/3.5.3" "source": "https://github.com/doctrine/dbal/tree/3.6.1"
}, },
"funding": [ "funding": [
{ {
...@@ -480,7 +481,7 @@ ...@@ -480,7 +481,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-12T10:21:44+00:00" "time": "2023-03-02T19:26:24+00:00"
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",
...@@ -1051,28 +1052,29 @@ ...@@ -1051,28 +1052,29 @@
"type": "github" "type": "github"
} }
], ],
"abandoned": true,
"time": "2022-02-23T14:25:13+00:00" "time": "2022-02-23T14:25:13+00:00"
}, },
{ {
"name": "graham-campbell/result-type", "name": "graham-campbell/result-type",
"version": "v1.1.0", "version": "v1.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/GrahamCampbell/Result-Type.git", "url": "https://github.com/GrahamCampbell/Result-Type.git",
"reference": "a878d45c1914464426dc94da61c9e1d36ae262a8" "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8", "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831",
"reference": "a878d45c1914464426dc94da61c9e1d36ae262a8", "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2.5 || ^8.0", "php": "^7.2.5 || ^8.0",
"phpoption/phpoption": "^1.9" "phpoption/phpoption": "^1.9.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^8.5.28 || ^9.5.21" "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
...@@ -1101,7 +1103,7 @@ ...@@ -1101,7 +1103,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/GrahamCampbell/Result-Type/issues", "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
"source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.0" "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.1"
}, },
"funding": [ "funding": [
{ {
...@@ -1113,7 +1115,7 @@ ...@@ -1113,7 +1115,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-07-30T15:56:11+00:00" "time": "2023-02-25T20:23:15+00:00"
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
...@@ -1329,16 +1331,16 @@ ...@@ -1329,16 +1331,16 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "2.4.3", "version": "2.4.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "67c26b443f348a51926030c83481b85718457d3d" "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d", "url": "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf",
"reference": "67c26b443f348a51926030c83481b85718457d3d", "reference": "3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1428,7 +1430,7 @@ ...@@ -1428,7 +1430,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.4.3" "source": "https://github.com/guzzle/psr7/tree/2.4.4"
}, },
"funding": [ "funding": [
{ {
...@@ -1444,7 +1446,7 @@ ...@@ -1444,7 +1446,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-10-26T14:07:24+00:00" "time": "2023-03-09T13:19:02+00:00"
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
...@@ -1746,16 +1748,16 @@ ...@@ -1746,16 +1748,16 @@
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
"version": "v2.8.0", "version": "v2.8.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/tinker.git", "url": "https://github.com/laravel/tinker.git",
"reference": "74d0b287cc4ae65d15c368dd697aae71d62a73ad" "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/tinker/zipball/74d0b287cc4ae65d15c368dd697aae71d62a73ad", "url": "https://api.github.com/repos/laravel/tinker/zipball/04a2d3bd0d650c0764f70bf49d1ee39393e4eb10",
"reference": "74d0b287cc4ae65d15c368dd697aae71d62a73ad", "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1808,22 +1810,22 @@ ...@@ -1808,22 +1810,22 @@
], ],
"support": { "support": {
"issues": "https://github.com/laravel/tinker/issues", "issues": "https://github.com/laravel/tinker/issues",
"source": "https://github.com/laravel/tinker/tree/v2.8.0" "source": "https://github.com/laravel/tinker/tree/v2.8.1"
}, },
"time": "2023-01-10T18:03:30+00:00" "time": "2023-02-15T16:40:09+00:00"
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
"version": "2.3.8", "version": "2.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/commonmark.git", "url": "https://github.com/thephpleague/commonmark.git",
"reference": "c493585c130544c4e91d2e0e131e6d35cb0cbc47" "reference": "d44a24690f16b8c1808bf13b1bd54ae4c63ea048"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c493585c130544c4e91d2e0e131e6d35cb0cbc47", "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d44a24690f16b8c1808bf13b1bd54ae4c63ea048",
"reference": "c493585c130544c4e91d2e0e131e6d35cb0cbc47", "reference": "d44a24690f16b8c1808bf13b1bd54ae4c63ea048",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1859,7 +1861,7 @@ ...@@ -1859,7 +1861,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-main": "2.4-dev" "dev-main": "2.5-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -1916,7 +1918,7 @@ ...@@ -1916,7 +1918,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-12-10T16:02:17+00:00" "time": "2023-03-24T15:16:10+00:00"
}, },
{ {
"name": "league/config", "name": "league/config",
...@@ -2152,16 +2154,16 @@ ...@@ -2152,16 +2154,16 @@
}, },
{ {
"name": "maatwebsite/excel", "name": "maatwebsite/excel",
"version": "3.1.46", "version": "3.1.48",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/SpartnerNL/Laravel-Excel.git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git",
"reference": "ba0b9b9305d5b603c3938d4d1d4a13025c92c241" "reference": "6d0fe2a1d195960c7af7bf0de760582da02a34b9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/ba0b9b9305d5b603c3938d4d1d4a13025c92c241", "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/6d0fe2a1d195960c7af7bf0de760582da02a34b9",
"reference": "ba0b9b9305d5b603c3938d4d1d4a13025c92c241", "reference": "6d0fe2a1d195960c7af7bf0de760582da02a34b9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2216,7 +2218,7 @@ ...@@ -2216,7 +2218,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues",
"source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.46" "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.48"
}, },
"funding": [ "funding": [
{ {
...@@ -2228,7 +2230,7 @@ ...@@ -2228,7 +2230,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2023-01-26T20:40:09+00:00" "time": "2023-02-22T21:01:38+00:00"
}, },
{ {
"name": "maennchen/zipstream-php", "name": "maennchen/zipstream-php",
...@@ -2417,16 +2419,16 @@ ...@@ -2417,16 +2419,16 @@
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
"version": "2.8.0", "version": "2.9.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/monolog.git", "url": "https://github.com/Seldaek/monolog.git",
"reference": "720488632c590286b88b80e62aa3d3d551ad4a50" "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50", "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
"reference": "720488632c590286b88b80e62aa3d3d551ad4a50", "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2441,7 +2443,7 @@ ...@@ -2441,7 +2443,7 @@
"doctrine/couchdb": "~1.0@dev", "doctrine/couchdb": "~1.0@dev",
"elasticsearch/elasticsearch": "^7 || ^8", "elasticsearch/elasticsearch": "^7 || ^8",
"ext-json": "*", "ext-json": "*",
"graylog2/gelf-php": "^1.4.2", "graylog2/gelf-php": "^1.4.2 || ^2@dev",
"guzzlehttp/guzzle": "^7.4", "guzzlehttp/guzzle": "^7.4",
"guzzlehttp/psr7": "^2.2", "guzzlehttp/psr7": "^2.2",
"mongodb/mongodb": "^1.8", "mongodb/mongodb": "^1.8",
...@@ -2503,7 +2505,7 @@ ...@@ -2503,7 +2505,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/Seldaek/monolog/issues", "issues": "https://github.com/Seldaek/monolog/issues",
"source": "https://github.com/Seldaek/monolog/tree/2.8.0" "source": "https://github.com/Seldaek/monolog/tree/2.9.1"
}, },
"funding": [ "funding": [
{ {
...@@ -2515,7 +2517,7 @@ ...@@ -2515,7 +2517,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-07-24T11:55:47+00:00" "time": "2023-02-06T13:44:46+00:00"
}, },
{ {
"name": "myclabs/php-enum", "name": "myclabs/php-enum",
...@@ -2832,16 +2834,16 @@ ...@@ -2832,16 +2834,16 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v4.15.3", "version": "v4.15.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039" "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
"reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039", "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2882,9 +2884,9 @@ ...@@ -2882,9 +2884,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/nikic/PHP-Parser/issues", "issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3" "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4"
}, },
"time": "2023-01-16T22:05:37+00:00" "time": "2023-03-05T19:49:14+00:00"
}, },
{ {
"name": "opis/closure", "name": "opis/closure",
...@@ -2953,16 +2955,16 @@ ...@@ -2953,16 +2955,16 @@
}, },
{ {
"name": "phpoffice/phpspreadsheet", "name": "phpoffice/phpspreadsheet",
"version": "1.27.0", "version": "1.28.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
"reference": "eeb8582f9cabf5a7f4ef78015691163233a1834f" "reference": "6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/eeb8582f9cabf5a7f4ef78015691163233a1834f", "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a",
"reference": "eeb8582f9cabf5a7f4ef78015691163233a1834f", "reference": "6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2989,7 +2991,7 @@ ...@@ -2989,7 +2991,7 @@
"psr/simple-cache": "^1.0 || ^2.0 || ^3.0" "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
}, },
"require-dev": { "require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "dev-master", "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
"dompdf/dompdf": "^1.0 || ^2.0", "dompdf/dompdf": "^1.0 || ^2.0",
"friendsofphp/php-cs-fixer": "^3.2", "friendsofphp/php-cs-fixer": "^3.2",
"mitoteam/jpgraph": "^10.2.4", "mitoteam/jpgraph": "^10.2.4",
...@@ -3052,30 +3054,30 @@ ...@@ -3052,30 +3054,30 @@
], ],
"support": { "support": {
"issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.27.0" "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.28.0"
}, },
"time": "2023-01-24T20:07:45+00:00" "time": "2023-02-25T12:24:49+00:00"
}, },
{ {
"name": "phpoption/phpoption", "name": "phpoption/phpoption",
"version": "1.9.0", "version": "1.9.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/schmittjoh/php-option.git", "url": "https://github.com/schmittjoh/php-option.git",
"reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab" "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab", "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dd3a383e599f49777d8b628dadbb90cae435b87e",
"reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab", "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2.5 || ^8.0" "php": "^7.2.5 || ^8.0"
}, },
"require-dev": { "require-dev": {
"bamarni/composer-bin-plugin": "^1.8", "bamarni/composer-bin-plugin": "^1.8.2",
"phpunit/phpunit": "^8.5.28 || ^9.5.21" "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
...@@ -3117,7 +3119,7 @@ ...@@ -3117,7 +3119,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/schmittjoh/php-option/issues", "issues": "https://github.com/schmittjoh/php-option/issues",
"source": "https://github.com/schmittjoh/php-option/tree/1.9.0" "source": "https://github.com/schmittjoh/php-option/tree/1.9.1"
}, },
"funding": [ "funding": [
{ {
...@@ -3129,7 +3131,7 @@ ...@@ -3129,7 +3131,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-07-30T15:51:26+00:00" "time": "2023-02-25T19:38:58+00:00"
}, },
{ {
"name": "psr/cache", "name": "psr/cache",
...@@ -3280,21 +3282,21 @@ ...@@ -3280,21 +3282,21 @@
}, },
{ {
"name": "psr/http-client", "name": "psr/http-client",
"version": "1.0.1", "version": "1.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/http-client.git", "url": "https://github.com/php-fig/http-client.git",
"reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
"reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.0 || ^8.0", "php": "^7.0 || ^8.0",
"psr/http-message": "^1.0" "psr/http-message": "^1.0 || ^2.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
...@@ -3314,7 +3316,7 @@ ...@@ -3314,7 +3316,7 @@
"authors": [ "authors": [
{ {
"name": "PHP-FIG", "name": "PHP-FIG",
"homepage": "http://www.php-fig.org/" "homepage": "https://www.php-fig.org/"
} }
], ],
"description": "Common interface for HTTP clients", "description": "Common interface for HTTP clients",
...@@ -3326,27 +3328,27 @@ ...@@ -3326,27 +3328,27 @@
"psr-18" "psr-18"
], ],
"support": { "support": {
"source": "https://github.com/php-fig/http-client/tree/master" "source": "https://github.com/php-fig/http-client/tree/1.0.2"
}, },
"time": "2020-06-29T06:28:15+00:00" "time": "2023-04-10T20:12:12+00:00"
}, },
{ {
"name": "psr/http-factory", "name": "psr/http-factory",
"version": "1.0.1", "version": "1.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/http-factory.git", "url": "https://github.com/php-fig/http-factory.git",
"reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" "reference": "e616d01114759c4c489f93b099585439f795fe35"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
"reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", "reference": "e616d01114759c4c489f93b099585439f795fe35",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.0.0", "php": ">=7.0.0",
"psr/http-message": "^1.0" "psr/http-message": "^1.0 || ^2.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
...@@ -3366,7 +3368,7 @@ ...@@ -3366,7 +3368,7 @@
"authors": [ "authors": [
{ {
"name": "PHP-FIG", "name": "PHP-FIG",
"homepage": "http://www.php-fig.org/" "homepage": "https://www.php-fig.org/"
} }
], ],
"description": "Common interfaces for PSR-7 HTTP message factories", "description": "Common interfaces for PSR-7 HTTP message factories",
...@@ -3381,31 +3383,31 @@ ...@@ -3381,31 +3383,31 @@
"response" "response"
], ],
"support": { "support": {
"source": "https://github.com/php-fig/http-factory/tree/master" "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
}, },
"time": "2019-04-30T12:38:16+00:00" "time": "2023-04-10T20:10:41+00:00"
}, },
{ {
"name": "psr/http-message", "name": "psr/http-message",
"version": "1.0.1", "version": "1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/http-message.git", "url": "https://github.com/php-fig/http-message.git",
"reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
"reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.0" "php": "^7.2 || ^8.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0.x-dev" "dev-master": "1.1.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3434,9 +3436,9 @@ ...@@ -3434,9 +3436,9 @@
"response" "response"
], ],
"support": { "support": {
"source": "https://github.com/php-fig/http-message/tree/master" "source": "https://github.com/php-fig/http-message/tree/1.1"
}, },
"time": "2016-08-06T14:39:51+00:00" "time": "2023-04-04T09:50:52+00:00"
}, },
{ {
"name": "psr/log", "name": "psr/log",
...@@ -3541,16 +3543,16 @@ ...@@ -3541,16 +3543,16 @@
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
"version": "v0.11.12", "version": "v0.11.15",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bobthecow/psysh.git", "url": "https://github.com/bobthecow/psysh.git",
"reference": "52cb7c47d403c31c0adc9bf7710fc355f93c20f7" "reference": "5350ce0ec8ecf2c5b5cf554cd2496f97b444af85"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/52cb7c47d403c31c0adc9bf7710fc355f93c20f7", "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5350ce0ec8ecf2c5b5cf554cd2496f97b444af85",
"reference": "52cb7c47d403c31c0adc9bf7710fc355f93c20f7", "reference": "5350ce0ec8ecf2c5b5cf554cd2496f97b444af85",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3611,9 +3613,9 @@ ...@@ -3611,9 +3613,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/bobthecow/psysh/issues", "issues": "https://github.com/bobthecow/psysh/issues",
"source": "https://github.com/bobthecow/psysh/tree/v0.11.12" "source": "https://github.com/bobthecow/psysh/tree/v0.11.15"
}, },
"time": "2023-01-29T21:24:40+00:00" "time": "2023-04-07T21:57:09+00:00"
}, },
{ {
"name": "ralouphie/getallheaders", "name": "ralouphie/getallheaders",
...@@ -3925,16 +3927,16 @@ ...@@ -3925,16 +3927,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v5.4.19", "version": "v5.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "dccb8d251a9017d5994c988b034d3e18aaabf740" "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/dccb8d251a9017d5994c988b034d3e18aaabf740", "url": "https://api.github.com/repos/symfony/console/zipball/3cd51fd2e6c461ca678f84d419461281bd87a0a8",
"reference": "dccb8d251a9017d5994c988b034d3e18aaabf740", "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3999,12 +4001,12 @@ ...@@ -3999,12 +4001,12 @@
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"keywords": [ "keywords": [
"cli", "cli",
"command line", "command-line",
"console", "console",
"terminal" "terminal"
], ],
"support": { "support": {
"source": "https://github.com/symfony/console/tree/v5.4.19" "source": "https://github.com/symfony/console/tree/v5.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -4020,20 +4022,20 @@ ...@@ -4020,20 +4022,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-01T08:32:19+00:00" "time": "2023-03-25T09:27:28+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v5.4.19", "version": "v5.4.21",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/css-selector.git",
"reference": "f4a7d150f5b9e8f974f6f127d8167e420d11fc62" "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/f4a7d150f5b9e8f974f6f127d8167e420d11fc62", "url": "https://api.github.com/repos/symfony/css-selector/zipball/95f3c7468db1da8cc360b24fa2a26e7cefcb355d",
"reference": "f4a7d150f5b9e8f974f6f127d8167e420d11fc62", "reference": "95f3c7468db1da8cc360b24fa2a26e7cefcb355d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4070,7 +4072,7 @@ ...@@ -4070,7 +4072,7 @@
"description": "Converts CSS selectors to XPath expressions", "description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/css-selector/tree/v5.4.19" "source": "https://github.com/symfony/css-selector/tree/v5.4.21"
}, },
"funding": [ "funding": [
{ {
...@@ -4086,7 +4088,7 @@ ...@@ -4086,7 +4088,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-01T08:32:19+00:00" "time": "2023-02-14T08:03:56+00:00"
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
...@@ -4157,16 +4159,16 @@ ...@@ -4157,16 +4159,16 @@
}, },
{ {
"name": "symfony/error-handler", "name": "symfony/error-handler",
"version": "v5.4.19", "version": "v5.4.21",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/error-handler.git", "url": "https://github.com/symfony/error-handler.git",
"reference": "438ef3e5e6481244785da3ce8cf8f4e74e7f2822" "reference": "56a94aa8cb5a5fbc411551d8d014a296b5456549"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/438ef3e5e6481244785da3ce8cf8f4e74e7f2822", "url": "https://api.github.com/repos/symfony/error-handler/zipball/56a94aa8cb5a5fbc411551d8d014a296b5456549",
"reference": "438ef3e5e6481244785da3ce8cf8f4e74e7f2822", "reference": "56a94aa8cb5a5fbc411551d8d014a296b5456549",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4208,7 +4210,7 @@ ...@@ -4208,7 +4210,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code", "description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/error-handler/tree/v5.4.19" "source": "https://github.com/symfony/error-handler/tree/v5.4.21"
}, },
"funding": [ "funding": [
{ {
...@@ -4224,20 +4226,20 @@ ...@@ -4224,20 +4226,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-01T08:32:19+00:00" "time": "2023-02-14T08:03:56+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v5.4.19", "version": "v5.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
"reference": "abf49cc084c087d94b4cb939c3f3672971784e0c" "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abf49cc084c087d94b4cb939c3f3672971784e0c", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1df20e45d56da29a4b1d8259dd6e950acbf1b13f",
"reference": "abf49cc084c087d94b4cb939c3f3672971784e0c", "reference": "1df20e45d56da29a4b1d8259dd6e950acbf1b13f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4293,7 +4295,7 @@ ...@@ -4293,7 +4295,7 @@
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/event-dispatcher/tree/v5.4.19" "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -4309,7 +4311,7 @@ ...@@ -4309,7 +4311,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-01T08:32:19+00:00" "time": "2023-03-17T11:31:58+00:00"
}, },
{ {
"name": "symfony/event-dispatcher-contracts", "name": "symfony/event-dispatcher-contracts",
...@@ -4392,16 +4394,16 @@ ...@@ -4392,16 +4394,16 @@
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v5.4.19", "version": "v5.4.21",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "6071aebf810ad13fe8200c224f36103abb37cf1f" "reference": "078e9a5e1871fcfe6a5ce421b539344c21afef19"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/6071aebf810ad13fe8200c224f36103abb37cf1f", "url": "https://api.github.com/repos/symfony/finder/zipball/078e9a5e1871fcfe6a5ce421b539344c21afef19",
"reference": "6071aebf810ad13fe8200c224f36103abb37cf1f", "reference": "078e9a5e1871fcfe6a5ce421b539344c21afef19",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4435,7 +4437,7 @@ ...@@ -4435,7 +4437,7 @@
"description": "Finds files and directories via an intuitive fluent interface", "description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/finder/tree/v5.4.19" "source": "https://github.com/symfony/finder/tree/v5.4.21"
}, },
"funding": [ "funding": [
{ {
...@@ -4451,20 +4453,20 @@ ...@@ -4451,20 +4453,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-14T19:14:44+00:00" "time": "2023-02-16T09:33:00+00:00"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v5.4.20", "version": "v5.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "d0435363362a47c14e9cf50663cb8ffbf491875a" "reference": "05cd1acdd0e3ce8473aaba1d86c188321d85f313"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/d0435363362a47c14e9cf50663cb8ffbf491875a", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/05cd1acdd0e3ce8473aaba1d86c188321d85f313",
"reference": "d0435363362a47c14e9cf50663cb8ffbf491875a", "reference": "05cd1acdd0e3ce8473aaba1d86c188321d85f313",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4511,7 +4513,7 @@ ...@@ -4511,7 +4513,7 @@
"description": "Defines an object-oriented layer for the HTTP specification", "description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-foundation/tree/v5.4.20" "source": "https://github.com/symfony/http-foundation/tree/v5.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -4527,20 +4529,20 @@ ...@@ -4527,20 +4529,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-29T11:11:52+00:00" "time": "2023-03-28T07:28:17+00:00"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v5.4.20", "version": "v5.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "aaeec341582d3c160cc9ecfa8b2419ba6c69954e" "reference": "2d3a8be2c756353627398827c409af6f126c096d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/aaeec341582d3c160cc9ecfa8b2419ba6c69954e", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2d3a8be2c756353627398827c409af6f126c096d",
"reference": "aaeec341582d3c160cc9ecfa8b2419ba6c69954e", "reference": "2d3a8be2c756353627398827c409af6f126c096d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4549,7 +4551,7 @@ ...@@ -4549,7 +4551,7 @@
"symfony/deprecation-contracts": "^2.1|^3", "symfony/deprecation-contracts": "^2.1|^3",
"symfony/error-handler": "^4.4|^5.0|^6.0", "symfony/error-handler": "^4.4|^5.0|^6.0",
"symfony/event-dispatcher": "^5.0|^6.0", "symfony/event-dispatcher": "^5.0|^6.0",
"symfony/http-foundation": "^5.3.7|^6.0", "symfony/http-foundation": "^5.4.21|^6.2.7",
"symfony/polyfill-ctype": "^1.8", "symfony/polyfill-ctype": "^1.8",
"symfony/polyfill-php73": "^1.9", "symfony/polyfill-php73": "^1.9",
"symfony/polyfill-php80": "^1.16" "symfony/polyfill-php80": "^1.16"
...@@ -4623,7 +4625,7 @@ ...@@ -4623,7 +4625,7 @@
"description": "Provides a structured process for converting a Request into a Response", "description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-kernel/tree/v5.4.20" "source": "https://github.com/symfony/http-kernel/tree/v5.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -4639,20 +4641,20 @@ ...@@ -4639,20 +4641,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-02-01T08:18:48+00:00" "time": "2023-03-31T11:54:37+00:00"
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
"version": "v5.4.19", "version": "v5.4.21",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/mime.git", "url": "https://github.com/symfony/mime.git",
"reference": "a858429a9c704edc53fe057228cf9ca282ba48eb" "reference": "ef57d9fb9cdd5e6b2ffc567d109865d10b6920cd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/a858429a9c704edc53fe057228cf9ca282ba48eb", "url": "https://api.github.com/repos/symfony/mime/zipball/ef57d9fb9cdd5e6b2ffc567d109865d10b6920cd",
"reference": "a858429a9c704edc53fe057228cf9ca282ba48eb", "reference": "ef57d9fb9cdd5e6b2ffc567d109865d10b6920cd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4707,7 +4709,7 @@ ...@@ -4707,7 +4709,7 @@
"mime-type" "mime-type"
], ],
"support": { "support": {
"source": "https://github.com/symfony/mime/tree/v5.4.19" "source": "https://github.com/symfony/mime/tree/v5.4.21"
}, },
"funding": [ "funding": [
{ {
...@@ -4723,7 +4725,7 @@ ...@@ -4723,7 +4725,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-09T05:43:46+00:00" "time": "2023-02-21T19:46:44+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
...@@ -5544,16 +5546,16 @@ ...@@ -5544,16 +5546,16 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v5.4.19", "version": "v5.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "c5ba874c9b636dbccf761e22ce750e88ec3f55e1" "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/c5ba874c9b636dbccf761e22ce750e88ec3f55e1", "url": "https://api.github.com/repos/symfony/process/zipball/4b850da0cc3a2a9181c1ed407adbca4733dc839b",
"reference": "c5ba874c9b636dbccf761e22ce750e88ec3f55e1", "reference": "4b850da0cc3a2a9181c1ed407adbca4733dc839b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -5586,7 +5588,7 @@ ...@@ -5586,7 +5588,7 @@
"description": "Executes commands in sub-processes", "description": "Executes commands in sub-processes",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/process/tree/v5.4.19" "source": "https://github.com/symfony/process/tree/v5.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -5602,20 +5604,20 @@ ...@@ -5602,20 +5604,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-01T08:32:19+00:00" "time": "2023-03-06T21:29:33+00:00"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v5.4.19", "version": "v5.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
"reference": "df1b28f37c8e78912213c58ef6ab2f2037bbfdc5" "reference": "c2ac11eb34947999b7c38fb4c835a57306907e6d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/df1b28f37c8e78912213c58ef6ab2f2037bbfdc5", "url": "https://api.github.com/repos/symfony/routing/zipball/c2ac11eb34947999b7c38fb4c835a57306907e6d",
"reference": "df1b28f37c8e78912213c58ef6ab2f2037bbfdc5", "reference": "c2ac11eb34947999b7c38fb4c835a57306907e6d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -5676,7 +5678,7 @@ ...@@ -5676,7 +5678,7 @@
"url" "url"
], ],
"support": { "support": {
"source": "https://github.com/symfony/routing/tree/v5.4.19" "source": "https://github.com/symfony/routing/tree/v5.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -5692,7 +5694,7 @@ ...@@ -5692,7 +5694,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-01T08:32:19+00:00" "time": "2023-03-14T14:59:20+00:00"
}, },
{ {
"name": "symfony/service-contracts", "name": "symfony/service-contracts",
...@@ -5779,16 +5781,16 @@ ...@@ -5779,16 +5781,16 @@
}, },
{ {
"name": "symfony/string", "name": "symfony/string",
"version": "v5.4.19", "version": "v5.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/string.git", "url": "https://github.com/symfony/string.git",
"reference": "0a01071610fd861cc160dfb7e2682ceec66064cb" "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/0a01071610fd861cc160dfb7e2682ceec66064cb", "url": "https://api.github.com/repos/symfony/string/zipball/8036a4c76c0dd29e60b6a7cafcacc50cf088ea62",
"reference": "0a01071610fd861cc160dfb7e2682ceec66064cb", "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -5845,7 +5847,7 @@ ...@@ -5845,7 +5847,7 @@
"utf8" "utf8"
], ],
"support": { "support": {
"source": "https://github.com/symfony/string/tree/v5.4.19" "source": "https://github.com/symfony/string/tree/v5.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -5861,20 +5863,20 @@ ...@@ -5861,20 +5863,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-01T08:32:19+00:00" "time": "2023-03-14T06:11:53+00:00"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v5.4.19", "version": "v5.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "83d487b13b7fb4c0a6ad079f4e4c9b4525e1b695" "reference": "9a401392f01bc385aa42760eff481d213a0cc2ba"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/83d487b13b7fb4c0a6ad079f4e4c9b4525e1b695", "url": "https://api.github.com/repos/symfony/translation/zipball/9a401392f01bc385aa42760eff481d213a0cc2ba",
"reference": "83d487b13b7fb4c0a6ad079f4e4c9b4525e1b695", "reference": "9a401392f01bc385aa42760eff481d213a0cc2ba",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -5942,7 +5944,7 @@ ...@@ -5942,7 +5944,7 @@
"description": "Provides tools to internationalize your application", "description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/translation/tree/v5.4.19" "source": "https://github.com/symfony/translation/tree/v5.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -5958,7 +5960,7 @@ ...@@ -5958,7 +5960,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-01T08:32:19+00:00" "time": "2023-03-27T16:07:23+00:00"
}, },
{ {
"name": "symfony/translation-contracts", "name": "symfony/translation-contracts",
...@@ -6040,16 +6042,16 @@ ...@@ -6040,16 +6042,16 @@
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v5.4.19", "version": "v5.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b" "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4",
"reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b", "reference": "e2edac9ce47e6df07e38143c7cfa6bdbc1a6dcc4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -6109,7 +6111,7 @@ ...@@ -6109,7 +6111,7 @@
"dump" "dump"
], ],
"support": { "support": {
"source": "https://github.com/symfony/var-dumper/tree/v5.4.19" "source": "https://github.com/symfony/var-dumper/tree/v5.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -6125,7 +6127,7 @@ ...@@ -6125,7 +6127,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-16T10:52:33+00:00" "time": "2023-03-25T09:27:28+00:00"
}, },
{ {
"name": "tijsverkoyen/css-to-inline-styles", "name": "tijsverkoyen/css-to-inline-styles",
...@@ -6734,16 +6736,16 @@ ...@@ -6734,16 +6736,16 @@
}, },
{ {
"name": "filp/whoops", "name": "filp/whoops",
"version": "2.14.6", "version": "2.15.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/filp/whoops.git", "url": "https://github.com/filp/whoops.git",
"reference": "f7948baaa0330277c729714910336383286305da" "reference": "e864ac957acd66e1565f25efda61e37791a5db0b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/f7948baaa0330277c729714910336383286305da", "url": "https://api.github.com/repos/filp/whoops/zipball/e864ac957acd66e1565f25efda61e37791a5db0b",
"reference": "f7948baaa0330277c729714910336383286305da", "reference": "e864ac957acd66e1565f25efda61e37791a5db0b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -6793,7 +6795,7 @@ ...@@ -6793,7 +6795,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/filp/whoops/issues", "issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.14.6" "source": "https://github.com/filp/whoops/tree/2.15.1"
}, },
"funding": [ "funding": [
{ {
...@@ -6801,7 +6803,7 @@ ...@@ -6801,7 +6803,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-11-02T16:23:29+00:00" "time": "2023-03-06T18:09:13+00:00"
}, },
{ {
"name": "hamcrest/hamcrest-php", "name": "hamcrest/hamcrest-php",
...@@ -7045,16 +7047,16 @@ ...@@ -7045,16 +7047,16 @@
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
"version": "1.11.0", "version": "1.11.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/myclabs/DeepCopy.git", "url": "https://github.com/myclabs/DeepCopy.git",
"reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
"reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -7092,7 +7094,7 @@ ...@@ -7092,7 +7094,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/myclabs/DeepCopy/issues", "issues": "https://github.com/myclabs/DeepCopy/issues",
"source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
}, },
"funding": [ "funding": [
{ {
...@@ -7100,7 +7102,7 @@ ...@@ -7100,7 +7102,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-03-03T13:19:32+00:00" "time": "2023-03-08T13:26:56+00:00"
}, },
{ {
"name": "nunomaduro/collision", "name": "nunomaduro/collision",
...@@ -7302,23 +7304,23 @@ ...@@ -7302,23 +7304,23 @@
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "9.2.24", "version": "9.2.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "2cf940ebc6355a9d430462811b5aaa308b174bed" "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2cf940ebc6355a9d430462811b5aaa308b174bed", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
"reference": "2cf940ebc6355a9d430462811b5aaa308b174bed", "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-dom": "*", "ext-dom": "*",
"ext-libxml": "*", "ext-libxml": "*",
"ext-xmlwriter": "*", "ext-xmlwriter": "*",
"nikic/php-parser": "^4.14", "nikic/php-parser": "^4.15",
"php": ">=7.3", "php": ">=7.3",
"phpunit/php-file-iterator": "^3.0.3", "phpunit/php-file-iterator": "^3.0.3",
"phpunit/php-text-template": "^2.0.2", "phpunit/php-text-template": "^2.0.2",
...@@ -7333,8 +7335,8 @@ ...@@ -7333,8 +7335,8 @@
"phpunit/phpunit": "^9.3" "phpunit/phpunit": "^9.3"
}, },
"suggest": { "suggest": {
"ext-pcov": "*", "ext-pcov": "PHP extension that provides line coverage",
"ext-xdebug": "*" "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
...@@ -7367,7 +7369,7 @@ ...@@ -7367,7 +7369,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
"source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.24" "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26"
}, },
"funding": [ "funding": [
{ {
...@@ -7375,7 +7377,7 @@ ...@@ -7375,7 +7377,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2023-01-26T08:26:55+00:00" "time": "2023-03-06T12:58:08+00:00"
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
...@@ -7620,16 +7622,16 @@ ...@@ -7620,16 +7622,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "9.5.28", "version": "9.6.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "954ca3113a03bf780d22f07bf055d883ee04b65e" "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/954ca3113a03bf780d22f07bf055d883ee04b65e", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b65d59a059d3004a040c16a82e07bbdf6cfdd115",
"reference": "954ca3113a03bf780d22f07bf055d883ee04b65e", "reference": "b65d59a059d3004a040c16a82e07bbdf6cfdd115",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -7662,8 +7664,8 @@ ...@@ -7662,8 +7664,8 @@
"sebastian/version": "^3.0.2" "sebastian/version": "^3.0.2"
}, },
"suggest": { "suggest": {
"ext-soap": "*", "ext-soap": "To be able to generate mocks based on WSDL files",
"ext-xdebug": "*" "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
}, },
"bin": [ "bin": [
"phpunit" "phpunit"
...@@ -7671,7 +7673,7 @@ ...@@ -7671,7 +7673,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "9.5-dev" "dev-master": "9.6-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -7702,7 +7704,8 @@ ...@@ -7702,7 +7704,8 @@
], ],
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues", "issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.28" "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.6"
}, },
"funding": [ "funding": [
{ {
...@@ -7718,7 +7721,7 @@ ...@@ -7718,7 +7721,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-01-14T12:32:24+00:00" "time": "2023-03-27T11:43:46+00:00"
}, },
{ {
"name": "sebastian/cli-parser", "name": "sebastian/cli-parser",
...@@ -8086,16 +8089,16 @@ ...@@ -8086,16 +8089,16 @@
}, },
{ {
"name": "sebastian/environment", "name": "sebastian/environment",
"version": "5.1.4", "version": "5.1.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/environment.git", "url": "https://github.com/sebastianbergmann/environment.git",
"reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
"reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -8137,7 +8140,7 @@ ...@@ -8137,7 +8140,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/environment/issues", "issues": "https://github.com/sebastianbergmann/environment/issues",
"source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
}, },
"funding": [ "funding": [
{ {
...@@ -8145,7 +8148,7 @@ ...@@ -8145,7 +8148,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-04-03T09:37:03+00:00" "time": "2023-02-03T06:03:51+00:00"
}, },
{ {
"name": "sebastian/exporter", "name": "sebastian/exporter",
...@@ -8459,16 +8462,16 @@ ...@@ -8459,16 +8462,16 @@
}, },
{ {
"name": "sebastian/recursion-context", "name": "sebastian/recursion-context",
"version": "4.0.4", "version": "4.0.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git", "url": "https://github.com/sebastianbergmann/recursion-context.git",
"reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
"reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -8507,10 +8510,10 @@ ...@@ -8507,10 +8510,10 @@
} }
], ],
"description": "Provides functionality to recursively process PHP variables", "description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context", "homepage": "https://github.com/sebastianbergmann/recursion-context",
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/recursion-context/issues", "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
"source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
}, },
"funding": [ "funding": [
{ {
...@@ -8518,7 +8521,7 @@ ...@@ -8518,7 +8521,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2020-10-26T13:17:30+00:00" "time": "2023-02-03T06:07:39+00:00"
}, },
{ {
"name": "sebastian/resource-operations", "name": "sebastian/resource-operations",
...@@ -8577,16 +8580,16 @@ ...@@ -8577,16 +8580,16 @@
}, },
{ {
"name": "sebastian/type", "name": "sebastian/type",
"version": "3.2.0", "version": "3.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/type.git", "url": "https://github.com/sebastianbergmann/type.git",
"reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
"reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -8621,7 +8624,7 @@ ...@@ -8621,7 +8624,7 @@
"homepage": "https://github.com/sebastianbergmann/type", "homepage": "https://github.com/sebastianbergmann/type",
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/type/issues", "issues": "https://github.com/sebastianbergmann/type/issues",
"source": "https://github.com/sebastianbergmann/type/tree/3.2.0" "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
}, },
"funding": [ "funding": [
{ {
...@@ -8629,7 +8632,7 @@ ...@@ -8629,7 +8632,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2022-09-12T14:47:03+00:00" "time": "2023-02-03T06:13:03+00:00"
}, },
{ {
"name": "sebastian/version", "name": "sebastian/version",
...@@ -8744,5 +8747,5 @@ ...@@ -8744,5 +8747,5 @@
"php": "^7.3|^8.0" "php": "^7.3|^8.0"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.3.0" "plugin-api-version": "2.2.0"
} }
database/migrations/2023_04_13_024157_add_column_horas_reajuste_in_table_avaliacao.php 0 → 100644
View file @ a23c72a9
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddColumnHorasReajusteInTableAvaliacao extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('avaliacao', function (Blueprint $table) {
$table->integer('horas_reajuste')->nullable(true);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('avaliacao', function (Blueprint $table) {
$table->dropColumn('horas_reajuste');
});
}
}
package copy.json 0 → 100644
View file @ a23c72a9
{
"private": true,
"scripts": {
"dev": "npm run development",
"development": "mix",
"watch": "mix watch",
"watch-poll": "mix watch -- --watch-options-poll=1000",
"hot": "mix watch --hot",
"prod": "npm run production",
"production": "mix --production"
},
"devDependencies": {
"@tailwindcss/forms": "^0.4.0",
"alpinejs": "^3.4.2",
"autoprefixer": "^10.1.0",
"axios": "^0.21",
"laravel-mix": "^6.0.6",
"lodash": "^4.17.19",
"postcss": "^8.2.1",
"postcss-import": "^14.0.1",
"tailwindcss": "^3.0.0"
}
}
package-lock.json
View file @ a23c72a9
This source diff could not be displayed because it is too large. You can view the blob instead.
resources/views/components/cards/avaliador_pad.blade.php
View file @ a23c72a9
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
<h3 class="text-center"> <i class="bi bi-book-half"></i> </h3> <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"> PAD: {{ $userPad->pad->nome }} </h4>
<h5 class="text-center"> Status: {{ $userPad->pad->statusAsString() }} </h4> <h5 class="text-center"> Status: {{ $userPad->pad->statusAsString() }} </h4>
<a class="stretched-link" href="{{ route('pad_view', ['id' => $userPad->id]) }}"></a> <a class="stretched-link" href="{{ route('pad_professores', ['id' => $userPad->id]) }}"></a>
</div> </div>
</div> </div>
resources/views/pad/avaliacao/index.blade.php
View file @ a23c72a9
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
@include('components.alerts') @include('components.alerts')
<div class="d-flex justify-content-between align-items-center border-bottom"> <div class="d-flex justify-content-between align-items-center border-bottom">
<h2 class="">PADs</h2> <h2 class="">PADs</h2>
</div> </div>
<!-- Tabela --> <!-- Tabela -->
......
resources/views/pad/avaliacao/professores.blade.php 0 → 100644
View file @ a23c72a9
@extends('layouts.main')
@section('title', 'Campus')
@section('header')
@include('layouts.header', [
'user' => Auth::user(),
])
@endsection
@section('nav')
@include('layouts.navigation', [
'index_menu' => $index_menu,
])
@endsection
@section('body')
@include('components.alerts')
<div class="d-flex justify-content-between align-items-center border-bottom">
<h2 class="">PADs</h2>
</div>
<!-- Tabela -->
<div class="table-responsive mt-5">
<table class="table table-hover table-striped">
<thead class="thead-dark">
<tr>
<th scope="col">Professor</th>
<th scope="col">Opções</th>
</tr>
</thead>
<tbody>
@foreach ($professores as $professor)
<tr>
<td>{{$professor->name}}</td>
<td>
@include('components.buttons.btn-avaliar', [
'route' => url("/pad/$pad->id/professor/$professor->id/atividades"), #avaliador_avaliar
'class' => '',
'content' => 'Avaliar',
'id' => '',
])
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
@endsection
resources/views/pad/avaliacao/taferas_professor.blade.php 0 → 100644
View file @ a23c72a9
@extends('layouts.main')
@section('title', 'Ensino')
@section('header')
@include('layouts.header', [
'user' => Auth::user(),
])
@endsection
@section('nav')
@include('layouts.navigation', [
'index_menu' => $index_menu,
])
@endsection
@section('body')
<div class="container">
<h3>{{$professor->name}}</h3><br><br>
@if (isset($ensino) && !empty($ensino))
<h4><strong>Ensino</strong></h4>
@foreach ($ensino as $tarefa)
<div class="card">
<h5 class="card-header">Cód. Atividade - {{$tarefa["cod_atividade"]}}</h5>
<div class="card-body">
<span class="fw-bold ">Componente Curricular: </span><span class="card-text">{{isset($tarefa["componente_curricular"])?$tarefa["componente_curricular"]:"--"}}</span><br>
<span class="fw-bold ">Curso: </span><span class="card-text">{{isset($tarefa["curso"])?$tarefa["curso"]:"--"}}</span><br>
<span class="fw-bold ">Nível: </span><span class="card-text">{{isset($tarefa["nivel"])?$niveis[$tarefa["nivel"]]:"--"}}</span><br>
<span class="fw-bold ">Modalidade: </span><span class="card-text">{{isset($tarefa["modalidade"])?$modalidades[$tarefa["modalidade"]]:"--"}}</span><br>
<span class="fw-bold ">Resolução: </span><span class="card-text">{{isset($tarefa["resolucao"])?$tarefa["resolucao"]:"--"}}</span><br>
<span class="fw-bold ">CH. Semanal: </span><span class="card-text">{{isset($tarefa["ch_semanal"])?$tarefa["ch_semanal"]:"--"}}</span><br>
<div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end">
<button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#modal_avaliacao" style="height: 38px;" onclick='setaDadosModalAvaliacao("{{$tarefa["id"]}}", "{{$professor["id"]}}", "6", "{{$tarefa["tipo_atividade"]}}")'>
Reprovar
</button>
<span>&nbsp;&nbsp;</span>
<form action="{{route('avaliador_avaliar')}}" method="POST">
@csrf
@method("PUT")
<input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$tarefa["id"]}}">
<input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$professor["id"]}}">
<input type="hidden" name="status" id="status_aprovar" value='7'>
<input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$tarefa["tipo_atividade"]}}">
<input type="submit" class="btn btn-primary" value="Aprovar">
</form>
</div>
</div>
</div><br>
@endforeach
@endif
@if (isset($pesquisa) && !empty($pesquisa))
<h4><strong>Pesquisa</strong></h4>
@foreach ($pesquisa as $tarefa)
<div class="card">
<h5 class="card-header">Cód. Atividade - {{$tarefa["cod_atividade"]}}</h5>
<div class="card-body">
<span class="fw-bold ">Título do Projeto: </span><span class="card-text">{{isset($tarefa["titulo_projeto"])?$tarefa["titulo_projeto"]:"--"}}</span><br>
<span class="fw-bold ">Componente Curricular: </span><span class="card-text">{{isset($tarefa["componente_curricular"])?$tarefa["componente_curricular"]:"--"}}</span><br>
<span class="fw-bold ">Curso: </span><span class="card-text">{{isset($tarefa["curso"])?$tarefa["curso"]:"--"}}</span><br>
<span class="fw-bold ">Nível: </span><span class="card-text">{{isset($tarefa["nivel"])?$niveis[$tarefa["nivel"]]:"--"}}</span><br>
<span class="fw-bold ">Modalidade: </span><span class="card-text">{{isset($tarefa["modalidade"])?$modalidades[$tarefa["modalidade"]]:"--"}}</span><br>
<span class="fw-bold ">Resolução: </span><span class="card-text">{{isset($tarefa["resolucao"])?$tarefa["resolucao"]:"--"}}</span><br>
<span class="fw-bold ">CH. Semanal: </span><span class="card-text">{{isset($tarefa["ch_semanal"])?$tarefa["ch_semanal"]:"--"}}</span><br>
<div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end">
<button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#modal_avaliacao" onclick='setaDadosModalAvaliacao("{{$tarefa["id"]}}", "{{$professor["id"]}}", "6", "{{$tarefa["tipo_atividade"]}}")'>
Reprovar
</button>
<span>&nbsp;&nbsp;</span>
<form action="{{route('avaliador_avaliar')}}" method="POST">
@csrf
@method("PUT")
<input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$tarefa["id"]}}">
<input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$professor["id"]}}">
<input type="hidden" name="status" id="status_aprovar" value='7'>
<input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$tarefa["tipo_atividade"]}}">
<input type="submit" class="btn btn-primary" value="Aprovar">
</form>
</div>
</div>
</div><br>
@endforeach
@endif
@if (isset($extensao) && !empty($extensao))
<h4><strong>Extensão</strong></h4>
@foreach ($extensao as $tarefa)
<div class="card">
<h5 class="card-header">Cód. Atividade - {{$tarefa["cod_atividade"]}}</h5>
<div class="card-body">
<span class="fw-bold ">Título do Projeto: </span><span class="card-text">{{isset($tarefa["titulo_projeto"])?$tarefa["titulo_projeto"]:"--"}}</span><br>
<span class="fw-bold ">Componente Curricular: </span><span class="card-text">{{isset($tarefa["componente_curricular"])?$tarefa["componente_curricular"]:"--"}}</span><br>
<span class="fw-bold ">Curso: </span><span class="card-text">{{isset($tarefa["curso"])?$tarefa["curso"]:"--"}}</span><br>
<span class="fw-bold ">Nível: </span><span class="card-text">{{isset($tarefa["nivel"])?$niveis[$tarefa["nivel"]]:"--"}}</span><br>
<span class="fw-bold ">Modalidade: </span><span class="card-text">{{isset($tarefa["modalidade"])?$modalidades[$tarefa["modalidade"]]:"--"}}</span><br>
<span class="fw-bold ">Resolução: </span><span class="card-text">{{isset($tarefa["resolucao"])?$tarefa["resolucao"]:"--"}}</span><br>
<span class="fw-bold ">CH. Semanal: </span><span class="card-text">{{isset($tarefa["ch_semanal"])?$tarefa["ch_semanal"]:"--"}}</span><br>
<div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end">
<button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#modal_avaliacao" onclick='setaDadosModalAvaliacao("{{$tarefa["id"]}}", "{{$professor["id"]}}", "6", "{{$tarefa["tipo_atividade"]}}")'>
Reprovar
</button>
<span>&nbsp;&nbsp;</span>
<form action="{{route('avaliador_avaliar')}}" method="POST">
@csrf
@method("PUT")
<input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$tarefa["id"]}}">
<input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$professor["id"]}}">
<input type="hidden" name="status" id="status_aprovar" value='7'>
<input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$tarefa["tipo_atividade"]}}">
<input type="submit" class="btn btn-primary" value="Aprovar">
</form>
</div>
</div>
</div><br>
@endforeach
@endif
@if (isset($gestao) && !empty($gestao))
<h4><strong>Gestão</strong></h4>
@foreach ($gestao as $tarefa)
<div class="card">
<h5 class="card-header">Cód. Atividade - {{$tarefa["cod_atividade"]}}</h5>
<div class="card-body">
<span class="fw-bold ">Título do Projeto: </span><span class="card-text">{{isset($tarefa["titulo_projeto"])?$tarefa["titulo_projeto"]:"--"}}</span><br>
<span class="fw-bold ">Componente Curricular: </span><span class="card-text">{{isset($tarefa["componente_curricular"])?$tarefa["componente_curricular"]:"--"}}</span><br>
<span class="fw-bold ">Curso: </span><span class="card-text">{{isset($tarefa["curso"])?$tarefa["curso"]:"--"}}</span><br>
<span class="fw-bold ">Nível: </span><span class="card-text">{{isset($tarefa["nivel"])?$niveis[$tarefa["nivel"]]:"--"}}</span><br>
<span class="fw-bold ">Modalidade: </span><span class="card-text">{{isset($tarefa["modalidade"])?$modalidades[$tarefa["modalidade"]]:"--"}}</span><br>
<span class="fw-bold ">Resolução: </span><span class="card-text">{{isset($tarefa["resolucao"])?$tarefa["resolucao"]:"--"}}</span><br>
<span class="fw-bold ">CH. Semanal: </span><span class="card-text">{{isset($tarefa["ch_semanal"])?$tarefa["ch_semanal"]:"--"}}</span><br>
<div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end">
<button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#modal_avaliacao" onclick='setaDadosModalAvaliacao("{{$tarefa["id"]}}", "{{$professor["id"]}}", "6", "{{$tarefa["tipo_atividade"]}}")'>
Reprovar
</button>
<span>&nbsp;&nbsp;</span>
<form action="{{route('avaliador_avaliar')}}" method="POST">
@csrf
@method("PUT")
<input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$tarefa["id"]}}">
<input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$professor["id"]}}">
<input type="hidden" name="status" id="status_aprovar" value='7'>
<input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$tarefa["tipo_atividade"]}}">
<input type="submit" class="btn btn-primary" value="Aprovar">
</form>
</div>
</div>
</div><br>
@endforeach
@endif
<div class="modal fade" id="modal_avaliacao" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Avaliação</h5>
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<form action="{{route('avaliador_avaliar')}}" method="POST">
@csrf
@method("PUT")
<input type="hidden" name="tarefa_id" id="tarefa_id">
<input type="hidden" name="professor_id" id="professor_id">
<input type="hidden" name="status" id="status">
<input type="hidden" name="atividade_type" id="atividade_type">
<div class="modal-body">
<div class="form-group">
<label for="hora_reajuste">Hora de reajuste:</label>
<input class="form-control" type="number" name="hora_reajuste" id="hora_reajuste"><br>
</div>
<div class="form-group">
<label for="descricao">Descrição:</label>
<input class="form-control" type="textarea" name="descricao" id="descricao">
</div>
</div>
<div class="modal-footer">
<input type="submit" class="btn btn-outline-danger" value="Reprovar">
</div>
</form>
</div>
</div>
</div>
@endsection
<script>
function setaDadosModalAvaliacao(tarefa_id, professor_id, status, atividade_type){
document.getElementById('tarefa_id').value = tarefa_id;
document.getElementById('professor_id').value = professor_id;
document.getElementById('status').value = status;
document.getElementById('atividade_type').value = atividade_type;
}
</script>
routes/api.php
View file @ a23c72a9
<?php <?php
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
/* /*
...@@ -17,3 +18,7 @@ use Illuminate\Support\Facades\Route; ...@@ -17,3 +18,7 @@ use Illuminate\Support\Facades\Route;
Route::middleware('auth:sanctum')->get('/user', function (Request $request) { Route::middleware('auth:sanctum')->get('/user', function (Request $request) {
return $request->user(); return $request->user();
}); });
Route::get('/hash', function () {
dd(Hash::make('1234'));
});
routes/pad.php
View file @ a23c72a9
...@@ -12,6 +12,8 @@ Route::prefix('/pad')->group(function () { ...@@ -12,6 +12,8 @@ Route::prefix('/pad')->group(function () {
Route::get('/edit/{id}', [PadController::class, 'edit'])->name('pad_edit'); Route::get('/edit/{id}', [PadController::class, 'edit'])->name('pad_edit');
Route::put('/update/{id}', [PadController::class, 'update'])->name('pad_update'); Route::put('/update/{id}', [PadController::class, 'update'])->name('pad_update');
Route::delete('/delete/{id}', [PadController::class, 'delete'])->name('pad_delete'); Route::delete('/delete/{id}', [PadController::class, 'delete'])->name('pad_delete');
Route::get('/{id}/avaliar/professores', [PadController::class, 'professores'])->name('pad_professores');
Route::get('/{id}/professor/{professor_id}/atividades', [PadController::class, 'professor_atividades'])->name('pad_professor_atividades');
}); });
/** PadProfessor */ /** PadProfessor */
......
routes/web.php
View file @ a23c72a9
...@@ -90,7 +90,7 @@ Route::prefix('/professor')->group(function () { ...@@ -90,7 +90,7 @@ Route::prefix('/professor')->group(function () {
Route::prefix('/avaliador')->group(function () { Route::prefix('/avaliador')->group(function () {
Route::get('/index', [AvaliadorController::class, 'index'])->name('avaliador_index'); Route::get('/index', [AvaliadorController::class, 'index'])->name('avaliador_index');
Route::get('/avaliar', [AvaliadorController::class, 'avaliar'])->name('avaliador_avaliar'); Route::put('/avaliar', [AvaliadorController::class, 'avaliar'])->name('avaliador_avaliar');
Route::get('/create', [AvaliadorController::class, 'create'])->name('avaliador_create'); Route::get('/create', [AvaliadorController::class, 'create'])->name('avaliador_create');
Route::post('/store', [AvaliadorController::class, 'store'])->name('avaliador_store'); Route::post('/store', [AvaliadorController::class, 'store'])->name('avaliador_store');
Route::get('/edit/{id}', [AvaliadorController::class, 'edit'])->name('avaliador_edit'); Route::get('/edit/{id}', [AvaliadorController::class, 'edit'])->name('avaliador_edit');
...@@ -103,4 +103,3 @@ Route::prefix('/user')->group(function () { ...@@ -103,4 +103,3 @@ Route::prefix('/user')->group(function () {
Route::post('/update/perfil', [UserController::class, 'updatePerfil'])->name('update_perfil'); Route::post('/update/perfil', [UserController::class, 'updatePerfil'])->name('update_perfil');
Route::post('/update/password', [UserController::class, 'updatePassword'])->name('update_password'); Route::post('/update/password', [UserController::class, 'updatePassword'])->name('update_password');
}); });
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