Merge remote-tracking branch 'origin/master'

SIT-kite · Nov 30, 2022 · 4900558 · 4900558
2 parents ff27508 + 7db0b91
commit 4900558
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/l10n/app_en.arb b/l10n/app_en.arb
@@ -239,6 +239,11 @@
   "expenseShower": "Shower",
   "expenseStuff": "Stuff",
   "expenseTotal": "Total",
+  "expenseConsume": "Consume",
+  "expenseTopUp": "Top Up",
+  "expenseSubsidy": "Subsidy",
+  "expenseLibrary": "Library",
+
   "faculty": "Faculty",
   "failed": "Failed",
   "feedback": "Feedback",
@@ -622,4 +627,4 @@
   "xuhui": "Xuhui",
   "xuhuiDistrict": "Xuhui District",
   "yes": "Yes"
-}
+}
diff --git a/l10n/app_zh.arb b/l10n/app_zh.arb
@@ -117,6 +117,11 @@
   "expenseShower": "淋浴",
   "expenseStuff": "杂项",
   "expenseTotal": "总计",
+  "expenseConsume": "Consume",
+  "expenseTopUp": "TopUp",
+  "expenseSubsidy": "圈存",
+  "expenseLibrary": "图书馆",
+
   "faculty": "学院",
   "failed": "失败",
   "feedback": "反馈",
@@ -390,4 +395,4 @@
   "xuhui": "徐汇",
   "xuhuiDistrict": "徐汇区",
   "yes": "好"
-}
+}
diff --git a/lib/module/expense2/entity/local.dart b/lib/module/expense2/entity/local.dart
@@ -108,13 +108,13 @@ enum TransactionType {
       case TransactionType.other:
         return i18n.expenseStuff;
       case TransactionType.consume:
-        return "TODO";
+        return i18n.expenseConsume;
       case TransactionType.topUp:
-        return "TODO";
+        return i18n.expenseTopUp;
       case TransactionType.subsidy:
-        return "TODO";
+        return i18n.expenseSubsidy;
       case TransactionType.library:
-        return "TODO";
+        return i18n.expenseLibrary;
     }
   }
 }
diff --git a/lib/module/expense2/page/statistics.dart b/lib/module/expense2/page/statistics.dart
@@ -221,7 +221,9 @@ class _StatisticsPageState extends State<StatisticsPage> {
 
     double sum = sumByClassification.fold(0.0, (previousValue, element) => previousValue += element);
 
-    return TransactionType.values.where((element) => element != TransactionType.consume).map(
+    return TransactionType.values
+        .where((e) => !{TransactionType.consume, TransactionType.topUp, TransactionType.subsidy}.contains(e))
+        .map(
       (expenseType) {
         final double sumInType = sumByClassification[expenseType.index];
         final double percentage = sum != 0 ? sumInType / sum : 0;