medical gas request date added.

main_production
Sikander Saleem 1 month ago
parent 523ce2a986
commit 43a657e68f

@ -3,6 +3,7 @@ import 'package:test_sa/modules/medical_gas_inspection/models/medical_gas_data_m
class DeliveryNotesFormModel { class DeliveryNotesFormModel {
int? id; int? id;
DateTime? requestDate;
DateTime? deliveredDate; DateTime? deliveredDate;
String? deliveryNoteNumber; String? deliveryNoteNumber;
bool? isPressureChecked; bool? isPressureChecked;
@ -15,6 +16,7 @@ class DeliveryNotesFormModel {
DeliveryNotesFormModel({ DeliveryNotesFormModel({
this.id, this.id,
this.requestDate,
this.deliveredDate, this.deliveredDate,
this.deliveryNoteNumber, this.deliveryNoteNumber,
this.isPressureChecked, this.isPressureChecked,
@ -31,6 +33,7 @@ class DeliveryNotesFormModel {
DeliveryNotesFormModel.fromJson(Map<String, dynamic> json) { DeliveryNotesFormModel.fromJson(Map<String, dynamic> json) {
id = json['id']; id = json['id'];
requestDate = json['requestDate'] != null ? DateTime.parse(json['requestDate']) : null;
deliveredDate = json['deliveredDate'] != null ? DateTime.parse(json['deliveredDate']) : null; deliveredDate = json['deliveredDate'] != null ? DateTime.parse(json['deliveredDate']) : null;
deliveryNoteNumber = json['deliveryNoteNumber']; deliveryNoteNumber = json['deliveryNoteNumber'];
isPressureChecked = json['isPressureChecked']; isPressureChecked = json['isPressureChecked'];
@ -54,6 +57,7 @@ class DeliveryNotesFormModel {
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
return { return {
'id': id, 'id': id,
'requestDate': requestDate?.toIso8601String(),
'deliveredDate': deliveredDate?.toIso8601String(), 'deliveredDate': deliveredDate?.toIso8601String(),
'deliveryNoteNumber': deliveryNoteNumber, 'deliveryNoteNumber': deliveryNoteNumber,
'isPressureChecked': isPressureChecked, 'isPressureChecked': isPressureChecked,

@ -98,6 +98,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
spacing: 12,
children: [ children: [
ADatePicker( ADatePicker(
label: "Delivered Date", label: "Delivered Date",
@ -118,7 +119,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
}); });
}, },
), ),
16.height, // 16.height,
AppTextFormField( AppTextFormField(
initialValue: formModel.deliveryNoteNumber, initialValue: formModel.deliveryNoteNumber,
labelText: "Delivery Notes", labelText: "Delivery Notes",
@ -136,7 +137,25 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
formModel.deliveryNoteNumber = value; 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 //Older design code
// MultipleItemDropDownMenu<MedicalGasRequestDetailModel, NullableLoadingProvider>( // MultipleItemDropDownMenu<MedicalGasRequestDetailModel, NullableLoadingProvider>(
@ -194,7 +213,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
left: 'Items'.addTranslation.bodyText(context).custom(color: AppColor.textColor(context)), left: 'Items'.addTranslation.bodyText(context).custom(color: AppColor.textColor(context)),
right: 'Delivered Qty'.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( ListView.separated(
separatorBuilder: (_, __) => 12.height, separatorBuilder: (_, __) => 12.height,
itemCount: formModel.deliveredItemList.length, itemCount: formModel.deliveredItemList.length,
@ -206,7 +225,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
}, },
) )
], ],
16.height, // 16.height,
AttachmentPicker( AttachmentPicker(
label: 'Upload Attachment', label: 'Upload Attachment',
@ -216,7 +235,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
onlyImages: false, onlyImages: false,
buttonIcon: 'attachment_icon'.toSvgAsset(color: AppColor.primary10), buttonIcon: 'attachment_icon'.toSvgAsset(color: AppColor.primary10),
), ),
16.height, // 16.height,
//should create a reusable widget. //should create a reusable widget.
Row( Row(
children: [ children: [
@ -238,7 +257,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
.expanded, .expanded,
], ],
), ),
8.height, // 8.height,
Row( Row(
// mainAxisAlignment: MainAxisAlignment.start, // mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

Loading…
Cancel
Save