Inclusao do changelog e correcao no reletorio de meta mensal para incluir link de detalhes do transbordo

asterisk/var_lib_asterisk/agi-bin/verifica_rota.php

@@ -1,5 +1,6 @@
 #!/usr/bin/php -q
 <?php
+include('util/util.php');
 include('bd.php');
 
 ob_implicit_flush(true);
@@ -61,6 +62,7 @@ inner join pbx_rotas_saida c on a.id_rota = c.id
         and tipo_acesso <> '0'
         order by prioridade limit 1";
 
+WriteLog($query, '/var/log/asterisk/rotas_saida.log');
 
 $result = pg_query($conexao, $query);
 $row = pg_fetch_array($result);

nbproject/private/private.xml

@@ -3,15 +3,13 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="5"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/var/www/html/aplicativo/supervisor.php</file>
-            <file>file:/var/www/html/aplicativo/projeto/base/sql/versao-1.7.11.5.sql</file>
-            <file>file:/var/www/html/aplicativo/include/util/funcoesAmi.php</file>
-            <file>file:/var/www/html/aplicativo/include/util/display_errors.php</file>
-            <file>file:/var/www/html/aplicativo/asterisk/etc_asterisk/editado_manual/extensions_padrao.conf</file>
-            <file>file:/var/www/html/aplicativo/include/util/funcoesLgpd.php</file>
-            <file>file:/var/www/html/aplicativo/agente/agenteChamadasAbandon.php</file>
-            <file>file:/var/www/html/aplicativo/contacteFunc.php</file>
-            <file>file:/var/www/html/aplicativo/asterisk/var_lib_asterisk/scripts/abandonadas/retornoAbandonada.php</file>
+            <file>file:/var/www/html/aplicativo/include/scriptdb/install/instalador_aplicativo/sip_install.sh</file>
+            <file>file:/var/www/html/aplicativo/admin/CadRotasSaida.php</file>
+            <file>file:/var/www/html/aplicativo/index.php</file>
+            <file>file:/var/www/html/aplicativo/admin/funcoes.php</file>
+            <file>file:/var/www/html/aplicativo/asterisk/var_lib_asterisk/agi-bin/verifica_rota.php</file>
+            <file>file:/var/www/html/aplicativo/include/scriptdb/install/instalador_asterisk/install.sh</file>
+            <file>file:/var/www/html/aplicativo/include/util/util.php</file>
             <file>file:/var/www/html/aplicativo/include/util/funcoesApl.php</file>
         </group>
     </open-files>

relatorios/callcenter/metas/metricasMensal.php

