From 416cec7ba88480e81ca46b384476e5565b1da14f Mon Sep 17 00:00:00 2001 From: moralec Date: Wed, 18 Nov 2020 13:33:06 +0000 Subject: [PATCH] Updated palette --- R/collaboration_area.R | 6 +++--- R/create_dist.R | 2 +- R/meeting_summary.R | 2 +- R/meetingtype_dist_ca.R | 2 +- R/meetingtype_dist_mt.R | 2 +- R/workpatterns_rank.R | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/R/collaboration_area.R b/R/collaboration_area.R index 98ab6089..62a57fc7 100644 --- a/R/collaboration_area.R +++ b/R/collaboration_area.R @@ -97,10 +97,10 @@ collaboration_area <- function(data, ## Colour definitions colour_defs <- - c("Meeting" = "#b4d5dd", - "Email" = "#bfe5ee", + c("Meeting" = "#34b1e2", + "Email" = "#1d627e", "Instant_Message" = "#adc0cb", - "Unscheduled_Call" = "#e1e1e1") + "Unscheduled_Call" = "#b4d5dd") colour_defs <- colour_defs[names(colour_defs) %in% level_chr] diff --git a/R/create_dist.R b/R/create_dist.R index 93ab9fad..97d84346 100644 --- a/R/create_dist.R +++ b/R/create_dist.R @@ -49,7 +49,7 @@ create_dist <- function(data, dist_colours = c("#facebc", "#fcf0eb", "#b4d5dd", - "#adc0cb")) { + "#bfe5ee")) { ## Check inputs required_variables <- c("Date", diff --git a/R/meeting_summary.R b/R/meeting_summary.R index ae848269..ea48680f 100644 --- a/R/meeting_summary.R +++ b/R/meeting_summary.R @@ -35,7 +35,7 @@ meeting_summary <- function(data, hrvar = hrvar, mingroup = mingroup, return = return, - bar_colour = "darkblue") + bar_colour = "default") } diff --git a/R/meetingtype_dist_ca.R b/R/meetingtype_dist_ca.R index 3a90bdfa..043ada15 100644 --- a/R/meetingtype_dist_ca.R +++ b/R/meetingtype_dist_ca.R @@ -145,7 +145,7 @@ meetingtype_dist_ca <- function(data, y = mean(Attendees)) %>% mutate(value2 = sub(" ", "\n", value), text = ifelse(id %in% c(1, 2, 6, 7),"#FFFFFF", "black"), - fill = ifelse(id %in% c(1, 2, 6, 7),"#31617C", "#9FE5FF")) %>% + fill = ifelse(id %in% c(1, 2, 6, 7),"#1d627e", "#34b1e2")) %>% left_join(select(myResultsTable, MeetingType, Percent), by = c("value" = "MeetingType")) %>% mutate(Percent = ifelse(is.na(Percent), "0 %", Percent)) %>% diff --git a/R/meetingtype_dist_mt.R b/R/meetingtype_dist_mt.R index d422252c..479d4d12 100644 --- a/R/meetingtype_dist_mt.R +++ b/R/meetingtype_dist_mt.R @@ -92,7 +92,7 @@ meetingtype_dist_mt <- function(data, return = "plot"){ y = mean(Attendees)) %>% mutate(value2 = sub(" ", "\n", value), text = ifelse(id %in% c(1, 2, 6, 7),"#FFFFFF", "black"), - fill = ifelse(id %in% c(1, 2, 6, 7),"#31617C", "#9FE5FF")) %>% + fill = ifelse(id %in% c(1, 2, 6, 7),"#1d627e", "#34b1e2")) %>% left_join(select(myResultsTable, MeetingType, Percent), by = c("value" = "MeetingType")) %>% mutate(Percent = ifelse(is.na(Percent), "0 %", Percent)) %>% diff --git a/R/workpatterns_rank.R b/R/workpatterns_rank.R index 8a692f6d..d3d49a8d 100644 --- a/R/workpatterns_rank.R +++ b/R/workpatterns_rank.R @@ -144,7 +144,7 @@ workpatterns_rank <- function(data, ggplot2::ggplot(ggplot2::aes(x = Hours, y = patternRank, fill = Freq)) + ggplot2::geom_tile(height=.5) + ggplot2::ylab("Top 10 Work Patterns") + - ggplot2::scale_fill_gradient2(low = "white", high = "red") + + ggplot2::scale_fill_gradient2(low = "white", high = "#1d627e") + ggplot2::scale_y_reverse(breaks=seq(1,10)) + theme_wpa_basic() + ggplot2::theme(legend.position = "none") + @@ -164,14 +164,14 @@ workpatterns_rank <- function(data, ymin = 0.5, ymax = length(myTable_legends$patternRank) + 0.5, alpha = .1, - fill = "red") + + fill = "#fe7f4f") + ggplot2::annotate("rect", xmin = end_hour + 0.5, xmax = 24.5, ymin = 0.5, ymax = length(myTable_legends$patternRank) + 0.5, alpha = .1, - fill = "red") + fill = "#fe7f4f") } else if(return == "table"){