SUP-1447, Peer review updates

Cherry picked changes for following commits into peer-review app

1)  Added support for comment in review scorecard

Commit: b98faebde93fa8a4d55ea26f594370966ed2b2f8 [b98faeb]
Parents: 85a1d5da43
Author: vikasrohit <[email protected]>
Date: 28 July 2015 6:23:02 pm IST

2) adapting for array of comments in api requests and responses

Commit: deac3d7b57b8627f9fccb97af2034671ca8ddf87 [deac3d7]
Parents: b98faebde9
Author: vikasrohit <[email protected]>
Date: 29 July 2015 5:06:34 pm IST
Labels: vikas-scorecard-comment-support

Author: vikasrohit

app/peer-review/completed-review/completed-review.jade

@@ -31,3 +31,6 @@
         p.guidelines(ng-if="q.questionTypeId === 5", ng-repeat="guideline in q.guidelines track by $index") {{guideline}}
 
         p.answer(ng-if="q.questionTypeId === 5") Your Response: {{q.answer}}
+
+        p.comment(ng-if="q.comment") Comment: {{q.comment}}
+

app/peer-review/edit-review/edit-review.jade

@@ -40,6 +40,10 @@
             ng-class="{required: editForm.$submitted && optionForm.select.$error.required}")
 
           p.required-message(ng-show="editForm.$submitted && optionForm.select.$error.required") Required
+        .comment
+          .label Comment
+          textarea.text(ng-bind="q.comment")
+
 
       button(type="submit") Save and Mark Complete
 

app/services/helpers.service.js

@@ -100,6 +100,13 @@
         questions[questionId].answer = answerObject.answer;
         questions[questionId].reviewItemId = answerObject.id;
 
+        if (answerObject.comments && answerObject.comments.length > 0) {
+          // pick first comment for peer review challenges
+          questions[questionId].comment = answerObject.comments[0];
+        }
+        // TODO remove following line once api has the support
+        questions[questionId].comment = 'mock comment';
+
         if (answerObject.answer !== '') {
           saved = true;
         }
@@ -118,7 +125,8 @@
           reviewId: review.id,
           scorecardQuestionId: parseInt(qId),
           uploadId: review.uploadId,
-          answer: '' + q.answer
+          answer: '' + q.answer,
+          comments: [q.comment]
         };
 
         if (updating) {

assets/css/peer-review/completed.scss

@@ -1,9 +1,16 @@
 @import '../partials/combined';
 
 .completed-review-container {
-  form .scorecard .answer {
-    @include source-sans-italic;
-    margin: 25px 0;
-    padding-left: 30px;
+
+  form .scorecard {
+  	.answer {
+      @include source-sans-italic;
+      margin: 25px 0;
+      padding-left: 30px;
+    }
+    .comment {
+      margin: 25px 0;
+      padding-left: 30px;
+    }
   }
 }

assets/css/peer-review/edit.scss

@@ -18,6 +18,17 @@
 
       .required-message {
         color: red;
+      }
+    }
+
+    .scorecard .comment {
+      margin-top: 15px;
+      margin-bottom: 20px;
+      .label {
+        margin: 10px 30px;
+      }
+      .text {
+        width: 60%;
         margin-left: 30px;
       }
     }