spare part activity improvements

design_3.0_demo_module
Sikander Saleem 1 year ago
parent f6b3c82fb3
commit 6722e19cc5

@ -332,7 +332,7 @@ class RequestDetailProvider extends ChangeNotifier {
isLoading = true; isLoading = true;
notifyListeners(); notifyListeners();
Map<String, dynamic> body = {'workOrderId': workOrderId, 'reOrderActivityDTOs': reOrderActivityDTOs}; Map<String, dynamic> body = {'workOrderId': workOrderId, 'reOrderActivityDTOs': reOrderActivityDTOs};
response = await ApiManager.instance.post(URLs.reOrderActivity, body: body); response = await ApiManager.instance.put(URLs.reOrderActivity, body: body);
stateCode = response.statusCode; stateCode = response.statusCode;
if (response.statusCode >= 200 && response.statusCode < 300) { if (response.statusCode >= 200 && response.statusCode < 300) {
currentWorkOrder = WorkOrderDetail.fromJson(json.decode(response.body)); currentWorkOrder = WorkOrderDetail.fromJson(json.decode(response.body));

@ -122,14 +122,15 @@ class _ActivitiesListViewState extends State<ActivitiesListView> {
label: showReorderView ? "Confirm Order".addTranslation : context.translation.createNewActivity, label: showReorderView ? "Confirm Order".addTranslation : context.translation.createNewActivity,
maxWidth: true, maxWidth: true,
buttonColor: AppColor.primary10, buttonColor: AppColor.primary10,
loading: requestDetailProvider.isLoading,
onPressed: () async { onPressed: () async {
if (showReorderView) { if (showReorderView) {
requestDetailProvider.currentWorkOrder!.data!.activities = reOrderActivities; // requestDetailProvider.currentWorkOrder!.data!.activities = reOrderActivities;
reOrderActivities = [];
List<Map<String, dynamic>> data = []; List<Map<String, dynamic>> data = [];
for (int i = 0; i < reOrderActivities.length; i++) { for (int i = 0; i < reOrderActivities.length; i++) {
data.add({"id": reOrderActivities[i].id, "orderNo": i}); data.add({"id": reOrderActivities[i].id, "orderNo": i});
} }
reOrderActivities = [];
requestDetailProvider.reOrderActivities(workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!, reOrderActivityDTOs: data); requestDetailProvider.reOrderActivities(workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!, reOrderActivityDTOs: data);
showReorderView = false; showReorderView = false;
return; return;

@ -290,7 +290,7 @@ class ServiceRequestBottomSheet {
visitDate: requestDetailProvider.needVisitHelperModel?.visitDate, visitDate: requestDetailProvider.needVisitHelperModel?.visitDate,
comment: requestDetailProvider.needVisitHelperModel?.comment, comment: requestDetailProvider.needVisitHelperModel?.comment,
)); ));
requestDetailProvider.engineerUpdateNeedVisit(); requestDetailProvider.engineerUpdateNeedVisit();
} else { } else {
requestDetailProvider.needVisitHelperModel?.workOrderId = requestDetailProvider.currentWorkOrder!.data!.requestId; requestDetailProvider.needVisitHelperModel?.workOrderId = requestDetailProvider.currentWorkOrder!.data!.requestId;
requestDetailProvider.engineerNeedVisit(); requestDetailProvider.engineerNeedVisit();
@ -516,7 +516,6 @@ class ServiceRequestBottomSheet {
], ],
); );
})); }));
} }
static Future addAnotherSpareRequestBottomSheet({required BuildContext context}) { static Future addAnotherSpareRequestBottomSheet({required BuildContext context}) {

@ -50,7 +50,10 @@ class WorkOrderDetailView extends StatelessWidget {
), ),
).expanded, ).expanded,
FooterActionButton.requestDetailsFooterWidget( FooterActionButton.requestDetailsFooterWidget(
workOrderNextStepStatus: requestProvider.currentWorkOrder!.data!.nextStep!.workOrderNextStepEnum!,activities:requestProvider.currentWorkOrder!.data?.activities??[], userProvider: _userProvider, context: context), workOrderNextStepStatus: requestProvider.currentWorkOrder!.data!.nextStep!.workOrderNextStepEnum!,
activities: requestProvider.currentWorkOrder!.data?.activities ?? [],
userProvider: _userProvider,
context: context),
], ],
), ),
// const TimerWidget(), // const TimerWidget(),

