-
Notifications
You must be signed in to change notification settings - Fork 102
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3051 from sap-labs-france/master-qa
merge master-qa
- Loading branch information
Showing
23 changed files
with
1,546 additions
and
1,482 deletions.
There are no files selected for viewing
82 changes: 40 additions & 42 deletions
82
src/app/pages/assets/asset/connection/asset-connection.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,49 +1,47 @@ | ||
<div> | ||
<form class="form" [formGroup]="formGroup"> | ||
<div class="row"> | ||
<div class="col-md-12 col-xl-4"> | ||
<div class="form-group"> | ||
<mat-checkbox [formControl]="dynamicAsset" (change)="disableConnectionDetails()"> | ||
{{'assets.dynamic_asset' | translate}} | ||
</mat-checkbox> | ||
</div> | ||
<form class="form" [formGroup]="formGroup"> | ||
<div class="row"> | ||
<div class="col-md-12 col-xl-4"> | ||
<div class="form-group"> | ||
<mat-checkbox [formControl]="dynamicAsset" (change)="disableConnectionDetails()"> | ||
{{'assets.dynamic_asset' | translate}} | ||
</mat-checkbox> | ||
</div> | ||
<div class="col-md-12 col-xl-4"> | ||
<div class="form-group"> | ||
<mat-checkbox [formControl]="usesPushAPI" (change)="disableConnectionDetails()"> | ||
{{'assets.uses_push_api' | translate}} | ||
</mat-checkbox> | ||
</div> | ||
</div> | ||
<div class="col-md-12 col-xl-4"> | ||
<div class="form-group"> | ||
<mat-checkbox [formControl]="usesPushAPI" (change)="disableConnectionDetails()"> | ||
{{'assets.uses_push_api' | translate}} | ||
</mat-checkbox> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-12 col-xl-5"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<mat-select [formControl]="connectionID" placeholder="{{'chargers.connector' | translate}}" required> | ||
<mat-option *ngFor="let connection of assetConnections" value="{{connection.key}}"> | ||
{{connection.value}} | ||
</mat-option> | ||
</mat-select> | ||
<mat-error *ngIf="connectionID.errors?.required"> | ||
{{"general.mandatory_field" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-12 col-xl-5"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<mat-select [formControl]="connectionID" placeholder="{{'chargers.connector' | translate}}" required> | ||
<mat-option *ngFor="let connection of assetConnections" value="{{connection.key}}"> | ||
{{connection.value}} | ||
</mat-option> | ||
</mat-select> | ||
<mat-error *ngIf="connectionID.errors?.required"> | ||
{{"general.mandatory_field" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-12 col-xl-5"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput type="text" placeholder="{{'assets.meter_id' | translate}}" [formControl]="meterID" | ||
required /> | ||
<mat-error *ngIf="meterID.errors?.required"> | ||
{{"general.mandatory_field" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-12 col-xl-5"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput type="text" placeholder="{{'assets.meter_id' | translate}}" [formControl]="meterID" | ||
required /> | ||
<mat-error *ngIf="meterID.errors?.required"> | ||
{{"general.mandatory_field" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
</div> | ||
</form> | ||
</div> | ||
</div> | ||
</form> |
250 changes: 124 additions & 126 deletions
250
src/app/pages/assets/asset/main/asset-main.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,143 +1,141 @@ | ||
<div> | ||
<form class="form" [formGroup]="formGroup"> | ||
<div class="row h-xl-100"> | ||
<div class="col-md-12 col-xl-5 h-xl-100"> | ||
<div class="rotating-card-container h-100" [ngStyle]="{ 'pointer-events': !readOnly ? 'all' : 'none'}"> | ||
<div class="card card-rotate card-background app-asset-image-padding mt-0"> | ||
<div class="front front-background" | ||
[ngStyle]="{'background-image': 'url(' + image + ')', 'background-size' : 'contain', 'background-repeat': 'no-repeat'}"> | ||
<div class="card-body mat-tab-dialog-body-content"> | ||
</div> | ||
<form class="form" [formGroup]="formGroup"> | ||
<div class="row h-xl-100"> | ||
<div class="col-md-12 col-xl-5 h-xl-100"> | ||
<div class="rotating-card-container h-100" [ngStyle]="{ 'pointer-events': !readOnly ? 'all' : 'none'}"> | ||
<div class="card card-rotate card-background app-asset-image-padding mt-0"> | ||
<div class="front front-background" | ||
[ngStyle]="{'background-image': 'url(' + image + ')', 'background-size' : 'contain', 'background-repeat': 'no-repeat'}"> | ||
<div class="card-body mat-tab-dialog-body-content"> | ||
</div> | ||
<div class="back back-background" | ||
[ngStyle]="{'background-image': 'url(' + image + ')', 'background-size' : 'contain', 'background-repeat': 'no-repeat'}"> | ||
<div *ngIf="!readOnly" class="card-body"> | ||
<h5 class="card-title"> | ||
{{'general.change_picture' | translate}} | ||
</h5> | ||
<div class="footer text-center"> | ||
<button mat-flat-button color="primary" class="me-2"> | ||
<mat-icon (click)="file.click()">mode_edit</mat-icon> | ||
<div class="d-none"> | ||
<input #file type="file" name="..." (change)="onImageChanged($event)" | ||
accept="image/jpg,image/jpeg,image/png,image/gif"> | ||
</div> | ||
</button> | ||
<button mat-flat-button color="warn"> | ||
<mat-icon (click)="clearImage()">delete</mat-icon> | ||
</button> | ||
</div> | ||
</div> | ||
<div class="back back-background" | ||
[ngStyle]="{'background-image': 'url(' + image + ')', 'background-size' : 'contain', 'background-repeat': 'no-repeat'}"> | ||
<div *ngIf="!readOnly" class="card-body"> | ||
<h5 class="card-title"> | ||
{{'general.change_picture' | translate}} | ||
</h5> | ||
<div class="footer text-center"> | ||
<button mat-flat-button color="primary" class="me-2"> | ||
<mat-icon (click)="file.click()">mode_edit</mat-icon> | ||
<div class="d-none"> | ||
<input #file type="file" name="..." (change)="onImageChanged($event)" | ||
accept="image/jpg,image/jpeg,image/png,image/gif"> | ||
</div> | ||
</button> | ||
<button mat-flat-button color="warn"> | ||
<mat-icon (click)="clearImage()">delete</mat-icon> | ||
</button> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
<div class="col-md-12 col-xl-7"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input appAutofocus matInput placeholder="{{'assets.name' | translate}}" type="text" [formControl]="name" required> | ||
<mat-error *ngIf="name.errors?.required"> | ||
{{"general.mandatory_field" | translate}} | ||
</mat-error> | ||
<mat-error *ngIf="name.errors?.maxlength"> | ||
<div [translateParams]="{length: name.errors?.maxlength?.requiredLength}" [translate]="'general.error_max_length'"></div> | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput type="text" readonly=true placeholder="{{'site_areas.titles' | translate}}" | ||
class="form-field-popup" (click)="assignSiteArea()" [formControl]="siteArea" required /> | ||
<button mat-button matSuffix mat-icon-button aria-label="Add" (click)="assignSiteArea()" [hidden]="readOnly"> | ||
<mat-icon>create</mat-icon> | ||
</button> | ||
<mat-error *ngIf="siteArea.errors?.required"> | ||
{{"general.mandatory_field" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<mat-select [formControl]="assetType" placeholder="{{'assets.asset_type' | translate}}" required> | ||
<mat-option *ngFor="let assetType of assetTypes" value="{{assetType.key}}"> | ||
{{assetType.value | translate}} | ||
</mat-option> | ||
</mat-select> | ||
<mat-error *ngIf="assetType.errors?.required">{{"general.mandatory_field" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
<div class="col-md-12 col-xl-7"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input appAutofocus matInput placeholder="{{'assets.name' | translate}}" type="text" [formControl]="name" required> | ||
<mat-error *ngIf="name.errors?.required"> | ||
{{"general.mandatory_field" | translate}} | ||
</mat-error> | ||
<mat-error *ngIf="name.errors?.maxlength"> | ||
<div [translateParams]="{length: name.errors?.maxlength?.requiredLength}" [translate]="'general.error_max_length'"></div> | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput type="text" readonly=true placeholder="{{'site_areas.titles' | translate}}" | ||
class="form-field-popup" (click)="assignSiteArea()" [formControl]="siteArea" required /> | ||
<button mat-button matSuffix mat-icon-button aria-label="Add" (click)="assignSiteArea()" [hidden]="readOnly"> | ||
<mat-icon>create</mat-icon> | ||
</button> | ||
<mat-error *ngIf="siteArea.errors?.required"> | ||
{{"general.mandatory_field" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<mat-select [formControl]="assetType" placeholder="{{'assets.asset_type' | translate}}" required> | ||
<mat-option *ngFor="let assetType of assetTypes" value="{{assetType.key}}"> | ||
{{assetType.value | translate}} | ||
</mat-option> | ||
</mat-select> | ||
<mat-error *ngIf="assetType.errors?.required">{{"general.mandatory_field" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
<div *ngIf="isSmartChargingComponentActive"> | ||
<div class="text-left form-group"> | ||
<mat-checkbox [formControl]="excludeFromSmartCharging"> | ||
{{'chargers.exclude_smart_charging' | translate}} | ||
</mat-checkbox> | ||
</div> | ||
<div *ngIf="isSmartChargingComponentActive"> | ||
<div class="text-left form-group"> | ||
<mat-checkbox [formControl]="excludeFromSmartCharging"> | ||
{{'chargers.exclude_smart_charging' | translate}} | ||
</mat-checkbox> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-4"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput [formControl]="staticValueWatt" | ||
placeholder="{{'assets.static_value_watt' | translate}}" required type='number'> | ||
<mat-error *ngIf="assetType.errors?.required">{{"general.mandatory_field" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-4"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput [formControl]="staticValueWatt" | ||
placeholder="{{'assets.static_value_watt' | translate}}" required type='number'> | ||
<mat-error *ngIf="assetType.errors?.required">{{"general.mandatory_field" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
</div> | ||
<div class="col-md-4"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput [formControl]="fluctuationPercent" | ||
placeholder="{{'assets.fluctuation_percent' | translate}}" type='number'> | ||
<mat-error *ngIf="fluctuationPercent.errors?.pattern || fluctuationPercent.errors?.max"> | ||
{{"chargers.invalid_efficiency" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
<div class="col-md-4"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput [formControl]="fluctuationPercent" | ||
placeholder="{{'assets.fluctuation_percent' | translate}}" type='number'> | ||
<mat-error *ngIf="fluctuationPercent.errors?.pattern || fluctuationPercent.errors?.max"> | ||
{{"chargers.invalid_efficiency" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
<div class="col-md-4"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput [formControl]="variationThresholdPercent" | ||
placeholder="{{'assets.variation_percent' | translate}}" type='number'> | ||
<mat-error | ||
*ngIf="variationThresholdPercent.errors?.pattern || variationThresholdPercent.errors?.max"> | ||
{{"chargers.invalid_efficiency" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
</div> | ||
<div class="col-md-4"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput [formControl]="variationThresholdPercent" | ||
placeholder="{{'assets.variation_percent' | translate}}" type='number'> | ||
<mat-error | ||
*ngIf="variationThresholdPercent.errors?.pattern || variationThresholdPercent.errors?.max"> | ||
{{"chargers.invalid_efficiency" | translate}} | ||
</mat-error> | ||
</mat-form-field> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-6"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput placeholder="{{'general.latitude' | translate}}" type="text" | ||
[formControl]="latitude" [readOnly]="readOnly"> | ||
<mat-error *ngIf="latitude.errors?.pattern">{{"general.invalid_value" | translate}}</mat-error> | ||
<button mat-button matSuffix mat-icon-button aria-label="Add" (click)="assignGeoMap()" | ||
[hidden]="readOnly"> | ||
<mat-icon>pin_drop</mat-icon> | ||
</button> | ||
</mat-form-field> | ||
</div> | ||
</div> | ||
<div class="row"> | ||
<div class="col-md-6"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput placeholder="{{'general.latitude' | translate}}" type="text" | ||
[formControl]="latitude" [readOnly]="readOnly"> | ||
<mat-error *ngIf="latitude.errors?.pattern">{{"general.invalid_value" | translate}}</mat-error> | ||
<button mat-button matSuffix mat-icon-button aria-label="Add" (click)="assignGeoMap()" | ||
[hidden]="readOnly"> | ||
<mat-icon>pin_drop</mat-icon> | ||
</button> | ||
</mat-form-field> | ||
</div> | ||
<div class="col-md-6"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput placeholder="{{'general.longitude' | translate}}" type="text" | ||
[formControl]="longitude" [readOnly]="readOnly"> | ||
<mat-error *ngIf="longitude.errors?.pattern">{{"general.invalid_value" | translate}}</mat-error> | ||
<button mat-button matSuffix mat-icon-button aria-label="Add" (click)="assignGeoMap()" | ||
[hidden]="readOnly"> | ||
<mat-icon>pin_drop</mat-icon> | ||
</button> | ||
</mat-form-field> | ||
</div> | ||
</div> | ||
<div class="col-md-6"> | ||
<div class="form-group"> | ||
<mat-form-field> | ||
<input matInput placeholder="{{'general.longitude' | translate}}" type="text" | ||
[formControl]="longitude" [readOnly]="readOnly"> | ||
<mat-error *ngIf="longitude.errors?.pattern">{{"general.invalid_value" | translate}}</mat-error> | ||
<button mat-button matSuffix mat-icon-button aria-label="Add" (click)="assignGeoMap()" | ||
[hidden]="readOnly"> | ||
<mat-icon>pin_drop</mat-icon> | ||
</button> | ||
</mat-form-field> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</form> | ||
</div> | ||
</div> | ||
</form> |
Oops, something went wrong.