@@ -11,9 +11,7 @@ import 'package:pilll/utils/datetime/day.dart';
1111// 予定されている生理日
1212// maxDateRangeCountは主にユニットテストの時に嬉しい引数になっているがプロダクションコードでもそのまま使用している
1313// ユースケースとして大体の未来のものを返せれば良いので厳密な計算結果が欲しいわけではないので動作確認とユニットテストをしやすい方式をとっている
14- List <DateRange > scheduledMenstruationDateRanges (PillSheetGroup ? pillSheetGroup,
15- Setting ? setting, List <Menstruation > menstruations,
16- [int maxDateRangeCount = 15 ]) {
14+ List <DateRange > scheduledMenstruationDateRanges (PillSheetGroup ? pillSheetGroup, Setting ? setting, List <Menstruation > menstruations, [int maxDateRangeCount = 15 ]) {
1715 if (pillSheetGroup == null || setting == null ) {
1816 return [];
1917 }
@@ -25,31 +23,22 @@ List<DateRange> scheduledMenstruationDateRanges(PillSheetGroup? pillSheetGroup,
2523 }
2624 assert (maxDateRangeCount > 0 );
2725
28- final scheduledMenstruationDateRanges =
29- pillSheetGroup.menstruationDateRanges (setting: setting);
26+ final scheduledMenstruationDateRanges = pillSheetGroup.menstruationDateRanges (setting: setting);
3027 List <DateRange > dateRanges = scheduledMenstruationDateRanges;
31- final pillSheetGroupTotalPillCount = pillSheetGroup.pillSheetTypes
32- .fold (0 , (p, e) => p + e.typeInfo.totalCount);
28+ final pillSheetGroupTotalPillCount = pillSheetGroup.pillSheetTypes.fold (0 , (p, e) => p + e.typeInfo.totalCount);
3329 for (var i = 1 ; i <= maxDateRangeCount; i++ ) {
3430 final offset = pillSheetGroupTotalPillCount * i;
35- final dateRangesWithOffset = scheduledMenstruationDateRanges
36- .map ((e) => DateRange (e.begin.addDays (offset), e.end.addDays (offset)))
37- .toList ();
31+ final dateRangesWithOffset = scheduledMenstruationDateRanges.map ((e) => DateRange (e.begin.addDays (offset), e.end.addDays (offset))).toList ();
3832 dateRanges = [...dateRanges, ...dateRangesWithOffset];
3933 }
4034
4135 final menstruationDateRanges = menstruations.map ((e) => e.dateRange);
4236 // `今日より前の生理予定日` と `すでに記録済みの生理予定日` はこのタイミングで除外する。scheduledMenstruationDateRangesを作成するタイミングだと後続のoffsetを含めた処理に影響が出る。
4337 // 例えば現在2シートめでこのwhere句でフィルタリングしてしまうと、1シート目とoffsetを考慮した生理予定日が表示されないようになる
44- dateRanges = dateRanges
45- .where ((scheduledMenstruationRange) =>
46- ! scheduledMenstruationRange.end.isBefore (today ()))
47- .where ((scheduledMenstruationRange) {
38+ dateRanges = dateRanges.where ((scheduledMenstruationRange) => ! scheduledMenstruationRange.end.isBefore (today ())).where ((scheduledMenstruationRange) {
4839 // すでに記録されている生理については除外したものを予定されている生理とする
4940 return menstruationDateRanges
50- .where ((menstruationDateRange) =>
51- menstruationDateRange.inRange (scheduledMenstruationRange.begin) ||
52- menstruationDateRange.inRange (scheduledMenstruationRange.end))
41+ .where ((menstruationDateRange) => menstruationDateRange.inRange (scheduledMenstruationRange.begin) || menstruationDateRange.inRange (scheduledMenstruationRange.end))
5342 .isEmpty;
5443 }).toList ();
5544
@@ -61,16 +50,13 @@ List<DateRange> scheduledMenstruationDateRanges(PillSheetGroup? pillSheetGroup,
6150 }
6251}
6352
64- List <DateRange > nextPillSheetDateRanges (PillSheetGroup pillSheetGroup,
65- [int maxDateRangeCount = 15 ]) {
53+ List <DateRange > nextPillSheetDateRanges (PillSheetGroup pillSheetGroup, [int maxDateRangeCount = 15 ]) {
6654 if (pillSheetGroup.pillSheets.isEmpty) {
6755 return [];
6856 }
6957 assert (maxDateRangeCount > 0 );
7058
71- final totalPillCount = pillSheetGroup.pillSheets
72- .map ((e) => e.pillSheetType.totalCount)
73- .reduce ((value, element) => value + element);
59+ final totalPillCount = pillSheetGroup.pillSheets.map ((e) => e.pillSheetType.totalCount).reduce ((value, element) => value + element);
7460 var dateRanges = < DateRange > [];
7561 for (int i = 0 ; i < maxDateRangeCount; i++ ) {
7662 final offset = totalPillCount * i;
@@ -89,8 +75,7 @@ List<DateRange> nextPillSheetDateRanges(PillSheetGroup pillSheetGroup,
8975 }
9076}
9177
92- int bandLength (
93- DateRange range, CalendarBandModel bandModel, bool isLineBreaked) {
78+ int bandLength (DateRange range, CalendarBandModel bandModel, bool isLineBreaked) {
9479 return range
9580 .union (
9681 DateRange (
@@ -107,7 +92,5 @@ bool isNecessaryLineBreak(DateTime date, DateRange dateRange) {
10792}
10893
10994int offsetForStartPositionAtLine (DateTime begin, DateRange dateRange) {
110- return isNecessaryLineBreak (begin, dateRange)
111- ? 0
112- : daysBetween (dateRange.begin.date (), begin.date ());
95+ return isNecessaryLineBreak (begin, dateRange) ? 0 : daysBetween (dateRange.begin.date (), begin.date ());
11396}
0 commit comments