Fix project visibility & item order

BhasherBEL · Jun 11, 2023 · 9b77731 · 9b77731
1 parent 7d533d4
commit 9b77731
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/lib/components/pages/project/expenses/item_list.dart b/lib/components/pages/project/expenses/item_list.dart
@@ -148,7 +148,7 @@ class _ItemListState extends State<ItemList> {
                                 title: Row(children: [
                                   Expanded(
                                       child: Text(item.title.capitalize())),
-                                  Text('${item.amount} €'),
+                                  Text('${item.amount.toStringAsFixed(2)} €'),
                                 ]),
                                 subtitle: Row(
                                   children: [
@@ -160,7 +160,7 @@ class _ItemListState extends State<ItemList> {
                                       ),
                                     ),
                                     Text(
-                                      '$share €',
+                                      '${share.toStringAsFixed(2)} €',
                                       style: TextStyle(
                                         fontStyle: FontStyle.italic,
                                         color: share > 0

diff --git a/lib/model/app_data.dart b/lib/model/app_data.dart
@@ -55,6 +55,8 @@ class AppData {
 
     AppData.projects = await Project.getAllProjects();
 
+    print(AppData.projects);
+
     if (!sharedPreferences.containsKey("firstRun")) {
       firstRun = AppData.projects.enabled().isEmpty;
     } else {

diff --git a/lib/model/connectors/pocketbase/item.dart b/lib/model/connectors/pocketbase/item.dart
@@ -90,7 +90,7 @@ class PocketBaseItem {
     }
 
     // Send local new records
-    for (Item i in project.items) {
+    for (Item i in project.items.toList()) {
       if (distUpdated.contains(i)) continue;
 
       if (i.lastUpdate > project.lastSync) {
@@ -101,6 +101,8 @@ class PocketBaseItem {
       }
     }
 
+    project.items.sort((a, b) => -a.date.compareTo(b.date));
+
     return true;
   }
 }
diff --git a/lib/model/project.dart b/lib/model/project.dart
@@ -133,12 +133,14 @@ class Project extends Data {
       tableProjects,
       columns: ProjectFields.values,
     );
+    print(res);
     return res.map((e) => fromJson(e)).toSet();
   }
 
   @override
   bool operator ==(Object other) {
-    return other is Project && name == other.name;
+    return other is Project &&
+        (localId != null ? localId == other.localId : name == other.name);
   }
 
   @override