rev

unhcr-americas · Feb 23, 2024 · 79cedb3 · 79cedb3
1 parent 72fa9b8
commit 79cedb3
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 41 deletions.
diff --git a/R/show_budget_gap.R b/R/show_budget_gap.R
@@ -27,9 +27,6 @@
 #' @examples
 #' show_budget_gap(year = 2018, 
 #'              ctr_name = "Brazil")
-#'
-#'
-#'
 #' show_budget_gap(year = 2018, 
 #'              ctr_name = "Brazil",
 #'              weight_by = c("refugees", "oip"))
@@ -121,8 +118,9 @@ show_budget_gap <- function(year,
         dplyr::left_join(ctrstat |> 
                          dplyr::select(year, weight)   , by = c("year")) |>
         dplyr::mutate(budget_value = round(budget_value / weight,1),   
-                      transaction_value = round(transaction_value  / weight,1))|>
-       dplyr::mutate(budget_gap = (budget_value - transaction_value) / budget_value *100) 
+                      transaction_value = round(transaction_value  / weight,1))
+      df2 <-  df2 |>
+       dplyr::mutate(budget_gap2 = (budget_value - transaction_value) / budget_value *100) 
 
     } 
 
@@ -145,9 +143,10 @@ show_budget_gap <- function(year,
                          color = "Budget"),
                      linewidth = 1.5,
                      color = "#F592A0") +  
-  ggplot2::scale_y_continuous(
-    expand = ggplot2::expansion(mult = c(0, .1)),
-    labels = scales::label_number(scale_cut = scales::cut_short_scale())  ) +
+  ggplot2::scale_y_continuous(  limits=c(0,100)) +
+  # ggplot2::scale_y_continuous(
+  #   #expand = ggplot2::expansion(mult = c(0, .1)),
+  #   labels = scales::label_number(scale_cut = scales::cut_short_scale())  ) +
 #  scale_x_continuous(labels = scales::label_number(scale_cut = cut_short_scale())) +
  # ggplot2::facet_wrap(~ trans_year) +
   unhcrthemes::theme_unhcr(grid = "Y", axis = "X", 

diff --git a/R/show_indicators_time.R b/R/show_indicators_time.R
@@ -209,7 +209,7 @@ show_indicators_time <- function(year,
                        shape = 17,
                        size = 3) +
     ggplot2::stat_summary(fun.data=mean_sdl, #mult=1, 
-                   geom="pointrange", color="grey", size = 3)   + 
+                   geom="pointrange", color="grey", size = 1)   + 
     geom_hline(yintercept= 0, color="red") +
  # ggplot2::scale_color_viridis_d(option = "inferno", na.value = "grey50") + 
     ggplot2::scale_colour_brewer(palette = "Paired") +
@@ -230,9 +230,9 @@ show_indicators_time <- function(year,
                    paste0( result_type_name, " Indicators   ", 
                            programme_lab, ctr_name,iati_identifier_ops ) ,
                    100),
-                 subtitle = stringr::str_wrap( paste0( 
-                   "Deviation between reported \"Actual\" value and programmatic \"Target\" (in %)" ) ,
-                   110),
+                subtitle = stringr::str_wrap( paste0( 
+                      "Progress comparison between \"Actual\" reported value and their \"baseline\" (in %)" ) ,
+                      110),
                  caption = stringr::str_wrap( 
                    "Data Source: UNHCR IATI (International Aid Transparency Initiative)" ,
                    110) )  
@@ -270,7 +270,7 @@ show_indicators_time <- function(year,
                              shape = 17,
                              size = 3) +
           ggplot2::stat_summary(fun.data=mean_sdl, #mult=1, 
-                         geom="pointrange", color="grey", size = 3)   + 
+                         geom="pointrange", color="grey", size = 1)   + 
           geom_hline(yintercept= 0, color="red") +
        # ggplot2::scale_color_viridis_d(option = "inferno", na.value = "grey50") + 
           ggplot2::scale_colour_brewer(palette = "Paired") +

diff --git a/dev/dev_unhcr_programme.Rmd b/dev/dev_unhcr_programme.Rmd
@@ -824,8 +824,9 @@ show_budget_gap <- function(year,
         dplyr::left_join(ctrstat |> 
                          dplyr::select(year, weight)   , by = c("year")) |>
         dplyr::mutate(budget_value = round(budget_value / weight,1),   
-                      transaction_value = round(transaction_value  / weight,1))|>
-       dplyr::mutate(budget_gap = (budget_value - transaction_value) / budget_value *100) 
+                      transaction_value = round(transaction_value  / weight,1))
+      df2 <-  df2 |>
+       dplyr::mutate(budget_gap2 = (budget_value - transaction_value) / budget_value *100) 
      
     } 
    
@@ -848,9 +849,10 @@ show_budget_gap <- function(year,
                          color = "Budget"),
                      linewidth = 1.5,
                      color = "#F592A0") +  
