Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon

lib/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart

@@ -1,68 +1,68 @@
 class GetAllSharedRecordsByStatusResponse {
-  Null date;
+  dynamic date;
   int languageID;
   int serviceName;
-  Null time;
-  Null androidLink;
-  Null authenticationTokenID;
-  Null data;
+  dynamic time;
+  dynamic androidLink;
+  dynamic authenticationTokenID;
+  dynamic data;
   bool dataw;
   int dietType;
-  Null errorCode;
-  Null errorEndUserMessage;
-  Null errorEndUserMessageN;
-  Null errorMessage;
+  dynamic errorCode;
+  dynamic errorEndUserMessage;
+  dynamic errorEndUserMessageN;
+  dynamic errorMessage;
   int errorType;
   int foodCategory;
-  Null iOSLink;
+  dynamic iOSLink;
   bool isAuthenticated;
   int mealOrderStatus;
   int mealType;
   int messageStatus;
   int numberOfResultRecords;
-  Null patientBlodType;
-  Null successMsg;
-  Null successMsgN;
-  Null doctorInformationList;
-  Null getAllPendingRecordsList;
+  dynamic patientBlodType;
+  dynamic successMsg;
+  dynamic successMsgN;
+  dynamic doctorInformationList;
+  List<GetAllSharedRecordsByStatusList> getAllPendingRecordsList;
   List<GetAllSharedRecordsByStatusList> getAllSharedRecordsByStatusList;
-  Null getResponseFileList;
+  List<GetAllSharedRecordsByStatusList> getResponseFileList;
   bool isHMGPatient;
   bool isLoginSuccessfully;
   bool isNeedUpdateIdintificationNo;
   bool kioskSendSMS;
-  Null list;
-  Null listAskHabibMobileLoginInfo;
-  Null listAskHabibPatientFile;
-  Null listMergeFiles;
-  Null listMobileLoginInfo;
-  Null listPatientCount;
-  Null logInTokenID;
-  Null mohemmPrivilegeList;
+  dynamic list;
+  dynamic listAskHabibMobileLoginInfo;
+  dynamic listAskHabibPatientFile;
+  dynamic listMergeFiles;
+  dynamic listMobileLoginInfo;
+  dynamic listPatientCount;
+  dynamic logInTokenID;
+  dynamic mohemmPrivilegeList;
   int pateintID;
-  Null patientBloodType;
-  Null patientERDriverFile;
-  Null patientERDriverFileList;
+  dynamic patientBloodType;
+  dynamic patientERDriverFile;
+  dynamic patientERDriverFileList;
   bool patientHasFile;
-  Null patientMergedIDs;
+  dynamic patientMergedIDs;
   bool patientOutSA;
   int patientShareRequestID;
   int patientType;
   int projectIDOut;
-  Null returnMessage;
+  dynamic returnMessage;
   bool sMSLoginRequired;
-  Null servicePrivilegeList;
-  Null sharePatientName;
-  Null verificationCode;
-  Null email;
-  Null errorList;
+  dynamic servicePrivilegeList;
+  dynamic sharePatientName;
+  dynamic verificationCode;
+  dynamic email;
+  dynamic errorList;
   bool hasFile;
   bool isActiveCode;
   bool isMerged;
   bool isNeedUserAgreement;
   bool isSMSSent;
-  Null memberList;
-  Null message;
+  dynamic memberList;
+  dynamic message;
   int statusCode;
 
   GetAllSharedRecordsByStatusResponse(
@@ -133,6 +133,7 @@ class GetAllSharedRecordsByStatusResponse {
       this.statusCode});
 
   GetAllSharedRecordsByStatusResponse.fromJson(Map<String, dynamic> json) {
+    try {
       date = json['Date'];
       languageID = json['LanguageID'];
       serviceName = json['ServiceName'];
@@ -158,10 +159,18 @@ class GetAllSharedRecordsByStatusResponse {
       successMsg = json['SuccessMsg'];
       successMsgN = json['SuccessMsgN'];
       doctorInformationList = json['DoctorInformation_List'];
-    getAllPendingRecordsList = json['GetAllPendingRecordsList'];
+//   getAllPendingRecordsList = json['GetAllPendingRecordsList'];
+
+      if (json['GetAllPendingRecordsList'] != null) {
+        getAllSharedRecordsByStatusList = new List<GetAllSharedRecordsByStatusList>();
+        json['GetAllPendingRecordsList'].forEach((v) {
+          getAllSharedRecordsByStatusList
+              .add(new GetAllSharedRecordsByStatusList.fromJson(v));
+        });
+      }
+
       if (json['GetAllSharedRecordsByStatusList'] != null) {
-      getAllSharedRecordsByStatusList =
-          new List<GetAllSharedRecordsByStatusList>();
+        getAllSharedRecordsByStatusList = new List<GetAllSharedRecordsByStatusList>();
         json['GetAllSharedRecordsByStatusList'].forEach((v) {
           getAllSharedRecordsByStatusList
               .add(new GetAllSharedRecordsByStatusList.fromJson(v));
@@ -205,6 +214,11 @@ class GetAllSharedRecordsByStatusResponse {
       memberList = json['memberList'];
       message = json['message'];
       statusCode = json['statusCode'];
+    }catch (e){
+      var asd ="";
+      print(e);
+
+    }
   }
 
   Map<String, dynamic> toJson() {
@@ -287,7 +301,7 @@ class GetAllSharedRecordsByStatusList {
   int responseID;
   int regionID;
   int status;
-  Null isActive;
+  dynamic isActive;
   String editedOn;
   String createdOn;
   String emaiLAddress;

lib/pages/DrawerPages/family/my-family.dart

@@ -220,6 +220,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
   Widget myFamilyRequest(context) {
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 10.0),
+      child: SingleChildScrollView(
         child: Column(
           children: <Widget>[
             // SizedBox(height: 20.0),
@@ -276,8 +277,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
                                       Expanded(flex: 1, child: AppText('Reject')),
                                     ]),
                                     Column(
-                                      children: snapshot
-                                          .data['GetAllPendingRecordsList']
+                                        children:familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList
                                             .map<Widget>((result) {
                                       return Padding(
                                           padding: EdgeInsets.all(10),
@@ -424,8 +424,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
                                     Expanded(flex: 1, child: AppText('Delete')),
                                   ]),
                                   Column(
-                                    children: snapshot
-                                        .data['GetAllPendingRecordsList']
+                                      children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList
                                           .map<Widget>((result) {
                                     return Padding(
                                         padding: EdgeInsets.all(10),
@@ -458,6 +457,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
             ))
           ],
         ),
+      ),
     );
   }
 

lib/services/family_files/family_files_provider.dart

@@ -42,7 +42,7 @@ class FamilyFilesProvider with ChangeNotifier {
   bool isLogin = false;
   bool isLoading = true;
   dynamic authenticatedUser;
-
+  GetAllSharedRecordsByStatusResponse allSharedRecordsByStatusResponse;
   Future<GetAllSharedRecordsByStatusResponse> getSharedRecordByStatus() async {
     try {
       dynamic localRes;
@@ -64,7 +64,7 @@ class FamilyFilesProvider with ChangeNotifier {
     }
   }
 
-  Future getUserViewRequest(responseID) async {
+  Future<GetAllSharedRecordsByStatusResponse> getUserViewRequest(responseID) async {
     try {
       dynamic localRes;
       Map<String, dynamic> request = {};
@@ -73,14 +73,17 @@ class FamilyFilesProvider with ChangeNotifier {
           onSuccess: (dynamic response, int statusCode) {
         localRes = response;
       }, onFailure: (String error, int statusCode) {
-        return Future.value(error);
+        return Future.error(error);
       }, body: request);
+      if(localRes!=null){
       sharedPref.setObject(FAMILY_FILE, localRes);
-      return Future.value(
-          GetAllSharedRecordsByStatusResponse.fromJson(localRes));
+      allSharedRecordsByStatusResponse = GetAllSharedRecordsByStatusResponse.fromJson(localRes);
+      return Future.value(allSharedRecordsByStatusResponse);}
+      else
+      return Future.error("No Data");
     } catch (error) {
       print(error);
-      throw error;
+      return Future.error(error);
     }
   }