diff --git a/src/main/java/com/ec/survey/service/SelfAssessmentService.java b/src/main/java/com/ec/survey/service/SelfAssessmentService.java index 81d43ffb..cae958d7 100644 --- a/src/main/java/com/ec/survey/service/SelfAssessmentService.java +++ b/src/main/java/com/ec/survey/service/SelfAssessmentService.java @@ -533,10 +533,11 @@ public SAResult getSAResult(int datasetid, String contributionuid) { double avg = counter != 0 ? value / (double)counter : 0.0; - //Output data = AVERAGE (variables) – Mrat + 5 - result.getValues().add(Math.round(10.0 * (avg - mrat + coefficient)) / 10.0); + //Output data = AVERAGE (variables) – Mrat + 5 + double computedValue = Math.round(10.0 * (avg - mrat + coefficient)) / 10.0; + result.getValues().add(computedValue); int typeIndex = types.indexOf(result.getCriteria().get(i).getType()); - result.getValuesForTypes().get(typeIndex).add(value); + result.getValuesForTypes().get(typeIndex).add(computedValue); } return result; diff --git a/src/main/webapp/WEB-INF/views/runner/saResultInner.jsp b/src/main/webapp/WEB-INF/views/runner/saResultInner.jsp index 3cdb6d57..44d8d281 100644 --- a/src/main/webapp/WEB-INF/views/runner/saResultInner.jsp +++ b/src/main/webapp/WEB-INF/views/runner/saResultInner.jsp @@ -392,11 +392,6 @@ data: data, options: { responsive: true, - - scales: { - yAxes: [{ticks: {beginAtZero: true, autoSkip: false}}], - xAxes: [{ticks: {beginAtZero: true, autoSkip: false}}] - }, legend: { @@ -405,11 +400,25 @@ - scale: { - ticks: { - display: false - }, - }, + + + scale: { + ticks: { + display: false + }, + }, + + + + scales: { + yAxes: [{ + ticks: { + display: false + } + }] + }, + + title: {