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

Skip to content
Snippets Groups Projects
Commit dbdb2f6f authored by Michael Breu's avatar Michael Breu :speech_balloon:
Browse files

Erste compilierbare Version

parent 14432f22
2 merge requests!91Bringing JHipster7.6.0 to production,!88Integrating Update to JHipster 7.6.0 back to Development
......@@ -32,7 +32,10 @@
<table class="table table-striped" aria-describedby="page-heading">
<thead>
<tr jhiSort [(predicate)]="predicate" [(ascending)]="ascending"
>
<!-- TODO
[callback]="reset.bind(this)">
-->
<th scope="col" jhiSortBy="name"><span
jhiTranslate="gitsearchApp.userWatchList.name">Name</span> <fa-icon
icon="sort"></fa-icon></th>
......
......@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
import { HttpResponse } from '@angular/common/http';
import { ActivatedRoute } from '@angular/router';
import { Subscription } from 'rxjs';
import { JhiEventManager } from 'ng-jhipster';
import { EventManager } from 'app/core/util/event-manager.service';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { ILikes } from 'app/shared/model/likes.model';
......@@ -20,7 +20,7 @@ export class LikesComponent implements OnInit, OnDestroy {
constructor(
protected likesService: LikesService,
protected eventManager: JhiEventManager,
protected eventManager: EventManager,
protected modalService: NgbModal,
protected activatedRoute: ActivatedRoute
) {
......
......@@ -10,7 +10,7 @@ import { likesRoute } from './likes.route';
@NgModule({
imports: [SharedModule, RouterModule.forChild(likesRoute)],
declarations: [LikesComponent, LikesDetailComponent, LikesUpdateComponent, LikesDeleteDialogComponent],
declarations: [LikesComponent, LikesDetailComponent, LikesUpdateComponent],
entryComponents: [LikesDeleteDialogComponent],
})
export class GitsearchLikesModule {}
......@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
import { ApplicationConfigService } from 'app/core/config/application-config.service';
import { createRequestOption } from 'app/core/request/request-util';
import { Search } from 'app/core/request/request.model';
import { SearchWithPagination, Search } from 'app/core/request/request.model';
import { IUserWatchList } from 'app/shared/model/user-watch-list.model';
import { SearchResultsDTO } from 'app/shared/model/search/search-results-dto.model';
......@@ -60,7 +60,7 @@ export class UserWatchListService {
return this.http.get<IUserWatchList[]>(this.resourceSearchUrl, { params: options, observe: 'response' });
}
searchForCurrentUser(req: Search): Observable<EntityArrayResponseType> {
searchForCurrentUser(req: SearchWithPagination): Observable<EntityArrayResponseType> {
const options = createRequestOption(req);
return this.http.get<IUserWatchList[]>(this.currentUserResourceSearchUrl, { params: options, observe: 'response' });
}
......
......@@ -39,8 +39,9 @@ export class ExerciseCardComponent {
* correct missing image urls
*/
correctImageURL(event: Event): void {
if (event.srcElement) {
event.srcElement['src'] = '/content/images/Logo_codeAbility_4c_300dpi_RGB3.gif';
const img = event.srcElement as HTMLImageElement;
if (img) {
img.src = '/content/images/Logo_codeAbility_4c_300dpi_RGB3.gif';
}
}
}
......@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy, Input } from '@angular/core';
import { Exercise } from 'app/shared/model/exercise.model';
import { Person } from 'app/shared/model/person.model';
import { Subscription } from 'rxjs';
import { Account } from 'app/core/user/account.model';
import { Account } from 'app/core/auth/account.model';
import { AccountService } from 'app/core/auth/account.service';
@Component({
......
......@@ -6,6 +6,8 @@
<div *ngIf="exerciseInfo != undefined">
<div class="row justify-content-center">
TODO
<!-- TODO
<div class="col-8">
<form name="importForm" role="form" (ngSubmit)="import()" #importForm="ngForm">
<div class="form-group">
......@@ -28,11 +30,11 @@
</div>
<div class="form-group">
<ng-template #helpLearningResourceType> {{ 'exercise.help.learningResourceHelp' | translate}}</ng-template>
<!-- TODO
<!-X- TODO
<fa-icon icon="info-circle"
[ngbTooltip]="helpLearningResourceType"
placement="left"></fa-icon>
-->
-X->
<label class="form-control-label" jhiTranslate="exercise.metadata.learningResourceType">Learning resource type</label>
<input type="text" name="learningResourceType" class="form-control" #learningResourceType="ngModel" required [(ngModel)]="exerciseInfo.learningResourceType"/>
<div *ngIf="learningResourceType.invalid && (learningResourceType.dirty || description.untouched || learningResourceType.touched)" class="alert alert-danger mt-2">
......@@ -41,13 +43,13 @@
</div>
<div class="form-group position-relative">
<label class="form-control-label" jhiTranslate="exercise.metadata.keyword.plural">Keywords</label>
<!-- <tag-input [(ngModel)]='exerciseInfo.keyword'
<!-X- TODO <tag-input [(ngModel)]='exerciseInfo.keyword'
[addOnBlur]="true"
theme="bootstrap"
class="tag-input"
name="keywords"
[animationDuration]="{ enter: '200ms', leave: '200ms' }"></tag-input>
-->
-X->
<div *ngIf="exerciseInfo.keyword === undefined || exerciseInfo.keyword.length < 1" class="alert alert-danger">
<span jhiTranslate="exercise.validation.minKeywords"></span>
......@@ -159,7 +161,7 @@
</div>
<div class="form-group position-relative">
<label class="form-control-label" jhiTranslate="exercise.metadata.programmingLanguage.plural">Programming languages</label>
<!--
<!-X- TODO
<tag-input [(ngModel)]='exerciseInfo.programmingLanguage'
[addOnBlur]="true"
[modelAsStrings]="true"
......@@ -167,7 +169,7 @@
class="tag-input"
name="Programming Languages"
[animationDuration]="{ enter: '200ms', leave: '200ms' }"></tag-input>
-->
-X->
</div>
<div class="form-group">
<label class="form-control-label" jhiTranslate="exercise.metadata.difficulty">Difficulty</label>
......@@ -181,12 +183,13 @@
</div>
</div>
<button type="submit" [disabled]="importForm.form.invalid || hasValidationErrors() || isLoading" class="btn btn-outline-primary mt-3">
<!-- TODO
<!-X- TODO
<fa-icon class="align-middle" [icon]="'save'"></fa-icon> <span jhiTranslate="exercise.import.form.submit">Submit</span>
-->
-X->
</button>
</form>
</div>
-->
</div>
</div>
<div *ngIf="isImporting" class="overlay">
......
......@@ -11,7 +11,7 @@ import { SharedModule } from 'app/shared/shared.module';
@NgModule({
imports: [RouterModule.forChild(EXERCISE_IMPORT_ROUTE), FontAwesomeModule, SharedModule, ExerciseModule, /* TagInputModule, */ GitlabModule, FormsModule],
// declarations: [ExerciseImportComponent],
declarations: [ExerciseImportComponent],
exports: [ExerciseImportComponent],
})
export class ExerciseImportModule {}
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