Skip to content

Commit 1d09d36

Browse files
fix: merge conflict
1 parent 8aa5612 commit 1d09d36

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lib/app/modules/reports/views/burn_down_weekly_taskc.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@ class BurnDownWeeklyTask extends StatelessWidget {
6868
Utils.getWeekNumbertoInt(DateTime.parse(allData[i].entry));
6969

7070
///check if weeklyInfo contains the week number
71-
if (weeklyInfo.containsKey(weekNumber)) {
71+
if (weeklyInfo.containsKey(weekNumber.toString())) {
7272
///check if the status is pending or completed
7373
if (allData[i].status == 'pending') {
7474
///if the status is pending then add 1 to the pending count
75-
weeklyInfo[weekNumber]!['pending'] =
76-
(weeklyInfo[weekNumber]!['pending'] ?? 0) + 1;
75+
weeklyInfo[weekNumber.toString()]!['pending'] =
76+
(weeklyInfo[weekNumber.toString()]!['pending'] ?? 0) + 1;
7777
} else if (allData[i].status == 'completed') {
7878
///if the status is completed then add 1 to the completed count
79-
weeklyInfo[weekNumber]!['completed'] =
80-
(weeklyInfo[weekNumber]!['completed'] ?? 0) + 1;
79+
weeklyInfo[weekNumber.toString()]!['completed'] =
80+
(weeklyInfo[weekNumber.toString()]!['completed'] ?? 0) + 1;
8181
}
8282
} else {
8383
///if weeklyInfo does not contain the week number

0 commit comments

Comments
 (0)