From e60dadcf29d476d717a114b7221348200aa46657 Mon Sep 17 00:00:00 2001 From: Stefan Feilmeier Date: Mon, 12 Aug 2024 13:38:01 +0200 Subject: [PATCH 1/2] UI formatting --- ui/.vscode/settings.json | 39 +++++++++++++------ ui/README.md | 2 +- ui/android/app/build.gradle | 4 +- ui/android/keystore.properties | 2 +- ui/android/settings.gradle | 2 +- ui/android/variables.gradle | 2 +- ui/angular.json | 2 +- ui/e2e/tsconfig.json | 2 +- ui/karma.conf.js | 2 +- ui/ngsw-config.json | 2 +- ui/src/app/app-routing.module.ts | 1 - ui/src/app/app.component.ts | 5 +-- ui/src/app/app.module.ts | 3 +- ui/src/app/appupdateservice.ts | 10 ----- ui/src/app/changelog/view/view.html | 2 +- ui/src/app/edge/edge.component.ts | 1 - ui/src/app/edge/edge.module.ts | 4 +- .../ChannelThreshold/flat/flat.html | 2 +- .../ChannelThreshold/overview/overview.html | 2 +- .../overview/overview.html | 3 +- .../TimeOfUseTariff/timeOfUseTariff.module.ts | 2 +- .../edge/history/abstracthistorychart.html | 2 +- .../app/edge/history/abstracthistorychart.ts | 3 +- .../app/edge/history/abstracthistorywidget.ts | 2 +- .../edge/history/chpsoc/chart.component.ts | 3 +- .../chpsocchartoverview.component.html | 2 +- .../edge/history/common/autarchy/Autarchy.ts | 2 +- .../history/common/autarchy/flat/flat.html | 2 +- .../common/autarchy/overview/overview.html | 2 +- ui/src/app/edge/history/common/common.ts | 3 +- .../consumption/chart/chart.constants.spec.ts | 3 +- .../consumption/details/details.overview.html | 9 +++-- .../consumption/details/details.overview.ts | 4 +- .../history/common/consumption/flat/flat.html | 2 +- .../common/consumption/overview/overview.html | 2 +- .../energy/chart/chart.constants.spec.ts | 3 +- .../edge/history/common/energy/flat/flat.html | 2 +- .../edge/history/common/energy/flat/flat.ts | 10 ++--- .../edge/history/common/grid/flat/flat.html | 18 ++++----- ui/src/app/edge/history/common/grid/grid.ts | 5 +-- .../details/chart/productionMeter.spec.ts | 2 +- .../production/details/details.overview.html | 4 +- .../history/common/production/flat/flat.html | 2 +- .../common/production/overview/overview.html | 8 ++-- .../common/production/overview/overview.ts | 3 +- .../common/selfconsumption/SelfConsumption.ts | 4 +- .../common/selfconsumption/flat/flat.html | 2 +- .../common/selfconsumption/flat/flat.ts | 2 +- .../selfconsumption/overview/overview.html | 2 +- ...ayedselltogridchartoverview.component.html | 2 +- .../delayedselltogrid/widget.component.html | 2 +- .../delayedselltogrid/widget.component.ts | 4 +- ...xdigitaloutputchartoverview.component.html | 2 +- .../fixdigitaloutput/widget.component.html | 2 +- ...heatingelementchartoverview.component.html | 2 +- .../heatingelement/widget.component.html | 2 +- .../heatpumpchartoverview.component.html | 2 +- .../history/heatpump/widget.component.html | 2 +- ...ricpeakshavingchartoverview.component.html | 2 +- .../asymmetric/widget.component.html | 2 +- .../asymmetric/widget.component.ts | 5 +-- ...ricpeakshavingchartoverview.component.html | 2 +- .../symmetric/widget.component.html | 2 +- .../peakshaving/symmetric/widget.component.ts | 1 - ...lotpeakshavingchartoverview.component.html | 2 +- .../timeslot/widget.component.html | 2 +- .../peakshaving/timeslot/widget.component.ts | 1 - .../singlethreshold/widget.component.html | 2 +- .../storagechartoverview.component.html | 2 +- .../history/storage/widget.component.html | 2 +- .../Channelthreshold/Channelthreshold.html | 2 +- .../edge/live/Controller/ChpSoc/ChpSoc.html | 2 +- .../ChpSoc/modal/modal.component.html | 2 +- .../Ess/FixActivePower/flat/flat.html | 2 +- .../Ess/FixActivePower/modal/modal.html | 2 +- .../Ess/GridOptimizedCharge/flat/flat.html | 2 +- .../TimeOfUseTariff/Ess_TimeOfUseTariff.ts | 30 +++++++------- .../Ess/TimeOfUseTariff/flat/flat.html | 2 +- .../TimeOfUseTariff/modal/powerSocChart.ts | 3 +- .../TimeOfUseTariff/modal/statePriceChart.ts | 2 +- .../administration.component.html | 2 +- .../live/Controller/Evcs/modal/modal.html | 2 +- .../live/Controller/Evcs/popover/popover.html | 2 +- .../FixDigitalOutput/Io_FixDigitalOutput.html | 2 +- .../modal/modal.component.html | 2 +- .../Io/HeatingElement/flat/flat.html | 2 +- .../Io/HeatingElement/modal/modal.html | 2 +- .../Controller/Io/Heatpump/Io_Heatpump.html | 2 +- .../Io/Heatpump/modal/modal.component.html | 2 +- .../PeakShaving/Asymmetric/Asymmetric.html | 2 +- .../Asymmetric/modal/modal.component.html | 2 +- .../PeakShaving/Symmetric/Symmetric.html | 2 +- .../Symmetric/modal/modal.component.html | 2 +- .../Symmetric_TimeSlot.html | 2 +- .../modal/modal.component.html | 2 +- .../Api_DigitalInput/Io_Api_DigitalInput.html | 2 +- .../Api_DigitalInput/modal/modal.component.ts | 6 +-- .../Evcs_Api_Cluster/Evcs_Api_Cluster.html | 2 +- .../modal/evcs-chart/evcs.chart.html | 2 +- .../modal/evcs-chart/evcs.chart.ts | 10 ++--- .../modal/evcsCluster-modal.page.html | 2 +- .../modal/evcsCluster-modal.page.ts | 4 +- .../edge/live/common/autarchy/flat/flat.html | 2 +- .../live/common/consumption/flat/flat.html | 2 +- .../app/edge/live/common/grid/flat/flat.html | 2 +- .../live/common/production/flat/flat.html | 2 +- .../edge/live/common/production/flat/flat.ts | 2 +- .../live/common/production/modal/modal.html | 2 +- .../common/selfconsumption/flat/flat.html | 2 +- .../common/storage/storage.component.html | 2 +- .../delayedselltogrid.component.html | 2 +- .../modal/modal.component.html | 2 +- .../energymonitor/chart/chart.component.html | 2 +- .../section/abstractsection.component.ts | 4 +- .../chart/section/consumption.component.html | 2 +- .../chart/section/grid.component.html | 2 +- .../chart/section/production.component.html | 2 +- .../chart/section/storage.component.html | 2 +- .../energymonitor.component.html | 2 +- .../energymonitor/energymonitor.module.ts | 9 ++--- ui/src/app/edge/live/info/info.component.html | 2 +- ui/src/app/edge/live/live.component.html | 4 +- ui/src/app/edge/live/live.module.ts | 2 +- ui/src/app/edge/live/livedataservice.ts | 3 +- ui/src/app/edge/settings/app/app.module.ts | 18 ++++----- .../edge/settings/app/formly/formly-text.ts | 2 +- .../formly-option-group-picker.component.html | 2 +- .../formly-option-group-picker.component.ts | 2 +- .../formly-reorder-array.component.html | 2 +- .../formly-safe-input-modal.component.html | 2 +- .../formly-safe-input.extended.html | 2 +- .../safe-input/formly-safe-input.extended.ts | 2 +- .../app/edge/settings/app/index.component.ts | 8 ++-- .../edge/settings/app/install.component.html | 2 +- .../app/jsonrpc/getAppAssistant.spec.ts | 2 +- .../app/keypopup/modal.component.html | 2 +- .../settings/app/keypopup/modal.component.ts | 4 +- .../edge/settings/app/single.component.html | 2 +- .../app/edge/settings/app/single.component.ts | 6 +-- .../edge/settings/app/update.component.html | 3 +- .../app/edge/settings/app/update.component.ts | 2 +- .../settings/channels/channels.component.html | 2 +- .../settings/channels/channels.component.ts | 4 +- .../component/install/index.component.html | 2 +- .../component/install/index.component.ts | 4 +- .../component/install/install.component.html | 2 +- .../component/install/install.component.ts | 4 +- .../component/update/index.component.html | 2 +- .../component/update/update.component.html | 2 +- .../component/update/update.component.ts | 4 +- .../settings/jsonrpctest/jsonrpctest.html | 4 +- .../jsonrpctest/jsonrpctest.permission.ts | 2 +- .../settings/powerassistant/powerassistant.ts | 7 ++-- .../profile/aliasupdate.component.html | 2 +- .../app/edge/settings/settings.component.html | 9 +++-- .../settings/system/executeSystemUpdate.ts | 2 +- .../system/executesystemupdate.component.html | 2 +- .../systemexecute.component.html | 2 +- .../settings/systemlog/systemlog.component.ts | 7 ++-- ui/src/app/index/filter/filter.component.html | 2 +- ui/src/app/index/filter/filter.component.ts | 2 +- ui/src/app/index/index.module.ts | 5 +-- .../index/overview/overview.component.html | 2 +- ui/src/app/index/shared/loading-screen.html | 2 +- ui/src/app/index/shared/sumState.ts | 4 +- .../registration/modal/modal.component.html | 2 +- .../registration/registration.component.html | 2 +- .../components/chart/abstracthistorychart.ts | 4 +- ui/src/app/shared/components/edge/edge.ts | 15 ++++--- .../currentVoltage.overview.html | 2 +- .../currentVoltage/currentVoltageModule.ts | 3 +- .../meter/electricity/modal.component.html | 2 +- .../meter/esscharger/modal.component.html | 2 +- .../flat-widget-horizontal-line.html | 2 +- .../flat-widget-line-item.html | 2 +- .../flat-widget-line/flat-widget-line.html | 2 +- .../flat-widget-percentagebar.html | 2 +- .../flat/flat-widget.component.html | 2 +- ui/src/app/shared/components/flat/flat.html | 2 +- .../subnavigation/footerNavigation.html | 2 +- ...form-field-checkbox-hyperlink.wrapper.html | 2 +- .../form-field-checkbox-hyperlink.wrapper.ts | 2 +- .../components/formly/form-field.wrapper.html | 2 +- .../components/formly/form-field.wrapper.ts | 2 +- .../formly-field-checkbox-with-image.html | 4 +- .../formly-field-modal/formlyfieldmodal.html | 2 +- .../formly/formly-field-modal/template.html | 2 +- .../formly-field-radio-with-image.html | 2 +- .../formly-field-radio-with-image.ts | 2 +- .../formly-select-field-modal.component.html | 2 +- .../formly/formly-select-field.extended.html | 2 +- .../formly/input-serial-number-wrapper.html | 2 +- .../app/shared/components/formly/input.html | 3 +- .../app/shared/components/formly/repeat.html | 2 +- .../components/header/header.component.html | 2 +- .../shared/components/modal/abstractModal.ts | 2 +- .../modal/help-button/help-button.html | 2 +- .../modal/modal-button/modal-button.html | 2 +- .../modal-info-line/modal-info-line.html | 2 +- .../modal-line-item/modal-line-item.html | 2 +- .../modal/modal-line/modal-line.html | 2 +- .../modal/modal-phases/modal-phases.html | 2 +- .../modal-value-line/modal-value-line.html | 2 +- .../modal-horizontal-line.html | 2 +- .../percentagebar.component.html | 2 +- .../pickdate/pickdate.component.html | 2 +- .../components/pickdate/pickdate.module.ts | 4 +- .../app/shared/components/shared/converter.ts | 2 - .../shared/components/shared/dataservice.ts | 3 +- .../components/shared/oe-formly-component.ts | 3 +- .../status/single/status.component.spec.ts | 7 ++-- ui/src/app/shared/directive/directive.ts | 2 +- .../notification/systemLogNotification.ts | 2 +- .../queryHistoricTimeseriesDataRequest.ts | 4 +- ...istoricTimeseriesEnergyPerPeriodRequest.ts | 4 +- .../queryHistoricTimeseriesEnergyRequest.ts | 2 +- .../chartoptions/chartoptions.component.html | 2 +- .../popover/popover.component.html | 2 +- .../pipe/unitvalue/unitvalue.pipe.spec.ts | 2 +- ui/src/app/shared/service/service.ts | 1 - .../app/shared/service/test/dummyservice.ts | 5 +-- .../app/shared/service/test/dummywebsocket.ts | 2 +- ui/src/app/shared/shared.module.ts | 1 - ui/src/app/shared/type/language.ts | 4 +- ui/src/app/shared/type/widget.ts | 1 - ui/src/app/user/user.component.html | 3 +- ui/src/app/user/user.component.ts | 3 +- ui/src/assets/i18n/de.json | 2 +- ui/src/assets/i18n/en.json | 2 +- ui/src/global.scss | 1 + ui/src/main.ts | 2 +- ui/src/polyfills.ts | 4 +- ui/src/test.ts | 1 + ui/src/themes/openems/root/site.webmanifest | 2 +- ui/tsconfig.app.json | 2 +- ui/tsconfig.spec.json | 2 +- 236 files changed, 353 insertions(+), 378 deletions(-) diff --git a/ui/.vscode/settings.json b/ui/.vscode/settings.json index ca17a9ba2dd..953439f6918 100644 --- a/ui/.vscode/settings.json +++ b/ui/.vscode/settings.json @@ -5,16 +5,6 @@ "i18n-ally.localesPaths": "src/assets/i18n", "i18n-ally.dirStructure": "file", "i18n-ally.keystyle": "nested", - "formatFiles.excludedFolders": [ - "node_modules", - ".vscode", - ".git", - "dist", - ".chrome", - ".angular", - "target" - ], - "formatFiles.excludePattern": "**/{*.svg,*.png,*.ico,package-lock.json}", "files.watcherExclude": { "**/.git/objects/**": true, "**/node_modules/**": true @@ -24,12 +14,37 @@ "editor.defaultFormatter": "dbaeumer.vscode-eslint", "eslint.format.enable": true, "[typescript]": { - "editor.defaultFormatter": "vscode.typescript-language-features" + "editor.defaultFormatter": "vscode.typescript-language-features", + "editor.codeActionsOnSave": { + "source.organizeImports": "explicit", + "source.removeUnusedImports": "explicit" + } }, "[jsonc]": { "editor.defaultFormatter": "vscode.json-language-features" }, "[json]": { "editor.defaultFormatter": "vscode.json-language-features" - } + }, + "[javascript]": { + "editor.defaultFormatter": "vscode.typescript-language-features" + }, + "[html]": { + "editor.defaultFormatter": "vscode.html-language-features" + }, + "[scss]": { + "editor.defaultFormatter": "vscode.css-language-features" + }, + "Workspace_Formatter.excludePattern": [ + "**/build", + "**/.*", + "**/.vscode", + "**/target", + "*.js", + "*.xml", + "*.js.map", + "**/node_modules", + "*.svg", + "*.scss" + ] } diff --git a/ui/README.md b/ui/README.md index 7464899feaf..96ef2800acb 100644 --- a/ui/README.md +++ b/ui/README.md @@ -114,4 +114,4 @@ ngOnDestroy() { ``` #### Debugging Angular PWA Via USB-Connection -Please follow this: https://medium.com/nerd-for-tech/google-chrome-how-to-inspect-websites-on-mobile-devices-804677f863ce \ No newline at end of file +Please follow this: https://medium.com/nerd-for-tech/google-chrome-how-to-inspect-websites-on-mobile-devices-804677f863ce diff --git a/ui/android/app/build.gradle b/ui/android/app/build.gradle index 222c575a476..49bae4cfcb6 100644 --- a/ui/android/app/build.gradle +++ b/ui/android/app/build.gradle @@ -9,7 +9,7 @@ android { defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 20240900 + versionCode 2024090000 versionName "2024.9.0-SNAPSHOT" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { @@ -85,4 +85,4 @@ try { } } catch(Exception e) { logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work") -} \ No newline at end of file +} diff --git a/ui/android/keystore.properties b/ui/android/keystore.properties index 9ac490bd3ea..23a54c08f52 100644 --- a/ui/android/keystore.properties +++ b/ui/android/keystore.properties @@ -1,4 +1,4 @@ storePassword=Halelilu4 keyPassword=Halelilu4 keyAlias=key1 -storeFile=./../../key.jks \ No newline at end of file +storeFile=./../../key.jks diff --git a/ui/android/settings.gradle b/ui/android/settings.gradle index 3b4431d7724..944c98f4239 100644 --- a/ui/android/settings.gradle +++ b/ui/android/settings.gradle @@ -2,4 +2,4 @@ include ':app' include ':capacitor-cordova-android-plugins' project(':capacitor-cordova-android-plugins').projectDir = new File('./capacitor-cordova-android-plugins/') -apply from: 'capacitor.settings.gradle' \ No newline at end of file +apply from: 'capacitor.settings.gradle' diff --git a/ui/android/variables.gradle b/ui/android/variables.gradle index 5946adabdd2..232bd9dd0c5 100644 --- a/ui/android/variables.gradle +++ b/ui/android/variables.gradle @@ -13,4 +13,4 @@ ext { androidxJunitVersion = '1.1.5' androidxEspressoCoreVersion = '3.5.1' cordovaAndroidVersion = '10.1.1' -} \ No newline at end of file +} diff --git a/ui/angular.json b/ui/angular.json index bb545d9ee55..e1fba2f0688 100644 --- a/ui/angular.json +++ b/ui/angular.json @@ -220,4 +220,4 @@ "styleext": "scss" } } -} \ No newline at end of file +} diff --git a/ui/e2e/tsconfig.json b/ui/e2e/tsconfig.json index a5524bf13b2..a82df00eef3 100644 --- a/ui/e2e/tsconfig.json +++ b/ui/e2e/tsconfig.json @@ -9,4 +9,4 @@ "node" ] } -} \ No newline at end of file +} diff --git a/ui/karma.conf.js b/ui/karma.conf.js index 0980006d7ec..be800f624ce 100644 --- a/ui/karma.conf.js +++ b/ui/karma.conf.js @@ -31,7 +31,7 @@ module.exports = function (config) { dir: require('path').join(__dirname, './coverage/ngv'), subdir: '.', reporters: [ - {type: 'lcov'}, + { type: 'lcov' }, { type: 'html' }, { type: 'text-summary' } ], diff --git a/ui/ngsw-config.json b/ui/ngsw-config.json index cfbfb992b16..04d5a40739a 100644 --- a/ui/ngsw-config.json +++ b/ui/ngsw-config.json @@ -24,4 +24,4 @@ } } ] -} \ No newline at end of file +} diff --git a/ui/src/app/app-routing.module.ts b/ui/src/app/app-routing.module.ts index 38a1dd97ae3..40394041c80 100644 --- a/ui/src/app/app-routing.module.ts +++ b/ui/src/app/app-routing.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; import { environment } from 'src/environments'; - import { ChangelogViewComponent } from './changelog/view/view'; import { EdgeComponent } from './edge/edge.component'; import { OverviewComponent as AutarchyChartOverviewComponent } from './edge/history/common/autarchy/overview/overview'; diff --git a/ui/src/app/app.component.ts b/ui/src/app/app.component.ts index 033478c4795..d4c4c458a00 100644 --- a/ui/src/app/app.component.ts +++ b/ui/src/app/app.component.ts @@ -2,16 +2,15 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Meta, Title } from '@angular/platform-browser'; import { NavigationEnd, Router } from '@angular/router'; +import { SplashScreen } from '@capacitor/splash-screen'; import { MenuController, ModalController, Platform, ToastController } from '@ionic/angular'; import { Subject, Subscription } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; - import { environment } from '../environments'; +import { AppService } from './app.service'; import { GlobalRouteChangeHandler } from './shared/service/globalRouteChangeHandler'; import { Service, UserPermission, Websocket } from './shared/shared'; import { Language } from './shared/type/language'; -import { SplashScreen } from '@capacitor/splash-screen'; -import { AppService } from './app.service'; @Component({ selector: 'app-root', diff --git a/ui/src/app/app.module.ts b/ui/src/app/app.module.ts index 79a367d56af..3a7db60566a 100644 --- a/ui/src/app/app.module.ts +++ b/ui/src/app/app.module.ts @@ -10,7 +10,7 @@ import { FORMLY_CONFIG } from '@ngx-formly/core'; import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'; import { AngularMyDatePickerModule } from '@nodro7/angular-mydatepicker'; import { CookieService } from 'ngx-cookie-service'; - +import { DeviceDetectorService } from 'ngx-device-detector'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { AppService } from './app.service'; @@ -29,7 +29,6 @@ import { SharedModule } from './shared/shared.module'; import { registerTranslateExtension } from './shared/translate.extension'; import { Language, MyTranslateLoader } from './shared/type/language'; import { UserModule } from './user/user.module'; -import { DeviceDetectorService } from 'ngx-device-detector'; @NgModule({ declarations: [ diff --git a/ui/src/app/appupdateservice.ts b/ui/src/app/appupdateservice.ts index 7029043c8fa..943f7fd254c 100644 --- a/ui/src/app/appupdateservice.ts +++ b/ui/src/app/appupdateservice.ts @@ -11,16 +11,6 @@ export class CheckForUpdateService { constructor(private update: SwUpdate, private service: Service, ) { } - - init() { - setInterval(async () => { - const updateFound = await this.update.checkForUpdate(); - console.log(updateFound ? 'A new version is available.' : 'Already on the latest version.'); - if (updateFound) { - window.location.reload(); - } - }, 10000); - } } // Will be used in Future @Injectable() diff --git a/ui/src/app/changelog/view/view.html b/ui/src/app/changelog/view/view.html index ee8a40dc029..2746d025db1 100644 --- a/ui/src/app/changelog/view/view.html +++ b/ui/src/app/changelog/view/view.html @@ -1,4 +1,4 @@
- \ No newline at end of file + diff --git a/ui/src/app/edge/edge.component.ts b/ui/src/app/edge/edge.component.ts index 8f6f8c7e965..6cc3aabb469 100644 --- a/ui/src/app/edge/edge.component.ts +++ b/ui/src/app/edge/edge.component.ts @@ -4,7 +4,6 @@ import { ActivatedRoute, Router } from "@angular/router"; import { SubscribeEdgesRequest } from "src/app/shared/jsonrpc/request/subscribeEdgesRequest"; import { ChannelAddress, Edge, Service, Websocket } from "src/app/shared/shared"; - /*** This component is needed as a routing parent and acts as a transit station without being displayed.*/ @Component({ selector: "edge", diff --git a/ui/src/app/edge/edge.module.ts b/ui/src/app/edge/edge.module.ts index 14c27cb4243..e88789f32af 100644 --- a/ui/src/app/edge/edge.module.ts +++ b/ui/src/app/edge/edge.module.ts @@ -1,8 +1,8 @@ -import { HistoryModule } from './history/history.module'; -import { LiveModule } from './live/live.module'; import { NgModule } from '@angular/core'; import { SharedModule } from './../shared/shared.module'; import { EdgeComponent } from './edge.component'; +import { HistoryModule } from './history/history.module'; +import { LiveModule } from './live/live.module'; @NgModule({ declarations: [ diff --git a/ui/src/app/edge/history/Controller/ChannelThreshold/flat/flat.html b/ui/src/app/edge/history/Controller/ChannelThreshold/flat/flat.html index 79d645191eb..17aa513987c 100644 --- a/ui/src/app/edge/history/Controller/ChannelThreshold/flat/flat.html +++ b/ui/src/app/edge/history/Controller/ChannelThreshold/flat/flat.html @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/Controller/ChannelThreshold/overview/overview.html b/ui/src/app/edge/history/Controller/ChannelThreshold/overview/overview.html index e761c780138..5c47abc06bf 100644 --- a/ui/src/app/edge/history/Controller/ChannelThreshold/overview/overview.html +++ b/ui/src/app/edge/history/Controller/ChannelThreshold/overview/overview.html @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/overview/overview.html b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/overview/overview.html index 370e95f0b7e..0c7ce394dd6 100644 --- a/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/overview/overview.html +++ b/ui/src/app/edge/history/Controller/Ess/GridoptimizedCharge/overview/overview.html @@ -1,5 +1,4 @@ - + diff --git a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/timeOfUseTariff.module.ts b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/timeOfUseTariff.module.ts index 16ac1004777..fbd0c4c0428 100644 --- a/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/timeOfUseTariff.module.ts +++ b/ui/src/app/edge/history/Controller/Ess/TimeOfUseTariff/timeOfUseTariff.module.ts @@ -1,9 +1,9 @@ import { NgModule } from "@angular/core"; import { BrowserModule } from "@angular/platform-browser"; import { SharedModule } from "src/app/shared/shared.module"; +import { ChartComponent } from "./chart/chart"; import { FlatComponent } from "./flat/flat"; import { OverviewComponent } from "./overview/overview"; -import { ChartComponent } from "./chart/chart"; @NgModule({ imports: [ diff --git a/ui/src/app/edge/history/abstracthistorychart.html b/ui/src/app/edge/history/abstracthistorychart.html index 086f2be9aff..b9b3c9edc7d 100644 --- a/ui/src/app/edge/history/abstracthistorychart.html +++ b/ui/src/app/edge/history/abstracthistorychart.html @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/abstracthistorychart.ts b/ui/src/app/edge/history/abstracthistorychart.ts index ed316c5f7b0..f1587b43962 100644 --- a/ui/src/app/edge/history/abstracthistorychart.ts +++ b/ui/src/app/edge/history/abstracthistorychart.ts @@ -2,6 +2,7 @@ import { TranslateService } from '@ngx-translate/core'; import * as Chart from 'chart.js'; import { AbstractHistoryChart as NewAbstractHistoryChart } from 'src/app/shared/components/chart/abstracthistorychart'; +import { ChartConstants, XAxisType } from 'src/app/shared/components/chart/chart.constants'; import { JsonrpcResponseError } from 'src/app/shared/jsonrpc/base'; import { QueryHistoricTimeseriesDataRequest } from "src/app/shared/jsonrpc/request/queryHistoricTimeseriesDataRequest"; import { QueryHistoricTimeseriesEnergyPerPeriodRequest } from 'src/app/shared/jsonrpc/request/queryHistoricTimeseriesEnergyPerPeriodRequest'; @@ -11,9 +12,7 @@ import { ChartAxis, HistoryUtils, Utils, YAxisTitle } from 'src/app/shared/servi import { ChannelAddress, Edge, EdgeConfig, Service } from 'src/app/shared/shared'; import { DateUtils } from 'src/app/shared/utils/date/dateutils'; import { DateTimeUtils } from 'src/app/shared/utils/datetime/datetime-utils'; - import { calculateResolution, ChronoUnit, DEFAULT_TIME_CHART_OPTIONS, EMPTY_DATASET, Resolution, setLabelVisible } from './shared'; -import { ChartConstants, XAxisType } from 'src/app/shared/components/chart/chart.constants'; // NOTE: Auto-refresh of widgets is currently disabled to reduce server load export abstract class AbstractHistoryChart { diff --git a/ui/src/app/edge/history/abstracthistorywidget.ts b/ui/src/app/edge/history/abstracthistorywidget.ts index 8f07ccf5cc4..22459c5a240 100644 --- a/ui/src/app/edge/history/abstracthistorywidget.ts +++ b/ui/src/app/edge/history/abstracthistorywidget.ts @@ -3,8 +3,8 @@ import { JsonrpcResponseError } from 'src/app/shared/jsonrpc/base'; import { QueryHistoricTimeseriesDataRequest } from 'src/app/shared/jsonrpc/request/queryHistoricTimeseriesDataRequest'; import { QueryHistoricTimeseriesDataResponse } from 'src/app/shared/jsonrpc/response/queryHistoricTimeseriesDataResponse'; import { ChannelAddress, Edge, EdgeConfig, Service } from 'src/app/shared/shared'; -import { calculateResolution } from './shared'; import { DateUtils } from 'src/app/shared/utils/date/dateutils'; +import { calculateResolution } from './shared'; // NOTE: Auto-refresh of widgets is currently disabled to reduce server load export abstract class AbstractHistoryWidget { diff --git a/ui/src/app/edge/history/chpsoc/chart.component.ts b/ui/src/app/edge/history/chpsoc/chart.component.ts index 3be26bf6160..56cf7403401 100644 --- a/ui/src/app/edge/history/chpsoc/chart.component.ts +++ b/ui/src/app/edge/history/chpsoc/chart.component.ts @@ -3,10 +3,9 @@ import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { DefaultTypes } from 'src/app/shared/service/defaulttypes'; - +import { YAxisTitle } from 'src/app/shared/service/utils'; import { ChannelAddress, Edge, EdgeConfig, Service } from '../../../shared/shared'; import { AbstractHistoryChart } from '../abstracthistorychart'; -import { YAxisTitle } from 'src/app/shared/service/utils'; @Component({ selector: 'chpsocchart', diff --git a/ui/src/app/edge/history/chpsoc/chpsocchartoverview/chpsocchartoverview.component.html b/ui/src/app/edge/history/chpsoc/chpsocchartoverview/chpsocchartoverview.component.html index 45e614e2e66..44ed82a5b13 100644 --- a/ui/src/app/edge/history/chpsoc/chpsocchartoverview/chpsocchartoverview.component.html +++ b/ui/src/app/edge/history/chpsoc/chpsocchartoverview/chpsocchartoverview.component.html @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/common/autarchy/Autarchy.ts b/ui/src/app/edge/history/common/autarchy/Autarchy.ts index 1407ff291e6..6b01e6b18fa 100644 --- a/ui/src/app/edge/history/common/autarchy/Autarchy.ts +++ b/ui/src/app/edge/history/common/autarchy/Autarchy.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { SharedModule } from 'src/app/shared/shared.module'; -import { FlatComponent } from './flat/flat'; import { ChartComponent } from './chart/chart'; +import { FlatComponent } from './flat/flat'; import { OverviewComponent } from './overview/overview'; @NgModule({ diff --git a/ui/src/app/edge/history/common/autarchy/flat/flat.html b/ui/src/app/edge/history/common/autarchy/flat/flat.html index e6e5fe45c4a..632cc21b2df 100644 --- a/ui/src/app/edge/history/common/autarchy/flat/flat.html +++ b/ui/src/app/edge/history/common/autarchy/flat/flat.html @@ -2,4 +2,4 @@ routerLink="/device/{{edge.id}}/history/autarchychart" *ngIf="isInitialized"> - \ No newline at end of file + diff --git a/ui/src/app/edge/history/common/autarchy/overview/overview.html b/ui/src/app/edge/history/common/autarchy/overview/overview.html index 6daae33cb38..63b79fdd217 100644 --- a/ui/src/app/edge/history/common/autarchy/overview/overview.html +++ b/ui/src/app/edge/history/common/autarchy/overview/overview.html @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/common/common.ts b/ui/src/app/edge/history/common/common.ts index 2dad8182fd7..c21e92b1a78 100644 --- a/ui/src/app/edge/history/common/common.ts +++ b/ui/src/app/edge/history/common/common.ts @@ -1,11 +1,10 @@ import { NgModule } from '@angular/core'; - import { Common_Autarchy } from './autarchy/Autarchy'; +import { Common_Consumption } from './consumption/Consumption'; import { CommonEnergyMonitor } from './energy/energy'; import { Common_Grid } from './grid/grid'; import { Common_Production } from './production/production'; import { Common_Selfconsumption } from './selfconsumption/SelfConsumption'; -import { Common_Consumption } from './consumption/Consumption'; @NgModule({ imports: [ diff --git a/ui/src/app/edge/history/common/consumption/chart/chart.constants.spec.ts b/ui/src/app/edge/history/common/consumption/chart/chart.constants.spec.ts index ef1030814ca..4793ffc4ded 100644 --- a/ui/src/app/edge/history/common/consumption/chart/chart.constants.spec.ts +++ b/ui/src/app/edge/history/common/consumption/chart/chart.constants.spec.ts @@ -1,9 +1,8 @@ import { DummyConfig } from "src/app/shared/components/edge/edgeconfig.spec"; import { OeTester } from "src/app/shared/components/shared/testing/common"; import { OeChartTester } from "src/app/shared/components/shared/testing/tester"; -import { EdgeConfig } from "src/app/shared/shared"; import { removeFunctions, TestContext } from "src/app/shared/components/shared/testing/utils.spec"; - +import { EdgeConfig } from "src/app/shared/shared"; import { ChartComponent } from "./chart"; export function expectView(config: EdgeConfig, testContext: TestContext, chartType: 'line' | 'bar', channels: OeTester.Types.Channels, view: OeChartTester.View): void { diff --git a/ui/src/app/edge/history/common/consumption/details/details.overview.html b/ui/src/app/edge/history/common/consumption/details/details.overview.html index c85fcf170b3..80ddb738d14 100644 --- a/ui/src/app/edge/history/common/consumption/details/details.overview.html +++ b/ui/src/app/edge/history/common/consumption/details/details.overview.html @@ -1,8 +1,9 @@ - + - - + + - + diff --git a/ui/src/app/edge/history/common/consumption/details/details.overview.ts b/ui/src/app/edge/history/common/consumption/details/details.overview.ts index f89f7186c13..74647b30812 100644 --- a/ui/src/app/edge/history/common/consumption/details/details.overview.ts +++ b/ui/src/app/edge/history/common/consumption/details/details.overview.ts @@ -28,7 +28,7 @@ export class DetailsOverviewComponent extends AbstractHistoryChartOverview { this.componentType = this.getComponentType(); this.service.getCurrentEdge().then(edge => { - if(!this.component) { + if (!this.component) { return; } @@ -47,7 +47,7 @@ export class DetailsOverviewComponent extends AbstractHistoryChartOverview { } private getComponentType(): typeof this.componentType { - if(!this.component) { + if (!this.component) { return null; } diff --git a/ui/src/app/edge/history/common/consumption/flat/flat.html b/ui/src/app/edge/history/common/consumption/flat/flat.html index 05eab4f6128..ac93f31a491 100644 --- a/ui/src/app/edge/history/common/consumption/flat/flat.html +++ b/ui/src/app/edge/history/common/consumption/flat/flat.html @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/common/consumption/overview/overview.html b/ui/src/app/edge/history/common/consumption/overview/overview.html index c7036474b77..02f12138d2e 100644 --- a/ui/src/app/edge/history/common/consumption/overview/overview.html +++ b/ui/src/app/edge/history/common/consumption/overview/overview.html @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/common/energy/chart/chart.constants.spec.ts b/ui/src/app/edge/history/common/energy/chart/chart.constants.spec.ts index b5d7a8fdae7..abaa914fefe 100644 --- a/ui/src/app/edge/history/common/energy/chart/chart.constants.spec.ts +++ b/ui/src/app/edge/history/common/energy/chart/chart.constants.spec.ts @@ -1,8 +1,7 @@ import { DummyConfig } from "src/app/shared/components/edge/edgeconfig.spec"; import { OeTester } from "src/app/shared/components/shared/testing/common"; -import { EdgeConfig } from "src/app/shared/shared"; import { removeFunctions, TestContext } from "src/app/shared/components/shared/testing/utils.spec"; - +import { EdgeConfig } from "src/app/shared/shared"; import { OeChartTester } from "../../../../../shared/components/shared/testing/tester"; import { ChartComponent } from "./chart"; diff --git a/ui/src/app/edge/history/common/energy/flat/flat.html b/ui/src/app/edge/history/common/energy/flat/flat.html index 94a5b9ea5be..9dd2bd9c078 100644 --- a/ui/src/app/edge/history/common/energy/flat/flat.html +++ b/ui/src/app/edge/history/common/energy/flat/flat.html @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/common/energy/flat/flat.ts b/ui/src/app/edge/history/common/energy/flat/flat.ts index 54cc70482c4..3e500cdd718 100644 --- a/ui/src/app/edge/history/common/energy/flat/flat.ts +++ b/ui/src/app/edge/history/common/energy/flat/flat.ts @@ -1,12 +1,12 @@ // @ts-strict-ignore import { Component } from '@angular/core'; -import { AbstractFlatWidget } from 'src/app/shared/components/flat/abstract-flat-widget'; -import { ChannelAddress, CurrentData, Utils } from '../../../../../shared/shared'; -import { Base64PayloadResponse } from 'src/app/shared/jsonrpc/response/base64PayloadResponse'; -import { QueryHistoricTimeseriesExportXlxsRequest } from 'src/app/shared/jsonrpc/request/queryHistoricTimeseriesExportXlxs'; -import { isSameDay, format, isSameMonth, isSameYear } from 'date-fns'; +import { format, isSameDay, isSameMonth, isSameYear } from 'date-fns'; import { saveAs } from 'file-saver-es'; import { AppService } from 'src/app/app.service'; +import { AbstractFlatWidget } from 'src/app/shared/components/flat/abstract-flat-widget'; +import { QueryHistoricTimeseriesExportXlxsRequest } from 'src/app/shared/jsonrpc/request/queryHistoricTimeseriesExportXlxs'; +import { Base64PayloadResponse } from 'src/app/shared/jsonrpc/response/base64PayloadResponse'; +import { ChannelAddress, CurrentData, Utils } from '../../../../../shared/shared'; @Component({ selector: 'energy', diff --git a/ui/src/app/edge/history/common/grid/flat/flat.html b/ui/src/app/edge/history/common/grid/flat/flat.html index b3b81f12c25..8a23fd9c1b3 100644 --- a/ui/src/app/edge/history/common/grid/flat/flat.html +++ b/ui/src/app/edge/history/common/grid/flat/flat.html @@ -1,16 +1,16 @@ - - - - - + [title]="'General.grid' | translate" *ngIf="isInitialized"> + + + + + - \ No newline at end of file + diff --git a/ui/src/app/edge/history/common/grid/grid.ts b/ui/src/app/edge/history/common/grid/grid.ts index 5b70f8b4edb..8e7d54bca35 100644 --- a/ui/src/app/edge/history/common/grid/grid.ts +++ b/ui/src/app/edge/history/common/grid/grid.ts @@ -1,13 +1,12 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; +import { FooterNavigationModule } from 'src/app/shared/components/footer/subnavigation/footerNavigation.module'; import { SharedModule } from 'src/app/shared/shared.module'; - import { ChartComponent } from './chart/chart'; import { ChartComponent as DetailsChartComponent } from './details/chart/chart'; +import { DetailsOverviewComponent } from './details/details.overview'; import { FlatComponent } from './flat/flat'; import { OverviewComponent } from './overview/overview'; -import { FooterNavigationModule } from 'src/app/shared/components/footer/subnavigation/footerNavigation.module'; -import { DetailsOverviewComponent } from './details/details.overview'; @NgModule({ imports: [ diff --git a/ui/src/app/edge/history/common/production/details/chart/productionMeter.spec.ts b/ui/src/app/edge/history/common/production/details/chart/productionMeter.spec.ts index 32c970e8387..5a4ab2d5393 100644 --- a/ui/src/app/edge/history/common/production/details/chart/productionMeter.spec.ts +++ b/ui/src/app/edge/history/common/production/details/chart/productionMeter.spec.ts @@ -1,4 +1,5 @@ // @ts-strict-ignore +import { ActivatedRoute } from "@angular/router"; import { DummyConfig } from "src/app/shared/components/edge/edgeconfig.spec"; import { OeTester } from "src/app/shared/components/shared/testing/common"; import { OeChartTester } from "src/app/shared/components/shared/testing/tester"; @@ -7,7 +8,6 @@ import { EdgeConfig } from "src/app/shared/shared"; import { DATA, LABELS } from "../../../energy/chart/chart.constants.spec"; import { History } from "./channels.spec"; import { ProductionMeterChartDetailsComponent } from "./productionMeter"; -import { ActivatedRoute } from "@angular/router"; describe('History Production Details - productionMeters', () => { const defaultEMS = DummyConfig.from( diff --git a/ui/src/app/edge/history/common/production/details/details.overview.html b/ui/src/app/edge/history/common/production/details/details.overview.html index e2a0122de97..1884e99ef81 100644 --- a/ui/src/app/edge/history/common/production/details/details.overview.html +++ b/ui/src/app/edge/history/common/production/details/details.overview.html @@ -3,8 +3,8 @@ - - + + - \ No newline at end of file + diff --git a/ui/src/app/edge/history/common/production/overview/overview.html b/ui/src/app/edge/history/common/production/overview/overview.html index e80f256eba4..d8c1d0c99cb 100644 --- a/ui/src/app/edge/history/common/production/overview/overview.html +++ b/ui/src/app/edge/history/common/production/overview/overview.html @@ -1,6 +1,6 @@ - - - + + + diff --git a/ui/src/app/edge/history/common/production/overview/overview.ts b/ui/src/app/edge/history/common/production/overview/overview.ts index 745d6ac0f81..7b6f24fff11 100644 --- a/ui/src/app/edge/history/common/production/overview/overview.ts +++ b/ui/src/app/edge/history/common/production/overview/overview.ts @@ -1,11 +1,10 @@ import { Component } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { ModalController } from '@ionic/angular'; +import { TranslateService } from '@ngx-translate/core'; import { NavigationOption } from 'src/app/shared/components/footer/subnavigation/footerNavigation'; - import { AbstractHistoryChartOverview } from '../../../../../shared/components/chart/abstractHistoryChartOverview'; import { ChannelAddress, EdgeConfig, Service } from '../../../../../shared/shared'; -import { TranslateService } from '@ngx-translate/core'; @Component({ templateUrl: './overview.html', diff --git a/ui/src/app/edge/history/common/selfconsumption/SelfConsumption.ts b/ui/src/app/edge/history/common/selfconsumption/SelfConsumption.ts index e67a47ad931..ec139b091f4 100644 --- a/ui/src/app/edge/history/common/selfconsumption/SelfConsumption.ts +++ b/ui/src/app/edge/history/common/selfconsumption/SelfConsumption.ts @@ -1,8 +1,8 @@ +import { NgModule } from "@angular/core"; import { BrowserModule } from "@angular/platform-browser"; import { SharedModule } from "src/app/shared/shared.module"; -import { FlatComponent } from "./flat/flat"; -import { NgModule } from "@angular/core"; import { ChartComponent } from "./chart/chart.component"; +import { FlatComponent } from "./flat/flat"; import { OverviewComponent } from "./overview/overview"; @NgModule({ diff --git a/ui/src/app/edge/history/common/selfconsumption/flat/flat.html b/ui/src/app/edge/history/common/selfconsumption/flat/flat.html index cafbdfaa75d..a3def18d075 100644 --- a/ui/src/app/edge/history/common/selfconsumption/flat/flat.html +++ b/ui/src/app/edge/history/common/selfconsumption/flat/flat.html @@ -2,4 +2,4 @@ button routerLink="/device/{{edge.id}}/history/selfconsumptionchart" *ngIf="isInitialized"> - \ No newline at end of file + diff --git a/ui/src/app/edge/history/common/selfconsumption/flat/flat.ts b/ui/src/app/edge/history/common/selfconsumption/flat/flat.ts index e818fc3005f..6d617da7808 100644 --- a/ui/src/app/edge/history/common/selfconsumption/flat/flat.ts +++ b/ui/src/app/edge/history/common/selfconsumption/flat/flat.ts @@ -1,7 +1,7 @@ // @ts-strict-ignore import { Component } from '@angular/core'; import { AbstractFlatWidget } from 'src/app/shared/components/flat/abstract-flat-widget'; -import { CurrentData, Utils, ChannelAddress } from 'src/app/shared/shared'; +import { ChannelAddress, CurrentData, Utils } from 'src/app/shared/shared'; @Component({ selector: 'selfconsumptionWidget', diff --git a/ui/src/app/edge/history/common/selfconsumption/overview/overview.html b/ui/src/app/edge/history/common/selfconsumption/overview/overview.html index 8100470a198..161f87a37fc 100644 --- a/ui/src/app/edge/history/common/selfconsumption/overview/overview.html +++ b/ui/src/app/edge/history/common/selfconsumption/overview/overview.html @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.html b/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.html index cedca95c96d..63997a1e1c5 100644 --- a/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.html +++ b/ui/src/app/edge/history/delayedselltogrid/symmetricpeakshavingchartoverview/delayedselltogridchartoverview.component.html @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/delayedselltogrid/widget.component.html b/ui/src/app/edge/history/delayedselltogrid/widget.component.html index e23f900e9f0..9850fcb7ddd 100644 --- a/ui/src/app/edge/history/delayedselltogrid/widget.component.html +++ b/ui/src/app/edge/history/delayedselltogrid/widget.component.html @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/delayedselltogrid/widget.component.ts b/ui/src/app/edge/history/delayedselltogrid/widget.component.ts index 5a537af8d69..a31ec5da133 100644 --- a/ui/src/app/edge/history/delayedselltogrid/widget.component.ts +++ b/ui/src/app/edge/history/delayedselltogrid/widget.component.ts @@ -1,7 +1,7 @@ -import { ActivatedRoute } from '@angular/router'; import { Component, Input, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { DefaultTypes } from 'src/app/shared/service/defaulttypes'; -import { Edge, Service, EdgeConfig } from 'src/app/shared/shared'; +import { Edge, EdgeConfig, Service } from 'src/app/shared/shared'; @Component({ selector: DelayedSellToGridWidgetComponent.SELECTOR, diff --git a/ui/src/app/edge/history/fixdigitaloutput/fixdigitaloutputchartoverview/fixdigitaloutputchartoverview.component.html b/ui/src/app/edge/history/fixdigitaloutput/fixdigitaloutputchartoverview/fixdigitaloutputchartoverview.component.html index 887b62548da..e516087b8b3 100644 --- a/ui/src/app/edge/history/fixdigitaloutput/fixdigitaloutputchartoverview/fixdigitaloutputchartoverview.component.html +++ b/ui/src/app/edge/history/fixdigitaloutput/fixdigitaloutputchartoverview/fixdigitaloutputchartoverview.component.html @@ -41,4 +41,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/fixdigitaloutput/widget.component.html b/ui/src/app/edge/history/fixdigitaloutput/widget.component.html index 6a243ca093c..fb8bf4bc466 100644 --- a/ui/src/app/edge/history/fixdigitaloutput/widget.component.html +++ b/ui/src/app/edge/history/fixdigitaloutput/widget.component.html @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/heatingelement/heatingelementchartoverview/heatingelementchartoverview.component.html b/ui/src/app/edge/history/heatingelement/heatingelementchartoverview/heatingelementchartoverview.component.html index bcfa40fc435..9b116e552fb 100644 --- a/ui/src/app/edge/history/heatingelement/heatingelementchartoverview/heatingelementchartoverview.component.html +++ b/ui/src/app/edge/history/heatingelement/heatingelementchartoverview/heatingelementchartoverview.component.html @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/heatingelement/widget.component.html b/ui/src/app/edge/history/heatingelement/widget.component.html index 4af8de75ce2..49b50bff319 100644 --- a/ui/src/app/edge/history/heatingelement/widget.component.html +++ b/ui/src/app/edge/history/heatingelement/widget.component.html @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.html b/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.html index a244ed42441..f8d4c9d4459 100644 --- a/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.html +++ b/ui/src/app/edge/history/heatpump/heatpumpchartoverview/heatpumpchartoverview.component.html @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/heatpump/widget.component.html b/ui/src/app/edge/history/heatpump/widget.component.html index b3537ee557c..c664db8d882 100644 --- a/ui/src/app/edge/history/heatpump/widget.component.html +++ b/ui/src/app/edge/history/heatpump/widget.component.html @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.html b/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.html index 25d95ace1ac..4c6ce917658 100644 --- a/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.html +++ b/ui/src/app/edge/history/peakshaving/asymmetric/asymmetricpeakshavingchartoverview/asymmetricpeakshavingchartoverview.component.html @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.html b/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.html index a2459516627..89e8082f29d 100644 --- a/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.html +++ b/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.html @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.ts b/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.ts index 85a4b2581e2..befb0fa19ef 100644 --- a/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.ts +++ b/ui/src/app/edge/history/peakshaving/asymmetric/widget.component.ts @@ -1,7 +1,7 @@ -import { ActivatedRoute } from '@angular/router'; import { Component, Input, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; import { DefaultTypes } from 'src/app/shared/service/defaulttypes'; -import { Edge, Service, EdgeConfig } from 'src/app/shared/shared'; +import { Edge, EdgeConfig, Service } from 'src/app/shared/shared'; @Component({ selector: AsymmetricPeakshavingWidgetComponent.SELECTOR, @@ -13,7 +13,6 @@ export class AsymmetricPeakshavingWidgetComponent implements OnInit { @Input({ required: true }) public period!: DefaultTypes.HistoryPeriod; @Input({ required: true }) public componentId!: string; - public edge: Edge | null = null; public component: EdgeConfig.Component | null = null; diff --git a/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.html b/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.html index 86c26ef7e42..278617c5783 100644 --- a/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.html +++ b/ui/src/app/edge/history/peakshaving/symmetric/symmetricpeakshavingchartoverview/symmetricpeakshavingchartoverview.component.html @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/peakshaving/symmetric/widget.component.html b/ui/src/app/edge/history/peakshaving/symmetric/widget.component.html index 23e49ec1b9f..dbf3842991d 100644 --- a/ui/src/app/edge/history/peakshaving/symmetric/widget.component.html +++ b/ui/src/app/edge/history/peakshaving/symmetric/widget.component.html @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/peakshaving/symmetric/widget.component.ts b/ui/src/app/edge/history/peakshaving/symmetric/widget.component.ts index 0ae228ca9f5..2a4a3720976 100644 --- a/ui/src/app/edge/history/peakshaving/symmetric/widget.component.ts +++ b/ui/src/app/edge/history/peakshaving/symmetric/widget.component.ts @@ -13,7 +13,6 @@ export class SymmetricPeakshavingWidgetComponent implements OnInit { @Input({ required: true }) public period!: DefaultTypes.HistoryPeriod; @Input({ required: true }) public componentId!: string; - public edge: Edge | null = null; public component: EdgeConfig.Component | null = null; diff --git a/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.html b/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.html index 3d253a4ca80..61e67f32806 100644 --- a/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.html +++ b/ui/src/app/edge/history/peakshaving/timeslot/timeslotpeakshavingchartoverview/timeslotpeakshavingchartoverview.component.html @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/peakshaving/timeslot/widget.component.html b/ui/src/app/edge/history/peakshaving/timeslot/widget.component.html index ea2fdd0d94a..912f7c07fc5 100644 --- a/ui/src/app/edge/history/peakshaving/timeslot/widget.component.html +++ b/ui/src/app/edge/history/peakshaving/timeslot/widget.component.html @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/peakshaving/timeslot/widget.component.ts b/ui/src/app/edge/history/peakshaving/timeslot/widget.component.ts index 6903d838553..a8748d264b0 100644 --- a/ui/src/app/edge/history/peakshaving/timeslot/widget.component.ts +++ b/ui/src/app/edge/history/peakshaving/timeslot/widget.component.ts @@ -13,7 +13,6 @@ export class TimeslotPeakshavingWidgetComponent implements OnInit { @Input({ required: true }) public period!: DefaultTypes.HistoryPeriod; @Input({ required: true }) public componentId!: string; - public edge: Edge | null = null; public component: EdgeConfig.Component | null = null; diff --git a/ui/src/app/edge/history/singlethreshold/widget.component.html b/ui/src/app/edge/history/singlethreshold/widget.component.html index 53e0a2d3687..a0d04bc95ca 100644 --- a/ui/src/app/edge/history/singlethreshold/widget.component.html +++ b/ui/src/app/edge/history/singlethreshold/widget.component.html @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html b/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html index 801f94f1d4b..749335aba84 100644 --- a/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html +++ b/ui/src/app/edge/history/storage/storagechartoverview/storagechartoverview.component.html @@ -150,4 +150,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/history/storage/widget.component.html b/ui/src/app/edge/history/storage/widget.component.html index fe64475d93c..79f3aaac4ce 100644 --- a/ui/src/app/edge/history/storage/widget.component.html +++ b/ui/src/app/edge/history/storage/widget.component.html @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Channelthreshold/Channelthreshold.html b/ui/src/app/edge/live/Controller/Channelthreshold/Channelthreshold.html index 677d4630fab..8cb74e66409 100644 --- a/ui/src/app/edge/live/Controller/Channelthreshold/Channelthreshold.html +++ b/ui/src/app/edge/live/Controller/Channelthreshold/Channelthreshold.html @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/ChpSoc/ChpSoc.html b/ui/src/app/edge/live/Controller/ChpSoc/ChpSoc.html index 751a66c868e..8dc374e330e 100644 --- a/ui/src/app/edge/live/Controller/ChpSoc/ChpSoc.html +++ b/ui/src/app/edge/live/Controller/ChpSoc/ChpSoc.html @@ -27,4 +27,4 @@ height="16" style="fill:blue" /> - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/ChpSoc/modal/modal.component.html b/ui/src/app/edge/live/Controller/ChpSoc/modal/modal.component.html index a1a9d050f1c..531dec7234d 100644 --- a/ui/src/app/edge/live/Controller/ChpSoc/modal/modal.component.html +++ b/ui/src/app/edge/live/Controller/ChpSoc/modal/modal.component.html @@ -103,4 +103,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Ess/FixActivePower/flat/flat.html b/ui/src/app/edge/live/Controller/Ess/FixActivePower/flat/flat.html index 55b1aa87dc2..61ce74a5bd8 100644 --- a/ui/src/app/edge/live/Controller/Ess/FixActivePower/flat/flat.html +++ b/ui/src/app/edge/live/Controller/Ess/FixActivePower/flat/flat.html @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Ess/FixActivePower/modal/modal.html b/ui/src/app/edge/live/Controller/Ess/FixActivePower/modal/modal.html index 98c41b705c5..78d026f8af5 100644 --- a/ui/src/app/edge/live/Controller/Ess/FixActivePower/modal/modal.html +++ b/ui/src/app/edge/live/Controller/Ess/FixActivePower/modal/modal.html @@ -31,4 +31,4 @@ [info]="('Edge.Index.Widgets.InfoStorageForCharge' | translate) + '. ' + ('Edge.Index.Widgets.InfoStorageForDischarge' | translate)"> - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/flat/flat.html b/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/flat/flat.html index d20fff09d10..3acb6e36570 100644 --- a/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/flat/flat.html +++ b/ui/src/app/edge/live/Controller/Ess/GridOptimizedCharge/flat/flat.html @@ -33,4 +33,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/Ess_TimeOfUseTariff.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/Ess_TimeOfUseTariff.ts index bb6eda0caa8..34ad15b24e1 100644 --- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/Ess_TimeOfUseTariff.ts +++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/Ess_TimeOfUseTariff.ts @@ -26,7 +26,20 @@ import { ScheduleStateAndPriceChartComponent } from "./modal/statePriceChart"; FlatComponent, ], }) -export class Controller_Ess_TimeOfUseTariff { +export class Controller_Ess_TimeOfUseTariff { } + +export namespace Controller_Ess_TimeOfUseTariff { + + export type ScheduleChartData = { + datasets: ChartDataset[], + colors: any[], + labels: Date[] + }; + + export enum ControlMode { + CHARGE_CONSUMPTION = 'CHARGE_CONSUMPTION', + DELAY_DISCHARGE = 'DELAY_DISCHARGE', + } /** * Gets the schedule chart data containing datasets, colors and labels. @@ -41,7 +54,7 @@ export class Controller_Ess_TimeOfUseTariff { * @param controlMode The Control mode of the controller. * @returns The ScheduleChartData. */ - public static getScheduleChartData(size: number, prices: number[], states: number[], timestamps: string[], + export function getScheduleChartData(size: number, prices: number[], states: number[], timestamps: string[], gridBuy: number[], socArray: number[], translate: TranslateService, controlMode: Controller_Ess_TimeOfUseTariff.ControlMode): Controller_Ess_TimeOfUseTariff.ScheduleChartData { @@ -152,16 +165,3 @@ export class Controller_Ess_TimeOfUseTariff { return scheduleChartData; } } - -export namespace Controller_Ess_TimeOfUseTariff { - export type ScheduleChartData = { - datasets: ChartDataset[], - colors: any[], - labels: Date[] - }; - - export enum ControlMode { - CHARGE_CONSUMPTION = 'CHARGE_CONSUMPTION', - DELAY_DISCHARGE = 'DELAY_DISCHARGE', - } -} diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/flat/flat.html b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/flat/flat.html index 4c9a749c8f7..25962cb6b4a 100644 --- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/flat/flat.html +++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/flat/flat.html @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts index 1c646bf9601..f28a7ee3b36 100644 --- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts +++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/powerSocChart.ts @@ -5,11 +5,10 @@ import { TranslateService } from '@ngx-translate/core'; import * as Chart from 'chart.js'; import { AbstractHistoryChart } from 'src/app/edge/history/abstracthistorychart'; import { AbstractHistoryChart as NewAbstractHistoryChart } from 'src/app/shared/components/chart/abstracthistorychart'; +import { ChartConstants } from 'src/app/shared/components/chart/chart.constants'; import { ComponentJsonApiRequest } from 'src/app/shared/jsonrpc/request/componentJsonApiRequest'; import { ChartAxis, HistoryUtils, TimeOfUseTariffUtils, Utils, YAxisTitle } from 'src/app/shared/service/utils'; import { ChannelAddress, Edge, EdgeConfig, Service, Websocket } from 'src/app/shared/shared'; - -import { ChartConstants } from 'src/app/shared/components/chart/chart.constants'; import { GetScheduleRequest } from '../../../../../../shared/jsonrpc/request/getScheduleRequest'; import { GetScheduleResponse } from '../../../../../../shared/jsonrpc/response/getScheduleResponse'; diff --git a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts index 51737b33769..a11644b8445 100644 --- a/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts +++ b/ui/src/app/edge/live/Controller/Ess/TimeOfUseTariff/modal/statePriceChart.ts @@ -10,11 +10,11 @@ import { ChartAxis, HistoryUtils, TimeOfUseTariffUtils, YAxisTitle } from 'src/a import { ChannelAddress, Currency, Edge, EdgeConfig, Service, Websocket } from 'src/app/shared/shared'; import { calculateResolution } from 'src/app/edge/history/shared'; +import { ChartConstants } from 'src/app/shared/components/chart/chart.constants'; import { ColorUtils } from 'src/app/shared/utils/color/color.utils'; import { GetScheduleRequest } from '../../../../../../shared/jsonrpc/request/getScheduleRequest'; import { GetScheduleResponse } from '../../../../../../shared/jsonrpc/response/getScheduleResponse'; import { Controller_Ess_TimeOfUseTariff } from '../Ess_TimeOfUseTariff'; -import { ChartConstants } from 'src/app/shared/components/chart/chart.constants'; @Component({ selector: 'statePriceChart', diff --git a/ui/src/app/edge/live/Controller/Evcs/administration/administration.component.html b/ui/src/app/edge/live/Controller/Evcs/administration/administration.component.html index ac292531413..6d2c10d1903 100644 --- a/ui/src/app/edge/live/Controller/Evcs/administration/administration.component.html +++ b/ui/src/app/edge/live/Controller/Evcs/administration/administration.component.html @@ -32,4 +32,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Evcs/modal/modal.html b/ui/src/app/edge/live/Controller/Evcs/modal/modal.html index 8c8c836f943..da7866b9130 100644 --- a/ui/src/app/edge/live/Controller/Evcs/modal/modal.html +++ b/ui/src/app/edge/live/Controller/Evcs/modal/modal.html @@ -154,4 +154,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Evcs/popover/popover.html b/ui/src/app/edge/live/Controller/Evcs/popover/popover.html index 3e284d228be..428cef4b69a 100644 --- a/ui/src/app/edge/live/Controller/Evcs/popover/popover.html +++ b/ui/src/app/edge/live/Controller/Evcs/popover/popover.html @@ -26,4 +26,4 @@ style="text-align: center"> - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/Io_FixDigitalOutput.html b/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/Io_FixDigitalOutput.html index b11e04690a6..6a40da4eee7 100644 --- a/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/Io_FixDigitalOutput.html +++ b/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/Io_FixDigitalOutput.html @@ -2,4 +2,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/modal/modal.component.html b/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/modal/modal.component.html index edbd3cb1964..2fd0e5ba02f 100644 --- a/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/modal/modal.component.html +++ b/ui/src/app/edge/live/Controller/Io/FixDigitalOutput/modal/modal.component.html @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Io/HeatingElement/flat/flat.html b/ui/src/app/edge/live/Controller/Io/HeatingElement/flat/flat.html index 3f6ebad1873..f2440c4a5d5 100644 --- a/ui/src/app/edge/live/Controller/Io/HeatingElement/flat/flat.html +++ b/ui/src/app/edge/live/Controller/Io/HeatingElement/flat/flat.html @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Io/HeatingElement/modal/modal.html b/ui/src/app/edge/live/Controller/Io/HeatingElement/modal/modal.html index f83d0dc6aef..3a8e729979e 100644 --- a/ui/src/app/edge/live/Controller/Io/HeatingElement/modal/modal.html +++ b/ui/src/app/edge/live/Controller/Io/HeatingElement/modal/modal.html @@ -75,4 +75,4 @@ [formGroup]="formGroup"> - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Io/Heatpump/Io_Heatpump.html b/ui/src/app/edge/live/Controller/Io/Heatpump/Io_Heatpump.html index 95f97d5a51c..c0ade929d82 100644 --- a/ui/src/app/edge/live/Controller/Io/Heatpump/Io_Heatpump.html +++ b/ui/src/app/edge/live/Controller/Io/Heatpump/Io_Heatpump.html @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.html b/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.html index eb3859cf803..59063fd023e 100644 --- a/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.html +++ b/ui/src/app/edge/live/Controller/Io/Heatpump/modal/modal.component.html @@ -278,4 +278,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/Asymmetric.html b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/Asymmetric.html index c6780f64a77..9f457005bed 100644 --- a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/Asymmetric.html +++ b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/Asymmetric.html @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.html b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.html index a25fdfa4fce..ebcb86c320f 100644 --- a/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.html +++ b/ui/src/app/edge/live/Controller/PeakShaving/Asymmetric/modal/modal.component.html @@ -121,4 +121,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/Symmetric.html b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/Symmetric.html index f5b77fe7087..1ae94833bb1 100644 --- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/Symmetric.html +++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/Symmetric.html @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.html b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.html index 4597da00889..fabeafa884e 100644 --- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.html +++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric/modal/modal.component.html @@ -71,4 +71,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/Symmetric_TimeSlot.html b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/Symmetric_TimeSlot.html index 59ae34dcc6a..20ba62c9fe4 100644 --- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/Symmetric_TimeSlot.html +++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/Symmetric_TimeSlot.html @@ -5,4 +5,4 @@ [converter]="CONVERT_WATT_TO_KILOWATT" [value]="peakShavingPower"> - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.html b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.html index 53301087624..a143c88db41 100644 --- a/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.html +++ b/ui/src/app/edge/live/Controller/PeakShaving/Symmetric_TimeSlot/modal/modal.component.html @@ -207,4 +207,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Io/Api_DigitalInput/Io_Api_DigitalInput.html b/ui/src/app/edge/live/Io/Api_DigitalInput/Io_Api_DigitalInput.html index bad2fcee243..b3c997ef533 100644 --- a/ui/src/app/edge/live/Io/Api_DigitalInput/Io_Api_DigitalInput.html +++ b/ui/src/app/edge/live/Io/Api_DigitalInput/Io_Api_DigitalInput.html @@ -2,4 +2,4 @@ [icon]="{name: 'radio-button-off-outline', color: 'dark'}"> - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Io/Api_DigitalInput/modal/modal.component.ts b/ui/src/app/edge/live/Io/Api_DigitalInput/modal/modal.component.ts index 5169a6f4ae5..fe0490cb871 100644 --- a/ui/src/app/edge/live/Io/Api_DigitalInput/modal/modal.component.ts +++ b/ui/src/app/edge/live/Io/Api_DigitalInput/modal/modal.component.ts @@ -1,10 +1,10 @@ // @ts-strict-ignore import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { Edge, Service, EdgeConfig, Websocket, ChannelAddress, EdgePermission } from '../../../../../shared/shared'; import { ModalController } from '@ionic/angular'; -import { Channel } from 'src/app/shared/jsonrpc/response/getChannelsOfComponentResponse'; -import { ComponentJsonApiRequest } from 'src/app/shared/jsonrpc/request/componentJsonApiRequest'; import { JsonrpcRequest, JsonrpcResponseSuccess } from 'src/app/shared/jsonrpc/base'; +import { ComponentJsonApiRequest } from 'src/app/shared/jsonrpc/request/componentJsonApiRequest'; +import { Channel } from 'src/app/shared/jsonrpc/response/getChannelsOfComponentResponse'; +import { ChannelAddress, Edge, EdgeConfig, EdgePermission, Service, Websocket } from '../../../../../shared/shared'; @Component({ selector: 'Io_Api_DigitalInputModal', diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html index da1d7b2a74a..7743c265a65 100644 --- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html +++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/Evcs_Api_Cluster.html @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart.html b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart.html index 7c11c16ed1a..dea298a6b67 100644 --- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart.html +++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart.html @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart.ts b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart.ts index fec7d8e1ebb..426c5ad9ec5 100644 --- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart.ts +++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart.ts @@ -1,11 +1,11 @@ // @ts-strict-ignore -import * as Chart from 'chart.js'; -import { Component, Input, OnInit, OnChanges } from '@angular/core'; -import { CurrentData } from 'src/app/shared/components/edge/currentdata'; -import { Data } from 'src/app/edge/history/shared'; -import { EdgeConfig, Edge } from 'src/app/shared/shared'; +import { Component, Input, OnChanges, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { TranslateService } from '@ngx-translate/core'; +import * as Chart from 'chart.js'; +import { Data } from 'src/app/edge/history/shared'; +import { CurrentData } from 'src/app/shared/components/edge/currentdata'; +import { Edge, EdgeConfig } from 'src/app/shared/shared'; @Component({ selector: EvcsChartComponent.SELECTOR, diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.html b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.html index 4d5e81a8835..e73fe3f8906 100644 --- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.html +++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.html @@ -327,4 +327,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.ts b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.ts index 13b2dfaeb2d..219e685ada7 100644 --- a/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.ts +++ b/ui/src/app/edge/live/Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page.ts @@ -1,9 +1,9 @@ // @ts-strict-ignore -import { ActivatedRoute, Router } from '@angular/router'; import { Component, Input, OnInit, ViewChild } from '@angular/core'; -import { Edge, EdgeConfig, Service, Websocket } from 'src/app/shared/shared'; +import { ActivatedRoute, Router } from '@angular/router'; import { IonReorderGroup, ModalController } from '@ionic/angular'; import { TranslateService } from '@ngx-translate/core'; +import { Edge, EdgeConfig, Service, Websocket } from 'src/app/shared/shared'; type ChargeMode = 'FORCE_CHARGE' | 'EXCESS_POWER'; type Priority = 'CAR' | 'STORAGE'; diff --git a/ui/src/app/edge/live/common/autarchy/flat/flat.html b/ui/src/app/edge/live/common/autarchy/flat/flat.html index 6ad3ab9290a..1b425accf5e 100644 --- a/ui/src/app/edge/live/common/autarchy/flat/flat.html +++ b/ui/src/app/edge/live/common/autarchy/flat/flat.html @@ -4,4 +4,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/common/consumption/flat/flat.html b/ui/src/app/edge/live/common/consumption/flat/flat.html index 4ac5da6b99d..761302becfe 100644 --- a/ui/src/app/edge/live/common/consumption/flat/flat.html +++ b/ui/src/app/edge/live/common/consumption/flat/flat.html @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/common/grid/flat/flat.html b/ui/src/app/edge/live/common/grid/flat/flat.html index 9c330d1db35..0005f51617a 100644 --- a/ui/src/app/edge/live/common/grid/flat/flat.html +++ b/ui/src/app/edge/live/common/grid/flat/flat.html @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/common/production/flat/flat.html b/ui/src/app/edge/live/common/production/flat/flat.html index 3f5ed5d187b..77b660e2749 100644 --- a/ui/src/app/edge/live/common/production/flat/flat.html +++ b/ui/src/app/edge/live/common/production/flat/flat.html @@ -10,4 +10,4 @@ [converter]="CONVERT_WATT_TO_KILOWATT"> - \ No newline at end of file + diff --git a/ui/src/app/edge/live/common/production/flat/flat.ts b/ui/src/app/edge/live/common/production/flat/flat.ts index c0459210a0c..8141104ce0c 100644 --- a/ui/src/app/edge/live/common/production/flat/flat.ts +++ b/ui/src/app/edge/live/common/production/flat/flat.ts @@ -1,6 +1,6 @@ -import { EdgeConfig, Utils } from 'src/app/shared/shared'; import { Component } from '@angular/core'; import { AbstractFlatWidget } from 'src/app/shared/components/flat/abstract-flat-widget'; +import { EdgeConfig, Utils } from 'src/app/shared/shared'; import { ModalComponent } from '../modal/modal'; @Component({ diff --git a/ui/src/app/edge/live/common/production/modal/modal.html b/ui/src/app/edge/live/common/production/modal/modal.html index e48c4cf52f6..81848b9b156 100644 --- a/ui/src/app/edge/live/common/production/modal/modal.html +++ b/ui/src/app/edge/live/common/production/modal/modal.html @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/common/selfconsumption/flat/flat.html b/ui/src/app/edge/live/common/selfconsumption/flat/flat.html index d013066fd28..87d7e770b3e 100644 --- a/ui/src/app/edge/live/common/selfconsumption/flat/flat.html +++ b/ui/src/app/edge/live/common/selfconsumption/flat/flat.html @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/common/storage/storage.component.html b/ui/src/app/edge/live/common/storage/storage.component.html index 13715f5e0ca..ad219c8d17f 100644 --- a/ui/src/app/edge/live/common/storage/storage.component.html +++ b/ui/src/app/edge/live/common/storage/storage.component.html @@ -60,4 +60,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/delayedselltogrid/delayedselltogrid.component.html b/ui/src/app/edge/live/delayedselltogrid/delayedselltogrid.component.html index 10874fd1d55..352d15d1357 100644 --- a/ui/src/app/edge/live/delayedselltogrid/delayedselltogrid.component.html +++ b/ui/src/app/edge/live/delayedselltogrid/delayedselltogrid.component.html @@ -25,4 +25,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.html b/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.html index a439486f2c1..0327fd96b05 100644 --- a/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.html +++ b/ui/src/app/edge/live/delayedselltogrid/modal/modal.component.html @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/energymonitor/chart/chart.component.html b/ui/src/app/edge/live/energymonitor/chart/chart.component.html index f1a4f537a10..c2eddea61c8 100644 --- a/ui/src/app/edge/live/energymonitor/chart/chart.component.html +++ b/ui/src/app/edge/live/energymonitor/chart/chart.component.html @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/energymonitor/chart/section/abstractsection.component.ts b/ui/src/app/edge/live/energymonitor/chart/section/abstractsection.component.ts index 869a8d30bf9..047bdff0e4d 100644 --- a/ui/src/app/edge/live/energymonitor/chart/section/abstractsection.component.ts +++ b/ui/src/app/edge/live/energymonitor/chart/section/abstractsection.component.ts @@ -1,8 +1,8 @@ // @ts-strict-ignore -import { DefaultTypes } from '../../../../../shared/service/defaulttypes'; -import { GridMode, Service } from 'src/app/shared/shared'; import { TranslateService } from '@ngx-translate/core'; import * as d3 from 'd3'; +import { GridMode, Service } from 'src/app/shared/shared'; +import { DefaultTypes } from '../../../../../shared/service/defaulttypes'; export type Ratio = 'Only Positive [0,1]' | 'Negative and Positive [-1,1]'; diff --git a/ui/src/app/edge/live/energymonitor/chart/section/consumption.component.html b/ui/src/app/edge/live/energymonitor/chart/section/consumption.component.html index 3d3d27d3451..fdef929c624 100644 --- a/ui/src/app/edge/live/energymonitor/chart/section/consumption.component.html +++ b/ui/src/app/edge/live/energymonitor/chart/section/consumption.component.html @@ -23,4 +23,4 @@ [attr.width]="square.image.length" [attr.height]="square.image.length" [attr.href]="square.image.image + '#root'"> - \ No newline at end of file + diff --git a/ui/src/app/edge/live/energymonitor/chart/section/grid.component.html b/ui/src/app/edge/live/energymonitor/chart/section/grid.component.html index 3d84fdbbdb2..d35a089e698 100644 --- a/ui/src/app/edge/live/energymonitor/chart/section/grid.component.html +++ b/ui/src/app/edge/live/energymonitor/chart/section/grid.component.html @@ -29,4 +29,4 @@ [attr.width]="square.image.length" [attr.height]="square.image.length" [attr.href]="square.image.image + '#root'"> - \ No newline at end of file + diff --git a/ui/src/app/edge/live/energymonitor/chart/section/production.component.html b/ui/src/app/edge/live/energymonitor/chart/section/production.component.html index 28d77c53120..520a36472ff 100644 --- a/ui/src/app/edge/live/energymonitor/chart/section/production.component.html +++ b/ui/src/app/edge/live/energymonitor/chart/section/production.component.html @@ -23,4 +23,4 @@ [attr.width]="square.image.length" [attr.height]="square.image.length" [attr.href]="square.image.image + '#root'"> - \ No newline at end of file + diff --git a/ui/src/app/edge/live/energymonitor/chart/section/storage.component.html b/ui/src/app/edge/live/energymonitor/chart/section/storage.component.html index 9fd35bf0f26..266ac898342 100644 --- a/ui/src/app/edge/live/energymonitor/chart/section/storage.component.html +++ b/ui/src/app/edge/live/energymonitor/chart/section/storage.component.html @@ -29,4 +29,4 @@ [attr.y]="square.image.y" [attr.width]="square.image.length" [attr.height]="square.image.length" [attr.href]="square.image.image + '#root'"> - \ No newline at end of file + diff --git a/ui/src/app/edge/live/energymonitor/energymonitor.component.html b/ui/src/app/edge/live/energymonitor/energymonitor.component.html index f7c1e05e63a..779a8c37cc4 100644 --- a/ui/src/app/edge/live/energymonitor/energymonitor.component.html +++ b/ui/src/app/edge/live/energymonitor/energymonitor.component.html @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/energymonitor/energymonitor.module.ts b/ui/src/app/edge/live/energymonitor/energymonitor.module.ts index ac7eb9461f4..1939bbf9d45 100644 --- a/ui/src/app/edge/live/energymonitor/energymonitor.module.ts +++ b/ui/src/app/edge/live/energymonitor/energymonitor.module.ts @@ -1,14 +1,13 @@ -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { SharedModule } from './../../../shared/shared.module'; - -import { ConsumptionSectionComponent } from './chart/section/consumption.component'; import { EnergymonitorChartComponent } from './chart/chart.component'; -import { EnergymonitorComponent } from './energymonitor.component'; +import { ConsumptionSectionComponent } from './chart/section/consumption.component'; import { GridSectionComponent } from './chart/section/grid.component'; import { ProductionSectionComponent } from './chart/section/production.component'; import { StorageSectionComponent } from './chart/section/storage.component'; +import { EnergymonitorComponent } from './energymonitor.component'; @NgModule({ imports: [ diff --git a/ui/src/app/edge/live/info/info.component.html b/ui/src/app/edge/live/info/info.component.html index 2e49a4083b3..47687b987ab 100644 --- a/ui/src/app/edge/live/info/info.component.html +++ b/ui/src/app/edge/live/info/info.component.html @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/live.component.html b/ui/src/app/edge/live/live.component.html index e771887a085..bef5c983782 100644 --- a/ui/src/app/edge/live/live.component.html +++ b/ui/src/app/edge/live/live.component.html @@ -44,7 +44,6 @@ - @@ -57,7 +56,6 @@ *ngIf="factoryId !== 'Evcs.Cluster.PeakShaving' && factoryId !== 'Evcs.Cluster.SelfConsumption'"> - @@ -159,4 +157,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/live/live.module.ts b/ui/src/app/edge/live/live.module.ts index 62c2a8b672e..a21b0b2caae 100644 --- a/ui/src/app/edge/live/live.module.ts +++ b/ui/src/app/edge/live/live.module.ts @@ -16,6 +16,7 @@ import { Controller_Ess_FixActivePower } from './Controller/Ess/FixActivePower/E import { Controller_Ess_GridOptimizedCharge } from './Controller/Ess/GridOptimizedCharge/Ess_GridOptimizedCharge'; import { Controller_Ess_TimeOfUseTariff } from './Controller/Ess/TimeOfUseTariff/Ess_TimeOfUseTariff'; import { AdministrationComponent } from './Controller/Evcs/administration/administration.component'; +import { Controller_Evcs } from './Controller/Evcs/Evcs'; import { Controller_Io_ChannelSingleThresholdComponent } from './Controller/Io/ChannelSingleThreshold/Io_ChannelSingleThreshold'; import { Controller_Io_ChannelSingleThresholdModalComponent } from './Controller/Io/ChannelSingleThreshold/modal/modal.component'; import { Controller_Io_FixDigitalOutputComponent } from './Controller/Io/FixDigitalOutput/Io_FixDigitalOutput'; @@ -40,7 +41,6 @@ import { Evcs_Api_ClusterComponent } from './Multiple/Evcs_Api_Cluster/Evcs_Api_ import { EvcsChartComponent } from './Multiple/Evcs_Api_Cluster/modal/evcs-chart/evcs.chart'; import { Evcs_Api_ClusterModalComponent } from './Multiple/Evcs_Api_Cluster/modal/evcsCluster-modal.page'; import { OfflineComponent } from './offline/offline.component'; -import { Controller_Evcs } from './Controller/Evcs/Evcs'; @NgModule({ imports: [ diff --git a/ui/src/app/edge/live/livedataservice.ts b/ui/src/app/edge/live/livedataservice.ts index 268b392bf72..3bcde8edb9c 100644 --- a/ui/src/app/edge/live/livedataservice.ts +++ b/ui/src/app/edge/live/livedataservice.ts @@ -1,11 +1,10 @@ // @ts-strict-ignore import { Directive, Inject, OnDestroy } from "@angular/core"; +import { RefresherCustomEvent } from "@ionic/angular"; import { takeUntil } from "rxjs/operators"; import { v4 as uuidv4 } from 'uuid'; - import { DataService } from "../../shared/components/shared/dataservice"; import { ChannelAddress, Edge, Service, Websocket } from "../../shared/shared"; -import { RefresherCustomEvent } from "@ionic/angular"; @Directive() export class LiveDataService extends DataService implements OnDestroy { diff --git a/ui/src/app/edge/settings/app/app.module.ts b/ui/src/app/edge/settings/app/app.module.ts index 3b12184a7ed..932b021cfa7 100644 --- a/ui/src/app/edge/settings/app/app.module.ts +++ b/ui/src/app/edge/settings/app/app.module.ts @@ -1,20 +1,20 @@ // @ts-strict-ignore import { NgModule } from '@angular/core'; -import { SharedModule } from 'src/app/shared/shared.module'; -import { InstallAppComponent } from './install.component'; -import { IndexComponent } from './index.component'; -import { SingleAppComponent } from './single.component'; -import { UpdateAppComponent } from './update.component'; -import { KeyModalComponent } from './keypopup/modal.component'; import { FormControl, ValidationErrors } from '@angular/forms'; -import { FormlyModule, FORMLY_CONFIG } from '@ngx-formly/core'; +import { FORMLY_CONFIG, FormlyModule } from '@ngx-formly/core'; import { TranslateService } from '@ngx-translate/core'; -import { FormlySafeInputModalComponent } from './formly/safe-input/formly-safe-input-modal.component'; -import { FormlySafeInputWrapperComponent } from './formly/safe-input/formly-safe-input.extended'; +import { SharedModule } from 'src/app/shared/shared.module'; import { FormlyTextComponent } from './formly/formly-text'; import { FormlyInputWithUnitComponent } from './formly/input-with-unit'; import { FormlyOptionGroupPickerComponent } from './formly/option-group-picker/formly-option-group-picker.component'; import { FormlyReorderArrayComponent } from './formly/reorder-select/formly-reorder-array.component'; +import { FormlySafeInputModalComponent } from './formly/safe-input/formly-safe-input-modal.component'; +import { FormlySafeInputWrapperComponent } from './formly/safe-input/formly-safe-input.extended'; +import { IndexComponent } from './index.component'; +import { InstallAppComponent } from './install.component'; +import { KeyModalComponent } from './keypopup/modal.component'; +import { SingleAppComponent } from './single.component'; +import { UpdateAppComponent } from './update.component'; export function KeyValidator(control: FormControl): ValidationErrors { return /^(.{4}-){3}.{4}$/.test(control.value) ? null : { 'key': true }; diff --git a/ui/src/app/edge/settings/app/formly/formly-text.ts b/ui/src/app/edge/settings/app/formly/formly-text.ts index 6e206169d13..ff08690c381 100644 --- a/ui/src/app/edge/settings/app/formly/formly-text.ts +++ b/ui/src/app/edge/settings/app/formly/formly-text.ts @@ -11,7 +11,7 @@ import { FieldType, FieldTypeConfig } from "@ngx-formly/core"; `, encapsulation: ViewEncapsulation.None, }) -export class FormlyTextComponent extends FieldType { +export class FormlyTextComponent extends FieldType { constructor( ) { diff --git a/ui/src/app/edge/settings/app/formly/option-group-picker/formly-option-group-picker.component.html b/ui/src/app/edge/settings/app/formly/option-group-picker/formly-option-group-picker.component.html index 4b291de45e1..3919cd33ff9 100644 --- a/ui/src/app/edge/settings/app/formly/option-group-picker/formly-option-group-picker.component.html +++ b/ui/src/app/edge/settings/app/formly/option-group-picker/formly-option-group-picker.component.html @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/app/formly/option-group-picker/formly-option-group-picker.component.ts b/ui/src/app/edge/settings/app/formly/option-group-picker/formly-option-group-picker.component.ts index b707644d911..ce5b702e4b1 100644 --- a/ui/src/app/edge/settings/app/formly/option-group-picker/formly-option-group-picker.component.ts +++ b/ui/src/app/edge/settings/app/formly/option-group-picker/formly-option-group-picker.component.ts @@ -1,7 +1,7 @@ // @ts-strict-ignore import { Component, OnInit } from "@angular/core"; import { FieldType, FieldTypeConfig, FormlyFieldConfig } from "@ngx-formly/core"; -import { OptionGroup, OptionGroupConfig, Option, getTitleFromOptionConfig } from "./optionGroupPickerConfiguration"; +import { Option, OptionGroup, OptionGroupConfig, getTitleFromOptionConfig } from "./optionGroupPickerConfiguration"; @Component({ selector: 'formly-option-group-picker', diff --git a/ui/src/app/edge/settings/app/formly/reorder-select/formly-reorder-array.component.html b/ui/src/app/edge/settings/app/formly/reorder-select/formly-reorder-array.component.html index 61f3a2ecd8c..16c3d0ff194 100644 --- a/ui/src/app/edge/settings/app/formly/reorder-select/formly-reorder-array.component.html +++ b/ui/src/app/edge/settings/app/formly/reorder-select/formly-reorder-array.component.html @@ -41,4 +41,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input-modal.component.html b/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input-modal.component.html index 9415c5a3319..56855d3e69d 100644 --- a/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input-modal.component.html +++ b/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input-modal.component.html @@ -36,4 +36,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input.extended.html b/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input.extended.html index 58d5124f8b3..08481c07142 100644 --- a/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input.extended.html +++ b/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input.extended.html @@ -22,4 +22,4 @@

- \ No newline at end of file + diff --git a/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input.extended.ts b/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input.extended.ts index 32aae50bfda..c0c55317216 100644 --- a/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input.extended.ts +++ b/ui/src/app/edge/settings/app/formly/safe-input/formly-safe-input.extended.ts @@ -2,9 +2,9 @@ import { Component, OnInit } from "@angular/core"; import { ModalController } from "@ionic/angular"; import { FieldWrapper, FormlyFieldConfig } from "@ngx-formly/core"; -import { FormlySafeInputModalComponent } from "./formly-safe-input-modal.component"; import { GetAppAssistant } from "../../jsonrpc/getAppAssistant"; import { OptionGroupConfig, getTitleFromOptionConfig } from "../option-group-picker/optionGroupPickerConfiguration"; +import { FormlySafeInputModalComponent } from "./formly-safe-input-modal.component"; @Component({ selector: 'formly-safe-input-wrapper', diff --git a/ui/src/app/edge/settings/app/index.component.ts b/ui/src/app/edge/settings/app/index.component.ts index 02051b79b30..328e4f384f5 100644 --- a/ui/src/app/edge/settings/app/index.component.ts +++ b/ui/src/app/edge/settings/app/index.component.ts @@ -10,16 +10,16 @@ import { Role } from 'src/app/shared/type/role'; import { Environment, environment } from 'src/environments'; import { Edge, Service, Websocket } from '../../../shared/shared'; import { ExecuteSystemUpdate } from '../system/executeSystemUpdate'; +import { InstallAppComponent } from './install.component'; +import { Flags } from './jsonrpc/flag/flags'; import { GetApps } from './jsonrpc/getApps'; +import { App } from './keypopup/app'; import { AppCenter } from './keypopup/appCenter'; import { AppCenterGetPossibleApps } from './keypopup/appCenterGetPossibleApps'; +import { AppCenterGetRegisteredKeys } from './keypopup/appCenterGetRegisteredKeys'; import { Key } from './keypopup/key'; import { KeyModalComponent, KeyValidationBehaviour } from './keypopup/modal.component'; import { canEnterKey } from './permissions'; -import { Flags } from './jsonrpc/flag/flags'; -import { App } from './keypopup/app'; -import { InstallAppComponent } from './install.component'; -import { AppCenterGetRegisteredKeys } from './keypopup/appCenterGetRegisteredKeys'; @Component({ selector: IndexComponent.SELECTOR, diff --git a/ui/src/app/edge/settings/app/install.component.html b/ui/src/app/edge/settings/app/install.component.html index 92b8960b12f..2418d652e3a 100644 --- a/ui/src/app/edge/settings/app/install.component.html +++ b/ui/src/app/edge/settings/app/install.component.html @@ -27,4 +27,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/app/jsonrpc/getAppAssistant.spec.ts b/ui/src/app/edge/settings/app/jsonrpc/getAppAssistant.spec.ts index d6cb07561a0..28dbc11b1b0 100644 --- a/ui/src/app/edge/settings/app/jsonrpc/getAppAssistant.spec.ts +++ b/ui/src/app/edge/settings/app/jsonrpc/getAppAssistant.spec.ts @@ -1,6 +1,6 @@ // @ts-strict-ignore -import { GetAppAssistant } from "./getAppAssistant"; import { FormlyFieldConfig } from "@ngx-formly/core"; +import { GetAppAssistant } from "./getAppAssistant"; describe('GetAppAssistant', () => { let fields: FormlyFieldConfig[]; diff --git a/ui/src/app/edge/settings/app/keypopup/modal.component.html b/ui/src/app/edge/settings/app/keypopup/modal.component.html index 9e2ede39af0..ea56ffdf288 100644 --- a/ui/src/app/edge/settings/app/keypopup/modal.component.html +++ b/ui/src/app/edge/settings/app/keypopup/modal.component.html @@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/app/keypopup/modal.component.ts b/ui/src/app/edge/settings/app/keypopup/modal.component.ts index 211f1f1a1b1..e8a3e2847b4 100644 --- a/ui/src/app/edge/settings/app/keypopup/modal.component.ts +++ b/ui/src/app/edge/settings/app/keypopup/modal.component.ts @@ -7,14 +7,14 @@ import { FormlyFieldConfig, FormlyFormOptions } from '@ngx-formly/core'; import { TranslateService } from '@ngx-translate/core'; import { Edge, Service, Websocket } from 'src/app/shared/shared'; import { environment } from 'src/environments'; +import { Flags } from '../jsonrpc/flag/flags'; import { GetApps } from '../jsonrpc/getApps'; +import { hasPredefinedKey } from '../permissions'; import { AppCenter } from './appCenter'; import { AppCenterAddRegisterKeyHistory } from './appCenterAddRegisterKeyHistory'; import { AppCenterGetRegisteredKeys } from './appCenterGetRegisteredKeys'; import { AppCenterIsKeyApplicable } from './appCenterIsKeyApplicable'; import { Key } from './key'; -import { Flags } from '../jsonrpc/flag/flags'; -import { hasPredefinedKey } from '../permissions'; @Component({ selector: KeyModalComponent.SELECTOR, diff --git a/ui/src/app/edge/settings/app/single.component.html b/ui/src/app/edge/settings/app/single.component.html index 5234280d784..465413bd056 100644 --- a/ui/src/app/edge/settings/app/single.component.html +++ b/ui/src/app/edge/settings/app/single.component.html @@ -55,4 +55,4 @@

- \ No newline at end of file + diff --git a/ui/src/app/edge/settings/app/single.component.ts b/ui/src/app/edge/settings/app/single.component.ts index df22cb61b85..10e07150acd 100644 --- a/ui/src/app/edge/settings/app/single.component.ts +++ b/ui/src/app/edge/settings/app/single.component.ts @@ -4,10 +4,13 @@ import { FormGroup } from '@angular/forms'; import { DomSanitizer } from '@angular/platform-browser'; import { ActivatedRoute, Router } from '@angular/router'; import { ModalController } from '@ionic/angular'; +import { TranslateService } from '@ngx-translate/core'; import { Subject } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; import { ComponentJsonApiRequest } from 'src/app/shared/jsonrpc/request/componentJsonApiRequest'; +import { environment } from 'src/environments'; import { Edge, Service, Utils, Websocket } from '../../../shared/shared'; +import { InstallAppComponent } from './install.component'; import { GetApp } from './jsonrpc/getApp'; import { GetAppDescriptor } from './jsonrpc/getAppDescriptor'; import { GetApps } from './jsonrpc/getApps'; @@ -16,9 +19,6 @@ import { AppCenterGetPossibleApps } from './keypopup/appCenterGetPossibleApps'; import { AppCenterIsAppFree } from './keypopup/appCenterIsAppFree'; import { KeyModalComponent, KeyValidationBehaviour } from './keypopup/modal.component'; import { canEnterKey, hasKeyModel, hasPredefinedKey } from './permissions'; -import { InstallAppComponent } from './install.component'; -import { TranslateService } from '@ngx-translate/core'; -import { environment } from 'src/environments'; @Component({ selector: SingleAppComponent.SELECTOR, diff --git a/ui/src/app/edge/settings/app/update.component.html b/ui/src/app/edge/settings/app/update.component.html index b773512c8e0..039d79b1826 100644 --- a/ui/src/app/edge/settings/app/update.component.html +++ b/ui/src/app/edge/settings/app/update.component.html @@ -17,7 +17,8 @@ [disabled]="(!((!varinstance.form.pristine) && (varinstance.form.valid))) || varinstance.isDeleting || varinstance.isUpdating" translate> Edge.Config.App.updateApp - + Edge.Config.App.deleteApp
diff --git a/ui/src/app/edge/settings/app/update.component.ts b/ui/src/app/edge/settings/app/update.component.ts index 26bf353a98f..361070f1e21 100644 --- a/ui/src/app/edge/settings/app/update.component.ts +++ b/ui/src/app/edge/settings/app/update.component.ts @@ -6,11 +6,11 @@ import { FormlyFieldConfig } from '@ngx-formly/core'; import { TranslateService } from '@ngx-translate/core'; import { ComponentJsonApiRequest } from 'src/app/shared/jsonrpc/request/componentJsonApiRequest'; import { Edge, Service, Utils, Websocket } from '../../../shared/shared'; +import { InstallAppComponent } from './install.component'; import { DeleteAppInstance } from './jsonrpc/deleteAppInstance'; import { GetAppAssistant } from './jsonrpc/getAppAssistant'; import { GetAppInstances } from './jsonrpc/getAppInstances'; import { UpdateAppInstance } from './jsonrpc/updateAppInstance'; -import { InstallAppComponent } from './install.component'; interface MyInstance { instanceId: string, // uuid diff --git a/ui/src/app/edge/settings/channels/channels.component.html b/ui/src/app/edge/settings/channels/channels.component.html index fd240402020..ecef95c38f1 100644 --- a/ui/src/app/edge/settings/channels/channels.component.html +++ b/ui/src/app/edge/settings/channels/channels.component.html @@ -197,4 +197,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/channels/channels.component.ts b/ui/src/app/edge/settings/channels/channels.component.ts index f911ef9520f..a6adc4dd12c 100644 --- a/ui/src/app/edge/settings/channels/channels.component.ts +++ b/ui/src/app/edge/settings/channels/channels.component.ts @@ -6,10 +6,10 @@ import { PersistencePriority } from 'src/app/shared/components/edge/edgeconfig'; import { SetChannelValueRequest } from 'src/app/shared/jsonrpc/request/setChannelValueRequest'; import { environment } from 'src/environments'; -import { ChannelAddress, Edge, EdgeConfig, EdgePermission, Service, Websocket } from '../../../shared/shared'; import { ComponentJsonApiRequest } from 'src/app/shared/jsonrpc/request/componentJsonApiRequest'; -import { Channel, GetChannelsOfComponentResponse } from 'src/app/shared/jsonrpc/response/getChannelsOfComponentResponse'; import { GetChannelsOfComponentRequest } from 'src/app/shared/jsonrpc/request/getChannelsOfComponentRequest'; +import { Channel, GetChannelsOfComponentResponse } from 'src/app/shared/jsonrpc/response/getChannelsOfComponentResponse'; +import { ChannelAddress, Edge, EdgeConfig, EdgePermission, Service, Websocket } from '../../../shared/shared'; @Component({ selector: ChannelsComponent.SELECTOR, diff --git a/ui/src/app/edge/settings/component/install/index.component.html b/ui/src/app/edge/settings/component/install/index.component.html index 4515acc6a17..c918b508485 100644 --- a/ui/src/app/edge/settings/component/install/index.component.html +++ b/ui/src/app/edge/settings/component/install/index.component.html @@ -24,4 +24,4 @@

{{ item.name }}

- \ No newline at end of file + diff --git a/ui/src/app/edge/settings/component/install/index.component.ts b/ui/src/app/edge/settings/component/install/index.component.ts index 05950505890..5b5ec1ecf07 100644 --- a/ui/src/app/edge/settings/component/install/index.component.ts +++ b/ui/src/app/edge/settings/component/install/index.component.ts @@ -1,9 +1,9 @@ // @ts-strict-ignore -import { CategorizedFactories } from 'src/app/shared/components/edge/edgeconfig'; import { Component, OnInit } from '@angular/core'; -import { Service, Utils, EdgeConfig, Websocket, Edge, EdgePermission } from '../../../../shared/shared'; +import { CategorizedFactories } from 'src/app/shared/components/edge/edgeconfig'; import { JsonrpcRequest, JsonrpcResponseSuccess } from 'src/app/shared/jsonrpc/base'; import { ComponentJsonApiRequest } from 'src/app/shared/jsonrpc/request/componentJsonApiRequest'; +import { Edge, EdgeConfig, EdgePermission, Service, Utils, Websocket } from '../../../../shared/shared'; interface MyCategorizedFactories extends CategorizedFactories { isClicked?: boolean, diff --git a/ui/src/app/edge/settings/component/install/install.component.html b/ui/src/app/edge/settings/component/install/install.component.html index f93712cddf2..ae3916b1def 100644 --- a/ui/src/app/edge/settings/component/install/install.component.html +++ b/ui/src/app/edge/settings/component/install/install.component.html @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/component/install/install.component.ts b/ui/src/app/edge/settings/component/install/install.component.ts index 360f2895de0..53be5a1fef2 100644 --- a/ui/src/app/edge/settings/component/install/install.component.ts +++ b/ui/src/app/edge/settings/component/install/install.component.ts @@ -1,9 +1,9 @@ // @ts-strict-ignore -import { ActivatedRoute } from '@angular/router'; import { Component, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; +import { ActivatedRoute } from '@angular/router'; import { FormlyFieldConfig } from '@ngx-formly/core'; -import { Service, Utils, Websocket, EdgeConfig, Edge } from '../../../../shared/shared'; +import { Edge, EdgeConfig, Service, Utils, Websocket } from '../../../../shared/shared'; @Component({ selector: ComponentInstallComponent.SELECTOR, diff --git a/ui/src/app/edge/settings/component/update/index.component.html b/ui/src/app/edge/settings/component/update/index.component.html index c4ebd8a90c5..30373db23e2 100644 --- a/ui/src/app/edge/settings/component/update/index.component.html +++ b/ui/src/app/edge/settings/component/update/index.component.html @@ -27,4 +27,4 @@

{{ item.alias }} - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/component/update/update.component.html b/ui/src/app/edge/settings/component/update/update.component.html index 38297852e60..aeaee6f0114 100644 --- a/ui/src/app/edge/settings/component/update/update.component.html +++ b/ui/src/app/edge/settings/component/update/update.component.html @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/component/update/update.component.ts b/ui/src/app/edge/settings/component/update/update.component.ts index ff1f9201fcd..e4177748d18 100644 --- a/ui/src/app/edge/settings/component/update/update.component.ts +++ b/ui/src/app/edge/settings/component/update/update.component.ts @@ -1,9 +1,9 @@ // @ts-strict-ignore -import { ActivatedRoute } from '@angular/router'; import { Component, OnInit } from '@angular/core'; import { FormGroup } from '@angular/forms'; +import { ActivatedRoute } from '@angular/router'; import { FormlyFieldConfig } from '@ngx-formly/core'; -import { Service, Utils, Websocket, EdgeConfig, Edge } from '../../../../shared/shared'; +import { Edge, EdgeConfig, Service, Utils, Websocket } from '../../../../shared/shared'; @Component({ selector: ComponentUpdateComponent.SELECTOR, diff --git a/ui/src/app/edge/settings/jsonrpctest/jsonrpctest.html b/ui/src/app/edge/settings/jsonrpctest/jsonrpctest.html index d10ae978751..0468ec0c4d5 100644 --- a/ui/src/app/edge/settings/jsonrpctest/jsonrpctest.html +++ b/ui/src/app/edge/settings/jsonrpctest/jsonrpctest.html @@ -13,7 +13,7 @@ "{{item.key}}": , -
+
  @@ -25,7 +25,7 @@ + [ngTemplateOutletContext]="{value: value.elementType, indentation: indentation + 4}"> [] diff --git a/ui/src/app/edge/settings/jsonrpctest/jsonrpctest.permission.ts b/ui/src/app/edge/settings/jsonrpctest/jsonrpctest.permission.ts index 789e472d542..67edc0ee8a0 100644 --- a/ui/src/app/edge/settings/jsonrpctest/jsonrpctest.permission.ts +++ b/ui/src/app/edge/settings/jsonrpctest/jsonrpctest.permission.ts @@ -5,7 +5,7 @@ import { User } from "src/app/shared/jsonrpc/shared"; export namespace JsonrpcTestPermission { export function canSee(user: User, edge: Edge): boolean { - return true; + return true; } } diff --git a/ui/src/app/edge/settings/powerassistant/powerassistant.ts b/ui/src/app/edge/settings/powerassistant/powerassistant.ts index 1cdedeeefe6..8dfaabf14dd 100644 --- a/ui/src/app/edge/settings/powerassistant/powerassistant.ts +++ b/ui/src/app/edge/settings/powerassistant/powerassistant.ts @@ -1,11 +1,10 @@ // @ts-strict-ignore -import { Component } from '@angular/core'; - import { formatNumber } from '@angular/common'; -import { ChannelAddress, CurrentData, EdgeConfig, Utils } from '../../../shared/shared'; -import { LiveDataService } from '../../live/livedataservice'; +import { Component } from '@angular/core'; import { AbstractFlatWidget } from 'src/app/shared/components/flat/abstract-flat-widget'; import { DataService } from 'src/app/shared/components/shared/dataservice'; +import { ChannelAddress, CurrentData, EdgeConfig, Utils } from '../../../shared/shared'; +import { LiveDataService } from '../../live/livedataservice'; type Channel = { title: string, diff --git a/ui/src/app/edge/settings/profile/aliasupdate.component.html b/ui/src/app/edge/settings/profile/aliasupdate.component.html index 9daf445a05b..1e63df550f6 100644 --- a/ui/src/app/edge/settings/profile/aliasupdate.component.html +++ b/ui/src/app/edge/settings/profile/aliasupdate.component.html @@ -37,4 +37,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/settings.component.html b/ui/src/app/edge/settings/settings.component.html index a08457cce91..abfdf9a2a04 100644 --- a/ui/src/app/edge/settings/settings.component.html +++ b/ui/src/app/edge/settings/settings.component.html @@ -103,7 +103,8 @@ Edge.Config.Index.adjustComponents - + @@ -117,7 +118,8 @@ Edge.Config.Index.addComponents - + @@ -146,7 +148,8 @@ Power Assistant - + diff --git a/ui/src/app/edge/settings/system/executeSystemUpdate.ts b/ui/src/app/edge/settings/system/executeSystemUpdate.ts index 6bb7f6b8c2e..8ad1732c5bd 100644 --- a/ui/src/app/edge/settings/system/executeSystemUpdate.ts +++ b/ui/src/app/edge/settings/system/executeSystemUpdate.ts @@ -5,8 +5,8 @@ import { ComponentJsonApiRequest } from "src/app/shared/jsonrpc/request/componen import { Edge, Websocket } from "src/app/shared/shared"; import { environment } from "src/environments"; import { ExecuteSystemUpdateRequest } from "./executeSystemUpdateRequest"; -import { GetSystemUpdateStateResponse, SystemUpdateState } from "./getSystemUpdateStateResponse"; import { GetSystemUpdateStateRequest } from "./getSystemUpdateStateRequest"; +import { GetSystemUpdateStateResponse, SystemUpdateState } from "./getSystemUpdateStateResponse"; export class ExecuteSystemUpdate { diff --git a/ui/src/app/edge/settings/system/executesystemupdate.component.html b/ui/src/app/edge/settings/system/executesystemupdate.component.html index a2e0205fe5d..53281fa214c 100644 --- a/ui/src/app/edge/settings/system/executesystemupdate.component.html +++ b/ui/src/app/edge/settings/system/executesystemupdate.component.html @@ -118,4 +118,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/systemexecute/systemexecute.component.html b/ui/src/app/edge/settings/systemexecute/systemexecute.component.html index 11216d1262f..c22504d89c5 100644 --- a/ui/src/app/edge/settings/systemexecute/systemexecute.component.html +++ b/ui/src/app/edge/settings/systemexecute/systemexecute.component.html @@ -130,4 +130,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/edge/settings/systemlog/systemlog.component.ts b/ui/src/app/edge/settings/systemlog/systemlog.component.ts index b460c3c7710..489f7c9bda2 100644 --- a/ui/src/app/edge/settings/systemlog/systemlog.component.ts +++ b/ui/src/app/edge/settings/systemlog/systemlog.component.ts @@ -1,13 +1,12 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; +import { SelectCustomEvent } from '@ionic/angular'; import { TranslateService } from '@ngx-translate/core'; +import { parse } from 'date-fns'; import { Subject } from 'rxjs'; import { filter, take, takeUntil } from 'rxjs/operators'; import { Filter } from 'src/app/index/filter/filter.component'; - -import { Service, Utils, Websocket } from '../../../shared/shared'; import { Role } from 'src/app/shared/type/role'; -import { parse } from 'date-fns'; -import { SelectCustomEvent } from '@ionic/angular'; +import { Service, Utils, Websocket } from '../../../shared/shared'; export const LOG_LEVEL_FILTER = (translate: TranslateService): Filter => ({ placeholder: translate.instant("Edge.Config.Log.level"), diff --git a/ui/src/app/index/filter/filter.component.html b/ui/src/app/index/filter/filter.component.html index 5d4b4593d89..aa8c62bc3e6 100644 --- a/ui/src/app/index/filter/filter.component.html +++ b/ui/src/app/index/filter/filter.component.html @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/index/filter/filter.component.ts b/ui/src/app/index/filter/filter.component.ts index c1019a9afd9..16cc1e4b1a4 100644 --- a/ui/src/app/index/filter/filter.component.ts +++ b/ui/src/app/index/filter/filter.component.ts @@ -2,9 +2,9 @@ import { Component, EventEmitter, Output } from "@angular/core"; import { TranslateService } from "@ngx-translate/core"; import { TKeyValue } from "src/app/shared/service/defaulttypes"; +import { Utils } from "src/app/shared/shared"; import { environment } from "src/environments"; import { SUM_STATES } from "../shared/sumState"; -import { Utils } from "src/app/shared/shared"; @Component({ selector: 'oe-filter', diff --git a/ui/src/app/index/index.module.ts b/ui/src/app/index/index.module.ts index fc90698bdaf..427fb34c7f5 100644 --- a/ui/src/app/index/index.module.ts +++ b/ui/src/app/index/index.module.ts @@ -1,12 +1,11 @@ import { NgModule } from '@angular/core'; - import { RegistrationModule } from '../registration/registration.module'; import { SharedModule } from './../shared/shared.module'; import { FilterComponent } from './filter/filter.component'; -import { OverViewComponent } from './overview/overview.component'; -import { SumStateComponent } from './shared/sumState'; import { LoginComponent } from './login.component'; +import { OverViewComponent } from './overview/overview.component'; import { LoadingScreenComponent } from './shared/loading-screen'; +import { SumStateComponent } from './shared/sumState'; @NgModule({ imports: [ diff --git a/ui/src/app/index/overview/overview.component.html b/ui/src/app/index/overview/overview.component.html index ceb8d8c680a..e1a0fa4e05d 100644 --- a/ui/src/app/index/overview/overview.component.html +++ b/ui/src/app/index/overview/overview.component.html @@ -128,4 +128,4 @@

{{ edge.comment }}

- \ No newline at end of file + diff --git a/ui/src/app/index/shared/loading-screen.html b/ui/src/app/index/shared/loading-screen.html index c20266ac0b3..2001205da68 100644 --- a/ui/src/app/index/shared/loading-screen.html +++ b/ui/src/app/index/shared/loading-screen.html @@ -2,4 +2,4 @@

Loading...

- \ No newline at end of file + diff --git a/ui/src/app/index/shared/sumState.ts b/ui/src/app/index/shared/sumState.ts index c2de550bd7d..a0a4dc504a0 100644 --- a/ui/src/app/index/shared/sumState.ts +++ b/ui/src/app/index/shared/sumState.ts @@ -1,8 +1,8 @@ import { Component, Input, OnInit } from "@angular/core"; import { TranslateService } from "@ngx-translate/core"; -import { Filter } from "../filter/filter.component"; -import { Role } from "src/app/shared/type/role"; import { Service } from "src/app/shared/shared"; +import { Role } from "src/app/shared/type/role"; +import { Filter } from "../filter/filter.component"; export enum SumState { OK = 'OK', diff --git a/ui/src/app/registration/modal/modal.component.html b/ui/src/app/registration/modal/modal.component.html index 93158068f8d..87cbc68a2dc 100644 --- a/ui/src/app/registration/modal/modal.component.html +++ b/ui/src/app/registration/modal/modal.component.html @@ -204,4 +204,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/registration/registration.component.html b/ui/src/app/registration/registration.component.html index 399bd0a13d2..8f36566a6fa 100644 --- a/ui/src/app/registration/registration.component.html +++ b/ui/src/app/registration/registration.component.html @@ -1,3 +1,3 @@ Register.createUser - \ No newline at end of file + diff --git a/ui/src/app/shared/components/chart/abstracthistorychart.ts b/ui/src/app/shared/components/chart/abstracthistorychart.ts index e0e569d889a..feaadfa5623 100644 --- a/ui/src/app/shared/components/chart/abstracthistorychart.ts +++ b/ui/src/app/shared/components/chart/abstracthistorychart.ts @@ -414,10 +414,10 @@ export abstract class AbstractHistoryChart implements OnInit, OnDestroy { text: dataset.label, datasetIndex: index, fontColor: getComputedStyle(document.documentElement).getPropertyValue('--ion-color-text'), - ...(dataset.backgroundColor != null && {fillStyle: dataset.backgroundColor.toString()}), + ...(dataset.backgroundColor != null && { fillStyle: dataset.backgroundColor.toString() }), hidden: isHidden != null ? isHidden : !chart.isDatasetVisible(index), lineWidth: 2, - ...(dataset.borderColor != null && {strokeStyle: dataset.borderColor.toString()}), + ...(dataset.borderColor != null && { strokeStyle: dataset.borderColor.toString() }), ...(dataset['borderDash'] != null && { lineDash: dataset['borderDash'] }), }); }); diff --git a/ui/src/app/shared/components/edge/edge.ts b/ui/src/app/shared/components/edge/edge.ts index 29a53ed556d..55ede05a5cf 100644 --- a/ui/src/app/shared/components/edge/edge.ts +++ b/ui/src/app/shared/components/edge/edge.ts @@ -1,12 +1,9 @@ // @ts-strict-ignore import { compareVersions } from 'compare-versions'; import { BehaviorSubject, Subject } from 'rxjs'; -import { SumState } from 'src/app/index/shared/sumState'; - -import { CurrentData } from './currentdata'; -import { EdgeConfig } from './edgeconfig'; import { filter, first } from 'rxjs/operators'; -import { JsonrpcResponseSuccess, JsonrpcRequest } from '../../jsonrpc/base'; +import { SumState } from 'src/app/index/shared/sumState'; +import { JsonrpcRequest, JsonrpcResponseSuccess } from '../../jsonrpc/base'; import { CurrentDataNotification } from '../../jsonrpc/notification/currentDataNotification'; import { EdgeConfigNotification } from '../../jsonrpc/notification/edgeConfigNotification'; import { SystemLogNotification } from '../../jsonrpc/notification/systemLogNotification'; @@ -16,18 +13,20 @@ import { DeleteComponentConfigRequest } from '../../jsonrpc/request/deleteCompon import { EdgeRpcRequest } from '../../jsonrpc/request/edgeRpcRequest'; import { GetChannelRequest } from '../../jsonrpc/request/getChannelRequest'; import { GetChannelsOfComponentRequest } from '../../jsonrpc/request/getChannelsOfComponentRequest'; +import { GetEdgeConfigRequest } from '../../jsonrpc/request/getEdgeConfigRequest'; import { GetPropertiesOfFactoryRequest } from '../../jsonrpc/request/getPropertiesOfFactoryRequest'; import { SubscribeChannelsRequest } from '../../jsonrpc/request/subscribeChannelsRequest'; import { SubscribeSystemLogRequest } from '../../jsonrpc/request/subscribeSystemLogRequest'; import { UpdateComponentConfigRequest } from '../../jsonrpc/request/updateComponentConfigRequest'; import { GetChannelResponse } from '../../jsonrpc/response/getChannelResponse'; import { Channel, GetChannelsOfComponentResponse } from '../../jsonrpc/response/getChannelsOfComponentResponse'; +import { GetEdgeConfigResponse } from '../../jsonrpc/response/getEdgeConfigResponse'; import { GetPropertiesOfFactoryResponse } from '../../jsonrpc/response/getPropertiesOfFactoryResponse'; import { ArrayUtils } from '../../service/arrayutils'; -import { ChannelAddress, SystemLog, Websocket, EdgePermission } from '../../shared'; +import { ChannelAddress, EdgePermission, SystemLog, Websocket } from '../../shared'; import { Role } from '../../type/role'; -import { GetEdgeConfigResponse } from '../../jsonrpc/response/getEdgeConfigResponse'; -import { GetEdgeConfigRequest } from '../../jsonrpc/request/getEdgeConfigRequest'; +import { CurrentData } from './currentdata'; +import { EdgeConfig } from './edgeconfig'; export class Edge { diff --git a/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltage.overview.html b/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltage.overview.html index 4db1a8ebaba..71727e415e6 100644 --- a/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltage.overview.html +++ b/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltage.overview.html @@ -5,4 +5,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltageModule.ts b/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltageModule.ts index 91fbe244d4b..8daaa2c37ac 100644 --- a/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltageModule.ts +++ b/ui/src/app/shared/components/edge/meter/currentVoltage/currentVoltageModule.ts @@ -8,10 +8,9 @@ import { FooterNavigationModule } from "src/app/shared/components/footer/subnavi import { ChartModule } from "../../../chart/chart.module"; import { HistoryDataErrorModule } from "../../../history-data-error/history-data-error.module"; import { PickdateModule } from "../../../pickdate/pickdate.module"; - +import { CurrentVoltageAsymmetricChartComponent } from "./chart/asymmetricMeter"; import { CurrentVoltageSymmetricChartComponent } from "./chart/symmetricMeter"; import { CurrentAndVoltageOverviewComponent } from "./currentVoltage.overview"; -import { CurrentVoltageAsymmetricChartComponent } from "./chart/asymmetricMeter"; @NgModule({ imports: [ diff --git a/ui/src/app/shared/components/edge/meter/electricity/modal.component.html b/ui/src/app/shared/components/edge/meter/electricity/modal.component.html index 6a899a8f470..389bd90116b 100644 --- a/ui/src/app/shared/components/edge/meter/electricity/modal.component.html +++ b/ui/src/app/shared/components/edge/meter/electricity/modal.component.html @@ -3,4 +3,4 @@ [converter]="Utils.CONVERT_TO_WATT"> - \ No newline at end of file + diff --git a/ui/src/app/shared/components/edge/meter/esscharger/modal.component.html b/ui/src/app/shared/components/edge/meter/esscharger/modal.component.html index 8b551aa89f7..d607901c8df 100644 --- a/ui/src/app/shared/components/edge/meter/esscharger/modal.component.html +++ b/ui/src/app/shared/components/edge/meter/esscharger/modal.component.html @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/flat/flat-widget-horizontal-line/flat-widget-horizontal-line.html b/ui/src/app/shared/components/flat/flat-widget-horizontal-line/flat-widget-horizontal-line.html index a38f40454db..1a5d6a96871 100644 --- a/ui/src/app/shared/components/flat/flat-widget-horizontal-line/flat-widget-horizontal-line.html +++ b/ui/src/app/shared/components/flat/flat-widget-horizontal-line/flat-widget-horizontal-line.html @@ -9,4 +9,4 @@
- \ No newline at end of file + diff --git a/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line-item/flat-widget-line-item.html b/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line-item/flat-widget-line-item.html index 17bd64df05e..7ac84753d40 100644 --- a/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line-item/flat-widget-line-item.html +++ b/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line-item/flat-widget-line-item.html @@ -1,4 +1,4 @@   {{ displayValue }} - \ No newline at end of file + diff --git a/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line.html b/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line.html index 48644948aae..46424574ca4 100644 --- a/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line.html +++ b/ui/src/app/shared/components/flat/flat-widget-line/flat-widget-line.html @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/flat/flat-widget-percentagebar/flat-widget-percentagebar.html b/ui/src/app/shared/components/flat/flat-widget-percentagebar/flat-widget-percentagebar.html index 8c5bb50478f..eba1a1964a0 100644 --- a/ui/src/app/shared/components/flat/flat-widget-percentagebar/flat-widget-percentagebar.html +++ b/ui/src/app/shared/components/flat/flat-widget-percentagebar/flat-widget-percentagebar.html @@ -7,4 +7,4 @@ {{ displayValue | unitvalue: '%' }} - \ No newline at end of file + diff --git a/ui/src/app/shared/components/flat/flat-widget.component.html b/ui/src/app/shared/components/flat/flat-widget.component.html index 5efe3ab68f3..a969eb76a61 100644 --- a/ui/src/app/shared/components/flat/flat-widget.component.html +++ b/ui/src/app/shared/components/flat/flat-widget.component.html @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/flat/flat.html b/ui/src/app/shared/components/flat/flat.html index e40a1627541..0e2ae2de349 100644 --- a/ui/src/app/shared/components/flat/flat.html +++ b/ui/src/app/shared/components/flat/flat.html @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/footer/subnavigation/footerNavigation.html b/ui/src/app/shared/components/footer/subnavigation/footerNavigation.html index 1d51d859e10..bfa8f32655c 100644 --- a/ui/src/app/shared/components/footer/subnavigation/footerNavigation.html +++ b/ui/src/app/shared/components/footer/subnavigation/footerNavigation.html @@ -45,4 +45,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/formly/form-field-checkbox-hyperlink/form-field-checkbox-hyperlink.wrapper.html b/ui/src/app/shared/components/formly/form-field-checkbox-hyperlink/form-field-checkbox-hyperlink.wrapper.html index a590984e1f7..34a2dbbaa28 100644 --- a/ui/src/app/shared/components/formly/form-field-checkbox-hyperlink/form-field-checkbox-hyperlink.wrapper.html +++ b/ui/src/app/shared/components/formly/form-field-checkbox-hyperlink/form-field-checkbox-hyperlink.wrapper.html @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/formly/form-field-checkbox-hyperlink/form-field-checkbox-hyperlink.wrapper.ts b/ui/src/app/shared/components/formly/form-field-checkbox-hyperlink/form-field-checkbox-hyperlink.wrapper.ts index c923b6718f3..84185208942 100644 --- a/ui/src/app/shared/components/formly/form-field-checkbox-hyperlink/form-field-checkbox-hyperlink.wrapper.ts +++ b/ui/src/app/shared/components/formly/form-field-checkbox-hyperlink/form-field-checkbox-hyperlink.wrapper.ts @@ -1,5 +1,5 @@ // @ts-strict-ignore -import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { FieldWrapper } from '@ngx-formly/core'; @Component({ diff --git a/ui/src/app/shared/components/formly/form-field.wrapper.html b/ui/src/app/shared/components/formly/form-field.wrapper.html index 82ad53b779f..18ebda3222c 100644 --- a/ui/src/app/shared/components/formly/form-field.wrapper.html +++ b/ui/src/app/shared/components/formly/form-field.wrapper.html @@ -14,4 +14,4 @@

- \ No newline at end of file + diff --git a/ui/src/app/shared/components/formly/form-field.wrapper.ts b/ui/src/app/shared/components/formly/form-field.wrapper.ts index 785582964ed..64b6e3a1fd9 100644 --- a/ui/src/app/shared/components/formly/form-field.wrapper.ts +++ b/ui/src/app/shared/components/formly/form-field.wrapper.ts @@ -1,4 +1,4 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { ChangeDetectionStrategy, Component } from '@angular/core'; import { FieldWrapper } from '@ngx-formly/core'; @Component({ diff --git a/ui/src/app/shared/components/formly/formly-field-checkbox-image/formly-field-checkbox-with-image.html b/ui/src/app/shared/components/formly/formly-field-checkbox-image/formly-field-checkbox-with-image.html index e48b0e25839..bd1c0ab4da9 100644 --- a/ui/src/app/shared/components/formly/formly-field-checkbox-image/formly-field-checkbox-with-image.html +++ b/ui/src/app/shared/components/formly/formly-field-checkbox-image/formly-field-checkbox-with-image.html @@ -12,8 +12,8 @@ - - + + diff --git a/ui/src/app/shared/components/formly/formly-field-modal/formlyfieldmodal.html b/ui/src/app/shared/components/formly/formly-field-modal/formlyfieldmodal.html index 88bfdd9af17..cd59a9539c3 100644 --- a/ui/src/app/shared/components/formly/formly-field-modal/formlyfieldmodal.html +++ b/ui/src/app/shared/components/formly/formly-field-modal/formlyfieldmodal.html @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/formly/formly-field-modal/template.html b/ui/src/app/shared/components/formly/formly-field-modal/template.html index 51c68cc8d91..1ab0804b0ba 100644 --- a/ui/src/app/shared/components/formly/formly-field-modal/template.html +++ b/ui/src/app/shared/components/formly/formly-field-modal/template.html @@ -1 +1 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/formly/formly-field-radio-with-image/formly-field-radio-with-image.html b/ui/src/app/shared/components/formly/formly-field-radio-with-image/formly-field-radio-with-image.html index 7eb91db5f1f..1c8e08a72cd 100644 --- a/ui/src/app/shared/components/formly/formly-field-radio-with-image/formly-field-radio-with-image.html +++ b/ui/src/app/shared/components/formly/formly-field-radio-with-image/formly-field-radio-with-image.html @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/formly/formly-field-radio-with-image/formly-field-radio-with-image.ts b/ui/src/app/shared/components/formly/formly-field-radio-with-image/formly-field-radio-with-image.ts index 5908a6cd96c..c66a5c192e0 100644 --- a/ui/src/app/shared/components/formly/formly-field-radio-with-image/formly-field-radio-with-image.ts +++ b/ui/src/app/shared/components/formly/formly-field-radio-with-image/formly-field-radio-with-image.ts @@ -1,4 +1,4 @@ -import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { FieldWrapper } from '@ngx-formly/core'; @Component({ diff --git a/ui/src/app/shared/components/formly/formly-select-field-modal.component.html b/ui/src/app/shared/components/formly/formly-select-field-modal.component.html index 77488ad7fbd..834fbb753d5 100644 --- a/ui/src/app/shared/components/formly/formly-select-field-modal.component.html +++ b/ui/src/app/shared/components/formly/formly-select-field-modal.component.html @@ -51,4 +51,4 @@ -
\ No newline at end of file + diff --git a/ui/src/app/shared/components/formly/formly-select-field.extended.html b/ui/src/app/shared/components/formly/formly-select-field.extended.html index 1409c0b07f6..1313a64eb0c 100644 --- a/ui/src/app/shared/components/formly/formly-select-field.extended.html +++ b/ui/src/app/shared/components/formly/formly-select-field.extended.html @@ -8,4 +8,4 @@ {{ formControl.value }} - \ No newline at end of file + diff --git a/ui/src/app/shared/components/formly/input-serial-number-wrapper.html b/ui/src/app/shared/components/formly/input-serial-number-wrapper.html index e2401c3aec9..169d30f12e8 100644 --- a/ui/src/app/shared/components/formly/input-serial-number-wrapper.html +++ b/ui/src/app/shared/components/formly/input-serial-number-wrapper.html @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/formly/input.html b/ui/src/app/shared/components/formly/input.html index abc8b4b0ea0..f85472cc915 100644 --- a/ui/src/app/shared/components/formly/input.html +++ b/ui/src/app/shared/components/formly/input.html @@ -1,6 +1,5 @@ diff --git a/ui/src/app/shared/components/formly/repeat.html b/ui/src/app/shared/components/formly/repeat.html index 09aaee84302..ec9a8f1a311 100644 --- a/ui/src/app/shared/components/formly/repeat.html +++ b/ui/src/app/shared/components/formly/repeat.html @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/header/header.component.html b/ui/src/app/shared/components/header/header.component.html index 875067f79e3..b1e4714c831 100644 --- a/ui/src/app/shared/components/header/header.component.html +++ b/ui/src/app/shared/components/header/header.component.html @@ -68,4 +68,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/modal/abstractModal.ts b/ui/src/app/shared/components/modal/abstractModal.ts index 5c5ca8f55aa..78331d04b12 100644 --- a/ui/src/app/shared/components/modal/abstractModal.ts +++ b/ui/src/app/shared/components/modal/abstractModal.ts @@ -10,8 +10,8 @@ import { ChannelAddress, CurrentData, Edge, EdgeConfig, Service, Utils, Websocke import { v4 as uuidv4 } from 'uuid'; import { Role } from "../../type/role"; -import { TextIndentation } from "./modal-line/modal-line"; import { Converter } from "../shared/converter"; +import { TextIndentation } from "./modal-line/modal-line"; @Directive() export abstract class AbstractModal implements OnInit, OnDestroy { diff --git a/ui/src/app/shared/components/modal/help-button/help-button.html b/ui/src/app/shared/components/modal/help-button/help-button.html index b0e195c58ba..203148b44fe 100644 --- a/ui/src/app/shared/components/modal/help-button/help-button.html +++ b/ui/src/app/shared/components/modal/help-button/help-button.html @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/modal/modal-button/modal-button.html b/ui/src/app/shared/components/modal/modal-button/modal-button.html index cfe065fc432..77f3b1a88b4 100644 --- a/ui/src/app/shared/components/modal/modal-button/modal-button.html +++ b/ui/src/app/shared/components/modal/modal-button/modal-button.html @@ -9,4 +9,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/modal/modal-info-line/modal-info-line.html b/ui/src/app/shared/components/modal/modal-info-line/modal-info-line.html index 6f66261a711..208186bbb6a 100644 --- a/ui/src/app/shared/components/modal/modal-info-line/modal-info-line.html +++ b/ui/src/app/shared/components/modal/modal-info-line/modal-info-line.html @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/modal/modal-line/modal-line-item/modal-line-item.html b/ui/src/app/shared/components/modal/modal-line/modal-line-item/modal-line-item.html index 1d44987f67e..85028091b7a 100644 --- a/ui/src/app/shared/components/modal/modal-line/modal-line-item/modal-line-item.html +++ b/ui/src/app/shared/components/modal/modal-line/modal-line-item/modal-line-item.html @@ -2,4 +2,4 @@ *ngIf="isAllowedToBeSeen && show && displayValue">   {{ displayValue }} - \ No newline at end of file + diff --git a/ui/src/app/shared/components/modal/modal-line/modal-line.html b/ui/src/app/shared/components/modal/modal-line/modal-line.html index 2f795565950..c75997960ec 100644 --- a/ui/src/app/shared/components/modal/modal-line/modal-line.html +++ b/ui/src/app/shared/components/modal/modal-line/modal-line.html @@ -30,7 +30,7 @@ - + diff --git a/ui/src/app/shared/components/modal/modal-phases/modal-phases.html b/ui/src/app/shared/components/modal/modal-phases/modal-phases.html index d368f4813cf..49679489ecf 100644 --- a/ui/src/app/shared/components/modal/modal-phases/modal-phases.html +++ b/ui/src/app/shared/components/modal/modal-phases/modal-phases.html @@ -10,4 +10,4 @@ [converter]="CONVERT_TO_POSITIVE_WATT"> - \ No newline at end of file + diff --git a/ui/src/app/shared/components/modal/modal-value-line/modal-value-line.html b/ui/src/app/shared/components/modal/modal-value-line/modal-value-line.html index 311cd8e2246..b8a6d8478f0 100644 --- a/ui/src/app/shared/components/modal/modal-value-line/modal-value-line.html +++ b/ui/src/app/shared/components/modal/modal-value-line/modal-value-line.html @@ -12,4 +12,4 @@ {{ displayValue }} - \ No newline at end of file + diff --git a/ui/src/app/shared/components/modal/model-horizontal-line/modal-horizontal-line.html b/ui/src/app/shared/components/modal/model-horizontal-line/modal-horizontal-line.html index 2af26b6ecc4..2a2f2922aaf 100644 --- a/ui/src/app/shared/components/modal/model-horizontal-line/modal-horizontal-line.html +++ b/ui/src/app/shared/components/modal/model-horizontal-line/modal-horizontal-line.html @@ -11,4 +11,4 @@
- \ No newline at end of file + diff --git a/ui/src/app/shared/components/percentagebar/percentagebar.component.html b/ui/src/app/shared/components/percentagebar/percentagebar.component.html index 1c7ce71728c..c06ff0ba341 100644 --- a/ui/src/app/shared/components/percentagebar/percentagebar.component.html +++ b/ui/src/app/shared/components/percentagebar/percentagebar.component.html @@ -4,4 +4,4 @@ {{ value | unitvalue:'%' }} - \ No newline at end of file + diff --git a/ui/src/app/shared/components/pickdate/pickdate.component.html b/ui/src/app/shared/components/pickdate/pickdate.component.html index ea2c96f7009..a3987add648 100644 --- a/ui/src/app/shared/components/pickdate/pickdate.component.html +++ b/ui/src/app/shared/components/pickdate/pickdate.component.html @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/components/pickdate/pickdate.module.ts b/ui/src/app/shared/components/pickdate/pickdate.module.ts index 4cf6632c20b..c555a743cac 100644 --- a/ui/src/app/shared/components/pickdate/pickdate.module.ts +++ b/ui/src/app/shared/components/pickdate/pickdate.module.ts @@ -3,10 +3,9 @@ import { ReactiveFormsModule } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; - +import { AngularMyDatePickerModule } from '@nodro7/angular-mydatepicker'; import { PickDateComponent } from './pickdate.component'; import { PickDatePopoverComponent } from './popover/popover.component'; -import { AngularMyDatePickerModule } from '@nodro7/angular-mydatepicker'; @NgModule({ imports: [ @@ -23,6 +22,5 @@ import { AngularMyDatePickerModule } from '@nodro7/angular-mydatepicker'; exports: [ PickDateComponent, ], - }) export class PickdateModule { } diff --git a/ui/src/app/shared/components/shared/converter.ts b/ui/src/app/shared/components/shared/converter.ts index bb3318e2621..94f0c2a7635 100644 --- a/ui/src/app/shared/components/shared/converter.ts +++ b/ui/src/app/shared/components/shared/converter.ts @@ -1,7 +1,5 @@ // @ts-strict-ignore - import { TranslateService } from "@ngx-translate/core"; - import { CurrentData, EdgeConfig, GridMode, Utils } from "../../shared"; import { TimeUtils } from "../../utils/time/timeutils"; import { Formatter } from "./formatter"; diff --git a/ui/src/app/shared/components/shared/dataservice.ts b/ui/src/app/shared/components/shared/dataservice.ts index 15b1b79600d..b1d7a835af2 100644 --- a/ui/src/app/shared/components/shared/dataservice.ts +++ b/ui/src/app/shared/components/shared/dataservice.ts @@ -1,9 +1,8 @@ // @ts-strict-ignore import { Injectable } from "@angular/core"; +import { RefresherCustomEvent } from "@ionic/angular"; import { BehaviorSubject, Subject } from "rxjs"; - import { ChannelAddress, Edge } from "../../shared"; -import { RefresherCustomEvent } from "@ionic/angular"; @Injectable() export abstract class DataService { diff --git a/ui/src/app/shared/components/shared/oe-formly-component.ts b/ui/src/app/shared/components/shared/oe-formly-component.ts index 50516a057d5..a463642482f 100644 --- a/ui/src/app/shared/components/shared/oe-formly-component.ts +++ b/ui/src/app/shared/components/shared/oe-formly-component.ts @@ -3,8 +3,7 @@ import { ActivatedRoute } from "@angular/router"; import { FormlyFieldConfig } from "@ngx-formly/core"; import { TranslateService } from "@ngx-translate/core"; import { filter } from "rxjs/operators"; - -import { CurrentData, ChannelAddress, EdgeConfig, Service } from "../../shared"; +import { ChannelAddress, CurrentData, EdgeConfig, Service } from "../../shared"; import { SharedModule } from "../../shared.module"; import { Role } from "../../type/role"; import { TextIndentation } from "../modal/modal-line/modal-line"; diff --git a/ui/src/app/shared/components/status/single/status.component.spec.ts b/ui/src/app/shared/components/status/single/status.component.spec.ts index 6f4c1868bbc..3894b66e66b 100644 --- a/ui/src/app/shared/components/status/single/status.component.spec.ts +++ b/ui/src/app/shared/components/status/single/status.component.spec.ts @@ -1,13 +1,12 @@ import { TestBed } from "@angular/core/testing"; import { ModalController } from "@ionic/angular"; - -import { EdgeConfig, PersistencePriority } from "../../edge/edgeconfig"; -import { StatusSingleComponent } from "./status.component"; import { BehaviorSubject } from "rxjs"; import { DummyWebsocket } from "src/app/shared/service/test/dummywebsocket"; -import { Service, Websocket, ChannelAddress } from "src/app/shared/shared"; +import { ChannelAddress, Service, Websocket } from "src/app/shared/shared"; import { Edge } from "../../edge/edge"; +import { EdgeConfig, PersistencePriority } from "../../edge/edgeconfig"; import { DummyModalController } from "../../shared/testing/DummyModalController"; +import { StatusSingleComponent } from "./status.component"; describe('StatusComponent', () => { const testComponent = new EdgeConfig.Component("test", {}, { diff --git a/ui/src/app/shared/directive/directive.ts b/ui/src/app/shared/directive/directive.ts index 619719018a9..cd1e4561875 100644 --- a/ui/src/app/shared/directive/directive.ts +++ b/ui/src/app/shared/directive/directive.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import { VarDirective } from './ngvar'; import { AutofillDirective } from './autofill'; +import { VarDirective } from './ngvar'; @NgModule({ imports: [ diff --git a/ui/src/app/shared/jsonrpc/notification/systemLogNotification.ts b/ui/src/app/shared/jsonrpc/notification/systemLogNotification.ts index 0c233a75fdd..d7ebcab68be 100644 --- a/ui/src/app/shared/jsonrpc/notification/systemLogNotification.ts +++ b/ui/src/app/shared/jsonrpc/notification/systemLogNotification.ts @@ -1,5 +1,5 @@ -import { JsonrpcNotification } from "../base"; import { SystemLog } from "../../type/systemlog"; +import { JsonrpcNotification } from "../base"; /** * Represents a JSON-RPC Notification for sending the current system log. diff --git a/ui/src/app/shared/jsonrpc/request/queryHistoricTimeseriesDataRequest.ts b/ui/src/app/shared/jsonrpc/request/queryHistoricTimeseriesDataRequest.ts index 77146413230..170c5b8af7f 100644 --- a/ui/src/app/shared/jsonrpc/request/queryHistoricTimeseriesDataRequest.ts +++ b/ui/src/app/shared/jsonrpc/request/queryHistoricTimeseriesDataRequest.ts @@ -1,9 +1,9 @@ // @ts-strict-ignore -import { ChannelAddress } from "../../../shared/type/channeladdress"; import { format } from 'date-fns'; +import { Resolution } from "src/app/edge/history/shared"; +import { ChannelAddress } from "../../../shared/type/channeladdress"; import { JsonrpcRequest } from "../base"; import { JsonRpcUtils } from "../jsonrpcutils"; -import { Resolution } from "src/app/edge/history/shared"; /** * Represents a JSON-RPC Request to query Historic Timeseries Data. diff --git a/ui/src/app/shared/jsonrpc/request/queryHistoricTimeseriesEnergyPerPeriodRequest.ts b/ui/src/app/shared/jsonrpc/request/queryHistoricTimeseriesEnergyPerPeriodRequest.ts index c81fd430687..af0a86a679c 100644 --- a/ui/src/app/shared/jsonrpc/request/queryHistoricTimeseriesEnergyPerPeriodRequest.ts +++ b/ui/src/app/shared/jsonrpc/request/queryHistoricTimeseriesEnergyPerPeriodRequest.ts @@ -1,9 +1,9 @@ // @ts-strict-ignore -import { ChannelAddress } from "../../type/channeladdress"; import { format } from 'date-fns'; +import { Resolution } from "src/app/edge/history/shared"; +import { ChannelAddress } from "../../type/channeladdress"; import { JsonrpcRequest } from "../base"; import { JsonRpcUtils } from "../jsonrpcutils"; -import { Resolution } from "src/app/edge/history/shared"; /** * Represents a JSON-RPC Request to query Timeseries Energy data. diff --git a/ui/src/app/shared/jsonrpc/request/queryHistoricTimeseriesEnergyRequest.ts b/ui/src/app/shared/jsonrpc/request/queryHistoricTimeseriesEnergyRequest.ts index cd44298b563..054c45038b6 100644 --- a/ui/src/app/shared/jsonrpc/request/queryHistoricTimeseriesEnergyRequest.ts +++ b/ui/src/app/shared/jsonrpc/request/queryHistoricTimeseriesEnergyRequest.ts @@ -1,6 +1,6 @@ // @ts-strict-ignore -import { ChannelAddress } from "../../type/channeladdress"; import { format } from 'date-fns'; +import { ChannelAddress } from "../../type/channeladdress"; import { JsonrpcRequest } from "../base"; import { JsonRpcUtils } from "../jsonrpcutils"; diff --git a/ui/src/app/shared/legacy/chartoptions/chartoptions.component.html b/ui/src/app/shared/legacy/chartoptions/chartoptions.component.html index 33dd2721bb4..02980ba1e0d 100644 --- a/ui/src/app/shared/legacy/chartoptions/chartoptions.component.html +++ b/ui/src/app/shared/legacy/chartoptions/chartoptions.component.html @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/legacy/chartoptions/popover/popover.component.html b/ui/src/app/shared/legacy/chartoptions/popover/popover.component.html index 82bd75f8572..94793aee035 100644 --- a/ui/src/app/shared/legacy/chartoptions/popover/popover.component.html +++ b/ui/src/app/shared/legacy/chartoptions/popover/popover.component.html @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/ui/src/app/shared/pipe/unitvalue/unitvalue.pipe.spec.ts b/ui/src/app/shared/pipe/unitvalue/unitvalue.pipe.spec.ts index bba039ef456..d6c567b4fa1 100644 --- a/ui/src/app/shared/pipe/unitvalue/unitvalue.pipe.spec.ts +++ b/ui/src/app/shared/pipe/unitvalue/unitvalue.pipe.spec.ts @@ -1,7 +1,7 @@ import { DecimalPipe, registerLocaleData } from "@angular/common"; import localDE from '@angular/common/locales/de'; -import { UnitvaluePipe } from "./unitvalue.pipe"; import { Language } from "../../type/language"; +import { UnitvaluePipe } from "./unitvalue.pipe"; describe('UnitvaluePipe', () => { registerLocaleData(localDE); diff --git a/ui/src/app/shared/service/service.ts b/ui/src/app/shared/service/service.ts index a0efd655628..1cd5bdfb98a 100644 --- a/ui/src/app/shared/service/service.ts +++ b/ui/src/app/shared/service/service.ts @@ -9,7 +9,6 @@ import { BehaviorSubject, Subject } from 'rxjs'; import { filter, first, take } from 'rxjs/operators'; import { ChosenFilter } from 'src/app/index/filter/filter.component'; import { environment } from 'src/environments'; - import { Edge } from '../components/edge/edge'; import { EdgeConfig } from '../components/edge/edgeconfig'; import { JsonrpcResponseError } from '../jsonrpc/base'; diff --git a/ui/src/app/shared/service/test/dummyservice.ts b/ui/src/app/shared/service/test/dummyservice.ts index e8b9cdc102f..58101b949a1 100644 --- a/ui/src/app/shared/service/test/dummyservice.ts +++ b/ui/src/app/shared/service/test/dummyservice.ts @@ -1,7 +1,6 @@ import { ActivatedRoute } from "@angular/router"; import { BehaviorSubject } from "rxjs"; import { SumState } from "src/app/index/shared/sumState"; - import { QueryHistoricTimeseriesEnergyResponse } from "../../jsonrpc/response/queryHistoricTimeseriesEnergyResponse"; import { ChannelAddress, Edge, EdgeConfig } from "../../shared"; import { Language } from "../../type/language"; @@ -62,8 +61,8 @@ export class DummyService extends AbstractService { isPartnerAllowed(edge: Edge): boolean { throw new Error("Method not implemented."); } - // https://v16.angular.io/api/core/ErrorHandler#errorhandler - // eslint-disable-next-line @typescript-eslint/no-explicit-any + // https://v16.angular.io/api/core/ErrorHandler#errorhandler + // eslint-disable-next-line @typescript-eslint/no-explicit-any override handleError(error: any): void { throw new Error("Method not implemented."); } diff --git a/ui/src/app/shared/service/test/dummywebsocket.ts b/ui/src/app/shared/service/test/dummywebsocket.ts index 04f579818f3..56d91ec80f1 100644 --- a/ui/src/app/shared/service/test/dummywebsocket.ts +++ b/ui/src/app/shared/service/test/dummywebsocket.ts @@ -1,4 +1,4 @@ -import { JsonrpcRequest, JsonrpcResponseSuccess, JsonrpcNotification } from "../../jsonrpc/base"; +import { JsonrpcNotification, JsonrpcRequest, JsonrpcResponseSuccess } from "../../jsonrpc/base"; import { AuthenticateWithPasswordRequest } from "../../jsonrpc/request/authenticateWithPasswordRequest"; import { AuthenticateWithTokenRequest } from "../../jsonrpc/request/authenticateWithTokenRequest"; import { WebsocketInterface } from "../websocketInterface"; diff --git a/ui/src/app/shared/shared.module.ts b/ui/src/app/shared/shared.module.ts index 7d6fc9ccbd2..de8f4e59542 100644 --- a/ui/src/app/shared/shared.module.ts +++ b/ui/src/app/shared/shared.module.ts @@ -10,7 +10,6 @@ import { FormlyIonicModule } from '@ngx-formly/ionic'; import { TranslateModule } from '@ngx-translate/core'; import { NgChartsModule } from 'ng2-charts'; import { NgxSpinnerModule } from "ngx-spinner"; - import { appRoutingProviders } from '../app-routing.module'; import { ComponentsModule } from './components/components.module'; import { MeterModule } from './components/edge/meter/meter.module'; diff --git a/ui/src/app/shared/type/language.ts b/ui/src/app/shared/type/language.ts index 4737bf4510a..2a4f71af9c7 100644 --- a/ui/src/app/shared/type/language.ts +++ b/ui/src/app/shared/type/language.ts @@ -2,8 +2,8 @@ import localDE from '@angular/common/locales/de'; import localEN from '@angular/common/locales/en'; import localES from '@angular/common/locales/es'; import localFR from '@angular/common/locales/fr'; -import localNL from '@angular/common/locales/nl'; import localJA from '@angular/common/locales/ja'; +import localNL from '@angular/common/locales/nl'; import { TranslateLoader } from "@ngx-translate/core"; import { Observable, of } from 'rxjs'; import cz from 'src/assets/i18n/cz.json'; @@ -11,8 +11,8 @@ import de from 'src/assets/i18n/de.json'; import en from 'src/assets/i18n/en.json'; import es from 'src/assets/i18n/es.json'; import fr from 'src/assets/i18n/fr.json'; -import nl from 'src/assets/i18n/nl.json'; import ja from 'src/assets/i18n/ja.json'; +import nl from 'src/assets/i18n/nl.json'; interface Translation { [key: string]: string | Translation; diff --git a/ui/src/app/shared/type/widget.ts b/ui/src/app/shared/type/widget.ts index f91e01905fd..367bc6fac51 100644 --- a/ui/src/app/shared/type/widget.ts +++ b/ui/src/app/shared/type/widget.ts @@ -75,7 +75,6 @@ export class Widgets { } public static parseWidgets(edge: Edge, config: EdgeConfig): Widgets { - const classes: string[] = Object.values(WidgetClass) // .filter(v => typeof v === 'string') .filter(clazz => { diff --git a/ui/src/app/user/user.component.html b/ui/src/app/user/user.component.html index 1f3f7407448..f9996302f38 100644 --- a/ui/src/app/user/user.component.html +++ b/ui/src/app/user/user.component.html @@ -17,7 +17,8 @@ Menu.name - {{ this.form?.model ? ((this.form?.model?.firstname ?? '') + ' ' + (this.form?.model?.lastname ?? '')).trim() : user.name }} + {{ this.form?.model ? ((this.form?.model?.firstname ?? '') + ' ' + (this.form?.model?.lastname ?? + '')).trim() : user.name }} diff --git a/ui/src/app/user/user.component.ts b/ui/src/app/user/user.component.ts index ee2ee865b0b..363937cb827 100644 --- a/ui/src/app/user/user.component.ts +++ b/ui/src/app/user/user.component.ts @@ -2,10 +2,9 @@ import { Component, OnInit } from '@angular/core'; import { FormGroup, Validators } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; +import { FormlyFieldConfig } from '@ngx-formly/core'; import { TranslateService } from '@ngx-translate/core'; import { Changelog } from 'src/app/changelog/view/component/changelog.constants'; - -import { FormlyFieldConfig } from '@ngx-formly/core'; import { environment } from '../../environments'; import { GetUserInformationRequest } from '../shared/jsonrpc/request/getUserInformationRequest'; import { SetUserInformationRequest } from '../shared/jsonrpc/request/setUserInformationRequest'; diff --git a/ui/src/assets/i18n/de.json b/ui/src/assets/i18n/de.json index 6f0d3426a53..3096991606a 100644 --- a/ui/src/assets/i18n/de.json +++ b/ui/src/assets/i18n/de.json @@ -974,4 +974,4 @@ "APP": { "FUNCTIONALITY_TEMPORARILY_NOT_AVAILABLE": "Diese Funktion ist vorübergehend in der App nicht verfügbar, verwenden Sie bitte dafür die Web-App." } -} \ No newline at end of file +} diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json index 99aa7e38184..45f7388ab29 100644 --- a/ui/src/assets/i18n/en.json +++ b/ui/src/assets/i18n/en.json @@ -977,4 +977,4 @@ "APP": { "FUNCTIONALITY_TEMPORARILY_NOT_AVAILABLE": "This function is temporarily not available in the app, please use the web app instead." } -} \ No newline at end of file +} diff --git a/ui/src/global.scss b/ui/src/global.scss index f29dac900c2..e0007c5fbe7 100644 --- a/ui/src/global.scss +++ b/ui/src/global.scss @@ -250,6 +250,7 @@ formly-input-section { .alert-button-group { justify-content: space-between; + .alert-button { color: $primary-color; font-size: small; diff --git a/ui/src/main.ts b/ui/src/main.ts index 43c16a32c32..001a8fbd192 100644 --- a/ui/src/main.ts +++ b/ui/src/main.ts @@ -1,7 +1,7 @@ import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { environment } from 'src/environments'; import { AppModule } from 'src/app/app.module'; +import { environment } from 'src/environments'; if (environment.production) { enableProdMode(); diff --git a/ui/src/polyfills.ts b/ui/src/polyfills.ts index 5aacd21714a..9c6628376e2 100644 --- a/ui/src/polyfills.ts +++ b/ui/src/polyfills.ts @@ -19,7 +19,7 @@ */ /** IE11 requires the following for NgClass support on SVG elements */ -import 'classlist.js'; // Run `npm install --save classlist.js`. +import 'classlist.js'; // Run `npm install --save classlist.js`. /** * Web Animations `@angular/platform-browser/animations` @@ -57,7 +57,7 @@ import './zone-flags'; /*************************************************************************************************** * Zone JS is required by default for Angular itself. */ -import 'zone.js/dist/zone'; // Included with Angular CLI. +import 'zone.js/dist/zone'; // Included with Angular CLI. /*************************************************************************************************** diff --git a/ui/src/test.ts b/ui/src/test.ts index d8e68564e1b..2d851fa6be3 100644 --- a/ui/src/test.ts +++ b/ui/src/test.ts @@ -8,6 +8,7 @@ // This file is required by karma.conf.js and loads recursively all the .spec and framework files import 'zone.js/testing'; + import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, diff --git a/ui/src/themes/openems/root/site.webmanifest b/ui/src/themes/openems/root/site.webmanifest index 58e369e755e..b4bc8f030b2 100644 --- a/ui/src/themes/openems/root/site.webmanifest +++ b/ui/src/themes/openems/root/site.webmanifest @@ -16,4 +16,4 @@ "theme_color": "#f4a942", "background_color": "#f4a942", "display": "standalone" -} \ No newline at end of file +} diff --git a/ui/tsconfig.app.json b/ui/tsconfig.app.json index da9cb8b9de2..82d91dc4a4d 100644 --- a/ui/tsconfig.app.json +++ b/ui/tsconfig.app.json @@ -12,4 +12,4 @@ "include": [ "src/**/*.d.ts" ] -} \ No newline at end of file +} diff --git a/ui/tsconfig.spec.json b/ui/tsconfig.spec.json index 87be9d5b3f1..092345b02e8 100644 --- a/ui/tsconfig.spec.json +++ b/ui/tsconfig.spec.json @@ -15,4 +15,4 @@ "src/**/*.spec.ts", "src/**/*.d.ts" ] -} \ No newline at end of file +} From 218c76196b6a02c3c1937c9ee47cbb1c64ceaa4f Mon Sep 17 00:00:00 2001 From: Stefan Feilmeier Date: Mon, 12 Aug 2024 14:11:46 +0200 Subject: [PATCH 2/2] formatting --- ui/src/app/user/user.component.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ui/src/app/user/user.component.html b/ui/src/app/user/user.component.html index f9996302f38..bc5370ebca3 100644 --- a/ui/src/app/user/user.component.html +++ b/ui/src/app/user/user.component.html @@ -17,10 +17,11 @@ Menu.name - {{ this.form?.model ? ((this.form?.model?.firstname ?? '') + ' ' + (this.form?.model?.lastname ?? - '')).trim() : user.name }} - + {{ + this.form?.model + ? ((this.form?.model?.firstname ?? '') + ' ' + (this.form?.model?.lastname ?? '')).trim() + : user.name + }}