test

R/divewatch.R

@@ -7,6 +7,7 @@
 #' 
 #' @param data The URL ID of the database in google sheets, if no URL is provided a mock dataset generated
 #' by the test_data function will be read
+#' @param email email account that will be used to access the Logbook in Google Spreadsheet
 #' 
 #' @author Ruben Perez Perez
 #' 
@@ -22,8 +23,9 @@
 #' }
 
 
-divewatch <- function(data = NA){
-              prep_data(data)
+divewatch <- function(data = NA,
+                      email = NA){
+              prep_data(data, email)
               download.file("https://raw.githubusercontent.com/rubenpp7/divewatchr/master/files/overview.Rmd",
                         "overview.Rmd")
               render("overview.Rmd")

R/prep_data.R

@@ -8,6 +8,7 @@
 #' @param data The URL ID of the database in google sheets, if no URL is provided a mock dataset generated
 #' by the test_data function will be read
 #' @param path directory location where the files will be read from or written into
+#' @param email email account that will be used to access the Logbook in Google Spreadsheet
 #' 
 #' @author Ruben Perez Perez
 #' 
@@ -29,16 +30,15 @@
 
 
 prep_data <- function (data = NA,
-                       #email = NA,
+                       email = NA,
                        path = getwd()){
 
 ### READ DATA
 #-------------
 
 if(!is.na(data)){  
 # From Google sheets
-#gs4_auth(email)
-gs4_deauth()  
+gs4_auth(email)
 (scuba_log <- read_sheet(data, sheet = "logbook", na = "")) 
 (scuba_geo <- read_sheet(data, sheet = "coordinates", na = ""))
 (scuba_typ <- read_sheet(data, sheet = "divetypes", na = ""))

divewatchrshiny/app.R

@@ -0,0 +1,100 @@
+#
+# This is a Shiny web application. You can run the application by clicking
+# the 'Run App' button above.
+#
+# Find out more about building applications with Shiny here:
+#
+#    http://shiny.rstudio.com/
+#
+
+
+
+library(shiny)
+library(divewatchr)
+
+
+path <<- "."
+homed <<- getwd()
+
+
+# Define UI for application that draws a histogram
+ui <- fluidPage(
+
+
+    conditionalPanel(condition="$('body').hasClass('disconnected')", tags$div("Disconnected\n refresh browser.",id="disconnectmess")),
+    tags$script('Shiny.addCustomMessageHandler("setcookie",function(cookie) {document.cookie=cookie;});'),
+
+    fluidRow(
+        column(9,titlePanel("Divewatchr")),
+        column(3,conditionalPanel(condition="$('html').hasClass('shiny-busy')",  HTML('<div class="fa-3x"><i class=\'fa fa-spinner fa-spin\' id=\'loadingIcon\'></i></div>')))
+    ),
+    # Application title
+    #titlePanel("Old Faithful Geyser Data"),
+
+
+
+
+    # Sidebar with a slider input for number of bins 
+    sidebarLayout(
+        sidebarPanel(
+            textInput('url','Google Spreadsheet page ID', value = "1PpXTVS8LdzbvwLHyAAhR2MdT9Iwdy-hiqJknUzF7Yqo"),
+            textInput('email','Email account to access the Logbook', value = ""),
+            actionButton("load","Load",icon("refresh")),
+            uiOutput("downloadbutton") # to download the html file from divewatch()
+
+        ),
+
+        # Show a plot of the generated distribution
+        mainPanel(
+            htmlOutput("htmldives")
+        )),
+
+
+
+
+
+
+
+
+)
+
+# Define server logic required to draw a histogram
+server <- function(input, output, session) {
+
+    values<-reactiveValues(sourceURL="")  
+
+    observe({
+        query <- parseQueryString(session$clientData$url_search)
+        if (!is.null(query[["baseurl"]]) & !is.null(query[["resource"]]))  {
+            baseurl <-  query[["baseurl"]] 
+            resource <-  query[["resource"]] 
+            values$sourceURL <- paste0(baseurl, '/resource?r=', resource)
+        }} )
+
+    observeEvent(input$load,{
+        if(!is.null(input$file))
+            values$sourceURL<-input$file[4]
+        else if(!is.null(input$url))
+            values$sourceURL<-input$url
+
+    }) 
+
+    CheckDataset<-reactive({
+        req(values$sourceURL)
+        return(divewatch (values$sourceURL, input$email))
+    })
+
+
+
+    output$htmldives <-  renderUI ({
+        IPTreport<-CheckDataset()
+
+        includeHTML("overview.html") 
+
+    })
+
+
+}
+
+# Run the application 
+shinyApp(ui = ui, server = server)