Merge branch 'sultan-patientapp' into 'development'

Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!288
merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
commit a018eab316

@ -1963,18 +1963,32 @@ const Map localizedValues = {
}, },
"ancillary-orders": {"en": "Ancillary Orders", "ar": "الأوامر التبعية"}, "ancillary-orders": {"en": "Ancillary Orders", "ar": "الأوامر التبعية"},
"onlineCheckInAgreement": {"en": "The online check-in is for non-life threatening situationCall the red crescent (number) or go to the nearest emergency department if there are:signs of stroke or heart attack history of seizure or syncope there is limb or life threatening injury picture of severe injuries", "onlineCheckInAgreement": {
"ar": "تسجيل الذهاب الى الطوارئ عبر الإنترنت هو فقط للحالات  التي لا تهدد الحياة يجب الاتصل بالهلال الأحمر (رقم) أو الذهاب إلى أقرب قسم طوارئ إذا كان هناك علامات السكتة الدماغية أو النوبة القلبية او هناك نوبة تشنج او حالة فقدان الوعي او وجود إصابة تهدد أحد الأطراف او تهدد الحياة او وجود إصابات خطيرة"}, "en":
"The online check-in is for non-life threatening situationCall the red crescent (number) or go to the nearest emergency department if there are:signs of stroke or heart attack history of seizure or syncope there is limb or life threatening injury picture of severe injuries",
"ar":
"تسجيل الذهاب الى الطوارئ عبر الإنترنت هو فقط للحالات  التي لا تهدد الحياة يجب الاتصل بالهلال الأحمر (رقم) أو الذهاب إلى أقرب قسم طوارئ إذا كان هناك علامات السكتة الدماغية أو النوبة القلبية او هناك نوبة تشنج او حالة فقدان الوعي او وجود إصابة تهدد أحد الأطراف او تهدد الحياة او وجود إصابات خطيرة"
},
"MRN": {"en": "MRN", "ar": "ایم آر این"}, "MRN": {"en": "MRN", "ar": "ایم آر این"},
"appointment-date": {"en": "Appointment Date", "ar": "تقرری کی تاریخ"}, "appointment-date": {"en": "Appointment Date", "ar": "تقرری کی تاریخ"},
"appointment-no": {"en": "Appointment No", "ar": "تقرری نمبر"}, "appointment-no": {"en": "Appointment No", "ar": "تقرری نمبر"},
"insurance-id": {"en": "Insurance ID", "ar": "انشورنس ID"}, "insurance-id": {"en": "Insurance ID", "ar": "انشورنس ID"},
"chiefComplaints": {"en": "Chief Complaints", "ar": "الشكوى الرئيسة"}, "chiefComplaints": {"en": "Chief Complaints", "ar": "الشكوى الرئيسة"},
"errorChiefComplaints": {"en": "Please Chief Complaints", "ar": "يرجى ادخال الشكوى الرئيسة"}, "errorChiefComplaints": {
"errorExpectedArrivalTimes": {"en": "Please Expected arrival time", "ar": "يرجى ادخال الوقت المتوقع للوصول"}, "en": "Please Chief Complaints",
"expectedArrivalTime": {"en": "Expected arrival time", "ar": "الوقت المتوقع للوصول"}, "ar": "يرجى ادخال الشكوى الرئيسة"
"add-address": { },
"en": "Add new address", "errorExpectedArrivalTimes": {
"ar": "اضف عنوان جديد" "en": "Please Expected arrival time",
"ar": "يرجى ادخال الوقت المتوقع للوصول"
},
"expectedArrivalTime": {
"en": "Expected arrival time",
"ar": "الوقت المتوقع للوصول"
},
"add-address": {"en": "Add new address", "ar": "اضف عنوان جديد"},
"enter-file": {
"en": "Please enter the mobile number and the medical file number",
"ar": "الرجاء إدخال رقم الجوال ورقم الملف الطبي"
} }
}; };

