Merge branch 'master_mohemm_flutter'

lib/classes/consts.dart

@@ -1,9 +1,12 @@
 import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
 
 class ApiConsts {
-  //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
+  // static String baseUrl = "http://10.200.204.11"; // Local server
   // static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
   // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
+
+  // static String baseUrl = "https://webservices.hmg.com"; // PreProd
+
   static String baseUrl = "https://hmgwebservices.com"; // Live server
   static String baseUrlServices = baseUrl + "/Services/"; // server
   // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server

lib/ui/landing/dashboard_screen.dart

@@ -183,7 +183,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
       ermIndex++;
       handleErmChannel(list);
     } catch (ex) {
-      Utils.hideLoading(context);
+      print(ex);
+      // Utils.hideLoading(context);
       // Utils.handleException(ex, context, null);
       return;
     }

lib/ui/work_list/itg_detail_screen.dart

@@ -159,7 +159,11 @@ class _ItgDetailScreenState extends State<ItgDetailScreen> {
                     });
                   },
                   children: [
-                    RequestDetailFragment(fields: itgRequest?.fieldGoups?[1].fields ?? []),
+                    RequestDetailFragment(
+                      fields: itgRequest?.fieldGoups?[1].fields ?? [],
+                      fieldGoups: itgRequest?.fieldGoups ?? [],
+                      taskID: itgRequest?.fieldGoups?[0].fields?[0].value ?? "",
+                    ),
                     ApprovalLevelfragment(
                       wFHistory: itgRequest?.wFHistory ?? [],
                       voidCallback: reloadITG,

lib/ui/work_list/itg_fragments/request_detail_fragment.dart

@@ -4,34 +4,72 @@ import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
+import 'package:mohem_flutter_app/models/itg_forms_models/field_goups_model.dart';
 import 'package:mohem_flutter_app/models/itg_forms_models/fields_model.dart';
 import 'package:mohem_flutter_app/widgets/item_detail_view_widget.dart';
 
 class RequestDetailFragment extends StatelessWidget {
   List<Fields> fields;
+  List<FieldGoups>? fieldGoups;
+  String taskID;
 
-  RequestDetailFragment({Key? key, this.fields = const <Fields>[]}) : super(key: key);
+  RequestDetailFragment({Key? key, this.fields = const <Fields>[], this.fieldGoups = const <FieldGoups>[], this.taskID = ""}) : super(key: key);
   double itemHeight = 0;
   double itemWidth = 0;
+
   @override
   Widget build(BuildContext context) {
     var size = MediaQuery.of(context).size;
     itemHeight = (size.height - kToolbarHeight - 24) / 9;
     itemWidth = size.width / 2;
-    List<Widget> uiList = [detailView()];
-    return Container(
-      width: double.infinity,
-      height: double.infinity,
-      child: fields.isEmpty
-          ? LocaleKeys.noDataAvailable.tr().toText16().center
-          : ListView(
+    List<Widget> uiList = [detailView(fields)];
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Expanded(
+          child: SingleChildScrollView(
+            child: Padding(
               padding: const EdgeInsets.all(21),
-              children: uiList,
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  SizedBox(
+                    width: double.infinity,
+                    // height: double.infinity,
+                    child: fields.isEmpty
+                        ? LocaleKeys.noDataAvailable.tr().toText16().center
+                        : ListView(
+                            shrinkWrap: true,
+                            children: uiList,
+                          ),
+                  ),
+                  12.height,
+                  if (taskID.toLowerCase().contains("vida"))
+                    Column(
+                      children: [
+                        fieldGoups![2].title!.toText14(),
+                        6.height,
+                        detailView(fieldGoups![2].fields!),
+                        12.height,
+                        fieldGoups![3].title!.toText14(),
+                        6.height,
+                        detailView(fieldGoups![3].fields!),
+                        12.height,
+                        fieldGoups![4].title!.toText14(),
+                        6.height,
+                        detailView(fieldGoups![4].fields!),
+                      ],
+                    )
+                ],
+              ),
             ),
+          ),
+        ),
+      ],
     );
   }
 
-  Widget detailView() {
+  Widget detailView(List<Fields> fields) {
     bool isOdd = false;
     if (fields.length % 2 != 0) {
       isOdd = true;
@@ -45,11 +83,12 @@ class RequestDetailFragment extends StatelessWidget {
         if (fields[index].value == null) {
           return ItemDetailViewGridItem(
             index,
-            fields[index].title, fields[index].multipleValue?.join(", ") ?? "",
+            fields[index].title,
+            fields[index].multipleValue?.join(", ") ?? "",
             isNeedToShowEmptyDivider: (fields.length == index + 1)
                 ? isOdd
-                ? true
-                : false
+                    ? true
+                    : false
                 : false,
             type: fields[index].type,
           );
@@ -60,8 +99,8 @@ class RequestDetailFragment extends StatelessWidget {
           fields[index].value ?? "",
           isNeedToShowEmptyDivider: (fields.length == index + 1)
               ? isOdd
-              ? true
-              : false
+                  ? true
+                  : false
               : false,
           type: fields[index].type,
         );

lib/widgets/bottom_sheet.dart

@@ -15,6 +15,7 @@ void showMyBottomSheet(BuildContext context, {required Widget child, required Vo
             topLeft: Radius.circular(25),
           ),
         ),
+        padding: MediaQuery.of(context).viewInsets,
         clipBehavior: Clip.antiAlias,
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,