diff --git a/app/Http/Controllers/EventoController.php b/app/Http/Controllers/EventoController.php index 6ed85bd5d8eb0d83e47507f839d7ccca32826d03..03246822a9e46df4a6ee10f1021fb2aac10aec62 100755 --- a/app/Http/Controllers/EventoController.php +++ b/app/Http/Controllers/EventoController.php @@ -128,7 +128,7 @@ class EventoController extends Controller 'dt_fimRelatorioParcial' => ['required', 'date'], 'dt_inicioRelatorioFinal' => ['required', 'date'], 'dt_fimRelatorioFinal' => ['required', 'date'], - 'pdfFormAvalExterno' => [($request->pdfFormAvalExternoPreenchido!=='sim'?'required':''), 'file', 'mimes:pdf', 'max:2048'], + 'pdfFormAvalExterno' => [($request->pdfFormAvalExternoPreenchido!=='sim'?'required':''), 'file','mimes:pdf,doc,docx,xlsx,xls,csv', 'max:2048'], 'pdfEdital' => [($request->pdfEditalPreenchido!=='sim'?'required':''), 'file', 'mimes:pdf', 'max:2048'], 'inicioProjeto' => ['required', 'date'], 'fimProjeto' => ['required', 'date'], @@ -159,7 +159,7 @@ class EventoController extends Controller 'dt_fimRelatorioParcial' => ['required', 'date', 'after_or_equal:dt_inicioRelatorioParcial'], 'dt_inicioRelatorioFinal' => ['required', 'date', 'after:dt_fimRelatorioParcial'], 'dt_fimRelatorioFinal' => ['required', 'date', 'after_or_equal:dt_inicioRelatorioFinal'], - 'pdfFormAvalExterno' => [($request->pdfFormAvalExternoPreenchido!=='sim'?'required':''), 'file', 'mimes:pdf', 'max:2048'], + 'pdfFormAvalExterno' => [($request->pdfFormAvalExternoPreenchido!=='sim'?'required':''), 'file','mimes:pdf,doc,docx,xlsx,xls,csv', 'max:2048'], 'pdfEdital' => [($request->pdfEditalPreenchido!=='sim'?'required':''), 'file', 'mimes:pdf', 'max:2048'], 'inicioProjeto' => ['required', 'date', 'after:yesterday'], 'fimProjeto' => ['required', 'date', 'after_or_equal:fimSubmissao'], @@ -280,8 +280,10 @@ class EventoController extends Controller $eventoTemp->modeloDocumento = Storage::putFileAs($path, $request->modeloDocumento, $nome); } if(!(is_null($request->pdfFormAvalExterno)) ) { + $extension = $request->pdfFormAvalExterno->extension(); $pasta = 'pdfFormAvalExterno/' . $eventoTemp->id; - $eventoTemp->formAvaliacaoExterno = Storage::putFileAs($pasta, $request->pdfFormAvalExterno, 'formulario de avaliação externo.pdf'); + $nome = "formulario de avaliação externo" . "." . $extension; + $eventoTemp->formAvaliacaoExterno = Storage::putFileAs($pasta, $request->pdfFormAvalExterno, $nome); } if(!(is_null($request->pdfFormAvalRelatorio)) ) { $pasta = 'pdfFormAvalRelatorio/' . $eventoTemp->id; @@ -428,7 +430,7 @@ class EventoController extends Controller 'dt_fimRelatorioFinal' => ['required', 'date'], 'pdfEdital' => ['file', 'mimes:pdf', 'max:2048'], 'modeloDocumento' => ['file', 'mimes:zip,doc,docx,odt,pdf', 'max:2048'], - 'pdfFormAvalExterno' => ['file', 'mimes:pdf', 'max:2048'], + 'pdfFormAvalExterno' => ['file','mimes:pdf,doc,docx,xlsx,xls,csv', 'max:2048'], 'pdfFormAvalRelatorio' => ['file', 'mimes:pdf', 'max:2048'], 'inicioProjeto' => ['required', 'date'], 'fimProjeto' => ['required', 'date'], @@ -454,7 +456,7 @@ class EventoController extends Controller 'dt_inicioRelatorioFinal' => ['required', 'date', 'after:dt_fimRelatorioParcial'], 'dt_fimRelatorioFinal' => ['required', 'date', 'after_or_equal:dt_inicioRelatorioFinal'], 'modeloDocumento' => ['file', 'mimes:zip,doc,docx,odt,pdf', 'max:2048'], - 'pdfFormAvalExterno' => ['file', 'mimes:pdf', 'max:2048'], + 'pdfFormAvalExterno' => ['file', 'mimes:pdf,doc,docx,xlsx,xls,csv', 'max:2048'], 'pdfFormAvalRelatorio' => ['file', 'mimes:pdf', 'max:2048'], 'inicioProjeto' => ['required', 'date', 'after:resultado_final'], 'fimProjeto' => ['required', 'date', 'after:inicioProjeto'], diff --git a/resources/views/administrador/analisarProposta.blade.php b/resources/views/administrador/analisarProposta.blade.php index f58cf7817bc5c4afc4a09c041488273581762ece..3e3442475e47e6615e4a23749f7dd191ad906656 100644 --- a/resources/views/administrador/analisarProposta.blade.php +++ b/resources/views/administrador/analisarProposta.blade.php @@ -741,8 +741,7 @@