diff --git a/src/app/sys-check/questionnaire/questionnaire.component.html b/src/app/sys-check/questionnaire/questionnaire.component.html
index b4b805af60356554fd45cadc2e42d316de66a12d..3301f3ae16e68b92fda6b79bbb4f3d53091bce55 100644
--- a/src/app/sys-check/questionnaire/questionnaire.component.html
+++ b/src/app/sys-check/questionnaire/questionnaire.component.html
@@ -1,49 +1,45 @@
-<mat-card>
+<mat-card-header>
+ <mat-card-title>Fragen</mat-card-title>
+ <mat-card-subtitle>Bitte füllen Sie die folgenden Fragen aus</mat-card-subtitle>
+</mat-card-header>
- <mat-card-header>
- <mat-card-title>Fragen</mat-card-title>
- <mat-card-subtitle>Bitte füllen Sie die folgenden Fragen aus</mat-card-subtitle>
- </mat-card-header>
-
- <mat-card-content style="height: 610px; overflow: auto">
- <div #questionnaireBody>
- <div [formGroup]="form" class="formList" fxLayout="column">
- <div *ngFor="let q of questions">
- <div [ngSwitch]="q.type" class="formEntry" fxLayout="column" fxLayoutGap="5px">
- <h3 *ngSwitchCase="'header'">{{ q.prompt }}{{ q.value }}</h3>
- <mat-form-field *ngSwitchCase="'text'">
- <p>{{q.prompt}}</p>
- <textarea matInput [formControlName]="q.id" [id]="q.id" cdkTextareaAutosize cdkAutosizeMinRows="2" class="formEntry"></textarea>
- </mat-form-field>
- <mat-form-field *ngSwitchCase="'string'">
- <p>{{q.prompt}}</p>
- <input matInput [formControlName]="q.id" [id]="q.id" class="formEntry">
- </mat-form-field>
- <mat-form-field *ngSwitchCase="'select'">
- <p>{{q.prompt}}</p>
- <mat-select [id]="q.id" [formControlName]="q.id" class="formEntry">
- <mat-option *ngFor="let opt of q.options" [value]="opt">
- {{opt}}
- </mat-option>
- </mat-select>
- </mat-form-field>
- <div *ngSwitchCase="'check'">
- <p *ngIf="q.prompt.length > 0">{{q.prompt}}</p>
- <mat-checkbox *ngSwitchCase="'check'" [formControlName]="q.id" [id]="q.id">{{q.value}}</mat-checkbox>
- </div>
- <div *ngSwitchCase="'radio'">
- <p>{{q.prompt}}</p>
- <mat-radio-group [id]="q.id" [formControlName]="q.id" [name]="q.id">
- <mat-radio-button *ngFor="let opt of q.options" [value]="opt" class="formEntry">
- {{opt}}
- </mat-radio-button>
- </mat-radio-group>
- </div>
- <p *ngSwitchDefault>Unbekannter Control-Typ: {{q.type}} für Element-ID {{q.id}}</p>
+<mat-card-content style="height: 610px; overflow: auto">
+ <div #questionnaireBody>
+ <div [formGroup]="form" class="formList" fxLayout="column">
+ <div *ngFor="let q of questions">
+ <div [ngSwitch]="q.type" class="formEntry" fxLayout="column" fxLayoutGap="5px">
+ <h3 *ngSwitchCase="'header'">{{ q.prompt }}{{ q.value }}</h3>
+ <mat-form-field *ngSwitchCase="'text'">
+ <p>{{q.prompt}}</p>
+ <textarea matInput [formControlName]="q.id" [id]="q.id" cdkTextareaAutosize cdkAutosizeMinRows="2" class="formEntry"></textarea>
+ </mat-form-field>
+ <mat-form-field *ngSwitchCase="'string'">
+ <p>{{q.prompt}}</p>
+ <input matInput [formControlName]="q.id" [id]="q.id" class="formEntry">
+ </mat-form-field>
+ <mat-form-field *ngSwitchCase="'select'">
+ <p>{{q.prompt}}</p>
+ <mat-select [id]="q.id" [formControlName]="q.id" class="formEntry">
+ <mat-option *ngFor="let opt of q.options" [value]="opt">
+ {{opt}}
+ </mat-option>
+ </mat-select>
+ </mat-form-field>
+ <div *ngSwitchCase="'check'">
+ <p *ngIf="q.prompt.length > 0">{{q.prompt}}</p>
+ <mat-checkbox *ngSwitchCase="'check'" [formControlName]="q.id" [id]="q.id">{{q.value}}</mat-checkbox>
+ </div>
+ <div *ngSwitchCase="'radio'">
+ <p>{{q.prompt}}</p>
+ <mat-radio-group [id]="q.id" [formControlName]="q.id" [name]="q.id">
+ <mat-radio-button *ngFor="let opt of q.options" [value]="opt" class="formEntry">
+ {{opt}}
+ </mat-radio-button>
+ </mat-radio-group>
</div>
+ <p *ngSwitchDefault>Unbekannter Control-Typ: {{q.type}} für Element-ID {{q.id}}</p>
</div>
</div>
</div>
- </mat-card-content>
-
-</mat-card>
+ </div>
+</mat-card-content>
diff --git a/src/app/sys-check/report/report.component.html b/src/app/sys-check/report/report.component.html
index a28810b3414a1bbdca507c39f9a228cee360440e..dc2a7a021e51e72c1b2b042fd5edf2cdd901aed7 100644
--- a/src/app/sys-check/report/report.component.html
+++ b/src/app/sys-check/report/report.component.html
@@ -1,32 +1,23 @@
-
-<mat-card>
-
- <mat-card-header>
- <mat-card-title>Bericht</mat-card-title>
- <mat-card-subtitle *ngIf="canSave">Dieser System-Check wurde so konfiguriert, dass nach Abschluss ein Bericht geschickt werden kann. Hierfür ist ein Kennwort erforderlich.</mat-card-subtitle>
- <mat-card-subtitle *ngIf="!canSave">Für diesen System-Check ist nicht vorgesehen, dass nach Abschluss ein Bericht geschickt wird.</mat-card-subtitle>
- </mat-card-header>
-
- <mat-card-content id="report-cointainer" fxLayout.gt-md="row" fxLayout="column" *ngIf="canSave">
- <p *ngIf="questionnaireDataWarnings.length > 0">Bitte prüfen Sie die Eingaben:</p>
- <ul>
- <li *ngFor="let qd of questionnaireDataWarnings">
- {{qd.label}}
- </li>
- </ul>
- </mat-card-content>
-
- <label *ngIf="csvReport">Export als CSV für Copy&Paste
- <textarea style="width:100%; height: 8em">{{csvReport}}</textarea>
- </label>
-
- <mat-card-actions>
- <button [disabled]="!isReady() || !canSave" mat-raised-button color="primary" (click)="saveReport()" class="save_button">Bericht senden</button>
+<mat-card-header>
+ <mat-card-title>Bericht</mat-card-title>
+ <mat-card-subtitle *ngIf="canSave">Dieser System-Check wurde so konfiguriert, dass nach Abschluss ein Bericht geschickt werden kann. Hierfür ist ein Kennwort erforderlich.</mat-card-subtitle>
+ <mat-card-subtitle *ngIf="!canSave">Für diesen System-Check ist nicht vorgesehen, dass nach Abschluss ein Bericht geschickt wird.</mat-card-subtitle>
+</mat-card-header>
+
+<mat-card-content id="report-cointainer" fxLayout.gt-md="row" fxLayout="column" *ngIf="canSave">
+ <p *ngIf="questionnaireDataWarnings.length > 0">Bitte prüfen Sie die Eingaben:</p>
+ <ul>
+ <li *ngFor="let qd of questionnaireDataWarnings">
+ {{qd.label}}
+ </li>
+ </ul>
+</mat-card-content>
+
+<label *ngIf="csvReport">Export als CSV für Copy&Paste
+ <textarea style="width:100%; height: 8em">{{csvReport}}</textarea>
+</label>
+
+<mat-card-actions>
+ <button [disabled]="!isReady() || !canSave" mat-raised-button color="primary" (click)="saveReport()" class="save_button">Bericht senden</button>
<!-- <button *ngIf="isReady()" mat-raised-button (click)="exportReport()" class="save_button">Als CSV zum kopieren</button>-->
- </mat-card-actions>
-
-</mat-card>
-
-
-
-
+</mat-card-actions>
diff --git a/src/app/sys-check/sys-check.component.html b/src/app/sys-check/sys-check.component.html
index 4d76c5baf510364f605d339db6e992589e0ff7d1..87a46a7d85c776199c7791cd408f9684be646b79 100644
--- a/src/app/sys-check/sys-check.component.html
+++ b/src/app/sys-check/sys-check.component.html
@@ -10,20 +10,26 @@
<div class="spinner-container-local" *ngIf="dataLoading">
<mat-spinner></mat-spinner>
</div>
- <div fxLayout="row wrap" fxLayoutAlign="center stretch">
- <mat-card fxFlex="0 0 400px">
- <iqb-environment-check></iqb-environment-check>
+ <div fxLayout="column" fxLayoutAlign="center stretch" class="cardhost">
+ <div fxLayout="raw wrap" fxLayoutAlign="center stretch" fxFlex>
+ <mat-card fxFlex>
+ <iqb-environment-check></iqb-environment-check>
+ </mat-card>
+ <mat-card fxFlex="2 0 800px">
+ <iqb-network-check [measureNetwork]="checks.network"></iqb-network-check>
+ </mat-card>
+ </div>
+ <div fxLayout="row wrap" fxLayoutAlign="center stretch">
+ <mat-card [fxFlex]="(checks.questions) ? '2 0 800px' : ''" *ngIf="checks.unit">
+ <iqb-unit-check></iqb-unit-check>
+ </mat-card>
+ <mat-card fxFlex *ngIf="checks.questions">
+ <iqb-questionnaire></iqb-questionnaire>
+ </mat-card>
+ </div>
+ <mat-card>
+ <iqb-report [canSave]="checks.report"></iqb-report>
</mat-card>
- <mat-card fxFlex="2 0 800px">
- <iqb-network-check [measureNetwork]="checks.network"></iqb-network-check>
- </mat-card>
- </div>
-
-
- <div fxLayout="column" fxLayout.gt-md="row" class="cardbox" [ngClass]="{toprow: !checks.network}">
- <iqb-unit-check fxFlex="100%" [fxFlex.gt-md]="(checks.unit && checks.questions) ? '75%' : '100%'" *ngIf="checks.unit"></iqb-unit-check>
- <iqb-questionnaire fxFlex="100%" [fxFlex.gt-md]="(checks.unit && checks.questions) ? '25%' : '100%'" *ngIf="checks.questions"></iqb-questionnaire>
</div>
- <iqb-report [canSave]="checks.report"></iqb-report>
</div>
diff --git a/src/app/sys-check/sys-check.component.scss b/src/app/sys-check/sys-check.component.scss
index 6df33bc6663d334304669b0602e4c6263f359673..8c5e8094d2e692970668c9f557164fa2063aad84 100644
--- a/src/app/sys-check/sys-check.component.scss
+++ b/src/app/sys-check/sys-check.component.scss
@@ -8,32 +8,14 @@
height: 100%;
}
-::ng-deep mat-card {
- margin: 1em;
+mat-card {
+ margin: 10px;
}
-::ng-deep .mat-card-header-text {
- margin-left: 0 !important;
+.cardhost {
+ margin: 10px;
}
-$mat-gt-md: "screen and (min-width: 1280px)";
-@media #{$mat-gt-md} {
-
- .cardbox {
- margin: 1em
- }
-
- ::ng-deep .cardbox mat-card {
- margin: 0 1em 0 0
- }
-
- ::ng-deep .cardbox :last-child mat-card {
- margin: 0
- }
-
- ::ng-deep .toprow,
- ::ng-deep .toprow mat-card {
- margin-top: 0 !important
- }
-
+::ng-deep .mat-card-header-text {
+ margin-left: 0 !important;
}
diff --git a/src/app/sys-check/unit-check/unit-check.component.html b/src/app/sys-check/unit-check/unit-check.component.html
index a471efc71dd95e4578fc0c6fb37826c84a5ddbf3..60b0946da542feda6d42a8998751e02c887e6df0 100644
--- a/src/app/sys-check/unit-check/unit-check.component.html
+++ b/src/app/sys-check/unit-check/unit-check.component.html
@@ -1,18 +1,14 @@
-<mat-card>
-
- <mat-card-header>
- <mat-card-title>
- Test-Aufgabe
- <span *ngIf="waitforloading" style="color:red"> - wird geladen, bitte warten.</span>
- </mat-card-title>
- <mat-card-subtitle>Hier können Sie eine Aufgabe ausprobieren</mat-card-subtitle>
-
- <tc-navi-buttons></tc-navi-buttons><!-- TODO needed? -->
- </mat-card-header>
-
- <mat-card-content style="height: 610px; overflow: auto">
- <div style="color:red; position: absolute" *ngIf="errorMessage">{{errorMessage}}</div>
- <div #iFrameHost iqbResizeIFrameChild style="height:99%"></div>
- </mat-card-content>
-
-</mat-card>
+<mat-card-header>
+ <mat-card-title>
+ Test-Aufgabe
+ <span *ngIf="waitforloading" style="color:red"> - wird geladen, bitte warten.</span>
+ </mat-card-title>
+ <mat-card-subtitle>Hier können Sie eine Aufgabe ausprobieren</mat-card-subtitle>
+
+ <tc-navi-buttons></tc-navi-buttons><!-- TODO needed? -->
+</mat-card-header>
+
+<mat-card-content style="height: 610px; overflow: auto">
+ <div style="color:red; position: absolute" *ngIf="errorMessage">{{errorMessage}}</div>
+ <div #iFrameHost iqbResizeIFrameChild style="height:99%"></div>
+</mat-card-content>
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 1968eda28212700a6c8e75f0b5185d956513d0d2..6c23bed2718ef80dbe4359c334adf43768c617bd 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -5,5 +5,5 @@ export const environment = {
testcenterUrl: '/',
appName: 'IQB-Testcenter',
appPublisher: 'IQB - Institut zur Qualitätsentwicklung im Bildungswesen',
- appVersion: '1.4.0 - 15.1.2020'
+ appVersion: '1.5.0 - 10.2.2020'
};