Skip to content

Commit

Permalink
Merge pull request #60 from aghaynes/main
Browse files Browse the repository at this point in the history
bug fix
  • Loading branch information
aghaynes authored Oct 9, 2024
2 parents 035464b + 0220da9 commit 5523235
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: CTUCosting
Type: Package
Title: Machinery for CTU costings
Version: 0.6.0
Version: 0.6.1
Authors@R:
c(
person(given = "Alan G.", family = "Haynes", role = "cre",
Expand Down Expand Up @@ -32,7 +32,7 @@ Imports:
tidyr,
vctrs,
writexl
RoxygenNote: 7.2.3
RoxygenNote: 7.3.0
Suggests:
bsicons,
bslib,
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# CTUCosting 0.6.1 (2024-10-09)

* bug fix: notes were stopping the PDF from being generated

# CTUCosting 0.6.0 (2024-09-27)

* restyle to approximate DCR letterhead, including DCR logo
Expand Down
2 changes: 1 addition & 1 deletion R/get_notes.R
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ notes_filter <- function(notes, selected_workpackages, fte){
unique() |>
na.omit()
print(paste("NOTESFILTER: ", services))
if(fte) services <- c(services, "full_time_equivalent")
if(fte & "full_time_equivalent" %in% names(notes)) services <- c(services, "full_time_equivalent")
out <- notes[services]
print("filtered notes names")
print(names(out))
Expand Down

0 comments on commit 5523235

Please sign in to comment.