Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad

 Conflicts:
	lib/screens/dashboard_screen.dart
merge-requests/100/head
Mohammad ALjammal 6 years ago
commit c16c8897be

@ -19,6 +19,20 @@ const Map<String, Map<String, String>> localizedValues = {
'maxResponseTime':{'en': 'Max Response Time', 'ar' : 'الوقت الأقصى للرد'}, 'maxResponseTime':{'en': 'Max Response Time', 'ar' : 'الوقت الأقصى للرد'},
'clinicDetailsandRemarks':{'en': 'Clinic Details and Remarks', 'ar' : 'ملاحضات وتفاصيل العيادة'}, 'clinicDetailsandRemarks':{'en': 'Clinic Details and Remarks', 'ar' : 'ملاحضات وتفاصيل العيادة'},
'answerSuggestions':{'en': 'Answer/Suggestions', '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' : 'خدمات المرضى'},
}; };

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

@ -315,7 +315,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.fromLTRB( padding: const EdgeInsets.fromLTRB(
0, 250, 0, 0), 0, 0, 0, 0),//250
child: child:
DrAppCircularProgressIndeicator(), DrAppCircularProgressIndeicator(),
)), )),
@ -365,182 +365,192 @@ class _PatientsScreenState extends State<PatientsScreen> {
// mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
children: responseModelList children: responseModelList
.map((PatiantInformtion item) { .map((PatiantInformtion item) {
return InkWell( return Container(
child: CardWithBgWidgetNew( decoration: myBoxDecoration(),
//CardWithBgWidget( child: InkWell(
child: CardWithBgWidgetNew(
widget: Column( //CardWithBgWidget(
children: <Widget>[
Row( widget: Column(
children: <Widget>[ children: <Widget>[
Column( Container(
mainAxisAlignment: // decoration: myBoxDecoration(),
MainAxisAlignment child: Row(
.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,
children: <Widget>[ children: <Widget>[
AppText( Column(
item.firstName + mainAxisAlignment:
" " + MainAxisAlignment
item.lastName, .start,
fontSize: 2.0 * children:
SizeConfig item.genderDescription ==
.textMultiplier, "Male"
fontWeight: ? [
FontWeight SvgPicture.asset(
.bold, url +
backGroundcolor: avatarMale,
Colors.white, height:
), 80.0,
SizedBox( width:
height: 8, 80.0,
), semanticsLabel:
AppText( 'Male Logo')
"File Number:" + ]
item.patientId : [
.toString(), SvgPicture.asset(
fontSize: 2.0 * url +
SizeConfig avatarFemale,
.textMultiplier, height:
fontWeight: 80.0,
FontWeight width:
.bold, 80.0,
backGroundcolor: semanticsLabel:
Colors.white, 'Female Logo')
), ],
// SizedBox(
// height: 8,
// ),
AppText(
"Age:" +
item.age
.toString(),
fontSize: 2.0 *
SizeConfig
.textMultiplier,
fontWeight:
FontWeight
.bold,
backGroundcolor:
Colors.white,
), ),
SizedBox( SizedBox(
height: 8, width: 10,
), ),
SERVICES_PATIANT2[int Column(
.parse( crossAxisAlignment:
patientType)] == CrossAxisAlignment
"List_MyOutPatient" .start,
? Row( children: <Widget>[
mainAxisAlignment: AppText(
MainAxisAlignment item.firstName +
.spaceBetween, " " +
children: < item.lastName,
Widget>[ fontSize: 2.0 *
Container( SizeConfig
height: .textMultiplier,
20, fontWeight:
width: FontWeight
80, .bold,
decoration: backGroundcolor:
BoxDecoration( Colors.white,
borderRadius: ),
BorderRadius.circular(50), SizedBox(
color: height: 8,
Hexcolor("#20A169"), ),
), AppText(
child: "File Number:" +
AppText( item.patientId
item.startTime, .toString(),
color: fontSize: 2.0 *
Colors.white, SizeConfig
fontSize: .textMultiplier,
2 * SizeConfig.textMultiplier, fontWeight:
textAlign: FontWeight
TextAlign.center, .bold,
fontWeight: backGroundcolor:
FontWeight.bold, Colors.white,
), ),
),
SizedBox( // SizedBox(
width: // height: 8,
60, // ),
), AppText(
Container( "Age:" +
child: item.age
AppText( .toString(),
convertDateFormat2(item fontSize: 2.0 *
.appointmentDate SizeConfig
.toString()), .textMultiplier,
fontSize: fontWeight:
2.0 * SizeConfig.textMultiplier, FontWeight
fontWeight: .bold,
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,
: AppText( fontSize: 2.5 *
item.nationalityName, SizeConfig
fontSize: 2.5 * .textMultiplier,
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(),
), ),
), ),
], ],
), ),
) )
], ],
), ),
@ -631,4 +641,19 @@ class _PatientsScreenState extends State<PatientsScreen> {
), ),
); );
} }
myBoxDecoration() {
return BoxDecoration(
border: Border(
bottom: BorderSide( // <--- top side
color: Colors.grey,
width: 1.0,
),
),
);
}
} }

@ -48,7 +48,19 @@ class TranslationBase {
String get maxResponseTime => localizedValues['maxResponseTime'][locale.languageCode]; String get maxResponseTime => localizedValues['maxResponseTime'][locale.languageCode];
String get clinicDetailsandRemarks=> localizedValues['clinicDetailsandRemarks'][locale.languageCode]; String get clinicDetailsandRemarks=> localizedValues['clinicDetailsandRemarks'][locale.languageCode];
String get answerSuggestions => localizedValues['answerSuggestions'][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];
} }

@ -36,6 +36,7 @@ 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(
@ -48,4 +49,6 @@ class CardWithBgWidgetNew extends StatelessWidget {
), ),
); );
} }
} }

Loading…
Cancel
Save