merge-update-with-lab-changes
Mohammad Aljammal 6 years ago
parent 20f9f6f06c
commit f534f8a348

@ -55,11 +55,11 @@ class NearestEr extends StatelessWidget {
child: CardPosition( child: CardPosition(
text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, text: mode.ProjectAvgERWaitingTimeModeList[0].projectName.toString(),
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, subText: mode.ProjectAvgERWaitingTimeModeList[0].distanceInKilometers.toString(),
type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, type: mode.ProjectAvgERWaitingTimeModeList[0].iD.toString(),
), ),
flex: 0, flex: 0,
@ -67,16 +67,12 @@ class NearestEr extends StatelessWidget {
Expanded( Expanded(
child: CardPosition( child: CardPosition(
// mode
// .vitalSignResModelList[ text: mode.ProjectAvgERWaitingTimeModeList[1].projectName.toString(),
// mode.vitalSignResModelList.length - 1]
// .heightCm
// .toString()
text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName,
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, subText: mode.ProjectAvgERWaitingTimeModeList[1].distanceInKilometers.toString(),
type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, type: mode.ProjectAvgERWaitingTimeModeList[1].iD.toString(),
), ),
flex: 0, flex: 0,
@ -95,11 +91,11 @@ class NearestEr extends StatelessWidget {
// mode.vitalSignResModelList.length - 1] // mode.vitalSignResModelList.length - 1]
// .heightCm // .heightCm
// .toString() // .toString()
text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, text: mode.ProjectAvgERWaitingTimeModeList[2].projectName.toString(),
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, subText: mode.ProjectAvgERWaitingTimeModeList[2].distanceInKilometers.toString(),
type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, type: mode.ProjectAvgERWaitingTimeModeList[2].iD.toString(),
), ),
flex: 0, flex: 0,
), ),
@ -111,11 +107,11 @@ class NearestEr extends StatelessWidget {
// mode.vitalSignResModelList.length - 1] // mode.vitalSignResModelList.length - 1]
// .heightCm // .heightCm
// .toString() // .toString()
text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, text: mode.ProjectAvgERWaitingTimeModeList[3].projectName.toString(),
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, subText: mode.ProjectAvgERWaitingTimeModeList[3].distanceInKilometers.toString(),
type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, type: mode.ProjectAvgERWaitingTimeModeList[3].iD.toString(),
), ),
flex: 0, flex: 0,
) )
@ -133,11 +129,11 @@ class NearestEr extends StatelessWidget {
// mode.vitalSignResModelList.length - 1] // mode.vitalSignResModelList.length - 1]
// .heightCm // .heightCm
// .toString() // .toString()
text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, text: mode.ProjectAvgERWaitingTimeModeList[4].projectName.toString(),
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, subText: mode.ProjectAvgERWaitingTimeModeList[4].distanceInKilometers.toString(),
type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, type: mode.ProjectAvgERWaitingTimeModeList[4].iD.toString(),
), ),
flex: 0, flex: 0,
), ),
@ -149,11 +145,11 @@ class NearestEr extends StatelessWidget {
// mode.vitalSignResModelList.length - 1] // mode.vitalSignResModelList.length - 1]
// .heightCm // .heightCm
// .toString() // .toString()
text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, text: mode.ProjectAvgERWaitingTimeModeList[5].projectName.toString(),
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers, subText: mode.ProjectAvgERWaitingTimeModeList[5].distanceInKilometers.toString(),
type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD, type: mode.ProjectAvgERWaitingTimeModeList[5].iD.toString(),
), ),
flex: 0, flex: 0,
@ -168,11 +164,11 @@ class NearestEr extends StatelessWidget {
child: CardPosition( child: CardPosition(
text: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].projectName, text: mode.ProjectAvgERWaitingTimeModeList[6].projectName.toString(),
image: 'assets/images/new-design/find_us_icon.png', image: 'assets/images/new-design/find_us_icon.png',
subText: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].distanceInKilometers.toString(), subText: mode.ProjectAvgERWaitingTimeModeList[6].distanceInKilometers.toString(),
type: mode.ProjectAvgERWaitingTimeModeList[mode.ProjectAvgERWaitingTimeModeList.length-1].iD.toString(), type: mode.ProjectAvgERWaitingTimeModeList[6].iD.toString(),
), ),
flex: 0, flex: 0,
), ),

@ -25,11 +25,13 @@ class CardPosition extends StatelessWidget {
print("=============this.type============="+this.type); print("=============this.type============="+this.type);
}, },
child: Container( child: Container(
width:190,
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)
], 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(
@ -62,10 +64,7 @@ class CardPosition extends StatelessWidget {
Future navigateToSearch(context, type) async { Future navigateToSearch(context, type) async {
//===Switch case=== //===Switch case===
if(type==0) print("================"+type);
{print("========Ambalunce=========");}
else{
print("=========Nearest ER===========");
// Navigator.push( // Navigator.push(
// context, // context,
@ -75,5 +74,5 @@ class CardPosition extends StatelessWidget {
} }
} }
}

Loading…
Cancel
Save