md.asif5/kmobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

APY integrated without testing...

Browse Source
This commit is contained in:
Md Asif
2026-03-18 12:36:41 +05:30
parent 075cb3aaad
commit 8744e69ef7
29 changed files with 1069 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

426
lib/features/yojna/screens/apy_register_screen.dart
View File

@@ -1,4 +1,8 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:kmobile/api/services/yojna_service.dart';
import 'package:kmobile/di/injection.dart';
import 'package:kmobile/l10n/app_localizations.dart';
class APYRegisterScreen extends StatefulWidget {
@@ -12,42 +16,73 @@ class APYRegisterScreen extends StatefulWidget {
class _APYRegisterScreenState extends State<APYRegisterScreen> {
final _formKey = GlobalKey<FormState>();
// Controllers
late final _titleController = TextEditingController(text: widget.initialData?['customertitle']?.toString());
late final _firstNameController = TextEditingController(text: widget.initialData?['customerfirstname']?.toString());
late final _middleNameController = TextEditingController(text: widget.initialData?['customermiddlename']?.toString());
late final _lastNameController = TextEditingController(text: widget.initialData?['customerlastname']?.toString());
late final _customerNoController = TextEditingController(text: widget.initialData?['customerno']?.toString());
late final _accountNoController = TextEditingController(text: widget.initialData?['accountno']?.toString());
late final _balanceController = TextEditingController(text: widget.initialData?['availablebalance']?.toString());
late final _dobController = TextEditingController(text: widget.initialData?['customerdob']?.toString());
late final _genderController = TextEditingController(text: widget.initialData?['gender']?.toString());
late final _marriedController = TextEditingController(text: widget.initialData?['married']?.toString());
late final _mobileController = TextEditingController(text: widget.initialData?['mobilenumber']?.toString());
late final _emailController = TextEditingController(text: widget.initialData?['emailid']?.toString());
late final _aadhaarController = TextEditingController(text: widget.initialData?['aadharno']?.toString());
late final _pincodeController = TextEditingController(text: widget.initialData?['pincode']?.toString());
// Helper to format initial date string (DDMMYYYY -> DD/MM/YYYY)
String _formatInitialDate(dynamic date) {
if (date == null) return '';
String dateStr = date.toString();
if (dateStr.length == 8) {
return "${dateStr.substring(0, 2)}/${dateStr.substring(2, 4)}/${dateStr.substring(4)}";
}
return dateStr;
}
late final _pensionAmountController = TextEditingController(text: widget.initialData?['pensionamtoptedfor']?.toString() ?? '1000');
late final _ageOfJoiningController = TextEditingController(text: widget.initialData?['ageofjoining']?.toString());
late final _spouseNameController = TextEditingController(text: widget.initialData?['nameofspouse']?.toString());
late final _incomeTaxPayerController = TextEditingController(text: widget.initialData?['whetherincometaxpayer']?.toString());
late final _otherSchemeController = TextEditingController(text: widget.initialData?['beneficaryofothersociatysecurityschemes']?.toString());
late final _collectionChannelController = TextEditingController(text: widget.initialData?['collectionchannel']?.toString() ?? '1');
late final _contributionTypeController = TextEditingController(text: widget.initialData?['contributionType']?.toString() ?? 'C');
late final _debitDateController = TextEditingController(text: widget.initialData?['subsequentContributionDebitDate']?.toString());
// Controllers initialized strictly from initialData where available, otherwise empty.
late final _titleController = TextEditingController(
text: widget.initialData?['customertitle']?.toString());
late final _firstNameController = TextEditingController(
text: widget.initialData?['customerfirstname']?.toString());
late final _middleNameController = TextEditingController(
text: widget.initialData?['customermiddlename']?.toString());
late final _lastNameController = TextEditingController(
text: widget.initialData?['customerlastname']?.toString());
late final _customerNoController = TextEditingController(
text: widget.initialData?['customerno']?.toString());
late final _accountNoController = TextEditingController(
text: widget.initialData?['accountno']?.toString());
late final _balanceController = TextEditingController(
text: widget.initialData?['availablebalance']?.toString());
late final _dobController = TextEditingController(
text: _formatInitialDate(widget.initialData?['customerdob']));
late final _genderController = TextEditingController(
text: widget.initialData?['gender']?.toString());
late final _aadhaarController = TextEditingController(
text: widget.initialData?['aadharno']?.toString());
late final _ageOfJoiningController = TextEditingController(
text: widget.initialData?['ageofjoining']?.toString());
late final _emailController = TextEditingController(
text: widget.initialData?['emailid']?.toString());
late final _modeOfCollectionController = TextEditingController(
text: widget.initialData?['modeofcollection']?.toString());
late final _nomineeNameController = TextEditingController(text: widget.initialData?['nomineename']?.toString());
late final _nomineeRelationController = TextEditingController(text: widget.initialData?['relationwithsubscriber']?.toString());
late final _nomineeMinorController = TextEditingController(text: widget.initialData?['nomineeminor']?.toString() ?? 'N');
// Fields that must be filled by the user (no defaults)
late final _marriedController = TextEditingController();
late final _mobileController = TextEditingController();
late final _pincodeController = TextEditingController();
late final _pensionAmountController = TextEditingController();
late final _spouseNameController = TextEditingController();
late final _incomeTaxPayerController = TextEditingController();
late final _otherSchemeController = TextEditingController();
late final _collectionChannelController = TextEditingController();
late final _contributionTypeController = TextEditingController();
late final _debitDateController = TextEditingController();
late final _nomineeNameController = TextEditingController();
late final _nomineeRelationController = TextEditingController();
late final _nomineeMinorController = TextEditingController();
late final _nomineeDobController = TextEditingController();
late final _guardianNameController = TextEditingController();
late final _fatcaController = TextEditingController();
late final _birthCountryController = TextEditingController();
late final _citizenshipCountryController = TextEditingController();
late final _taxResidenceCountryController = TextEditingController();
late final _usPersonController = TextEditingController();
late final _fatcaController = TextEditingController(text: widget.initialData?['fatcacrsapplicable']?.toString());
late final _birthCountryController = TextEditingController(text: widget.initialData?['countryofbirth']?.toString());
late final _citizenshipCountryController = TextEditingController(text: widget.initialData?['countryofcitizenship']?.toString());
late final _taxResidenceCountryController = TextEditingController(text: widget.initialData?['countryofresidencefortaxpurpose']?.toString());
late final _usPersonController = TextEditingController(text: widget.initialData?['uspersonflag']?.toString());
late final _secondNomineeNameController = TextEditingController();
late final _secondNomineeMinorController = TextEditingController();
late final _secondNomineeRelationController = TextEditingController();
late final _fatcaCountController = TextEditingController();
late final _docCitizenshipFlagController = TextEditingController();
late final _reasonNoEvidenceController = TextEditingController();
late final _docNameEvidenceController = TextEditingController();
final Map<String, String> _yesNoOptions = {
'Y': 'Yes',
@@ -60,6 +95,12 @@ class _APYRegisterScreenState extends State<APYRegisterScreen> {
'03': 'Miss',
};
final Map<String, String> _genderOptions = {
'M': 'Male',
'F': 'Female',
'O': 'Other',
};
final Map<String, String> _pensionOptions = {
'1000': '₹1000',
'2000': '₹2000',
@@ -143,20 +184,121 @@ class _APYRegisterScreenState extends State<APYRegisterScreen> {
_citizenshipCountryController.dispose();
_taxResidenceCountryController.dispose();
_usPersonController.dispose();
_secondNomineeNameController.dispose();
_secondNomineeMinorController.dispose();
_secondNomineeRelationController.dispose();
_fatcaCountController.dispose();
_docCitizenshipFlagController.dispose();
_reasonNoEvidenceController.dispose();
_docNameEvidenceController.dispose();
_modeOfCollectionController.dispose();
super.dispose();
}
bool _isFetched(String key) {
return widget.initialData != null &&
widget.initialData!.containsKey(key) &&
widget.initialData![key]?.toString().isNotEmpty == true;
Future<void> _selectDate(BuildContext context, TextEditingController controller) async {
final DateTime? picked = await showDatePicker(
context: context,
initialDate: DateTime.now(),
firstDate: DateTime(1900),
lastDate: DateTime(2100),
);
if (picked != null) {
setState(() {
// Display format: DD/MM/YYYY
controller.text = DateFormat('dd/MM/yyyy').format(picked);
});
}
}
void _handleRegister() {
void _handleRegister() async {
if (_formKey.currentState!.validate()) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Registration logic to be implemented')),
showDialog(
context: context,
barrierDismissible: false,
builder: (context) => const Center(child: CircularProgressIndicator()),
);
try {
final yojnaService = getIt<YojnaService>();
final response = await yojnaService.registerAPY(
accountno: _accountNoController.text,
customerfirstname: _firstNameController.text,
customermiddlename: _middleNameController.text,
customerlastname: _lastNameController.text,
availablebalance: _balanceController.text,
// Remove slashes for API (DD/MM/YYYY -> DDMMYYYY)
customerdob: _dobController.text.replaceAll('/', ''),
emailid: _emailController.text,
gender: _genderController.text,
married: _marriedController.text,
nomineename: _nomineeNameController.text,
relationwithsubscriber: _nomineeRelationController.text,
mobilenumber: _mobileController.text,
nomineeminor: _nomineeMinorController.text,
customerno: _customerNoController.text,
beneficaryofothersociatysecurityschemes: _otherSchemeController.text,
whetherincometaxpayer: _incomeTaxPayerController.text,
customertitle: _titleController.text,
aadharno: _aadhaarController.text,
nameofspouse: _spouseNameController.text,
ageofjoining: _ageOfJoiningController.text,
pensionamtoptedfor: _pensionAmountController.text,
montlycontributioncalculate: _calculatedContribution,
collectionchannel: _collectionChannelController.text,
// Remove slashes for API
subsequentContributionDebitDate: _debitDateController.text.replaceAll('/', ''),
secondnomineeminor: _secondNomineeMinorController.text,
secondnomineename: _secondNomineeNameController.text,
secondrelationshipwithsubscriber: _secondNomineeRelationController.text,
pincode: _pincodeController.text,
fatcacrsapplicable: _fatcaController.text,
countryofbirth: _birthCountryController.text,
countryofcitizenship: _citizenshipCountryController.text,
countryofresidencefortaxpurpose: _taxResidenceCountryController.text,
uspersonflag: _usPersonController.text,
fatcadeclarationcount: _fatcaCountController.text,
documentevidencingcitizenshipflag: _docCitizenshipFlagController.text,
reasonfornoevidence: _reasonNoEvidenceController.text,
nameofdocumentforcitizenshipevidence: _docNameEvidenceController.text,
modeofcollection: _modeOfCollectionController.text,
contributionType: _contributionTypeController.text,
);
if (!mounted) return;
Navigator.pop(context); // Close loading dialog
showDialog(
context: context,
builder: (context) => AlertDialog(
title: const Text('Registration Result'),
content: SingleChildScrollView(
child: Text(response.toString()),
),
actions: [
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text('OK'),
),
],
),
);
} catch (e) {
if (!mounted) return;
Navigator.pop(context); // Close loading dialog
showDialog(
context: context,
builder: (context) => AlertDialog(
title: const Text('Error'),
content: Text('Failed to register: $e'),
actions: [
TextButton(
onPressed: () => Navigator.pop(context),
child: const Text('OK'),
),
],
),
);
}
}
}
@@ -174,7 +316,7 @@ class _APYRegisterScreenState extends State<APYRegisterScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// Tile 1: Customer & APY Details
// Tile 1: Customer Details
Card(
elevation: 2,
child: Padding(
@@ -182,53 +324,104 @@ class _APYRegisterScreenState extends State<APYRegisterScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(l10n.details,
Text(l10n.personaldetails,
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.bold)),
const SizedBox(height: 16),
_buildDropdownField(_titleController, l10n.customerTitle,
_titleOptions,
readOnly: _isFetched('customertitle')),
_buildDropdownField(
_titleController, l10n.customerTitle, _titleOptions),
_buildTextField(
_firstNameController, l10n.customerFirstName,
readOnly: _isFetched('customerfirstname')),
_firstNameController, l10n.customerFirstName),
_buildTextField(
_middleNameController, l10n.customerMiddleName,
readOnly: _isFetched('customermiddlename')),
_middleNameController, l10n.customerMiddleName),
_buildTextField(
_lastNameController, l10n.customerLastName,
readOnly: _isFetched('customerlastname')),
_lastNameController, l10n.customerLastName),
_buildTextField(_customerNoController, l10n.customerNo),
_buildTextField(_accountNoController, l10n.accountNumber,
keyboardType: TextInputType.number,
readOnly: _isFetched('accountno')),
_buildTextField(
_balanceController, l10n.availableBalance,
keyboardType: TextInputType.number,
readOnly: _isFetched('availablebalance')),
keyboardType: TextInputType.number),
_buildTextField(_balanceController, l10n.availableBalance,
keyboardType: TextInputType.number),
_buildTextField(_dobController, l10n.customerDobFormat,
mandatory: true, readOnly: _isFetched('customerdob')),
mandatory: true, onTap: () => _selectDate(context, _dobController)),
_buildDropdownField(
_genderController, l10n.gender, _genderOptions),
_buildTextField(_mobileController, l10n.mobileNumber,
keyboardType: TextInputType.phone),
_buildTextField(_emailController, l10n.emailId,
keyboardType: TextInputType.emailAddress,
readOnly: _isFetched('emailid')),
keyboardType: TextInputType.emailAddress),
_buildTextField(_aadhaarController, l10n.aadhaarNo,
keyboardType: TextInputType.number),
_buildTextField(_pincodeController, l10n.pincode,
keyboardType: TextInputType.number),
_buildDropdownField(
_marriedController, l10n.marriedYesNo, _yesNoOptions,
mandatory: true),
],
),
),
),
const SizedBox(height: 16),
// Tile 2: Nominee Details
Card(
elevation: 2,
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(l10n.nomineeDetails,
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.bold)),
const SizedBox(height: 16),
Text("Nominee 1", style: TextStyle(fontWeight: FontWeight.bold, color: Theme.of(context).colorScheme.primary)),
const SizedBox(height: 8),
_buildTextField(_nomineeNameController, l10n.nomineeName,
mandatory: true),
_buildTextField(_nomineeRelationController, l10n.relationWithSubscriber,
mandatory: true),
_buildDropdownField(_nomineeMinorController,
l10n.nomineeMinor, _yesNoOptions,
mandatory: true, onChanged: (val) {
l10n.nomineeMinor, _yesNoOptions, mandatory: true,
onChanged: (val) {
setState(() {
_nomineeMinorController.text = val ?? 'N';
_nomineeMinorController.text = val ?? '';
});
}),
if (_nomineeMinorController.text == 'Y') ...[
_buildTextField(_nomineeDobController, l10n.nomineeDob,
mandatory: true),
mandatory: true, onTap: () => _selectDate(context, _nomineeDobController)),
_buildTextField(
_guardianNameController, l10n.guardianName,
mandatory: true),
],
const Divider(height: 32),
Text("Nominee 2", style: TextStyle(fontWeight: FontWeight.bold, color: Theme.of(context).colorScheme.primary)),
const SizedBox(height: 8),
_buildTextField(_secondNomineeNameController, l10n.secondNomineeName),
_buildTextField(_secondNomineeRelationController, l10n.secondNomineeRelationship),
_buildDropdownField(_secondNomineeMinorController,
l10n.secondNomineeMinor, _yesNoOptions,
onChanged: (val) {
setState(() {
_secondNomineeMinorController.text = val ?? '';
});
}),
],
),
),
),
const SizedBox(height: 16),
// Tile 3: Scheme & APY Details
Card(
elevation: 2,
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(l10n.schemeDetails,
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.bold)),
const SizedBox(height: 16),
_buildDropdownField(_otherSchemeController,
l10n.isBeneficiaryOtherScheme, _yesNoOptions,
mandatory: true),
@@ -242,40 +435,78 @@ class _APYRegisterScreenState extends State<APYRegisterScreen> {
_buildDropdownField(_collectionChannelController,
l10n.collectionChannel, _collectionChannelOptions,
mandatory: true),
_buildDropdownField(
_fatcaController, l10n.fatcaApplicable, _yesNoOptions),
_buildTextField(_modeOfCollectionController, l10n.modeOfCollection),
],
),
),
),
const SizedBox(height: 16),
// Tile 4: FATCA / CRS Details (KYC Details)
Card(
elevation: 2,
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(l10n.kycdetails,
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.bold)),
const SizedBox(height: 16),
_buildDropdownField(_fatcaController,
l10n.fatcaApplicable, _yesNoOptions),
_buildTextField(
_birthCountryController, l10n.countryOfBirth),
_buildTextField(
_citizenshipCountryController, l10n.countryOfCitizenship),
_buildTextField(_citizenshipCountryController,
l10n.countryOfCitizenship),
_buildTextField(_taxResidenceCountryController,
l10n.countryOfTaxResidence),
_buildDropdownField(
_usPersonController, l10n.usPersonFlag, _yesNoOptions),
const Divider(height: 32),
_buildDropdownField(_usPersonController,
l10n.usPersonFlag, _yesNoOptions),
_buildTextField(_fatcaCountController, "FATCA Declaration Count"),
_buildTextField(_docCitizenshipFlagController, "Doc Evidencing Citizenship Flag"),
_buildTextField(_reasonNoEvidenceController, "Reason for No Evidence"),
_buildTextField(_docNameEvidenceController, "Doc Name for Citizenship Evidence"),
],
),
),
),
const SizedBox(height: 16),
// Tile 5: Pension & Contribution Settings
Card(
elevation: 2,
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(l10n.contributionAmount,
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.bold)),
const SizedBox(height: 16),
_buildDropdownField(_pensionAmountController,
l10n.pensionAmount, _pensionOptions,
mandatory: true, onChanged: (val) {
l10n.pensionAmount, _pensionOptions, mandatory: true,
onChanged: (val) {
setState(() {
_pensionAmountController.text = val ?? '1000';
_pensionAmountController.text = val ?? '';
});
}),
_buildDropdownField(_contributionTypeController,
l10n.periodicity, _getPeriodicityOptions(l10n),
mandatory: true, onChanged: (val) {
setState(() {
_contributionTypeController.text = val ?? 'C';
_contributionTypeController.text = val ?? '';
});
}),
_buildTextField(
_debitDateController, l10n.subsequentDebitDate,
mandatory: true),
mandatory: true, onTap: () => _selectDate(context, _debitDateController)),
],
),
),
),
const SizedBox(height: 16),
// Tile 2: Contribution Amount
// Tile 6: Contribution Amount Summary
Card(
elevation: 2,
color: Theme.of(context).colorScheme.secondaryContainer,
@@ -306,8 +537,10 @@ class _APYRegisterScreenState extends State<APYRegisterScreen> {
ElevatedButton(
onPressed: _handleRegister,
style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.primaryContainer,
foregroundColor: Theme.of(context).colorScheme.onPrimaryContainer,
backgroundColor:
Theme.of(context).colorScheme.primaryContainer,
foregroundColor:
Theme.of(context).colorScheme.onPrimaryContainer,
padding: const EdgeInsets.symmetric(vertical: 16),
elevation: 4,
shape: RoundedRectangleBorder(
@@ -316,7 +549,8 @@ class _APYRegisterScreenState extends State<APYRegisterScreen> {
),
child: Text(
l10n.register,
style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
style: const TextStyle(
fontSize: 16, fontWeight: FontWeight.bold),
),
),
const SizedBox(height: 32),
@@ -327,9 +561,11 @@ class _APYRegisterScreenState extends State<APYRegisterScreen> {
);
}
Widget _buildDropdownField(
TextEditingController controller, String label, Map<String, String> options,
{bool readOnly = false, bool mandatory = false, void Function(String?)? onChanged}) {
Widget _buildDropdownField(TextEditingController controller, String label,
Map<String, String> options,
{bool readOnly = false,
bool mandatory = false,
void Function(String?)? onChanged}) {
String? currentValue =
options.containsKey(controller.text) ? controller.text : null;
@@ -337,15 +573,18 @@ class _APYRegisterScreenState extends State<APYRegisterScreen> {
padding: const EdgeInsets.only(bottom: 16.0),
child: DropdownButtonFormField<String>(
value: currentValue,
onChanged: readOnly ? null : (newValue) {
if (onChanged != null) {
onChanged(newValue);
} else {
setState(() {
controller.text = newValue ?? '';
});
}
},
onChanged: readOnly
? null
: (newValue) {
if (newValue != null) {
setState(() {
controller.text = newValue;
});
}
if (onChanged != null) {
onChanged(newValue);
}
},
decoration: InputDecoration(
labelText: mandatory ? '$label *' : label,
border: const OutlineInputBorder(),
@@ -371,15 +610,18 @@ class _APYRegisterScreenState extends State<APYRegisterScreen> {
Widget _buildTextField(TextEditingController controller, String label,
{TextInputType keyboardType = TextInputType.text,
bool readOnly = false,
bool mandatory = false}) {
bool mandatory = false,
VoidCallback? onTap}) {
return Padding(
padding: const EdgeInsets.only(bottom: 16.0),
child: TextFormField(
controller: controller,
readOnly: readOnly,
readOnly: readOnly || onTap != null,
onTap: onTap,
decoration: InputDecoration(
labelText: mandatory ? '$label *' : label,
border: const OutlineInputBorder(),
suffixIcon: onTap != null ? const Icon(Icons.calendar_today) : null,
contentPadding:
const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
),

119
lib/features/yojna/screens/apy_screen.dart
View File

@@ -1,5 +1,7 @@
import 'package:flutter/material.dart';
import 'package:kmobile/api/services/yojna_service.dart';
import 'package:kmobile/data/models/user.dart';
import 'package:kmobile/di/injection.dart';
import 'package:kmobile/features/yojna/screens/apy_register_screen.dart';
import 'package:kmobile/l10n/app_localizations.dart';
@@ -20,6 +22,7 @@ class _APYScreenState extends State<APYScreen> {
User? _selectedAccount;
List<User> _filteredUsers = [];
final _formKey = GlobalKey<FormState>();
bool _isLoading = false;
@override
void initState() {
@@ -27,7 +30,7 @@ class _APYScreenState extends State<APYScreen> {
_filteredUsers = widget.users
.where((user) => ['SA', 'SB', 'CA', 'CC'].contains(user.accountType))
.toList();
// Pre-fill the account number if possible
if (widget.users.isNotEmpty && widget.selectedIndex < widget.users.length) {
if (_filteredUsers.isNotEmpty) {
@@ -111,58 +114,51 @@ class _APYScreenState extends State<APYScreen> {
),
const SizedBox(height: 24),
ElevatedButton(
onPressed: () {
if (_formKey.currentState!.validate()) {
final mockData = {
"accountno": _selectedAccount?.accountNo ?? "50069506061",
"customerfirstname": "TAMANA",
"customermiddlename": "",
"customerlastname": "",
"availablebalance": "634000",
"customerdob": "06061998",
"emailid": "",
"gender": "F",
"married": "Y",
"nomineename": "shubham Kada",
"relationwithsubscriber": "S",
"mobilenumber": "",
"nomineeminor": "N",
"customerno": "30028309887",
"beneficaryofothersociatysecurityschemes": "N",
"whetherincometaxpayer": "N",
"customertitle": "02",
"aadharno": "",
"nameofspouse": "shubham kada",
"ageofjoining": "27",
"pensionamtoptedfor": "1000",
"montlycontributioncalculate": "90",
"collectionchannel": "1",
"subsequentContributionDebitDate": "02012026",
"secondnomineeminor": "N",
"secondnomineename": "shubham kad",
"secondrelationshipwithsubscriber": "",
"pincode": "176215",
"fatcacrsapplicable": "N",
"countryofbirth": "India",
"countryofcitizenship": "India",
"countryofresidencefortaxpurpose": "India",
"uspersonflag": "N",
"fatcadeclarationcount": "",
"documentevidencingcitizenshipflag": "",
"reasonfornoevidence": "",
"nameofdocumentforcitizenshipevidence": "",
"modeofcollection": "Transfer Voucher",
"contributionType": "C"
};
onPressed: _isLoading
? null
: () async {
if (_formKey.currentState!.validate()) {
setState(() {
_isLoading = true;
});
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => APYRegisterScreen(initialData: mockData),
),
);
}
},
try {
final response = await getIt<YojnaService>()
.fetchpapydetails(
accountno: _selectedAccount!.accountNo ?? '');
if (mounted) {
if (response != null) {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => APYRegisterScreen(
initialData: response),
),
);
} else {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text(
"Failed to fetch details. Please try again.")),
);
}
}
} catch (e) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text("Error: ${e.toString()}")),
);
}
} finally {
if (mounted) {
setState(() {
_isLoading = false;
});
}
}
}
},
style: ElevatedButton.styleFrom(
backgroundColor:
Theme.of(context).colorScheme.primaryContainer,
@@ -174,11 +170,19 @@ class _APYScreenState extends State<APYScreen> {
borderRadius: BorderRadius.circular(8),
),
),
child: Text(
l10n.proceedButton,
style: const TextStyle(
fontSize: 16, fontWeight: FontWeight.bold),
),
child: _isLoading
? const SizedBox(
height: 20,
width: 20,
child: CircularProgressIndicator(
strokeWidth: 2,
),
)
: Text(
l10n.proceedButton,
style: const TextStyle(
fontSize: 16, fontWeight: FontWeight.bold),
),
),
],
),
@@ -187,3 +191,4 @@ class _APYScreenState extends State<APYScreen> {
);
}
}

2
lib/features/yojna/screens/gov_scheme_screen.dart
View File

@@ -64,7 +64,7 @@ class _GovSchemeScreenState extends State<GovSchemeScreen> {
selectedIndex: widget.selectedIndex,
),
),
);// Action for APY will be added later
); // Action for APY will be added later
},
),
),

