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
55a0747c
"app/vscode:/vscode.git/clone" did not exist on "b389bf4bbb13802c5bda274d2ab26851e4a479c2"
Unverified
Commit
55a0747c
authored
Jul 06, 2021
by
José Rômulo
Committed by
GitHub
Jul 06, 2021
Browse files
Merge branch 'lmts-ufape:master' into master
parents
e211da21
22e72923
Changes
24
Expand all
Show whitespace changes
Inline
Side-by-side
Procfile
0 → 100644
View file @
55a0747c
web: vendor/bin/heroku-php-apache2 public/
app/CoordenadorComissao.php
View file @
55a0747c
...
...
@@ -15,7 +15,7 @@ class CoordenadorComissao extends Model
}
public
function
trabalho
(){
return
$this
->
hasMany
(
'App\Trabalho'
);
return
$this
->
hasMany
(
'App\Trabalho'
,
'coordenador_id'
);
}
}
app/Http/Controllers/ArquivoController.php
View file @
55a0747c
...
...
@@ -88,6 +88,7 @@ class ArquivoController extends Controller
$arquivo
=
Arquivo
::
find
(
$id
);
if
(
Storage
::
disk
()
->
exists
(
$arquivo
->
nome
))
{
ob_end_clean
();
return
Storage
::
download
(
$arquivo
->
nome
);
}
return
abort
(
404
);
...
...
app/Http/Controllers/EventoController.php
View file @
55a0747c
...
...
@@ -166,6 +166,7 @@ class EventoController extends Controller
$evento
[
'coordenadorId'
]
=
$request
->
coordenador_id
;
$evento
[
'criador_id'
]
=
$user_id
;
$evento
[
'numParticipantes'
]
=
$request
->
numParticipantes
;
$evento
[
'consu'
]
=
$request
->
has
(
'consu'
);
$evento
[
'anexosStatus'
]
=
'final'
;
//dd($evento);
...
...
@@ -395,7 +396,7 @@ class EventoController extends Controller
$evento
->
resultado_preliminar
=
$request
->
resultado_preliminar
;
$evento
->
resultado_final
=
$request
->
resultado_final
;
$evento
->
coordenadorId
=
$request
->
coordenador_id
;
$evento
->
consu
=
$request
->
has
(
'consu'
);
if
(
$request
->
pdfEdital
!=
null
){
$pdfEdital
=
$request
->
pdfEdital
;
$path
=
'pdfEdital/'
.
$evento
->
id
.
'/'
;
...
...
@@ -597,6 +598,7 @@ class EventoController extends Controller
$evento
=
Evento
::
find
(
$id
);
if
(
Storage
::
disk
()
->
exists
(
$evento
->
pdfEdital
))
{
ob_end_clean
();
return
Storage
::
download
(
$evento
->
pdfEdital
);
}
...
...
@@ -607,6 +609,7 @@ class EventoController extends Controller
$evento
=
Evento
::
find
(
$id
);
if
(
Storage
::
disk
()
->
exists
(
$evento
->
modeloDocumento
))
{
ob_end_clean
();
return
Storage
::
download
(
$evento
->
modeloDocumento
);
}
...
...
app/Http/Controllers/HomeController.php
View file @
55a0747c
...
...
@@ -54,6 +54,7 @@ class HomeController extends Controller
}
public
function
downloadArquivo
(
Request
$request
){
ob_end_clean
();
return
Storage
::
download
(
$request
->
file
);
}
}
app/Http/Controllers/TrabalhoController.php
View file @
55a0747c
This diff is collapsed.
Click to expand it.
app/Http/Requests/StoreTrabalho.php
View file @
55a0747c
...
...
@@ -2,9 +2,10 @@
namespace
App\Http\Requests
;
use
Illuminate\Foundation\Http\FormRequest
;
use
Illuminate\Support\Facades\Auth
;
use
App\Evento
;
use
Illuminate\Validation\Rule
;
use
Illuminate\Support\Facades\Auth
;
use
Illuminate\Foundation\Http\FormRequest
;
class
StoreTrabalho
extends
FormRequest
{
...
...
@@ -26,7 +27,7 @@ class StoreTrabalho extends FormRequest
public
function
rules
()
{
$evento
=
Evento
::
find
(
$this
->
editalId
);
$rules
=
[
'editalId'
=>
[
'required'
,
'string'
],
'marcado.*'
=>
[
'required'
],
...
...
@@ -37,7 +38,7 @@ class StoreTrabalho extends FormRequest
'pontuacaoPlanilha'
=>
[
'required'
,
'string'
],
'linkGrupoPesquisa'
=>
[
'required'
,
'string'
],
'anexoProjeto'
=>
[
'required'
,
'mimes:pdf'
],
'anexoDecisaoCONSU'
=>
[
'
required
'
,
'mimes:pdf'
],
'anexoDecisaoCONSU'
=>
[
Rule
::
required
If
(
$evento
->
consu
)
,
'mimes:pdf'
],
'anexoPlanilhaPontuacao'
=>
[
'required'
],
'anexoLattesCoordenador'
=>
[
'required'
,
'mimes:pdf'
],
'anexoGrupoPesquisa'
=>
[
'required'
,
'mimes:pdf'
],
...
...
@@ -62,7 +63,6 @@ class StoreTrabalho extends FormRequest
$rules
[
'cidade.'
.
$value
]
=
[
'required'
,
'string'
];
$rules
[
'uf.'
.
$value
]
=
[
'required'
,
'string'
];
$rules
[
'cep.'
.
$value
]
=
[
'required'
,
'string'
];
$rules
[
'complemento.'
.
$value
]
=
[
'required'
,
'string'
];
//participante
$rules
[
'rg.'
.
$value
]
=
[
'required'
,
'string'
];
$rules
[
'data_de_nascimento.'
.
$value
]
=
[
'required'
,
'string'
];
...
...
app/Http/Requests/UpdateTrabalho.php
View file @
55a0747c
...
...
@@ -2,10 +2,11 @@
namespace
App\Http\Requests
;
use
App\Evento
;
use
App\Trabalho
;
use
Illuminate\Foundation\Http\FormRequest
;
use
Illuminate\Support\Facades\Auth
;
use
Illuminate\Validation\Rule
;
use
Illuminate\Support\Facades\Auth
;
use
Illuminate\Foundation\Http\FormRequest
;
class
UpdateTrabalho
extends
FormRequest
{
...
...
@@ -27,7 +28,7 @@ class UpdateTrabalho extends FormRequest
public
function
rules
()
{
$projeto
=
Trabalho
::
find
(
$this
->
id
);
$evento
=
Evento
::
find
(
$this
->
editalId
);
$rules
=
[
'editalId'
=>
[
'required'
,
'string'
],
'marcado.*'
=>
[
'required'
],
...
...
@@ -38,15 +39,15 @@ class UpdateTrabalho extends FormRequest
'pontuacaoPlanilha'
=>
[
'required'
,
'string'
],
'linkGrupoPesquisa'
=>
[
'required'
,
'string'
],
'anexoProjeto'
=>
[[
Rule
::
requiredIf
(
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoProjeto
==
null
)],
'mimes:pdf'
],
'anexoDecisaoCONSU'
=>
[
'mimes:pdf'
],
'anexoDecisaoCONSU'
=>
[
Rule
::
requiredIf
(
$evento
->
consu
&&
$projeto
->
anexoDecisaoCONSU
==
null
),
'mimes:pdf'
],
'anexoPlanilhaPontuacao'
=>
[[
Rule
::
requiredIf
(
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoPlanilhaPontuacao
==
null
)]],
'anexoLattesCoordenador'
=>
[[
Rule
::
requiredIf
(
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoLattesCoordenador
==
null
)],
'mimes:pdf'
],
'anexoGrupoPesquisa'
=>
[[
Rule
::
requiredIf
(
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoGrupoPesquisa
==
null
)],
'mimes:pdf'
],
'anexoAutorizacaoComiteEtica'
=>
[
Rule
::
requiredIf
((
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoAutorizacaoComiteEtica
==
null
)
)
Rule
::
requiredIf
((
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
justificativaAutorizacaoEtica
==
null
&&
$projeto
->
anexoAutorizacaoComiteEtica
==
null
)
)
],
'justificativaAutorizacaoEtica'
=>
[
Rule
::
requiredIf
((
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoAutorizacaoComiteEtica
==
null
))
Rule
::
requiredIf
((
!
$this
->
has
(
'rascunho'
)
&&
$projeto
->
anexoAutorizacaoComiteEtica
==
null
&&
$projeto
->
justificativaAutorizacaoEtica
==
null
))
],
];
...
...
@@ -66,7 +67,6 @@ class UpdateTrabalho extends FormRequest
$rules
[
'cidade.'
.
$value
]
=
[
'required'
,
'string'
];
$rules
[
'uf.'
.
$value
]
=
[
'required'
,
'string'
];
$rules
[
'cep.'
.
$value
]
=
[
'required'
,
'string'
];
$rules
[
'complemento.'
.
$value
]
=
[
'required'
,
'string'
];
//participante
$rules
[
'rg.'
.
$value
]
=
[
'required'
,
'string'
];
$rules
[
'data_de_nascimento.'
.
$value
]
=
[
'required'
,
'string'
];
...
...
@@ -91,4 +91,14 @@ class UpdateTrabalho extends FormRequest
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'
,
];
}
}
composer.lock
View file @
55a0747c
...
...
@@ -1643,16 +1643,16 @@
},
{
"name": "monolog/monolog",
"version": "2.
2
.0",
"version": "2.
3
.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
"reference": "
1cb1cde8e8dd0f70cc0fe51354a59acad9302084
"
"reference": "
df991fd88693ab703aa403413d83e15f688dae33
"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/
1cb1cde8e8dd0f70cc0fe51354a59acad9302084
",
"reference": "
1cb1cde8e8dd0f70cc0fe51354a59acad9302084
",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/
df991fd88693ab703aa403413d83e15f688dae33
",
"reference": "
df991fd88693ab703aa403413d83e15f688dae33
",
"shasum": ""
},
"require": {
...
...
@@ -1671,7 +1671,7 @@
"php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3",
"phpspec/prophecy": "^1.6.1",
"phpstan/phpstan": "^0.12.
5
9",
"phpstan/phpstan": "^0.12.9
1
",
"phpunit/phpunit": "^8.5",
"predis/predis": "^1.1",
"rollbar/rollbar": "^1.3",
...
...
@@ -1723,7 +1723,7 @@
],
"support": {
"issues": "https://github.com/Seldaek/monolog/issues",
"source": "https://github.com/Seldaek/monolog/tree/2.
2
.0"
"source": "https://github.com/Seldaek/monolog/tree/2.
3
.0"
},
"funding": [
{
...
...
@@ -1735,7 +1735,7 @@
"type": "tidelift"
}
],
"time": "202
0-12-14T13:15:25
+00:00"
"time": "202
1-07-05T11:34:13
+00:00"
},
{
"name": "nesbot/carbon",
...
...
@@ -1832,16 +1832,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.1
0.5
",
"version": "v4.1
1.0
",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "
4432ba399e47c66624bc73c8c0f811e5c109576f
"
"reference": "
fe14cf3672a149364fb66dfe11bf6549af899f94
"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/
4432ba399e47c66624bc73c8c0f811e5c109576f
",
"reference": "
4432ba399e47c66624bc73c8c0f811e5c109576f
",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/
fe14cf3672a149364fb66dfe11bf6549af899f94
",
"reference": "
fe14cf3672a149364fb66dfe11bf6549af899f94
",
"shasum": ""
},
"require": {
...
...
@@ -1882,9 +1882,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.1
0.5
"
"source": "https://github.com/nikic/PHP-Parser/tree/v4.1
1.0
"
},
"time": "2021-0
5
-03T1
9:11:20
+00:00"
"time": "2021-0
7
-03T1
3:36:55
+00:00"
},
{
"name": "opis/closure",
...
...
@@ -7321,5 +7321,5 @@
"php": "^7.2"
},
"platform-dev": [],
"plugin-api-version": "2.
1
.0"
"plugin-api-version": "2.
0
.0"
}
config/database.php
View file @
55a0747c
<?php
use
Illuminate\Support\Str
;
// $DATABASE_URL=parse_url('postgres://shldedzeknxkxv:2b9d0bcbdc7bd07dcbc4db2716e1af333788b38234d527435607a3fd1353f52b@ec2-54-227-246-76.compute-1.amazonaws.com:5432/d87d2lg0us76su');
return
[
/*
...
...
@@ -15,7 +15,7 @@ return [
|
*/
'default'
=>
env
(
'DB_CONNECTION'
,
'
my
sql'
),
'default'
=>
env
(
'DB_CONNECTION'
,
'
pg
sql'
),
/*
|--------------------------------------------------------------------------
...
...
@@ -78,6 +78,20 @@ return [
'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'
=>
[
'driver'
=>
'sqlsrv'
,
'url'
=>
env
(
'DATABASE_URL'
),
...
...
database/migrations/2021_07_01_123506_alter_table_eventos.php
0 → 100644
View file @
55a0747c
<?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 @
55a0747c
...
...
@@ -15,7 +15,7 @@
</
div
>
{{
--
nome
|
Participantes
|
Tipo
--
}}
<
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
>
<
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 @@
@
enderror
</
div
>
<
div
class
=
"col-sm-
2
"
>
<
div
class
=
"col-sm-
5
"
>
<
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
>
<
option
@
if
(
old
(
'tipo'
)
==
'PIBIC'
)
selected
@
endif
value
=
"PIBIC"
>
PIBIC
</
option
>
...
...
@@ -56,7 +56,8 @@
@
enderror
</
div
>
<
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
>
@
error
(
'numParticipantes'
)
...
...
@@ -65,6 +66,18 @@
</
span
>
@
enderror
</
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
--
}}
{{
--
Descricao
Edital
--
}}
...
...
resources/views/evento/editarEvento.blade.php
View file @
55a0747c
...
...
@@ -15,7 +15,7 @@
</
div
>
{{
--
nome
|
Tipo
--
}}
<
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
>
<
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 @@
</
div
>
{{
--
End
Nome
do
evento
--
}}
{{
--
Tipo
do
evento
--
}}
<
div
class
=
"col-sm-
2
"
>
<
div
class
=
"col-sm-
5
"
>
<
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
>
-->
<
select
id
=
"tipo"
type
=
"text"
class
=
"form-control @error('tipo') is-invalid @enderror"
name
=
"tipo"
required
>
...
...
@@ -70,6 +70,18 @@
</
span
>
@
enderror
</
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
--
}}
{{
--
Descricao
Evento
--
}}
...
...
resources/views/evento/formulario/anexos.blade.php
View file @
55a0747c
...
...
@@ -41,6 +41,17 @@
@enderror
@endcomponent
</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"
>
<label
class=
" control-label"
for=
"firstname"
>
Decisão do CONSU (.pdf)
</label>
<input
type=
"file"
class=
"input-group-text"
name=
"anexoDecisaoCONSU"
accept=
".pdf"
/>
...
...
@@ -51,6 +62,8 @@
@enderror
</div>
@endif
<div
class=
"form-group col-md-6"
style=
"margin-top: 10px"
>
@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"
/>
...
...
resources/views/evento/formulario/participantes.blade.php
View file @
55a0747c
...
...
@@ -102,7 +102,7 @@
<div
class=
"col-md-12"
><h5>
Endereço
</h5></div>
<div
class=
"col-6"
>
@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)
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<strong>
{{ $message }}
</strong>
...
...
@@ -167,14 +167,15 @@
@endcomponent
</div>
<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"
/>
@error('complemento.'.$i)
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<strong>
{{ $message }}
</strong>
</span>
@enderror
@endcomponent
</div>
</div>
<div
class=
"col-md-12"
><h5>
Dados do curso
</h5></div>
<div
class=
"col-6"
>
...
...
resources/views/evento/formulario/proponente.blade.php
View file @
55a0747c
...
...
@@ -45,7 +45,7 @@
</div>
<div
class=
"form-group col-md-6"
>
<label
for=
"pontuacaoPlanilha"
>
Valor da planilha de pontuação
<span
style=
"color: red; font-weight:bold"
>
*
</span></label>
<input
class=
"form-control @error('pontuacaoPlanilha') is-invalid @enderror"
type=
"number"
min=
"0"
name=
"pontuacaoPlanilha"
<input
class=
"form-control @error('pontuacaoPlanilha') is-invalid @enderror"
type=
"number"
min=
"0"
step=
".01"
name=
"pontuacaoPlanilha"
value=
"{{old('pontuacaoPlanilha')}}"
>
@error('pontuacaoPlanilha')
...
...
resources/views/evento/submeterTrabalho.blade.php
View file @
55a0747c
...
...
@@ -29,20 +29,20 @@
<
div
class
=
"row justify-content-center"
>
@
component
(
'evento.formulario.projeto'
,
[
'grandeAreas'
=>
$grandeAreas
])
@
endcomponent
@
include
(
'evento.formulario.projeto'
)
@
component
(
'evento.formulario.proponente'
)
@
endcomponent
@
component
(
'evento.formulario.anexos'
)
@
endcomponent
@
include
(
'evento.formulario.proponente'
)
@
component
(
'evento.formulario.participantes'
,
[
'estados'
=>
$estados
,
'enum_turno'
=>
$enum_turno
,
'edital'
=>
$edital
])
@
endcomponent
@
component
(
'evento.formulario.finalizar'
)
@
endcomponent
@
include
(
'evento.formulario.anexos'
)
@
include
(
'evento.formulario.participantes'
)
@
include
(
'evento.formulario.finalizar'
)
</
div
>
</
div
>
...
...
resources/views/index.blade.php
View file @
55a0747c
...
...
@@ -13,10 +13,22 @@
O
Submeta
é
um
sistema
de
submissão
de
projetos
acadêmicos
,
que
pode
ser
adotado
para
os
diferentes
propósitos
de
Ensino
,
Pesquisa
e
Extensão
.
O
sistema
abrange
todas
as
principais
etapas
relacionadas
à
submissão
de
projetos
,
permitindo
o
lançamento
e
configuração
de
editais
,
além
de
gerenciar
a
distribuição
das
avaliações
e
os
pareceres
técnicos
dos
avaliadores
,
como
também
,
visualizar
os
projetos
submetidos
pelos
proponentes
.
</
p
>
</
div
>
<
br
>
<
div
class
=
"row position-text"
>
{{
--
<
button
class
=
"btn btn-opcoes-edital"
style
=
"margin-bottom: 20px;"
>
Leia
mais
</
button
>
--
}}
<
div
class
=
"alert alert-danger"
role
=
"alert"
>
<
p
>
<
strong
>
INFORME
</
strong
>
</
p
>
<
p
>
<
strong
>
Comitês
Internos
do
PIBIC
e
do
PIBITI
comunicam
prorrogração
do
prazo
de
envio
de
propostas
</
strong
>
</
p
>
<
p
>
Os
Comitês
Internos
do
PIBIC
e
do
PIBITI
da
UFAPE
informam
que
o
prazo
para
envio
das
propostas
referentes
aos
Editais
PIBIC
/
PIC
e
PIBITI
UFAPE
2021
/
2022
foi
prorrogado
para
o
dia
07
/
07
/
2021
até
às
23
h59min
(
horário
de
Brasília
)
.
</
p
>
<
p
>
Não
serão
aceitas
propostas
submetidas
após
este
prazo
.
</
p
>
</
div
>
</
div
>
</
div
>
<
br
>
...
...
resources/views/projeto/editaFormulario/anexos.blade.php
View file @
55a0747c
...
...
@@ -61,7 +61,7 @@
<div
class=
"row justify-content-center"
>
<div
class=
"col-12"
>
@component('componentes.input', ['label' => 'Planilha de Pontuação (.xlsx,.xls,.ods)'])
<input
type=
"file"
class=
"input-group-text"
name=
"anexoPlanilhaPontuacao"
accept=
".xlsx, .xls, .ods"
/>
<input
type=
"file"
class=
"input-group-text"
name=
"anexoPlanilhaPontuacao"
accept=
".xlsx, .xls, .ods
, .gnumeric
"
/>
@error('anexoPlanilhaPontuacao')
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<strong>
{{ $message }}
</strong>
...
...
@@ -83,6 +83,35 @@
</div>
{{-- 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=
"row justify-content-center"
>
<div
class=
"col-12"
>
...
...
@@ -111,6 +140,9 @@
</div>
</div>
@endif
{{-- Anexo do Grupo de Pesquisa --}}
<div
class=
"form-group col-md-6"
style=
"margin-top: 10px"
>
<div
class=
"row justify-content-center"
>
...
...
@@ -140,26 +172,26 @@
<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>
<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>
<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>
<span
id=
"idAvisoAutorizacaoEspecial"
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:none"
>
<strong>
Selecione a autorização e envie o arquivo!
</strong>
</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)'])
<input
type=
"file"
class=
"input-group-text"
name=
"anexoAutorizacaoComiteEtica"
accept=
".pdf"
/>
<div
class=
"row justify-content-center"
>
@if(
$projeto->justificativaAutorizacaoEtica ||
$projeto->anexoAutorizacaoComiteEtica )
@if($projeto->anexoAutorizacaoComiteEtica )
<div
class=
"row justify-content-center"
>
<div
class=
"col-3 mt-2"
>
<a
href=
"{{ route('baixar.anexo.comite', ['id' => $projeto->id]) }}"
><i
class=
"fas fa-file-pdf fa-2x"
></i></a>
</div>
</div>
@else
<div
class=
"col-3 text-danger"
>
<div
class=
"col-3 text-danger
mt-2
"
>
<p><i
class=
"fas fa-times-circle fa-2x"
></i></p>
</div>
@endif
...
...
@@ -173,17 +205,17 @@
@endcomponent
</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)'])
<input
type=
"file"
class=
"input-group-text"
name=
"justificativaAutorizacaoEtica"
accept=
".pdf"
/>
@if($projeto->justificativaAutorizacaoEtica
|| $projeto->anexoAutorizacaoComiteEtica
)
@if($projeto->justificativaAutorizacaoEtica)
<div
class=
"row justify-content-center"
>
<div
class=
"col-3 mt-2"
>
<a
href=
"{{ route('baixar.anexo.justificativa', ['id' => $projeto->id]) }}"
><i
class=
"fas fa-file-pdf fa-2x"
></i></a>
</div>
</div>
@else
<div
class=
"col-3 text-danger"
>
<div
class=
"col-3 text-danger
mt-2
"
>
<p><i
class=
"fas fa-times-circle fa-2x"
></i></p>
</div>
@endif
...
...
resources/views/projeto/editaFormulario/participantes.blade.php
View file @
55a0747c
...
...
@@ -177,14 +177,16 @@
@endcomponent
</div>
<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] ?? $p->user->endereco->complemento }}"
name=
"complemento[{{$i}}]"
placeholder=
"Complemento"
/>
@error('complemento.'.$i)
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<strong>
{{ $message }}
</strong>
</span>
@enderror
@endcomponent
</div>
</div>
<div
class=
"col-md-12"
><h5>
Dados do curso
</h5></div>
<div
class=
"col-6"
>
...
...
@@ -403,7 +405,7 @@
<div
class=
"col-md-12"
><h5>
Endereço
</h5></div>
<div
class=
"col-6"
>
@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)
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<strong>
{{ $message }}
</strong>
...
...
@@ -468,14 +470,15 @@
@endcomponent
</div>
<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"
/>
@error('complemento.'.$i)
<span
class=
"invalid-feedback"
role=
"alert"
style=
"overflow: visible; display:block"
>
<strong>
{{ $message }}
</strong>
</span>
@enderror
@endcomponent
</div>
</div>
<div
class=
"col-md-12"
><h5>
Dados do curso
</h5></div>
<div
class=
"col-6"
>
...
...
Prev
1
2
Next
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