DELPHI-1816 [ESURVEY-8497] Self-assessment - COMPUTATION issues

EUSurvey · Nov 6, 2024 · 1e35043 · 1e35043
1 parent 55ba457
commit 1e35043
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git 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
@@ -392,11 +392,6 @@
 					  data: data,
 					  options: {
 					    responsive: true,
-					        
-				        scales: {
-							yAxes: [{ticks: {beginAtZero: true, autoSkip: false}}],
-							xAxes: [{ticks: {beginAtZero: true, autoSkip: false}}]
-						},
 					    
 					    <c:if test="${!SAReportConfiguration.legend}">
 					      legend: {
@@ -405,11 +400,25 @@
 				        </c:if>
 				          
 				        <c:if test="${!SAReportConfiguration.scale}">
-				          scale: {
-				              ticks: {
-				                  display: false
-				              },
-				          },
+				        
+				          <c:if test='${SAReportConfiguration.selectedChart == "SPIDER"}'>				        
+					          scale: {
+					              ticks: {
+					                  display: false
+					              },
+					          },				          
+				          </c:if>
+				          
+					     <c:if test='${SAReportConfiguration.selectedChart != "SPIDER"}'>	
+				          	scales: {
+					            yAxes: [{
+					                ticks: {
+					                    display: false
+					                }
+					            }]
+					        },
+				          </c:if>
+				          
 				        </c:if>   
 				          
 				          title: {