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

Changes for Adrian's feedback #7

Merged
merged 3 commits into from
Jun 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# R wants HTML files to have UNIX line endings ie. just \n or LF
*.html text eol=lf
2 changes: 1 addition & 1 deletion dags/observatory.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
'htpasswd -b -c htpasswd observatory {HTPASSWD} && '
'cf login -a https://api.system.y.cld.gov.au -u $CF_USERNAME -p $CF_PASSWORD && '
'cf unmap-route observatory-green apps.y.cld.gov.au -n observatory &&'
'cf v3-apply-manifest -f manifest.yml'
'cf v3-apply-manifest -f manifest.yml &&'
'cf v3-push observatory-green &&'
'cf map-route observatory-green apps.y.cld.gov.au -n observatory &&'
'cf unmap-route observatory-blue apps.y.cld.gov.au -n observatory &&'
Expand Down
20 changes: 12 additions & 8 deletions shiny/observatory/agencycomparison.R
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ agencycomparison_server <- function (input, output) {
})

output$ac_caption <- renderText({
paste(input$agencies, " compared to", input$groups, "agencies")
paste("Comparing referral sources from",input$agencies, " with ", input$groups, "agencies")
})


Expand All @@ -96,11 +96,13 @@ agencycomparison_server <- function (input, output) {
top_n(5) %>%
ggplot(aes(x="", y=tot_source, fill=sourceurl)) +
geom_bar(width = 1, stat = "identity")+
coord_polar("y", start = 0) +
ylab(NULL)+
coord_polar("y", start = 0)+
theme_minimal() +
labs(title = NULL)

theme(axis.text = element_blank(),
axis.ticks = element_blank(),
panel.grid = element_blank()) +
ggtitle("Single Agency referal sources") +
theme(legend.position = "none")
})

output$view2 <- renderPlot({
Expand All @@ -111,9 +113,11 @@ agencycomparison_server <- function (input, output) {
geom_bar(width = 1, stat = "identity")+
coord_polar("y", start = 0)+
ylab(NULL)+
theme_minimal()+
theme(legend.position = "none")+
labs(title = NULL)
theme(axis.text = element_blank(),
axis.ticks = element_blank(),
panel.grid = element_blank()) +
ggtitle("Cohort Agencies referal sources") +
theme(legend.position = "none")
})


Expand Down
5 changes: 0 additions & 5 deletions shiny/observatory/app.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ library(igraph)
library(networkD3)
library(lazyeval)
library(r2d3)
library(dplyr)
library(magrittr)
library(ggplot2)
library(lubridate)
library(stringr)

# Define UI ----
# User interface ----
Expand Down
Loading