Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Walter Felipe
submeta
Commits
39fa8693
Unverified
Commit
39fa8693
authored
Jun 28, 2020
by
Gabriel Antônio da Silva
Committed by
GitHub
Jun 28, 2020
Browse files
Merge pull request #52 from lmts-ufape/beta
botao criar projeto de participante removido
parents
d89fa938
34f669fe
Changes
3
Show whitespace changes
Inline
Side-by-side
app/Http/Controllers/EventoController.php
View file @
39fa8693
...
@@ -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:
1
500'
],
'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 @
39fa8693
...
@@ -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 @
39fa8693
...
@@ -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
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment