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
60fa5589
"app/git@sites.upe.br:walter.felipe/submeta.git" did not exist on "1861579718df2237ba3982b4c8b2ce3c5e869c3f"
Commit
60fa5589
authored
Mar 17, 2022
by
Guilherme Silva
Browse files
Adição de formulários de avaliação ao edital
parent
0c22a1bf
Changes
3
Show whitespace changes
Inline
Side-by-side
app/Evento.php
View file @
60fa5589
...
@@ -16,7 +16,8 @@ class Evento extends Model
...
@@ -16,7 +16,8 @@ class Evento extends Model
'inicioSubmissao'
,
'fimSubmissao'
,
'inicioRevisao'
,
'fimRevisao'
,
'inicioSubmissao'
,
'fimSubmissao'
,
'inicioRevisao'
,
'fimRevisao'
,
'resultado_final'
,
'resultado_preliminar'
,
'coordenadorId'
,
'resultado_final'
,
'resultado_preliminar'
,
'coordenadorId'
,
'numMaxTrabalhos'
,
'numMaxCoautores'
,
'hasResumo'
,
'criador_id'
,
'numParticipantes'
,
'numMaxTrabalhos'
,
'numMaxCoautores'
,
'hasResumo'
,
'criador_id'
,
'numParticipantes'
,
'dt_inicioRelatorioParcial'
,
'dt_fimRelatorioParcial'
,
'dt_inicioRelatorioFinal'
,
'dt_fimRelatorioFinal'
'dt_inicioRelatorioParcial'
,
'dt_fimRelatorioParcial'
,
'dt_inicioRelatorioFinal'
,
'dt_fimRelatorioFinal'
,
'formAvaliacaoExterno'
,
'formAvaliacaoInterno'
];
];
public
function
endereco
(){
public
function
endereco
(){
...
...
app/Http/Controllers/EventoController.php
View file @
60fa5589
...
@@ -126,6 +126,10 @@ class EventoController extends Controller
...
@@ -126,6 +126,10 @@ class EventoController extends Controller
'dt_fimRelatorioParcial'
=>
[
'required'
,
'date'
],
'dt_fimRelatorioParcial'
=>
[
'required'
,
'date'
],
'dt_inicioRelatorioFinal'
=>
[
'required'
,
'date'
],
'dt_inicioRelatorioFinal'
=>
[
'required'
,
'date'
],
'dt_fimRelatorioFinal'
=>
[
'required'
,
'date'
],
'dt_fimRelatorioFinal'
=>
[
'required'
,
'date'
],
'pdfFormAvalExterno'
=>
[(
$request
->
pdfFormAvalExternoPreenchido
!==
'sim'
?
'required'
:
''
),
'file'
,
'mimes:pdf'
,
'max:2048'
],
'pdfFormAvalInterno'
=>
[(
$request
->
pdfFormAvalInternoPreenchido
!==
'sim'
?
'required'
:
''
),
'file'
,
'mimes:pdf'
,
'max:2048'
]
,
'pdfFormAvalInterno'
=>
[
'required'
,
'file'
],
'pdfEdital'
=>
[(
$request
->
pdfEditalPreenchido
!==
'sim'
?
'required'
:
''
),
'file'
,
'mimes:pdf'
,
'max:2048'
],
'pdfEdital'
=>
[(
$request
->
pdfEditalPreenchido
!==
'sim'
?
'required'
:
''
),
'file'
,
'mimes:pdf'
,
'max:2048'
],
//'modeloDocumento' => [],
//'modeloDocumento' => [],
]);
]);
...
@@ -154,6 +158,8 @@ class EventoController extends Controller
...
@@ -154,6 +158,8 @@ class EventoController extends Controller
'dt_fimRelatorioParcial'
=>
[
'required'
,
'date'
,
'after_or_equal:dt_inicioRelatorioParcial'
],
'dt_fimRelatorioParcial'
=>
[
'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'
],
'pdfFormAvalExterno'
=>
[(
$request
->
pdfFormAvalExternoPreenchido
!==
'sim'
?
'required'
:
''
),
'file'
,
'mimes:pdf'
,
'max:2048'
],
'pdfFormAvalInterno'
=>
[(
$request
->
pdfFormAvalInternoPreenchido
!==
'sim'
?
'required'
:
''
),
'file'
,
'mimes:pdf'
,
'max:2048'
],
'pdfEdital'
=>
[(
$request
->
pdfEditalPreenchido
!==
'sim'
?
'required'
:
''
),
'file'
,
'mimes:pdf'
,
'max:2048'
],
'pdfEdital'
=>
[(
$request
->
pdfEditalPreenchido
!==
'sim'
?
'required'
:
''
),
'file'
,
'mimes:pdf'
,
'max:2048'
],
//'modeloDocumento' => ['file', 'mimes:zip,doc,docx,odt,pdf', 'max:2048'],
//'modeloDocumento' => ['file', 'mimes:zip,doc,docx,odt,pdf', 'max:2048'],
]);
]);
...
@@ -214,6 +220,26 @@ class EventoController extends Controller
...
@@ -214,6 +220,26 @@ class EventoController extends Controller
$evento
->
modeloDocumento
=
$path
.
$nome
;
$evento
->
modeloDocumento
=
$path
.
$nome
;
}
}
if
(
isset
(
$request
->
pdfFormAvalInterno
)){
$pdfFormAvalInterno
=
$request
->
pdfFormAvalInterno
;
$extension
=
$pdfFormAvalInterno
->
extension
();
$path
=
'pdfFormAvalInterno/'
.
$evento
->
id
.
'/'
;
$nome
=
"formulario de avaliação interno"
.
"."
.
$extension
;
Storage
::
putFileAs
(
$path
,
$pdfFormAvalInterno
,
$nome
);
$evento
->
formAvaliacaoInterno
=
$path
.
$nome
;
}
if
(
isset
(
$request
->
pdfFormAvalExterno
)){
$pdfFormAvalExterno
=
$request
->
pdfFormAvalExterno
;
$extension
=
$pdfFormAvalExterno
->
extension
();
$path
=
'pdfFormAvalExterno/'
.
$evento
->
id
.
'/'
;
$nome
=
"formulario de avaliação externo"
.
"."
.
$extension
;
Storage
::
putFileAs
(
$path
,
$pdfFormAvalExterno
,
$nome
);
$evento
->
formAvaliacaoExterno
=
$path
.
$nome
;
}
$evento
->
update
();
$evento
->
update
();
// $user = Auth::user();
// $user = Auth::user();
...
@@ -247,6 +273,14 @@ class EventoController extends Controller
...
@@ -247,6 +273,14 @@ class EventoController extends Controller
$nome
=
"modelo"
.
"."
.
$extension
;
$nome
=
"modelo"
.
"."
.
$extension
;
$eventoTemp
->
modeloDocumento
=
Storage
::
putFileAs
(
$path
,
$request
->
modeloDocumento
,
$nome
);
$eventoTemp
->
modeloDocumento
=
Storage
::
putFileAs
(
$path
,
$request
->
modeloDocumento
,
$nome
);
}
}
if
(
!
(
is_null
(
$request
->
pdfFormAvalExterno
))
)
{
$pasta
=
'pdfFormAvalExterno/'
.
$eventoTemp
->
id
;
$eventoTemp
->
formAvaliacaoExterno
=
Storage
::
putFileAs
(
$pasta
,
$request
->
pdfFormAvalExterno
,
'formulario de avaliação externo.pdf'
);
}
if
(
!
(
is_null
(
$request
->
pdfFormAvalInterno
))
)
{
$pasta
=
'pdfFormAvalInterno/'
.
$eventoTemp
->
id
;
$eventoTemp
->
formAvaliacaoInterno
=
Storage
::
putFileAs
(
$pasta
,
$request
->
pdfFormAvalInterno
,
'formulario de avaliação interno.pdf'
);
}
$eventoTemp
->
update
();
$eventoTemp
->
update
();
...
@@ -378,6 +412,8 @@ class EventoController extends Controller
...
@@ -378,6 +412,8 @@ class EventoController extends Controller
'dt_fimRelatorioFinal'
=>
[
'required'
,
'date'
],
'dt_fimRelatorioFinal'
=>
[
'required'
,
'date'
],
'pdfEdital'
=>
[
'file'
,
'mimes:pdf'
,
'max:2048'
],
'pdfEdital'
=>
[
'file'
,
'mimes:pdf'
,
'max:2048'
],
'modeloDocumento'
=>
[
'file'
,
'mimes:zip,doc,docx,odt,pdf'
,
'max:2048'
],
'modeloDocumento'
=>
[
'file'
,
'mimes:zip,doc,docx,odt,pdf'
,
'max:2048'
],
'pdfFormAvalExterno'
=>
[
'file'
,
'mimes:pdf'
,
'max:2048'
],
'pdfFormAvalInterno'
=>
[
'file'
,
'mimes:pdf'
,
'max:2048'
],
]);
]);
}
}
...
@@ -400,6 +436,8 @@ class EventoController extends Controller
...
@@ -400,6 +436,8 @@ class EventoController extends Controller
'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'
,
'max:2048'
],
'pdfFormAvalInterno'
=>
[
'file'
,
'mimes:pdf'
,
'max:2048'
],
]);
]);
$evento
->
nome
=
$request
->
nome
;
$evento
->
nome
=
$request
->
nome
;
...
@@ -437,6 +475,26 @@ class EventoController extends Controller
...
@@ -437,6 +475,26 @@ class EventoController extends Controller
$evento
->
modeloDocumento
=
$path
.
$nome
;
$evento
->
modeloDocumento
=
$path
.
$nome
;
}
}
if
(
isset
(
$request
->
pdfFormAvalInterno
)){
$pdfFormAvalInterno
=
$request
->
pdfFormAvalInterno
;
$extension
=
$pdfFormAvalInterno
->
extension
();
$path
=
'pdfFormAvalInterno/'
.
$evento
->
id
.
'/'
;
$nome
=
"formulario de avaliação interno"
.
"."
.
$extension
;
Storage
::
putFileAs
(
$path
,
$pdfFormAvalInterno
,
$nome
);
$evento
->
formAvaliacaoInterno
=
$path
.
$nome
;
}
if
(
isset
(
$request
->
pdfFormAvalExterno
)){
$pdfFormAvalExterno
=
$request
->
pdfFormAvalExterno
;
$extension
=
$pdfFormAvalExterno
->
extension
();
$path
=
'pdfFormAvalExterno/'
.
$evento
->
id
.
'/'
;
$nome
=
"formulario de avaliação externo"
.
"."
.
$extension
;
Storage
::
putFileAs
(
$path
,
$pdfFormAvalExterno
,
$nome
);
$evento
->
formAvaliacaoExterno
=
$path
.
$nome
;
}
$evento
->
update
();
$evento
->
update
();
$eventos
=
Evento
::
orderBy
(
'nome'
)
->
get
();
$eventos
=
Evento
::
orderBy
(
'nome'
)
->
get
();
...
...
database/migrations/2022_03_17_085158_alter_table_eventos3.php
0 → 100644
View file @
60fa5589
<?php
use
Illuminate\Database\Migrations\Migration
;
use
Illuminate\Database\Schema\Blueprint
;
use
Illuminate\Support\Facades\Schema
;
class
AlterTableEventos3
extends
Migration
{
/**
* Run the migrations.
*
* @return void
*/
public
function
up
()
{
Schema
::
table
(
'eventos'
,
function
(
Blueprint
$table
)
{
$table
->
string
(
'formAvaliacaoExterno'
)
->
nullable
();
$table
->
string
(
'formAvaliacaoInterno'
)
->
nullable
();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public
function
down
()
{
Schema
::
table
(
'eventos'
,
function
(
Blueprint
$table
)
{
$table
->
dropColumn
(
'formAvaliacaoExterno'
);
$table
->
dropColumn
(
'formAvaliacaoInterno'
);
});
}
}
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