Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 3e9b33f

Browse files
author
Nick Litwin
committed
Fix merge conflicts
1 parent c479cbd commit 3e9b33f

File tree

7 files changed

+140
-132
lines changed

7 files changed

+140
-132
lines changed

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

+35-34
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,65 @@
1+
import angular from 'angular'
2+
13
(function() {
2-
'use strict';
4+
'use strict'
35

4-
angular.module('tc.peer-review').controller('CompletedReviewController', CompletedReviewController);
6+
angular.module('tc.peer-review').controller('CompletedReviewController', CompletedReviewController)
57

6-
CompletedReviewController.$inject = ['$stateParams', 'ScorecardService', 'ReviewService', 'UserService', 'ChallengeService', 'Helpers', '$q', 'CONSTANTS'];
8+
CompletedReviewController.$inject = ['$stateParams', 'ScorecardService', 'ReviewService', 'UserService', 'ChallengeService', 'Helpers', '$q', 'CONSTANTS', '$state']
79

8-
function CompletedReviewController($stateParams, ScorecardService, ReviewService, UserService, ChallengeService, Helpers, $q, CONSTANTS) {
9-
var vm = this;
10-
vm.domain = CONSTANTS.domain;
11-
vm.challengeId = $stateParams.challengeId;
12-
vm.loaded = false;
13-
vm.stats = {};
10+
function CompletedReviewController($stateParams, ScorecardService, ReviewService, UserService, ChallengeService, Helpers, $q, CONSTANTS, $state) {
11+
var vm = this
12+
vm.domain = CONSTANTS.domain
13+
vm.challengeId = $stateParams.challengeId
14+
vm.loaded = false
15+
vm.stats = {}
1416
vm.scorecard = {
1517
questions: {}
16-
};
17-
var handle = UserService.getUserIdentity().handle;
18+
}
19+
var handle = UserService.getUserIdentity().handle
1820
vm.submit = function() {
1921
$state.go('review.status', {
2022
challengeId: vm.challengeId
21-
});
22-
};
23+
})
24+
}
2325

24-
activate();
26+
activate()
2527

2628
function activate() {
2729
var promises = [
2830
ChallengeService.getChallengeDetails($stateParams.challengeId),
2931
ReviewService.getReview($stateParams.reviewId),
3032
ScorecardService.getScorecard(vm.challengeId)
31-
];
33+
]
3234

3335
$q.all(promises)
3436
.then(function(responses) {
35-
vm.stats.username = handle;
37+
vm.stats.username = handle
3638

37-
vm.challenge = responses[0];
39+
vm.challenge = responses[0]
3840

39-
vm.review = responses[1];
40-
vm.stats.submissionId = vm.review.submissionId;
41-
vm.stats.uploadId = vm.review.uploadId;
42-
vm.stats.createdAt = vm.review.createdAt;
43-
vm.stats.updatedAt = vm.review.updatedAt;
41+
vm.review = responses[1]
42+
vm.stats.submissionId = vm.review.submissionId
43+
vm.stats.uploadId = vm.review.uploadId
44+
vm.stats.createdAt = vm.review.createdAt
45+
vm.stats.updatedAt = vm.review.updatedAt
4446

45-
var scorecardData = responses[2][0];
46-
var scorecardId = scorecardData.id;
47+
var scorecardData = responses[2][0]
48+
var scorecardId = scorecardData.id
4749

4850
ScorecardService.getScorecardQuestions(scorecardId)
4951
.then(function(questions) {
50-
Helpers.storeById(vm.scorecard.questions, questions);
51-
Helpers.parseQuestions(vm.scorecard.questions);
52+
Helpers.storeById(vm.scorecard.questions, questions)
53+
Helpers.parseQuestions(vm.scorecard.questions)
5254

53-
return ReviewService.getReviewItems($stateParams.reviewId);
55+
return ReviewService.getReviewItems($stateParams.reviewId)
5456

5557
}).then(function(answers) {
58+
Helpers.parseAnswers(vm.scorecard.questions, answers)
5659

57-
Helpers.parseAnswers(vm.scorecard.questions, answers);
58-
59-
vm.loaded = true;
60-
});
61-
});
60+
vm.loaded = true
61+
})
62+
})
6263
}
63-
};
64-
})();
64+
}
65+
})()

‎app/peer-review/completed-review/completed-review.spec.js

Whitespace-only changes.

