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
submeta
Commits
2d499473
Commit
2d499473
authored
Nov 04, 2022
by
S-Nathalia
Browse files
adicao de rotas e views para selecao de cursos dos proponentes
parent
2c8e7fe1
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/CursoController.php
0 → 100644
View file @
2d499473
<?php
namespace
App\Http\Controllers
;
use
Illuminate\Http\Request
;
class
CursoController
extends
Controller
{
//
}
app/Http/Controllers/ProponenteController.php
View file @
2d499473
...
@@ -17,11 +17,12 @@ use App\Notificacao;
...
@@ -17,11 +17,12 @@ use App\Notificacao;
use
App\Participante
;
use
App\Participante
;
use
Carbon\Carbon
;
use
Carbon\Carbon
;
use
Illuminate\Support\Facades\Mail
;
use
Illuminate\Support\Facades\Mail
;
use
App\Curso
;
class
ProponenteController
extends
Controller
class
ProponenteController
extends
Controller
{
{
public
function
index
(){
public
function
index
(){
$cursos
=
Curso
::
orderBy
(
'nome'
)
->
get
();
return
view
(
'proponente.index'
);
return
view
(
'proponente.index'
);
}
}
...
...
app/Http/Controllers/UserController.php
View file @
2d499473
...
@@ -18,45 +18,45 @@ use Carbon\Carbon;
...
@@ -18,45 +18,45 @@ use Carbon\Carbon;
use
Illuminate\Validation\Rule
;
use
Illuminate\Validation\Rule
;
use
Illuminate\Support\Facades\Hash
;
use
Illuminate\Support\Facades\Hash
;
use
Illuminate\Support\Facades\Log
;
use
Illuminate\Support\Facades\Log
;
use
App\Curso
;
class
UserController
extends
Controller
class
UserController
extends
Controller
{
{
public
function
index
()
public
function
index
()
{
{
$eventos
=
Evento
::
orderBy
(
'created_at'
,
'desc'
)
->
get
();
$eventos
=
Evento
::
orderBy
(
'created_at'
,
'desc'
)
->
get
();
dd
(
$eventos
);
if
(
Auth
::
check
())
{
if
(
Auth
::
check
()){
Log
::
debug
(
'UserController check'
);
Log
::
debug
(
'UserController check'
);
return
redirect
()
->
route
(
'home'
);
return
redirect
()
->
route
(
'home'
);
}
}
Log
::
debug
(
'UserController index'
);
Log
::
debug
(
'UserController index'
);
$hoje
=
Carbon
::
today
(
'America/Recife'
);
$hoje
=
Carbon
::
today
(
'America/Recife'
);
$hoje
=
$hoje
->
toDateString
();
$hoje
=
$hoje
->
toDateString
();
return
view
(
'index'
,
[
'eventos'
=>
$eventos
,
'hoje'
=>
$hoje
]);
return
view
(
'index'
,
[
'eventos'
=>
$eventos
,
'hoje'
=>
$hoje
]);
//return view('auth.login');
}
}
public
function
inicial
()
public
function
inicial
()
{
{
$eventos
=
Evento
::
orderBy
(
'created_at'
,
'desc'
)
->
get
();
$eventos
=
Evento
::
orderBy
(
'created_at'
,
'desc'
)
->
get
();
$hoje
=
Carbon
::
today
(
'America/Recife'
);
$hoje
=
Carbon
::
today
(
'America/Recife'
);
$hoje
=
$hoje
->
toDateString
();
$hoje
=
$hoje
->
toDateString
();
return
view
(
'index'
,
[
'eventos'
=>
$eventos
,
'hoje'
=>
$hoje
]);
return
view
(
'index'
,
[
'eventos'
=>
$eventos
,
'hoje'
=>
$hoje
]);
//return view('auth.login');
}
}
function
perfil
(){
function
perfil
()
{
$user
=
User
::
find
(
Auth
::
user
()
->
id
);
$user
=
User
::
find
(
Auth
::
user
()
->
id
);
return
view
(
'user.perfilUser'
,[
'user'
=>
$user
]);
return
view
(
'user.perfilUser'
,
[
'user'
=>
$user
]);
}
}
function
editarPerfil
(
Request
$request
){
function
editarPerfil
(
Request
$request
)
{
$id
=
Auth
()
->
user
()
->
id
;
$id
=
Auth
()
->
user
()
->
id
;
$user
=
User
::
find
(
$id
);
$user
=
User
::
find
(
$id
);
if
(
$request
->
tipo
!=
"proponente"
)
{
if
(
$request
->
tipo
!=
"proponente"
)
{
$validated
=
$request
->
validate
([
$validated
=
$request
->
validate
([
'name'
=>
[
'required'
,
'string'
,
'max:255'
],
'name'
=>
[
'required'
,
'string'
,
'max:255'
],
'instituicao'
=>
[
'required_if:instituicaoSelect,Outra'
,
'max:255'
],
'instituicao'
=>
[
'required_if:instituicaoSelect,Outra'
,
'max:255'
],
...
@@ -86,10 +86,10 @@ class UserController extends Controller
...
@@ -86,10 +86,10 @@ class UserController extends Controller
'nivel'
=>
[
'required_if:bolsistaProdutividade,sim'
],
'nivel'
=>
[
'required_if:bolsistaProdutividade,sim'
],
// 'nivel' => [(isset($request['cargo']) && $request['cargo'] !== 'Estudante') || (isset($request['cargo']) && $request['cargo'] === 'Estudante' && isset($request['vinculo']) && $request['vinculo'] === 'Pós-doutorando') ? 'required':''],
// 'nivel' => [(isset($request['cargo']) && $request['cargo'] !== 'Estudante') || (isset($request['cargo']) && $request['cargo'] === 'Estudante' && isset($request['vinculo']) && $request['vinculo'] === 'Pós-doutorando') ? 'required':''],
'linkLattes'
=>
[
'required_with:titulacaoMaxima,anoTitulacao,areaFormacao,bolsistaProdutividade'
],
'linkLattes'
=>
[
'required_with:titulacaoMaxima,anoTitulacao,areaFormacao,bolsistaProdutividade'
],
'linkLattes'
=>
[(
isset
(
$request
[
'cargo'
])
&&
$request
[
'cargo'
]
!==
'Estudante'
)
||
(
isset
(
$request
[
'cargo'
])
&&
$request
[
'cargo'
]
===
'Estudante'
&&
isset
(
$request
[
'vinculo'
])
&&
$request
[
'vinculo'
]
===
'Pós-doutorando'
)
?
'required'
:
''
],
'linkLattes'
=>
[(
isset
(
$request
[
'cargo'
])
&&
$request
[
'cargo'
]
!==
'Estudante'
)
||
(
isset
(
$request
[
'cargo'
])
&&
$request
[
'cargo'
]
===
'Estudante'
&&
isset
(
$request
[
'vinculo'
])
&&
$request
[
'vinculo'
]
===
'Pós-doutorando'
)
?
'required'
:
''
],
'linkLattes'
=>
[(
isset
(
$request
[
'cargo'
])
&&
$request
[
'cargo'
]
!==
'Estudante'
)
||
(
isset
(
$request
[
'cargo'
])
&&
$request
[
'cargo'
]
===
'Estudante'
&&
isset
(
$request
[
'vinculo'
])
&&
$request
[
'vinculo'
]
===
'Pós-doutorando'
)
?
'link_lattes'
:
''
],
'linkLattes'
=>
[(
isset
(
$request
[
'cargo'
])
&&
$request
[
'cargo'
]
!==
'Estudante'
)
||
(
isset
(
$request
[
'cargo'
])
&&
$request
[
'cargo'
]
===
'Estudante'
&&
isset
(
$request
[
'vinculo'
])
&&
$request
[
'vinculo'
]
===
'Pós-doutorando'
)
?
'link_lattes'
:
''
],
]);
]);
}
}
if
(
$request
->
alterarSenhaCheckBox
!=
null
)
{
if
(
$request
->
alterarSenhaCheckBox
!=
null
)
{
...
@@ -100,13 +100,12 @@ class UserController extends Controller
...
@@ -100,13 +100,12 @@ class UserController extends Controller
if
(
!
(
$request
->
nova_senha
===
$request
->
confirmar_senha
))
{
if
(
!
(
$request
->
nova_senha
===
$request
->
confirmar_senha
))
{
return
redirect
()
->
back
()
->
withErrors
([
'nova_senha'
=>
'Senhas diferentes'
]);
return
redirect
()
->
back
()
->
withErrors
([
'nova_senha'
=>
'Senhas diferentes'
]);
}
}
}
}
if
(
$user
->
avaliadors
!=
null
&&
$request
->
area
!=
null
&&
$user
->
tipo
==
"avaliador"
){
if
(
$user
->
avaliadors
!=
null
&&
$request
->
area
!=
null
&&
$user
->
tipo
==
"avaliador"
)
{
$avaliador
=
Avaliador
::
where
(
'user_id'
,
'='
,
$id
)
->
first
();
$avaliador
=
Avaliador
::
where
(
'user_id'
,
'='
,
$id
)
->
first
();
$avaliador
->
user_id
=
$user
->
id
;
$avaliador
->
user_id
=
$user
->
id
;
//$avaliador->area_id = $request->area;
//$avaliador->area_id = $request->area;
$avaliador
->
update
();
$avaliador
->
update
();
}
}
switch
(
$request
->
tipo
)
{
switch
(
$request
->
tipo
)
{
...
@@ -119,9 +118,9 @@ class UserController extends Controller
...
@@ -119,9 +118,9 @@ class UserController extends Controller
$avaliador
=
Avaliador
::
where
(
'user_id'
,
'='
,
$id
)
->
first
();
$avaliador
=
Avaliador
::
where
(
'user_id'
,
'='
,
$id
)
->
first
();
$avaliador
->
user_id
=
$user
->
id
;
$avaliador
->
user_id
=
$user
->
id
;
$avaliador
->
area_id
=
$request
->
area
;
$avaliador
->
area_id
=
$request
->
area
;
if
(
$user
->
usuarioTemp
==
true
){
if
(
$user
->
usuarioTemp
==
true
)
{
$user
->
usuarioTemp
=
false
;
$user
->
usuarioTemp
=
false
;
}
}
$avaliador
->
update
();
$avaliador
->
update
();
break
;
break
;
case
"proponente"
:
case
"proponente"
:
...
@@ -147,6 +146,7 @@ class UserController extends Controller
...
@@ -147,6 +146,7 @@ class UserController extends Controller
$proponente
->
linkLattes
=
$request
->
linkLattes
;
$proponente
->
linkLattes
=
$request
->
linkLattes
;
$proponente
->
user_id
=
$user
->
id
;
$proponente
->
user_id
=
$user
->
id
;
$proponente
->
cursos
()
->
sync
(
$request
->
curso
);
$proponente
->
update
();
$proponente
->
update
();
break
;
break
;
case
"participante"
:
case
"participante"
:
...
@@ -154,7 +154,7 @@ class UserController extends Controller
...
@@ -154,7 +154,7 @@ class UserController extends Controller
//$participante = $user->participantes->where('user_id', Auth::user()->id)->first();
//$participante = $user->participantes->where('user_id', Auth::user()->id)->first();
$participante
->
user_id
=
$user
->
id
;
$participante
->
user_id
=
$user
->
id
;
//dd($participante);
//dd($participante);
if
(
$user
->
usuarioTemp
==
true
){
if
(
$user
->
usuarioTemp
==
true
)
{
$user
->
usuarioTemp
=
false
;
$user
->
usuarioTemp
=
false
;
}
}
...
@@ -165,7 +165,7 @@ class UserController extends Controller
...
@@ -165,7 +165,7 @@ class UserController extends Controller
$user
->
name
=
$request
->
name
;
$user
->
name
=
$request
->
name
;
$user
->
tipo
=
$request
->
tipo
;
$user
->
tipo
=
$request
->
tipo
;
// $user->email = $request->email;
// $user->email = $request->email;
$user
->
cpf
=
$request
->
cpf
;
$user
->
cpf
=
$request
->
cpf
;
$user
->
celular
=
$request
->
celular
;
$user
->
celular
=
$request
->
celular
;
if
(
$request
->
instituicao
!=
null
)
{
if
(
$request
->
instituicao
!=
null
)
{
...
@@ -181,24 +181,26 @@ class UserController extends Controller
...
@@ -181,24 +181,26 @@ class UserController extends Controller
$user
->
update
();
$user
->
update
();
return
redirect
(
route
(
'user.perfil'
)
)
->
with
([
'mensagem'
=>
'Dados atualizados com sucesso.'
]);
return
redirect
(
route
(
'user.perfil'
))
->
with
([
'mensagem'
=>
'Dados atualizados com sucesso.'
]);
}
}
public
function
meusTrabalhos
(){
public
function
meusTrabalhos
()
{
//$trabalhos = Trabalho::where('autorId', Auth::user()->id)->get();
//$trabalhos = Trabalho::where('autorId', Auth::user()->id)->get();
$proponente
=
Proponente
::
with
(
'user'
)
->
where
(
'user_id'
,
Auth
::
user
()
->
id
)
->
first
();
$proponente
=
Proponente
::
with
(
'user'
)
->
where
(
'user_id'
,
Auth
::
user
()
->
id
)
->
first
();
$trabalhos
=
$proponente
->
trabalhos
;
$trabalhos
=
$proponente
->
trabalhos
;
//dd($trabalhos);
//dd($trabalhos);
return
view
(
'user.meusTrabalhos'
,[
return
view
(
'user.meusTrabalhos'
,
[
'trabalhos'
=>
$trabalhos
,
'trabalhos'
=>
$trabalhos
,
'agora'
=>
now
(),
'agora'
=>
now
(),
]);
]);
}
}
public
function
minhaConta
()
{
public
function
minhaConta
()
{
$id
=
Auth
::
user
()
->
id
;
$id
=
Auth
::
user
()
->
id
;
$user
=
User
::
find
(
$id
);
$user
=
User
::
find
(
$id
);
...
@@ -206,11 +208,15 @@ class UserController extends Controller
...
@@ -206,11 +208,15 @@ class UserController extends Controller
$avaliador
=
Avaliador
::
where
(
'user_id'
,
'='
,
$id
)
->
first
();
$avaliador
=
Avaliador
::
where
(
'user_id'
,
'='
,
$id
)
->
first
();
$proponente
=
Proponente
::
where
(
'user_id'
,
'='
,
$id
)
->
first
();
$proponente
=
Proponente
::
where
(
'user_id'
,
'='
,
$id
)
->
first
();
$participante
=
Participante
::
where
(
'user_id'
,
'='
,
$id
)
->
first
();
$participante
=
Participante
::
where
(
'user_id'
,
'='
,
$id
)
->
first
();
$cursos
=
Curso
::
orderBy
(
'nome'
)
->
get
();
return
view
(
'user.perfilUser'
)
->
with
([
'user'
=>
$user
,
'adminResp'
=>
$adminResp
,
return
view
(
'user.perfilUser'
)
->
with
([
'avaliador'
=>
$avaliador
,
'user'
=>
$user
,
'proponente'
=>
$proponente
,
'adminResp'
=>
$adminResp
,
'participante'
=>
$participante
]);
'avaliador'
=>
$avaliador
,
'proponente'
=>
$proponente
,
'participante'
=>
$participante
,
'cursos'
=>
$cursos
]);
}
}
}
}
resources/views/auth/register.blade.php
View file @
2d499473
This diff is collapsed.
Click to expand it.
resources/views/user/perfilUser.blade.php
View file @
2d499473
This diff is collapsed.
Click to expand it.
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