Christopher Johnson (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/247808
Change subject: adds Wikimedia Categories to home view ...................................................................... adds Wikimedia Categories to home view Change-Id: Id09c7d467c816ae111097401dd1da1ad33933bf0 --- M src/model.R M src/output/server-home.R M ui.R 3 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/analytics/dashboard refs/changes/08/247808/1 diff --git a/src/model.R b/src/model.R index f980c5e..6e6180e 100644 --- a/src/model.R +++ b/src/model.R @@ -22,6 +22,7 @@ sparql1 <<- get_local_set("spql1.tsv", sparql_data_uri) sparql2 <<- get_local_set("spql2.tsv", sparql_data_uri) sparql3 <<- get_local_set("spql3.tsv", sparql_data_uri) + sparql13 <<- get_local_set("spql13.tsv", sparql_data_uri) return(invisible()) } diff --git a/src/output/server-home.R b/src/output/server-home.R index a9772ac..147dc19 100644 --- a/src/output/server-home.R +++ b/src/output/server-home.R @@ -24,11 +24,11 @@ )) #Latest DataValues Table -latest_dv <- data.frame(tail(sparql1,2), tail(sparql2,2), tail(sparql3,2)) +latest_dv <- data.frame(tail(sparql1,2), tail(sparql2,2), tail(sparql3,2), tail(sparql13,2)) data_values_latest <- data.table(latest_dv[order(latest_dv$Sys.Date.., decreasing =TRUE),]) -dv_latest <- setnames(data_values_latest, c("Date", "GlobecoordinateValue", "date.1", "TimeValue", "date.2", "QuantityValue")) -dv_latest <- dv_latest[, list(Date, GlobecoordinateValue, TimeValue, QuantityValue)] -dv_delta <- dv_latest[, list(Date, GlobecoordinateValue=diff(GlobecoordinateValue)*-1, TimeValue=diff(TimeValue)*-1, QuantityValue=diff(QuantityValue)*-1)] +dv_latest <- setnames(data_values_latest, c("Date", "GlobecoordinateValue", "date.1", "TimeValue", "date.2", "QuantityValue", "date.3", "Wikimedia Categories" )) +dv_latest <- dv_latest[, list(Date, GlobecoordinateValue, TimeValue, QuantityValue, `Wikimedia Categories`)] +dv_delta <- dv_latest[, list(Date, GlobecoordinateValue=diff(GlobecoordinateValue)*-1, TimeValue=diff(TimeValue)*-1, QuantityValue=diff(QuantityValue)*-1, `Wikimedia Categories`=diff(`Wikimedia Categories`)*-1)] dv_delta_out <- t(dv_delta[1]) dv_latest_out <- t(dv_latest[1]) dv_out <- data.table(dv_latest_out, keep.rownames=TRUE) @@ -41,7 +41,7 @@ dv_join <- dv_join[,.SD,.SDcols=c(1:2,5)] cuts <- 0 output$wikidata_daily_datavalues_table <- DT::renderDataTable( - datatable(dv_join[2:4], class = "display compact", colnames = c("Property", "Value", "Delta"), options = list(dom = 't', columnDefs = list(list(width='10%', targets = c(0)), list(width='30%', targets = c(1)), list(width='30%', targets = c(2)))), caption = paste0("WDQS Sourced Statistics for ", dv_join[1,V1])) %>% + datatable(dv_join[2:5], class = "display compact", colnames = c("Property", "Value", "Delta"), options = list(dom = 't', columnDefs = list(list(width='10%', targets = c(0)), list(width='30%', targets = c(1)), list(width='30%', targets = c(2)))), caption = paste0("WDQS Sourced Statistics for ", dv_join[1,V1])) %>% formatCurrency(2:3, currency = "", interval = 3, mark = ",") %>% formatStyle(3, color = styleInterval(cuts, c("red", "green")) )) diff --git a/ui.R b/ui.R index 0921181..935658b 100644 --- a/ui.R +++ b/ui.R @@ -19,7 +19,7 @@ menuSubItem(text = "getClaims Usage", tabName = "wikidata_daily_getclaims_property_use")), # menuItem(text = "Social Stats", icon = icon("heart"), # menuSubItem(text = "Networks", tabName = "wikidata_daily_social")), - menuItem(text = "", badgeLabel = "Weekly RDF", badgeColor = "red"), + menuItem(text = "", badgeLabel = "Daily RDF", badgeColor = "red"), menuItem(text = "Queries", icon = icon("question"), menuSubItem(text = "Lists", tabName = "wikidata_rdf_queries")), menuItem(text = "", badgeLabel = "Monthly", badgeColor = "purple"), -- To view, visit https://gerrit.wikimedia.org/r/247808 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id09c7d467c816ae111097401dd1da1ad33933bf0 Gerrit-PatchSet: 1 Gerrit-Project: wikidata/analytics/dashboard Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits