From 126b8c4ee2e483109a5b41749c7ea17627041a19 Mon Sep 17 00:00:00 2001
From: Costa <47926492N@ICO.SCS.local>
Date: Tue, 16 Nov 2021 12:37:40 +0100
Subject: [PATCH] =?UTF-8?q?Optimizaci=C3=B3n=20de=20sqlShowSamples.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sqlFunctions.R | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sqlFunctions.R b/sqlFunctions.R
index a101683..32aa5f6 100644
--- a/sqlFunctions.R
+++ b/sqlFunctions.R
@@ -40,8 +40,8 @@ sqlShowSamples<-function(conn=dta, nhcs=nhc.test, verb=F, dbtype){
   }
   if (isFALSE(verb)){
     sqlQuery(conn, query) %>% filter(NHC %in% nhcs) %>% 
-    group_by(NHC,db["dbcode"]) %>% summarise(Samples=length(UQ(rlang::sym(db["dbsamples"]))), Names=paste0(UQ(rlang::sym(db["dbsamples"])), collapse = ";")) %>% 
-      merge(data.frame(NHC=nhcs),all=T) %>% rename((!!db["dbcode"]):='db["dbcode"]')
+    group_by(NHC,UQ(rlang::sym(db["dbcode"]))) %>% summarise(Samples=length(UQ(rlang::sym(db["dbsamples"]))), Names=paste0(UQ(rlang::sym(db["dbsamples"])), collapse = ";")) %>% 
+      merge(data.frame(NHC=nhcs),all=T) %>% mutate(NHC=factor(NHC,levels = nhcs)) %>% arrange(NHC)
   }else{
     sqlQuery(conn, query) %>% filter(NHC %in% nhcs)
   }