Unverified Commit d80f9576 authored by Laboratório Multidisciplinar de Tecnologias Sociais's avatar Laboratório Multidisciplinar de Tecnologias Sociais Committed by GitHub
Browse files

Merge pull request #182 from GuilhermeGz/master

Alterações do sistema
parents 7d3649cf 1cb321f0
...@@ -19,7 +19,6 @@ class CreateSubstituicaosTable extends Migration ...@@ -19,7 +19,6 @@ class CreateSubstituicaosTable extends Migration
$table->enum('tipo', ['Completa', 'TrocarPlano', 'ManterPlano']); $table->enum('tipo', ['Completa', 'TrocarPlano', 'ManterPlano']);
$table->text('justificativa')->nullable(); $table->text('justificativa')->nullable();
$table->string('causa')->nullable(); $table->string('causa')->nullable();
$table->text('observacao')->nullable();
$table->unsignedBigInteger('trabalho_id'); $table->unsignedBigInteger('trabalho_id');
$table->unsignedBigInteger('participanteSubstituido_id'); $table->unsignedBigInteger('participanteSubstituido_id');
......
...@@ -17,7 +17,6 @@ class AlterTableParticipantes extends Migration ...@@ -17,7 +17,6 @@ class AlterTableParticipantes extends Migration
$table->string('anexoTermoCompromisso')->nullable(); $table->string('anexoTermoCompromisso')->nullable();
$table->string('anexoComprovanteMatricula')->nullable(); $table->string('anexoComprovanteMatricula')->nullable();
$table->string('anexoLattes')->nullable(); $table->string('anexoLattes')->nullable();
$table->string('anexoComprovanteBancario')->nullable();
}); });
} }
...@@ -32,7 +31,6 @@ class AlterTableParticipantes extends Migration ...@@ -32,7 +31,6 @@ class AlterTableParticipantes extends Migration
$table->dropColumn('anexoTermoCompromisso'); $table->dropColumn('anexoTermoCompromisso');
$table->dropColumn('anexoComprovanteMatricula'); $table->dropColumn('anexoComprovanteMatricula');
$table->dropColumn('anexoLattes'); $table->dropColumn('anexoLattes');
$table->dropColumn('anexoComprovanteBancario');
}); });
} }
} }
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AlterTableParticipantes3 extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('participantes', function (Blueprint $table) {
$table->string('anexoComprovanteBancario')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('participantes', function (Blueprint $table) {
$table->dropColumn('anexoComprovanteBancario');
});
}
}
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AlterTableSubstituicaos extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('substituicaos', function (Blueprint $table) {
$table->text('observacao')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('substituicaos', function (Blueprint $table) {
$table->dropColumn('observacao');
});
}
}
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<input type="hidden" name="evento_id" value="{{ $evento->id }}"> <input type="hidden" name="evento_id" value="{{ $evento->id }}">
<div class="form-group"> <div class="form-group">
<label for="exampleFormControlSelect2">Selecione o(s) avaliador(es) para esse projeto</label> <label for="exampleFormControlSelect2">Selecione o(s) avaliador(es) para esse projeto</label>
<select name="avaliadores_id[]" multiple class="form-control" id="exampleFormControlSelect2"> <select name="avaliadores_id[]" multiple class="form-control" id="exampleFormControlSelect2" required>
@foreach ($trabalho->aval as $avaliador) @foreach ($trabalho->aval as $avaliador)
<option value="{{ $avaliador->id }}" > {{ $avaliador->user->name }} ({{$avaliador->area->nome ?? 'Indefinida'}}) </option> <option value="{{ $avaliador->id }}" > {{ $avaliador->user->name }} ({{$avaliador->area->nome ?? 'Indefinida'}}) </option>
@endforeach @endforeach
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="form-group col-md-12" style="margin-top: 10px"> <div class="form-group col-md-12" style="margin-top: 10px">
<label for="titulo" class="col-form-label">{{ __('Nome do Projeto') }} <span style="color: red; font-weight:bold">*</span></label> <label for="titulo" class="col-form-label">{{ __('Nome do Projeto') }} <span style="color: red; font-weight:bold">*</span></label>
<input id="titulo" type="text" class="form-control @error('titulo') is-invalid @enderror" name="titulo" placeholder="Digite o nome do projeto" value="{{old('titulo')}}" autocomplete="titulo" maxlength="255" > <input id="titulo" type="text" class="form-control @error('titulo') is-invalid @enderror" name="titulo" placeholder="Digite o nome do projeto" value="" autocomplete="titulo" maxlength="255" >
<span style="color: red; font-size: 12px" id="caracsRestantestitulo"> <span style="color: red; font-size: 12px" id="caracsRestantestitulo">
</span> </span>
@error('titulo') @error('titulo')
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="linkGrupo">Link do grupo de pesquisa</label> <label for="linkGrupo">Link do grupo de pesquisa</label>
<input class="form-control @error('linkGrupoPesquisa') is-invalid @enderror" type="url" name="linkGrupoPesquisa" <input class="form-control @error('linkGrupoPesquisa') is-invalid @enderror" type="url" name="linkGrupoPesquisa"
value="{{old('linkGrupoPesquisa')}}" > value="" >
<small>Ex.: http://dgp.cnpq.br/dgp/espelhogrupo/228363</small> <small>Ex.: http://dgp.cnpq.br/dgp/espelhogrupo/228363</small>
@error('linkGrupoPesquisa') @error('linkGrupoPesquisa')
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="pontuacaoPlanilha">Valor da planilha de pontuação <span style="color: red; font-weight:bold">*</span></label> <label for="pontuacaoPlanilha">Valor da planilha de pontuação <span style="color: red; font-weight:bold">*</span></label>
<input class="form-control @error('pontuacaoPlanilha') is-invalid @enderror" type="number" min="0" step=".01" name="pontuacaoPlanilha" <input class="form-control @error('pontuacaoPlanilha') is-invalid @enderror" type="number" min="0" step=".01" name="pontuacaoPlanilha"
value="{{old('pontuacaoPlanilha')}}" > value="" >
@error('pontuacaoPlanilha') @error('pontuacaoPlanilha')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block"> <span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
......
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