lib/controllers/providers/api/user_provider.dart

@@ -68,13 +68,7 @@ class UserProvider extends ChangeNotifier {
 
   List<ModulesPermissionsModel> get modulesPermissionsList => _modulesPermissionsModel;
 
-  ModulesPermissionsModel? currentModelPermission(int moduleId) {
+  ModulesPermissionsModel currentModelPermission(int moduleId) => ModulesPermissionsModel.fromJson(_modulesPermissionsModel.singleWhere((module) => module.module!.value == moduleId).toJson());
-    try {
-      return ModulesPermissionsModel.fromJson(_modulesPermissionsModel.singleWhere((module) => module.module!.value == moduleId).toJson());
-    } catch (ex) {
-      return null;
-    }
-  }
 
   set swipeHistory(List<SwipeHistory> value) {
     _swipeHistory = value;

lib/main.dart

@@ -68,7 +68,6 @@ import 'package:test_sa/modules/applicationDemo/providers/application_demo_reque
 import 'package:test_sa/modules/applicationDemo/screens/application_demo_request_form_screen.dart';
 import 'package:test_sa/modules/tm_module/gas_refill/create_gas_refill_request.dart';
 import 'package:test_sa/modules/tm_module/gas_refill/update_gas_refill_request.dart';
-import 'package:test_sa/modules/traf_module/traf_request_provider.dart';
 import 'package:test_sa/new_views/app_style/app_themes.dart';
 import 'package:test_sa/new_views/pages/help_center_page.dart';
 import 'package:test_sa/new_views/pages/land_page/land_page.dart';
@@ -333,7 +332,6 @@ class MyApp extends StatelessWidget {
         ChangeNotifierProvider(create: (_) => LoanProvider(), lazy: true),
         ChangeNotifierProvider(create: (_) => LoanPeriodProvider(), lazy: true),
         ChangeNotifierProvider(create: (_) => DemoProvider(), lazy: true),
-        ChangeNotifierProvider(create: (_) => TrafRequestProvider(), lazy: true),
 
         // MEDICAL GAS INSPECTION PROVIDERS (4)
         ChangeNotifierProvider(create: (_) => MedicalGasOrderTypeProvider(), lazy: true),

lib/modules/incident_module/incident_detail_page.dart

@@ -33,51 +33,49 @@ class IncidentDetailPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
         appBar: const DefaultAppBar(title: "Request Details"),
-        body: SafeArea(
+        body: FutureBuilder<IncidentDataModel?>(
-          child: FutureBuilder<IncidentDataModel?>(
+            future: Provider.of<IncidentProvider>(context, listen: false).getIncidentById(incidentId),
-              future: Provider.of<IncidentProvider>(context, listen: false).getIncidentById(incidentId),
+            builder: (BuildContext context, AsyncSnapshot<IncidentDataModel?> snapshot) {
-              builder: (BuildContext context, AsyncSnapshot<IncidentDataModel?> snapshot) {
+              if (snapshot.connectionState == ConnectionState.waiting) return CircularProgressIndicator(color: AppColor.loadingColor(context)).center;
-                if (snapshot.connectionState == ConnectionState.waiting) return CircularProgressIndicator(color: AppColor.loadingColor(context)).center;
+              if (snapshot.data == null) return const NoDataFound().center;
-                if (snapshot.data == null) return const NoDataFound().center;
 
-                List<IncidentAttachments> allAttachments = snapshot.data!.incidentAttachments!;
+              List<IncidentAttachments> allAttachments = snapshot.data!.incidentAttachments!;
 
-                return SingleChildScrollView(
+              return SingleChildScrollView(
-                  padding: const EdgeInsets.all(16),
+                padding: const EdgeInsets.all(16),
-                  child: Column(
+                child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
+                  crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
+                  children: [
-                      Row(
+                    Row(
-                        crossAxisAlignment: CrossAxisAlignment.start,
+                      crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
+                      children: [
-                          StatusLabel(
+                        StatusLabel(
-                            label: snapshot.data!.incidentStatusName!,
+                          label: snapshot.data!.incidentStatusName!,
-                            textColor: AppColor.getRequestStatusTextColorByName(context, snapshot.data!.incidentStatusName!),
+                          textColor: AppColor.getRequestStatusTextColorByName(context, snapshot.data!.incidentStatusName!),
-                            backgroundColor: AppColor.getRequestStatusColorByName(context, snapshot.data!.incidentStatusName!),
+                          backgroundColor: AppColor.getRequestStatusColorByName(context, snapshot.data!.incidentStatusName!),
-                          ),
+                        ),
-                          1.width.expanded,
+                        1.width.expanded,
-                          InfoDateWidget(snapshot.data!.createdDate?.toString() ?? ""),
+                        InfoDateWidget(snapshot.data!.createdDate?.toString() ?? ""),
-                        ],
-                      ),
-                      // 12.height,
-                      ...requesterDetails(context, snapshot.data!),
-                      const Divider().defaultStyle(context),
-                      ...requestDetails(context, snapshot.data!),
-                      if (snapshot.data!.ovrTicketNumber?.isNotEmpty ?? false) ovrInformation(context, snapshot.data!.ovrTicketNumber!),
-                      const Divider().defaultStyle(context),
-                      ...assetDetails(context, snapshot.data!),
-                      const Divider().defaultStyle(context),
-                      ...personInvolvedDetails(context, snapshot.data!),
-                      if (allAttachments.isNotEmpty) ...[
-                        const Divider().defaultStyle(context),
-                        InfoHeader16Widget("Attachments".addTranslation),
-                        FilesList(images: allAttachments.map((e) => URLs.getFileUrl(e.attachmentName ?? '') ?? '').toList() ?? []),
                       ],
+                    ),
+                    // 12.height,
+                    ...requesterDetails(context, snapshot.data!),
+                    const Divider().defaultStyle(context),
+                    ...requestDetails(context, snapshot.data!),
+                    if (snapshot.data!.ovrTicketNumber?.isNotEmpty ?? false) ovrInformation(context, snapshot.data!.ovrTicketNumber!),
+                    const Divider().defaultStyle(context),
+                    ...assetDetails(context, snapshot.data!),
+                    const Divider().defaultStyle(context),
+                    ...personInvolvedDetails(context, snapshot.data!),
+                    if (allAttachments.isNotEmpty) ...[
+                      const Divider().defaultStyle(context),
+                      InfoHeader16Widget("Attachments".addTranslation),
+                      FilesList(images: allAttachments.map((e) => URLs.getFileUrl(e.attachmentName ?? '') ?? '').toList() ?? []),
                     ],
-                  ).toShadowContainer(context),
+                  ],
-                );
+                ).toShadowContainer(context),
-              }),
+              );
-        ));
+            }));
   }
 
   List<Widget> requestDetails(BuildContext context, IncidentDataModel incidentData) {

lib/modules/traf_module/traf_request_detail_page.dart

@@ -67,32 +67,30 @@ class _TrafRequestDetailPageState extends State<TrafRequestDetailPage> {
             }
             return trafProvider.trafRequestDataModel == null
                 ? const NoDataFound().center
-                : SafeArea(
+                : Column(
-                  child: Column(
+                    children: [
-                      children: [
+                      ListView(
-                        ListView(
+                        padding: const EdgeInsets.all(16),
-                          padding: const EdgeInsets.all(16),
+                        children: [
-                          children: [
+                          requesterInformation(trafProvider.trafRequestDataModel!),
-                            requesterInformation(trafProvider.trafRequestDataModel!),
+                          12.height,
-                            12.height,
+                          requestInformation(trafProvider.trafRequestDataModel!),
-                            requestInformation(trafProvider.trafRequestDataModel!),
+                          12.height,
-                            12.height,
+                          assetInformation(trafProvider.trafRequestDataModel!),
-                            assetInformation(trafProvider.trafRequestDataModel!),
+                        ],
-                          ],
+                      ).expanded,
-                        ).expanded,
+                      // // if (isEngineer)
-                        // // if (isEngineer)
+                      // FooterActionButton.footerContainer(
-                        // FooterActionButton.footerContainer(
+                      //   context: context,
-                        //   context: context,
+                      //   child: AppFilledButton(
-                        //   child: AppFilledButton(
+                      //       buttonColor: AppColor.primary10,
-                        //       buttonColor: AppColor.primary10,
+                      //       label: "Update",
-                        //       label: "Update",
+                      //       onPressed: () {
-                        //       onPressed: () {
+                      //         Navigator.pushNamed(context, UpdateTrafRequestPage.id);
-                        //         Navigator.pushNamed(context, UpdateTrafRequestPage.id);
+                      //       }),
-                        //       }),
+                      // ),
-                        // ),
+                    ],
-                      ],
+                  );
-                    ),
-                );
           },
         ));
   }

