updates and fixes

Author: jarochi

R/bg_df.R

@@ -13,6 +13,8 @@ emp <- googlesheets4::read_sheet(link, sheet = "work") %>% mutate(activity = "em
 team <- googlesheets4::read_sheet(link, sheet = "team")
 other_act_df <- googlesheets4::read_sheet(link, sheet = "other_activities")
 
+pub_overwrite <- googlesheets4::read_sheet(link, sheet = "pub_overwrite")
+
 full_df <- full_join(con, edu, by = c("start_date", "end_date", "city", "country", "name", "who", "activity")) %>%
   full_join(., int, by = c("start_date", "end_date", "city", "country", "name", "who", "activity")) %>%
   full_join(., emp, by = c("start_date", "end_date", "city", "country", "name", "who", "group", "faculty", "activity")) %>%
@@ -28,5 +30,5 @@ full_df <- full_join(con, edu, by = c("start_date", "end_date", "city", "country
 
 remove(link)
 
-save.image(file = 'bg_df_data.RData')
-# load("bg_df_data.RData")
+# save.image(file = 'data/bg_df_data.RData')
+# load("databg_df_data.RData")

R/create_ppl_page.R

@@ -1,8 +1,7 @@
 # whois_full_name <- "Michał"
 # whois <- whois
-# whois <- "Jarek"
+# whois <- "Asia"
 
-# source('R/bg_df.R')
 load("bg_df_data.RData")
 source('R/resume_fun.R')
 
@@ -25,7 +24,7 @@ knitr:
 ---
     
 ```{r, echo=FALSE, message=FALSE,include=FALSE}
-source('../../R/bg_df.R')
+load('../../data/bg_df_data.RData')
 whois <- '", whois, "'\n\n",
 "source('../../R/resume_fun.R')
 openalex_id <- basic_info(whois)$openalex_id
@@ -116,7 +115,7 @@ paste0(
 
 
 conference_txt <- if_else((full_df %>% filter(who == whois & cat == "conferences") %>% nrow()) != 0, paste0(
-"# 👏🏻 **Conferences, workshops** 🤝🏻 
+"# 👏🏻 **Conferences, workshops, training schools** 🤝🏻 
 
 ------------------------------------------------------------------------
 
@@ -125,7 +124,7 @@ conf_work(whois)
 ```
 \n"),
 paste0(
-"<!-- # 👏🏻 **Conferences, workshops** 🤝🏻  -->
+"<!-- # 👏🏻 **Conferences, workshops, training schools** 🤝🏻  -->
 
 <!-- ------------------------------------------------------------------------ -->
 
@@ -134,7 +133,7 @@ paste0(
 <!-- ``` -->", "\n"))
 
 
-publication_txt <- if_else((openalexR::oa_fetch(entity ="works", author.id = basic_info(whois)$openalex_id) %>% nrow()) != 0, paste0(
+publication_txt <- if_else((openalexR::oa_fetch(entity ="works", author.id = basic_info(whois)$openalex_id) %>% try() %>% nrow()) != 0, paste0(
 "#  📖 **Publications**
 
 ------------------------------------------------------------------------

R/gen_team_files.R

@@ -0,0 +1,22 @@
+source('R/create_ppl_page.R')
+
+for (i in team %>% filter(team == "main") %>% .$who) {
+  print(i)
+  temp_df <- team %>% filter(who == i)
+  whois <- i
+  whois_full_name <- temp_df$whois_full_name
+  file_name <- paste0("subsite/team/", temp_df$file_name)
+  
+  create_ppl_page(whois_full_name, whois, file_name)
+}
+
+
+for (i in team %>% filter(team == "colab") %>% .$who) {
+  print(i)
+  temp_df <- team %>% filter(who == i)
+  whois <- i
+  whois_full_name <- temp_df$whois_full_name
+  file_name <- paste0("subsite/colab/", temp_df$file_name)
+  
+  create_ppl_page(whois_full_name, whois, file_name)
+}

R/resume_fun.R

@@ -26,7 +26,7 @@ education <- function(whois){
   edu_df <- full_df %>% 
     filter(who == whois & cat == "education") %>% 
     arrange(desc(end_date)) %>% 
-    mutate(new_col = paste0("<h3>", "![](../fig/logo/", logo_name, "){width='50'} ", name, "</h3>\n", "<h4> ", major, "</h4> [ ", start_date, " - ", end_date, " ]", "{style='float:right;'}", "<br> ", if_else(thesis_title %>% is.na, " ", paste0("Thesis: **", thesis_title, "** ")), "[ 📍 ", city, ", ", country, " ]{style='float:right;'}"
+    mutate(new_col = paste0("<h3>", "![](../fig/logo/", logo_name, "){width='50'} ", name, "</h3>\n", "<h4> ", major, "</h4> [ ", start_date, " - ", end_date, " ]", "{style='float:right;'}", "<br> ", if_else(thesis_title %>% is.na, " ", paste0(degree, " thesis: **", thesis_title, "** ")), "[ 📍 ", city, ", ", country, " ]{style='float:right;'}"
     ))
 }
 
@@ -56,9 +56,44 @@ pubs <- function(whois, openalex_id){
     tibble(authors = .) %>% 
     cbind(pub, .)
 
+  
+  pub_mod <- pub_mod$author %>% 
+    lapply(., function(x){
+      number <- x$au_id %>% str_detect(openalex_id) %>% which()
+      position <-  x$author_position[number]
+        }) %>% 
+    unlist(.) %>%
+    tibble(position = .) %>% 
+    cbind(pub_mod, .)
+  
+  # for (i in pub_overwrite %>% filter(who == whois) %>% select(doi) %>% as.vector()) {
+  #   pub_mod <- pub_mod %>% 
+  #       mutate(position = if_else(str_detect(doi, i), "first", position))
+  #   }
+    
+    
+  pub_mod <- pub_mod$author %>% 
+    lapply(., function(x){
+      number <- x$au_id %>% str_detect(openalex_id) %>% which(.)
+      corresponding <-  x$is_corresponding[number]
+    }) %>% 
+    unlist(.) %>%
+    tibble(corresponding = .) %>% 
+    cbind(pub_mod, .)
+  
+  # for (i in pub_overwrite %>% filter(who == whois) %>% select(doi) %>% as.vector()) {
+  #   pub_mod <- pub_mod %>% 
+  #     mutate(corresponding = if_else(str_detect(doi, i), TRUE, corresponding))
+  # }
+  
   pub_mod %>% 
     filter(type != "dataset") %>% 
-    select(title, authors, doi, publication_date, type, so, host_organization) %>% 
+    # select(title, authors, doi, publication_date, type, so, host_organization) %>% 
+    mutate(authorship = paste0(
+      if_else(position == "middle", "coauthor", position),
+      if_else(corresponding == TRUE, ",\n corresponding", "")
+    )) %>% 
+    select(title, authors, doi, publication_date, type, so, host_organization, authorship) %>% 
     drop_na(., doi) %>%
     mutate(doi = paste0('<a  target=_blank href=', doi, '>', doi %>% str_remove(., "https://doi.org/"),'</a>'),
            journal = so %>% as.factor(),
@@ -68,7 +103,7 @@ pubs <- function(whois, openalex_id){
     ) %>% 
     select(!c(so, host_organization, publication_date)) %>% 
     arrange(desc(`publication date`)) %>%
-    DT::datatable(., escape = F, options = list(dom = 'tp'))
+    DT::datatable(., escape = F, extensions = 'Buttons', options = list(dom = 'tp', buttons = c('copy', 'csv', 'excel')))
 }