Merge pull request #7 from govau/Adrian-Feedback

Changes for Adrian's feedback

.gitattributes

@@ -0,0 +1,2 @@
+# R wants HTML files to have UNIX line endings ie. just \n or LF 
+*.html text eol=lf

dags/observatory.py

@@ -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 &&'

shiny/observatory/agencycomparison.R

@@ -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")
   })
 
 
@@ -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({
@@ -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")
   })
 
 

shiny/observatory/app.R

@@ -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 ----