Conflicts:
	lib/widgets/doctor/my_referred_patient_widget.dart
merge-requests/96/head
Mohammad ALjammal 6 years ago
commit c8b2604110

@ -2,8 +2,8 @@ const MAX_SMALL_SCREEN = 660;
const ONLY_NUMBERS = "[0-9]"; const ONLY_NUMBERS = "[0-9]";
const ONLY_LETTERS = "[a-zA-Z]"; const ONLY_LETTERS = "[a-zA-Z]";
const ONLY_DATE = "[0-9/]"; const ONLY_DATE = "[0-9/]";
const BASE_URL = 'https://hmgwebservices.com/Services/'; // const BASE_URL = 'https://hmgwebservices.com/Services/';
//const BASE_URL = 'https://uat.hmgwebservices.com/Services/'; const BASE_URL = 'https://uat.hmgwebservices.com/Services/';
const PHARMACY_ITEMS_URL = "Lists.svc/REST/GetPharmcyItems_Region"; const PHARMACY_ITEMS_URL = "Lists.svc/REST/GetPharmcyItems_Region";
const PHARMACY_LIST_URL = "Patients.svc/REST/GetPharmcyList"; const PHARMACY_LIST_URL = "Patients.svc/REST/GetPharmcyList";
const PATIENT_PROGRESS_NOTE_URL = "DoctorApplication.svc/REST/GetProgressNoteForInPatient"; const PATIENT_PROGRESS_NOTE_URL = "DoctorApplication.svc/REST/GetProgressNoteForInPatient";

@ -11,5 +11,14 @@ const Map<String, Map<String, String>> localizedValues = {
'messagesScreenToolbarTitle' : {'en': 'Messages','ar': 'الرسائل' }, 'messagesScreenToolbarTitle' : {'en': 'Messages','ar': 'الرسائل' },
'mySchedule' : {'en': 'My Schedule', 'ar' : 'جدولي'}, 'mySchedule' : {'en': 'My Schedule', 'ar' : 'جدولي'},
'errorNoSchedule' :{'en': 'You don\'t have any 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' : 'ملاحضات وتفاصيل العيادة'},
}; };

@ -1,66 +0,0 @@
import 'package:doctor_app_flutter/models/category_models.dart';
import 'package:doctor_app_flutter/routes.dart';
const DUMMY_CATEGORIES = const [
Category(
id: 'c1',
title: 'My Schedule',
image: 'assets/images/user_id_icon.png',
link: MY_SCHEDULE),
Category(
id: 'c2',
title: 'Patient Search',
image: 'assets/images/user_id_icon.png',
link: PATIENT_SEARCH),
Category(
id: 'c3',
title: 'outPatiant',
image: 'assets/images/user_id_icon.png',
link: PATIENTS),
Category(
id: 'c4',
title: 'InPatiant',
image: 'assets/images/user_id_icon.png',
link: PATIENTS),
Category(
id: 'c5',
title: 'Referral',
image: 'assets/images/user_id_icon.png',
link: PATIENTS),
Category(
id: 'c6',
title: 'Referred',
image: 'assets/images/user_id_icon.png',
link: PATIENTS),
Category(
id: 'c7',
title: 'Discharged Patient',
image: 'assets/images/user_id_icon.png',
link: PATIENTS),
Category(
id: 'c8',
title: 'Referral Discharge',
image: 'assets/images/user_id_icon.png',
link: PATIENTS),
Category(
id: 'c9',
title: 'Search For Medicine',
image: 'assets/images/user_id_icon.png',
link: MEDICINE_SEARCH),
Category(
id: 'c10',
title: 'Doctor Reply',
image: 'assets/images/user_id_icon.png',
link: DOCTOR_REPLY),
Category(
id: 'c11',
title: 'Blood Bank',
image: 'assets/images/user_id_icon.png',
link: BLOOD_BANK),
Category(
id: 'c12',
title: 'QR Reader',
image: 'assets/images/user_id_icon.png',
link: QR_READER),
];

@ -0,0 +1,218 @@
List <Map> ListProject= [
{
"Desciption": "Dubai Hospital",
"DesciptionN": null,
"ID": 2,
"LegalName": "Dr. Sulaiman Al Habib Hospital FZ - LLC ",
"LegalNameN": "مستشفى الدكتور سليمان الحبيب منطقة حرة - ذ.م.م",
"Name": "Dubai Hospital",
"NameN": null,
"PhoneNumber": "+97144297777",
"SetupID": "505005",
"DistanceInKilometers": 0,
"IsActive": true,
"Latitude": "25.231273",
"Longitude": "55.320942",
"MainProjectID": 2,
"ProjectOutSA": true,
"UsingInDoctorApp": true
},
{
"Desciption": "SZR Center",
"DesciptionN": null,
"ID": 3,
"LegalName": "Dr. Sulaiman Al Habib Hospital SZR - LLC ",
"LegalNameN": "مستشفى الدكتور سليمان الحبيب طريق الشيخ زايد",
"Name": "SZR Medical Center",
"NameN": null,
"PhoneNumber": "+97144297777",
"SetupID": "505005",
"DistanceInKilometers": 0,
"IsActive": true,
"Latitude": "25.154501",
"Longitude": "55.226000",
"MainProjectID": 3,
"ProjectOutSA": true,
"UsingInDoctorApp": true
},
{
"Desciption": "Home Health Care (HHC)",
"DesciptionN": null,
"ID": 95,
"LegalName": "",
"LegalNameN": "",
"Name": "Home Health Care (HHC)",
"NameN": null,
"PhoneNumber": "+966114622224",
"SetupID": "91877 ",
"DistanceInKilometers": 0,
"IsActive": false,
"Latitude": "24.704242",
"Longitude": "46.675823",
"MainProjectID": 12,
"ProjectOutSA": false,
"UsingInDoctorApp": true
},
{
"Desciption": "Olaya Hospital",
"DesciptionN": null,
"ID": 12,
"LegalName": "from Sehat Al Olaya Medical Complex Company",
"LegalNameN": "شركة مجمع صحة العليا الطبي ",
"Name": "Olaya Hospital",
"NameN": null,
"PhoneNumber": "+966114622224",
"SetupID": "91877 ",
"DistanceInKilometers": 0,
"IsActive": true,
"Latitude": "24.704242",
"Longitude": "46.675823",
"MainProjectID": 12,
"ProjectOutSA": false,
"UsingInDoctorApp": true
},
{
"Desciption": "Ajaji Dental Clinic (AMS)",
"DesciptionN": null,
"ID": 99,
"LegalName": "from Dr. Abdulaziz A. Al - Ajaji Dental Clinics Complex Company",
"LegalNameN": "شركة مجمع عيادات الدكتور عبدالعزيز ابرهيم العجاجي لطب الاسنان",
"Name": "Ajaji Dental Clinic (AMS)",
"NameN": null,
"PhoneNumber": "+966115259999",
"SetupID": "010266",
"DistanceInKilometers": 0,
"IsActive": false,
"Latitude": "24.722136",
"Longitude": "46.774303",
"MainProjectID": 15,
"ProjectOutSA": false,
"UsingInDoctorApp": true
},
{
"Desciption": "Ajaji Dental Clinic (AMS)",
"DesciptionN": null,
"ID": 100,
"LegalName": "from Dr. Abdulaziz A. Al - Ajaji Dental Clinics Complex Company",
"LegalNameN": "شركة مجمع عيادات الدكتور عبدالعزيز ابرهيم العجاجي لطب الاسنان",
"Name": "Ajaji Dental Clinic (AMS) Malaz",
"NameN": null,
"PhoneNumber": "+966115259999",
"SetupID": "010266",
"DistanceInKilometers": 0,
"IsActive": false,
"Latitude": "24.722136",
"Longitude": "46.774303",
"MainProjectID": 15,
"ProjectOutSA": false,
"UsingInDoctorApp": true
},
{
"Desciption": "Arryan Hospital",
"DesciptionN": null,
"ID": 15,
"LegalName": "Al Rayan Hospital for Healthcare Company ",
"LegalNameN": "شركة مستشفى الريان للرعاية الطبية",
"Name": "Arryan Hospital",
"NameN": null,
"PhoneNumber": "+966114909999",
"SetupID": "010266",
"DistanceInKilometers": 0,
"IsActive": true,
"Latitude": "24.722136",
"Longitude": "46.774303",
"MainProjectID": 15,
"ProjectOutSA": false,
"UsingInDoctorApp": true
},
{
"Desciption": "MD Lab",
"DesciptionN": null,
"ID": 150,
"LegalName": "",
"LegalNameN": "",
"Name": "MD Lab",
"NameN": null,
"PhoneNumber": "+966114774700",
"SetupID": "010266",
"DistanceInKilometers": 0,
"IsActive": false,
"Latitude": "24.722136",
"Longitude": "46.774303",
"MainProjectID": 15,
"ProjectOutSA": false,
"UsingInDoctorApp": true
},
{
"Desciption": "Takhassusi Hospital",
"DesciptionN": null,
"ID": 16,
"LegalName": "Western Specialist Hospital for Medical Care",
"LegalNameN": "شركة مستشفى الغرب التخصصي للرعاية الطبية ",
"Name": "Takhassusi Hospital",
"NameN": null,
"PhoneNumber": "+966112833333",
"SetupID": "102000",
"DistanceInKilometers": 0,
"IsActive": true,
"Latitude": "24.719364",
"Longitude": "46.657567",
"MainProjectID": 16,
"ProjectOutSA": false,
"UsingInDoctorApp": true
},
{
"Desciption": "Suwaidi Hospital",
"DesciptionN": null,
"ID": 17,
"LegalName": "Sehat Al Suwaidi Medical Company",
"LegalNameN": "شركة صحة السويدي الطبية",
"Name": "Suwaidi Hospital",
"NameN": null,
"PhoneNumber": "+966114754444",
"SetupID": "010266",
"DistanceInKilometers": 0,
"IsActive": true,
"Latitude": "24.567525",
"Longitude": " 46.641019",
"MainProjectID": 17,
"ProjectOutSA": false,
"UsingInDoctorApp": true
},
{
"Desciption": "Al Qassim Hospital\r\n",
"DesciptionN": null,
"ID": 21,
"LegalName": "Buraidah Al Takhassusi Hospital for Healthcare Company",
"LegalNameN": "شركة مستشفى بريدة التخصصي للرعاية الطبية ",
"Name": "Al Qassim Hospital",
"NameN": null,
"PhoneNumber": "+966163166666",
"SetupID": "051431",
"DistanceInKilometers": 0,
"IsActive": true,
"Latitude": "26.360724",
"Longitude": "43.945774",
"MainProjectID": 21,
"ProjectOutSA": false,
"UsingInDoctorApp": true
},
{
"Desciption": "Khobar Hospital",
"DesciptionN": null,
"ID": 60,
"LegalName": "Khobar Hospital",
"LegalNameN": "مستشفى الخبر",
"Name": "Khobar Hospital",
"NameN": null,
"PhoneNumber": "+966138711111",
"SetupID": "034423",
"DistanceInKilometers": 0,
"IsActive": true,
"Latitude": "26.3107804",
"Longitude": "50.2108347",
"MainProjectID": 60,
"ProjectOutSA": false,
"UsingInDoctorApp": true
}
];

