Merge pull request #734 from Thoth2023/develop

Develop

Author: diegocomis

app/Livewire/Conducting/StudySelection/PaperModal.php

@@ -26,7 +26,18 @@ class PaperModal extends Component
 
     public $currentProject;
     public $projectId;
-    public $paper = null;
+    public $paper = [
+        'id_paper' => null,
+        'title' => '',
+        'author' => '',
+        'year' => '',
+        'doi' => '',
+        'url' => '',
+        'data_base' => null,
+        'database_name' => '',
+        'status_selection' => null,
+        'status_description' => 'None',
+    ];
     public $canEdit = false;
 
     public $criterias;
@@ -41,6 +52,7 @@ public function mount()
     {
         $this->projectId = request()->segment(2);
         $this->currentProject = Project::findOrFail($this->projectId);
+
     }
     #[On('showPaper')]
     public function showPaper($paper, $criterias)
@@ -58,13 +70,22 @@ public function showPaper($paper, $criterias)
             ->values()
             ->toArray();
 
-        $this->paper = $paper;
+        // Se showPaper for chamado com o ID do paper, carrega o objeto e converte para array
+        // Se o paper for passado como um array de dados, usa o id_paper
+        $paperId = is_array($paper) ? $paper['id_paper'] : $paper;
+
+        if (!$paperId) {
+            Log::error('showPaper called without a valid paper ID or data.');
+            return;
+        }
+
+        $this->paper = Papers::where('id_paper', $paperId)->first()->toArray();
 
         $databaseName = DB::table('data_base')
             ->where('id_database', $this->paper['data_base'])
             ->value('name');
 
-        $this->paper['database_name'] = $databaseName;
+        $this->paper['database_name'] = $databaseName ?? 'Unknown';
 
         // Buscar o membro específico para o projeto atual
         $member = Member::where('id_user', auth()->user()->id)
@@ -80,7 +101,7 @@ public function showPaper($paper, $criterias)
         $this->temp_selected_criterias = $this->selected_criterias;
 
         //status selecionado com base no status salvo no banco de dados
-        $this->selected_status = $this->paper['status_description'];
+        $this->selected_status = $this->getPaperStatusDescription($this->paper['status_selection']);
 
         // Carregar a nota existente
         $paperSelection = PapersSelection::where('id_paper', $this->paper['id_paper'])
@@ -200,24 +221,15 @@ public function saveSelectedCriterias()
         $this->selected_criterias = $this->temp_selected_criterias;
 
         // Atualizar o status do paper
-
-        $criteria = Criteria::find(reset($addedCriterias));
-        if ($criteria) {
+        $criterias = Criteria::whereIn('id_criteria', $this->selected_criterias)->get();
+        foreach ($criterias as $criteria) {
             $this->updatePaperStatus($criteria->type);
         }
-        /*
-        $criteria = null;
-        if (!empty($addedCriterias)) {
-            $criteria = Criteria::find(reset($addedCriterias));
-        }
-
-        if ($criteria) {
-            $this->updatePaperStatus($criteria->type);
-        }*/
 
         session()->flash('successMessage', 'Critérios salvos com sucesso');
         $this->dispatch('show-success');
         $this->dispatch('refreshPaperStatus');
+
     }
 
     // Método auxiliar para obter a descrição do status
@@ -284,6 +296,12 @@ private function updatePaperStatus($type)
             if ($member->level == 1) {
                 Papers::where('id_paper', $id_paper)->update(['status_selection' => $new_status]);
             }
+            // 🔥 Recarrega o paper atualizado
+            $this->paper = Papers::where('id_paper', $id_paper)->first()->toArray();
+            $this->paper['database_name'] = DB::table('data_base')
+                ->where('id_database', $this->paper['data_base'])
+                ->value('name') ?? '';
+
             session()->forget('successMessage');
             session()->flash('successMessage', "Status updated successfully.");
         }

