Quitar un Id.

Merge branch 'UM'

# Conflicts:
#	workflow.R

Docs/Readme.md

@@ -128,7 +128,7 @@ sqlBackUp()
 ```r
 sqlBackUp<-function(dbfile=file,conn=dta,bu.dir=NULL){
   if(sqlTables(conn) %>% filter(TABLE_NAME == "UMID") %>% nrow > 0){bu.dir<-"BU_UM"}
-  if(sqlTables(conn) %>% filter(TABLE_NAME == "OVID") %>% nrow > 0){dbtype<-"BU_OVARIO"}
+  if(sqlTables(conn) %>% filter(TABLE_NAME == "OVID") %>% nrow > 0){bu.dir<-"BU_OVARIO"}
   
   db=strsplit(dbfile, "/")[[1]]%>% tail(n=1)
   bu_path<-gsub(db,bu.dir,dbfile)

Docs/sqlFunctions-doc.Rmd

@@ -126,7 +126,7 @@ sqlBackUp()
 ```r
 sqlBackUp<-function(dbfile=file,conn=dta,bu.dir=NULL){
   if(sqlTables(conn) %>% filter(TABLE_NAME == "UMID") %>% nrow > 0){bu.dir<-"BU_UM"}
-  if(sqlTables(conn) %>% filter(TABLE_NAME == "OVID") %>% nrow > 0){dbtype<-"BU_OVARIO"}
+  if(sqlTables(conn) %>% filter(TABLE_NAME == "OVID") %>% nrow > 0){bu.dir<-"BU_OVARIO"}
   
   db=strsplit(dbfile, "/")[[1]]%>% tail(n=1)
   bu_path<-gsub(db,bu.dir,dbfile)

sqlFunctions.R

@@ -24,7 +24,7 @@ sqlInitialize<-function(){
 
 sqlBackUp<-function(dbfile=file,conn=dta,bu.dir=NULL){
   if(sqlTables(conn) %>% filter(TABLE_NAME == "UMID") %>% nrow > 0){bu.dir<-"BU_UM"}
-  if(sqlTables(conn) %>% filter(TABLE_NAME == "OVID") %>% nrow > 0){dbtype<-"BU_OVARIO"}
+  if(sqlTables(conn) %>% filter(TABLE_NAME == "OVID") %>% nrow > 0){bu.dir<-"BU_OVARIO"}
   
   db=strsplit(dbfile, "/")[[1]]%>% tail(n=1)
   bu_path<-gsub(db,bu.dir,dbfile)
@@ -54,7 +54,7 @@ sqlShowSamples<-function(conn=dta, nhcs=nhc.test, verb=F, dbtype=NULL){
   if (isFALSE(verb)){
     sqlQuery(conn, query) %>% filter(NHC %in% nhcs) %>% 
     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)
+      merge(data.frame(NHC=nhcs),all=T) %>% mutate(NHC=factor(NHC,levels = unique(nhcs))) %>% arrange(NHC)
   }else{
     sqlQuery(conn, query) %>% filter(NHC %in% nhcs)
   }
@@ -73,7 +73,7 @@ sqlGenOVID<-function(conn=dta, nhcs=nhc.test, verb=T, sinc=F, dbtype=NULL){
   
   dbid<-sqlFetch(conn,db["dbcode"])
   
-  new.nhc<-nhcs[!nhcs %in% dbid$NHC]
+  new.nhc<-nhcs[!nhcs %in% dbid$NHC] %>% unique()
   if(length(new.nhc) > 0){
     next.num<-gsub(db["dbcode"],"",dbid[,db["dbcode"]]) %>% as.numeric %>% max(na.rm=T)+1
     last.num<-next.num+(length(new.nhc)-1)
@@ -82,8 +82,8 @@ sqlGenOVID<-function(conn=dta, nhcs=nhc.test, verb=T, sinc=F, dbtype=NULL){
       dbid<-rbind(dbid,newtab)
     }
     if(dbtype=="UM"){
-      dbid<-merge(dbid, newtab, all=T) %>% select(Id,NHC,UMID) %>% arrange(Id)
+      dbid<-merge(dbid, newtab, all=T) %>% select(NHC,UMID) %>% arrange(UMID)
-      dbid$Id<-as.numeric(rownames(dbid))
+      # dbid$Id<-as.numeric(rownames(dbid))
       dbid$NHC<-as.numeric(dbid$NHC)
     }
     rownames(dbid)<-as.character(1:nrow(dbid))
@@ -91,7 +91,7 @@ sqlGenOVID<-function(conn=dta, nhcs=nhc.test, verb=T, sinc=F, dbtype=NULL){
     
     if (sinc){
       ### !! Atención, esto cambia la base de datos:
-      sqlSave(conn, dbid, tablename=db["dbcode"], append = T)
+      sqlSave(conn, dbid, tablename=db["dbcode"], append = T, rownames = F)
       print("La base ha sido actualizada.")
     }
     if (verb){
@@ -150,7 +150,7 @@ sqlWriteTemp<-function(conn=dta, nhcs=nhc.test, file="queryOV.xlsx", samples.mod
       }
       last.samp<-next.samp+(length(nhcs)-1)
       new.samp<-sprintf("UM%s%02d",Sys.time() %>% format("%y"),next.samp:last.samp)
-      new.samp.df<-merge(sqlFetch(dta,"UMID") %>% merge(data.frame("NHC"=nhcs)), data.frame("NHC"=nhcs, "CODIGO"=new.samp))
+      new.samp.df<-data.frame("NHC"=nhcs, "CODIGO"=new.samp) %>% merge(sqlFetch(dta,"UMID")) %>% arrange(CODIGO)
       samples.exp<-merge(samples %>% slice(0), new.samp.df %>% select(-NHC), all=T) %>% select(colnames(samples)) %>% arrange(CODIGO)
     }
     
@@ -158,14 +158,14 @@ sqlWriteTemp<-function(conn=dta, nhcs=nhc.test, file="queryOV.xlsx", samples.mod
       ## Importar los datos clínicos de pacientes existentes y generar nueva entrada par los nuevos
       upd.clinics<-sqlFetch(conn, "CLINICOS")
       umid.new<-sqlFetch(conn, "UMID") %>% filter(NHC %in% nhcs)
-      upd.clinics<-merge(umid.new,upd.clinics %>% select(-Id), all.x=T, by="UMID")
+      upd.clinics<-merge(umid.new,upd.clinics, all.x=T, by="UMID")
       upd.clinics$NHC<-as.character(upd.clinics$NHC)
       for (i in colnames(upd.clinics)[sapply(upd.clinics, lubridate::is.POSIXct)]){upd.clinics[,i]<-as.Date(upd.clinics[,i])}
     }
     
     ## Exportar tablas a la plantilla de entrada para su rellenado
     wb <- loadWorkbook(file)
-    writeData(wb, "NHC", upd.umid)
+    writeData(wb, "NHC", merge(data.frame("NHC"=nhcs), upd.umid, sort = F))
     if (samples.mod){writeData(wb,"samples",samples.exp)}
     if (clinics.mod){writeData(wb,"CLINICS",upd.clinics)}
     saveWorkbook(wb,file,overwrite = TRUE)
@@ -238,7 +238,7 @@ sqlSincBD<-function(conn=dta, filetemp="queryOV.xlsx", sinc.samples=F, sinc.clin
       for (i in fechas){
         clinics.mod[,i]<-as.Date(clinics.mod[,i])
       }
-      sqlUpdate(conn, clinics.mod,"CLINICOS")
+      sqlUpdate(conn, clinics.mod,"CLINICOS", index="UMID")
       print("Tabla CLINICOS modificada.")
     }
   }
@@ -276,7 +276,7 @@ sqlSincBD<-function(conn=dta, filetemp="queryOV.xlsx", sinc.samples=F, sinc.clin
       for (i in fechas){
         clinics.new[,i]<-as.Date(clinics.new[,i])
       }
-      sqlSave(conn, clinics.new, tablename="CLINICOS", append = T, varTypes = varTypes)
+      sqlSave(conn, clinics.new, tablename="CLINICOS", append = T, varTypes = varTypes, rownames = F)
       print("Tabla CLINICOS sincronizada.")
     }
   }