Fix error in export_tables namespace

ScotGovAnalysis · Sep 9, 2024 · d0701e0 · d0701e0
1 parent 6e4ce8b
commit d0701e0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/R/export_tables.R b/R/export_tables.R
@@ -206,13 +206,13 @@ format_columns <- function(wb,
     )
 
   }
-  # Format £ columns
-  if (str_detect(colnames(table[column]), "[Vv]alue")) {
-    addStyle(wb, sheet_name,
-             rows = start_row:end_row,
-             cols = column,
-             style = createStyle(numFmt = "£#,##0;-;£0", halign = "right"),
-             gridExpand = TRUE
+  # Format GBP columns
+  if (stringr::str_detect(colnames(table[column]), "[Vv]alue")) {
+    openxlsx::addStyle(wb, sheet_name,
+                       rows = start_row:end_row,
+                       cols = column,
+                       style = openxlsx::createStyle(numFmt = "£#,##0;-;£0", halign = "right"),
+                       gridExpand = TRUE
     )
 
   }
@@ -247,12 +247,12 @@ format_rows <- function(wb,
     )
   }
   # Format % rows
-  else if (str_starts(table[[table_row, 1]],"Percentage")) {
-    addStyle(wb, sheet_name,
-             rows = sheet_row,
-             cols = 2:end_col,
-             style = createStyle(numFmt = "0%;-;0%", halign = "right"),
-             gridExpand = TRUE
+  else if (stringr::str_starts(table[[table_row, 1]],"Percentage")) {
+    openxlsx::addStyle(wb, sheet_name,
+                       rows = sheet_row,
+                       cols = 2:end_col,
+                       style = openxlsx::createStyle(numFmt = "0%;-;0%", halign = "right"),
+                       gridExpand = TRUE
     )
 
   }

diff --git a/README.Rmd b/README.Rmd
@@ -27,7 +27,8 @@ You can install the development version of xlsss from [GitHub](https://github.co
 
 ``` r
 # install.packages("devtools")
-devtools::install_github("ScotGovAnalysis/xlsss")
+devtools::install_github("ScotGovAnalysis/xlsss",
+                          upgrade = "never")
 ```
 
 ## Getting started

diff --git a/README.md b/README.md
@@ -18,7 +18,8 @@ You can install the development version of xlsss from
 
 ``` r
 # install.packages("devtools")
-devtools::install_github("ScotGovAnalysis/xlsss")
+devtools::install_github("ScotGovAnalysis/xlsss",
+                          upgrade = "never")
 ```
 
 ## Getting started

diff --git a/man/xlsss-package.Rd b/man/xlsss-package.Rd