pat man used signedinUser as paremeter and required user to search for patient by id or medaid no

Frontend/patient_manager/lib/pages/patientManager.dart

@@ -2,8 +2,10 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:patient_manager/components/buildPatientList.dart';
 import 'package:patient_manager/components/mihAppBar.dart';
+import 'package:patient_manager/objects/appUser.dart';
 import 'package:supertokens_flutter/http.dart' as http;
 import 'package:patient_manager/components/mySearchInput.dart';
 import 'package:patient_manager/env/env.dart';
@@ -11,11 +13,11 @@ import 'package:patient_manager/main.dart';
 import 'package:patient_manager/objects/patients.dart';
 
 class PatientManager extends StatefulWidget {
-  final String userEmail;
+  final AppUser signedInUser;
 
   const PatientManager({
     super.key,
-    required this.userEmail,
+    required this.signedInUser,
   });
 
   @override
@@ -25,16 +27,20 @@ class PatientManager extends StatefulWidget {
 //
 class _PatientManagerState extends State<PatientManager> {
   TextEditingController searchController = TextEditingController();
-  String endpoint = "${AppEnviroment.baseApiUrl}/patients/user/";
+  String baseUrl = AppEnviroment.baseApiUrl;
-  late Future<List<Patient>> futurePatients;
+
+  final FocusNode _focusNode = FocusNode();
   String errorCode = "";
   String errorBody = "";
 
   String searchString = "";
 
-  Future<List<Patient>> fetchPatients(String endpoint) async {
+  late Future<List<Patient>> patientSearchResults;
+
+  Future<List<Patient>> fetchPatients(String search) async {
     //print("Patien manager page: $endpoint");
-    final response = await http.get(Uri.parse(endpoint));
+    final response =
+        await http.get(Uri.parse("$baseUrl/patients/search/$search"));
     // print("Here");
     // print("Body: ${response.body}");
     // print("Code: ${response.statusCode}");
@@ -68,15 +74,16 @@ class _PatientManagerState extends State<PatientManager> {
     return templist;
   }
 
+  void submitForm() {
+    setState(() {
+      searchString = searchController.text;
+      patientSearchResults = fetchPatients(searchString);
+    });
+  }
+
   Widget displayList(List<Patient> patientsList, String searchString) {
     if (searchString.isNotEmpty && searchString != "") {
-      return Padding(
+      return Container(
-        padding: const EdgeInsets.only(
-          left: 25,
-          right: 25,
-          bottom: 25,
-        ),
-        child: Container(
         height: 500,
         decoration: BoxDecoration(
           color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
@@ -88,18 +95,11 @@ class _PatientManagerState extends State<PatientManager> {
         ),
         child: BuildPatientsList(
           patients: patientsList,
-            //searchString: searchString,
+          signedInUser: widget.signedInUser,
-          ),
         ),
       );
     }
-    return Padding(
+    return Container(
-      padding: const EdgeInsets.only(
-        left: 25,
-        right: 25,
-        bottom: 25,
-      ),
-      child: Container(
       height: 500,
       decoration: BoxDecoration(
         color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
@@ -113,17 +113,30 @@ class _PatientManagerState extends State<PatientManager> {
           "Enter ID or Medical Aid No. of Patient",
           style: TextStyle(
               fontSize: 25,
-                color:
+              color: MzanziInnovationHub.of(context)!.theme.messageTextColor()),
-                    MzanziInnovationHub.of(context)!.theme.messageTextColor()),
           textAlign: TextAlign.center,
         ),
       ),
-      ),
     );
   }
 
   Widget patientSearch(double w, double h) {
-    return SizedBox(
+    return KeyboardListener(
+      focusNode: _focusNode,
+      autofocus: true,
+      onKeyEvent: (event) async {
+        if (event is KeyDownEvent &&
+            event.logicalKey == LogicalKeyboardKey.enter) {
+          submitForm();
+        }
+      },
+      child: Padding(
+        padding: const EdgeInsets.only(
+          left: 25,
+          right: 25,
+          bottom: 25,
+        ),
+        child: SizedBox(
           width: w,
           height: h,
           child: Column(mainAxisSize: MainAxisSize.max, children: [
@@ -134,27 +147,19 @@ class _PatientManagerState extends State<PatientManager> {
               hintText: "ID or Medical Aid No. Search",
               required: false,
               editable: true,
-          onTap: () {},
+              onTap: () {
-          onChanged: (value) {
+                submitForm();
-            setState(() {
-              searchString = value;
-            });
               },
+              onChanged: (value) {},
             ),
             //spacer
             const SizedBox(height: 10),
             FutureBuilder(
-          future: futurePatients,
+              future: patientSearchResults,
               builder: (context, snapshot) {
                 //print("patient Liust  ${snapshot.data}");
                 if (snapshot.connectionState == ConnectionState.waiting) {
-              return Padding(
+                  return Container(
-                padding: const EdgeInsets.only(
-                  left: 25,
-                  right: 25,
-                  bottom: 25,
-                ),
-                child: Container(
                     height: 500,
                     decoration: BoxDecoration(
                       color:
@@ -169,7 +174,6 @@ class _PatientManagerState extends State<PatientManager> {
                     child: const Center(
                       child: CircularProgressIndicator(),
                     ),
-                ),
                   );
                 } else if (snapshot.hasData) {
                   List<Patient> patientsList;
@@ -185,13 +189,7 @@ class _PatientManagerState extends State<PatientManager> {
                     child: displayList(patientsList, searchString),
                   );
                 } else {
-              return Padding(
+                  return Container(
-                padding: const EdgeInsets.only(
-                  left: 25,
-                  right: 25,
-                  bottom: 25,
-                ),
-                child: Container(
                     height: 500,
                     decoration: BoxDecoration(
                       color:
@@ -205,7 +203,7 @@ class _PatientManagerState extends State<PatientManager> {
                     ),
                     child: Center(
                       child: Text(
-                      "$errorCode: Error pulling Patients Data\n$endpoint${widget.userEmail}\n$errorBody",
+                        "$errorCode: Error pulling Patients Data\n$baseUrl${widget.signedInUser.email}\n$errorBody",
                         style: TextStyle(
                             fontSize: 25,
                             color: MzanziInnovationHub.of(context)!
@@ -214,12 +212,13 @@ class _PatientManagerState extends State<PatientManager> {
                         textAlign: TextAlign.center,
                       ),
                     ),
-                ),
                   );
                 }
               },
             ),
           ]),
+        ),
+      ),
     );
   }
 
@@ -228,7 +227,7 @@ class _PatientManagerState extends State<PatientManager> {
     // errorCode = "";
     // errorBody = "";
     //print("patient manager page: ${widget.userEmail}");
-    futurePatients = fetchPatients(endpoint + widget.userEmail);
+    patientSearchResults = fetchPatients("abc");
     super.initState();
   }
 
@@ -243,24 +242,24 @@ class _PatientManagerState extends State<PatientManager> {
       //   logo: MzanziInnovationHub.of(context)!.theme.logoImage(),
       // ),
       //floatingActionButtonLocation: FloatingActionButtonLocation.,
-      floatingActionButton: FloatingActionButton.extended(
+      // floatingActionButton: FloatingActionButton.extended(
-        label: Text(
+      //   label: Text(
-          "Add Patient",
+      //     "Add Patient",
-          style: TextStyle(
+      //     style: TextStyle(
-            fontWeight: FontWeight.bold,
+      //       fontWeight: FontWeight.bold,
-            color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      //       color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
-          ),
+      //     ),
-        ),
+      //   ),
-        //backgroundColor: Colors.blueAccent,
+      //   //backgroundColor: Colors.blueAccent,
-        onPressed: () {
+      //   onPressed: () {
-          Navigator.of(context)
+      //     Navigator.of(context).pushNamed('/patient-manager/add',
-              .pushNamed('/patient-manager/add', arguments: widget.userEmail);
+      //         arguments: widget.signedInUser.email);
-        },
+      //   },
-        icon: Icon(
+      //   icon: Icon(
-          Icons.add,
+      //     Icons.add,
-          color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
+      //     color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
-        ),
+      //   ),
-      ),
+      // ),
       body: patientSearch(screenWidth, screenHeight),
     );
   }