Commit b9bf18a3 authored by Gabriel-31415's avatar Gabriel-31415
Browse files

ajuaste no index dos usuarios e mensagem de retorno

parent ef05180e
...@@ -19,7 +19,7 @@ class ProponenteController extends Controller ...@@ -19,7 +19,7 @@ class ProponenteController extends Controller
} }
public function create(){ public function create(){
return view('proponente.cadastro'); return view('proponente.cadastro')->with(['mensagem' => 'Preencha o seguinte formulário para poder submeter algum projeto.']);;
} }
public function editais(){ public function editais(){
......
...@@ -255,6 +255,8 @@ class TrabalhoController extends Controller ...@@ -255,6 +255,8 @@ class TrabalhoController extends Controller
$file = $request->anexoPlanoTrabalho[$key]; $file = $request->anexoPlanoTrabalho[$key];
Storage::putFileAs($path, $file, $nome); Storage::putFileAs($path, $file, $nome);
$mytime = Carbon::now('America/Recife');
$mytime = $mytime->toDateString();
$arquivo = new Arquivo(); $arquivo = new Arquivo();
$arquivo->titulo = $request->nomePlanoTrabalho[$key]; $arquivo->titulo = $request->nomePlanoTrabalho[$key];
$arquivo->nome = $path . $nome; $arquivo->nome = $path . $nome;
...@@ -470,8 +472,8 @@ class TrabalhoController extends Controller ...@@ -470,8 +472,8 @@ class TrabalhoController extends Controller
$subject = "Participante de Projeto"; $subject = "Participante de Projeto";
$email = $value; $email = $value;
Mail::to($email) // Mail::to($email)
->send(new SubmissaoTrabalho($userParticipante, $subject, $evento, $trabalho)); // ->send(new SubmissaoTrabalho($userParticipante, $subject, $evento, $trabalho));
} }
if($request->nomePlanoTrabalho[$key] != null){ if($request->nomePlanoTrabalho[$key] != null){
...@@ -482,6 +484,8 @@ class TrabalhoController extends Controller ...@@ -482,6 +484,8 @@ class TrabalhoController extends Controller
$file = $request->anexoPlanoTrabalho[$key]; $file = $request->anexoPlanoTrabalho[$key];
Storage::putFileAs($path, $file, $nome); Storage::putFileAs($path, $file, $nome);
$mytime = Carbon::now('America/Recife');
$mytime = $mytime->toDateString();
$arquivo = new Arquivo(); $arquivo = new Arquivo();
$arquivo->titulo = $request->nomePlanoTrabalho[$key]; $arquivo->titulo = $request->nomePlanoTrabalho[$key];
$arquivo->nome = $path . $nome; $arquivo->nome = $path . $nome;
......
...@@ -15,7 +15,7 @@ class DatabaseSeeder extends Seeder ...@@ -15,7 +15,7 @@ class DatabaseSeeder extends Seeder
$this->call(UsuarioSeeder::class); $this->call(UsuarioSeeder::class);
$this->call(AdministradorSeeder::class); $this->call(AdministradorSeeder::class);
$this->call(AdministradorResponsavelSeeder::class); $this->call(AdministradorResponsavelSeeder::class);
//$this->call(ProponenteSeeder::class); // $this->call(ProponenteSeeder::class);
$this->call(GrandeAreaSeeder::class); $this->call(GrandeAreaSeeder::class);
$this->call(AreaSeeder::class); $this->call(AreaSeeder::class);
$this->call(SubAreaSeeder::class); $this->call(SubAreaSeeder::class);
...@@ -80,8 +80,8 @@ class DatabaseSeeder extends Seeder ...@@ -80,8 +80,8 @@ class DatabaseSeeder extends Seeder
// 'inicioSubmissao'=>'2020-03-30', // 'inicioSubmissao'=>'2020-03-30',
// 'fimSubmissao'=>'2020-09-20', // 'fimSubmissao'=>'2020-09-20',
// 'inicioRevisao'=>'2020-04-21', // 'inicioRevisao'=>'2020-04-21',
// 'fimRevisao'=>'2020-05-21', // 'fimRevisao'=>'2020-07-21',
// 'resultado'=>'2020-05-22', // 'resultado'=>'2020-07-22',
// 'numMaxTrabalhos' => 2, // 'numMaxTrabalhos' => 2,
// 'numMaxCoautores' => 5, // 'numMaxCoautores' => 5,
// 'coordenadorId'=>1, // 'coordenadorId'=>1,
......
...@@ -48,14 +48,14 @@ class UsuarioSeeder extends Seeder ...@@ -48,14 +48,14 @@ class UsuarioSeeder extends Seeder
'email_verified_at'=>'2020-01-01' 'email_verified_at'=>'2020-01-01'
]); ]);
// DB::table('users')->insert([ DB::table('users')->insert([
// 'name'=>'Gabriel', 'name'=>'Gabriel',
// 'email'=>'gabriel.uag.ufrpe@gmail.com', 'email'=>'gabriel.uag.ufrpe@gmail.com',
// 'password'=>Hash::make('12345678'), 'password'=>Hash::make('12345678'),
// 'tipo'=>'proponente', 'tipo'=>'proponente',
// 'email_verified_at'=>'2020-01-01' 'email_verified_at'=>'2020-01-01'
// ]); ]);
DB::table('users')->insert([ DB::table('users')->insert([
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="container"> <div class="container">
<h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2> <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }} - Perfil: Administrador</h2>
<div class="row justify-content-center d-flex align-items-center"> <div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-3 d-flex justify-content-center "> <div class="col-sm-3 d-flex justify-content-center ">
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="container"> <div class="container">
<h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2> <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }} - Perfil: Administrador Responsável</h2>
<div class="row justify-content-center d-flex align-items-center"> <div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-4 d-flex justify-content-center "> <div class="col-sm-4 d-flex justify-content-center ">
<a href="{{route('adminResp.editais')}}" style="text-decoration:none; color: inherit;"> <a href="{{route('adminResp.editais')}}" style="text-decoration:none; color: inherit;">
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="container"> <div class="container">
<h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2> <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }} - Perfil: Avaliador</h2>
<div class="row justify-content-center d-flex align-items-center"> <div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-4 d-flex justify-content-center "> <div class="col-sm-4 d-flex justify-content-center ">
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="container"> <div class="container">
<h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2> <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }} - Perfil: Coordenador</h2>
<div class="row justify-content-center d-flex align-items-center"> <div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-4 d-flex justify-content-center "> <div class="col-sm-4 d-flex justify-content-center ">
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="container"> <div class="container">
<h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2> <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }} - Perfil: Participante</h2>
<div class="row justify-content-center d-flex align-items-center"> <div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-4 d-flex justify-content-center "> <div class="col-sm-4 d-flex justify-content-center ">
......
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
<div class="row justify-content-center" style="margin: 20px 0 20px 0"> <div class="row justify-content-center" style="margin: 20px 0 20px 0">
<div class="col-md-6" style="padding-left:0"> <div class="col-md-6" style="padding-left:0">
<a class="btn btn-secondary botao-form" href="{{route('admin.editais')}}" style="width:100%">Cancelar Cadastro</a> <a class="btn btn-secondary botao-form" href="{{ route('home') }}" style="width:100%">Cancelar Cadastro</a>
</div> </div>
<div class="col-md-6" style="padding-right:0"> <div class="col-md-6" style="padding-right:0">
<button type="submit" class="btn btn-primary botao-form" style="width:100%"> <button type="submit" class="btn btn-primary botao-form" style="width:100%">
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="container"> <div class="container">
<h2 style="margin-top: 100px;">{{ Auth()->user()->name }}</h2> <h2 style="margin-top: 100px;">{{ Auth()->user()->name }} - Perfil: Proponente</h2>
<div class="row justify-content-center d-flex align-items-center"> <div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-3 d-flex justify-content-center "> <div class="col-sm-3 d-flex justify-content-center ">
......
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
<div class="row justify-content-center" style="margin: 20px 0 20px 0"> <div class="row justify-content-center" style="margin: 20px 0 20px 0">
<div class="col-md-6" style="padding-left:0"> <div class="col-md-6" style="padding-left:0">
<a class="btn btn-secondary botao-form" href="/" style="width:100%">Cancelar</a> <a class="btn btn-secondary botao-form" href="{{ route('home') }}" style="width:100%">Cancelar</a>
</div> </div>
<div class="col-md-6" style="padding-right:0"> <div class="col-md-6" style="padding-right:0">
<button type="submit" class="btn btn-primary botao-form" style="width:100%" onclick="submeterForm()"> <button type="submit" class="btn btn-primary botao-form" style="width:100%" onclick="submeterForm()">
......
...@@ -20,15 +20,7 @@ Route::get('/editais/home' ,'EventoController@index' ...@@ -20,15 +20,7 @@ Route::get('/editais/home' ,'EventoController@index'
Route::get('/perfil','UserController@perfil')->name('perfil'); Route::get('/perfil','UserController@perfil')->name('perfil');
Auth::routes(['verify' => true]); Auth::routes(['verify' => true]);
//######## Rotas Avaliador ####################################
Route::prefix('avaliador')->name('avaliador.')->group(function(){
Route::get('/index', 'AvaliadorController@index' )->name('index')->middleware('auth');
Route::get('/trabalhos', 'AvaliadorController@visualizarTrabalhos' )->name('visualizarTrabalho')->middleware('auth');
Route::post('/parecer', 'AvaliadorController@parecer' )->name('parecer')->middleware('auth');
Route::get('/editais', 'AvaliadorController@editais' )->name('editais')->middleware('auth');
Route::post('/Enviarparecer', 'AvaliadorController@enviarParecer' )->name('enviarParecer')->middleware('auth');
Route::get('/Resposta', 'AvaliadorController@conviteResposta' )->name('conviteResposta')->middleware('auth');
});
//######### Proponente ######################################## //######### Proponente ########################################
Route::get('/proponente/index', 'ProponenteController@index' )->name('proponente.index'); Route::get('/proponente/index', 'ProponenteController@index' )->name('proponente.index');
...@@ -43,6 +35,16 @@ Route::post('/perfil-usuario', 'UserController@editarPerfil' ...@@ -43,6 +35,16 @@ Route::post('/perfil-usuario', 'UserController@editarPerfil'
Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
//######## Rotas Avaliador ####################################
Route::prefix('avaliador')->name('avaliador.')->group(function(){
Route::get('/index', 'AvaliadorController@index' )->name('index')->middleware('auth');
Route::get('/trabalhos', 'AvaliadorController@visualizarTrabalhos' )->name('visualizarTrabalho')->middleware('auth');
Route::post('/parecer', 'AvaliadorController@parecer' )->name('parecer')->middleware('auth');
Route::get('/editais', 'AvaliadorController@editais' )->name('editais')->middleware('auth');
Route::post('/Enviarparecer', 'AvaliadorController@enviarParecer' )->name('enviarParecer')->middleware('auth');
Route::get('/Resposta', 'AvaliadorController@conviteResposta' )->name('conviteResposta')->middleware('auth');
});
Route::get('/home/edital', 'EventoController@index' )->name('visualizarEvento'); Route::get('/home/edital', 'EventoController@index' )->name('visualizarEvento');
......
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