Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Walter Felipe
pad-upe
Commits
646e5362
Commit
646e5362
authored
Apr 11, 2023
by
luiz-davi
Browse files
atualizando listagem de pads para avaliador
parent
1551eb52
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/AvaliadorController.php
View file @
646e5362
<?php
namespace
App\Http\Controllers
;
use
App\Models\User
;
...
...
@@ -17,7 +17,7 @@ class AvaliadorController extends Controller
*/
public
function
index
()
{
// $professores = User::where('type', '=', User::->isTypeTeacher())->get();
// $professores = User::where('type', '=', User::->isTypeTeacher())->get();
return
view
(
'pad.avaliacao.index'
,
[
'index_menu'
=>
MenuItemsAvaliador
::
PADs
,
'professores'
=>
null
...
...
@@ -26,7 +26,7 @@ class AvaliadorController extends Controller
public
function
avaliar
()
{
// $professores = User::where('type', '=', User::->isTypeTeacher())->get();
// $professores = User::where('type', '=', User::->isTypeTeacher())->get();
return
view
(
'pad.avaliacao.dimensao.ensino'
,
[
'index_menu'
=>
MenuItemsAvaliador
::
PADs
,
'user_pad_id'
=>
1
...
...
@@ -37,18 +37,17 @@ class AvaliadorController extends Controller
* @param integer $id
* @return \Illuminate\Http\Response
*/
public
function
view
(
$id
)
{
public
function
view
(
$id
)
{
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public
function
create
()
{
{
}
/**
...
...
@@ -56,13 +55,12 @@ class AvaliadorController extends Controller
* @param \Illuminate\Http\Request $request
*/
public
function
store
(
Request
$request
)
{
{
}
public
function
anexo
()
{
return
view
(
'pad.anexo'
,
[
'index_menu'
=>
1
]);
return
view
(
'pad.anexo'
,
[
'index_menu'
=>
1
]);
}
/**
...
...
@@ -72,7 +70,7 @@ class AvaliadorController extends Controller
* @return \Illuminate\Http\Response
*/
public
function
edit
(
$id
)
{
{
}
/**
...
...
@@ -83,12 +81,12 @@ class AvaliadorController extends Controller
* @return \Illuminate\Http\Response
*/
public
function
update
(
Request
$request
,
$id
)
{
{
}
public
function
delete
(
$id
)
{
public
function
delete
(
$id
)
{
}
/**
...
...
@@ -99,6 +97,5 @@ class AvaliadorController extends Controller
*/
public
function
destroy
(
$id
)
{
}
}
\ No newline at end of file
}
app/Http/Controllers/DashboardController.php
View file @
646e5362
...
...
@@ -2,6 +2,7 @@
namespace
App\Http\Controllers
;
use
App\Models\AvaliadorPad
;
use
App\Models\Pad
;
use
App\Models\Tabelas\Constants
;
use
App\Models\UserPad
;
...
...
@@ -17,41 +18,37 @@ use Illuminate\Support\Facades\Auth;
class
DashboardController
extends
Controller
{
public
function
index
()
{
public
function
index
()
{
$user
=
Auth
::
user
();
if
(
$user
->
isTypeAdmin
())
{
return
view
(
'dashboard'
,[
'menu'
=>
Menu
::
HOME
]);
if
(
$user
->
isTypeAdmin
())
{
return
view
(
'dashboard'
,
[
'menu'
=>
Menu
::
HOME
]);
}
if
(
$user
->
isTypeTeacher
())
{
if
(
$user
->
isTypeTeacher
())
{
$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
())
{
return
view
(
'dashboard'
,
[
'PADs'
=>
Pad
::
all
(),
'menu'
=>
Menu
::
HOME
]);
if
(
$user
->
isTypeDirector
())
{
return
view
(
'dashboard'
,
[
'PADs'
=>
Pad
::
all
(),
'menu'
=>
Menu
::
HOME
]);
}
if
(
$user
->
isTypeCoordinator
())
{
return
view
(
'dashboard'
,
[
'PADs'
=>
Pad
::
all
(),
'menu'
=>
Menu
::
HOME
]);
}
if
(
$user
->
isTypeCoordinator
())
{
return
view
(
'dashboard'
,
[
'PADs'
=>
Pad
::
all
(),
'menu'
=>
Menu
::
HOME
]);
}
if
(
$user
->
isTypeEvaluator
())
{
$userPads
=
UserPad
::
initQuery
()
->
whereUser
(
$user
->
id
)
->
wherePadStatus
(
Status
::
ATIVO
)
->
get
();
if
(
$user
->
isTypeEvaluator
())
{
$userPads
=
AvaliadorPad
::
where
(
'user_id'
,
'='
,
$user
->
id
)
->
join
(
'pad'
,
'avaliador_pad.pad_id'
,
'='
,
'pad.id'
)
->
where
(
'pad.status'
,
'='
,
Status
::
ATIVO
)
->
get
();
return
view
(
'dashboard'
,
[
'userPads'
=>
$userPads
,
'menu'
=>
Menu
::
HOME
]);
return
view
(
'dashboard'
,
[
'userPads'
=>
$userPads
,
'menu'
=>
Menu
::
HOME
]);
}
//return redirect()->route('login');
...
...
composer.lock
View file @
646e5362
This diff is collapsed.
Click to expand it.
package copy.json
0 → 100644
View file @
646e5362
{
"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 @
646e5362
This diff is collapsed.
Click to expand it.
resources/views/components/cards/avaliador_pad.blade.php
View file @
646e5362
{{
--
{{
--
@
include
(
'components.cards.avaliador_pad'
,
[
'userPad'
=>
$userPad
])
--
}}
...
...
@@ -9,4 +9,4 @@
<
h5
class
=
"text-center"
>
Status
:
{{
$userPad
->
pad
->
statusAsString
()
}}
</
h4
>
<
a
class
=
"stretched-link"
href
=
"{{ route('pad_view', ['id' =>
$userPad->id
]) }}"
></
a
>
</
div
>
</
div
>
\ No newline at end of file
</
div
>
resources/views/pad/avaliacao/index.blade.php
View file @
646e5362
...
...
@@ -15,7 +15,6 @@
@
include
(
'components.alerts'
)
<
div
class
=
"d-flex justify-content-between align-items-center border-bottom"
>
<
h2
class
=
""
>
PADs
</
h2
>
</
div
>
<!--
Tabela
-->
...
...
@@ -253,7 +252,7 @@
'modal_id'
=>
$camp
->
id
,
'route'
=>
route
(
'campus_delete'
,
[
'id'
=>
$camp
->
id
])
])
</
td
>
</
tr
>
</
tr
>
@
endforeach
--
}}
</
tbody
>
</
table
>
...
...
routes/api.php
View file @
646e5362
<?php
use
Illuminate\Http\Request
;
use
Illuminate\Support\Facades\Hash
;
use
Illuminate\Support\Facades\Route
;
/*
...
...
@@ -17,3 +18,7 @@ use Illuminate\Support\Facades\Route;
Route
::
middleware
(
'auth:sanctum'
)
->
get
(
'/user'
,
function
(
Request
$request
)
{
return
$request
->
user
();
});
Route
::
get
(
'/hash'
,
function
()
{
dd
(
Hash
::
make
(
'1234'
));
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment