Merge pull request #118 from The-Strategy-Unit/107_heatmap_nee

107 heatmap nee

Author: craig-parylo

R/app_server.R

@@ -286,10 +286,11 @@ app_server <- function(input, output, session) {
         scheme_codes = input$schemes,
         focal_scheme_code = input$focus_scheme,
         heatmap_type = input$heatmap_type,
-        standardise_heatmap = input$toggle_horizon_heatmap,
         scheme_order = input$heatmap_scheme_order,
         mitigator_order = input$heatmap_mitigator_order,
-        values_displayed = input$values_displayed
+        values_displayed = input$values_displayed,
+        toggle_heatmap_nee = input$toggle_heatmap_nee,
+        toggle_heatmap_aggregate_summaries = input$toggle_heatmap_aggregate_summaries
       )
 
     return(dat)
@@ -383,6 +384,8 @@ app_server <- function(input, output, session) {
       # disable
       shinyjs::disable("toggle_horizon_heatmap")
       shinyjs::disable("toggle_heatmap_scale_fill_by_mitigator")
+      shinyjs::disable("toggle_heatmap_nee")
+      shinyjs::disable("toggle_heatmap_aggregate_summaries")
 
       # show
       shinyjs::show("heatmap_binary_colour")
@@ -396,6 +399,8 @@ app_server <- function(input, output, session) {
       # enable
       shinyjs::enable("toggle_horizon_heatmap")
       shinyjs::enable("toggle_heatmap_scale_fill_by_mitigator")
+      shinyjs::enable("toggle_heatmap_nee")
+      shinyjs::enable("toggle_heatmap_aggregate_summaries")
 
       # disable
 

R/app_ui.R

@@ -399,17 +399,6 @@ app_ui <- function(request) {
                   selected = "value_mid",
                   multiple = FALSE
                 ),
-                shiny::checkboxInput(
-                  inputId = "toggle_horizon_heatmap",
-                  label = bslib::tooltip(
-                    trigger = list(
-                      "Standardise by horizon?",
-                      bsicons::bs_icon("info-circle")
-                    ),
-                    "Divides the scheme's chosen mitigator values by the number of years between the chosen start and final year."
-                  ),
-                  value = FALSE
-                ),
                 shiny::checkboxInput(
                   inputId = "toggle_mitigator_name",
                   label = bslib::tooltip(
@@ -432,6 +421,28 @@ app_ui <- function(request) {
                   ),
                   value = TRUE
                 ),
+                shiny::checkboxInput(
+                  inputId = "toggle_heatmap_nee",
+                  label = bslib::tooltip(
+                    trigger = list(
+                      "Add NEE?",
+                      bsicons::bs_icon("info-circle")
+                    ),
+                    "Controls whether the National Elicitation Exercise (NEE) estimates are included. Toggle on to add the NEE value as an additional column."
+                  ),
+                  value = FALSE
+                ),
+                shiny::checkboxInput(
+                  inputId = "toggle_heatmap_aggregate_summaries",
+                  label = bslib::tooltip(
+                    trigger = list(
+                      "Add aggregate summaries?",
+                      bsicons::bs_icon("info-circle")
+                    ),
+                    "Controls whether the minimum, maximum and average mitigator values are displayed. Toggle on to see these values as additional columns and rows."
+                  ),
+                  value = FALSE
+                ),
                 shiny::selectInput(
                   inputId = "heatmap_scheme_order",
                   label = bslib::tooltip(