Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release for v1.0 #103

Draft
wants to merge 20 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
45d5e63
fix(create_template):
sbreitbart-NOAA Dec 12, 2024
3a33a9b
Updated warnings for missing rda_dir, then changed end_year definitio…
sbreitbart-NOAA Dec 12, 2024
76d341f
moving commits from dev to dev-1.0 (minor typo fix; updating authors …
sbreitbart-NOAA Dec 12, 2024
b201a5a
moving commits from dev to dev-1.0 (adding new fish images)
sbreitbart-NOAA Dec 12, 2024
ecf10de
Removed captions_alt_text_template.csv because it's not used in asar.…
sbreitbart-NOAA Dec 12, 2024
acf482b
changed eval for first chunk to true, and eval for indices table setu…
sbreitbart-NOAA Dec 12, 2024
94eb5c7
Merge pull request #101 from nmfs-ost/fix-cr_temp
sbreitbart-NOAA Dec 12, 2024
0fda2ac
update(create_template):
sbreitbart-NOAA Dec 12, 2024
f901b49
fix(create_template): added back check for null resdir and model_resu…
sbreitbart-NOAA Dec 13, 2024
29e8815
Update(test-create_template): reflect changes with fxn that interacts…
Schiano-NOAA Dec 13, 2024
5c4a855
Add remaining fish images found in NOAA species directory from list h…
sbreitbart-NOAA Dec 13, 2024
99657f3
Merge branch 'dev-1.0' of https://github.com/nmfs-ost/asar into dev-1.0
sbreitbart-NOAA Dec 13, 2024
41c6ac4
Added species images from the PFMC documents repository: https://www.…
sbreitbart-NOAA Dec 13, 2024
38a1682
Added species images from the PIFSC google drive folder
sbreitbart-NOAA Dec 16, 2024
377339d
added first draft of new FSC-specific citations
sbreitbart-NOAA Dec 17, 2024
de47142
Bracketed information that must be added by authors into citation. Up…
sbreitbart-NOAA Dec 17, 2024
58e5772
Merge pull request #107 from nmfs-ost/update-citations
sbreitbart-NOAA Dec 17, 2024
84742da
Added new species images and updated existing image names
sbreitbart-NOAA Dec 18, 2024
ec3ec7c
Changed names of species images as per suggestions from @marcnadon ht…
sbreitbart-NOAA Dec 18, 2024
e8bb754
Added '!expr' before captions and alt tex objects in chunk options fo…
sbreitbart-NOAA Dec 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 58 additions & 12 deletions R/create_citation.R
Original file line number Diff line number Diff line change
Expand Up @@ -117,30 +117,76 @@ create_citation <- function(
"\n",
"Please cite this publication as: \n",
"\n",
"AUTHOR NAME. YEAR. ",
"[AUTHOR NAME]. [YEAR]. ",
title, ". ", off_title, ", ",
"CITY, STATE. "
"[CITY], [STATE]. "
)
} else if (office != "SEFSC") {

} else if (office == "AFSC") {
cit <- paste0(
"{{< pagebreak >}} \n",
"\n",
"Please cite this publication as: \n",
"\n",
author_list, ". ", year, ". ",
title,
". North Pacific Fishery Management Council, Anchorage, AK. Available from ",
"https://www.npfmc.org/library/safe-reports/"
)

} else if (office == "NWFSC") {
cit <- paste0(
"{{< pagebreak >}} \n",
"\n",
"Please cite this publication as: \n",
"\n",
author_list, ". ", title, ".", year,
". Prepared by [COMMITTEE]. [XX] p."
)

} else if (office == "PIFSC") {
cit <- paste0(
"{{< pagebreak >}} \n",
"\n",
"Please cite this publication as: \n",
"\n",
author_list, ". ", year, ". ",
title, ". NOAA Tech. Memo. [TECH MEMO NUMBER]",
", ", "[XX] p."
)

} else if (office == "SEFSC") {
cit <- paste0(
"{{< pagebreak >}} \n",
"'{{< pagebreak >}}' \n",
"\n",
"Please cite this publication as: \n",
"\n",
author_list, ". ", year, ". ",
title, ". ", off_title, ", ",
loc_city, ", ", loc_state, ". "
"SEDAR. ", year, ". ", title, ". ",
"SEDAR, North Charleston SC. [XX] pp. ",
"available online at: http://sedarweb.org/"
)
} else {

} else if (office == "SWFSC") {
cit <- paste0(
"{{< pagebreak >}} \n",
"\n",
"Please cite this publication as: \n",
"\n",
author_list, ", ", year, ". ", title,
". Pacific Fishery Management Council, Portland, OR. Available from https://www.pcouncil.org/stock-assessments-and-fishery-evaluation-safe-documents/."
)

} else { # this includes NEFSC
cit <- paste0(
"'{{< pagebreak >}}' \n",
"{{< pagebreak >}} \n",
"\n",
"Please cite this publication as: \n",
"\n",
"SEDAR. ", year, ". ", title,
"SEDAR, North Charleston SC. XXpp. ",
"available online at: http://sedarweb.org/"
author_list, ". ", year, ". ",
title, ". ", off_title, ", ",
loc_city, ", ", loc_state, ". "
)

}