lib/new_views/app_style/app_color.dart

@@ -215,8 +215,6 @@ class AppColor {
         return redStatusTextColor;
       case "request completed":
         return greenStatusTextColor;
-      case "complete":
-        return greenStatusTextColor;
       case "low priority":
         return greenStatusTextColor;
       case "low":

lib/new_views/common_widgets/single_item_drop_down_menu.dart

@@ -263,9 +263,9 @@ class _SingleItemDropDownMenuState<T extends Base, X extends LoadingListNotifier
                                 isExpanded: true,
                                 hint: Text(
                                   isEmpty || widget.enabled == false ? context.translation.noDataFound : context.translation.select,
-                                  style: AppTextStyles.bodyText.copyWith(color: AppColor.textStyleColor(context)),
+                                  style: AppTextStyles.heading5.copyWith(color: AppColor.textStyleColor(context)),
                                 ),
-                                // style: TextStyle(color: Theme.of(context).primaryColor, fontSize: 12),
+                                style: TextStyle(color: Theme.of(context).primaryColor, fontSize: 12),
                                 underline: const SizedBox.shrink(),
                                 onChanged: (widget.enabled == false || widget.showAsBottomSheet || widget.showAsFullScreenDialog)
                                     ? null
@@ -284,7 +284,7 @@ class _SingleItemDropDownMenuState<T extends Base, X extends LoadingListNotifier
                                     child: Text(value.name ?? "", // Null-aware operator for value.name
                                         maxLines: 1,
                                         overflow: TextOverflow.ellipsis,
-                                        style: AppTextStyles.bodyText.copyWith(color: AppColor.textStyleColor(context))
+                                        style: AppTextStyles.heading5.copyWith(color: AppColor.textStyleColor(context))
                                         //  Theme.of(context).textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.white10 : AppColor.black10),
                                         ),
                                   );

lib/views/pages/user/profile_page.dart

@@ -140,9 +140,10 @@ class _ProfilePageState extends State<ProfilePage> {
                         }),
                         8.height,
                         Text(
-                          (_user.username ?? ""),
+                          "Work Order Status".addTranslation,
-                          style: AppTextStyles.heading3.copyWith(fontWeight: FontWeight.w600, color: AppColor.headingTextColor(context)),
+                          style: AppTextStyles.heading3.copyWith(color: AppColor.headingTextColor(context)),
                         ),
+                        (_user.username ?? "").heading3(context).custom(fontWeight: FontWeight.w600, color: context.isDark ? AppColor.neutral10 : AppColor.neutral50),
                       ],
                     ),
                   ),