From 6bf9f22af40cfbd5be17ae710b9e31390b61db4e Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikandersaleem.cloudsolutions@gmail.com>
Date: Thu, 22 May 2025 16:20:16 +0300
Subject: [PATCH] improvements

---
 .../service_request/service_request.dart      |  2 +-
 .../views/nurse/create_new_request_view.dart  | 74 +++++++++----------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/lib/models/service_request/service_request.dart b/lib/models/service_request/service_request.dart
index 9cc05c19..e2de1b54 100644
--- a/lib/models/service_request/service_request.dart
+++ b/lib/models/service_request/service_request.dart
@@ -162,7 +162,7 @@ class ServiceRequest {
     if (device == null) {
       await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.device}");
       return false;
-    } else if (priority == null) {
+    } else if (priority == null && !context.settingProvider.isUserFMS) {
       await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.priority}");
       return false;
     } else if (defectType == null) {
diff --git a/lib/modules/cm_module/views/nurse/create_new_request_view.dart b/lib/modules/cm_module/views/nurse/create_new_request_view.dart
index 776b2a2b..6c276072 100644
--- a/lib/modules/cm_module/views/nurse/create_new_request_view.dart
+++ b/lib/modules/cm_module/views/nurse/create_new_request_view.dart
@@ -86,7 +86,7 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
 
   Future<void> getInitialData() async {
     WidgetsBinding.instance.addPostFrameCallback((_) async {
-      if(Provider.of<SettingProvider>(context, listen: false).showPriority) {
+      if (Provider.of<SettingProvider>(context, listen: false).showPriority) {
         await Provider.of<PriorityProvider>(context, listen: false).getDate();
       }
 
@@ -125,45 +125,45 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
               child: Column(
                 children: [
                   SingleChildScrollView(
+                    padding: const EdgeInsets.all(16),
                     child: Column(
                       children: [
-                        Card(
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              scanAssetButton(),
-                              if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) ...[
-                                8.height,
-                                Row(
-                                  children: [
-                                    const Icon(Icons.warning, color: Color(0xffEE404C), size: 14),
-                                    8.width,
-                                    Text(
-                                      "This asset already have ${pendingAssetServiceRequest!.details!.length} request pending",
-                                      style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500, color: Color(0xff7D859A), decoration: TextDecoration.underline),
-                                    ).expanded,
-                                  ],
-                                ).onPress(() {
-                                  showPendingRequests();
-                                }),
-                              ],
-                              if (Provider.of<SettingProvider>(context, listen: false).showPriority) ...[
-                                16.height,
-                                highPriorityWidget(),
-                              ],
+                        Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            scanAssetButton(),
+                            if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) ...[
+                              8.height,
+                              Row(
+                                children: [
+                                  const Icon(Icons.warning, color: Color(0xffEE404C), size: 14),
+                                  8.width,
+                                  Text(
+                                    "This asset already have ${pendingAssetServiceRequest!.details!.length} request pending",
+                                    style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500, color: Color(0xff7D859A), decoration: TextDecoration.underline),
+                                  ).expanded,
+                                ],
+                              ).onPress(() {
+                                showPendingRequests();
+                              }),
+                            ],
+                            if (Provider.of<SettingProvider>(context, listen: false).showPriority) ...[
                               16.height,
-                              assetStatusWidget(context),
-                              24.height,
-                              MultiFilesPicker(
-                                label: context.translation.attachImage,
-                                files: _deviceImages,
-                                buttonColor: AppColor.black10,
-                                onlyImages: false,
-                                buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120),
-                              ),
+                              highPriorityWidget(),
                             ],
-                          ).paddingOnly(start: 13, end: 13, top: 15, bottom: 16),
-                        ).paddingAll(16),
+                            16.height,
+                            assetStatusWidget(context),
+                            24.height,
+                            MultiFilesPicker(
+                              label: context.translation.attachImage,
+                              files: _deviceImages,
+                              buttonColor: AppColor.black10,
+                              onlyImages: false,
+                              buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120),
+                            ),
+                          ],
+                        ).paddingAll(0).toShadowContainer(context),
+                        16.height,
                         commentWidget(serviceRequest: _serviceRequest),
                       ],
                     ),
@@ -293,7 +293,7 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
         serviceRequest?.audio = audio;
       },
       enabled: serviceRequest == null ? true : false,
-    ).paddingOnly(start: 16, end: 16, bottom: 16);
+    );
   }
 
   bool checkPendingRequest = false;