Remoção do org_padrao

include/util/funcoesApl.php

@@ -1779,7 +1779,7 @@ function GetParametrosLicensa() {
 }
 
 function GetDadosOrganizacao($db) {
-    $query = sprintf("SELECT u.nome, matricula, po.id, po.nome as nome_fantasia, po.master, po.status, u.org_padrao, prm_logo_relatorio
+    $query = sprintf("SELECT u.nome, matricula, po.id, po.nome as nome_fantasia, po.master, po.status, prm_logo_relatorio
         FROM pbx_usuarios u 
         INNER JOIN pbx_organizacao_usuarios pou ON pou.id_usuario = u.id 
         INNER JOIN pbx_organizacao po ON po.id = pou.id_organizacao

projeto/base/sql/versao-1.9.0.sql

@@ -82,7 +82,6 @@ END;
 $function$
 ;
 
-ALTER TABLE pbx_usuarios ADD COLUMN org_padrao int;
 ------------------------------------------
 -----    ADICAO DE ID NAS TABELAS    -----
 ------------------------------------------
@@ -204,14 +203,13 @@ UNION ALL
   ORDER BY 1;
 
 
-update pbx_usuarios set org_padrao = 0, user_system = 1, email = apelido || '@system.cloud'  where id in(341,342,462,467);
+update pbx_usuarios set user_system = 1, email = apelido || '@system.cloud'  where id in(341,342,462,467);
 alter table pbx_usuarios alter column email set not null;
 
 -- Indices para tabela de usuarios para garantir unicidade de login no sistema e apelido por organizadao.
 drop index if exists idxPbxUsuariosApelido;
 drop index if exists "PbxUsuariosEmail";
 create unique index "idxPbxUsuariosEmail" on pbx_usuarios(email);
-create unique index "idxPbxUsuarosApelidoOrgId" on pbx_usuarios(apelido, org_padrao);
 
 
 -- Removendo a chave primária existente

seguranca/usuarioCad.php

@@ -22,7 +22,7 @@ if (isset($_GET["idUser"]) && $_GET["idUser"] == 0) {
 } else if (isset($_GET["idUser"]) && $_GET["idUser"] > 0) {
     $msgLogin = "disabled";
     $acaoUser = 'Alterar';
-    $query = "SELECT id, nome, apelido, matricula, flag, coalesce(\"admin\", false)::int as adm , senha,  coalesce(supervisor, false)::int as supervisor, coalesce(agente,false)::int as agente, email, coalesce(status,true)::int as status, penalidade, senha_dias_expira, org_padrao FROM pbx_usuarios \n";
+    $query = "SELECT id, nome, apelido, matricula, flag, coalesce(\"admin\", false)::int as adm , senha,  coalesce(supervisor, false)::int as supervisor, coalesce(agente,false)::int as agente, email, coalesce(status,true)::int as status, penalidade, senha_dias_expira FROM pbx_usuarios \n";
     $query .= "WHERE id = $idUser";
 
     $result = pg_query($dbcon, $query);
@@ -37,7 +37,6 @@ if (isset($_GET["idUser"]) && $_GET["idUser"] == 0) {
     $userExpiraSenha = $dados["senha_dias_expira"];
     $userStatus = $dados["status"] ? "checked" : "";
     $penalidade = $dados["penalidade"];
-    $empPadrao = $dados['org_padrao'];
     $dacAgente = GetIdDacPadrao($dbcon, $idUser);
     $dacPadrao = GetDacs($dbcon, $dacAgente, "", 0, 1);
 } else if ((isset($_POST["btGravar"]))) {
@@ -237,7 +236,6 @@ $smarty->assign("userStatus", $limpaVar ? "checked" : $userStatus);
 $smarty->assign("acaoUser", $acaoUser);
 $smarty->assign("idUser", $idUser);
 $smarty->assign("dacPadrao", $dacPadrao);
-$smarty->assign("empPadrao", getOrgPadrao($dbcon, $idUser));
 $smarty->assign("penalidade", $penalidade ? $penalidade : "0");
 
 $jsJQuery[] = "\$('#userLogin').change(function(){limpaEspaco(this);}) ";
@@ -291,30 +289,3 @@ function getEmailUser($dbcon, $email, $id = null)
     }
     return true;
 }
-
-function getOrgPadrao($dbcon, $idUser)
-{
-    $query = "SELECT a.id, a.nome, a.master, org_padrao 
-    FROM pbx_organizacao a 
-    INNER JOIN pbx_organizacao_usuarios b ON b.id_organizacao = a.id 
-    INNER JOIN pbx_usuarios c ON c.id = b.id_usuario 
-    WHERE b.id_usuario = {$idUser}
-    AND a.status = 1
-    ORDER BY a.id";
-
-    $result = pg_query($dbcon, $query);
-    $data = pg_fetch_all($result);
-
-    if (!$data) {
-        return null;
-    }
-
-    $select = "<select name='empPadrao' id='empPadrao'>";
-    foreach ($data as $v) {
-        $sel = $v['id'] == $v['org_padrao'] ? 'selected' : '';
-        $select .= "<option value='{$v['id']}' $sel>{$v['nome']}</option>";
-    }
-    $select .= "</select>";
-
-    return $select;
-}