Merge pull request #717 from Thoth2023/develop

Ajustes Modais Study Selection e Quality

Author: diegocomis

resources/views/livewire/conducting/quality-assessment/paper-modal.blade.php

@@ -197,12 +197,12 @@ class="list-group-item d-flex row w-100">
 </div>
 @script
 <script>
-    $(document).ready(function(){
+    $(document).ready(function () {
         $wire.on('show-paper-quality', () => {
             setTimeout(() => {
                 $('#paperModalQuality').modal('show');
-            }, 800); // Delay to ensure the modal is shown after the paper data is set and the modal is ready
-        }); 
+            }, 800);
+        });
 
         // Mostrar o modal de sucesso
         Livewire.on('show-success-quality', () => {
@@ -214,42 +214,29 @@ class="list-group-item d-flex row w-100">
         $('#successModalQuality').on('hidden.bs.modal', function () {
             $('#paperModalQuality').modal('show');
         });
-    });
 
-    // Mostrar toast de sucesso ao invés de um modal
-    Livewire.on('show-success-quality', (message) => {
-        console.log('show-success-quality', message);
-        $('#paperModalQuality').modal('hide');
-
-        if (message) {
-            toasty({
-                message: message,
-                type: 'success'
-            });
-        }
-    });
+        // Mostrar toast de sucesso ao invés de um modal
+        Livewire.on('show-success-quality', (message) => {
+            console.log('show-success-quality', message);
+            $('#paperModalQuality').modal('hide');
 
-    // Reabrir o modal do paper após o modal de sucesso (caso continue usando)
-    $('#successModalQuality').on('hidden.bs.modal', function() {
-        $('#paperModalQuality').modal('show');
-    });
-});
-
-// Recarga do modal de paper com dados atualizados
-Livewire.on('reload-paper-quality', () => {
-    Livewire.emit('showPaperQuality', @json($paper));
-});
-
-// Exibir toast customizado vindo do backend
-$wire.on('paper-quality-toast', ([{
-    message,
-    type
-}]) => {
-    toasty({
-        message,
-        type
+            if (message) {
+                toasty({
+                    message: message,
+                    type: 'success'
+                });
+            }
+        });
+
+        // Recarga do modal de paper com dados atualizados
+        Livewire.on('reload-paper-quality', () => {
+            Livewire.emit('showPaperQuality', @json($paper));
+        });
+
+        // Exibir toast customizado vindo do backend
+        $wire.on('paper-quality-toast', ([{ message, type }]) => {
+            toasty({ message, type });
+        });
     });
-});
 </script>
-
-@endscript
+@endscript

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

@@ -179,47 +179,36 @@
         $wire.on('show-paper', () => {
             setTimeout(() => {
                 $('#paperModal').modal('show');
-            }, 800); // Delay to ensure the modal is shown after the paper data is set and the modal is ready
+            }, 800);
         });
 
         // Show the success modal on success event
         Livewire.on('show-success', () => {
-            $('#paperModal').modal('hide'); // Hide the paper modal
-            $('#successModal').modal('show'); // Show the success modal
+            $('#paperModal').modal('hide');
+            $('#successModal').modal('show');
         });
 
         // Handle the closing of success modal to reopen the paper modal
         $('#successModal').on('hidden.bs.modal', function() {
-            $('#paperModal').modal('show'); // Reopen the paper modal after success modal is closed
+            $('#paperModal').modal('show');
         });
     });
+
+    // Recarregar papers e mostrar modais
     Livewire.on('reload-papers', () => {
-        // Recarregar o componente Livewire para refletir as mudanças
         Livewire.emit('show-success');
     });
+
     Livewire.on('show-success', () => {
-        // Recarregar o componente Livewire para refletir as mudanças
         Livewire.emit('show-success-quality');
     });
-});
-Livewire.on('reload-papers', () => {
-    // Recarregar o componente Livewire para refletir as mudanças
-    Livewire.emit('show-sucess');
-});
-Livewire.on('show-sucess', () => {
-    // Recarregar o componente Livewire para refletir as mudanças
-    Livewire.emit('show-sucess-quality');
-});
-
-    $wire.on('paper-modal', ([{
-        message,
-        type
-    }]) => {
-        toasty({
-            message,
-            type
-        });
+
+    Livewire.on('show-sucess', () => {
+        Livewire.emit('show-sucess-quality');
+    });
+
+    $wire.on('paper-modal', ({ message, type }) => {
+        toasty({ message, type });
     });
-});
 </script>
-@endscript
+@endscript