‎app/peer-review/edit-review/edit-review.controller.js

+49-47
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,105 @@
1+
import angular from 'angular'
2+
13
(function() {
2-
'use strict';
4+
'use strict'
35

46
// The EditReviewController controller fetches the scorecard template and any
57
// answers saved but not submitted.
6-
angular.module('tc.peer-review').controller('EditReviewController', EditReviewController);
8+
angular.module('tc.peer-review').controller('EditReviewController', EditReviewController)
79

8-
EditReviewController.$inject = ['$state', '$stateParams', 'ReviewService', 'ScorecardService', 'UserService', 'ChallengeService', 'Helpers', '$q', 'CONSTANTS'];
10+
EditReviewController.$inject = ['$state', '$stateParams', 'ReviewService', 'ScorecardService', 'UserService', 'ChallengeService', 'Helpers', '$q', 'CONSTANTS']
911

1012
function EditReviewController($state, $stateParams, ReviewService, ScorecardService, UserService, ChallengeService, Helpers, $q, CONSTANTS) {
11-
var vm = this;
12-
vm.domain = CONSTANTS.domain;
13-
vm.challengeId = $stateParams.challengeId;
14-
vm.challenge = null;
15-
vm.loaded = false;
16-
vm.saved = false;
17-
vm.stats = {};
13+
var vm = this
14+
vm.domain = CONSTANTS.domain
15+
vm.challengeId = $stateParams.challengeId
16+
vm.challenge = null
17+
vm.loaded = false
18+
vm.saved = false
19+
vm.stats = {}
1820
vm.scorecard = {
1921
questions: {}
20-
};
21-
var handle = UserService.getUserIdentity().handle;
22+
}
23+
var handle = UserService.getUserIdentity().handle
2224

2325
vm.submitReviewItems = function() {
24-
var body = Helpers.compileReviewItems(vm.scorecard.questions, vm.review, vm.saved);
26+
var body = Helpers.compileReviewItems(vm.scorecard.questions, vm.review, vm.saved)
2527

2628
ReviewService.saveReviewItems(body, vm.saved)
2729
.then(function(response) {
28-
return ReviewService.markAsCompleted($stateParams.reviewId);
30+
return ReviewService.markAsCompleted($stateParams.reviewId)
2931
})
3032
.then(function(response) {
3133
$state.go('review.status', {
3234
challengeId: vm.challengeId
33-
});
35+
})
3436
})
3537
.catch(function(error) {
36-
var message = 'An error occurred while trying to submit answers.\n' + error.status + ': ' + error.statusText;
38+
var message = 'An error occurred while trying to submit answers.\n' + error.status + ': ' + error.statusText
3739

38-
alert(message);
40+
alert(message)
3941

40-
$state.reload();
41-
});
42-
};
42+
$state.reload()
43+
})
44+
}
4345

4446
vm.saveReviewForLater = function() {
45-
var body = Helpers.compileReviewItems(vm.scorecard.questions, vm.review, vm.saved);
47+
var body = Helpers.compileReviewItems(vm.scorecard.questions, vm.review, vm.saved)
4648

4749
ReviewService.saveReviewItems(body, vm.saved)
4850
.then(function(data) {
4951
$state.go('review.status', {
5052
challengeId: vm.challengeId
51-
});
53+
})
5254
})
5355
.catch(function(error) {
54-
var message = 'An error occurred while trying to update answers.\n' + error.status + ': ' + error.statusText;
56+
var message = 'An error occurred while trying to update answers.\n' + error.status + ': ' + error.statusText
5557

56-
alert(message);
58+
alert(message)
5759

58-
$state.reload();
59-
});
60-
};
60+
$state.reload()
61+
})
62+
}
6163

62-
activate();
64+
activate()
6365

6466
function activate() {
6567
var promises = [
6668
ChallengeService.getChallengeDetails(vm.challengeId),
6769
ReviewService.getReview($stateParams.reviewId),
6870
ScorecardService.getScorecard(vm.challengeId)
69-
];
71+
]
7072

