Index: classes/submission/sectionEditor/SectionEditorAction.inc.php =================================================================== RCS file: /cvs/ojs2/classes/submission/sectionEditor/SectionEditorAction.inc.php,v retrieving revision 1.166 diff -u -r1.166 SectionEditorAction.inc.php --- classes/submission/sectionEditor/SectionEditorAction.inc.php 11 Jul 2008 04:15:34 -0000 1.166 +++ classes/submission/sectionEditor/SectionEditorAction.inc.php 23 Oct 2008 22:06:05 -0000 @@ -1875,15 +1875,45 @@ if ($reviewAssignment->getDateCompleted() != null && !$reviewAssignment->getCancelled()) { // Get the comments associated with this review assignment $articleComments = &$articleCommentDao->getArticleComments($sectionEditorSubmission->getArticleId(), COMMENT_TYPE_PEER_REVIEW, $reviewAssignment->getReviewId()); - $body .= "------------------------------------------------------\n"; - $body .= Locale::translate('submission.comments.importPeerReviews.reviewerLetter', array('reviewerLetter' => chr(ord('A') + $reviewIndexes[$reviewAssignment->getReviewId()]))) . "\n"; - if (is_array($articleComments)) { - foreach ($articleComments as $comment) { - // If the comment is viewable by the author, then add the comment. - if ($comment->getViewable()) { - $body .= $comment->getComments() . "\n\n"; + if($articleComments) { + $body .= "------------------------------------------------------\n"; + $body .= Locale::translate('submission.comments.importPeerReviews.reviewerLetter', array('reviewerLetter' => chr(ord('A') + $reviewIndexes[$reviewAssignment->getReviewId()]))) . "\n"; + if (is_array($articleComments)) { + foreach ($articleComments as $comment) { + // If the comment is viewable by the author, then add the comment. + if ($comment->getViewable()) { + $body .= $comment->getComments() . "\n\n"; + } } } + } else { + $reviewFormId = $reviewAssignment->getReviewFormId(); + $reviewId = $reviewAssignment->getReviewId(); + + $reviewFormResponseDao =& DAORegistry::getDAO('ReviewFormResponseDAO'); + $reviewFormElementDao =& DAORegistry::getDAO('ReviewFormElementDAO'); + $reviewFormElements =& $reviewFormElementDao->getReviewFormElements($reviewFormId); + $body .= "------------------------------------------------------\n"; + $body .= Locale::translate('submission.comments.importPeerReviews.reviewerLetter', array('reviewerLetter' => chr(ord('A') + $reviewIndexes[$reviewAssignment->getReviewId()]))) . "\n\n"; + foreach ($reviewFormElements as $reviewFormElement) { + $body .= $reviewFormElement->getReviewFormElementQuestion() . ": \n"; + $reviewFormResponse = $reviewFormResponseDao->getReviewFormResponse($reviewId, $reviewFormElement->getReviewFormElementId()); + + $possibleResponses = $reviewFormElement->getReviewFormElementPossibleResponses(); + if (in_array($reviewFormElement->getElementType(), $reviewFormElement->getMultipleResponsesElementTypes())) { + if ($reviewFormElement->getElementType() == REVIEW_FORM_ELEMENT_TYPE_CHECKBOXES) { + foreach ($reviewFormResponse->getValue() as $value) { + $body .= "\t" . String::html2utf(strip_tags($possibleResponses[$value-1]['content'])) . "\n"; + } + } else { + $body .= "\t" . String::html2utf(strip_tags($possibleResponses[$reviewFormResponse->getValue()-1]['content'])) . "\n"; + } + $body .= "\n"; + } else { + $body .= "\t" . String::html2utf(strip_tags($reviewFormResponse->getValue())) . "\n\n"; + } + + } } $body .= "------------------------------------------------------\n\n"; }