Merge branch 'refs/heads/main_production' into main_production_attahment_type

lib/controllers/api_routes/urls.dart

@@ -1,7 +1,7 @@
 class URLs {
   URLs._();
 
-  static const String appReleaseBuildNumber = "52";
+  static const String appReleaseBuildNumber = "53";
 
   // static const host1 = "https://atomsm.hmg.com"; // production url
   static const host1 = "https://atomsmdev.hmg.com"; // local DEV url

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<String, dynamic> 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<String, dynamic> toJson() {
     return {
       'id': id,
+      'requestDate': requestDate?.toIso8601String(),
       'deliveredDate': deliveredDate?.toIso8601String(),
       'deliveryNoteNumber': deliveryNoteNumber,
       'isPressureChecked': isPressureChecked,

lib/modules/medical_gas_inspection/update_delivery_notes_page.dart

@@ -99,6 +99,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
                 children: [
                   Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
+                    spacing: 12,
                     children: [
                       ADatePicker(
                         label: "Delivered Date",
@@ -119,7 +120,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
                           });
                         },
                       ),
-                      16.height,
+                      // 16.height,
                       AppTextFormField(
                         initialValue: formModel.deliveryNoteNumber,
                         labelText: "Delivery Notes",
@@ -137,7 +138,25 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
                           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<MedicalGasRequestDetailModel, NullableLoadingProvider>(
@@ -195,7 +214,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
                           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,
@@ -207,7 +226,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
                           },
                         )
                       ],
-                      16.height,
+                      // 16.height,
 
                       AttachmentPicker(
                         label: 'Upload Attachment',
@@ -218,7 +237,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
                         onlyImages: false,
                         buttonIcon: 'attachment_icon'.toSvgAsset(color: AppColor.primary10),
                       ),
-                      16.height,
+                      // 16.height,
                       //should create a reusable widget.
                       Row(
                         children: [
@@ -240,7 +259,7 @@ class _UpdateDeliveryNotesState extends State<UpdateDeliveryNotes> {
                               .expanded,
                         ],
                       ),
-                      8.height,
+                      // 8.height,
                       Row(
                         // mainAxisAlignment: MainAxisAlignment.start,
                         crossAxisAlignment: CrossAxisAlignment.start,

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.9.2+52
+version: 1.9.3+53
 
 environment:
   sdk: ">=3.5.0 <4.0.0"