Skip to content

GitLab

Commit 0e8df8db authored by Yuri Resende's avatar Yuri Resende
Browse files

Atualizando o fork

parent 6295b7c8
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/AdministradorController.php
View file @ 0e8df8db
...@@ -1302,4 +1302,4 @@ class AdministradorController extends Controller ...@@ -1302,4 +1302,4 @@ class AdministradorController extends Controller
return $pdf->setPaper('a4')->stream('Resultados.pdf'); return $pdf->setPaper('a4')->stream('Resultados.pdf');
} }
} }
\ No newline at end of file
app/Http/Controllers/AvaliacaoRelatorioController.php
View file @ 0e8df8db
...@@ -17,13 +17,6 @@ use Auth; ...@@ -17,13 +17,6 @@ use Auth;
class AvaliacaoRelatorioController extends Controller class AvaliacaoRelatorioController extends Controller
{ {
public function create()
{
}
public function listarUser($id){ public function listarUser($id){
$avaliacao = AvaliacaoRelatorio::find($id); $avaliacao = AvaliacaoRelatorio::find($id);
...@@ -66,8 +59,10 @@ class AvaliacaoRelatorioController extends Controller ...@@ -66,8 +59,10 @@ class AvaliacaoRelatorioController extends Controller
public function criar(Request $request){ public function criar(Request $request){
$validatedData = $request->validate([ $validatedData = $request->validate([
'nota' => ['required'], 'nota' => ['required'],
'nota_apresentacao' => ['required'],
'comentario' => ['required'], 'comentario' => ['required'],
]); ]);
$avaliacao = AvaliacaoRelatorio::find($request->avaliacao_id); $avaliacao = AvaliacaoRelatorio::find($request->avaliacao_id);
if($request->avaliacaoArq !=null){ if($request->avaliacaoArq !=null){
...@@ -77,6 +72,7 @@ class AvaliacaoRelatorioController extends Controller ...@@ -77,6 +72,7 @@ class AvaliacaoRelatorioController extends Controller
} }
$plano = Arquivo::find($request->plano_id); $plano = Arquivo::find($request->plano_id);
$avaliacao->nota = $request->nota; $avaliacao->nota = $request->nota;
$avaliacao->nota_apresentacao = $request->nota_apresentacao;
$avaliacao->comentario = $request->comentario; $avaliacao->comentario = $request->comentario;
$avaliacao->update(); $avaliacao->update();
......
database/migrations/2023_03_03_160243_add_nota_apresentacao_to_avaliacao_relatorios.php 0 → 100644
View file @ 0e8df8db
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddNotaApresentacaoToAvaliacaoRelatorios extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('avaliacao_relatorios', function (Blueprint $table) {
$table->float('nota_apresentacao')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('avaliacao_relatorios', function (Blueprint $table) {
$table->dropColumn('nota_apresentacao');
});
}
}
resources/views/administrador/analisarProposta.blade.php
View file @ 0e8df8db
...@@ -2282,4 +2282,4 @@ ...@@ -2282,4 +2282,4 @@
} }
} }
</script> </script>
@endsection @endsection
\ No newline at end of file
resources/views/avaliacaoRelatorio/listar.blade.php
View file @ 0e8df8db
...@@ -72,18 +72,25 @@ ...@@ -72,18 +72,25 @@
src="{{asset('img/icons/pdf.ico')}}" style="width:40px" alt=""></a> src="{{asset('img/icons/pdf.ico')}}" style="width:40px" alt=""></a>
@endif @endif
@if($avaliacao->tipo == "Parcial") @if($avaliacao->tipo == "Parcial")
<div style="margin-left: 25px"> <div style="margin-left: 120px">
<label for="anexoProjeto" class="col-form-label font-tam" <label for="anexoProjeto" class="col-form-label font-tam"
style="font-weight: bold" style="font-weight: bold">{{ __('Relatório Parcial: ') }}
>{{ __('Relatório Parcial: ') }}</label> </label>
@if($avaliacao->plano->relatorioParcial) @if($avaliacao->plano->relatorioParcial)
<a href="{{ route('baixar.documentosParticipante', ['pathDocumento' => $avaliacao->plano->relatorioParcial]) }}"><img <a href="{{ route('baixar.documentosParticipante', ['pathDocumento' => $avaliacao->plano->relatorioParcial]) }}"><img
src="{{asset('img/icons/pdf.ico')}}" style="width:40px" alt=""></a> src="{{asset('img/icons/pdf.ico')}}" style="width:40px" alt=""></a>
@else @else
<a><i class="fas fa-times-circle fa-2x"></i></a> <a><i class="fas fa-times-circle fa-2x"></i></a>
@endif @endif
<label for="lattes" class="col-form-label font-tam"
style="font-weight: bold;margin-right: 5px;margin-left: 120px;">{{ __('Formulário de Avaliação: ') }}</label>
@if($evento->formAvaliacaoRelatorio != null)
<a href="{{route('download', ['file' => $evento->formAvaliacaoRelatorio])}}" target="_new" >
<img class="" src="{{asset('img/icons/pdf.ico')}}" style="width:40px">
</a>
@endif
</div> </div>
<div class="col-sm-12"> <div class="col-sm-12">
<form id="formRelatFinal" method="post" <form id="formRelatFinal" method="post"
...@@ -97,43 +104,44 @@ ...@@ -97,43 +104,44 @@
value="{{$avaliacao->plano->id}}"> value="{{$avaliacao->plano->id}}">
<input type="hidden" name="user_id" value="{{Auth::user()->id}}"> <input type="hidden" name="user_id" value="{{Auth::user()->id}}">
<div class="col-12" style="padding-left: 0px">
<div class="row"> <div class="col-12" style="padding-left: 0px; margin-top: 10px ">
<div class="col-sm-6 row">
<div class="row" >
<div class="col-sm-4 row">
<label for="lattes" class="col-form-label font-tam" <label for="lattes" class="col-form-label font-tam"
style="font-weight: bold;padding-right: 10px">{{ __('Nota: ') }}</label> style="font-weight: bold;padding-right: 10px">{{ __('Nota do relatório escrito: ') }}</label>
<input class="form-control" name="nota" type="number" step="0.01" <input class="form-control" name="nota" type="number" step="0.01"
style="width: 70px;" style="width: 70px;"
required
@if($avaliacao->nota != null) value="{{$avaliacao->nota}}" @endif> @if($avaliacao->nota != null) value="{{$avaliacao->nota}}" @endif>
</div> </div>
</div> <div class="col row">
<div class="row" style="margin-top: 10px"> <label for="lattes" class="col-form-label font-tam"
<label for="lattes" class="col-form-label font-tam" style="font-weight: bold;padding-right: 10px">{{ __('Nota da apresentação: ') }}</label>
style="font-weight: bold;margin-right: 5px;">{{ __('Formulário de Avaliação: ') }}</label>
@if($evento->formAvaliacaoRelatorio != null) <input class="form-control" name="nota_apresentacao" type="number" step="0.01"
<a href="{{route('download', ['file' => $evento->formAvaliacaoRelatorio])}}" target="_new" > style="width: 70px;"
<img class="" src="{{asset('img/icons/pdf.ico')}}" style="width:40px"> required
</a> @if($avaliacao->nota != null) value="{{$avaliacao->nota_apresentacao}}" @endif>
@endif </div>
</div> <div class="col-5 row" style="margin-right: 40px;">
<div class="row" style="margin-top: 10px"> <label for="lattes" class="col-form-label font-tam"
<label for="lattes" class="col-form-label font-tam" style="font-weight: bold;margin-right: 5px;">{{ __('Arquivo: ') }}</label>
style="font-weight: bold;margin-right: 5px;">{{ __('Arquivo: ') }}</label> @if($avaliacao->arquivoAvaliacao != null)
@if($avaliacao->arquivoAvaliacao != null) <a href="{{route('download', ['file' => $avaliacao->arquivoAvaliacao])}}" target="_new" >
<a href="{{route('download', ['file' => $avaliacao->arquivoAvaliacao])}}" target="_new" > <img class="" src="{{asset('img/icons/pdf.ico')}}" style="width:40px">
<img class="" src="{{asset('img/icons/pdf.ico')}}" style="width:40px"> </a>
</a> @endif
@endif <input type="file" class="input-group-text" name="avaliacaoArq" accept=".pdf" id="avaliacaoArq"/>
<input type="file" class="input-group-text" name="avaliacaoArq" accept=".pdf" id="avaliacaoArq"/>
@error('avaliacaoArq')
@error('avaliacaoArq') <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> </span>
</span> @enderror
@enderror </div>
</div> </div>
<div class="row"> <div class="row">
...@@ -141,14 +149,18 @@ ...@@ -141,14 +149,18 @@
style="font-weight: bold">{{ __('Comentário: ') }}</label> style="font-weight: bold">{{ __('Comentário: ') }}</label>
</div> </div>
<div class="row"> <div class="row">
<textarea class="col-md-11" minlength="20" id="comentario" <textarea class="col-md-12" minlength="20" id="comentario"
name="comentario" name="comentario"
style="border-radius:5px 5px 0 0;height: 71px;" style="border-radius:5px 5px 0 0;height: 150px;"
required>@if($avaliacao->comentario != null){{$avaliacao->comentario}}@endif</textarea> required>@if($avaliacao->comentario != null){{$avaliacao->comentario}}@endif</textarea>
</div>
<div class="col-md-1" style="flex: 1;align-self: flex-end;"> <div class="row justify-content-end" style="margin-top: 10px">
<div class="col-1">
<button type="submit" class="btn btn-success" style="height: 40px">Salvar</button> <button type="submit" class="btn btn-success" style="height: 40px">Salvar</button>
</div> </div>
<div>
<a href="{{ route('planos.avaliacoes.index') }}" class="btn btn-secondary">Voltar</a>
</div>
</div> </div>
</div> </div>
<br> <br>
...@@ -159,7 +171,7 @@ ...@@ -159,7 +171,7 @@
{{--Relatorio FInal--}} {{--Relatorio FInal--}}
@else @else
<div style="margin-left: 25px"> <div style="margin-left: 120px">
<label for="anexoProjeto" class="col-form-label font-tam" <label for="anexoProjeto" class="col-form-label font-tam"
style="font-weight: bold" style="font-weight: bold"
>{{ __('Relatório Final: ') }}</label> >{{ __('Relatório Final: ') }}</label>
...@@ -169,6 +181,14 @@ ...@@ -169,6 +181,14 @@
@else @else
<a><i class="fas fa-times-circle fa-2x"></i></a> <a><i class="fas fa-times-circle fa-2x"></i></a>
@endif @endif
<label for="lattes" class="col-form-label font-tam"
style="font-weight: bold;margin-right: 5px; margin-left: 120px;">{{ __('Formulário de Avaliação: ') }}</label>
@if($evento->formAvaliacaoRelatorio != null)
<a href="{{route('download', ['file' => $evento->formAvaliacaoRelatorio])}}" target="_new" >
<img class="" src="{{asset('img/icons/pdf.ico')}}" style="width:40px">
</a>
@endif
</div> </div>
<div class="col-sm-12"> <div class="col-sm-12">
<form id="formRelatFinal" method="post" <form id="formRelatFinal" method="post"
...@@ -182,49 +202,63 @@ ...@@ -182,49 +202,63 @@
value="{{$avaliacao->plano->id}}"> value="{{$avaliacao->plano->id}}">
<input type="hidden" name="user_id" value="{{Auth::user()->id}}"> <input type="hidden" name="user_id" value="{{Auth::user()->id}}">
<div class="col-12" style="padding-left: 0px"> <div class="col-12" style="padding-left: 0px; margin-top: 10px ">
<div class="row"> <div class="row">
<div class="col-sm-6 row"> <div class="col-sm-4 row">
<label for="lattes" class="col-form-label font-tam" <label for="lattes" class="col-form-label font-tam"
style="font-weight: bold;padding-right: 10px">{{ __('Nota: ') }}</label> style="font-weight: bold;padding-right: 10px">{{ __('Nota do relatório escrito: ') }}</label>
<input class="form-control" name="nota" type="number" step="0.01" <input class="form-control" name="nota" type="number" step="0.01"
style="width: 70px;" style="width: 70px;" required
@if($avaliacao->nota != null) value="{{$avaliacao->nota}}" @endif> @if($avaliacao->nota != null) value="{{$avaliacao->nota}}" @endif>
</div> </div>
</div> <div class="col row">
<div class="row" style="margin-top: 10px"> <label for="lattes" class="col-form-label font-tam"
<label for="lattes" class="col-form-label font-tam" style="font-weight: bold;padding-right: 10px">{{ __('Nota da apresentação: ') }}</label>
style="font-weight: bold;margin-right: 5px;">{{ __('Arquivo: ') }}</label>
<input class="form-control" name="nota_apresentacao" type="number" step="0.01"
@if($avaliacao->arquivoAvaliacao != null) style="width: 70px;" required
<a href="{{route('download', ['file' => $avaliacao->arquivoAvaliacao])}}" target="_new" > @if($avaliacao->nota_apresentacao != null) value="{{$avaliacao->nota_apresentacao}}" @endif>
<img class="" src="{{asset('img/icons/pdf.ico')}}" style="width:40px"> </div>
</a> <div class="col-5 row" style="margin-right: 70px;">
@endif <label for="lattes" class="col-form-label font-tam"
style="font-weight: bold;margin-right: 5px;">{{ __('Arquivo: ') }}</label>
<input type="file" class="input-group-text" name="avaliacaoArq" accept=".pdf" id="avaliacaoArq"/>
@error('avaliacaoArq') @if($avaliacao->arquivoAvaliacao != null)
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block"> <a href="{{route('download', ['file' => $avaliacao->arquivoAvaliacao])}}" target="_new" >
<strong>{{ $message }}</strong> <img class="" src="{{asset('img/icons/pdf.ico')}}" style="width:40px">
</span> </a>
@enderror @endif
</div>
<input type="file" class="input-group-text" name="avaliacaoArq" accept=".pdf" id="avaliacaoArq"/>
@error('avaliacaoArq')
<span class="invalid-feedback" role="alert" style="overflow: visible; display:block">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
</div>
<div class="row"> <div class="row">
<label for="lattes" class="col-form-label font-tam" <label for="lattes" class="col-form-label font-tam"
style="font-weight: bold">{{ __('Comentário: ') }}</label> style="font-weight: bold">{{ __('Comentário: ') }}</label>
</div> </div>
<div class="row"> <div class="row">
<textarea class="col-md-11" minlength="20" id="comentario" <textarea class="col-md-12" minlength="20" id="comentario"
name="comentario" name="comentario" style="border-radius:5px 5px 0 0;height: 150px;"
style="border-radius:5px 5px 0 0;height: 71px;" required>@if($avaliacao->comentario){{$avaliacao->comentario}}@endif
required>@if($avaliacao->comentario){{$avaliacao->comentario}}@endif</textarea> </textarea>
<div class="col-md-1" style="flex: 1;align-self: flex-end;"> </div>
<div class="row justify-content-end" style="margin-top: 10px">
<div class="col-1">
<button type="submit" class="btn btn-success" style="height: 40px">Salvar</button> <button type="submit" class="btn btn-success" style="height: 40px">Salvar</button>
</div> </div>
<div>
<a href="{{ route('planos.avaliacoes.index') }}" class="btn btn-secondary">Voltar</a>
</div>
</div> </div>
</div> </div>
<br> <br>
......
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