Skip to content

updated facility selection in registration-delivery and referral #680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yashita-egov wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

updated facility selection in registration-delivery and referral #680

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
01a643d
updated facility selection in registration-delivery and referral
yashita-egov Feb 13, 2025
94ee8c6
updated digit_ui library version
yashita-egov Feb 14, 2025
8c66261
unlocalized codes display fix during login and logout
naveenr-egov Feb 17, 2025
f4f1270
Added PRODUCT as enum in beneficiary_type.dart
naveenr-egov Feb 17, 2025
a64ce99
added dropdown in inventory package
yashita-egov Feb 19, 2025
d53755d
Merge branch 'develop' of https://github.com/egovernments/health-camp…
yashita-egov Feb 19, 2025
cd185b2
stock bug fixes for dropdown component added selectedOptions
naveenr-egov Feb 19, 2025
2cada72
Merge branch '1.7-patch' into HCMPRE-2292
naveenr-egov Mar 3, 2025
3cb0604
merge conflicts
naveenr-egov Mar 3, 2025
1be5a9f
Merge branch 'develop' into HCMPRE-2292
naveenr-egov Mar 25, 2025
a9023c1
updated with dev
naveenr-egov Mar 25, 2025
bf19c65
updated dropdown field to disabled in viewonly flow - HCMPRE-2592
naveenr-egov Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions apps/health_campaign_field_worker_app/lib/router/app_router.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,6 @@ class AppRouter extends _$AppRouter {
page: ProjectFacilitySelectionRoute.page,
path: 'select-project-facilities',
),
AutoRoute(
page: FacilitySelectionRoute.page,
path: 'select-facilities',
),

/// Project Selection
AutoRoute(
Expand Down
1 change: 0 additions & 1 deletion packages/inventory_management/lib/inventory_management.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export 'models/entities/stock_reconciliation.dart';
export 'models/entities/transaction_reason.dart';
export 'models/entities/transaction_type.dart';
export 'pages/acknowledgement.dart';
export 'pages/facility_selection.dart';
export 'pages/manage_stocks.dart';
export 'pages/record_stock/record_stock_wrapper.dart';
export 'pages/record_stock/stock_details.dart';
Expand Down
193 changes: 0 additions & 193 deletions packages/inventory_management/lib/pages/facility_selection.dart
View file
Open in desktop

This file was deleted.

142 changes: 74 additions & 68 deletions packages/inventory_management/lib/pages/record_stock/stock_details.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import '../../../utils/i18_key_constants.dart' as i18;
import '../../../widgets/localized.dart';
import '../../blocs/product_variant.dart';
import '../../blocs/record_stock.dart';
import '../../utils/constants.dart';
import '../../widgets/back_navigation_help_header.dart';

@RoutePage()
Expand Down Expand Up @@ -746,77 +747,82 @@ class StockDetailsPageState extends LocalizedState<StockDetailsPage> {
const SizedBox(
height: spacer4,
),
InkWell(
onTap: () async {
clearQRCodes();
form
.control(_deliveryTeamKey)
.value = '';

final facility =
await context.router.push(
InventoryFacilitySelectionRoute(
facilities:
facilities))
as FacilityModel?;

if (facility == null) return;
form
.control(_secondaryPartyKey)
.value =
ReactiveWrapperField(
formControlName:
_secondaryPartyKey,
validationMessages: {
'required': (object) =>
localizations.translate(
'FAC_${facility.id}',
);
controller1.text =
localizations.translate(
'FAC_${facility.id}');
setState(() {
selectedFacilityId =
facility.id;
});
if (facility.id ==
'Delivery Team') {
setState(() {
deliveryTeamSelected = true;
});
} else {
setState(() {
deliveryTeamSelected =
false;
});
}
'${i18.individualDetails.nameLabelText}_IS_REQUIRED',
),
},
child: IgnorePointer(
child: ReactiveWrapperField(
formControlName:
_secondaryPartyKey,
validationMessages: {
'required': (object) =>
localizations
.translate(
'${i18.individualDetails.nameLabelText}_IS_REQUIRED',
),
},
showErrors: (control) =>
control.invalid &&
control.touched,
builder: (field) {
return InputField(
type: InputType.search,
isRequired: true,
label: localizations
showErrors: (control) =>
control.invalid &&
control.touched,
builder: (field) => LabeledField(
label: localizations.translate(
'${pageTitle}_${i18.stockReconciliationDetails.stockLabel}',
),
isRequired: true,
child: DigitDropdown(
sentenceCaseEnabled: false,
selectedOption: DropdownItem(
name: form
.control(
_secondaryPartyKey)
.value ??
'',
code: selectedFacilityId ??
'',
),
isSearchable: true,
emptyItemText: localizations
.translate(i18
.common.noMatchFound),
errorMessage: field.errorText,
onSelect: (value) {
clearQRCodes();
form
.control(
_deliveryTeamKey)
.value = '';

form
.control(
_secondaryPartyKey)
.value =
localizations.translate(
'FAC_${value.code}',
);
controller1.text =
localizations.translate(
'FAC_${value.code}');
setState(() {
selectedFacilityId =
value.code;
});

if (value.code ==
'Delivery Team') {
setState(() {
deliveryTeamSelected =
true;
});
} else {
setState(() {
deliveryTeamSelected =
false;
});
}
},
items: facilities.map((e) {
return DropdownItem(
name: localizations
.translate(
'${pageTitle}_${i18.stockReconciliationDetails.stockLabel}',
),
onChange: (value) {
field.control
.markAsTouched();
},
controller: controller1,
errorMessage:
field.errorText,
);
}),
'$facilityPrefix${e.id}'),
code: e.id);
}).toList(),
),
),
),
],
Expand Down
Loading
Loading