improvements

design_3.0_task_module_new
Sikander Saleem 5 months ago
parent 3181e666be
commit 12752535b8

@ -738,20 +738,14 @@ class ServiceRequestDetailProvider extends ChangeNotifier {
} }
Future<int> updateActivitySparePart() async { Future<int> updateActivitySparePart() async {
isLoading = true;
notifyListeners();
try { try {
final response = await ApiManager.instance.post(URLs.updateActivitySparePartUrl, body: sparePartHelperModel!.toJson()); final response = await ApiManager.instance.post(URLs.updateActivitySparePartUrl, body: sparePartHelperModel!.toJson());
stateCode = response.statusCode; stateCode = response.statusCode;
if (response.statusCode >= 200 && response.statusCode < 300) { if (response.statusCode >= 200 && response.statusCode < 300) {
// request.engineerName = employee.name; // request.engineerName = employee.name;
} }
isLoading = false;
notifyListeners();
return response.statusCode; return response.statusCode;
} catch (error) { } catch (error) {
isLoading = false;
notifyListeners();
return -1; return -1;
} }
} }
@ -868,25 +862,16 @@ class ServiceRequestDetailProvider extends ChangeNotifier {
} }
Future<int> createActivitySparePart() async { Future<int> createActivitySparePart() async {
isLoading = true;
notifyListeners();
try { try {
final response = await ApiManager.instance.post( final response = await ApiManager.instance.post(URLs.createActivitySparePartUrl, body: sparePartHelperModel!.toJson());
URLs.createActivitySparePartUrl,
body: sparePartHelperModel!.toJson(),
);
stateCode = response.statusCode; stateCode = response.statusCode;
if (response.statusCode >= 200 && response.statusCode < 300) { if (response.statusCode >= 200 && response.statusCode < 300) {
// currentWorkOrder = await WorkOrderDetail.fromJson(json.decode(response.body)); // currentWorkOrder = await WorkOrderDetail.fromJson(json.decode(response.body));
// // updateCurrentWorkOrder(currentWorkOrder); // // updateCurrentWorkOrder(currentWorkOrder);
// notifyListeners(); // notifyListeners();
} }
isLoading = false;
notifyListeners();
return response.statusCode; return response.statusCode;
} catch (error) { } catch (error) {
isLoading = false;
notifyListeners();
return -1; return -1;
} }
} }

