Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
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
5a805a92
Unverified
Commit
5a805a92
authored
2 years ago
by
GuilhermeGz
Committed by
GitHub
2 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #509 from S-Nathalia/master
Alterações do dia
parents
3daa4e92
3e27f13a
master
carl-branch
dependabot/composer/symfony/http-kernel-4.4.50
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
excluir_projeto_submetido
updates_mar
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
resources/views/evento/criarEvento.blade.php
+1
-0
resources/views/evento/criarEvento.blade.php
resources/views/evento/editarEvento.blade.php
+1
-0
resources/views/evento/editarEvento.blade.php
resources/views/evento/rascunho/projeto.blade.php
+1
-1
resources/views/evento/rascunho/projeto.blade.php
resources/views/projeto/editaFormulario/finalizar.blade.php
+5
-0
resources/views/projeto/editaFormulario/finalizar.blade.php
resources/views/projeto/editar.blade.php
+2
-2
resources/views/projeto/editar.blade.php
with
10 additions
and
3 deletions
+10
-3
resources/views/evento/criarEvento.blade.php
View file @
5a805a92
...
...
@@ -31,6 +31,7 @@
<
select
id
=
"tipo"
type
=
"text"
class
=
"form-control @error('tipo') is-invalid @enderror"
name
=
"tipo"
value
=
"{{ old('tipo') }}"
required
>
<
option
@
if
(
old
(
'tipo'
)
==
'PIBIC'
)
selected
@
endif
value
=
"PIBIC"
>
PIBIC
</
option
>
<
option
@
if
(
old
(
'tipo'
)
==
'PIBIC-EM'
)
selected
@
endif
value
=
"PIBIC-EM"
>
PIBIC
-
EM
</
option
>
<
option
@
if
(
old
(
'tipo'
)
==
'PIBIC-AF'
)
selected
@
endif
value
=
"PIBIC-AF"
>
PIBIC
-
AF
</
option
>
<
option
@
if
(
old
(
'tipo'
)
==
'PIBITI'
)
selected
@
endif
value
=
"PIBITI"
>
PIBITI
</
option
>
<
option
@
if
(
old
(
'tipo'
)
==
'PIBEX'
)
selected
@
endif
value
=
"PIBEX"
>
PIBEX
</
option
>
</
select
>
...
...
This diff is collapsed.
Click to expand it.
resources/views/evento/editarEvento.blade.php
View file @
5a805a92
...
...
@@ -33,6 +33,7 @@
<
select
id
=
"tipo"
type
=
"text"
class
=
"form-control @error('tipo') is-invalid @enderror"
name
=
"tipo"
required
>
<
option
value
=
"PIBIC"
{{
$evento
->
tipo
==
"PIBIC"
?
'selected'
:
''
}}
>
PIBIC
</
option
>
<
option
value
=
"PIBIC-EM"
{{
$evento
->
tipo
==
"PIBIC-EM"
?
'selected'
:
''
}}
>
PIBIC
-
EM
</
option
>
<
option
value
=
"PIBIC-AF"
{{
$evento
->
tipo
==
"PIBIC-AF"
?
'selected'
:
''
}}
>
PIBIC
-
AF
</
option
>
<
option
value
=
"PIBITI"
{{
$evento
->
tipo
==
"PIBITI"
?
'selected'
:
''
}}
>
PIBITI
</
option
>
<
option
value
=
"PIBEX"
{{
$evento
->
tipo
==
"PIBEX"
?
'selected'
:
''
}}
>
PIBEX
</
option
>
</
select
>
...
...
This diff is collapsed.
Click to expand it.
resources/views/evento/rascunho/projeto.blade.php
View file @
5a805a92
...
...
@@ -7,7 +7,7 @@
<div
class=
"card-body"
>
<div
class=
"container"
>
<div
class=
"form-row mt-3"
>
<div
class=
"col-md-12"
><h5
style=
"color: #1492E6; margin-bottom:-0.4rem"
>
Informações do
p
rojeto
</h5></div>
<div
class=
"col-md-12"
><h5
style=
"color: #1492E6; margin-bottom:-0.4rem"
>
Informações do
P
rojeto
</h5></div>
<div
class=
"col-md-12"
style=
"margin-bottom: -0.8rem;"
><hr
style=
"border-top: 1px solid#1492E6"
></div>
<div
class=
"form-group col-md-12"
style=
"margin-top: 10px"
>
...
...
This diff is collapsed.
Click to expand it.
resources/views/projeto/editaFormulario/finalizar.blade.php
View file @
5a805a92
...
...
@@ -13,6 +13,11 @@
<button
type=
"submit"
class=
"btn btn-primary "
id=
"idButtonSubmitRascunho"
>
{{ __('Salvar como rascunho') }}
</button>
<button
type=
"submit"
class=
"btn btn-success"
id=
"idButtonSubmitProjeto"
>
{{ __('Submeter projeto') }}
</button>
</div>
@if($errors->any())
<div
class=
"alert alert-danger"
>
Verifique se todos os campos obrigatórios/Dados do discente foram preenchidos!
</div>
@endif
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
resources/views/projeto/editar.blade.php
View file @
5a805a92
...
...
@@ -17,7 +17,7 @@
{{
session
(
'mensagem'
)
}}
</
div
>
@
endif
@
if
(
$errors
->
any
())
<!--
@
if
(
$errors
->
any
())
<
div
class
=
"alert alert-danger"
>
<
ul
>
@
foreach
(
$errors
->
all
()
as
$error
)
...
...
@@ -25,7 +25,7 @@
@
endforeach
</
ul
>
</
div
>
@
endif
@
endif
-->
<
div
class
=
"row justify-content-center"
>
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help