7173
$q.all(promises)
7274
.then(function(responses) {
73-
vm.stats.username = handle;
75+
vm.stats.username = handle
7476

75-
vm.challenge = responses[0];
77+
vm.challenge = responses[0]
7678

77-
vm.review = responses[1];
78-
vm.stats.submissionId = vm.review.submissionId;
79-
vm.stats.uploadId = vm.review.uploadId;
80-
vm.stats.createdAt = vm.review.createdAt;
81-
vm.stats.updatedAt = vm.review.updatedAt;
79+
vm.review = responses[1]
80+
vm.stats.submissionId = vm.review.submissionId
81+
vm.stats.uploadId = vm.review.uploadId
82+
vm.stats.createdAt = vm.review.createdAt
83+
vm.stats.updatedAt = vm.review.updatedAt
8284

83-
var scorecardData = responses[2][0];
84-
var scorecardId = scorecardData.id;
85+
var scorecardData = responses[2][0]
86+
var scorecardId = scorecardData.id
8587

8688
ScorecardService.getScorecardQuestions(scorecardId)
8789
.then(function(questions) {
8890

89-
Helpers.storeById(vm.scorecard.questions, questions);
90-
Helpers.parseQuestions(vm.scorecard.questions);
91+
Helpers.storeById(vm.scorecard.questions, questions)
92+
Helpers.parseQuestions(vm.scorecard.questions)
9193

92-
return ReviewService.getReviewItems($stateParams.reviewId);
94+
return ReviewService.getReviewItems($stateParams.reviewId)
9395

9496
})
9597
.then(function(answers) {
96-
vm.saved = Helpers.parseAnswers(vm.scorecard.questions, answers);
98+
vm.saved = Helpers.parseAnswers(vm.scorecard.questions, answers)
9799

98-
vm.loaded = true;
99-
});
100-
});
100+
vm.loaded = true
101+
})
102+
})
101103
}
102-
};
103-
})();
104+
}
105+
})()

‎app/peer-review/edit-review/edit-review.spec.js

Whitespace-only changes.

‎app/peer-review/peer-review.module.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
import angular from 'angular'
2+
13
(function() {
2-
'use strict';
4+
'use strict'
35

46
var dependencies = [
57
'angular-jwt',
68
'ui.router',
79
'ngCookies',
810
'angularSlideables'
9-
];
11+
]
1012

11-
angular.module('tc.peer-review', dependencies);
13+
angular.module('tc.peer-review', dependencies)
1214

13-
})();
15+
})()

‎app/peer-review/readOnlyScorecard/readOnlyScorecard.controller.js

+21-19
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,38 @@
1+
import angular from 'angular'
2+
13
(function() {
2-
'use strict';
4+
'use strict'
35

4-
angular.module('tc.peer-review').controller('ReadOnlyScorecardController', ReadOnlyScorecardController);
6+
angular.module('tc.peer-review').controller('ReadOnlyScorecardController', ReadOnlyScorecardController)
57

6-
ReadOnlyScorecardController.$inject = ['$stateParams', 'ScorecardService', 'Helpers'];
8+
ReadOnlyScorecardController.$inject = ['$stateParams', 'ScorecardService', 'Helpers']
79

810
function ReadOnlyScorecardController($stateParams, ScorecardService, Helpers) {
9-
var scorecardId = $stateParams.scorecardId;
10-
var vm = this;
11-
vm.loaded = false;
12-
vm.scorecard = {};
11+
var scorecardId = $stateParams.scorecardId
12+
var vm = this
13+
vm.loaded = false
14+
vm.scorecard = {}
1315

14-
activate();
16+
activate()
1517

1618
function activate() {
1719
ScorecardService.getScorecardById(scorecardId)
1820
.then(function(response) {
19-
var scorecardData = response.data.result.content[0];
20-
vm.scorecard.name = scorecardData.name;
21+
var scorecardData = response.data.result.content[0]
22+
vm.scorecard.name = scorecardData.name
2123

2224
ScorecardService.getScorecardQuestions(scorecardId)
2325
.then(function(data) {
24-
vm.scorecard.questions = {};
26+
vm.scorecard.questions = {}
2527

26-
var questions = data.data.result.content;
28+
var questions = data.data.result.content
2729

28-
Helpers.storeById(vm.scorecard.questions, questions);
29-
Helpers.parseQuestions(vm.scorecard.questions);
30+
Helpers.storeById(vm.scorecard.questions, questions)
31+
Helpers.parseQuestions(vm.scorecard.questions)
3032

31-
vm.loaded = true;
32-
});
33-
});
33+
vm.loaded = true
34+
})
35+
})
3436
}
35-
};
36-
})();
37+
}
38+
})()

0 commit comments

Comments
 (0)