@ -103,7 +103,7 @@ class _AnicllaryOrdersState extends State<AnicllaryOrders>
bottom: BorderSide( bottom: BorderSide(
width: 0.5, width: 0.5,
))), ))),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(15),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [

@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart'; import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import "package:collection/collection.dart"; import "package:collection/collection.dart";
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
class AnicllaryOrdersDetails extends StatefulWidget { class AnicllaryOrdersDetails extends StatefulWidget {
final dynamic appoNo; final dynamic appoNo;
@ -186,11 +187,60 @@ class _AnicllaryOrdersState extends State<AnicllaryOrdersDetails>
} }
Widget getAncillaryDetails(model) { Widget getAncillaryDetails(model) {
var newMap = groupBy(model.ancillaryListsDetails[0].ancillaryOrderProcList, Map newMap = groupBy(model.ancillaryListsDetails[0].ancillaryOrderProcList,
(obj) => obj.procedureCategoryName); (obj) => obj.procedureCategoryName);
print(newMap); print(newMap);
return Padding( return Padding(
padding: EdgeInsets.only(top: 10, bottom: 10), padding: EdgeInsets.only(top: 10, bottom: 10),
child: Column(children: [])); child: getHeaderDetails(newMap));
}
Widget getHeaderDetails(newMap) {
List<Widget> list = new List<Widget>();
newMap.forEach((key, value) {
list.add(
Texts(
key,
fontWeight: FontWeight.bold,
),
);
list.add(Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [getLabDetails(value)],
));
});
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: list,
);
}
getLabDetails(value) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: value.map<Widget>((result) {
return Container(
width: MediaQuery.of(context).size.width * .9,
padding: EdgeInsets.all(10),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Expanded(
flex: 3,
child: Text(result.procedureName.toString(),
overflow: TextOverflow.ellipsis)),
Expanded(child: AppText(result.companyShare.toString())),
Expanded(child: AppText(result.companyTaxAmount.toString())),
Expanded(
child: AppText(
result.companyShareWithTax.toString(),
))
],
));
}).toList(),
);
} }
} }

