Skip to content

GitLab

"vscode:/vscode.git/clone" did not exist on "d2735cdf16c32c0c18ce88dcfea446b93692d49a"
Unverified Commit 79094c42 authored by Gabriel Antônio da Silva's avatar Gabriel Antônio da Silva Committed by GitHub
Browse files

Merge pull request #96 from Gabriel-31415/master 

numero de participantes
parents 0d2f7c81 8a8c2861
Expand all Show whitespace changes
Inline Side-by-side
app/Evento.php
View file @ 79094c42
......@@ -15,7 +15,7 @@ class Evento extends Model
'nome', 'descricao', 'tipo',
'inicioSubmissao', 'fimSubmissao', 'inicioRevisao', 'fimRevisao',
'resultado_final','resultado_preliminar', 'coordenadorId',
'numMaxTrabalhos', 'numMaxCoautores', 'hasResumo', 'criador_id'
'numMaxTrabalhos', 'numMaxCoautores', 'hasResumo', 'criador_id', 'numParticipantes'
];
public function endereco(){
......
app/Http/Controllers/EventoController.php
View file @ 79094c42
......@@ -113,6 +113,7 @@ class EventoController extends Controller
'tipo' => ['required', 'string'],
'natureza' => ['required'],
'coordenador_id' => ['required'],
'numParticipantes' => ['required'],
'inicioSubmissao' => ['required', 'date'],
'fimSubmissao' => ['required', 'date'],
'inicioRevisao' => ['required', 'date'],
......@@ -135,6 +136,7 @@ class EventoController extends Controller
'tipo' => ['required', 'string'],
'natureza' => ['required'],
'coordenador_id' => ['required'],
'numParticipantes' => ['required'],
#----------------------------------------------
'inicioSubmissao' => ['required', 'date', 'after:yesterday'],
'fimSubmissao' => ['required', 'date', 'after_or_equal:inicioSubmissao'],
......@@ -163,6 +165,7 @@ class EventoController extends Controller
$evento['resultado_final'] = $request->resultado_final;
$evento['coordenadorId'] = $request->coordenador_id;
$evento['criador_id'] = $user_id;
$evento['numParticipantes'] = $request->numParticipantes;
$evento['anexosStatus'] = 'final';
//dd($evento);
......@@ -347,6 +350,7 @@ class EventoController extends Controller
'descricao' => ['required', 'string'],
'tipo' => ['required', 'string'],
'natureza' => ['required'],
'numParticipantes' => ['required'],
'inicioSubmissao' => ['required', 'date'],
'fimSubmissao' => ['required', 'date'],
'inicioRevisao' => ['required', 'date', 'after:fimSubmissao'],
......@@ -365,6 +369,7 @@ class EventoController extends Controller
'descricao' => ['required', 'string', 'max:1500'],
'tipo' => ['required', 'string'],
'natureza' => ['required'],
'numParticipantes' => ['required'],
'inicioSubmissao' => ['required', 'date', 'after_or_equal:inicioSubmissao'],
'fimSubmissao' => ['required', 'date', 'after_or_equal:inicioSubmissao'],
'inicioRevisao' => ['required', 'date', 'after:fimSubmissao'],
......@@ -380,6 +385,7 @@ class EventoController extends Controller
$evento->descricao = $request->descricao;
$evento->tipo = $request->tipo;
$evento->natureza_id = $request->natureza;
$evento->numParticipantes = $request->numParticipantes;
$evento->inicioSubmissao = $request->inicioSubmissao;
$evento->fimSubmissao = $request->fimSubmissao;
$evento->inicioRevisao = $request->inicioRevisao;
......
app/Http/Controllers/TrabalhoController.php
View file @ 79094c42
This diff is collapsed.
database/migrations/2020_02_05_123153_create_eventos_table.php
View file @ 79094c42
......@@ -30,6 +30,7 @@ class CreateEventosTable extends Migration
$table->date('fim_recurso')->nullable();
$table->integer('numMaxTrabalhos')->nullable();
$table->integer('numMaxCoautores')->nullable();
$table->integer('numParticipantes')->nullable();
$table->boolean('hasResumo')->nullable();
$table->integer('criador_id')->nullable();
$table->integer('coordenadorId')->nullable();
......
resources/views/componentes/input.blade.php
View file @ 79094c42
@php
$class = $class ?? " ";
@endphp
<div class="form-group">
<label class=" control-label" for="firstname">{{ $label }}<span style="color: red; font-weight:bold">*</span></label>
<label class=" control-label {{ $class }}" for="firstname">{{ $label }}<span style="color: red; font-weight:bold">*</span></label>
<div class="">
{{ $slot }}
</div>
......
resources/views/evento/criarEvento.blade.php
View file @ 79094c42
......@@ -26,7 +26,7 @@
@enderror
</div>
<div class="col-sm-3">
<div class="col-sm-2">
<label for="tipo" class="col-form-label">{{ __('Tipo*:') }}</label>
<select id="tipo" type="text" class="form-control @error('tipo') is-invalid @enderror" name="tipo" value="{{ old('tipo') }}" required>
<option @if(old('tipo')=='PIBIC' ) selected @endif value="PIBIC">PIBIC</option>
......@@ -41,7 +41,7 @@
@enderror
</div>
<div class="col-sm-3">
<div class="col-sm-2">
<label for="natureza" class="col-form-label">{{ __('Natureza*:') }}</label>
<select id="natureza" type="text" class="form-control @error('natureza') is-invalid @enderror" name="natureza" value="{{ old('natureza') }}" required>
@foreach ($naturezas as $natureza)
......@@ -55,6 +55,16 @@
</span>
@enderror
</div>
<div class="col-sm-2">
<label for="numParticipantes" class="col-form-label">{{ __('numParticipantes*:') }}</label>
<input id="numParticipantes" type="number" min="1" max="20" class="form-control @error('numParticipantes') is-invalid @enderror" name="numParticipantes" value="{{ old('numParticipantes') }}" required autocomplete="numParticipantes" autofocus>
@error('numParticipantes')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
</div>{{-- end nome | Participantes | Tipo--}}
{{-- Descricao Edital --}}
......
resources/views/evento/editarEvento.blade.php
View file @ 79094c42
......@@ -27,7 +27,7 @@
</div>{{--End Nome do evento--}}
{{-- Tipo do evento --}}
<div class="col-sm-3">
<div class="col-sm-2">
<label for="tipo" class="col-form-label">{{ __('Tipo*:') }}</label>
<!-- <input value="{{$evento->tipo}}" id="tipo" type="text" class="form-control @error('tipo') is-invalid @enderror" name="tipo" value="{{ old('tipo') }}" required autocomplete="tipo" autofocus> -->
<select id="tipo" type="text" class="form-control @error('tipo') is-invalid @enderror" name="tipo" required>
......@@ -42,7 +42,7 @@
@enderror
</div>{{-- Tipo do evento --}}
<div class="col-sm-3">
<div class="col-sm-2">
<label for="natureza" class="col-form-label">{{ __('Natureza*:') }}</label>
<select id="natureza" type="text" class="form-control @error('natureza') is-invalid @enderror" name="natureza" value="{{ old('natureza') }}" required>
@foreach ($naturezas as $natureza)
......@@ -60,6 +60,16 @@
</span>
@enderror
</div>
<div class="col-sm-2">
<label for="numParticipantes" class="col-form-label">{{ __('numParticipantes*:') }}</label>
<input id="numParticipantes" type="number" min="1" max="20" class="form-control @error('numParticipantes') is-invalid @enderror" name="numParticipantes" value="{{ $evento->numParticipantes }}" required autocomplete="numParticipantes" autofocus>
@error('numParticipantes')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
</div>{{-- end nome | Participantes | Tipo--}}
{{-- Descricao Evento --}}
......
resources/views/evento/formulario/anexos.blade.php
View file @ 79094c42
......@@ -23,7 +23,7 @@
</div>
<div class="form-group col-md-6">
@component('componentes.input', ['label' => 'Anexo da Planilha de Pontuação'])
<input type="file" class="input-group-text" name="anexoPlanilha" placeholder="anexoPlanoTrabalho" required/>
<input type="file" class="input-group-text" name="anexoLattesCoordenador" placeholder="anexoPlanoTrabalho" required/>
@endcomponent
</div>
<div class="form-group col-md-6">
......
resources/views/evento/formulario/participantes.blade.php
View file @ 79094c42
......@@ -33,10 +33,11 @@
<div class="collapse" id="collapseParticipante">
<div class="container">
<div class="row">
<input type="hidden" name="funcaoParticipante[]" value="4">
<div class="col-md-12"><h5>Dados do participante</h5></div>
<div class="col-6">
@component('componentes.input', ['label' => 'Nome completo'])
<input type="text" class="form-control" name="nomeParticipante[]" placeholder="Nome Completo" required />
<input type="text" class="form-control " name="nomeParticipante[]" placeholder="Nome Completo" required />
@endcomponent
</div>
<div class="col-6">
......@@ -46,28 +47,28 @@
</div>
<div class="col-6">
@component('componentes.input', ['label' => 'Data de nascimento'])
<input type="date" class="form-control" name="data_de_nascimento" placeholder="Data de nascimento" required/>
<input type="date" class="form-control" name="data_de_nascimento[]" placeholder="Data de nascimento" required/>
@endcomponent
</div>
<div class="col-6">
@component('componentes.input', ['label' => 'CPF'])
<input type="text" class="form-control" name="cpf" placeholder="CPF" required/>
@component('componentes.input', ['label' => 'CPF', 'class' => 'cpf'])
<input type="text" class="form-control cpf" name="cpf[]" placeholder="CPF" required/>
@endcomponent
</div>
<div class="col-6">
@component('componentes.input', ['label' => 'RG'])
<input type="text" class="form-control" name="rg" placeholder="RG" required/>
<input type="text" class="form-control" name="rg[]" placeholder="RG" required/>
@endcomponent
</div>
<div class="col-6">
@component('componentes.input', ['label' => 'Celular'])
<input type="text" class="form-control" name="celular" placeholder="Celular" required/>
<input type="text" class="form-control" name="celular[]" placeholder="Celular" required/>
@endcomponent
</div>
<div class="col-md-12"><h5>Endereço</h5></div>
<div class="col-6">
@component('componentes.input', ['label' => 'CEP'])
<input type="text" class="form-control" name="cep" placeholder="CEP" required/>
<input type="text" class="form-control" name="cep[]" placeholder="CEP" required/>
@endcomponent
</div>
......@@ -83,7 +84,7 @@
</div>
<div class="col-6">
@component('componentes.input', ['label' => 'Cidade'])
<input type="text" class="form-control" name="cidade" placeholder="Cidade" required/>
<input type="text" class="form-control" name="cidade[]" placeholder="Cidade" required/>
@endcomponent
</div>
<div class="col-6">
......@@ -122,7 +123,7 @@
<select name="turno[]" class="form-control" required>
<option value="" disabled selected>-- Selecione uma opção --</option>
@foreach ($enum_turno as $key => $value)
<option @if(old('turno') == $value ) selected @endif value="{{ $key }}">{{ $value }}</option>
<option @if(old('turno') == $value ) selected @endif value="{{ $value }}">{{ $value }}</option>
@endforeach
</select>
@endcomponent
......
resources/views/evento/submeterTrabalho.blade.php
View file @ 79094c42
......@@ -4,7 +4,7 @@
<div>
{{-- action="{{route('trabalho.store')}}" --}}
<form method="POST" id="criarProjetoForm" action="#" enctype="multipart/form-data" >
<form method="POST" id="criarProjetoForm" action="{{route('trabalho.store')}}" enctype="multipart/form-data" >
@csrf
<input type="hidden" name="editalId" value="{{$edital->id}}">
......@@ -110,8 +110,8 @@
buttonMais.addEventListener("click", (e) => {
if(parts.children.length >= 3){
// console.log("{{ $edital->numParticipantes }}")
if(parts.children.length >= "{{ $edital->numParticipantes }}"){
alert('Limite de participante.')
}else{
var cln = participante.cloneNode(true);
......@@ -124,7 +124,7 @@
let select = cln.children[i].querySelectorAll('select')[index];
if(select){
let selectName = select.getAttributeNode("name").value;
console.log(select.getAttributeNode("name").value)
// console.log(select.getAttributeNode("name").value)
select.getAttributeNode("name").value = selectName + '[' + contador + ']';
}
......
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