Feature/update country summary

DESCRIPTION

@@ -50,5 +50,5 @@ Remotes:
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.1
 Config/testthat/edition: 3

NAMESPACE

@@ -4,6 +4,7 @@ export("%>%")
 export(export_all_countries_summaries_xls)
 export(export_country_summary_xls)
 export(export_plot_timeseries_indicator_pdf)
+export(export_regional_data)
 export(plot_timeseries_indicator)
 importFrom(magrittr,"%>%")
 importFrom(rlang,"!!")

R/export_country_summary.R

@@ -224,10 +224,9 @@ export_country_summary_xls <- function(df,
     )
   }
 
-  sheets_hidden <- grep("_Inter$", openxlsx::sheets(wb))
-  for (i in sheets_hidden) {
-    openxlsx::sheetVisibility(wb)[sheets_hidden] <- "hidden"
-  }
+  # Remove Chart and Inter sheets
+  purrr::walk(openxlsx::sheets(wb)[stringr::str_detect(openxlsx::sheets(wb), "_Chart$|_Inter$")], ~ openxlsx::removeWorksheet(wb, .x))
+
 
   # Write workbook
   if (!dir.exists(output_folder)) {
@@ -327,6 +326,7 @@ export_hep_country_summary_xls <- function(df,
   # summary sheet
   summary_sheet <- glue::glue("{sheet_prefix}_summary")
 
+
   wb <- write_hep_summary_sheet(
     df = df_iso_one_scenario,
     wb = wb,
@@ -341,6 +341,9 @@ export_hep_country_summary_xls <- function(df,
     ind_ids
   )
 
+  openxlsx::groupRows(wb, sheet = summary_sheet, rows = 35:37, hidden = TRUE)
+
+
   write_hep_timeseries_sheet(
     df = df_iso_one_scenario,
     wb = wb,
@@ -354,8 +357,12 @@ export_hep_country_summary_xls <- function(df,
 
   if(!is.null(scenario_col)){
     if(length(unique(df_iso[[scenario_col]])) > 1){
+
+      df_iso_no_base_scenarios <- df_iso %>%
+        dplyr::filter(.data[[scenario_col]] %in% scenarios_not_base)
+
       write_scenario_sheet(
-        df = df_iso,
+        df = df_iso_no_base_scenarios,
         wb = wb,
         billion = "hep",
         sheet_name = glue::glue("{sheet_prefix}_Scenarios"),
@@ -372,6 +379,20 @@ export_hep_country_summary_xls <- function(df,
     }
   }
 
+  # Plot
+  plot_sheet <- glue::glue("{sheet_prefix}_Plot")
+
+  write_plot_sheet(
+    df = df_iso_one_scenario,
+    wb = wb,
+    sheet_name = plot_sheet,
+    billion = "hep",
+    start_year = start_year,
+    end_year = end_year,
+    ind_df = ind_df,
+    ind_ids = ind_ids
+  )
+
   openxlsx::addStyle(wb,
                      sheet = "HEP_Chart", rows = 22, cols = (3:(2 + nrow(ind_df))),
                      style = excel_styles(
@@ -523,8 +544,12 @@ export_hpop_country_summary_xls <- function(df,
   )
 
   if(length(unique(df_iso[[scenario_col]])) > 1){
+
+    df_iso_no_base_scenarios <- df_iso %>%
+      dplyr::filter(.data[[scenario_col]] %in% scenarios_not_base)
+
     write_scenario_sheet(
-      df = df_iso,
+      df = df_iso_no_base_scenarios,
       wb = wb,
       billion = "hpop",
       sheet_name = glue::glue("{sheet_prefix}_Scenarios"),
@@ -540,19 +565,32 @@ export_hpop_country_summary_xls <- function(df,
     )
   }
 
+  # Plot
+  plot_sheet <- glue::glue("{sheet_prefix}_Plot")
 
-  # Flip titles graph
-  openxlsx::addStyle(wb,
-                     sheet = "HPOP_Chart", rows = 22, cols = (3:(2 + nrow(ind_df))),
-                     style = excel_styles(
-                       textRotation = 90,
-                       fontSize = 8,
-                       fgFill = "white",
-                       wrapText = TRUE,
-                       halign = "center",
-                       valign = "center"
-                     )
+  write_plot_sheet(
+    df = df_iso_one_scenario,
+    wb = wb,
+    sheet_name = plot_sheet,
+    billion = "hpop",
+    start_year = start_year,
+    end_year = end_year,
+    ind_df = ind_df,
+    ind_ids = ind_ids
   )
+
+  # Flip titles graph
+  # openxlsx::addStyle(wb,
+  #                    sheet = "HPOP_Chart", rows = 22, cols = (3:(2 + nrow(ind_df))),
+  #                    style = excel_styles(
+  #                      textRotation = 90,
+  #                      fontSize = 8,
+  #                      fgFill = "white",
+  #                      wrapText = TRUE,
+  #                      halign = "center",
+  #                      valign = "center"
+  #                    )
+  # )
   return(wb)
 }
 
@@ -657,8 +695,12 @@ export_uhc_country_summary_xls <- function(df,
   )
 
   if(length(unique(df_iso[[scenario_col]])) > 1){
+
+    df_iso_no_base_scenarios <- df_iso %>%
+      dplyr::filter(.data[[scenario_col]] %in% scenarios_not_base)
+
     write_scenario_sheet(
-      df = df_iso,
+      df = df_iso_no_base_scenarios,
       wb = wb,
       billion = "uhc",
       sheet_name = glue::glue("{sheet_prefix}_Scenarios"),
@@ -674,6 +716,20 @@ export_uhc_country_summary_xls <- function(df,
     )
   }
 
+  # Plot
+  plot_sheet <- glue::glue("{sheet_prefix}_Plot")
+
+  write_plot_sheet(
+    df = df_iso_one_scenario,
+    wb = wb,
+    sheet_name = plot_sheet,
+    billion = "uhc",
+    start_year = start_year,
+    end_year = end_year,
+    ind_df = ind_df,
+    ind_ids = ind_ids
+  )
+
   openxlsx::addStyle(wb,
                      sheet = "UHC_Chart", rows = 22, cols = (3:(2 + nrow(ind_df))),
                      style = excel_styles(