diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index 522b7853..d51fb77c 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -435,7 +435,8 @@ class URLs { //Medical Gas Request.. // 4004 static get orderTypeLookUp => "$_baseUrl/Lookups/GetLookup?lookupEnum=4004"; - static get itemTypeLookUp => "$_baseUrl/Lookups/GetLookup?lookupEnum=4005"; + // static get itemTypeLookUp => "$_baseUrl/Lookups/GetLookup?lookupEnum=4005"; + static get itemTypeLookUp => "$_baseUrl/MedicalGas/GetItemTypeLookup?lookupEnum=4002"; static get getMedicalGasSupplierList => "$_baseUrl/MedicalGas/GetMedicalGasSupplierAsync"; static get getMedicalGasInfoBySupplier => "$_baseUrl/MedicalGas/GetMedicalGasInfoBySupplierAsync"; static get addMedicalGasRequest => "$_baseUrl/MedicalGas/AddUpdateMedicalGasRequestAsync"; diff --git a/lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart b/lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart index 46d990b1..023af466 100644 --- a/lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart +++ b/lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart @@ -91,6 +91,8 @@ class _MedicalGasInspectionDetailPageState extends State requestDetailDtos = []; @@ -51,6 +52,7 @@ class MedicalGasDataModel { this.isInspectedGasLeak, this.deliveredDate, this.deliveryNote, + this.lastModifiedBy, List? requestDetailDtos, List? deliveryNoteAttachmentDto, }) { @@ -75,9 +77,11 @@ class MedicalGasDataModel { email = json['email']; isSubmitted = json['isSubmitted']; deliveryNote = json['deliveryNote']; + lastModifiedBy = json['lastModifiedBy']; requestOrderStatus = json['requestOrderStatus']; isPressureChecked = json['isPressureChecked']; isInspectedGasLeak = json['isInspectedGasLeak']; + deliveredDate = json['deliveredDate'] != null ? DateTime.parse(json['deliveredDate']) : null; requestStatus = json['requestOrderStatusDto'] != null ? Lookup.fromJson(json['requestOrderStatusDto']) : null; if (json['requestDetailDtos'] != null) { @@ -109,6 +113,7 @@ class MedicalGasDataModel { 'site': site, 'supplierId': supplierId, 'deliveryNote': deliveryNote, + 'lastModifiedBy': lastModifiedBy, 'supplier': supplier, 'contact': contact, 'email': email, diff --git a/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart b/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart index 56744d4d..925f5193 100644 --- a/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart +++ b/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import 'package:test_sa/controllers/providers/api/all_requests_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart'; @@ -35,7 +36,8 @@ class _UpdateDeliveryNotesState extends State { late MedicalGasInspectionProvider medicalGasInspectionProvider; bool pressureTestAcknowledgement = false; bool leakTestAcknowledgement = false; - List selectedItemList = []; + + // List selectedItemList = []; @override void initState() { @@ -62,7 +64,7 @@ class _UpdateDeliveryNotesState extends State { isSubmitted: dataModel.isSubmitted, deliveryNoteNumber: dataModel.deliveryNote); //Need to Confirm this condition - selectedItemList = dataModel.requestDetailDtos.where((item) => item.deliveredQuantity != null && item.deliveredQuantity! > 0).toList(); + // selectedItemList = dataModel.requestDetailDtos.where((item) => item.deliveredQuantity != null && item.deliveredQuantity! > 0).toList(); setState(() {}); } } @@ -290,7 +292,7 @@ class _UpdateDeliveryNotesState extends State { void _update({required BuildContext context, bool isSubmitted = false}) async { formModel.gasDeliveredQuantityDtos = []; formModel.isSubmitted = isSubmitted; - for (var item in selectedItemList) { + for (var item in formModel.deliveredItemList) { formModel.gasDeliveredQuantityDtos.add(GasDeliveredQuantityModel( id: widget.dataModel != null ? item.id : 0, medicalGasAttributeId: item.medicalGasAttributeId ?? item.id, @@ -302,6 +304,11 @@ class _UpdateDeliveryNotesState extends State { Navigator.pop(context); if (status) { Navigator.pop(context, true); + if (formModel.isSubmitted == true) { + AllRequestsProvider allRequestsProvider = Provider.of(context, listen: false); + allRequestsProvider.reset(); + await allRequestsProvider.getAllRequests(context, typeTransaction: 14); + } } }); } @@ -332,7 +339,7 @@ class _UpdateDeliveryNotesState extends State { ), right: TextFormField( keyboardType: TextInputType.number, - initialValue: model.deliveredQuantity != null ? model.deliveredQuantity.toString() : '', + initialValue: model.deliveredQuantity != null ? model.deliveredQuantity?.toStringAsFixed(0) : '', decoration: InputDecoration( contentPadding: EdgeInsets.symmetric(horizontal: 5.toScreenWidth), filled: true,