Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 11 Wiki Activity

improvements

Browse Source
design_3.0_task_module_new
Sikander Saleem 5 months ago
parent 2acfa82a6f
commit 6bf9f22af4
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File

2
lib/models/service_request/service_request.dart
Unescape Escape View File

@ -162,7 +162,7 @@ class ServiceRequest {
if (device == null) { if (device == null) {
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.device}"); await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.device}");
return false; return false;
} else if (priority == null) { } else if (priority == null && !context.settingProvider.isUserFMS) {
await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.priority}"); await Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.priority}");
return false; return false;
} else if (defectType == null) { } else if (defectType == null) {

74
lib/modules/cm_module/views/nurse/create_new_request_view.dart
Unescape Escape View File

@ -86,7 +86,7 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
Future<void> getInitialData() async { Future<void> getInitialData() async {
WidgetsBinding.instance.addPostFrameCallback((_) 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(); await Provider.of<PriorityProvider>(context, listen: false).getDate();
} }
@ -125,45 +125,45 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
child: Column( child: Column(
children: [ children: [
SingleChildScrollView( SingleChildScrollView(
padding: const EdgeInsets.all(16),
child: Column( child: Column(
children: [ children: [
Card( Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ scanAssetButton(),
scanAssetButton(), if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) ...[
if (pendingAssetServiceRequest != null && pendingAssetServiceRequest!.details!.isNotEmpty) ...[ 8.height,
8.height, Row(
Row( children: [
children: [ const Icon(Icons.warning, color: Color(0xffEE404C), size: 14),
const Icon(Icons.warning, color: Color(0xffEE404C), size: 14), 8.width,
8.width, Text(
Text( "This asset already have ${pendingAssetServiceRequest!.details!.length} request pending",
"This asset already have ${pendingAssetServiceRequest!.details!.length} request pending", style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500, color: Color(0xff7D859A), decoration: TextDecoration.underline),
style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500, color: Color(0xff7D859A), decoration: TextDecoration.underline), ).expanded,
).expanded, ],
], ).onPress(() {
).onPress(() { showPendingRequests();
showPendingRequests(); }),
}), ],
], if (Provider.of<SettingProvider>(context, listen: false).showPriority) ...[
if (Provider.of<SettingProvider>(context, listen: false).showPriority) ...[
16.height,
highPriorityWidget(),
],
16.height, 16.height,
assetStatusWidget(context), highPriorityWidget(),
24.height,
MultiFilesPicker(
label: context.translation.attachImage,
files: _deviceImages,
buttonColor: AppColor.black10,
onlyImages: false,
buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120),
),
], ],
).paddingOnly(start: 13, end: 13, top: 15, bottom: 16), 16.height,
).paddingAll(16), 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), commentWidget(serviceRequest: _serviceRequest),
], ],
), ),
@ -293,7 +293,7 @@ class _CreateNewRequestState extends State<CreateNewRequest> with TickerProvider
serviceRequest?.audio = audio; serviceRequest?.audio = audio;
}, },
enabled: serviceRequest == null ? true : false, enabled: serviceRequest == null ? true : false,
).paddingOnly(start: 16, end: 16, bottom: 16); );
} }
bool checkPendingRequest = false; bool checkPendingRequest = false;

Write Preview
Loading…
Cancel
Save