diff --git a/assets/scripts/bedabin.coffee b/assets/scripts/bedabin.coffee index 3f6449f..aef4834 100644 --- a/assets/scripts/bedabin.coffee +++ b/assets/scripts/bedabin.coffee @@ -32,5 +32,17 @@ addResult = (e) -> result_min: $('#result_min').val() result_max: $('#result_max').val() }, (data) -> - console.log(data) + dataRow = $('tr[data-benchmark=' + $('#result_benchmark').val() + ']') + numResultsElem = dataRow.children('[data-result-count]').eq(0) + numResults = numResultsElem.text() + avgElem = dataRow.children('[data-result-avg]').eq(0) + avgElem.text(((avgElem.text() * numResults) + $('#result_avg').val()) / (numResults + 1)) + + minElem = dataRow.children('[data-result-min]').eq(0) + minElem.text(((minElem.text() * numResults) + $('#result_min').val()) / (numResults + 1)) + + maxElem = dataRow.children('[data-result-max]').eq(0) + maxElem.text(((maxElem.text() * numResults) + $('#result_max').val()) / (numResults + 1)) + + numResultsElem.text(numResults + 1) ) diff --git a/src/Models/Test.php b/src/Models/Test.php index 0887a20..6a9627c 100644 --- a/src/Models/Test.php +++ b/src/Models/Test.php @@ -41,21 +41,23 @@ class Test extends Model { } $data[$i] = [ - 'name' => $b->name, - 'scoring' => $b->scoring, - 'count' => count($benchmarkResults), - 'average' => (array_sum($averageResults) / count($averageResults)), - 'minimum' => (array_sum($minimumResults) / count($minimumResults)), - 'maximum' => (array_sum($maximumResults) / count($maximumResults)), + 'benchmark_id' => $b->id, + 'name' => $b->name, + 'scoring' => $b->scoring, + 'count' => count($benchmarkResults), + 'average' => (array_sum($averageResults) / count($averageResults)), + 'minimum' => (array_sum($minimumResults) / count($minimumResults)), + 'maximum' => (array_sum($maximumResults) / count($maximumResults)), ]; } else { $data[$i] = [ - 'name' => $b->name, - 'scoring' => $b->scoring, - 'count' => count($benchmarkResults), - 'average' => 0, - 'minimum' => 0, - 'maximum' => 0, + 'benchmark_id' => $b->id, + 'name' => $b->name, + 'scoring' => $b->scoring, + 'count' => count($benchmarkResults), + 'average' => 0, + 'minimum' => 0, + 'maximum' => 0, ]; } } diff --git a/views/test/view.twig b/views/test/view.twig index 62c382d..49fd8ff 100644 --- a/views/test/view.twig +++ b/views/test/view.twig @@ -64,13 +64,13 @@ {% for r in test.benchmarkResults() %} - + {{ r.name }} {{ r.scoring | capitalize }} {{ r.count }} - {{ r.average }} - {{ r.minimum ? r.minimum : 'N/a' }} - {{ r.maximum ? r.maximum : 'N/a' }} + {{ r.average }} + {{ r.minimum ? r.minimum : 'N/a' }} + {{ r.maximum ? r.maximum : 'N/a' }} {% endfor %}