Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: move vehicles from loadpoint to site (#4106)

Browse source
This commit is contained in:
andig 2022-08-14 11:21:37 +02:00 • committed by GitHub
parent 4b6abe158c
commit 16cefae35a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/js/components/Loadpoints.vue
View file

@ -11,6 +11,7 @@
<Loadpoint
v-bind="loadpoint"
:id="index"
:vehicles="vehicles"
class="h-100"
:class="{ 'loadpoint-unselected': !selected(index) }"
@click="scrollTo(index)"
@ -41,6 +42,7 @@ export default {
components: { Loadpoint },
props: {
loadpoints: Array,
vehicles: Array,
},
data() {
return { selectedIndex: 0, snapTimeout: null };

7
assets/js/components/Site.vue
View file

@ -15,7 +15,11 @@
<Energyflow v-bind="energyflow" />
</div>
<div class="d-flex flex-column justify-content-between content-area">
<Loadpoints class="mt-1 mt-sm-2 flex-grow-1" :loadpoints="loadpoints" />
<Loadpoints
class="mt-1 mt-sm-2 flex-grow-1"
:loadpoints="loadpoints"
:vehicles="vehicles"
/>
<Vehicles v-if="$hiddenFeatures" />
<Footer v-bind="footer"></Footer>
</div>
@ -64,6 +68,7 @@ export default {
gridCurrents: Array,
prioritySoC: Number,
siteTitle: String,
vehicles: Array,
auth: Object,

6
core/loadpoint.go
View file

@ -516,7 +516,6 @@ func (lp *LoadPoint) Prepare(uiChan chan<- util.Param, pushChan chan<- push.Even
lp.publish("maxCurrent", lp.MaxCurrent)
lp.publish("phases", lp.phases)
lp.publish("activePhases", lp.activePhases())
lp.publishVehicles()
lp.setDefaultPhases(lp.DefaultPhases)
@ -1176,11 +1175,6 @@ func (lp *LoadPoint) coordinatedVehicles() []api.Vehicle {
return lp.coordinator.GetVehicles()
}
// publishVehicles publishes a slice of vehicle titles
func (lp *LoadPoint) publishVehicles() {
lp.publish("vehicles", vehicleTitles(lp.coordinatedVehicles()))
}
// TODO move up to timer functions
func (lp *LoadPoint) publishTimer(name string, delay time.Duration, action string) {
timer := lp.pvTimer

2
core/site.go
View file

@ -466,6 +466,8 @@ func (site *Site) prepare() {
site.publish("currency", site.tariffs.Currency.String())
site.publish("savingsSince", site.savings.Since().Unix())
site.publish("vehicles", vehicleTitles(site.GetVehicles()))
}
// Prepare attaches communication channels to site and loadpoints

2
dist/assets/index.447d1cbc.css → dist/assets/index.266d8f6e.css vendored
View file

File diff suppressed because one or more lines are too long

4
dist/assets/index.811144e6.js → dist/assets/index.d35976ed.js vendored
View file

File diff suppressed because one or more lines are too long

4
dist/index.html vendored
View file

@ -20,8 +20,8 @@
<meta name="theme-color" content="#020318" />
<title>evcc</title>
<script type="module" crossorigin src="./assets/index.811144e6.js"></script>
<link rel="stylesheet" href="./assets/index.447d1cbc.css">
<script type="module" crossorigin src="./assets/index.d35976ed.js"></script>
<link rel="stylesheet" href="./assets/index.266d8f6e.css">
</head>
<body>
<script>