From e1ee9270858fc2cccdd04558fe7c13162fc51fb6 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Tue, 22 Sep 2015 13:03:46 +0530 Subject: [PATCH 01/10] 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 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 Date: 29 July 2015 5:06:34 pm IST Labels: vikas-scorecard-comment-support --- .../completed-review/completed-review.jade | 3 +++ app/peer-review/edit-review/edit-review.jade | 4 ++++ app/services/helpers.service.js | 10 +++++++++- assets/css/peer-review/completed.scss | 15 +++++++++++---- assets/css/peer-review/edit.scss | 11 +++++++++++ 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/app/peer-review/completed-review/completed-review.jade b/app/peer-review/completed-review/completed-review.jade index dabbd25f8..ba772198a 100644 --- a/app/peer-review/completed-review/completed-review.jade +++ b/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}} + diff --git a/app/peer-review/edit-review/edit-review.jade b/app/peer-review/edit-review/edit-review.jade index ef3c16191..535f2dab1 100644 --- a/app/peer-review/edit-review/edit-review.jade +++ b/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 diff --git a/app/services/helpers.service.js b/app/services/helpers.service.js index d3a7adf75..96cd03bcf 100644 --- a/app/services/helpers.service.js +++ b/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) { diff --git a/assets/css/peer-review/completed.scss b/assets/css/peer-review/completed.scss index ff8474dc8..94137d6c6 100644 --- a/assets/css/peer-review/completed.scss +++ b/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; + } } } diff --git a/assets/css/peer-review/edit.scss b/assets/css/peer-review/edit.scss index cd133e668..827342e76 100644 --- a/assets/css/peer-review/edit.scss +++ b/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; } } From a84b0d98bcd6db1fb7aa441c0797cad42ae681ac Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Tue, 22 Sep 2015 13:09:47 +0530 Subject: [PATCH 02/10] SUP-1447, Peer review updates Cherry picked changes for following commits into peer-review app 1) integrating with api Commit: da21a311e76083e8a2cc35b4135c9e16c3c1247d [da21a31] Parents: deac3d7b57 Author: Mauricio Desiderio Date: 1 August 2015 1:36:12 am IST Labels: origin/vikas-scorecard-comment-support --- app/peer-review/edit-review/edit-review.jade | 2 +- app/services/helpers.service.js | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/peer-review/edit-review/edit-review.jade b/app/peer-review/edit-review/edit-review.jade index 535f2dab1..a19abf5d6 100644 --- a/app/peer-review/edit-review/edit-review.jade +++ b/app/peer-review/edit-review/edit-review.jade @@ -42,7 +42,7 @@ p.required-message(ng-show="editForm.$submitted && optionForm.select.$error.required") Required .comment .label Comment - textarea.text(ng-bind="q.comment") + textarea.text(ng-model="q.comment") button(type="submit") Save and Mark Complete diff --git a/app/services/helpers.service.js b/app/services/helpers.service.js index 96cd03bcf..f3dd478a3 100644 --- a/app/services/helpers.service.js +++ b/app/services/helpers.service.js @@ -102,7 +102,8 @@ if (answerObject.comments && answerObject.comments.length > 0) { // pick first comment for peer review challenges - questions[questionId].comment = answerObject.comments[0]; + questions[questionId].comment = answerObject.comments[0].content; + questions[questionId].comments = answerObject.comments; } // TODO remove following line once api has the support questions[questionId].comment = 'mock comment'; @@ -126,8 +127,18 @@ scorecardQuestionId: parseInt(qId), uploadId: review.uploadId, answer: '' + q.answer, - comments: [q.comment] + comments: q.comments }; + + if (reviewItem.comments && reviewItem.comments.length > 0) { + reviewItem.comments[0].content = q.comment; + } else { + reviewItem.comments = [{ + content: '' + q.comment, + resourceId: review.resourceId, + commentTypeId: 1 + }]; + } if (updating) { reviewItem.id = q.reviewItemId; From 4ae69b573a86451ba95428169f90aebe36d84e93 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Tue, 22 Sep 2015 13:14:44 +0530 Subject: [PATCH 03/10] SUP-1447, Peer review updates Cherry picked changes for following commits into peer-review app 1) integrating with api Commit: da21a311e76083e8a2cc35b4135c9e16c3c1247d [da21a31] Parents: deac3d7b57 Author: Mauricio Desiderio Date: 1 August 2015 1:36:12 am IST Labels: origin/vikas-scorecard-comment-support --- app/services/helpers.service.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/services/helpers.service.js b/app/services/helpers.service.js index f3dd478a3..0ee00ea43 100644 --- a/app/services/helpers.service.js +++ b/app/services/helpers.service.js @@ -105,8 +105,6 @@ questions[questionId].comment = answerObject.comments[0].content; questions[questionId].comments = answerObject.comments; } - // TODO remove following line once api has the support - questions[questionId].comment = 'mock comment'; if (answerObject.answer !== '') { saved = true; @@ -129,7 +127,7 @@ answer: '' + q.answer, comments: q.comments }; - + if (reviewItem.comments && reviewItem.comments.length > 0) { reviewItem.comments[0].content = q.comment; } else { From 1828c28afc064593bbf7561ebd314e8495080374 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Tue, 22 Sep 2015 13:17:31 +0530 Subject: [PATCH 04/10] SUP-1447, Peer review updates Cherry picked changes for following commits into peer-review app 1) Initialize comment as an empty string, refactor helper logic Commit: 3ca3272666c64aa4dba072d41223dd7ed53b6f41 [3ca3272] Parents: b9669d651b Author: Nick Litwin Date: 1 August 2015 2:58:10 am IST Labels: HEAD origin/dev origin/HEAD dev --- app/peer-review/edit-review/edit-review.jade | 2 +- app/services/helpers.service.js | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/peer-review/edit-review/edit-review.jade b/app/peer-review/edit-review/edit-review.jade index a19abf5d6..e0febec8a 100644 --- a/app/peer-review/edit-review/edit-review.jade +++ b/app/peer-review/edit-review/edit-review.jade @@ -42,7 +42,7 @@ p.required-message(ng-show="editForm.$submitted && optionForm.select.$error.required") Required .comment .label Comment - textarea.text(ng-model="q.comment") + textarea.text(ng-init="q.comment = ''", ng-model="q.comment") button(type="submit") Save and Mark Complete diff --git a/app/services/helpers.service.js b/app/services/helpers.service.js index 0ee00ea43..b7b924448 100644 --- a/app/services/helpers.service.js +++ b/app/services/helpers.service.js @@ -103,7 +103,6 @@ if (answerObject.comments && answerObject.comments.length > 0) { // pick first comment for peer review challenges questions[questionId].comment = answerObject.comments[0].content; - questions[questionId].comments = answerObject.comments; } if (answerObject.answer !== '') { @@ -124,18 +123,17 @@ reviewId: review.id, scorecardQuestionId: parseInt(qId), uploadId: review.uploadId, - answer: '' + q.answer, - comments: q.comments + answer: '' + q.answer }; - if (reviewItem.comments && reviewItem.comments.length > 0) { - reviewItem.comments[0].content = q.comment; - } else { - reviewItem.comments = [{ - content: '' + q.comment, - resourceId: review.resourceId, - commentTypeId: 1 - }]; + if (q.comment.length > 0) { + reviewItem.comments = [ + { + content: '' + q.comment + resourceId: review.resourceId + commentTypeId: 1 + } + ]; } if (updating) { From a97d3d8bfde9be7969a81731956496620dbf4847 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Tue, 22 Sep 2015 13:28:49 +0530 Subject: [PATCH 05/10] SUP-1447, Peer review updates Cherry picked changes for following commits into peer-review app Converted coffee syntax to javascript --- app/services/helpers.service.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/helpers.service.js b/app/services/helpers.service.js index b7b924448..30820e193 100644 --- a/app/services/helpers.service.js +++ b/app/services/helpers.service.js @@ -129,8 +129,8 @@ if (q.comment.length > 0) { reviewItem.comments = [ { - content: '' + q.comment - resourceId: review.resourceId + content: '' + q.comment, + resourceId: review.resourceId, commentTypeId: 1 } ]; From aabea01dcc13a6b233412be3620be1c2f939606f Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Tue, 22 Sep 2015 13:29:21 +0530 Subject: [PATCH 06/10] SUP-1447, Peer review updates Cherry picked changes for following commits into peer-review app 1)Update routes to work with new backend Commit: 85a1d5da43f1339c1f517ed2af20fe674bad20e2 [85a1d5d] Parents: 58e6f391a4 Author: Nick Litwin Date: 24 July 2015 2:59:41 am IST --- app/services/challenge.service.js | 2 +- app/services/review.service.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/challenge.service.js b/app/services/challenge.service.js index 09dbf7974..44e5e6ead 100644 --- a/app/services/challenge.service.js +++ b/app/services/challenge.service.js @@ -159,7 +159,7 @@ } function getReviewEndDate(challengeId) { - var url = CONSTANTS.API_URL + '/phases/?filter=' + encodeURIComponent('challengeId=' + challengeId + ' & phaseType=4'); + var url = CONSTANTS.API_URL + '/phases/?challengeId=' + challengeId; return ApiService.requestHandler('GET', url); } diff --git a/app/services/review.service.js b/app/services/review.service.js index 53749283e..82daf9395 100644 --- a/app/services/review.service.js +++ b/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); } From f7a73e5d9c909db2886ce55f089b7dc8543fe876 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Tue, 22 Sep 2015 16:30:01 +0530 Subject: [PATCH 07/10] SUP-1447, Peer review updates Used v2 for challenge details end point. --- app/services/challenge.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/challenge.service.js b/app/services/challenge.service.js index 44e5e6ead..65643b962 100644 --- a/app/services/challenge.service.js +++ b/app/services/challenge.service.js @@ -164,7 +164,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); } From 0894a0432c147e97b0ed34d513301cd42ef51ffa Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Thu, 1 Oct 2015 10:54:07 -0700 Subject: [PATCH 08/10] SUP-1447, Peer Review updates Fixed review service API calls to use v2 token instead of v3 token. --- .../completed-review.controller.js | 5 +++-- .../edit-review/edit-review.controller.js | 5 +++-- app/services/jwtInterceptor.service.js | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/peer-review/completed-review/completed-review.controller.js b/app/peer-review/completed-review/completed-review.controller.js index 64f880316..9c09dd32f 100644 --- a/app/peer-review/completed-review/completed-review.controller.js +++ b/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; diff --git a/app/peer-review/edit-review/edit-review.controller.js b/app/peer-review/edit-review/edit-review.controller.js index a225489e1..d2c4ce105 100644 --- a/app/peer-review/edit-review/edit-review.controller.js +++ b/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; diff --git a/app/services/jwtInterceptor.service.js b/app/services/jwtInterceptor.service.js index 097518841..c5c9d5930 100644 --- a/app/services/jwtInterceptor.service.js +++ b/app/services/jwtInterceptor.service.js @@ -24,6 +24,13 @@ // matchs everything besides /v3/members/{handle}/financial { method: 'GET', url: '\/v3\/members\/\\w+\/(?!financial)\\w*'} ]; + // list here all endpoints which are v3 but require v2 token for backward compatability + var v3EndpointsWithV2Token = [ + { method: 'GET', url: '\/v3\/reviews'}, + { method: 'GET', url: '\/v3\/scorecards'}, + { method: 'GET', url: '\/v3\/scorecardQuestions'}, + { method: 'GET', url: '\/v3\/reviewItems'} + ]; for (var i = 0; i < haveItAddItEndpoints.length; i++) { var obj = haveItAddItEndpoints[i]; @@ -59,6 +66,14 @@ // for everything else assume that we need to send token var idToken = config.url.indexOf('v2/') > -1 ? AuthTokenService.getV2Token() : AuthTokenService.getV3Token(); + for (var i = 0; i < v3EndpointsWithV2Token.length; i++) {; + var ep = v3EndpointsWithV2Token[i]; + console.log(config.url); + if (config.url.indexOf(ep.url) > -1) { + idToken = AuthTokenService.getV2Token(); + } + }; + if (!TcAuthService.isAuthenticated() || idToken == null) { $state.go('login'); return; From 15abbda9caa3f992000ff64c3710381a0d8bbd79 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Thu, 15 Oct 2015 13:39:53 -0700 Subject: [PATCH 09/10] SUP-1447, Peer Review Updates -- Removed using v2 tokens for the review end points. --- app/services/jwtInterceptor.service.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/services/jwtInterceptor.service.js b/app/services/jwtInterceptor.service.js index 33b60bb1b..108e37fa4 100644 --- a/app/services/jwtInterceptor.service.js +++ b/app/services/jwtInterceptor.service.js @@ -25,12 +25,7 @@ { method: 'GET', url: '\/v3[\\d\\.\\-A-Za-z]*\/members\/\\w+\/(?!financial)\\w*'} ]; // list here all endpoints which are v3 but require v2 token for backward compatability - var v3EndpointsWithV2Token = [ - { method: 'GET', url: '\/v3\/reviews'}, - { method: 'GET', url: '\/v3\/scorecards'}, - { method: 'GET', url: '\/v3\/scorecardQuestions'}, - { method: 'GET', url: '\/v3\/reviewItems'} - ]; + var v3EndpointsWithV2Token = []; for (var i = 0; i < haveItAddItEndpoints.length; i++) { var obj = haveItAddItEndpoints[i]; @@ -68,7 +63,6 @@ for (var i = 0; i < v3EndpointsWithV2Token.length; i++) {; var ep = v3EndpointsWithV2Token[i]; - console.log(config.url); if (config.url.indexOf(ep.url) > -1) { idToken = AuthTokenService.getV2Token(); } From 96d77bdb3879495bb5357405c425a794b21e78b8 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Thu, 15 Oct 2015 13:42:05 -0700 Subject: [PATCH 10/10] SUP-1447, Peer Review Updates -- Removed logic for supporting compatibility with v2 tokens. --- app/services/jwtInterceptor.service.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/services/jwtInterceptor.service.js b/app/services/jwtInterceptor.service.js index 108e37fa4..555670647 100644 --- a/app/services/jwtInterceptor.service.js +++ b/app/services/jwtInterceptor.service.js @@ -24,8 +24,6 @@ // matchs everything besides /v3/members/{handle}/financial { method: 'GET', url: '\/v3[\\d\\.\\-A-Za-z]*\/members\/\\w+\/(?!financial)\\w*'} ]; - // list here all endpoints which are v3 but require v2 token for backward compatability - var v3EndpointsWithV2Token = []; for (var i = 0; i < haveItAddItEndpoints.length; i++) { var obj = haveItAddItEndpoints[i]; @@ -61,13 +59,6 @@ // for everything else assume that we need to send token var idToken = config.url.indexOf('v2/') > -1 ? AuthTokenService.getV2Token() : AuthTokenService.getV3Token(); - for (var i = 0; i < v3EndpointsWithV2Token.length; i++) {; - var ep = v3EndpointsWithV2Token[i]; - if (config.url.indexOf(ep.url) > -1) { - idToken = AuthTokenService.getV2Token(); - } - }; - if (!TcAuthService.isAuthenticated() || idToken == null) { $state.go('login'); return;