Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'amjad_amireh' into 'master'

Browse Source 
Amjad amireh

See merge request Cloud_Solution/diplomatic-quarter!46
find_us
Mohammad Aljammal 4 years ago
parent 67713434f1 c0c175651f
commit 14bc7354f6
3 changed files with 242 additions and 240 deletions
Show Stats Download Patch File Download Diff File

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

@ -51,160 +51,160 @@ class NearestEr extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardPosition( child: Container(
text: mode child: CardPosition(
.ProjectAvgERWaitingTimeModeList[0] text: mode
.projectName .ProjectAvgERWaitingTimeModeList[0]
.toString(), .projectName
image: .toString(),
'assets/images/new-design/find_us_icon.png', image:
subText: mode 'assets/images/new-design/find_us_icon.png',
.ProjectAvgERWaitingTimeModeList[0] subText: mode
.distanceInKilometers .ProjectAvgERWaitingTimeModeList[0]
.toString(), .distanceInKilometers
type: mode .toString(),
.ProjectAvgERWaitingTimeModeList[0].iD type: mode
.toString(), .ProjectAvgERWaitingTimeModeList[0].iD
telephone: mode .toString(),
.ProjectAvgERWaitingTimeModeList[0] telephone: mode
.phoneNumber .ProjectAvgERWaitingTimeModeList[0]
.toString(), .phoneNumber
networkImage: mode .toString(),
.ProjectAvgERWaitingTimeModeList[0] networkImage: mode
.projectImageURL .ProjectAvgERWaitingTimeModeList[0]
.toString(), .projectImageURL
latitude: mode .toString(),
.ProjectAvgERWaitingTimeModeList[0] latitude: mode
.latitude, .ProjectAvgERWaitingTimeModeList[0]
longitude: mode .latitude,
.ProjectAvgERWaitingTimeModeList[0] longitude: mode
.longitude, .ProjectAvgERWaitingTimeModeList[0]
projectname: mode .longitude,
.ProjectAvgERWaitingTimeModeList[0] projectname: mode
.projectName, .ProjectAvgERWaitingTimeModeList[0]
.projectName,
),
), ),
flex: 0,
), ),
Expanded( Expanded(
child: CardPosition( child: Container(
text: mode child: CardPosition(
.ProjectAvgERWaitingTimeModeList[1] text: mode
.projectName .ProjectAvgERWaitingTimeModeList[1]
.toString(), .projectName
image: .toString(),
'assets/images/new-design/find_us_icon.png', image:
subText: mode 'assets/images/new-design/find_us_icon.png',
.ProjectAvgERWaitingTimeModeList[1] subText: mode
.distanceInKilometers .ProjectAvgERWaitingTimeModeList[1]
.toString(), .distanceInKilometers
type: mode .toString(),
.ProjectAvgERWaitingTimeModeList[1].iD type: mode
.toString(), .ProjectAvgERWaitingTimeModeList[1].iD
telephone: mode .toString(),
.ProjectAvgERWaitingTimeModeList[1] telephone: mode
.phoneNumber .ProjectAvgERWaitingTimeModeList[1]
.toString(), .phoneNumber
networkImage: mode .toString(),
.ProjectAvgERWaitingTimeModeList[1] networkImage: mode
.projectImageURL .ProjectAvgERWaitingTimeModeList[1]
.toString(), .projectImageURL
latitude: mode .toString(),
.ProjectAvgERWaitingTimeModeList[1] latitude: mode
.latitude, .ProjectAvgERWaitingTimeModeList[1]
longitude: mode .latitude,
.ProjectAvgERWaitingTimeModeList[1] longitude: mode
.longitude, .ProjectAvgERWaitingTimeModeList[1]
projectname: mode .longitude,
.ProjectAvgERWaitingTimeModeList[1] projectname: mode
.projectName, .ProjectAvgERWaitingTimeModeList[1]
.projectName,
),
), ),
flex: 0,
) )
], ],
), ),
Row( Row(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardPosition( child: Container(
// mode child: CardPosition(
// .vitalSignResModelList[
// mode.vitalSignResModelList.length - 1]
// .heightCm
// .toString()
text: mode
.ProjectAvgERWaitingTimeModeList[2]
.projectName
.toString(),
image:
'assets/images/new-design/find_us_icon.png',
subText: mode text: mode
.ProjectAvgERWaitingTimeModeList[2] .ProjectAvgERWaitingTimeModeList[2]
.distanceInKilometers .projectName
.toString(), .toString(),
type: mode image:
.ProjectAvgERWaitingTimeModeList[2].iD 'assets/images/new-design/find_us_icon.png',
.toString(),
telephone: mode subText: mode
.ProjectAvgERWaitingTimeModeList[2] .ProjectAvgERWaitingTimeModeList[2]
.phoneNumber .distanceInKilometers
.toString(), .toString(),
networkImage: mode type: mode
.ProjectAvgERWaitingTimeModeList[2] .ProjectAvgERWaitingTimeModeList[2].iD
.projectImageURL .toString(),
.toString(), telephone: mode
latitude: mode .ProjectAvgERWaitingTimeModeList[2]
.ProjectAvgERWaitingTimeModeList[2] .phoneNumber
.latitude, .toString(),
longitude: mode networkImage: mode
.ProjectAvgERWaitingTimeModeList[2] .ProjectAvgERWaitingTimeModeList[2]
.longitude, .projectImageURL
projectname: mode .toString(),
.ProjectAvgERWaitingTimeModeList[2] latitude: mode
.projectName, .ProjectAvgERWaitingTimeModeList[2]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[2]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[2]
.projectName,
),
), ),
flex: 0,
), ),
Expanded( Expanded(
child: CardPosition( child: Container(
// mode child: CardPosition(
// .vitalSignResModelList[
// mode.vitalSignResModelList.length - 1] text: mode
// .heightCm .ProjectAvgERWaitingTimeModeList[3]
// .toString() .projectName
text: mode .toString(),
.ProjectAvgERWaitingTimeModeList[3] image:
.projectName 'assets/images/new-design/find_us_icon.png',
.toString(),
image:
'assets/images/new-design/find_us_icon.png',
subText: mode subText: mode
.ProjectAvgERWaitingTimeModeList[3] .ProjectAvgERWaitingTimeModeList[3]
.distanceInKilometers .distanceInKilometers
.toString(), .toString(),
type: mode type: mode
.ProjectAvgERWaitingTimeModeList[3].iD .ProjectAvgERWaitingTimeModeList[3].iD
.toString(), .toString(),
telephone: mode telephone: mode
.ProjectAvgERWaitingTimeModeList[3] .ProjectAvgERWaitingTimeModeList[3]
.phoneNumber .phoneNumber
.toString(), .toString(),
networkImage: mode networkImage: mode
.ProjectAvgERWaitingTimeModeList[3] .ProjectAvgERWaitingTimeModeList[3]
.projectImageURL .projectImageURL
.toString(), .toString(),
latitude: mode latitude: mode
.ProjectAvgERWaitingTimeModeList[3] .ProjectAvgERWaitingTimeModeList[3]
.latitude, .latitude,
longitude: mode longitude: mode
.ProjectAvgERWaitingTimeModeList[3] .ProjectAvgERWaitingTimeModeList[3]
.longitude, .longitude,
projectname: mode projectname: mode
.ProjectAvgERWaitingTimeModeList[3] .ProjectAvgERWaitingTimeModeList[3]
.projectName, .projectName,
),
), ),
flex: 0, flex: 0,
) )
@ -215,80 +215,80 @@ class NearestEr extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardPosition( child: Container(
// mode child: CardPosition(
// .vitalSignResModelList[
// mode.vitalSignResModelList.length - 1]
// .heightCm
// .toString()
text: mode
.ProjectAvgERWaitingTimeModeList[4]
.projectName
.toString(),
image:
'assets/images/new-design/find_us_icon.png',
subText: mode text: mode
.ProjectAvgERWaitingTimeModeList[4] .ProjectAvgERWaitingTimeModeList[4]
.distanceInKilometers .projectName
.toString(), .toString(),
type: mode image:
.ProjectAvgERWaitingTimeModeList[4].iD 'assets/images/new-design/find_us_icon.png',
.toString(),
telephone: mode subText: mode
.ProjectAvgERWaitingTimeModeList[4] .ProjectAvgERWaitingTimeModeList[4]
.phoneNumber .distanceInKilometers
.toString(), .toString(),
networkImage: mode type: mode
.ProjectAvgERWaitingTimeModeList[4] .ProjectAvgERWaitingTimeModeList[4].iD
.projectImageURL .toString(),
.toString(), telephone: mode
latitude: mode .ProjectAvgERWaitingTimeModeList[4]
.ProjectAvgERWaitingTimeModeList[4] .phoneNumber
.latitude, .toString(),
longitude: mode networkImage: mode
.ProjectAvgERWaitingTimeModeList[4] .ProjectAvgERWaitingTimeModeList[4]
.longitude, .projectImageURL
projectname: mode .toString(),
.ProjectAvgERWaitingTimeModeList[4] latitude: mode
.projectName, .ProjectAvgERWaitingTimeModeList[4]
.latitude,
longitude: mode
.ProjectAvgERWaitingTimeModeList[4]
.longitude,
projectname: mode
.ProjectAvgERWaitingTimeModeList[4]
.projectName,
),
), ),
flex: 0,
), ),
Expanded( Expanded(
child: CardPosition( child: Container(
text: mode child: CardPosition(
.ProjectAvgERWaitingTimeModeList[5] text: mode
.projectName .ProjectAvgERWaitingTimeModeList[5]
.toString(), .projectName
image: .toString(),
'assets/images/new-design/find_us_icon.png', image:
subText: mode 'assets/images/new-design/find_us_icon.png',
.ProjectAvgERWaitingTimeModeList[5] subText: mode
.distanceInKilometers .ProjectAvgERWaitingTimeModeList[5]
.toString(), .distanceInKilometers
type: mode .toString(),
.ProjectAvgERWaitingTimeModeList[5].iD type: mode
.toString(), .ProjectAvgERWaitingTimeModeList[5].iD
telephone: mode .toString(),
.ProjectAvgERWaitingTimeModeList[5] telephone: mode
.phoneNumber .ProjectAvgERWaitingTimeModeList[5]
.toString(), .phoneNumber
networkImage: mode .toString(),
.ProjectAvgERWaitingTimeModeList[5] networkImage: mode
.projectImageURL .ProjectAvgERWaitingTimeModeList[5]
.toString(), .projectImageURL
latitude: mode .toString(),
.ProjectAvgERWaitingTimeModeList[5] latitude: mode
.latitude, .ProjectAvgERWaitingTimeModeList[5]
longitude: mode .latitude,
.ProjectAvgERWaitingTimeModeList[5] longitude: mode
.longitude, .ProjectAvgERWaitingTimeModeList[5]
projectname: mode .longitude,
.ProjectAvgERWaitingTimeModeList[5] projectname: mode
.projectName, .ProjectAvgERWaitingTimeModeList[5]
.projectName,
),
), ),
flex: 0,
) )
], ],
), ),
@ -297,37 +297,39 @@ class NearestEr extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: CardPosition( child: Container(
text: mode child: CardPosition(
.ProjectAvgERWaitingTimeModeList[6] text: mode
.projectName .ProjectAvgERWaitingTimeModeList[6]
.toString(), .projectName
image: .toString(),
'assets/images/new-design/find_us_icon.png', image:
subText: mode 'assets/images/new-design/find_us_icon.png',
.ProjectAvgERWaitingTimeModeList[6] subText: mode
.distanceInKilometers .ProjectAvgERWaitingTimeModeList[6]
.toString(), .distanceInKilometers
type: mode .toString(),
.ProjectAvgERWaitingTimeModeList[6].iD type: mode
.toString(), .ProjectAvgERWaitingTimeModeList[6].iD
telephone: mode .toString(),
.ProjectAvgERWaitingTimeModeList[6] telephone: mode
.phoneNumber .ProjectAvgERWaitingTimeModeList[6]
.toString(), .phoneNumber
networkImage: mode .toString(),
.ProjectAvgERWaitingTimeModeList[6] networkImage: mode
.projectImageURL .ProjectAvgERWaitingTimeModeList[6]
.toString(), .projectImageURL
latitude: mode .toString(),
.ProjectAvgERWaitingTimeModeList[6] latitude: mode
.latitude, .ProjectAvgERWaitingTimeModeList[6]
longitude: mode .latitude,
.ProjectAvgERWaitingTimeModeList[6] longitude: mode
.longitude, .ProjectAvgERWaitingTimeModeList[6]
projectname: mode .longitude,
.ProjectAvgERWaitingTimeModeList[6] projectname: mode
.projectName, .ProjectAvgERWaitingTimeModeList[6]
.projectName,
),
), ),
flex: 0, flex: 0,
), ),

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

@ -40,7 +40,7 @@ class CardPosition extends StatelessWidget {
}, },
child: Container( child: Container(
width:190, width:170,
margin: EdgeInsets.fromLTRB(7.0, 7.0, 7.0, 7.0), margin: EdgeInsets.fromLTRB(7.0, 7.0, 7.0, 7.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)

2
pubspec.yaml
Unescape Escape View File

@ -35,7 +35,7 @@ dependencies:
giffy_dialog: ^1.8.0 giffy_dialog: ^1.8.0
# Flutter Html View # Flutter Html View
flutter_html: ^1.0.2 flutter_html: 1.0.2
# Native # Native
flutter_device_type: ^0.2.0 flutter_device_type: ^0.2.0

Write Preview
Loading…
Cancel
Save