diff --git a/lib/modules/medical_gas_inspection/models/delivery_notes_form_model.dart b/lib/modules/medical_gas_inspection/models/delivery_notes_form_model.dart index 5b86859c..96b3032c 100644 --- a/lib/modules/medical_gas_inspection/models/delivery_notes_form_model.dart +++ b/lib/modules/medical_gas_inspection/models/delivery_notes_form_model.dart @@ -3,6 +3,7 @@ import 'package:test_sa/modules/medical_gas_inspection/models/medical_gas_data_m class DeliveryNotesFormModel { int? id; + DateTime? requestDate; DateTime? deliveredDate; String? deliveryNoteNumber; bool? isPressureChecked; @@ -15,6 +16,7 @@ class DeliveryNotesFormModel { DeliveryNotesFormModel({ this.id, + this.requestDate, this.deliveredDate, this.deliveryNoteNumber, this.isPressureChecked, @@ -31,6 +33,7 @@ class DeliveryNotesFormModel { DeliveryNotesFormModel.fromJson(Map json) { id = json['id']; + requestDate = json['requestDate'] != null ? DateTime.parse(json['requestDate']) : null; deliveredDate = json['deliveredDate'] != null ? DateTime.parse(json['deliveredDate']) : null; deliveryNoteNumber = json['deliveryNoteNumber']; isPressureChecked = json['isPressureChecked']; @@ -54,6 +57,7 @@ class DeliveryNotesFormModel { Map toJson() { return { 'id': id, + 'requestDate': requestDate?.toIso8601String(), 'deliveredDate': deliveredDate?.toIso8601String(), 'deliveryNoteNumber': deliveryNoteNumber, 'isPressureChecked': isPressureChecked, 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 47c77c39..eecb9d9e 100644 --- a/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart +++ b/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart @@ -98,6 +98,7 @@ class _UpdateDeliveryNotesState extends State { children: [ Column( crossAxisAlignment: CrossAxisAlignment.start, + spacing: 12, children: [ ADatePicker( label: "Delivered Date", @@ -118,7 +119,7 @@ class _UpdateDeliveryNotesState extends State { }); }, ), - 16.height, + // 16.height, AppTextFormField( initialValue: formModel.deliveryNoteNumber, labelText: "Delivery Notes", @@ -136,7 +137,25 @@ class _UpdateDeliveryNotesState extends State { formModel.deliveryNoteNumber = value; }, ), - 16.height, + ADatePicker( + label: "Requested Date", + hideShadow: true, + backgroundColor: AppColor.fieldBgColor(context), + from: DateTime.now().subtract(const Duration(days: 365 * 3)), + date: formModel.requestDate, + formatDateWithTime: true, + onDatePicker: (selectedDate) { + showThemedTimePicker( + context: context, + initialTime: TimeOfDay.now(), + ).then((selectedTime) { + if (selectedTime != null) { + formModel.requestDate = DateTime(selectedDate.year, selectedDate.month, selectedDate.day, selectedTime.hour, selectedTime.minute); + setState(() {}); + } + }); + }, + ), //Older design code // MultipleItemDropDownMenu( @@ -194,7 +213,7 @@ class _UpdateDeliveryNotesState extends State { left: 'Items'.addTranslation.bodyText(context).custom(color: AppColor.textColor(context)), right: 'Delivered Qty'.addTranslation.bodyText(context).custom(color: AppColor.textColor(context)), ), - 8.height, + // 8.height, ListView.separated( separatorBuilder: (_, __) => 12.height, itemCount: formModel.deliveredItemList.length, @@ -206,7 +225,7 @@ class _UpdateDeliveryNotesState extends State { }, ) ], - 16.height, + // 16.height, AttachmentPicker( label: 'Upload Attachment', @@ -216,7 +235,7 @@ class _UpdateDeliveryNotesState extends State { onlyImages: false, buttonIcon: 'attachment_icon'.toSvgAsset(color: AppColor.primary10), ), - 16.height, + // 16.height, //should create a reusable widget. Row( children: [ @@ -238,7 +257,7 @@ class _UpdateDeliveryNotesState extends State { .expanded, ], ), - 8.height, + // 8.height, Row( // mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,