61
lib/features/yojna/screens/pm_main_screen.dart
View File

@@ -27,9 +27,9 @@ class _PMMainScreenState extends State<PMMainScreen> {
String? _selectedScheme;
List<String> _getSchemes(AppLocalizations l10n) => [
l10n.pmjjbyFull,
l10n.pmsbyFull,
];
l10n.pmjjbyFull,
l10n.pmsbyFull,
];
@override
void initState() {
@@ -76,7 +76,8 @@ class _PMMainScreenState extends State<PMMainScreen> {
return;
}
final String schemeCode = (_selectedScheme == l10n.pmjjbyFull) ? '02' : '01';
final String schemeCode =
(_selectedScheme == l10n.pmjjbyFull) ? '02' : '01';
// Show loading
ScaffoldMessenger.of(context).showSnackBar(
@@ -103,7 +104,9 @@ class _PMMainScreenState extends State<PMMainScreen> {
Map<String, dynamic>? data;
if (response is Map<String, dynamic>) {
data = response;
} else if (response is List && response.isNotEmpty && response[0] is Map<String, dynamic>) {
} else if (response is List &&
response.isNotEmpty &&
response[0] is Map<String, dynamic>) {
data = response[0] as Map<String, dynamic>;
}
@@ -169,15 +172,15 @@ class _PMMainScreenState extends State<PMMainScreen> {
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context);
final schemes = _getSchemes(l10n);
// Ensure _selectedScheme is valid if it was set in a different language
if (_selectedScheme != null && !schemes.contains(_selectedScheme)) {
// Try to find the corresponding scheme in the new language
// This is a bit tricky, but since we only have two:
// If it doesn't match, it might be from the other language.
// For simplicity, we can just reset it or try to guess.
// Better to use non-localized values for the state, but let's just reset for now if it doesn't match
_selectedScheme = null;
// Try to find the corresponding scheme in the new language
// This is a bit tricky, but since we only have two:
// If it doesn't match, it might be from the other language.
// For simplicity, we can just reset it or try to guess.
// Better to use non-localized values for the state, but let's just reset for now if it doesn't match
_selectedScheme = null;
}
return Scaffold(
@@ -243,23 +246,23 @@ class _PMMainScreenState extends State<PMMainScreen> {
decoration: InputDecoration(
labelText: l10n.selectScheme,
border: const OutlineInputBorder(),
contentPadding:
const EdgeInsets.symmetric(vertical: 12, horizontal: 12),
contentPadding: const EdgeInsets.symmetric(
vertical: 12, horizontal: 12),
),
selectedItemBuilder: (BuildContext context) {
return schemes.map((String scheme) {
return Container(
alignment: Alignment.centerLeft,
child: Text(
scheme,
style: const TextStyle(fontSize: 14),
softWrap: true,
maxLines: 2,
overflow: TextOverflow.visible,
),
);
}).toList();
},
selectedItemBuilder: (BuildContext context) {
return schemes.map((String scheme) {
return Container(
alignment: Alignment.centerLeft,
child: Text(
scheme,
style: const TextStyle(fontSize: 14),
softWrap: true,
maxLines: 2,
overflow: TextOverflow.visible,
),
);
}).toList();
},
items: schemes.map((String scheme) {
return DropdownMenuItem<String>(
value: scheme,
@@ -268,7 +271,6 @@ class _PMMainScreenState extends State<PMMainScreen> {
child: Text(
scheme,
style: const TextStyle(fontSize: 15),
softWrap: true,
),
),
@@ -336,4 +338,3 @@ class _PMMainScreenState extends State<PMMainScreen> {
);
}
}

31
lib/features/yojna/screens/pmjjby_enquiry_screen.dart
View File

@@ -119,7 +119,8 @@ class _PMJJBYEnquiryScreenState extends State<PMJJBYEnquiryScreen> {
labelText: l10n.selectFinancialYear,
border: const OutlineInputBorder(),
prefixIcon: const Icon(Icons.calendar_today),
contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
contentPadding: const EdgeInsets.symmetric(
horizontal: 12, vertical: 8),
),
items: _financialYears.map((String year) {
return DropdownMenuItem<String>(
@@ -153,7 +154,9 @@ class _PMJJBYEnquiryScreenState extends State<PMJJBYEnquiryScreen> {
padding: const EdgeInsets.all(16.0),
child: Text(
_errorMessage!,
style: TextStyle(color: Colors.red.shade700, fontWeight: FontWeight.bold),
style: TextStyle(
color: Colors.red.shade700,
fontWeight: FontWeight.bold),
//textAlign: Center,
),
),
@@ -177,13 +180,20 @@ class _PMJJBYEnquiryScreenState extends State<PMJJBYEnquiryScreen> {
),
),
const Divider(),
_buildDetailRow(l10n.customerName, _enquiryData!['customername']),
_buildDetailRow(l10n.policyNumber, _enquiryData!['policynumber']),
_buildDetailRow(l10n.accountNumber, _enquiryData!['accountno']),
_buildDetailRow(l10n.premiumAmount, _enquiryData!['preimiumamount']),
_buildDetailRow(l10n.nomineeName, _enquiryData!['nomineename']),
_buildDetailRow(l10n.date, _enquiryData!['transactiondate']),
_buildDetailRow(l10n.journalNo, _enquiryData!['journalno']),
_buildDetailRow(
l10n.customerName, _enquiryData!['customername']),
_buildDetailRow(
l10n.policyNumber, _enquiryData!['policynumber']),
_buildDetailRow(
l10n.accountNumber, _enquiryData!['accountno']),
_buildDetailRow(
l10n.premiumAmount, _enquiryData!['preimiumamount']),
_buildDetailRow(
l10n.nomineeName, _enquiryData!['nomineename']),
_buildDetailRow(
l10n.date, _enquiryData!['transactiondate']),
_buildDetailRow(
l10n.journalNo, _enquiryData!['journalno']),
],
),
),
@@ -202,7 +212,8 @@ class _PMJJBYEnquiryScreenState extends State<PMJJBYEnquiryScreen> {
children: [
Text(
label,
style: const TextStyle(fontWeight: FontWeight.w500, color: Colors.grey),
style: const TextStyle(
fontWeight: FontWeight.w500, color: Colors.grey),
),
Flexible(
child: Text(

204
lib/features/yojna/screens/pmjjby_screen.dart
View File

@@ -15,26 +15,45 @@ class _PMJJBYScreenState extends State<PMJJBYScreen> {
final _formKey = GlobalKey<FormState>();
// Controllers for all requested fields
late final _aadhaarController = TextEditingController(text: widget.initialData?['aadharno']?.toString());
late final _accountNoController = TextEditingController(text: widget.initialData?['accountno']?.toString());
late final _balanceController = TextEditingController(text: widget.initialData?['availablebalance']?.toString());
late final _countryController = TextEditingController(text: widget.initialData?['country']?.toString() ?? 'IN');
late final _dobController = TextEditingController(text: widget.initialData?['customerdob']?.toString());
late final _nameController = TextEditingController(text: widget.initialData?['customername']?.toString());
late final _customerNoController = TextEditingController(text: widget.initialData?['customerno']?.toString());
late final _acctOpeningDateController = TextEditingController(text: widget.initialData?['dateofacctopening']?.toString());
late final _emailController = TextEditingController(text: widget.initialData?['emailid']?.toString());
late final _financialYearController = TextEditingController(text: widget.initialData?['financialyear']?.toString());
late final _genderController = TextEditingController(text: widget.initialData?['gender']?.toString());
late final _ifscController = TextEditingController(text: widget.initialData?['ifsccode']?.toString());
late final _marriedController = TextEditingController(text: widget.initialData?['married']?.toString());
late final _mobileController = TextEditingController(text: widget.initialData?['mobileno']?.toString());
late final _panController = TextEditingController(text: widget.initialData?['pan']?.toString());
late final _pincodeController = TextEditingController(text: widget.initialData?['pincode']?.toString());
late final _policyNumberController = TextEditingController(text: widget.initialData?['policynumber']?.toString());
late final _premiumAmountController = TextEditingController(text: widget.initialData?['premiumamount']?.toString());
late final _stateController = TextEditingController(text: widget.initialData?['state']?.toString());
late final _aadhaarController =
TextEditingController(text: widget.initialData?['aadharno']?.toString());
late final _accountNoController =
TextEditingController(text: widget.initialData?['accountno']?.toString());
late final _balanceController = TextEditingController(
text: widget.initialData?['availablebalance']?.toString());
late final _countryController = TextEditingController(
text: widget.initialData?['country']?.toString() ?? 'IN');
late final _dobController = TextEditingController(
text: widget.initialData?['customerdob']?.toString());
late final _nameController = TextEditingController(
text: widget.initialData?['customername']?.toString());
late final _customerNoController = TextEditingController(
text: widget.initialData?['customerno']?.toString());
late final _acctOpeningDateController = TextEditingController(
text: widget.initialData?['dateofacctopening']?.toString());
late final _emailController =
TextEditingController(text: widget.initialData?['emailid']?.toString());
late final _financialYearController = TextEditingController(
text: widget.initialData?['financialyear']?.toString());
late final _genderController =
TextEditingController(text: widget.initialData?['gender']?.toString());
late final _ifscController =
TextEditingController(text: widget.initialData?['ifsccode']?.toString());
late final _marriedController =
TextEditingController(text: widget.initialData?['married']?.toString());
late final _mobileController =
TextEditingController(text: widget.initialData?['mobileno']?.toString());
late final _panController =
TextEditingController(text: widget.initialData?['pan']?.toString());
late final _pincodeController =
TextEditingController(text: widget.initialData?['pincode']?.toString());
late final _policyNumberController = TextEditingController(
text: widget.initialData?['policynumber']?.toString());
late final _premiumAmountController = TextEditingController(
text: widget.initialData?['premiumamount']?.toString());
late final _stateController =
TextEditingController(text: widget.initialData?['state']?.toString());
// Mapping options
final Map<String, String> _healthStatusOptions = {
'1': 'Excellent',
@@ -90,16 +109,20 @@ class _PMJJBYScreenState extends State<PMJJBYScreen> {
// Initialize dropdown controllers if data exists in initialData
if (widget.initialData != null) {
if (widget.initialData!.containsKey('ruralcategory')) {
_ruralCategoryController.text = widget.initialData!['ruralcategory'].toString();
_ruralCategoryController.text =
widget.initialData!['ruralcategory'].toString();
}
if (widget.initialData!.containsKey('healthstatus')) {
_healthStatusController.text = widget.initialData!['healthstatus'].toString();
_healthStatusController.text =
widget.initialData!['healthstatus'].toString();
}
if (widget.initialData!.containsKey('nomineerelationship')) {
_nomineeRelationshipController.text = widget.initialData!['nomineerelationship'].toString();
_nomineeRelationshipController.text =
widget.initialData!['nomineerelationship'].toString();
}
if (widget.initialData!.containsKey('nomineeminor')) {
_nomineeMinorController.text = widget.initialData!['nomineeminor'].toString();
_nomineeMinorController.text =
widget.initialData!['nomineeminor'].toString();
}
}
}
@@ -136,9 +159,9 @@ class _PMJJBYScreenState extends State<PMJJBYScreen> {
}
bool _isFetched(String key) {
return widget.initialData != null &&
widget.initialData!.containsKey(key) &&
widget.initialData![key]?.toString().isNotEmpty == true;
return widget.initialData != null &&
widget.initialData!.containsKey(key) &&
widget.initialData![key]?.toString().isNotEmpty == true;
}
Future<void> _handleRegister() async {
@@ -180,8 +203,8 @@ class _PMJJBYScreenState extends State<PMJJBYScreen> {
ruralcategory: _ruralCategoryController.text,
);
String x = response.toString();
if(x.contains('RECORD ALREADY EXISTS')){
x= l10n.recordAlreadyExists;
if (x.contains('RECORD ALREADY EXISTS')) {
x = l10n.recordAlreadyExists;
}
if (mounted) {
@@ -229,38 +252,77 @@ class _PMJJBYScreenState extends State<PMJJBYScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildTextField(_nameController, l10n.customerName, readOnly: _isFetched('customername')),
_buildTextField(_customerNoController, l10n.customerNo, readOnly: _isFetched('customerno')),
_buildTextField(_accountNoController, l10n.accountNumber, keyboardType: TextInputType.number, readOnly: _isFetched('accountno')),
_buildTextField(_balanceController, l10n.availableBalance, keyboardType: TextInputType.number, readOnly: _isFetched('availablebalance')),
_buildTextField(_aadhaarController, l10n.aadhaarNo, keyboardType: TextInputType.number, readOnly: _isFetched('aadharno')),
_buildTextField(_dobController, l10n.customerDobFormat, readOnly: _isFetched('customerdob')),
_buildTextField(_genderController, l10n.gender, readOnly: _isFetched('gender')),
_buildTextField(_marriedController, l10n.marriedYesNo, readOnly: _isFetched('married')),
_buildTextField(_mobileController, l10n.mobileNumber, keyboardType: TextInputType.phone, readOnly: _isFetched('mobileno')),
_buildTextField(_emailController, 'Email ID', keyboardType: TextInputType.emailAddress, readOnly: _isFetched('emailid')),
_buildTextField(_panController, l10n.pan, readOnly: _isFetched('pan')),
_buildTextField(_ifscController, l10n.ifscCode, readOnly: _isFetched('ifsccode')),
_buildTextField(_acctOpeningDateController, l10n.dateOfAcctOpening, readOnly: _isFetched('dateofacctopening')),
_buildTextField(_pincodeController, l10n.pincode, keyboardType: TextInputType.number, readOnly: _isFetched('pincode')),
_buildTextField(_stateController, l10n.state, readOnly: _isFetched('state')),
_buildTextField(_countryController, l10n.country, readOnly: _isFetched('country')),
_buildDropdownField(_ruralCategoryController, l10n.ruralCategory, _ruralOptions, readOnly: _isFetched('ruralcategory')),
_buildTextField(_nameController, l10n.customerName,
readOnly: _isFetched('customername')),
_buildTextField(_customerNoController, l10n.customerNo,
readOnly: _isFetched('customerno')),
_buildTextField(_accountNoController, l10n.accountNumber,
keyboardType: TextInputType.number,
readOnly: _isFetched('accountno')),
_buildTextField(_balanceController, l10n.availableBalance,
keyboardType: TextInputType.number,
readOnly: _isFetched('availablebalance')),
_buildTextField(_aadhaarController, l10n.aadhaarNo,
keyboardType: TextInputType.number,
readOnly: _isFetched('aadharno')),
_buildTextField(_dobController, l10n.customerDobFormat,
readOnly: _isFetched('customerdob')),
_buildTextField(_genderController, l10n.gender,
readOnly: _isFetched('gender')),
_buildTextField(_marriedController, l10n.marriedYesNo,
readOnly: _isFetched('married')),
_buildTextField(_mobileController, l10n.mobileNumber,
keyboardType: TextInputType.phone,
readOnly: _isFetched('mobileno')),
_buildTextField(_emailController, 'Email ID',
keyboardType: TextInputType.emailAddress,
readOnly: _isFetched('emailid')),
_buildTextField(_panController, l10n.pan,
readOnly: _isFetched('pan')),
_buildTextField(_ifscController, l10n.ifscCode,
readOnly: _isFetched('ifsccode')),
_buildTextField(
_acctOpeningDateController, l10n.dateOfAcctOpening,
readOnly: _isFetched('dateofacctopening')),
_buildTextField(_pincodeController, l10n.pincode,
keyboardType: TextInputType.number,
readOnly: _isFetched('pincode')),
_buildTextField(_stateController, l10n.state,
readOnly: _isFetched('state')),
_buildTextField(_countryController, l10n.country,
readOnly: _isFetched('country')),
_buildDropdownField(
_ruralCategoryController, l10n.ruralCategory, _ruralOptions,
readOnly: _isFetched('ruralcategory')),
const Divider(height: 32),
Text(l10n.policyDetails, style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
Text(l10n.policyDetails,
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.bold)),
const SizedBox(height: 16),
_buildTextField(_policyNumberController, l10n.policyNumber, readOnly: _isFetched('policynumber')),
_buildTextField(_premiumAmountController, l10n.premiumAmount, keyboardType: TextInputType.number, readOnly: _isFetched('premiumamount')),
_buildTextField(_financialYearController, l10n.financialYear, readOnly: _isFetched('financialyear')),
_buildDropdownField(_healthStatusController, l10n.healthStatus, _healthStatusOptions),
_buildTextField(_collectionChannelController, l10n.collectionChannel),
_buildTextField(_policyNumberController, l10n.policyNumber,
readOnly: _isFetched('policynumber')),
_buildTextField(_premiumAmountController, l10n.premiumAmount,
keyboardType: TextInputType.number,
readOnly: _isFetched('premiumamount')),
_buildTextField(_financialYearController, l10n.financialYear,
readOnly: _isFetched('financialyear')),
_buildDropdownField(_healthStatusController, l10n.healthStatus,
_healthStatusOptions),
_buildTextField(
_collectionChannelController, l10n.collectionChannel),
const Divider(height: 32),
Text(l10n.nomineeDetails, style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
Text(l10n.nomineeDetails,
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.bold)),
const SizedBox(height: 16),
_buildTextField(_nomineeNameController, l10n.nomineeName),
_buildTextField(_nomineeAddressController, l10n.nomineeAddress),
_buildDropdownField(_nomineeRelationshipController, l10n.nomineeRelationship, _relationshipOptions, readOnly: _isFetched('nomineerelationship')),
_buildDropdownField(_nomineeMinorController, l10n.nomineeMinor, _minorOptions, readOnly: _isFetched('nomineeminor')),
_buildDropdownField(_nomineeRelationshipController,
l10n.nomineeRelationship, _relationshipOptions,
readOnly: _isFetched('nomineerelationship')),
_buildDropdownField(
_nomineeMinorController, l10n.nomineeMinor, _minorOptions,
readOnly: _isFetched('nomineeminor')),
const SizedBox(height: 24),
ElevatedButton(
onPressed: _handleRegister,
@@ -274,7 +336,8 @@ class _PMJJBYScreenState extends State<PMJJBYScreen> {
),
child: Text(
l10n.register,
style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
style: const TextStyle(
fontSize: 16, fontWeight: FontWeight.bold),
),
),
const SizedBox(height: 32),
@@ -285,25 +348,29 @@ class _PMJJBYScreenState extends State<PMJJBYScreen> {
);
}
Widget _buildDropdownField(
TextEditingController controller, String label, Map<String, String> options,
Widget _buildDropdownField(TextEditingController controller, String label,
Map<String, String> options,
{bool readOnly = false}) {
// Determine current value
String? currentValue = options.containsKey(controller.text) ? controller.text : null;
String? currentValue =
options.containsKey(controller.text) ? controller.text : null;
return Padding(
padding: const EdgeInsets.only(bottom: 16.0),
child: DropdownButtonFormField<String>(
value: currentValue,
onChanged: readOnly ? null : (newValue) {
setState(() {
controller.text = newValue ?? '';
});
},
onChanged: readOnly
? null
: (newValue) {
setState(() {
controller.text = newValue ?? '';
});
},
decoration: InputDecoration(
labelText: label,
border: const OutlineInputBorder(),
contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
contentPadding:
const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
),
items: options.entries.map((entry) {
return DropdownMenuItem<String>(
@@ -315,7 +382,9 @@ class _PMJJBYScreenState extends State<PMJJBYScreen> {
);
}
Widget _buildTextField(TextEditingController controller, String label, {TextInputType keyboardType = TextInputType.text, bool readOnly = false}) {
Widget _buildTextField(TextEditingController controller, String label,
{TextInputType keyboardType = TextInputType.text,
bool readOnly = false}) {
return Padding(
padding: const EdgeInsets.only(bottom: 16.0),
child: TextFormField(
@@ -324,7 +393,8 @@ class _PMJJBYScreenState extends State<PMJJBYScreen> {
decoration: InputDecoration(
labelText: label,
border: const OutlineInputBorder(),
contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
contentPadding:
const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
),
keyboardType: keyboardType,
),

35
lib/features/yojna/screens/pmsby_enquiry_screen.dart
View File

@@ -119,7 +119,8 @@ class _PMSBYEnquiryScreenState extends State<PMSBYEnquiryScreen> {
labelText: l10n.selectFinancialYear,
border: const OutlineInputBorder(),
prefixIcon: const Icon(Icons.calendar_today),
contentPadding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
contentPadding: const EdgeInsets.symmetric(
horizontal: 12, vertical: 8),
),
items: _financialYears.map((String year) {
return DropdownMenuItem<String>(
@@ -153,7 +154,9 @@ class _PMSBYEnquiryScreenState extends State<PMSBYEnquiryScreen> {
padding: const EdgeInsets.all(16.0),
child: Text(
_errorMessage!,
style: TextStyle(color: Colors.red.shade700, fontWeight: FontWeight.bold),
style: TextStyle(
color: Colors.red.shade700,
fontWeight: FontWeight.bold),
//textAlign: Center,
),
),
@@ -177,13 +180,24 @@ class _PMSBYEnquiryScreenState extends State<PMSBYEnquiryScreen> {
),
),
const Divider(),
_buildDetailRow(l10n.customerName, _enquiryData!['customername']),
_buildDetailRow(l10n.policyNumber, _enquiryData!['policynumber'] ?? _enquiryData!['policyno']),
_buildDetailRow(l10n.accountNumber, _enquiryData!['accountno']),
_buildDetailRow(l10n.premiumAmount, _enquiryData!['preimiumamount'] ?? _enquiryData!['premiumamount']),
_buildDetailRow(l10n.nomineeName, _enquiryData!['nomineename']),
_buildDetailRow(l10n.date, _enquiryData!['transactiondate']),
_buildDetailRow(l10n.journalNo, _enquiryData!['journalno']),
_buildDetailRow(
l10n.customerName, _enquiryData!['customername']),
_buildDetailRow(
l10n.policyNumber,
_enquiryData!['policynumber'] ??
_enquiryData!['policyno']),
_buildDetailRow(
l10n.accountNumber, _enquiryData!['accountno']),
_buildDetailRow(
l10n.premiumAmount,
_enquiryData!['preimiumamount'] ??
_enquiryData!['premiumamount']),
_buildDetailRow(
l10n.nomineeName, _enquiryData!['nomineename']),
_buildDetailRow(
l10n.date, _enquiryData!['transactiondate']),
_buildDetailRow(
l10n.journalNo, _enquiryData!['journalno']),
],
),
),
@@ -202,7 +216,8 @@ class _PMSBYEnquiryScreenState extends State<PMSBYEnquiryScreen> {
children: [
Text(
label,
style: const TextStyle(fontWeight: FontWeight.w500, color: Colors.grey),
style: const TextStyle(
fontWeight: FontWeight.w500, color: Colors.grey),
),
Flexible(
child: Text(

232
lib/features/yojna/screens/pmsby_screen.dart
View File

@@ -15,30 +15,54 @@ class _PMSBYScreenState extends State<PMSBYScreen> {
final _formKey = GlobalKey<FormState>();
// Controllers for all requested fields
late final _aadhaarController = TextEditingController(text: widget.initialData?['aadharno']?.toString());
late final _accountNoController = TextEditingController(text: widget.initialData?['accountno']?.toString());
late final _balanceController = TextEditingController(text: widget.initialData?['availablebalance']?.toString());
late final _countryController = TextEditingController(text: widget.initialData?['country']?.toString() ?? 'IN');
late final _dobController = TextEditingController(text: widget.initialData?['customerdob']?.toString());
late final _nameController = TextEditingController(text: widget.initialData?['customername']?.toString());
late final _customerNoController = TextEditingController(text: widget.initialData?['customerno']?.toString());
late final _acctOpeningDateController = TextEditingController(text: widget.initialData?['dateofacctopening']?.toString());
late final _emailController = TextEditingController(text: widget.initialData?['emailid']?.toString());
late final _financialYearController = TextEditingController(text: widget.initialData?['financialyear']?.toString());
late final _genderController = TextEditingController(text: widget.initialData?['gender']?.toString());
late final _ifscController = TextEditingController(text: widget.initialData?['ifsccode']?.toString());
late final _marriedController = TextEditingController(text: widget.initialData?['married']?.toString());
late final _mobileController = TextEditingController(text: widget.initialData?['mobileno']?.toString());
late final _panController = TextEditingController(text: widget.initialData?['pan']?.toString());
late final _pincodeController = TextEditingController(text: widget.initialData?['pincode']?.toString());
late final _policyNumberController = TextEditingController(text: widget.initialData?['policyno']?.toString());
late final _premiumAmountController = TextEditingController(text: widget.initialData?['premiumamount']?.toString());
late final _stateController = TextEditingController(text: widget.initialData?['state']?.toString());
late final _address1Controller = TextEditingController(text: widget.initialData?['address1']?.toString());
late final _address2Controller = TextEditingController(text: widget.initialData?['address2']?.toString());
late final _cityController = TextEditingController(text: widget.initialData?['city']?.toString());
late final _relationWithNomineeController = TextEditingController(text: widget.initialData?['relationwithnominee']?.toString());
late final _policyStatusController = TextEditingController(text: widget.initialData?['policystatus']?.toString());
late final _aadhaarController =
TextEditingController(text: widget.initialData?['aadharno']?.toString());
late final _accountNoController =
TextEditingController(text: widget.initialData?['accountno']?.toString());
late final _balanceController = TextEditingController(
text: widget.initialData?['availablebalance']?.toString());
late final _countryController = TextEditingController(
text: widget.initialData?['country']?.toString() ?? 'IN');
late final _dobController = TextEditingController(
text: widget.initialData?['customerdob']?.toString());
late final _nameController = TextEditingController(
text: widget.initialData?['customername']?.toString());
late final _customerNoController = TextEditingController(
text: widget.initialData?['customerno']?.toString());
late final _acctOpeningDateController = TextEditingController(
text: widget.initialData?['dateofacctopening']?.toString());
late final _emailController =
TextEditingController(text: widget.initialData?['emailid']?.toString());
late final _financialYearController = TextEditingController(
text: widget.initialData?['financialyear']?.toString());
late final _genderController =
TextEditingController(text: widget.initialData?['gender']?.toString());
late final _ifscController =
TextEditingController(text: widget.initialData?['ifsccode']?.toString());
late final _marriedController =
TextEditingController(text: widget.initialData?['married']?.toString());
late final _mobileController =
TextEditingController(text: widget.initialData?['mobileno']?.toString());
late final _panController =
TextEditingController(text: widget.initialData?['pan']?.toString());
late final _pincodeController =
TextEditingController(text: widget.initialData?['pincode']?.toString());
late final _policyNumberController =
TextEditingController(text: widget.initialData?['policyno']?.toString());
late final _premiumAmountController = TextEditingController(
text: widget.initialData?['premiumamount']?.toString());
late final _stateController =
TextEditingController(text: widget.initialData?['state']?.toString());
late final _address1Controller =
TextEditingController(text: widget.initialData?['address1']?.toString());
late final _address2Controller =
TextEditingController(text: widget.initialData?['address2']?.toString());
late final _cityController =
TextEditingController(text: widget.initialData?['city']?.toString());
late final _relationWithNomineeController = TextEditingController(
text: widget.initialData?['relationwithnominee']?.toString());
late final _policyStatusController = TextEditingController(
text: widget.initialData?['policystatus']?.toString());
// Mapping options
final Map<String, String> _healthStatusOptions = {
@@ -95,16 +119,20 @@ class _PMSBYScreenState extends State<PMSBYScreen> {
// Initialize dropdown controllers if data exists in initialData
if (widget.initialData != null) {
if (widget.initialData!.containsKey('ruralcategory')) {
_ruralCategoryController.text = widget.initialData!['ruralcategory'].toString();
_ruralCategoryController.text =
widget.initialData!['ruralcategory'].toString();
}
if (widget.initialData!.containsKey('healthstatus')) {
_healthStatusController.text = widget.initialData!['healthstatus'].toString();
_healthStatusController.text =
widget.initialData!['healthstatus'].toString();
}
if (widget.initialData!.containsKey('relationwithnominee')) {
_nomineeRelationshipController.text = widget.initialData!['relationwithnominee'].toString();
_nomineeRelationshipController.text =
widget.initialData!['relationwithnominee'].toString();
}
if (widget.initialData!.containsKey('nomineeminor')) {
_nomineeMinorController.text = widget.initialData!['nomineeminor'].toString();
_nomineeMinorController.text =
widget.initialData!['nomineeminor'].toString();
}
}
}
@@ -146,9 +174,9 @@ class _PMSBYScreenState extends State<PMSBYScreen> {
}
bool _isFetched(String key) {
return widget.initialData != null &&
widget.initialData!.containsKey(key) &&
widget.initialData![key]?.toString().isNotEmpty == true;
return widget.initialData != null &&
widget.initialData!.containsKey(key) &&
widget.initialData![key]?.toString().isNotEmpty == true;
}
Future<void> _handleRegister() async {
@@ -192,8 +220,8 @@ class _PMSBYScreenState extends State<PMSBYScreen> {
policystatus: _policyStatusController.text,
);
String x = response.toString();
if(x.contains('RECORD ALREADY EXISTS')){
x= l10n.recordAlreadyExists;
if (x.contains('RECORD ALREADY EXISTS')) {
x = l10n.recordAlreadyExists;
}
if (mounted) {
@@ -241,43 +269,87 @@ class _PMSBYScreenState extends State<PMSBYScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildTextField(_nameController, l10n.customerName, readOnly: _isFetched('customername')),
_buildTextField(_customerNoController, l10n.customerNo, readOnly: _isFetched('customerno')),
_buildTextField(_accountNoController, l10n.accountNumber, keyboardType: TextInputType.number, readOnly: _isFetched('accountno')),
_buildTextField(_balanceController, l10n.availableBalance, keyboardType: TextInputType.number, readOnly: _isFetched('availablebalance')),
_buildTextField(_aadhaarController, l10n.aadhaarNo, keyboardType: TextInputType.number, readOnly: _isFetched('aadharno')),
_buildTextField(_dobController, l10n.customerDobFormat, readOnly: _isFetched('customerdob')),
_buildTextField(_genderController, l10n.gender, readOnly: _isFetched('gender')),
_buildTextField(_marriedController, l10n.marriedYesNo, readOnly: _isFetched('married')),
_buildTextField(_mobileController, l10n.mobileNumber, keyboardType: TextInputType.phone, readOnly: _isFetched('mobileno')),
_buildTextField(_emailController, 'Email ID', keyboardType: TextInputType.emailAddress, readOnly: _isFetched('emailid')),
_buildTextField(_address1Controller, l10n.address1, readOnly: _isFetched('address1')),
_buildTextField(_address2Controller, l10n.address2, readOnly: _isFetched('address2')),
_buildTextField(_cityController, l10n.city, readOnly: _isFetched('city')),
_buildTextField(_panController, l10n.pan, readOnly: _isFetched('pan')),
_buildTextField(_ifscController, l10n.ifscCode, readOnly: _isFetched('ifsccode')),
_buildTextField(_acctOpeningDateController, l10n.dateOfAcctOpening, readOnly: _isFetched('dateofacctopening')),
_buildTextField(_pincodeController, l10n.pincode, keyboardType: TextInputType.number, readOnly: _isFetched('pincode')),
_buildTextField(_stateController, l10n.state, readOnly: _isFetched('state')),
_buildTextField(_countryController, l10n.country, readOnly: _isFetched('country')),
_buildDropdownField(_ruralCategoryController, l10n.ruralCategory, _ruralOptions, readOnly: _isFetched('ruralcategory')),
_buildTextField(_nameController, l10n.customerName,
readOnly: _isFetched('customername')),
_buildTextField(_customerNoController, l10n.customerNo,
readOnly: _isFetched('customerno')),
_buildTextField(_accountNoController, l10n.accountNumber,
keyboardType: TextInputType.number,
readOnly: _isFetched('accountno')),
_buildTextField(_balanceController, l10n.availableBalance,
keyboardType: TextInputType.number,
readOnly: _isFetched('availablebalance')),
_buildTextField(_aadhaarController, l10n.aadhaarNo,
keyboardType: TextInputType.number,
readOnly: _isFetched('aadharno')),
_buildTextField(_dobController, l10n.customerDobFormat,
readOnly: _isFetched('customerdob')),
_buildTextField(_genderController, l10n.gender,
readOnly: _isFetched('gender')),
_buildTextField(_marriedController, l10n.marriedYesNo,
readOnly: _isFetched('married')),
_buildTextField(_mobileController, l10n.mobileNumber,
keyboardType: TextInputType.phone,
readOnly: _isFetched('mobileno')),
_buildTextField(_emailController, 'Email ID',
keyboardType: TextInputType.emailAddress,
readOnly: _isFetched('emailid')),
_buildTextField(_address1Controller, l10n.address1,
readOnly: _isFetched('address1')),
_buildTextField(_address2Controller, l10n.address2,
readOnly: _isFetched('address2')),
_buildTextField(_cityController, l10n.city,
readOnly: _isFetched('city')),
_buildTextField(_panController, l10n.pan,
readOnly: _isFetched('pan')),
_buildTextField(_ifscController, l10n.ifscCode,
readOnly: _isFetched('ifsccode')),
_buildTextField(
_acctOpeningDateController, l10n.dateOfAcctOpening,
readOnly: _isFetched('dateofacctopening')),
_buildTextField(_pincodeController, l10n.pincode,
keyboardType: TextInputType.number,
readOnly: _isFetched('pincode')),
_buildTextField(_stateController, l10n.state,
readOnly: _isFetched('state')),
_buildTextField(_countryController, l10n.country,
readOnly: _isFetched('country')),
_buildDropdownField(
_ruralCategoryController, l10n.ruralCategory, _ruralOptions,
readOnly: _isFetched('ruralcategory')),
const Divider(height: 32),
Text(l10n.policyDetails, style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
Text(l10n.policyDetails,
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.bold)),
const SizedBox(height: 16),
_buildTextField(_policyNumberController, l10n.policyNumber, readOnly: _isFetched('policyno')),
_buildTextField(_premiumAmountController, l10n.premiumAmount, keyboardType: TextInputType.number, readOnly: _isFetched('premiumamount')),
_buildTextField(_financialYearController, l10n.financialYear, readOnly: _isFetched('financialyear')),
_buildTextField(_policyStatusController, l10n.policyStatus, readOnly: _isFetched('policystatus')),
_buildDropdownField(_healthStatusController, l10n.healthStatus, _healthStatusOptions),
_buildTextField(_collectionChannelController, l10n.collectionChannel),
_buildTextField(_policyNumberController, l10n.policyNumber,
readOnly: _isFetched('policyno')),
_buildTextField(_premiumAmountController, l10n.premiumAmount,
keyboardType: TextInputType.number,
readOnly: _isFetched('premiumamount')),
_buildTextField(_financialYearController, l10n.financialYear,
readOnly: _isFetched('financialyear')),
_buildTextField(_policyStatusController, l10n.policyStatus,
readOnly: _isFetched('policystatus')),
_buildDropdownField(_healthStatusController, l10n.healthStatus,
_healthStatusOptions),
_buildTextField(
_collectionChannelController, l10n.collectionChannel),
const Divider(height: 32),
Text(l10n.nomineeDetails, style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
Text(l10n.nomineeDetails,
style: const TextStyle(
fontSize: 18, fontWeight: FontWeight.bold)),
const SizedBox(height: 16),
_buildTextField(_nomineeNameController, l10n.nomineeName),
_buildTextField(_nomineeAddressController, l10n.nomineeAddress),
_buildDropdownField(_relationWithNomineeController, l10n.relationWithNominee, _relationshipOptions, readOnly: _isFetched('relationwithnominee')),
_buildTextField(_nomineeRelationshipController, l10n.nomineeRelationship),
_buildDropdownField(_nomineeMinorController, l10n.nomineeMinor, _minorOptions, readOnly: _isFetched('nomineeminor')),
_buildDropdownField(_relationWithNomineeController,
l10n.relationWithNominee, _relationshipOptions,
readOnly: _isFetched('relationwithnominee')),
_buildTextField(
_nomineeRelationshipController, l10n.nomineeRelationship),
_buildDropdownField(
_nomineeMinorController, l10n.nomineeMinor, _minorOptions,
readOnly: _isFetched('nomineeminor')),
const SizedBox(height: 24),
ElevatedButton(
onPressed: _handleRegister,
@@ -291,7 +363,8 @@ class _PMSBYScreenState extends State<PMSBYScreen> {
),
child: Text(
l10n.register,
style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
style: const TextStyle(
fontSize: 16, fontWeight: FontWeight.bold),
),
),
const SizedBox(height: 32),
@@ -302,25 +375,29 @@ class _PMSBYScreenState extends State<PMSBYScreen> {
);
}
Widget _buildDropdownField(
TextEditingController controller, String label, Map<String, String> options,
Widget _buildDropdownField(TextEditingController controller, String label,
Map<String, String> options,
{bool readOnly = false}) {
// Determine current value
String? currentValue = options.containsKey(controller.text) ? controller.text : null;
String? currentValue =
options.containsKey(controller.text) ? controller.text : null;
return Padding(
padding: const EdgeInsets.only(bottom: 16.0),
child: DropdownButtonFormField<String>(
value: currentValue,
onChanged: readOnly ? null : (newValue) {
setState(() {
controller.text = newValue ?? '';
});
},
onChanged: readOnly
? null
: (newValue) {
setState(() {
controller.text = newValue ?? '';
});
},
decoration: InputDecoration(
labelText: label,
border: const OutlineInputBorder(),
contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
contentPadding:
const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
),
items: options.entries.map((entry) {
return DropdownMenuItem<String>(
@@ -332,7 +409,9 @@ class _PMSBYScreenState extends State<PMSBYScreen> {
);
}
Widget _buildTextField(TextEditingController controller, String label, {TextInputType keyboardType = TextInputType.text, bool readOnly = false}) {
Widget _buildTextField(TextEditingController controller, String label,
{TextInputType keyboardType = TextInputType.text,
bool readOnly = false}) {
return Padding(
padding: const EdgeInsets.only(bottom: 16.0),
child: TextFormField(
@@ -341,7 +420,8 @@ class _PMSBYScreenState extends State<PMSBYScreen> {
decoration: InputDecoration(
labelText: label,
border: const OutlineInputBorder(),
contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
contentPadding:
const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
),
keyboardType: keyboardType,
),