1.3.3+22 uploaded

lib/controllers/api_routes/urls.dart

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

lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart

@@ -59,18 +59,18 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
     super.initState();
     _partsProvider = Provider.of<PartsProvider>(context, listen: false);
     _requestDetailProvider = Provider.of<ServiceRequestDetailProvider>(context, listen: false);
-    // _requestDetailProvider?.sparePartHelperModel = SparePartHelperModel(
-    //   id: _requestDetailProvider?.sparePartHelperModel?.id ?? 0,
-    //   workOrderId: _requestDetailProvider?.sparePartHelperModel?.workOrderId ?? _requestDetailProvider?.currentWorkOrder?.data?.requestId,
-    //   sparePartAttachments: _requestDetailProvider?.sparePartHelperModel?.sparePartAttachments ?? [],
-    //   sparePart: _requestDetailProvider?.sparePartHelperModel?.sparePart ?? SparePart(),
-    //   quantity: _requestDetailProvider?.sparePartHelperModel?.quantity,
-    //   installQty: _requestDetailProvider?.sparePartHelperModel?.installQty,
-    //   returnQty: _requestDetailProvider?.sparePartHelperModel?.returnQty,
-    //   activityStatusId: _requestDetailProvider?.sparePartHelperModel?.activityStatusId ?? statusLookup.id,
-    //   activityStatus: _requestDetailProvider?.sparePartHelperModel?.activityStatus ?? statusLookup,
-    //   comment: _requestDetailProvider?.sparePartHelperModel?.comment ?? '',
-    // );
+    _requestDetailProvider?.sparePartHelperModel = SparePartHelperModel(
+      id: _requestDetailProvider?.sparePartHelperModel?.id ?? 0,
+      workOrderId: _requestDetailProvider?.sparePartHelperModel?.workOrderId ?? _requestDetailProvider?.currentWorkOrder?.data?.requestId,
+      sparePartAttachments: _requestDetailProvider?.sparePartHelperModel?.sparePartAttachments ?? [],
+      sparePart: _requestDetailProvider?.sparePartHelperModel?.sparePart ?? SparePart(),
+      quantity: _requestDetailProvider?.sparePartHelperModel?.quantity,
+      installQty: _requestDetailProvider?.sparePartHelperModel?.installQty,
+      returnQty: _requestDetailProvider?.sparePartHelperModel?.returnQty,
+      activityStatusId: _requestDetailProvider?.sparePartHelperModel?.activityStatusId ?? statusLookup.id,
+      activityStatus: _requestDetailProvider?.sparePartHelperModel?.activityStatus ?? statusLookup,
+      comment: _requestDetailProvider?.sparePartHelperModel?.comment ?? '',
+    );
     _partQtyController.text = _requestDetailProvider?.sparePartHelperModel?.quantity != null ? _requestDetailProvider!.sparePartHelperModel!.quantity!.round().toString() : '';
     _installQtyController.text = _requestDetailProvider?.sparePartHelperModel?.installQty != null ? _requestDetailProvider!.sparePartHelperModel!.installQty!.round().toString() : '';
     _returnQtyController.text = _requestDetailProvider?.sparePartHelperModel?.returnQty != null ? _requestDetailProvider!.sparePartHelperModel!.returnQty!.round().toString() : '';

lib/views/widgets/images/multi_image_picker.dart

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:file_picker/file_picker.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:image_picker/image_picker.dart';
@@ -19,6 +18,7 @@ class MultiFilesPicker extends StatefulWidget {
   final bool error;
   final List<File> files;
   final List<AttachmentModel> attachment;
+
   final bool enabled, onlyImages;
   double? buttonHeight;
   Widget? buttonIcon;
@@ -101,6 +101,9 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
     if (result != null) {
       for (var path in result.paths) {
         widget.files.add(File(path!));
+        if (widget.onChange != null) {
+          widget.onChange!(widget.files);
+        }
       }
       setState(() {});
     }
@@ -112,7 +115,7 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
       return;
     }
 
-    ImageSource source = (await showModalBottomSheet(
+    ImageSource? source = (await showModalBottomSheet(
       context: context,
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.vertical(
@@ -143,8 +146,8 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
           12.height,
         ],
       ).paddingAll(21),
-    )) as ImageSource;
-
+    )) as ImageSource?;
+    if (source == null) return;
     final pickedFile = await ImagePicker().pickImage(source: source, imageQuality: 70, maxWidth: 800, maxHeight: 800);
 
     if (pickedFile != null) {
@@ -193,10 +196,7 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
             child: Container(
               constraints: BoxConstraints(minWidth: 111.toScreenWidth, minHeight: 111.toScreenHeight),
               padding: EdgeInsets.symmetric(horizontal: 12.toScreenWidth, vertical: 12.toScreenHeight),
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(12),
-                border: Border.all(width: 1,color:AppColor.white70)
-              ),
+              decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), border: Border.all(width: 1, color: AppColor.white70)),
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -209,6 +209,7 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
             ),
           );
         }
+
         return Container(
           padding: const EdgeInsets.all(16.0),
           child: Row(
@@ -286,13 +287,10 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
   }
 }
 
-
-
-
-
 class AttachmentModel {
   int id = 0;
   File? file;
+
   AttachmentModel(this.id, this.file);
 
   factory AttachmentModel.fromJson(Map<String, dynamic> json) {
@@ -308,14 +306,13 @@ class AttachmentModel {
       'file': file?.path,
     };
   }
-
-
 }
 
 class AttachmentPicker extends StatefulWidget {
   final String label;
   final bool error;
   final List<AttachmentModel> attachment;
+
   final bool enabled, onlyImages;
   double? buttonHeight;
   Widget? buttonIcon;
@@ -487,10 +484,7 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
             child: Container(
               constraints: BoxConstraints(minWidth: 111.toScreenWidth, minHeight: 111.toScreenHeight),
               padding: EdgeInsets.symmetric(horizontal: 12.toScreenWidth, vertical: 12.toScreenHeight),
-              decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(12),
-                  border: Border.all(width: 1,color:AppColor.white70)
-              ),
+              decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), border: Border.all(width: 1, color: AppColor.white70)),
               child: Column(
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.start,
@@ -503,6 +497,7 @@ class _AttachmentPickerState extends State<AttachmentPicker> {
             ),
           );
         }
+
         return Container(
           padding: const EdgeInsets.all(16.0),
           child: Row(

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.3.2+21
+version: 1.3.3+22
 
 environment:
   sdk: ">=3.5.0 <4.0.0"