Merge pull request #83 from nuest/master

Author: nuest

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: codecheck
 Title: Helper Functions for CODECHECK Project
-Version: 0.13.1
+Version: 0.14.0
 Authors@R: 
     c(person(given = "Stephen",
             family = "Eglen",
@@ -23,7 +23,7 @@ Authors@R:
            email = "[email protected]",
            comment = c(ORCID = "0000-0002-1322-1553"))
        )
-Description: This contains helper functions for CODECHECKERS (<https://codecheck.org.uk>).
+Description: This contains helper functions for CODECHECKERS (<https://codecheck.org.uk>) and the rendering of the CODECHECK Register (<https://codecheck.org.uk/register/>).
 License: MIT + file LICENSE
 Depends: R (>= 4.0.0), gh, R.cache, parsedate
 Imports: 

NAMESPACE

@@ -42,6 +42,7 @@ importFrom(stringr,str_match)
 importFrom(stringr,str_replace_all)
 importFrom(utils,askYesNo)
 importFrom(utils,capture.output)
+importFrom(utils,packageVersion)
 importFrom(utils,read.csv)
 importFrom(utils,tail)
 importFrom(whisker,whisker.render)

R/register.R

@@ -16,15 +16,17 @@
 #' @importFrom parsedate parse_date
 #' @importFrom rmarkdown render
 #' @importFrom knitr kable
-#' @importFrom utils capture.output read.csv tail
+#' @importFrom utils capture.output read.csv tail packageVersion
 #' @import     jsonlite
 #' @import     dplyr
 #'
 #' @export
-register_render <- function(register = read.csv("register.csv", as.is = TRUE),
+register_render <- function(register = read.csv("register.csv", as.is = TRUE, comment.char = '#'),
                             filter_by = c("venues", "codecheckers"),
                             outputs = c("html", "md", "json"),
                             config = c(system.file("extdata", "config.R", package = "codecheck"))) {
+  message("Rendering register using codecheck version ", utils::packageVersion("codecheck"))
+  
   # Loading config.R files
   for (i in seq(length(config))) {
     source(config[i])
@@ -64,11 +66,14 @@ register_render <- function(register = read.csv("register.csv", as.is = TRUE),
 #'
 #' @author Daniel Nüst
 #' @importFrom R.cache getCacheRootPath
+#' @importFrom utils packageVersion
 #' @importFrom gh gh
 #' @export
-register_check <- function(register = read.csv("register.csv", as.is = TRUE),
+register_check <- function(register = read.csv("register.csv", as.is = TRUE, comment.char = '#'),
                            from = 1,
                            to = nrow(register)) {
+  message("Checking register using codecheck version ", utils::packageVersion("codecheck"))
+  
   # Loading config.R file
   source(system.file("extdata", "config.R", package = "codecheck"))
 

inst/extdata/config.R

@@ -56,7 +56,7 @@ CONFIG$MD_TITLES <- list(
   "venues" = function(table_details) {
     venue_type <- table_details[["subcat"]]
     venue_name <- table_details[["name"]]
-    paste0("CODECHECK Register for ", venue_type, " (", venue_name, ")")
+    paste0("CODECHECK Register for ", venue_name, " (", venue_type, ")")
   },
 
   "certs" = "CODECHECK Certificate"
@@ -91,7 +91,8 @@ CONFIG$HYPERLINKS <- list(
 CONFIG$VENUE_SUBCAT_PLURAL <- list(
   conference = "conferences",
   journal = "journals",
-  community = "communities"
+  community = "communities",
+  institution = "institutions"
 )
 
 # NON-REGISTER_TABLE
@@ -111,7 +112,8 @@ CONFIG$NON_REG_TITLE_FNS <- list(
       plural_subcat <- switch (subcat,
         "conference" = "conferences",
         "journal" = "journals",
-        "community" = "communities"
+        "community" = "communities",
+        "institution" = "institutions"
       )
       return(paste("CODECHECK List of", plural_subcat))
     }
@@ -157,21 +159,21 @@ CONFIG$NON_REG_SUBTEXT <- list(
 CONFIG$NON_REG_TABLE_COL_NAMES <- list(
   "codecheckers" = c(
     "codechecker_name" = "Codechecker name",
-    "Codechecker" = "ORCID ID",
+    "Codechecker" = "ORCID",
     "no_codechecks" = "No. of codechecks"
   ),
 
   "venues" = c(
-    "Type" = "Venue type", 
     "Venue" = "Venue name",
+    "Type" = "Venue type",
     "no_codechecks" = "No. of codechecks"
   )
 )
 
 # REGISTER FILTER SUBCATEGORIES
 # Each filter can be further divided into each of these subgroups
 CONFIG$FILTER_SUBCATEGORIES <- list(
-  venues = list("community", "journal", "conference") 
+  venues = list("community", "journal", "conference", "institution") 
 )
 
 # For each filter with subcategories we have a reference to the column
@@ -241,7 +243,9 @@ CONFIG$DICT_VENUE_NAMES <- list(
   "codecheck NL" = "CODECHECK NL",
   "in press" = "In press",
   "preprint" = "Preprint",
-  "AUMC" = "Amsterdam UMC"
+  "AUMC" = "Amsterdam UMC",
+  "Lifecycle Journal" = "Lifecycle Journal",
+  "TU Delft DCC" = "TU Delft Digital Competence Centre"
 )
 
 # JSON FILE INFORMATION