Skip to content
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

updated numeric field to have max 5 digits #674

Merged
merged 1 commit into from
Feb 11, 2025
Merged

updated numeric field to have max 5 digits #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 20 additions & 19 deletions apps/health_campaign_field_worker_app/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,11 @@ packages:
closed_household:
dependency: "direct main"
description:
path: "../../packages/closed_household"
relative: true
source: path
version: "1.0.4"
name: closed_household
sha256: d3e78f1a1f65a88b695d37d4fbf217cd3e259c8fdb11402dfb821225a11726c2
url: "https://pub.dev"
source: hosted
version: "1.0.3"
code_builder:
dependency: transitive
description:
Expand All @@ -362,10 +363,11 @@ packages:
complaints:
dependency: "direct main"
description:
path: "../../packages/complaints"
relative: true
source: path
version: "1.0.1"
name: complaints
sha256: "6e383d4be32cee58696258c2f58176ef9869b2afc4aeed252e4b3757eb4bfb76"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
connectivity_plus:
dependency: "direct main"
description:
Expand Down Expand Up @@ -509,7 +511,7 @@ packages:
path: "../../packages/digit_data_model"
relative: true
source: path
version: "1.0.5-dev.2"
version: "1.0.5-dev.3"
digit_dss:
dependency: "direct main"
description:
Expand Down Expand Up @@ -543,19 +545,18 @@ packages:
digit_showcase:
dependency: "direct main"
description:
name: digit_showcase
sha256: "75b67298f1860ad757827b15af752b677f934b5275b887e36b15e25a5285e498"
url: "https://pub.dev"
source: hosted
version: "1.0.0"
path: "../../packages/digit_showcase"
relative: true
source: path
version: "1.0.1"
digit_ui_components:
dependency: "direct main"
description:
name: digit_ui_components
sha256: "1010132c36b6785b20fa702a772c172a5287b5bfca301105bf63444ce7a1c944"
sha256: a0637ca53c234e476f65f71a5967663499e4fbea863715c6400c701700289d1d
url: "https://pub.dev"
source: hosted
version: "0.0.2-dev.10"
version: "0.0.2-dev.11"
dio:
dependency: "direct main"
description:
Expand Down Expand Up @@ -669,7 +670,7 @@ packages:
source: hosted
version: "8.0.7"
file_selector_linux:
dependency: transitive
dependency: "direct overridden"
description:
name: file_selector_linux
sha256: "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33"
Expand All @@ -685,7 +686,7 @@ packages:
source: hosted
version: "0.9.4+2"
file_selector_platform_interface:
dependency: transitive
dependency: "direct overridden"
description:
name: file_selector_platform_interface
sha256: a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b
Expand Down Expand Up @@ -815,7 +816,7 @@ packages:
source: hosted
version: "3.0.7"
flutter_dropzone_platform_interface:
dependency: transitive
dependency: "direct overridden"
description:
name: flutter_dropzone_platform_interface
sha256: b4e2df75364bab2f4c3ca32b87193267d786b6e158c3f345c3a1daeb911d82b9
Expand Down
4 changes: 2 additions & 2 deletions apps/health_campaign_field_worker_app/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: health_campaign_field_worker_app
description: A new Flutter project.
publish_to: 'none'
version: 1.6.0+0
version: 1.7.0

