Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/print/PDFAssessmentBean.java =================================================================== --- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/print/PDFAssessmentBean.java (revisiĆ³n: 310689) +++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/print/PDFAssessmentBean.java (copia de trabajo) @@ -369,7 +369,7 @@ if (!(item.getItemData().getTypeId().equals(TypeIfc.FILL_IN_BLANK) || item.getItemData().getTypeId().equals(TypeIfc.FILL_IN_NUMERIC))) { contentBuffer.append("
"); - contentBuffer.append(item.getItemData().getText()); + contentBuffer.append(FormattedText.convertPlaintextToFormattedText(FormattedText.convertFormattedTextToPlaintext(item.getItemData().getText()))); contentBuffer.append("
"); } if (item.getItemData().getItemAttachmentList() != null && item.getItemData().getItemAttachmentList().size() > 0) { @@ -403,7 +403,7 @@ contentBuffer.append("
"); } contentBuffer.append("
"); - contentBuffer.append(item.getItemData().getText()); + contentBuffer.append(FormattedText.convertPlaintextToFormattedText(FormattedText.convertFormattedTextToPlaintext(item.getItemData().getText()))); contentBuffer.append("
"); } @@ -472,10 +472,10 @@ if (matching.getText() == null) break; contentBuffer.append(""); - contentBuffer.append(matching.getText()); + contentBuffer.append(FormattedText.convertPlaintextToFormattedText(FormattedText.convertFormattedTextToPlaintext(matching.getText()))); contentBuffer.append(""); contentBuffer.append(""); - contentBuffer.append(answer); + contentBuffer.append(FormattedText.convertPlaintextToFormattedText(FormattedText.convertFormattedTextToPlaintext(answer))); contentBuffer.append(""); } @@ -563,32 +563,42 @@ else contentBuffer.append(""); - contentBuffer.append(""); - if (!item.getItemData().getTypeId().equals(TypeIfc.MULTIPLE_CHOICE_SURVEY)) { - contentBuffer.append(answer.getLabel()); - contentBuffer.append(". "); - } - - contentBuffer.append(answer.getText()); - contentBuffer.append(""); - contentBuffer.append(""); if (printSetting.getShowKeysFeedback()) { + contentBuffer.append(""); + if (!item.getItemData().getTypeId().equals(TypeIfc.MULTIPLE_CHOICE_SURVEY)) { + contentBuffer.append(answer.getLabel()); + contentBuffer.append(". "); + } + + contentBuffer.append(FormattedText.convertPlaintextToFormattedText(FormattedText.convertFormattedTextToPlaintext(answer.getText()))); + contentBuffer.append(""); + contentBuffer.append(""); contentBuffer.append("
"); contentBuffer.append(commonMessages.getString("feedback")); contentBuffer.append(": "); if (answer.getGeneralAnswerFeedback() != null && !answer.getGeneralAnswerFeedback().equals("")) - contentBuffer.append(answer.getGeneralAnswerFeedback()); + contentBuffer.append(FormattedText.convertPlaintextToFormattedText(FormattedText.convertFormattedTextToPlaintext(answer.getGeneralAnswerFeedback()))); else contentBuffer.append("--------"); contentBuffer.append("
"); } + else { + contentBuffer.append(""); + if (!item.getItemData().getTypeId().equals(TypeIfc.MULTIPLE_CHOICE_SURVEY)) { + contentBuffer.append(answer.getLabel()); + contentBuffer.append(". "); + } + + contentBuffer.append(FormattedText.convertPlaintextToFormattedText(FormattedText.convertFormattedTextToPlaintext(answer.getText()))); + contentBuffer.append(""); + } contentBuffer.append(""); } if (item.getItemData().getTypeId().equals(TypeIfc.TRUE_FALSE)) { contentBuffer.append(""); contentBuffer.append(""); - contentBuffer.append(answer.getText()); + contentBuffer.append(FormattedText.convertPlaintextToFormattedText(FormattedText.convertFormattedTextToPlaintext(answer.getText()))); contentBuffer.append(""); } @@ -640,7 +650,7 @@ contentBuffer.append(commonMessages.getString("feedback")); contentBuffer.append(": "); if (item.getItemData().getGeneralItemFeedback() != null && !item.getItemData().getGeneralItemFeedback().equals("")) - contentBuffer.append(item.getItemData().getGeneralItemFeedback()); + contentBuffer.append(FormattedText.convertPlaintextToFormattedText(FormattedText.convertFormattedTextToPlaintext(item.getItemData().getGeneralItemFeedback()))); else contentBuffer.append("--------"); } @@ -656,14 +666,14 @@ contentBuffer.append(printMessages.getString("correct_feedback")); contentBuffer.append(": "); if (item.getItemData().getCorrectItemFeedback() != null && !item.getItemData().getCorrectItemFeedback().equals("")) - contentBuffer.append(item.getItemData().getCorrectItemFeedback()); + contentBuffer.append(FormattedText.convertPlaintextToFormattedText(FormattedText.convertFormattedTextToPlaintext(item.getItemData().getCorrectItemFeedback()))); else contentBuffer.append("--------"); contentBuffer.append("
"); contentBuffer.append(printMessages.getString("incorrect_feedback")); contentBuffer.append(": "); if (item.getItemData().getInCorrectItemFeedback() != null && !item.getItemData().getInCorrectItemFeedback().equals("")) - contentBuffer.append(item.getItemData().getInCorrectItemFeedback()); + contentBuffer.append(FormattedText.convertPlaintextToFormattedText(FormattedText.convertFormattedTextToPlaintext(item.getItemData().getInCorrectItemFeedback()))); else contentBuffer.append("--------"); }