Merge remote-tracking branch 'origin/design_3.0_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes

# Conflicts:
#	lib/new_views/pages/land_page/create_request-type_bottomsheet.dart

lib/new_views/pages/land_page/create_request-type_bottomsheet.dart

@@ -15,6 +15,8 @@ class CreateRequestTypeBottomSheet extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    List<CreateRequestModel> requestList = CreateRequestModel.requestsList(context, isEngineer);
+
     return Container(
       padding: const EdgeInsets.all(16.0),
       width: double.infinity,
@@ -23,61 +25,23 @@ class CreateRequestTypeBottomSheet extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           context.translation.selectWorkOrder.heading4(context),
-          16.height,
-          isEngineer
-              ? SizedBox(
-                  // width: double.infinity,
-                  child: listCard(
-                    context: context,
-                    icon: 'add_icon',
-                    label: context.translation.task,
-                    onTap: () async {
-                      Navigator.pushReplacementNamed(context, CreateTaskView.id);
-                    },
-                  ),
-                )
-              : GridView(
-                  padding: EdgeInsets.all(0),
-                  shrinkWrap: true,
-                  physics: const NeverScrollableScrollPhysics(),
-                  gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 1, crossAxisSpacing: 16, mainAxisSpacing: 16),
-                  children: <Widget>[
-                    listCard(
-                      context: context,
-                      icon: 'add_icon',
-                      label: context.translation.correctiveMaintenance,
-                      onTap: () {
-                        Navigator.pushReplacementNamed(context, CreateNewRequest.id);
-                      },
-                    ),
-                    listCard(
-                      context: context,
-                      icon: 'add_icon',
-                      label: context.translation.gasRefill,
-                      onTap: () {
-                        //NewGasRefillRequestPage.routeName)
-                        Navigator.pushReplacementNamed(context, GasRefillRequestForm.routeName);
-                      },
-                    ),
-                    listCard(
-                      context: context,
-                      icon: 'add_icon',
-                      label: context.translation.deviceTransfer,
-                      onTap: () async {
-                        Navigator.pushReplacementNamed(context, CreateDeviceTransferRequest.id);
-                      },
-                    ),
-                    listCard(
-                      context: context,
-                      icon: 'add_icon',
-                      label: context.translation.task,
-                      onTap: () async {
-                        Navigator.pushReplacementNamed(context, CreateTaskView.id);
-                      },
-                    ),
-                  ],
+          GridView(
+            padding: const EdgeInsets.only(top: 16, bottom: 16),
+            shrinkWrap: true,
+            physics: const NeverScrollableScrollPhysics(),
+            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 1, crossAxisSpacing: 16, mainAxisSpacing: 16),
+            children: <Widget>[
+              for (var request in requestList)
+                listCard(
+                  context: context,
+                  icon: request.icon,
+                  label: request.title,
+                  onTap: () {
+                    Navigator.pushReplacementNamed(context, request.routeName);
+                  },
                 ),
-          16.height,
+            ],
+          ),
         ],
       ),
     );
@@ -109,3 +73,24 @@ class CreateRequestTypeBottomSheet extends StatelessWidget {
     );
   }
 }
+
+class CreateRequestModel {
+  String title;
+  String icon;
+  String routeName;
+
+  CreateRequestModel(this.title, this.icon, this.routeName);
+
+  static List<CreateRequestModel> requestsList(BuildContext context, bool isEngineer) {
+    List<CreateRequestModel> list = [];
+    if (isEngineer) {
+      list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id));
+    } else {
+      list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateNewRequest.id));
+      list.add(CreateRequestModel(context.translation.gasRefill, "add_icon", GasRefillRequestForm.routeName));
+      list.add(CreateRequestModel(context.translation.deviceTransfer, "add_icon", CreateDeviceTransferRequest.id));
+      list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id));
+    }
+    return list;
+  }
+}