Merge branch 'amjad_amireh' into 'master'

Amjad amireh

See merge request Cloud_Solution/diplomatic-quarter!46

lib/pages/ErService/NearestEr.dart

@@ -51,6 +51,7 @@ class NearestEr extends StatelessWidget {
                               mainAxisAlignment: MainAxisAlignment.center,
                               children: <Widget>[
                                 Expanded(
+                                  child: Container(
                                     child: CardPosition(
                                       text: mode
                                           .ProjectAvgERWaitingTimeModeList[0]
@@ -83,9 +84,11 @@ class NearestEr extends StatelessWidget {
                                           .ProjectAvgERWaitingTimeModeList[0]
                                           .projectName,
                                     ),
-                                  flex: 0,
+                                  ),
+
                                 ),
                                 Expanded(
+                                  child: Container(
                                     child: CardPosition(
                                       text: mode
                                           .ProjectAvgERWaitingTimeModeList[1]
@@ -118,21 +121,19 @@ class NearestEr extends StatelessWidget {
                                           .ProjectAvgERWaitingTimeModeList[1]
                                           .projectName,
                                     ),
-                                  flex: 0,
+                                  ),
+
                                 )
                               ],
                             ),
                             Row(
-                              mainAxisSize: MainAxisSize.max,
+                              mainAxisSize: MainAxisSize.min,
                               mainAxisAlignment: MainAxisAlignment.center,
                               children: <Widget>[
                                 Expanded(
+                                  child: Container(
                                     child: CardPosition(
-//                              mode
-//                                  .vitalSignResModelList[
-//                              mode.vitalSignResModelList.length - 1]
-//                                  .heightCm
-//                                  .toString()
+
                                       text: mode
                                           .ProjectAvgERWaitingTimeModeList[2]
                                           .projectName
@@ -165,15 +166,13 @@ class NearestEr extends StatelessWidget {
                                           .ProjectAvgERWaitingTimeModeList[2]
                                           .projectName,
                                     ),
-                                  flex: 0,
+                                  ),
+
                                 ),
                                 Expanded(
+                                  child: Container(
                                     child: CardPosition(
-//                              mode
-//                                  .vitalSignResModelList[
-//                              mode.vitalSignResModelList.length - 1]
-//                                  .heightCm
-//                                  .toString()
+
                                       text: mode
                                           .ProjectAvgERWaitingTimeModeList[3]
                                           .projectName
@@ -206,6 +205,7 @@ class NearestEr extends StatelessWidget {
                                           .ProjectAvgERWaitingTimeModeList[3]
                                           .projectName,
                                     ),
+                                  ),
                                   flex: 0,
                                 )
                               ],
@@ -215,12 +215,9 @@ class NearestEr extends StatelessWidget {
                               mainAxisAlignment: MainAxisAlignment.center,
                               children: <Widget>[
                                 Expanded(
+                                  child: Container(
                                     child: CardPosition(
-//                              mode
-//                                  .vitalSignResModelList[
-//                              mode.vitalSignResModelList.length - 1]
-//                                  .heightCm
-//                                  .toString()
+
                                       text: mode
                                           .ProjectAvgERWaitingTimeModeList[4]
                                           .projectName
@@ -253,9 +250,11 @@ class NearestEr extends StatelessWidget {
                                           .ProjectAvgERWaitingTimeModeList[4]
                                           .projectName,
                                     ),
-                                  flex: 0,
+                                  ),
+
                                 ),
                                 Expanded(
+                                  child: Container(
                                     child: CardPosition(
                                       text: mode
                                           .ProjectAvgERWaitingTimeModeList[5]
@@ -288,7 +287,8 @@ class NearestEr extends StatelessWidget {
                                           .ProjectAvgERWaitingTimeModeList[5]
                                           .projectName,
                                     ),
-                                  flex: 0,
+                                  ),
+
                                 )
                               ],
                             ),
@@ -297,6 +297,7 @@ class NearestEr extends StatelessWidget {
                               mainAxisAlignment: MainAxisAlignment.center,
                               children: <Widget>[
                                 Expanded(
+                                  child: Container(
                                     child: CardPosition(
                                       text: mode
                                           .ProjectAvgERWaitingTimeModeList[6]
@@ -329,6 +330,7 @@ class NearestEr extends StatelessWidget {
                                           .ProjectAvgERWaitingTimeModeList[6]
                                           .projectName,
                                     ),
+                                  ),
                                   flex: 0,
                                 ),
                               ],

lib/pages/ErService/widgets/card_position.dart

@@ -40,7 +40,7 @@ class CardPosition extends StatelessWidget {
 
       },
       child: Container(
-        width:190,
+        width:170,
         margin: EdgeInsets.fromLTRB(7.0, 7.0, 7.0, 7.0),
         decoration: BoxDecoration(boxShadow: [
           BoxShadow(color: Colors.grey[400], blurRadius: 2.0, spreadRadius: 0.0)

pubspec.yaml

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