Skip to content

GitLab

Commit 9d690396 authored by unknown's avatar unknown
Browse files

Merge branch 'master' of https://github.com/antonioDurval/submeta

parents 2cba0c73 a2e105d0
Show whitespace changes
Inline Side-by-side
app/Http/Controllers/AvaliacaoRelatorioController.php
View file @ 9d690396
......@@ -65,7 +65,7 @@ class AvaliacaoRelatorioController extends Controller
public function criar(Request $request){
$validatedData = $request->validate([
'nota' => ['required', 'integer',],
'nota' => ['required'],
'comentario' => ['required'],
]);
$avaliacao = AvaliacaoRelatorio::find($request->avaliacao_id);
......
app/Http/Requests/UpdateTrabalho.php
View file @ 9d690396
......@@ -38,6 +38,11 @@ class UpdateTrabalho extends FormRequest
if($this->has('marcado')){
foreach ($this->get('marcado') as $key => $value) {
if( intval($value) == $key){
$participante = null;
if($this->participante_id[$value] != null){
$participante = Participante::find($this->participante_id[$value]);
}
//user
$rules['name.'.$value] = ['required', 'string'];
$rules['email.'.$value] = ['required', 'string'];
......@@ -63,12 +68,19 @@ class UpdateTrabalho extends FormRequest
$rules['media_do_curso.' . $value] = ['required', 'string'];
}
$rules['nomePlanoTrabalho.'.$value] = ['required', 'string'];
$rules['anexoPlanoTrabalho.'.$value] = ['required', 'mimes:pdf'];
if($participante !=null){
$arquivo = Arquivo::where('participanteId',$participante->id)->where('trabalhoId',$projeto->id)->first();
if($arquivo == null || $this->nomePlanoTrabalho[$value] != $arquivo->titulo){
$rules['anexoPlanoTrabalho.'.$value] = ['required', 'mimes:pdf'];
}
}else{
$rules['anexoPlanoTrabalho.'.$value] = ['required', 'mimes:pdf'];
}
}
}
}
// dd($this->all());
if ($this->has('rascunho')) {
$rules = [];
......
database/migrations/2022_08_30_155137_change_avaliacao_relatorios_nota_column_type.php 0 → 100644
View file @ 9d690396
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class ChangeAvaliacaoRelatoriosNotaColumnType extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('avaliacao_relatorios', function (Blueprint $table) {
$table->float('nota')->nullable()->change();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
}
resources/views/administrador/analisarProposta.blade.php
View file @ 9d690396
......@@ -503,7 +503,7 @@
<div class="form-row mt-3">
<div class="col-sm-9"><h5 style="color: #234B8B; font-weight: bold">Relatórios</h5></div>
<div class="col-sm-3 text-sm-right">
@if($flagSubstituicao == 1)
@if($substituicoesPendentes->count() == 0)
<a href="{{route('planos.listar', ['id' => $trabalho->id])}}" class="button">Listar
Relatórios</a>
@else
......@@ -558,8 +558,8 @@
<div class="form-row mt-3">
<div class="col-sm-11"><h5 style="color: #234B8B; font-weight: bold">Avaliações de
Relatórios</h5></div>
@if(($evento->dt_fimRelatorioParcial < $hoje && $hoje<$evento->dt_inicioRelatorioFinal)
|| ($hoje>$evento->dt_fimRelatorioFinal))
@if((($evento->dt_fimRelatorioParcial < $hoje && $hoje<$evento->dt_inicioRelatorioFinal)
|| ($hoje>$evento->dt_fimRelatorioFinal)) && ($substituicoesPendentes->count() == 0) )
<div class="col-md-1 text-sm-right">
<a type="button" value="{{ $trabalho->id }}" id="atribuir1" data-toggle="modal"
data-target="#avaliacaoRelatorioModal">
......@@ -574,6 +574,7 @@
</div>
@endif
<!-- Modal -->
@if($substituicoesPendentes->count() == 0)
<div class="modal fade" id="avaliacaoRelatorioModal" data-bs-backdrop="static"
data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel"
aria-hidden="true" style="overflow-y: auto">
......@@ -582,7 +583,7 @@
<div class="modal-header modal-header-submeta">
<div class="col-md-8" style="padding-left: 0px">
<h5 class="modal-title titulo-table" id="avaliacaoModalLongTitle">
@if(isset($participante->planoTrabalho)) Seleciones o(s) avaliador(es) @else Pendências de Substituição @endif</h5>
@if($substituicoesPendentes->count() == 0) Seleciones o(s) avaliador(es) @else Pendências de Substituição @endif</h5>
</div>
<div class="col-md-4" style="text-align: right">
<button type="button" id="enviarConviteButton" class="btn btn-info"
......@@ -676,6 +677,7 @@
</div>
</div>
</div>
@endif
</div>
<hr style="border-top: 1px solid#1492E6">
......
resources/views/avaliacaoRelatorio/listar.blade.php
View file @ 9d690396
......@@ -98,8 +98,8 @@
<label for="lattes" class="col-form-label font-tam"
style="font-weight: bold;padding-right: 10px">{{ __('Nota: ') }}</label>
<input class="form-control" name="nota" type="number"
style="width: 60px;"
<input class="form-control" name="nota" type="number" step="0.01"
style="width: 70px;"
@if($avaliacao->nota != null) value="{{$avaliacao->nota}}" @endif>
</div>
</div>
......@@ -183,8 +183,8 @@
<label for="lattes" class="col-form-label font-tam"
style="font-weight: bold;padding-right: 10px">{{ __('Nota: ') }}</label>
<input class="form-control" name="nota" type="number"
style="width: 60px;"
<input class="form-control" name="nota" type="number" step="0.01"
style="width: 70px;"
@if($avaliacao->nota != null) value="{{$avaliacao->nota}}" @endif>
</div>
</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