in patient change

merge-requests/531/head
Sultan Khan 5 years ago
parent 5afb44adfd
commit 360b4d22cf

@ -852,4 +852,6 @@ const Map<String, Map<String, String>> localizedValues = {
}, },
"updateNow": {"en": "Update Now", "ar": "تحديث الان"}, "updateNow": {"en": "Update Now", "ar": "تحديث الان"},
"updateTheApp": {"en": "Update The App", "ar": "تحديث التطبيق"}, "updateTheApp": {"en": "Update The App", "ar": "تحديث التطبيق"},
"admission-date": {"en": "Admission Date", "ar": "تاريخ القبول"},
"noOfDays": {"en": "No of days", "ar": "عدد الأيام"},
}; };

@ -2,15 +2,17 @@ import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart'; import 'package:hexcolor/hexcolor.dart';
class HomePageCard extends StatelessWidget { class HomePageCard extends StatelessWidget {
const HomePageCard({this.hasBorder = false, const HomePageCard(
this.imageName, {this.hasBorder = false,
@required this.child, this.imageName,
this.onTap, @required this.child,
Key key, this.onTap,
this.width, Key key,
this.height, this.width,
this.color, this.height,
this.opacity = 0.4}) this.color,
this.opacity = 0.4,
this.margin})
: super(key: key); : super(key: key);
final bool hasBorder; final bool hasBorder;
final String imageName; final String imageName;
@ -20,7 +22,7 @@ class HomePageCard extends StatelessWidget {
final double height; final double height;
final Color color; final Color color;
final double opacity; final double opacity;
final EdgeInsets margin;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return InkWell( return InkWell(
@ -30,13 +32,14 @@ class HomePageCard extends StatelessWidget {
height: height != null height: height != null
? height ? height
: MediaQuery.of(context).orientation == Orientation.portrait : MediaQuery.of(context).orientation == Orientation.portrait
? MediaQuery.of(context).size.height * 0.18 ? MediaQuery.of(context).size.height * 0.18
: MediaQuery.of(context).size.height * 0.36, : MediaQuery.of(context).size.height * 0.36,
margin: this.margin,
decoration: BoxDecoration( decoration: BoxDecoration(
color: !hasBorder color: !hasBorder
? color != null ? color != null
? color ? color
: HexColor('#050705').withOpacity(opacity) : HexColor('#050705').withOpacity(opacity)
: Colors.white, : Colors.white,
borderRadius: BorderRadius.circular(15.0), borderRadius: BorderRadius.circular(15.0),
border: hasBorder border: hasBorder
@ -44,11 +47,11 @@ class HomePageCard extends StatelessWidget {
: Border.all(width: 0.0, color: Colors.transparent), : Border.all(width: 0.0, color: Colors.transparent),
image: imageName != null image: imageName != null
? DecorationImage( ? DecorationImage(
image: AssetImage('assets/images/dashboard/${imageName}'), image: AssetImage('assets/images/dashboard/${imageName}'),
fit: BoxFit.cover, fit: BoxFit.cover,
colorFilter: new ColorFilter.mode( colorFilter: new ColorFilter.mode(
Colors.black.withOpacity(0.2), BlendMode.dstIn), Colors.black.withOpacity(0.2), BlendMode.dstIn),
) )
: null, : null,
), ),
child: Center( child: Center(
@ -59,4 +62,4 @@ class HomePageCard extends StatelessWidget {
} }
getDashboardWidget() {} getDashboardWidget() {}
} }

@ -457,167 +457,189 @@ class _HomeScreenState extends State<HomeScreen> {
SizedBox( SizedBox(
height: 10, height: 10,
), ),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, new Container(
crossAxisAlignment: CrossAxisAlignment.start, height: 130,
children: <Widget>[ child: new ListView(
HomePageCard( scrollDirection: Axis.horizontal,
color: Colors.red[800], children: [
child: Column( HomePageCard(
mainAxisAlignment: MainAxisAlignment.center, color: Colors.red[800],
crossAxisAlignment: CrossAxisAlignment.start, margin: EdgeInsets.all(5),
children: <Widget>[ child: Column(
Padding( mainAxisAlignment:
padding: EdgeInsets.only( MainAxisAlignment.center,
top: 10, left: 10, right: 0), crossAxisAlignment:
child: Icon( CrossAxisAlignment.start,
DoctorApp.referral_1, children: <Widget>[
size: 35, Padding(
color: Colors.white, padding: EdgeInsets.only(
)), top: 10, left: 10, right: 0),
Container( child: Icon(
padding: EdgeInsets.all(10), DoctorApp.referral_1,
child: AppText( size: 35,
TranslationBase.of(context) color: Colors.white,
.patientsreferral, )),
color: Colors.white, Container(
textAlign: TextAlign.start, padding: EdgeInsets.all(10),
fontSize: 15, child: AppText(
)) TranslationBase.of(context)
], .patientsreferral,
), color: Colors.white,
hasBorder: false, textAlign: TextAlign.start,
onTap: () { fontSize: 15,
Navigator.push( ))
context, ],
MaterialPageRoute( ),
builder: (context) => hasBorder: false,
PatientReferralScreen(), onTap: () {
// MyReferredPatient(), Navigator.push(
context,
MaterialPageRoute(
builder: (context) =>
PatientReferralScreen(),
// MyReferredPatient(),
),
);
},
), ),
); HomePageCard(
}, color: Colors.grey[300],
), margin: EdgeInsets.all(5),
HomePageCard( child: Column(
color: Colors.grey[300], mainAxisAlignment:
child: Column( MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment:
crossAxisAlignment: CrossAxisAlignment.start, CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
top: 10, left: 10, right: 0), top: 10, left: 10, right: 0),
child: Icon( child: Icon(
DoctorApp.arrival_patients, DoctorApp.arrival_patients,
size: 35, size: 35,
color: Colors.black, color: Colors.black,
)), )),
Container( Container(
padding: EdgeInsets.all(10), padding: EdgeInsets.all(10),
child: AppText( child: AppText(
TranslationBase.of(context) TranslationBase.of(context)
.arrivalpatient, .arrivalpatient,
color: Colors.black, color: Colors.black,
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontSize: 15, fontSize: 15,
)) ))
], ],
), ),
hasBorder: false, hasBorder: false,
onTap: () { onTap: () {
getRequestHeader(false); getRequestHeader(false);
Navigator.of(context) Navigator.of(context)
.pushNamed(PATIENTS, arguments: { .pushNamed(PATIENTS, arguments: {
"patientSearchForm": "patientSearchForm":
_patientSearchFormValues, _patientSearchFormValues,
"selectedType": "7", "selectedType": "7",
"arrivalType": "1" "arrivalType": "1"
}); });
}, },
), ),
HomePageCard( HomePageCard(
color: Colors.black, color: Colors.black,
child: Column( margin: EdgeInsets.all(5),
mainAxisAlignment: MainAxisAlignment.center, child: Column(
crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment:
children: <Widget>[ MainAxisAlignment.center,
Padding( crossAxisAlignment:
padding: EdgeInsets.only( CrossAxisAlignment.start,
top: 10, left: 10, right: 0), children: <Widget>[
child: Icon( Padding(
DoctorApp.search, padding: EdgeInsets.only(
size: 32, top: 10, left: 10, right: 0),
color: Colors.white, child: Icon(
)), DoctorApp.search,
Container( size: 32,
padding: EdgeInsets.all(10), color: Colors.white,
child: AppText( )),
TranslationBase.of(context) Container(
.searchmedicinepatient, padding: EdgeInsets.all(10),
color: Colors.white, child: AppText(
textAlign: TextAlign.start, TranslationBase.of(context)
fontSize: 13, .searchmedicinepatient,
)) color: Colors.white,
], textAlign: TextAlign.start,
), fontSize: 13,
hasBorder: false, ))
onTap: () { ],
Navigator.push( ),
context, hasBorder: false,
MaterialPageRoute( onTap: () {
builder: (context) => Navigator.push(
SearchMedicinePatientScreen(), context,
)); MaterialPageRoute(
}, builder: (context) =>
) SearchMedicinePatientScreen(),
], ));
), },
SizedBox( ),
height: 10, HomePageCard(
), color: Colors.red[800],
Row( margin: EdgeInsets.all(5),
children: [ child: Column(
HomePageCard( mainAxisAlignment:
color: Colors.black, MainAxisAlignment.center,
child: Column( crossAxisAlignment:
mainAxisAlignment: MainAxisAlignment.center, CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
children: <Widget>[ Padding(
Padding( padding: EdgeInsets.only(
padding: EdgeInsets.only( top: 10, left: 10, right: 0),
top: 10, left: 10, right: 0), child: Icon(
child: Icon( DoctorApp.search,
DoctorApp.search, size: 32,
size: 32, color: Colors.white,
color: Colors.white, )),
)), Container(
Container( padding: EdgeInsets.all(10),
padding: EdgeInsets.all(10), child: AppText(
child: AppText( TranslationBase.of(context)
TranslationBase.of(context).inPatient, .inPatient,
color: Colors.white, color: Colors.white,
textAlign: TextAlign.start, textAlign: TextAlign.start,
fontSize: 13, fontSize: 13,
)) ))
], ],
), ),
hasBorder: false, hasBorder: false,
onTap: () { onTap: () {
getRequestHeader(true); getRequestHeader(true);
Navigator.of(context) Navigator.of(context)
.pushNamed(PATIENTS, arguments: { .pushNamed(PATIENTS, arguments: {
"patientSearchForm": "patientSearchForm":
_patientSearchFormValues, _patientSearchFormValues,
"selectedType": "1", "selectedType": "1",
"arrivalType": "1" "arrivalType": "1"
}); });
}, },
) )
], ])),
), // Row(
SizedBox( // mainAxisAlignment: MainAxisAlignment.spaceBetween,
height: 20, // crossAxisAlignment: CrossAxisAlignment.start,
), // children: <Widget>[
// ],
// ),
// SizedBox(
// height: 10,
// ),
// Row(
// children: [
// ],
// ),
// SizedBox(
// height: 20,
// ),
Row( Row(
// mainAxisAlignment: MainAxisAlignment.spaceAround, // mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

@ -1229,6 +1229,9 @@ class TranslationBase {
String get updateNow => localizedValues['updateNow'][locale.languageCode]; String get updateNow => localizedValues['updateNow'][locale.languageCode];
String get updateTheApp => String get updateTheApp =>
localizedValues['updateTheApp'][locale.languageCode]; localizedValues['updateTheApp'][locale.languageCode];
String get admissionDate =>
localizedValues['admission-date'][locale.languageCode];
String get noOfDays => localizedValues['noOfDays'][locale.languageCode];
} }
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> { class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -29,23 +29,27 @@ class PatientCard extends StatelessWidget {
return Container( return Container(
width: SizeConfig.screenWidth * 0.9, width: SizeConfig.screenWidth * 0.9,
margin: EdgeInsets.all(6), margin: EdgeInsets.all(6),
padding: EdgeInsets.only(left: 0, right: 5, bottom: 5, top: 5), padding:
(SERVICES_PATIANT2[int.parse(patientType)] == "List_MyInPatient")
? EdgeInsets.only(left: 0, right: 5, bottom: 20, top: 5)
: EdgeInsets.only(left: 0, right: 5, bottom: 5, top: 5),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
color: Colors.white, color: Colors.white,
), ),
child: Stack(children: [ child: Stack(children: [
Container( if (SERVICES_PATIANT2[int.parse(patientType)] == "List_MyOutPatient")
height: MediaQuery.of(context).size.height * .20, Container(
width: 5, height: MediaQuery.of(context).size.height * .20,
decoration: BoxDecoration( width: 5,
borderRadius: BorderRadius.only( decoration: BoxDecoration(
topLeft: Radius.circular(10), borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(10)), topLeft: Radius.circular(10),
color: patientInfo.patientStatusType == 43 bottomLeft: Radius.circular(10)),
? Colors.green[500] color: patientInfo.patientStatusType == 43
: Colors.red[800], ? Colors.green[500]
)), : Colors.red[800],
)),
Container( Container(
padding: EdgeInsets.only(left: 10, right: 0, bottom: 0), padding: EdgeInsets.only(left: 10, right: 0, bottom: 0),
child: InkWell( child: InkWell(
@ -212,29 +216,84 @@ class PatientCard extends StatelessWidget {
), ),
), ),
), ),
Container( if (SERVICES_PATIANT2[int.parse(patientType)] ==
child: RichText( "List_MyOutPatient")
text: new TextSpan( Container(
style: new TextStyle( child: RichText(
fontSize: 2.0 * SizeConfig.textMultiplier, text: new TextSpan(
color: Colors.black, style: new TextStyle(
fontFamily: 'Poppins', fontSize: 2.0 * SizeConfig.textMultiplier,
color: Colors.black,
fontFamily: 'Poppins',
),
children: <TextSpan>[
new TextSpan(
text:
TranslationBase.of(context).age +
" : ",
style: TextStyle(fontSize: 14)),
new TextSpan(
text:
"${DateUtils.getAgeByBirthday(patientInfo.dateofBirth, context)}",
style: TextStyle(
fontWeight: FontWeight.w700,
fontSize: 15)),
],
), ),
children: <TextSpan>[ ),
),
if (SERVICES_PATIANT2[int.parse(patientType)] ==
"List_MyInPatient")
Container(
child: RichText(
text: new TextSpan(
style: new TextStyle(
fontSize:
2.0 * SizeConfig.textMultiplier,
color: Colors.black,
fontFamily: 'Poppins',
),
children: <TextSpan>[
new TextSpan( new TextSpan(
text: TranslationBase.of(context).age + text: TranslationBase.of(context)
.admissionDate +
" : ", " : ",
style: TextStyle(fontSize: 14)), style: TextStyle(fontSize: 14)),
new TextSpan( new TextSpan(
text: text:
"${DateUtils.getAgeByBirthday(patientInfo.dateofBirth, context)}", "${DateUtils.convertDateFromServerFormat(patientInfo.admissionDate.toString(), 'yyyy-MM-dd')}",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
fontSize: 15)), fontSize: 15)),
], ]))),
), // Container(
), // child: Row(
), // crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisAlignment: MainAxisAlignment.start,
// children: <Widget>[
// Expanded(
// child: AppText(
// TranslationBase.of(context).noOfDays +
// " : ",
// fontSize: 14,
// ),
// ),
// AppText(
// patientInfo.days,
// color: Colors.white,
// fontSize: 1.5 * SizeConfig.textMultiplier,
// textAlign: TextAlign.center,
// fontWeight: FontWeight.bold,
// ),
// SizedBox(
// height: 0.5,
// )
// ],
// ),
// margin: EdgeInsets.only(
// top: 8,
// ),
// ),
if (SERVICES_PATIANT2[int.parse(patientType)] == if (SERVICES_PATIANT2[int.parse(patientType)] ==
"List_MyOutPatient") "List_MyOutPatient")
Container( Container(

Loading…
Cancel
Save