@ -398,9 +398,9 @@ class _PatientsScreenState extends State<PatientsScreen> {
url + url +
avatarFemale, avatarFemale,
height: height:
100.0, 80.0,
width: width:
100.0, 80.0,
semanticsLabel: semanticsLabel:
'Female Logo') 'Female Logo')
], ],

@ -1,3 +1,5 @@
import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart';
import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -74,42 +76,55 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
final routeArgs = ModalRoute.of(context).settings.arguments as Map; final routeArgs = ModalRoute.of(context).settings.arguments as Map;
vitalSing = routeArgs['vitalSing']; vitalSing = routeArgs['vitalSing'];
return AppScaffold( return AppScaffold(
appBarTitle: "vital Sing ", appBarTitle: "vital Sing",
isloading: patientsProv.isLoading, body: patientsProv.isLoading
body: Container( ? DrAppCircularProgressIndeicator()
: patientsProv.isError
? DrAppEmbeddedError(error: patientsProv.error)
: patientsProv.patientVitalSignOrderdSubList.length == 0
? DrAppEmbeddedError(
error: 'You don\'t have any vital Sings')
: Container(
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Row( Row(
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.of(context).pushNamed(BODY_MEASUREMENTS, Navigator.of(context).pushNamed(
BODY_MEASUREMENTS,
arguments: { arguments: {
'title': 'Body Measurements', 'title': 'Body Measurements',
'key': vitalSignDetails.bodyMeasurements 'key':
vitalSignDetails.bodyMeasurements
}); });
}, },
child: Expanded( child: Expanded(
child: VitalSignItem( child: VitalSignItem(
des: 'Body Measurements', des: 'Body Measurements',
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: '137', lastVal: patientsProv.patientVitalSignOrderdSubList[0].heightCm.toString(),
unit: 'Cm', unit: 'Cm',
), ),
), ),
), ),
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.of(context).pushNamed(BODY_MEASUREMENTS, Navigator.of(context).pushNamed(
BODY_MEASUREMENTS,
arguments: { arguments: {
'title': 'Temperature', 'title': 'Temperature',
'key': vitalSignDetails.temperature 'key': vitalSignDetails.temperature,
}); });
}, },
child: Expanded( child: Expanded(
child: VitalSignItem( child: VitalSignItem(
des: 'Temperature', des: 'Temperature',
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: patientsProv.patientVitalSignOrderdSubList[0].temperatureCelcius.toString(),
unit: 'C',
), ),
), ),
), ),
@ -119,7 +134,8 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.of(context).pushNamed(BODY_MEASUREMENTS, Navigator.of(context).pushNamed(
BODY_MEASUREMENTS,
arguments: { arguments: {
'title': 'pulse', 'title': 'pulse',
'key': vitalSignDetails.pulse 'key': vitalSignDetails.pulse
@ -128,11 +144,14 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
child: VitalSignItem( child: VitalSignItem(
des: 'Pulse', des: 'Pulse',
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: patientsProv.patientVitalSignOrderdSubList[0].pulseBeatPerMinute.toString(),
unit: 'M',
), ),
), ),
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.of(context).pushNamed(BODY_MEASUREMENTS, Navigator.of(context).pushNamed(
BODY_MEASUREMENTS,
arguments: { arguments: {
'title': 'pespiration', 'title': 'pespiration',
'key': vitalSignDetails.pespiration 'key': vitalSignDetails.pespiration
@ -141,6 +160,9 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
child: VitalSignItem( child: VitalSignItem(
des: 'Respiration', des: 'Respiration',
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: patientsProv.patientVitalSignOrderdSubList[0].respirationBeatPerMinute.toString(),
unit: 'M',
), ),
), ),
], ],
@ -149,7 +171,8 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.of(context).pushNamed(BODY_MEASUREMENTS, Navigator.of(context).pushNamed(
BODY_MEASUREMENTS,
arguments: { arguments: {
'title': 'Blood Pressure', 'title': 'Blood Pressure',
'key': vitalSignDetails.bloodPressure 'key': vitalSignDetails.bloodPressure
@ -158,11 +181,14 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
child: VitalSignItem( child: VitalSignItem(
des: 'Blood Pressure', des: 'Blood Pressure',
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: patientsProv.patientVitalSignOrderdSubList[0].bloodPressure.toString(),
unit: '',
), ),
), ),
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.of(context).pushNamed(BODY_MEASUREMENTS, Navigator.of(context).pushNamed(
BODY_MEASUREMENTS,
arguments: { arguments: {
'title': 'Oxygenation', 'title': 'Oxygenation',
'key': vitalSignDetails.oxygenation 'key': vitalSignDetails.oxygenation
@ -171,6 +197,8 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
child: VitalSignItem( child: VitalSignItem(
des: 'Oxygenation', des: 'Oxygenation',
url: url + 'heartbeat.png', url: url + 'heartbeat.png',
lastVal: patientsProv.patientVitalSignOrderdSubList[0].fIO2.toString(),
unit: '',
), ),
), ),
], ],
@ -180,7 +208,8 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
onTap: () { onTap: () {
Navigator.of(context).pushNamed(BODY_MEASUREMENTS, Navigator.of(context).pushNamed(
BODY_MEASUREMENTS,
arguments: { arguments: {
'title': 'Pain Scale', 'title': 'Pain Scale',
'key': vitalSignDetails.painScale 'key': vitalSignDetails.painScale
@ -198,4 +227,3 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
)); ));
} }
} }

@ -1,7 +1,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import '../../../../config/size_config.dart'; import '../../../../config/size_config.dart';
import '../../../../widgets/shared/rounded_container_widget.dart'; import '../../../../widgets/shared/rounded_container_widget.dart';
/* /*
*@author: Elham Rababah *@author: Elham Rababah
*@Date:03/6/2020 *@Date:03/6/2020
@ -46,15 +48,13 @@ class VitalSignItem extends StatelessWidget {
des, des,
style: TextStyle( style: TextStyle(
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: 1.7 * SizeConfig.textMultiplier,
color: Theme.of(context).primaryColor, color: Hexcolor('#B8382C'),
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
), ),
Expanded( Expanded(
flex: 1, flex: 1,
child: Column( child: Column(
// mainAxisAlignment: MainAxisAlignment.spaceEvenly,
// crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Image.asset( child: Image.asset(
@ -70,8 +70,10 @@ class VitalSignItem extends StatelessWidget {
new TextSpan(text: lastVal), new TextSpan(text: lastVal),
new TextSpan( new TextSpan(
text: ' ${unit}', text: ' ${unit}',
style: style: TextStyle(
TextStyle(color: Theme.of(context).primaryColor)), color: Hexcolor('#B8382C'),
),
),
], ],
), ),
)) ))

@ -40,6 +40,16 @@ class TranslationBase {
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 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];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
import 'package:hexcolor/hexcolor.dart';
import '../../config/size_config.dart'; import '../../config/size_config.dart';
import '../../lookups/auth_lookup.dart'; import '../../lookups/auth_lookup.dart';
@ -113,7 +114,7 @@ class AuthHeader extends StatelessWidget {
Text( Text(
text2, text2,
style: TextStyle( style: TextStyle(
color: Theme.of(context).primaryColor, color: Hexcolor('#B8382C'),
fontSize: textFontSize, fontSize: textFontSize,
fontWeight: FontWeight.w800), fontWeight: FontWeight.w800),
) )
@ -160,7 +161,7 @@ class AuthHeader extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: SizeConfig.isMobile ? 26 : SizeConfig.realScreenWidth * 0.030, fontSize: SizeConfig.isMobile ? 26 : SizeConfig.realScreenWidth * 0.030,
fontWeight: FontWeight.w800, fontWeight: FontWeight.w800,
color: Theme.of(context).primaryColor), color: Hexcolor('#B8382C')),
), ),
); );
} }
@ -176,7 +177,7 @@ class AuthHeader extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w800, fontWeight: FontWeight.w800,
fontSize: SizeConfig.isMobile ? 24 : SizeConfig.realScreenWidth * 0.029, fontSize: SizeConfig.isMobile ? 24 : SizeConfig.realScreenWidth * 0.029,
color: Theme.of(context).primaryColor, color: Hexcolor('#B8382C'),
), ),
); );
} }

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/lookups/hospital_lookup.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
@ -35,6 +36,9 @@ class _LoginFormState extends State<LoginForm> {
String uniqueId = "Unknown"; String uniqueId = "Unknown";
var projectsList = []; var projectsList = [];
FocusNode focusPass;
FocusNode focusProject;
var userInfo = UserModel( var userInfo = UserModel(
UserID: '', UserID: '',
Password: '', Password: '',
@ -147,8 +151,6 @@ class _LoginFormState extends State<LoginForm> {
), ),
RaisedButton( RaisedButton(
onPressed: () { onPressed: () {
// Navigator.of(context).pushNamed(VERIFICATION_METHODS);
login(context, authProv, widget.changeLoadingStata); login(context, authProv, widget.changeLoadingStata);
}, },
textColor: Colors.white, textColor: Colors.white,
@ -314,9 +316,14 @@ class _LoginFormState extends State<LoginForm> {
}); });
} else { } else {
// handel error // handel error
setState(() {
projectsList = ListProject;
});
} }
}).catchError((err) { }).catchError((err) {
setState(() {
projectsList = ListProject;
});
print(err); print(err);
}); });
} }
@ -330,5 +337,6 @@ class _LoginFormState extends State<LoginForm> {
userInfo.ProjectID = projectsList[index]["ID"]; userInfo.ProjectID = projectsList[index]["ID"];
projectIdController.text = projectsList[index]['Name']; projectIdController.text = projectsList[index]['Name'];
}); });
FocusScope.of(context).requestFocus(focusProject);
} }
} }

@ -1,6 +1,7 @@
import 'package:doctor_app_flutter/models/my_referral_patient_model.dart'; import 'package:doctor_app_flutter/models/my_referral_patient_model.dart';
import 'package:doctor_app_flutter/models/my_referred_patient_model.dart'; import 'package:doctor_app_flutter/models/my_referred_patient_model.dart';
import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
@ -86,7 +87,8 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
), ),
children: [ children: [
TableRow(children: [ TableRow(children: [
Container( Expanded(
child: Container(
margin: EdgeInsets.all(2.5), margin: EdgeInsets.all(2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
decoration: BoxDecoration(), decoration: BoxDecoration(),
@ -95,7 +97,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'File No', TranslationBase.of(context).fileNo,
fontSize: fontSize:
1.7 * SizeConfig.textMultiplier, 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -109,7 +111,9 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
], ],
), ),
), ),
Container( ),
Expanded(
child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 4, left: 4,
top: 2.5, top: 2.5,
@ -121,7 +125,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'Referral Doctor', TranslationBase.of(context).referralDoctor,
fontSize: fontSize:
1.7 * SizeConfig.textMultiplier, 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -135,10 +139,12 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
], ],
), ),
), ),
),
]), ]),
TableRow( TableRow(
children: [ children: [
Container( Expanded(
child: Container(
margin: EdgeInsets.all(2.5), margin: EdgeInsets.all(2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
@ -146,7 +152,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'Referring Clinic', TranslationBase.of(context).referringClinic,
fontSize: 1.7 * fontSize: 1.7 *
SizeConfig.textMultiplier, SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -160,7 +166,9 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
], ],
), ),
), ),
Container( ),
Expanded(
child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 4, left: 4,
top: 2.5, top: 2.5,
@ -172,7 +180,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'Frequency', TranslationBase.of(context).frequency,
fontSize: 1.7 * fontSize: 1.7 *
SizeConfig.textMultiplier, SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -186,11 +194,13 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
) )
], ],
), ),
),
) )
], ],
), ),
TableRow(children: [ TableRow(children: [
Container( Expanded(
child: Container(
margin: EdgeInsets.all(2.5), margin: EdgeInsets.all(2.5),
padding: EdgeInsets.all(5), padding: EdgeInsets.all(5),
child: Column( child: Column(
@ -198,7 +208,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'Priority', TranslationBase.of(context).priority,
fontSize: fontSize:
1.7 * SizeConfig.textMultiplier, 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -212,7 +222,9 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
], ],
), ),
), ),
Container( ),
Expanded(
child: Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 4, left: 4,
top: 2.5, top: 2.5,
@ -224,7 +236,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
AppText( AppText(
'Max Response Time', TranslationBase.of(context).maxResponseTime,
fontSize: fontSize:
1.7 * SizeConfig.textMultiplier, 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -239,6 +251,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
) )
], ],
), ),
),
) )
]) ])
], ],
@ -251,7 +264,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
height: 5, height: 5,
), ),
AppText( AppText(
'Clinic Details and Remarks', TranslationBase.of(context).clinicDetailsandRemarks,
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
textAlign: TextAlign.start, textAlign: TextAlign.start,
@ -269,7 +282,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
height: 5, height: 5,
), ),
AppText( AppText(
'Answer/Suggestions', TranslationBase.of(context).answerSuggestions,
fontSize: 1.7 * SizeConfig.textMultiplier, fontSize: 1.7 * SizeConfig.textMultiplier,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
textAlign: TextAlign.start, textAlign: TextAlign.start,
@ -307,7 +320,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
DrAppToastMsg.showErrorToast(e); DrAppToastMsg.showErrorToast(e);
} }
}, },
title: 'Verify', title: TranslationBase.of(context).verify,
loading: _isLoading, loading: _isLoading,
), ),
) )

@ -86,7 +86,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
tableRow.add(TableRow(children: [ tableRow.add(TableRow(children: [
Container( Container(
child: Container( child: Container(
height: 50, padding: EdgeInsets.all(10),
color: Colors.white, color: Colors.white,
child: Center( child: Center(
child: Texts( child: Texts(
@ -98,7 +98,7 @@ class _VitalSignDetailsWidgetState extends State<VitalSignDetailsWidget> {
), ),
Container( Container(
child: Container( child: Container(
height: 50, padding: EdgeInsets.all(10),
color: Colors.white, color: Colors.white,
child: Center( child: Center(
child: Texts( child: Texts(

@ -36,11 +36,11 @@ class CardWithBgWidgetNew extends StatelessWidget {
children: [ children: [
Center( Center(
child: Container( child: Container(
padding:EdgeInsets.fromLTRB(0, 10,0, 10), //EdgeInsets.all(10.0),//10 // padding:EdgeInsets.fromLTRB(0, 10,0, 10), //EdgeInsets.all(10.0),//10
// margin: EdgeInsets.only(left: 10), // margin: EdgeInsets.only(left: 10),
child: Padding( child: Padding(
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: widget, child: Center(child: widget),
)), )),
) )
], ],

Loading…
Cancel
Save