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
f8122be5
Unverified
Commit
f8122be5
authored
Jul 01, 2021
by
Gabriel Antônio da Silva
Committed by
GitHub
Jul 01, 2021
Browse files
Merge pull request #136 from Gabriel-31415/master
add consu opcional no edital, ajuste no complemento
parents
035e8bd3
903599cb
Changes
14
Show whitespace changes
Inline
Side-by-side
Procfile
0 → 100644
View file @
f8122be5
web: vendor/bin/heroku-php-apache2 public/
app/Http/Controllers/EventoController.php
View file @
f8122be5
...
@@ -166,6 +166,7 @@ class EventoController extends Controller
...
@@ -166,6 +166,7 @@ class EventoController extends Controller
$evento
[
'coordenadorId'
]
=
$request
->
coordenador_id
;
$evento
[
'coordenadorId'
]
=
$request
->
coordenador_id
;
$evento
[
'criador_id'
]
=
$user_id
;
$evento
[
'criador_id'
]
=
$user_id
;
$evento
[
'numParticipantes'
]
=
$request
->
numParticipantes
;
$evento
[
'numParticipantes'
]
=
$request
->
numParticipantes
;
$evento
[
'consu'
]
=
$request
->
has
(
'consu'
);
$evento
[
'anexosStatus'
]
=
'final'
;
$evento
[
'anexosStatus'
]
=
'final'
;
//dd($evento);
//dd($evento);
...
@@ -395,7 +396,7 @@ class EventoController extends Controller
...
@@ -395,7 +396,7 @@ class EventoController extends Controller
$evento
->
resultado_preliminar
=
$request
->
resultado_preliminar
;
$evento
->
resultado_preliminar
=
$request
->
resultado_preliminar
;
$evento
->
resultado_final
=
$request
->
resultado_final
;
$evento
->
resultado_final
=
$request
->
resultado_final
;
$evento
->
coordenadorId
=
$request
->
coordenador_id
;
$evento
->
coordenadorId
=
$request
->
coordenador_id
;
$evento
->
consu
=
$request
->
has
(
'consu'
);
if
(
$request
->
pdfEdital
!=
null
){
if
(
$request
->
pdfEdital
!=
null
){
$pdfEdital
=
$request
->
pdfEdital
;
$pdfEdital
=
$request
->
pdfEdital
;
$path
=
'pdfEdital/'
.
$evento
->
id
.
'/'
;
$path
=
'pdfEdital/'
.
$evento
->
id
.
'/'
;
...
...
app/Http/Requests/StoreTrabalho.php
View file @
f8122be5
...
@@ -2,9 +2,10 @@
...
@@ -2,9 +2,10 @@
namespace
App\Http\Requests
;
namespace
App\Http\Requests
;
use
Illuminate\Foundation\Http\FormRequest
;
use
App\Evento
;
use
Illuminate\Support\Facades\Auth
;
use
Illuminate\Validation\Rule
;
use
Illuminate\Validation\Rule
;
use
Illuminate\Support\Facades\Auth
;
use
Illuminate\Foundation\Http\FormRequest
;
class
StoreTrabalho
extends
FormRequest
class
StoreTrabalho
extends
FormRequest
{
{
...
@@ -26,7 +27,7 @@ class StoreTrabalho extends FormRequest
...
@@ -26,7 +27,7 @@ class StoreTrabalho extends FormRequest
public
function
rules
()
public
function
rules
()
{
{
$evento
=
Evento
::
find
(
$this
->
editalId
);
$rules
=
[
$rules
=
[
'editalId'
=>
[
'required'
,
'string'
],
'editalId'
=>
[
'required'
,
'string'
],
'marcado.*'
=>
[
'required'
],
'marcado.*'
=>
[
'required'
],
...
@@ -37,7 +38,7 @@ class StoreTrabalho extends FormRequest
...
@@ -37,7 +38,7 @@ class StoreTrabalho extends FormRequest
'pontuacaoPlanilha'
=>
[
'required'
,
'string'
],
'pontuacaoPlanilha'
=>
[
'required'
,
'string'
],
'linkGrupoPesquisa'
=>
[
'required'
,
'string'
],
'linkGrupoPesquisa'
=>
[
'required'
,
'string'
],
'anexoProjeto'
=>
[
'required'
,
'mimes:pdf'
],
'anexoProjeto'
=>
[
'required'
,
'mimes:pdf'
],
'anexoDecisaoCONSU'
=>
[
'
required
'
,
'mimes:pdf'
],
'anexoDecisaoCONSU'
=>
[
Rule
::
required
If
(
$evento
->
consu
)
,
'mimes:pdf'
],
'anexoPlanilhaPontuacao'
=>
[
'required'
],
'anexoPlanilhaPontuacao'
=>
[
'required'
],
'anexoLattesCoordenador'
=>
[
'required'
,
'mimes:pdf'
],
'anexoLattesCoordenador'
=>
[
'required'
,
'mimes:pdf'
],
'anexoGrupoPesquisa'
=>
[
'required'
,
'mimes:pdf'
],
'anexoGrupoPesquisa'
=>
[
'required'
,
'mimes:pdf'
],
...
...
app/Http/Requests/UpdateTrabalho.php
View file @
f8122be5
...
@@ -2,10 +2,11 @@
...
@@ -2,10 +2,11 @@
namespace
App\Http\Requests
;
namespace
App\Http\Requests
;
use
App\Evento
;
use
App\Trabalho
;
use
App\Trabalho
;
use
Illuminate\Foundation\Http\FormRequest
;
use
Illuminate\Support\Facades\Auth
;
use
Illuminate\Validation\Rule
;
use
Illuminate\Validation\Rule
;
use
Illuminate\Support\Facades\Auth
;
use
Illuminate\Foundation\Http\FormRequest
;
class
UpdateTrabalho
extends
FormRequest
class
UpdateTrabalho
extends
FormRequest
{
{
...
@@ -27,7 +28,7 @@ class UpdateTrabalho extends FormRequest
...
@@ -27,7 +28,7 @@ class UpdateTrabalho extends FormRequest
public
function
rules
()
public
function
rules
()
{
{
$projeto
=
Trabalho
::
find
(
$this
->
id
);
$projeto
=
Trabalho
::
find
(
$this
->
id
);
$evento
=
Evento
::
find
(
$this
->
editalId
);
$rules
=
[
$rules
=
[
'editalId'
=>
[
'required'
,
'string'
],
'editalId'
=>
[
'required'
,
'string'
],
'marcado.*'
=>
[
'required'
],
'marcado.*'
=>
[
'required'
],
...
@@ -38,15 +39,15 @@ class UpdateTrabalho extends FormRequest
...
@@ -38,15 +39,15 @@ class UpdateTrabalho extends FormRequest
'pontuacaoPlanilha'
=>
[
'required'
,
'string'
],
'pontuacaoPlanilha'
=>
[
'required'
,
'string'
],
'linkGrupoPesquisa'
=>
[
'required'
,
'string'
],
'linkGrupoPesquisa'
=>
[
'required'
,
'string'
],
'anexoProjeto'
=>
[[
Rule
::
requiredIf
(
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoProjeto
==
null
)],
'mimes:pdf'
],
'anexoProjeto'
=>
[[
Rule
::
requiredIf
(
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoProjeto
==
null
)],
'mimes:pdf'
],
'anexoDecisaoCONSU'
=>
[
'mimes:pdf'
],
'anexoDecisaoCONSU'
=>
[
Rule
::
requiredIf
(
$evento
->
consu
),
'mimes:pdf'
],
'anexoPlanilhaPontuacao'
=>
[[
Rule
::
requiredIf
(
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoPlanilhaPontuacao
==
null
)]],
'anexoPlanilhaPontuacao'
=>
[[
Rule
::
requiredIf
(
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoPlanilhaPontuacao
==
null
)]],
'anexoLattesCoordenador'
=>
[[
Rule
::
requiredIf
(
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoLattesCoordenador
==
null
)],
'mimes:pdf'
],
'anexoLattesCoordenador'
=>
[[
Rule
::
requiredIf
(
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoLattesCoordenador
==
null
)],
'mimes:pdf'
],
'anexoGrupoPesquisa'
=>
[[
Rule
::
requiredIf
(
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoGrupoPesquisa
==
null
)],
'mimes:pdf'
],
'anexoGrupoPesquisa'
=>
[[
Rule
::
requiredIf
(
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoGrupoPesquisa
==
null
)],
'mimes:pdf'
],
'anexoAutorizacaoComiteEtica'
=>
[
'anexoAutorizacaoComiteEtica'
=>
[
Rule
::
requiredIf
((
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoAutorizacaoComiteEtica
==
null
)
)
Rule
::
requiredIf
((
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
justificativaAutorizacaoEtica
==
null
&&
$projeto
->
anexoAutorizacaoComiteEtica
==
null
)
)
],
],
'justificativaAutorizacaoEtica'
=>
[
'justificativaAutorizacaoEtica'
=>
[
Rule
::
requiredIf
((
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoAutorizacaoComiteEtica
==
null
))
Rule
::
requiredIf
((
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoAutorizacaoComiteEtica
==
null
&&
$projeto
->
justificativaAutorizacaoEtica
==
null
))
],
],
];
];
...
@@ -91,4 +92,14 @@ class UpdateTrabalho extends FormRequest
...
@@ -91,4 +92,14 @@ class UpdateTrabalho extends FormRequest
return
$rules
;
return
$rules
;
}
}
}
}
public
function
messages
()
{
return
[
'titulo.required'
=>
'O :attribute é obrigatório'
,
'justificativaAutorizacaoEtica.required'
=>
'O campo justificativa Autorizacao Etica é obrigatório'
,
'anexoAutorizacaoComiteEtica.required'
=>
'O campo anexoAutorizacao Comite Etica é obrigatório'
,
];
}
}
}
config/database.php
View file @
f8122be5
<?php
<?php
use
Illuminate\Support\Str
;
use
Illuminate\Support\Str
;
// $DATABASE_URL=parse_url('postgres://shldedzeknxkxv:2b9d0bcbdc7bd07dcbc4db2716e1af333788b38234d527435607a3fd1353f52b@ec2-54-227-246-76.compute-1.amazonaws.com:5432/d87d2lg0us76su');
return
[
return
[
/*
/*
...
@@ -15,7 +15,7 @@ return [
...
@@ -15,7 +15,7 @@ return [
|
|
*/
*/
'default'
=>
env
(
'DB_CONNECTION'
,
'
my
sql'
),
'default'
=>
env
(
'DB_CONNECTION'
,
'
pg
sql'
),
/*
/*
|--------------------------------------------------------------------------
|--------------------------------------------------------------------------
...
@@ -78,6 +78,20 @@ return [
...
@@ -78,6 +78,20 @@ return [
'sslmode'
=>
'prefer'
,
'sslmode'
=>
'prefer'
,
],
],
// 'pgsql' => array(
// 'driver' => 'pgsql',
// 'host' => $DATABASE_URL['host'],
// 'port' => $DATABASE_URL['port'],
// 'database' => ltrim($DATABASE_URL['path'], "/"),
// 'username' => $DATABASE_URL['user'],
// 'password' => $DATABASE_URL['pass'],
// 'charset' => 'utf8',
// 'prefix' => '',
// 'prefix_indexes' => true,
// 'schema' => 'public',
// 'sslmode' => 'prefer',
// ),
'sqlsrv'
=>
[
'sqlsrv'
=>
[
'driver'
=>
'sqlsrv'
,
'driver'
=>
'sqlsrv'
,
'url'
=>
env
(
'DATABASE_URL'
),
'url'
=>
env
(
'DATABASE_URL'
),
...
...
database/migrations/2021_07_01_123506_alter_table_eventos.php
0 → 100644
View file @
f8122be5
<?php
use
Illuminate\Database\Migrations\Migration
;
use
Illuminate\Database\Schema\Blueprint
;
use
Illuminate\Support\Facades\Schema
;
class
AlterTableEventos
extends
Migration
{
/**
* Run the migrations.
*
* @return void
*/
public
function
up
()
{
Schema
::
table
(
'eventos'
,
function
(
Blueprint
$table
)
{
$table
->
boolean
(
'consu'
)
->
default
(
false
);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public
function
down
()
{
Schema
::
table
(
'eventos'
,
function
(
Blueprint
$table
)
{
$table
->
dropColumn
(
'consu'
);
});
}
}
resources/views/evento/criarEvento.blade.php
View file @
f8122be5
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
</
div
>
</
div
>
{{
--
nome
|
Participantes
|
Tipo
--
}}
{{
--
nome
|
Participantes
|
Tipo
--
}}
<
div
class
=
"row justify-content-center"
>
<
div
class
=
"row justify-content-center"
>
<
div
class
=
"col-sm-
6
"
>
<
div
class
=
"col-sm-
12
"
>
<
label
for
=
"nome"
class
=
"col-form-label"
>
{{
__
(
'Nome*:'
)
}}
</
label
>
<
label
for
=
"nome"
class
=
"col-form-label"
>
{{
__
(
'Nome*:'
)
}}
</
label
>
<
input
id
=
"nome"
type
=
"text"
class
=
"form-control @error('nome') is-invalid @enderror"
name
=
"nome"
value
=
"{{ old('nome') }}"
required
autocomplete
=
"nome"
autofocus
>
<
input
id
=
"nome"
type
=
"text"
class
=
"form-control @error('nome') is-invalid @enderror"
name
=
"nome"
value
=
"{{ old('nome') }}"
required
autocomplete
=
"nome"
autofocus
>
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
@
enderror
@
enderror
</
div
>
</
div
>
<
div
class
=
"col-sm-
2
"
>
<
div
class
=
"col-sm-
5
"
>
<
label
for
=
"tipo"
class
=
"col-form-label"
>
{{
__
(
'Tipo*:'
)
}}
</
label
>
<
label
for
=
"tipo"
class
=
"col-form-label"
>
{{
__
(
'Tipo*:'
)
}}
</
label
>
<
select
id
=
"tipo"
type
=
"text"
class
=
"form-control @error('tipo') is-invalid @enderror"
name
=
"tipo"
value
=
"{{ old('tipo') }}"
required
>
<
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'
)
selected
@
endif
value
=
"PIBIC"
>
PIBIC
</
option
>
...
@@ -56,7 +56,8 @@
...
@@ -56,7 +56,8 @@
@
enderror
@
enderror
</
div
>
</
div
>
<
div
class
=
"col-sm-2"
>
<
div
class
=
"col-sm-2"
>
<
label
for
=
"numParticipantes"
class
=
"col-form-label"
>
{{
__
(
'numParticipantes*:'
)
}}
</
label
>
<
label
for
=
"numParticipantes"
class
=
"col-form-label"
>
{{
__
(
'Nº de Participantes*:'
)
}}
</
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
>
<
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
>
@
error
(
'numParticipantes'
)
@
error
(
'numParticipantes'
)
...
@@ -65,6 +66,18 @@
...
@@ -65,6 +66,18 @@
</
span
>
</
span
>
@
enderror
@
enderror
</
div
>
</
div
>
<
div
class
=
"col-sm-3"
>
<
label
for
=
"consu"
class
=
"col-form-label"
>
{{
__
(
'Consu obrigatório?*'
)
}}
</
label
>
<
br
>
<
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
>
--
}}
@
error
(
'consu'
)
<
span
class
=
"invalid-feedback"
role
=
"alert"
>
<
strong
>
{{
$message
}}
</
strong
>
</
span
>
@
enderror
</
div
>
</
div
>
{{
--
end
nome
|
Participantes
|
Tipo
--
}}
</
div
>
{{
--
end
nome
|
Participantes
|
Tipo
--
}}
{{
--
Descricao
Edital
--
}}
{{
--
Descricao
Edital
--
}}
...
...
resources/views/evento/editarEvento.blade.php
View file @
f8122be5
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
</
div
>
</
div
>
{{
--
nome
|
Tipo
--
}}
{{
--
nome
|
Tipo
--
}}
<
div
class
=
"row justify-content-center"
>
<
div
class
=
"row justify-content-center"
>
<
div
class
=
"col-sm-
6
"
>
{{
--
Nome
do
evento
--
}}
<
div
class
=
"col-sm-
12
"
>
{{
--
Nome
do
evento
--
}}
<
label
for
=
"nome"
class
=
"col-form-label"
>
{{
__
(
'Nome*:'
)
}}
</
label
>
<
label
for
=
"nome"
class
=
"col-form-label"
>
{{
__
(
'Nome*:'
)
}}
</
label
>
<
input
value
=
"
{
{$evento->nome}
}
"
id
=
"nome"
type
=
"text"
class
=
"form-control @error('nome') is-invalid @enderror"
name
=
"nome"
value
=
"{{ old('nome') }}"
required
autocomplete
=
"nome"
autofocus
>
<
input
value
=
"
{
{$evento->nome}
}
"
id
=
"nome"
type
=
"text"
class
=
"form-control @error('nome') is-invalid @enderror"
name
=
"nome"
value
=
"{{ old('nome') }}"
required
autocomplete
=
"nome"
autofocus
>
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
</
div
>
{{
--
End
Nome
do
evento
--
}}
</
div
>
{{
--
End
Nome
do
evento
--
}}
{{
--
Tipo
do
evento
--
}}
{{
--
Tipo
do
evento
--
}}
<
div
class
=
"col-sm-
2
"
>
<
div
class
=
"col-sm-
5
"
>
<
label
for
=
"tipo"
class
=
"col-form-label"
>
{{
__
(
'Tipo*:'
)
}}
</
label
>
<
label
for
=
"tipo"
class
=
"col-form-label"
>
{{
__
(
'Tipo*:'
)
}}
</
label
>
<!--
<
input
value
=
"
{
{$evento->tipo}
}
"
id
=
"tipo"
type
=
"text"
class
=
"form-control @error('tipo') is-invalid @enderror"
name
=
"tipo"
value
=
"{{ old('tipo') }}"
required
autocomplete
=
"tipo"
autofocus
>
-->
<!--
<
input
value
=
"
{
{$evento->tipo}
}
"
id
=
"tipo"
type
=
"text"
class
=
"form-control @error('tipo') is-invalid @enderror"
name
=
"tipo"
value
=
"{{ old('tipo') }}"
required
autocomplete
=
"tipo"
autofocus
>
-->
<
select
id
=
"tipo"
type
=
"text"
class
=
"form-control @error('tipo') is-invalid @enderror"
name
=
"tipo"
required
>
<
select
id
=
"tipo"
type
=
"text"
class
=
"form-control @error('tipo') is-invalid @enderror"
name
=
"tipo"
required
>
...
@@ -70,6 +70,18 @@
...
@@ -70,6 +70,18 @@
</
span
>
</
span
>
@
enderror
@
enderror
</
div
>
</
div
>
<
div
class
=
"col-sm-3"
>
<
label
for
=
"consu"
class
=
"col-form-label"
>
{{
__
(
'Consu obrigatório?*'
)
}}
</
label
>
<
br
>
<
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
>
--
}}
@
error
(
'consu'
)
<
span
class
=
"invalid-feedback"
role
=
"alert"
>
<
strong
>
{{
$message
}}
</
strong
>
</
span
>
@
enderror
</
div
>
</
div
>
{{
--
end
nome
|
Participantes
|
Tipo
--
}}
</
div
>
{{
--
end
nome
|
Participantes
|
Tipo
--
}}
{{
--
Descricao
Evento
--
}}
{{
--
Descricao
Evento
--
}}
...
...
resources/views/evento/formulario/anexos.blade.php
View file @
f8122be5
...
@@ -41,6 +41,17 @@
...
@@ -41,6 +41,17 @@
@enderror
@enderror
@endcomponent
@endcomponent
</div>
</div>
@if($edital->consu)
<div
class=
"form-group col-md-6"
>
<label
class=
" control-label"
for=
"firstname"
>
Decisão do CONSU (.pdf)
<span
style=
"color: red; font-weight:bold"
>
*
</span></label>
<input
type=
"file"
class=
"input-group-text"
name=
"anexoDecisaoCONSU"
accept=
".pdf"
/>
@error('anexoDecisaoCONSU')
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<strong>
{{ $message }}
</strong>
</span>
@enderror
</div>
@else
<div
class=
"form-group col-md-6"
>
<div
class=
"form-group col-md-6"
>
<label
class=
" control-label"
for=
"firstname"
>
Decisão do CONSU (.pdf)
</label>
<label
class=
" control-label"
for=
"firstname"
>
Decisão do CONSU (.pdf)
</label>
<input
type=
"file"
class=
"input-group-text"
name=
"anexoDecisaoCONSU"
accept=
".pdf"
/>
<input
type=
"file"
class=
"input-group-text"
name=
"anexoDecisaoCONSU"
accept=
".pdf"
/>
...
@@ -51,6 +62,8 @@
...
@@ -51,6 +62,8 @@
@enderror
@enderror
</div>
</div>
@endif
<div
class=
"form-group col-md-6"
style=
"margin-top: 10px"
>
<div
class=
"form-group col-md-6"
style=
"margin-top: 10px"
>
@component('componentes.input', ['label' => 'Grupo de Pesquisa (.pdf)'])
@component('componentes.input', ['label' => 'Grupo de Pesquisa (.pdf)'])
<input
type=
"file"
class=
"input-group-text"
name=
"anexoGrupoPesquisa"
placeholder=
"Anexo do Grupo de Pesquisa"
accept=
"application/pdf"
/>
<input
type=
"file"
class=
"input-group-text"
name=
"anexoGrupoPesquisa"
placeholder=
"Anexo do Grupo de Pesquisa"
accept=
"application/pdf"
/>
...
...
resources/views/evento/formulario/participantes.blade.php
View file @
f8122be5
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
<div
class=
"col-md-12"
><h5>
Endereço
</h5></div>
<div
class=
"col-md-12"
><h5>
Endereço
</h5></div>
<div
class=
"col-6"
>
<div
class=
"col-6"
>
@component('componentes.input', ['label' => 'CEP'])
@component('componentes.input', ['label' => 'CEP'])
<input
type=
"text"
class=
"form-control"
value=
"{{old('cep')[$i] ?? "
"
}}"
name=
"cep[{{$i}}]"
placeholder=
"CEP"
/>
<input
type=
"text"
class=
"form-control
cep
"
value=
"{{old('cep')[$i] ?? "
"
}}"
name=
"cep[{{$i}}]"
placeholder=
"CEP"
/>
@error('cep.'.$i)
@error('cep.'.$i)
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<strong>
{{ $message }}
</strong>
<strong>
{{ $message }}
</strong>
...
@@ -167,14 +167,15 @@
...
@@ -167,14 +167,15 @@
@endcomponent
@endcomponent
</div>
</div>
<div
class=
"col-12"
>
<div
class=
"col-12"
>
@component('componentes.input', ['label' => 'Complemento',])
<div
class=
"form-group"
>
<label
class=
" control-label"
for=
"firstname"
>
Complemento
</label>
<input
type=
"text"
class=
"form-control"
value=
"{{old('complemento')[$i] ?? "
"
}}"
name=
"complemento[{{$i}}]"
placeholder=
"Complemento"
/>
<input
type=
"text"
class=
"form-control"
value=
"{{old('complemento')[$i] ?? "
"
}}"
name=
"complemento[{{$i}}]"
placeholder=
"Complemento"
/>
@error('complemento.'.$i)
@error('complemento.'.$i)
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<strong>
{{ $message }}
</strong>
<strong>
{{ $message }}
</strong>
</span>
</span>
@enderror
@enderror
@endcomponent
</div>
</div>
</div>
<div
class=
"col-md-12"
><h5>
Dados do curso
</h5></div>
<div
class=
"col-md-12"
><h5>
Dados do curso
</h5></div>
<div
class=
"col-6"
>
<div
class=
"col-6"
>
...
...
resources/views/evento/submeterTrabalho.blade.php
View file @
f8122be5
...
@@ -29,20 +29,20 @@
...
@@ -29,20 +29,20 @@
<
div
class
=
"row justify-content-center"
>
<
div
class
=
"row justify-content-center"
>
@
component
(
'evento.formulario.projeto'
,
[
'grandeAreas'
=>
$grandeAreas
])
@
include
(
'evento.formulario.projeto'
)
@
endcomponent
@
component
(
'evento.formulario.proponente'
)
@
endcomponent
@
component
(
'evento.formulario.anexos'
)
@
include
(
'evento.formulario.proponente'
)
@
endcomponent
@
component
(
'evento.formulario.participantes'
,
[
'estados'
=>
$estados
,
'enum_turno'
=>
$enum_turno
,
'edital'
=>
$edital
])
@
endcomponent
@
component
(
'evento.formulario.finalizar'
)
@
include
(
'evento.formulario.anexos'
)
@
endcomponent
@
include
(
'evento.formulario.participantes'
)
@
include
(
'evento.formulario.finalizar'
)
</
div
>
</
div
>
</
div
>
</
div
>
...
...
resources/views/projeto/editaFormulario/anexos.blade.php
View file @
f8122be5
...
@@ -83,6 +83,35 @@
...
@@ -83,6 +83,35 @@
</div>
</div>
{{-- Anexo da Decisão do CONSU --}}
{{-- Anexo da Decisão do CONSU --}}
@if($edital->consu)
<div
class=
"form-group col-md-6"
style=
"margin-top: 10px"
>
<div
class=
"row justify-content-center"
>
<div
class=
"col-12"
>
<div
class=
"form-group"
>
<label
class=
" control-label"
for=
"firstname"
>
Decisão do CONSU (.pdf
<span
style=
"color: red; font-weight:bold"
>
*
</span>
)
</label>
<input
type=
"file"
class=
"input-group-text"
name=
"anexoDecisaoCONSU"
accept=
".pdf"
/>
@error('anexoDecisaoCONSU')
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<strong>
{{ $message }}
</strong>
</span>
@enderror
</div>
</div>
@if($projeto->anexoDecisaoCONSU)
<div
class=
"col-3 "
>
<a
href=
"{{ route('baixar.anexo.consu', ['id' => $projeto->id]) }}"
><i
class=
"fas fa-file-pdf fa-2x"
></i></a>
</div>
@else
<div
class=
"col-3 text-danger"
>
<p><i
class=
"fas fa-times-circle fa-2x"
></i></p>
</div>
@endif
</div>
</div>
@else
<div
class=
"form-group col-md-6"
style=
"margin-top: 10px"
>
<div
class=
"form-group col-md-6"
style=
"margin-top: 10px"
>
<div
class=
"row justify-content-center"
>
<div
class=
"row justify-content-center"
>
<div
class=
"col-12"
>
<div
class=
"col-12"
>
...
@@ -111,6 +140,9 @@
...
@@ -111,6 +140,9 @@
</div>
</div>
</div>
</div>
@endif
{{-- Anexo do Grupo de Pesquisa --}}
{{-- Anexo do Grupo de Pesquisa --}}
<div
class=
"form-group col-md-6"
style=
"margin-top: 10px"
>
<div
class=
"form-group col-md-6"
style=
"margin-top: 10px"
>
<div
class=
"row justify-content-center"
>
<div
class=
"row justify-content-center"
>
...
@@ -140,15 +172,15 @@
...
@@ -140,15 +172,15 @@
<div
class=
"form-group col-md-6"
>
<div
class=
"form-group col-md-6"
>
<label
for=
"botao"
class=
"col-form-label @error('botao') is-invalid @enderror"
data-toggle=
"tooltip"
data-placement=
"bottom"
title=
"Se possuir, coloque todas em único arquivo pdf."
style=
"margin-right: 15px;"
>
{{ __('Possui autorizações especiais?') }}
<span
style=
"color: red; font-weight:bold"
>
*
</span></label>
<label
for=
"botao"
class=
"col-form-label @error('botao') is-invalid @enderror"
data-toggle=
"tooltip"
data-placement=
"bottom"
title=
"Se possuir, coloque todas em único arquivo pdf."
style=
"margin-right: 15px;"
>
{{ __('Possui autorizações especiais?') }}
<span
style=
"color: red; font-weight:bold"
>
*
</span></label>
<input
type=
"radio"
checked
id=
"radioSim"
name=
"sim"
onchange=
"displayAutorizacoesEspeciais('sim')"
>
<input
type=
"radio"
id=
"radioSim"
@
if
($
projeto-
>
anexoAutorizacaoComiteEtica) checked @endif
name="sim" onchange="displayAutorizacoesEspeciais('sim')">
<label
for=
"radioSim"
style=
"margin-right: 5px"
>
Sim
</label>
<label
for=
"radioSim"
style=
"margin-right: 5px"
>
Sim
</label>
<input
type=
"radio"
id=
"radioNao"
name=
"nao"
onchange=
"displayAutorizacoesEspeciais('nao')"
>
<input
type=
"radio"
id=
"radioNao"
@
if
($
projeto-
>
justificativaAutorizacaoEtica) checked @endif
name="nao" onchange="displayAutorizacoesEspeciais('nao')">
<label
for=
"radioNao"
style=
"margin-right: 5px"
>
Não
</label><br>
<label
for=
"radioNao"
style=
"margin-right: 5px"
>
Não
</label><br>
<span
id=
"idAvisoAutorizacaoEspecial"
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:none"
>
<span
id=
"idAvisoAutorizacaoEspecial"
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:none"
>
<strong>
Selecione a autorização e envie o arquivo!
</strong>
<strong>
Selecione a autorização e envie o arquivo!
</strong>
</span>
</span>
<div
class=
"form-group"
id=
"displaySim"
style=
"display: block; margin-top:-1rem"
>
<div
class=
"form-group"
id=
"displaySim"
@
if
($
projeto-
>
anexoAutorizacaoComiteEtica) style="display: block; margin-top:-1rem" @else style="display: none; margin-top:-1rem" @endif
>
@component('componentes.input', ['label' => 'Sim, declaro que necessito de autorizações especiais (.pdf)'])
@component('componentes.input', ['label' => 'Sim, declaro que necessito de autorizações especiais (.pdf)'])
<input
type=
"file"
class=
"input-group-text"
name=
"anexoAutorizacaoComiteEtica"
accept=
".pdf"
/>
<input
type=
"file"
class=
"input-group-text"
name=
"anexoAutorizacaoComiteEtica"
accept=
".pdf"
/>
<div
class=
"row justify-content-center"
>
<div
class=
"row justify-content-center"
>
...
@@ -173,7 +205,7 @@
...
@@ -173,7 +205,7 @@
@endcomponent
@endcomponent
</div>
</div>
<div
class=
"form-group"
id=
"displayNao"
style=
"display: none; margin-top:-1rem"
>
<div
class=
"form-group"
id=
"displayNao"
@
if
($
projeto-
>
justificativaAutorizacaoEtica) style="display: block; margin-top:-1rem" @else
style="display: none; margin-top:-1rem"
@endif
>
@component('componentes.input', ['label' => 'Declaração de que não necessito de autorização especiais (.pdf)'])
@component('componentes.input', ['label' => 'Declaração de que não necessito de autorização especiais (.pdf)'])
<input
type=
"file"
class=
"input-group-text"
name=
"justificativaAutorizacaoEtica"
accept=
".pdf"
/>
<input
type=
"file"
class=
"input-group-text"
name=
"justificativaAutorizacaoEtica"
accept=
".pdf"
/>
@if($projeto->justificativaAutorizacaoEtica || $projeto->anexoAutorizacaoComiteEtica )
@if($projeto->justificativaAutorizacaoEtica || $projeto->anexoAutorizacaoComiteEtica )
...
...
resources/views/projeto/editaFormulario/participantes.blade.php
View file @
f8122be5
...
@@ -403,7 +403,7 @@
...
@@ -403,7 +403,7 @@
<div
class=
"col-md-12"
><h5>
Endereço
</h5></div>
<div
class=
"col-md-12"
><h5>
Endereço
</h5></div>
<div
class=
"col-6"
>
<div
class=
"col-6"
>
@component('componentes.input', ['label' => 'CEP'])
@component('componentes.input', ['label' => 'CEP'])
<input
type=
"text"
class=
"form-control"
value=
"{{old('cep')[$i] ?? "
"
}}"
name=
"cep[{{$i}}]"
placeholder=
"CEP"
/>
<input
type=
"text"
class=
"form-control
cep
"
value=
"{{old('cep')[$i] ?? "
"
}}"
name=
"cep[{{$i}}]"
placeholder=
"CEP"
/>
@error('cep.'.$i)
@error('cep.'.$i)
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<strong>
{{ $message }}
</strong>
<strong>
{{ $message }}
</strong>
...
@@ -468,14 +468,15 @@
...
@@ -468,14 +468,15 @@
@endcomponent
@endcomponent
</div>
</div>
<div
class=
"col-12"
>
<div
class=
"col-12"
>
@component('componentes.input', ['label' => 'Complemento',])
<div
class=
"form-group"
>
<label
class=
" control-label"
for=
"firstname"
>
Complemento
</label>
<input
type=
"text"
class=
"form-control"
value=
"{{old('complemento')[$i] ?? "
"
}}"
name=
"complemento[{{$i}}]"
placeholder=
"Complemento"
/>
<input
type=
"text"
class=
"form-control"
value=
"{{old('complemento')[$i] ?? "
"
}}"
name=
"complemento[{{$i}}]"
placeholder=
"Complemento"
/>
@error('complemento.'.$i)
@error('complemento.'.$i)
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<strong>
{{ $message }}
</strong>
<strong>
{{ $message }}
</strong>
</span>
</span>
@enderror
@enderror
@endcomponent
</div>
</div>
</div>
<div
class=
"col-md-12"
><h5>
Dados do curso
</h5></div>
<div
class=
"col-md-12"
><h5>
Dados do curso
</h5></div>
<div
class=
"col-6"
>
<div
class=
"col-6"
>
...
...
resources/views/projeto/editar.blade.php
View file @
f8122be5
...
@@ -106,6 +106,19 @@
...
@@ -106,6 +106,19 @@
<
script
>
<
script
>
if
(
document
.
getElementById
(
"radioSim"
)
.
checked
){
document
.
getElementById
(
"radioSim"
)
.
checked
=
true
;
document
.
getElementById
(
"radioNao"
)
.
checked
=
false
;
document
.
getElementById
(
"displaySim"
)
.
style
.
display
=
"block"
;
document
.
getElementById
(
"displayNao"
)
.
style
.
display
=
"none"
;
document
.
getElementById
(
"idAvisoAutorizacaoEspecial"
)
.
style
.
display
=
"none"
;
}
else
{
document
.
getElementById
(
"radioSim"
)
.
checked
=
false
;
document
.
getElementById
(
"radioNao"
)
.
checked
=
true
;
document
.
getElementById
(
"displaySim"
)
.
style
.
display
=
"none"
;
document
.
getElementById
(
"displayNao"
)
.
style
.
display
=
"block"
;
document
.
getElementById
(
"idAvisoAutorizacaoEspecial"
)
.
style
.
display
=
"none"
;
}
let
buttonSubmit
=
document
.
getElementById
(
'idButtonSubmitProjeto'
);
let
buttonSubmit
=
document
.
getElementById
(
'idButtonSubmitProjeto'
);
let
buttonRascunho
=
document
.
getElementById
(
'idButtonSubmitRascunho'
);
let
buttonRascunho
=
document
.
getElementById
(
'idButtonSubmitRascunho'
);
...
@@ -148,6 +161,18 @@
...
@@ -148,6 +161,18 @@
}
}
}
}
var
SPMaskBehavior
=
function
(
val
)
{
return
val
.
replace
(
/
\
D
/
g
,
''
)
.
length
===
11
?
'(00) 00000-0000'
:
'(00) 0000-00009'
;
},
spOptions
=
{
onKeyPress
:
function
(
val
,
e
,
field
,
options
)
{
field
.
mask
(
SPMaskBehavior
.
apply
({},
arguments
),
options
);
}
};
$
(
"input.cpf:text"
)
.
mask
(
"000.000.000-00"
);
$
(
"input.celular:text"
)
.
mask
(
SPMaskBehavior
,
spOptions
);
$
(
"input.cep:text"
)
.
mask
(
"00000-000"
);
buttonMais
.
addEventListener
(
"click"
,
(
e
)
=>
{
buttonMais
.
addEventListener
(
"click"
,
(
e
)
=>
{
...
...
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