feat(#668): use consumer on report page

hpi-dhc · Nov 22, 2023 · a98e404 · a98e404
1 parent 4f4ef7e
commit a98e404
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/app/lib/common/models/userdata/userdata.dart b/app/lib/common/models/userdata/userdata.dart
@@ -172,26 +172,26 @@ class UserData {
 }
 
 class ActiveDrugs extends ChangeNotifier {
-  List<String> activeDrugs = [];
+  List<String> names = [];
 
   Future<void> _preserveAndNotify() async {
-    UserData.instance.activeDrugNames = activeDrugs;
+    UserData.instance.activeDrugNames = names;
     await UserData.save();
     notifyListeners();
   }
 
   Future<void> setList(List<String> drugNames) async {
-    activeDrugs = drugNames;
+    names = drugNames;
     await _preserveAndNotify();
   }
 
   Future<void> _add(String drugName) async {
-    activeDrugs.add(drugName);
+    names.add(drugName);
     await _preserveAndNotify();
   }
 
   Future<void> _remove(String drugName) async {
-    activeDrugs = activeDrugs.filter((name) => name != drugName).toList();
+    names = names.filter((name) => name != drugName).toList();
     await _preserveAndNotify();
   }
 

diff --git a/app/lib/common/widgets/drug_list/drug_items/drug_checkbox_list.dart b/app/lib/common/widgets/drug_list/drug_items/drug_checkbox_list.dart
@@ -1,10 +1,6 @@
 import '../../../module.dart';
 import 'utils.dart';
 
-bool isDrugSelected(Drug drug) {
-  return UserData.instance.activeDrugNames!.contains(drug.name);
-}
-
 List<Widget> buildDrugCheckboxList(
   BuildContext context,
   List<Drug> drugs,
@@ -18,16 +14,16 @@ List<Widget> buildDrugCheckboxList(
   final checkboxesEnabled = buildParams['checkboxesEnabled'];
   final sortedDrugs = List<Drug>.from(drugs);
   sortedDrugs.sort((drugA, drugB) {
-    final drugASelected = isDrugSelected(drugA);
-    final drugBSelected = isDrugSelected(drugB);
+    final drugASelected = drugA.isActive();
+    final drugBSelected = drugB.isActive();
     if (drugASelected == drugBSelected) return drugA.name.compareTo(drugB.name);
     return drugASelected ? -1 : 1;
   });
   return [
     ...sortedDrugs.map(
       (drug) => CheckboxListTile(
         enabled: checkboxesEnabled,
-        value: isDrugSelected(drug),
+        value: drug.isActive(),
         onChanged: (value) => onCheckboxChange(drug, value),
         title: Text(formatDrugName(drug, showDrugInteractionIndicator)),
         subtitle: (drug.annotations.brandNames.isNotEmpty) ?

diff --git a/app/lib/report/pages/report.dart b/app/lib/report/pages/report.dart
@@ -1,11 +1,19 @@
+import 'package:provider/provider.dart';
+
 import '../../common/module.dart';
 import '../../common/utilities/guideline_utils.dart';
 
 class ReportPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final hasActiveInhibitors = UserData.instance.activeDrugNames != null &&
-      UserData.instance.activeDrugNames!.any(isInhibitor);
+    return Consumer<ActiveDrugs>(
+      builder: (context, activeDrugs, child) =>
+        _buildReportPage(context, activeDrugs)
+    );
+  }
+
+  Widget _buildReportPage(BuildContext context, ActiveDrugs activeDrugs) {
+    final hasActiveInhibitors = activeDrugs.names.any(isInhibitor);
     final guidelineGenes = getGuidelineGenes();
 
     final notTestedString = context.l10n.general_not_tested;