Haroon6138
/
PatientApp-KKUMC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix_design' into 'development'

Browse Source 
Fix design

See merge request Cloud_Solution/diplomatic-quarter!241
merge-requests/243/merge
Mohammad Aljammal 4 years ago
parent 80fdebc34d ff85b2f1b2
commit 1cb5e250ed
4 changed files with 61 additions and 328 deletions
Show Stats Download Patch File Download Diff File

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

@ -1457,4 +1457,12 @@ const Map localizedValues = {
"en": "Drive-Thru", "en": "Drive-Thru",
"ar": "من السيارة" "ar": "من السيارة"
}, },
"NearestErDesc": {
"en": "\nThis service Displays nearest branch\n among all the branches of All Habib \n medical Group based on your current Location",
"ar": "\nتعرض هذه الخدمة أقرب فرع\n من بين جميع فروع مجموعة \nالحبيب الطبية بناءً على موقعك الحالي."
},
"NearestEr": {
"en": "Nearest ER",
"ar": "أقرب ER"
},
}; };

360
lib/pages/ErService/NearestEr.dart
Unescape Escape View File

@ -20,6 +20,10 @@ class NearestEr extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var size = MediaQuery.of(context).size;
final double itemHeight = (size.height - kToolbarHeight - 24) / 2;
final double itemWidth = size.width / 2;
return BaseView<NearHospitalViewModel>( return BaseView<NearHospitalViewModel>(
onModelReady: appointmentNo != null && projectID != null onModelReady: appointmentNo != null && projectID != null
? (model) => model.getProjectAvgERWaitingTimeOrders( ? (model) => model.getProjectAvgERWaitingTimeOrders(
@ -27,14 +31,14 @@ class NearestEr extends StatelessWidget {
: (model) => model.getProjectAvgERWaitingTimeOrders(), : (model) => model.getProjectAvgERWaitingTimeOrders(),
builder: (_, mode, widget) => AppScaffold( builder: (_, mode, widget) => AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarTitle: 'Nearest ER', appBarTitle: TranslationBase.of(context).NearestEr,
baseViewModel: mode, baseViewModel: mode,
body: mode.ProjectAvgERWaitingTimeModeList.length > 0 body: mode.ProjectAvgERWaitingTimeModeList.length > 0
? Container( ? Container(
child: ListView( child: ListView(
children: <Widget>[ children: <Widget>[
Text( Text(
"\nThis service Displays nearest branch\n among all the branches of All Habib \n medical Group based on your current Location", "${TranslationBase.of(context).NearestErDesc}",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontSize: 18.0, fontSize: 18.0,
@ -45,7 +49,7 @@ class NearestEr extends StatelessWidget {
margin: EdgeInsets.fromLTRB(2.0, 10.0, 0.0, 10.0), margin: EdgeInsets.fromLTRB(2.0, 10.0, 0.0, 10.0),
child: GridView.count( child: GridView.count(
crossAxisCount: 2, crossAxisCount: 2,
// childAspectRatio: 2.2, childAspectRatio: (itemWidth / itemWidth),
crossAxisSpacing: 10, crossAxisSpacing: 10,
mainAxisSpacing: 10, mainAxisSpacing: 10,
controller: controller:
@ -54,329 +58,43 @@ class NearestEr extends StatelessWidget {
padding: const EdgeInsets.all(4.0), padding: const EdgeInsets.all(4.0),
children: List.generate(7, (index) { children: List.generate(7, (index) {
return Container( return Container(
child: Container( child: CardPosition(
child: CardPosition( text: mode
text: mode .ProjectAvgERWaitingTimeModeList[index]
.ProjectAvgERWaitingTimeModeList[index] .projectName
.projectName .toString(),
.toString(), image:
image: 'assets/images/new-design/find_us_icon.png',
'assets/images/new-design/find_us_icon.png', subText: mode
subText: mode .ProjectAvgERWaitingTimeModeList[index]
.ProjectAvgERWaitingTimeModeList[index] .distanceInKilometers
.distanceInKilometers .toString(),
.toString(), type: mode
type: mode .ProjectAvgERWaitingTimeModeList[index].iD
.ProjectAvgERWaitingTimeModeList[index].iD .toString(),
.toString(), telephone: mode
telephone: mode .ProjectAvgERWaitingTimeModeList[index]
.ProjectAvgERWaitingTimeModeList[index] .phoneNumber
.phoneNumber .toString(),
.toString(), networkImage: mode
networkImage: mode .ProjectAvgERWaitingTimeModeList[index]
.ProjectAvgERWaitingTimeModeList[index] .projectImageURL
.projectImageURL .toString(),
.toString(), latitude: mode
latitude: mode .ProjectAvgERWaitingTimeModeList[index]
.ProjectAvgERWaitingTimeModeList[index] .latitude,
.latitude, longitude: mode
longitude: mode .ProjectAvgERWaitingTimeModeList[index]
.ProjectAvgERWaitingTimeModeList[index] .longitude,
.longitude, projectname: mode
projectname: mode .ProjectAvgERWaitingTimeModeList[index]
.ProjectAvgERWaitingTimeModeList[index] .projectName,
.projectName, cardSize: itemWidth,
),
), ),
); );
}), }),
), ),
), ),
/* Container(
margin: EdgeInsets.fromLTRB(0.0, 10.0, 0.0, 10.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Expanded(
child: Container(
child: CardPosition(
text: mode
.ProjectAvgERWaitingTimeModeList[0]
.projectName
.toString(),
image:
'assets/images/new-design/find_us_icon.png',
subText: mode
.ProjectAvgERWaitingTimeModeList[0]
.distanceInKilometers
.toString(),
type: mode
.ProjectAvgERWaitingTimeModeList[0].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[0]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[0]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[0]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[0]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[0]
.projectName,
),
),
),
Expanded(
child: Container(
child: CardPosition(
text: mode
.ProjectAvgERWaitingTimeModeList[1]
.projectName
.toString(),
image:
'assets/images/new-design/find_us_icon.png',
subText: mode
.ProjectAvgERWaitingTimeModeList[1]
.distanceInKilometers
.toString(),
type: mode
.ProjectAvgERWaitingTimeModeList[1].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[1]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[1]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[1]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[1]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[1]
.projectName,
),
),
)
],
),
Row(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Expanded(
child: Container(
child: CardPosition(
text: mode
.ProjectAvgERWaitingTimeModeList[2]
.projectName
.toString(),
image:
'assets/images/new-design/find_us_icon.png',
subText: mode
.ProjectAvgERWaitingTimeModeList[2]
.distanceInKilometers
.toString(),
type: mode
.ProjectAvgERWaitingTimeModeList[2].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[2]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[2]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[2]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[2]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[2]
.projectName,
),
),
),
Expanded(
child: Container(
child: CardPosition(
text: mode
.ProjectAvgERWaitingTimeModeList[3]
.projectName
.toString(),
image:
'assets/images/new-design/find_us_icon.png',
subText: mode
.ProjectAvgERWaitingTimeModeList[3]
.distanceInKilometers
.toString(),
type: mode
.ProjectAvgERWaitingTimeModeList[3].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[3]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[3]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[3]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[3]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[3]
.projectName,
),
),
flex: 0,
)
],
),
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Expanded(
child: Container(
child: CardPosition(
text: mode
.ProjectAvgERWaitingTimeModeList[4]
.projectName
.toString(),
image:
'assets/images/new-design/find_us_icon.png',
subText: mode
.ProjectAvgERWaitingTimeModeList[4]
.distanceInKilometers
.toString(),
type: mode
.ProjectAvgERWaitingTimeModeList[4].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[4]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[4]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[4]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[4]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[4]
.projectName,
),
),
),
Expanded(
child: Container(
child: CardPosition(
text: mode
.ProjectAvgERWaitingTimeModeList[5]
.projectName
.toString(),
image:
'assets/images/new-design/find_us_icon.png',
subText: mode
.ProjectAvgERWaitingTimeModeList[5]
.distanceInKilometers
.toString(),
type: mode
.ProjectAvgERWaitingTimeModeList[5].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[5]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[5]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[5]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[5]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[5]
.projectName,
),
),
)
],
),
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Expanded(
child: Container(
child: CardPosition(
text: mode
.ProjectAvgERWaitingTimeModeList[6]
.projectName
.toString(),
image:
'assets/images/new-design/find_us_icon.png',
subText: mode
.ProjectAvgERWaitingTimeModeList[6]
.distanceInKilometers
.toString(),
type: mode
.ProjectAvgERWaitingTimeModeList[6].iD
.toString(),
telephone: mode
.ProjectAvgERWaitingTimeModeList[6]
.phoneNumber
.toString(),
networkImage: mode
.ProjectAvgERWaitingTimeModeList[6]
.projectImageURL
.toString(),
latitude: mode
.ProjectAvgERWaitingTimeModeList[6]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[6]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[6]
.projectName,
),
),
flex: 0,
),
],
),
],
)),*/
], ],
), ),
) )

19
lib/pages/ErService/widgets/card_position.dart
Unescape Escape View File

@ -19,6 +19,8 @@ class CardPosition extends StatelessWidget {
final latitude; final latitude;
final longitude; final longitude;
final projectname; final projectname;
final cardSize;
const CardPosition( const CardPosition(
{ {
@required this.image, @required this.image,
@ -30,6 +32,7 @@ class CardPosition extends StatelessWidget {
@required this.latitude, @required this.latitude,
@required this.longitude, @required this.longitude,
@required this.projectname , @required this.projectname ,
@required this.cardSize ,
}); });
@override @override
@ -40,17 +43,17 @@ class CardPosition extends StatelessWidget {
}, },
child: Container( child: Container(
width:MediaQuery.of(context).size.width * 0.47,//165, // width:MediaQuery.of(context).size.width * 0.47,//165,
margin: EdgeInsets.fromLTRB(7.0, 7.0, 7.0, 7.0), margin: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 8.0),
decoration: BoxDecoration(boxShadow: [ decoration: BoxDecoration(boxShadow: [
BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0) BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0)
], borderRadius: BorderRadius.circular(10), color: Colors.white), ], borderRadius: BorderRadius.circular(10), color: Colors.white),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Container( Container(
margin: EdgeInsets.fromLTRB(10.0, 10.0, 10.0, 0.0), height: cardSize * 0.2 - 8,
margin: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 0.0),
child: Text(this.text, child: Text(this.text,
overflow: TextOverflow.clip, overflow: TextOverflow.clip,
style: TextStyle( style: TextStyle(
@ -59,12 +62,14 @@ class CardPosition extends StatelessWidget {
fontSize: 2 * SizeConfig.textMultiplier)), fontSize: 2 * SizeConfig.textMultiplier)),
), ),
Container( Container(
height: cardSize * 0.5 - 8,
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.fromLTRB(0.0, 0.0, 10.0, 8.0), margin: EdgeInsets.fromLTRB(0.0, 0.0, 8.0, 8.0),
child: Image.asset(this.image, width: 60.0, height: 60.0), child: Image.asset(this.image, width: 60.0, height: cardSize * 0.4),
), ),
Container( Container(
margin: EdgeInsets.fromLTRB(10.0, 0.0, 10.0, 0.0), margin: EdgeInsets.fromLTRB(8.0, 0.0, 8.0, 0.0),
height: cardSize * 0.2 - 8,
child: Text(this.subText, child: Text(this.subText,
overflow: TextOverflow.clip, overflow: TextOverflow.clip,
style: TextStyle( style: TextStyle(

2
lib/uitl/translations_delegate_base.dart
Unescape Escape View File

@ -1245,6 +1245,8 @@ class TranslationBase {
localizedValues['shoppingCart'][locale.languageCode]; localizedValues['shoppingCart'][locale.languageCode];
String get covidTest => localizedValues['covidTest'][locale.languageCode]; String get covidTest => localizedValues['covidTest'][locale.languageCode];
String get driveThru => localizedValues['driveThru'][locale.languageCode]; String get driveThru => localizedValues['driveThru'][locale.languageCode];
String get NearestErDesc => localizedValues['NearestErDesc'][locale.languageCode];
String get NearestEr => localizedValues['NearestEr'][locale.languageCode];
} }

Write Preview
Loading…
Cancel
Save