Skip to content

Colors theme (display): Fixes, dependency updates, max price keyboard #2204

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.

Sign up for GitHub

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

Merged
benderl merged 7 commits into from
Feb 10, 2025
Merged

Colors theme (display): Fixes, dependency updates, max price keyboard #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fdbd512
fix time display format
cshagen Feb 8, 2025
29e6ce9
fix pin check for settings
cshagen Feb 8, 2025
fa4d397
update dependencies
cshagen Feb 8, 2025
b98893b
update to node 22
cshagen Feb 8, 2025
521179c
add keypad for max price
cshagen Feb 9, 2025
284d413
update range slider for price chart
cshagen Feb 9, 2025
703ba7c
fix pricechart layout
cshagen Feb 10, 2025
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
976 changes: 680 additions & 296 deletions packages/modules/display_themes/colors/source/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions packages/modules/display_themes/colors/source/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "colordisplaytheme2",
"version": "0.9.0",
"version": "2.1.0",
"license": "MIT",
"type": "module",
"scripts": {
Expand All @@ -20,29 +20,29 @@
"vue": "^3.5.10"
},
"devDependencies": {
"@babel/types": "^7.26.5",
"@babel/types": "^7.26.8",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@esbuild-plugins/node-modules-polyfill": "^0.2.2",
"@eslint/compat": "^1.2.5",
"@eslint/compat": "^1.2.6",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.18.0",
"@rushstack/eslint-patch": "^1.10.5",
"@tsconfig/node20": "^20.1.4",
"@tsconfig/node22": "^22.0.0",
"@types/bootstrap": "^5.2.10",
"@types/d3": "^7.4.3",
"@types/node": "^20.17.14",
"@types/node": "^22.13.1",
"@vitejs/plugin-vue": "^5.2.1",
"@vue/eslint-config-prettier": "^10.2.0",
"@vue/eslint-config-typescript": "^14.3.0",
"@vue/tsconfig": "^0.7.0",
"esbuild": "^0.24.2",
"eslint": "^9.18.0",
"eslint": "^9.20.0",
"eslint-plugin-vue": "^9.32.0",
"npm-run-all2": "^7.0.2",
"prettier": "^3.4.2",
"rollup": "^4.31.0",
"rollup": "^4.34.6",
"typescript": "^5.7.3",
"vite": "^6.0.7",
"vite": "^6.1.0",
"vue-tsc": "^2.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/modules/display_themes/colors/source/src/assets/js/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export function formatTime(seconds: number) {
}
}
export function formatCurrentTime(d: Date) {
return d.toLocaleTimeString([], { hour: 'numeric', minute: '2-digit' })
return d.toLocaleTimeString(['de-DE'], { hour: 'numeric', minute: '2-digit' })
}