# Add citation as .qmd to add into template
Expand Down
24 changes: 12 additions & 12 deletions R/create_figures_doc.R
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ recruitment_alt_text <- recruitment_plot_rda$alt_text"),
add_option = TRUE,
chunk_op = c(
glue::glue(
"fig-cap: recruitment_cap"
"fig-cap: !expr recruitment_cap"
),
glue::glue(
"fig-alt: recruitment_alt_text"
"fig-alt: !expr recruitment_alt_text"
)
)
),
Expand Down Expand Up @@ -109,10 +109,10 @@ spawning_biomass_alt_text <- spawning_biomass_plot_rda$alt_text"),
add_option = TRUE,
chunk_op = c(
glue::glue(
"fig-cap: spawning_biomass_cap"
"fig-cap: !expr spawning_biomass_cap"
),
glue::glue(
"fig-alt: spawning_biomass_alt_text"
"fig-alt: !expr spawning_biomass_alt_text"
)
)
),
Expand Down Expand Up @@ -150,10 +150,10 @@ biomass_alt_text <- biomass_plot_rda$alt_text"),
add_option = TRUE,
chunk_op = c(
glue::glue(
"fig-cap: biomass_cap"
"fig-cap: !expr biomass_cap"
),
glue::glue(
"fig-alt: biomass_alt_text"
"fig-alt: !expr biomass_alt_text"
)
)
),
Expand Down Expand Up @@ -192,10 +192,10 @@ landings_alt_text <- landings_plot_rda$alt_text"),
add_option = TRUE,
chunk_op = c(
glue::glue(
"fig-cap: landings_cap"
"fig-cap: !expr landings_cap"
),
glue::glue(
"fig-alt: landings_alt_text"
"fig-alt: !expr landings_alt_text"
)
)
),
Expand Down Expand Up @@ -233,10 +233,10 @@ recruitment_deviations_alt_text <- recruitment_deviations_plot_rda$alt_text"),
add_option = TRUE,
chunk_op = c(
glue::glue(
"fig-cap: recruitment_deviations_cap"
"fig-cap: !expr recruitment_deviations_cap"
),
glue::glue(
"fig-alt: recruitment_deviations_alt_text"
"fig-alt: !expr recruitment_deviations_alt_text"
)
)
),
Expand Down Expand Up @@ -274,10 +274,10 @@ spawning_recruitment_alt_text <- spawning_recruitment_plot_rda$alt_text"),
add_option = TRUE,
chunk_op = c(
glue::glue(
"fig-cap: spawning_recruitment_cap"
"fig-cap: !expr spawning_recruitment_cap"
),
glue::glue(
"fig-alt: spawning_recruitment_alt_text"
"fig-alt: !expr spawning_recruitment_alt_text"
)
)
),
Expand Down
6 changes: 3 additions & 3 deletions R/create_tables_doc.R
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ create_tables_doc <- function(resdir = NULL,
add_chunk(
paste0("rda_dir <- '", rda_dir, "/rda_files'"),
label = "set-rda-dir-tbls",
eval = "false"
eval = "true"
),
"\n"
)
Expand All @@ -51,7 +51,7 @@ rm(rda)\n
indices_table <- indices_table_rda$table
indices_cap <- indices_table_rda$cap"),
label = "tbl-indices-setup",
eval = "true"
eval = "false"
),
"\n"
)
Expand All @@ -66,7 +66,7 @@ indices_cap <- indices_table_rda$cap"),
add_option = TRUE,
chunk_op = c(
glue::glue(
"tbl-cap: indices_cap"
"tbl-cap: !expr indices_cap"
)
)
),
Expand Down
Loading
Loading