Skip to content

GitLab

Commit 34f669fe authored by Gabriel-31415's avatar Gabriel-31415
Browse files

botao criar de participante removido

parent 59559405
master beta carl-branch carlos dependabot/composer/dompdf/dompdf-1.2.2 dependabot/composer/guzzlehttp/guzzle-6.5.8 dependabot/composer/guzzlehttp/psr7-1.8.5 dependabot/composer/symfony/http-kernel-4.4.50 dependabot/npm_and_yarn/axios-0.21.2 dependabot/npm_and_yarn/decode-uri-component-0.2.2 dependabot/npm_and_yarn/express-4.18.2 dependabot/npm_and_yarn/json5-and-json5-2.2.3 dependabot/npm_and_yarn/loader-utils-and-webpack-cli-1.4.2 dependabot/npm_and_yarn/minimist-and-mkdirp-1.2.8 dependabot/npm_and_yarn/qs-and-express-6.11.0 editarProjeto excluir_projeto_submetido fixCorrecoes fixQtdParticipante master-test minha_conta modificacoes_aviso modificacoes_layout_6 modificacoes_layout_7 modificacoes_layout_8 modificacoes_layout_9 modificacoes_layout_igor modificacoes_layout_minha_conta modificacoes_perfil_avaliador updates_mar
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 12 deletions
+5 -12
app/Http/Controllers/EventoController.php
View file @ 34f669fe
...@@ -104,7 +104,6 @@ class EventoController extends Controller ...@@ -104,7 +104,6 @@ class EventoController extends Controller
'descricao' => ['required', 'string'], 'descricao' => ['required', 'string'],
'tipo' => ['required', 'string'], 'tipo' => ['required', 'string'],
'natureza' => ['required'], 'natureza' => ['required'],
'descricao' => ['required'],
'coordenador_id' => ['required'], 'coordenador_id' => ['required'],
'inicioSubmissao' => ['required', 'date'], 'inicioSubmissao' => ['required', 'date'],
'fimSubmissao' => ['required', 'date'], 'fimSubmissao' => ['required', 'date'],
...@@ -124,10 +123,9 @@ class EventoController extends Controller ...@@ -124,10 +123,9 @@ class EventoController extends Controller
//before = antes //before = antes
$validatedData = $request->validate([ $validatedData = $request->validate([
'nome' => ['required', 'string'], 'nome' => ['required', 'string'],
'descricao' => ['required', 'string'], 'descricao' => ['required', 'string','size:1500'],
'tipo' => ['required', 'string'], 'tipo' => ['required', 'string'],
'natureza' => ['required'], 'natureza' => ['required'],
'descricao' => ['required'],
'coordenador_id' => ['required'], 'coordenador_id' => ['required'],
#---------------------------------------------- #----------------------------------------------
'inicioSubmissao' => ['required', 'date', 'after:yesterday'], 'inicioSubmissao' => ['required', 'date', 'after:yesterday'],
...@@ -356,7 +354,7 @@ class EventoController extends Controller ...@@ -356,7 +354,7 @@ class EventoController extends Controller
$validated = $request->validate([ $validated = $request->validate([
'nome' => ['required', 'string'], 'nome' => ['required', 'string'],
'descricao' => ['required', 'string', 'size:500'], 'descricao' => ['required', 'string', 'size:1500'],
'tipo' => ['required', 'string'], 'tipo' => ['required', 'string'],
'natureza' => ['required'], 'natureza' => ['required'],
'inicioSubmissao' => ['required', 'date', 'after:yesterday'], 'inicioSubmissao' => ['required', 'date', 'after:yesterday'],
......
resources/views/participante/projetos.blade.php
View file @ 34f669fe
...@@ -10,12 +10,7 @@ ...@@ -10,12 +10,7 @@
<h6 style="color: rgb(4, 78, 4);">Submissão irá até o dia {{ date('d-m-Y', strtotime($edital->fimSubmissao)) }}</h6> <h6 style="color: rgb(4, 78, 4);">Submissão irá até o dia {{ date('d-m-Y', strtotime($edital->fimSubmissao)) }}</h6>
</div> </div>
<div class="col-sm-2"> <div class="col-sm-2">
<!-- Se usuário não é proponente, redirecionar para view de cadastro -->
@if(Auth::user()->proponentes == null)
<a href="{{ route('proponente.create' )}}" class="btn btn-primary">Criar projeto</a>
@else
<a href="{{ route('trabalho.index' )}}" class="btn btn-primary">Criar projeto</a>
@endif
</div> </div>
</div> </div>
</div> </div>
......
resources/views/projeto/index.blade.php
View file @ 34f669fe
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
<div class="col-sm-3"> <div class="col-sm-3">
<!-- Se usuário não é proponente, redirecionar para view de cadastro --> <!-- Se usuário não é proponente, redirecionar para view de cadastro -->
@if(Auth::user()->proponentes->where('user_id', Auth::user()->id)->count() == 0) == null) @if(Auth::user()->proponentes == null)
<a href="{{ route('proponente.create' )}}" class="btn btn-primary" style="position:relative; float: right;">Criar projeto</a> <a href="{{ route('proponente.create' )}}" class="btn btn-primary" style="position:relative; float: right;">Criar projeto</a>
@elseif(Auth::user()->participantes->where('user_id', Auth::user()->id)->count() == 0) @elseif(Auth::user()->participantes->where('user_id', Auth::user()->id)->count() == 0)
<a href="{{ route('trabalho.index', ['id' => $edital->id] )}}" class="btn btn-primary" style="position:relative; float: right;">Criar projeto</a> <a href="{{ route('trabalho.index', ['id' => $edital->id] )}}" class="btn btn-primary" style="position:relative; float: right;">Criar projeto</a>
......
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