This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit fc5b98bb authored by Eduard Frankford's avatar Eduard Frankford
Browse files

improve johannes comments

parent 6e970b4c
Branches
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
......@@ -207,7 +207,7 @@ public class ReviewService {
Arrays.asList(user.getEmail()),
Arrays.asList(reviewRating1.getStatus().name()),
Arrays.asList(reviewRating1.getComment()),
"ANNONYMIZED"
"ANONYMIZED"
);
StatisticsDTO stats = statisticsService.findOneByExerciseID(reviewRating1.getReview().getResourceID()).orElse(null);
if (stats == null) {
......@@ -238,7 +238,7 @@ public class ReviewService {
.stream()
.forEach(review -> {
review.setRequestedBy(user.getEmail());
review.setUsers(review.getUsers().stream().map(x -> "ANNONYMIZED").collect(Collectors.toList()));
review.setUsers(review.getUsers().stream().map(x -> "ANONYMIZED").collect(Collectors.toList()));
});
reviewDTOs.addAll(reviewRatingDTOs);
return reviewDTOs;
......
......@@ -107,7 +107,7 @@
type="button"
data-toggle="modal"
data-target="#detailModal2"
(click)="selectedReview = review"
(click)="selectedReview = review; selectedStatus = review.status![0]"
>
<fa-icon icon="times"></fa-icon>
<span class="d-none d-md-inline" jhiTranslate="entity.action.edit">Edit Review</span>
......@@ -210,11 +210,7 @@
<label for="" jhiTranslate="review.create.changeStatus">Change Status</label>
<div class="pt-2">
<label *ngFor="let option of options" class="row">
<input
type="checkbox"
[checked]="selectedReview.status!.includes(option)"
(change)="selectedReview.status![0] = option"
/>
<input type="checkbox" [checked]="selectedStatus === option" (change)="selectedStatus = option" />
<span class="pl-2">{{ option }}</span>
</label>
</div>
......
......@@ -26,6 +26,7 @@ export class PeerReviewingComponent implements OnInit {
selectedReview = new Review('', [''], [''], ['']);
options = ['IMPROVEMENTS_REQUESTED', 'REVIEW_REJECTED', 'REVIEW_COMPLETED'];
selectedResult?: Exercise;
selectedStatus = '';
@Output() exerciseSelectionEvent = new EventEmitter<Exercise>();
......@@ -108,6 +109,7 @@ export class PeerReviewingComponent implements OnInit {
}
updateReview(): void {
this.selectedReview.status![0] = this.selectedStatus;
this.reviewManagementService.updateByUser(this.selectedReview).subscribe(() => this.loadAll());
}
......
......@@ -133,7 +133,7 @@ public class ReviewServiceTest {
public void getReviewsByUserTest() {
List<ReviewDTO> reviewList = reviewService.getReviewsByUser();
reviewList.forEach(r -> assertThat(r.getResource()).isEqualTo("resource"));
reviewList.forEach(r -> r.getUsers().stream().forEach(u -> assertEquals("ANNONYMIZED", u)));
reviewList.forEach(r -> r.getUsers().stream().forEach(u -> assertEquals("ANONYMIZED", u)));
}
@Test
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment