diff --git a/assets/images/dashboard_icon/qr-code.svg b/assets/images/dashboard_icon/qr-code.svg
new file mode 100644
index 00000000..a85e6e63
--- /dev/null
+++ b/assets/images/dashboard_icon/qr-code.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 1bed3315..4eeb0ad4 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -66,4 +66,4 @@ const IS_LOGIN_FOR_DOCTOR_APP = true;
const PATIENT_OUT_SA = false;
/// Timer Info
-const TIMER_MIN =10;
+const TIMER_MIN = 10;
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 727bcee4..675d846f 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -4,21 +4,42 @@ const Map> localizedValues = {
'language': {'en': 'App Language', 'ar': 'لغة التطبيق'},
'lanEnglish': {'en': 'English', 'ar': 'English'},
'lanArabic': {'en': 'العربية', 'ar': 'العربية'},
- 'doctorReply':{'en': 'Doctor Reply', 'ar': 'رد الطبيب'},
- 'time' :{'en': 'Time','ar':'الوقت'},
- 'fileNo' :{'en':'File No', 'ar':'رقم الملف'},
- 'mobileNo' :{'en':'Mobile No', 'ar':'رقم الموبايل'},
- 'messagesScreenToolbarTitle' : {'en': 'Messages','ar': 'الرسائل' },
- 'mySchedule' : {'en': 'My Schedule', 'ar' : 'جدولي'},
- 'errorNoSchedule' :{'en': 'You don\'t have any Schedule' , 'ar': 'ليس لديك أي جدول زمني'},
- 'verify': {'en': 'Verify', 'ar' : 'تحقق'},
- 'referralDoctor':{'en': 'Referral Doctor', 'ar' : 'الطبيب المُحول إليه'},
- 'referringClinic':{'en': 'Referring Clinic', 'ar' : 'العيادة المُحول إليها'},
- 'frequency':{'en': 'Frequency', 'ar' : 'نوع التحويلا'},
- 'priority':{'en': 'Priority', 'ar' : 'الأولوية'},
- 'maxResponseTime':{'en': 'Max Response Time', 'ar' : 'الوقت الأقصى للرد'},
- 'clinicDetailsandRemarks':{'en': 'Clinic Details and Remarks', 'ar' : 'ملاحضات وتفاصيل العيادة'},
- 'answerSuggestions':{'en': 'Answer/Suggestions', 'ar' : 'ملاحضات وتفاصيل العيادة'},
-
-
+ 'doctorReply': {'en': 'Doctor Reply', 'ar': 'رد الطبيب'},
+ 'time': {'en': 'Time', 'ar': 'الوقت'},
+ 'fileNo': {'en': 'File No', 'ar': 'رقم الملف'},
+ 'mobileNo': {'en': 'Mobile No', 'ar': 'رقم الموبايل'},
+ 'messagesScreenToolbarTitle': {'en': 'Messages', 'ar': 'الرسائل'},
+ 'mySchedule': {'en': 'My Schedule', 'ar': 'جدولي'},
+ 'errorNoSchedule': {
+ 'en': 'You don\'t have any Schedule',
+ 'ar': 'ليس لديك أي جدول زمني'
+ },
+ 'verify': {'en': 'Verify', 'ar': 'تحقق'},
+ 'referralDoctor': {'en': 'Referral Doctor', 'ar': 'الطبيب المُحول إليه'},
+ 'referringClinic': {'en': 'Referring Clinic', 'ar': 'العيادة المُحول إليها'},
+ 'frequency': {'en': 'Frequency', 'ar': 'نوع التحويلا'},
+ 'priority': {'en': 'Priority', 'ar': 'الأولوية'},
+ 'maxResponseTime': {'en': 'Max Response Time', 'ar': 'الوقت الأقصى للرد'},
+ 'clinicDetailsandRemarks': {
+ 'en': 'Clinic Details and Remarks',
+ 'ar': 'ملاحضات وتفاصيل العيادة'
+ },
+ 'answerSuggestions': {
+ 'en': 'Answer/Suggestions',
+ 'ar': 'ملاحضات وتفاصيل العيادة'
+ },
+ 'outPatients': {'en': 'Out-Patients', 'ar': 'ةالمريض الخارجي'},
+ 'searchPatient': {'en': 'Search Patient', 'ar': 'البحث عن مريض'},
+ 'labResult': {'en': 'Lab Result', 'ar': 'نتيجة المختبر'},
+ 'todayStatistics': {'en': 'Today Statistics', 'ar': 'إحصائيات اليوم'},
+ 'arrived': {'en': 'Arrived', 'ar': 'وصل'},
+ 'er': {'en': 'ER', 'ar': 'حالة طوارئ'},
+ 'walkIn': {'en': 'Walk-in', 'ar': 'ادخل'},
+ 'notArrived': {'en': 'Not Arrived', 'ar': 'لم يصل'},
+ 'radiology': {'en': 'Radiology', 'ar': 'الأشعة'},
+ 'referral': {'en': 'Referral', 'ar': 'االإحالة'},
+ 'inPatient': {'en': 'In-Patient', 'ar': 'االمريض الداخلي'},
+ 'operations': {'en': 'Operations', 'ar': 'عمليات'},
+ 'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'},
+ 'familyMedicine': {'en': 'Family Medicine Clinic', 'ar': 'عيادة طب الأسرة'}
};
diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart
index ccb5db3c..d5a3dbaa 100644
--- a/lib/screens/dashboard_screen.dart
+++ b/lib/screens/dashboard_screen.dart
@@ -4,6 +4,7 @@ import 'package:doctor_app_flutter/providers/medicine_provider.dart';
import 'package:doctor_app_flutter/providers/hospital_provider.dart';
import 'package:doctor_app_flutter/providers/referral_patient_provider.dart';
import 'package:doctor_app_flutter/providers/referred_patient_provider.dart';
+import 'package:doctor_app_flutter/screens/QR_reader_screen.dart';
import 'package:doctor_app_flutter/screens/medicine/medicine_search_screen.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
@@ -42,19 +43,37 @@ class _DashboardScreenState extends State {
child: Scaffold(
body: SingleChildScrollView(
child: SizedBox(
- height: MediaQuery.of(context).size.height,
+ height: MediaQuery.of(context).size.height * 1.09,
child: Column(
children: [
- Expanded(
- flex: 1,
- child: Container(
- margin: EdgeInsets.all(10),
- child: AppText(
- "Today's Statistics",
- fontWeight: FontWeight.bold,
- ),
- alignment: Alignment.centerLeft,
+ Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ mainAxisSize: MainAxisSize.max,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Container(
+ margin: EdgeInsets.only(left: 10, top: 10),
+ child: AppText(
+ TranslationBase.of(context).familyMedicine,
+ fontWeight: FontWeight.bold,
+ fontSize: SizeConfig.textMultiplier * 2.5,
+ ),
+ alignment: Alignment.centerLeft,
+ ),
+ Container(
+ margin: EdgeInsets.only(left: 10, top: 10, right: 10),
+ child: Icon(
+ Icons.settings,
+ size: SizeConfig.textMultiplier * 2.5,
+ ))
+ ]),
+ Container(
+ margin: EdgeInsets.only(left: 10, top: 5),
+ child: AppText(
+ TranslationBase.of(context).todayStatistics,
+ fontWeight: FontWeight.bold,
),
+ alignment: Alignment.centerLeft,
),
Expanded(
flex: 3,
@@ -76,7 +95,7 @@ class _DashboardScreenState extends State {
AppText("38",
fontWeight: FontWeight.bold,
fontSize: SizeConfig.textMultiplier * 4),
- AppText("Out-Patients",
+ AppText(TranslationBase.of(context).outPatients,
fontWeight: FontWeight.normal,
fontSize: SizeConfig.textMultiplier * 1.1,
color: Colors.grey[800]),
@@ -99,16 +118,17 @@ class _DashboardScreenState extends State {
flex: 1,
child: Column(
crossAxisAlignment:
- CrossAxisAlignment.stretch,
+ CrossAxisAlignment.stretch,
children: [
Expanded(
child: DashboardItemTexts(
- "Arrived",
- "23",
- )),
+ TranslationBase.of(context).arrived,
+ "23",
+ )),
Expanded(
child: DashboardItemTexts(
- "Not Arrived",
+ TranslationBase.of(context)
+ .notArrived,
"23",
),
),
@@ -117,21 +137,21 @@ class _DashboardScreenState extends State {
),
Expanded(
child: Column(
- crossAxisAlignment:
+ crossAxisAlignment:
CrossAxisAlignment.stretch,
- children: [
- Expanded(
- child: DashboardItemTexts(
- "ER",
- "23",
- )),
- Expanded(
- child: DashboardItemTexts(
- "Walk-in",
- "23",
- )),
- ],
+ children: [
+ Expanded(
+ child: DashboardItemTexts(
+ TranslationBase.of(context).er,
+ "23",
+ )),
+ Expanded(
+ child: DashboardItemTexts(
+ TranslationBase.of(context).walkIn,
+ "23",
)),
+ ],
+ )),
],
),
))
@@ -148,7 +168,7 @@ class _DashboardScreenState extends State {
child: new DashboardItemIconText(
widget.iconURL + 'lab_results.svg',
"08",
- "Lab Result",
+ TranslationBase.of(context).labResult,
backgroundColor: Colors.black45,
// valueFontColor: Colors.white,
// titleFontColor: Colors.white,
@@ -160,7 +180,7 @@ class _DashboardScreenState extends State {
child: new DashboardItemIconText(
widget.iconURL + 'radiology.svg',
"10",
- "Radiology",
+ TranslationBase.of(context).radiology,
backgroundColor: Colors.black45,
// valueFontColor: Colors.white,
// titleFontColor: Colors.white,
@@ -171,7 +191,7 @@ class _DashboardScreenState extends State {
child: new DashboardItemIconText(
widget.iconURL + 'referral.svg',
"05",
- "Referral",
+ TranslationBase.of(context).referral,
backgroundColor: Colors.black45,
// valueFontColor: Colors.white,
// titleFontColor: Colors.white,
@@ -200,7 +220,7 @@ class _DashboardScreenState extends State {
child: new DashboardItemIconText(
widget.iconURL + 'operations.svg',
"23",
- "Operations",
+ TranslationBase.of(context).operations,
showBorder: true,
backgroundColor: Colors.red[900],
)),
@@ -212,7 +232,7 @@ class _DashboardScreenState extends State {
child: Container(
margin: EdgeInsets.all(10),
child: AppText(
- "Patient Services",
+ TranslationBase.of(context).patientServices,
fontWeight: FontWeight.bold,
),
alignment: Alignment.centerLeft,
@@ -228,7 +248,7 @@ class _DashboardScreenState extends State {
child: DashboardItemIconText(
widget.iconURL + 'search_patient.svg',
"",
- "Search Patient",
+ TranslationBase.of(context).searchPatient,
showBorder: true,
backgroundColor: Colors.white,
valueFontColor: Colors.black,
@@ -258,7 +278,7 @@ class _DashboardScreenState extends State {
child: DashboardItemIconText(
widget.iconURL + 'message_icon.svg',
"",
- "Doctor Reply",
+ TranslationBase.of(context).doctorReply,
showBorder: true,
backgroundColor: Colors.white,
valueFontColor: Colors.black,
@@ -365,7 +385,25 @@ class _DashboardScreenState extends State {
),
),
),
- Expanded(flex: 1, child: Container())
+ Expanded(
+ flex: 1,
+ child: InkWell(
+ onTap: () {
+ Navigator.of(context).pushNamed(QR_READER);
+ },
+ child: DashboardItemIconText(
+ widget.iconURL + 'qr-code.svg',
+ "",
+ "QR Reader",
+ showBorder: true,
+ backgroundColor: Colors.white,
+ valueFontColor: Colors.black,
+ titleFontColor: Colors.black,
+ iconColor: Colors.black,
+ titleFontSize: SizeConfig.textMultiplier * 2,
+ ),
+ ),
+ ),
],
)),
],
diff --git a/lib/screens/doctor/my_referral_patient_screen.dart b/lib/screens/doctor/my_referral_patient_screen.dart
index d79313e4..58c6e432 100644
--- a/lib/screens/doctor/my_referral_patient_screen.dart
+++ b/lib/screens/doctor/my_referral_patient_screen.dart
@@ -43,6 +43,7 @@ class MyReferralPatient extends StatelessWidget {
children: [
SizedBox(
height: 10,
+
),
Container(
child: Column(
diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart
index ec1a89f6..61f6fb1e 100644
--- a/lib/screens/patients/patients_screen.dart
+++ b/lib/screens/patients/patients_screen.dart
@@ -315,7 +315,7 @@ class _PatientsScreenState extends State {
child: Center(
child: Padding(
padding: const EdgeInsets.fromLTRB(
- 0, 250, 0, 0),
+ 0, 0, 0, 0), //250
child:
DrAppCircularProgressIndeicator(),
)),
@@ -365,175 +365,167 @@ class _PatientsScreenState extends State {
// mainAxisAlignment: MainAxisAlignment.center,
children: responseModelList
.map((PatiantInformtion item) {
- return InkWell(
- child: CardWithBgWidgetNew(
- //CardWithBgWidget(
-
- widget: Column(
- children: [
- Row(
- children: [
- Column(
- mainAxisAlignment:
- MainAxisAlignment
- .start,
- children:
- item.genderDescription ==
- "Male"
- ? [
- SvgPicture.asset(
- url +
- avatarMale,
- height:
- 80.0,
- width:
- 80.0,
- semanticsLabel:
- 'Male Logo')
- ]
- : [
- SvgPicture.asset(
- url +
- avatarFemale,
- height:
- 80.0,
- width:
- 80.0,
- semanticsLabel:
- 'Female Logo')
- ],
- ),
- SizedBox(
- width: 10,
- ),
- Column(
- crossAxisAlignment:
- CrossAxisAlignment
- .start,
+ return Container(
+ decoration: myBoxDecoration(),
+ child: InkWell(
+ child: CardWithBgWidgetNew(
+ //CardWithBgWidget(
+
+ widget: Column(
+ children: [
+ Container(
+ // decoration: myBoxDecoration(),
+ child: Row(
children: [
- AppText(
- item.firstName +
- " " +
- item.lastName,
- fontSize: 2.0 *
- SizeConfig
- .textMultiplier,
- fontWeight:
- FontWeight
- .bold,
- backGroundcolor:
- Colors.white,
- ),
- SizedBox(
- height: 8,
- ),
- AppText(
- "File Number:" +
- item.patientId
- .toString(),
- fontSize: 2.0 *
- SizeConfig
- .textMultiplier,
- fontWeight:
- FontWeight
- .bold,
- backGroundcolor:
- Colors.white,
- ),
-
- // SizedBox(
- // height: 8,
- // ),
- AppText(
- "Age:" +
- item.age
- .toString(),
- fontSize: 2.0 *
- SizeConfig
- .textMultiplier,
- fontWeight:
- FontWeight
- .bold,
- backGroundcolor:
- Colors.white,
+ Column(
+ mainAxisAlignment:
+ MainAxisAlignment
+ .start,
+ children:
+ item.genderDescription ==
+ "Male"
+ ? [
+ SvgPicture.asset(
+ url + avatarMale,
+ height: 80.0,
+ width: 80.0,
+ semanticsLabel: 'Male Logo')
+ ]
+ : [
+ SvgPicture.asset(
+ url + avatarFemale,
+ height: 80.0,
+ width: 80.0,
+ semanticsLabel: 'Female Logo')
+ ],
),
SizedBox(
- height: 8,
+ width: 10,
),
- SERVICES_PATIANT2[int
- .parse(
- patientType)] ==
- "List_MyOutPatient"
- ? Row(
- mainAxisAlignment:
- MainAxisAlignment
- .spaceBetween,
- children: <
- Widget>[
- Container(
- height:
- 20,
- width:
- 80,
- decoration:
- BoxDecoration(
- borderRadius:
- BorderRadius.circular(50),
- color:
- Hexcolor("#20A169"),
- ),
- child:
- AppText(
- item.startTime,
- color:
- Colors.white,
- fontSize:
- 2 * SizeConfig.textMultiplier,
- textAlign:
- TextAlign.center,
- fontWeight:
- FontWeight.bold,
- ),
- ),
- SizedBox(
- width:
- 60,
- ),
- Container(
- child:
- AppText(
- convertDateFormat2(item
- .appointmentDate
- .toString()),
- fontSize:
- 2.0 * SizeConfig.textMultiplier,
- fontWeight:
- FontWeight.bold,
- ),
+ Column(
+ crossAxisAlignment:
+ CrossAxisAlignment
+ .start,
+ children: <
+ Widget>[
+ AppText(
+ item.firstName +
+ " " +
+ item.lastName,
+ fontSize: 2.0 *
+ SizeConfig
+ .textMultiplier,
+ fontWeight:
+ FontWeight
+ .bold,
+ backGroundcolor:
+ Colors
+ .white,
+ ),
+ SizedBox(
+ height: 8,
+ ),
+ AppText(
+ "File Number:" +
+ item.patientId
+ .toString(),
+ fontSize: 2.0 *
+ SizeConfig
+ .textMultiplier,
+ fontWeight:
+ FontWeight
+ .bold,
+ backGroundcolor:
+ Colors
+ .white,
+ ),
+
+ // SizedBox(
+ // height: 8,
+ // ),
+ AppText(
+ "Age:" +
+ item.age
+ .toString(),
+ fontSize: 2.0 *
+ SizeConfig
+ .textMultiplier,
+ fontWeight:
+ FontWeight
+ .bold,
+ backGroundcolor:
+ Colors
+ .white,
+ ),
+ SizedBox(
+ height: 8,
+ ),
+ SERVICES_PATIANT2[
+ int.parse(patientType)] ==
+ "List_MyOutPatient"
+ ? Row(
+ mainAxisAlignment:
+ MainAxisAlignment.spaceBetween,
+ children: <
+ Widget>[
+ Container(
+ height:
+ 20,
+ width:
+ 80,
+ decoration:
+ BoxDecoration(
+ borderRadius: BorderRadius.circular(50),
+ color: Hexcolor("#20A169"),
+ ),
+ child:
+ AppText(
+ item.startTime,
+ color: Colors.white,
+ fontSize: 2 * SizeConfig.textMultiplier,
+ textAlign: TextAlign.center,
+ fontWeight: FontWeight.bold,
+ ),
+ ),
+ SizedBox(
+ width:
+ 60,
+ ),
+ Container(
+ child:
+ AppText(
+ convertDateFormat2(item.appointmentDate.toString()),
+ fontSize: 2.0 * SizeConfig.textMultiplier,
+ fontWeight: FontWeight.bold,
+ ),
+ )
+ ],
)
- ],
- )
- : AppText(
- item.nationalityName,
- fontSize: 2.5 *
- SizeConfig
- .textMultiplier,
- ),
+ : AppText(
+ item.nationalityName,
+ fontSize:
+ 2.5 *
+ SizeConfig.textMultiplier,
+ ),
+ ],
+ ),
+ // Divider(color: Colors.grey)
],
),
- ],
- ),
- Divider(color: Colors.grey)
- ],
+ ),
+ // Divider(color: Colors.grey)
+ ],
+ ),
),
+ onTap: () {
+ Navigator.of(context)
+ .pushNamed(
+ PATIENTS_PROFILE,
+ arguments: {
+ "patient": item
+ });
+ },
),
- onTap: () {
- Navigator.of(context).pushNamed(
- PATIENTS_PROFILE,
- arguments: {
- "patient": item
- });
- },
);
}).toList(),
),
@@ -627,4 +619,16 @@ class _PatientsScreenState extends State {
),
);
}
+
+ myBoxDecoration() {
+ return BoxDecoration(
+ border: Border(
+ bottom: BorderSide(
+ // <--- top side
+ color: Colors.grey,
+ width: 1.0,
+ ),
+ ),
+ );
+ }
}
diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart
index f6fc660a..acbff5ce 100644
--- a/lib/util/translations_delegate_base.dart
+++ b/lib/util/translations_delegate_base.dart
@@ -13,9 +13,8 @@ class TranslationBase {
return Localizations.of(context, TranslationBase);
}
-
-
- String get dashboardScreenToolbarTitle => localizedValues['dashboardScreenToolbarTitle'][locale.languageCode];
+ String get dashboardScreenToolbarTitle =>
+ localizedValues['dashboardScreenToolbarTitle'][locale.languageCode];
String get settings => localizedValues['settings'][locale.languageCode];
@@ -33,23 +32,45 @@ class TranslationBase {
String get mobileNo => localizedValues['mobileNo'][locale.languageCode];
- String get messagesScreenToolbarTitle => localizedValues['messagesScreenToolbarTitle'][locale.languageCode];
+ String get messagesScreenToolbarTitle =>
+ localizedValues['messagesScreenToolbarTitle'][locale.languageCode];
String get mySchedule => localizedValues['mySchedule'][locale.languageCode];
- String get errorNoSchedule => localizedValues['errorNoSchedule'][locale.languageCode];
-
+ String get errorNoSchedule =>
+ localizedValues['errorNoSchedule'][locale.languageCode];
String get verify => localizedValues['verify'][locale.languageCode];
- String get referralDoctor => localizedValues['referralDoctor'][locale.languageCode];
- String get referringClinic => localizedValues['referringClinic'][locale.languageCode];
+ String get referralDoctor =>
+ localizedValues['referralDoctor'][locale.languageCode];
+ String get referringClinic =>
+ localizedValues['referringClinic'][locale.languageCode];
String get frequency => localizedValues['frequency'][locale.languageCode];
String get priority => localizedValues['priority'][locale.languageCode];
- String get maxResponseTime => localizedValues['maxResponseTime'][locale.languageCode];
- String get clinicDetailsandRemarks=> localizedValues['clinicDetailsandRemarks'][locale.languageCode];
- String get answerSuggestions => localizedValues['answerSuggestions'][locale.languageCode];
-
-
+ String get maxResponseTime =>
+ localizedValues['maxResponseTime'][locale.languageCode];
+ String get clinicDetailsandRemarks =>
+ localizedValues['clinicDetailsandRemarks'][locale.languageCode];
+ String get answerSuggestions =>
+ localizedValues['answerSuggestions'][locale.languageCode];
+ String get outPatients => localizedValues['outPatients'][locale.languageCode];
+ String get searchPatient =>
+ localizedValues['searchPatient'][locale.languageCode];
+ String get labResult => localizedValues['labResult'][locale.languageCode];
+ String get todayStatistics =>
+ localizedValues['todayStatistics'][locale.languageCode];
+ String get familyMedicine =>
+ localizedValues['familyMedicine'][locale.languageCode];
+ String get arrived => localizedValues['arrived'][locale.languageCode];
+ String get er => localizedValues['er'][locale.languageCode];
+ String get walkIn => localizedValues['walkIn'][locale.languageCode];
+ String get notArrived => localizedValues['notArrived'][locale.languageCode];
+ String get radiology => localizedValues['radiology'][locale.languageCode];
+ String get referral => localizedValues['referral'][locale.languageCode];
+ String get inPatient => localizedValues['inPatient'][locale.languageCode];
+ String get operations => localizedValues['inPatient'][locale.languageCode];
+ String get patientServices =>
+ localizedValues['patientServices'][locale.languageCode];
}
class TranslationBaseDelegate extends LocalizationsDelegate {
diff --git a/lib/widgets/auth/login_form.dart b/lib/widgets/auth/login_form.dart
index ccee038f..b93bfafa 100644
--- a/lib/widgets/auth/login_form.dart
+++ b/lib/widgets/auth/login_form.dart
@@ -23,6 +23,7 @@ Helpers helpers = Helpers();
class LoginForm extends StatefulWidget with DrAppToastMsg {
LoginForm({this.changeLoadingStata});
+
final Function changeLoadingStata;
@override
@@ -85,7 +86,7 @@ class _LoginFormState extends State {
return null;
},
onSaved: (value) {
- userInfo.UserID = value;
+ userInfo.UserID = value.trim();
},
onFieldSubmitted: (_) {
FocusScope.of(context).requestFocus(focusPass);
@@ -184,9 +185,9 @@ class _LoginFormState extends State {
);
}
-/*
- *@author: Elham Rababah
- *@Date:20/4/2020
+/*
+ *@author: Elham Rababah
+ *@Date:20/4/2020
*@param: context, hint, asset
*@return: InputDecoration
*@desc: decorate input feilds
@@ -337,6 +338,7 @@ class _LoginFormState extends State {
userInfo.ProjectID = projectsList[index]["ID"];
projectIdController.text = projectsList[index]['Name'];
});
- FocusScope.of(context).requestFocus(focusProject);
+
+ primaryFocus.unfocus();
}
}
diff --git a/lib/widgets/auth/verfiy_account.dart b/lib/widgets/auth/verfiy_account.dart
index 0ebbeab4..9a4ad85c 100644
--- a/lib/widgets/auth/verfiy_account.dart
+++ b/lib/widgets/auth/verfiy_account.dart
@@ -21,7 +21,9 @@ Helpers helpers = Helpers();
class VerifyAccount extends StatefulWidget {
VerifyAccount({this.changeLoadingStata});
+
final Function changeLoadingStata;
+
@override
_VerifyAccountState createState() => _VerifyAccountState();
}
@@ -37,8 +39,9 @@ class _VerifyAccountState extends State {
Future _loggedUserFuture;
var _loggedUser;
AuthProvider authProv;
- bool _isInit =true;
+ bool _isInit = true;
var model;
+
@override
void initState() {
super.initState();
@@ -93,25 +96,30 @@ class _VerifyAccountState extends State {
MainAxisAlignment.spaceAround,
children: [
Container(
- width: SizeConfig.realScreenWidth * 0.20,
- child: TextFormField(
- textInputAction: TextInputAction.next,
- style: buildTextStyle(),
- maxLength: 1,
- textAlign: TextAlign.center,
- keyboardType: TextInputType.number,
- decoration:
- buildInputDecoration(context),
- onSaved: (val) {
- verifyAccountFormValue['digit1'] =
- val;
- },
- validator: validateCodeDigit,
- onFieldSubmitted: (_) {
+ width: SizeConfig.realScreenWidth * 0.20,
+ child: TextFormField(
+ textInputAction: TextInputAction.next,
+ style: buildTextStyle(),
+ maxLength: 1,
+ textAlign: TextAlign.center,
+ keyboardType: TextInputType.number,
+ decoration: buildInputDecoration(context),
+ onSaved: (val) {
+ verifyAccountFormValue['digit1'] = val;
+ },
+ validator: validateCodeDigit,
+ onFieldSubmitted: (_) {
+ FocusScope.of(context)
+ .requestFocus(focusD2);
+ },
+ onChanged: (val) {
+ if (val.length == 1) {
FocusScope.of(context)
.requestFocus(focusD2);
- },
- )),
+ }
+ },
+ ),
+ ),
Container(
width: SizeConfig.realScreenWidth * 0.20,
child: TextFormField(
@@ -131,6 +139,12 @@ class _VerifyAccountState extends State {
FocusScope.of(context)
.requestFocus(focusD3);
},
+ onChanged: (val) {
+ if (val.length == 1) {
+ FocusScope.of(context)
+ .requestFocus(focusD3);
+ }
+ },
validator: validateCodeDigit),
),
Container(
@@ -152,6 +166,12 @@ class _VerifyAccountState extends State {
FocusScope.of(context)
.requestFocus(focusD4);
},
+ onChanged: (val) {
+ if (val.length == 1) {
+ FocusScope.of(context)
+ .requestFocus(focusD4);
+ }
+ },
validator: validateCodeDigit)),
Container(
width: SizeConfig.realScreenWidth * 0.20,
@@ -214,10 +234,10 @@ class _VerifyAccountState extends State {
});
}
-/*
- *@author: Elham Rababah
- *@Date:19/4/2020
- *@param:
+/*
+ *@author: Elham Rababah
+ *@Date:19/4/2020
+ *@param:
*@return:
*@desc: change the style for the input field
*/
@@ -234,9 +254,9 @@ class _VerifyAccountState extends State {
return null;
}
-/*
- *@author: Elham Rababah
- *@Date:28/4/2020
+/*
+ *@author: Elham Rababah
+ *@Date:28/4/2020
*@param: context
*@return:InputDecoration
*@desc: buildInputDecoration
@@ -255,10 +275,10 @@ class _VerifyAccountState extends State {
));
}
-/*
- *@author: Elham Rababah
- *@Date:28/4/2020
- *@param:
+/*
+ *@author: Elham Rababah
+ *@Date:28/4/2020
+ *@param:
*@return: RichText
*@desc: buildText
*/
@@ -283,9 +303,9 @@ class _VerifyAccountState extends State {
);
}
-/*
- *@author: Elham Rababah
- *@Date:15/4/2020
+/*
+ *@author: Elham Rababah
+ *@Date:15/4/2020
*@param: authProv
*@return:
*@desc: verify Account func call sendActivationCodeByOtpNotificationType service
@@ -349,8 +369,8 @@ class _VerifyAccountState extends State {
}
}
- /*
- *@author: Elham Rababah
+ /*
+ *@author: Elham Rababah
*@Date:17/5/2020
*@param: Map profile, Function changeLoadingStata
*@return:
@@ -385,7 +405,7 @@ class _VerifyAccountState extends State {
});
}
- /*
+ /*
*@author: Elham Rababah
*@Date:17/5/2020
*@param: ClinicModel clinicInfo, Function changeLoadingStata
diff --git a/lib/widgets/patients/profile/profile_medical_info_widget.dart b/lib/widgets/patients/profile/profile_medical_info_widget.dart
index 3ac66f2e..c60c2d29 100644
--- a/lib/widgets/patients/profile/profile_medical_info_widget.dart
+++ b/lib/widgets/patients/profile/profile_medical_info_widget.dart
@@ -53,30 +53,38 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
route: RADIOLOGY,
name: 'Radiology',
icon: 'radiology-1.png'),
- PatientProfileButton(
- key: key,
- patient: patient,
- route: PROGRESS_NOTE,
- name: 'Progress Notes',
- icon: 'heartbeat.png'),
+ Visibility(
+ visible: selectedPatientType != 0 && selectedPatientType != 5,
+ child: PatientProfileButton(
+ key: key,
+ patient: patient,
+ route: PROGRESS_NOTE,
+ name: 'Progress Notes',
+ icon: 'heartbeat.png')),
PatientProfileButton(
key: key,
patient: patient,
route: PATIENT_INSURANCE_APPROVALS,
name: 'Insurance Aprovals',
icon: 'lab.png'),
- PatientProfileButton(
- key: key,
- patient: patient,
- route: PRESCRIPTIONS,
- name: 'Refer Patient',
- icon: 'note.png'),
- PatientProfileButton(
- key: key,
- patient: patient,
- route: PATIENT_ORDERS,
- name: 'Orders',
- icon: 'radiology-1.png'),
+ Visibility(
+ visible: selectedPatientType != 0 &&
+ selectedPatientType != 5 &&
+ selectedPatientType != 2,
+ child: PatientProfileButton(
+ key: key,
+ patient: patient,
+ route: PRESCRIPTIONS,
+ name: 'Refer Patient',
+ icon: 'note.png')),
+ Visibility(
+ visible: selectedPatientType != 0 && selectedPatientType != 5,
+ child: PatientProfileButton(
+ key: key,
+ patient: patient,
+ route: PATIENT_ORDERS,
+ name: 'Orders',
+ icon: 'radiology-1.png')),
]);
// child: ListView(
// children: [
diff --git a/lib/widgets/shared/card_with_bgNew_widget.dart b/lib/widgets/shared/card_with_bgNew_widget.dart
index 25cb509c..51822cc2 100644
--- a/lib/widgets/shared/card_with_bgNew_widget.dart
+++ b/lib/widgets/shared/card_with_bgNew_widget.dart
@@ -36,6 +36,7 @@ class CardWithBgWidgetNew extends StatelessWidget {
children: [
Center(
child: Container(
+
// padding:EdgeInsets.fromLTRB(0, 10,0, 10), //EdgeInsets.all(10.0),//10
// margin: EdgeInsets.only(left: 10),
child: Padding(
@@ -48,4 +49,6 @@ class CardWithBgWidgetNew extends StatelessWidget {
),
);
}
+
+
}