diff --git a/.env.production b/.env.production index a8e67cb..bb37520 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ -API_URL=https://dev.venbait.in/nhance/uat/employeeRest/ -BASE_HREF=/nhance/app/uat/ +API_URL=https://app.nhanceindia.in/zenith/employeeRest/ +BASE_HREF=/app/ ENV=production \ No newline at end of file diff --git a/assets/nhance_client_logo.png b/assets/nhance_client_logo.png index f316a3f..631af6a 100644 Binary files a/assets/nhance_client_logo.png and b/assets/nhance_client_logo.png differ diff --git a/lib/addons.dart b/lib/addons.dart index ac183d7..2e2c34c 100644 --- a/lib/addons.dart +++ b/lib/addons.dart @@ -57,6 +57,7 @@ class _addOnsDetailsState extends State { dynamic gmcSelfRelationship; dynamic gmcSelfDetails; dynamic gmcPolicyName; + dynamic gmcPolicyType; dynamic gmcNotes; dynamic gmcSumInsured; dynamic gmcFloaterTextDescription; @@ -71,6 +72,7 @@ class _addOnsDetailsState extends State { dynamic topUpSlabRates; dynamic topUpFamilyFloater; dynamic topUpPolicyName; + dynamic topUpPolicyType; dynamic topUpSiPremiumValue; dynamic topUpSiValue; dynamic topUpSiSelectedSI; @@ -81,6 +83,7 @@ class _addOnsDetailsState extends State { dynamic topUpParentClientPolicyId; dynamic topUpParentSlabRates; dynamic topUpParentPolicyName; + dynamic topUpParentPolicyType; dynamic topUpParentFamilyFloater; dynamic topUpParentMappedFamilyFloatersSi; dynamic topUpParentECardDownload; @@ -98,6 +101,7 @@ class _addOnsDetailsState extends State { dynamic addOnsSelectedDependent; dynamic addOnsdependentValue; dynamic addOnsDependentPolicyName; + dynamic addOnsDependentPolicyType; dynamic addOnsDependentECardDownload; int addOnsDependentOpenForEnrollment = 0; dynamic siValue; @@ -123,6 +127,7 @@ class _addOnsDetailsState extends State { dynamic gpaDataIsEmpty = 1; dynamic empRefId; dynamic empClientBranchId; + dynamic selfEmpStatus; @override void initState() { @@ -132,7 +137,7 @@ class _addOnsDetailsState extends State { _memberNameController = TextEditingController(); _relationShipController = TextEditingController(); _loadToken(); - Future.delayed(Duration(seconds: 5), () { + Future.delayed(Duration(seconds: 3), () { setState(() { isLoading = false; }); @@ -167,6 +172,7 @@ class _addOnsDetailsState extends State { // Decode the JWT token received from the API response Map? decodedToken = Jwt.parseJwt(token); print(decodedToken); + selfEmpStatus = prefs.getString('selfEmpStatus'); empClientBranchId = prefs.getString('empClientBranchId'); empCodeString = prefs.getString('empCode'); print(empCodeString); // Check if emp_code is correct @@ -321,6 +327,8 @@ class _addOnsDetailsState extends State { topUpPolicyName = await topUpSiPolicies['gmc_si_topup']['policy_name']; + topUpPolicyType = await topUpSiPolicies['gmc_si_topup']['type']; + topUpFamilyFloater = await topUpSiPolicies['gmc_si_topup'] ['policy_terms']['family_floater']; print('topUpFamilyFloater'); @@ -348,14 +356,15 @@ class _addOnsDetailsState extends State { topUpSiValue != 0 ? topUpSiValue.toString() : null; if (topUpSiSelectedSI != null) { print('topUpSiSelectedSI'); - - _topUpSiSwitcher = true; setState(() { - topUpSiPremiumValue = topUpSiPolicies['gmc_si_topup'] - ['family_floaters_of_only_si_premium_value']; + _topUpSiSwitcher = true; + topUpSiPremiumValue = (topUpSiPolicies['gmc_si_topup'] + ['family_floaters_of_only_si_premium_value'] as double) + .toInt(); - topUpSiPremiumGst = topUpSiPolicies['gmc_si_topup'] - ['family_floaters_of_only_si_gst_value']; + topUpSiPremiumGst = (topUpSiPolicies['gmc_si_topup'] + ['family_floaters_of_only_si_gst_value'] as double) + .toInt(); topUpSiTotalAmt = topUpSiPremiumValue + topUpSiPremiumGst; }); @@ -415,6 +424,9 @@ class _addOnsDetailsState extends State { await topUpSiParentPolicies['gmc_si_parent_topup'] ['policy_name']; + topUpParentPolicyType = + await topUpSiParentPolicies['gmc_si_parent_topup']['type']; + topUpParentFamilyFloater = await topUpSiParentPolicies['gmc_si_parent_topup'] ['policy_terms']['family_floater']; @@ -447,16 +459,18 @@ class _addOnsDetailsState extends State { topUpParentSiValue != 0 ? topUpParentSiValue.toString() : null; if (topUpParentSiSelectedSI != null) { print('topUpParentSiSelectedSI'); - - _topUpParentSiSwitcher = true; setState(() { + _topUpParentSiSwitcher = true; topUpParentSiPremiumValue = - topUpSiParentPolicies['gmc_si_parent_topup'] - ['family_floaters_of_only_si_premium_value']; + (topUpSiParentPolicies['gmc_si_parent_topup'] + ['family_floaters_of_only_si_premium_value'] + as double) + .toInt(); topUpParentSiPremiumGst = - topUpSiParentPolicies['gmc_si_parent_topup'] - ['family_floaters_of_only_si_gst_value']; + (topUpSiParentPolicies['gmc_si_parent_topup'] + ['family_floaters_of_only_si_gst_value'] as double) + .toInt(); topUpParentSiTotalAmt = topUpParentSiPremiumValue + topUpParentSiPremiumGst; @@ -517,6 +531,9 @@ class _addOnsDetailsState extends State { await addOnsDependentPolicies['gmc_dependent_addon'] ['policy_name']; + addOnsDependentPolicyType = + await addOnsDependentPolicies['gmc_dependent_addon']['type']; + addOnsDependentFamilyFloater = await addOnsDependentPolicies['gmc_dependent_addon'] ['policy_terms']['family_floater']; @@ -539,15 +556,19 @@ class _addOnsDetailsState extends State { ? addOnsdependentValue.toString() : null; if (addOnsSelectedDependent != null) { - _addOnsDependentSwitcher = true; setState(() { - addOnDependentPremiumValue = - addOnsDependentPolicies['gmc_dependent_addon'] - ['family_floaters_of_dependent_and_si_premium_value']; + _addOnsDependentSwitcher = true; + addOnDependentPremiumValue = (addOnsDependentPolicies[ + 'gmc_dependent_addon'][ + 'family_floaters_of_dependent_and_si_premium_value'] + as double) + .toInt(); addOnsDependentPremiumGst = - addOnsDependentPolicies['gmc_dependent_addon'] - ['family_floaters_of_dependent_and_gst_value']; + (addOnsDependentPolicies['gmc_dependent_addon'] + ['family_floaters_of_dependent_and_gst_value'] + as double) + .toInt(); addOnsDependentTotalAmt = addOnDependentPremiumValue + addOnsDependentPremiumGst; @@ -807,6 +828,7 @@ class _addOnsDetailsState extends State { 'employee_id': employee_id, 'client_id': client_id, 'emp_code': empCodeString, + 'client_branch_id': empClientBranchId, }; // Add the map to the list @@ -884,6 +906,7 @@ class _addOnsDetailsState extends State { 'employee_id': employee_id, 'client_id': client_id, 'emp_code': empCodeString, + 'client_branch_id': empClientBranchId, }; // Add the map to the list @@ -960,6 +983,7 @@ class _addOnsDetailsState extends State { 'employee_id': employee_id, 'client_id': client_id, 'emp_code': empCodeString, + 'client_branch_id': empClientBranchId, }; // Add the map to the list @@ -1091,7 +1115,8 @@ class _addOnsDetailsState extends State { var calculation = { 'client_policy_id': topUpClientPolicyId, 'emp_code': empCodeString, - 'si': choosedSiValue + 'si': choosedSiValue, + 'client_branch_id': empClientBranchId }; print(calculation); @@ -1130,10 +1155,11 @@ class _addOnsDetailsState extends State { } print('Sum of gst: $topUpGstSum'); setState(() { - topUpSiPremiumValue = topUpRataPremimumSum; + topUpSiPremiumValue = (topUpRataPremimumSum as double).toInt(); print(topUpSiPremiumValue); - topUpSiPremiumGst = topUpGstSum; + topUpSiPremiumGst = (topUpGstSum as double).toInt(); print(topUpSiPremiumGst); + topUpSiTotalAmt = topUpSiPremiumValue + topUpSiPremiumGst; print(topUpSiTotalAmt); }); @@ -1157,7 +1183,8 @@ class _addOnsDetailsState extends State { var calculation = { 'client_policy_id': topUpParentClientPolicyId, 'emp_code': empCodeString, - 'si': choosedSiValue + 'si': choosedSiValue, + 'client_branch_id': empClientBranchId }; print(calculation); @@ -1197,9 +1224,10 @@ class _addOnsDetailsState extends State { } print('Sum of gst: $topUpGstSum'); setState(() { - topUpParentSiPremiumValue = topUpRataPremimumSum; + topUpParentSiPremiumValue = + (topUpRataPremimumSum as double).toInt(); print(topUpParentSiPremiumValue); - topUpParentSiPremiumGst = topUpGstSum; + topUpParentSiPremiumGst = (topUpGstSum as double).toInt(); print(topUpSiPremiumGst); topUpParentSiTotalAmt = topUpParentSiPremiumValue + topUpParentSiPremiumGst; @@ -1225,7 +1253,8 @@ class _addOnsDetailsState extends State { var calculation = { 'client_policy_id': addOnsDependentClientPolicyId, 'emp_code': empCodeString, - 'si': choosedDependentValue + 'si': choosedDependentValue, + 'client_branch_id': empClientBranchId }; print(calculation); @@ -1265,9 +1294,10 @@ class _addOnsDetailsState extends State { } print('Sum of gst: $addOnsGstSum'); setState(() { - addOnDependentPremiumValue = addOnsRataPremimumSum; + addOnDependentPremiumValue = + (addOnsRataPremimumSum as double).toInt(); print(addOnDependentPremiumValue); - addOnsDependentPremiumGst = addOnsGstSum; + addOnsDependentPremiumGst = (addOnsGstSum as double).toInt(); print(addOnsDependentPremiumGst); addOnsDependentTotalAmt = addOnDependentPremiumValue + addOnsDependentPremiumGst; @@ -1289,10 +1319,17 @@ class _addOnsDetailsState extends State { setState(() { isLoading = true; }); - print('sendAddOnAPI'); + if (gpaDataIsEmpty != 0) { - iAgreeForAddOn.add(int.parse(gpaClintPolicyId)); + print('gpaDataIsEmpty : $gpaDataIsEmpty'); + for (var item in gpaPolicies) { + print('ClientPolicyId'); + // Extract ClientPolicyId value from each object + String clientPolicyId = item['ClientPolicyId']; + // Convert to integer and add to iAgreeForAddOn list + iAgreeForAddOn.add(int.parse(clientPolicyId)); + } } if (gmcDataIsEmpty != 0) { @@ -1996,8 +2033,8 @@ class _addOnsDetailsState extends State { // Add your logic here based on the toggle state }); }, - activeColor: Color( - 0xFFE26728), // Color when the switch is ON + activeColor: Colors + .green, // Color when the switch is ON inactiveTrackColor: Colors .grey, // Color of the switch track when OFF ), @@ -2639,8 +2676,8 @@ class _addOnsDetailsState extends State { // Add your logic here based on the toggle state }); }, - activeColor: Color( - 0xFFE26728), // Color when the switch is ON + activeColor: Colors + .green, // Color when the switch is ON inactiveTrackColor: Colors .grey, // Color of the switch track when OFF ), @@ -3165,7 +3202,7 @@ class _addOnsDetailsState extends State { ), ), Text( - 'Group Medical Coverage - Dependent AddOns', + '', textAlign: TextAlign.left, style: GoogleFonts @@ -3268,29 +3305,27 @@ class _addOnsDetailsState extends State { .end, children: [ Switch( - value: - _addOnsDependentSwitcher, - onChanged: (addOnsDependentOpenForEnrollment == - 0 || - (addOnsDependentOpenForEnrollment != - 0 && - addOnsDependentECardDownload != - null)) - ? null - : (value) { - setState( - () { - _addOnsDependentSwitcher = - value; - // Add your logic here based on the toggle state - }); - }, - activeColor: Color( - 0xFFE26728), // Color when the switch is ON - inactiveTrackColor: - Colors - .grey, // Color of the switch track when OFF - ), + value: + _addOnsDependentSwitcher, + onChanged: (addOnsDependentOpenForEnrollment == + 0 || + (addOnsDependentOpenForEnrollment != + 0 && + addOnsDependentECardDownload != + null)) + ? null + : (value) { + setState( + () { + _addOnsDependentSwitcher = + value; + // Add your logic here based on the toggle state + }); + }, + activeColor: Colors + .green, // Color when the switch is ON + inactiveTrackColor: + Colors.grey), ], ))), ], @@ -3986,6 +4021,18 @@ class _addOnsDetailsState extends State { } } + Future _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 openForm(Map floaterData, action) { print(action); print(floaterData); @@ -4292,6 +4339,200 @@ class _addOnsDetailsState extends State { ); } + List generateGmcCards(List data) { + List cards = []; + + for (var item in data) { + setState(() { + gmcPolicyName = item['Policy_Name']; + gmcFloaterTextHeading = item['floter_text_heading']; + gmcFloaterTextDescription = item['floter_text_description']; + gmcNotes = item['notes']; + gmcECardDownload = item['eCardDownload']; + // gmcSumInsured = item['Policy_Terms']['sum_insured']; + gmcMappedFamilyFloaters = item['mapped_family_floaters']; + dynamic getTrueObjects = gmcMappedFamilyFloaters + .where((element) => element['is_value_exist'] == true) + .toList(); + print('getTrueObjects'); + print(getTrueObjects); + if (getTrueObjects.length > 0) { + print('true'); + gmcSumInsured = gmcMappedFamilyFloaters[0]["data"]["basic_cover_si"]; + } else { + print('false'); + gmcSumInsured = item['Policy_Terms']['sum_insured']; + } + gmcTypeName = item['type']; + }); + print('forEach Card'); + print(gmcMappedFamilyFloaters); + dynamic getTrueObjects = gmcMappedFamilyFloaters + .where((element) => element['is_value_exist'] == true) + .toList(); + + print(getTrueObjects); + + Widget card = getTrueObjects.length > 0 + ? Card( + elevation: 0, + color: Colors.white, + child: Padding( + padding: Responsive.isDesktop(context) + ? EdgeInsets.all(30) + : EdgeInsets.all(10), + child: Column( + children: [ + Container( + decoration: BoxDecoration( + color: Color( + 0xFFFFF1DD), // Set background color for the container + borderRadius: BorderRadius.circular( + 5), // Set border radius for the container + ), + padding: Responsive.isDesktop(context) + ? EdgeInsets.only( + top: 15, bottom: 15, left: 25, right: 25) + : EdgeInsets.only( + top: 10, bottom: 10, left: 10, right: 10), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + flex: 9, + child: Container( + alignment: Alignment.centerLeft, + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Text( + '', + textAlign: TextAlign.left, + style: GoogleFonts.poppins( + fontSize: + Responsive.isDesktop(context) + ? 18 + : 13, + ), + ), + Row( + children: [ + Text( + gmcPolicyName ?? '', + textAlign: TextAlign.left, + style: GoogleFonts.poppins( + fontSize: + Responsive.isDesktop(context) + ? 20 + : 14, + fontWeight: FontWeight.w600, + ), + ), + if (item['eCardDownload'] != null) + GestureDetector( + onTap: () async { + _launchURL( + item['eCardDownload']); + }, + child: MouseRegion( + cursor: + SystemMouseCursors.click, + child: Icon( + Icons.file_download, + color: Color(0xFFE26728), + size: 25, + ), + ), + ), + ], + ), + ], + ))), + Expanded( + flex: 3, + child: Container( + alignment: Alignment.centerRight, + child: Column( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text( + gmcFloaterTextHeading ?? '', + textAlign: TextAlign.right, + style: GoogleFonts.poppins( + fontSize: + Responsive.isDesktop(context) + ? 18 + : 13, + ), + ), + Text( + '₹ ${gmcSumInsured != null ? gmcSumInsured : 'NA'}', + textAlign: TextAlign.right, + style: GoogleFonts.poppins( + fontSize: + Responsive.isDesktop(context) + ? 20 + : 14, + fontWeight: FontWeight.w600, + ), + ), + ], + ))), + ], + ), + ), + SizedBox(height: 15), + Container( + padding: Responsive.isDesktop(context) + ? EdgeInsets.only( + top: 0, bottom: 0, left: 15, right: 15) + : EdgeInsets.only( + top: 0, bottom: 0, left: 5, right: 5), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: gmcMappedFamilyFloaters + .where((item) => item['is_value_exist'] == true) + .map((item) { + Map data = item['data']; + String formattedDate = formatDate(data['dob']); + return Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Icon(Icons.arrow_right, + color: Color(0xFFE26728)), // Arrow icon + SizedBox( + width: Responsive.isDesktop(context) + ? 10 + : 5), // Space between icon and text + Expanded( + child: Text( + '${data['name']} ~ ${data['relationship']} ~ DOB : $formattedDate', + style: GoogleFonts.poppins( + fontSize: + Responsive.isDesktop(context) ? 18 : 16, + color: Color(0xFF232526), + ), + ), + ), + ], + ); + }).toList(), + ), + ), + ], + ), + )) + : SizedBox(height: 0); + + cards.add(card); + } + + return cards; + } + List generateGpaCards(List data) { List cards = []; @@ -4413,16 +4654,10 @@ class _addOnsDetailsState extends State { fontWeight: FontWeight.w600, ), ), - if (gpaECardDownload != null) + if (item['eCardDownload'] != null) GestureDetector( onTap: () async { - Uri uri = Uri.parse(gpaECardDownload); - if (await canLaunchUrl(uri)) { - await launchUrl(uri); - } else { - print( - 'Could not launch $gpaECardDownload'); - } + _launchURL(item['eCardDownload']); }, child: MouseRegion( cursor: SystemMouseCursors.click, @@ -4485,208 +4720,4 @@ class _addOnsDetailsState extends State { return cards; } - - List generateGmcCards(List data) { - List cards = []; - - for (var item in data) { - setState(() { - gmcPolicyName = item['Policy_Name']; - gmcFloaterTextHeading = item['floter_text_heading']; - gmcFloaterTextDescription = item['floter_text_description']; - gmcNotes = item['notes']; - gmcECardDownload = item['eCardDownload']; - // gmcSumInsured = item['Policy_Terms']['sum_insured']; - gmcMappedFamilyFloaters = item['mapped_family_floaters']; - dynamic getTrueObjects = gmcMappedFamilyFloaters - .where((element) => element['is_value_exist'] == true) - .toList(); - print('getTrueObjects'); - print(getTrueObjects); - if (getTrueObjects.length > 0) { - print('true'); - gmcSumInsured = gmcMappedFamilyFloaters[0]["data"]["basic_cover_si"]; - } else { - print('false'); - gmcSumInsured = item['Policy_Terms']['sum_insured']; - } - gmcTypeName = item['type']; - }); - print('forEach Card'); - print(gmcMappedFamilyFloaters); - dynamic getTrueObjects = gmcMappedFamilyFloaters - .where((element) => element['is_value_exist'] == true) - .toList(); - - print(getTrueObjects); - - Widget card = getTrueObjects.length > 0 - ? Card( - elevation: 0, - color: Colors.white, - child: Padding( - padding: Responsive.isDesktop(context) - ? EdgeInsets.all(30) - : EdgeInsets.all(10), - child: Column( - children: [ - Container( - decoration: BoxDecoration( - color: Color( - 0xFFFFF1DD), // Set background color for the container - borderRadius: BorderRadius.circular( - 5), // Set border radius for the container - ), - padding: Responsive.isDesktop(context) - ? EdgeInsets.only( - top: 15, bottom: 15, left: 25, right: 25) - : EdgeInsets.only( - top: 10, bottom: 10, left: 10, right: 10), - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Expanded( - flex: 9, - child: Container( - alignment: Alignment.centerLeft, - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Text( - '', - textAlign: TextAlign.left, - style: GoogleFonts.poppins( - fontSize: - Responsive.isDesktop(context) - ? 18 - : 13, - ), - ), - Row( - children: [ - Text( - gmcPolicyName ?? '', - textAlign: TextAlign.left, - style: GoogleFonts.poppins( - fontSize: - Responsive.isDesktop(context) - ? 20 - : 14, - fontWeight: FontWeight.w600, - ), - ), - if (gmcECardDownload != null) - GestureDetector( - onTap: () async { - // Convert the URL string to a Uri object - Uri uri = - Uri.parse(gmcECardDownload); - // Check if the URL is valid - if (await canLaunchUrl(uri)) { - // Open the URL in the default browser - await launchUrl(uri); - } else { - // Handle the case where the URL cannot be launched - print( - 'Could not launch $gmcECardDownload'); - } - }, - child: MouseRegion( - cursor: - SystemMouseCursors.click, - child: Icon( - Icons.file_download, - color: Color(0xFFE26728), - size: 25, - ), - ), - ), - ], - ), - ], - ))), - Expanded( - flex: 3, - child: Container( - alignment: Alignment.centerRight, - child: Column( - mainAxisAlignment: MainAxisAlignment.end, - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Text( - gmcFloaterTextHeading ?? '', - textAlign: TextAlign.right, - style: GoogleFonts.poppins( - fontSize: - Responsive.isDesktop(context) - ? 18 - : 13, - ), - ), - Text( - '₹ ${gmcSumInsured != null ? gmcSumInsured : 'NA'}', - textAlign: TextAlign.right, - style: GoogleFonts.poppins( - fontSize: - Responsive.isDesktop(context) - ? 20 - : 14, - fontWeight: FontWeight.w600, - ), - ), - ], - ))), - ], - ), - ), - SizedBox(height: 15), - Container( - padding: Responsive.isDesktop(context) - ? EdgeInsets.only( - top: 0, bottom: 0, left: 15, right: 15) - : EdgeInsets.only( - top: 0, bottom: 0, left: 5, right: 5), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: gmcMappedFamilyFloaters - .where((item) => item['is_value_exist'] == true) - .map((item) { - Map data = item['data']; - String formattedDate = formatDate(data['dob']); - return Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Icon(Icons.arrow_right, - color: Color(0xFFE26728)), // Arrow icon - SizedBox( - width: Responsive.isDesktop(context) - ? 10 - : 5), // Space between icon and text - Expanded( - child: Text( - '${data['name']} ~ ${data['relationship']} ~ DOB : $formattedDate', - style: GoogleFonts.poppins( - fontSize: - Responsive.isDesktop(context) ? 18 : 16, - color: Color(0xFF232526), - ), - ), - ), - ], - ); - }).toList(), - ), - ), - ], - ), - )) - : SizedBox(height: 0); - - cards.add(card); - } - - return cards; - } } diff --git a/lib/customAppBar/customAppBar.dart b/lib/customAppBar/customAppBar.dart index 01c8edd..3834421 100644 --- a/lib/customAppBar/customAppBar.dart +++ b/lib/customAppBar/customAppBar.dart @@ -93,8 +93,8 @@ class _CustomAppBarState extends State { children: [ Container( margin: EdgeInsets.only(top: 10, bottom: 10), - width: 230, - height: 230, + width: 150, + height: 150, child: Image.asset( 'assets/nhance_client_logo.png', fit: BoxFit.contain, diff --git a/lib/empDetails.dart b/lib/empDetails.dart index d2f0b11..958b8ab 100644 --- a/lib/empDetails.dart +++ b/lib/empDetails.dart @@ -47,6 +47,7 @@ class _empDetailsState extends State { dynamic gpaSelfDetails; dynamic gpaOpenForEnrollment; dynamic gpaECardDownload; + dynamic gpaSumInsured; dynamic gmcECardDownload; int gmcOpenForEnrollment = 0; dynamic gmcPolicies; @@ -57,6 +58,7 @@ class _empDetailsState extends State { dynamic gmcSelfRelationship; dynamic gmcSelfDetails; dynamic gmcPolicyName; + dynamic gmcPolicyType; dynamic gmcNotes; dynamic gmcGridMaster; dynamic gmcSumInsured; @@ -86,6 +88,7 @@ class _empDetailsState extends State { dynamic selfEmpCode; dynamic selfFamilyFloaterKey; dynamic selfEmpStatus; + dynamic selfUnit; dynamic gmcDataIsEmpty = 1; dynamic gpaDataIsEmpty = 1; dynamic hrPrimaryId; @@ -335,6 +338,7 @@ class _empDetailsState extends State { selfFamilyFloaterKey = selfDetails['family_floater_key']; // print(clientDetails); selfEmpStatus = selfDetails['emp_status']; + selfUnit = selfDetails['unit']; }); final SharedPreferences prefs = await SharedPreferences.getInstance(); prefs.setString('selfEmpStatus', selfEmpStatus); @@ -573,10 +577,10 @@ class _empDetailsState extends State { } void saveFamilyMemberDetails(Map formData, - Map floatedData, action) async { + Map floatedData, action, gmcSumInsured) async { // Construct the array of objects print(formData); - print(floatedData); + print('floatedData $floatedData'); print(action); final SharedPreferences prefs = await SharedPreferences.getInstance(); @@ -600,6 +604,8 @@ class _empDetailsState extends State { 'client_policy_id': floatedData['client_policy_id'], 'created_by': primaryId, 'is_createdby_hr': is_createdby_hr, + 'unit': selfUnit, + 'basic_cover_si': gmcSumInsured, // Add the 'id' field only if action is 'Edit' if (action == 'Edit') 'id': floatedData['employee_id'], }); @@ -954,7 +960,7 @@ class _empDetailsState extends State { } } - void openForm(Map floaterData, action) { + void openForm(Map floaterData, action, gmcSumInsured) { print(action); print(floaterData); print(relationshipOptions); @@ -1077,7 +1083,7 @@ class _empDetailsState extends State { hintText: 'Relationship', labelText: 'Relationship', contentPadding: EdgeInsets.symmetric( - vertical: 5, horizontal: 5), + vertical: 10, horizontal: 15), ), value: dropdownValue ?? (action == 'Edit' @@ -1086,6 +1092,7 @@ class _empDetailsState extends State { onChanged: (value) { _relationShipController.text = value!; }, + dropdownColor: Colors.white, items: selectedRelationships .map((relationship) { final String relationshipName = @@ -1229,7 +1236,10 @@ class _empDetailsState extends State { // Call the function to send form data to API saveFamilyMemberDetails( - formData, floaterData, action); + formData, + floaterData, + action, + gmcSumInsured); // Close the dialog Navigator.of(context).pop(); @@ -1265,6 +1275,18 @@ class _empDetailsState extends State { ); } + Future _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 openSelfForm(action) { showDialog( context: context, @@ -1384,21 +1406,21 @@ class _empDetailsState extends State { ), ), ), - SizedBox(width: 10), - Expanded( - flex: 4, - child: TextFormField( - readOnly: true, - initialValue: selfEmailPersonal ?? '', - decoration: InputDecoration( - border: OutlineInputBorder(), - hintText: 'Email personal', - labelText: 'Email personal', - contentPadding: EdgeInsets.symmetric( - vertical: 10, horizontal: 15), - ), - ), - ), + // SizedBox(width: 10), + // Expanded( + // flex: 4, + // child: TextFormField( + // readOnly: true, + // initialValue: selfEmailPersonal ?? '', + // decoration: InputDecoration( + // border: OutlineInputBorder(), + // hintText: 'Email personal', + // labelText: 'Email personal', + // contentPadding: EdgeInsets.symmetric( + // vertical: 10, horizontal: 15), + // ), + // ), + // ), SizedBox(width: 10), Expanded( flex: 4, @@ -1519,18 +1541,18 @@ class _empDetailsState extends State { vertical: 10, horizontal: 15), ), ), - SizedBox(height: 15), - TextFormField( - readOnly: true, - initialValue: selfEmailPersonal ?? '', - decoration: InputDecoration( - border: OutlineInputBorder(), - hintText: 'Email personal', - labelText: 'Email personal', - contentPadding: EdgeInsets.symmetric( - vertical: 10, horizontal: 15), - ), - ), + // SizedBox(height: 15), + // TextFormField( + // readOnly: true, + // initialValue: selfEmailPersonal ?? '', + // decoration: InputDecoration( + // border: OutlineInputBorder(), + // hintText: 'Email personal', + // labelText: 'Email personal', + // contentPadding: EdgeInsets.symmetric( + // vertical: 10, horizontal: 15), + // ), + // ), SizedBox(height: 15), TextFormField( readOnly: true, @@ -1805,16 +1827,10 @@ class _empDetailsState extends State { fontWeight: FontWeight.w600, ), ), - if (gpaECardDownload != null) + if (item['eCardDownload'] != null) GestureDetector( onTap: () async { - Uri uri = Uri.parse(gpaECardDownload); - if (await canLaunchUrl(uri)) { - await launchUrl(uri); - } else { - print( - 'Could not launch $gpaECardDownload'); - } + _launchURL(item['eCardDownload']); }, child: MouseRegion( cursor: SystemMouseCursors.click, @@ -2042,7 +2058,8 @@ class _empDetailsState extends State { if (floaterData['relationship'] == 'Self') { openSelfForm('View'); } else { - openForm(floaterData, 'Edit'); + openForm( + floaterData, 'Edit', gmcSumInsured); } }, child: Text( @@ -2076,7 +2093,7 @@ class _empDetailsState extends State { // Handle the click event to open the form if (gmcOpenForEnrollment != 0) { if (gmcECardDownload == null) { - openForm(floaterData, 'Add'); + openForm(floaterData, 'Add', gmcSumInsured); } } }, @@ -2203,22 +2220,10 @@ class _empDetailsState extends State { fontWeight: FontWeight.w600, ), ), - if (gmcECardDownload != null) + if (item['eCardDownload'] != null) GestureDetector( onTap: () async { - // Convert the URL string to a Uri object - Uri uri = - Uri.parse(gmcECardDownload); - - // Check if the URL is valid - if (await canLaunchUrl(uri)) { - // Open the URL in the default browser - await launchUrl(uri); - } else { - // Handle the case where the URL cannot be launched - print( - 'Could not launch $gmcECardDownload'); - } + _launchURL(item['eCardDownload']); }, child: MouseRegion( cursor: SystemMouseCursors.click, diff --git a/lib/empReview.dart b/lib/empReview.dart index 244db13..17d1a68 100644 --- a/lib/empReview.dart +++ b/lib/empReview.dart @@ -27,7 +27,11 @@ class empReviewDetails extends StatefulWidget { class _empReviewDetailsState extends State { late ApiService apiService; bool isLoading = true; - bool isChecked = false; // Declare the _isSwitched variable here + bool isChecked = false; + bool topUpSiIsChecked = false; // Declare the _isSwitched variable here + bool topUpParentIsChecked = false; // Declare the _isSwitched variable here + bool addOnsDependentIsChecked = + false; // Declare the _isSwitched variable here dynamic _token; dynamic empCodeString; dynamic empPrimaryId; @@ -38,7 +42,7 @@ class _empReviewDetailsState extends State { dynamic gpaGridMaster; dynamic gmcPolicies; dynamic gpasumInsured; - dynamic gpaClintPolicyId = 0; + dynamic gpaClintPolicyId; dynamic gpaMappedFamilyFloaters = []; dynamic gpaSelfName; dynamic gpaSelfDob; @@ -53,6 +57,7 @@ class _empReviewDetailsState extends State { dynamic gmcSelfRelationship; dynamic gmcSelfDetails; dynamic gmcPolicyName; + dynamic gmcPolicyType; dynamic gmcNotes; dynamic gmcSumInsured; dynamic gmcTypeName; @@ -68,11 +73,13 @@ class _empReviewDetailsState extends State { dynamic siValue; dynamic addOnsDependentSumInsured; dynamic addOnsDependentPolicyName; + dynamic addOnsDependentPolicyType; dynamic addOnsFloaterTextHeading; dynamic addOnsDependentECardDownload; + dynamic addOnsDependentDisclaimer; dynamic addOnsFamilyFloater; late DateTime? selectedDate; - int totalPayableAmt = 0; + double totalPayableAmt = 0.0; List> relationshipOptions = []; List> selectedRelationships = []; List> formDataList = []; @@ -82,21 +89,24 @@ class _empReviewDetailsState extends State { dynamic topUpSlabRates; dynamic topUpFamilyFloater; dynamic topUpPolicyName; + dynamic topUpPolicyType; dynamic topUpTypeName; - int topUpSiPremiumValue = 0; - int topUpSiPremiumGst = 0; - int topUpSiTotalAmt = 0; - int topUpParentSiPremiumValue = 0; - int topUpParentSiPremiumGst = 0; - int topUpParentSiTotalAmt = 0; - int addOnDependentPremiumValue = 0; - int addOnsDependentPremiumGst = 0; - int addOnsDependentTotalAmt = 0; + dynamic topUpSiPremiumValue; + dynamic topUpSiPremiumGst; + dynamic topUpSiTotalAmt; + dynamic topUpParentSiPremiumValue; + dynamic topUpParentSiPremiumGst; + dynamic topUpParentSiTotalAmt; + // int addOnDependentPremiumValue = 0; + dynamic addOnDependentPremiumValue; + dynamic addOnsDependentPremiumGst; + dynamic addOnsDependentTotalAmt; dynamic topUpSiValue; dynamic topUpSiSelectedSI; dynamic topUpSumInsured; dynamic topUpFloaterTextHeading; dynamic topUpECardDownload; + dynamic topUpDisclaimer; int showHideTopUpCard = 0; int showHideAddOnsCard = 0; int showHideTopUpParentCard = 0; @@ -105,6 +115,7 @@ class _empReviewDetailsState extends State { dynamic topUpParentClientPolicyId; dynamic topUpParentSlabRates; dynamic topUpParentPolicyName; + dynamic topUpParentPolicyType; dynamic topUpParentFamilyFloater; dynamic topUpParentMappedFamilyFloatersSi; dynamic topUpParentECardDownload; @@ -112,6 +123,7 @@ class _empReviewDetailsState extends State { dynamic topUpParentSiSelectedSI; dynamic topUpParentTypeName; dynamic topUpParentFloterTextHeading; + dynamic topUpParentDisclaimer; int topUpParentOpenForEnrollment = 0; int activeSiData = 0; int activeSiParentData = 0; @@ -120,13 +132,14 @@ class _empReviewDetailsState extends State { dynamic gmcDataIsEmpty = 1; dynamic gpaDataIsEmpty = 1; dynamic empClientBranchId; + dynamic selfEmpStatus; @override void initState() { super.initState(); apiService = ApiService(context); // Initialize ApiService here _loadToken(); - Future.delayed(Duration(seconds: 5), () { + Future.delayed(Duration(seconds: 3), () { setState(() { isLoading = false; }); @@ -155,6 +168,7 @@ class _empReviewDetailsState extends State { setState(() { _token = token; }); + selfEmpStatus = prefs.getString('selfEmpStatus'); empClientBranchId = prefs.getString('empClientBranchId'); empCodeString = prefs.getString('empCode'); print(empCodeString); // Check if emp_code is correct @@ -380,6 +394,8 @@ class _empReviewDetailsState extends State { topUpPolicyName = await topUpSiPolicies['gmc_si_topup']['policy_name']; + topUpPolicyType = await topUpSiPolicies['gmc_si_topup']['type']; + topUpMappedFamilyFloatersSiArray = topUpSiPolicies['gmc_si_topup'] ['family_floaters_of_only_si_array']; print('topUpMappedFamilyFloatersSiArray'); @@ -392,6 +408,9 @@ class _empReviewDetailsState extends State { topUpECardDownload = topUpSiPolicies['gmc_si_topup']['eCardDownload']; + + topUpDisclaimer = + await topUpSiPolicies['gmc_si_topup']['disclaimer']; // }); } else { // ToastHelper.showErrorToast( @@ -447,6 +466,9 @@ class _empReviewDetailsState extends State { await topUpSiParentPolicies['gmc_si_parent_topup'] ['policy_name']; + topUpParentPolicyType = + await topUpSiParentPolicies['gmc_si_parent_topup']['type']; + topUpParentFamilyFloater = await topUpSiParentPolicies['gmc_si_parent_topup'] ['policy_terms']['family_floater']; @@ -485,6 +507,10 @@ class _empReviewDetailsState extends State { } else { showHideTopUpParentCard = 1; } + + topUpParentDisclaimer = + await topUpSiParentPolicies['gmc_si_parent_topup'] + ['disclaimer']; // }); } else { // ToastHelper.showErrorToast( @@ -545,6 +571,10 @@ class _empReviewDetailsState extends State { addOnsDependentPolicies['gmc_dependent_addon']['policy_name']; print(addOnsDependentPolicyName); + addOnsDependentPolicyType = + addOnsDependentPolicies['gmc_dependent_addon']['type']; + print(addOnsDependentPolicyType); + addOnsDependentMappedFamilyFloatersArray = await addOnsDependentPolicies['gmc_dependent_addon'] ['family_floaters_of_dependent_and_si_array']; @@ -557,6 +587,10 @@ class _empReviewDetailsState extends State { addOnsDependentECardDownload = addOnsDependentPolicies['gmc_dependent_addon']['eCardDownload']; + + addOnsDependentDisclaimer = + await addOnsDependentPolicies['gmc_dependent_addon'] + ['disclaimer']; } else { // ToastHelper.showErrorToast( // context, 'No data found in the response'); @@ -582,7 +616,7 @@ class _empReviewDetailsState extends State { Future sendAddOnAPI() async { setState(() { - isLoading = false; + isLoading = true; }); if (addOnsDependentMappedFamilyFloatersArray != null) { dynamic getDependentTrueObjects = addOnsDependentMappedFamilyFloatersArray @@ -626,7 +660,14 @@ class _empReviewDetailsState extends State { print(gmcPolicies); if (gpaDataIsEmpty != 0) { - iAgreeForAddOn.add(int.parse(gpaClintPolicyId)); + print('gpaDataIsEmpty : $gpaDataIsEmpty'); + for (var item in gpaPolicies) { + print('ClientPolicyId'); + // Extract ClientPolicyId value from each object + String clientPolicyId = item['ClientPolicyId']; + // Convert to integer and add to iAgreeForAddOn list + iAgreeForAddOn.add(int.parse(clientPolicyId)); + } } if (gmcDataIsEmpty != 0) { @@ -658,6 +699,9 @@ class _empReviewDetailsState extends State { setState(() { isLoading = false; isChecked = false; + topUpSiIsChecked = false; + topUpParentIsChecked = false; + addOnsDependentIsChecked = false; }); print('response.statusCode == 200'); _showSuccessDialog(); @@ -741,6 +785,25 @@ class _empReviewDetailsState extends State { ); } + Future _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'; + } + } + + bool isSubmitEnabled() { + return isChecked && + (activeSiData == 1 ? topUpSiIsChecked : true) && + (activeSiParentData == 1 ? topUpParentIsChecked : true) && + (activeDependentData == 1 ? addOnsDependentIsChecked : true); + } + @override Widget build(BuildContext context) { if ((gpaMappedFamilyFloaters == [] && gpaMappedFamilyFloaters == null) && @@ -1089,21 +1152,8 @@ class _empReviewDetailsState extends State { null) GestureDetector( onTap: () async { - // Convert the URL string to a Uri object - Uri uri = Uri.parse( + _launchURL( topUpECardDownload); - - // Check if the URL is valid - if (await canLaunchUrl( - uri)) { - // Open the URL in the default browser - await launchUrl( - uri); - } else { - // Handle the case where the URL cannot be launched - print( - 'Could not launch $topUpECardDownload'); - } }, child: MouseRegion( cursor: @@ -1334,21 +1384,8 @@ class _empReviewDetailsState extends State { null) GestureDetector( onTap: () async { - // Convert the URL string to a Uri object - Uri uri = Uri.parse( + _launchURL( topUpParentECardDownload); - - // Check if the URL is valid - if (await canLaunchUrl( - uri)) { - // Open the URL in the default browser - await launchUrl( - uri); - } else { - // Handle the case where the URL cannot be launched - print( - 'Could not launch $topUpParentECardDownload'); - } }, child: MouseRegion( cursor: @@ -1573,21 +1610,8 @@ class _empReviewDetailsState extends State { null) GestureDetector( onTap: () async { - // Convert the URL string to a Uri object - Uri uri = Uri.parse( + _launchURL( addOnsDependentECardDownload); - - // Check if the URL is valid - if (await canLaunchUrl( - uri)) { - // Open the URL in the default browser - await launchUrl( - uri); - } else { - // Handle the case where the URL cannot be launched - print( - 'Could not launch $addOnsDependentECardDownload'); - } }, child: MouseRegion( cursor: @@ -2225,6 +2249,191 @@ class _empReviewDetailsState extends State { ], ), ), + SizedBox(height: 15), + if (activeSiData == 1) + Container( + child: Row( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Expanded( + flex: 1, + child: Container( + alignment: Alignment.centerLeft, + child: Column( + mainAxisAlignment: + MainAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Checkbox( + value: topUpSiIsChecked, + onChanged: (bool? value) { + setState(() { + topUpSiIsChecked = + value!; + }); + }, + activeColor: + Color(0xFFE26728), + ), + ], + ))), + Expanded( + flex: 11, + child: Container( + alignment: Alignment.centerRight, + child: Column( + mainAxisAlignment: + MainAxisAlignment.end, + crossAxisAlignment: + CrossAxisAlignment.end, + children: [ + Text( + topUpDisclaimer ?? '', + textAlign: + Responsive.isDesktop( + context) + ? TextAlign.left + : TextAlign.start, + style: GoogleFonts.poppins( + fontSize: + Responsive.isDesktop( + context) + ? 18 + : 15, + color: Color(0xFF292929), + ), + ), + ], + ))), + ], + ), + ), + SizedBox(height: 15), + if (activeSiParentData == 1) + Container( + child: Row( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Expanded( + flex: 1, + child: Container( + alignment: Alignment.centerLeft, + child: Column( + mainAxisAlignment: + MainAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Checkbox( + value: topUpParentIsChecked, + onChanged: (bool? value) { + setState(() { + topUpParentIsChecked = + value!; + }); + }, + activeColor: + Color(0xFFE26728), + ), + ], + ))), + Expanded( + flex: 11, + child: Container( + alignment: Alignment.centerRight, + child: Column( + mainAxisAlignment: + MainAxisAlignment.end, + crossAxisAlignment: + CrossAxisAlignment.end, + children: [ + Text( + topUpParentDisclaimer ?? '', + textAlign: + Responsive.isDesktop( + context) + ? TextAlign.left + : TextAlign.start, + style: GoogleFonts.poppins( + fontSize: + Responsive.isDesktop( + context) + ? 18 + : 15, + color: Color(0xFF292929), + ), + ), + ], + ))), + ], + ), + ), + SizedBox(height: 15), + if (activeDependentData == 1) + Container( + child: Row( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Expanded( + flex: 1, + child: Container( + alignment: Alignment.centerLeft, + child: Column( + mainAxisAlignment: + MainAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Checkbox( + value: + addOnsDependentIsChecked, + onChanged: (bool? value) { + setState(() { + addOnsDependentIsChecked = + value!; + }); + }, + activeColor: + Color(0xFFE26728), + ), + ], + ))), + Expanded( + flex: 11, + child: Container( + alignment: Alignment.centerRight, + child: Column( + mainAxisAlignment: + MainAxisAlignment.end, + crossAxisAlignment: + CrossAxisAlignment.end, + children: [ + Text( + addOnsDependentDisclaimer ?? + '', + textAlign: + Responsive.isDesktop( + context) + ? TextAlign.left + : TextAlign.start, + style: GoogleFonts.poppins( + fontSize: + Responsive.isDesktop( + context) + ? 18 + : 15, + color: Color(0xFF292929), + ), + ), + ], + ))), + ], + ), + ), SizedBox( height: Responsive.isDesktop(context) ? 15 : 0), @@ -2274,8 +2483,9 @@ class _empReviewDetailsState extends State { height: 150, alignment: Alignment.centerRight, child: ElevatedButton( - onPressed: - isChecked ? sendAddOnAPI : null, + onPressed: isSubmitEnabled() + ? sendAddOnAPI + : null, child: Text( 'Submit', style: GoogleFonts.poppins( @@ -2332,6 +2542,7 @@ class _empReviewDetailsState extends State { print(item); String? gpaPolicyName = item['Policy_Name']; + String? gpaPolicyType = item['type']; String? gpaECardDownload = item['eCardDownload']; String? gpaSumInsured; List gpaMappedFamilyFloaters = []; @@ -2444,16 +2655,10 @@ class _empReviewDetailsState extends State { fontWeight: FontWeight.w600, ), ), - if (gpaECardDownload != null) + if (item['eCardDownload'] != null) GestureDetector( onTap: () async { - Uri uri = Uri.parse(gpaECardDownload); - if (await canLaunchUrl(uri)) { - await launchUrl(uri); - } else { - print( - 'Could not launch $gpaECardDownload'); - } + _launchURL(item['eCardDownload']); }, child: MouseRegion( cursor: SystemMouseCursors.click, @@ -2523,6 +2728,7 @@ class _empReviewDetailsState extends State { for (var item in data) { setState(() { gmcPolicyName = item['Policy_Name']; + gmcPolicyType = item['type']; gmcFloaterTextHeading = item['floter_text_heading']; gmcFloaterTextDescription = item['floter_text_description']; gmcNotes = item['notes']; @@ -2608,22 +2814,11 @@ class _empReviewDetailsState extends State { fontWeight: FontWeight.w600, ), ), - if (gmcECardDownload != null) + if (item['eCardDownload'] != null) GestureDetector( onTap: () async { - // Convert the URL string to a Uri object - Uri uri = - Uri.parse(gmcECardDownload); - - // Check if the URL is valid - if (await canLaunchUrl(uri)) { - // Open the URL in the default browser - await launchUrl(uri); - } else { - // Handle the case where the URL cannot be launched - print( - 'Could not launch $gmcECardDownload'); - } + _launchURL( + item['eCardDownload']); }, child: MouseRegion( cursor: diff --git a/lib/excel_verification.dart b/lib/excel_verification.dart index d5a1c81..978a2ea 100644 --- a/lib/excel_verification.dart +++ b/lib/excel_verification.dart @@ -485,6 +485,7 @@ class _excelVerifyState extends State { (cell) => Map.from(cell)) .toList()) .toList(); + print('excelData : $excelData'); print('excelHeader : $excelHeader'); }); } diff --git a/lib/hrLogin.dart b/lib/hrLogin.dart index 8a7eba1..68851a4 100644 --- a/lib/hrLogin.dart +++ b/lib/hrLogin.dart @@ -448,7 +448,7 @@ class _MyPhoneState extends State { )), ], ), - SizedBox(height: 15), + SizedBox(height: 80), Container( margin: Responsive.isDesktop(context) ? EdgeInsets.symmetric( @@ -603,110 +603,115 @@ class _MyPhoneState extends State { SizedBox( height: _size.width <= 1100 ? 0 : 0, ), - _size.width > 1100 - ? Container( - margin: EdgeInsets.symmetric( - horizontal: 150), - child: Column( - children: [ - SizedBox(height: 30), - Text( - "Benefits of Login", - style: TextStyle( - fontSize: 20, - fontWeight: FontWeight.bold, - ), - ), - SizedBox(height: 15), - ], - )) - : SizedBox(), - _size.width > 1100 - ? Container( - margin: EdgeInsets.symmetric( - horizontal: 150), - child: Row( - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Expanded( - flex: 6, - child: Container( - padding: - EdgeInsets.symmetric( - vertical: 8), - child: Row( - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Expanded( - child: Container( - padding: EdgeInsets - .symmetric( - vertical: - 12), - decoration: - BoxDecoration( - border: Border( - right: - BorderSide( - width: 1, - color: Colors - .black, - ), - ), - ), - child: Column( - children: [ - Icon( - Icons - .policy, - color: Color( - 0xFFE26728)), - SizedBox( - height: 10), - Text( - "View Policy"), - ], - ), - ), - ), - Expanded( - child: Container( - padding: EdgeInsets - .symmetric( - vertical: - 12), - child: Column( - children: [ - Icon(Icons.edit, - color: Color( - 0xFFE26728)), - SizedBox( - height: 10), - Text( - "Manage Claims"), - ], - ), - ), - ), - ], - ), - ), - ), - ], - ), - ) - : SizedBox( - height: - Responsive.isDesktop(context) - ? _size.height * 0.1 - : _size.height * 0.2, - ), + // _size.width > 1100 + // ? Container( + // margin: EdgeInsets.symmetric( + // horizontal: 150), + // child: Column( + // children: [ + // SizedBox(height: 30), + // Text( + // "Benefits of Login", + // style: TextStyle( + // fontSize: 20, + // fontWeight: FontWeight.bold, + // ), + // ), + // SizedBox(height: 15), + // ], + // )) + // : SizedBox(), + // _size.width > 1100 + // ? Container( + // margin: EdgeInsets.symmetric( + // horizontal: 150), + // child: Row( + // mainAxisAlignment: + // MainAxisAlignment.center, + // children: [ + // Expanded( + // flex: 6, + // child: Container( + // padding: + // EdgeInsets.symmetric( + // vertical: 8), + // child: Row( + // mainAxisAlignment: + // MainAxisAlignment + // .center, + // children: [ + // Expanded( + // child: Container( + // padding: EdgeInsets + // .symmetric( + // vertical: + // 12), + // decoration: + // BoxDecoration( + // border: Border( + // right: + // BorderSide( + // width: 1, + // color: Colors + // .black, + // ), + // ), + // ), + // child: Column( + // children: [ + // Icon( + // Icons + // .policy, + // color: Color( + // 0xFFE26728)), + // SizedBox( + // height: 10), + // Text( + // "View Policy"), + // ], + // ), + // ), + // ), + // Expanded( + // child: Container( + // padding: EdgeInsets + // .symmetric( + // vertical: + // 12), + // child: Column( + // children: [ + // Icon(Icons.edit, + // color: Color( + // 0xFFE26728)), + // SizedBox( + // height: 10), + // Text( + // "Manage Claims"), + // ], + // ), + // ), + // ), + // ], + // ), + // ), + // ), + // ], + // ), + // ) + // : SizedBox( + // height: + // Responsive.isDesktop(context) + // ? _size.height * 0.1 + // : _size.height * 0.2, + // ), SizedBox( - height: _size.height * 0.1, + height: Responsive.isDesktop(context) + ? _size.height * 0.3 + : _size.height * 0.2, ), + // SizedBox( + // height: _size.height * 0.1, + // ), Align( alignment: Alignment.bottomCenter, child: Container( diff --git a/lib/hrPolicyDetails.dart b/lib/hrPolicyDetails.dart index 915b5fc..4fc9131 100644 --- a/lib/hrPolicyDetails.dart +++ b/lib/hrPolicyDetails.dart @@ -124,6 +124,24 @@ class _HrPolicyDetailsState extends State String int_inception_type = argumentsData['inception_type']; inceptionType = int.parse(int_inception_type); getEmployeeAndDependence(clientId, clientPolicyId); + } else if (argumentsData['type'] == 'EDLI') { + _isLoading = true; + clientPolicyId = argumentsData['client_policy_id']; + clientId = argumentsData['client_id']; + policyType = argumentsData['type']; + policyName = argumentsData['policy_name']; + String int_inception_type = argumentsData['inception_type']; + inceptionType = int.parse(int_inception_type); + getEmployeeAndDependence(clientId, clientPolicyId); + } else if (argumentsData['type'] == 'GTLI') { + _isLoading = true; + clientPolicyId = argumentsData['client_policy_id']; + clientId = argumentsData['client_id']; + policyType = argumentsData['type']; + policyName = argumentsData['policy_name']; + String int_inception_type = argumentsData['inception_type']; + inceptionType = int.parse(int_inception_type); + getEmployeeAndDependence(clientId, clientPolicyId); } } }); @@ -524,7 +542,9 @@ class _HrPolicyDetailsState extends State ? 5 : 0), if ((policyType == 'GPA' || - policyType == 'GMC') && + policyType == 'GMC' || + policyType == 'EDLI' || + policyType == 'GTLI') && inceptionType == 2) Expanded( flex: 2, diff --git a/lib/hrVerify.dart b/lib/hrVerify.dart index 260ba27..8e9c4d2 100644 --- a/lib/hrVerify.dart +++ b/lib/hrVerify.dart @@ -524,7 +524,7 @@ class _MyVerifyState extends State { )), ], ), - SizedBox(height: 10), + SizedBox(height: 80), Container( margin: Responsive.isDesktop(context) ? EdgeInsets.symmetric( @@ -657,110 +657,115 @@ class _MyVerifyState extends State { SizedBox( height: _size.width <= 1100 ? 0 : 0, ), - _size.width > 1100 - ? Container( - margin: EdgeInsets.symmetric( - horizontal: 150), - child: Column( - children: [ - SizedBox(height: 30), - Text( - "Benefits of Login", - style: GoogleFonts.poppins( - fontSize: 20, - fontWeight: FontWeight.bold, - ), - ), - SizedBox(height: 15), - ], - )) - : SizedBox(), - _size.width > 1100 - ? Container( - margin: EdgeInsets.symmetric( - horizontal: 150), - child: Row( - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Expanded( - flex: 6, - child: Container( - padding: - EdgeInsets.symmetric( - vertical: 8), - child: Row( - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Expanded( - child: Container( - padding: EdgeInsets - .symmetric( - vertical: - 12), - decoration: - BoxDecoration( - border: Border( - right: - BorderSide( - width: 1, - color: Colors - .black, - ), - ), - ), - child: Column( - children: [ - Icon( - Icons - .policy, - color: Color( - 0xFFE26728)), - SizedBox( - height: 10), - Text( - "View Policy"), - ], - ), - ), - ), - Expanded( - child: Container( - padding: EdgeInsets - .symmetric( - vertical: - 12), - child: Column( - children: [ - Icon(Icons.edit, - color: Color( - 0xFFE26728)), - SizedBox( - height: 10), - Text( - "Manage Claims"), - ], - ), - ), - ), - ], - ), - ), - ), - ], - ), - ) - : SizedBox( - height: - Responsive.isDesktop(context) - ? _size.height * 0.1 - : _size.height * 0.2, - ), + // _size.width > 1100 + // ? Container( + // margin: EdgeInsets.symmetric( + // horizontal: 150), + // child: Column( + // children: [ + // SizedBox(height: 30), + // Text( + // "Benefits of Login", + // style: GoogleFonts.poppins( + // fontSize: 20, + // fontWeight: FontWeight.bold, + // ), + // ), + // SizedBox(height: 15), + // ], + // )) + // : SizedBox(), + // _size.width > 1100 + // ? Container( + // margin: EdgeInsets.symmetric( + // horizontal: 150), + // child: Row( + // mainAxisAlignment: + // MainAxisAlignment.center, + // children: [ + // Expanded( + // flex: 6, + // child: Container( + // padding: + // EdgeInsets.symmetric( + // vertical: 8), + // child: Row( + // mainAxisAlignment: + // MainAxisAlignment + // .center, + // children: [ + // Expanded( + // child: Container( + // padding: EdgeInsets + // .symmetric( + // vertical: + // 12), + // decoration: + // BoxDecoration( + // border: Border( + // right: + // BorderSide( + // width: 1, + // color: Colors + // .black, + // ), + // ), + // ), + // child: Column( + // children: [ + // Icon( + // Icons + // .policy, + // color: Color( + // 0xFFE26728)), + // SizedBox( + // height: 10), + // Text( + // "View Policy"), + // ], + // ), + // ), + // ), + // Expanded( + // child: Container( + // padding: EdgeInsets + // .symmetric( + // vertical: + // 12), + // child: Column( + // children: [ + // Icon(Icons.edit, + // color: Color( + // 0xFFE26728)), + // SizedBox( + // height: 10), + // Text( + // "Manage Claims"), + // ], + // ), + // ), + // ), + // ], + // ), + // ), + // ), + // ], + // ), + // ) + // : SizedBox( + // height: + // Responsive.isDesktop(context) + // ? _size.height * 0.1 + // : _size.height * 0.2, + // ), SizedBox( - height: _size.height * 0.1, + height: Responsive.isDesktop(context) + ? _size.height * 0.3 + : _size.height * 0.2, ), + // SizedBox( + // height: _size.height * 0.1, + // ), Align( alignment: Alignment.bottomCenter, child: Container( diff --git a/lib/phone.dart b/lib/phone.dart index 123a7d6..bcf62dd 100644 --- a/lib/phone.dart +++ b/lib/phone.dart @@ -419,7 +419,7 @@ class _MyPhoneState extends State { )), ], ), - SizedBox(height: 10), + SizedBox(height: 80), Container( margin: Responsive.isDesktop(context) ? EdgeInsets.symmetric( @@ -574,110 +574,115 @@ class _MyPhoneState extends State { SizedBox( height: _size.width <= 1100 ? 0 : 0, ), - _size.width > 1100 - ? Container( - margin: EdgeInsets.symmetric( - horizontal: 150), - child: Column( - children: [ - SizedBox(height: 30), - Text( - "Benefits of Login", - style: GoogleFonts.poppins( - fontSize: 20, - fontWeight: FontWeight.bold, - ), - ), - SizedBox(height: 15), - ], - )) - : SizedBox(), - _size.width > 1100 - ? Container( - margin: EdgeInsets.symmetric( - horizontal: 150), - child: Row( - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Expanded( - flex: 6, - child: Container( - padding: - EdgeInsets.symmetric( - vertical: 8), - child: Row( - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Expanded( - child: Container( - padding: EdgeInsets - .symmetric( - vertical: - 12), - decoration: - BoxDecoration( - border: Border( - right: - BorderSide( - width: 1, - color: Colors - .black, - ), - ), - ), - child: Column( - children: [ - Icon( - Icons - .policy, - color: Color( - 0xFFE26728)), - SizedBox( - height: 10), - Text( - "View Policy"), - ], - ), - ), - ), - Expanded( - child: Container( - padding: EdgeInsets - .symmetric( - vertical: - 12), - child: Column( - children: [ - Icon(Icons.edit, - color: Color( - 0xFFE26728)), - SizedBox( - height: 10), - Text( - "Manage Claims"), - ], - ), - ), - ), - ], - ), - ), - ), - ], - ), - ) - : SizedBox( - height: - Responsive.isDesktop(context) - ? _size.height * 0.1 - : _size.height * 0.2, - ), + // _size.width > 1100 + // ? Container( + // margin: EdgeInsets.symmetric( + // horizontal: 150), + // child: Column( + // children: [ + // SizedBox(height: 30), + // Text( + // "Benefits of Login", + // style: GoogleFonts.poppins( + // fontSize: 20, + // fontWeight: FontWeight.bold, + // ), + // ), + // SizedBox(height: 15), + // ], + // )) + // : SizedBox(), + // _size.width > 1100 + // ? Container( + // margin: EdgeInsets.symmetric( + // horizontal: 150), + // child: Row( + // mainAxisAlignment: + // MainAxisAlignment.center, + // children: [ + // Expanded( + // flex: 6, + // child: Container( + // padding: + // EdgeInsets.symmetric( + // vertical: 8), + // child: Row( + // mainAxisAlignment: + // MainAxisAlignment + // .center, + // children: [ + // Expanded( + // child: Container( + // padding: EdgeInsets + // .symmetric( + // vertical: + // 12), + // decoration: + // BoxDecoration( + // border: Border( + // right: + // BorderSide( + // width: 1, + // color: Colors + // .black, + // ), + // ), + // ), + // child: Column( + // children: [ + // Icon( + // Icons + // .policy, + // color: Color( + // 0xFFE26728)), + // SizedBox( + // height: 10), + // Text( + // "View Policy"), + // ], + // ), + // ), + // ), + // Expanded( + // child: Container( + // padding: EdgeInsets + // .symmetric( + // vertical: + // 12), + // child: Column( + // children: [ + // Icon(Icons.edit, + // color: Color( + // 0xFFE26728)), + // SizedBox( + // height: 10), + // Text( + // "Manage Claims"), + // ], + // ), + // ), + // ), + // ], + // ), + // ), + // ), + // ], + // ), + // ) + // : SizedBox( + // height: + // Responsive.isDesktop(context) + // ? _size.height * 0.1 + // : _size.height * 0.2, + // ), SizedBox( - height: _size.height * 0.1, + height: Responsive.isDesktop(context) + ? _size.height * 0.3 + : _size.height * 0.2, ), + // SizedBox( + // height: _size.height * 0.1, + // ), Align( alignment: Alignment.bottomCenter, child: Container( diff --git a/lib/verify.dart b/lib/verify.dart index 0f412ac..efc3ecf 100644 --- a/lib/verify.dart +++ b/lib/verify.dart @@ -491,7 +491,7 @@ class _MyVerifyState extends State { )), ], ), - SizedBox(height: 10), + SizedBox(height: 80), Container( margin: Responsive.isDesktop(context) ? EdgeInsets.symmetric( @@ -621,114 +621,119 @@ class _MyVerifyState extends State { ), ), ), - _size.width > 1100 - ? Container( - margin: EdgeInsets.symmetric( - horizontal: 150), - child: Column( - children: [ - SizedBox(height: 20), - Text( - "Benefits of Login", - style: GoogleFonts.poppins( - fontSize: 20, - fontWeight: FontWeight.bold, - ), - ), - SizedBox(height: 15), - ], - )) - : SizedBox(), - _size.width > 1100 - ? Container( - margin: EdgeInsets.symmetric( - horizontal: 150), - child: Row( - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Expanded( - flex: 6, - child: Container( - padding: - EdgeInsets.symmetric( - vertical: 8), - child: Row( - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Expanded( - child: Container( - padding: EdgeInsets - .symmetric( - vertical: - 12), - decoration: - BoxDecoration( - border: Border( - right: - BorderSide( - width: 1, - color: Colors - .black, - ), - ), - ), - child: Column( - children: [ - Icon( - Icons - .policy, - color: Color( - 0xFFE26728)), - SizedBox( - height: 10), - Text( - "View Policy", - style: GoogleFonts - .poppins()), - ], - ), - ), - ), - Expanded( - child: Container( - padding: EdgeInsets - .symmetric( - vertical: - 12), - child: Column( - children: [ - Icon(Icons.edit, - color: Color( - 0xFFE26728)), - SizedBox( - height: 10), - Text( - "Manage Claims", - style: GoogleFonts - .poppins()), - ], - ), - ), - ), - ], - ), - ), - ), - ], - ), - ) - : SizedBox( - height: - Responsive.isDesktop(context) - ? _size.height * 0.1 - : _size.height * 0.2, - ), + // _size.width > 1100 + // ? Container( + // margin: EdgeInsets.symmetric( + // horizontal: 150), + // child: Column( + // children: [ + // SizedBox(height: 20), + // Text( + // "Benefits of Login", + // style: GoogleFonts.poppins( + // fontSize: 20, + // fontWeight: FontWeight.bold, + // ), + // ), + // SizedBox(height: 15), + // ], + // )) + // : SizedBox(), + // _size.width > 1100 + // ? Container( + // margin: EdgeInsets.symmetric( + // horizontal: 150), + // child: Row( + // mainAxisAlignment: + // MainAxisAlignment.center, + // children: [ + // Expanded( + // flex: 6, + // child: Container( + // padding: + // EdgeInsets.symmetric( + // vertical: 8), + // child: Row( + // mainAxisAlignment: + // MainAxisAlignment + // .center, + // children: [ + // Expanded( + // child: Container( + // padding: EdgeInsets + // .symmetric( + // vertical: + // 12), + // decoration: + // BoxDecoration( + // border: Border( + // right: + // BorderSide( + // width: 1, + // color: Colors + // .black, + // ), + // ), + // ), + // child: Column( + // children: [ + // Icon( + // Icons + // .policy, + // color: Color( + // 0xFFE26728)), + // SizedBox( + // height: 10), + // Text( + // "View Policy", + // style: GoogleFonts + // .poppins()), + // ], + // ), + // ), + // ), + // Expanded( + // child: Container( + // padding: EdgeInsets + // .symmetric( + // vertical: + // 12), + // child: Column( + // children: [ + // Icon(Icons.edit, + // color: Color( + // 0xFFE26728)), + // SizedBox( + // height: 10), + // Text( + // "Manage Claims", + // style: GoogleFonts + // .poppins()), + // ], + // ), + // ), + // ), + // ], + // ), + // ), + // ), + // ], + // ), + // ) + // : SizedBox( + // height: + // Responsive.isDesktop(context) + // ? _size.height * 0.1 + // : _size.height * 0.2, + // ), SizedBox( - height: _size.height * 0.1, + height: Responsive.isDesktop(context) + ? _size.height * 0.3 + : _size.height * 0.2, ), + // SizedBox( + // height: _size.height * 0.1, + // ), Align( alignment: Alignment.bottomCenter, child: Container(