Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'Amjad_search' into 'development'

Browse Source 
Amjad search

See merge request Cloud_Solution/doctor_app_flutter!98
merge-requests/100/merge
amjad nabil amireh 4 years ago
parent 55de147885 cc2c0f9a1e
commit 2210e98a96
5 changed files with 235 additions and 178 deletions
Show Stats Download Patch File Download Diff File

14
lib/config/localized_values.dart
Unescape Escape View File

@ -19,6 +19,20 @@ const Map<String, Map<String, String>> localizedValues = {
'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' : 'خدمات المرضى'},
};

31
lib/screens/dashboard_screen.dart
Unescape Escape View File

@ -50,7 +50,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Container(
margin: EdgeInsets.all(10),
child: AppText(
"Today's Statistics",
TranslationBase.of(context).todayStatistics,
fontWeight: FontWeight.bold,
),
alignment: Alignment.centerLeft,
@ -76,7 +77,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
AppText("38",
fontWeight: FontWeight.bold,
fontSize: SizeConfig.textMultiplier * 4),
AppText("Out-Patients",
AppText(TranslationBase.of(context).outPatients,
fontWeight: FontWeight.normal,
fontSize: SizeConfig.textMultiplier * 1.2,
color: Colors.grey[800]),
@ -103,12 +104,12 @@ class _DashboardScreenState extends State<DashboardScreen> {
children: <Widget>[
Expanded(
child: DashboardItemTexts(
"Arrived",
TranslationBase.of(context).arrived,
"23",
)),
Expanded(
child: DashboardItemTexts(
"Not Arrived",
TranslationBase.of(context).notArrived,
"23",
),
),
@ -122,12 +123,13 @@ class _DashboardScreenState extends State<DashboardScreen> {
children: <Widget>[
Expanded(
child: DashboardItemTexts(
"ER",
TranslationBase.of(context).er,
"23",
)),
Expanded(
child: DashboardItemTexts(
"Walk-in",
TranslationBase.of(context).walkIn,
"23",
)),
],
@ -148,7 +150,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: new DashboardItemIconText(
DoctorApp.home_icon,
"08",
"Lab Result",
TranslationBase.of(context).labResult,
backgroundColor: Colors.black45,
// valueFontColor: Colors.white,
// titleFontColor: Colors.white,
@ -160,7 +162,8 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: new DashboardItemIconText(
DoctorApp.home_icon,
"10",
"Radiology",
TranslationBase.of(context).radiology,
backgroundColor: Colors.black45,
// valueFontColor: Colors.white,
// titleFontColor: Colors.white,
@ -171,7 +174,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: new DashboardItemIconText(
DoctorApp.home_icon,
"05",
"Referral",
TranslationBase.of(context).referral,
backgroundColor: Colors.black45,
// valueFontColor: Colors.white,
// titleFontColor: Colors.white,
@ -190,7 +193,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: new DashboardItemIconText(
DoctorApp.home_icon,
"23",
"In-Patient",
TranslationBase.of(context).inPatient,
showBorder: true,
backgroundColor: Colors.red[900],
),
@ -200,7 +203,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: new DashboardItemIconText(
DoctorApp.home_icon,
"23",
"Operations",
TranslationBase.of(context).operations,
showBorder: true,
backgroundColor: Colors.red[900],
)),
@ -212,7 +215,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: Container(
margin: EdgeInsets.all(10),
child: AppText(
"Patient Services",
TranslationBase.of(context).patientServices,
fontWeight: FontWeight.bold,
),
alignment: Alignment.centerLeft,
@ -229,7 +232,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: DashboardItemIconText(
DoctorApp.home_icon,
"",
"Search Patient",
TranslationBase.of(context).searchPatient,
showBorder: true,
backgroundColor: Colors.white,
valueFontColor: Colors.black,
@ -259,7 +262,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
child: DashboardItemIconText(
DoctorApp.home_icon,
"",
"Doctor Reply",
TranslationBase.of(context).doctorReply,
showBorder: true,
backgroundColor: Colors.white,
valueFontColor: Colors.black,

351
lib/screens/patients/patients_screen.dart
Unescape Escape View File

@ -317,7 +317,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
child: Center(
child: Padding(
padding: const EdgeInsets.fromLTRB(
0, 250, 0, 0),
0, 0, 0, 0),//250
child:
DrAppCircularProgressIndeicator(),
)),
@ -367,182 +367,192 @@ class _PatientsScreenState extends State<PatientsScreen> {
// mainAxisAlignment: MainAxisAlignment.center,
children: responseModelList
.map((PatiantInformtion item) {
return InkWell(
child: CardWithBgWidgetNew(
//CardWithBgWidget(
widget: Column(
children: <Widget>[
Row(
children: <Widget>[
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: <Widget>[
Container(
// decoration: myBoxDecoration(),
child: Row(
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,
),
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,
// ),
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,
),
width: 10,
),
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(),
}).toList(),
),
),
],
),
)
],
),
@ -633,4 +643,19 @@ class _PatientsScreenState extends State<PatientsScreen> {
),
);
}
myBoxDecoration() {
return BoxDecoration(
border: Border(
bottom: BorderSide( // <--- top side
color: Colors.grey,
width: 1.0,
),
),
);
}
}

14
lib/util/translations_delegate_base.dart
Unescape Escape View File

@ -48,7 +48,19 @@ class TranslationBase {
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 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];
}

3
lib/widgets/shared/card_with_bgNew_widget.dart
Unescape Escape View File

@ -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 {
),
);
}
}

Write Preview
Loading…
Cancel
Save