Nhances/enrollment-app
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX_MinorTask

Browse Source
This commit is contained in:
sanjeev.p 2026-02-17 10:28:54 +05:30
parent 1fb7c324a0
commit e1844828b8
2 changed files with 391 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
lib/presentation/RaiseClaimForm.dart
View File

@ -71,6 +71,7 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
dynamic emailId; dynamic emailId;
List<Map<String, dynamic>> employeePolicyList = []; List<Map<String, dynamic>> employeePolicyList = [];
String? selectedFileNames; String? selectedFileNames;
// html.File? uploadedFile; // html.File? uploadedFile;
// List<html.File> uploadedFiles = []; // List<html.File> uploadedFiles = [];
List<PlatformFile> uploadedFiles = []; List<PlatformFile> uploadedFiles = [];
@ -144,6 +145,7 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
bool isIntimationDateValid = true; bool isIntimationDateValid = true;
bool isAdmitDateValid = true; bool isAdmitDateValid = true;
bool isDischargeDateValid = true; bool isDischargeDateValid = true;
bool isAccidentService = false;
@override @override
void initState() { void initState() {
@ -372,7 +374,6 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
} }
Future<void> sendFormDataToApi() async { Future<void> sendFormDataToApi() async {
setState(() { setState(() {
isServiceValid = serviceId != null; isServiceValid = serviceId != null;
isPolicyValid = selectedClientPolicyId != null; isPolicyValid = selectedClientPolicyId != null;
@ -395,6 +396,8 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
// ☠ Accident / Death // ☠ Accident / Death
final isAccident = [2, 3, 4].contains(serviceId); final isAccident = [2, 3, 4].contains(serviceId);
isAccidentService = isAccident ? true : false;
isAccidentDateValid = !isAccident || accidentDate != null; isAccidentDateValid = !isAccident || accidentDate != null;
isIntimationDateValid = !isAccident || intimationDate != null; isIntimationDateValid = !isAccident || intimationDate != null;
}); });
@ -550,7 +553,8 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
pdf.addPage( pdf.addPage(
pw.Page( pw.Page(
build: (pw.Context context) => pw.Center( build: (pw.Context context) =>
pw.Center(
child: pw.Image(image, fit: pw.BoxFit.contain), child: pw.Image(image, fit: pw.BoxFit.contain),
), ),
), ),
@ -760,7 +764,8 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
buildDropdownField( buildDropdownField(
'Service', 'Service',
(value) { (value) {
final selectedItem = departmentList.firstWhere( final selectedItem = departmentList
.firstWhere(
(item) => item['id'] == value, (item) => item['id'] == value,
orElse: () => {}, orElse: () => {},
); );
@ -776,19 +781,24 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
departmentList, departmentList,
'name', 'name',
serviceId, serviceId,
isRequired: true,
isValid: isServiceValid,
), ),
buildDropdownField( buildDropdownField(
'Select Policy', 'Select Policy',
(value) { (value) {
final selectedPolicy = final selectedPolicy =
policyNumberList.firstWhere((p) => p['id'] == value); policyNumberList.firstWhere((
p) => p['id'] == value);
setState(() { setState(() {
// ✅ THIS is what you send to API // ✅ THIS is what you send to API
selectedClientPolicyId = selectedPolicy['id']; selectedClientPolicyId =
selectedPolicy['id'];
// optional // optional
selectedPolicyTypeId = selectedPolicy['policy_type_id']; selectedPolicyTypeId =
selectedPolicy['policy_type_id'];
policyNumberId = value; policyNumberId = value;
isPolicyValid = true; isPolicyValid = true;
@ -799,45 +809,67 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
policyNumberList, policyNumberList,
'label', // 👈 DISPLAY FIELD 'label', // 👈 DISPLAY FIELD
policyNumberId, policyNumberId,
isRequired: true,
isValid: isPolicyValid, // 👈 Hooked to your state
), ),
buildDropdownFieldSearch( buildDropdownFieldSearch(
'Member Name', 'Member Name',
(value) { (value) {
final member = employeePolicyList.firstWhere( final member = employeePolicyList
.firstWhere(
(m) => m['id'] == value, (m) => m['id'] == value,
); );
setState(() { setState(() {
selectedMemberId = value; selectedMemberId = value;
selectedMemberObject = member; // ✅ FULL OBJECT selectedMemberObject =
member; // ✅ FULL OBJECT
selectedMemberName = member['name']; selectedMemberName = member['name'];
isMemberValid = true; isMemberValid = true;
print('selectedMemberObject $selectedMemberObject'); print(
'selectedMemberObject $selectedMemberObject');
}); });
}, },
employeePolicyList, employeePolicyList,
'name', 'name',
selectedMemberId, selectedMemberId,
isRequired: true,
isValid: isMemberValid, // 👈 Hooked to your state
), ),
]), ]),
_row([ _row([
buildTextField('Message', messageController), buildTextField('Message', messageController,
isRequired: false, isValid: true),
if (serviceId == 1 || serviceId == 72)...[ if (serviceId == 1 || serviceId == 72)...[
buildTextField('Hospital Name', hospitalNameController), buildTextField(
buildTextField('Hospital Address', hospitalAddressController), 'Hospital Name', hospitalNameController,
isRequired: true,
isValid: isHospitalNameValid),
buildTextField('Hospital Address',
hospitalAddressController,
isRequired: true,
isValid: isHospitalAddressValid),
] ]
]), ]),
if (serviceId == 1 || serviceId == 72) if (serviceId == 1 || serviceId == 72)
_row([ _row([
buildTextField('Hospital City', hospitalCityController), buildTextField(
buildTextField('Hospital State', hospitalStateController), 'Hospital City', hospitalCityController,
isRequired: true,
isValid: isHospitalCityValid),
buildTextField(
'Hospital State', hospitalStateController,
isRequired: true,
isValid: isHospitalStateValid),
buildTextField( buildTextField(
'Hospital Pincode', 'Hospital Pincode',
hospitalPinCodeController, hospitalPinCodeController,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
isRequired: true,
isValid: isHospitalPincodeValid,
inputFormatters: [ inputFormatters: [
FilteringTextInputFormatter.digitsOnly, FilteringTextInputFormatter.digitsOnly,
LengthLimitingTextInputFormatter(6), LengthLimitingTextInputFormatter(6),
@ -850,6 +882,8 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
'Hospital Phone No', 'Hospital Phone No',
hospitalPhoneNoController, hospitalPhoneNoController,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
isRequired: true,
isValid: isHospitalPhoneNoValid,
inputFormatters: [ inputFormatters: [
FilteringTextInputFormatter.digitsOnly, FilteringTextInputFormatter.digitsOnly,
LengthLimitingTextInputFormatter(10), LengthLimitingTextInputFormatter(10),
@ -859,6 +893,8 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
label: 'Admit Date', label: 'Admit Date',
selectedDate: admitDate, selectedDate: admitDate,
allowFuture: false, allowFuture: false,
isRequired: true,
isValid: isAdmitDateValid,
onDateSelected: (d) { onDateSelected: (d) {
setState(() { setState(() {
admitDate = d; admitDate = d;
@ -870,14 +906,22 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
label: 'Discharge Date', label: 'Discharge Date',
selectedDate: dischargeDate, selectedDate: dischargeDate,
allowFuture: true, allowFuture: true,
minDate: admitDate?.add(const Duration(days: 1)), minDate: admitDate?.add(
onDateSelected: (d) => setState(() => dischargeDate = d), const Duration(days: 1)),
isRequired: true,
isValid: isDischargeDateValid,
onDateSelected: (d) =>
setState(() => dischargeDate = d),
), ),
buildTextField( buildTextField(
'Claims Amount', 'Claims Amount',
claimAmountController, claimAmountController,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
inputFormatters: [FilteringTextInputFormatter.digitsOnly], isRequired: true,
isValid: isClaimAmountValid,
inputFormatters: [
FilteringTextInputFormatter.digitsOnly
],
), ),
]), ]),
@ -887,12 +931,16 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
label: 'Date of Birth', label: 'Date of Birth',
selectedDate: birthDate, selectedDate: birthDate,
allowFuture: false, allowFuture: false,
onDateSelected: (d) => setState(() => birthDate = d), isRequired: false,isValid: true,
onDateSelected: (d) =>
setState(() => birthDate = d),
), ),
buildDatePickerField( buildDatePickerField(
label: 'Accident Date', label: 'Accident Date',
selectedDate: accidentDate, selectedDate: accidentDate,
allowFuture: false, allowFuture: false,
isRequired: isAccidentService,
isValid: isAccidentDateValid,
onDateSelected: (d) { onDateSelected: (d) {
setState(() { setState(() {
accidentDate = d; accidentDate = d;
@ -905,7 +953,10 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
label: 'Date of Death', label: 'Date of Death',
selectedDate: deathDate, selectedDate: deathDate,
allowFuture: false, allowFuture: false,
onDateSelected: (d) => setState(() => deathDate = d), isRequired: false,
isValid: true,
onDateSelected: (d) =>
setState(() => deathDate = d),
), ),
]), ]),
if ([2, 3, 4].contains(serviceId)) if ([2, 3, 4].contains(serviceId))
@ -914,13 +965,19 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
label: 'Date of Intimation', label: 'Date of Intimation',
selectedDate: intimationDate, selectedDate: intimationDate,
allowFuture: false, allowFuture: false,
onDateSelected: (d) => setState(() => intimationDate = d), isRequired: isAccidentService,
isValid: isIntimationDateValid,
onDateSelected: (d) =>
setState(() => intimationDate = d),
), ),
buildTextField( buildTextField(
'Sum Insured', 'Sum Insured',
sumInsuredController, sumInsuredController,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
inputFormatters: [FilteringTextInputFormatter.digitsOnly], isRequired: false,isValid: true,
inputFormatters: [
FilteringTextInputFormatter.digitsOnly
],
), ),
const SizedBox(), const SizedBox(),
]), ]),
@ -934,7 +991,9 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
width: 120, width: 120,
height: 42, height: 42,
child: ElevatedButton( child: ElevatedButton(
onPressed: isSubmitting ? null : sendFormDataToApi, onPressed: isSubmitting
? null
: sendFormDataToApi,
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFFE26728), backgroundColor: const Color(0xFFE26728),
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
@ -1003,16 +1062,17 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
); );
} }
Widget buildTextField( Widget buildTextField(String label,
String label,
TextEditingController controller, { TextEditingController controller, {
TextInputType keyboardType = TextInputType.text, TextInputType keyboardType = TextInputType.text,
bool isRequired = true, bool isValid = true,
List<TextInputFormatter>? inputFormatters, List<TextInputFormatter>? inputFormatters,
}) { }) {
return Column( return Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
fieldLabel(label), fieldLabel(label, isRequired: isRequired),
formBox( formBox(
child: TextField( child: TextField(
controller: controller, controller: controller,
@ -1024,8 +1084,9 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
), ),
), ),
), ),
if (!isValid) validationText(),
], ],
); ),);
} }
Widget buildTextAreaField(String label, TextEditingController controller) { Widget buildTextAreaField(String label, TextEditingController controller) {
@ -1057,49 +1118,77 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
void Function(int?) onChanged, void Function(int?) onChanged,
List<Map<String, dynamic>> itemsList, List<Map<String, dynamic>> itemsList,
String displayField, String displayField,
int? selectedValue, int? selectedValue, {
) { bool isRequired = true,
bool isValid = true,
}) {
// Logic to calculate font size based on string length
double getDynamicFontSize(String text) {
if (text.length > 25) return 9.0;
if (text.length > 15) return 10.0;
return 12.0;
}
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
fieldLabel(label), fieldLabel(label, isRequired: isRequired),
formBox( formBox(
child: DropdownButtonHideUnderline( child: DropdownButtonHideUnderline(
child: DropdownButton<int>( child: DropdownButton<int>(
isExpanded: true, isExpanded: true,
value: selectedValue, value: selectedValue,
hint: const Text('Select'), hint: const Text(
'Select',
style: TextStyle(fontSize: 12),
),
icon: const Icon(Icons.keyboard_arrow_down), icon: const Icon(Icons.keyboard_arrow_down),
items: itemsList.map<DropdownMenuItem<int>>((item) { items: itemsList.map<DropdownMenuItem<int>>((item) {
String textValue = item[displayField].toString(); // Get the text first
return DropdownMenuItem<int>( return DropdownMenuItem<int>(
value: item['id'], value: item['id'],
child: Text(item[displayField]), child: Text(
textValue,
overflow: TextOverflow.ellipsis,
softWrap: false,
maxLines: 1, // Strictly keep to one line
style: TextStyle(
// Call the function here and pass the textValue
fontSize: getDynamicFontSize(textValue),
),
),
); );
}).toList(), }).toList(),
onChanged: onChanged, onChanged: onChanged,
), ),
), ),
), ),
if (!isValid)
Padding(
padding: const EdgeInsets.only(top: 4, left: 4),
child: Text(
"Required",
style: TextStyle(color: Colors.red, fontSize: 12),
),
),
], ],
); );
} }
Widget buildDropdownFieldSearch(String label,
Widget buildDropdownFieldSearch(
String label,
void Function(int?) onChanged, void Function(int?) onChanged,
List<Map<String, dynamic>> itemsList, List<Map<String, dynamic>> itemsList,
String displayField, String displayField,
int? selectedValue, int? selectedValue,
) { {
bool isRequired = true, // Added
bool isValid = true, // Added
}) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( fieldLabel(label, isRequired: isRequired),
label,
style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500),
),
const SizedBox(height: 4), const SizedBox(height: 4),
Container( Container(
height: 40, height: 40,
@ -1179,6 +1268,12 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
), ),
), ),
), ),
if (!isValid)
Padding(
padding: const EdgeInsets.only(top: 4, left: 4),
child: Text("Required",
style: GoogleFonts.poppins(color: Colors.red, fontSize: 12)),
),
], ],
); );
} }
@ -1191,11 +1286,13 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
required ValueChanged<DateTime?> onDateSelected, required ValueChanged<DateTime?> onDateSelected,
DateTime? minDate, DateTime? minDate,
DateTime? maxDate, DateTime? maxDate,
bool isRequired = true,
bool isValid = true,
}) { }) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
fieldLabel(label), fieldLabel(label, isRequired: isRequired),
formBox( formBox(
child: InkWell( child: InkWell(
onTap: () async { onTap: () async {
@ -1232,6 +1329,7 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
), ),
), ),
), ),
if (!isValid) validationText(),
], ],
); );
} }
@ -1270,16 +1368,36 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
); );
} }
Widget fieldLabel(String text) { Widget fieldLabel(String text, {bool isRequired = false}) {
return Padding( return Padding(
padding: const EdgeInsets.only(bottom: 6), padding: const EdgeInsets.only(bottom: 6),
child: Text( child: RichText(
text, text: TextSpan(
text: text,
style: GoogleFonts.poppins( style: GoogleFonts.poppins(
fontSize: 12, fontSize: 12,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
color: Colors.black, color: Colors.black,
), ),
children: [
if (isRequired)
const TextSpan(
text: ' *',
style: TextStyle(
color: Colors.red, fontWeight: FontWeight.bold),
),
],
),
),
);
}
Widget validationText() {
return Padding(
padding: const EdgeInsets.only(top: 4, left: 4),
child: Text(
"Required",
style: GoogleFonts.poppins(
color: Colors.red, fontSize: 12, fontWeight: FontWeight.w500),
), ),
); );
} }

7
lib/presentation/excelVerification.dart
View File

@ -114,7 +114,14 @@ class _activePolicyExcelErrorState extends State<excelErrorScreen>
// 🟢 CASE 2: Success with data // 🟢 CASE 2: Success with data
if (response['status'] == true) { if (response['status'] == true) {
if (response['message'] == "Error data feteched successfully") {
// This runs if the message matches EXACTLY (including the typo 'feteched')
ToastHelper.showErrorToast(context, response['message']);
}else {
ToastHelper.showSuccessToast(context, response['message']); ToastHelper.showSuccessToast(context, response['message']);
}
setState(() { setState(() {
isLoading = false; isLoading = false;