Merge pull request #203 from appirio-tech/feature/vikas-sup-1447-peer-review-updates

SUP-1447, peer review updates

@parthshah  @nlitwin @tladendo @mdesiderio  merging

Author: vikasrohit

app/peer-review/completed-review/completed-review.controller.js

@@ -15,6 +15,7 @@
     vm.scorecard = {
       questions: {}
     };
+    var handle = UserService.getUserIdentity().handle;
     vm.submit = function() {
       $state.go('review.status', {
         challengeId: vm.challengeId
@@ -25,7 +26,7 @@
 
     function activate() {
       var promises = [
-        UserService.getUsername(),
+        handle,
         ChallengeService.getChallengeDetails($stateParams.challengeId),
         ReviewService.getReview($stateParams.reviewId),
         ScorecardService.getScorecard(vm.challengeId)
@@ -34,7 +35,7 @@
       $q.all(promises)
       .then(function(response) {
         var user = response[0].data;
-        vm.stats.username = user.handle;
+        vm.stats.username = handle;
 
         var challenge = response[1].data;
         vm.challenge = challenge;

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.controller.js

@@ -19,6 +19,7 @@
     vm.scorecard = {
       questions: {}
     };
+    var handle = UserService.getUserIdentity().handle;
 
     vm.submitReviewItems = function() {
       var body = Helpers.compileReviewItems(vm.scorecard.questions, vm.review, vm.saved);
@@ -63,7 +64,7 @@
 
     function activate() {
       var promises = [
-        UserService.getUsername(),
+        handle,
         ChallengeService.getChallengeDetails(vm.challengeId),
         ReviewService.getReview($stateParams.reviewId),
         ScorecardService.getScorecard(vm.challengeId)
@@ -72,7 +73,7 @@
       $q.all(promises)
       .then(function(response) {
         var user = response[0].data;
-        vm.stats.username = user.handle;
+        vm.stats.username = handle;
 
         var challenge = response[1].data;
         vm.challenge = challenge;

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-init="q.comment = ''", ng-model="q.comment")
+
 
       button(type="submit") Save and Mark Complete
 

app/services/challenge.service.js

@@ -50,7 +50,7 @@
     }
 
     function getChallengeDetails(challengeId) {
-      var url = CONSTANTS.API_URL + '/challenges/' + challengeId;
+      var url = CONSTANTS.API_URL_V2 + '/challenges/' + challengeId;
       return ApiService.requestHandler('GET', url, {}, true);
     }
 

app/services/helpers.service.js

@@ -130,6 +130,11 @@
         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].content;
+        }
+
         if (answerObject.answer !== '') {
           saved = true;
         }
@@ -151,6 +156,16 @@
           answer: '' + q.answer
         };
 
+        if (q.comment.length > 0) {
+          reviewItem.comments = [
+            {
+              content: '' + q.comment,
+              resourceId: review.resourceId,
+              commentTypeId: 1
+            }
+          ];
+        }
+
         if (updating) {
           reviewItem.id = q.reviewItemId;
         }

app/services/review.service.js

@@ -34,7 +34,7 @@
     }
 
     function getNextReview(challengeId) {
-      var url = CONSTANTS.API_URL + '/challenges/' + challengeId + '/assignNextReview';
+      var url = CONSTANTS.API_URL + '/reviews/' + challengeId + '/assignNextReview';
       return ApiService.requestHandler('PUT', url);
     }
 

assets/css/peer-review/completed.scss

@@ -2,9 +2,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

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