Commit 646e5362 authored by luiz-davi's avatar luiz-davi
Browse files

atualizando listagem de pads para avaliador

parent 1551eb52
...@@ -37,8 +37,8 @@ class AvaliadorController extends Controller ...@@ -37,8 +37,8 @@ class AvaliadorController extends Controller
* @param integer $id * @param integer $id
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function view($id) { public function view($id)
{
} }
/** /**
...@@ -48,7 +48,6 @@ class AvaliadorController extends Controller ...@@ -48,7 +48,6 @@ class AvaliadorController extends Controller
*/ */
public function create() public function create()
{ {
} }
/** /**
...@@ -57,12 +56,11 @@ class AvaliadorController extends Controller ...@@ -57,12 +56,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 +85,8 @@ class AvaliadorController extends Controller ...@@ -87,8 +85,8 @@ class AvaliadorController extends Controller
} }
public function delete($id) { public function delete($id)
{
} }
/** /**
...@@ -99,6 +97,5 @@ class AvaliadorController extends Controller ...@@ -99,6 +97,5 @@ class AvaliadorController extends Controller
*/ */
public function destroy($id) public function destroy($id)
{ {
} }
} }
...@@ -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');
......
This diff is collapsed.
{
"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"
}
}
This diff is collapsed.
...@@ -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 -->
......
<?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'));
});
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