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

Add loadpoint config api (BC) #12958

Open
wants to merge 152 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
152 commits
Select commit Hold shift + click to select a range
dbaa26d
wip
andig Mar 13, 2024
6faf0bd
Add loadpoint config api
andig Mar 15, 2024
98a3070
Migrate settings
andig Mar 15, 2024
f59e60a
wip
andig Mar 15, 2024
13be207
Deprecate mode
andig Mar 15, 2024
7de60e1
wip
andig Mar 15, 2024
83b3b95
wip
andig Mar 15, 2024
82e7503
wip
andig Mar 15, 2024
b07a69f
Merge branch 'master' into feat/loadpoint-config
andig Mar 15, 2024
6802f5b
Merge branch 'master' into feat/loadpoint-config
naltatis Mar 24, 2024
dae8c6a
loadpoint config ui, wip
naltatis Mar 25, 2024
d403997
form spacing
naltatis Mar 25, 2024
acfa5b4
updated general section; loadpoint status (mock)
naltatis Mar 25, 2024
ffb4a1e
general settings
naltatis Mar 26, 2024
9ca47d1
Merge branch 'master' into feat/loadpoint-config
naltatis Mar 26, 2024
be4899e
fix change title test
naltatis Mar 26, 2024
36f9c87
Add device references
andig Mar 26, 2024
5b9ebc9
added charger/meter/vehicle, color contrast, status values, loadpoint…
naltatis Mar 27, 2024
47627a6
Return priority=0
andig Mar 28, 2024
17176e1
Smart cost: zero is disabled
andig Mar 28, 2024
d191c4d
Persist thresholds
andig Mar 28, 2024
772af51
Align spelling
andig Mar 29, 2024
9e88b9b
Add soc config
andig Mar 29, 2024
bf737ea
Add poll mode migration
andig Mar 29, 2024
829447f
Merge branch 'master' into feat/loadpoint-config
naltatis Mar 30, 2024
c278f90
toml fix
naltatis Mar 30, 2024
a18eea0
Marshal poll mode as string
andig Apr 3, 2024
44564dd
current limits
naltatis Apr 5, 2024
b76304f
Merge branch 'master' into feat/loadpoint-config
naltatis Jun 7, 2024
29e86d3
Merge branch 'master' into feat/loadpoint-config
naltatis Jun 7, 2024
3075eb9
resolve
naltatis Jun 7, 2024
2d1f9ea
npm lint
naltatis Jun 7, 2024
e165479
wip
andig Jun 8, 2024
b6eddd7
Merge branch 'master' into feat/loadpoint-config
naltatis Jun 8, 2024
4c146e7
toml
naltatis Jun 8, 2024
1e7ab54
fix ui build
naltatis Jun 8, 2024
2c77bcf
Fix config structs
andig Jun 8, 2024
403ea33
Fix thresholds
andig Jun 8, 2024
49b335c
wip
andig Jun 8, 2024
1810477
wip
andig Jun 8, 2024
d873f03
gp
andig Jun 8, 2024
cca97f2
Add mqtt
andig Jun 9, 2024
0bda0f6
restored /config/loadpoints route
naltatis Jun 9, 2024
749633f
align loadpoint modal layout with other new setting modals
naltatis Jun 9, 2024
82cb47b
Default vehicle; estimate checkbox
naltatis Jun 14, 2024
094c68a
create, edit, remove charge meters from loadpoint
naltatis Jun 14, 2024
315dc03
ui lint
naltatis Jun 14, 2024
0207a63
modal refactor
naltatis Jun 14, 2024
dedec3c
Merge branch 'master' into feat/loadpoint-config
naltatis Jun 14, 2024
ab0af27
modal refactor
naltatis Jun 14, 2024
94020d1
simplify lp updating
naltatis Jun 14, 2024
74061a6
lint
naltatis Jun 14, 2024
7d4691f
duration conversion; add and delete loadpoint
naltatis Jun 19, 2024
db80260
Merge branch 'master' into feat/loadpoint-config
naltatis Jun 19, 2024
9c2c1d0
merge
naltatis Jun 19, 2024
3d1c239
added charger modal
naltatis Jun 19, 2024
a3c2c4a
Split static/dynamic config, add circuit reference
andig Jun 22, 2024
60ec28c
Split static config
andig Jun 22, 2024
9ff0a67
wip
andig Jun 22, 2024
bbae6d5
Loadpoints: add CRUD
andig Jun 22, 2024
b7645d8
wip
andig Jun 22, 2024
b9d8a8b
cleaner loadpoint form
naltatis Jun 24, 2024
6f0b6d2
Rename (default) vehicle
andig Jun 30, 2024
55c251d
Better errors
andig Jun 30, 2024
05d7085
Merge branch 'master' into feat/loadpoint-config
naltatis Jul 10, 2024
ee0331d
add/remove loadpoint, quickfix init errors
naltatis Jul 10, 2024
634b4d4
add/remove loadpoint
naltatis Jul 10, 2024
df8d259
wip: between modals animation
naltatis Jul 11, 2024
ff389e3
Merge branch 'master' into feat/loadpoint-config
naltatis Jul 24, 2024
89551c0
fix imports
naltatis Jul 24, 2024
247e26a
loadpoint <> charger|meter modal transition; added charger identifiers
naltatis Jul 24, 2024
fb0e828
Merge branch 'master' into feat/loadpoint-config
naltatis Jul 28, 2024
a1d0e89
Fix tests
andig Aug 3, 2024
1da90fb
Move configurable loadpoints config from settings to config
andig Aug 3, 2024
64364f9
Merge branch 'master' into feat/loadpoint-config
naltatis Aug 11, 2024
67af355
merge fix
naltatis Aug 11, 2024
50b8e73
Add YAML todo
andig Aug 11, 2024
b15e426
Fix panic when creating loadpoint via UI
andig Aug 11, 2024
dce044b
Fix lint
andig Aug 11, 2024
f75a6bc
Fix poll mode
andig Aug 11, 2024
d3cb63a
fix poll ui; meter modal
naltatis Aug 14, 2024
7a2eb13
Introduce tabs for loadpoint settings; better meter/charger names
naltatis Aug 14, 2024
e95e09f
add circuit assignment to loadpoint
naltatis Aug 14, 2024
da2a7d2
Merge branch 'master' into feat/loadpoint-config
naltatis Aug 14, 2024
61f30fe
add collapsable advanced fields to charger modal
naltatis Aug 14, 2024
fe01a0a
fix grid modal
naltatis Aug 14, 2024
65f6b5e
Merge branch 'master' into feat/loadpoint-config
naltatis Aug 14, 2024
3d35698
debugging
naltatis Sep 10, 2024
cfa47a8
Merge branch 'master' into feat/loadpoint-config
naltatis Sep 10, 2024
49eeb3e
improve loadpoint creation ux; add ocpp url; charger groups
naltatis Sep 10, 2024
7b64b15
fix ui lint
naltatis Sep 10, 2024
bea94ee
add failing integration tests for loadpoint config ui
naltatis Sep 10, 2024
4d5acc5
Fix tests
andig Sep 15, 2024
67372e9
Fix loadpoint persistence
andig Oct 4, 2024
419c9f0
Merge branch 'master' into feat/loadpoint-config
andig Oct 4, 2024
867680c
wip
andig Oct 4, 2024
61c95b3
Fix settings key names
andig Oct 4, 2024
ff535ab
add loadpoint config update testcase
naltatis Oct 4, 2024
4e7d899
Fix updating config
andig Oct 4, 2024
3023c89
Remove safeguards
andig Oct 4, 2024
6bdf1e8
Add 1p3p capability
andig Oct 4, 2024
24413b4
wip
andig Oct 4, 2024
193d56d
Revert renaming phases key
andig Oct 4, 2024
c5147f4
Merge branch 'master' into feat/loadpoint-config
andig Oct 5, 2024
7600bb6
Merge branch 'master' into feat/loadpoint-config
andig Oct 5, 2024
a086289
wip
andig Oct 5, 2024
c214811
Merge branch 'master' into feat/loadpoint-config
naltatis Oct 24, 2024
e116a1e
proper merge
naltatis Oct 24, 2024
39062a0
show phaseswitch capability
naltatis Oct 24, 2024
80936dc
fix threshold format
naltatis Oct 24, 2024
a093b27
add failing e2e test when updating individual lp properties
naltatis Oct 24, 2024
6c4f882
lint
naltatis Oct 24, 2024
7025141
Fix partial update wiping db config due to short-circuiting dynamic u…
andig Oct 26, 2024
c5315a5
Merge branch 'master' into feat/loadpoint-config
naltatis Oct 26, 2024
f1cb75b
format
naltatis Oct 26, 2024
2cb6a63
Merge branch 'master' into feat/loadpoint-config
naltatis Oct 26, 2024
f95e73d
eslint
naltatis Oct 26, 2024
dfac61f
fix e2e
naltatis Oct 26, 2024
1e3bf28
Merge branch 'master' into feat/loadpoint-config
naltatis Nov 5, 2024
e7d1f02
lint
naltatis Nov 5, 2024
05f0815
add sponsor hint when necessary
naltatis Nov 5, 2024
cc12ea9
Merge branch 'master' into feat/loadpoint-config
naltatis Nov 12, 2024
2477c40
Merge branch 'master' into feat/loadpoint-config
naltatis Nov 13, 2024
4f9f862
lint
naltatis Nov 13, 2024
674e035
modal autofocus
naltatis Nov 13, 2024
a090a6a
mock gen
naltatis Nov 13, 2024
1fbdee6
add 1p3p demo option; lp durations; remove value scaling; headlines i…
naltatis Nov 13, 2024
c39e7bd
lint
naltatis Nov 13, 2024
6f338de
handle 1p3p charger differences in lp config
naltatis Nov 23, 2024
3c42471
smartcostlimit: fix float read behaviour
naltatis Nov 23, 2024
dad3d39
lp mode vs defaultMode; config settings error handling
naltatis Nov 23, 2024
f650d1d
Merge branch 'master' into feat/loadpoint-config
naltatis Nov 23, 2024
b7f501c
fix e2e tests
naltatis Nov 23, 2024
d1413c2
Merge branch 'master' into feat/loadpoint-config
naltatis Dec 4, 2024
fd08c15
manual testing; a11y
naltatis Dec 4, 2024
e51f952
better onboarding
naltatis Dec 4, 2024
dea78f9
translation
naltatis Dec 4, 2024
cb3e814
Merge branch 'master' into feat/loadpoint-config
naltatis Dec 4, 2024
e03bb75
update experimental hint
naltatis Dec 4, 2024
655da8e
e2e: clean configuration
naltatis Dec 4, 2024
60d6ddd
e2e: from empty config
naltatis Dec 4, 2024
49723e1
gst
naltatis Dec 4, 2024
0e86ff0
e2e stability
naltatis Dec 4, 2024
1ac55bf
add onboarding screen; e2e: setup with empty config
naltatis Dec 5, 2024
32550fe
Filter meter and charger references
andig Dec 6, 2024
eb83a79
Merge branch 'master' into feat/loadpoint-config
naltatis Dec 10, 2024
875d0bf
e2e: defaultMode vs mode
naltatis Dec 10, 2024
dfb41d0
setup
naltatis Dec 10, 2024
18a0ab3
e2e fix
naltatis Dec 10, 2024
dd87149
Merge branch 'master' into feat/loadpoint-config
naltatis Dec 18, 2024
d211697
migrate: clean all config devices
naltatis Dec 18, 2024
ce09aaf
Loadpoint: add more runtime settings; simulate vehicles
naltatis Dec 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var ErrNotAvailable = errors.New("not available")
var ErrMustRetry = errors.New("must retry")

