Seperation of registration and delivery package from registartion_delivery.

apps/health_campaign_field_worker_app/lib/app.dart

@@ -1,6 +1,8 @@
 import 'package:attendance_management/attendance_management.dart';
 import 'package:closed_household/blocs/closed_household.dart';
 import 'package:closed_household/closed_household.dart';
+import 'package:delivery/data/repositories/local/household_global_search.dart';
+import 'package:delivery/data/repositories/local/individual_global_search.dart';
 import 'package:digit_data_model/data_model.dart';
 import 'package:digit_dss/digit_dss.dart';
 import 'package:digit_scanner/blocs/scanner.dart';
@@ -12,13 +14,13 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:inventory_management/inventory_management.dart';
 import 'package:isar/isar.dart';
 import 'package:location/location.dart';
-import 'package:registration_delivery/data/repositories/local/household_global_search.dart';
-import 'package:registration_delivery/data/repositories/local/individual_global_search.dart';
-import 'package:registration_delivery/data/repositories/oplog/oplog.dart';
-import 'package:registration_delivery/models/entities/household.dart';
-import 'package:registration_delivery/models/entities/household_member.dart';
-import 'package:registration_delivery/models/entities/project_beneficiary.dart';
-import 'package:registration_delivery/models/entities/task.dart';
+import 'package:registration/data/repositories/local/household_global_search.dart';
+import 'package:registration/data/repositories/local/individual_global_search.dart';
+import 'package:registration/data/repositories/oplog/oplog.dart';
+import 'package:registration/models/entities/household.dart';
+import 'package:registration/models/entities/household_member.dart';
+import 'package:registration/models/entities/project_beneficiary.dart';
+
 import 'package:survey_form/survey_form.dart';
 
 import 'blocs/app_initialization/app_initialization.dart';
@@ -79,12 +81,24 @@ class MainApplicationState extends State<MainApplication>
             IndividualOpLogManager(widget.isar),
           ),
         ),
+        RepositoryProvider<IndividualGlobalDeliverySearchRepository>(
+          create: (context) => IndividualGlobalDeliverySearchRepository(
+            widget.sql,
+            IndividualOpLogManager(widget.isar),
+          ),
+        ),
         RepositoryProvider<HouseHoldGlobalSearchRepository>(
           create: (context) => HouseHoldGlobalSearchRepository(
             widget.sql,
             HouseholdOpLogManager(widget.isar),
           ),
         ),
+         RepositoryProvider<HouseHoldGlobalDeliverySearchRepository>(
+          create: (context) => HouseHoldGlobalDeliverySearchRepository(
+            widget.sql,
+            HouseholdOpLogManager(widget.isar),
+          ),
+        ),
       ],
       child: BlocProvider(
         create: (context) => AppInitializationBloc(
@@ -336,8 +350,6 @@ class MainApplicationState extends State<MainApplication>
                               projectBeneficiaryRepository: context.repository<
                                   ProjectBeneficiaryModel,
                                   ProjectBeneficiarySearchModel>(),
-                              taskRepository: context
-                                  .repository<TaskModel, TaskSearchModel>(),
                             );
                           },
                           lazy: false,

apps/health_campaign_field_worker_app/lib/blocs/projects_beneficiary_downsync/project_beneficiaries_downsync.dart

@@ -1,11 +1,15 @@
 // GENERATED using mason_cli
 import 'dart:async';
 
+import 'package:delivery/models/entities/referral.dart';
+import 'package:delivery/models/entities/side_effect.dart';
+import 'package:delivery/models/entities/task.dart';
 import 'package:digit_data_model/data_model.dart';
 import 'package:disk_space_update/disk_space_update.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:registration_delivery/registration_delivery.dart';
+import 'package:registration/models/entities/household.dart';
+import 'package:registration/registration.dart';
 import 'package:sync_service/sync_service_lib.dart';
 
 import '../../data/local_store/no_sql/schema/app_configuration.dart';

apps/health_campaign_field_worker_app/lib/data/local_store/no_sql/schema/entity_mapper.dart

