Filter exposure under 15 minutes #771

keiji · 2022-01-18T16:41:09Z

Issue 番号 / Issue ID

Close リスクスコアが15分未満の接触で閾値を越えたときの対応が考慮されていない #754

目的 / Purpose

スコアが規定値を超え、かつ接触時間が規定値を超えなかったときの表示の整備

破壊的変更をもたらしますか / Does this introduce a breaking change?

[x] Yes
[ ] No

Pull Request の種類 / Pull Request type

[ ] Bugfix
[x] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Documentation content changes
[ ] Other... Please describe:

検証方法 / How to test

コードの入手 / Get the code

git clone [repo-address]
cd [repo-name]
git checkout [branch-name]
dotnet restore

コードの検証 / Test the code

確認事項 / What to check

その他 / Other information

keiji · 2022-01-18T16:43:58Z

Covid19Radar/Covid19Radar/ViewModels/ExposureCheck/ExposureCheckPageViewModel.cs

+    public class ExposureCheckScoreModel
+    {
+        public long DateMillisSinceEpoch { get; set; }
+
+        public string DateTimeString => DateTimeOffset.UnixEpoch
+                .AddMilliseconds(DateMillisSinceEpoch).UtcDateTime
+                .ToLocalTime().ToString("D", CultureInfo.CurrentCulture);
+
+        public bool IsScoreVisible { get; set; }
+
+        public bool IsDurationTimeVisible { get; set; }
+
+        public string Description { get; set; }
+    }


これぼくが指摘して、別ファイルに分けてもらいましたが、他では使わなかったですね……（ENv1からこの画面に繋がらない）。

考えが及ばず、お手数をおかけしました。

keiji · 2022-01-18T16:44:50Z

...d19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposureCheckPageViewModelTests.cs

@@ -47,39 +53,110 @@ public void LowRiskPage_Initialize_Display()
        {
            mockExposureDataRepository
                .Setup(x => x.GetDailySummariesAsync(AppConstants.DaysOfExposureInformationToDisplay))
-                .Returns(Task.FromResult(new List<DailySummary>()
+                .ReturnsAsync(new List<DailySummary>()


ReturnsAsync を使うとTaskにくるまなくても良くなります！

keiji · 2022-01-18T16:45:35Z

Covid19Radar/Covid19Radar/Repository/ExposureDataRepositoryMock.cs

@@ -31,15 +31,23 @@ public class ExposureDataRepositoryMock : IExposureDataRepository
                DateMillisSinceEpoch = DateTime.SpecifyKind(new DateTime(2022, 1, 10), DateTimeKind.Utc).ToUnixEpoch() * 1000,


このファイルの変更はMockなのであまり気にしないでください。

keiji · 2022-01-18T16:46:35Z

Covid19Radar/Covid19Radar/Resources/AppResources.resx

+  <data name="LowRiskContactPage_DailySummary_ScoreSum_Descritpion_Satisfied" xml:space="preserve">
+    <value>Score: {0:#.##} (Threshold: {2:#} {1:#.##})</value>
+    <comment>スコア: {0:#.##}（基準値: {1:#.##}{2:#}）</comment>
+  </data>
+  <data name="LowRiskContactPage_DailySummary_ScoreSum_Descritpion_Unsatisfied" xml:space="preserve">
+    <value>Score: {0:#.##} (Threshold: {2:#} {1:#.##})</value>
+    <comment>スコア: {0:#.##}（基準値: {1:#.##}{2:#}）のため通知の対象外</comment>
+  </data>
+  <data name="LowRiskContactPage_ExposureDuration_Description_Satisfied" xml:space="preserve">
+    <value>{0:#} min exposure (Threshold {2:#} {1:#} min)</value>
+    <comment>{0:#}分間の接触（基準値: {1:#}分間{2:#}）</comment>
+  </data>
+  <data name="LowRiskContactPage_ExposureDuration_Description_Unsatisfied" xml:space="preserve">
+    <value>{0:#} min exposure (Threshold {2:#} {1:#} min)</value>
+    <comment>{0:#}分間の接触（基準値: {1:#}分間{2:#}）のため通知の対象外</comment>
+  </data>


英語には反映できてません（翻訳の方にお願いしたい）

keiji · 2022-01-18T16:48:45Z

Covid19Radar/Covid19Radar/ViewModels/ExposureCheck/ExposureCheckPageViewModel.cs

                _loggerService.Info("_exposureRiskCalculationConfiguration.DailySummary_DaySummary_ScoreSum.Op = NOP");
                return;
            }

-            LowRiskContactPageHeaderTextSuffix


これ消しましたが、レイアウト上には残っていて使える状態にしてあります。
もしかしたら何か表示してと言われるかもしれないから残してあります。

…mode was disabled.

kazuhiro4949 · 2022-01-19T07:26:41Z

Covid19Radar/Covid19Radar/ViewModels/ExposureCheck/ExposureCheckPageViewModel.cs

+                    AppResources.LowRiskContactPage_ExposureDuration_Description_Unsatisfied,
+                    exposureDurationInMinute,
+                    exposureDurationThresholdInMinute,
+                    OperatorToString(_exposureRiskCalculationConfiguration.DailySummary_DaySummary_ScoreSum.Op)


ここって_exposureRiskCalculationConfiguration.DailySummary_DaySummary_ScoreSum.Op であってますか？

あ、下2行要らないですね。

LowRiskContactPage_ExposureDuration_Description_Unsatisfiedの内容は{0:#}分間の接触のため通知の対象外なので、一つ目の値だけ有ればいいです（後は無視されるのでビルド通って動きにも問題がない）

kazuhiro4949 · 2022-01-19T07:32:26Z

開発チームからリクエストがあったため、中国語リソースにも仮のデータの用意お願いします。

…ter_exposure_under_15minutes_plan1

keiji · 2022-01-19T07:48:13Z

開発チームからリクエストがあったため、中国語リソースにも仮のデータの用意お願いします。

リソースについては #779 で対応します！

keiji added 2 commits January 19, 2022 00:44

Improve ExposureCheckPage(LowRiskContact).

8b3c67a

Fix test.

3f05164

keiji added design デザイン関連の Issue COCOA2 labels Jan 18, 2022

keiji requested a review from kazuhiro4949 January 18, 2022 16:41

keiji self-assigned this Jan 18, 2022

keiji added 2 commits January 19, 2022 01:42

Remove unused code and comment out mock-code.

b8e752f

Refactoring.

620de34

keiji commented Jan 18, 2022

View reviewed changes

keiji marked this pull request as ready for review January 18, 2022 16:49

Fixed an issue that unconfirmed status persisted even after Airplane …

1cc3250

…mode was disabled.

keiji mentioned this pull request Jan 19, 2022

翻訳が必要な文字列リソースを確認する #750

Closed

kazuhiro4949 added this to In review in COCOA2 Jan 19, 2022

kazuhiro4949 reviewed Jan 19, 2022

View reviewed changes

keiji added 2 commits January 19, 2022 16:45

Maintain string.Format

c42c426

Merge branch 'develop' of github.com:cocoa-mhlw/cocoa into cocoa2/fil…

0b4a86d

…ter_exposure_under_15minutes_plan1

kazuhiro4949 approved these changes Jan 19, 2022

View reviewed changes

kazuhiro4949 merged commit 699c637 into cocoa-mhlw:develop Jan 19, 2022

keiji deleted the cocoa2/filter_exposure_under_15minutes_plan1 branch January 19, 2022 12:03

keiji moved this from In review to Done in COCOA2 Jan 19, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Filter exposure under 15 minutes #771

Filter exposure under 15 minutes #771

keiji commented Jan 18, 2022

keiji Jan 18, 2022 •

edited

Loading

keiji Jan 18, 2022

keiji Jan 18, 2022

keiji Jan 18, 2022

keiji Jan 18, 2022

kazuhiro4949 Jan 19, 2022

keiji Jan 19, 2022

kazuhiro4949 commented Jan 19, 2022

keiji commented Jan 19, 2022

		@@ -31,15 +31,23 @@ public class ExposureDataRepositoryMock : IExposureDataRepository
		DateMillisSinceEpoch = DateTime.SpecifyKind(new DateTime(2022, 1, 10), DateTimeKind.Utc).ToUnixEpoch() * 1000,

Filter exposure under 15 minutes #771

Filter exposure under 15 minutes #771

Conversation

keiji commented Jan 18, 2022

Issue 番号 / Issue ID

目的 / Purpose

破壊的変更をもたらしますか / Does this introduce a breaking change?

Pull Request の種類 / Pull Request type

検証方法 / How to test

コードの入手 / Get the code

コードの検証 / Test the code

確認事項 / What to check

その他 / Other information

keiji Jan 18, 2022 • edited Loading

Choose a reason for hiding this comment

keiji Jan 18, 2022

Choose a reason for hiding this comment

keiji Jan 18, 2022

Choose a reason for hiding this comment

keiji Jan 18, 2022

Choose a reason for hiding this comment

keiji Jan 18, 2022

Choose a reason for hiding this comment

kazuhiro4949 Jan 19, 2022

Choose a reason for hiding this comment

keiji Jan 19, 2022

Choose a reason for hiding this comment

kazuhiro4949 commented Jan 19, 2022

keiji commented Jan 19, 2022

keiji Jan 18, 2022 •

edited

Loading