lang/en/pages/user-manager.php

@@ -2,6 +2,7 @@
 
 return [
     'Users' => 'Users',
+    'description' => 'Here you can manage the users registered in the system.',
     'Name' => 'Name',
     'Role' => 'Permissions',
     'super_user' => 'Super User Management',
@@ -13,7 +14,7 @@
     'Edit' => 'Edit',
     'Deactivate' => 'Deactivate',
     'Activate' => 'Activate',
-    'Add_User' => '+ New User',
+    'Add_User' => 'New User',
     'Yes' => 'Yes',
     'No' => 'No',
     'singup_user' => 'Sign Up new user',

lang/pt_BR/pages/user-manager.php

@@ -2,6 +2,7 @@
 
 return[
     'Users' => 'Usuários',
+    'description'=>'Aqui você pode gerenciar os usuários cadastrados no sistema.',
     'Name' => 'Nome',
     'Role' => 'Permissões de Acesso',
     'super_user' => 'Acesso Administrativo',
@@ -13,7 +14,7 @@
     'Edit' => 'Editar',
     'Deactivate' => 'Desativar',
     'Activate' => 'Ativar',
-    'Add_User' => '+ Novo Usuário',
+    'Add_User' => 'Novo Usuário',
     'Yes' => 'Sim',
     'No' => 'Não',
     'singup_user' => 'Cadastrar novo usuário',

resources/views/livewire/conducting/study-selection/paper-modal.blade.php

@@ -23,7 +23,7 @@
                         </div>
                         <div class="col-4">
                             <b>{{ __('project/conducting.study-selection.modal.database' )}}:</b>
-                            <p>{{ $paper['database_name'] }}</p>
+                            <p>{{ $paper['database_name'] ?? ($paper['data_base'] ? 'Loading...' : '—') }}</p>
                         </div>
                         <div class="col-2">
                             <a class="btn py-1 px-3 btn-outline-dark" data-toggle="tooltip" data-original-title="Doi"
@@ -49,8 +49,11 @@
                             $paper['id_paper'], 'projectId' => $this->projectId], key($paper['id_paper']))
                         </div>
 
+                        {{-- @livewire('conducting.study-selection.paper-status', ['paperId' =>
+                        $paper['id_paper'],'projectId' => $this->projectId], key($paper['id_paper']))--}}
+
                         @livewire('conducting.study-selection.paper-status', ['paperId' =>
-                        $paper['id_paper'],'projectId' => $this->projectId], key($paper['id_paper']))
+                            $paper['id_paper'],'projectId' => $this->projectId], key('paper-status-'.$paper['id_paper']))
 
                         @livewire('conducting.study-selection.paper-abstract-keywords', ['paperId' =>
                         $paper['id_paper'], 'projectId' => $this->projectId], key($paper['id_paper']))
@@ -153,7 +156,7 @@
         <div class="modal-dialog modal-dialog-centered" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title" id="successModalLabel">Success</h5>
+                    <h5 class="modal-title" id="successModalLabel">{{ __('project/conducting.study-selection.modal.success' )}}</h5>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">

resources/views/pages/database-manager.blade.php

@@ -1,9 +1,9 @@
-@extends("layouts.app")
+@extends('layouts.app')
 
-@section("content")
-    @include("layouts.navbars.guest.navbar", ["title" => "pages.home.home"])
-	<!-- Page header section for the database manager, displaying title and description -->
-    <div class="container mt-7 mb-3">
+@section('content')
+    <!-- Displays the database management table with options to add, edit, activate or deactivate -->
+    @include('layouts.navbars.auth.topnav', ['title' => __("nav/side.user_manager")])
+    <div class="container mt-4 mb-3">
         <div class="page-header d-flex flex-column pt-4 pb-11 border-radius-lg">
             <div
                 class="row justify-content-center rounded-3 py-4 bg-gradient-faded-dark opacity-8 "