@@ -112,7 +112,6 @@ class RelMetricasMensal extends Relatorios {
 
         $tipoRel = !$this->___tipoRelatorio ? '' : 'checked="checked"';
 
-
         /*
          * Personalise esta função se necessitar de outras operações de filtro.
          */
@@ -333,10 +332,9 @@ class RelMetricasMensal extends Relatorios {
         $somaEspera = 0;
         $somaOriginadasPA = 0;
 
-
         foreach ($this->GetData()[0] as $row) {
 
-            $somaReg ++;
+            $somaReg++;
             $somaFila += $row['oferecidas'];
             $somaTransbordada += $row['transbordada'];
             $somaTransbordando += $row['transbordando'];
@@ -431,7 +429,6 @@ class RelMetricasMensal extends Relatorios {
         $filtro = $this->___FiltrosRelatorio();
         $mostraColunaServicos = GetUsoServico() == RELATORIO_SERVICOS_HABILITA;
 
-
         /*
          * Inicia o relatório.
          */
@@ -487,9 +484,8 @@ class RelMetricasMensal extends Relatorios {
         $somaEspera = 0;
         $somaOriginadasPA = 0;
 
-
         foreach ($this->GetData()[0] as $row) {
-            $somaReg ++;
+            $somaReg++;
             $somaFila += $row['oferecidas'];
             $somaTransbordada += $row['transbordada'];
             $somaTransbordando += $row['transbordando'];
@@ -689,7 +685,7 @@ class RelMetricasMensal extends Relatorios {
         }
 
 
-        $agrupaServico = function($row, $somaFieldServ) use(&$somaServ, &$dataRel, &$srv, &$oldSrv) {
+        $agrupaServico = function ($row, $somaFieldServ) use (&$somaServ, &$dataRel, &$srv, &$oldSrv) {
 
             $style = 'style="font-weight: bold; padding: 0; margin: 0; padding-left: 6px; padding-right: 6px; background-color: #4F71C0 !important"';
             $srv = $row["serv_id"];
@@ -717,8 +713,6 @@ class RelMetricasMensal extends Relatorios {
             }
         };
 
-
-
         /*
          * Linhas de dados.
          */
@@ -743,13 +737,22 @@ class RelMetricasMensal extends Relatorios {
             $somaTempoAtendimento += $row['tempo_atendimento'];
             $somaTempoAbandono += $row['tempo_abandono'];
 
-
             $linha = "<tr>";
             foreach ($dadosField as $key => $value) {
-                $linha .= sprintf("<td %s>%s</td>", $value, $row["$key"]);
+                if ($key == 'transbordada') {                                                       
+                    $linha .= sprintf("<td><a href=\"javascript:NovaJanela('index.php?idProg=324&tipo=TRANSBORDADO&dac=%s&dataIni=%s&dataFim=%s', 'relTransbordo', '820', '700', 'scrollbars=YES');\">%s</a></td>", $this->___dac, sprintf("%s/%s/%s",  $this->___mes , $row["dia"], $this->___ano), sprintf("%s/%s/%s",  $this->___mes , $row["dia"], $this->___ano), $row[$key]);
+                } else if ($key == 'transbordando') {
+                    $linha .= sprintf("<td><a href=\"javascript:NovaJanela('index.php?idProg=324&tipo=TRANSBORDANDO&dac=%s&dataIni=%s&dataFim=%s', 'relTransbordo', '820', '700', 'scrollbars=YES');\">%s</a></td>", $this->___dac, sprintf("%s/%s/%s",  $this->___mes , $row["dia"], $this->___ano), sprintf("%s/%s/%s",  $this->___mes , $row["dia"], $this->___ano), $row[$key]);
+                } else {
+                    $linha .= sprintf("<td %s>%s</td>", $value, $row[$key]);
+                }
             }
             $linha .= "</tr>";
             $dataRel[] = $linha;
+            //  
+            //  <td><a href="javascript:NovaJanela('index.php?idProg=324&tipo=TRANSBORDANDO&dac={$dac}&dataIni={$dados[i][0]|str_pad:2:'0':$smarty.const.STR_PAD_LEFT}/{$mesano}&dataFim={$dados[i][0]|str_pad:2:'0':$smarty.const.STR_PAD_LEFT}/{$mesano}', 'relTransbordo', '820', '700', 'scrollbars=YES');">{$dados[i][4]}</a></td>
+
+            
         }
 
         $totalDias = count($numDiasRelatorio);
@@ -782,7 +785,6 @@ class RelMetricasMensal extends Relatorios {
 
         $dataRel[] = '<br><table width = "100%" cellpadding = "2" class = "grid">';
 
-
         $totalCabecalio = array(
             "Tempo de Espera" => 'align = "center"',
             "TE <= 10" => 'align = "center"',
@@ -927,7 +929,7 @@ class RelMetricasMensal extends Relatorios {
         }
 
 
-        $agrupaServico = function($row, $somaFieldServ) use(&$somaServ, &$dadosTable, &$srv, &$oldSrv) {
+        $agrupaServico = function ($row, $somaFieldServ) use (&$somaServ, &$dadosTable, &$srv, &$oldSrv) {
 
             $srv = $row["serv_id"];
             if (!$oldSrv) {
@@ -962,7 +964,6 @@ class RelMetricasMensal extends Relatorios {
             }
         };
 
-
         $dados = $this->GetData()[0];
 
         foreach ($dados as $row) {

supervisao/RelTransbordo.php

@@ -9,6 +9,10 @@
     class RelTransbordo extends Relatorios {
 
         private $___modo;
+        private $___dac;
+        private $___tipo;
+        private $___dataIni;
+        private $___dataFim;
 
         public function __construct($idProg, $dbcon, $incDac) {
             parent::__construct($idProg, $dbcon, $incDac);