Skip to content

GitLab

"git@sites.upe.br:walter.felipe/submeta.git" did not exist on "a3454bee44cebfc1eb973dc8810ed8b13276d88b"
Commit 6afb8fb7 authored by Gabriel-31415's avatar Gabriel-31415
Browse files

conflict resolved

parents b2538c9c ff70569f
Hide whitespace changes
Inline Side-by-side
README.md
View file @ 6afb8fb7
# EventosCientificos_ModuloTrabalhos <a href="http://app.uag.ufrpe.br/submeta/" target="_blank"><img src="http://app.uag.ufrpe.br/submeta/img/icons/logo_submeta_pemenor.png"><a>
app/Http/Controllers/TrabalhoController.php
View file @ 6afb8fb7
...@@ -33,6 +33,7 @@ use App\Mail\SubmissaoTrabalho; ...@@ -33,6 +33,7 @@ use App\Mail\SubmissaoTrabalho;
use App\Mail\EventoCriado; use App\Mail\EventoCriado;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
use App\OutrasInfoParticipante;
class TrabalhoController extends Controller class TrabalhoController extends Controller
{ {
...@@ -45,7 +46,7 @@ class TrabalhoController extends Controller ...@@ -45,7 +46,7 @@ class TrabalhoController extends Controller
{ {
$edital = Evento::find($id); $edital = Evento::find($id);
$grandeAreas = GrandeArea::orderBy('nome')->get(); $grandeAreas = GrandeArea::orderBy('nome')->get();
$funcaoParticipantes = FuncaoParticipantes::all(); $funcaoParticipantes = FuncaoParticipantes::orderBy('nome')->get();
$proponente = Proponente::where('user_id', Auth::user()->id)->first(); $proponente = Proponente::where('user_id', Auth::user()->id)->first();
if($proponente == null){ if($proponente == null){
...@@ -61,7 +62,8 @@ class TrabalhoController extends Controller ...@@ -61,7 +62,8 @@ class TrabalhoController extends Controller
'edital' => $edital, 'edital' => $edital,
'grandeAreas' => $grandeAreas, 'grandeAreas' => $grandeAreas,
'funcaoParticipantes'=> $funcaoParticipantes, 'funcaoParticipantes'=> $funcaoParticipantes,
'rascunho' => $rascunho 'rascunho' => $rascunho,
'enum_turno' => OutrasInfoParticipante::ENUM_TURNO
]); ]);
} }
...@@ -82,7 +84,7 @@ class TrabalhoController extends Controller ...@@ -82,7 +84,7 @@ class TrabalhoController extends Controller
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function store(Request $request){ public function store(Request $request){
// dd($request->all()); dd($request);
$mytime = Carbon::now('America/Recife'); $mytime = Carbon::now('America/Recife');
$mytime = $mytime->toDateString(); $mytime = $mytime->toDateString();
$evento = Evento::find($request->editalId); $evento = Evento::find($request->editalId);
...@@ -128,10 +130,10 @@ class TrabalhoController extends Controller ...@@ -128,10 +130,10 @@ class TrabalhoController extends Controller
'anexoComiteEtica' => [($request->anexoComitePreenchido!=='sim'&&$request->anexoJustificativaPreenchido!=='sim'?'required_without:justificativaAutorizacaoEtica':''), 'file', 'mimes:pdf', 'max:2048'], 'anexoComiteEtica' => [($request->anexoComitePreenchido!=='sim'&&$request->anexoJustificativaPreenchido!=='sim'?'required_without:justificativaAutorizacaoEtica':''), 'file', 'mimes:pdf', 'max:2048'],
'justificativaAutorizacaoEtica' => [($request->anexoJustificativaPreenchido!=='sim'&&$request->anexoComitePreenchido!=='sim'?'required_without:anexoComiteEtica':''), 'file', 'mimes:pdf', 'max:2048'], 'justificativaAutorizacaoEtica' => [($request->anexoJustificativaPreenchido!=='sim'&&$request->anexoComitePreenchido!=='sim'?'required_without:anexoComiteEtica':''), 'file', 'mimes:pdf', 'max:2048'],
'anexoLattesCoordenador' => [($request->anexoLattesPreenchido!=='sim'?'required': ''), 'file', 'mimes:pdf', 'max:2048'], 'anexoLattesCoordenador' => [($request->anexoLattesPreenchido!=='sim'?'required': ''), 'file', 'mimes:pdf', 'max:2048'],
'anexoPlanilha' => [($request->anexoPlanilhaPreenchido!=='sim'?'required':''), 'file', 'mimes:pdf,xls,xlsx', 'max:2048'], 'anexoPlanilha' => [($request->anexoPlanilhaPreenchido!=='sim'?'required':''), 'file', 'mimes:xls,xlsx,ods', 'max:2048'],
'anexoPlanoTrabalho.*' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], 'anexoPlanoTrabalho.*' => ['nullable', 'file', 'mimes:pdf', 'max:2048'],
]); ]);
if(gettype($this->validarAnexosRascunho($request, $trabalho)) != 'integer'){ if(gettype($this->validarAnexosRascunho($request, $trabalho)) != 'integer'){
return $this->validarAnexosRascunho($request, $trabalho); return $this->validarAnexosRascunho($request, $trabalho);
} }
...@@ -175,7 +177,7 @@ class TrabalhoController extends Controller ...@@ -175,7 +177,7 @@ class TrabalhoController extends Controller
'nomePlanoTrabalho.*' => ['nullable', 'string'], 'nomePlanoTrabalho.*' => ['nullable', 'string'],
'anexoProjeto' => [($request->anexoProjetoPreenchido!=='sim'?'required':''), 'file', 'mimes:pdf', 'max:2048'], 'anexoProjeto' => [($request->anexoProjetoPreenchido!=='sim'?'required':''), 'file', 'mimes:pdf', 'max:2048'],
'anexoLattesCoordenador' => [($request->anexoLattesPreenchido!=='sim'?'required':''), 'file', 'mimes:pdf', 'max:2048'], 'anexoLattesCoordenador' => [($request->anexoLattesPreenchido!=='sim'?'required':''), 'file', 'mimes:pdf', 'max:2048'],
'anexoPlanilha' => [($request->anexoPlanilhaPreenchido!=='sim'?'required':''), 'file', 'mimes:pdf,xls,xlsx', 'max:2048'], 'anexoPlanilha' => [($request->anexoPlanilhaPreenchido!=='sim'?'required':''), 'file', 'mimes:xls,xlsx,ods', 'max:2048'],
'anexoPlanoTrabalho.*' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], 'anexoPlanoTrabalho.*' => ['nullable', 'file', 'mimes:pdf', 'max:2048'],
]); ]);
......
app/OutrasInfoParticipante.php 0 → 100644
View file @ 6afb8fb7
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class OutrasInfoParticipante extends Model
{
protected $fillable = ['name', 'user_id', 'trabalho_id', 'participante_id'];
public const ENUM_TURNO = ['Matutino', 'Vespertino', 'Noturno', 'Integral'];
}
composer.lock
View file @ 6afb8fb7
...@@ -636,16 +636,16 @@ ...@@ -636,16 +636,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v6.20.24", "version": "v6.20.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "addc44fce390c783b2dee0d617300dce97e895f4" "reference": "0117d797dc1ab64b1f88d4f6b966380ea7def091"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/addc44fce390c783b2dee0d617300dce97e895f4", "url": "https://api.github.com/repos/laravel/framework/zipball/0117d797dc1ab64b1f88d4f6b966380ea7def091",
"reference": "addc44fce390c783b2dee0d617300dce97e895f4", "reference": "0117d797dc1ab64b1f88d4f6b966380ea7def091",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -785,7 +785,7 @@ ...@@ -785,7 +785,7 @@
"issues": "https://github.com/laravel/framework/issues", "issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework" "source": "https://github.com/laravel/framework"
}, },
"time": "2021-04-20T13:46:19+00:00" "time": "2021-04-28T14:38:32+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
...@@ -911,16 +911,16 @@ ...@@ -911,16 +911,16 @@
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
"version": "1.5.8", "version": "1.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/commonmark.git", "url": "https://github.com/thephpleague/commonmark.git",
"reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf" "reference": "19a9673b833cc37770439097b381d86cd125bfe8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf", "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/19a9673b833cc37770439097b381d86cd125bfe8",
"reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf", "reference": "19a9673b833cc37770439097b381d86cd125bfe8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1008,7 +1008,7 @@ ...@@ -1008,7 +1008,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-28T18:51:39+00:00" "time": "2021-05-01T19:00:49+00:00"
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
...@@ -1259,16 +1259,16 @@ ...@@ -1259,16 +1259,16 @@
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.46.0", "version": "2.47.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4" "reference": "606262fd8888b75317ba9461825a24fc34001e1e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/606262fd8888b75317ba9461825a24fc34001e1e",
"reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4", "reference": "606262fd8888b75317ba9461825a24fc34001e1e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1348,20 +1348,20 @@ ...@@ -1348,20 +1348,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-02-24T17:30:44+00:00" "time": "2021-04-13T21:54:02+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v4.10.4", "version": "v4.10.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e" "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
"reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e", "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1402,9 +1402,9 @@ ...@@ -1402,9 +1402,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/nikic/PHP-Parser/issues", "issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4" "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
}, },
"time": "2020-12-20T10:01:03+00:00" "time": "2021-05-03T19:11:20+00:00"
}, },
{ {
"name": "opis/closure", "name": "opis/closure",
...@@ -1693,16 +1693,16 @@ ...@@ -1693,16 +1693,16 @@
}, },
{ {
"name": "psr/log", "name": "psr/log",
"version": "1.1.3", "version": "1.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/log.git", "url": "https://github.com/php-fig/log.git",
"reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
"reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1726,7 +1726,7 @@ ...@@ -1726,7 +1726,7 @@
"authors": [ "authors": [
{ {
"name": "PHP-FIG", "name": "PHP-FIG",
"homepage": "http://www.php-fig.org/" "homepage": "https://www.php-fig.org/"
} }
], ],
"description": "Common interface for logging libraries", "description": "Common interface for logging libraries",
...@@ -1737,9 +1737,9 @@ ...@@ -1737,9 +1737,9 @@
"psr-3" "psr-3"
], ],
"support": { "support": {
"source": "https://github.com/php-fig/log/tree/1.1.3" "source": "https://github.com/php-fig/log/tree/1.1.4"
}, },
"time": "2020-03-23T09:12:05+00:00" "time": "2021-05-03T11:20:27+00:00"
}, },
{ {
"name": "psr/simple-cache", "name": "psr/simple-cache",
...@@ -2081,16 +2081,16 @@ ...@@ -2081,16 +2081,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v4.4.21", "version": "v4.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "1ba4560dbbb9fcf5ae28b61f71f49c678086cf23" "reference": "36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/1ba4560dbbb9fcf5ae28b61f71f49c678086cf23", "url": "https://api.github.com/repos/symfony/console/zipball/36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625",
"reference": "1ba4560dbbb9fcf5ae28b61f71f49c678086cf23", "reference": "36bbd079b69b94bcc9c9c9e1e37ca3b1e7971625",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2150,7 +2150,7 @@ ...@@ -2150,7 +2150,7 @@
"description": "Eases the creation of beautiful and testable command line interfaces", "description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/console/tree/v4.4.21" "source": "https://github.com/symfony/console/tree/v4.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -2166,20 +2166,20 @@ ...@@ -2166,20 +2166,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-26T09:23:24+00:00" "time": "2021-04-16T17:32:19+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v5.2.4", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/css-selector.git",
"reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f" "reference": "59a684f5ac454f066ecbe6daecce6719aed283fb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/f65f217b3314504a1ec99c2d6ef69016bb13490f", "url": "https://api.github.com/repos/symfony/css-selector/zipball/59a684f5ac454f066ecbe6daecce6719aed283fb",
"reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f", "reference": "59a684f5ac454f066ecbe6daecce6719aed283fb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2215,7 +2215,7 @@ ...@@ -2215,7 +2215,7 @@
"description": "Converts CSS selectors to XPath expressions", "description": "Converts CSS selectors to XPath expressions",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/css-selector/tree/v5.2.4" "source": "https://github.com/symfony/css-selector/tree/v5.3.0-BETA1"
}, },
"funding": [ "funding": [
{ {
...@@ -2231,20 +2231,20 @@ ...@@ -2231,20 +2231,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-27T10:01:46+00:00" "time": "2021-04-07T16:07:52+00:00"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v4.4.20", "version": "v4.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
"reference": "157bbec4fd773bae53c5483c50951a5530a2cc16" "reference": "45b2136377cca5f10af858968d6079a482bca473"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/157bbec4fd773bae53c5483c50951a5530a2cc16", "url": "https://api.github.com/repos/symfony/debug/zipball/45b2136377cca5f10af858968d6079a482bca473",
"reference": "157bbec4fd773bae53c5483c50951a5530a2cc16", "reference": "45b2136377cca5f10af858968d6079a482bca473",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2284,7 +2284,7 @@ ...@@ -2284,7 +2284,7 @@
"description": "Provides tools to ease debugging PHP code", "description": "Provides tools to ease debugging PHP code",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/debug/tree/v4.4.20" "source": "https://github.com/symfony/debug/tree/v4.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -2300,7 +2300,7 @@ ...@@ -2300,7 +2300,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-28T16:54:48+00:00" "time": "2021-04-02T07:50:12+00:00"
}, },
{ {
"name": "symfony/deprecation-contracts", "name": "symfony/deprecation-contracts",
...@@ -2371,16 +2371,16 @@ ...@@ -2371,16 +2371,16 @@
}, },
{ {
"name": "symfony/error-handler", "name": "symfony/error-handler",
"version": "v4.4.21", "version": "v4.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/error-handler.git", "url": "https://github.com/symfony/error-handler.git",
"reference": "48e81a375525872e788c2418430f54150d935810" "reference": "76603a8df8e001436df80758eb03a8baa5324175"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/48e81a375525872e788c2418430f54150d935810", "url": "https://api.github.com/repos/symfony/error-handler/zipball/76603a8df8e001436df80758eb03a8baa5324175",
"reference": "48e81a375525872e788c2418430f54150d935810", "reference": "76603a8df8e001436df80758eb03a8baa5324175",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2420,7 +2420,7 @@ ...@@ -2420,7 +2420,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code", "description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/error-handler/tree/v4.4.21" "source": "https://github.com/symfony/error-handler/tree/v4.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -2436,7 +2436,7 @@ ...@@ -2436,7 +2436,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-08T10:28:40+00:00" "time": "2021-04-02T07:50:12+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
...@@ -2741,16 +2741,16 @@ ...@@ -2741,16 +2741,16 @@
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v4.4.20", "version": "v4.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
"reference": "02d968647fe61b2f419a8dc70c468a9d30a48d3a" "reference": "1a6f87ef99d05b1bf5c865b4ef7992263e1cb081"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/02d968647fe61b2f419a8dc70c468a9d30a48d3a", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1a6f87ef99d05b1bf5c865b4ef7992263e1cb081",
"reference": "02d968647fe61b2f419a8dc70c468a9d30a48d3a", "reference": "1a6f87ef99d05b1bf5c865b4ef7992263e1cb081",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2789,7 +2789,7 @@ ...@@ -2789,7 +2789,7 @@
"description": "Defines an object-oriented layer for the HTTP specification", "description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-foundation/tree/v4.4.20" "source": "https://github.com/symfony/http-foundation/tree/v4.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -2805,20 +2805,20 @@ ...@@ -2805,20 +2805,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-02-25T17:11:33+00:00" "time": "2021-04-30T12:05:50+00:00"
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v4.4.21", "version": "v4.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "0248214120d00c5f44f1cd5d9ad65f0b38459333" "reference": "cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/0248214120d00c5f44f1cd5d9ad65f0b38459333", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f",
"reference": "0248214120d00c5f44f1cd5d9ad65f0b38459333", "reference": "cd2e325fc34a4a5bbec91eecf69dda8ee8c5ea4f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2893,7 +2893,7 @@ ...@@ -2893,7 +2893,7 @@
"description": "Provides a structured process for converting a Request into a Response", "description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/http-kernel/tree/v4.4.21" "source": "https://github.com/symfony/http-kernel/tree/v4.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -2909,20 +2909,20 @@ ...@@ -2909,20 +2909,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-29T05:11:04+00:00" "time": "2021-05-01T14:38:48+00:00"
}, },
{ {
"name": "symfony/mime", "name": "symfony/mime",
"version": "v5.2.6", "version": "v5.2.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/mime.git", "url": "https://github.com/symfony/mime.git",
"reference": "1b2092244374cbe48ae733673f2ca0818b37197b" "reference": "7af452bf51c46f18da00feb32e1ad36db9426515"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/1b2092244374cbe48ae733673f2ca0818b37197b", "url": "https://api.github.com/repos/symfony/mime/zipball/7af452bf51c46f18da00feb32e1ad36db9426515",
"reference": "1b2092244374cbe48ae733673f2ca0818b37197b", "reference": "7af452bf51c46f18da00feb32e1ad36db9426515",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2976,7 +2976,7 @@ ...@@ -2976,7 +2976,7 @@
"mime-type" "mime-type"
], ],
"support": { "support": {
"source": "https://github.com/symfony/mime/tree/v5.2.6" "source": "https://github.com/symfony/mime/tree/v5.2.7"
}, },
"funding": [ "funding": [
{ {
...@@ -2992,7 +2992,7 @@ ...@@ -2992,7 +2992,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-12T13:18:39+00:00" "time": "2021-04-29T20:47:09+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
...@@ -3644,16 +3644,16 @@ ...@@ -3644,16 +3644,16 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v4.4.20", "version": "v4.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "7e950b6366d4da90292c2e7fa820b3c1842b965a" "reference": "f5481b22729d465acb1cea3455fc04ce84b0148b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/7e950b6366d4da90292c2e7fa820b3c1842b965a", "url": "https://api.github.com/repos/symfony/process/zipball/f5481b22729d465acb1cea3455fc04ce84b0148b",
"reference": "7e950b6366d4da90292c2e7fa820b3c1842b965a", "reference": "f5481b22729d465acb1cea3455fc04ce84b0148b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3685,7 +3685,7 @@ ...@@ -3685,7 +3685,7 @@
"description": "Executes commands in sub-processes", "description": "Executes commands in sub-processes",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"support": { "support": {
"source": "https://github.com/symfony/process/tree/v4.4.20" "source": "https://github.com/symfony/process/tree/v4.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -3701,20 +3701,20 @@ ...@@ -3701,20 +3701,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-27T09:09:26+00:00" "time": "2021-04-07T16:22:29+00:00"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v4.4.20", "version": "v4.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
"reference": "69919991c845b34626664ddc9b3aef9d09d2a5df" "reference": "049e7c5c41f98511959668791b4adc0898a821b3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/69919991c845b34626664ddc9b3aef9d09d2a5df", "url": "https://api.github.com/repos/symfony/routing/zipball/049e7c5c41f98511959668791b4adc0898a821b3",
"reference": "69919991c845b34626664ddc9b3aef9d09d2a5df", "reference": "049e7c5c41f98511959668791b4adc0898a821b3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3773,7 +3773,7 @@ ...@@ -3773,7 +3773,7 @@
"url" "url"
], ],
"support": { "support": {
"source": "https://github.com/symfony/routing/tree/v4.4.20" "source": "https://github.com/symfony/routing/tree/v4.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -3789,7 +3789,7 @@ ...@@ -3789,7 +3789,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-02-22T15:37:04+00:00" "time": "2021-04-11T12:59:39+00:00"
}, },
{ {
"name": "symfony/service-contracts", "name": "symfony/service-contracts",
...@@ -4038,16 +4038,16 @@ ...@@ -4038,16 +4038,16 @@
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v4.4.21", "version": "v4.4.22",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "0da0e174f728996f5d5072d6a9f0a42259dbc806" "reference": "c194bcedde6295f3ec3e9eba1f5d484ea97c41a7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/0da0e174f728996f5d5072d6a9f0a42259dbc806", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c194bcedde6295f3ec3e9eba1f5d484ea97c41a7",
"reference": "0da0e174f728996f5d5072d6a9f0a42259dbc806", "reference": "c194bcedde6295f3ec3e9eba1f5d484ea97c41a7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4107,7 +4107,7 @@ ...@@ -4107,7 +4107,7 @@
"dump" "dump"
], ],
"support": { "support": {
"source": "https://github.com/symfony/var-dumper/tree/v4.4.21" "source": "https://github.com/symfony/var-dumper/tree/v4.4.22"
}, },
"funding": [ "funding": [
{ {
...@@ -4123,7 +4123,7 @@ ...@@ -4123,7 +4123,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-27T19:49:03+00:00" "time": "2021-04-19T13:36:17+00:00"
}, },
{ {
"name": "thiagocfn/inscricaoestadual", "name": "thiagocfn/inscricaoestadual",
...@@ -4373,16 +4373,16 @@ ...@@ -4373,16 +4373,16 @@
}, },
{ {
"name": "facade/flare-client-php", "name": "facade/flare-client-php",
"version": "1.7.0", "version": "1.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/facade/flare-client-php.git", "url": "https://github.com/facade/flare-client-php.git",
"reference": "6bf380035890cb0a09b9628c491ae3866b858522" "reference": "69742118c037f34ee1ef86dc605be4a105d9e984"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/facade/flare-client-php/zipball/6bf380035890cb0a09b9628c491ae3866b858522", "url": "https://api.github.com/repos/facade/flare-client-php/zipball/69742118c037f34ee1ef86dc605be4a105d9e984",
"reference": "6bf380035890cb0a09b9628c491ae3866b858522", "reference": "69742118c037f34ee1ef86dc605be4a105d9e984",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4426,7 +4426,7 @@ ...@@ -4426,7 +4426,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/facade/flare-client-php/issues", "issues": "https://github.com/facade/flare-client-php/issues",
"source": "https://github.com/facade/flare-client-php/tree/1.7.0" "source": "https://github.com/facade/flare-client-php/tree/1.8.0"
}, },
"funding": [ "funding": [
{ {
...@@ -4434,7 +4434,7 @@ ...@@ -4434,7 +4434,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-04-12T09:30:36+00:00" "time": "2021-04-30T11:11:50+00:00"
}, },
{ {
"name": "facade/ignition", "name": "facade/ignition",
......
database/migrations/2021_05_05_161225_create_outras_info_participantes_table.php 0 → 100644
View file @ 6afb8fb7
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use App\OutrasInfoParticipante;
class CreateOutrasInfoParticipantesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('outras_info_participantes', function (Blueprint $table) {
$table->bigIncrements('id');
$table->string("rg");
$table->date("data_de_nascimento");
$table->string("curso");
$table->enum("turno", OutrasInfoParticipante::ENUM_TURNO)->nullable(true);
$table->integer("ordem_prioridade")->nullable(true);
$table->string("periodo_atual")->nullable(true);
$table->string("total_periodos")->nullable(true);
$table->double("media_do_curso", 3, 2)->nullable(true);
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('outras_info_participantes');
}
}
database/migrations/2021_05_05_163601_add_column_participante.php 0 → 100644
View file @ 6afb8fb7
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddColumnParticipante extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('participantes', function (Blueprint $table) {
$table->unsignedBigInteger('outras_info_participante_id')->nullable(true);
$table->foreign('outras_info_participante_id')->references('id')->on('outras_info_participantes');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
}
database/seeds/FuncaoParticipanteSeeder.php
View file @ 6afb8fb7
...@@ -34,6 +34,11 @@ class FuncaoParticipanteSeeder extends Seeder ...@@ -34,6 +34,11 @@ class FuncaoParticipanteSeeder extends Seeder
DB::table('funcao_participantes')->insert([ DB::table('funcao_participantes')->insert([
'nome'=>'Voluntário', 'nome'=>'Voluntário',
]);
DB::table('funcao_participantes')->insert([
'nome'=>'Pesquisador',
]); ]);
} }
} }
resources/views/evento/submeterTrabalho.blade.php
View file @ 6afb8fb7
...@@ -89,13 +89,13 @@ ...@@ -89,13 +89,13 @@
</div> </div>
<hr> <hr>
<h3>Coordenador</h3> <h3>Proponente</h3>
{{-- Coordenador --}} {{-- Coordenador --}}
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-sm-6"> <div class="col-sm-6">
<label for="nomeCoordenador" class="col-form-label">{{ __('Coordenador:') }}</label> <label for="nomeCoordenador" class="col-form-label">{{ __('Proponente:') }}</label>
<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">
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<label for="anexoLattesCoordenador" class="col-form-label">{{ __('Anexo do Lattes do Coordenador*:') }}</label> <label for="anexoLattesCoordenador" class="col-form-label">{{ __('Anexo do Lattes do Coordenador dos últimos 5 anos*:') }}</label>
@if(old('anexoLattesPreenchido') != null || (isset($rascunho) && $rascunho->anexoLattesCoordenador != "")) @if(old('anexoLattesPreenchido') != null || (isset($rascunho) && $rascunho->anexoLattesCoordenador != ""))
<a id="anexoLattesTemp" href="{{ route('baixar.anexo.temp', ['eventoId' => $edital->id, <a id="anexoLattesTemp" href="{{ route('baixar.anexo.temp', ['eventoId' => $edital->id,
'nomeAnexo' => 'anexoLattesCoordenador' ])}}">Arquivo atual</a> 'nomeAnexo' => 'anexoLattesCoordenador' ])}}">Arquivo atual</a>
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
<div class="custom-file"> <div class="custom-file">
<input type="file" class="custom-file-input @error('anexoPlanilha') is-invalid @enderror" id="anexoPlanilha" aria-describedby="anexoPlanilhaDescribe" name="anexoPlanilha" onchange="exibirAnexoTemp(this)"> <input type="file" class="custom-file-input @error('anexoPlanilha') is-invalid @enderror" id="anexoPlanilha" aria-describedby="anexoPlanilhaDescribe" name="anexoPlanilha" onchange="exibirAnexoTemp(this)">
<label class="custom-file-label" id="custom-file-label" for="anexoPlanilha">O arquivo deve ser no formato PDF, XLS ou XLSX de até 2MB.</label> <label class="custom-file-label" id="custom-file-label" for="anexoPlanilha">O arquivo deve ser no formato XLS, XLSX ou ODS de até 2MB.</label>
</div> </div>
</div> </div>
@error('anexoPlanilha') @error('anexoPlanilha')
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<label for="nomeTrabalho" class="col-form-label">{{ __('Justificativa*:') }}</label> <label for="nomeTrabalho" class="col-form-label">{{ __('Declaração de não necessidade de autorizações especiais*:') }}</label>
@if(old('anexoJustificativaPreenchido') != null || (isset($rascunho) && $rascunho->justificativaAutorizacaoEtica != "" && $rascunho->justificativaAutorizacaoEtica != null)) @if(old('anexoJustificativaPreenchido') != null || (isset($rascunho) && $rascunho->justificativaAutorizacaoEtica != "" && $rascunho->justificativaAutorizacaoEtica != null))
<a id="anexoJustificativaTemp" href="{{ route('baixar.anexo.temp', ['eventoId' => $edital->id, <a id="anexoJustificativaTemp" href="{{ route('baixar.anexo.temp', ['eventoId' => $edital->id,
'nomeAnexo' => 'justificativaAutorizacaoEtica' ])}}">Arquivo atual</a> 'nomeAnexo' => 'justificativaAutorizacaoEtica' ])}}">Arquivo atual</a>
...@@ -323,10 +323,11 @@ ...@@ -323,10 +323,11 @@
<div id="novoParticipante" style="display: block;"> <div id="novoParticipante" style="display: block;">
<br> <br>
<h4>Dados do participante</h4> <h4>Dados do participante</h4>
<h6>Dados pessoais</h6>
<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" value="{{old('nomeParticipante.'.$i)}}"> <input type="text" style="margin-bottom:10px" class="form-control @error('nomeParticipante') is-invalid @enderror" name="nomeParticipante[]" placeholder="Nome" value="{{old('nomeParticipante.'.$i)}}" required>
@error('nomeParticipante.'.$i) @error('nomeParticipante.'.$i)
<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>
...@@ -335,7 +336,7 @@ ...@@ -335,7 +336,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" value="{{old('emailParticipante.'.$i)}}"> <input type="email" style="margin-bottom:10px" class="form-control @error('emailParticipante') is-invalid @enderror" name="emailParticipante[]" placeholder="email" value="{{old('emailParticipante.'.$i)}}" required>
@error('emailParticipante.'.$i) @error('emailParticipante.'.$i)
<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>
...@@ -344,7 +345,7 @@ ...@@ -344,7 +345,7 @@
</div> </div>
<div class="col-sm-3"> <div class="col-sm-3">
<label>Função*:</label> <label>Função*:</label>
<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" required>
<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 @if(old('funcaoParticipante.'.$i)==$funcaoParticipante->id ) selected @endif value="{{$funcaoParticipante->id}}">{{$funcaoParticipante->nome}}</option> <option @if(old('funcaoParticipante.'.$i)==$funcaoParticipante->id ) selected @endif value="{{$funcaoParticipante->id}}">{{$funcaoParticipante->nome}}</option>
...@@ -357,6 +358,170 @@ ...@@ -357,6 +358,170 @@
@enderror @enderror
</div> </div>
</div> </div>
<div id="dados_complemento_1">
<div class="form-group">
<div class="row">
<div class="col-sm-4">
<label for="">{{ __('CPF*') }}</label>
<input type="text" class="form-control cpf" name="cpf[]" required>
</div>
<div class="col-sm-4">
<label for="">{{ __('RG*') }}</label>
<input type="text" class="form-control rg" name="rg[]" required>
</div>
<div class="col-sm-4">
<label for="">{{ __('Celular*') }}</label>
<input type="text" class="form-control celular" name="celular[]" required>
</div>
</div>
</div>
<div class="form-group">
<div class="row">
<div class="col-sm-4">
<label for="">{{ __('Data de nascimento*') }}</label>
<input type="date" class="form-control" name="data_de_nascimento[]" required>
</div>
</div>
</div>
<div class="form-group">
<div class="row">
<div class="container">
<h6>Endereço do participante</h6>
</div>
</div>
<div class="row">
<div class="col-sm-3">
<label for="">{{ __('CEP*') }}</label>
<input type="text" class="form-control" name="cep[]" required>
</div>
</div>
</div>
<div class="form-group">
<div class="row">
<div class="col-sm-6">
<label for="">{{ __('Rua*') }}</label>
<input type="text" class="form-control" name="rua[]" required>
</div>
<div class="col-sm-3">
<label for="">{{ __('Número*') }}</label>
<input type="text" class="form-control" name="numero[]" required>
</div>
<div class="col-sm-3">
<label for="">{{ __('Bairro*') }}</label>
<input type="text" class="form-control" name="bairro[]" required>
</div>
</div>
</div>
<div class="form-group">
<div class="row">
<div class="col-sm-4">
<label for="">{{ __('Cidade*') }}</label>
<input type="text" class="form-control " name="cidade[]" required>
</div>
<div class="col-sm-4">
<label for="">{{ __('Complemento*') }}</label>
<input type="text" class="form-control" name="complemento[]" required>
</div>
<div class="col-sm-4">
<label for="">{{ __('Estado*') }}</label>
<select name="uf[]" id="" class="form-control" required>
<option value="" disabled selected>-- UF --</option>
<option @if(old('uf') == 'AC') selected @endif value="AC">Acre</option>
<option @if(old('uf') == 'AL') selected @endif value="AL">Alagoas</option>
<option @if(old('uf') == 'AP') selected @endif value="AP">Amapá</option>
<option @if(old('uf') == 'AM') selected @endif value="AM">Amazonas</option>
<option @if(old('uf') == 'BA') selected @endif value="BA">Bahia</option>
<option @if(old('uf') == 'CE') selected @endif value="CE">Ceará</option>
<option @if(old('uf') == 'DF') selected @endif value="DF">Distrito Federal</option>
<option @if(old('uf') == 'ES') selected @endif value="ES">Espírito Santo</option>
<option @if(old('uf') == 'GO') selected @endif value="GO">Goiás</option>
<option @if(old('uf') == 'MA') selected @endif value="MA">Maranhão</option>
<option @if(old('uf') == 'MT') selected @endif value="MT">Mato Grosso</option>
<option @if(old('uf') == 'MS') selected @endif value="MS">Mato Grosso do Sul</option>
<option @if(old('uf') == 'MG') selected @endif value="MG">Minas Gerais</option>
<option @if(old('uf') == 'PA') selected @endif value="PA">Pará</option>
<option @if(old('uf') == 'PB') selected @endif value="PB">Paraíba</option>
<option @if(old('uf') == 'PR') selected @endif value="PR">Paraná</option>
<option @if(old('uf') == 'PE') selected @endif value="PE">Pernambuco</option>
<option @if(old('uf') == 'PI') selected @endif value="PI">Piauí</option>
<option @if(old('uf') == 'RJ') selected @endif value="RJ">Rio de Janeiro</option>
<option @if(old('uf') == 'RN') selected @endif value="RN">Rio Grande do Norte</option>
<option @if(old('uf') == 'RS') selected @endif value="RS">Rio Grande do Sul</option>
<option @if(old('uf') == 'RO') selected @endif value="RO">Rondônia</option>
<option @if(old('uf') == 'RR') selected @endif value="RR">Roraima</option>
<option @if(old('uf') == 'SC') selected @endif value="SC">Santa Catarina</option>
<option @if(old('uf') == 'SP') selected @endif value="SP">São Paulo</option>
<option @if(old('uf') == 'SE') selected @endif value="SE">Sergipe</option>
<option @if(old('uf') == 'TO') selected @endif value="TO">Tocantins</option>
</select>
</div>
</div>
</div>
<div class="form-group">
<div class="row">
<div class="container">
<h6>Dados do curso do participante</h6>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<label for="">{{ __('Universidade*') }}</label>
<input type="text" class="form-control" name="universidade[]" required>
</div>
<div class="col-sm-6">
<label for="">{{ __('Curso*') }}</label>
<input type="text" class="form-control" name="curso[]" required>
</div>
</div>
</div>
<div class="form-group">
<div class="row">
<div class="col-sm-2">
<label for="">{{ __('Turno*') }}</label>
<select id="" class="form-control" name="turno[]" required>
<option value="" disabled selected>-- TURNO --</option>
@foreach ($enum_turno as $turno)
<option value="{{$turno}}">{{$turno}}</option>
@endforeach
</select>
</div>
<div class="col-sm-3">
<label for="">{{ __('Total de periodos do curso*') }}</label>
<select name="total_periodos[]" id="" class="form-control" onchange="gerarPeriodos(this)" required>
<option value="" disabled selected>-- TOTAL DE PERIODOS --</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
</select>
</div>
<div class="col-sm-2">
<label for="">{{ __('Periodo atual*') }}</label>
<select name="periodo_cursado[]" id="" class="form-control" required>
<option value="" disabled selected>-- PERÍODO ATUAL --</option>
</select>
</div>
<div class="col-sm-2">
<label for="">{{ __('Ordem de prioridade*') }}</label>
<select name="ordem_prioridade[]" id="" class="form-control" required>
<option value="" disabled selected>-- ORDEM --</option>
<option value="1">1º</option>
<option value="2">2º</option>
<option value="3">3º</option>
<option value="4">4º</option>
</select>
</div>
<div class="col-sm-3">
<label for="">{{ __('Média geral do curso*') }}</label>
<input type="number" class="form-control media" min="0" max="10" step="0.01" value="00.00" name="media_geral_curso[]" required>
</div>
</div>
</div>
</div>
<h6 class="mb-1">Possui plano de trabalho?</h6> <h6 class="mb-1">Possui plano de trabalho?</h6>
<button class="btn btn-primary mt-2 mb-2 simPlano">Sim</button> <button class="btn btn-primary mt-2 mb-2 simPlano">Sim</button>
<button class="btn btn-primary mt-2 mb-2 naoPlano">Não</button> <button class="btn btn-primary mt-2 mb-2 naoPlano">Não</button>
...@@ -395,20 +560,14 @@ ...@@ -395,20 +560,14 @@
</span> </span>
@enderror @enderror
</div> </div>
<div class="col-sm-1">
{{-- <a class="delete">
<img src="{{ asset('/img/icons/user-times-solid.svg') }}" style="width:25px;margin-top:35px">
</a> --}}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@if($i != 0) <button class="btn btn-danger mt-2 mb-2 delete" style='width:100%;margin-top:10px' disabled>Limite minimo de participantes</button>
<a href='#' class="btn btn-danger mt-2 mb-2 delete" style='width:100%;margin-top:10px'>Remover participante</a>
@endif
</div> </div>
{{-- </div> {{-- </div>
...@@ -418,7 +577,7 @@ ...@@ -418,7 +577,7 @@
@endif @endif
</div> </div>
<input type="hidden" name="countParticipante" id="countParticipante" value="{{ old('countParticipante') != null ? old('countParticipante') : 1}}"> <input type="hidden" name="countParticipante" id="countParticipante" value="{{ old('countParticipante') != null ? old('countParticipante') : 1}}">
<a href="#" class="btn btn-primary" id="addCoautor" style="width:100%;margin-top:10px">Adicionar participante</a> <button class="btn btn-primary" id="addCoautor" style="width:100%;margin-top:10px">Adicionar participante</button>
</div> </div>
</div> </div>
...@@ -453,14 +612,30 @@ ...@@ -453,14 +612,30 @@
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
var qtdLinhas = 1; var qtdLinhas = 1;
const limiteMaxParticipantes = 3;
const limiteMinParticipantes = 1;
// Coautores // Coautores
$('#addCoautor').click(function(e) { $('#addCoautor').click(function(e) {
var countParticipante = document.getElementById('countParticipante'); var countParticipante = document.getElementById('countParticipante');
if (countParticipante.value < 100) { if (countParticipante.value < limiteMaxParticipantes) {
e.preventDefault(); e.preventDefault();
linha = montarLinhaInput(); linha = montarLinhaInput();
$('#participantes').append(linha); $('#participantes').append(linha);
setParticipanteDiv(parseInt(countParticipante.value) + 1); setParticipanteDiv(parseInt(countParticipante.value) + 1);
var btnsDeletar = document.getElementsByClassName("delete");
for(var i = 0; i < btnsDeletar.length; i++) {
btnsDeletar[i].disabled = "";
$(btnsDeletar[i]).text("Remover participantes");
}
if (countParticipante.value >= limiteMaxParticipantes) {
var btn = document.getElementById('addCoautor');
btn.disabled = "true";
$('#addCoautor').text("Limite de participantes atingido");
}
// aplicarMascaras();
} }
}); });
...@@ -484,11 +659,20 @@ ...@@ -484,11 +659,20 @@
// }); // });
$(document).on('click', '.delete', function() { $(document).on('click', '.delete', function() {
var countParticipante = document.getElementById('countParticipante'); var countParticipante = document.getElementById('countParticipante');
if (countParticipante.value >= 2) { if (countParticipante.value >= limiteMinParticipantes) {
setParticipanteDiv(parseInt(countParticipante.value) - 1); setParticipanteDiv(parseInt(countParticipante.value) - 1);
$(this).closest('#novoParticipante').remove(); $(this).closest('#novoParticipante').remove();
document.getElementById("addCoautor").disabled = "";
$('#addCoautor').text("Adicionar participante");
if (countParticipante.value == limiteMinParticipantes) {
var btnsDeletar = document.getElementsByClassName("delete");
for(var i = 0; i < btnsDeletar.length; i++) {
btnsDeletar[i].disabled = true;
$(btnsDeletar).text("Limite minimo de participantes");
}
}
return false; return false;
} }
}); });
$(document).on('click', '.deletePlano', function() { $(document).on('click', '.deletePlano', function() {
if (qtdLinhas > 1) { if (qtdLinhas > 1) {
...@@ -586,93 +770,255 @@ ...@@ -586,93 +770,255 @@
function montarLinhaInput() { function montarLinhaInput() {
return "<div id="+"novoParticipante"+">" + return `<div id="novoParticipante" style="display: block;">
"<div class='row'>"+ <br>
"<div class='col-sm-9'>"+ <h4>Dados do participante</h4>
"<br><h4>Dados do participante</h4>" + <h6>Dados pessoais</h6>
"</div>"+ <div class="row">
"<div class='col-sm-3'>"+ <div class="col-sm-5">
<label>Nome Completo*</label>
"</div>"+ <input type="text" style="margin-bottom:10px" class="form-control @error('nomeParticipante') is-invalid @enderror" name="nomeParticipante[]" placeholder="Nome" value="{{old('nomeParticipante.'.$i)}}" required>
"</div>"+ @error('nomeParticipante.'.$i)
"<div class="+"row"+">"+ <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
"<div class="+"col-sm-5"+">"+ <strong>{{ $message }}</strong>
"<label>Nome Completo*</label>"+ </span>
"<input"+" type="+'text'+" style="+"margin-bottom:10px"+" class="+'form-control' + " @error('nomeParticipante') is-invalid @enderror" + "name=" +'nomeParticipante[]'+" placeholder="+"Nome"+">"+ @enderror
"@error('nomeParticipante')" + </div>
"<span class='invalid-feedback'" + "role='alert'" + "style='overflow: visible; display:block'>" + <div class="col-sm-4">
"<strong>{{ $message }}</strong>" + <label>E-mail*</label>
"</span>" + <input type="email" style="margin-bottom:10px" class="form-control @error('emailParticipante') is-invalid @enderror" name="emailParticipante[]" placeholder="email" value="{{old('emailParticipante.'.$i)}}" required>
"@enderror" + @error('emailParticipante.'.$i)
"</div>"+ <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
"<div class="+"col-sm-4"+">"+ <strong>{{ $message }}</strong>
"<label>E-mail*</label>"+ </span>
"<input type='email'" + "style='margin-bottom:10px'" + "class=" + "form-control @error('emailParticipante') is-invalid @enderror" + "name='emailParticipante[]'" + "placeholder='email' >" + @enderror
"@error('emailParticipante')" + </div>
"<span class='invalid-feedback'" + "role='alert'" + "style='overflow: visible; display:block'>" + <div class="col-sm-3">
"<strong>{{ $message }}</strong>" + <label>Função*:</label>
"</span>" + <select class="form-control @error('funcaoParticipante') is-invalid @enderror" name="funcaoParticipante[]" id="funcaoParticipante" required>
"@enderror" + <option value="" disabled selected hidden>-- Função --</option>
"</div>"+ @foreach($funcaoParticipantes as $funcaoParticipante)
"<div class='col-sm-3'>"+ <option @if(old('funcaoParticipante.'.$i)==$funcaoParticipante->id ) selected @endif value="{{$funcaoParticipante->id}}">{{$funcaoParticipante->nome}}</option>
"<label>Função*:</label>"+ @endforeach
"<select class=" + "form-control @error('funcaoParticipante') is-invalid @enderror" + "name='funcaoParticipante[]'" + "id='funcaoParticipante'> " + </select>
"<option value='' disabled selected hidden> Função </option>"+ @error('funcaoParticipante')
"@foreach($funcaoParticipantes as $funcaoParticipante)"+ <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
"<option value='{{$funcaoParticipante->id}}'>{{$funcaoParticipante->nome}}</option>"+ <strong>{{ $message }}</strong>
"@endforeach"+ </span>
"@error('funcaoParticipante'. $i)" + @enderror
"<span class='invalid-feedback'" + " role='alert'" + " style='overflow: visible; display:block'>" + </div>
"<strong>{{ $message }}</strong>" + </div>
"</span>" + <div id="dados_complemento_1">
"@enderror" + <div class="form-group">
"</select>"+ <div class="row">
"</div>"+ <div class="col-sm-4">
"</div>" + <label for="">{{ __('CPF*') }}</label>
"<h6 class='mb-1'>Possui plano de trabalho?</h6>"+ <input type="text" class="form-control cpf" name="cpf[]" required>
"<button class="+"'btn btn-primary mt-2 mb-2 mr-1 simPlano'"+">Sim</button>"+ </div>
"<button class="+"'btn btn-primary mt-2 mb-2 mr-1 naoPlano'"+">Não</button>"+ <div class="col-sm-4">
"<div id="+"planoHabilitado"+" style="+"'display:none;'"+">" + <label for="">{{ __('RG*') }}</label>
"<h5>Dados do plano de trabalho</h5>" + <input type="text" class="form-control rg" name="rg[]" required>
"<div class="+"row"+">"+ </div>
"<div class="+"col-sm-4"+">"+ <div class="col-sm-4">
"<label>Titulo*</label>"+ <label for="">{{ __('Celular*') }}</label>
"<input"+" type="+'text'+" style="+"margin-bottom:10px"+" class="+"form-control @error('nomePlanoTrabalho') is-invalid @enderror"+" name="+'nomePlanoTrabalho[]'+" placeholder="+"Nome"+">"+ <input type="text" class="form-control celular" name="celular[]" required>
"@error('nomePlanoTrabalho')" + </div>
"<span class='invalid-feedback'" + "role='alert'" + "style='overflow: visible; display:block'>" + </div>
"<strong>{{ $message }}</strong>" + </div>
"</span>" + <div class="form-group">
"@enderror" + <div class="row">
"</div>"+ <div class="col-sm-4">
"<div class="+"col-sm-7" +">"+ <label for="">{{ __('Data de nascimento*') }}</label>
"<label for="+"nomeTrabalho"+">Anexo* </label>"+ <input type="date" class="form-control" name="data_de_nascimento[]" required>
</div>
"<div class="+"input-group"+">"+ </div>
"<div class='input-group-prepend'>"+ </div>
"<span class='input-group-text' id='anexoPlanoTrabalho'>Selecione um arquivo:</span>"+ <div class="form-group">
"</div>"+ <div class="row">
"<div class='custom-file'>"+ <div class="container">
"<input type='file' class='custom-file-input @error('anexoPlanoTrabalho') is-invalid @enderror" + "id='anexoPlanoTrabalho'"+ <h6>Endereço do participante</h6>
" 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>"+ <div class="row">
"</div>"+ <div class="col-sm-3">
"@error('anexoPlanoTrabalho')"+ <label for="">{{ __('CEP*') }}</label>
"<span class='invalid-feedback' role='alert' style='overflow: visible; display:block'>"+ <input type="text" class="form-control" name="cep[]" required>
"<strong>{{ $message }}</strong>"+ </div>
"</span>"+ </div>
"@enderror"+ </div>
"</div>"+ <div class="form-group">
"<div class="+"col-sm-1"+">"+ <div class="row">
"<a class="+"delete"+">"+ <div class="col-sm-6">
"<img src="+"{{ asset('/img/icons/user-times-solid.svg') }}"+" style="+"width:25px;margin-top:35px"+">"+ <label for="">{{ __('Rua*') }}</label>
"</a>"+ <input type="text" class="form-control" name="rua[]" required>
"</div>"+ </div>
"</div>"+ <div class="col-sm-3">
"</div>"+ <label for="">{{ __('Número*') }}</label>
<input type="text" class="form-control" name="numero[]" required>
"<a href='#' class="+"'btn btn-danger mt-2 mb-2 delete'"+" style='width:100%;margin-top:10px'"+">Remover participante</a>"+ </div>
"</div>"; <div class="col-sm-3">
<label for="">{{ __('Bairro*') }}</label>
<input type="text" class="form-control" name="bairro[]" required>
</div>
</div>
</div>
<div class="form-group">
<div class="row">
<div class="col-sm-4">
<label for="">{{ __('Cidade*') }}</label>
<input type="text" class="form-control " name="cidade[]" required>
</div>
<div class="col-sm-4">
<label for="">{{ __('Complemento*') }}</label>
<input type="text" class="form-control" name="complemento[]" required>
</div>
<div class="col-sm-4">
<label for="">{{ __('Estado*') }}</label>
<select name="uf[]" id="" class="form-control" required>
<option value="" disabled selected>-- UF --</option>
<option @if(old('uf') == 'AC') selected @endif value="AC">Acre</option>
<option @if(old('uf') == 'AL') selected @endif value="AL">Alagoas</option>
<option @if(old('uf') == 'AP') selected @endif value="AP">Amapá</option>
<option @if(old('uf') == 'AM') selected @endif value="AM">Amazonas</option>
<option @if(old('uf') == 'BA') selected @endif value="BA">Bahia</option>
<option @if(old('uf') == 'CE') selected @endif value="CE">Ceará</option>
<option @if(old('uf') == 'DF') selected @endif value="DF">Distrito Federal</option>
<option @if(old('uf') == 'ES') selected @endif value="ES">Espírito Santo</option>
<option @if(old('uf') == 'GO') selected @endif value="GO">Goiás</option>
<option @if(old('uf') == 'MA') selected @endif value="MA">Maranhão</option>
<option @if(old('uf') == 'MT') selected @endif value="MT">Mato Grosso</option>
<option @if(old('uf') == 'MS') selected @endif value="MS">Mato Grosso do Sul</option>
<option @if(old('uf') == 'MG') selected @endif value="MG">Minas Gerais</option>
<option @if(old('uf') == 'PA') selected @endif value="PA">Pará</option>
<option @if(old('uf') == 'PB') selected @endif value="PB">Paraíba</option>
<option @if(old('uf') == 'PR') selected @endif value="PR">Paraná</option>
<option @if(old('uf') == 'PE') selected @endif value="PE">Pernambuco</option>
<option @if(old('uf') == 'PI') selected @endif value="PI">Piauí</option>
<option @if(old('uf') == 'RJ') selected @endif value="RJ">Rio de Janeiro</option>
<option @if(old('uf') == 'RN') selected @endif value="RN">Rio Grande do Norte</option>
<option @if(old('uf') == 'RS') selected @endif value="RS">Rio Grande do Sul</option>
<option @if(old('uf') == 'RO') selected @endif value="RO">Rondônia</option>
<option @if(old('uf') == 'RR') selected @endif value="RR">Roraima</option>
<option @if(old('uf') == 'SC') selected @endif value="SC">Santa Catarina</option>
<option @if(old('uf') == 'SP') selected @endif value="SP">São Paulo</option>
<option @if(old('uf') == 'SE') selected @endif value="SE">Sergipe</option>
<option @if(old('uf') == 'TO') selected @endif value="TO">Tocantins</option>
</select>
</div>
</div>
</div>
<div class="form-group">
<div class="row">
<div class="container">
<h6>Dados do curso do participante</h6>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<label for="">{{ __('Universidade*') }}</label>
<input type="text" class="form-control" name="universidade[]" required>
</div>
<div class="col-sm-6">
<label for="">{{ __('Curso*') }}</label>
<input type="text" class="form-control" name="curso[]" required>
</div>
</div>
</div>
<div class="form-group">
<div class="row">
<div class="col-sm-2">
<label for="">{{ __('Turno*') }}</label>
<select id="" class="form-control" name="turno[]" required>
<option value="" disabled selected>-- TURNO --</option>
@foreach ($enum_turno as $turno)
<option value="{{$turno}}">{{$turno}}</option>
@endforeach
</select>
</div>
<div class="col-sm-3">
<label for="">{{ __('Total de periodos do curso*') }}</label>
<select name="total_periodos[]" id="" class="form-control" onchange="gerarPeriodos(this)" required>
<option value="" disabled selected>-- TOTAL DE PERIODOS --</option>
<option value="6">6</option>
<option value="7">7</option>
<option value="8">8</option>
<option value="9">9</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
</select>
</div>
<div class="col-sm-2">
<label for="">{{ __('Periodo atual*') }}</label>
<select name="periodo_cursado[]" id="" class="form-control" required>
<option value="" disabled selected>-- PERÍODO ATUAL --</option>
</select>
</div>
<div class="col-sm-2">
<label for="">{{ __('Ordem de prioridade*') }}</label>
<select name="ordem_prioridade[]" id="" class="form-control" required>
<option value="" disabled selected>-- ORDEM --</option>
<option value="1">1º</option>
<option value="2">2º</option>
<option value="3">3º</option>
<option value="4">4º</option>
</select>
</div>
<div class="col-sm-3">
<label for="">{{ __('Média geral do curso*') }}</label>
<input type="number" class="form-control media" min="0" max="10" step="0.01" value="00.00" name="media_geral_curso[]" required>
</div>
</div>
</div>
</div>
<h6 class="mb-1">Possui plano de trabalho?</h6>
<button class="btn btn-primary mt-2 mb-2 simPlano">Sim</button>
<button class="btn btn-primary mt-2 mb-2 naoPlano">Não</button>
<div id="planoHabilitado" style="display:none;">
<h5>Dados do plano de trabalho</h5>
<div class="row">
<div class="col-sm-12">
<div id="planoTrabalho">
<div class="row">
<div class="col-sm-4">
<label>Titulo* </label>
<input type="text" style="margin-bottom:10px" class="form-control @error('nomePlanoTrabalho') is-invalid @enderror" name="nomePlanoTrabalho[]" placeholder="Nome" value="{{old('nomePlanoTrabalho.'.$i)}}">
@error('nomePlanoTrabalho')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
{{-- Arquivo --}}
<div class="col-sm-7">
<label for="nomeTrabalho">Anexo*</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text" id="anexoPlanoTrabalho">Selecione um arquivo:</span>
</div>
<div class="custom-file">
<input type="file" class="custom-file-input @error('anexoPlanoTrabalho') is-invalid @enderror" id="anexoPlanoTrabalho" aria-describedby="anexoPlanoTrabalho" name="anexoPlanoTrabalho[]">
<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>
</div>
</div>
</div>
</div>
<button class="btn btn-danger mt-2 mb-2 delete" style='width:100%;margin-top:10px' disabled>Limite minimo de participantes</button>
</div>`;
} }
...@@ -784,5 +1130,36 @@ ...@@ -784,5 +1130,36 @@
} }
window.onload = areas(); window.onload = areas();
window.onload = habilitarBotao(); window.onload = habilitarBotao();
$(document).ready(aplicarMascaras());
function aplicarMascaras() {
$('.cpf').mask('000.000.000-00');
var SPMaskBehavior = function(val) {
return val.replace(/\D/g, '').length === 11 ? '(00) 00000-0000' : '(00) 0000-00009';
},
spOptions = {
onKeyPress: function(val, e, field, options) {
field.mask(SPMaskBehavior.apply({}, arguments), options);
}
};
$('.celular').mask(SPMaskBehavior, spOptions);
$('.rg').mask('99.999.999-9');
$('.media').mask('00.00');
}
function gerarPeriodos(select) {
var div = select.parentElement.parentElement;
var selectPeriodos = div.children[2].children[1];
var html = `<option value="" disabled selected>-- TOTAL DE PERIODOS --</option>`;
for(var i = 0; i < parseInt(select.value); i++) {
html += `<option value="${i+1}">${i+1}º</option>`;
}
$(selectPeriodos).html('');
$(selectPeriodos).append(html);
}
</script> </script>
@endsection @endsection
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