SS-FCSC/uaestats_fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chart changes merge

Browse Source
This commit is contained in:
Surendiran 2026-01-13 17:59:46 +05:30
parent e599ee6655
commit 5f45f1cb05
1 changed files with 39 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
lib/presentation/Screens/charts/screens/chart_screen.dart
View File

@ -110,7 +110,6 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
late UserService _userService; late UserService _userService;
late double tourCard; late double tourCard;
late bool isDarkTheme; late bool isDarkTheme;
String? _previousTabId;
@override @override
void initState() { void initState() {
@ -1672,45 +1671,6 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
Navigator.pop(context); Navigator.pop(context);
} }
void clear() {
print('CLEAR ---');
// List<Map<String, dynamic>> selectedFilters =
// selectedFiltersStorage.isNotEmpty
// ? List.from(selectedFiltersStorage) // Use stored filters
// : filters.map((filter) {
// return {"filter_key": filter["filter_key"], "filter_data": []};
// }).toList(); // Or initialize empty filters
// selectedFilters.forEach((filter) {
// filter["filter_data"].clear();
// });
setState(() {
chartsData = List.from(originalTabChartsData);
cardData = List.from(originalTabCardData);
});
selectedFiltersStorage.clear();
formattedFilters = [];
final locale = ref.watch(localeProvider)?.languageCode ?? 'en';
print('locale22- $locale');
final isDark = ref.watch(themeProvider) == ThemeMode.dark ||
(ref.watch(themeProvider) == ThemeMode.system &&
MediaQuery.of(context).platformBrightness == Brightness.dark);
print('isDark filter');
print(isDark);
final themeMode = (isDark ? 'dark' : 'light');
print(themeMode);
// fetchChartData(
// widget.dataSets,
// locale,
// tabWiseKpi, // Ensure you are passing the correct KPI here
// formattedFilters, // Pass the formatted filter data here
// themeMode);
}
String capitalizeAndSplit(String text) { String capitalizeAndSplit(String text) {
if (text.isEmpty) return text; if (text.isEmpty) return text;
return text return text
@ -2081,13 +2041,6 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
print( print(
"Selected Filters before applying: $selectedFilters"); "Selected Filters before applying: $selectedFilters");
final hasAnyFilterData = selectedFilters.any(
(filter) =>
(filter['filter_data'] as List).isNotEmpty,
);
if (hasAnyFilterData) {
print("⛔ No filter data, resetting");
if (selectedFilters.every( if (selectedFilters.every(
(filter) => filter['filter_data'].isEmpty)) { (filter) => filter['filter_data'].isEmpty)) {
setState(() { setState(() {
@ -2108,14 +2061,29 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
'en'; 'en';
print('locale22- $locale'); print('locale22- $locale');
final isDark = ref.watch(themeProvider) == final isDark =
ThemeMode.dark || ref.watch(themeProvider) == ThemeMode.dark ||
(ref.watch(themeProvider) == (ref.watch(themeProvider) ==
ThemeMode.system && ThemeMode.system &&
MediaQuery.of(context) MediaQuery.of(context)
.platformBrightness == .platformBrightness ==
Brightness.dark); Brightness.dark);
final themeMode = (isDark ? 'dark' : 'light');
fetchChartData(
widget.dataSets,
locale,
tabWiseKpi, // Ensure you are passing the correct KPI here
formattedFilters, // Pass the formatted filter data here
themeMode);
Navigator.pop(context);
} else {
setState(() {
// isLoading = true;
chartsData = originalTabChartsData;
cardData = originalTabCardData;
});
applyFilters(context, filters, chartsData, applyFilters(context, filters, chartsData,
cardData, selectedFilters); cardData, selectedFilters);
// selectedFiltersStorage = List.from(selectedFilters); // selectedFiltersStorage = List.from(selectedFilters);