Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix #593

Merged
merged 6 commits into from
May 15, 2022
Merged

Bugfix #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6fcd25c
Rename to summarizedPillDayCountWithPillSheetsToEndIndex
bannzai May 15, 2022
eb24a26
Add old name function
bannzai May 15, 2022
f9470b4
Rename
bannzai May 15, 2022
5a91ae4
Replace
bannzai May 15, 2022
ea26427
Replace
bannzai May 15, 2022
e872f6b
Remove unnecessary code
bannzai May 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions lib/domain/record/components/pill_sheet/record_page_pill_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,9 @@ class RecordPagePillSheet extends StatelessWidget {
}
} else if (setting.pillSheetAppearanceMode ==
PillSheetAppearanceMode.sequential) {
final pageOffset = summarizedPillCountWithPillSheetsToEndIndex(
pillSheets: pillSheetGroup.pillSheets,
final pageOffset = summarizedPillCountWithPillSheetTypesToEndIndex(
pillSheetTypes:
pillSheetGroup.pillSheets.map((e) => e.pillSheetType).toList(),
endIndex: pageIndex,
);
if (setting.pillNumberForFromMenstruation == 0 ||
Expand Down Expand Up @@ -244,8 +245,10 @@ class RecordPagePillSheet extends StatelessWidget {
return left <= pillNumberIntoPillSheet &&
pillNumberIntoPillSheet <= right;
}
final passedCount = summarizedPillCountWithPillSheetsToEndIndex(
pillSheets: pillSheetGroup.pillSheets, endIndex: pageIndex);
final passedCount = summarizedPillCountWithPillSheetTypesToEndIndex(
pillSheetTypes:
pillSheetGroup.pillSheets.map((e) => e.pillSheetType).toList(),
endIndex: pageIndex);
final serialiedPillNumber = passedCount + pillNumberIntoPillSheet;

final menstruationRangeList =
Expand Down
13 changes: 0 additions & 13 deletions lib/entity/pill_sheet.codegen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,16 +227,3 @@ int pillSheetPillNumber({
restDurations: pillSheet.restDurations, upperDate: targetDate) +
1;
}

int summarizedPillCountWithPillSheetsToEndIndex(
{required List<PillSheet> pillSheets, required int endIndex}) {
if (endIndex == 0) {
return 0;
}

return pillSheets.sublist(0, endIndex).fold(0, (int result, pillSheet) {
return result +
daysBetween(pillSheet.beginingDate, pillSheet.estimatedEndTakenDate) +
1;
});
}
17 changes: 11 additions & 6 deletions lib/entity/pill_sheet_group.codegen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:pilll/entity/firestore_timestamp_converter.dart';
import 'package:pilll/entity/pill_sheet.codegen.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:pilll/entity/pill_sheet_type.dart';

part 'pill_sheet_group.codegen.g.dart';
part 'pill_sheet_group.codegen.freezed.dart';
Expand Down Expand Up @@ -68,8 +69,9 @@ class PillSheetGroup with _$PillSheetGroup {
}

final passedPillCountForPillSheetTypes =
summarizedPillCountWithPillSheetsToEndIndex(
pillSheets: pillSheets, endIndex: activedPillSheet.groupIndex);
summarizedPillCountWithPillSheetTypesToEndIndex(
pillSheetTypes: pillSheets.map((e) => e.pillSheetType).toList(),
endIndex: activedPillSheet.groupIndex);

var sequentialTodayPillNumber =
passedPillCountForPillSheetTypes + activedPillSheet.todayPillNumber;
Expand Down Expand Up @@ -103,8 +105,9 @@ class PillSheetGroup with _$PillSheetGroup {
}

final passedPillCountForPillSheetTypes =
summarizedPillCountWithPillSheetsToEndIndex(
pillSheets: pillSheets, endIndex: activedPillSheet.groupIndex);
summarizedPillCountWithPillSheetTypesToEndIndex(
pillSheetTypes: pillSheets.map((e) => e.pillSheetType).toList(),
endIndex: activedPillSheet.groupIndex);

var sequentialLastTakenPillNumber =
passedPillCountForPillSheetTypes + activedPillSheet.lastTakenPillNumber;
Expand All @@ -129,8 +132,10 @@ class PillSheetGroup with _$PillSheetGroup {
}

int get estimatedEndPillNumber {
var estimatedEndPillNumber = summarizedPillCountWithPillSheetsToEndIndex(
pillSheets: pillSheets, endIndex: pillSheets.length);
var estimatedEndPillNumber =
summarizedPillCountWithPillSheetTypesToEndIndex(
pillSheetTypes: pillSheets.map((e) => e.pillSheetType).toList(),
endIndex: pillSheets.length);

final displayNumberSetting = this.displayNumberSetting;
if (displayNumberSetting != null) {
Expand Down