Correction for the label of variables with no label

Now quantitative variables also display the group sizes, and columns headers are changed accordingly

R/desc_groupe.R

@@ -54,7 +54,7 @@ desc_groupe <- function(table, groupe, param = character(0), html=NULL, titre=NU
   }
   
   etiq <- label(modulo)
-  if (etiq == "modulo") etiq <- var
+  if (etiq == "modulo") etiq <- groupe
   
   # Creation du titre
   if (is.null(titre))
@@ -92,16 +92,16 @@ desc_groupe <- function(table, groupe, param = character(0), html=NULL, titre=NU
   HTML("<thead>")
   inc()
   
-  HTML("<tr><th></th>", paste0("<th colspan='2'>",levels(modulo),"</th>", collapse=""), "<th>p</th></tr>")
+  HTML("<tr><th></th>", paste0("<th colspan='3'>",levels(modulo),"</th>", collapse=""), "<th>p</th></tr>")
   
   HTML("<tr><td></td>", sep="")
   for (i in levels(modulo))
   {
-    HTML("<td colspan='2'>N=", length(na.omit(modulo[modulo==i])), "</td>", sep="")
+    HTML("<td colspan='3'>N=", length(na.omit(modulo[modulo==i])), "</td>", sep="")
   }
   HTML("<td></td></tr>")
 
-  HTML("<tr><td></td>", paste0(rep(c("<td>N</td>","<td>%</td>"),nlevels(modulo)),collapse=""), "<td></td></tr>")
+  HTML("<tr><td></td>", paste0(rep(c("<td>N</td>","<td>%/moy</td>","<td>et</td>"),nlevels(modulo)),collapse=""), "<td></td></tr>")
 
   dec()
   HTML("</thead>")
@@ -111,7 +111,7 @@ desc_groupe <- function(table, groupe, param = character(0), html=NULL, titre=NU
   {
     HTML("<tfoot>")
     inc()
-    HTML("<tr><td colspan='", nlevels(modulo)*2+2, "'>", note,"</td></tr>")
+    HTML("<tr><td colspan='", nlevels(modulo)*3+2, "'>", note,"</td></tr>")
     dec()
     HTML("</tfoot>")
   }
@@ -155,10 +155,10 @@ desc_groupe <- function(table, groupe, param = character(0), html=NULL, titre=NU
         }
       }
       
-      HTML("<tr><td class='var'>", etiq, " (moy &plusmn;SD)</td>", sep="")
+      HTML("<tr><td class='var'>", etiq, "</td>", sep="")
       
       for (level in levels(modulo))
-        HTML("<td>",format(mean(table[[var]][modulo==level], na.rm=T), digits=nbdec,nsmall=nbdec), "</td><td>", format(sd(table[[var]][modulo==level],na.rm=T), digits=nbdec,nsmall=nbdec), "</td>", sep="")
+        HTML("<td>",length(table[[var]][modulo==level]) ,"</td><td>",format(mean(table[[var]][modulo==level], na.rm=T), digits=nbdec,nsmall=nbdec), "</td><td>", format(sd(table[[var]][modulo==level],na.rm=T), digits=nbdec,nsmall=nbdec), "</td>", sep="")
       
       HTML("<td>", format(p,digits=nbdecp,nsmall=nbdecp), sep="")
       if (!is.na(p))
@@ -194,12 +194,13 @@ desc_groupe <- function(table, groupe, param = character(0), html=NULL, titre=NU
           "NA"
         })
       
-      HTML("<tr><td class='var' colspan='", nlevels(modulo)*2+1, "'>", etiq, "</td>", sep="")
+      HTML("<tr><td class='var' colspan='", nlevels(modulo)*3+1, "'>", etiq, "</td>", sep="")
       HTML("<td>", format(p,digits=nbdecp,nsmall=nbdecp), sep="")
       if (!is.na(p))
         if (p<.05)
           HTML("*", sep="")
       HTML(" (",test,")</td>", sep="")
+      HTML("</tr>")
       
       # Levels de la variable qualitative
       for (level in levels(table[[var]]))
@@ -212,6 +213,7 @@ desc_groupe <- function(table, groupe, param = character(0), html=NULL, titre=NU
                  row = HTML("<td>", format(100*table(table[[var]],modulo)[level,level_m]/rowSums(table(table[[var]],modulo))[level], digits=nbdec, nsmall=nbdec), "</td>", sep=""),
                  col = HTML("<td>", format(100*table(table[[var]],modulo)[level,level_m]/colSums(table(table[[var]],modulo))[level_m], digits=nbdec, nsmall=nbdec), "</td>", sep=""),
                  total = HTML("<td>", format(100*table(table[[var]],modulo)[level,level_m]/sum(table(table[[var]],modulo)), digits=nbdec, nsmall=nbdec), "</td>", sep=""))
+          HTML("<td></td>",sep="")
         }
         
         HTML("<td></td></tr>")