[MediaWiki-commits] [Gerrit] analytics...WDCM-Usage-Dashboard[master]: Usage Dashboard Dec 2017

2017-12-17 Thread GoranSMilovanovic (Code Review)
GoranSMilovanovic has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398695 )

Change subject: Usage Dashboard Dec 2017
..


Usage Dashboard Dec 2017

Change-Id: I229d45fc96e581da487effce6497720b319b0234
---
M server.R
M ui.R
2 files changed, 37 insertions(+), 12 deletions(-)

Approvals:
  GoranSMilovanovic: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/server.R b/server.R
index 5bdfdd6..a57f449 100644
--- a/server.R
+++ b/server.R
@@ -159,9 +159,27 @@
 })
 names(unzip_projectTypes) <- search_projectTypes
 
+### --- Fetch update info
+setwd('/srv/shiny-server/WDCM_UsageDashboard/update/')
+update <- read.csv('toLabsReport.csv', 
+   header = T,
+   check.names = F,
+   stringsAsFactors = F,
+   row.names = 1)
+
 ### --- shinyServer
 shinyServer(function(input, output, session) {
   
+  ### --- output: updateInfo
+  output$updateInfo <- renderText({
+date <- update$timeStamp[dim(update)[1]]
+date <- strsplit(as.character(date), split = " ", fixed = T)[[1]][1]
+date <- strsplit(date, split = "-", fixed = T)
+date[[1]][2] <- month.name[as.numeric(date[[1]][2])]
+date <- paste(unlist(date), collapse = " ")
+return(paste("Last update: ", date, "", sep = 
""))
+  })
+  
   ### --
   ### --- BASIC FACTS
   ### --
diff --git a/ui.R b/ui.R
index 8a8221b..0caf258 100644
--- a/ui.R
+++ b/ui.R
@@ -25,20 +25,27 @@
 
 # - fluidRow Title
 fluidRow(
-  column(width = 12,
- h2('WDCM Usage Dashboard'),
- HTML('Wikidata Concepts 
Monitor')
- 
+  column(width = 5,
+ fluidRow(
+   column(width = 3,
+  img(src = 'Wikidata-logo-en.png',
+  align = "left")
+   ),
+   column(width = 1),
+   column(width = 8,
+  h1('WDCM Usage Dashboard'),
+  HTML('Wikidata Concepts 
Monitor')
+   )
  )
+  ),
+  column(width = 7,
+ br(),
+ HTML('Interactive visualizations of 
Wikidata use by other Wikimedia projects.'),
+ HTML('https://www.wikidata.org/wiki/Wikidata:Wikidata_Concepts_Monitor; 
target="_blank">Visit the WDCM wiki page'),
+ HTML('Did you spot a bug, a missing 
label, or wrong data? https://www.wikidata.org/wiki/Wikidata:Wikidata_Concepts_Monitor/UserFeedback; 
target="_blank">Give us feedback here'),
+ htmlOutput('updateInfo')
+  )
 ), # - fluidRow Title END
-
-# - fluidRow Logo
-fluidRow(
-  column(width = 12,
- img(src='Wikidata-logo-en.png', 
- align = "left")
- )
-), # - fluidRow END
 
 # - hr()
 fluidRow(

-- 
To view, visit https://gerrit.wikimedia.org/r/398695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I229d45fc96e581da487effce6497720b319b0234
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM-Usage-Dashboard
Gerrit-Branch: master
Gerrit-Owner: GoranSMilovanovic 
Gerrit-Reviewer: GoranSMilovanovic 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] analytics...WDCM-Usage-Dashboard[master]: Usage Dashboard Dec 2017

2017-12-17 Thread GoranSMilovanovic (Code Review)
GoranSMilovanovic has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398695 )

Change subject: Usage Dashboard Dec 2017
..

Usage Dashboard Dec 2017

Change-Id: I229d45fc96e581da487effce6497720b319b0234
---
M server.R
M ui.R
2 files changed, 37 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/WDCM-Usage-Dashboard 
refs/changes/95/398695/1

diff --git a/server.R b/server.R
index 5bdfdd6..a57f449 100644
--- a/server.R
+++ b/server.R
@@ -159,9 +159,27 @@
 })
 names(unzip_projectTypes) <- search_projectTypes
 
+### --- Fetch update info
+setwd('/srv/shiny-server/WDCM_UsageDashboard/update/')
+update <- read.csv('toLabsReport.csv', 
+   header = T,
+   check.names = F,
+   stringsAsFactors = F,
+   row.names = 1)
+
 ### --- shinyServer
 shinyServer(function(input, output, session) {
   
+  ### --- output: updateInfo
+  output$updateInfo <- renderText({
+date <- update$timeStamp[dim(update)[1]]
+date <- strsplit(as.character(date), split = " ", fixed = T)[[1]][1]
+date <- strsplit(date, split = "-", fixed = T)
+date[[1]][2] <- month.name[as.numeric(date[[1]][2])]
+date <- paste(unlist(date), collapse = " ")
+return(paste("Last update: ", date, "", sep = 
""))
+  })
+  
   ### --
   ### --- BASIC FACTS
   ### --
diff --git a/ui.R b/ui.R
index 8a8221b..0caf258 100644
--- a/ui.R
+++ b/ui.R
@@ -25,20 +25,27 @@
 
 # - fluidRow Title
 fluidRow(
-  column(width = 12,
- h2('WDCM Usage Dashboard'),
- HTML('Wikidata Concepts 
Monitor')
- 
+  column(width = 5,
+ fluidRow(
+   column(width = 3,
+  img(src = 'Wikidata-logo-en.png',
+  align = "left")
+   ),
+   column(width = 1),
+   column(width = 8,
+  h1('WDCM Usage Dashboard'),
+  HTML('Wikidata Concepts 
Monitor')
+   )
  )
+  ),
+  column(width = 7,
+ br(),
+ HTML('Interactive visualizations of 
Wikidata use by other Wikimedia projects.'),
+ HTML('https://www.wikidata.org/wiki/Wikidata:Wikidata_Concepts_Monitor; 
target="_blank">Visit the WDCM wiki page'),
+ HTML('Did you spot a bug, a missing 
label, or wrong data? https://www.wikidata.org/wiki/Wikidata:Wikidata_Concepts_Monitor/UserFeedback; 
target="_blank">Give us feedback here'),
+ htmlOutput('updateInfo')
+  )
 ), # - fluidRow Title END
-
-# - fluidRow Logo
-fluidRow(
-  column(width = 12,
- img(src='Wikidata-logo-en.png', 
- align = "left")
- )
-), # - fluidRow END
 
 # - hr()
 fluidRow(

-- 
To view, visit https://gerrit.wikimedia.org/r/398695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I229d45fc96e581da487effce6497720b319b0234
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/WDCM-Usage-Dashboard
Gerrit-Branch: master
Gerrit-Owner: GoranSMilovanovic 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits