Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.frontend into SI-374
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
index 60fbde7..1834e8c 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
@@ -12,7 +12,40 @@
********************************************************************************/ -->
<app-card-layout>
<div header>
- <span>{{ 'GridFailure.Title' | translate }}</span>
+ <div class="header-container">
+ <span>{{ 'GridFailure.Title' | translate }}</span>
+ <div class="diverse-btn-container">
+ <div>
+ <button type="button" class="btn btn-primary button" (click)="gridFailureDetailsSandbox.cancel()">
+ {{ 'CancelBtn' | translate }}
+ </button>
+ <ng-container *ngIf="gridFailureDetailsSandbox.showStornoButton && gridFailureDetailsSandbox.saveEnabled">
+ <ng-template visibleByRight [acceptedRole]="RolesEnum.QUALIFIER">
+ <button type="button" class="btn btn-primary right-button" (click)="gridFailureDetailsSandbox.setState(StateEnum.CANCELED)">
+ {{ 'StornoBtn' | translate }}
+ </button>
+ </ng-template>
+ </ng-container>
+ </div>
+ <div>
+ <ng-container *ngIf="gridFailureDetailsSandbox.showQualifyButton && gridFailureDetailsSandbox.saveEnabled">
+ <ng-template visibleByRight [acceptedRole]="RolesEnum.QUALIFIER">
+ <button type="button" class="btn btn-primary button" (click)="gridFailureDetailsSandbox.setState(StateEnum.QUALIFIED)">
+ {{ 'QualifyBtn' | translate }}
+ </button>
+ </ng-template>
+ </ng-container>
+ <button
+ *ngIf="gridFailureDetailsSandbox.saveEnabled"
+ type="button"
+ class="btn btn-success button"
+ (click)="gridFailureDetailsSandbox.saveGridFailure()"
+ >
+ {{ 'SaveBtn' | translate }}
+ </button>
+ </div>
+ </div>
+ </div>
</div>
<div class="grid-failure-grid-wrapper" body>
<div *ngIf="gridFailureDetailsSandbox.maxVersionNumber">
@@ -478,43 +511,6 @@
</div>
</div>
</app-expandable>
-
- <!-- buttons -->
- <div class="row justify-content-between">
- <div>
- <button
- *ngIf="gridFailureDetailsSandbox.saveEnabled"
- type="button"
- class="btn btn-success left-button"
- (click)="gridFailureDetailsSandbox.saveGridFailure()"
- >
- {{ 'SaveBtn' | translate }}
- </button>
- <button type="button" class="btn btn-primary left-button" (click)="gridFailureDetailsSandbox.cancel()">
- {{ 'CancelBtn' | translate }}
- </button>
- </div>
- <div>
- <!-- State Buttons -->
- <ng-container *ngIf="gridFailureDetailsSandbox.saveEnabled">
- <ng-container *ngIf="gridFailureDetailsSandbox.showQualifyButton">
- <ng-template visibleByRight [acceptedRole]="RolesEnum.QUALIFIER">
- <button type="button" class="btn btn-primary right-button" (click)="gridFailureDetailsSandbox.setState(StateEnum.QUALIFIED)">
- {{ 'QualifyBtn' | translate }}
- </button>
- </ng-template>
- </ng-container>
-
- <ng-container *ngIf="gridFailureDetailsSandbox.showStornoButton">
- <ng-template visibleByRight [acceptedRole]="RolesEnum.QUALIFIER">
- <button type="button" class="btn btn-primary right-button" (click)="gridFailureDetailsSandbox.setState(StateEnum.CANCELED)">
- {{ 'StornoBtn' | translate }}
- </button>
- </ng-template>
- </ng-container>
- </ng-container>
- </div>
- </div>
</div>
</form>
</div>
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.scss b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.scss
index c7a7b8a..d2fa2b6 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.scss
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.scss
@@ -43,11 +43,11 @@
padding-left: 16px;
width: 247px;
}
-.left-button {
- margin-left: 15px;
+.button {
+ margin: 0px 5px;
}
.right-button {
- margin-right: 15px;
+ margin: 0px 15px 0px 5px;
}
.editable {
background-color: white;
@@ -64,3 +64,15 @@
.expandable-content {
padding: 20px 0px 20px 35px;
}
+.header-container {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+}
+.diverse-btn-container {
+ display: flex;
+ justify-content: space-between;
+}
+.card {
+ height: calc(100vh - 180px);
+}
diff --git a/projects/grid-failure-information-app/src/app/shared/containers/card-layout/card-layout.component.scss b/projects/grid-failure-information-app/src/app/shared/containers/card-layout/card-layout.component.scss
index 08aa06f..7373249 100644
--- a/projects/grid-failure-information-app/src/app/shared/containers/card-layout/card-layout.component.scss
+++ b/projects/grid-failure-information-app/src/app/shared/containers/card-layout/card-layout.component.scss
@@ -11,11 +11,12 @@
* SPDX-License-Identifier: EPL-2.0
********************************************************************************/
.card {
- height: calc(100vh - 142px);
+ height: calc(100vh - 180px);
overflow: auto;
border: none;
}
.card-title {
font-size: 30px;
margin-bottom: 8px;
+ background-color: #f8fafd;
}
