diff --git a/.Rbuildignore b/.Rbuildignore index 9257dd4..1732f82 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -9,3 +9,4 @@ ^pkgdown$ ^\.github$ ^\.secrets$ +^data-raw$ diff --git a/R/server.R b/R/server.R index 5332354..6ae3b14 100644 --- a/R/server.R +++ b/R/server.R @@ -127,9 +127,13 @@ server <- function(input, output, session) { aire_de_sante = character(), jour = character(), rapport_completude_pct = numeric(), + couverture_campagne_pct = numeric(), # Was missing couverture_campaign_cumulative = numeric(), avg_vax_rural = numeric(), avg_vax_urban = numeric(), + recovery_0_11 = numeric(), # Was missing and was returning an error at the start of the app + recovery_12_23 = numeric(), # Was missing + recovery_24_59 = numeric(), # Was missing recovery_0_11_cumulative = numeric(), recovery_12_23_cumulative = numeric(), recovery_24_59_cumulative = numeric(), @@ -342,7 +346,7 @@ server <- function(input, output, session) { filtered_zs_p <- if (!is.null(selected_prov) && length(selected_prov) > 0) { current_data |> - filter(provinces %in% selected_prov) |> + filter(provinces %in% selected_prov,antennes %in% input$perm_antenne) |> pull(zones_de_sante) |> unique() } else { @@ -395,12 +399,14 @@ server <- function(input, output, session) { options = lapply(x <- filtered_campaign_ant, function(x) list(key = x, text = x) ), - value = if (is.null(isolate(input$ant_selector_campaign_completeness))) { - filtered_campaign_ant[1] - } else { - isolate(input$ant_selector_campaign_completeness) + value = { + current <- isolate(input$ant_selector_campaign_completeness) + if (!is.null(current) && current %in% filtered_campaign_ant) { + current + } else { + filtered_campaign_ant[1] + } } - # value = isolate(input$ant_selector_campaign_completeness) ) @@ -703,15 +709,16 @@ server <- function(input, output, session) { shinyjs::click("download_template") }) - + data("template_data_geographics", package = "rdcAVS", envir = globalenv()) + data("data_perm", package = "rdcAVS", envir = globalenv()) output$download_template <- downloadHandler( filename = function(){ paste("template_geographic",Sys.Date(),".csv",sep = "") }, content = function(file){ - x <- get("template_data_geographics", envir = asNamespace("rdcAVS")) - write.csv(x,file,row.names = FALSE) + # x <- get("template_data_geographics", envir = asNamespace("rdcAVS")) + write.csv(template_data_geographics,file,row.names = FALSE) } ) @@ -1381,8 +1388,8 @@ observeEvent(input$download_geo,{ paste("template_permissions",Sys.Date(),".csv",sep = "") }, content = function(file){ - y <- get("data_perm", envir = asNamespace("rdcAVS")) - write.csv(y,file,row.names = FALSE) + # y <- get("data_perm", envir = asNamespace("rdcAVS")) + write.csv(data_perm,file,row.names = FALSE) } ) @@ -1718,6 +1725,8 @@ observeEvent(input$click_download_campaign_quality_monitoring,{ #### Plots ---- output$campaign_completeness_plot <- renderPlot( { + req(input$prov_selector_campaign_completeness) + req(input$zs_selector_campaign_completeness) validate( need(!is.null(campaign_quality()), "No campaign quality data."), @@ -1736,6 +1745,9 @@ observeEvent(input$click_download_campaign_quality_monitoring,{ output$campaign_completeness_plot_daily <- renderPlot( { + + req(input$prov_selector_campaign_completeness) + req(input$zs_selector_campaign_completeness) validate( need(!is.null(campaign_quality()), "No campaign quality data."), need(nrow(campaign_quality()) > 0, "No campaign quality data.") @@ -1749,6 +1761,9 @@ observeEvent(input$click_download_campaign_quality_monitoring,{ output$campaign_urban_rural_plot <- renderPlot( { + req(input$prov_selector_campaign_completeness) + req(input$zs_selector_campaign_completeness) + validate( need(!is.null(campaign_quality()), "No campaign quality data."), need(nrow(campaign_quality()) > 0, "No campaign quality data.") @@ -1763,6 +1778,8 @@ observeEvent(input$click_download_campaign_quality_monitoring,{ output$campaign_recovery_plot <- renderPlot( { + req(input$prov_selector_campaign_completeness) + req(input$zs_selector_campaign_completeness) validate( need(!is.null(campaign_quality()), "No campaign quality data."), need(nrow(campaign_quality()) > 0, "No campaign quality data.") diff --git a/R/set_permissions.R b/R/set_permissions.R index e38ee66..457e629 100644 --- a/R/set_permissions.R +++ b/R/set_permissions.R @@ -83,6 +83,7 @@ set_permissions <- function(campaign_name, dribble_files <- dribble_files |> dplyr::mutate(dir_path = ifelse(stringr::str_ends(path, "/"), path, paste0(fs::path_dir(path), "/"))) |> + dplyr::mutate(path = stringr::str_to_upper(path)) |> googledrive::drive_reveal("mimeType") files_for_zs_editors <- dribble_files |> dplyr::filter(str_ends(mime_type, "spreadsheet")) |> diff --git a/data-raw/import_template_data.R b/data-raw/import_template_data.R new file mode 100644 index 0000000..89cb7bc --- /dev/null +++ b/data-raw/import_template_data.R @@ -0,0 +1,10 @@ +## code to import `data_perm` +library(readr) +data_perm <- readr::read_csv("data-raw/permission_template.csv") +usethis::use_data(data_perm, overwrite = TRUE) + + +## code to import `template_data_geographics` + +template_data_geographics <- readr::read_csv("data-raw/template_geographic.csv") +usethis::use_data(template_data_geographics, overwrite = TRUE) diff --git a/data-raw/permission_template.csv b/data-raw/permission_template.csv new file mode 100644 index 0000000..6be54b2 --- /dev/null +++ b/data-raw/permission_template.csv @@ -0,0 +1,5 @@ +name,phone,notes,email,level,role,province,antenne,zone_de_sante +Test Level zone de sante,8175149870,Data manager_ZS,paul08@gmail.com,zone de sante,writer,PROVINCE1,ANTENNE1,ZONE SANTE 1 +Test Level Antenne,82231416576,Data manager_ANTENNE,km34@gmail.com,antenne,reader,PROVINCE2,ANTENNE2, +Test Level Province,814649110,Data manger_PROVINCE,kwa@gmail.com,province,reader,PROVINCE1,, +Test Level National,,partenaire,auer@gmail.com,national,writer,,, diff --git a/data-raw/template_geographic.csv b/data-raw/template_geographic.csv new file mode 100644 index 0000000..4a2f6e1 --- /dev/null +++ b/data-raw/template_geographic.csv @@ -0,0 +1,10 @@ +provinces,antennes,zones_de_sante,aires_de_sante,population_totale +Maniema,Kasongo,Kabambare,Biyungi,12345 +Maniema,Kasongo,Kabambare,Fimbo Nyingi,12347 +Maniema,Kasongo,Kabambare,Kabeya,12349 +Maniema,Kasongo,Kabambare,Kalonda Kibuyu,12351 +Maniema,Kasongo,Kabambare,Kalunga Mugabo,12353 +Maniema,Kasongo,Kabambare,Kiyanga,12355 +Maniema,Kasongo,Kabambare,Malota,12357 +Maniema,Kasongo,Kabambare,Musongela,12359 +Maniema,Kasongo,Kabambare,Ndanda Lukala,12361 diff --git a/data/data_perm.rda b/data/data_perm.rda index 127a118..db1a736 100644 Binary files a/data/data_perm.rda and b/data/data_perm.rda differ diff --git a/data/template_data_geographics.rda b/data/template_data_geographics.rda index b4c8a9a..890b5df 100644 Binary files a/data/template_data_geographics.rda and b/data/template_data_geographics.rda differ