Commit c5e0cb6c authored by Florian Mühlburger's avatar Florian Mühlburger
Browse files

fixed missing entries in drop down lists 2

Fixed Dropdown Lists:
-lvaInstanzen
-lvas
-movers
-pruefungs-typen
-studienjahre
Ausblenden von Links auf Statseite
parent 29bda7a2
Pipeline #997 passed with stages
in 9 minutes and 39 seconds
#H2 Server Properties
#Tue Apr 09 15:55:39 CEST 2019
#Tue Jun 11 15:25:20 CEST 2019
0=JHipster H2 (Disk)|org.h2.Driver|jdbc\:h2\:file\:./target/h2db/db/zml|zml
webAllowOthers=true
webPort=8082
......
......@@ -14,14 +14,14 @@
<label class="form-control-label" for="field_lva">Lva</label>
<select class="form-control" id="field_lva" name="lva" [(ngModel)]="lVAInstanz.lva" >
<option [ngValue]="null"></option>
<option [ngValue]="lVAOption.id === lVAInstanz.lva?.id ? lVAInstanz.lva : lVAOption" *ngFor="let lVAOption of lvas; trackBy: trackLVAById">{{lVAOption.id}}</option>
<option [ngValue]="lVAOption.id === lVAInstanz.lva?.id ? lVAInstanz.lva : lVAOption" *ngFor="let lVAOption of lvas; trackBy: trackLVAById">{{lVAOption.lvanr}}</option>
</select>
</div>
<div class="form-group">
<label class="form-control-label" for="field_jahr">Jahr</label>
<select class="form-control" id="field_jahr" name="jahr" [(ngModel)]="lVAInstanz.jahr" >
<option [ngValue]="null"></option>
<option [ngValue]="studienjahrOption.id === lVAInstanz.jahr?.id ? lVAInstanz.jahr : studienjahrOption" *ngFor="let studienjahrOption of studienjahrs; trackBy: trackStudienjahrById">{{studienjahrOption.id}}</option>
<option [ngValue]="studienjahrOption.id === lVAInstanz.jahr?.id ? lVAInstanz.jahr : studienjahrOption" *ngFor="let studienjahrOption of studienjahrs; trackBy: trackStudienjahrById">{{studienjahrOption.jahr}}</option>
</select>
</div>
</div>
......
......@@ -3,7 +3,7 @@ import { HttpClient, HttpResponse } from '@angular/common/http';
import { Observable } from 'rxjs';
import { SERVER_API_URL } from 'app/app.constants';
import { createRequestOption } from 'app/shared';
import { createRequestOption, ITEMS_PER_PAGE, MAX_PAGE_SIZE } from 'app/shared';
import { ILVAInstanz } from 'app/shared/model/lva-instanz.model';
type EntityResponseType = HttpResponse<ILVAInstanz>;
......@@ -28,6 +28,13 @@ export class LVAInstanzService {
}
query(req?: any): Observable<EntityArrayResponseType> {
if (!req) {
req = {
page: 0,
size: MAX_PAGE_SIZE,
sort: ['id,asc', 'id']
};
}
const options = createRequestOption(req);
return this.http.get<ILVAInstanz[]>(this.resourceUrl, { params: options, observe: 'response' });
}
......
......@@ -3,7 +3,7 @@ import { HttpClient, HttpResponse } from '@angular/common/http';
import { Observable } from 'rxjs';
import { SERVER_API_URL } from 'app/app.constants';
import { createRequestOption } from 'app/shared';
import { createRequestOption, ITEMS_PER_PAGE, MAX_PAGE_SIZE } from 'app/shared';
import { ILVA } from 'app/shared/model/lva.model';
type EntityResponseType = HttpResponse<ILVA>;
......@@ -28,6 +28,13 @@ export class LVAService {
}
query(req?: any): Observable<EntityArrayResponseType> {
if (!req) {
req = {
page: 0,
size: MAX_PAGE_SIZE,
sort: ['lvanr,asc', 'id']
};
}
const options = createRequestOption(req);
return this.http.get<ILVA[]>(this.resourceUrl, { params: options, observe: 'response' });
}
......
......@@ -3,7 +3,7 @@ import { HttpClient, HttpResponse } from '@angular/common/http';
import { Observable } from 'rxjs';
import { SERVER_API_URL } from 'app/app.constants';
import { createRequestOption } from 'app/shared';
import { createRequestOption, ITEMS_PER_PAGE, MAX_PAGE_SIZE } from 'app/shared';
import { IPruefungsTyp } from 'app/shared/model/pruefungs-typ.model';
type EntityResponseType = HttpResponse<IPruefungsTyp>;
......@@ -28,6 +28,13 @@ export class PruefungsTypService {
}
query(req?: any): Observable<EntityArrayResponseType> {
if (!req) {
req = {
page: 0,
size: MAX_PAGE_SIZE,
sort: ['id,asc', 'id']
};
}
const options = createRequestOption(req);
return this.http.get<IPruefungsTyp[]>(this.resourceUrl, { params: options, observe: 'response' });
}
......
......@@ -3,7 +3,7 @@ import { HttpClient, HttpResponse } from '@angular/common/http';
import { Observable } from 'rxjs';
import { SERVER_API_URL } from 'app/app.constants';
import { createRequestOption } from 'app/shared';
import { createRequestOption, ITEMS_PER_PAGE, MAX_PAGE_SIZE } from 'app/shared';
import { IStudienjahr } from 'app/shared/model/studienjahr.model';
type EntityResponseType = HttpResponse<IStudienjahr>;
......@@ -28,6 +28,13 @@ export class StudienjahrService {
}
query(req?: any): Observable<EntityArrayResponseType> {
if (!req) {
req = {
page: 0,
size: MAX_PAGE_SIZE,
sort: ['jahr,asc', 'id']
};
}
const options = createRequestOption(req);
return this.http.get<IStudienjahr[]>(this.resourceUrl, { params: options, observe: 'response' });
}
......
......@@ -18,8 +18,9 @@
<li><a href="#/pruefungs-termin">Die Liste aller Prüfungstermine abrufen.</a></li>
</ul>
</p>
<p>
Außerdem können Sie:
<div class="" *ngIf="account.authorities.includes('ROLE_ADMIN')">
<p>
Außerdem können Sie:
<ul>
<li><a href="#/modul">Module im Curriculum anlegen oder ändern.</a></li>
<li><a href="#/lva">Lehrveranstaltungen anlegen und Modulen zuordnen.</a></li>
......@@ -27,9 +28,9 @@
<li><a href="#/pruefungs-typ">Die Liste der unterschiedlichen Prüfungstypen warten.</a></li>
<li><a href="#/mail-recipient">Die Empfänger der Benachrichtigungs-eMails konfigurieren.</a></li>
</ul>
</p>
</p>
</div>
</div>
<div class="alert alert-warning" *ngSwitchCase="false">
<span>If you want to </span>
<a class="alert-link" (click)="login()">sign in</a><span>, you can try the default accounts:<br/>- Administrator (login="admin" and password="admin") <br/>- User (login="user" and password="user").</span>
......
Markdown is supported
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