export function formatDate(d: Date, mode: string = 'day') {
Expand Down
49 changes: 25 additions & 24 deletions ...ges/modules/display_themes/colors/source/src/components/chargePointList/CPChargePoint.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,31 +160,32 @@ const cpNameStyle = computed(() => {
function openSettings() {
if (displayConfig.locked) {
unlockDisplay()
}
const settingspage = new Modal('#settingspage')
settingspage.toggle()
let chargePanelName = ''
switch (props.chargepoint.chargeMode) {
case 'instant_charging':
chargePanelName = '#inSettings'
break
case 'pv_charging':
chargePanelName = '#phvSettings'
break
case 'scheduled_charging':
chargePanelName = '#scSettings'
break
default:
chargePanelName = '#chSettings'
}
const tabToActivate = document.querySelector(
chargePanelName + props.chargepoint.id,
)
if (tabToActivate) {
var tab = new Tab(tabToActivate)
tab.show()
} else {
console.error('no element found')
const settingspage = new Modal('#settingspage')
settingspage.toggle()
let chargePanelName = ''
switch (props.chargepoint.chargeMode) {
case 'instant_charging':
chargePanelName = '#inSettings'
break
case 'pv_charging':
chargePanelName = '#phvSettings'
break
case 'scheduled_charging':
chargePanelName = '#scSettings'
break
default:
chargePanelName = '#chSettings'
}
const tabToActivate = document.querySelector(
chargePanelName + props.chargepoint.id,
)
if (tabToActivate) {
var tab = new Tab(tabToActivate)
tab.show()
} else {
console.error('no element found')
}
}
}
</script>
Expand Down
64 changes: 34 additions & 30 deletions packages/modules/display_themes/colors/source/src/components/chargePointList/CPVehicle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@
class="grid-col-4 grid-left"
>
<BatterySymbol :soc="soc" class="me-2" />
<DisplayButton
v-if="chargepoint.isSocManual"
@click="editSoc = !editSoc"
>
<DisplayButton v-if="chargepoint.isSocManual" @click="startSocEditor">
<i
class="fa-solid fa-sm fas fa-edit py-0 px-3 mt-3"
:style="{ color: 'var(--color-fg)' }"
Expand Down Expand Up @@ -182,44 +179,51 @@ const chargeMode = computed({
}
},
})

const currentPrice = computed(() => {
const [p] = etData.etPriceList.values()
return (Math.round(p * 10) / 10).toFixed(1)
})
function openSettings(target: string = '') {
if (displayConfig.locked) {
unlockDisplay()
}
const settingspage = new Modal('#settingspage')
settingspage.toggle()
let chargePanelName = target
if (target == '') {
switch (props.chargepoint.chargeMode) {
case 'instant_charging':
chargePanelName = '#inSettings'
break
case 'pv_charging':
chargePanelName = '#phvSettings'
break
case 'scheduled_charging':
chargePanelName = '#scSettings'
break
default:
chargePanelName = '#chSettings'
} else {
const settingspage = new Modal('#settingspage')
settingspage.toggle()
let chargePanelName = target
if (target == '') {
switch (props.chargepoint.chargeMode) {
case 'instant_charging':
chargePanelName = '#inSettings'
break
case 'pv_charging':
chargePanelName = '#phvSettings'
break
case 'scheduled_charging':
chargePanelName = '#scSettings'
break
default:
chargePanelName = '#chSettings'
}
}
const tabToActivate = document.querySelector(
chargePanelName + props.chargepoint.id,
)
if (tabToActivate) {
var tab = new Tab(tabToActivate)
tab.show()
} else {
console.error('no element found')
}
}

const tabToActivate = document.querySelector(
chargePanelName + props.chargepoint.id,
)
if (tabToActivate) {
var tab = new Tab(tabToActivate)
tab.show()
}
function startSocEditor() {
if (displayConfig.locked) {
unlockDisplay()
} else {
console.error('no element found')
editSoc.value = !editSoc.value
}
}

const currentPriceStyle = computed(() => {
return props.chargepoint.etMaxPrice >= +currentPrice.value
? { color: 'var(--color-charging)' }
Expand Down
6 changes: 3 additions & 3 deletions packages/modules/display_themes/colors/source/src/components/powerGraph/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ export const dayGraph = reactive({
(this.date.getMonth() + 1).toString().padStart(2, '0') +
this.date.getDate().toString().padStart(2, '0')
mqttSubscribe(this.topic)
sendCommand('getDailyLog',{ day: dateString })
sendCommand('getDailyLog', { day: dateString })

// graphData.data = []
}
},
Expand Down Expand Up @@ -176,7 +176,7 @@ export const monthGraph = reactive({
this.year.toString() + this.month.toString().padStart(2, '0')
graphData.data = []
mqttSubscribe(this.topic)
sendCommand('getMonthlyLog',{ month: dateString })
sendCommand('getMonthlyLog', { month: dateString })
},
deactivate() {
mqttUnsubscribe(this.topic)
Expand Down
Loading