@ -59,18 +59,18 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
super.initState(); super.initState();
_partsProvider = Provider.of<PartsProvider>(context, listen: false); _partsProvider = Provider.of<PartsProvider>(context, listen: false);
_requestDetailProvider = Provider.of<ServiceRequestDetailProvider>(context, listen: false); _requestDetailProvider = Provider.of<ServiceRequestDetailProvider>(context, listen: false);
// _requestDetailProvider?.sparePartHelperModel = SparePartHelperModel( _requestDetailProvider?.sparePartHelperModel = SparePartHelperModel(
// id: _requestDetailProvider?.sparePartHelperModel?.id ?? 0, id: _requestDetailProvider?.sparePartHelperModel?.id ?? 0,
// workOrderId: _requestDetailProvider?.sparePartHelperModel?.workOrderId ?? _requestDetailProvider?.currentWorkOrder?.data?.requestId, workOrderId: _requestDetailProvider?.sparePartHelperModel?.workOrderId ?? _requestDetailProvider?.currentWorkOrder?.data?.requestId,
// sparePartAttachments: _requestDetailProvider?.sparePartHelperModel?.sparePartAttachments ?? [], sparePartAttachments: _requestDetailProvider?.sparePartHelperModel?.sparePartAttachments ?? [],
// sparePart: _requestDetailProvider?.sparePartHelperModel?.sparePart ?? SparePart(), sparePart: _requestDetailProvider?.sparePartHelperModel?.sparePart ?? SparePart(),
// quantity: _requestDetailProvider?.sparePartHelperModel?.quantity, quantity: _requestDetailProvider?.sparePartHelperModel?.quantity,
// installQty: _requestDetailProvider?.sparePartHelperModel?.installQty, installQty: _requestDetailProvider?.sparePartHelperModel?.installQty,
// returnQty: _requestDetailProvider?.sparePartHelperModel?.returnQty, returnQty: _requestDetailProvider?.sparePartHelperModel?.returnQty,
// activityStatusId: _requestDetailProvider?.sparePartHelperModel?.activityStatusId ?? statusLookup.id, activityStatusId: _requestDetailProvider?.sparePartHelperModel?.activityStatusId ?? statusLookup.id,
// activityStatus: _requestDetailProvider?.sparePartHelperModel?.activityStatus ?? statusLookup, activityStatus: _requestDetailProvider?.sparePartHelperModel?.activityStatus ?? statusLookup,
// comment: _requestDetailProvider?.sparePartHelperModel?.comment ?? '', comment: _requestDetailProvider?.sparePartHelperModel?.comment ?? '',
// ); );
_partQtyController.text = _requestDetailProvider?.sparePartHelperModel?.quantity != null ? _requestDetailProvider!.sparePartHelperModel!.quantity!.round().toString() : ''; _partQtyController.text = _requestDetailProvider?.sparePartHelperModel?.quantity != null ? _requestDetailProvider!.sparePartHelperModel!.quantity!.round().toString() : '';
_installQtyController.text = _requestDetailProvider?.sparePartHelperModel?.installQty != null ? _requestDetailProvider!.sparePartHelperModel!.installQty!.round().toString() : ''; _installQtyController.text = _requestDetailProvider?.sparePartHelperModel?.installQty != null ? _requestDetailProvider!.sparePartHelperModel!.installQty!.round().toString() : '';
_returnQtyController.text = _requestDetailProvider?.sparePartHelperModel?.returnQty != null ? _requestDetailProvider!.sparePartHelperModel!.returnQty!.round().toString() : ''; _returnQtyController.text = _requestDetailProvider?.sparePartHelperModel?.returnQty != null ? _requestDetailProvider!.sparePartHelperModel!.returnQty!.round().toString() : '';
@ -119,12 +119,12 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
key: _scaffoldKey, key: _scaffoldKey,
appBar: DefaultAppBar(title: context.translation.sparePartRequest), appBar: DefaultAppBar(title: context.translation.sparePartRequest),
body: Consumer<ServiceRequestDetailProvider>(builder: (context, ServiceRequestDetailProvider requestDetailProvider, child) { body: Consumer<ServiceRequestDetailProvider>(builder: (context, ServiceRequestDetailProvider requestDetailProvider, child) {
return SafeArea( return Form(
child: Form(
key: _formKey, key: _formKey,
child: Column( child: Column(
children: [ children: [
SingleChildScrollView( SingleChildScrollView(
padding: const EdgeInsets.all(12),
child: IgnorePointer( child: IgnorePointer(
ignoring: _requestDetailProvider!.isReadOnlyRequest, ignoring: _requestDetailProvider!.isReadOnlyRequest,
child: Column( child: Column(
@ -303,7 +303,7 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
], ],
), ),
), ),
).paddingAll(12).expanded, ).expanded,
if (!requestDetailProvider.isReadOnlyRequest) if (!requestDetailProvider.isReadOnlyRequest)
FooterActionButton.footerContainer( FooterActionButton.footerContainer(
child: AppFilledButton( child: AppFilledButton(
@ -340,7 +340,7 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
)), )),
], ],
), ),
)); );
}), }),
); );
} }

@ -17,8 +17,9 @@ class MultiFilesPickerItem extends StatelessWidget {
final File file; final File file;
final bool enabled; final bool enabled;
final Function(File) onRemoveTap; final Function(File) onRemoveTap;
final VoidCallback? onRemove;
const MultiFilesPickerItem({Key? key, required this.file, required this.enabled, required this.onRemoveTap}) : super(key: key); const MultiFilesPickerItem({Key? key, required this.file, required this.enabled, required this.onRemoveTap, this.onRemove}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -27,8 +28,8 @@ class MultiFilesPickerItem extends StatelessWidget {
bool isExcel = file.path.split(".").last.toLowerCase() == "xlsx"; bool isExcel = file.path.split(".").last.toLowerCase() == "xlsx";
return SizedBox( return SizedBox(
width: 54.toScreenWidth, width: 60.toScreenWidth,
height: 51.toScreenWidth, height: 60.toScreenWidth,
child: Stack( child: Stack(
alignment: AlignmentDirectional.topEnd, alignment: AlignmentDirectional.topEnd,
children: [ children: [
@ -80,6 +81,9 @@ class MultiFilesPickerItem extends StatelessWidget {
child: "remove".toSvgAsset(width: 16), child: "remove".toSvgAsset(width: 16),
onTap: () { onTap: () {
onRemoveTap(file); onRemoveTap(file);
if (onRemove != null) {
onRemove!();
}
}, },
) )
], ],

@ -86,6 +86,13 @@ class _MultiFilesPickerState extends State<NewMultiFilesPicker> {
} }
setState(() {}); setState(() {});
}, },
onRemove: () {
widget.files.removeAt(index);
if (widget.onChange != null) {
widget.onChange!(widget.files);
}
setState(() {});
},
); );
}, },
), ),

Loading…
Cancel
Save