From b1bae3cb15a46f8639c11d0d2fda4445c2a1557c Mon Sep 17 00:00:00 2001 From: Faris Armoush Date: Thu, 15 May 2025 15:59:02 +0300 Subject: [PATCH] fixed overflow bug on charts. --- .../helpers/energy_management_charts_helper.dart | 6 ++++-- .../widgets/total_energy_consumption_chart.dart | 1 + .../modules/occupancy/widgets/occupancy_chart.dart | 9 ++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart b/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart index 5c56d229..b8849335 100644 --- a/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart +++ b/lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart @@ -20,7 +20,8 @@ abstract final class EnergyManagementChartsHelper { interval: 1, reservedSize: 32, showTitles: true, - maxIncluded: true, + maxIncluded: false, + minIncluded: false, getTitlesWidget: (value, meta) => Padding( padding: const EdgeInsetsDirectional.only(top: 20.0), child: Text( @@ -36,7 +37,8 @@ abstract final class EnergyManagementChartsHelper { leftTitles: AxisTitles( sideTitles: SideTitles( showTitles: true, - maxIncluded: true, + maxIncluded: false, + minIncluded: false, interval: leftTitlesInterval, reservedSize: 110, getTitlesWidget: (value, meta) => Padding( diff --git a/lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart.dart b/lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart.dart index b0f7961a..81052d02 100644 --- a/lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart.dart +++ b/lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart.dart @@ -21,6 +21,7 @@ class TotalEnergyConsumptionChart extends StatelessWidget { gridData: EnergyManagementChartsHelper.gridData().copyWith( checkToShowHorizontalLine: (value) => true, horizontalInterval: 250, + ), borderData: EnergyManagementChartsHelper.borderData(), lineTouchData: EnergyManagementChartsHelper.lineTouchData(), diff --git a/lib/pages/analytics/modules/occupancy/widgets/occupancy_chart.dart b/lib/pages/analytics/modules/occupancy/widgets/occupancy_chart.dart index dc1357bc..8a93ccf1 100644 --- a/lib/pages/analytics/modules/occupancy/widgets/occupancy_chart.dart +++ b/lib/pages/analytics/modules/occupancy/widgets/occupancy_chart.dart @@ -23,7 +23,14 @@ class OccupancyChart extends StatelessWidget { ), borderData: EnergyManagementChartsHelper.borderData(), barTouchData: _barTouchData(context), - titlesData: _titlesData(context), + titlesData: _titlesData(context).copyWith( + leftTitles: _titlesData(context).leftTitles.copyWith( + sideTitles: _titlesData(context).leftTitles.sideTitles.copyWith( + maxIncluded: true, + minIncluded: true, + ), + ), + ), barGroups: List.generate(chartData.length, (index) { final actual = chartData[index]; return BarChartGroupData(