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

ui fixes

Browse Source
design_3.0_TM_Module_snagsFix
Sikander Saleem 3 months ago
parent 1edcea47be
commit c4efbba6a8
4 changed files with 151 additions and 155 deletions
Show Stats Download Patch File Download Diff File

152
lib/modules/cm_module/views/forms/asset_retired/asset_retired.dart
Unescape Escape View File

@ -60,84 +60,82 @@ class _AssetRetiredState extends State<AssetRetired> with TickerProviderStateMix
key: _scaffoldKey, key: _scaffoldKey,
appBar: DefaultAppBar(title: context.translation.assetToBeRetired), appBar: DefaultAppBar(title: context.translation.assetToBeRetired),
body: Consumer<ServiceRequestDetailProvider>(builder: (context, ServiceRequestDetailProvider requestDetailProvider, child) { body: Consumer<ServiceRequestDetailProvider>(builder: (context, ServiceRequestDetailProvider requestDetailProvider, child) {
return SafeArea( return LoadingManager(
child: LoadingManager( isLoading: _isLoading,
isLoading: _isLoading, isFailedLoading: false,
isFailedLoading: false, stateCode: 200,
stateCode: 200, onRefresh: () async {},
onRefresh: () async {}, child: Form(
child: Form( key: _formKey,
key: _formKey, child: Column(
child: Column( children: [
children: [ SingleChildScrollView(
SingleChildScrollView( child: Card(
child: Card( child: Column(
child: Column( children: [
children: [ SingleItemDropDownMenu<Lookup, RetirementTypeProvider>(
SingleItemDropDownMenu<Lookup, RetirementTypeProvider>( context: context,
context: context, title: context.translation.retirementType,
title: context.translation.retirementType, backgroundColor: AppColor.fieldBgColor(context),
backgroundColor: AppColor.fieldBgColor(context), showAsBottomSheet: true,
showAsBottomSheet: true, height: 56.toScreenHeight,
height: 56.toScreenHeight, showShadow: false,
showShadow: false, initialValue: requestDetailProvider.assetRetiredHelperModel?.retirmentReason,
initialValue: requestDetailProvider.assetRetiredHelperModel?.retirmentReason, onSelect: (value) {
onSelect: (value) { if (value != null) {
if (value != null) { requestDetailProvider.assetRetiredHelperModel?.retirmentReason = value;
requestDetailProvider.assetRetiredHelperModel?.retirmentReason = value; setState(() {});
setState(() {}); }
} },
}, ),
), 8.height,
8.height, AppTextFormField(
AppTextFormField( labelText: context.translation.comments,
labelText: context.translation.comments, textInputType: TextInputType.multiline,
textInputType: TextInputType.multiline, showWithoutDecoration: true,
showWithoutDecoration: true, labelStyle: AppTextStyles.textFieldLabelStyle,
labelStyle: AppTextStyles.textFieldLabelStyle, backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral100,
backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral100, alignLabelWithHint: true,
alignLabelWithHint: true, onChange: (text) {
onChange: (text) { requestDetailProvider.assetRetiredHelperModel?.retirementComment = text;
requestDetailProvider.assetRetiredHelperModel?.retirementComment = text; },
}, onSaved: (text) {
onSaved: (text) { requestDetailProvider.assetRetiredHelperModel?.retirementComment = text;
requestDetailProvider.assetRetiredHelperModel?.retirementComment = text; },
}, ),
), 23.height,
23.height, AttachmentPicker(
AttachmentPicker( label: context.translation.attachFiles,
label: context.translation.attachFiles, attachment: attachments,
attachment: attachments, buttonIcon: 'image-plus'.toSvgAsset(),
buttonIcon: 'image-plus'.toSvgAsset(), ),
), ],
], ).paddingOnly(start: 13, end: 13, top: 14, bottom: 16),
).paddingOnly(start: 13, end: 13, top: 14, bottom: 16), ).paddingAll(16),
).paddingAll(16), ).expanded,
).expanded, FooterActionButton.footerContainer(
FooterActionButton.footerContainer( context: context,
context: context, child: AppFilledButton(
child: AppFilledButton( label: context.translation.submit,
label: context.translation.submit, buttonColor: AppColor.primary10,
buttonColor: AppColor.primary10, loading: requestDetailProvider.isLoading,
loading: requestDetailProvider.isLoading, onPressed: () async {
onPressed: () async { requestDetailProvider.assetRetiredHelperModel?.activityAssetToBeRetiredAttachments = [];
requestDetailProvider.assetRetiredHelperModel?.activityAssetToBeRetiredAttachments = []; for (var attachment in attachments) {
for (var attachment in attachments) { String fileName = ServiceRequestUtils.isLocalUrl(attachment.name??'') ? ("${attachment.name??''.split("/").last}|${base64Encode(File(attachment.name??'').readAsBytesSync())}") :attachment.name??'';
String fileName = ServiceRequestUtils.isLocalUrl(attachment.name??'') ? ("${attachment.name??''.split("/").last}|${base64Encode(File(attachment.name??'').readAsBytesSync())}") :attachment.name??''; requestDetailProvider.assetRetiredHelperModel?.activityAssetToBeRetiredAttachments
requestDetailProvider.assetRetiredHelperModel?.activityAssetToBeRetiredAttachments ?.add(ActivityAssetToBeRetiredAttachments(id: attachment.id, name: fileName));
?.add(ActivityAssetToBeRetiredAttachments(id: attachment.id, name: fileName)); }
} int status = await requestDetailProvider.createActivityAssetToBeRetired();
int status = await requestDetailProvider.createActivityAssetToBeRetired(); if (status == 200) {
if (status == 200) { Navigator.pop(context);
Navigator.pop(context); requestDetailProvider.stopTimer();
requestDetailProvider.stopTimer(); const SizedBox().flushBar(context: context, title: '', message: context.translation.assetRetirementRequestSubmittedSuccessfully);
const SizedBox().flushBar(context: context, title: '', message: context.translation.assetRetirementRequestSubmittedSuccessfully); }
} },
},
),
), ),
], ),
), ],
), ),
), ),
); );

8
lib/modules/cm_module/views/forms/asset_retired/verify_asset_detail.dart
Unescape Escape View File

@ -13,6 +13,7 @@ import 'package:test_sa/models/helper_data_models/workorder/work_order_helper_mo
import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/models/lookup.dart';
import 'package:test_sa/models/new_models/work_order_detail_model.dart'; import 'package:test_sa/models/new_models/work_order_detail_model.dart';
import 'package:test_sa/modules/cm_module/service_request_detail_provider.dart'; import 'package:test_sa/modules/cm_module/service_request_detail_provider.dart';
import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart'; import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart';
@ -328,10 +329,9 @@ class _VerifyAssetDetailsState extends State<VerifyAssetDetails> with TickerProv
] else ...[ ] else ...[
assetStatusWidget(context: context, workOrderData: updateAssetModel!).toShadowContainer(context).paddingAll(16), assetStatusWidget(context: context, workOrderData: updateAssetModel!).toShadowContainer(context).paddingAll(16),
], ],
Container( FooterActionButton.footerContainer(
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 16.toScreenHeight), context: context,
color: AppColor.background(context), child:AppFilledButton(
child: AppFilledButton(
label: context.translation.updateAssetDetails, label: context.translation.updateAssetDetails,
buttonColor: AppColor.primary10, buttonColor: AppColor.primary10,
onPressed: () async { onPressed: () async {

6
lib/modules/cm_module/views/forms/cost/cost_detail_form_screen.dart
Unescape Escape View File

@ -7,6 +7,7 @@ import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/helper_data_models/workorder/work_order_helper_models.dart'; import 'package:test_sa/models/helper_data_models/workorder/work_order_helper_models.dart';
import 'package:test_sa/models/new_models/work_order_detail_model.dart'; import 'package:test_sa/models/new_models/work_order_detail_model.dart';
import 'package:test_sa/modules/cm_module/service_request_detail_provider.dart'; import 'package:test_sa/modules/cm_module/service_request_detail_provider.dart';
import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart'; import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart';
@ -185,9 +186,8 @@ class _CostDetailFormScreenState extends State<CostDetailFormScreen> with Ticker
], ],
).toShadowContainer(context).paddingAll(16), ).toShadowContainer(context).paddingAll(16),
).expanded, ).expanded,
Container( FooterActionButton.footerContainer(
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 16.toScreenHeight), context: context,
color: AppColor.background(context),
child: AppFilledButton( child: AppFilledButton(
label: "Update Cost Details", label: "Update Cost Details",
buttonColor: AppColor.primary10, buttonColor: AppColor.primary10,

140
lib/modules/tm_module/tasks_wo/create_task_view.dart
Unescape Escape View File

@ -65,80 +65,78 @@ class _CreateTaskViewState extends State<CreateTaskView> with TickerProviderStat
return Scaffold( return Scaffold(
key: _scaffoldKey, key: _scaffoldKey,
appBar: DefaultAppBar(title: context.translation.createTaskRequest), appBar: DefaultAppBar(title: context.translation.createTaskRequest),
body: SafeArea( body: Form(
child: Form( key: _formKey,
key: _formKey, child: Column(
child: Column( children: [
children: [ SingleChildScrollView(
SingleChildScrollView( child: Column(
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ SingleItemDropDownMenu<TaskType, TaskTypeProvider>(
SingleItemDropDownMenu<TaskType, TaskTypeProvider>( context: context,
context: context, height: 56.toScreenHeight,
height: 56.toScreenHeight, title: context.translation.taskType,
title: context.translation.taskType, showShadow: false,
showShadow: false, backgroundColor: AppColor.neutral100,
backgroundColor: AppColor.neutral100, showAsBottomSheet: true,
showAsBottomSheet: true, initialValue: selectedType,
initialValue: selectedType, onSelect: (type) {
onSelect: (type) { if (type != null) {
if (type != null) { selectedType = type;
selectedType = type; _addTaskModel = AddTaskModel(id: 0);
_addTaskModel = AddTaskModel(id: 0); commentController.clear();
commentController.clear(); _addTaskModel?.taskTypeId = selectedType?.id;
_addTaskModel?.taskTypeId = selectedType?.id;
setState(() {});
}
},
),
8.height,
taskTypeWidget(selectedType?.relatedTo?.value),
8.height,
if (selectedType != null && selectedType!.isRecallAndAlert!) ...[
recallAndAlert(),
],
8.height,
AppTextFormField(
initialValue: _addTaskModel?.callComment,
controller: commentController,
labelText: context.translation.callComments,
backgroundColor: AppColor.neutral100,
showShadow: false,
labelStyle: AppTextStyles.textFieldLabelStyle,
alignLabelWithHint: true,
textInputType: TextInputType.multiline,
onChange: (value) {
_addTaskModel?.callComment = value;
},
),
23.height,
AttachmentPicker(
label: context.translation.attachImage,
attachment: attachments,
buttonColor: AppColor.black10,
onlyImages: false,
buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120),
//verify this if not required delete this ..
onChange: (attachments) {
attachments = attachments;
setState(() {}); setState(() {});
}, }
), },
),
8.height,
taskTypeWidget(selectedType?.relatedTo?.value),
8.height,
if (selectedType != null && selectedType!.isRecallAndAlert!) ...[
recallAndAlert(),
], ],
).toShadowContainer(context).paddingAll(16), 8.height,
).expanded, AppTextFormField(
FooterActionButton.footerContainer( initialValue: _addTaskModel?.callComment,
context: context, controller: commentController,
child: AppFilledButton( labelText: context.translation.callComments,
buttonColor: AppColor.primary10, backgroundColor: AppColor.neutral100,
label: context.translation.submitRequest, showShadow: false,
onPressed: _submit, labelStyle: AppTextStyles.textFieldLabelStyle,
// buttonColor: AppColor.primary10, alignLabelWithHint: true,
), textInputType: TextInputType.multiline,
onChange: (value) {
_addTaskModel?.callComment = value;
},
),
23.height,
AttachmentPicker(
label: context.translation.attachImage,
attachment: attachments,
buttonColor: AppColor.black10,
onlyImages: false,
buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120),
//verify this if not required delete this ..
onChange: (attachments) {
attachments = attachments;
setState(() {});
},
),
],
).toShadowContainer(context).paddingAll(16),
).expanded,
FooterActionButton.footerContainer(
context: context,
child: AppFilledButton(
buttonColor: AppColor.primary10,
label: context.translation.submitRequest,
onPressed: _submit,
// buttonColor: AppColor.primary10,
), ),
], ),
), ],
), ),
), ),
); );

Write Preview
Loading…
Cancel
Save