Skip to content

issue 199 #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Marcelo-k-USP wants to merge 1 commit into
base: master
Choose a base branch
from
Open

issue 199 #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/Http/Controllers/RelatorioController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
class RelatorioController extends Controller
{
public function index(){
\UspTheme::activeUrl('/relatorio');
return view('relatorio.index', [
'categorias' => Categoria::pluck('nome','id')->prepend('Selecione a Categoria', '')
]);
Expand All @@ -38,7 +39,7 @@ public function query(RelatorioRequest $request, Excel $excel){
->orderBy('data','asc')
->orderBy('horario_inicio','desc')
->get();

if($reservas->isNotEmpty()){
$data = $reservas->toArray();
$headings = [
Expand Down
1 change: 1 addition & 0 deletions app/Http/Controllers/SalasLivresController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class SalasLivresController extends Controller
{
public function index()
{
\UspTheme::activeUrl('/salas_livres');
$reserva = new Reserva();
return view('sala.salas_livres', ['today' => Carbon::today(), 'reserva' => $reserva]);
}
Expand Down