Skip to content

GitLab

Unverified Commit beed2694 authored by Aline Tenório's avatar Aline Tenório Committed by GitHub
Browse files

Merge pull request #27 from lmts-ufape/fix-jean 

Correções
parents 490fc4da 409ef94a
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/TrabalhoController.php
View file @ beed2694
...@@ -93,8 +93,8 @@ class TrabalhoController extends Controller ...@@ -93,8 +93,8 @@ class TrabalhoController extends Controller
'area' => ['required', 'string'], 'area' => ['required', 'string'],
'subArea' => ['required', 'string'], 'subArea' => ['required', 'string'],
'pontuacaoPlanilha' => ['required', 'string'], 'pontuacaoPlanilha' => ['required', 'string'],
'linkGrupo' => ['required', 'string'], 'linkGrupo' => ['required', 'string', 'link_grupo'],
'linkLattesEstudante' => ['required', 'string'], 'linkLattesEstudante' => ['required', 'string', 'link_lattes'],
'nomeParticipante.*' => ['required', 'string'], 'nomeParticipante.*' => ['required', 'string'],
'emailParticipante.*' => ['required', 'string'], 'emailParticipante.*' => ['required', 'string'],
'funcaoParticipante.*' => ['required', 'string'], 'funcaoParticipante.*' => ['required', 'string'],
...@@ -142,8 +142,8 @@ class TrabalhoController extends Controller ...@@ -142,8 +142,8 @@ class TrabalhoController extends Controller
'area' => ['required', 'string'], 'area' => ['required', 'string'],
'subArea' => ['required', 'string'], 'subArea' => ['required', 'string'],
'pontuacaoPlanilha' => ['required', 'string'], 'pontuacaoPlanilha' => ['required', 'string'],
'linkGrupo' => ['required', 'string'], 'linkGrupo' => ['required', 'string', 'link_grupo'],
'linkLattesEstudante' => ['required', 'string'], 'linkLattesEstudante' => ['required', 'string', 'link_lattes'],
'nomeParticipante.*' => ['required', 'string'], 'nomeParticipante.*' => ['required', 'string'],
'emailParticipante.*' => ['required', 'string'], 'emailParticipante.*' => ['required', 'string'],
'funcaoParticipante.*' => ['required', 'string'], 'funcaoParticipante.*' => ['required', 'string'],
......
app/Mail/EmailLembrete.php
View file @ beed2694
...@@ -36,8 +36,8 @@ class EmailLembrete extends Mailable ...@@ -36,8 +36,8 @@ class EmailLembrete extends Mailable
*/ */
public function build() public function build()
{ {
$subject = 'Eventos - Lembrete de Evento'; $subject = 'Submeta - Lembrete de Edital';
return $this->from('lmtsteste@gmail.com', 'Eventos - LMTS') return $this->from('lmtsteste@gmail.com', 'Submeta - LMTS')
->subject($this->subject) ->subject($this->subject)
->view('emails.emailLembreteRevisor') ->view('emails.emailLembreteRevisor')
->with([ ->with([
......
app/Mail/EventoCriado.php
View file @ beed2694
...@@ -37,7 +37,7 @@ class EventoCriado extends Mailable ...@@ -37,7 +37,7 @@ class EventoCriado extends Mailable
public function build() public function build()
{ {
return $this->from('lmtsteste@gmail.com', 'Eventos - LMTS') return $this->from('lmtsteste@gmail.com', 'Submeta - LMTS')
->subject($this->subject) ->subject($this->subject)
->view('emails.emailEventoCriado') ->view('emails.emailEventoCriado')
->with([ ->with([
......
app/Mail/SubmissaoTrabalho.php
View file @ beed2694
...@@ -35,7 +35,7 @@ class SubmissaoTrabalho extends Mailable ...@@ -35,7 +35,7 @@ class SubmissaoTrabalho extends Mailable
public function build() public function build()
{ {
return $this->from('lmtsteste@gmail.com', 'Eventos - LMTS') return $this->from('lmtsteste@gmail.com', 'Submeta - LMTS')
->subject($this->subject) ->subject($this->subject)
->view('emails.submissaoTrabalho'); ->view('emails.submissaoTrabalho');
} }
......
app/Providers/AppServiceProvider.php
View file @ beed2694
...@@ -26,5 +26,6 @@ class AppServiceProvider extends ServiceProvider ...@@ -26,5 +26,6 @@ class AppServiceProvider extends ServiceProvider
{ {
Validator::extend('cpf', '\App\Utils\CpfValidation@validate'); Validator::extend('cpf', '\App\Utils\CpfValidation@validate');
Validator::extend('link_lattes', '\App\Utils\LattesValidation@validate', 'Link inválido'); Validator::extend('link_lattes', '\App\Utils\LattesValidation@validate', 'Link inválido');
Validator::extend('link_grupo', '\App\Utils\GrupoPesquisaValidation@validate', 'Link inválido');
} }
} }
app/Utils/GrupoPesquisaValidation.php 0 → 100644
View file @ beed2694
<?php namespace App\Utils;
class GrupoPesquisaValidation
{
public function validate($attribute, $value, $parameters, $validator)
{
return $this->isValidUrl($value);
}
function isValidUrl($url)
{
// first do some quick sanity checks:
if (!$url || !is_string($url)) {
return false;
}
$url = filter_var($url, FILTER_SANITIZE_URL);
// Validate url
if (!filter_var($url, FILTER_VALIDATE_URL)) {
return false;
}
// if(parse_url($url)['host'] != 'dgp.cnpq.br'){
// return false;
// }
if($this->getHttpResponseCode_using_getheaders($url) != 200){
return false;
}
return true;
}
function getHttpResponseCode_using_getheaders($url, $followredirects = true)
{
if (!$url || !is_string($url)) {
return false;
}
$headers = @get_headers($url);
if ($headers && is_array($headers)) {
if ($followredirects) {
$headers = array_reverse($headers);
}
foreach ($headers as $hline) {
if (preg_match('/^HTTP\/\S+\s+([1-9][0-9][0-9])\s+.*/', $hline, $matches)) {
$code = $matches[1];
return $code;
}
}
return false;
}
return false;
}
}
\ No newline at end of file
composer.lock
View file @ beed2694
...@@ -1831,7 +1831,7 @@ ...@@ -1831,7 +1831,7 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v4.4.9", "version": "v4.4.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
...@@ -1908,7 +1908,7 @@ ...@@ -1908,7 +1908,7 @@
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v5.1.0", "version": "v5.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/css-selector.git",
...@@ -1961,7 +1961,7 @@ ...@@ -1961,7 +1961,7 @@
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v4.4.9", "version": "v4.4.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
...@@ -2018,7 +2018,7 @@ ...@@ -2018,7 +2018,7 @@
}, },
{ {
"name": "symfony/error-handler", "name": "symfony/error-handler",
"version": "v4.4.9", "version": "v4.4.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/error-handler.git", "url": "https://github.com/symfony/error-handler.git",
...@@ -2075,7 +2075,7 @@ ...@@ -2075,7 +2075,7 @@
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v4.4.9", "version": "v4.4.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
...@@ -2203,7 +2203,7 @@ ...@@ -2203,7 +2203,7 @@
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v4.4.9", "version": "v4.4.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
...@@ -2252,7 +2252,7 @@ ...@@ -2252,7 +2252,7 @@
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v4.4.9", "version": "v4.4.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
...@@ -2307,16 +2307,16 @@ ...@@ -2307,16 +2307,16 @@
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v4.4.9", "version": "v4.4.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "54526b598d7fc86a67850488b194a88a79ab8467" "reference": "81d42148474e1852a333ed7a732f2a014af75430"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/54526b598d7fc86a67850488b194a88a79ab8467", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/81d42148474e1852a333ed7a732f2a014af75430",
"reference": "54526b598d7fc86a67850488b194a88a79ab8467", "reference": "81d42148474e1852a333ed7a732f2a014af75430",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2394,20 +2394,20 @@ ...@@ -2394,20 +2394,20 @@
], ],
"description": "Symfony HttpKernel Component", "description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2020-05-31T05:25:51+00:00" "time": "2020-06-12T11:15:37+00:00"
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
"version": "v5.1.0", "version": "v5.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/mime.git", "url": "https://github.com/symfony/mime.git",
"reference": "56261f89385f9d13cf843a5101ac72131190bc91" "reference": "c0c418f05e727606e85b482a8591519c4712cf45"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/56261f89385f9d13cf843a5101ac72131190bc91", "url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45",
"reference": "56261f89385f9d13cf843a5101ac72131190bc91", "reference": "c0c418f05e727606e85b482a8591519c4712cf45",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2457,7 +2457,7 @@ ...@@ -2457,7 +2457,7 @@
"mime", "mime",
"mime-type" "mime-type"
], ],
"time": "2020-05-25T12:33:44+00:00" "time": "2020-06-09T15:07:35+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
...@@ -2874,7 +2874,7 @@ ...@@ -2874,7 +2874,7 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v4.4.9", "version": "v4.4.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
...@@ -2923,7 +2923,7 @@ ...@@ -2923,7 +2923,7 @@
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v4.4.9", "version": "v4.4.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
...@@ -3057,7 +3057,7 @@ ...@@ -3057,7 +3057,7 @@
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v4.4.9", "version": "v4.4.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
...@@ -3190,7 +3190,7 @@ ...@@ -3190,7 +3190,7 @@
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v4.4.9", "version": "v4.4.10",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
......
config/app.php
View file @ beed2694
...@@ -67,7 +67,7 @@ return [ ...@@ -67,7 +67,7 @@ return [
| |
*/ */
'timezone' => 'UTC', 'timezone' => 'America/Recife',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
...@@ -80,7 +80,7 @@ return [ ...@@ -80,7 +80,7 @@ return [
| |
*/ */
'locale' => 'en', 'locale' => 'pt-BR',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
...@@ -93,7 +93,7 @@ return [ ...@@ -93,7 +93,7 @@ return [
| |
*/ */
'fallback_locale' => 'en', 'fallback_locale' => 'pt-BR',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
......
database/migrations/2020_05_23_054945_create_participantes_table.php
View file @ beed2694
...@@ -24,7 +24,7 @@ class CreateParticipantesTable extends Migration ...@@ -24,7 +24,7 @@ class CreateParticipantesTable extends Migration
$table->foreign('trabalho_id')->references('id')->on('trabalhos'); $table->foreign('trabalho_id')->references('id')->on('trabalhos');
$table->unsignedBigInteger('funcao_participante_id')->nullable(); $table->unsignedBigInteger('funcao_participante_id')->nullable();
$table->foreign('funcao_participante_id')->references('id')->on('funcao_participantes'); $table->foreign('funcao_participante_id')->references('id')->on('funcao_participantes')->onDelete('cascade');
$table->softDeletes(); $table->softDeletes();
}); });
......
database/seeds/FuncaoParticipanteSeeder.php
View file @ beed2694
...@@ -31,10 +31,6 @@ class FuncaoParticipanteSeeder extends Seeder ...@@ -31,10 +31,6 @@ class FuncaoParticipanteSeeder extends Seeder
]); ]);
DB::table('funcao_participantes')->insert([
'nome'=>'Estudante',
]);
DB::table('funcao_participantes')->insert([ DB::table('funcao_participantes')->insert([
'nome'=>'Voluntário', 'nome'=>'Voluntário',
......
database/seeds/SubAreaSeeder.php
View file @ beed2694
...@@ -46,15 +46,7 @@ class SubAreaSeeder extends Seeder ...@@ -46,15 +46,7 @@ class SubAreaSeeder extends Seeder
DB::table('sub_areas')->insert([ DB::table('sub_areas')->insert([
'nome'=>'Teoria da Computação', 'nome'=>'Teoria da Computação',
'area_id' => '1' 'area_id' => '1'
]); ]);
DB::table('sub_areas')->insert([
'nome'=>'Matemática Aplicada',
'area_id' => '1'
]);
DB::table('sub_areas')->insert([
'nome'=>'Matemática Aplicada',
'area_id' => '1'
]);
DB::table('sub_areas')->insert([ DB::table('sub_areas')->insert([
'nome'=>'Matemática da Computação', 'nome'=>'Matemática da Computação',
'area_id' => '1' 'area_id' => '1'
...@@ -195,11 +187,7 @@ class SubAreaSeeder extends Seeder ...@@ -195,11 +187,7 @@ class SubAreaSeeder extends Seeder
DB::table('sub_areas')->insert([ DB::table('sub_areas')->insert([
'nome'=>'Morfologia Vegetal', 'nome'=>'Morfologia Vegetal',
'area_id' => '2' 'area_id' => '2'
]); ]);
DB::table('sub_areas')->insert([
'nome'=>'Morfologia Vegetal',
'area_id' => '2'
]);
DB::table('sub_areas')->insert([ DB::table('sub_areas')->insert([
'nome'=>'Fisiologia Vegetal', 'nome'=>'Fisiologia Vegetal',
'area_id' => '2' 'area_id' => '2'
...@@ -333,11 +321,7 @@ class SubAreaSeeder extends Seeder ...@@ -333,11 +321,7 @@ class SubAreaSeeder extends Seeder
DB::table('sub_areas')->insert([ DB::table('sub_areas')->insert([
'nome'=>'Neuropsicofarmacologia', 'nome'=>'Neuropsicofarmacologia',
'area_id' => '2' 'area_id' => '2'
]); ]);
DB::table('sub_areas')->insert([
'nome'=>'Farmacologia Cardiorenal',
'area_id' => '2'
]);
DB::table('sub_areas')->insert([ DB::table('sub_areas')->insert([
'nome'=>'Farmacologia Cardiorenal', 'nome'=>'Farmacologia Cardiorenal',
'area_id' => '2' 'area_id' => '2'
...@@ -434,11 +418,7 @@ class SubAreaSeeder extends Seeder ...@@ -434,11 +418,7 @@ class SubAreaSeeder extends Seeder
DB::table('sub_areas')->insert([ DB::table('sub_areas')->insert([
'nome'=>'Instalações e Equipamentos Metalúrgicos', 'nome'=>'Instalações e Equipamentos Metalúrgicos',
'area_id' => '3' 'area_id' => '3'
]); ]);
DB::table('sub_areas')->insert([
'nome'=>'Instalações e Equipamentos Metalúrgicos',
'area_id' => '3'
]);
DB::table('sub_areas')->insert([ DB::table('sub_areas')->insert([
'nome'=>'Metalurgia de Transformação', 'nome'=>'Metalurgia de Transformação',
'area_id' => '3' 'area_id' => '3'
...@@ -1357,11 +1337,7 @@ class SubAreaSeeder extends Seeder ...@@ -1357,11 +1337,7 @@ class SubAreaSeeder extends Seeder
DB::table('sub_areas')->insert([ DB::table('sub_areas')->insert([
'nome'=>'Literaturas Estrangeiras Modernas', 'nome'=>'Literaturas Estrangeiras Modernas',
'area_id' => '8' 'area_id' => '8'
]); ]);
DB::table('sub_areas')->insert([
'nome'=>'Literaturas Estrangeiras Modernas',
'area_id' => '8'
]);
DB::table('sub_areas')->insert([ DB::table('sub_areas')->insert([
'nome'=>'Literaturas Clássicas', 'nome'=>'Literaturas Clássicas',
'area_id' => '8' 'area_id' => '8'
......
resources/views/administrador/editar_user.blade.php
View file @ beed2694
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
</span> </span>
@enderror --}} @enderror --}}
@if ($user->tipo == "proponente") @if ($user->tipo == "proponente" && !(is_null($proponente)))
<div id="proponente" style="display: none;"> <div id="proponente" style="display: none;">
<label class="col-form-label">{{ __('SIAPE') }}</label> <label class="col-form-label">{{ __('SIAPE') }}</label>
<input value="{{$proponente->SIAPE}}" id="SIAPE" type="text" class="form-control @error('SIAPE') is-invalid @enderror" name="SIAPE" autocomplete="SIAPE"> <input value="{{$proponente->SIAPE}}" id="SIAPE" type="text" class="form-control @error('SIAPE') is-invalid @enderror" name="SIAPE" autocomplete="SIAPE">
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<input value="" id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" autocomplete="anoTitulacao"> <input value="" id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" autocomplete="anoTitulacao">
<label class="col-form-label">{{ __('Área Formação') }}</label> <label class="col-form-label">{{ __('Área Formação') }}</label>
<input value="{{$proponente->areaFormacao}}" id="areaFormacao" type="text" class="form-control @error('areaFormacao') is-invalid @enderror" name="areaFormacao" autocomplete="areaFormacao"> <input value="" id="areaFormacao" type="text" class="form-control @error('areaFormacao') is-invalid @enderror" name="areaFormacao" autocomplete="areaFormacao">
<label class="col-form-label">{{ __('Bolsista Produtividade') }}</label> <label class="col-form-label">{{ __('Bolsista Produtividade') }}</label>
<input value="" id="bolsistaProdutividade" type="text" class="form-control @error('bolsistaProdutividade') is-invalid @enderror" name="bolsistaProdutividade" autocomplete="bolsistaProdutividade"> <input value="" id="bolsistaProdutividade" type="text" class="form-control @error('bolsistaProdutividade') is-invalid @enderror" name="bolsistaProdutividade" autocomplete="bolsistaProdutividade">
......
resources/views/administrador/index.blade.php
View file @ beed2694
...@@ -47,15 +47,15 @@ ...@@ -47,15 +47,15 @@
</div> </div>
</a> </a>
</div> </div>
<div class="col-sm-3 d-flex justify-content-center"> {{-- <div class="col-sm-3 d-flex justify-content-center">
<a href="{{ route('admin.usuarios') }}" style="text-decoration:none; color: inherit;"> <a href="{{ route('admin.usuarios') }}" style="text-decoration:none; color: inherit;">
<div class="card text-center " style="border-radius: 31px; width: 13rem;height: 15rem;"> <div class="card text-center " style="border-radius: 31px; width: 13rem;height: 15rem;">
<div class="card-body d-flex justify-content-center"> <div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Mensangens</h2> <h2 style="padding-top:15px">Mensagens</h2>
</div> </div>
</div> </div>
</a> </a>
</div> </div> --}}
</div> </div>
......
resources/views/administrador/usersAdmin.blade.php
View file @ beed2694
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="container" > <div class="container" >
<div class="row" > <div class="row" >
<div class="col-sm-10"> <div class="col-sm-10">
<h3>Editais</h3> <h3>Usuários</h3>
</div> </div>
<div class="col-sm-2"> <div class="col-sm-2">
<a href="{{route('admin.user.create')}}" class="btn btn-primary">{{ __('Criar usuário') }}</a> <a href="{{route('admin.user.create')}}" class="btn btn-primary">{{ __('Criar usuário') }}</a>
......
resources/views/evento/criarEvento.blade.php
View file @ beed2694
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</select> </select>
</div> </div>
</div> </div>
<hr>
<div class="row subtitulo"> <div class="row subtitulo">
<div class="col-sm-12"> <div class="col-sm-12">
<p>Projetos</p> <p>Projetos</p>
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
@enderror @enderror
</div> </div>
</div> </div>
<hr>
<div class="row subtitulo"> <div class="row subtitulo">
<div class="col-sm-12"> <div class="col-sm-12">
<p>Documentos</p> <p>Documentos</p>
...@@ -159,9 +159,9 @@ ...@@ -159,9 +159,9 @@
<div class="row justify-content-center" style="margin-top:10px"> <div class="row justify-content-center" style="margin-top:10px">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label for="pdfEdital">PDF do Edital</label> <label for="pdfEdital">Anexar edital</label>
<input type="file" class="form-control-file @error('pdfEdital') is-invalid @enderror" name="pdfEdital" value="{{ old('pdfEdital') }}" id="pdfEdital"> <input type="file" class="form-control-file @error('pdfEdital') is-invalid @enderror" name="pdfEdital" value="{{ old('pdfEdital') }}" id="pdfEdital">
<small>O arquivo selecionado deve ser no formato PDF de até xmb.</small> <small>O arquivo selecionado deve ser no formato PDF de até 2mb.</small>
@error('pdfEdital') @error('pdfEdital')
<span class="invalid-feedback" role="alert"> <span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong> <strong>{{ $message }}</strong>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
<div class="form-group"> <div class="form-group">
<label for="modeloDocumento">Arquivo com os modelos de documentos do edital</label> <label for="modeloDocumento">Arquivo com os modelos de documentos do edital</label>
<input type="file" class="form-control-file @error('modeloDocumento') is-invalid @enderror" name="modeloDocumento" value="{{ old('modeloDocumento') }}" id="modeloDocumento"> <input type="file" class="form-control-file @error('modeloDocumento') is-invalid @enderror" name="modeloDocumento" value="{{ old('modeloDocumento') }}" id="modeloDocumento">
<small>O arquivo selecionado deve ter até xmb.</small> <small>O arquivo selecionado deve ter até 2mb.</small>
@error('modeloDocumento') @error('modeloDocumento')
<span class="invalid-feedback" role="alert"> <span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong> <strong>{{ $message }}</strong>
......
resources/views/evento/submeterTrabalho.blade.php
View file @ beed2694
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<select class="form-control @error('grandeArea') is-invalid @enderror" id="grandeArea" name="grandeArea" onchange="areas()"> <select class="form-control @error('grandeArea') is-invalid @enderror" id="grandeArea" name="grandeArea" onchange="areas()">
<option value="" disabled selected hidden>-- Grande Área --</option> <option value="" disabled selected hidden>-- Grande Área --</option>
@foreach($grandeAreas as $grandeArea) @foreach($grandeAreas as $grandeArea)
<option value="{{$grandeArea->id}}">{{$grandeArea->nome}}</option> <option @if(old('grandeArea')==$grandeArea->id ) selected @endif value="{{$grandeArea->id}}">{{$grandeArea->nome}}</option>
@endforeach @endforeach
</select> </select>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<select class="form-control @error('area') is-invalid @enderror" id="area" name="area" onchange="subareas()"> <select class="form-control @error('area') is-invalid @enderror" id="area" name="area" onchange="subareas()">
<option value="" disabled selected hidden>-- Área --</option> <option value="" disabled selected hidden>-- Área --</option>
{{-- @foreach($areas as $area) {{-- @foreach($areas as $area)
<option value="{{$area->id}}">{{$area->nome}}</option> <option @if(old('area')==$area->id ) selected @endif value="{{$area->id}}">{{$area->nome}}</option>
@endforeach --}} @endforeach --}}
</select> </select>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<select class="form-control @error('subArea') is-invalid @enderror" id="subArea" name="subArea"> <select class="form-control @error('subArea') is-invalid @enderror" id="subArea" name="subArea">
<option value="" disabled selected hidden>-- Sub Área --</option> <option value="" disabled selected hidden>-- Sub Área --</option>
{{-- @foreach($subAreas as $subArea) {{-- @foreach($subAreas as $subArea)
<option value="{{$subArea->id}}">{{$subArea->nome}}</option> <option @if(old('subArea')==$subArea->id ) selected @endif value="{{$subArea->id}}">{{$subArea->nome}}</option>
@endforeach --}} @endforeach --}}
</select> </select>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<input class="form-control" type="text" id="nomeCoordenador" name="nomeCoordenador" disabled="disabled" value="{{ Auth()->user()->name }}"> <input class="form-control" type="text" id="nomeCoordenador" name="nomeCoordenador" disabled="disabled" value="{{ Auth()->user()->name }}">
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<label for="nomeTrabalho" class="col-form-label">Link Lattes do Proponente*</label> <label for="linkLattesEstudante" class="col-form-label">Link Lattes do Proponente*</label>
<input class="form-control @error('linkLattesEstudante') is-invalid @enderror" type="text" name="linkLattesEstudante" <input class="form-control @error('linkLattesEstudante') is-invalid @enderror" type="text" name="linkLattesEstudante"
@if(Auth()->user()->proponentes->linkLattes != null) @if(Auth()->user()->proponentes->linkLattes != null)
value="{{ Auth()->user()->proponentes->linkLattes }}" value="{{ Auth()->user()->proponentes->linkLattes }}"
...@@ -110,8 +110,8 @@ ...@@ -110,8 +110,8 @@
@enderror @enderror
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<label for="nomeTrabalho" class="col-form-label">{{ __('Pontuação da Planilha de Pontuação*:') }}</label> <label for="pontuacaoPlanilha" class="col-form-label">{{ __('Pontuação da Planilha de Pontuação*:') }}</label>
<input class="form-control @error('pontuacaoPlanilha') is-invalid @enderror" type="text" name="pontuacaoPlanilha"> <input class="form-control @error('pontuacaoPlanilha') is-invalid @enderror" type="text" name="pontuacaoPlanilha" value="{{old('pontuacaoPlanilha')}}">
@error('pontuacaoPlanilha') @error('pontuacaoPlanilha')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block"> <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
...@@ -120,8 +120,8 @@ ...@@ -120,8 +120,8 @@
@enderror @enderror
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<label for="nomeTrabalho" class="col-form-label">{{ __('Link do grupo de pesquisa*:') }}</label> <label for="linkGrupo" class="col-form-label">{{ __('Link do grupo de pesquisa*:') }}</label>
<input class="form-control @error('linkGrupo') is-invalid @enderror" type="text" name="linkGrupo"> <input class="form-control @error('linkGrupo') is-invalid @enderror" type="text" name="linkGrupo" value="{{old('linkGrupo')}}">
@error('linkGrupo') @error('linkGrupo')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block"> <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
...@@ -269,10 +269,13 @@ ...@@ -269,10 +269,13 @@
<div id="novoParticipante"> <div id="novoParticipante">
<br> <br>
<h5>Dados do participante</h5> <h5>Dados do participante</h5>
@php
$i = 0;
@endphp
<div class="row"> <div class="row">
<div class="col-sm-5"> <div class="col-sm-5">
<label>Nome Completo*</label> <label>Nome Completo*</label>
<input type="text" style="margin-bottom:10px" class="form-control @error('nomeParticipante') is-invalid @enderror" name="nomeParticipante[]" placeholder="Nome" required> <input type="text" style="margin-bottom:10px" class="form-control @error('nomeParticipante') is-invalid @enderror" name="nomeParticipante[]" placeholder="Nome" required value="{{old('nomeParticipante.'.$i)}}">
@error('nomeParticipante') @error('nomeParticipante')
<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>
...@@ -281,7 +284,7 @@ ...@@ -281,7 +284,7 @@
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<label>E-mail*</label> <label>E-mail*</label>
<input type="email" style="margin-bottom:10px" class="form-control @error('emailParticipante') is-invalid @enderror" name="emailParticipante[]" placeholder="email" required> <input type="email" style="margin-bottom:10px" class="form-control @error('emailParticipante') is-invalid @enderror" name="emailParticipante[]" placeholder="email" required value="{{old('emailParticipante.'.$i)}}">
@error('emailParticipante') @error('emailParticipante')
<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>
...@@ -293,7 +296,7 @@ ...@@ -293,7 +296,7 @@
<select class="form-control @error('funcaoParticipante') is-invalid @enderror" name="funcaoParticipante[]" id="funcaoParticipante"> <select class="form-control @error('funcaoParticipante') is-invalid @enderror" name="funcaoParticipante[]" id="funcaoParticipante">
<option value="" disabled selected hidden>-- Função --</option> <option value="" disabled selected hidden>-- Função --</option>
@foreach($funcaoParticipantes as $funcaoParticipante) @foreach($funcaoParticipantes as $funcaoParticipante)
<option value="{{$funcaoParticipante->id}}">{{$funcaoParticipante->nome}}</option> <option @if(old('funcaoParticipante.'.$i)==$funcaoParticipante->id ) selected @endif value="{{$funcaoParticipante->id}}">{{$funcaoParticipante->nome}}</option>
@endforeach @endforeach
@error('funcaoParticipante') @error('funcaoParticipante')
...@@ -311,7 +314,7 @@ ...@@ -311,7 +314,7 @@
<div class="row"> <div class="row">
<div class="col-sm-4"> <div class="col-sm-4">
<label>Titulo* </label> <label>Titulo* </label>
<input type="text" style="margin-bottom:10px" class="form-control @error('nomePlanoTrabalho') is-invalid @enderror" name="nomePlanoTrabalho[]" placeholder="Nome" required> <input type="text" style="margin-bottom:10px" class="form-control @error('nomePlanoTrabalho') is-invalid @enderror" name="nomePlanoTrabalho[]" placeholder="Nome" required value="{{old('nomePlanoTrabalho.'.$i)}}">
@error('nomePlanoTrabalho') @error('nomePlanoTrabalho')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block"> <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
...@@ -611,5 +614,7 @@ ...@@ -611,5 +614,7 @@
$('#subArea').html(option).show(); $('#subArea').html(option).show();
}) })
} }
window.onload = areas();
</script> </script>
@endsection @endsection
\ No newline at end of file
resources/views/index.blade.php
View file @ beed2694
...@@ -46,67 +46,6 @@ ...@@ -46,67 +46,6 @@
</div> </div>
</li> </li>
@endforeach @endforeach
@foreach ($eventos as $evento)
<li class="li-editais">
<div class="container">
<div class="row">
<div class="col-sm-1">
<img class="img-arquivo" src="{{ asset('img/icons/logo_arquivo.png') }}" alt="">
</div>
<div class="col-sm-8">
<div>{{$evento->nome}}</div>
<div class="color-subtitle-edital">Submissão até o dia {{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}</div>
</div>
<div class="col-sm-3">
<button class="btn btn-opcoes-edital" style="margin-left: 15px;">
Opções
</button>
</div>
</div>
</div>
</li>
@endforeach
@foreach ($eventos as $evento)
<li class="li-editais">
<div class="container">
<div class="row">
<div class="col-sm-1">
<img class="img-arquivo" src="{{ asset('img/icons/logo_arquivo.png') }}" alt="">
</div>
<div class="col-sm-8">
<div>{{$evento->nome}}</div>
<div class="color-subtitle-edital">Submissão até o dia {{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}</div>
</div>
<div class="col-sm-3">
<button class="btn btn-opcoes-edital" style="margin-left: 15px;">
Opções
</button>
</div>
</div>
</div>
</li>
@endforeach
@foreach ($eventos as $evento)
<li class="li-editais">
<div class="container">
<div class="row">
<div class="col-sm-1">
<img class="img-arquivo" src="{{ asset('img/icons/logo_arquivo.png') }}" alt="">
</div>
<div class="col-sm-8">
<div>{{$evento->nome}}</div>
<div class="color-subtitle-edital">Submissão até o dia {{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}</div>
</div>
<div class="col-sm-3">
<button class="btn btn-opcoes-edital" style="margin-left: 15px;">
Opções
</button>
</div>
</div>
</div>
</li>
@endforeach
</ul>
</div> </div>
</div> </div>
</div> </div>
......
resources/views/projeto/editar.blade.php
View file @ beed2694
...@@ -320,50 +320,50 @@ ...@@ -320,50 +320,50 @@
<h5>Dados do plano de trabalho</h5> <h5>Dados do plano de trabalho</h5>
@foreach ($arquivos as $arquivo) @foreach ($arquivos as $arquivo)
@if($arquivo->participanteId === $participante->id) @if($arquivo->participanteId === $participante->id)
<a href="{{ route('baixar.plano', ['id' => $arquivo->id]) }}">Plano de trabalho atual</a> <a href="{{ route('baixar.plano', ['id' => $arquivo->id]) }}">Plano de trabalho atual</a>
@endif <div class="row">
@endforeach <div class="col-sm-12">
<div class="row"> <div id="planoTrabalho">
<div class="col-sm-12"> <div class="row">
<div id="planoTrabalho"> <div class="col-sm-4">
<div class="row"> <label>Titulo </label>
<div class="col-sm-4"> <input type="text" value="{{$arquivo->titulo}}" style="margin-bottom:10px" class="form-control @error('nomePlanoTrabalho') is-invalid @enderror" name="nomePlanoTrabalho[]" placeholder="Nome">
<label>Titulo </label>
<input type="text" style="margin-bottom:10px" class="form-control @error('nomePlanoTrabalho') is-invalid @enderror" name="nomePlanoTrabalho[]" placeholder="Nome"> @error('nomePlanoTrabalho')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
@error('nomePlanoTrabalho') <strong>{{ $message }}</strong>
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block"> </span>
<strong>{{ $message }}</strong> @enderror
</span> </div>
@enderror {{-- Arquivo --}}
</div> <div class="col-sm-7">
{{-- Arquivo --}} <label for="nomeTrabalho">Anexo</label>
<div class="col-sm-7"> <div class="input-group">
<label for="nomeTrabalho">Anexo</label> <div class="input-group-prepend">
<div class="input-group"> <span class="input-group-text" id="anexoPlanoTrabalho">Selecione um arquivo:</span>
<div class="input-group-prepend"> </div>
<span class="input-group-text" id="anexoPlanoTrabalho">Selecione um arquivo:</span> <div class="custom-file">
</div> <input type="file" class="custom-file-input @error('anexoPlanoTrabalho') is-invalid @enderror" id="anexoPlanoTrabalho" aria-describedby="anexoPlanoTrabalho" name="anexoPlanoTrabalho[]">
<div class="custom-file"> <label class="custom-file-label" id="custom-file-label" for="inputGroupFile01">O arquivo deve ser no formato PDF de até 2mb.</label>
<input type="file" class="custom-file-input @error('anexoPlanoTrabalho') is-invalid @enderror" id="anexoPlanoTrabalho" aria-describedby="anexoPlanoTrabalho" name="anexoPlanoTrabalho[]"> </div>
<label class="custom-file-label" id="custom-file-label" for="inputGroupFile01">O arquivo deve ser no formato PDF de até 2mb.</label>
</div> </div>
@error('anexoPlanoTrabalho')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
<div class="col-sm-1">
<a class="delete">
<img src="/img/icons/user-times-solid.svg" style="width:25px;margin-top:35px">
</a>
</div> </div>
@error('anexoPlanoTrabalho')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
<div class="col-sm-1">
<a class="delete">
<img src="/img/icons/user-times-solid.svg" style="width:25px;margin-top:35px">
</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> @endif
@endforeach
</div> </div>
@endif @endif
@endforeach @endforeach
......
resources/views/proponente/index.blade.php
View file @ beed2694
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
</a> </a>
</div> </div>
<div class="col-sm-3 d-flex justify-content-center"> {{-- <div class="col-sm-3 d-flex justify-content-center">
<a href="#" style="text-decoration:none; color: inherit;"> <a href="#" style="text-decoration:none; color: inherit;">
<div class="card text-center " style="border-radius: 30px; width: 13rem;height: 15rem;"> <div class="card text-center " style="border-radius: 30px; width: 13rem;height: 15rem;">
<div class="card-body d-flex justify-content-center"> <div class="card-body d-flex justify-content-center">
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
</div> </div>
</a> </a>
</div> </div> --}}
</div> </div>
</div> </div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment