Skip to content

Commit

Permalink
Added Multi-checklist validation
Browse files Browse the repository at this point in the history 
updated sort at task search query
  • Loading branch information
@naveenr-egov
naveenr-egov committed Sep 27, 2024
1 parent 5fb6235 commit eae106b
Show file tree
Hide file tree
Showing 7 changed files with 204 additions and 147 deletions.
192 changes: 128 additions & 64 deletions apps/health_campaign_field_worker_app/lib/pages/checklist/checklist_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,15 +138,16 @@ class _ChecklistViewPageState extends LocalizedState<ChecklistViewPage> {
}

// Request location from LocationBloc
context.read<LocationBloc>().add(const LocationEvent.load());
context
.read<LocationBloc>()
.add(const LocationEvent.load());

// Wait for the location to be obtained
final locationState =
context.read<LocationBloc>().state;
double? latitude = locationState.latitude;
double? longitude = locationState.longitude;


final shouldSubmit = await DigitDialog.show(
context,
options: DigitDialogOptions(
Expand Down Expand Up @@ -213,19 +214,21 @@ class _ChecklistViewPageState extends LocalizedState<ChecklistViewPage> {
.text
.toString()
: null,
additionalFields: ServiceAttributesAdditionalFields(
additionalFields:
ServiceAttributesAdditionalFields(
version: 1,
fields: [
AdditionalField(
'latitude', latitude,
'latitude',
latitude,
),
AdditionalField(
'longitude', longitude,
'longitude',
longitude,
),
],
),
)
);
));
}

context.read<ServiceBloc>().add(
Expand Down Expand Up @@ -397,7 +400,7 @@ class _ChecklistViewPageState extends LocalizedState<ChecklistViewPage> {
Align(
alignment: Alignment.topLeft,
child: Padding(
padding: const EdgeInsets.all(8),
padding: const EdgeInsets.all(kPadding * 2),
child: Column(
children: [
Text(
Expand All @@ -412,45 +415,89 @@ class _ChecklistViewPageState extends LocalizedState<ChecklistViewPage> {
),
BlocBuilder<ServiceBloc, ServiceState>(
builder: (context, state) {
// Validation logic to check if required field is empty
final hasError = (e.required == true &&
controller[index].text.isEmpty &&
submitTriggered);

return Column(
children: e.values!
.map((e) => DigitCheckboxTile(
label: e,
value: controller[index]
.text
.split('.')
.contains(e),
onChanged: (value) {
context
.read<ServiceBloc>()
.add(
ServiceChecklistEvent(
value: e.toString(),
submitTriggered:
submitTriggered,
),
);
final String ele;
var val = controller[index]
.text
.split('.');
if (val.contains(e)) {
val.remove(e);
ele = val.join(".");
} else {
ele =
"${controller[index].text}.$e";
}
controller[index].value =
TextEditingController
.fromValue(
TextEditingValue(
text: ele,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
// Checkbox options
Column(
children: e.values!
.map((item) => Padding(
padding:
const EdgeInsets.only(
left: kPadding * 2),
child: DigitCheckboxTile(
label: item,
value: controller[index]
.text
.split('.')
.contains(item),
onChanged: (value) {
context
.read<ServiceBloc>()
.add(
ServiceChecklistEvent(
value: item
.toString(),
submitTriggered:
submitTriggered,
),
);

var val =
controller[index]
.text
.split('.');
if (val
.contains(item)) {
val.remove(item);
} else {
val.add(item);
}

// Update the controller with the selected values
controller[index]
.value =
TextEditingController
.fromValue(
TextEditingValue(
text: val.join('.'),
),
).value;

// If the field is required and no option is selected, trigger validation
if (e.required ==
true &&
val.isEmpty) {
submitTriggered =
true;
}
},
),
).value;
},
))
.toList(),
))
.toList(),
),
// Error message display if validation fails
Offstage(
offstage: !hasError,
child: Align(
alignment: Alignment.centerLeft,
child: Text(
localizations.translate(
i18.common.corecommonRequired,
),
style: TextStyle(
color: theme.colorScheme.error,
),
),
),
),
],
);
},
),
Expand All @@ -464,7 +511,7 @@ class _ChecklistViewPageState extends LocalizedState<ChecklistViewPage> {
context,
),
),
]else if (e.dataType == 'Boolean') ...[
] else if (e.dataType == 'Boolean') ...[
if (!(e.code ?? '').contains('.'))
DigitCard(
child: Column(
Expand All @@ -479,7 +526,8 @@ class _ChecklistViewPageState extends LocalizedState<ChecklistViewPage> {
'${localizations.translate(
'${selectedServiceDefinition?.code}.${e.code}',
)} ${e.required == true ? '*' : ''}',
style: theme.textTheme.headlineSmall,
style: theme
.textTheme.headlineSmall,
),
],
),
Expand All @@ -492,30 +540,46 @@ class _ChecklistViewPageState extends LocalizedState<ChecklistViewPage> {
allowMultipleSelection: false,
width: 110,
valueMapper: (value) {
return value ? localizations.translate(
i18.common.coreCommonYes,
) : localizations.translate(
i18.common.coreCommonNo,
);
return value
? localizations.translate(
i18.common
.coreCommonYes,
)
: localizations.translate(
i18.common.coreCommonNo,
);
},
initialSelection: controller[index].text=='true' ? [true] : controller[index].text=='false' ?[false] : [],
options: const [true, false], // TODO: need to update
initialSelection:
controller[index].text ==
'true'
? [true]
: controller[index]
.text ==
'false'
? [false]
: [],
options: const [
true,
false
], // TODO: need to update
onSelectionChanged: (curValue) {
if(curValue.isNotEmpty){
if (curValue.isNotEmpty) {
context
.read<ServiceBloc>()
.add(
ServiceChecklistEvent(
value: curValue.toString(),
submitTriggered:
submitTriggered,
),
);
controller[index].value = TextEditingValue(
text: curValue.first.toString(),
ServiceChecklistEvent(
value: curValue
.toString(),
submitTriggered:
submitTriggered,
),
);
controller[index].value =
TextEditingValue(
text: curValue.first
.toString(),
);
}

},
);
},
Expand Down
Loading

0 comments on commit eae106b

Please sign in to comment.