// ErrSponsorRequired indicates that a sponsor token is required
var ErrSponsorRequired = errors.New("sponsorship required, see https://github.com/evcc-io/evcc#sponsorship")
var ErrSponsorRequired = errors.New("sponsorship required, see https://docs.evcc.io/docs/sponsorship")

// ErrMissingCredentials indicates that user/password are missing
var ErrMissingCredentials = errors.New("missing credentials")
Expand Down
2 changes: 1 addition & 1 deletion api/globalconfig/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type All struct {
Vehicles []config.Named
Tariffs Tariffs
Site map[string]interface{}
Loadpoints []map[string]interface{}
Loadpoints []config.Named
Circuits []config.Named
}

Expand Down
34 changes: 31 additions & 3 deletions assets/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@
--evcc-green: #baffcb;
--evcc-dark-green: #0fde41ff;
--evcc-darker-green: #0ba631ff;
--evcc-darker-green-rgb: 11, 166, 49;
--evcc-darkest-green: #076f20ff;
--evcc-darkest-green-rgb: 11, 166, 49;
--evcc-darkest-green-rgb: 7, 111, 32;
--evcc-yellow: #faf000;
--evcc-dark-yellow: #bbb400;
--evcc-orange: #ff9000;
Expand Down Expand Up @@ -269,10 +270,16 @@ a:hover {
--bs-btn-hover-border-color: var(--bs-gray-medium);
}

