merge-requests/140/head
Sultan Khan 6 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,13 +194,13 @@ 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(
@ -210,30 +215,35 @@ class _AppDrawerState extends State<AppDrawer> {
Widget>[ Widget>[
Expanded( Expanded(
child: Icon( child: Icon(
Icons.person), Icons
.person),
), ),
Expanded( Expanded(
flex: flex: 7,
7,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment:
CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText(mainUser.firstName +' '+mainUser.lastName), AppText(mainUser.firstName + ' ' + mainUser.lastName),
AppText(TranslationBase.of(context).fileno +": " + mainUser.patientID.toString()), AppText(TranslationBase.of(context).fileno + ": " + mainUser.patientID.toString()),
])), ])),
], ],
))) : SizedBox(), )))
: SizedBox(),
Column( Column(
mainAxisAlignment: mainAxisAlignment:
MainAxisAlignment.start, MainAxisAlignment
.start,
mainAxisSize: mainAxisSize:
MainAxisSize.min, MainAxisSize.min,
children: snapshot.data children: snapshot.data
.getAllSharedRecordsByStatusList .getAllSharedRecordsByStatusList
.map<Widget>((result) { .map<Widget>(
return result.status == 3 (result) {
return result
.status ==
3
? Container( ? Container(
padding: EdgeInsets padding: EdgeInsets
.only( .only(
bottom: bottom:
@ -246,27 +256,25 @@ class _AppDrawerState extends State<AppDrawer> {
}, },
child: Row( child: Row(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment CrossAxisAlignment.start,
.start,
children: < children: <
Widget>[ Widget>[
Expanded( Expanded(
child: Icon( child:
Icons.person, color:result.responseID ==user.patientID ? Color(0xFF40ACC9): Colors.black), Icon(Icons.person, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
), ),
Expanded( Expanded(
flex: flex: 7,
7, child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
child: Column( AppText(result.patientName, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
crossAxisAlignment: CrossAxisAlignment.start, AppText(TranslationBase.of(context).fileno + ": " + result.iD.toString(), color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
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(); : SizedBox();
}).toList())],)); }).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,7 +424,7 @@ 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(
@ -427,7 +439,8 @@ class _AppDrawerState extends State<AppDrawer> {
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