From 1d09d36c8f382f80a1d7ed0d556443b1672dac46 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Sat, 6 Jul 2024 15:23:06 +0530 Subject: [PATCH] fix: merge conflict --- .../modules/reports/views/burn_down_weekly_taskc.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/app/modules/reports/views/burn_down_weekly_taskc.dart b/lib/app/modules/reports/views/burn_down_weekly_taskc.dart index 6d2430d..6d9f582 100644 --- a/lib/app/modules/reports/views/burn_down_weekly_taskc.dart +++ b/lib/app/modules/reports/views/burn_down_weekly_taskc.dart @@ -68,16 +68,16 @@ class BurnDownWeeklyTask extends StatelessWidget { Utils.getWeekNumbertoInt(DateTime.parse(allData[i].entry)); ///check if weeklyInfo contains the week number - if (weeklyInfo.containsKey(weekNumber)) { + if (weeklyInfo.containsKey(weekNumber.toString())) { ///check if the status is pending or completed if (allData[i].status == 'pending') { ///if the status is pending then add 1 to the pending count - weeklyInfo[weekNumber]!['pending'] = - (weeklyInfo[weekNumber]!['pending'] ?? 0) + 1; + weeklyInfo[weekNumber.toString()]!['pending'] = + (weeklyInfo[weekNumber.toString()]!['pending'] ?? 0) + 1; } else if (allData[i].status == 'completed') { ///if the status is completed then add 1 to the completed count - weeklyInfo[weekNumber]!['completed'] = - (weeklyInfo[weekNumber]!['completed'] ?? 0) + 1; + weeklyInfo[weekNumber.toString()]!['completed'] = + (weeklyInfo[weekNumber.toString()]!['completed'] ?? 0) + 1; } } else { ///if weeklyInfo does not contain the week number