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
153900c5
Unverified
Commit
153900c5
authored
Jun 23, 2020
by
Gabriel Antônio da Silva
Committed by
GitHub
Jun 23, 2020
Browse files
Merge pull request #36 from lmts-ufape/fixbugs
modal para apagar projeto e edital
parents
8d059a91
f9faab3f
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/TrabalhoController.php
View file @
153900c5
...
@@ -112,7 +112,8 @@ class TrabalhoController extends Controller
...
@@ -112,7 +112,8 @@ class TrabalhoController extends Controller
'area'
=>
[
'required'
,
'string'
],
'area'
=>
[
'required'
,
'string'
],
'subArea'
=>
[
'required'
,
'string'
],
'subArea'
=>
[
'required'
,
'string'
],
'pontuacaoPlanilha'
=>
[
'required'
,
'string'
],
'pontuacaoPlanilha'
=>
[
'required'
,
'string'
],
'linkGrupo'
=>
[
'required'
,
'string'
,
'link_grupo'
],
'linkGrupo'
=>
[
'required'
,
'string'
],
// 'linkGrupo' => ['required', 'string', 'link_grupo'],
'linkLattesEstudante'
=>
[
'required'
,
'string'
,
'link_lattes'
],
'linkLattesEstudante'
=>
[
'required'
,
'string'
,
'link_lattes'
],
'nomeParticipante.*'
=>
[
'required'
,
'string'
],
'nomeParticipante.*'
=>
[
'required'
,
'string'
],
'emailParticipante.*'
=>
[
'required'
,
'string'
],
'emailParticipante.*'
=>
[
'required'
,
'string'
],
...
@@ -161,7 +162,8 @@ class TrabalhoController extends Controller
...
@@ -161,7 +162,8 @@ class TrabalhoController extends Controller
'area'
=>
[
'required'
,
'string'
],
'area'
=>
[
'required'
,
'string'
],
'subArea'
=>
[
'required'
,
'string'
],
'subArea'
=>
[
'required'
,
'string'
],
'pontuacaoPlanilha'
=>
[
'required'
,
'string'
],
'pontuacaoPlanilha'
=>
[
'required'
,
'string'
],
'linkGrupo'
=>
[
'required'
,
'string'
,
'link_grupo'
],
'linkGrupo'
=>
[
'required'
,
'string'
],
// 'linkGrupo' => ['required', 'string', 'link_grupo'],
'linkLattesEstudante'
=>
[
'required'
,
'string'
,
'link_lattes'
],
'linkLattesEstudante'
=>
[
'required'
,
'string'
,
'link_lattes'
],
'nomeParticipante.*'
=>
[
'required'
,
'string'
],
'nomeParticipante.*'
=>
[
'required'
,
'string'
],
'emailParticipante.*'
=>
[
'required'
,
'string'
],
'emailParticipante.*'
=>
[
'required'
,
'string'
],
...
...
resources/views/administrador/editais.blade.php
View file @
153900c5
...
@@ -50,15 +50,13 @@
...
@@ -50,15 +50,13 @@
Visualizar
Pareceres
Visualizar
Pareceres
</
a
>
</
a
>
<
form
method
=
"POST"
action
=
"
{
{route('evento.deletar',$evento->id)}
}
"
class
=
"text-center"
>
<!--
Button
trigger
modal
-->
{{
csrf_field
()
}}
<
button
type
=
"button"
class
=
"dropdown-item text-center"
data
-
toggle
=
"modal"
data
-
target
=
"#exampleModal"
>
{{
method_field
(
'DELETE'
)
}}
Deletar
<
button
type
=
"submit"
class
=
"dropdown-item"
>
Deletar
</
button
>
</
button
>
</
form
>
</
div
>
</
div
>
</
div
>
</
div
>
@
endif
@
endif
...
@@ -69,6 +67,34 @@
...
@@ -69,6 +67,34 @@
</
table
>
</
table
>
</
div
>
</
div
>
<!--
Modal
-->
<
div
class
=
"modal fade"
id
=
"exampleModal"
tabindex
=
"-1"
role
=
"dialog"
aria
-
labelledby
=
"exampleModalLabel"
aria
-
hidden
=
"true"
>
<
div
class
=
"modal-dialog"
>
<
div
class
=
"modal-content"
>
<
div
class
=
"modal-header"
>
<
h5
class
=
"modal-title"
id
=
"exampleModalLabel"
>
Deletar
edital
</
h5
>
<
button
type
=
"button"
class
=
"close"
data
-
dismiss
=
"modal"
aria
-
label
=
"Close"
>
<
span
aria
-
hidden
=
"true"
>&
times
;
</
span
>
</
button
>
</
div
>
<
div
class
=
"modal-body"
>
<
p
>
Você
tem
certeza
que
deseja
deletar
o
edital
:
{{
$evento
->
nome
}}
?</
p
>
</
div
>
<
div
class
=
"modal-footer"
>
<
button
type
=
"button"
class
=
"btn btn-secondary"
data
-
dismiss
=
"modal"
>
Cancelar
</
button
>
<
form
method
=
"POST"
action
=
"
{
{route('evento.deletar',$evento->id)}
}
"
class
=
"text-center"
>
{{
csrf_field
()
}}
{{
method_field
(
'DELETE'
)
}}
<
button
type
=
"submit"
class
=
"btn btn-primary"
>
Deletar
</
button
>
</
form
>
</
div
>
</
div
>
</
div
>
</
div
>
@
endsection
@
endsection
...
...
resources/views/projeto/editar.blade.php
View file @
153900c5
No preview for this file type
resources/views/projeto/index.blade.php
View file @
153900c5
...
@@ -61,9 +61,14 @@
...
@@ -61,9 +61,14 @@
Resultado
Resultado
</
a
>
--
}}
</
a
>
--
}}
@
if
(
$projeto
->
status
==
'Submetido'
)
@
if
(
$projeto
->
status
==
'Submetido'
)
<
a
href
=
"{{ route('trabalho.destroy', ['id' =>
$projeto->id
]) }}"
class
=
"dropdown-item"
style
=
"text-align: center"
>
<!--
Button
trigger
modal
-->
<
button
type
=
"button"
class
=
"dropdown-item"
data
-
toggle
=
"modal"
data
-
target
=
"#modal
{
{$projeto->id}
}
"
>
Excluir
projeto
Excluir
projeto
</
a
>
</
button
>
@
endif
@
endif
</
div
>
</
div
>
...
@@ -71,6 +76,28 @@
...
@@ -71,6 +76,28 @@
</
td
>
</
td
>
</
tr
>
</
tr
>
@
endif
@
endif
<!--
Modal
-->
<
div
class
=
"modal fade"
id
=
"modal
{
{$projeto->id}
}
"
tabindex
=
"-1"
role
=
"dialog"
aria
-
labelledby
=
"exampleModalLabel"
aria
-
hidden
=
"true"
>
<
div
class
=
"modal-dialog"
>
<
div
class
=
"modal-content"
>
<
div
class
=
"modal-header"
>
<
h5
class
=
"modal-title"
id
=
"exampleModalLabel"
>
Deletar
projeto
</
h5
>
<
button
type
=
"button"
class
=
"close"
data
-
dismiss
=
"modal"
aria
-
label
=
"Close"
>
<
span
aria
-
hidden
=
"true"
>&
times
;
</
span
>
</
button
>
</
div
>
<
div
class
=
"modal-body"
>
<
p
>
Você
tem
certeza
que
deseja
deletar
o
projeto
:
{{
$projeto
->
titulo
}}
?</
p
>
</
div
>
<
div
class
=
"modal-footer"
>
<
button
type
=
"button"
class
=
"btn btn-secondary"
data
-
dismiss
=
"modal"
>
Cancelar
</
button
>
<
a
href
=
"{{ route('trabalho.destroy', ['id' =>
$projeto->id
]) }}"
class
=
"btn btn-primary"
style
=
"text-align: center"
>
Deletar
</
a
>
</
div
>
</
div
>
</
div
>
</
div
>
@
endforeach
@
endforeach
</
tbody
>
</
tbody
>
</
table
>
</
table
>
...
@@ -79,6 +106,7 @@
...
@@ -79,6 +106,7 @@
@
section
(
'javascript'
)
@
section
(
'javascript'
)
<
script
>
<
script
>
</
script
>
</
script
>
@
endsection
@
endsection
\ No newline at end of file
resources/views/proponente/projetos.blade.php
View file @
153900c5
...
@@ -52,16 +52,39 @@
...
@@ -52,16 +52,39 @@
<
a
href
=
""
class
=
"dropdown-item"
style
=
"text-align: center"
>
<
a
href
=
""
class
=
"dropdown-item"
style
=
"text-align: center"
>
Resultado
Resultado
</
a
>
--
}}
</
a
>
--
}}
@
if
(
$projeto
->
status
==
'Submetido'
)
@
if
(
$projeto
->
status
==
'Submetido'
)
<
a
href
=
"{{ route('trabalho.destroy', ['id' =>
$projeto->id
]) }}"
class
=
"dropdown-item"
style
=
"text-align: center"
>
<!--
Button
trigger
modal
-->
<
button
type
=
"button"
class
=
"dropdown-item"
style
=
"text-align: center"
data
-
toggle
=
"modal"
data
-
target
=
"#modal
{
{$projeto->id}
}
"
>
Excluir
projeto
Excluir
projeto
</
a
>
</
button
>
@
endif
@
endif
</
div
>
</
div
>
</
div
>
</
div
>
</
td
>
</
td
>
</
tr
>
</
tr
>
<!--
Modal
-->
<
div
class
=
"modal fade"
id
=
"modal
{
{$projeto->id}
}
"
tabindex
=
"-1"
role
=
"dialog"
aria
-
labelledby
=
"exampleModalLabel"
aria
-
hidden
=
"true"
>
<
div
class
=
"modal-dialog"
>
<
div
class
=
"modal-content"
>
<
div
class
=
"modal-header"
>
<
h5
class
=
"modal-title"
id
=
"exampleModalLabel"
>
Deletar
o
projeto
:
{{
$projeto
->
titulo
}}
</
h5
>
<
button
type
=
"button"
class
=
"close"
data
-
dismiss
=
"modal"
aria
-
label
=
"Close"
>
<
span
aria
-
hidden
=
"true"
>&
times
;
</
span
>
</
button
>
</
div
>
<
div
class
=
"modal-body"
>
<
p
>
Você
tem
certeza
que
deseja
deletar
o
projeto
:
{{
$projeto
->
titulo
}}
?</
p
>
</
div
>
<
div
class
=
"modal-footer"
>
<
button
type
=
"button"
class
=
"btn btn-secondary"
data
-
dismiss
=
"modal"
>
Cancelar
</
button
>
<
a
href
=
"{{ route('trabalho.destroy', ['id' =>
$projeto->id
]) }}"
class
=
"btn btn-primary"
>
Deletar
</
a
>
</
div
>
</
div
>
</
div
>
</
div
>
@
endforeach
@
endforeach
</
tbody
>
</
tbody
>
</
table
>
</
table
>
...
...
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