Unverified Commit 7ccae9d4 authored by Gabriel Antônio da Silva's avatar Gabriel Antônio da Silva Committed by GitHub
Browse files

Merge pull request #66 from lmts-ufape/master-test

Master test
parents a0f2c289 d7b3bb42
......@@ -887,8 +887,10 @@ class TrabalhoController extends Controller
public function projetosDoEdital($id) {
$edital = Evento::find($id);
$projetos = Trabalho::where('evento_id', '=', $id)->get();
$hoje = Carbon::today('America/Recife');
$hoje = $hoje->toDateString();
return view('projeto.index')->with(['edital' => $edital, 'projetos' => $projetos]);
return view('proponente.projetosEdital')->with(['edital' => $edital, 'projetos' => $projetos, 'hoje'=>$hoje]);
}
public function baixarAnexoProjeto($id) {
......@@ -967,5 +969,4 @@ class TrabalhoController extends Controller
}
return abort(404);
}
}
}
\ No newline at end of file
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