Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions packages/modules/web_themes/koala/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@
@auto_str
class KoalaWebThemeConfiguration:
def __init__(self,
hide_standard_vehicle: bool = False,
history_chart_range: int = 3600,
chargePoint_card_view_breakpoint: int = 4,
vehicle_card_view_breakpoint: int = 4,
chargePoint_table_search_input_field: bool = False,
vehicle_table_search_input_field: bool = False) -> None:
self.hide_standard_vehicle = hide_standard_vehicle
self.history_chart_range = history_chart_range
self.chargePoint_card_view_breakpoint = chargePoint_card_view_breakpoint
self.vehicle_card_view_breakpoint = vehicle_card_view_breakpoint
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export interface ThemeConfiguration {
hide_standard_vehicle: boolean;
history_chart_range: number;
chargePoint_card_view_breakpoint: number;
vehicle_card_view_breakpoint: number;
Expand Down
23 changes: 17 additions & 6 deletions packages/modules/web_themes/koala/source/src/stores/mqtt-store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ export const useMqttStore = defineStore('mqtt', () => {
*/
const convertDcCurrentToPower = (dcCurrent: number): number => {
return Math.round((dcCurrent * 3 * 230) / 1000);
}
};

/**
* Converts power in Kilowatts to DC current in Ampere.
Expand All @@ -991,8 +991,8 @@ export const useMqttStore = defineStore('mqtt', () => {
* @returns number
*/
const convertPowerToDcCurrent = (power: number): number => {
return Math.round(power * 1000 / (230 * 3));
}
return Math.round((power * 1000) / (230 * 3));
};

/**
* Get or set the charge point connected vehicle instant charging DC power identified by the charge point id
Expand Down Expand Up @@ -2022,14 +2022,25 @@ export const useMqttStore = defineStore('mqtt', () => {
* Get a list of all vehicles
* @returns Vehicle[]
*/
const vehicleList = computed(() => {
const vehicleList = computed<Vehicle[]>(() => {
const list = getWildcardValues.value('openWB/vehicle/+/name');
const hideStandardFahrzeuge =
themeConfiguration.value?.hide_standard_vehicle;
// Filter out Standard-Fahrzeug if hideStandardFahrzeuge is true
const filteredList = hideStandardFahrzeuge
? Object.fromEntries(
Object.entries(list).filter(
([, name]) =>
typeof name === 'string' && name !== 'Standard-Fahrzeug',
),
)
: list;
// generate an array of objects, containing vehicle index and name
return Object.keys(list).map((key) => {
return Object.keys(filteredList).map((key) => {
const vehicleIndex = parseInt(key.split('/')[2]);
return {
id: vehicleIndex,
name: list[key],
name: filteredList[key],
} as Vehicle;
});
});
Expand Down