@ -109,27 +109,49 @@ class _InsuranceCardState extends State<InsuranceCard> {
), ),
Column( Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.stretch, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Texts(
TranslationBase.of(context)
.category,
fontSize: 18.5),
Texts( Texts(
TranslationBase.of(context).category +": "+
model.insurance[index] model.insurance[index]
.subCategoryDesc, .subCategoryDesc,
fontSize: 18.5, fontSize: 18.5)
],
), ),
Row( Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [ children: [
Texts( Texts(
TranslationBase.of(context) TranslationBase.of(context)
.expirationDate +": "+ .expirationDate,
convertDateFormat(model fontSize: 18.5),
.insurance[index].cardValidTo), Texts(
fontSize: 18.5, convertDateFormat(
model.insurance[index]
.cardValidTo,
), ),
Expanded( fontSize: 18.5),
child: Column( ],
children: <Widget>[ ),
model.insurance[index].isActive == true Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Texts(
TranslationBase.of(context)
.status +
": ",
fontSize: 18.5),
model.insurance[index].isActive ==
true
? Texts( ? Texts(
TranslationBase.of(context) TranslationBase.of(context)
.activeInsurence, .activeInsurence,
@ -144,23 +166,35 @@ class _InsuranceCardState extends State<InsuranceCard> {
fontSize: 17.9) fontSize: 17.9)
], ],
), ),
), Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Texts(
TranslationBase.of(context)
.patientCard,
fontSize: 18.5),
Texts(
model.insurance[index]
.patientCardID,
fontSize: 18.5)
], ],
), ),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Texts( Texts(
TranslationBase.of(context) TranslationBase.of(context)
.patientCard +": "+ .policyNumber,
model
.insurance[index].patientCardID,
fontSize: 18.5, fontSize: 18.5,
), ),
Texts( Texts(
TranslationBase.of(context)
.policyNumber +" "+
model.insurance[index] model.insurance[index]
.insurancePolicyNumber, .insurancePolicyNumber,
fontSize: 18.5, fontSize: 18.5,
), )
]),
], ],
), ),
SizedBox( SizedBox(

@ -88,7 +88,9 @@ class _Login extends State<Login> {
Expanded( Expanded(
flex: 2, flex: 2,
child: Texts( child: Texts(
TranslationBase.of(context).enterNationalId, loginType == 1
? TranslationBase.of(context).enterNationalId
: TranslationBase.of(context).enterFile,
fontSize: SizeConfig.textMultiplier * 3.5, fontSize: SizeConfig.textMultiplier * 3.5,
textAlign: TextAlign.start, textAlign: TextAlign.start,
)), )),

@ -47,7 +47,7 @@ defaultTheme({fontName}) {
textTheme: TextTheme( textTheme: TextTheme(
bodyText1: TextStyle(color: Colors.black), bodyText1: TextStyle(color: Colors.black),
headline1: TextStyle(color: Colors.white), headline1: TextStyle(color: Colors.white),
), headline2: TextStyle(color: Colors.white)),
appBarTheme: AppBarTheme( appBarTheme: AppBarTheme(
color: Color(0xff515A5D), color: Color(0xff515A5D),
brightness: Brightness.light, brightness: Brightness.light,
@ -76,7 +76,7 @@ invertThemes({fontName}) {
textTheme: TextTheme( textTheme: TextTheme(
bodyText1: TextStyle(color: Colors.white), bodyText1: TextStyle(color: Colors.white),
headline1: TextStyle(color: Colors.white), headline1: TextStyle(color: Colors.white),
), headline2: TextStyle(color: Colors.white)),
disabledColor: Colors.grey[800], disabledColor: Colors.grey[800],
errorColor: Color.fromRGBO(235, 80, 60, 1.0), errorColor: Color.fromRGBO(235, 80, 60, 1.0),
scaffoldBackgroundColor: Color(0xff000000), // Colors.grey[100], scaffoldBackgroundColor: Color(0xff000000), // Colors.grey[100],
@ -125,6 +125,7 @@ bwThemes({fontName}) {
textTheme: TextTheme( textTheme: TextTheme(
bodyText1: TextStyle(color: Colors.red[900]), bodyText1: TextStyle(color: Colors.red[900]),
headline1: TextStyle(color: Colors.red[900]), headline1: TextStyle(color: Colors.red[900]),
headline2: TextStyle(color: Colors.white),
bodyText2: TextStyle(color: Colors.red[900]), bodyText2: TextStyle(color: Colors.red[900]),
subtitle1: TextStyle(color: Colors.red[900]), subtitle1: TextStyle(color: Colors.red[900]),
), ),

@ -1573,12 +1573,18 @@ class TranslationBase {
String get shippingAddresss => String get shippingAddresss =>
localizedValues["shipping-address"][locale.languageCode]; localizedValues["shipping-address"][locale.languageCode];
String get covidAlert => localizedValues["covid-alert"][locale.languageCode]; String get covidAlert => localizedValues["covid-alert"][locale.languageCode];
String get pharmacyRelogin => localizedValues["pharmacy-relogin"][locale.languageCode]; String get pharmacyRelogin =>
String get onlineCheckInAgreement => localizedValues["onlineCheckInAgreement"][locale.languageCode]; localizedValues["pharmacy-relogin"][locale.languageCode];
String get chiefComplaints => localizedValues["chiefComplaints"][locale.languageCode]; String get onlineCheckInAgreement =>
String get errorChiefComplaints => localizedValues["errorChiefComplaints"][locale.languageCode]; localizedValues["onlineCheckInAgreement"][locale.languageCode];
String get expectedArrivalTime => localizedValues["expectedArrivalTime"][locale.languageCode]; String get chiefComplaints =>
String get errorExpectedArrivalTime => localizedValues["errorExpectedArrivalTimes"][locale.languageCode]; localizedValues["chiefComplaints"][locale.languageCode];
String get errorChiefComplaints =>
localizedValues["errorChiefComplaints"][locale.languageCode];
String get expectedArrivalTime =>
localizedValues["expectedArrivalTime"][locale.languageCode];
String get errorExpectedArrivalTime =>
localizedValues["errorExpectedArrivalTimes"][locale.languageCode];
String get anicllaryOrders => String get anicllaryOrders =>
localizedValues["ancillary-orders"][locale.languageCode]; localizedValues["ancillary-orders"][locale.languageCode];
String get mrn => localizedValues["MRN"][locale.languageCode]; String get mrn => localizedValues["MRN"][locale.languageCode];
@ -1588,6 +1594,7 @@ class TranslationBase {
localizedValues["appointment-no"][locale.languageCode]; localizedValues["appointment-no"][locale.languageCode];
String get insuranceID => String get insuranceID =>
localizedValues["insurance-id"][locale.languageCode]; localizedValues["insurance-id"][locale.languageCode];
String get enterFile => localizedValues["enter-file"][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -36,6 +36,7 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:url_launcher/url_launcher.dart';
import '../Constants.dart'; import '../Constants.dart';
import 'app_shared_preferences.dart'; import 'app_shared_preferences.dart';
@ -183,10 +184,9 @@ class Utils {
// } // }
} }
static getPhoneNumberWithoutZero(String number){ static getPhoneNumberWithoutZero(String number) {
String newNumber=""; String newNumber = "";
if(number.startsWith('0')) if (number.startsWith('0')) {
{
newNumber = number.substring(1); newNumber = number.substring(1);
} }
return newNumber; return newNumber;
@ -202,7 +202,11 @@ class Utils {
.hasMatch(email); .hasMatch(email);
} }
static List<Widget> myMedicalList({ProjectViewModel projectViewModel, BuildContext context, bool isLogin, count}) { static List<Widget> myMedicalList(
{ProjectViewModel projectViewModel,
BuildContext context,
bool isLogin,
count}) {
List<Widget> medical = List(); List<Widget> medical = List();
if (projectViewModel.havePrivilege(5)) { if (projectViewModel.havePrivilege(5)) {
medical.add(InkWell( medical.add(InkWell(
@ -503,15 +507,19 @@ class Utils {
if (projectViewModel.havePrivilege(32) || true) { if (projectViewModel.havePrivilege(32) || true) {
medical.add(InkWell( medical.add(InkWell(
onTap: () { onTap: () {
userData().then((userData_){ userData().then((userData_) {
if (projectViewModel.isLogin && userData_ != null) { if (projectViewModel.isLogin && userData_ != null) {
String patientID = userData_.patientID.toString(); String patientID = userData_.patientID.toString();
GifLoaderDialogUtils.showMyDialog(context); GifLoaderDialogUtils.showMyDialog(context);
projectViewModel.platformBridge().connectHMGInternetWifi(patientID).then((value) => {GifLoaderDialogUtils.hideDialog(context)}); projectViewModel
.platformBridge()
.connectHMGInternetWifi(patientID)
.then((value) => {GifLoaderDialogUtils.hideDialog(context)});
} else { } else {
AlertDialogBox( AlertDialogBox(
context: context, context: context,
confirmMessage: "Please login with your account first to use this feature", confirmMessage:
"Please login with your account first to use this feature",
okText: "OK", okText: "OK",
okFunction: () { okFunction: () {
AlertDialogBox.closeAlertDialog(context); AlertDialogBox.closeAlertDialog(context);
@ -529,10 +537,9 @@ class Utils {
if (projectViewModel.havePrivilege(40)) { if (projectViewModel.havePrivilege(40)) {
medical.add(InkWell( medical.add(InkWell(
// onTap: () { onTap: () {
// Navigator.push( launch('whatsapp://send?phone=18885521858&text=');
// context, FadePage(page: InsuranceApproval())); },
// },
child: MedicalProfileItem( child: MedicalProfileItem(
title: TranslationBase.of(context).chatbot, title: TranslationBase.of(context).chatbot,
imagePath: 'insurance_approvals_icon.png', imagePath: 'insurance_approvals_icon.png',
@ -546,12 +553,11 @@ class Utils {
} }
Future<AuthenticatedUser> userData() async { Future<AuthenticatedUser> userData() async {
var userData = AuthenticatedUser.fromJson(await AppSharedPreferences().getObject(MAIN_USER)); var userData = AuthenticatedUser.fromJson(
await AppSharedPreferences().getObject(MAIN_USER));
return userData; return userData;
} }
// extension function that use in iterations(list.. etc) to iterate items and get index and item it self // extension function that use in iterations(list.. etc) to iterate items and get index and item it self
extension IndexedIterable<E> on Iterable<E> { extension IndexedIterable<E> on Iterable<E> {
Iterable<T> mapIndexed<T>(T Function(E e, int i) f) { Iterable<T> mapIndexed<T>(T Function(E e, int i) f) {

@ -15,7 +15,7 @@ class ServicesContainer extends StatelessWidget {
height: 60, height: 60,
margin: EdgeInsets.all(8), margin: EdgeInsets.all(8),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).primaryColor, color: Theme.of(context).textTheme.headline2.color,
shape: BoxShape.rectangle, shape: BoxShape.rectangle,
borderRadius: BorderRadius.circular(7), borderRadius: BorderRadius.circular(7),
), ),
@ -38,6 +38,7 @@ class ServicesContainer extends StatelessWidget {
Texts( Texts(
title, title,
fontSize: 16, fontSize: 16,
color: Colors.black,
), ),
], ],
), ),

@ -61,10 +61,14 @@ class _AppDrawerState extends State<AppDrawer> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
projectProvider = Provider.of(context); projectProvider = Provider.of(context);
return SizedBox( return Container(
width: MediaQuery.of(context).size.width * 0.75, width: MediaQuery.of(context).size.width * 0.75,
color: Theme.of(context).scaffoldBackgroundColor,
child: Container( child: Container(
color: Colors.white, // color: Colors.white,
child: Theme(
data: Theme.of(context).copyWith(
canvasColor: Theme.of(context).scaffoldBackgroundColor),
child: Drawer( child: Drawer(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
@ -80,8 +84,8 @@ class _AppDrawerState extends State<AppDrawer> {
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Container( Container(
child: child: Image.asset(
Image.asset('assets/images/logo_HMG.png'), 'assets/images/logo_HMG.png'),
margin: EdgeInsets.all( margin: EdgeInsets.all(
SizeConfig.imageSizeMultiplier * 4), SizeConfig.imageSizeMultiplier * 4),
), ),
@ -95,11 +99,13 @@ class _AppDrawerState extends State<AppDrawer> {
Row( Row(
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only( padding:
EdgeInsets.only(
right: 5), right: 5),
child: Icon( child: Icon(
Icons.account_circle, Icons.account_circle,
color: Color(0xFF40ACC9), color:
Color(0xFF40ACC9),
)), )),
AppText( AppText(
user.firstName + user.firstName +
@ -122,14 +128,15 @@ class _AppDrawerState extends State<AppDrawer> {
": " + ": " +
user.patientID user.patientID
.toString(), .toString(),
color: color: Color(
Color(0xFF40ACC9), 0xFF40ACC9),
fontSize: SizeConfig fontSize: SizeConfig
.textMultiplier * .textMultiplier *
1.5, 1.5,
), ),
AppText( AppText(
user.bloodGroup != null user.bloodGroup !=
null
? 'Blood Group: ' + ? 'Blood Group: ' +
user.bloodGroup user.bloodGroup
: '', : '',
@ -147,7 +154,8 @@ class _AppDrawerState extends State<AppDrawer> {
), ),
), ),
), ),
Column( Container(
child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
@ -172,7 +180,8 @@ class _AppDrawerState extends State<AppDrawer> {
projectProvider.havePrivilege(2) projectProvider.havePrivilege(2)
? InkWell( ? InkWell(
child: DrawerItem( child: DrawerItem(
TranslationBase.of(context).family, TranslationBase.of(context)
.family,
Icons.group, Icons.group,
textColor: Theme.of(context) textColor: Theme.of(context)
.textTheme .textTheme
@ -207,7 +216,8 @@ class _AppDrawerState extends State<AppDrawer> {
if (snapshot.hasError) if (snapshot.hasError)
return Padding( return Padding(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: Text(snapshot.error)); child:
Text(snapshot.error));
else else
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
@ -222,9 +232,10 @@ class _AppDrawerState extends State<AppDrawer> {
children: [ children: [
user.isFamily == true user.isFamily == true
? Container( ? Container(
padding: padding: EdgeInsets
EdgeInsets.only( .only(
bottom: 5), bottom:
5),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
switchUser( switchUser(
@ -238,18 +249,19 @@ class _AppDrawerState extends State<AppDrawer> {
children: < children: <
Widget>[ Widget>[
Expanded( Expanded(
child: Icon( child:
Icons Icon(Icons.person),
.person),
), ),
Expanded( Expanded(
flex: 7, flex:
child: Column( 7,
crossAxisAlignment: child:
CrossAxisAlignment.start, Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
children: <Widget>[ AppText(mainUser.firstName + ' ' + mainUser.lastName, color: Theme.of(context).textTheme.bodyText1.color),
AppText(mainUser.firstName + ' ' + mainUser.lastName), AppText(
AppText(TranslationBase.of(context).fileno + ": " + mainUser.patientID.toString()), TranslationBase.of(context).fileno + ": " + mainUser.patientID.toString(),
color: Theme.of(context).textTheme.bodyText1.color,
),
])), ])),
], ],
))) )))
@ -259,8 +271,10 @@ class _AppDrawerState extends State<AppDrawer> {
MainAxisAlignment MainAxisAlignment
.start, .start,
mainAxisSize: mainAxisSize:
MainAxisSize.min, MainAxisSize
children: snapshot.data .min,
children: snapshot
.data
.getAllSharedRecordsByStatusList .getAllSharedRecordsByStatusList
.map<Widget>( .map<Widget>(
(result) { (result) {
@ -268,24 +282,20 @@ class _AppDrawerState extends State<AppDrawer> {
.status == .status ==
3 3
? Container( ? Container(
padding: EdgeInsets padding: EdgeInsets.only(
.only(
bottom: bottom:
5), 5),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
switchUser( switchUser(result,
result,
context); context);
}, },
child: Row( child: Row(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: < children: <Widget>[
Widget>[
Expanded( Expanded(
child: child: Icon(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: 7, flex: 7,
@ -313,15 +323,18 @@ class _AppDrawerState extends State<AppDrawer> {
Icons.notifications, Icons.notifications,
count: notificationCount != null count: notificationCount != null
? new Container( ? new Container(
padding: EdgeInsets.all(4), padding:
EdgeInsets.all(4),
margin: EdgeInsets.all(2), margin: EdgeInsets.all(2),
decoration: new BoxDecoration( decoration:
new BoxDecoration(
color: Colors.red, color: Colors.red,
borderRadius: borderRadius:
BorderRadius.circular( BorderRadius
20), .circular(20),
), ),
constraints: BoxConstraints( constraints:
BoxConstraints(
minWidth: 20, minWidth: 20,
minHeight: 20, minHeight: 20,
), ),
@ -329,12 +342,14 @@ class _AppDrawerState extends State<AppDrawer> {
notificationCount, notificationCount,
style: new TextStyle( style: new TextStyle(
color: Colors.white, color: Colors.white,
fontSize: projectProvider fontSize:
projectProvider
.isArabic .isArabic
? 8 ? 8
: 9, : 9,
), ),
textAlign: TextAlign.center, textAlign:
TextAlign.center,
), ),
// ), // ),
) )
@ -345,8 +360,10 @@ class _AppDrawerState extends State<AppDrawer> {
onTap: () { onTap: () {
//NotificationsPage //NotificationsPage
Navigator.of(context).pop(); Navigator.of(context).pop();
Navigator.push(context, Navigator.push(
FadePage(page: NotificationsPage())); context,
FadePage(
page: NotificationsPage()));
}, },
), ),
if (projectProvider.havePrivilege(3)) if (projectProvider.havePrivilege(3))
@ -387,7 +404,8 @@ class _AppDrawerState extends State<AppDrawer> {
) )
: InkWell( : InkWell(
child: DrawerItem( child: DrawerItem(
TranslationBase.of(context).loginregister, TranslationBase.of(context)
.loginregister,
Icons.lock_open), Icons.lock_open),
onTap: () { onTap: () {
login(); login();
@ -404,7 +422,7 @@ class _AppDrawerState extends State<AppDrawer> {
// }, // },
// ) // )
], ],
) ))
], ],
), ),
), ),
@ -417,14 +435,17 @@ class _AppDrawerState extends State<AppDrawer> {
alignment: FractionalOffset.bottomCenter, alignment: FractionalOffset.bottomCenter,
child: Container( child: Container(
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [ children: [
Column( Column(
children: <Widget>[ children: <Widget>[
Text(TranslationBase.of(context).poweredBy), Text(TranslationBase.of(context)
.poweredBy),
Image.asset( Image.asset(
'assets/images/cs_logo_container.png', 'assets/images/cs_logo_container.png',
width: SizeConfig.imageSizeMultiplier * 30, width:
SizeConfig.imageSizeMultiplier * 30,
) )
], ],
), ),
@ -432,7 +453,8 @@ class _AppDrawerState extends State<AppDrawer> {
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/new-design/vidamobile.png', 'assets/images/new-design/vidamobile.png',
width: SizeConfig.imageSizeMultiplier * 25, width:
SizeConfig.imageSizeMultiplier * 25,
) )
], ],
), ),
@ -448,7 +470,7 @@ class _AppDrawerState extends State<AppDrawer> {
), ),
), ),
), ),
); ));
} }
drawerNavigator(context, routeName) { drawerNavigator(context, routeName) {

Loading…
Cancel
Save