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
ee7f7180
Commit
ee7f7180
authored
3 years ago
by
Guilherme Silva
Browse files
Options
Download
Email Patches
Plain Diff
Ajuste em evento para utilização de cota de recem doutor
parent
6921e3de
master
carl-branch
dependabot/composer/dompdf/dompdf-1.2.2
dependabot/composer/guzzlehttp/guzzle-6.5.8
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
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/Http/Controllers/EventoController.php
+2
-0
app/Http/Controllers/EventoController.php
resources/views/evento/criarEvento.blade.php
+13
-3
resources/views/evento/criarEvento.blade.php
resources/views/evento/editarEvento.blade.php
+14
-3
resources/views/evento/editarEvento.blade.php
with
29 additions
and
6 deletions
+29
-6
app/Http/Controllers/EventoController.php
View file @
ee7f7180
...
...
@@ -181,6 +181,7 @@ class EventoController extends Controller
$evento
[
'criador_id'
]
=
$user_id
;
$evento
[
'numParticipantes'
]
=
$request
->
numParticipantes
;
$evento
[
'consu'
]
=
$request
->
has
(
'consu'
);
$evento
[
'cotaDoutor'
]
=
$request
->
has
(
'cotaDoutor'
);
$evento
[
'anexosStatus'
]
=
'final'
;
//dd($evento);
...
...
@@ -441,6 +442,7 @@ class EventoController extends Controller
$evento
->
dt_fimRelatorioFinal
=
$request
->
dt_fimRelatorioFinal
;
$evento
->
coordenadorId
=
$request
->
coordenador_id
;
$evento
->
consu
=
$request
->
has
(
'consu'
);
$evento
->
cotaDoutor
=
$request
->
has
(
'cotaDoutor'
);
if
(
$request
->
pdfEdital
!=
null
){
$pdfEdital
=
$request
->
pdfEdital
;
$path
=
'pdfEdital/'
.
$evento
->
id
.
'/'
;
...
...
This diff is collapsed.
Click to expand it.
resources/views/evento/criarEvento.blade.php
View file @
ee7f7180
...
...
@@ -32,6 +32,7 @@
<
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'
)
==
'PIBITI'
)
selected
@
endif
value
=
"PIBITI"
>
PIBITI
</
option
>
<
option
@
if
(
old
(
'tipo'
)
==
'PIBEX'
)
selected
@
endif
value
=
"PIBEX"
>
PIBEX
</
option
>
</
select
>
@
error
(
'tipo'
)
...
...
@@ -56,7 +57,7 @@
@
enderror
</
div
>
<
div
class
=
"col-sm-2"
>
<
label
for
=
"numParticipantes"
class
=
"col-form-label"
>
{{
__
(
'Nº de
Participante
s*:'
)
}}
</
label
>
<
label
for
=
"numParticipantes"
class
=
"col-form-label"
>
{{
__
(
'Nº de
Bolsista
s*:'
)
}}
</
label
>
<
input
id
=
"numParticipantes"
type
=
"number"
min
=
"1"
max
=
"20"
class
=
"form-control @error('numParticipantes') is-invalid @enderror"
name
=
"numParticipantes"
value
=
"{{ old('numParticipantes') }}"
required
autocomplete
=
"numParticipantes"
autofocus
>
...
...
@@ -67,8 +68,7 @@
@
enderror
</
div
>
<
div
class
=
"col-sm-3"
>
<
label
for
=
"consu"
class
=
"col-form-label"
>
{{
__
(
'Consu obrigatório?*'
)
}}
</
label
>
<
br
>
<
label
for
=
"consu"
class
=
"col-form-label"
>
{{
__
(
'CONSEPE obrigatório?*'
)
}}
</
label
>
<
input
type
=
"checkbox"
name
=
"consu"
id
=
"consu"
>
{{
--
<
input
id
=
"consu"
type
=
"checkbox"
class
=
"form-control @error('consu') is-invalid @enderror"
name
=
"consu"
@
if
(
old
(
'consu'
))
checked
@
endif
required
autocomplete
=
"consu"
autofocus
>
--
}}
...
...
@@ -77,6 +77,16 @@
<
strong
>
{{
$message
}}
</
strong
>
</
span
>
@
enderror
<
br
>
<
label
for
=
"cotaDoutor"
class
=
"col-form-label"
>
{{
__
(
'Cota para recém doutor?'
)
}}
</
label
>
<
input
type
=
"checkbox"
name
=
"cotaDoutor"
id
=
"cotaDoutor"
>
@
error
(
'cotaDoutor'
)
<
span
class
=
"invalid-feedback"
role
=
"alert"
>
<
strong
>
{{
$message
}}
</
strong
>
</
span
>
@
enderror
</
div
>
</
div
>
{{
--
end
nome
|
Participantes
|
Tipo
--
}}
...
...
This diff is collapsed.
Click to expand it.
resources/views/evento/editarEvento.blade.php
View file @
ee7f7180
...
...
@@ -34,6 +34,7 @@
<
option
value
=
"PIBIC"
{{
$evento
->
tipo
==
"PIBIC"
?
'selected'
:
''
}}
>
PIBIC
</
option
>
<
option
value
=
"PIBIC-EM"
{{
$evento
->
tipo
==
"PIBIC-EM"
?
'selected'
:
''
}}
>
PIBIC
-
EM
</
option
>
<
option
value
=
"PIBITI"
{{
$evento
->
tipo
==
"PIBITI"
?
'selected'
:
''
}}
>
PIBITI
</
option
>
<
option
value
=
"PIBEX"
{{
$evento
->
tipo
==
"PIBEX"
?
'selected'
:
''
}}
>
PIBEX
</
option
>
</
select
>
@
error
(
'tipo'
)
<
span
class
=
"invalid-feedback"
role
=
"alert"
>
...
...
@@ -61,7 +62,7 @@
@
enderror
</
div
>
<
div
class
=
"col-sm-2"
>
<
label
for
=
"numParticipantes"
class
=
"col-form-label"
>
{{
__
(
'Nº de
Discente
s*:'
)
}}
</
label
>
<
label
for
=
"numParticipantes"
class
=
"col-form-label"
>
{{
__
(
'Nº de
Bolsista
s*:'
)
}}
</
label
>
<
input
id
=
"numParticipantes"
type
=
"number"
min
=
"1"
max
=
"20"
class
=
"form-control @error('numParticipantes') is-invalid @enderror"
name
=
"numParticipantes"
value
=
"{{
$evento->numParticipantes
}}"
required
autocomplete
=
"numParticipantes"
autofocus
>
@
error
(
'numParticipantes'
)
...
...
@@ -71,8 +72,7 @@
@
enderror
</
div
>
<
div
class
=
"col-sm-3"
>
<
label
for
=
"consu"
class
=
"col-form-label"
>
{{
__
(
'Consu obrigatório?*'
)
}}
</
label
>
<
br
>
<
label
for
=
"consu"
class
=
"col-form-label"
>
{{
__
(
'CONSEPE obrigatório?*'
)
}}
</
label
>
<
input
type
=
"checkbox"
@
if
(
$evento
->
consu
)
checked
@
endif
name
=
"consu"
id
=
"consu"
>
{{
--
<
input
id
=
"consu"
type
=
"checkbox"
class
=
"form-control @error('consu') is-invalid @enderror"
name
=
"consu"
@
if
(
old
(
'consu'
))
checked
@
endif
required
autocomplete
=
"consu"
autofocus
>
--
}}
...
...
@@ -81,6 +81,17 @@
<
strong
>
{{
$message
}}
</
strong
>
</
span
>
@
enderror
<
br
>
<
label
for
=
"cotaDoutor"
class
=
"col-form-label"
>
{{
__
(
'Cota para recém doutor?'
)
}}
</
label
>
<
input
type
=
"checkbox"
@
if
(
$evento
->
cotaDoutor
)
checked
@
endif
name
=
"cotaDoutor"
id
=
"cotaDoutor"
>
@
error
(
'cotaDoutor'
)
<
span
class
=
"invalid-feedback"
role
=
"alert"
>
<
strong
>
{{
$message
}}
</
strong
>
</
span
>
@
enderror
</
div
>
</
div
>
{{
--
end
nome
|
Participantes
|
Tipo
--
}}
...
...
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