100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI: Corrected time period options for Bar Chart- and Chart widget (#2354)
Martin Peetersc7cfc0e04ffc
diff --git a/ui/component/or-attribute-barchart/src/index.ts b/ui/component/or-attribute-barchart/src/index.tsindex bf07a627a..e8da271bd 100644--- a/ui/component/or-attribute-barchart/src/index.ts+++ b/ui/component/or-attribute-barchart/src/index.ts@@ -1330,6 +1330,7 @@ export class OrAttributeBarChart extends LitElement {public static getDefaultTimeWindowOptions(): Map<string, [moment.unitOfTime.DurationConstructor, number]> {return new Map<string, [moment.unitOfTime.DurationConstructor, number]>([+ ["60Minutes", ["minutes", 60]],["Hour", ["hours", 1]],["6Hours", ["hours", 6]],["24Hours", ["hours", 24]],@@ -1338,6 +1339,8 @@ export class OrAttributeBarChart extends LitElement {["Week", ["weeks", 1]],["30Days", ["days", 30]],["Month", ["months", 1]],+ ["90Days", ["days", 90]],+ ["6Months", ["months", 6]],["365Days", ["days", 365]],["Year", ["years", 1]]]);diff --git a/ui/component/or-dashboard-builder/src/widgets/chart-widget.ts b/ui/component/or-dashboard-builder/src/widgets/chart-widget.tsindex 923f7d5bb..56cbb9106 100644--- a/ui/component/or-dashboard-builder/src/widgets/chart-widget.ts+++ b/ui/component/or-dashboard-builder/src/widgets/chart-widget.ts@@ -25,19 +25,19 @@ export interface ChartWidgetConfig extends AssetWidgetConfig {function getDefaultTimeWindowOptions(): Map<string, [moment.unitOfTime.DurationConstructor, number]> {return new Map<string, [moment.unitOfTime.DurationConstructor, number]>([- ["60Minutes", ['minutes', 60]],- ["Hour", ['hours', 1]],- ["6Hours", ['hours', 6]],- ["24Hours", ['hours', 24]],- ["Day", ['days', 1]],- ["7Days", ['days', 7]],- ["Week", ['weeks', 1]],- ["30Days", ['days', 30]],- ["Month", ['months', 1]],- ["90Days", ['days', 90]],- ["6Months", ['months', 6]],- ["365Days", ['days', 365]],- ["Year", ['years', 1]]+ ["60Minutes", ["minutes", 60]],+ ["Hour", ["hours", 1]],+ ["6Hours", ["hours", 6]],+ ["24Hours", ["hours", 24]],+ ["Day", ["days", 1]],+ ["7Days", ["days", 7]],+ ["Week", ["weeks", 1]],+ ["30Days", ["days", 30]],+ ["Month", ["months", 1]],+ ["90Days", ["days", 90]],+ ["6Months", ["months", 6]],+ ["365Days", ["days", 365]],+ ["Year", ["years", 1]]]);}