From 93ebdc348f9b996fdba3149c12982a1b1255632f Mon Sep 17 00:00:00 2001
From: Guilherme Silva <guilherme.dna06@gmail.com>
Date: Wed, 8 Jun 2022 01:16:18 -0300
Subject: [PATCH] =?UTF-8?q?Atualiza=C3=A7=C3=A3o=20nos=20formatos=20aceito?=
 =?UTF-8?q?s=20para=20o=20formuluario=20de=20avalia=C3=A7=C3=A3o=20na=20cr?=
 =?UTF-8?q?ia=C3=A7=C3=A3o=20do=20edital?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/EventoController.php     | 12 +++++++-----
 resources/views/evento/criarEvento.blade.php  |  4 ++--
 resources/views/evento/editarEvento.blade.php |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/EventoController.php b/app/Http/Controllers/EventoController.php
index 6ed85bd..0324682 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/evento/criarEvento.blade.php b/resources/views/evento/criarEvento.blade.php
index 033a418..8cf276b 100755
--- a/resources/views/evento/criarEvento.blade.php
+++ b/resources/views/evento/criarEvento.blade.php
@@ -426,8 +426,8 @@
                         <a id="pdfFormAvalExternoTemp" href="{{ route('baixar.evento.temp', ['nomeAnexo' => 'formAvaliacaoExterno' ])}}">Arquivo atual</a>
                     @endif
                     <input type="hidden" id="pdfFormAvalExternoPreenchido" name="pdfFormAvalExternoPreenchido" value="{{ old('pdfFormAvalExternoPreenchido') }}" >
-                    <input type="file" accept=".pdf" class="form-control-file pdf @error('pdfFormAvalExterno') is-invalid @enderror" name="pdfFormAvalExterno" value="{{ old('pdfFormAvalExterno') }}" id="pdfFormAvalExterno" onchange="exibirAnexoTemp(this)">
-                    <small>O arquivo selecionado deve ser no formato PDF de até 2mb.</small>
+                    <input type="file" accept=".pdf,.doc,.docx,.xlsx, .xls, .csv" class="form-control-file @error('pdfFormAvalExterno') is-invalid @enderror" name="pdfFormAvalExterno" value="{{ old('pdfFormAvalExterno') }}" id="pdfFormAvalExterno" onchange="exibirAnexoTemp(this)">
+                    <small>O arquivo selecionado deve ter até 2mb.</small>
                     @error('pdfFormAvalExterno')
                     <span class="invalid-feedback" role="alert">
                             <strong>{{ $message }}</strong>
diff --git a/resources/views/evento/editarEvento.blade.php b/resources/views/evento/editarEvento.blade.php
index c2679d8..822b7e1 100755
--- a/resources/views/evento/editarEvento.blade.php
+++ b/resources/views/evento/editarEvento.blade.php
@@ -405,8 +405,8 @@
                     <a href="{{route('download', ['file' => $evento->formAvaliacaoExterno])}}" target="_new" style="font-size: 20px; color: #114048ff;" >
                         <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px">
                     </a>
-                    <input type="file" class="form-control-file @error('pdfFormAvalExterno') is-invalid @enderror" name="pdfFormAvalExterno" value="{{ old('pdfFormAvalExterno') }}" id="pdfFormAvalExterno">
-                    <small>O arquivo selecionado deve ser no formato PDF de até 2mb.</small>
+                    <input type="file" accept=".pdf,.doc,.docx,.xlsx, .xls, .csv" class="form-control-file @error('pdfFormAvalExterno') is-invalid @enderror" name="pdfFormAvalExterno" value="{{ old('pdfFormAvalExterno') }}" id="pdfFormAvalExterno">
+                    <small>O arquivo selecionado deve ter até 2mb.</small>
                     @error('pdfFormAvalExterno')
                     <span class="invalid-feedback" role="alert">
                             <strong>{{ $message }}</strong>
-- 
GitLab