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

Skip to content
Snippets Groups Projects
Commit d06ef0db authored by Daniel Crazzolara's avatar Daniel Crazzolara
Browse files

Small fixes after merge

parent 8c817387
2 merge requests!62created achievementService and separated some functionality out of...,!61Feature/#51 import from artemis
...@@ -35,7 +35,7 @@ export class ExerciseService { ...@@ -35,7 +35,7 @@ export class ExerciseService {
* @param exerciseUrl * @param exerciseUrl
*/ */
public importExerciseInfoFromArtemis(exerciseToken: string): Observable<ArtemisExerciseInfo> { public importExerciseInfoFromArtemis(exerciseToken: string): Observable<ArtemisExerciseInfo> {
return this.http.get<ArtemisExerciseInfo>(`${this.resourceUrl}imported-exercise-info/${exerciseToken}`); return this.http.get<ArtemisExerciseInfo>(`${this.exerciseUrl}imported-exercise-info/${exerciseToken}`);
} }
/** /**
...@@ -43,6 +43,6 @@ export class ExerciseService { ...@@ -43,6 +43,6 @@ export class ExerciseService {
* @param exerciseInfo to submit and import * @param exerciseInfo to submit and import
*/ */
public submitExerciseInfoForImport(exerciseInfo: ArtemisExerciseInfo, exerciseToken: string, gitlabGroupId: number) { public submitExerciseInfoForImport(exerciseInfo: ArtemisExerciseInfo, exerciseToken: string, gitlabGroupId: number) {
return this.http.post<ArtemisExerciseInfo>(`${this.resourceUrl}import-exercise/${exerciseToken}/${gitlabGroupId}`, exerciseInfo); return this.http.post<ArtemisExerciseInfo>(`${this.exerciseUrl}import-exercise/${exerciseToken}/${gitlabGroupId}`, exerciseInfo);
} }
} }
...@@ -36,6 +36,8 @@ export class ArtemisExerciseInfo implements Exercise { ...@@ -36,6 +36,8 @@ export class ArtemisExerciseInfo implements Exercise {
public type: IExerciseType, public type: IExerciseType,
public version: string, public version: string,
public views: number, public views: number,
public numberOfLikes: number,
public userHasLiked: boolean,
public difficulty?: string, public difficulty?: string,
// Artemis only metadata // Artemis only metadata
public maxPoints?: number, public maxPoints?: number,
......
...@@ -77,7 +77,7 @@ export function searchResultToExercise(searchResult: SearchResultDTO): Exercise ...@@ -77,7 +77,7 @@ export function searchResultToExercise(searchResult: SearchResultDTO): Exercise
description: searchResult.metadata.description, description: searchResult.metadata.description,
programmingLanguages: searchResult.metadata.programmingLanguage, programmingLanguages: searchResult.metadata.programmingLanguage,
languages: searchResult.metadata.language, languages: searchResult.metadata.language,
creators: searchResult.metadata.creator, creator: searchResult.metadata.creator,
contributor: searchResult.metadata.contributor, contributor: searchResult.metadata.contributor,
publisher: searchResult.metadata.publisher, publisher: searchResult.metadata.publisher,
imageURL: searchResult.metadata.image, imageURL: searchResult.metadata.image,
......
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