diff --git a/assets/scripts/edgeville.coffee b/assets/scripts/edgeville.coffee index 853461e..7eda933 100644 --- a/assets/scripts/edgeville.coffee +++ b/assets/scripts/edgeville.coffee @@ -1,3 +1,3 @@ $ -> # run foundation scripts - $(document).foundation() + console.log('Ready.') diff --git a/assets/scripts/reports.coffee b/assets/scripts/reports.coffee index f1a285e..87b66e1 100644 --- a/assets/scripts/reports.coffee +++ b/assets/scripts/reports.coffee @@ -1,55 +1,113 @@ -$(document).ready -> - $('#generate_button').on 'click', (e) -> - e.preventDefault() - $.ajax( - method: 'POST' - url: '/reports' - data: - type: $('#report_type').val() - choice: $('#report_choice').val() - compare: $('#report_compare').val() - ).done (data) -> - benchChart.options.title.text = data.choice - benchChart.data.labels = data.names - benchChart.data.datasets[0].data = data.avg_results - benchChart.data.datasets[1].data = data.min_results - benchChart.update() - return - return - return +$ -> + chartInstance = null -benchChart = new Chart(document.getElementById('chart_canvas').getContext('2d'), - type: 'horizontalBar' - data: - labels: [] - datasets: [ - { - label: 'Average FPS' - data: [] - backgroundColor: 'hotpink' - borderColor: '#212121' - borderWidth: 1 - } - { - label: 'Minimum FPS' - data: [] - backgroundColor: 'cornflowerblue' - borderColor: '#212121' - borderWidth: 1 - } - ] - options: - title: - display: true - text: 'N/a' - scales: xAxes: [ { - display: true - ticks: beginAtZero: true - } ] - animation: onComplete: -> - dwnbtn = $('#download_button') - dwnbtn.attr 'href', benchChart.toBase64Image() - dwnbtn.attr 'download', 'benchmark_chart.png' - dwnbtn.attr 'disabled', false - return -) + $('#reports-download').on 'click', (e) -> + e.preventDefault() + canvas = $('#benchmark-chart')[0] + a = document.createElement 'a' + a.href = canvas.toDataURL 'image/png' + a.download = 'chart.png' + a.click() + + $('#reports-button').on 'click', (e) -> + e.preventDefault() + $('#reports-download').attr('disabled', true) + chartInstance.destroy() if chartInstance + + benchmarkId = $('#report-benchmarks').val() + testIds = $('#report-tests').val() + + benchmarkSearchParams = new URLSearchParams + benchmark_id: benchmarkId + benchmarkRes = await fetch("/api/v1/benchmark/details?#{benchmarkSearchParams}") + benchmarkData = await benchmarkRes.json() + + data = + labels: [] + datasets: [] + + switch benchmarkData.scoring + when 'pts' + data.datasets.push({ + label: 'Average Score' + data: [] + }) + when 'fps' + data.datasets.push({ + label: 'Average FPS' + data: [] + }) + data.datasets.push({ + label: 'Minimum FPS' + data: [] + }) + when 'ms' + data.datasets.push({ + label: 'Average Frame Time' + data: [] + }) + data.datasets.push({ + label: 'Minimum Frame Time' + data: [] + }) + + for testId in testIds + try + testSearchParams = new URLSearchParams + test_id: testId + testRes = await fetch("/api/v1/test/details?#{testSearchParams}") + testData = await testRes.json() + + resultSearchParams = new URLSearchParams + test_id: testId + benchmark_id: benchmarkId + resultRes = await fetch("/api/v1/result/list?#{resultSearchParams}") + resultData = await resultRes.json() + + avg_total = 0 + min_total = 0 + max_total = 0 + + for result in resultData + avg_total += result.avg_score + min_total += result.min_score if result.min_score + max_total += result.max_score if result.max_score + + data.labels.push(testData.name) + data.datasets[0].data.push(avg_total / resultData.length) + console.log(data.datasets[0].data) + switch benchmarkData.scoring + when 'fps', 'ms' + data.datasets[1].data.push(min_total / resultData.length) + catch error + console.error 'An error occurred while fetching benchmark results.', error + + ctx = $('#benchmark-chart')[0].getContext('2d') + + options = + indexAxis: 'y' + plugins: + title: + display: true + text: benchmarkData.name + font: + size: '24' + datalabels: + anchor: 'end' + align: 'left' + color: 'black' + font: + weight: 'bold' + formatter: (value) -> value + scales: + y: + beginAtZero: true + + chartInstance = new Chart ctx, + type: 'bar' + data: data + options: options + plugins: [ChartDataLabels] + + $('#reports-download').attr('disabled', false) + $('#benchmark-chart').removeClass('disabled') diff --git a/assets/scripts/reports.coffee.bak b/assets/scripts/reports.coffee.bak new file mode 100644 index 0000000..f1a285e --- /dev/null +++ b/assets/scripts/reports.coffee.bak @@ -0,0 +1,55 @@ +$(document).ready -> + $('#generate_button').on 'click', (e) -> + e.preventDefault() + $.ajax( + method: 'POST' + url: '/reports' + data: + type: $('#report_type').val() + choice: $('#report_choice').val() + compare: $('#report_compare').val() + ).done (data) -> + benchChart.options.title.text = data.choice + benchChart.data.labels = data.names + benchChart.data.datasets[0].data = data.avg_results + benchChart.data.datasets[1].data = data.min_results + benchChart.update() + return + return + return + +benchChart = new Chart(document.getElementById('chart_canvas').getContext('2d'), + type: 'horizontalBar' + data: + labels: [] + datasets: [ + { + label: 'Average FPS' + data: [] + backgroundColor: 'hotpink' + borderColor: '#212121' + borderWidth: 1 + } + { + label: 'Minimum FPS' + data: [] + backgroundColor: 'cornflowerblue' + borderColor: '#212121' + borderWidth: 1 + } + ] + options: + title: + display: true + text: 'N/a' + scales: xAxes: [ { + display: true + ticks: beginAtZero: true + } ] + animation: onComplete: -> + dwnbtn = $('#download_button') + dwnbtn.attr 'href', benchChart.toBase64Image() + dwnbtn.attr 'download', 'benchmark_chart.png' + dwnbtn.attr 'disabled', false + return +) diff --git a/assets/scripts/test.coffee b/assets/scripts/test.coffee index 9880aec..5e69e21 100644 --- a/assets/scripts/test.coffee +++ b/assets/scripts/test.coffee @@ -10,7 +10,7 @@ fetchTestBenchmarkResults = (testId, benchmarkId) -> resultSearchParams = new URLSearchParams test_id: testId benchmark_id: benchmarkId - resultRes = await fetch("/api/v1/results?#{resultSearchParams}") + resultRes = await fetch("/api/v1/result/list?#{resultSearchParams}") resultData = await resultRes.json() avg_total = 0 diff --git a/src/routes/api1.rb b/src/routes/api1.rb index e7e8c53..6d5a3c1 100644 --- a/src/routes/api1.rb +++ b/src/routes/api1.rb @@ -11,7 +11,7 @@ class GameData < Sinatra::Base json benchmark.values() end - get '/api/v1/results' do + get '/api/v1/result/list' do test_id = params[:test_id] benchmark_id = params[:benchmark_id] @@ -20,4 +20,12 @@ class GameData < Sinatra::Base json results.map(&:values) end + get '/api/v1/test/details' do + test_id = params[:test_id] + + tst = Test.where(id: test_id).first() + + json tst.values() + end + end diff --git a/views/layout.erb b/views/layout.erb index dde1f16..314410f 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -10,7 +10,6 @@ - diff --git a/views/reports/index.erb b/views/reports/index.erb index 1ddcf07..fc342e6 100644 --- a/views/reports/index.erb +++ b/views/reports/index.erb @@ -2,14 +2,14 @@
-
- <% benchmarks.each do |b| %> <% end %> @@ -18,7 +18,7 @@
- <% tests.each do |t| %> <% end %> @@ -26,16 +26,18 @@
- - Download + +
- +
+ +