@@ -8,12 +8,12 @@ import 'package:digit_data_model/models/entities/user_action.dart';
 import 'package:inventory_management/models/entities/stock.dart';
 import 'package:inventory_management/models/entities/stock_reconciliation.dart';
 import 'package:referral_reconciliation/models/entities/hf_referral.dart';
-import 'package:registration_delivery/models/entities/household.dart';
-import 'package:registration_delivery/models/entities/household_member.dart';
-import 'package:registration_delivery/models/entities/project_beneficiary.dart';
-import 'package:registration_delivery/models/entities/referral.dart';
-import 'package:registration_delivery/models/entities/side_effect.dart';
-import 'package:registration_delivery/models/entities/task.dart';
+import 'package:registration/models/entities/household.dart';
+import 'package:registration/models/entities/household_member.dart';
+import 'package:registration/models/entities/project_beneficiary.dart';
+import 'package:delivery/models/entities/referral.dart';
+import 'package:delivery/models/entities/side_effect.dart';
+import 'package:delivery/models/entities/task.dart';
 
 /// The `EntityMapper` class extends `EntityMapperListener` and provides a concrete implementation
 /// for the `getEntityMappers` method. This method is responsible for mapping a given entity type

apps/health_campaign_field_worker_app/lib/data/sync_service_mapper.dart

@@ -3,10 +3,13 @@ import 'dart:convert';
 
 import 'package:attendance_management/attendance_management.dart';
 import 'package:collection/collection.dart';
+import 'package:delivery/models/entities/referral.dart';
+import 'package:delivery/models/entities/side_effect.dart';
+import 'package:delivery/models/entities/task.dart';
 import 'package:digit_data_model/data_model.dart';
 import 'package:inventory_management/inventory_management.dart';
 import 'package:referral_reconciliation/referral_reconciliation.dart';
-import 'package:registration_delivery/registration_delivery.dart';
+import 'package:registration/registration.dart';
 import 'package:sync_service/data/repositories/sync/remote_type.dart';
 import 'package:sync_service/data/sync_entity_mapper_listener.dart';
 

apps/health_campaign_field_worker_app/lib/pages/authenticated.dart

@@ -1,6 +1,9 @@
 import 'dart:async';
 
 import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:delivery/models/entities/referral.dart';
+import 'package:delivery/models/entities/side_effect.dart';
+import 'package:delivery/models/entities/task.dart';
 import 'package:digit_data_model/data_model.dart';
 import 'package:digit_showcase/showcase_widget.dart';
 import 'package:digit_ui_components/digit_components.dart';
@@ -16,10 +19,9 @@ import 'package:flutter_portal/flutter_portal.dart';
 import 'package:isar/isar.dart';
 import 'package:location/location.dart';
 import 'package:qr_flutter/qr_flutter.dart';
-import 'package:registration_delivery/registration_delivery.dart';
+import 'package:registration/registration.dart';
 import 'package:survey_form/survey_form.dart';
 import 'package:sync_service/sync_service_lib.dart';
-
 import '../blocs/app_initialization/app_initialization.dart';
 import '../blocs/auth/auth.dart';
 import '../blocs/localization/app_localization.dart';