@ -87,7 +87,7 @@ class _VerifyAssetDetailsState extends State<VerifyAssetDetails> with TickerProv
returnToService: currentWorkOrderData.returnToService, returnToService: currentWorkOrderData.returnToService,
serviceType: currentWorkOrderData.serviceType, serviceType: currentWorkOrderData.serviceType,
); );
_requestDetailProvider?.updateEngineerUpdateWorkOrderHelperModel(_requestDetailProvider?.engineerUpdateWorkOrderHelperModel); // _requestDetailProvider?.updateEngineerUpdateWorkOrderHelperModel(_requestDetailProvider?.engineerUpdateWorkOrderHelperModel);
getFaultDescription(); getFaultDescription();
} }

@ -49,19 +49,22 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
final TextEditingController _oracleNoController = TextEditingController(); final TextEditingController _oracleNoController = TextEditingController();
final TextEditingController _descriptionController = TextEditingController(); final TextEditingController _descriptionController = TextEditingController();
Lookup statusLookup = Lookup.fromJson({"id": 5619, "name": "New", "value": 1});
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_partsProvider = Provider.of<PartsProvider>(context, listen: false); _partsProvider = Provider.of<PartsProvider>(context, listen: false);
_requestDetailProvider = Provider.of<RequestDetailProvider>(context, listen: false); _requestDetailProvider = Provider.of<RequestDetailProvider>(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,
activityStatusId: _requestDetailProvider?.sparePartHelperModel?.activityStatusId, activityStatusId: _requestDetailProvider?.sparePartHelperModel?.activityStatusId ?? statusLookup.id,
activityStatus: _requestDetailProvider?.sparePartHelperModel?.activityStatus, activityStatus: _requestDetailProvider?.sparePartHelperModel?.activityStatus ?? statusLookup,
comment: _requestDetailProvider?.sparePartHelperModel?.comment ?? '', comment: _requestDetailProvider?.sparePartHelperModel?.comment ?? '',
); );
_partQtyController.text = _requestDetailProvider?.sparePartHelperModel?.quantity != null ? _requestDetailProvider!.sparePartHelperModel!.quantity.toString() : ''; _partQtyController.text = _requestDetailProvider?.sparePartHelperModel?.quantity != null ? _requestDetailProvider!.sparePartHelperModel!.quantity.toString() : '';
@ -137,7 +140,8 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
context: context, context: context,
title: context.translation.partNo, title: context.translation.partNo,
staticData: _spareParts, staticData: _spareParts,
showShadow: false,loading: _isLoading, showShadow: false,
loading: _isLoading,
initialValue: requestDetailProvider.sparePartHelperModel?.sparePart, initialValue: requestDetailProvider.sparePartHelperModel?.sparePart,
backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral90, backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral90,
onSelect: (part) { onSelect: (part) {
@ -234,11 +238,10 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
Navigator.pop(context); Navigator.pop(context);
Navigator.pop(context); Navigator.pop(context);
//show this only for add form.. //show this only for add form..
if(_requestDetailProvider?.sparePartHelperModel?.id==0){ if (_requestDetailProvider?.sparePartHelperModel?.id == 0) {
ServiceRequestBottomSheet.addAnotherSpareRequestBottomSheet(context: context); ServiceRequestBottomSheet.addAnotherSpareRequestBottomSheet(context: context);
SizedBox().flushBar(context: context, title: context.translation.sparePartActivitySuccess, message: ''); SizedBox().flushBar(context: context, title: context.translation.sparePartActivitySuccess, message: '');
} }
} else { } else {
Navigator.pop(context); Navigator.pop(context);
} }

Loading…
Cancel
Save