Rebase repair-charts onto master

This commit is contained in:
Sebastian Serth
2018-11-28 17:21:50 +01:00
parent e08e02f1c8
commit b6ff7ede99
2 changed files with 62 additions and 126 deletions

View File

@@ -33,7 +33,7 @@ h1 = @exercise
-working_time_array.push working_time
hr
.d-none#data data-working-time=ActiveSupport::JSON.encode(working_time_array)
.graph-functions
.working-time-graphs
div#chart_1
hr
div#chart_2