code of conduct, workmen regulations added. & improvement.

lib/ui/landing/widget/services_widget.dart

@@ -49,6 +49,7 @@ class ServicesWidget extends StatelessWidget {
                             padding: const EdgeInsets.only(left: 21, right: 21, top: 13, bottom: 13),
                             scrollDirection: Axis.horizontal,
                             itemBuilder: (cxt, index) {
+
                               return AspectRatio(
                                 aspectRatio: 105 / 105,
                                 child: data.isServicesMenusLoading
@@ -118,9 +119,8 @@ class ServicesWidget extends StatelessWidget {
       Navigator.of(context).pushNamed(AppRoutes.profile);
       return;
     }
-    List<GetMenuEntriesList> menuList = pro.getMenuEntriesList?.where((element) => element.parentMenuName == menuEntry.menuName && element.menuEntryType == "FUNCTION").toList() ?? [];
+    List<GetMenuEntriesList> menuList = pro.getMenuEntriesList?.where((element) => element.parentMenuName == menuEntry.menuName && (element.menuEntryType == "FUNCTION" || element.menuEntryType == "MENU")).toList() ?? [];
     menuEntry.icon = "";
-    print(menuEntry.toJson());
     if (menuList.isEmpty) {
       if (menuEntry.requestType == "EIT") {
         Navigator.pushNamed(context, AppRoutes.dynamicScreen, arguments: DynamicListViewParams(menuEntry.prompt!, menuEntry.functionName!));

lib/ui/login/login_screen.dart

@@ -5,6 +5,7 @@ import 'package:easy_localization/src/public_ext.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:mohem_flutter_app/api/login_api_client.dart';
@@ -129,14 +130,14 @@ class _LoginScreenState extends State<LoginScreen> {
   Widget build(BuildContext context) {
     if (isAppOpenBySystem == null) {
       isAppOpenBySystem = (ModalRoute.of(context)!.settings.arguments ?? true) as bool;
-
+      if (kDebugMode) {
-      // username.text = "15153";
+        // username.text = "15444"; // Maha User
-      // password.text = "Abcd@12345";
+        username.text = "15153"; // Tamer User
+        password.text = "Abcd@12345";
+      }
       if (isAppOpenBySystem!) checkFirebaseToken();
     }
 
-    // username.text = "15444";
-
     return Scaffold(
       body: Column(
         children: [

lib/ui/my_attendance/services_menu_list_screen.dart

@@ -8,8 +8,10 @@ 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/models/dashboard/menu_entries.dart';
+import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
 import 'package:mohem_flutter_app/ui/my_attendance/dynamic_screens/dynamic_listview_screen.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
+import 'package:provider/provider.dart';
 
 class ServicesMenuListScreenParams {
   final String title;
@@ -29,10 +31,7 @@ class ServicesMenuListScreen extends StatelessWidget {
 
     return Scaffold(
       backgroundColor: Colors.white,
-      appBar: AppBarWidget(
+      appBar: AppBarWidget(context, title: servicesMenuData.title),
-        context,
-        title: servicesMenuData.title,
-      ),
       body: SizedBox(
         width: double.infinity,
         height: double.infinity,
@@ -60,8 +59,12 @@ class ServicesMenuListScreen extends StatelessWidget {
                         Navigator.pushNamed(context, AppRoutes.dynamicScreen, arguments: DynamicListViewParams(servicesMenuData.list[index].prompt!, servicesMenuData.list[index].functionName!));
                       } else {
                         if (servicesMenuData.list[index].requestType == "TERMINATION") {
-                          Navigator.pushNamed(context, AppRoutes.endEmploymentScreen, arguments: DynamicListViewParams(servicesMenuData.list[index].prompt!, servicesMenuData.list[index].functionName!));
+                          Navigator.pushNamed(context, AppRoutes.endEmploymentScreen,
-
+                              arguments: DynamicListViewParams(servicesMenuData.list[index].prompt!, servicesMenuData.list[index].functionName!));
+                        } else {
+                          var provider = Provider.of<DashboardProviderModel>(context, listen: false);
+                          List<GetMenuEntriesList> menuList = provider.getMenuEntriesList?.where((element) => element.parentMenuName == servicesMenuData.list[index].menuName).toList() ?? [];
+                          Navigator.pushNamed(context, AppRoutes.servicesMenuListScreen, arguments: ServicesMenuListScreenParams(servicesMenuData.list[index].prompt!, menuList));
                         }
                       }
                     }),

lib/ui/work_list/worklist_detail_screen.dart

@@ -168,6 +168,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
     } catch (ex) {
       Utils.hideLoading(context);
       Utils.handleException(ex, context, null);
+      setState(() {});
     }
   }
 

lib/ui/work_list/worklist_fragments/request_fragment.dart

@@ -1,7 +1,9 @@
 import 'package:easy_localization/src/public_ext.dart';
+import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 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/get_item_creation_ntf_body_list_model.dart';
@@ -39,10 +41,13 @@ class RequestFragment extends StatelessWidget {
   }
 
   Widget poLinesDataView() {
-    return ListView.separated(
+    return ExpandableNotifier(
+      child: ListView.separated(
           shrinkWrap: true,
           physics: const NeverScrollableScrollPhysics(),
-        itemBuilder: (cxt, index) => Column(
+          itemBuilder: (cxt, index) => ExpandablePanel(
+                header: poLinesList[index].iTEMDESCRIPTION!.toText14(),
+                collapsed: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   mainAxisSize: MainAxisSize.min,
                   children: [
@@ -96,9 +101,12 @@ class RequestFragment extends StatelessWidget {
                       ],
                     )
                   ],
-            ).objectContainerView(title: poLinesList[index].iTEMDESCRIPTION!),
+                ),
+                expanded: const SizedBox(),
+              ).objectContainerView(),
           separatorBuilder: (cxt, index) => 12.height,
-        itemCount: poLinesList.length);
+          itemCount: poLinesList.length),
+    );
   }
 
   Widget moNotificationDataView() {

pubspec.yaml

@@ -77,6 +77,7 @@ dependencies:
   flutter_rating_bar: ^4.0.1
   auto_size_text: ^3.0.0
   pull_to_refresh: ^2.0.0
+  expandable: ^5.0.1
 
   #Chat
   signalr_netcore: ^1.3.3