Skip to content
Snippets Groups Projects
Commit c9e130f0 authored by Martin Mechtel's avatar Martin Mechtel
Browse files

release 0.9

parent 0df48da0
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<mat-spinner></mat-spinner> <mat-spinner></mat-spinner>
</div> </div>
<div class="page-body" fxLayout="row" iqbResizeIFrameChild> <div class="page-body" fxLayout="row" iqbResizeIFrameChild>
<div class="tcSidenav" name="sideNav" fxFlex="110px" fxLayout="column" fxLayoutAlign="start center" fxLayoutGap="5px"> <div class="tcSidenav" name="sideNav" fxFlex="100px" fxLayout="column" fxLayoutAlign="start center" fxLayoutGap="5px">
<p>Aufgaben</p> <p>Aufgaben</p>
<tc-sidenavi-button *ngFor="let u of allUnits" [unitData]="u"></tc-sidenavi-button> <tc-sidenavi-button *ngFor="let u of allUnits" [unitData]="u"></tc-sidenavi-button>
</div> </div>
......
...@@ -336,22 +336,42 @@ export class UnitDef { ...@@ -336,22 +336,42 @@ export class UnitDef {
if (oDOM.documentElement.nodeName === 'Unit') { if (oDOM.documentElement.nodeName === 'Unit') {
// ________________________ // ________________________
let definitionRef = '';
const defElements = oDOM.documentElement.getElementsByTagName('Definition'); const defElements = oDOM.documentElement.getElementsByTagName('Definition');
if (defElements.length > 0) { if (defElements.length > 0) {
const defElement = defElements[0]; const defElement = defElements[0];
this.unitDefinition = defElement.textContent; this.unitDefinition = defElement.textContent;
this.unitDefinitionType = defElement.getAttribute('type'); this.unitDefinitionType = defElement.getAttribute('type');
} else {
const defRefElements = oDOM.documentElement.getElementsByTagName('DefinitionRef');
if (defRefElements.length > 0) {
const defRefElement = defRefElements[0];
definitionRef = defRefElement.textContent;
this.unitDefinition = '';
this.unitDefinitionType = defRefElement.getAttribute('type');
}
}
if (this.unitDefinitionType.length > 0) {
return tcs.loadItemplayerOk(auth, this.unitDefinitionType).pipe( return tcs.loadItemplayerOk(auth, this.unitDefinitionType).pipe(
switchMap(ok => of(this.locked = !ok))); switchMap(ok => {
// ________________________ if (ok && definitionRef.length > 0) {
// const resourcesElements = oDOM.documentElement.getElementsByTagName('Resources'); return bs.getUnitResourceTxt(auth, definitionRef).pipe(
// if (resourcesElements.length > 0) { switchMap(def => {
// const resourcesElement = resourcesElements[0]; if (def instanceof ServerError) {
// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> return of(false);
// } else {
// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> this.unitDefinition = def as string;
// } this.locked = false;
return of(true);
}
}));
} else {
return of(this.locked = !ok);
}
}));
} else { } else {
this.label = 'unitdef not found'; this.label = 'unitdef not found';
return of(false); // Def-Element required return of(false); // Def-Element required
......
...@@ -5,5 +5,5 @@ export const environment = { ...@@ -5,5 +5,5 @@ export const environment = {
testcenterUrl: '/', testcenterUrl: '/',
appName: 'IQB-Testcenter', appName: 'IQB-Testcenter',
appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen', appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen',
appVersion: '0.8.1 - 25.9.2018' appVersion: '0.9.0 - 30.9.2018'
}; };
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment