From 1037b0850b47aa5bb3fed9fbc280237f57441556 Mon Sep 17 00:00:00 2001
From: Felipe Fontana <felipe.fontana@simplesip.com.br>
Date: Wed, 3 Apr 2024 07:56:20 -0400
Subject: [PATCH] Fix: correcao modal horario, option e redirect option, acao e
 destino agente e horario

---
 app/Models/Horario.php        | 6 +++---
 app/Models/HorarioOption.php  | 2 +-
 app/Models/RedirectOption.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Models/Horario.php b/app/Models/Horario.php
index 415c3af..e9bd867 100644
--- a/app/Models/Horario.php
+++ b/app/Models/Horario.php
@@ -25,7 +25,7 @@ class Horario extends Model
     {
 
         $horarios = DB::table(DB::raw("(
-            SELECT h.*, nc.title as name_channel, nc.id_empresa as id_empresa, nc.id as id_number,
+            SELECT h.*, nc.title as name_channel, nc.id_empresa as id_empresa, nc.id as number_id,
                 CASE
                     WHEN h.opcao = '1' THEN q.nome
                     WHEN h.opcao = '2' THEN r.name
@@ -39,7 +39,7 @@ class Horario extends Model
             INNER JOIN number_channel nc on h.id_number = nc.id
             INNER JOIN types t on h.opcao::integer = t.id
             LEFT JOIN queues q ON h.opcao = '1' AND q.id = (case when h.acao ~ '^[0-9]+$' then h.acao::integer else 0 end)
-            LEFT JOIN usuarios u ON h.opcao = '3' AND u.id = (case when h.acao ~ '^[0-9]+$' then h.acao::integer else 0 end)
+            LEFT JOIN usuarios u ON h.opcao = '3' AND u.matricula = h.acao 
             LEFT JOIN redirect r  ON h.opcao = '2' AND r.id = (case when h.acao ~ '^[0-9]+$' then h.acao::integer else 0 end)
         ) as t"));
         
@@ -52,7 +52,7 @@ class Horario extends Model
         }
 
         if(isset($params['id_number'])){
-            $horarios->where('t.id_number', $params['id_number']);
+            $horarios->where('t.number_id', $params['id_number']);
         }
 
         if(isset($params['nome'])){
diff --git a/app/Models/HorarioOption.php b/app/Models/HorarioOption.php
index a759695..bf786a9 100644
--- a/app/Models/HorarioOption.php
+++ b/app/Models/HorarioOption.php
@@ -48,7 +48,7 @@ class HorarioOption extends Model
             INNER JOIN horarios h on hi.id_horario = h.id
             INNER JOIN types t on h.opcao::integer = t.id
             LEFT JOIN queues q ON hi.opcao = '1' AND q.id = (case when hi.acao ~ '^[0-9]+$' then hi.acao::integer else 0 end)
-            LEFT JOIN usuarios u ON hi.opcao = '3' AND u.id = (case when hi.acao ~ '^[0-9]+$' then hi.acao::integer else 0 end)
+            LEFT JOIN usuarios u ON hi.opcao = '3' AND u.matricula = hi.acao
             LEFT JOIN redirect r  ON hi.opcao = '2' AND r.id = (case when hi.acao ~ '^[0-9]+$' then hi.acao::integer else 0 end)
         ) as t"));
         
diff --git a/app/Models/RedirectOption.php b/app/Models/RedirectOption.php
index 84a082c..1cb4224 100644
--- a/app/Models/RedirectOption.php
+++ b/app/Models/RedirectOption.php
@@ -52,7 +52,7 @@ class RedirectOption extends Model
             INNER JOIN types t on ro.id_type = t.id
             LEFT JOIN queues q ON ro.id_type = 1 AND q.id = (case when ro.code_id ~ '^[0-9]+$' then ro.code_id::integer else 0 end)
             LEFT JOIN horarios h ON ro.id_type = 5 AND h.id = (case when ro.code_id ~ '^[0-9]+$' then ro.code_id::integer else 0 end)
-            LEFT JOIN usuarios u ON ro.id_type = 3 AND u.id = (case when ro.code_id ~ '^[0-9]+$' then ro.code_id::integer else 0 end)
+            LEFT JOIN usuarios u ON ro.id_type = 3 AND u.matricula = ro.code_id 
         ) as t"));
         
         $options->selectRaw('t.*, redirect_name, type_name, t.additional_info');