.btn-link:hover {
.btn-link:hover,
.btn-link:focus {
color: var(--bs-primary);
}

.btn-link:focus {
outline: var(--bs-focus-ring-width) solid var(--bs-focus-ring-color);
outline-width: var(--bs-focus-ring-width);
}

.dark .btn-outline-secondary {
--bs-btn-color: var(--bs-gray-bright);
--bs-btn-border-color: var(--bs-gray-bright);
Expand Down Expand Up @@ -364,6 +371,16 @@ a:hover {
transition-timing-function: linear;
}

.modal.fade-left .modal-dialog {
transform: translate(-50px, 0);
}
.modal.fade-right .modal-dialog {
transform: translate(50px, 0);
}
.modal.show .modal-dialog {
transform: none;
}

.modal-header {
padding: 0 0 1rem 0;
border: none;
Expand Down Expand Up @@ -517,8 +534,13 @@ input::-webkit-datetime-edit {
.form-control {
color: var(--evcc-default-text);
}
.form-control:disabled {
.form-control:disabled,
.form-control:read-only,
.dark .form-control:disabled,
.dark .form-control:read-only {
background-color: var(--bs-secondary-bg);
color: var(--bs-gray-dark);
opacity: 1;
}

.dark .form-control {
Expand Down Expand Up @@ -633,6 +655,12 @@ html.app .modal-dialog {
color: var(--evcc-darkest-green);
}

.hyphenate {
overflow-wrap: break-word;
word-wrap: break-word;
hyphens: auto;
}

input::-webkit-date-and-time-value {
text-align: left;
}
1 change: 1 addition & 0 deletions assets/js/components/ChargingPlan.vue
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ export default {
this.modal.show();
},
updateTargetTimeLabel: function () {
if (!this.effectivePlanTime) return "";
const targetDate = new Date(this.effectivePlanTime);
this.targetTimeLabel = this.fmtAbsoluteDate(targetDate);
},
Expand Down
Loading
Loading