Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: replicate details of previous history energy monitor #2279

Merged
merged 3,062 commits into from
Jul 21, 2023

Conversation

lukasrgr
Copy link
Contributor

@lukasrgr lukasrgr commented Jul 20, 2023

Minor Improvements

  • show zero as well in legend labels
  • change order of label "State of Charge" being at most right, because it makes more sense to have it next to the corresponding yAxis

Michael Grill and others added 30 commits March 22, 2023 09:31
* added wrapper to set default value dynamically
 * check if 'ALIAS' field is provided

Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/579
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Michael Grill <[email protected]>
Co-committed-by: Michael Grill <[email protected]>
)

Allow better tracing on errors like
```
INFO  [.backend.edgewebsocket.OnClose] [Edge.Websocket] [UNKNOWN] Disconnected. Code [1003] Reason [Connection to backend failed. Apikey []. Error: Apikey is missing in handshake]
```

Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/589
Reviewed-by: Michael Grill <[email protected]>
* Hardy Barth: added number of charge points selectable
 * Fixed providing ids of apps with multiple componentids with the same basename
 * JsonUtils: added JsonObject collector
 * Add Common Properties
 * Formly:
      * add expression builder
      * add wrapper

Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/580
Reviewed-by: Hueseyin Sahutoglu <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Reviewed-by: Jan Seidemann <[email protected]>
Co-authored-by: Michael Grill <[email protected]>
Co-committed-by: Michael Grill <[email protected]>
Reset State-Channels when HeatPump gets modified
Co-authored-by: Michael Grill <[email protected]>
Co-committed-by: Michael Grill <[email protected]>
Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/591
Reviewed-by: Jan Seidemann <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Michael Grill <[email protected]>
Co-committed-by: Michael Grill <[email protected]>
# Conflicts:
#	io.openems.backend.metadata.odoo/src/io/openems/backend/metadata/odoo/OdooMetadata.java
#	ui/src/app/app-routing.module.ts
#	ui/src/app/app.module.ts
#	ui/src/app/appupdateservice.ts
#	ui/src/app/changelog/view/component/changelog.component.html
#	ui/src/app/changelog/view/component/changelog.component.ts
#	ui/src/app/changelog/view/component/changelog.constants.ts
#	ui/src/app/edge/history/history.component.html
#	ui/src/app/edge/live/common/storage/modal/modal.component.html
#	ui/src/app/edge/live/live.component.ts
#	ui/src/app/edge/settings/app/permissions.ts
#	ui/src/app/edge/settings/settings.component.html
#	ui/src/app/edge/settings/settings.module.ts
#	ui/src/app/index/index.component.ts
#	ui/src/app/shared/history-data-error.component.ts
#	ui/src/app/shared/service/service.ts
#	ui/src/assets/i18n/cz.json
#	ui/src/assets/i18n/de.json
#	ui/src/assets/i18n/en.json
#	ui/src/assets/i18n/es.json
#	ui/src/assets/i18n/fr.json
#	ui/src/assets/i18n/nl.json
Merge/apply #1685

Java 17 is the latest LTS (Long Term Support) release of Java.

See discussion in OpenEMS Community: https://community.openems.io/t/switch-to-java-17/1326

Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/593
Found at fems3504; system was running properly

Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/597
Reviewed-by: Hueseyin Sahutoglu <[email protected]>
Co-authored-by: Stefan Feilmeier <[email protected]>
Co-committed-by: Stefan Feilmeier <[email protected]>
update to make woodpecker support java 17

Co-authored-by: Kai Jeschek <[email protected]>
Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/598
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Kai Jeschek <[email protected]>
Co-committed-by: Kai Jeschek <[email protected]>
Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/586
Reviewed-by: Jan Seidemann <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Lukas Rieger <[email protected]>
Co-committed-by: Lukas Rieger <[email protected]>
Before the warning state Channel "NoValidTargetTime" would not get set on @Modified when `isTargetTimeSpecified` became false.

Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/601
Reviewed-by: sebastian asen <[email protected]>
Changed the label on flat and modal widgets.
made buy on grid state to be displayed only with old controller.

Co-authored-by: Sagar Bandi Venu <[email protected]>
Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/573
Reviewed-by: Jan Seidemann <[email protected]>
Reviewed-by: Lukas Rieger <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Sagar Venu <[email protected]>
Co-committed-by: Sagar Venu <[email protected]>
Replaced the faq link with latest one.

Co-authored-by: Sagar Bandi Venu <[email protected]>
Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/602
Reviewed-by: Lukas Rieger <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Sagar Venu <[email protected]>
Co-committed-by: Sagar Venu <[email protected]>
- Permanently remove BOOLEAN states
- Remove "Temperature Difference Too Big Pre-Alarm"; found on working fems1364

Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/603
Reviewed-by: Hueseyin Sahutoglu <[email protected]>
Co-authored-by: Stefan Feilmeier <[email protected]>
Co-committed-by: Stefan Feilmeier <[email protected]>
Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/595
Reviewed-by: Jan Seidemann <[email protected]>
Reviewed-by: Lukas Rieger <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Michael Grill <[email protected]>
Co-committed-by: Michael Grill <[email protected]>
Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/594
Reviewed-by: Jan Seidemann <[email protected]>
Reviewed-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Lukas Rieger <[email protected]>
Co-committed-by: Lukas Rieger <[email protected]>
lukasrgr and others added 23 commits July 13, 2023 17:40
Co-authored-by: Lukas Rieger <[email protected]>
Co-authored-by: Sagar <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <[email protected]>
Co-authored-by: Kai J <[email protected]>
Co-authored-by: Sebastian Asen <[email protected]>
Reviewed-on: https://git.intranet.fenecon.de/FENECON/fems/pulls/712
Co-authored-by: Lukas Rieger <[email protected]>
Co-committed-by: Lukas Rieger <[email protected]>
# Conflicts:
#	cnf/pom.xml
#	io.openems.edge.application/EdgeApp.bndrun
#	ui/package-lock.json
#	ui/package.json
#	ui/src/app/app-routing.module.ts
#	ui/src/app/edge/history/common/energy/chart/chart.spec.ts
#	ui/src/app/edge/history/common/energy/chart/chart.ts
#	ui/src/app/edge/settings/settings.component.html
#	ui/src/app/edge/settings/settings.module.ts
#	ui/src/app/user/user.component.html
#	ui/src/assets/i18n/de.json
#	ui/src/assets/i18n/en.json
#	ui/src/assets/i18n/es.json
#	ui/src/assets/i18n/fr.json
#	ui/src/assets/i18n/nl.json
#	ui/src/themes/openems/environments/theme.ts
…to feature/ui-dev/restoreOldEnergyMonitor

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
@github-actions
Copy link

Code Coverage

@lukasrgr lukasrgr marked this pull request as ready for review July 20, 2023 21:36
@lukasrgr lukasrgr requested a review from sfeilmeier July 20, 2023 21:38
@sfeilmeier sfeilmeier changed the title UI: restore old energy monitor UI: replicate details of previous history energy monitor Jul 21, 2023
@sfeilmeier sfeilmeier merged commit 52f34d3 into develop Jul 21, 2023
3 checks passed
@sfeilmeier sfeilmeier deleted the feature/ui-dev/restoreOldEnergyMonitor branch July 21, 2023 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants