diff --git a/DESCRIPTION b/DESCRIPTION index a3373c23d..19b7c5323 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,8 +2,8 @@ Type: Package Package: datapackr Title: A Package that Packs and Unpacks all Data Packs and Target Setting Tools -Version: 7.3.2 -Date: 2024-01-30 +Version: 7.3.3 +Date: 2024-02-09 Authors@R: c( person("Scott", "Jackson", , "sjackson@baosystems.com", role = c("aut", "cre")), person("Jason", "Pickering", , "jason.p.pickering@gmail.com", role = c("aut", "rev")), diff --git a/NEWS.md b/NEWS.md index 479fe7a42..f8a1de17c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,18 @@ +# datapackr 7.3.3 + +## New features +* + +## Bug fixes +* Updated `packForDATIM` to include only certain pop indicators for COP24 in `createDATIMExport`. +* Patched `update_de_coc_co_map` to allow for certain data elements to be included even though they were left off the data entry forms +* Updated `getCOPDataFromDATIM`, as it relates to imports, to work with COP24 +* Updated `getMemoIndicators` to allow for COP24 +* Updated `memoStructure` to allow for COP24 + +## Minor improvements and fixes +* + # datapackr 7.3.2 ## New features diff --git a/R/getCOPDataFromDATIM.R b/R/getCOPDataFromDATIM.R index b53bc30bc..1eee9d4f6 100644 --- a/R/getCOPDataFromDATIM.R +++ b/R/getCOPDataFromDATIM.R @@ -18,7 +18,7 @@ getCOPDataFromDATIM <- function(country_uids, inherits = TRUE)) { - if (!cop_year %in% c(2020:2023)) { + if (!cop_year %in% c(2020:2024)) { stop("The COP year provided is not supported by the internal function getCOPDataFromDATIM") ### NOTE for COP23 some special handling of SUBNAT data for FY23 like the code below may be diff --git a/R/getMemoIndicators.R b/R/getMemoIndicators.R index 3dde41437..afcd37763 100644 --- a/R/getMemoIndicators.R +++ b/R/getMemoIndicators.R @@ -42,6 +42,7 @@ getMemoIndicators <- function(cop_year, "2021" = "TslxbFe3VUZ", "2022" = "zRApVEi7qjo", "2023" = "ZTGhB3qIPsi", + "2024" = "VOYwOgsftbT", NULL) #Bail out early if don't have a group if (is.null(ind_group)) { diff --git a/R/memoStructure.R b/R/memoStructure.R index feac18d60..c2dd81bfd 100644 --- a/R/memoStructure.R +++ b/R/memoStructure.R @@ -77,7 +77,7 @@ memoStructure <- function(d, d2_session = dynGet("d2_default_session", "AGYW_PREV", "Total", NA) } - if (d$info$cop_year %in% c("2022", "2023")) { + if (d$info$cop_year %in% c("2022", "2023", "2024")) { row_order <- tibble::tribble( ~ind, ~options, ~partner_chunk, "TX_NEW", "<15", 1, diff --git a/R/update_de_coc_co_map.R b/R/update_de_coc_co_map.R index df8d4c43a..c85c37a91 100644 --- a/R/update_de_coc_co_map.R +++ b/R/update_de_coc_co_map.R @@ -132,9 +132,18 @@ update_de_coc_co_map <- function(cop_year = NULL, categoryOptions.ids = categoryOptions, categoryoptioncomboname = categoryoptioncombo) - - - ############# + # Thu Feb 1 14:47:16 2024 ------------------------------ + # DP-1195 PATCH + # P2XNbiNnIqV was not included in forms + #Setup dataframe to append back to fullCodeList + Patch <- fullCodeList[fullCodeList$dataelementuid == "P2XNbiNnIqV" & + fullCodeList$period == "2024Oct", ] + Patch$FY <- 2024 + Patch$period <- "2023Oct" + Patch$period_dataset <- "FY24 SUBNAT Targets" + + #Append back to full code list + fullCodeList <- rbind(fullCodeList, Patch) # Prep Data Pack schema for mapping #### diff --git a/data/cop24_map_DataPack_DATIM_DEs_COCs.rda b/data/cop24_map_DataPack_DATIM_DEs_COCs.rda index 6ecc02530..8d8426011 100644 Binary files a/data/cop24_map_DataPack_DATIM_DEs_COCs.rda and b/data/cop24_map_DataPack_DATIM_DEs_COCs.rda differ