Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: move data to subdirectory
......................................................................
move data to subdirectory
Change-Id: Ibde752eeaffad32c9cae5f1ca350563dbccede2a
---
M .gitignore
R data/Wikidata community engagement tracking - Sheet1.ods
R data/wikidata-edits.tsv
R data/wikidata-pages.tsv
R data/wikidata-properties.tsv
M server.R
M ui.R
M wdm.Rproj
8 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
index aa7f856..bafaa18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
.Rhistory
.Rproj.user/
-
+.RData
diff --git a/Wikidata community engagement tracking - Sheet1.ods
b/data/Wikidata community engagement tracking - Sheet1.ods
similarity index 100%
rename from Wikidata community engagement tracking - Sheet1.ods
rename to data/Wikidata community engagement tracking - Sheet1.ods
Binary files differ
diff --git a/wikidata-edits.tsv b/data/wikidata-edits.tsv
similarity index 100%
rename from wikidata-edits.tsv
rename to data/wikidata-edits.tsv
diff --git a/wikidata-pages.tsv b/data/wikidata-pages.tsv
similarity index 100%
rename from wikidata-pages.tsv
rename to data/wikidata-pages.tsv
diff --git a/wikidata-properties.tsv b/data/wikidata-properties.tsv
similarity index 100%
rename from wikidata-properties.tsv
rename to data/wikidata-properties.tsv
diff --git a/server.R b/server.R
index 65211da..62021cd 100644
--- a/server.R
+++ b/server.R
@@ -3,18 +3,18 @@
existing_date <- (Sys.Date()-1)
-## Read in desktop data and generate means for the value boxes, along with a
time-series appropriate form for
+## Read in data and generate means for the value boxes, along with a
time-series appropriate form for
## dygraphs.
read_desktop <- function(){
data <- download_set("wikidata-edits.tsv")
wikidata_edits <<- data
-
+
data <- download_set("wikidata-pages.tsv")
wikidata_pages <<- data
-
+
data <- download_set("wikidata-properties.tsv")
wikidata_properties <<- data
-
+
return(invisible())
}
diff --git a/ui.R b/ui.R
index 3af7b78..25c859c 100644
--- a/ui.R
+++ b/ui.R
@@ -16,7 +16,7 @@
menuItem(text = "Wikidata",
menuSubItem(text = "Edits", tabName = "wikidata_edits"),
menuSubItem(text = "Pages", tabName = "wikidata_pages"),
- menuSubItem(text = "Properties", tabName =
"wikidata_properties")),
+ menuSubItem(text = "Properties", tabName =
"wikidata_properties")),
selectInput(inputId = "smoothing_global", label = "Smoothing (Global
Setting)", selectize = TRUE, selected = "day",
choices = c("No Smoothing" = "day", "Moving Average" =
"moving_avg",
"Weekly Median" = "week", "Monthly Median" =
"month"))
diff --git a/wdm.Rproj b/wdm.Rproj
index 8e3c2eb..d96a2b3 100644
--- a/wdm.Rproj
+++ b/wdm.Rproj
@@ -11,3 +11,5 @@
RnwWeave: Sweave
LaTeX: pdfLaTeX
+
+StripTrailingWhitespace: Yes
--
To view, visit https://gerrit.wikimedia.org/r/238539
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibde752eeaffad32c9cae5f1ca350563dbccede2a
Gerrit-PatchSet: 1
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
