Merge branch 'new_design_sikander' into development_new_design_2.0

# Conflicts:
#	lib/widgets/hospital_location.dart
merge-update-with-lab-changes
Sikander Saleem 4 years ago
commit 7641da8122

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

@ -1,8 +1,10 @@
import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart';
import 'package:diplomaticquarterapp/core/model/er/projectavgerwaitingtime.dart'; import 'package:diplomaticquarterapp/core/model/er/projectavgerwaitingtime.dart';
import 'package:diplomaticquarterapp/core/service/er/er_service.dart'; import 'package:diplomaticquarterapp/core/service/er/er_service.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart'; import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/hospital_location.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -25,7 +27,7 @@ class NearestEr extends StatefulWidget {
class _NearestErState extends State<NearestEr> { class _NearestErState extends State<NearestEr> {
List<ProjectAvgERWaitingTime> projectAvgERWaitingTimeModelList = List(); List<ProjectAvgERWaitingTime> projectAvgERWaitingTimeModelList = List();
bool isDataLoaded = false; bool isDataLoaded;
@override @override
void initState() { void initState() {
@ -45,47 +47,41 @@ class _NearestErState extends State<NearestEr> {
showNewAppBarTitle: true, showNewAppBarTitle: true,
showNewAppBar: true, showNewAppBar: true,
appBarTitle: TranslationBase.of(context).NearestEr, appBarTitle: TranslationBase.of(context).NearestEr,
body: isDataLoaded body: isDataLoaded != null
? Container( ? isDataLoaded
child: ListView( ? ListView(
children: <Widget>[ padding: EdgeInsets.all(21),
Text(TranslationBase.of(context).NearestErDesc, physics: BouncingScrollPhysics(),
textAlign: TextAlign.center, style: TextStyle(fontSize: 18.0, letterSpacing: 1.0, fontWeight: FontWeight.w900, color: new Color(0xFF60686b))), children: <Widget>[
Container( Text(
margin: EdgeInsets.fromLTRB(2.0, 10.0, 0.0, 10.0), TranslationBase.of(context).NearestErDesc,
child: GridView.count( style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64, height: 23 / 16),
crossAxisCount: 2, ),
childAspectRatio: (itemWidth / itemWidth), SizedBox(height: 21),
crossAxisSpacing: 10, ListView.separated(
mainAxisSpacing: 10, physics: NeverScrollableScrollPhysics(),
controller: new ScrollController(keepScrollOffset: false),
shrinkWrap: true, shrinkWrap: true,
padding: const EdgeInsets.all(4.0), padding: EdgeInsets.zero,
children: List.generate(projectAvgERWaitingTimeModelList.length, (index) { separatorBuilder: (context, index) => SizedBox(height: 14),
return Container( itemBuilder: (context, index) {
child: CardPosition( GetHMGLocationsModel location = GetHMGLocationsModel();
waitingTime: projectAvgERWaitingTimeModelList[index].avgTimeInHHMM.toString(), location.locationName = projectAvgERWaitingTimeModelList[index].projectName;
text: projectAvgERWaitingTimeModelList[index].projectName.toString(), location.cityName = projectAvgERWaitingTimeModelList[index].projectName;
image: 'assets/images/new-design/find_us_icon.png', location.projectImageURL = projectAvgERWaitingTimeModelList[index].projectImageURL;
subText: projectAvgERWaitingTimeModelList[index].distanceInKilometers.toString() + " " + TranslationBase.of(context).km, location.phoneNumber = projectAvgERWaitingTimeModelList[index].phoneNumber;
type: projectAvgERWaitingTimeModelList[index].iD.toString(), location.latitude = projectAvgERWaitingTimeModelList[index].latitude;
telephone: projectAvgERWaitingTimeModelList[index].phoneNumber.toString(), location.longitude = projectAvgERWaitingTimeModelList[index].longitude;
networkImage: projectAvgERWaitingTimeModelList[index].projectImageURL.toString(), location.distanceInKilometers = projectAvgERWaitingTimeModelList[index].distanceInKilometers;
latitude: projectAvgERWaitingTimeModelList[index].latitude, return HospitalLocation(location, waitingTime: projectAvgERWaitingTimeModelList[index].avgTimeInHHMM.toString());
longitude: projectAvgERWaitingTimeModelList[index].longitude, },
projectname: projectAvgERWaitingTimeModelList[index].projectName, itemCount: projectAvgERWaitingTimeModelList.length,
cardSize: itemWidth,
),
);
}),
), ),
), ],
], )
), : Center(
) child: Texts('No Data'),
: Center( )
child: Texts('No Data'), : SizedBox(),
),
); );
} }

@ -14,8 +14,9 @@ import 'my_rich_text.dart';
class HospitalLocation extends StatelessWidget { class HospitalLocation extends StatelessWidget {
final GetHMGLocationsModel location; final GetHMGLocationsModel location;
final bool showCity; final bool showCity;
final String waitingTime;
HospitalLocation(this.location, {Key key, this.showCity = false}) : super(key: key); HospitalLocation(this.location, {Key key, this.showCity = false, this.waitingTime}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -49,8 +50,13 @@ class HospitalLocation extends StatelessWidget {
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
LargeAvatar(url: location?.projectImageURL?.toString() ?? 'https://hmgwebservices.com/Images/Hospitals/15.jpg',width: 48,height: 48, name: "",), LargeAvatar(
name: "",
url: location?.projectImageURL?.toString() ?? 'https://hmgwebservices.com/Images/Hospitals/15.jpg',
width: 48,
height: 48,
radius: 30,
),
SizedBox(width: 10), SizedBox(width: 10),
Expanded( Expanded(
child: Column( child: Column(
@ -58,6 +64,7 @@ class HospitalLocation extends StatelessWidget {
children: [ children: [
if (showCity) MyRichText(TranslationBase.of(context).city + ":", location.cityName?.trim().toString(), projectViewModel.isArabic), if (showCity) MyRichText(TranslationBase.of(context).city + ":", location.cityName?.trim().toString(), projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).distance + ":", location.distanceInKilometers.toString() + " " + TranslationBase.of(context).km_ ?? "", projectViewModel.isArabic), MyRichText(TranslationBase.of(context).distance + ":", location.distanceInKilometers.toString() + " " + TranslationBase.of(context).km_ ?? "", projectViewModel.isArabic),
if (waitingTime != null) MyRichText(TranslationBase.of(context).waitingTime, waitingTime, projectViewModel.isArabic),
], ],
), ),
) )

Loading…
Cancel
Save