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

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

resolve #376

parent a73b8635
Branches
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
......@@ -13,9 +13,10 @@ import { SettingsComponent } from './settings/settings.component';
import { accountState } from './account.route';
import { AchievementsComponent } from './achievements.component';
import { PeerReviewingComponent } from './peer-reviewing/peer-reviewing.component';
import { ExerciseModule } from 'app/exercise/exercise.module';
@NgModule({
imports: [SharedModule, RouterModule.forChild(accountState), TranslateModule],
imports: [SharedModule, RouterModule.forChild(accountState), TranslateModule, ExerciseModule],
declarations: [
ActivateComponent,
RegisterComponent,
......
......@@ -27,7 +27,7 @@
type="button"
style="margin-top: 20px"
data-toggle="modal"
data-target="#detailModal"
data-target="#detailModal0"
(click)="(true)"
[disabled]="!user?.reviewingEnabled"
>
......@@ -50,6 +50,7 @@
<tr>
<th scope="col"><span jhiTranslate="global.field.id">ID</span></th>
<th scope="col"><span jhiTranslate="review.create.resource">Resource</span></th>
<th scope="col"></th>
<th scope="col"><span>Status</span></th>
<th scope="col"><span jhiTranslate="review.create.comments">Comments</span></th>
<th scope="col"></th>
......@@ -61,6 +62,19 @@
<td>
<a href="{{ review.link }}" style="color: rgb(33, 37, 41)" target="_blank"> {{ review.resource }}</a>
</td>
<td>
<div class="btn-group">
<button
class="btn btn-info btn-sm"
type="button"
data-toggle="modal"
data-target="#detailModal"
(click)="selectedResult = selectExercise(review.link!)"
>
<span class="d-none d-md-inline" jhiTranslate="review.create.view">View Resource</span>
</button>
</div>
</td>
<td>
<div *ngFor="let level of review.status">
<span class="">{{ level }}</span>
......@@ -81,7 +95,6 @@
data-target="#detailModal3"
(click)="selectedReview = review"
>
<fa-icon icon="times"></fa-icon>
<span class="d-none d-md-inline" jhiTranslate="review.create.comments">View comments</span>
</button>
</div>
......@@ -132,8 +145,9 @@
</tbody>
</table>
</div>
<jhi-exercise-modal-details [exercise]="selectedResult"></jhi-exercise-modal-details>
<div>
<div class="modal fade" id="detailModal">
<div class="modal fade" id="detailModal0">
<div class="modal-dialog modal-lg modal-dialog-centered">
<div class="modal-content">
<!-- Modal Header -->
......
import { Component, OnInit } from '@angular/core';
import { Component, EventEmitter, OnInit, Output } from '@angular/core';
import { ReviewManagementService } from 'app/admin/review-management/review-management.service';
import { Review } from 'app/admin/review-management/review.model';
import { ReviewRequest } from 'app/admin/review-management/reviewRequest.model';
......@@ -6,6 +6,7 @@ import { UserManagementService } from 'app/admin/user-management/service/user-ma
import { User } from 'app/admin/user-management/user-management.model';
import { Account } from 'app/core/auth/account.model';
import { AccountService } from 'app/core/auth/account.service';
import { ExerciseService } from 'app/exercise/service/exercise.service';
import { SearchService } from 'app/search/service/search-service';
import { Exercise, searchResultToExercise } from 'app/shared/model/exercise.model';
import { SearchResultsDTO } from 'app/shared/model/search/search-results-dto.model';
......@@ -24,12 +25,16 @@ export class PeerReviewingComponent implements OnInit {
reviews: Review[] = [];
selectedReview = new Review('', [''], [''], ['']);
options = ['Improvements Requested', 'Review Rejected', 'Review Completed'];
selectedResult?: Exercise;
@Output() exerciseSelectionEvent = new EventEmitter<Exercise>();
constructor(
private userService: UserManagementService,
private accountService: AccountService,
private searchService: SearchService,
private reviewManagementService: ReviewManagementService
private reviewManagementService: ReviewManagementService,
private exerciseService: ExerciseService
) {}
ngOnInit(): void {
......@@ -75,6 +80,13 @@ export class PeerReviewingComponent implements OnInit {
this.selectedExercise = exercise;
}
selectExercise(gitlabURL: string): Exercise {
const exercise: Exercise = this.exerciseService.populateExerciseWithData(
this.results.find(exercise => exercise.gitlabURL === gitlabURL)!
);
return exercise;
}
requestReview(): void {
if (this.currentAccount) {
this.searchService
......
{
"review": {
"create": {
"view": "Inhalt ansehen",
"pagetitle": "Review Management",
"title": "Erstelle ein neues Review",
"selectUsers": "Wählen Sie einen oder mehrere Benutzer aus",
......@@ -11,7 +12,7 @@
"requested": "Review Angefragt",
"rewarded": "Badge verliehen",
"rewardBadge": "Badge verleihen",
"comments": "Kommentare",
"comments": "Kommentare ansehen",
"exerciseName": "Aufgaben Name",
"userEmail": "Benutzer Email",
"selectResourceToBeReviewed": "Wählen Sie die Ressource aus, die Sie überprüfen lassen möchten",
......
{
"review": {
"create": {
"view": "View resource",
"pagetitle": "Review Management",
"title": "Create a new review",
"selectUsers": "Select users",
......@@ -8,7 +9,7 @@
"button": "Create",
"resource": "Resource",
"user": "User",
"comments": "Comments",
"comments": "View comments",
"requested": "Review Requested",
"rewarded": "Badge Rewarded",
"rewardBadge": "Reward Badge",
......
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