environment:
sdk: '>=3.0.0 <=4.0.0'
Expand All @@ -18,7 +18,7 @@ dependencies:
sqlite3_flutter_libs: ^0.5.11+1
path_provider: ^2.1.3
path: ^1.9.0
digit_ui_components: ^0.0.2-dev.9
digit_ui_components: ^0.0.2-dev.11
auto_route: ^8.3.0
flutter_bloc: ^8.1.5
collection: ^1.18.0
Expand Down
63 changes: 47 additions & 16 deletions packages/registration_delivery/lib/pages/beneficiary_registration/household_details.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:digit_ui_components/theme/digit_extended_theme.dart';
import 'package:digit_ui_components/widgets/atoms/text_block.dart';
import 'package:digit_ui_components/widgets/molecules/digit_card.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:intl/intl.dart';
import 'package:reactive_forms/reactive_forms.dart';
Expand Down Expand Up @@ -413,8 +414,14 @@ class HouseHoldDetailsPageState extends LocalizedState<HouseHoldDetailsPage> {
.noOfPregnantWomenCountLabel,
),
child: DigitNumericFormInput(
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
minValue: 0,
maxValue: 10,
maxValue: RegistrationDeliverySingleton()
.householdType !=
HouseholdType.community
? 10
: 100000,
maxLength: 5,
step: 1,
editable: RegistrationDeliverySingleton()
.householdType ==
Expand All @@ -424,19 +431,23 @@ class HouseHoldDetailsPageState extends LocalizedState<HouseHoldDetailsPage> {
.value
.toString(),
onChange: (value) {
form.control(_pregnantWomenCountKey).value =
int.parse(value);
int pregnantWomen = form
.control(_pregnantWomenCountKey)
.value;
int children =
form.control(_childrenCountKey).value;
int memberCount =
form.control(_memberCountKey).value;
form.control(_memberCountKey).value =
memberCount < (children + pregnantWomen)
? children + pregnantWomen
: memberCount;
if(value.isEmpty){
form.control(_pregnantWomenCountKey).value = 0;
}else{
form.control(_pregnantWomenCountKey).value =
int.parse(value);
int pregnantWomen = form
.control(_pregnantWomenCountKey)
.value;
int children =
form.control(_childrenCountKey).value;
int memberCount =
form.control(_memberCountKey).value;
form.control(_memberCountKey).value =
memberCount < (children + pregnantWomen)
? children + pregnantWomen
: memberCount;
}
},
),
),
Expand All @@ -453,8 +464,14 @@ class HouseHoldDetailsPageState extends LocalizedState<HouseHoldDetailsPage> {
.noOfChildrenBelow5YearsLabel,
),
child: DigitNumericFormInput(
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
minValue: 0,
maxValue: 20,
maxValue: RegistrationDeliverySingleton()
.householdType !=
HouseholdType.community
? 20
: 100000,
maxLength: 5,
step: 1,
editable: RegistrationDeliverySingleton()
.householdType ==
Expand All @@ -464,6 +481,10 @@ class HouseHoldDetailsPageState extends LocalizedState<HouseHoldDetailsPage> {
.value
.toString(),
onChange: (value) {
if(value.isEmpty){
form.control(_childrenCountKey).value = 0;
return;
}
form.control(_childrenCountKey).value =
int.parse(value);
int pregnantWomen = form
Expand Down Expand Up @@ -493,10 +514,16 @@ class HouseHoldDetailsPageState extends LocalizedState<HouseHoldDetailsPage> {
i18.householdDetails.noOfMembersCountLabel,
),
child: DigitNumericFormInput(
inputFormatters: [FilteringTextInputFormatter.digitsOnly],
minValue: children + pregnantWomen != 0
? children + pregnantWomen
: 1,
maxValue: 30,
maxValue: RegistrationDeliverySingleton()
.householdType !=
HouseholdType.community
? 30
: 1000000,
maxLength: 5,
step: 1,
editable: RegistrationDeliverySingleton()
.householdType ==
Expand All @@ -506,6 +533,10 @@ class HouseHoldDetailsPageState extends LocalizedState<HouseHoldDetailsPage> {
.value
.toString(),
onChange: (value) {
if(value.isEmpty){
form.control(_memberCountKey).value = 1;
return;
}
form.control(_memberCountKey).value =
int.parse(value);
int pregnantWomen = form
Expand Down
29 changes: 18 additions & 11 deletions packages/registration_delivery/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.11.0"
attendance_management:
dependency: "direct overridden"
description:
path: "../attendance_management"
relative: true
source: path
version: "1.0.3-dev.1"
audioplayers:
dependency: transitive
description:
Expand Down Expand Up @@ -226,13 +233,13 @@ packages:
source: hosted
version: "0.11.0+2"
camera_android_camerax:
dependency: transitive
dependency: "direct overridden"
description:
name: camera_android_camerax
sha256: "011be2ab0e5b3e3aa8094413fa890f8c5c5afd7cfdaef353a992047d4dab5780"
sha256: "594b40a5ea0e144fdfe49e4036abe4ec9bd578b2ce3aabdb0668a02db376a1e8"
url: "https://pub.dev"
source: hosted
version: "0.6.8+2"
version: "0.6.7"
camera_avfoundation:
dependency: transitive
description:
Expand Down Expand Up @@ -408,7 +415,7 @@ packages:
path: "../digit_data_model"
relative: true
source: path
version: "1.0.5-dev.2"
version: "1.0.5-dev.3"
digit_scanner:
dependency: "direct main"
description:
Expand All @@ -429,10 +436,10 @@ packages:
dependency: "direct main"
description:
name: digit_ui_components
sha256: "1010132c36b6785b20fa702a772c172a5287b5bfca301105bf63444ce7a1c944"
sha256: a0637ca53c234e476f65f71a5967663499e4fbea863715c6400c701700289d1d
url: "https://pub.dev"
source: hosted
version: "0.0.2-dev.10"
version: "0.0.2-dev.11"
dio:
dependency: "direct main"
description:
Expand Down Expand Up @@ -514,7 +521,7 @@ packages:
source: hosted
version: "8.0.0+1"
file_selector_linux:
dependency: transitive
dependency: "direct overridden"
description:
name: file_selector_linux
sha256: "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492"
Expand All @@ -530,7 +537,7 @@ packages:
source: hosted
version: "0.9.4"
file_selector_platform_interface:
dependency: transitive
dependency: "direct overridden"
description:
name: file_selector_platform_interface
sha256: a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b
Expand Down Expand Up @@ -575,13 +582,13 @@ packages:
source: hosted
version: "3.0.7"
flutter_dropzone_platform_interface:
dependency: transitive
dependency: "direct overridden"
description:
name: flutter_dropzone_platform_interface
sha256: "96d2c51c86063ba150551c3b40fd26c5a18785bee071c0c751502d28a545df3b"
sha256: b4e2df75364bab2f4c3ca32b87193267d786b6e158c3f345c3a1daeb911d82b9
url: "https://pub.dev"
source: hosted
version: "2.2.0"
version: "2.0.6"
flutter_dropzone_web:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion packages/registration_delivery/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ environment:
dependencies:
flutter:
sdk: flutter
digit_ui_components: ^0.0.2-dev.10
digit_ui_components: ^0.0.2-dev.11
flutter_bloc: ^8.1.5
freezed_annotation: ^2.4.1
reactive_forms: ^17.0.0
Expand Down