Skip to content

Removed return and fixed dtime #1

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.

Sign up for GitHub

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

Open
jonbry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Removed return and fixed dtime #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.Rproj.user
.Rhistory
.RData
.Ruserdata
21 changes: 6 additions & 15 deletions SensorApp/app.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ options(DT.options = list(pageLength = 15))
#set db connection
#using a pool connection so separate connnections are unified
#gets environmental variables saved in local or pwdrstudio environment
poolConn <- dbPool(odbc(), dsn = "mars14_datav2", uid = Sys.getenv("shiny_uid"), pwd = Sys.getenv("shiny_pwd"))
poolConn <- dbPool(odbc::odbc(), dsn = "mars14_datav2", uid = Sys.getenv("shiny_uid"), pwd = Sys.getenv("shiny_pwd"))


#disconnect from db on stop
Expand Down Expand Up @@ -80,7 +80,7 @@ sensor_issue_lookup <- dbGetQuery(poolConn, "select * from fieldwork.tbl_sensor_
#Sensor Serial Number List
hobo_list_query <- "select inv.sensor_serial, inv.sensor_model, inv.date_purchased,
ow.smp_id, ow.ow_suffix from fieldwork.viw_inventory_sensors_full inv
left join fieldwork.tbl_deployment d on d.inventory_sensors_uid = inv.inventory_sensors_uid AND d.collection_dtime_est is NULL
left join fieldwork.tbl_deployment d on d.inventory_sensors_uid = inv.inventory_sensors_uid AND d.collection_dtime is NULL
left join fieldwork.tbl_ow ow on ow.ow_uid = d.ow_uid"
hobo_list <- odbc::dbGetQuery(poolConn, hobo_list_query)
sensor_serial <- hobo_list$sensor_serial
Expand Down Expand Up @@ -244,14 +244,14 @@ server <- function(input, output, session) {

rv$history_dt <- reactive(odbc::dbGetQuery(poolConn, history_query) %>%
select(sensor_serial, smp_site_name, ow_suffix, type, term,
deployment_dtime_est, collection_dtime_est,
deployment_dtime, collection_dtime,
project_name, notes) %>%
dplyr::mutate("Deployment Time" = lubridate::as_date(deployment_dtime_est),
"Collection Time" = lubridate::as_date(collection_dtime_est)) %>%
dplyr::mutate("Deployment Time" = lubridate::as_date(deployment_dtime),
"Collection Time" = lubridate::as_date(collection_dtime)) %>%
dplyr::filter(sensor_serial == input$serial_no))

rv$sensor_history_display <- reactive(rv$history_dt() %>%
dplyr::select(-project_name,-deployment_dtime_est,-collection_dtime_est) %>%
dplyr::select(-project_name,-deployment_dtime,-collection_dtime) %>%
rename("Serial Number" = "sensor_serial",
"SMP ID/Site Name" = "smp_site_name",
"Location" = "ow_suffix",
Expand Down Expand Up @@ -509,15 +509,6 @@ server <- function(input, output, session) {
}
)

#2.8 return values ------
return(
list(
refresh_serial_no = reactive(rv$refresh_serial_no),
serial_no = reactive(input$serial_no),
sensor_serial = reactive(rv$sensor_table$sensor_serial)
)
)

# Add/Edit Sensor Test tab ----
rv$sensor_tests <- reactive(dbGetQuery(poolConn, "SELECT * FROM fieldwork.tbl_sensor_tests INNER JOIN
fieldwork.tbl_sensor_test_type_lookup USING(test_type_lookup_uid)"))
Expand Down
13 changes: 13 additions & 0 deletions SensorHub.Rproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Version: 1.0

RestoreWorkspace: Default
SaveWorkspace: Default
AlwaysSaveHistory: Default

EnableCodeIndexing: Yes
UseSpacesForTab: Yes
NumSpacesForTab: 2
Encoding: UTF-8

RnwWeave: Sweave
LaTeX: pdfLaTeX