Merge pull request #30 from wognsths/master

.
jinseob2kim · Jul 18, 2024 · eb2a989 · eb2a989
2 parents 05a45ca + 7eab712
commit eb2a989
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -14,7 +14,7 @@ Description: 'RStudio' addins and 'Shiny' modules for descriptive statistics, re
 Depends: R (>= 3.4.0)
 License: Apache License 2.0 
 Encoding: UTF-8
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Imports: 
   data.table, 
   DT, 

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# jsmodule 1.5.6
+
+## Bugfix:
+- Fix var_label displaying incorrectly when loading .sav file
+
+
 # jsmodule 1.5.5
 
 ## Update

diff --git a/R/utils.R b/R/utils.R
@@ -17,8 +17,11 @@ mk.lev2 <- function(out.old, out.label) {
   label.variable <- sapply(out.old, function(x) attr(x, "label")) %>% .[!sapply(., is.null)]
 
   for (v in names(label.variable)) {
-    out.label[variable == v, var_label := label.variable[v]]
+    logical <- label.variable[[v]] %in% out.old[[v]]
+    tmp <- ifelse(sum(logical) > 0, rep(v, sum(logical)), label.variable[v])
+    out.label[variable == v, var_label := tmp]
   }
+
   for (v in names(label.value)) {
     if (any(out.label[variable == v, class] != "numeric")) {
       out.label[variable == v, val_label := label.value[[v]][level]]