merge-requests/140/head
Sultan Khan 4 years ago
parent 00b0154987
commit 0ed29be214

@ -1,3 +1,4 @@
import 'dart:io';
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
@ -15,6 +16,7 @@ import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:smart_progress_bar/smart_progress_bar.dart'; import 'package:smart_progress_bar/smart_progress_bar.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../config/size_config.dart'; import '../../config/size_config.dart';
import '../../locator.dart'; import '../../locator.dart';
@ -98,7 +100,10 @@ class _AppDrawerState extends State<AppDrawer> {
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
AppText( AppText(
TranslationBase.of(context).fileno +": " + TranslationBase.of(
context)
.fileno +
": " +
user.patientID user.patientID
.toString(), .toString(),
color: color:
@ -189,84 +194,87 @@ class _AppDrawerState extends State<AppDrawer> {
width: 1.0, width: 1.0,
), ),
)), )),
child: Column(children: [ child: Column(
user.isFamily == true ? Container( children: [
user.isFamily == true
padding: EdgeInsets ? Container(
.only( padding:
bottom: EdgeInsets.only(
5), bottom: 5),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
switchUser( switchUser(
mainUser, mainUser,
context); context);
}, },
child: Row( child: Row(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment CrossAxisAlignment
.start,
children: <
Widget>[
Expanded(
child: Icon(
Icons
.person),
),
Expanded(
flex: 7,
child: Column(
crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[
AppText(mainUser.firstName + ' ' + mainUser.lastName),
AppText(TranslationBase.of(context).fileno + ": " + mainUser.patientID.toString()),
])),
],
)))
: SizedBox(),
Column(
mainAxisAlignment:
MainAxisAlignment
.start, .start,
children: < mainAxisSize:
Widget>[ MainAxisSize.min,
Expanded( children: snapshot.data
child: Icon( .getAllSharedRecordsByStatusList
Icons.person), .map<Widget>(
), (result) {
Expanded( return result
flex: .status ==
7, 3
child: Column( ? Container(
crossAxisAlignment: CrossAxisAlignment.start, padding: EdgeInsets
children: <Widget>[ .only(
AppText(mainUser.firstName +' '+mainUser.lastName), bottom:
AppText(TranslationBase.of(context).fileno +": " + mainUser.patientID.toString()), 5),
])), child: InkWell(
], onTap: () {
))) : SizedBox(), switchUser(
Column( result,
mainAxisAlignment: context);
MainAxisAlignment.start, },
mainAxisSize: child: Row(
MainAxisSize.min, crossAxisAlignment:
children: snapshot.data CrossAxisAlignment.start,
.getAllSharedRecordsByStatusList children: <
.map<Widget>((result) { Widget>[
return result.status == 3 Expanded(
? Container( child:
Icon(Icons.person, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
padding: EdgeInsets ),
.only( Expanded(
bottom: flex: 7,
5), child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
child: InkWell( AppText(result.patientName, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
onTap: () { AppText(TranslationBase.of(context).fileno + ": " + result.iD.toString(), color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
switchUser( ])),
result, ],
context); )))
}, : SizedBox();
child: Row( }).toList())
crossAxisAlignment: ],
CrossAxisAlignment ));
.start,
children: <
Widget>[
Expanded(
child: Icon(
Icons.person, color:result.responseID ==user.patientID ? Color(0xFF40ACC9): Colors.black),
),
Expanded(
flex:
7,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
AppText(result.patientName, color:result.responseID ==user.patientID ? Color(0xFF40ACC9): Colors.black),
AppText(TranslationBase.of(context).fileno +": " + result.iD.toString(), color:result.responseID ==user.patientID ? Color(0xFF40ACC9): Colors.black),
])),
],
)))
: SizedBox();
}).toList())],));
} }
}, },
), ),
@ -300,9 +308,13 @@ class _AppDrawerState extends State<AppDrawer> {
TranslationBase.of(context).rateApp, TranslationBase.of(context).rateApp,
Icons.star), Icons.star),
onTap: () { onTap: () {
Navigator.of(context).pushNamed( if (Platform.isIOS) {
WELCOME_LOGIN, launch(
); "https://apps.apple.com/sa/app/dr-suliaman-alhabib/id733503978");
} else {
launch(
"https://play.google.com/store/apps/details?id=com.ejada.hmg&hl=en");
}
}, },
), ),
InkWell( InkWell(
@ -412,22 +424,23 @@ class _AppDrawerState extends State<AppDrawer> {
} }
Future<GetAllSharedRecordsByStatusResponse> getFamilyFiles() async { Future<GetAllSharedRecordsByStatusResponse> getFamilyFiles() async {
if(user !=null){ if (user != null) {
if (await sharedPref.getObject(FAMILY_FILE) != null) { if (await sharedPref.getObject(FAMILY_FILE) != null) {
// print(await sharedPref.getObject(FAMILY_FILE)); // print(await sharedPref.getObject(FAMILY_FILE));
return Future.value(GetAllSharedRecordsByStatusResponse.fromJson( return Future.value(GetAllSharedRecordsByStatusResponse.fromJson(
await sharedPref.getObject(FAMILY_FILE))); await sharedPref.getObject(FAMILY_FILE)));
} else { } else {
return familyFileProvider.getSharedRecordByStatus(); return familyFileProvider.getSharedRecordByStatus();
}
} }
}
} }
switchUser(user, context) { switchUser(user, context) {
Utils.showProgressDialog(context); Utils.showProgressDialog(context);
this this
.familyFileProvider .familyFileProvider
.silentLoggin(user is AuthenticatedUser ? null : user, mainUser: user is AuthenticatedUser) .silentLoggin(user is AuthenticatedUser ? null : user,
mainUser: user is AuthenticatedUser)
.then((value) => loginAfter(value, context)) .then((value) => loginAfter(value, context))
.catchError((err) { .catchError((err) {
print(err); print(err);
@ -443,10 +456,10 @@ class _AppDrawerState extends State<AppDrawer> {
var familyFile = await sharedPref.getObject(FAMILY_FILE); var familyFile = await sharedPref.getObject(FAMILY_FILE);
var mainUser = await sharedPref.getObject(MAIN_USER); var mainUser = await sharedPref.getObject(MAIN_USER);
this.sharedPref.clear(); this.sharedPref.clear();
if(mainUser["PatientID"] != result.list.patientID) { if (mainUser["PatientID"] != result.list.patientID) {
result.list.isFamily = true; result.list.isFamily = true;
} }
this.sharedPref.setObject(MAIN_USER,mainUser); this.sharedPref.setObject(MAIN_USER, mainUser);
this.sharedPref.setObject(USER_PROFILE, result.list); this.sharedPref.setObject(USER_PROFILE, result.list);
this.sharedPref.setObject(FAMILY_FILE, familyFile); this.sharedPref.setObject(FAMILY_FILE, familyFile);
this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID); this.sharedPref.setObject(LOGIN_TOKEN_ID, result.logInTokenID);

Loading…
Cancel
Save