v3.0.16-Beta

dnlmgwi · May 8, 2020 · 8b49800 · 8b49800
1 parent 7b2da88
commit 8b49800
Show file tree

Hide file tree

Showing 6 changed files with 500 additions and 63 deletions.
diff --git a/lib/data/graphqlQueries.dart b/lib/data/graphqlQueries.dart
@@ -21,6 +21,22 @@ class Queries {
     }''';
   }
 
+  static String getMyHistory({String member_id}) {
+    return '''{
+  collection(name:"Transactions",filter:{
+    member_id:"5e9cc5523862613211000312"
+  },limit: 5, sort: {
+      scanTime: -1,
+      }
+  ) MemberCollection ( filter: {homeless_id: "2a4f4226-1804-414d-a855-f9d68190bacd" })
+  {
+    name
+    surname
+    primary_phoneNumber
+    alternative_phoneNumber
+  }}''';
+  }
+
   //Get location points and place markers
   static String getMarkers({String homeless_id}) {
     return '''query whereAbouts

diff --git a/lib/routes.dart b/lib/routes.dart
@@ -1,4 +1,5 @@
 import 'package:homeless/packages.dart';
+import 'package:homeless/screens/myHistory.dart';
 
 GlobalKey globalKey = GlobalKey();
 //Contains all in app navigation code.
@@ -13,6 +14,7 @@ final routes = {
   '/logout': (BuildContext context) => OnBoardingScreen(),
   '/instructions': (BuildContext context) => InstructionsScreen(),
   '/register': (BuildContext context) => RegistrationScreen(),
+  '/myHistory': (BuildContext context) => MyHistoryScreen(),
   RegistrationScreen.routeName: (context) => RegistrationScreen(),
   ScanScreen.routeName: (context) => ScanScreen(),
   '/scan': (BuildContext context) => ScanScreen(),

diff --git a/lib/screens/menuScreen.dart b/lib/screens/menuScreen.dart
@@ -136,21 +136,21 @@ class _MenuScreenState extends State<MenuScreen> with TickerProviderStateMixin {
       ),
     );
 
-    // listViews.add(
-    //   TitleView(
-    //     // route: '/',
-    //     icon: Icon(
-    //       FontAwesomeIcons.history,
-    //       color: AppTheme.dark_grey,
-    //     ),
-    //     titleTxt: 'Transaction History',
-    //     animation: Tween(begin: 0.0, end: 1.0).animate(CurvedAnimation(
-    //         parent: widget.animationController,
-    //         curve:
-    //             Interval((1 / count) * 6, 1.0, curve: Curves.fastOutSlowIn))),
-    //     animationController: widget.animationController,
-    //   ),
-    // );
+    listViews.add(
+      TitleView(
+        route: '/myHistory',
+        icon: Icon(
+          FontAwesomeIcons.history,
+          color: AppTheme.dark_grey,
+        ),
+        titleTxt: 'Transaction History',
+        animation: Tween(begin: 0.0, end: 1.0).animate(CurvedAnimation(
+            parent: widget.animationController,
+            curve:
+                Interval((1 / count) * 6, 1.0, curve: Curves.fastOutSlowIn))),
+        animationController: widget.animationController,
+      ),
+    );
 
     listViews.add(
       TitleView(