Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: refactors into /src removes datatable dom elements adds links
to page metrics from seeAlso adds link to this page icon, moves to right side
of page adds dashboardReference annotation to metrics.owl
......................................................................
refactors into /src
removes datatable dom elements
adds links to page metrics from seeAlso
adds link to this page icon, moves to right side of page
adds dashboardReference annotation to metrics.owl
Change-Id: I09560645308702e00cfa8b56d8f16bd93a55868c
---
M .gitignore
D Rcron.sh
M assets/catalog-v001.xml
M assets/metrics.owl
M data/sparql/spql1.tsv
M data/sparql/spql10.tsv
M data/sparql/spql11.tsv
M data/sparql/spql12.tsv
M data/sparql/spql13.tsv
M data/sparql/spql14.tsv
M data/sparql/spql15.tsv
M data/sparql/spql16.tsv
M data/sparql/spql17.tsv
M data/sparql/spql18.tsv
M data/sparql/spql19.tsv
M data/sparql/spql2.tsv
M data/sparql/spql20.tsv
M data/sparql/spql21.tsv
M data/sparql/spql3.tsv
M data/sparql/spql4.tsv
M data/sparql/spql5.tsv
M data/sparql/spql6.tsv
M data/sparql/spql7.tsv
M data/sparql/spql8.tsv
M data/sparql/spql9.tsv
M global.R
M server.R
R src/config.R
R src/model.R
R src/output/server-KPI.R
R src/output/server-RDFQ.R
R src/output/server-content.R
R src/output/server-developer.R
R src/output/server-engagement.R
R src/output/server-home.R
R src/output/server-recent.R
A src/scripts/Rcron.sh
R src/scripts/bulk_sparql.R
R src/scripts/bulk_sparql.Rout
R src/utils.R
M ui.R
41 files changed, 87 insertions(+), 43 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index b9dfc21..e70988f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
.Rproj.user/
.RData
.Rproj.user
+/data/sparql/*
diff --git a/Rcron.sh b/Rcron.sh
deleted file mode 100755
index 00edb39..0000000
--- a/Rcron.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-R CMD BATCH /srv/dashboards/shiny-server/wdm/bulk_sparql.R
diff --git a/assets/catalog-v001.xml b/assets/catalog-v001.xml
index 4775607..6d5e3fb 100644
--- a/assets/catalog-v001.xml
+++ b/assets/catalog-v001.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<group id="Folder Repository, directory=, recursive=true,
Auto-Update=true, version=2" prefer="public" xml:base="">
- <uri id="Automatically generated entry, Timestamp=1444029417262"
name="http://wikiba.se/metrics"; uri="metrics.owl"/>
+ <uri id="Automatically generated entry, Timestamp=1445344434972"
name="http://wikiba.se/metrics"; uri="metrics.owl"/>
</group>
</catalog>
diff --git a/assets/metrics.owl b/assets/metrics.owl
index 264bb94..23ffa43 100644
--- a/assets/metrics.owl
+++ b/assets/metrics.owl
@@ -11,10 +11,10 @@
<rdf:RDF xmlns="http://wikiba.se/metrics#";
xml:base="http://wikiba.se/metrics";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#";
xmlns:owl="http://www.w3.org/2002/07/owl#";
xmlns:xsd="http://www.w3.org/2001/XMLSchema#";
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#";>
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
<owl:Ontology rdf:about="http://wikiba.se/metrics#"/>
@@ -27,6 +27,12 @@
///////////////////////////////////////////////////////////////////////////////////////
-->
+
+
+
+ <!-- http://wikiba.se/metrics#dashboardReference -->
+
+ <owl:AnnotationProperty
rdf:about="http://wikiba.se/metrics#dashboardReference"/>
@@ -154,9 +160,10 @@
<owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Active_Users";>
<rdf:type rdf:resource="http://wikiba.se/metrics#Engagement"/>
-
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/site_stats_active_users.tsv</dataSourceURI>
<rdfs:comment>any account with an action recorded in the RC table
during the last 30 days - see the source code of SpecialActiveusers.php for
more details.</rdfs:comment>
<updateFrequency>Daily</updateFrequency>
+ <dashboardReference>./?t=wikidata_active_users</dashboardReference>
+
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/site_stats_active_users.tsv</dataSourceURI>
</owl:NamedIndividual>
@@ -174,9 +181,10 @@
<owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Edits";>
<rdf:type rdf:resource="http://wikiba.se/metrics#Engagement"/>
- <rdfs:comment>updates to countable pages (in #Content namespaces).
Also includes new page creation.</rdfs:comment>
- <updateFrequency>Daily</updateFrequency>
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/site_stats_total_edits.tsv</dataSourceURI>
+ <updateFrequency>Daily</updateFrequency>
+ <rdfs:comment>updates to countable pages (in #Content namespaces).
Also includes new page creation.</rdfs:comment>
+ <dashboardReference>./?t=wikidata_edits</dashboardReference>
</owl:NamedIndividual>
@@ -235,8 +243,8 @@
<owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Items";>
<rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
- <updateFrequency>Monthly</updateFrequency>
<rdfs:isDefinedBy>http://wikiba.se/ontology#Item</rdfs:isDefinedBy>
+ <updateFrequency>Monthly</updateFrequency>
</owl:NamedIndividual>
@@ -274,9 +282,10 @@
<owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Pages";>
<rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
- <updateFrequency>Daily</updateFrequency>
<rdfs:comment>content pages are pages which contain an internal link
(aka wikilink), category or property link, and are not a redirect
page.</rdfs:comment>
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/site_stats_total_pages.tsv</dataSourceURI>
+ <updateFrequency>Daily</updateFrequency>
+ <dashboardReference>./?t=wikidata_pages</dashboardReference>
</owl:NamedIndividual>
@@ -295,8 +304,8 @@
<owl:NamedIndividual
rdf:about="http://wikiba.se/metrics#Referenced_Statements_by_Type";>
<rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
- <updateFrequency>Monthly</updateFrequency>
<rdfs:isDefinedBy>http://wikiba.se/ontology#Statement</rdfs:isDefinedBy>
+ <updateFrequency>Monthly</updateFrequency>
</owl:NamedIndividual>
@@ -315,8 +324,8 @@
<owl:NamedIndividual
rdf:about="http://wikiba.se/metrics#Referenced_Statements_to_Wikipedia_by_Type";>
<rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
-
<rdfs:isDefinedBy>http://wikiba.se/ontology#Statement</rdfs:isDefinedBy>
<updateFrequency>Monthly</updateFrequency>
+
<rdfs:isDefinedBy>http://wikiba.se/ontology#Statement</rdfs:isDefinedBy>
</owl:NamedIndividual>
@@ -345,8 +354,8 @@
<owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Statement_Ranks";>
<rdf:type rdf:resource="http://wikiba.se/metrics#Content"/>
- <rdfs:isDefinedBy>http://wikiba.se/ontology#Rank</rdfs:isDefinedBy>
<updateFrequency>Monthly</updateFrequency>
+ <rdfs:isDefinedBy>http://wikiba.se/ontology#Rank</rdfs:isDefinedBy>
</owl:NamedIndividual>
@@ -365,8 +374,8 @@
<owl:NamedIndividual rdf:about="http://wikiba.se/metrics#Twitter";>
<rdf:type rdf:resource="http://wikiba.se/metrics#Social_Media"/>
-
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_twitter.tsv</dataSourceURI>
<updateFrequency>Daily</updateFrequency>
+
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_twitter.tsv</dataSourceURI>
</owl:NamedIndividual>
@@ -385,8 +394,8 @@
<owl:NamedIndividual
rdf:about="http://wikiba.se/metrics#getClaim_Property_Use_count";>
<rdf:type rdf:resource="http://wikiba.se/metrics#Developer"/>
<rdfs:label>getClaim Property Use count</rdfs:label>
-
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/getclaims_property_use.tsv</dataSourceURI>
<updateFrequency>Daily</updateFrequency>
+
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/getclaims_property_use.tsv</dataSourceURI>
</owl:NamedIndividual>
@@ -413,8 +422,8 @@
<owl:NamedIndividual
rdf:about="http://wikiba.se/metrics#mailing_list_subscribers_-l";>
<rdf:type rdf:resource="http://wikiba.se/metrics#Mailing_Lists"/>
-
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_mail.tsv</dataSourceURI>
<updateFrequency>Daily</updateFrequency>
+
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_mail.tsv</dataSourceURI>
</owl:NamedIndividual>
@@ -423,8 +432,8 @@
<owl:NamedIndividual
rdf:about="http://wikiba.se/metrics#mailing_list_subscribers_-tech";>
<rdf:type rdf:resource="http://wikiba.se/metrics#Mailing_Lists"/>
-
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_techmail.tsv</dataSourceURI>
<updateFrequency>Daily</updateFrequency>
+
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_techmail.tsv</dataSourceURI>
</owl:NamedIndividual>
@@ -433,8 +442,8 @@
<owl:NamedIndividual
rdf:about="http://wikiba.se/metrics#newsletter_subscribers";>
<rdf:type rdf:resource="http://wikiba.se/metrics#Mailing_Lists"/>
-
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_newsletter.tsv</dataSourceURI>
<updateFrequency>Daily</updateFrequency>
+
<dataSourceURI>http://datasets.wikimedia.org/aggregate-datasets/wikidata/social_newsletter.tsv</dataSourceURI>
</owl:NamedIndividual>
@@ -526,3 +535,4 @@
<!-- Generated by the OWL API (version 3.5.0) http://owlapi.sourceforge.net -->
+
diff --git a/data/sparql/spql1.tsv b/data/sparql/spql1.tsv
index f8bddb9..abce504 100644
--- a/data/sparql/spql1.tsv
+++ b/data/sparql/spql1.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 2353341
2015-10-18 "2326987"
+2015-10-20 "2327322"
diff --git a/data/sparql/spql10.tsv b/data/sparql/spql10.tsv
index 6353117..ceec31f 100644
--- a/data/sparql/spql10.tsv
+++ b/data/sparql/spql10.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 887
2015-10-18 "886"
+2015-10-20 "886"
diff --git a/data/sparql/spql11.tsv b/data/sparql/spql11.tsv
index cdf0754..9848c32 100644
--- a/data/sparql/spql11.tsv
+++ b/data/sparql/spql11.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 31
2015-10-18 "31"
+2015-10-20 "31"
diff --git a/data/sparql/spql12.tsv b/data/sparql/spql12.tsv
index 456e757..0ed782d 100644
--- a/data/sparql/spql12.tsv
+++ b/data/sparql/spql12.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 30
2015-10-18 "30"
+2015-10-20 "30"
diff --git a/data/sparql/spql13.tsv b/data/sparql/spql13.tsv
index 498f8bf..3323471 100644
--- a/data/sparql/spql13.tsv
+++ b/data/sparql/spql13.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 2513357
2015-10-18 "2507958"
+2015-10-20 "2507730"
diff --git a/data/sparql/spql14.tsv b/data/sparql/spql14.tsv
index a2966f2..7e7a699 100644
--- a/data/sparql/spql14.tsv
+++ b/data/sparql/spql14.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 1121470
2015-10-18 "1120407"
+2015-10-20 "1120855"
diff --git a/data/sparql/spql15.tsv b/data/sparql/spql15.tsv
index 203be2d..9a895b0 100644
--- a/data/sparql/spql15.tsv
+++ b/data/sparql/spql15.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 1673007
2015-10-18 "1673030"
+2015-10-20 "1678643"
diff --git a/data/sparql/spql16.tsv b/data/sparql/spql16.tsv
index e1c46c8..2e1d87d 100644
--- a/data/sparql/spql16.tsv
+++ b/data/sparql/spql16.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 2113063
2015-10-18 "2112502"
+2015-10-20 "2113112"
diff --git a/data/sparql/spql17.tsv b/data/sparql/spql17.tsv
index 3da16c5..080eada 100644
--- a/data/sparql/spql17.tsv
+++ b/data/sparql/spql17.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 2921028
2015-10-18 "2921747"
+2015-10-20 "2925817"
diff --git a/data/sparql/spql18.tsv b/data/sparql/spql18.tsv
index 5f1d909..2400d77 100644
--- a/data/sparql/spql18.tsv
+++ b/data/sparql/spql18.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 925204
2015-10-18 "925324"
+2015-10-20 "925546"
diff --git a/data/sparql/spql19.tsv b/data/sparql/spql19.tsv
index 42d84a3..f754450 100644
--- a/data/sparql/spql19.tsv
+++ b/data/sparql/spql19.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 24426
2015-10-18 "24422"
+2015-10-20 "24425"
diff --git a/data/sparql/spql2.tsv b/data/sparql/spql2.tsv
index e235b8b..3a94b7d 100644
--- a/data/sparql/spql2.tsv
+++ b/data/sparql/spql2.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 195633
2015-10-18 "195419"
+2015-10-20 "195743"
diff --git a/data/sparql/spql20.tsv b/data/sparql/spql20.tsv
index 7f61655..bc65691 100644
--- a/data/sparql/spql20.tsv
+++ b/data/sparql/spql20.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 given name
2015-10-18 "given name"
+2015-10-20 "given name"
diff --git a/data/sparql/spql21.tsv b/data/sparql/spql21.tsv
index 9a41bce..6d43b6a 100644
--- a/data/sparql/spql21.tsv
+++ b/data/sparql/spql21.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 2469638
2015-10-18 "2471593"
+2015-10-20 "2488800"
diff --git a/data/sparql/spql3.tsv b/data/sparql/spql3.tsv
index 2787aac..7d0e0a0 100644
--- a/data/sparql/spql3.tsv
+++ b/data/sparql/spql3.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 67683
2015-10-18 "66813"
+2015-10-20 "67958"
diff --git a/data/sparql/spql4.tsv b/data/sparql/spql4.tsv
index 74e1dfe..023a67a 100644
--- a/data/sparql/spql4.tsv
+++ b/data/sparql/spql4.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 47367
2015-10-18 "44710"
+2015-10-20 "44854"
diff --git a/data/sparql/spql5.tsv b/data/sparql/spql5.tsv
index 120f0c7..1df29f8 100644
--- a/data/sparql/spql5.tsv
+++ b/data/sparql/spql5.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 1872
2015-10-18 "1867"
+2015-10-20 "1867"
diff --git a/data/sparql/spql6.tsv b/data/sparql/spql6.tsv
index 3a0abd0..8d8a1ac 100644
--- a/data/sparql/spql6.tsv
+++ b/data/sparql/spql6.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 649
2015-10-18 "648"
+2015-10-20 "648"
diff --git a/data/sparql/spql7.tsv b/data/sparql/spql7.tsv
index 64221b7..6612869 100644
--- a/data/sparql/spql7.tsv
+++ b/data/sparql/spql7.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 35
2015-10-18 "32"
+2015-10-20 "32"
diff --git a/data/sparql/spql8.tsv b/data/sparql/spql8.tsv
index 0f5572e..fcca021 100644
--- a/data/sparql/spql8.tsv
+++ b/data/sparql/spql8.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 20
2015-10-18 "20"
+2015-10-20 "20"
diff --git a/data/sparql/spql9.tsv b/data/sparql/spql9.tsv
index 4b1fa31..0448087 100644
--- a/data/sparql/spql9.tsv
+++ b/data/sparql/spql9.tsv
@@ -1,3 +1,4 @@
Sys.Date.. text
2015-10-17 205
2015-10-18 "205"
+2015-10-20 "205"
diff --git a/global.R b/global.R
index 8bbfdda..8036ed4 100644
--- a/global.R
+++ b/global.R
@@ -1,3 +1,3 @@
-source("config.R")
-source("model.R")
-source("utils.R")
\ No newline at end of file
+source("./src/config.R")
+source("./src/model.R")
+source("./src/utils.R")
\ No newline at end of file
diff --git a/server.R b/server.R
index 92109d9..470ac1a 100644
--- a/server.R
+++ b/server.R
@@ -41,17 +41,17 @@
})
# Home
- source('./output/server-home.R', local=TRUE)
+ source('./src/output/server-home.R', local=TRUE)
# Recent
- source('./output/server-recent.R', local=TRUE)
+ source('./src/output/server-recent.R', local=TRUE)
# Developer
- source('./output/server-developer.R', local=TRUE)
+ source('./src/output/server-developer.R', local=TRUE)
# RDF
- source('./output/server-RDFQ.R', local=TRUE)
+ source('./src/output/server-RDFQ.R', local=TRUE)
# Engagement
- source('./output/server-engagement.R', local=TRUE)
+ source('./src/output/server-engagement.R', local=TRUE)
# Content
- source('./output/server-content.R', local=TRUE)
+ source('./src/output/server-content.R', local=TRUE)
# KPI
- source('./output/server-KPI.R', local=TRUE)
+ source('./src/output/server-KPI.R', local=TRUE)
}
diff --git a/config.R b/src/config.R
similarity index 68%
rename from config.R
rename to src/config.R
index c5a8089..2d75d5c 100644
--- a/config.R
+++ b/src/config.R
@@ -19,10 +19,13 @@
library(DT)
library(XML)
-data_uri <- "/srv/dashboards/shiny-server/wdm/data/"
-sparql_data_uri <- "/srv/dashboards/shiny-server/wdm/data/sparql/"
+base_uri <- "/srv/dashboards/shiny-server/wdm/"
+data_uri <- paste0(base_uri, "data/")
+sparql_data_uri <- paste0(data_uri, "sparql/")
+custom_css <- paste0(base_uri, "assets/css/custom.css")
+metrics_rdf <- paste0(base_uri, "assets/metrics.owl")
+
source_data_uri <- "http://wdm-data.wmflabs.org/data/";
agg_data_uri <- "http://datasets.wikimedia.org/aggregate-datasets/wikidata/";
wdqs_uri <- "https://query.wikidata.org/bigdata/namespace/wdq/sparql?query=";
-custom_css <- "./assets/css/custom.css"
-metrics_rdf <- "/srv/dashboards/shiny-server/wdm/assets/metrics.owl"
+
diff --git a/model.R b/src/model.R
similarity index 100%
rename from model.R
rename to src/model.R
diff --git a/output/server-KPI.R b/src/output/server-KPI.R
similarity index 100%
rename from output/server-KPI.R
rename to src/output/server-KPI.R
diff --git a/output/server-RDFQ.R b/src/output/server-RDFQ.R
similarity index 100%
rename from output/server-RDFQ.R
rename to src/output/server-RDFQ.R
diff --git a/output/server-content.R b/src/output/server-content.R
similarity index 100%
rename from output/server-content.R
rename to src/output/server-content.R
diff --git a/output/server-developer.R b/src/output/server-developer.R
similarity index 100%
rename from output/server-developer.R
rename to src/output/server-developer.R
diff --git a/output/server-engagement.R b/src/output/server-engagement.R
similarity index 100%
rename from output/server-engagement.R
rename to src/output/server-engagement.R
diff --git a/output/server-home.R b/src/output/server-home.R
similarity index 90%
rename from output/server-home.R
rename to src/output/server-home.R
index c94c7db..db68aa1 100644
--- a/output/server-home.R
+++ b/src/output/server-home.R
@@ -18,7 +18,7 @@
dt_join <- dt_join[,.SD,.SDcols=c(1:2,5)]
cuts <- 0
output$wikidata_daily_summary_table <- DT::renderDataTable(
- datatable(dt_join[2:5], class = "display compact", colnames = c("Property",
"Value", "Delta"), caption = paste0("Statistics for ", dt_join[1,V1])) %>%
+ datatable(dt_join[2:5], class = "display compact", colnames = c("Property",
"Value", "Delta"), options = list(dom = 't'), caption = paste0("Statistics for
", dt_join[1,V1])) %>%
formatCurrency(2:3, currency = "", interval = 3, mark = ",") %>%
formatStyle(3, color = styleInterval(cuts, c("red", "green"))
))
@@ -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"), caption = paste0("WDQS Sourced Statistics for ",
dv_join[1,V1])) %>%
+ datatable(dv_join[2:4], class = "display compact", colnames = c("Property",
"Value", "Delta"), options = list(dom = 't'), 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/output/server-recent.R b/src/output/server-recent.R
similarity index 89%
rename from output/server-recent.R
rename to src/output/server-recent.R
index 0cac3cd..7f292b9 100644
--- a/output/server-recent.R
+++ b/src/output/server-recent.R
@@ -23,7 +23,8 @@
output$metric_meta_recent_edits_seeAlso <- renderUI({
metric_desc <- get_rdf_metadata(paste0("<",daily_obj[3],">"),
"<http://www.w3.org/2000/01/rdf-schema#seeAlso>")
- standard_seeAlso_box(metric_desc[1])
+ metric_reference <- get_rdf_metadata(paste0("<",engagement_obj[1],">"),
"<http://wikiba.se/metrics#dashboardReference>")
+ standard_seeAlso_box(metric_reference, metric_desc[1])
})
# http://wikiba.se/metrics#RecentPages
wikidata_recent_pages <- wikidata_pages[which(wikidata_pages$date > Sys.Date()
- 8),]
@@ -54,7 +55,8 @@
})
output$metric_meta_recent_pages_seeAlso <- renderUI({
metric_desc <- get_rdf_metadata(paste0("<",daily_obj[2],">"),
"<http://www.w3.org/2000/01/rdf-schema#seeAlso>")
- standard_seeAlso_box(metric_desc[1])
+ metric_reference <- get_rdf_metadata(paste0("<",content_obj[13],">"),
"<http://wikiba.se/metrics#dashboardReference>")
+ standard_seeAlso_box(metric_reference, metric_desc[1])
})
# http://wikiba.se/metrics#RecentUsers
df_recent_users <- wikidata_active_users[order(wikidata_active_users$date,
decreasing =TRUE),]
@@ -78,5 +80,6 @@
})
output$metric_meta_recent_users_seeAlso <- renderUI({
metric_desc <- get_rdf_metadata(paste0("<",daily_obj[1],">"),
"<http://www.w3.org/2000/01/rdf-schema#seeAlso>")
- standard_seeAlso_box(metric_desc[1])
+ metric_reference <- get_rdf_metadata(paste0("<",engagement_obj[2],">"),
"<http://wikiba.se/metrics#dashboardReference>")
+ standard_seeAlso_box(metric_reference, metric_desc[1])
})
diff --git a/src/scripts/Rcron.sh b/src/scripts/Rcron.sh
new file mode 100755
index 0000000..5e210c1
--- /dev/null
+++ b/src/scripts/Rcron.sh
@@ -0,0 +1,2 @@
+#! /bin/bash
+R CMD BATCH /srv/dashboards/shiny-server/wdm/src/scripts/bulk_sparql.R
diff --git a/bulk_sparql.R b/src/scripts/bulk_sparql.R
similarity index 100%
rename from bulk_sparql.R
rename to src/scripts/bulk_sparql.R
diff --git a/bulk_sparql.Rout b/src/scripts/bulk_sparql.Rout
similarity index 100%
rename from bulk_sparql.Rout
rename to src/scripts/bulk_sparql.Rout
diff --git a/utils.R b/src/utils.R
similarity index 98%
rename from utils.R
rename to src/utils.R
index 0e53ccd..0603c9d 100644
--- a/utils.R
+++ b/src/utils.R
@@ -170,8 +170,8 @@
return(box(title = "Individual", width = 12, status = "primary", tags$a(href
= value, value)))
}
-standard_seeAlso_box <- function(value) {
- return(box(title = "seeAlso", width = 6, status = "primary", tags$a(href =
value, value, target="_blank")))
+standard_seeAlso_box <- function(href, value) {
+ return(box(title = "seeAlso", width = 6, status = "primary", tags$a(value,
href=href, target="_blank")))
}
diff --git a/ui.R b/ui.R
index bab6f07..0921181 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 Stats", badgeColor = "red"),
+ menuItem(text = "", badgeLabel = "Weekly RDF", badgeColor = "red"),
menuItem(text = "Queries", icon = icon("question"),
menuSubItem(text = "Lists", tabName = "wikidata_rdf_queries")),
menuItem(text = "", badgeLabel = "Monthly", badgeColor = "purple"),
@@ -68,7 +68,9 @@
fluidRow(
uiOutput("metric_meta_recent_edits_seeAlso")
),
- tags$a(href="./?t=wikidata_daily_edits_delta", "Link here: ",
icon("external-link"))),
+ fluidRow(column(width=12, offset=10,
+ tags$a(href="./?t=wikidata_daily_edits_delta", "Link to this Page:
", icon("share-alt")))
+ )),
tabItem(tabName = "wikidata_daily_pages_delta",
dygraphOutput("wikidata_daily_pages_delta_plot"),
tags$br(),
@@ -79,7 +81,9 @@
fluidRow(
uiOutput("metric_meta_recent_pages_seeAlso")
),
- tags$a(href="./?t=wikidata_daily_pages_delta", "Link here: ",
icon("external-link"))),
+ fluidRow(column(width=12, offset=10,
+ tags$a(href="./?t=wikidata_daily_pages_delta", "Link to this Page:
", icon("share-alt")))
+ )),
tabItem(tabName = "wikidata_daily_users_delta",
dygraphOutput("wikidata_daily_users_delta_plot"),
tags$br(),
@@ -89,7 +93,9 @@
fluidRow(
uiOutput("metric_meta_recent_users_seeAlso")
),
- tags$a(href="./?t=wikidata_daily_users_delta", "Link here: ",
icon("external-link"))),
+ fluidRow(column(width=12, offset=10,
+ tags$a(href="./?t=wikidata_daily_users_delta", "Link to this Page:
", icon("share-alt")))
+ )),
tabItem(tabName = "wikidata_daily_social",
dygraphOutput("wikidata_daily_social_plot"),
tags$br(),
--
To view, visit https://gerrit.wikimedia.org/r/247573
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09560645308702e00cfa8b56d8f16bd93a55868c
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/analytics/dashboard
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) <[email protected]>
Gerrit-Reviewer: Christopher Johnson (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
