wayBillNumber key change from waybillNumber

apps/health_campaign_field_worker_app/pubspec.lock

@@ -430,7 +430,7 @@ packages:
     description:
       path: "packages/dart_mappable_builder"
       ref: master
-      resolved-ref: "9b887d24c05459c027a92391869d4c10b440e00f"
+      resolved-ref: e3d8ac43f70568b4a17c200cae5cde285050ef23
       url: "https://github.com/egovernments/health-campaign-field-worker-app/"
     source: git
     version: "4.2.0"
@@ -493,10 +493,11 @@ packages:
   digit_components:
     dependency: "direct main"
     description:
-      path: "../../packages/digit_components"
-      relative: true
-    source: path
-    version: "1.0.1+1"
+      name: digit_components
+      sha256: dcdab9542149022cb66241c3c379ca96916f8b6116e585f4799748d859a2ca49
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   digit_data_model:
     dependency: "direct main"
     description:
@@ -1119,10 +1120,10 @@ packages:
     dependency: "direct main"
     description:
       name: inventory_management
-      sha256: "1a5976ab807666629704f559730d5418e1c723fed898df2cc6e7d9807f813b6f"
+      sha256: "1d0dd4f7811941092653426a86548a31d475237d318eee71505b21a57ebc310b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3+2"
+    version: "1.0.3+4"
   io:
     dependency: transitive
     description:

apps/health_campaign_field_worker_app/pubspec.yaml

@@ -18,7 +18,7 @@ dependencies:
   sqlite3_flutter_libs: ^0.5.10
   path_provider: ^2.0.11
   path: ^1.8.2
-  digit_components: ^1.0.1+1
+  digit_components: ^1.0.2
   auto_route: ^7.8.4
   flutter_bloc: ^8.1.1
   collection: ^1.16.0
@@ -67,7 +67,7 @@ dependencies:
   camera: ^0.10.5+7
   attendance_management: ^1.0.2+1
   digit_scanner: ^1.0.3+1
-  inventory_management: ^1.0.3+2
+  inventory_management: ^1.0.3+4
   referral_reconciliation: ^1.0.2+1
   digit_data_model: ^1.0.3+1
   registration_delivery: ^1.0.3+1

packages/digit_components/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.0.2
+* Added privacy notice component
+
 ## 1.0.1+1
 * Changed similar dialogs to a common hideDialog
 

packages/digit_components/example/pubspec.lock

@@ -231,7 +231,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.1+1"
+    version: "1.0.2"
   easy_stepper:
     dependency: transitive
     description:

packages/digit_components/lib/widgets/privacy_notice/privacy_notice_dialog.dart

@@ -4,7 +4,6 @@ import 'package:digit_components/widgets/digit_card.dart';
 import 'package:digit_components/widgets/digit_elevated_button.dart';
 import 'package:digit_components/widgets/digit_outline_button.dart';
 import 'package:flutter/material.dart';
-import '../../models/privacy_policy_model.dart';
 import '../../theme/digit_theme.dart';
 import '../localized.dart';
 import 'privacy_notice_expand_component.dart';
@@ -25,10 +24,10 @@ class FullPageDialog extends LocalizedStatefulWidget {
   });
 
   @override
-  _FullPageDialogState createState() => _FullPageDialogState();
+  FullPageDialogState createState() => FullPageDialogState();
 }
 
