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
9a1415ba
Unverified
Commit
9a1415ba
authored
Jun 27, 2023
by
Antônio Durval
Committed by
GitHub
Jun 27, 2023
Browse files
Merge pull request #919 from antonioDurval/master
Correção no Edital (parte dos arquivos)
parents
41a6e842
cf0abe0e
Changes
3
Show whitespace changes
Inline
Side-by-side
app/Evento.php
View file @
9a1415ba
...
@@ -110,7 +110,7 @@ class Evento extends Model
...
@@ -110,7 +110,7 @@ class Evento extends Model
'dt_fimRelatorioParcial'
=>
[
'exclude_if:tipo,PIBEX'
,
'required'
,
'date'
,
'after_or_equal:dt_inicioRelatorioParcial'
],
'dt_fimRelatorioParcial'
=>
[
'exclude_if:tipo,PIBEX'
,
'required'
,
'date'
,
'after_or_equal:dt_inicioRelatorioParcial'
],
'dt_inicioRelatorioFinal'
=>
[
'required'
,
'date'
,
'after:dt_fimRelatorioParcial'
],
'dt_inicioRelatorioFinal'
=>
[
'required'
,
'date'
,
'after:dt_fimRelatorioParcial'
],
'dt_fimRelatorioFinal'
=>
[
'required'
,
'date'
,
'after_or_equal:dt_inicioRelatorioFinal'
],
'dt_fimRelatorioFinal'
=>
[
'required'
,
'date'
,
'after_or_equal:dt_inicioRelatorioFinal'
],
'modeloDocumento'
=>
[
'file'
,
'mimes:zip,doc,docx,odt,pdf'
,
'max:2048'
],
'modeloDocumento
.*
'
=>
[
'file'
,
'mimes:zip,doc,docx,odt,pdf'
,
'max:2048'
],
'pdfFormAvalExterno'
=>
[
'file'
,
'mimes:pdf,doc,docx,xlsx,xls,csv,zip'
,
'max:2048'
],
'pdfFormAvalExterno'
=>
[
'file'
,
'mimes:pdf,doc,docx,xlsx,xls,csv,zip'
,
'max:2048'
],
'inicioProjeto'
=>
[
'required'
,
'date'
,
'after:resultado_final'
],
'inicioProjeto'
=>
[
'required'
,
'date'
,
'after:resultado_final'
],
'fimProjeto'
=>
[
'required'
,
'date'
,
'after:inicioProjeto'
],
'fimProjeto'
=>
[
'required'
,
'date'
,
'after:inicioProjeto'
],
...
...
app/Http/Controllers/EventoController.php
View file @
9a1415ba
...
@@ -463,7 +463,8 @@ class EventoController extends Controller
...
@@ -463,7 +463,8 @@ class EventoController extends Controller
*/
*/
public
function
update
(
Request
$request
,
$id
)
public
function
update
(
Request
$request
,
$id
)
{
{
//dd($request);
// AKII
// dd($request);
$tipo_usuario
=
Auth
()
->
user
()
->
tipo
;
$tipo_usuario
=
Auth
()
->
user
()
->
tipo
;
//dd($tipo_usuario);
//dd($tipo_usuario);
$evento
=
Evento
::
find
(
$id
);
$evento
=
Evento
::
find
(
$id
);
...
@@ -648,7 +649,7 @@ class EventoController extends Controller
...
@@ -648,7 +649,7 @@ class EventoController extends Controller
$evento
->
update
();
$evento
->
update
();
$eventos
=
Evento
::
orderBy
(
'nome'
)
->
get
();
$eventos
=
Evento
::
orderBy
(
'nome'
)
->
get
();
//dd('FINAL');
if
(
$tipo_usuario
==
'coordenador'
){
if
(
$tipo_usuario
==
'coordenador'
){
return
redirect
(
route
(
'coordenador.editais'
)
)
->
with
([
'mensagem'
=>
'Edital salvo com sucesso!'
,
'eventos'
=>
$eventos
]);
return
redirect
(
route
(
'coordenador.editais'
)
)
->
with
([
'mensagem'
=>
'Edital salvo com sucesso!'
,
'eventos'
=>
$eventos
]);
}
}
...
...
resources/views/evento/editarEvento.blade.php
View file @
9a1415ba
...
@@ -703,7 +703,7 @@
...
@@ -703,7 +703,7 @@
<
i
class
=
"fas fa-times-circle fa-2x"
style
=
"color:red; font-size:25px"
></
i
>
<
i
class
=
"fas fa-times-circle fa-2x"
style
=
"color:red; font-size:25px"
></
i
>
</
a
>
</
a
>
@
endif
@
endif
<
input
type
=
"file"
class
=
"form-control-file @error('modeloDocumento[]') is-invalid @enderror"
name
=
"modeloDocumento[]"
multiple
value
=
"{{ old('modeloDocumento') }}"
id
=
"modeloDocumento"
onchange
=
"exibirAnexoTemp(this)"
accept
=
".doc,.docx,.pdf"
>
<
input
type
=
"file"
class
=
"form-control-file @error('modeloDocumento[]') is-invalid @enderror"
name
=
"modeloDocumento[]"
multiple
value
=
"{{ old('modeloDocumento') }}"
id
=
"modeloDocumento"
accept
=
".doc,.docx,.pdf
,.zip
"
>
<
small
>
Os
arquivos
selecionado
deve
ter
até
2
mb
.
</
small
>
<
small
>
Os
arquivos
selecionado
deve
ter
até
2
mb
.
</
small
>
@
error
(
'modeloDocumento[]'
)
@
error
(
'modeloDocumento[]'
)
<
span
class
=
"invalid-feedback"
role
=
"alert"
>
<
span
class
=
"invalid-feedback"
role
=
"alert"
>
...
...
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