diff --git a/lib/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart b/lib/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart index b92962eb..e6e702eb 100644 --- a/lib/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart +++ b/lib/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart @@ -295,12 +295,12 @@ class GetAllSharedRecordsByStatusList { int iD; int patientID; int responseID; - Null relationshipID; - Null relationship; - Null relationshipN; + dynamic relationshipID; + dynamic relationship; + dynamic relationshipN; int regionID; int status; - Null isActive; + dynamic isActive; String editedOn; String createdOn; int age; diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart index 08491827..9cd4e8a0 100644 --- a/lib/pages/DrawerPages/family/my-family.dart +++ b/lib/pages/DrawerPages/family/my-family.dart @@ -12,7 +12,8 @@ import 'package:diplomaticquarterapp/extensions/string_extensions.dart'; import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/models/Appointments/toDoCountProviderModel.dart'; import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart'; -import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart' as list; +import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart' + as list; import 'package:diplomaticquarterapp/models/FamilyFiles/GetAllSharedRecordByStatusResponse.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/pages/rateAppointment/rate_appointment_doctor.dart'; @@ -51,12 +52,15 @@ class _MyFamily extends State with TickerProviderStateMixin { var userID; TabController _tabController; int _tabIndex = 0; - AuthenticatedUserObject authenticatedUserObject = locator(); - AppointmentRateViewModel appointmentRateViewModel = locator(); + AuthenticatedUserObject authenticatedUserObject = + locator(); + AppointmentRateViewModel appointmentRateViewModel = + locator(); ProjectViewModel projectViewModel; AuthenticatedUser user; VitalSignService _vitalSignService = locator(); - PharmacyModuleViewModel pharmacyModuleViewModel = locator(); + PharmacyModuleViewModel pharmacyModuleViewModel = + locator(); ToDoCountProviderModel toDoProvider; var isVaiable = false; bool isSwitchUser = false; @@ -73,12 +77,18 @@ class _MyFamily extends State with TickerProviderStateMixin { Widget build(BuildContext context) { imagesInfo.add( ImagesInfo( - imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/en/0.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/ar/0.png'), + imageEn: + 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/en/0.png', + imageAr: + 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/ar/0.png'), ); imagesInfo.add( ImagesInfo( - imageEn: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/en/1.png', imageAr: 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/ar/1.png'), + imageEn: + 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/en/1.png', + imageAr: + 'https://hmgwebservices.com/Images/MobileApp/images-info-home/family-file/ar/1.png'), ); projectViewModel = Provider.of(context); toDoProvider = Provider.of(context); @@ -90,108 +100,56 @@ class _MyFamily extends State with TickerProviderStateMixin { showNewAppBarTitle: true, icon: "assets/images/new/bottom_nav/family_files.svg", description: TranslationBase.of(context).familyInfo, - body: Scaffold( - extendBodyBehindAppBar: true, - appBar: PreferredSize( - preferredSize: Size.fromHeight(65.0), - child: Stack( - children: [ - // Positioned( - // bottom: 1, - // left: 0, - // right: 0, - // child: BackdropFilter( - // filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10), - // child: Container( - // color: Theme.of(context).scaffoldBackgroundColor.withOpacity(0.8), - // height: 70.0, - // ), - // ), - // ), - // Center( - // child: Container( - // height: 60.0, - // // margin: EdgeInsets.only(top: 10.0), - // width: MediaQuery.of(context).size.width * 0.92, // 0.9, - // decoration: BoxDecoration( - // border: Border( - // bottom: BorderSide(color: Theme.of(context).dividerColor, width: 0.9), //width: 0.7 - // ), - // color: Colors.white), - Center( - child: - // TabBar( - // isScrollable: true, - // controller: _tabController, - // indicatorWeight: 5.0, - // indicatorSize: TabBarIndicatorSize.tab, - // labelPadding: EdgeInsets.only(top: 4.0, left: 35.0, right: 35.0), - // unselectedLabelColor: Colors.grey[800], - // tabs: [ - // Container( - // width: MediaQuery.of(context).size.width * 0.30, - // child: Center( - // child: AppText(TranslationBase.of(context).family), - // ), - // ), - // Container( - // width: MediaQuery.of(context).size.width * 0.30, - // child: Center( - // child: AppText(TranslationBase.of(context).request), - // ), - // ), - // ], - // ), - TabBar( - controller: _tabController, - indicatorWeight: 3.0, - indicatorSize: TabBarIndicatorSize.tab, - labelColor: Color(0xff2B353E), - unselectedLabelColor: Color(0xff575757), - labelPadding: EdgeInsets.only(top: 15, bottom: 13, left: 20, right: 20), - labelStyle: TextStyle( - fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins', - fontSize: 16, - fontWeight: FontWeight.w600, - letterSpacing: -0.48, - ), - unselectedLabelStyle: TextStyle( - fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins', - fontSize: 16, - fontWeight: FontWeight.w600, - letterSpacing: -0.48, - ), - tabs: [Text(TranslationBase.of(context).family), Text(TranslationBase.of(context).request)], - ), - ), - // ), - // ), + body: Column( + children: [ + TabBar( + controller: _tabController, + indicatorWeight: 3.0, + indicatorSize: TabBarIndicatorSize.tab, + labelColor: Color(0xff2B353E), + unselectedLabelColor: Color(0xff575757), + labelPadding: + EdgeInsets.only(top: 15, bottom: 13, left: 20, right: 20), + labelStyle: TextStyle( + fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins', + fontSize: 16, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + ), + unselectedLabelStyle: TextStyle( + fontFamily: projectViewModel.isArabic ? 'Cairo' : 'Poppins', + fontSize: 16, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, + ), + tabs: [ + Text(TranslationBase.of(context).family), + Text(TranslationBase.of(context).request) ], ), - ), - body: Column( - children: [ - Expanded( - child: (user != null && projectViewModel.isLogin) - ? TabBarView( - physics: BouncingScrollPhysics(), - controller: _tabController, - children: [myFamilyDetails(context), myFamilyRequest(context)], - ) - : Container(child: AppText('Loading..')), - ) - ], - ), - bottomSheet: Container( - color: Theme.of(context).scaffoldBackgroundColor, - width: double.infinity, - padding: EdgeInsets.all(14), - child: DefaultButton( - TranslationBase.of(context).addFamilyMember, - () async { - Navigator.of(context).pushNamed(ADD_FAMILY_MEMBER_TYPE); - }, + Expanded( + child: (user != null && projectViewModel.isLogin) + ? TabBarView( + physics: BouncingScrollPhysics(), + controller: _tabController, + children: [ + myFamilyDetails(context), + myFamilyRequest(context) + ], + ) + : Container(child: AppText('Loading..')), ), + ], + ), + bottomSheet: Container( + color: Theme.of(context).scaffoldBackgroundColor, + width: double.infinity, + padding: EdgeInsets.all(14), + child: DefaultButton( + TranslationBase.of(context).addFamilyMember, + () async { + Navigator.of(context).pushNamed(ADD_FAMILY_MEMBER_TYPE); + }, ), ), ); @@ -199,150 +157,168 @@ class _MyFamily extends State with TickerProviderStateMixin { Widget myFamilyDetails(context) { return Container( - height: MediaQuery.of(context).size.height, - margin: EdgeInsets.fromLTRB(20.0, 25.0, 20.0, 0.0), + margin: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 0.0), child: Column( children: [ Expanded( flex: 4, child: FutureBuilder( future: getFamilyFiles(), // async work - builder: (BuildContext context, AsyncSnapshot snapshot) { + builder: (BuildContext context, + AsyncSnapshot + snapshot) { switch (snapshot.connectionState) { case ConnectionState.waiting: - return Padding(padding: EdgeInsets.only(top: 50), child: Text('Loading....')); + return Padding( + padding: EdgeInsets.only(top: 50), + child: Text('Loading....')); default: if (snapshot.hasError) - return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable)); - else return Padding( - padding: EdgeInsets.only(top: 50), - child: Column(children: [ - // Row( - // mainAxisAlignment: MainAxisAlignment.spaceBetween, - // children: [ - // Expanded( - // flex: 3, - // child: Texts( - // TranslationBase.of(context).request, - // textAlign: TextAlign.center, - // )), - // Expanded(flex: 2, child: Texts(TranslationBase.of(context).switchUser, textAlign: TextAlign.center)), - // Expanded(flex: 1, child: Texts(TranslationBase.of(context).deleteView, textAlign: TextAlign.center)), - // ], - // ), - Column( - mainAxisAlignment: MainAxisAlignment.start, - children: snapshot.data.getAllSharedRecordsByStatusList.map((result) { - return result.status == 3 - ? Card( - margin: EdgeInsets.all(10), - shape: cardRadius(15), - color: result.gender == 1 ? Color(0xff6EA8FF) : Color(0xffFDA4B0), - elevation: 3, - child: Container( - // height: 130, - width: MediaQuery.of(context).size.width, - padding: EdgeInsets.all(10), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ + padding: EdgeInsets.all(10), + child: Text( + TranslationBase.of(context).noDataAvailable)); + else + return ListView.separated( + itemBuilder: (context, index) { + if (snapshot + .data + .getAllSharedRecordsByStatusList[index] + .status == + 3) + return Card( + margin: EdgeInsets.all(10), + shape: cardRadius(15), + color: snapshot + .data + .getAllSharedRecordsByStatusList[ + index] + .gender == + 1 + ? Color(0xff6EA8FF) + : Color(0xffFDA4B0), + elevation: 3, + child: Container( + // height: 130, + width: + MediaQuery.of(context).size.width, + padding: EdgeInsets.all(10), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Texts( + snapshot + .data + .getAllSharedRecordsByStatusList[ + index] + .patientName + .toLowerCase() + .capitalizeFirstofEach, + fontSize: 22, + fontWeight: FontWeight.bold, + color: Colors.white, + ), + Texts( + TranslationBase.of(context) + .fileNumber + + ': ' + + snapshot + .data + .getAllSharedRecordsByStatusList[ + index] + .responseID + .toString(), + fontSize: 12, + color: Colors.white), + Texts( + snapshot + .data + .getAllSharedRecordsByStatusList[ + index] + .age + .toString() + + ' ' + + TranslationBase.of(context) + .years + + ', ' + + snapshot + .data + .getAllSharedRecordsByStatusList[ + index] + .genderDescription, + fontSize: 12, + color: Colors.white), + Row( + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + children: [ + Row( + children: [ + CupertinoSwitch( + value: isSwitchUser, + onChanged: (value) { + setState(() { + isSwitchUser = value; + }); + if (isSwitchUser == + true) + switchUser( + snapshot.data + .getAllSharedRecordsByStatusList[ + index], + context); + }, + ), Texts( - result.patientName.toLowerCase().capitalizeFirstofEach, - fontSize: 22, - fontWeight: FontWeight.bold, + TranslationBase.of( + context) + .switchUser, color: Colors.white, - ), - Texts(TranslationBase.of(context).fileNumber + ': ' + result.responseID.toString(), fontSize: 12, color: Colors.white), - Texts(result.age.toString() + ' ' + TranslationBase.of(context).years + ', ' + result.genderDescription, fontSize: 12, color: Colors.white), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, + fontSize: 12, + ) + ], + ), + InkWell( + onTap: () { + deleteFamily( + snapshot.data + .getAllSharedRecordsByStatusList[ + index], + context); + }, + child: Row( children: [ - Row( - children: [ - CupertinoSwitch( - value: isSwitchUser, - onChanged: (value) { - setState(() { - isSwitchUser = value; - }); - if (isSwitchUser == true) switchUser(result, context); - }, - ), - Texts( - TranslationBase.of(context).switchUser, - color: Colors.white, - fontSize: 12, - ) - ], + Texts( + TranslationBase.of( + context) + .delete, + color: Colors.white, + fontSize: 12, + ), + Icon( + Icons.delete, + color: Colors.white, ), - InkWell( - onTap: () { - deleteFamily(result, context); - }, - child: Row( - children: [ - Texts( - TranslationBase.of(context).delete, - color: Colors.white, - fontSize: 12, - ), - Icon( - Icons.delete, - color: Colors.white, - ), - ], - )) ], - ) - // Expanded( - // flex: 2, - // child: IconButton( - // icon: Icon(Icons.group), - // color: Colors.black, - // onPressed: () { - // switchUser(result, context); - // }, - // )), - // Expanded( - // flex: 1, - // child: IconButton( - // icon: Icon( - // Icons.delete, - // color: Colors.black, - // ), - // onPressed: () { - // deleteFamily(result, context); - // }, - // )), - ], - ))) - : SizedBox(); - }).toList()) - ])); + )) + ], + ) + ], + ))); + else + return SizedBox.shrink(); + }, + separatorBuilder: (context, index) => + SizedBox(height: 0), + itemCount: snapshot + .data.getAllSharedRecordsByStatusList.length); } }, ), ), - // Expanded( - // flex: 1, - // child: Column( - // mainAxisAlignment: MainAxisAlignment.end, - // children: [ - // Row( - // children: [ - // Expanded( - // child: DefaultButton( - // TranslationBase.of(context).addFamilyMember, - // () => {Navigator.of(context).pushNamed(ADD_FAMILY_MEMBER_TYPE)}, - // color: Colors.grey[900], - // textColor: Colors.white, - // )) - // ], - // ), - // ], - // ), - // ) + SizedBox(height: 80.0) ], )); } @@ -354,25 +330,34 @@ class _MyFamily extends State with TickerProviderStateMixin { SingleChildScrollView( child: Container( height: MediaQuery.of(context).size.height, - margin: EdgeInsets.only(top: 65), + margin: EdgeInsets.only(top: 10), child: Column( children: [ RoundedContainer( child: ExpansionTile( title: Text( TranslationBase.of(context).userViewRequest, - style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold, color: Colors.black), + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.bold, + color: Colors.black), ), children: [ FutureBuilder( future: getUserViewRequest(), // async work - builder: (BuildContext context, AsyncSnapshot snapshot) { + builder: (BuildContext context, + AsyncSnapshot snapshot) { switch (snapshot.connectionState) { case ConnectionState.waiting: - return Padding(padding: EdgeInsets.only(top: 50), child: Text('Loading....')); + return Padding( + padding: EdgeInsets.only(top: 50), + child: Text('Loading....')); default: if (snapshot.hasError) - return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable)); + return Padding( + padding: EdgeInsets.all(10), + child: Text(TranslationBase.of(context) + .noDataAvailable)); else return Container( padding: EdgeInsets.all(15), @@ -385,27 +370,60 @@ class _MyFamily extends State with TickerProviderStateMixin { Padding( padding: EdgeInsets.all(10), child: Row(children: [ - Expanded(flex: 3, child: AppText(TranslationBase.of(context).name, fontWeight: FontWeight.w600)), - Expanded(flex: 1, child: AppText(TranslationBase.of(context).allow, fontWeight: FontWeight.w600)), - Expanded(flex: 1, child: AppText(TranslationBase.of(context).reject, fontWeight: FontWeight.w600)), + Expanded( + flex: 3, + child: AppText( + TranslationBase.of( + context) + .name, + fontWeight: + FontWeight.w600)), + Expanded( + flex: 1, + child: AppText( + TranslationBase.of( + context) + .allow, + fontWeight: + FontWeight.w600)), + Expanded( + flex: 1, + child: AppText( + TranslationBase.of( + context) + .reject, + fontWeight: + FontWeight.w600)), ])), - Divider(color: Colors.black, height: 1), + Divider( + color: Colors.black, height: 1), Column( - children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.map((result) { + children: familyFileProvider + .allSharedRecordsByStatusResponse + .getAllSharedRecordsByStatusList + .map((result) { return Container( padding: EdgeInsets.all(10), child: Row( children: [ - Expanded(flex: 3, child: Text(result.patientName)), + Expanded( + flex: 3, + child: Text(result + .patientName)), Expanded( flex: 1, child: IconButton( icon: Icon( - Icons.check_circle, - color: Colors.black, + Icons + .check_circle, + color: + Colors.black, ), onPressed: () { - acceptRemoveRequest(result.iD, 3, context); + acceptRemoveRequest( + result.iD, + 3, + context); }, )), Expanded( @@ -413,10 +431,14 @@ class _MyFamily extends State with TickerProviderStateMixin { child: IconButton( icon: Icon( Icons.delete, - color: Colors.black, + color: + Colors.black, ), onPressed: () { - acceptRemoveRequest(result.iD, 4, context); + acceptRemoveRequest( + result.iD, + 4, + context); }, )) ], @@ -434,18 +456,28 @@ class _MyFamily extends State with TickerProviderStateMixin { child: ExpansionTile( title: Text( TranslationBase.of(context).sentRequest, - style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold, color: Colors.black), + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.bold, + color: Colors.black), ), children: [ FutureBuilder( future: getSentRequest(), // async work - builder: (BuildContext context, AsyncSnapshot snapshot) { + builder: (BuildContext context, + AsyncSnapshot + snapshot) { switch (snapshot.connectionState) { case ConnectionState.waiting: - return Padding(padding: EdgeInsets.only(top: 50), child: Text('Loading....')); + return Padding( + padding: EdgeInsets.only(top: 50), + child: Text('Loading....')); default: if (snapshot.hasError) - return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable)); + return Padding( + padding: EdgeInsets.all(10), + child: Text(TranslationBase.of(context) + .noDataAvailable)); else return Container( padding: EdgeInsets.all(15), @@ -459,22 +491,45 @@ class _MyFamily extends State with TickerProviderStateMixin { Padding( padding: EdgeInsets.all(10), child: Row(children: [ - Expanded(flex: 3, child: AppText(TranslationBase.of(context).theName, fontWeight: FontWeight.w600)), - Expanded(flex: 2, child: AppText(TranslationBase.of(context).status, fontWeight: FontWeight.w600)) + Expanded( + flex: 3, + child: AppText( + TranslationBase.of( + context) + .theName, + fontWeight: + FontWeight.w600)), + Expanded( + flex: 2, + child: AppText( + TranslationBase.of( + context) + .status, + fontWeight: + FontWeight.w600)) ])), Divider(color: Colors.black, height: 1), Column( - children: snapshot.data.getAllSharedRecordsByStatusList.map((result) { + children: snapshot.data + .getAllSharedRecordsByStatusList + .map((result) { return Padding( padding: EdgeInsets.all(10), child: Row( children: [ - Expanded(flex: 3, child: Text(result.patientName)), + Expanded( + flex: 3, + child: Text(result + .patientName)), Expanded( flex: 2, child: AppText( - result.statusDescription, - color: result.status == 3 ? Colors.green : Colors.red, + result + .statusDescription, + color: + result.status == 3 + ? Colors.green + : Colors.red, )), ], )); @@ -490,18 +545,27 @@ class _MyFamily extends State with TickerProviderStateMixin { child: ExpansionTile( title: Text( TranslationBase.of(context).userView, - style: TextStyle(fontSize: 16.0, fontWeight: FontWeight.bold, color: Colors.black), + style: TextStyle( + fontSize: 16.0, + fontWeight: FontWeight.bold, + color: Colors.black), ), children: [ FutureBuilder( future: getUserViewRequest(), // async work - builder: (BuildContext context, AsyncSnapshot snapshot) { + builder: (BuildContext context, + AsyncSnapshot snapshot) { switch (snapshot.connectionState) { case ConnectionState.waiting: - return Padding(padding: EdgeInsets.only(top: 50), child: Text('Loading....')); + return Padding( + padding: EdgeInsets.only(top: 50), + child: Text('Loading....')); default: if (snapshot.hasError) - return Padding(padding: EdgeInsets.all(10), child: Text(TranslationBase.of(context).noDataAvailable)); + return Padding( + padding: EdgeInsets.all(10), + child: Text(TranslationBase.of(context) + .noDataAvailable)); else return Container( padding: EdgeInsets.all(15), @@ -514,17 +578,33 @@ class _MyFamily extends State with TickerProviderStateMixin { Padding( padding: EdgeInsets.all(10), child: Row(children: [ - Expanded(flex: 3, child: AppText(TranslationBase.of(context).name)), - Expanded(flex: 1, child: AppText(TranslationBase.of(context).delete)), + Expanded( + flex: 3, + child: AppText( + TranslationBase.of( + context) + .name)), + Expanded( + flex: 1, + child: AppText( + TranslationBase.of( + context) + .delete)), ])), Divider(color: Colors.black), Column( - children: familyFileProvider.allSharedRecordsByStatusResponse.getAllSharedRecordsByStatusList.map((result) { + children: familyFileProvider + .allSharedRecordsByStatusResponse + .getAllSharedRecordsByStatusList + .map((result) { return Padding( padding: EdgeInsets.all(10), child: Row( children: [ - Expanded(flex: 3, child: AppText(result.patientName)), + Expanded( + flex: 3, + child: AppText(result + .patientName)), Expanded( flex: 1, child: IconButton( @@ -533,7 +613,10 @@ class _MyFamily extends State with TickerProviderStateMixin { color: Colors.black, ), onPressed: () { - deactivateRequest(result.iD, 5, context); + deactivateRequest( + result.iD, + 5, + context); }, )), ], @@ -562,13 +645,11 @@ class _MyFamily extends State with TickerProviderStateMixin { } Future getFamilyFiles() async { - if (user != null) { - if (await sharedPref.getObject(FAMILY_FILE) != null) { - // print(await sharedPref.getObject(FAMILY_FILE)); - return Future.value(GetAllSharedRecordsByStatusResponse.fromJson(await sharedPref.getObject(FAMILY_FILE))); - } else { - return familyFileProvider.getSharedRecordByStatus(); - } + if (await sharedPref.getObject(FAMILY_FILE) != null) { + return Future.value(GetAllSharedRecordsByStatusResponse.fromJson( + await sharedPref.getObject(FAMILY_FILE))); + } else { + return familyFileProvider.getSharedRecordByStatus().then((value) {}); } } @@ -588,7 +669,10 @@ class _MyFamily extends State with TickerProviderStateMixin { confirmMessage: TranslationBase.of(context).removeFamilyMember, okText: TranslationBase.of(context).confirm, cancelText: TranslationBase.of(context).cancel_nocaps, - okFunction: () => {ConfirmDialog.closeAlertDialog(context), removeFamily(family, context)}, + okFunction: () => { + ConfirmDialog.closeAlertDialog(context), + removeFamily(family, context) + }, cancelFunction: () => {}); dialog.showAlertDialog(context); } @@ -599,7 +683,10 @@ class _MyFamily extends State with TickerProviderStateMixin { Map request = {}; request['ID'] = this.userID; request['IsActive'] = false; - this.familyFileProvider.deativateActivateMemberFile(request).then((value) => refreshFamily(context)); + this + .familyFileProvider + .deativateActivateMemberFile(request) + .then((value) => refreshFamily(context)); } refreshFamily(context) { @@ -617,7 +704,12 @@ class _MyFamily extends State with TickerProviderStateMixin { // .then((value) => loginAfter(value, context)); // Utils.showProgressDialog(context); - this.familyFileProvider.silentLoggin(user is AuthenticatedUser ? null : user, mainUser: user is AuthenticatedUser).then((value) => loginAfter(value, context)).catchError((err) { + this + .familyFileProvider + .silentLoggin(user is AuthenticatedUser ? null : user, + mainUser: user is AuthenticatedUser) + .then((value) => loginAfter(value, context)) + .catchError((err) { print(err); AppToast.showErrorToast(message: err); Navigator.of(context).pop(); @@ -626,7 +718,8 @@ class _MyFamily extends State with TickerProviderStateMixin { loginAfter(result, context) async { var currentLang = await sharedPref.getString(APP_LANGUAGE); - Provider.of(context, listen: false).setPrivilege(privilegeList: result, isLoginChild: true); + Provider.of(context, listen: false) + .setPrivilege(privilegeList: result, isLoginChild: true); result = list.CheckActivationCode.fromJson(result); var familyFile = await sharedPref.getObject(FAMILY_FILE); @@ -647,12 +740,10 @@ class _MyFamily extends State with TickerProviderStateMixin { this.sharedPref.setString(TOKEN, result.authenticationTokenID); await authenticatedUserObject.getUser(getUser: true); - Provider.of(context, listen: false).user = authenticatedUserObject.user; - Provider.of(context, listen: false).setUser(authenticatedUserObject.user); - - // await pharmacyModuleViewModel.generatePharmacyToken().then((value) async { - // if (pharmacyModuleViewModel.error.isNotEmpty) await pharmacyModuleViewModel.createUser(); - // }); + Provider.of(context, listen: false).user = + authenticatedUserObject.user; + Provider.of(context, listen: false) + .setUser(authenticatedUserObject.user); appointmentRateViewModel .getIsLastAppointmentRatedList() @@ -690,7 +781,8 @@ class _MyFamily extends State with TickerProviderStateMixin { Map request = {}; request["ID"] = ID; request["Status"] = status; - this.familyFileProvider.deactivateFamily(request).then((value) => {GifLoaderDialogUtils.hideDialog(context), refreshFamily(context)}); + this.familyFileProvider.deactivateFamily(request).then((value) => + {GifLoaderDialogUtils.hideDialog(context), refreshFamily(context)}); } acceptRemoveRequest(ID, status, context) { @@ -698,15 +790,17 @@ class _MyFamily extends State with TickerProviderStateMixin { Map request = {}; request["ID"] = ID; request["Status"] = status; - this.familyFileProvider.acceptRejectFamily(request).then((value) => {GifLoaderDialogUtils.hideDialog(context), refreshFamily(context)}); + this.familyFileProvider.acceptRejectFamily(request).then((value) => + {GifLoaderDialogUtils.hideDialog(context), refreshFamily(context)}); } checkUserData() async { if (await this.sharedPref.getObject(USER_PROFILE) != null) { - var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE)); + var data = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(USER_PROFILE)); - var data2 = AuthenticatedUser.fromJson(await this.sharedPref.getObject(MAIN_USER)); - print(data2); + var data2 = AuthenticatedUser.fromJson( + await this.sharedPref.getObject(MAIN_USER)); setState(() { this.user = data; }); @@ -719,7 +813,8 @@ class _MyFamily extends State with TickerProviderStateMixin { service.getActiveAppointmentNo(context).then((res) { print(res['AppointmentActiveNumber']); if (res['MessageStatus'] == 1 && res['AppointmentActiveNumber'] != null) { - toDoProvider.setState(res['AppointmentActiveNumber'], true, toDoProvider.notificationsCount); + toDoProvider.setState(res['AppointmentActiveNumber'], true, + toDoProvider.notificationsCount); } else {} }).catchError((err) { print(err); diff --git a/lib/services/family_files/family_files_provider.dart b/lib/services/family_files/family_files_provider.dart index 5fbe2392..ef7ad14d 100644 --- a/lib/services/family_files/family_files_provider.dart +++ b/lib/services/family_files/family_files_provider.dart @@ -37,12 +37,14 @@ class FamilyFilesProvider with ChangeNotifier { GetAllSharedRecordsByStatusResponse allSharedRecordsByStatusResponse; Future getSharedRecordByStatus() async { + dynamic localRes; try { - dynamic localRes; var request = GetAllSharedRecordsByStatusReq(); var result = await sharedPref.getObject(MAIN_USER); request.status = 0; + request.patientID = result["PatientID"]; + await new BaseAppClient().post(GET_SHARED_RECORD_BY_STATUS, onSuccess: (dynamic response, int statusCode) { localRes = response; }, onFailure: (String error, int statusCode) {