Skip to content

GitLab

Commit 989e985e authored by Gabriel-31415's avatar Gabriel-31415
Browse files

merged carlos

parents 39fa8693 4b127467
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 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
Hide whitespace changes
Inline Side-by-side
Showing
with 38 additions and 13 deletions
+38 -13
app/Http/Controllers/TrabalhoController.php
View file @ 989e985e
No preview for this file type
database/seeds/SubAreaSeeder.php
View file @ 989e985e
......@@ -1404,4 +1404,6 @@ class SubAreaSeeder extends Seeder
]);
}
}
resources/lang/pt-BR/validation.php
View file @ 989e985e
......@@ -12,7 +12,7 @@ return [
*/
'accepted' => ':Attribute deve ser aceito.',
'active_url' => ':Attribute não é uma URL válida.',
'after' => ':Attribute deve ser uma data depois de ',
'after' => ':Attribute deve ser uma data depois de :date',
'after_or_equal' => ':attribute deve ser uma data posterior ou igual a:date.',
'alpha' => ':Attribute deve conter somente letras.',
'alpha_dash' => ':Attribute deve conter letras, números e traços.',
......
resources/views/emails/submissaoTrabalho.blade.php
View file @ 989e985e
......@@ -8,7 +8,14 @@
@if($user->proponentes->id == $trabalho->proponente_id)
{{-- Usuario proponente--}}
<h2>Olá, {{ $user->name }} </h2>
<h4>Seu trabalho {{ $trabalho->titulo }} foi submetido com sucesso no Edital {{ $evento->nome }} </h4>
<br>
<h4>Seu projeto intitulado {{ $trabalho->titulo }} foi submetido com sucesso ao Edital {{ $evento->nome }} </h4>
<br>
<h4>
Atenciosamente,
<br>
Equipe submeta.
</h4>
@endif
@else
{{-- Usuario participante--}}
......
resources/views/evento/criarEvento.blade.php
View file @ 989e985e
......@@ -102,7 +102,17 @@
@error('inicioSubmissao')
<span class="invalid-feedback" role="alert">
<strong>{{ $message . date('d/m/Y', strtotime($ontem ?? '')) . '.' }}</strong>
<strong>
@if ($message != null)
@for ($i = 0; $i < 9; $i++)
@if ($i < 8)
{{ explode(" ", $message)[$i] }}
@else
{{ date('d/m/Y', strtotime(explode(" ", $message)[$i])) }}
@endif
@endfor
@endif
</strong>
</span>
@enderror
</div>
......@@ -112,7 +122,7 @@
@error('fimSubmissao')
<span class="invalid-feedback" role="alert">
<strong>{{ $message . date('d/m/Y', strtotime(old('inicioSubmissao'))) . '.' }}</strong>
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
......@@ -125,7 +135,7 @@
@error('inicioRevisao')
<span class="invalid-feedback" role="alert">
<strong>{{ $message . date('d/m/Y', strtotime($ontem ?? '')) . '.' }}</strong>
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
......@@ -135,7 +145,7 @@
@error('fimRevisao')
<span class="invalid-feedback" role="alert">
<strong>{{ $message . date('d/m/Y', strtotime( old('inicioRevisao') )) . '.' }}</strong>
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
......@@ -148,7 +158,7 @@
@error('resultado_preliminar')
<span class="invalid-feedback" role="alert">
<strong>{{ $message . date('d/m/Y', strtotime($ontem ?? '')) . '.' }}</strong>
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
......@@ -158,7 +168,7 @@
@error('inicio_recurso')
<span class="invalid-feedback" role="alert">
<strong>{{ $message . date('d/m/Y', strtotime($ontem ?? '')) . '.' }}</strong>
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
......@@ -171,7 +181,7 @@
@error('fim_recurso')
<span class="invalid-feedback" role="alert">
<strong>{{ $message . date('d/m/Y', strtotime($ontem ?? '')) . '.' }}</strong>
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
......@@ -182,7 +192,7 @@
@error('resultado_final')
<span class="invalid-feedback" role="alert">
<strong>{{ $message . date('d/m/Y', strtotime($ontem ?? '')) . '.' }}</strong>
<strong>{{ $message }}</strong>
</span>
@enderror
</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