@@ -88,7 +90,8 @@ class AuthenticatedPageWrapper extends StatelessWidget {
                                       ]);
                                     },
                                     child: Container(
-                                      padding: const EdgeInsets.only(right: spacer2),
+                                      padding:
+                                          const EdgeInsets.only(right: spacer2),
                                       width: MediaQuery.of(context).size.width -
                                           60,
                                       child: Align(

apps/health_campaign_field_worker_app/lib/pages/home.dart

@@ -7,6 +7,11 @@ import 'package:closed_household/router/closed_household_router.gm.dart';
 import 'package:complaints/complaints.dart';
 import 'package:complaints/router/complaints_router.gm.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:delivery/models/entities/referral.dart';
+import 'package:delivery/models/entities/side_effect.dart';
+import 'package:delivery/models/entities/task.dart';
+import 'package:delivery/router/delivery_router.gm.dart';
+import 'package:delivery/utils/utils.dart';
 import 'package:digit_data_model/data_model.dart';
 import 'package:digit_data_model/models/entities/household_type.dart';
 import 'package:digit_data_model/models/entities/user_action.dart';
@@ -28,8 +33,9 @@ import 'package:inventory_management/router/inventory_router.gm.dart';
 import 'package:recase/recase.dart';
 import 'package:referral_reconciliation/referral_reconciliation.dart';
 import 'package:referral_reconciliation/router/referral_reconciliation_router.gm.dart';
-import 'package:registration_delivery/registration_delivery.dart';
-import 'package:registration_delivery/router/registration_delivery_router.gm.dart';
+
+import 'package:registration/registration.dart';
+import 'package:registration/router/registration_router.gm.dart';
 import 'package:survey_form/router/survey_form_router.gm.dart';
 import 'package:survey_form/survey_form.dart';
 import 'package:sync_service/blocs/sync/sync.dart';
@@ -362,29 +368,48 @@ class _HomePageState extends LocalizedState<HomePage> {
           icon: Icons.all_inbox,
           label: i18.home.beneficiaryLabel,
           onPressed: () async {
-            RegistrationDeliverySingleton()
+            RegistrationSingleton()
+                .setHouseholdType(HouseholdType.family);
+            if (isTriggerLocalisation) {
+              triggerLocalization();
+              isTriggerLocalisation = false;
+            }
+            await context.router.push(const RegistrationWrapperRoute());
+          },
+        ),
+      ),
+
+
+      i18.home.deliveryLabel:
+          homeShowcaseData.managedelivery.buildWith(
+        child: HomeItemCard(
+          icon: Icons.all_inbox,
+          label: i18.home.deliveryLabel,
+          onPressed: () async {
+            DeliverySingleton()
                 .setHouseholdType(HouseholdType.family);
             if (isTriggerLocalisation) {
               triggerLocalization();
               isTriggerLocalisation = false;
             }
-            await context.router.push(const RegistrationDeliveryWrapperRoute());
+            await context.router.push(const DeliveryWrapperRoute());
           },
         ),
       ),
+
 
       i18.home.clfLabel: homeShowcaseData.clf.buildWith(
         child: HomeItemCard(
           icon: Icons.account_balance,
           label: i18.home.clfLabel,
           onPressed: () async {
-            RegistrationDeliverySingleton()
+            RegistrationSingleton()
                 .setHouseholdType(HouseholdType.community);
             if (isTriggerLocalisation) {
               triggerLocalization();
               isTriggerLocalisation = false;
             }
-            await context.router.push(const RegistrationDeliveryWrapperRoute());
+            await context.router.push(const RegistrationWrapperRoute());
           },
         ),
       ),
@@ -553,6 +578,8 @@ class _HomePageState extends LocalizedState<HomePage> {
       // INFO : Need to add showcase keys of package Here
       i18.home.beneficiaryLabel:
           homeShowcaseData.distributorBeneficiaries.showcaseKey,
+      i18.home.deliveryLabel:
+          homeShowcaseData.managedelivery.showcaseKey,    
       i18.home.manageStockLabel:
           homeShowcaseData.warehouseManagerManageStock.showcaseKey,
       i18.home.stockReconciliationLabel:
@@ -577,6 +604,7 @@ class _HomePageState extends LocalizedState<HomePage> {
     final homeItemsLabel = <String>[
       // INFO: Need to add items label of package Here
       i18.home.beneficiaryLabel,
+      i18.home.deliveryLabel,
       i18.home.clfLabel,
       i18.home.closedHouseHoldLabel,
       i18.home.manageStockLabel,
@@ -599,17 +627,16 @@ class _HomePageState extends LocalizedState<HomePage> {
                 .contains(element) ||
             element == i18.home.db)
         .toList();
-
+     filteredLabels.add(i18.home.deliveryLabel);   
+
     final showcaseKeys = filteredLabels
         .where((f) => f != i18.home.db)
         .map((label) => homeItemsShowcaseMap[label]!)
         .toList();
 
-
-      if (envConfig.variables.envType == EnvType.demo && kReleaseMode) {
-        filteredLabels.remove(i18.home.db);
-      }
-
+    if (envConfig.variables.envType == EnvType.demo && kReleaseMode) {
+      filteredLabels.remove(i18.home.db);
+    }
 
     final List<Widget> widgetList =
         filteredLabels.map((label) => homeItemsMap[label]!).toList();
@@ -750,7 +777,39 @@ void setPackagesSingleton(BuildContext context) {
           userName: context.loggedInUser.name ?? '',
         );
 
-        RegistrationDeliverySingleton().setInitialData(
+        RegistrationSingleton().setInitialData(
+          loggedInUser: context.loggedInUserModel,
+          loggedInUserUuid: context.loggedInUserUuid,
+          maxRadius: appConfiguration.maxRadius!,
+          projectId: context.projectId,
+          selectedBeneficiaryType: context.beneficiaryType,
+          projectType: context.selectedProjectType,
+          selectedProject: context.selectedProject,
+          genderOptions:
+              appConfiguration.genderOptions!.map((e) => e.code).toList(),
+          idTypeOptions:
+              appConfiguration.idTypeOptions!.map((e) => e.code).toList(),
+          householdDeletionReasonOptions: appConfiguration
+              .householdDeletionReasonOptions!
+              .map((e) => e.code)
+              .toList(),
+          householdMemberDeletionReasonOptions: appConfiguration
+              .householdMemberDeletionReasonOptions!
+              .map((e) => e.code)
+              .toList(),
+          searchHouseHoldFilter: appConfiguration.searchHouseHoldFilters != null
+              ? appConfiguration.searchHouseHoldFilters!
+                  .map((e) => e.code)
+                  .toList()
+              : [],
+          searchCLFFilters: appConfiguration.searchCLFFilters != null
+              ? appConfiguration.searchCLFFilters!.map((e) => e.code).toList()
+              : [],
+          houseStructureTypes:
+              appConfiguration.houseStructureTypes?.map((e) => e.code).toList(),
+        );
+
+          DeliverySingleton().setInitialData(
           loggedInUser: context.loggedInUserModel,
           loggedInUserUuid: context.loggedInUserUuid,
           maxRadius: appConfiguration.maxRadius!,

apps/health_campaign_field_worker_app/lib/router/app_router.dart

@@ -5,6 +5,7 @@ import 'package:closed_household/router/closed_household_router.dart';
 import 'package:closed_household/router/closed_household_router.gm.dart';
 import 'package:complaints/router/complaints_router.dart';
 import 'package:complaints/router/complaints_router.gm.dart';
+import 'package:delivery/router/delivery_router.dart';
 import 'package:digit_data_model/data_model.dart';
 import 'package:digit_data_model/data_model.dart';
 import 'package:digit_dss/router/dashboard_router.dart';
@@ -16,8 +17,11 @@ import 'package:inventory_management/router/inventory_router.dart';
 import 'package:inventory_management/router/inventory_router.gm.dart';
 import 'package:referral_reconciliation/router/referral_reconciliation_router.dart';
 import 'package:referral_reconciliation/router/referral_reconciliation_router.gm.dart';
-import 'package:registration_delivery/router/registration_delivery_router.dart';
-import 'package:registration_delivery/router/registration_delivery_router.gm.dart';
+
+import 'package:delivery/router/delivery_router.gm.dart' ;
+
+import 'package:registration/router/registration_router.dart';
+import 'package:registration/router/registration_router.gm.dart';
 import 'package:survey_form/router/survey_form_router.dart';
 import 'package:survey_form/router/survey_form_router.gm.dart';
 
@@ -45,11 +49,12 @@ part 'app_router.gr.dart';
     AttendanceRoute,
     ReferralReconciliationRoute,
     DigitScannerPackageRoute,
-    RegistrationDeliveryRoute,
+    RegistrationRoute,
     ClosedHouseholdPackageRoute,
     DashboardRoute,
     SurveyFormRoute,
-    ComplaintsRoute
+    ComplaintsRoute,
+    DeliveryRoute
   ],
 )
 class AppRouter extends _$AppRouter {
@@ -87,7 +92,9 @@ class AppRouter extends _$AppRouter {
           page: UserDashboardRoute.page,
           path: 'dashboard',
         ),
-        ...RegistrationDeliveryRoute().routes,
+        ...RegistrationRoute().routes,
+
+        ...DeliveryRoute().routes,
 
         /// close household
         ...ClosedHouseholdPackageRoute().routes,