UI_HR_POLICY_CHANGES

lib/claimshistory.dart

@@ -0,0 +1,467 @@
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:nhancepolicy/service/api_service.dart';
+
+class ClaimHistoryPopup extends StatefulWidget {
+  final String ticket_id;
+  final String empName;
+  final String empCode;
+  final String policyType;
+  final String clientPolicyNo;
+  final String claimAmount;
+  final String claimNo;
+  final String postToken;
+
+  const ClaimHistoryPopup({
+    Key? key,
+    required this.ticket_id,
+    required this.empName,
+    required this.empCode,
+    required this.policyType,
+    required this.clientPolicyNo,
+    required this.claimAmount,
+    required this.claimNo,
+    required this.postToken,
+  }) : super(key: key);
+
+  @override
+  State<ClaimHistoryPopup> createState() => _ClaimHistoryPopupState();
+}
+
+class _ClaimHistoryPopupState extends State<ClaimHistoryPopup> {
+  late ApiService apiService;
+  List<Map<String, dynamic>> getClaimsHistoryList = [];
+  int _index = 4;
+
+  @override
+  void initState() {
+    super.initState();
+    apiService = ApiService(context);
+    print(widget.postToken);
+    print(widget.claimAmount);
+    print(widget.claimNo);
+    print(widget.clientPolicyNo);
+    print(widget.empCode);
+    print(widget.policyType);
+    print(widget.ticket_id);
+    // getClaimsHistoryDetails();
+  }
+
+  @override
+  void dispose() {
+    super.dispose();
+  }
+
+  // Future<void> getClaimsHistoryDetails() async {
+  //   setState(() {
+  //     // isLoading = true;
+  //   });
+  //   try {
+  //     print('10');
+  //    final ticketID = widget.ticket_id;
+  //    if(ticketID != '' || ticketID != null){
+  //      return;
+  //    }
+  //     final response = await apiService.getClaimsHistoryToApi(
+  //         widget.ticket_id, widget.postToken);
+  //     if (response['status'] == 'success') {
+  //       setState(() {
+  //         // isLoading = false;
+  //       });
+  //       setState(() {
+  //         getClaimsHistoryList = List<Map<String, dynamic>>.from(response['data']);
+  //         // originalData = getCDPolicies;
+  //         // filteredData = List.from(originalData);
+  //         // print('filteredData');
+  //         // print(filteredData);
+  //       });
+  //     } else {
+  //       setState(() {
+  //         // isLoading = false;
+  //       });
+  //
+  //       // ToastHelper.showWarningToast(
+  //       //     context, 'Request failed with status: ${response.statusCode}');
+  //       print('Request failed with status: ${response['code']}');
+  //     }
+  //   } catch (e) {
+  //     setState(() {
+  //       // isLoading = false;
+  //     });
+  //     print('Exception occurred: $e');
+  //   } finally {
+  //     setState(() {
+  //       // _isLoading = false;
+  //     });
+  //   }
+  // }
+
+  @override
+  Widget build(BuildContext context) {
+    if (getClaimsHistoryList.isEmpty) {
+      return SizedBox(
+        height: 50,
+        child: Center(child: Text('No available Claims')),
+      );
+    }
+    return Container(
+      constraints: BoxConstraints(maxWidth: 800, maxHeight: 800),
+      padding: EdgeInsets.all(20),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: SingleChildScrollView(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: Align(
+                    alignment: Alignment.centerLeft,
+                    child: Text(
+                      'Claim History',
+                      style: GoogleFonts.poppins(
+                        fontSize: 20,
+                        fontWeight: FontWeight.w500,
+                        color: Color(0xFF101010),
+                      ),
+                    ),
+                  ),
+                ),
+                MouseRegion(
+                  cursor: SystemMouseCursors.click, // Show pointer cursor
+                  child: GestureDetector(
+                    onTap: () => Navigator.of(context).pop(),
+                    child: Container(
+                      height: 30,
+                      width: 30,
+                      decoration: BoxDecoration(
+                        color: Colors.white,
+                        border: Border.all(color: Color(0xFFBCBCBC)),
+                        borderRadius: BorderRadius.circular(6),
+                      ),
+                      child: Icon(
+                        Icons.close,
+                        size: 25,
+                        color: Color(0xFFBCBCBC),
+                      ),
+                    ),
+                  ),
+                )
+              ],
+            ),
+            SizedBox(height: 10),
+            // Container(
+            //   decoration: BoxDecoration(
+            //     color: Color(0xFFFFFFFF), // White background
+            //     borderRadius: BorderRadius.circular(12),
+            //     boxShadow: [
+            //       BoxShadow(
+            //         color: Color(0xFFEBEBEB), // Shadow color
+            //         blurRadius: 14, // How soft the shadow is
+            //         spreadRadius: 2, // How much it spreads
+            //         offset: Offset(0, 1), // X and Y offset
+            //       ),
+            //     ],
+            //   ),
+            //   padding: const EdgeInsets.all(16),
+            //   child: Column(
+            //     crossAxisAlignment: CrossAxisAlignment.start,
+            //     children: [
+            //       Row(
+            //         children: [
+            //             Expanded(
+            //               child: _buildKeyValue(
+            //                   'Name', '${widget.empName ?? ''} (${widget.empCode ?? ''})'),
+            //             ),
+            //           SizedBox(width: 16),
+            //           Expanded(
+            //               child: _buildKeyValue('Policy Name',
+            //                   '${widget.policyType ?? ''} - ${widget.clientPolicyNo ?? ''}')),
+            //         ],
+            //       ),
+            //       SizedBox(height: 16),
+            //       Row(
+            //         children: [
+            //           Expanded(
+            //             child: _buildKeyValue(
+            //                 'Claim Amount', '₹${widget.claimAmount ?? ''}'),
+            //           ),
+            //           SizedBox(width: 16),
+            //           Expanded(
+            //             child: _buildKeyValue('Claim Number', widget.claimNo ?? ''),
+            //           ),
+            //         ],
+            //       ),
+            //     ],
+            //   ),
+            // ),
+            // SizedBox(height: 10),
+            // // Container(
+            // //   padding: const EdgeInsets.all(16),
+            // //   child: Stepper(
+            // //     currentStep: _index,
+            // //     onStepCancel: () {
+            // //       if (_index > 0) {
+            // //         setState(() {
+            // //           _index -= 1;
+            // //         });
+            // //       }
+            // //     },
+            // //     onStepContinue: () {
+            // //       if (_index < 4) {
+            // //         setState(() {
+            // //           _index += 1;
+            // //         });
+            // //       }
+            // //     },
+            // //     onStepTapped: (int index) {
+            // //       setState(() {
+            // //         _index = index;
+            // //       });
+            // //     },
+            // //     steps: <Step>[
+            // //       Step(
+            // //         title: Text('Step 1: PAYMENT INITIATED'),
+            // //         content: Text('Pay Initiate Date: 05-05-2025'),
+            // //         isActive: true,
+            // //         state: StepState.complete,
+            // //       ),
+            // //       Step(
+            // //         title: Text('Step 2: INFORMATION REQUIRED'),
+            // //         content: Text('Raised Date: 05-05-2025'),
+            // //         isActive: true,
+            // //         state: StepState.complete,
+            // //       ),
+            // //       Step(
+            // //         title: Text('Step 3: CLAIM NO. UPDATION'),
+            // //         content: Column(
+            // //           crossAxisAlignment: CrossAxisAlignment.start,
+            // //           children: [
+            // //             Text('Claim Number: 4315440'),
+            // //             Text('Registration Date: 05-05-2025'),
+            // //           ],
+            // //         ),
+            // //         isActive: true,
+            // //         state: StepState.complete,
+            // //       ),
+            // //       Step(
+            // //         title: Text('Step 4: QUERY DOCUMENT REQUIRED'),
+            // //         content: Text('Query Received Date: 05-05-2025'),
+            // //         isActive: true,
+            // //         state: StepState.complete,
+            // //       ),
+            // //       Step(
+            // //         title: Text('Step 5: APPROVED'),
+            // //         content: Column(
+            // //           crossAxisAlignment: CrossAxisAlignment.start,
+            // //           children: [
+            // //             Text('Approved Amount: 4315440'),
+            // //             Text('Approved Date: 05-05-2025'),
+            // //             Text('Approved Letter: Lorem ipsum...'),
+            // //             Text('Description: Lorem ipsum...'),
+            // //           ],
+            // //         ),
+            // //         isActive: true,
+            // //         state: StepState.complete,
+            // //       ),
+            // //     ],
+            // //   ),
+            // // )
+            // Column(
+            //   crossAxisAlignment: CrossAxisAlignment.start,
+            //   children: List.generate(5, (index) {
+            //     return _buildStep(
+            //       stepNumber: index + 1,
+            //       title: _getStepTitle(index),
+            //       content: _getStepContent(index),
+            //       isLast: index == 4,
+            //     );
+            //   }),
+            // )
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildStep({
+    required int stepNumber,
+    required String title,
+    required Widget content,
+    bool isLast = false,
+  }) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        // Left Column with circle + line
+        Column(
+          children: [
+            // Add top spacing before circle
+            SizedBox(height: stepNumber == 1 ? 0 : 4),
+
+            // Step number circle
+            Container(
+              height: 28,
+              width: 28,
+              decoration: BoxDecoration(
+                color: Color(0xFF00A5A8),
+                shape: BoxShape.circle,
+              ),
+              alignment: Alignment.center,
+              child: Text(
+                '$stepNumber',
+                style: TextStyle(
+                  color: Colors.white,
+                  fontSize: 13,
+                  fontWeight: FontWeight.w600,
+                ),
+              ),
+            ),
+
+            // Dotted line below circle (except for last step)
+            if (!isLast)
+              Container(
+                height: 50, // increase to extend line
+                width: 2,
+                margin: EdgeInsets.only(top: 4, bottom: 4),
+                child: CustomPaint(
+                  painter: DottedLinePainter(),
+                ),
+              ),
+          ],
+        ),
+
+        SizedBox(width: 12),
+
+        // Right Side: Step title and content
+        Expanded(
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                title,
+                style: TextStyle(
+                  fontWeight: FontWeight.w600,
+                  fontSize: 15,
+                ),
+              ),
+              SizedBox(height: 8),
+              Container(
+                width: double.infinity,
+                padding: EdgeInsets.all(12),
+                decoration: BoxDecoration(
+                  color: Color(0xFFF7F7F7),
+                  borderRadius: BorderRadius.circular(8),
+                  border: Border.all(color: Color(0xFFE0E0E0)),
+                ),
+                child: content,
+              ),
+              SizedBox(height: isLast ? 0 : 16),
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  String _getStepTitle(int index) {
+    switch (index) {
+      case 0:
+        return 'PAYMENT INITIATED (Nalini – 21–06–2025 / 11:20:02 AM)';
+      case 1:
+        return 'INFORMATION REQUIRED (Nalini – 21–06–2025 / 11:20:02 AM)';
+      case 2:
+        return 'UNDER PROCESS – CLAIM NO. UPDATION (Nalini – 21–06–2025 / 11:20:02 AM)';
+      case 3:
+        return 'UNDER PROCESS – QUERY DOCUMENT REQUIRED (Nalini – 21–06–2025 / 11:20:02 AM)';
+      case 4:
+        return 'APPROVED (Nalini – 21–06–2025 / 11:20:02 AM)';
+      default:
+        return '';
+    }
+  }
+
+  Widget _getStepContent(int index) {
+    switch (index) {
+      case 0:
+        return Text('Pay Initiate Date: 05-05-2025');
+      case 1:
+        return Text('Raised Date: 05-05-2025');
+      case 2:
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text('Claim Number: 4315440'),
+            Text('Registration Date: 05-05-2025'),
+          ],
+        );
+      case 3:
+        return Text('Query Received Date: 05-05-2025');
+      case 4:
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text('Approved Amount: 4315440'),
+            Text('Approved Date: 05-05-2025'),
+            Text('Approved Letter: Lorem ipsum...'),
+            Text('Description: Lorem ipsum...'),
+          ],
+        );
+      default:
+        return SizedBox.shrink();
+    }
+  }
+
+  Widget _buildKeyValue(String title, String value) {
+    final displayValue =
+        (value == null || value.trim().isEmpty) ? 'N/A' : value;
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          title,
+          style: TextStyle(
+            color: Colors.grey[600],
+            fontSize: 14,
+          ),
+        ),
+        SizedBox(height: 4),
+        Text(
+          displayValue,
+          style: TextStyle(
+            color: Colors.black,
+            fontWeight: FontWeight.w500,
+            fontSize: 15,
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class DottedLinePainter extends CustomPainter {
+  @override
+  void paint(Canvas canvas, Size size) {
+    const dashHeight = 4.0;
+    const dashSpace = 3.0;
+    double startY = 0;
+    final paint = Paint()
+      ..color = Colors.grey.shade400
+      ..strokeWidth = 1;
+
+    while (startY < size.height) {
+      canvas.drawLine(
+        Offset(0, startY),
+        Offset(0, startY + dashHeight),
+        paint,
+      );
+      startY += dashHeight + dashSpace;
+    }
+  }
+
+  @override
+  bool shouldRepaint(CustomPainter oldDelegate) => false;
+}

lib/excel_verification.dart

@@ -32,7 +32,19 @@ class excelVerify extends StatefulWidget {
   final String cardInsurer_name;
   final String cardPolicy_name;
   final String cardPolicy_ExpDate;
-  const excelVerify({Key? key, required this.ClientId, required this.ClientPoliyId, required this.clientBranchId, required this.Token, required this.TokenType, required this.cardType, required this.cardPolicyNo, required this.cardInsurer_name, required this.cardPolicy_name, required this.cardPolicy_ExpDate}) : super(key: key);
+  const excelVerify(
+      {Key? key,
+      required this.ClientId,
+      required this.ClientPoliyId,
+      required this.clientBranchId,
+      required this.Token,
+      required this.TokenType,
+      required this.cardType,
+      required this.cardPolicyNo,
+      required this.cardInsurer_name,
+      required this.cardPolicy_name,
+      required this.cardPolicy_ExpDate})
+      : super(key: key);
 
   @override
   State<excelVerify> createState() => _excelVerifyState();
@@ -608,9 +620,11 @@ class _excelVerifyState extends State<excelVerify> {
                                       // invalidRelationships = 0;
                                       // dobAgeCheckCount = 0;
                                       // nonExcelFilteredData = [];
-                                      Navigator.pushNamed(
+                                      // Navigator.pushNamed(
-                                          context, 'hrPolicyDetails',
+                                      //     context, 'hrPolicyDetails',
-                                          arguments: argumentsData);
+                                      //     arguments: argumentsData);
+
+                                      Navigator.pop(context);
                                     },
                                     child: Text(
                                       'Close',

lib/hrDashboard.dart

@@ -310,7 +310,7 @@ class _hrDashboardState extends State<hrDashboard>
     print("hr_id -$hr_id");
     print("token -$token");
 
-    // isLoading = true;
+    isLoading = true;
     // setState(() {
     //   _isLoading = true;
     // });

lib/hrPolicyDetails.dart

@@ -20,6 +20,7 @@ import 'package:intl/intl.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:path/path.dart' as path;
 import 'package:collection/collection.dart';
+import 'package:url_launcher/url_launcher.dart';
 import 'customAppBar/customFooter.dart';
 
 class hrPolicyDetails extends StatefulWidget {
@@ -106,14 +107,14 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
       print('10');
 
       final response = widget.TokenType == "post"
-          ? await apiService.getEmployeeAndDependenceToApi(
+          ? await apiService.getEmployeeAndDependenceToApi(widget.ClientId,
-              widget.ClientId, widget.ClientPoliyId, widget.clientBranchId, widget.Token)
+              widget.ClientPoliyId, widget.clientBranchId, widget.Token)
-          : await apiService.getEmployeeAndDependenceToApiPre(
+          : await apiService.getEmployeeAndDependenceToApiPre(widget.ClientId,
-              widget.ClientId, widget.ClientPoliyId, widget.clientBranchId, widget.Token);
+              widget.ClientPoliyId, widget.clientBranchId, widget.Token);
 
       if (response['status'] == 'success') {
         setState(() {
-          // isLoading = false;
+          isLoading = false;
         });
         setState(() {
           getCDPolicies = List<Map<String, dynamic>>.from(response['data']);
@@ -124,7 +125,7 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
         });
       } else {
         setState(() {
-          // isLoading = false;
+          isLoading = false;
         });
 
         // ToastHelper.showWarningToast(
@@ -133,7 +134,7 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
       }
     } catch (e) {
       setState(() {
-        // isLoading = false;
+        isLoading = false;
       });
       print('Exception occurred: $e');
     } finally {
@@ -143,6 +144,18 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
     }
   }
 
+  Future<void> _launchURL(String url) async {
+    final Uri uri = Uri.parse(url); // Parse the URL properly
+    print('_launchURL $uri');
+    if (uri != null) {
+      print('If $uri');
+      await launchUrl(uri, mode: LaunchMode.externalApplication);
+    } else {
+      print('else $uri');
+      throw 'Could not launch $url';
+    }
+  }
+
   void search(String query) {
     print(query);
     // Check if the query is empty
@@ -257,9 +270,15 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
     // TODO: implement build
     return Scaffold(
       appBar: CustomAppBar(),
-      body: Container(
+      backgroundColor: Color(0xFFEFF3F6),
-        color: Color(0xFFEFF3F6),
+      body: Stack(children: [
-        padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 40),
+        // color: Color(0xFFEFF3F6),
+
+        // padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 40),
+        SingleChildScrollView(
+          scrollDirection: Axis.vertical,
+          child: Container(
+            padding: EdgeInsets.only(top: 30, bottom: 200, left: 50, right: 50),
             child: Column(
               children: [
                 Container(
@@ -274,7 +293,8 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           IconButton(
-                          padding: EdgeInsets.zero, // Removes default padding
+                              padding:
+                                  EdgeInsets.zero, // Removes default padding
                               constraints: BoxConstraints(),
                               onPressed: () {
                                 Navigator.pop(context);
@@ -303,7 +323,8 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
                         mainAxisAlignment: MainAxisAlignment.start,
                         children: [
                           Text(
-                        "${widget.cardType} - ${widget.cardPolicyNo} " ?? '',
+                            "${widget.cardType} - ${widget.cardPolicyNo} " ??
+                                '',
                             style: GoogleFonts.poppins(
                               color: Colors.black,
                               fontSize: 14,
@@ -378,18 +399,21 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
                                     Navigator.push(
                                       context,
                                       MaterialPageRoute(
-                                    builder: (context) =>
+                                        builder: (context) => excelVerify(
-                                        excelVerify(
+                                          ClientId:
-                                          ClientId: widget.ClientId, // <-- from map
+                                              widget.ClientId, // <-- from map
                                           ClientPoliyId: widget.ClientPoliyId,
                                           clientBranchId: widget.clientBranchId,
                                           Token: widget.Token,
                                           TokenType: widget.TokenType,
                                           cardType: widget.cardType,
                                           cardPolicyNo: widget.cardPolicyNo,
-                                          cardInsurer_name: widget.cardInsurer_name,
+                                          cardInsurer_name:
-                                          cardPolicy_name: widget.cardPolicy_name,
+                                              widget.cardInsurer_name,
-                                          cardPolicy_ExpDate: widget.cardPolicy_ExpDate,
+                                          cardPolicy_name:
+                                              widget.cardPolicy_name,
+                                          cardPolicy_ExpDate:
+                                              widget.cardPolicy_ExpDate,
 
                                           // Token: widget.Token,
                                           // ClientId: widget.ClientId,
@@ -405,7 +429,8 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
                                   },
                                   style: ElevatedButton.styleFrom(
                                     backgroundColor: Color(0xFFE26728),
-                                padding: EdgeInsets.all(10), // Internal padding
+                                    padding:
+                                        EdgeInsets.all(10), // Internal padding
                                     shape: RoundedRectangleBorder(
                                       borderRadius: BorderRadius.circular(
                                           10), // Border radius
@@ -435,7 +460,8 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
                                   },
                                   style: ElevatedButton.styleFrom(
                                     backgroundColor: Color(0xFFE26728),
-                                padding: EdgeInsets.all(10), // Internal padding
+                                    padding:
+                                        EdgeInsets.all(10), // Internal padding
                                     shape: RoundedRectangleBorder(
                                       borderRadius: BorderRadius.circular(
                                           10), // Border radius
@@ -480,6 +506,27 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
               ],
             ),
           ),
+        ),
+
+        if (isLoading)
+          Container(
+            color: Color(0x98FFFCE5), // Semi-transparent background
+            child: Center(
+              child: // Your GIF loader widget
+                  Image.asset(
+                      height: 60,
+                      width: 60,
+                      'assets/nhance-loader.gif'), // Adjust path to your GIF loader
+            ),
+          ),
+        Align(
+          alignment: Alignment.bottomCenter,
+          child: Container(
+            width: double.infinity, // Make the footer full width
+            child: CustomFooter(),
+          ),
+        ),
+      ]),
     );
   }
 
@@ -749,8 +796,11 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
                         child: Row(
                           mainAxisAlignment: MainAxisAlignment.center,
                           children: [
+                            if (item['ecard_download_link'] != null)
                               GestureDetector(
-                              onTap: () {},
+                                onTap: () {
+                                  _launchURL(item['ecard_download_link']);
+                                },
                                 child: Container(
                                   height: 35,
                                   width: 35,
@@ -759,7 +809,8 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
                                     borderRadius: BorderRadius.circular(8),
                                   ),
                                   child: Padding(
-                                  padding: EdgeInsets.all(6), // You can adjust this value
+                                    padding: EdgeInsets.all(
+                                        6), // You can adjust this value
                                     child: Image.asset(
                                       'assets/credit_card.png',
                                       fit: BoxFit.contain,
@@ -780,15 +831,14 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
                                   borderRadius: BorderRadius.circular(8),
                                 ),
                                 child: Padding(
-                                  padding: EdgeInsets.all(6), // You can adjust this value
+                                  padding: EdgeInsets.all(
+                                      6), // You can adjust this value
                                   child: Image.asset(
                                     'assets/claim.png',
                                     fit: BoxFit.contain,
                                   ),
                                 ),
                               ),
-
-
                             ),
                           ],
                         ),

lib/service/hrDashboardTabs/activePolicies.dart

@@ -30,6 +30,7 @@ class _ActivePolicieState extends State<ActivePolicies> {
   dynamic getCardArrays = [];
   int selectedIndex = 1;
   int stausVal = 1;
+  bool isLoading = false;
 
   // List<Map<String, dynamic>> getCardArrays = [
   //   {
@@ -108,7 +109,7 @@ class _ActivePolicieState extends State<ActivePolicies> {
     print("hr_id -$hr_id");
     print("token -$token");
 
-    // isLoading = true;
+    isLoading = true;
     // setState(() {
     //   _isLoading = true;
     // });
@@ -124,7 +125,7 @@ class _ActivePolicieState extends State<ActivePolicies> {
       //     clintID!, clintBranchId!, hr_id, token);
       print('IN1');
       if (response['status'] == 'success') {
-        // isLoading = false;
+        isLoading = false;
         setState(() {
           print('response');
           print(response['data']);
@@ -141,6 +142,7 @@ class _ActivePolicieState extends State<ActivePolicies> {
         print('IN2');
         print("getCardArrays9 - $getCardArrays");
       } else {
+        isLoading = false;
         print('API request failed with status');
         setState(() {
           getCardArrays = [];
@@ -211,10 +213,21 @@ class _ActivePolicieState extends State<ActivePolicies> {
               ),
             ],
           ),
-          SizedBox(
+          const SizedBox(
             height: 15,
           ),
-          Column(
+          isLoading
+              ? Expanded(
+                  // color: Color(0x98FFFCE5), // Semi-transparent background
+                  child: Center(
+                    child: // Your GIF loader widget
+                        Image.asset(
+                            height: 60,
+                            width: 60,
+                            'assets/nhance-loader.gif'), // Adjust path to your GIF loader
+                  ),
+                )
+              : Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     Container(
@@ -237,7 +250,8 @@ class _ActivePolicieState extends State<ActivePolicies> {
                             )
                           : GridView.builder(
                               itemCount: getCardArrays.length,
-                        gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                              gridDelegate:
+                                  SliverGridDelegateWithFixedCrossAxisCount(
                                 crossAxisCount: 4,
                                 crossAxisSpacing: 20,
                                 mainAxisSpacing: 20,

lib/service/hrDashboardTabs/cd.dart

@@ -85,7 +85,7 @@ class _CdPolicieState extends State<CdPolicies> {
   Future<void> getCDPoliciesDetails() async {
     print('9');
     setState(() {
-      // isLoading = true;
+      isLoading = true;
     });
     try {
       print('10');
@@ -93,7 +93,7 @@ class _CdPolicieState extends State<CdPolicies> {
           widget.empClientId, widget.empHrId, widget.postToken);
       if (response['status'] == 'success') {
         setState(() {
-          // isLoading = false;
+          isLoading = false;
         });
         setState(() {
           getCDPolicies = List<Map<String, dynamic>>.from(response['data']);
@@ -104,7 +104,7 @@ class _CdPolicieState extends State<CdPolicies> {
         });
       } else {
         setState(() {
-          // isLoading = false;
+          isLoading = false;
         });
 
         // ToastHelper.showWarningToast(
@@ -113,12 +113,12 @@ class _CdPolicieState extends State<CdPolicies> {
       }
     } catch (e) {
       setState(() {
-        // isLoading = false;
+        isLoading = false;
       });
       print('Exception occurred: $e');
     } finally {
       setState(() {
-        // _isLoading = false;
+        _isLoading = false;
       });
     }
   }
@@ -268,33 +268,9 @@ class _CdPolicieState extends State<CdPolicies> {
             ],
           ),
           SizedBox(height: 20),
-          Row(
+          isLoading
-            children: [
+              ? Expanded(
-              Expanded(
+                  // color: Color(0x98FFFCE5), // semi-transparent overlay
-                child: SingleChildScrollView(
-                  child: _buildCDDataTable(context),
-                ),
-              )
-            ],
-          ),
-
-        ],
-      ),
-    );
-  }
-
-  Widget _buildCDDataTable(BuildContext context) {
-    if (filteredData.isEmpty) {
-      return const SizedBox(
-        height: 50,
-        child: Center(child: Text('No available data')),
-      );
-    }
-
-    // Loader overlay
-    if (isLoading)
-     return Container(
-        color: Color(0x98FFFCE5), // semi-transparent overlay
                   child: Center(
                     child: Image.asset(
                       'assets/nhance-loader.gif',
@@ -302,90 +278,188 @@ class _CdPolicieState extends State<CdPolicies> {
                       width: 60,
                     ),
                   ),
+                )
+              : Expanded(
+                  child: SingleChildScrollView(
+                    child: _buildCDDataTable(context),
+                  ),
+                )
+        ],
+      ),
+    );
+  }
+
+  Widget _buildCDDataTable(BuildContext context) {
+    // Loader overlay
+
+    if (filteredData.isEmpty) {
+      return const SizedBox(
+        height: 50,
+        child: Center(child: Text('No available data')),
+      );
+    }
+
+    return ListView.builder(
+      itemCount: _paginatedData.length + 2, // +1 for header, +1 for pagination
+      itemBuilder: (context, index) {
+        if (index == 0) return _buildHeader();
+        if (index == _paginatedData.length + 1)
+          return _buildPagination(context);
+
+        final item = _paginatedData[index - 1];
+        return _buildDataRow(item);
+      },
     );
 
-    return Column(
+    // return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
+    //   crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
+    //   children: [
-        // Header row
+    //     // Header row
-        Container(
+    //     Container(
+    //       decoration: BoxDecoration(
+    //         color: Color(0xFF00A6A6),
+    //         borderRadius: BorderRadius.circular(6),
+    //       ),
+    //       padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
+    //       child: Row(
+    //         children: [
+    //           Expanded(
+    //             flex: 4,
+    //             child: Text(
+    //               'Insurer Name',
+    //               style: GoogleFonts.poppins(
+    //                   color: Colors.white, fontWeight: FontWeight.bold),
+    //             ),
+    //           ),
+    //           Expanded(
+    //             flex: 3,
+    //             child: Text(
+    //               'CD Account number',
+    //               style: GoogleFonts.poppins(
+    //                   color: Colors.white, fontWeight: FontWeight.bold),
+    //             ),
+    //           ),
+    //           Expanded(
+    //             flex: 2,
+    //             child: Text(
+    //               'Current Balance',
+    //               style: GoogleFonts.poppins(
+    //                   color: Colors.white, fontWeight: FontWeight.bold),
+    //             ),
+    //           ),
+    //           Expanded(
+    //             flex: 1,
+    //             child: Text(
+    //               'Action',
+    //               textAlign: TextAlign.center,
+    //               style: GoogleFonts.poppins(
+    //                   color: Colors.white, fontWeight: FontWeight.bold),
+    //             ),
+    //           ),
+    //         ],
+    //       ),
+    //     ),
+    //
+    //     const SizedBox(height: 6),
+    //
+    //     // Table body rows
+    //     ..._paginatedData.mapIndexed((index, item) {
+    //       return Container(
+    //         margin: const EdgeInsets.only(bottom: 8),
+    //         padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 16),
+    //         decoration: BoxDecoration(
+    //           color: index % 2 == 0 ? Color(0xFFE6FAFB) : Colors.white,
+    //           borderRadius: BorderRadius.circular(6),
+    //         ),
+    //         child: Row(
+    //           children: [
+    //             Expanded(
+    //               flex: 4,
+    //               child: Text(
+    //                 item['insurer_name'] ?? '-',
+    //                 style: GoogleFonts.poppins(color: Color(0xFF000000)),
+    //               ),
+    //             ),
+    //             Expanded(
+    //               flex: 3,
+    //               child: Text(
+    //                 item['cd_master_account_no'] ?? '-',
+    //                 style: GoogleFonts.poppins(color: Color(0xFF000000)),
+    //               ),
+    //             ),
+    //             Expanded(
+    //               flex: 2,
+    //               child: Text(
+    //                 "₹${item['balance'] ?? '0'}",
+    //                 style: GoogleFonts.poppins(color: Color(0xFF000000)),
+    //               ),
+    //             ),
+    //             Expanded(
+    //               flex: 1,
+    //               child: Center(
+    //                 child: IconButton(
+    //                   icon: const Icon(Icons.remove_red_eye_outlined),
+    //                   onPressed: () {
+    //                     Navigator.push(
+    //                       context,
+    //                       MaterialPageRoute(
+    //                         builder: (context) => cdTransactionDetails(
+    //                             insurerName: item['insurer_name'],
+    //                             cdMasterAccountNo: item['cd_master_account_no'],
+    //                             insurerId: item['insurer_id'],
+    //                             cd_ac_pk: item['cd_ac_pk'],
+    //                             empClientId: widget.empClientId,
+    //                             postToken: widget.postToken),
+    //                       ),
+    //                     );
+    //                   },
+    //                 ),
+    //               ),
+    //             ),
+    //           ],
+    //         ),
+    //       );
+    //     }).toList(),
+    //
+    //
+    //   ],
+    // );
+  }
+
+  Widget _buildDataRow(Map<String, dynamic> item) {
+    return Container(
+      padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 16),
+      margin: const EdgeInsets.only(top: 10),
       decoration: BoxDecoration(
-            color: Color(0xFF00A6A6),
+        color: Color(0xFFE0F7F9),
-            borderRadius: BorderRadius.circular(6),
+        border: const Border(
+          bottom: BorderSide(color: Color(0xFFD7E9EB), width: 1),
+        ),
+        borderRadius: BorderRadius.circular(8),
       ),
-          padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
       child: Row(
         children: [
           Expanded(
             flex: 4,
-                child: Text(
+            child: Column(
-                  'Insurer Name',
+              crossAxisAlignment: CrossAxisAlignment.start,
-                  style: GoogleFonts.poppins(
+              children: [
-                      color: Colors.white, fontWeight: FontWeight.bold),
+                Text(item['insurer_name'] ?? '-', style: _dataBold),
-                ),
-              ),
-              Expanded(
-                flex: 3,
-                child: Text(
-                  'CD Account number',
-                  style: GoogleFonts.poppins(
-                      color: Colors.white, fontWeight: FontWeight.bold),
-                ),
-              ),
-              Expanded(
-                flex: 2,
-                child: Text(
-                  'Current Balance',
-                  style: GoogleFonts.poppins(
-                      color: Colors.white, fontWeight: FontWeight.bold),
-                ),
-              ),
-              Expanded(
-                flex: 1,
-                child: Text(
-                  'Action',
-                  textAlign: TextAlign.center,
-                  style: GoogleFonts.poppins(
-                      color: Colors.white, fontWeight: FontWeight.bold),
-                ),
-              ),
               ],
             ),
           ),
-
-        const SizedBox(height: 6),
-
-        // Table body rows
-        ..._paginatedData.mapIndexed((index, item) {
-          return Container(
-            margin: const EdgeInsets.only(bottom: 8),
-            padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 16),
-            decoration: BoxDecoration(
-              color: index % 2 == 0 ? Color(0xFFE6FAFB) : Colors.white,
-              borderRadius: BorderRadius.circular(6),
-            ),
-            child: Row(
-              children: [
           Expanded(
             flex: 4,
-                  child: Text(
+            child: Column(
-                    item['insurer_name'] ?? '-',
+              crossAxisAlignment: CrossAxisAlignment.start,
-                    style: GoogleFonts.poppins(color: Color(0xFF000000)),
+              children: [
+                Text(item['cd_master_account_no'] ?? '-', style: _dataBold),
+              ],
             ),
           ),
           Expanded(
             flex: 3,
-                  child: Text(
+            child: Text("₹${item['balance'] ?? '0'}", style: _dataBold),
-                    item['cd_master_account_no'] ?? '-',
-                    style: GoogleFonts.poppins(color: Color(0xFF000000)),
-                  ),
-                ),
-                Expanded(
-                  flex: 2,
-                  child: Text(
-                    "₹${item['balance'] ?? '0'}",
-                    style: GoogleFonts.poppins(color: Color(0xFF000000)),
-                  ),
           ),
           Expanded(
             flex: 1,
@@ -412,11 +486,47 @@ class _CdPolicieState extends State<CdPolicies> {
         ],
       ),
     );
-        }).toList(),
+  }
 
-        Row(
+  Widget _buildHeader() {
-          mainAxisAlignment: MainAxisAlignment.end,
+    return Container(
+      decoration: BoxDecoration(
+        color: Color(0xFF00A6A6),
+        borderRadius: BorderRadius.circular(6),
+      ),
+      padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
+      child: const Row(
         children: [
+          Expanded(flex: 4, child: Text('Insurer Name', style: _headerStyle)),
+          Expanded(
+              flex: 4, child: Text('CD Account number', style: _headerStyle)),
+          Expanded(
+              flex: 4, child: Text('Current Balance', style: _headerStyle)),
+          Expanded(flex: 4, child: Text('Actions', style: _headerStyle)),
+        ],
+      ),
+    );
+  }
+
+  static final _dataBold = GoogleFonts.poppins(
+    fontSize: 12,
+    fontWeight: FontWeight.w400,
+    color: Color(0xFF000000),
+  );
+
+  static final _dataSub = GoogleFonts.poppins(
+    fontSize: 10,
+    fontWeight: FontWeight.w300,
+    color: Color(0xFF585757),
+  );
+
+  static const _headerStyle = TextStyle(
+    color: Colors.white,
+    fontWeight: FontWeight.bold,
+  );
+
+  Widget _buildPagination(BuildContext context) {
+    return Row(mainAxisAlignment: MainAxisAlignment.end, children: [
       Padding(
         padding: const EdgeInsets.symmetric(vertical: 12),
         child: Row(
@@ -436,7 +546,8 @@ class _CdPolicieState extends State<CdPolicies> {
               onChanged: (newValue) {
                 setState(() {
                   _rowsPerPage = newValue!;
-                        _currentPage = 1;
+                  _currentPage =
+                      1; // Reset to first page when rows per page changes
                 });
               },
             ),
@@ -474,8 +585,8 @@ class _CdPolicieState extends State<CdPolicies> {
                 ),
               ),
             IconButton(
-                    onPressed: _currentPage <
+              onPressed:
-                        (filteredData.length / _rowsPerPage).ceil()
+                  _currentPage < (filteredData.length / _rowsPerPage).ceil()
                       ? () {
                           setState(() {
                             _currentPage++;
@@ -487,10 +598,7 @@ class _CdPolicieState extends State<CdPolicies> {
           ],
         ),
       ),
-          ],
+    ]);
-        ),
-      ],
-    );
   }
 }
 

lib/service/hrDashboardTabs/claims.dart

@@ -8,6 +8,7 @@ import 'package:http/http.dart' as http;
 import 'package:collection/collection.dart';
 import 'package:jwt_decode/jwt_decode.dart';
 
+import '../../claimshistory.dart';
 import '../../models/environment.dart';
 import '../api_service.dart';
 
@@ -119,14 +120,14 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
       final response = await apiService.getClaimPoliciesToApi(widget.postToken);
       if (response['status'] == 'success') {
         setState(() {
-          // isLoading = false;
+          isLoading = false;
         });
         setState(() {
           getClaimPoliciesApi = Map<String, dynamic>.from(response['data']);
         });
       } else {
         setState(() {
-          // isLoading = false;
+          isLoading = false;
         });
 
         // ToastHelper.showWarningToast(
@@ -227,7 +228,18 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
             height: 10,
           ),
 
-          Expanded(
+          isLoading
+              ? Expanded(
+                  // color: Color(0x98FFFCE5), // Semi-transparent background
+                  child: Center(
+                    child: // Your GIF loader widget
+                        Image.asset(
+                            height: 60,
+                            width: 60,
+                            'assets/nhance-loader.gif'), // Adjust path to your GIF loader
+                  ),
+                )
+              : Expanded(
                   child: _buildClaimsDataTable(context),
                 ),
           // Expanded(
@@ -692,24 +704,46 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
             child: Text(item['ticket_created_date'] ?? '-', style: _dataBold),
           ),
           Expanded(
-            flex: 2,
+            flex: 1,
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
                 GestureDetector(
-                  onTap: () {},
+                  onTap: () {
+                    showDialog(
+                      context: context,
+                      barrierDismissible: true,
+                      builder: (BuildContext context) {
+                        return Dialog(
+                          backgroundColor: Colors.transparent,
+                          insetPadding: EdgeInsets.all(16),
+                          child: ClaimHistoryPopup(
+                            ticket_id: item['id'],
+                            empName: item['emp_name'], // example
+                            empCode: item['emp_code'], // example
+                            policyType: item['policy_type'],
+                            clientPolicyNo: item['client_policy_no'],
+                            claimAmount: item['claim_amount'],
+                            claimNo: item['claim_no'],
+                            postToken: widget.postToken,
+                          ),
+                        );
+                      },
+                    );
+                  },
                   child: Container(
-                    height: 30,
+                    height: 35,
-                    width: 30,
+                    width: 35,
                     decoration: BoxDecoration(
                       color: Color(0xFF86D1D4),
                       borderRadius: BorderRadius.circular(8),
                     ),
                     child: Padding(
-                      padding: EdgeInsets.all(6), // You can adjust this value
+                      padding: EdgeInsets.all(10), // You can adjust this value
                       child: Image.asset(
-                        'assets/claimHistory.png',
+                        'assets/cliamHistory.png',
                         fit: BoxFit.contain,
+                        width: 5,
                       ),
                     ),
                   ),
@@ -1106,6 +1140,12 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
             height: 40,
             child: DropdownSearch<String>(
               selectedItem: selectedPolicyTypeName,
+              dropdownBuilder: (context, selectedItem) {
+                return Text(
+                  selectedItem ?? "",
+                  style: TextStyle(fontSize: 12),
+                );
+              },
               items: (String? filter, _) {
                 return ticketTypeList
                     .map<String>((item) => item['type_name'].toString())
@@ -1123,7 +1163,6 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
               },
               decoratorProps: DropDownDecoratorProps(
                 decoration: InputDecoration(
-                  constraints: BoxConstraints(maxHeight: 200),
                   hintText: "Select Policy Type",
                   hintStyle: TextStyle(fontSize: 12),
                   filled: true,
@@ -1144,9 +1183,12 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
                       EdgeInsets.symmetric(horizontal: 12, vertical: 10),
                 ),
               ),
-              popupProps: const PopupProps.menu(
+              popupProps: PopupProps.menu(
+                menuProps: const MenuProps(color: Colors.red),
+                fit: FlexFit.loose,
+                constraints: const BoxConstraints(maxHeight: 250),
                 showSearchBox: true,
-                searchFieldProps: TextFieldProps(
+                searchFieldProps: const TextFieldProps(
                   decoration: InputDecoration(
                     hintText: "Search Policy Type",
                     hintStyle: TextStyle(fontSize: 12),
@@ -1207,7 +1249,7 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
             "Claim Status",
             style: TextStyle(fontSize: 12),
           ),
-          SizedBox(
+          const SizedBox(
             height: 3,
           ),
           SizedBox(
@@ -1229,42 +1271,15 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
                     "Selected selectedClaimStatusName: $selectedClaimStatusName");
                 print("Selected selectedClaimStatus: $selectedClaimStatus");
               },
-
+              dropdownBuilder: (context, selectedItem) {
-              // selectedItem: selectedClaimStatus,
+                return Text(
-              // selectedItem: getTypeNameById(selectedClaimStatus),
+                  selectedItem ?? "",
-              // items: (String? filter, _) {
+                  style: TextStyle(fontSize: 12),
-              //   List<String> allItems = claimStatusList
+                );
-              //       .map<String>((item) => item['claim_status'].toString())
+              },
-              //       .toList();
-              //
-              //   if (filter == null || filter.isEmpty) return allItems;
-              //
-              //   return allItems
-              //       .where((element) =>
-              //           element.toLowerCase().contains(filter.toLowerCase()))
-              //       .toList();
-              // },
-
-              //
-              // onChanged: (value) {
-              //   if (!mounted) return;
-              //   print("Selected ticket_type11: $value");
-              //
-              //   final id = getIdByTypeName(value);
-              //   print("getIdByTypeName returned: $id");
-              //
-              //   if (id != null) {
-              //     setState(() {
-              //       selectedClaimStatus = id;
-              //     });
-              //   } else {
-              //     print("No match found for $value");
-              //   }
-              // },
-
               decoratorProps: DropDownDecoratorProps(
                 decoration: InputDecoration(
-                  constraints: BoxConstraints(maxHeight: 200),
+                  // suffixStyle: TextStyle(color: Colors.red),
                   hintText: "Select Policy Type",
                   hintStyle: TextStyle(fontSize: 12),
                   filled: true,
@@ -1283,12 +1298,17 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
                   ),
                   contentPadding:
                       EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+                  labelStyle: TextStyle(fontSize: 19, color: Colors.red),
                 ),
               ),
-              popupProps: PopupProps.menu(
+              popupProps: const PopupProps.menu(
+                fit: FlexFit.loose,
+                constraints: BoxConstraints(maxHeight: 250),
                 showSearchBox: true,
                 searchFieldProps: TextFieldProps(
+                  style: TextStyle(fontSize: 14.0, color: Colors.red),
                   decoration: InputDecoration(
+                    labelStyle: TextStyle(fontSize: 19, color: Colors.red),
                     hintText: "Search Claim Status",
                     hintStyle: TextStyle(fontSize: 12),
                     contentPadding:

lib/service/hrDashboardTabs/preEnrollment.dart

@@ -29,6 +29,7 @@ class _PreEnrollmentState extends State<PreEnrollment> {
   late ApiService apiService;
   dynamic getCardArrays = [];
   int selectedIndex = 0;
+  bool isLoading = false;
   // List<Map<String, dynamic>> getCardArrays = [
   //   {
   //     "client_policy_id": 392,
@@ -91,7 +92,7 @@ class _PreEnrollmentState extends State<PreEnrollment> {
     print("hr_id -$hr_id");
     print("token -$token");
 
-    // isLoading = true;
+    isLoading = true;
     // setState(() {
     //   _isLoading = true;
     // });
@@ -106,7 +107,7 @@ class _PreEnrollmentState extends State<PreEnrollment> {
       //     clintID!, clintBranchId!, hr_id, token);
       print('IN1');
       if (response['status'] == 'success') {
-        // isLoading = false;
+        isLoading = false;
         setState(() {
           print('response');
           print(response['data']);
@@ -120,6 +121,7 @@ class _PreEnrollmentState extends State<PreEnrollment> {
         print('IN2');
         print("getCardArrays9 - $getCardArrays");
       } else {
+        isLoading = false;
         print('API request failed with status');
       }
     } catch (e) {
@@ -159,7 +161,18 @@ class _PreEnrollmentState extends State<PreEnrollment> {
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          Container(
+          isLoading
+              ? Container(
+                  // color: Color(0x98FFFCE5), // Semi-transparent background
+                  child: Center(
+                    child: // Your GIF loader widget
+                        Image.asset(
+                            height: 60,
+                            width: 60,
+                            'assets/nhance-loader.gif'), // Adjust path to your GIF loader
+                  ),
+                )
+              : Container(
                   // color: Colors.redAccent.shade100,
                   // color: Colors.white,
                   // color: Colors.white,
@@ -179,7 +192,8 @@ class _PreEnrollmentState extends State<PreEnrollment> {
                         )
                       : GridView.builder(
                           itemCount: getCardArrays.length,
-                    gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+                          gridDelegate:
+                              SliverGridDelegateWithFixedCrossAxisCount(
                             crossAxisCount: 4,
                             crossAxisSpacing: 20,
                             mainAxisSpacing: 20,