From dd7e00a62d1aa5b34e3274337db7461feef25844 Mon Sep 17 00:00:00 2001 From: carlos Date: Fri, 12 Jun 2020 12:45:34 -0300 Subject: [PATCH] correcoes --- composer.lock | 42 ++++++------- config/app.php | 6 +- ...5_23_054945_create_participantes_table.php | 2 +- database/seeds/FuncaoParticipanteSeeder.php | 4 -- .../views/administrador/editar_user.blade.php | 4 +- resources/views/administrador/index.blade.php | 6 +- .../views/administrador/usersAdmin.blade.php | 2 +- resources/views/evento/criarEvento.blade.php | 10 +-- resources/views/index.blade.php | 61 ------------------- resources/views/proponente/index.blade.php | 4 +- 10 files changed, 38 insertions(+), 103 deletions(-) diff --git a/composer.lock b/composer.lock index e1996fe..ddf6993 100644 --- a/composer.lock +++ b/composer.lock @@ -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", diff --git a/config/app.php b/config/app.php index c9960cd..3c45c54 100644 --- a/config/app.php +++ b/config/app.php @@ -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', /* |-------------------------------------------------------------------------- diff --git a/database/migrations/2020_05_23_054945_create_participantes_table.php b/database/migrations/2020_05_23_054945_create_participantes_table.php index b944cc5..88cb893 100644 --- a/database/migrations/2020_05_23_054945_create_participantes_table.php +++ b/database/migrations/2020_05_23_054945_create_participantes_table.php @@ -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(); }); diff --git a/database/seeds/FuncaoParticipanteSeeder.php b/database/seeds/FuncaoParticipanteSeeder.php index 252de37..9fd486b 100644 --- a/database/seeds/FuncaoParticipanteSeeder.php +++ b/database/seeds/FuncaoParticipanteSeeder.php @@ -31,10 +31,6 @@ class FuncaoParticipanteSeeder extends Seeder ]); - DB::table('funcao_participantes')->insert([ - 'nome'=>'Estudante', - - ]); DB::table('funcao_participantes')->insert([ 'nome'=>'Voluntário', diff --git a/resources/views/administrador/editar_user.blade.php b/resources/views/administrador/editar_user.blade.php index 4610305..a096a85 100644 --- a/resources/views/administrador/editar_user.blade.php +++ b/resources/views/administrador/editar_user.blade.php @@ -104,7 +104,7 @@ @enderror --}} - @if ($user->tipo == "proponente") + @if ($user->tipo == "proponente" && !(is_null($proponente))) -
+ {{--
-

Mensangens

+

Mensagens

 -
+
--}} diff --git a/resources/views/administrador/usersAdmin.blade.php b/resources/views/administrador/usersAdmin.blade.php index ae39681..ed4684c 100644 --- a/resources/views/administrador/usersAdmin.blade.php +++ b/resources/views/administrador/usersAdmin.blade.php @@ -7,7 +7,7 @@
-

Editais

+

Usuários

{{ __('Criar usuário') }} diff --git a/resources/views/evento/criarEvento.blade.php b/resources/views/evento/criarEvento.blade.php index 5596aa6..d39840c 100644 --- a/resources/views/evento/criarEvento.blade.php +++ b/resources/views/evento/criarEvento.blade.php @@ -82,7 +82,7 @@
- +

Projetos

@@ -148,7 +148,7 @@ @enderror
- +

Documentos

@@ -159,9 +159,9 @@
- + - O arquivo selecionado deve ser no formato PDF de até xmb. + O arquivo selecionado deve ser no formato PDF de até 2mb. @error('pdfEdital') {{ $message }} @@ -174,7 +174,7 @@
- O arquivo selecionado deve ter até xmb. + O arquivo selecionado deve ter até 2mb. @error('modeloDocumento') {{ $message }} diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 04ee919..e1c4ef2 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -46,67 +46,6 @@
@endforeach - @foreach ($eventos as $evento) -
  • -
    -
    -
    - -
    -
    -
    {{$evento->nome}}
    -
    Submissão até o dia {{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}
    -
    -
    - -
    -
    -
    -
    • - @endforeach - @foreach ($eventos as $evento) -
  • -
    -
    -
    - -
    -
    -
    {{$evento->nome}}
    -
    Submissão até o dia {{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}
    -
    -
    - -
    -
    -
    -
    • - @endforeach - @foreach ($eventos as $evento) -
  • -
    -
    -
    - -
    -
    -
    {{$evento->nome}}
    -
    Submissão até o dia {{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}
    -
    -
    - -
    -
    -
    -
    • - @endforeach -
    diff --git a/resources/views/proponente/index.blade.php b/resources/views/proponente/index.blade.php index 09594eb..682a3b4 100644 --- a/resources/views/proponente/index.blade.php +++ b/resources/views/proponente/index.blade.php @@ -27,7 +27,7 @@
    -
    + {{--
    @@ -35,7 +35,7 @@
    -
    +
    --}}
    -- GitLab