From 12a2368916fd9ecb331ab018a9f3c993b95be954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Rodr=C3=ADguez=20Fern=C3=A1ndez?=
 <jorge.rodriguezfernandez.ext@telefonicaed.com>
Date: Mon, 29 Apr 2019 15:57:22 +0200
Subject: [PATCH] =?UTF-8?q?#158119:=20Cambio=20para=20resolver=20la=20inci?=
 =?UTF-8?q?dencia=20con=20la=20valoraci=C3=B3n=20de=20P2P=20que=20no=20act?=
 =?UTF-8?q?ualiza=20bien=20el=20popup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../p2ptaskactivity/inc/correctActivities.jsp | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/docroot/html/p2ptaskactivity/inc/correctActivities.jsp b/docroot/html/p2ptaskactivity/inc/correctActivities.jsp
index 02fe60880..989f9aebd 100644
--- a/docroot/html/p2ptaskactivity/inc/correctActivities.jsp
+++ b/docroot/html/p2ptaskactivity/inc/correctActivities.jsp
@@ -195,32 +195,7 @@ if(activity.getEnddate() == null){
 
 				//Se copia el atributo para no modificar el servicio
 				
-				<%
-					for(int i=0;i<numQuestion;i++){
-						String des = LearningActivityLocalServiceUtil.getExtraContentValue(actId, "text"+i);
-						if(i==0 || (des != null && des.length() > 0)){
-							if(Validator.isNull(des)){
-								des = LanguageUtil.get(themeDisplay.getLocale(), "feedback");
-							}
-				%>
-
-							var textDesc = CKEDITOR.instances[thisEditor+'_<%=i%>'].getData();
-	
-							AUI().one(selector).get(thisEditor+'_<%=i%>i').set('value',textDesc);
-	
-							AUI().one(selector).get(thisEditor+'_<%=i%>').set('value',textDesc);
-							textDesc = CKEDITOR.instances[thisEditor+'_<%=i%>'].document.getBody().getText();
-	
-	
-							
-	
-							A.one("#contentDescriptionCorrec_<%=i%>").html(textDesc);
-				<%
-						}else{
-							break;
-						}
-					}
-				%>
+				
 				
 				if(	A.one(selector).one('select[name="<portlet:namespace />resultuser"]') != null){
 					textResult = A.one(selector).one('select[name="<portlet:namespace />resultuser"]').val();
@@ -260,6 +235,35 @@ if(activity.getEnddate() == null){
 				}
 				A.one("#submitCorrec").on('click', function(){<portlet:namespace />commitFormCorrection(formName);});
 				
+				
+				<%
+				for(int i=0;i<numQuestion;i++){
+					String des = LearningActivityLocalServiceUtil.getExtraContentValue(actId, "text"+i);
+					if(i==0 || (des != null && des.length() > 0)){
+						if(Validator.isNull(des)){
+							des = LanguageUtil.get(themeDisplay.getLocale(), "feedback");
+						}
+			%>
+
+						var textDesc = CKEDITOR.instances[thisEditor+'_<%=i%>'].getData();
+
+						AUI().one(selector).get(thisEditor+'_<%=i%>i').set('value',textDesc);
+
+						AUI().one(selector).get(thisEditor+'_<%=i%>').set('value',textDesc);
+						textDesc = CKEDITOR.instances[thisEditor+'_<%=i%>'].document.getBody().getText();
+
+
+						
+
+						A.one("#contentDescriptionCorrec_<%=i%>").html(textDesc);
+			<%
+					}else{
+						break;
+					}
+				}
+			%>
+				
+				
 				window.<portlet:namespace />p2pconfrmCorrec.show();
 	        },
 	        ['node','aui-dialog']