Skip to content

GitLab

Commit dd7e00a6 authored by carlos's avatar carlos
Browse files

correcoes

parent 490fc4da
master beta carl-branch carlos dependabot/composer/dompdf/dompdf-1.2.2 dependabot/composer/guzzlehttp/guzzle-6.5.8 dependabot/composer/guzzlehttp/psr7-1.8.5 dependabot/composer/symfony/http-kernel-4.4.50 dependabot/npm_and_yarn/axios-0.21.2 dependabot/npm_and_yarn/decode-uri-component-0.2.2 dependabot/npm_and_yarn/express-4.18.2 dependabot/npm_and_yarn/json5-and-json5-2.2.3 dependabot/npm_and_yarn/loader-utils-and-webpack-cli-1.4.2 dependabot/npm_and_yarn/minimist-and-mkdirp-1.2.8 dependabot/npm_and_yarn/qs-and-express-6.11.0 editarProjeto excluir_projeto_submetido fixCorrecoes fixQtdParticipante fixRascunho master-test minha_conta modificacoes_aviso modificacoes_layout_6 modificacoes_layout_7 modificacoes_layout_8 modificacoes_layout_9 modificacoes_layout_igor modificacoes_layout_minha_conta modificacoes_perfil_avaliador updates_mar
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 38 additions and 103 deletions
+38 -103
composer.lock
View file @ dd7e00a6
......@@ -1831,7 +1831,7 @@
},
{
"name": "symfony/console",
"version": "v4.4.9",
"version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
......@@ -1908,7 +1908,7 @@
},
{
"name": "symfony/css-selector",
"version": "v5.1.0",
"version": "v5.1.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
......@@ -1961,7 +1961,7 @@
},
{
"name": "symfony/debug",
"version": "v4.4.9",
"version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
......@@ -2018,7 +2018,7 @@
},
{
"name": "symfony/error-handler",
"version": "v4.4.9",
"version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
......@@ -2075,7 +2075,7 @@
},
{
"name": "symfony/event-dispatcher",
"version": "v4.4.9",
"version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
......@@ -2203,7 +2203,7 @@
},
{
"name": "symfony/finder",
"version": "v4.4.9",
"version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
......@@ -2252,7 +2252,7 @@
},
{
"name": "symfony/http-foundation",
"version": "v4.4.9",
"version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
......@@ -2307,16 +2307,16 @@
},
{
"name": "symfony/http-kernel",
"version": "v4.4.9",
"version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "54526b598d7fc86a67850488b194a88a79ab8467"
"reference": "81d42148474e1852a333ed7a732f2a014af75430"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/54526b598d7fc86a67850488b194a88a79ab8467",
"reference": "54526b598d7fc86a67850488b194a88a79ab8467",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/81d42148474e1852a333ed7a732f2a014af75430",
"reference": "81d42148474e1852a333ed7a732f2a014af75430",
"shasum": ""
},
"require": {
......@@ -2394,20 +2394,20 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2020-05-31T05:25:51+00:00"
"time": "2020-06-12T11:15:37+00:00"
},
{
"name": "symfony/mime",
"version": "v5.1.0",
"version": "v5.1.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "56261f89385f9d13cf843a5101ac72131190bc91"
"reference": "c0c418f05e727606e85b482a8591519c4712cf45"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/56261f89385f9d13cf843a5101ac72131190bc91",
"reference": "56261f89385f9d13cf843a5101ac72131190bc91",
"url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45",
"reference": "c0c418f05e727606e85b482a8591519c4712cf45",
"shasum": ""
},
"require": {
......@@ -2457,7 +2457,7 @@
"mime",
"mime-type"
],
"time": "2020-05-25T12:33:44+00:00"
"time": "2020-06-09T15:07:35+00:00"
},
{
"name": "symfony/polyfill-ctype",
......@@ -2874,7 +2874,7 @@
},
{
"name": "symfony/process",
"version": "v4.4.9",
"version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
......@@ -2923,7 +2923,7 @@
},
{
"name": "symfony/routing",
"version": "v4.4.9",
"version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
......@@ -3057,7 +3057,7 @@
},
{
"name": "symfony/translation",
"version": "v4.4.9",
"version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
......@@ -3190,7 +3190,7 @@
},
{
"name": "symfony/var-dumper",
"version": "v4.4.9",
"version": "v4.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
......
config/app.php
View file @ dd7e00a6
......@@ -67,7 +67,7 @@ return [
|
*/
'timezone' => 'UTC',
'timezone' => 'America/Recife',
/*
|--------------------------------------------------------------------------
......@@ -80,7 +80,7 @@ return [
|
*/
'locale' => 'en',
'locale' => 'pt-BR',
/*
|--------------------------------------------------------------------------
......@@ -93,7 +93,7 @@ return [
|
*/
'fallback_locale' => 'en',
'fallback_locale' => 'pt-BR',
/*
|--------------------------------------------------------------------------
......
database/migrations/2020_05_23_054945_create_participantes_table.php
View file @ dd7e00a6
......@@ -24,7 +24,7 @@ class CreateParticipantesTable extends Migration
$table->foreign('trabalho_id')->references('id')->on('trabalhos');
$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();
});
......
database/seeds/FuncaoParticipanteSeeder.php
View file @ dd7e00a6
......@@ -31,10 +31,6 @@ class FuncaoParticipanteSeeder extends Seeder
]);
DB::table('funcao_participantes')->insert([
'nome'=>'Estudante',
]);
DB::table('funcao_participantes')->insert([
'nome'=>'Voluntário',
......
resources/views/administrador/editar_user.blade.php
View file @ dd7e00a6
......@@ -104,7 +104,7 @@
</span>
@enderror --}}
@if ($user->tipo == "proponente")
@if ($user->tipo == "proponente" && !(is_null($proponente)))
<div id="proponente" style="display: none;">
<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">
......@@ -158,7 +158,7 @@
<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>
<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>
<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 @ dd7e00a6
......@@ -47,15 +47,15 @@
</div>
</a>
</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;">
<div class="card text-center " style="border-radius: 31px; width: 13rem;height: 15rem;">
<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>
</a>
</div>
</div> --}}
</div>
......
resources/views/administrador/usersAdmin.blade.php
View file @ dd7e00a6
......@@ -7,7 +7,7 @@
<div class="container" >
<div class="row" >
<div class="col-sm-10">
<h3>Editais</h3>
<h3>Usuários</h3>
</div>
<div class="col-sm-2">
<a href="{{route('admin.user.create')}}" class="btn btn-primary">{{ __('Criar usuário') }}</a>
......
resources/views/evento/criarEvento.blade.php
View file @ dd7e00a6
......@@ -82,7 +82,7 @@
</select>
</div>
</div>
<hr>
<div class="row subtitulo">
<div class="col-sm-12">
<p>Projetos</p>
......@@ -148,7 +148,7 @@
@enderror
</div>
</div>
<hr>
<div class="row subtitulo">
<div class="col-sm-12">
<p>Documentos</p>
......@@ -159,9 +159,9 @@
<div class="row justify-content-center" style="margin-top:10px">
<div class="col-sm-6">
<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">
<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')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
......@@ -174,7 +174,7 @@
<div class="form-group">
<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">
<small>O arquivo selecionado deve ter até xmb.</small>
<small>O arquivo selecionado deve ter até 2mb.</small>
@error('modeloDocumento')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
......
resources/views/index.blade.php
View file @ dd7e00a6
......@@ -46,67 +46,6 @@
</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
@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>
......
resources/views/proponente/index.blade.php
View file @ dd7e00a6
......@@ -27,7 +27,7 @@
</div>
</a>
</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;">
<div class="card text-center " style="border-radius: 30px; width: 13rem;height: 15rem;">
<div class="card-body d-flex justify-content-center">
......@@ -35,7 +35,7 @@
</div>
</div>
</a>
</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