Merge branch 'SI-1386-Markierung-bei-Vorversion-entfernen' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.frontend into DEVELOP
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 f367686..fbad8b3 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
@@ -134,7 +134,13 @@
<div class="form-group row">
<label for="branch" class="col-sm-2 col-form-label">{{ 'GridFailure.Branch' | translate }}</label>
<div class="col-sm-4">
- <select (change)="setLocation()" required type="text" class="form-control" [ngrxFormControlState]="formState.controls['__formBranch']">
+ <select
+ (change)="setLocation()"
+ [required]="!gridFailureDetailsSandbox.oldVersion"
+ type="text"
+ class="form-control"
+ [ngrxFormControlState]="formState.controls['__formBranch']"
+ >
<option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
<option
*ngFor="let branch of gridFailureDetailsSandbox.gridFailureBranches$ | async"
@@ -219,7 +225,13 @@
<div class="form-group row" [visibleByDependentField]="formState.value.branch !== Globals.BUSINESS_RULE_FIELDS.branch.gas">
<label for="voltageLevel" class="col-sm-2 col-form-label">{{ 'GridFailure.VoltageLevel' | translate }}</label>
<div class="col-sm-4">
- <select required type="text" class="form-control" id="voltageLevel" [ngrxFormControlState]="formState.controls['voltageLevel']">
+ <select
+ [required]="!gridFailureDetailsSandbox.oldVersion"
+ type="text"
+ class="form-control"
+ id="voltageLevel"
+ [ngrxFormControlState]="formState.controls['voltageLevel']"
+ >
<option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
<option *ngFor="let enum of gridFailureDetailsSandbox.voltageLevelEnum | keyvalue" [value]="enum.key">{{ enum.value }}</option>
</select>
@@ -242,7 +254,7 @@
<label for="failureBegin" class="col-sm-2 col-form-label">{{ 'GridFailure.FailureBegin' | translate }}</label>
<div class="input-group col-sm-4">
<app-date-time-picker
- [isRequired]="true"
+ [isRequired]="!gridFailureDetailsSandbox.oldVersion"
[ngrxFormControlState]="formState.controls['failureBegin']"
[isDisabled]="formState.controls['failureBegin']?.isDisabled"
>
@@ -278,7 +290,13 @@
<div class="form-group row">
<label for="expectedReason" class="col-sm-2 col-form-label">{{ 'GridFailure.ExpectedReason' | translate }}</label>
<div class="col-sm-4">
- <select required type="text" class="form-control" id="expectedReason" [ngrxFormControlState]="formState.controls['expectedReasonId']">
+ <select
+ [required]="!gridFailureDetailsSandbox.oldVersion"
+ type="text"
+ class="form-control"
+ id="expectedReason"
+ [ngrxFormControlState]="formState.controls['expectedReasonId']"
+ >
<option [value]="null" selected disabled>{{ 'SelectOption' | translate }}</option>
<option *ngFor="let item of gridFailureDetailsSandbox.gridFailureExpectedReasons$ | async" [value]="item.id">{{ item.text }}</option>
</select>
@@ -373,7 +391,7 @@
<label for="postcode" class="col-sm-5 col-form-label">{{ 'GridFailure.Postcode' | translate }}</label>
<div class="col-sm-6">
<input
- [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId"
+ [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion"
type="text"
maxlength="255"
class="form-control"
@@ -391,7 +409,7 @@
<label for="city" class="col-sm-5 col-form-label">{{ 'GridFailure.City' | translate }}</label>
<div class="col-sm-6">
<select
- [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId"
+ [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion"
type="text"
class="form-control"
id="city"
@@ -408,7 +426,7 @@
<label for="district" class="col-sm-5 col-form-label">{{ 'GridFailure.District' | translate }}</label>
<div class="col-sm-6">
<select
- [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId"
+ [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion"
type="text"
class="form-control"
id="district"
@@ -425,7 +443,7 @@
<label for="street" class="col-sm-5 col-form-label">{{ 'GridFailure.Street' | translate }}</label>
<div class="col-sm-6">
<select
- [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId"
+ [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion"
type="text"
class="form-control"
id="street"
@@ -442,7 +460,7 @@
<label for="housenumber" class="col-sm-5 col-form-label">{{ 'GridFailure.Housenumber' | translate }}</label>
<div class="col-sm-6">
<select
- [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId"
+ [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion"
type="text"
class="form-control"
id="housenumber"
@@ -461,7 +479,7 @@
<label for="radius" class="col-sm-5 col-form-label">{{ 'GridFailure.RadiusInMeter' | translate }}</label>
<div class="col-sm-6">
<select
- [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId"
+ [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion"
type="text"
class="form-control"
[ngrxFormControlState]="formState.controls['radiusId']"
@@ -478,8 +496,8 @@
<div class="form-group row">
<div class="col-sm-6">
<input
- [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId"
- [disabled]="gridFailureDetailsSandbox.disableStationAttributes"
+ [required]="gridFailureDetailsSandbox.isFieldRequiredDependingOnBranchId && !gridFailureDetailsSandbox.oldVersion"
+ [disabled]="gridFailureDetailsSandbox.oldVersion"
#searchInput
placeholder="{{ 'GridFailure.StationDescription' | translate }}"
type="text"
@@ -498,7 +516,7 @@
type="button"
class="btn btn-primary btn-sm"
(click)="gridFailureDetailsSandbox.postSelectedStation(); clearSearchInput()"
- [disabled]="gridFailureDetailsSandbox.disableStationAttributes"
+ [disabled]="gridFailureDetailsSandbox.oldVersion"
>
{{ 'GridFailure.AddStation' | translate }}
</button>
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.ts
index 431a507..9b219ef 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.ts
@@ -41,7 +41,7 @@
public failureLocationView: string = this._initialLocationView;
public mapOptions: MapOptions = new MapOptions();
public get mapInteractionMode(): boolean {
- return this.failureLocationView === Globals.FAILURE_LOCATION_MAP && !this.gridFailureDetailsSandbox.disableStationAttributes;
+ return this.failureLocationView === Globals.FAILURE_LOCATION_MAP && !this.gridFailureDetailsSandbox.oldVersion;
}
public stationsColumnDefinition: any = STATION_COLDEF;
public frameworkComponents: any;
@@ -63,7 +63,7 @@
});
this.gridOptions.context = {
...this.gridOptions.context,
- icons: { delete: !this.gridFailureDetailsSandbox.disableStationAttributes },
+ icons: { delete: !this.gridFailureDetailsSandbox.oldVersion },
};
this._subscription = this.gridOptions.context.eventSubject.subscribe(event => {
if (event.type === 'delete') {
@@ -114,7 +114,7 @@
public changeMode() {
this.gridFailureDetailsSandbox.gridFailureStations$.pipe(takeUntil(this._endSubscriptions$)).subscribe(() => {
- this.gridFailureDetailsSandbox.disableStationAttributes
+ this.gridFailureDetailsSandbox.oldVersion
? this.events$.next({ eventType: this._modeEnum.oldVersionMode })
: this.events$.next({ eventType: this._modeEnum.currentVersionMode });
});
diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.ts b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.ts
index bd3becb..1cc83c6 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.ts
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.sandbox.ts
@@ -122,7 +122,7 @@
public exportChannels$: Observable<string[]> = this.appState$.select(store.getExportChannels);
public gridFailurePublicationChannels$: Observable<models.PublicationChannel[]> = this.appState$.select(store.getGridFailurePublicationChannelsData);
public disablePublishButton: boolean;
- public disableStationAttributes = false;
+ public oldVersion = false;
public selectedPublicationChannels: Array<string>;
private _gridFailureId: string;
@@ -206,10 +206,10 @@
this.appState$.dispatch(gridFailureActions.loadGridFailureStations({ payload: this._gridFailureId }));
if (+versionNumber < this.maxVersionNumber) {
this.appState$.dispatch(new DisableAction(FORM_ID));
- this.disableStationAttributes = true;
+ this.oldVersion = true;
} else {
this.appState$.dispatch(new EnableAction(FORM_ID));
- this.disableStationAttributes = false;
+ this.oldVersion = false;
}
if (!!versionNumber && +versionNumber === this.maxVersionNumber) {
//necessary because of not-versioned publication properties
@@ -750,7 +750,7 @@
this.appState$.dispatch(new SetValueAction(FORM_ID, INITIAL_STATE.value));
this.appState$.dispatch(new ResetAction(FORM_ID));
this.appState$.dispatch(new EnableAction(FORM_ID));
- this.disableStationAttributes = false;
+ this.oldVersion = false;
this._gridFailureId = null;
this.maxVersionNumber = null;
this._assignedDistributionGroups = null;
