From da6b6a2690151292083967e97282bf73335d28a4 Mon Sep 17 00:00:00 2001
From: victorMendes18 <victorfran18@gmail.com>
Date: Wed, 12 Apr 2023 23:56:20 -0300
Subject: [PATCH] finalizando aprovar

---
 app/Http/Controllers/AvaliadorController.php  | 11 +--
 app/Models/Avaliacao.php                      |  2 +-
 ...umn_horas_reajuste_in_table_avaliacao.php} |  4 +-
 .../pad/avaliacao/taferas_professor.blade.php | 86 +++++++++++--------
 4 files changed, 58 insertions(+), 45 deletions(-)
 rename database/migrations/{2023_04_12_230101_add_feedback_avaliacao_campos.php => 2023_04_13_024157_add_column_horas_reajuste_in_table_avaliacao.php} (81%)

diff --git a/app/Http/Controllers/AvaliadorController.php b/app/Http/Controllers/AvaliadorController.php
index 2e135ad..2c4a407 100644
--- a/app/Http/Controllers/AvaliadorController.php
+++ b/app/Http/Controllers/AvaliadorController.php
@@ -35,7 +35,7 @@ class AvaliadorController extends Controller
                 'professor_id' => ['required', 'integer'],
                 'atividade_type' => ['required', 'integer'],
                 'descricao' => ['nullable', 'string'],
-                'hora_reajuste' => ['nullable', 'double'],
+                'hora_reajuste' => ['nullable', 'integer'],
             ],
             [
                 'required' => 'O campo de :attribute é obrigatório',
@@ -56,15 +56,10 @@ class AvaliadorController extends Controller
             $avaliacao->status = $req->status;
             $avaliacao->avaliador_id = $user->id;
             $avaliacao->descricao = $req->descricao ? $req->descricao : NULL;
-            $avaliacao->hora_reajuste = $req->hora_reajuste;
+            $avaliacao->horas_reajuste = $req->hora_reajuste;
 
             if ($avaliacao->save()) {
-
-                dd($avaliacao);
-                //return view('pad.avaliacao.dimensao.ensino', [
-                //    'index_menu' => MenuItemsAvaliador::PADs,
-                //    'user_pad_id' =>  1
-                //]);
+                return redirect()->back();
             }
         }
     }
diff --git a/app/Models/Avaliacao.php b/app/Models/Avaliacao.php
index 1acd3c7..6541578 100644
--- a/app/Models/Avaliacao.php
+++ b/app/Models/Avaliacao.php
@@ -11,7 +11,7 @@ class Avaliacao extends Model
 
     protected $table = 'avaliacao';
 