-class _FullPageDialogState extends LocalizedState<FullPageDialog> {
+class FullPageDialogState extends LocalizedState<FullPageDialog> {
   @override
   Widget build(BuildContext context) {
     return Dialog.fullscreen(

packages/digit_components/lib/widgets/privacy_notice/privacy_notice_expand_component.dart

@@ -1,7 +1,6 @@
 import 'package:digit_components/theme/colors.dart';
 import 'package:flutter/material.dart';
 import '../../models/privacy_notice/privacy_notice_model.dart';
-import '../../models/privacy_policy_model.dart';
 import '../../theme/digit_theme.dart';
 import '../localized.dart';
 
@@ -15,10 +14,10 @@ class ExpandableSection extends LocalizedStatefulWidget {
   });
 
   @override
-  _ExpandableSectionState createState() => _ExpandableSectionState();
+  ExpandableSectionState createState() => ExpandableSectionState();
 }
 
-class _ExpandableSectionState extends LocalizedState<ExpandableSection> {
+class ExpandableSectionState extends LocalizedState<ExpandableSection> {
   bool _isExpanded = false;
 
   @override
@@ -103,10 +102,10 @@ class DescriptionWidget extends LocalizedStatefulWidget {
   });
 
   @override
-  _DescriptionWidgetState createState() => _DescriptionWidgetState();
+  DescriptionWidgetState createState() => DescriptionWidgetState();
 }
 
-class _DescriptionWidgetState extends LocalizedState<DescriptionWidget> {
+class DescriptionWidgetState extends LocalizedState<DescriptionWidget> {
   @override
   Widget build(BuildContext context) {
     final descriptionText = widget.description.text ?? '';
@@ -213,10 +212,10 @@ class SubDescriptionWidget extends LocalizedStatefulWidget {
   });
 
   @override
-  _SubDescriptionWidgetState createState() => _SubDescriptionWidgetState();
+  SubDescriptionWidgetState createState() => SubDescriptionWidgetState();
 }
 
-class _SubDescriptionWidgetState extends LocalizedState<SubDescriptionWidget> {
+class SubDescriptionWidgetState extends LocalizedState<SubDescriptionWidget> {
   @override
   Widget build(BuildContext context) {
     final subDescriptionText = widget.subDescription.text ?? '';

packages/digit_components/pubspec.yaml

@@ -1,6 +1,6 @@
 name: digit_components
 description: Digit UI Design specification Flutter widgets. Import this package by adding digit_components <latest> in respective pubspec.yaml dependencies.
-version: 1.0.1+1
+version: 1.0.2
 homepage: https://github.com/egovernments/health-campaign-field-worker-app/tree/master/packages/digit_components
 repository: https://github.com/egovernments/health-campaign-field-worker-app
 

packages/inventory_management/CHANGELOG.md

@@ -1,4 +1,13 @@
-## 1.0.3+1
+## 1.0.3+4
+
+* Updated wayBillNumber validation
+
+## 1.0.3+3
+
+* Updated key name of waybillNumber to wayBillNumber
+* Return transaction type logic change in stock_details and report_details bloc
+
+## 1.0.3+2
 
 * Updated digit_scanner package, digit_components, digit_data_model
 

packages/inventory_management/lib/blocs/inventory_report.dart

@@ -67,8 +67,8 @@ class InventoryReportBloc
       } else if (reportType == InventoryReportType.returned) {
         transactionType = [TransactionType.received.toValue()];
         transactionReason = [TransactionReason.returned.toValue()];
-        receiverId = null;
-        senderId = facilityId;
+        receiverId = facilityId;
+        senderId = null;
       } else if (reportType == InventoryReportType.damage) {
         transactionType = [TransactionType.dispatched.toValue()];
         transactionReason = [

packages/inventory_management/lib/data/repositories/local/stock.dart

@@ -89,7 +89,7 @@ class StockLocalRepository
           transactingPartyId: data.transactingPartyId,
           transactingPartyType: data.transactingPartyType,
           quantity: data.quantity,
-          waybillNumber: data.waybillNumber,
+          wayBillNumber: data.waybillNumber,
           clientReferenceId: data.clientReferenceId,
           isDeleted: data.isDeleted,
           rowVersion: data.rowVersion,

packages/inventory_management/lib/models/entities/stock.dart

@@ -77,7 +77,7 @@ class StockModel extends EntityModel with StockModelMappable {
   final String? transactingPartyId;
   final String? transactingPartyType;
   final String? quantity;
-  final String? waybillNumber;
+  final String? wayBillNumber;
   final String? receiverId;
   final String? receiverType;
   final String? senderId;
@@ -100,7 +100,7 @@ class StockModel extends EntityModel with StockModelMappable {
     this.transactingPartyId,
     this.transactingPartyType,
     this.quantity,
-    this.waybillNumber,
+    this.wayBillNumber,
     this.receiverId,
     this.receiverType,
     this.senderId,
@@ -136,7 +136,7 @@ class StockModel extends EntityModel with StockModelMappable {
       transactingPartyId: Value(transactingPartyId),
       transactingPartyType: Value(transactingPartyType),
       quantity: Value(quantity),
-      waybillNumber: Value(waybillNumber),
+      waybillNumber: Value(wayBillNumber),
       receiverId: Value(receiverId),
       receiverType: Value(receiverType),
       senderId: Value(senderId),

packages/inventory_management/lib/pages/record_stock/stock_details.dart

@@ -60,7 +60,9 @@ class StockDetailsPageState extends LocalizedState<StockDetailsPage> {
         Validators.max(10000),
       ]),
       _transactionReasonKey: FormControl<String>(),
-      _waybillNumberKey: FormControl<String>(),
+      _waybillNumberKey: FormControl<String>(
+        validators: [Validators.minLength(2), Validators.maxLength(200)],
+      ),
       _waybillQuantityKey: FormControl<String>(),
       _vehicleNumberKey: FormControl<String>(),
       _typeOfTransportKey: FormControl<String>(),
@@ -385,6 +387,7 @@ class StockDetailsPageState extends LocalizedState<StockDetailsPage> {
                                             case StockRecordEntryType.receipt:
                                             case StockRecordEntryType.loss:
                                             case StockRecordEntryType.damaged:
+                                            case StockRecordEntryType.returned:
                                               if (deliveryTeamSelected) {
                                                 senderId = deliveryTeamName;
                                                 senderType = "STAFF";
@@ -397,7 +400,6 @@ class StockDetailsPageState extends LocalizedState<StockDetailsPage> {
 
                                               break;
                                             case StockRecordEntryType.dispatch:
-                                            case StockRecordEntryType.returned:
                                               if (deliveryTeamSelected) {
                                                 receiverId = deliveryTeamName;
                                                 receiverType = "STAFF";
@@ -420,7 +422,7 @@ class StockDetailsPageState extends LocalizedState<StockDetailsPage> {
                                             referenceId: stockState.projectId,
                                             referenceIdType: 'PROJECT',
                                             quantity: quantity.toString(),
-                                            waybillNumber: waybillNumber,
+                                            wayBillNumber: waybillNumber,
                                             receiverId: receiverId,
                                             receiverType: receiverType,
                                             senderId: senderId,
@@ -834,16 +836,25 @@ class StockDetailsPageState extends LocalizedState<StockDetailsPage> {
                                 ),
                                 if (isWareHouseMgr)
                                   DigitTextFormField(
-                                    key: const Key(_waybillNumberKey),
-                                    label: localizations.translate(
-                                      i18.stockDetails.waybillNumberLabel,
-                                    ),
-                                    formControlName: _waybillNumberKey,
-                                    keyboardType:
-                                        const TextInputType.numberWithOptions(
-                                      decimal: true,
-                                    ),
-                                  ),
+                                      key: const Key(_waybillNumberKey),
+                                      label: localizations.translate(
+                                        i18.stockDetails.waybillNumberLabel,
+                                      ),
+                                      formControlName: _waybillNumberKey,
+                                      keyboardType:
+                                          const TextInputType.numberWithOptions(
+                                        decimal: true,
+                                      ),
+                                      validationMessages: {
+                                        'maxLength': (object) => localizations
+                                            .translate(
+                                                i18.common.maxCharsRequired)
+                                            .replaceAll('{}', '200'),
+                                        'minLength': (object) => localizations
+                                            .translate(
+                                                i18.common.min2CharsRequired)
+                                            .replaceAll('{}', ''),
+                                      }),
                                 if (isWareHouseMgr)
                                   DigitTextFormField(
                                       label: localizations.translate(

packages/inventory_management/lib/pages/reports/report_details.dart

@@ -458,9 +458,9 @@ class InventoryReportDetailsPageState
                                                           DigitGridCell(
                                                             key: waybillKey,
                                                             value: model
-                                                                    .waybillNumber ??
+                                                                    .wayBillNumber ??
                                                                 model
-                                                                    .waybillNumber ??
+                                                                    .wayBillNumber ??
                                                                 '',
                                                           ),
                                                           DigitGridCell(

packages/inventory_management/pubspec.yaml

@@ -1,6 +1,6 @@
 name: inventory_management
 description: This package offers inventory management features, allowing users to view stock reports and perform inventory resource reconciliation.
-version: 1.0.3+2
+version: 1.0.3+4
 homepage: https://github.com/egovernments/health-campaign-field-worker-app/tree/master/packages/inventory_management
 repository: https://github.com/egovernments/health-campaign-field-worker-app