-  ggplot2::scale_y_continuous(
-    expand = ggplot2::expansion(mult = c(0, .1)),
-    labels = scales::label_number(scale_cut = scales::cut_short_scale())  ) +
+  ggplot2::scale_y_continuous(  limits=c(0,100)) +
+  # ggplot2::scale_y_continuous(
+  #   #expand = ggplot2::expansion(mult = c(0, .1)),
+  #   labels = scales::label_number(scale_cut = scales::cut_short_scale())  ) +
 #  scale_x_continuous(labels = scales::label_number(scale_cut = cut_short_scale())) +
  # ggplot2::facet_wrap(~ trans_year) +
   unhcrthemes::theme_unhcr(grid = "Y", axis = "X", 
@@ -871,9 +873,6 @@ show_budget_gap <- function(year,
 ```{r example-show_budget_gap, message=FALSE, warning=FALSE, fig.retina = 2, fig.width = 8, fig.asp = 0.618, fig.align = "center",  out.width = "90%"}
 show_budget_gap(year = 2018, 
              ctr_name = "Brazil")
-
-
-
 show_budget_gap(year = 2018, 
              ctr_name = "Brazil",
              weight_by = c("refugees", "oip"))
@@ -1820,7 +1819,7 @@ show_indicators_time <- function(year,
                        shape = 17,
                        size = 3) +
     ggplot2::stat_summary(fun.data=mean_sdl, #mult=1, 
-                   geom="pointrange", color="grey", size = 3)   + 
+                   geom="pointrange", color="grey", size = 1)   + 
     geom_hline(yintercept= 0, color="red") +
  # ggplot2::scale_color_viridis_d(option = "inferno", na.value = "grey50") + 
     ggplot2::scale_colour_brewer(palette = "Paired") +
@@ -1841,9 +1840,9 @@ show_indicators_time <- function(year,
                    paste0( result_type_name, " Indicators   ", 
                            programme_lab, ctr_name,iati_identifier_ops ) ,
                    100),
-                 subtitle = stringr::str_wrap( paste0( 
-                   "Deviation between reported \"Actual\" value and programmatic \"Target\" (in %)" ) ,
-                   110),
+                subtitle = stringr::str_wrap( paste0( 
+                      "Progress comparison between \"Actual\" reported value and their \"baseline\" (in %)" ) ,
+                      110),
                  caption = stringr::str_wrap( 
                    "Data Source: UNHCR IATI (International Aid Transparency Initiative)" ,
                    110) )  
@@ -1881,7 +1880,7 @@ show_indicators_time <- function(year,
                              shape = 17,
                              size = 3) +
           ggplot2::stat_summary(fun.data=mean_sdl, #mult=1, 
-                         geom="pointrange", color="grey", size = 3)   + 
+                         geom="pointrange", color="grey", size = 1)   + 
           geom_hline(yintercept= 0, color="red") +
        # ggplot2::scale_color_viridis_d(option = "inferno", na.value = "grey50") + 
           ggplot2::scale_colour_brewer(palette = "Paired") +

diff --git a/docs/articles/unhcr-programme.html b/docs/articles/unhcr-programme.html
diff --git a/docs/articles/unhcr-programme_files/figure-html/example-show_budget_gap-1.png b/docs/articles/unhcr-programme_files/figure-html/example-show_budget_gap-1.png
diff --git a/docs/articles/unhcr-programme_files/figure-html/example-show_budget_gap-2.png b/docs/articles/unhcr-programme_files/figure-html/example-show_budget_gap-2.png
diff --git a/docs/articles/unhcr-programme_files/figure-html/example-show_indicators_time-1.png b/docs/articles/unhcr-programme_files/figure-html/example-show_indicators_time-1.png
diff --git a/docs/articles/unhcr-programme_files/figure-html/example-show_indicators_time-3.png b/docs/articles/unhcr-programme_files/figure-html/example-show_indicators_time-3.png
diff --git a/docs/articles/unhcr-programme_files/figure-html/example-show_indicators_time-4.png b/docs/articles/unhcr-programme_files/figure-html/example-show_indicators_time-4.png
diff --git a/docs/articles/unhcr-programme_files/figure-html/example-show_indicators_time-5.png b/docs/articles/unhcr-programme_files/figure-html/example-show_indicators_time-5.png
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -3,5 +3,5 @@ pkgdown: 2.0.7
 pkgdown_sha: ~
 articles:
   unhcr-programme: unhcr-programme.html
-last_built: 2024-02-22T23:55Z
+last_built: 2024-02-23T00:23Z
 
diff --git a/docs/reference/show_budget_gap-1.png b/docs/reference/show_budget_gap-1.png
diff --git a/docs/reference/show_budget_gap-2.png b/docs/reference/show_budget_gap-2.png
diff --git a/docs/reference/show_budget_gap.html b/docs/reference/show_budget_gap.html
diff --git a/docs/reference/show_indicators_time-1.png b/docs/reference/show_indicators_time-1.png
diff --git a/docs/reference/show_indicators_time-3.png b/docs/reference/show_indicators_time-3.png
diff --git a/docs/reference/show_indicators_time-5.png b/docs/reference/show_indicators_time-5.png
diff --git a/docs/search.json b/docs/search.json
diff --git a/man/show_budget_gap.Rd b/man/show_budget_gap.Rd
diff --git a/vignettes/unhcr-programme.Rmd b/vignettes/unhcr-programme.Rmd
@@ -148,9 +148,6 @@ show_expenditure(year = 2018,
 ```{r example-show_budget_gap, message = FALSE, warning = FALSE, fig.retina = 2, fig.width = 8, fig.asp = 0.618, fig.align = "center", out.width = "90%"}
 show_budget_gap(year = 2018, 
              ctr_name = "Brazil")
-
-
-
 show_budget_gap(year = 2018, 
              ctr_name = "Brazil",
              weight_by = c("refugees", "oip"))