-    protected $fillable = ['tarefa_id', 'avaliador_id', 'type', 'status', 'descricao', 'ch_semanal'];
+    protected $fillable = ['tarefa_id', 'avaliador_id', 'type', 'status', 'descricao', 'ch_semanal', 'hora_reajuste'];
 
 
     public function tarefa() {
diff --git a/database/migrations/2023_04_12_230101_add_feedback_avaliacao_campos.php b/database/migrations/2023_04_13_024157_add_column_horas_reajuste_in_table_avaliacao.php
similarity index 81%
rename from database/migrations/2023_04_12_230101_add_feedback_avaliacao_campos.php
rename to database/migrations/2023_04_13_024157_add_column_horas_reajuste_in_table_avaliacao.php
index f4f4fa9..34ad5ea 100644
--- a/database/migrations/2023_04_12_230101_add_feedback_avaliacao_campos.php
+++ b/database/migrations/2023_04_13_024157_add_column_horas_reajuste_in_table_avaliacao.php
@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class AddFeedbackAvaliacaoCampos extends Migration
+class AddColumnHorasReajusteInTableAvaliacao extends Migration
 {
     /**
      * Run the migrations.
@@ -14,7 +14,7 @@ class AddFeedbackAvaliacaoCampos extends Migration
     public function up()
     {
         Schema::table('avaliacao', function (Blueprint $table) {
-            $table->double('horas_reajuste')->nullable(true);
+            $table->integer('horas_reajuste')->nullable(true);
         });
     }
 
diff --git a/resources/views/pad/avaliacao/taferas_professor.blade.php b/resources/views/pad/avaliacao/taferas_professor.blade.php
index b50df43..cee7d4e 100644
--- a/resources/views/pad/avaliacao/taferas_professor.blade.php
+++ b/resources/views/pad/avaliacao/taferas_professor.blade.php
@@ -31,18 +31,21 @@
                         <span class="fw-bold ">CH. Semanal: </span><span class="card-text">{{isset($tarefa["ch_semanal"])?$tarefa["ch_semanal"]:"--"}}</span><br>
 
                         <div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end">
-                            <button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#modal_avaliacao" onclick="setaDadosModalAvaliacao($tarefa['id'], $professor['id'], 6, )">
+                            <button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#modal_avaliacao" style="height: 38px;" onclick='setaDadosModalAvaliacao("{{$tarefa["id"]}}", "{{$professor["id"]}}", "6", "{{$tarefa["tipo_atividade"]}}")'>
                                 Reprovar
                             </button>
 
                             <span>&nbsp;&nbsp;</span>
-                            @include('components.buttons.btn-aprovar', [
-                                'route' => route('avaliador_avaliar'),
-                                'class' => 'ml-2',
-                                'content' => 'Aprovar',
-                                'id' => '',
-                            ])
 
+                            <form action="{{route('avaliador_avaliar')}}" method="POST">
+                                @csrf
+                                @method("PUT")
+                                <input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$tarefa["id"]}}">
+                                <input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$professor["id"]}}">
+                                <input type="hidden" name="status" id="status_aprovar" value='7'>
+                                <input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$tarefa["tipo_atividade"]}}">
+                                <input type="submit" class="btn btn-primary" value="Aprovar">
+                            </form>
                         </div>
                     </div>
                 </div><br>
@@ -66,17 +69,21 @@
                         <span class="fw-bold ">CH. Semanal: </span><span class="card-text">{{isset($tarefa["ch_semanal"])?$tarefa["ch_semanal"]:"--"}}</span><br>
 
                         <div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end">
-                            <button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#modal_avaliacao" onclick="setaDadosModalAvaliacao('a', 'b')">
+                            <button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#modal_avaliacao" onclick='setaDadosModalAvaliacao("{{$tarefa["id"]}}", "{{$professor["id"]}}", "6", "{{$tarefa["tipo_atividade"]}}")'>
                                 Reprovar
                             </button>
 
                             <span>&nbsp;&nbsp;</span>
-                            @include('components.buttons.btn-aprovar', [
-                                'route' => route('avaliador_avaliar'),
-                                'class' => 'ml-2',
-                                'content' => 'Aprovar',
-                                'id' => '',
-                            ])
+
+                            <form action="{{route('avaliador_avaliar')}}" method="POST">
+                                @csrf
+                                @method("PUT")
+                                <input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$tarefa["id"]}}">
+                                <input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$professor["id"]}}">
+                                <input type="hidden" name="status" id="status_aprovar" value='7'>
+                                <input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$tarefa["tipo_atividade"]}}">
+                                <input type="submit" class="btn btn-primary" value="Aprovar">
+                            </form>
 
                         </div>
                     </div>
@@ -101,17 +108,21 @@
                         <span class="fw-bold ">CH. Semanal: </span><span class="card-text">{{isset($tarefa["ch_semanal"])?$tarefa["ch_semanal"]:"--"}}</span><br>
 
                         <div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end">
-                            <button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#modal_avaliacao" onclick="setaDadosModalAvaliacao('a', 'b')">
+                            <button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#modal_avaliacao" onclick='setaDadosModalAvaliacao("{{$tarefa["id"]}}", "{{$professor["id"]}}", "6", "{{$tarefa["tipo_atividade"]}}")'>
                                 Reprovar
                             </button>
 
                             <span>&nbsp;&nbsp;</span>
-                            @include('components.buttons.btn-aprovar', [
-                                'route' => route('avaliador_avaliar'),
-                                'class' => 'ml-2',
-                                'content' => 'Aprovar',
-                                'id' => '',
-                            ])
+
+                            <form action="{{route('avaliador_avaliar')}}" method="POST">
+                                @csrf
+                                @method("PUT")
+                                <input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$tarefa["id"]}}">
+                                <input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$professor["id"]}}">
+                                <input type="hidden" name="status" id="status_aprovar" value='7'>
+                                <input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$tarefa["tipo_atividade"]}}">
+                                <input type="submit" class="btn btn-primary" value="Aprovar">
+                            </form>
 
                         </div>
                     </div>
@@ -136,17 +147,21 @@
                         <span class="fw-bold ">CH. Semanal: </span><span class="card-text">{{isset($tarefa["ch_semanal"])?$tarefa["ch_semanal"]:"--"}}</span><br>
 
                         <div style="width: 100%; " class="btns-avaliar mt-5 d-flex justify-content-end">
-                            <button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#modal_avaliacao" onclick="setaDadosModalAvaliacao('a', 'b')">
+                            <button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#modal_avaliacao" onclick='setaDadosModalAvaliacao("{{$tarefa["id"]}}", "{{$professor["id"]}}", "6", "{{$tarefa["tipo_atividade"]}}")'>
                                 Reprovar
                             </button>
 
                             <span>&nbsp;&nbsp;</span>
-                            @include('components.buttons.btn-aprovar', [
-                                'route' => route('avaliador_avaliar'),
-                                'class' => 'ml-2',
-                                'content' => 'Aprovar',
-                                'id' => '',
-                            ])
+
+                            <form action="{{route('avaliador_avaliar')}}" method="POST">
+                                @csrf
+                                @method("PUT")
+                                <input type="hidden" name="tarefa_id" id="tarefa_id_aprovar" value="{{$tarefa["id"]}}">
+                                <input type="hidden" name="professor_id" id="professor_id_aprovar" value="{{$professor["id"]}}">
+                                <input type="hidden" name="status" id="status_aprovar" value='7'>
+                                <input type="hidden" name="atividade_type" id="atividade_type_aprovar" value="{{$tarefa["tipo_atividade"]}}">
+                                <input type="submit" class="btn btn-primary" value="Aprovar">
+                            </form>
 
                         </div>
                     </div>
@@ -164,7 +179,9 @@
                 <span aria-hidden="true">&times;</span>
               </button>
             </div>
-            <form action="#" method="POST">
+            <form action="{{route('avaliador_avaliar')}}" method="POST">
+                @csrf
+                @method("PUT")
                 <input type="hidden" name="tarefa_id" id="tarefa_id">
                 <input type="hidden" name="professor_id" id="professor_id">
                 <input type="hidden" name="status" id="status">
@@ -180,7 +197,7 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-outline-danger">Reprovar</button>
+                    <input type="submit" class="btn btn-outline-danger" value="Reprovar">
                 </div>
             </form>
           </div>
@@ -190,9 +207,10 @@
 @endsection
 
 <script>
-    function setaDadosModalAvaliacao(a, b){
-        document.getElementById('a').value = a;
-        document.getElementById('b').value = b;
-
+    function setaDadosModalAvaliacao(tarefa_id, professor_id, status, atividade_type){
+        document.getElementById('tarefa_id').value = tarefa_id;
+        document.getElementById('professor_id').value = professor_id;
+        document.getElementById('status').value = status;
+        document.getElementById('atividade_type').value = atividade_type;
     }
 </script>
-- 
GitLab