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

FIX_minor issues

Browse Source
This commit is contained in:
sanjeev.p 2026-02-17 15:20:33 +05:30
parent 7088c0d99d
commit 87ed647344
9 changed files with 546 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/presentation/RaiseClaimForm.dart
View File

@ -749,6 +749,7 @@ class _RaiseClaimDialogState extends State<RaiseClaimDialog> {
), ),
IconButton( IconButton(
icon: const Icon(Icons.close), icon: const Icon(Icons.close),
tooltip: 'Close',
onPressed: () => Navigator.pop(context), onPressed: () => Navigator.pop(context),
), ),
], ],

138
lib/presentation/cdTransactionDetails.dart
View File

@ -790,12 +790,14 @@ class _cdTransactionDetailsState extends State<cdTransactionDetails> {
if (isAllowedSubType) if (isAllowedSubType)
_ActionIconButton( _ActionIconButton(
icon: Icons.picture_as_pdf_outlined, icon: Icons.picture_as_pdf_outlined,
toolTip: 'View Endorsement PDF',
onTap: () => getCdEndorsementDetails(item['id']), onTap: () => getCdEndorsementDetails(item['id']),
), ),
const SizedBox(width: 8), const SizedBox(width: 8),
if (isAllowedSubType && hasSplitUpFile) if (isAllowedSubType && hasSplitUpFile)
_ActionIconButton( _ActionIconButton(
icon: Icons.folder_open_outlined, icon: Icons.folder_open_outlined,
toolTip: 'View Files',
onTap: () => _launchURL(item['split_up_url']), onTap: () => _launchURL(item['split_up_url']),
), ),
], ],
@ -819,6 +821,126 @@ class _cdTransactionDetailsState extends State<cdTransactionDetails> {
} }
Widget _buildPagination(BuildContext context) { Widget _buildPagination(BuildContext context) {
final totalItems = filteredData.length;
// Calculate entries range
final int startEntry = totalItems == 0 ? 0 : ((_currentPage - 1) * _rowsPerPage) + 1;
int endEntry = _currentPage * _rowsPerPage;
if (endEntry > totalItems) endEntry = totalItems;
// Calculate total pages
final int totalPages = (totalItems / _rowsPerPage).ceil();
const int visiblePageCount = 5;
// Helper logic for page numbers
List<int> getVisiblePages() {
if (totalPages <= visiblePageCount) {
return List.generate(totalPages, (i) => i + 1);
}
if (_currentPage <= 3) {
return [1, 2, 3, 4, 5];
}
if (_currentPage >= totalPages - 2) {
return [
totalPages - 4,
totalPages - 3,
totalPages - 2,
totalPages - 1,
totalPages
];
}
return [
_currentPage - 2,
_currentPage - 1,
_currentPage,
_currentPage + 1,
_currentPage + 2,
];
}
List<int> visiblePages = getVisiblePages();
return Padding(
padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, // Standard Table Footer Layout
children: [
/// --- LEFT SIDE: ENTRY DETAILS ---
Text(
'Showing $startEntry to $endEntry of $totalItems entries',
style: GoogleFonts.poppins(
fontSize: 13,
fontWeight: FontWeight.w500,
color: const Color(0xFF666666),
),
),
/// --- RIGHT SIDE: CONTROLS ---
Row(
children: [
DropdownButton<int>(
value: _rowsPerPage,
items: [5, 10, 15, 20, 50].map((int value) {
return DropdownMenuItem<int>(
value: value,
child: Text(' $value ',
style: GoogleFonts.poppins(fontSize: 15)),
);
}).toList(),
onChanged: (newValue) {
setState(() {
_rowsPerPage = newValue!;
_currentPage = 1;
});
},
),
const SizedBox(width: 16),
IconButton(
onPressed: _currentPage > 1
? () => setState(() => _currentPage--)
: null,
icon: const Icon(Icons.chevron_left),
),
if (!visiblePages.contains(1))
Row(children: [
_buildPageButton(1),
const Padding(
padding: EdgeInsets.symmetric(horizontal: 4),
child: Text("..."),
),
]),
// Visible page buttons
for (int page in visiblePages) _buildPageButton(page),
if (!visiblePages.contains(totalPages) && totalPages > 0)
Row(children: [
const Padding(
padding: EdgeInsets.symmetric(horizontal: 4),
child: Text("..."),
),
_buildPageButton(totalPages),
]),
// Next button
IconButton(
onPressed: _currentPage < totalPages
? () => setState(() => _currentPage++)
: null,
icon: const Icon(Icons.chevron_right),
),
],
),
],
),
);
}
Widget _buildPagination_backup(BuildContext context) {
final totalPages = (filteredData.length / _rowsPerPage).ceil(); final totalPages = (filteredData.length / _rowsPerPage).ceil();
const visiblePageCount = 5; const visiblePageCount = 5;
@ -1033,16 +1155,19 @@ class _ActionIconButton extends StatelessWidget {
final IconData icon; final IconData icon;
final VoidCallback onTap; final VoidCallback onTap;
final bool enabled; final bool enabled;
final String? toolTip; // 1. Define the optional tooltip string
const _ActionIconButton({ const _ActionIconButton({
required this.icon, required this.icon,
required this.onTap, required this.onTap,
this.toolTip, // 2. Added to constructor
this.enabled = true, this.enabled = true,
}); });
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SizedBox( // 3. Define the main button widget
Widget button = SizedBox(
width: 36, width: 36,
height: 36, height: 36,
child: Material( child: Material(
@ -1061,6 +1186,17 @@ class _ActionIconButton extends StatelessWidget {
), ),
), ),
); );
// 4. Wrap with Tooltip only if enabled and tooltip text exists
if (enabled && toolTip != null) {
return Tooltip(
message: toolTip!,
preferBelow: false, // Shows tooltip above the button
child: button,
);
}
return button;
} }
} }

164
lib/presentation/claims.dart
View File

@ -810,51 +810,60 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
GestureDetector( // 1. Tooltip for the hover message
onTap: () { Tooltip(
// print('id ${item['id']}'); message: 'View Claim History',
// print('emp_name ${item['emp_name']}'); child:
// print('emp_code ${item['emp_code']}'); // 2. MouseRegion for the hand pointer
// print('policy_type ${item['policy_type']}'); MouseRegion(
// print('client_policy_no ${item['client_policy_no']}'); cursor: SystemMouseCursors.click,
// print('claim_amount ${item['claim_amount']}'); child: GestureDetector(
// print('claim_no ${item['claim_no']}'); onTap: () {
// print(widget.postToken); // print('id ${item['id']}');
// return; // print('emp_name ${item['emp_name']}');
showDialog( // print('emp_code ${item['emp_code']}');
context: context, // print('policy_type ${item['policy_type']}');
barrierDismissible: true, // print('client_policy_no ${item['client_policy_no']}');
builder: (BuildContext context) { // print('claim_amount ${item['claim_amount']}');
return Dialog( // print('claim_no ${item['claim_no']}');
backgroundColor: Colors.transparent, // print(widget.postToken);
insetPadding: EdgeInsets.all(16), // return;
child: ClaimHistoryPopup( showDialog(
ticket_id: item['id'] ?? '', context: context,
empName: item['emp_name'] ?? '', // example barrierDismissible: true,
empCode: item['emp_code'] ?? '', // example builder: (BuildContext context) {
policyType: item['policy_type'] ?? '', return Dialog(
clientPolicyNo: item['client_policy_no'] ?? '', backgroundColor: Colors.transparent,
claimAmount: item['claim_amount']?.toString() ?? '', insetPadding: EdgeInsets.all(16),
claimNo: item['claim_no'] ?? '', child: ClaimHistoryPopup(
postToken: _postPreToken ?? '', 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']?.toString() ?? '',
claimNo: item['claim_no'] ?? '',
postToken: _postPreToken ?? '',
),
);
},
); );
}, },
); child: Container(
}, height: 35,
child: Container( width: 35,
height: 35, decoration: BoxDecoration(
width: 35, color: Color(0xFF86D1D4),
decoration: BoxDecoration( borderRadius: BorderRadius.circular(8),
color: Color(0xFF86D1D4), ),
borderRadius: BorderRadius.circular(8), child: Padding(
), padding: EdgeInsets.all(10), // You can adjust this value
child: Padding( child: Image.asset(
padding: EdgeInsets.all(10), // You can adjust this value 'assets/claimHistory.png',
child: Image.asset( fit: BoxFit.contain,
'assets/claimHistory.png', width: 5,
fit: BoxFit.contain, ),
width: 5, ),
), ),
), ),
), ),
@ -937,6 +946,12 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
); );
Widget _buildPagination(BuildContext context) { Widget _buildPagination(BuildContext context) {
// 1. Calculate the range of entries being shown
final totalItems = filteredData.length;
final int startEntry = totalItems == 0 ? 0 : ((_currentPage - 1) * _rowsPerPage) + 1;
int endEntry = _currentPage * _rowsPerPage;
if (endEntry > totalItems) endEntry = totalItems;
final totalPages = (filteredData.length / _rowsPerPage).ceil(); final totalPages = (filteredData.length / _rowsPerPage).ceil();
const visiblePageCount = 5; const visiblePageCount = 5;
@ -947,7 +962,8 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
if (_currentPage <= 3) { if (_currentPage <= 3) {
return [1, 2, 3, 4, 5]; return [1, 2, 3, 4, 5];
} else if (_currentPage >= totalPages - 2) { }
if (_currentPage >= totalPages - 2) {
return [ return [
totalPages - 4, totalPages - 4,
totalPages - 3, totalPages - 3,
@ -955,29 +971,42 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
totalPages - 1, totalPages - 1,
totalPages totalPages
]; ];
} else {
return [
_currentPage - 2,
_currentPage - 1,
_currentPage,
_currentPage + 1,
_currentPage + 2,
];
} }
return [
_currentPage - 2,
_currentPage - 1,
_currentPage,
_currentPage + 1,
_currentPage + 2,
];
} }
List<int> visiblePages = getVisiblePages(); List<int> visiblePages = getVisiblePages();
return Row( return Padding(
mainAxisAlignment: MainAxisAlignment.end, // Match this horizontal padding (16) to your Table Header padding for perfect alignment
children: [ padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
Padding( child: Row(
padding: const EdgeInsets.symmetric(vertical: 12), mainAxisAlignment: MainAxisAlignment.spaceBetween, // Pushes text to left, buttons to right
child: Row( children: [
// --- LEFT SIDE: Showing Text ---
Text(
"Showing $startEntry to $endEntry of $totalItems entries",
style: GoogleFonts.poppins(
fontSize: 13,
color: const Color(0xFF585757),
fontWeight: FontWeight.w400,
),
),
// --- RIGHT SIDE: Controls ---
Row(
children: [ children: [
// Dropdown for rows per page // Dropdown for rows per page
DropdownButton<int>( DropdownButton<int>(
value: _rowsPerPage, value: _rowsPerPage,
// focusColor: Colors.transparent, // Fix: Removes the grey/blue highlight on change
items: [5, 10, 15, 20, 50].map((int value) { items: [5, 10, 15, 20, 50].map((int value) {
return DropdownMenuItem<int>( return DropdownMenuItem<int>(
value: value, value: value,
@ -1015,7 +1044,7 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
for (int page in visiblePages) _buildPageButton(page), for (int page in visiblePages) _buildPageButton(page),
// Right ellipsis + last page // Right ellipsis + last page
if (!visiblePages.contains(totalPages)) if (!visiblePages.contains(totalPages) && totalPages > 0)
Row(children: [ Row(children: [
const Padding( const Padding(
padding: EdgeInsets.symmetric(horizontal: 4), padding: EdgeInsets.symmetric(horizontal: 4),
@ -1033,8 +1062,8 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
), ),
], ],
), ),
), ],
], ),
); );
} }
@ -1641,11 +1670,13 @@ class _ClaimsPolicieState extends State<ClaimsPolicies> {
_IconActionButton( _IconActionButton(
icon: Icons.filter_alt_outlined, icon: Icons.filter_alt_outlined,
onTap: applyFilter, onTap: applyFilter,
tooltip:"Filter"
), ),
const SizedBox(width: 12), const SizedBox(width: 12),
_IconActionButton( _IconActionButton(
icon: Icons.refresh_outlined, icon: Icons.refresh_outlined,
onTap: reset, onTap: reset,
tooltip:"Reset"
), ),
], ],
), ),
@ -1703,21 +1734,24 @@ class _ClaimsHeaderDelegate extends SliverPersistentHeaderDelegate {
bool shouldRebuild(_) => false; bool shouldRebuild(_) => false;
} }
// ================= ICON BUTTON ================= // ================= ICON BUTTON =================
class _IconActionButton extends StatelessWidget { class _IconActionButton extends StatelessWidget {
final IconData icon; final IconData icon;
final VoidCallback onTap; final VoidCallback onTap;
final String tooltip;
const _IconActionButton({ const _IconActionButton({
required this.icon, required this.icon,
required this.onTap, required this.onTap,
required this.tooltip,
}); });
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SizedBox( return Tooltip(
message: tooltip,
preferBelow: false, // Optional: Shows tooltip above the button
child: SizedBox(
width: 40, width: 40,
height: 40, height: 40,
child: Material( child: Material(
@ -1729,6 +1763,6 @@ class _IconActionButton extends StatelessWidget {
child: Icon(icon, color: Colors.white, size: 20), child: Icon(icon, color: Colors.white, size: 20),
), ),
), ),
); ),);
} }
} }

11
lib/presentation/claimshistory.dart
View File

@ -796,7 +796,9 @@ class _ClaimHistoryPopupState extends State<ClaimHistoryPopup>
const SizedBox(width: 8), const SizedBox(width: 8),
/// DOWNLOAD ICON /// DOWNLOAD ICON
InkWell( Tooltip(
message: 'Download', // Added tooltip name
child: InkWell(
borderRadius: BorderRadius.circular(6), borderRadius: BorderRadius.circular(6),
onTap: () => _launchURL(file['url']), onTap: () => _launchURL(file['url']),
child: Container( child: Container(
@ -812,6 +814,7 @@ class _ClaimHistoryPopupState extends State<ClaimHistoryPopup>
), ),
), ),
), ),
),
], ],
), ),
), ),
@ -866,6 +869,7 @@ class _ClaimHistoryPopupState extends State<ClaimHistoryPopup>
), ),
IconButton( IconButton(
icon: Icon(Icons.close), icon: Icon(Icons.close),
tooltip: 'Remove', // Built-in property
onPressed: () { onPressed: () {
_resetIRDocs(); _resetIRDocs();
setState(() => showIRDocs = false); setState(() => showIRDocs = false);
@ -972,6 +976,7 @@ class _ClaimHistoryPopupState extends State<ClaimHistoryPopup>
), ),
trailing: IconButton( trailing: IconButton(
icon: Icon(Icons.cancel, color: Colors.red), icon: Icon(Icons.cancel, color: Colors.red),
tooltip: 'Remove', // Built-in property
onPressed: () => removeAssignedFile(title), onPressed: () => removeAssignedFile(title),
), ),
), ),
@ -1070,6 +1075,7 @@ class _ClaimHistoryPopupState extends State<ClaimHistoryPopup>
fontSize: 18, fontWeight: FontWeight.w600))), fontSize: 18, fontWeight: FontWeight.w600))),
IconButton( IconButton(
icon: Icon(Icons.close), icon: Icon(Icons.close),
tooltip: 'Close', // Built-in property
onPressed: () { onPressed: () {
_resetIRDocs(); _resetIRDocs();
setState(() => showIRDocs = false); setState(() => showIRDocs = false);
@ -1139,6 +1145,7 @@ class _ClaimHistoryPopupState extends State<ClaimHistoryPopup>
maxLines: 1, overflow: TextOverflow.ellipsis), maxLines: 1, overflow: TextOverflow.ellipsis),
trailing: IconButton( trailing: IconButton(
icon: Icon(Icons.cancel, color: Colors.red), icon: Icon(Icons.cancel, color: Colors.red),
tooltip: 'Remove', // Built-in property
onPressed: () => removeAssignedFile(title)), onPressed: () => removeAssignedFile(title)),
), ),
); );
@ -1234,6 +1241,7 @@ class _ClaimHistoryPopupState extends State<ClaimHistoryPopup>
fontSize: 16, fontWeight: FontWeight.w600))), fontSize: 16, fontWeight: FontWeight.w600))),
IconButton( IconButton(
icon: Icon(Icons.close), icon: Icon(Icons.close),
tooltip: 'Close', // Built-in property
onPressed: () { onPressed: () {
_resetIRDocs(); _resetIRDocs();
setState(() => showIRDocs = false); setState(() => showIRDocs = false);
@ -1304,6 +1312,7 @@ class _ClaimHistoryPopupState extends State<ClaimHistoryPopup>
maxLines: 1, overflow: TextOverflow.ellipsis), maxLines: 1, overflow: TextOverflow.ellipsis),
trailing: IconButton( trailing: IconButton(
icon: Icon(Icons.cancel, color: Colors.red), icon: Icon(Icons.cancel, color: Colors.red),
tooltip: 'Remove', // Built-in property
onPressed: () => removeAssignedFile(title)), onPressed: () => removeAssignedFile(title)),
), ),
); );

206
lib/presentation/hrPolicyDetails.dart
View File

@ -361,7 +361,7 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
// Filter the original data based on the search query // Filter the original data based on the search query
setState(() { setState(() {
filteredData = originalData.where((row) { filteredData = originalData.where((row) {
final empStatus = row['emp_is_active'] == 1 ? 'active' : 'inactive'; final empStatus = row['emp_is_active'] == 1 ? 'active' : 'Inactive';
// Implement your filter logic here // Implement your filter logic here
// For example, check if any field in the row contains the query // For example, check if any field in the row contains the query
// Adjust this logic based on your data structure // Adjust this logic based on your data structure
@ -377,7 +377,7 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
.toString() .toString()
.toLowerCase() .toLowerCase()
.contains(query.toLowerCase()) || .contains(query.toLowerCase()) ||
row['formatted_dob'] row['formatted_dob'].replaceAll("/", "-")
.toString() .toString()
.toLowerCase() .toLowerCase()
.contains(query.toLowerCase()) || .contains(query.toLowerCase()) ||
@ -595,6 +595,7 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
IconButton( IconButton(
tooltip: 'Previous Page', tooltip: 'Previous Page',
onPressed: () => {Navigator.pop(context)}, onPressed: () => {Navigator.pop(context)},
// splashRadius: 20,
icon: const Icon( icon: const Icon(
Icons.arrow_back_ios, Icons.arrow_back_ios,
size: 18, size: 18,
@ -1569,92 +1570,87 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
child: Builder( child: Builder(
builder: (context) { builder: (context) {
final isSelf = item['relationship'] == 'Self'; final isSelf = item['relationship'] == 'Self';
final hasEcard = final hasEcard = item['ecard_download_link'] != null;
item['ecard_download_link'] != null;
final showEcard = isSelf && hasEcard; final showEcard = isSelf && hasEcard;
final showClaim = final showClaim = widget.TokenType == "post" && hasModule;
widget.TokenType == "post" && hasModule;
if (!showEcard && !showClaim) { if (!showEcard && !showClaim) {
return SizedBox(); // No icon to show return SizedBox(); // No icon to show
} }
return Row( return Row(
mainAxisAlignment: showEcard && !showClaim mainAxisAlignment: MainAxisAlignment.center,
? MainAxisAlignment crossAxisAlignment: CrossAxisAlignment.center,
.start // Only eCard, push to right
: MainAxisAlignment
.end, // eCard + claim OR only claim
children: [ children: [
// --- eCard Button ---
if (showEcard) if (showEcard)
Padding( Tooltip(
padding: const EdgeInsets.symmetric( message: 'Download e-Card',
horizontal: 4.0), child: MouseRegion(
child: GestureDetector( cursor: SystemMouseCursors.click,
onTap: () { child: GestureDetector(
getEcardDownload( onTap: () {
item['emp_code'], getEcardDownload(
item['employee_id'], item['emp_code'],
item['client_policy_id'], item['employee_id'],
item['policy_no']); item['client_policy_id'],
}, item['policy_no']);
child: Container( },
height: 40, child: Container(
width: 40, height: 40,
decoration: BoxDecoration( width: 40,
color: Color(0xFFE6F5F6), decoration: BoxDecoration(
borderRadius: color: Color(0xFFE6F5F6),
BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
child: Padding( child: Padding(
padding: EdgeInsets.all(4), padding: EdgeInsets.all(4),
child: Image.asset( child: Image.asset(
'assets/credit_card.png', 'assets/credit_card.png',
fit: BoxFit.contain, fit: BoxFit.contain,
),
), ),
), ),
), ),
), ),
), ),
if (showEcard && showClaim)
SizedBox(width: 8), if (showEcard && showClaim) SizedBox(width: 8),
// --- Claim Button ---
if (showClaim) if (showClaim)
Padding( Tooltip(
padding: const EdgeInsets.symmetric( message: 'View Claims',
horizontal: 4.0),
child: MouseRegion( child: MouseRegion(
cursor: cursor: SystemMouseCursors.click,
SystemMouseCursors child: GestureDetector(
.click, onTap: () {
child: GestureDetector( Navigator.push(
onTap: () { context,
Navigator.push( MaterialPageRoute(
context, builder: (context) => ClaimsPolicies(
MaterialPageRoute( empCode: item['emp_code']!,
builder: (context) => ClaimsPolicies( ),
empCode: item['emp_code']!,
), ),
);
},
child: Container(
height: 40,
width: 40,
decoration: BoxDecoration(
color: Color(0xFFE6F5F6),
borderRadius: BorderRadius.circular(8),
), ),
); child: Padding(
}, padding: EdgeInsets.all(4),
child: Container( child: Image.asset(
height: 40, 'assets/claim.png',
width: 40, fit: BoxFit.contain,
decoration: BoxDecoration( ),
color: Color(0xFFE6F5F6),
borderRadius:
BorderRadius.circular(8),
),
child: Padding(
padding: EdgeInsets.all(4),
child: Image.asset(
'assets/claim.png',
fit: BoxFit.contain,
), ),
), ),
), ),
), ),
)
), ),
], ],
); );
@ -1822,6 +1818,12 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
} }
Widget _buildPagination(BuildContext context) { Widget _buildPagination(BuildContext context) {
// 1. Calculate the range of entries being shown
final totalItems = filteredData.length;
final int startEntry = totalItems == 0 ? 0 : ((_currentPage - 1) * _rowsPerPage) + 1;
int endEntry = _currentPage * _rowsPerPage;
if (endEntry > totalItems) endEntry = totalItems;
final totalPages = (filteredData.length / _rowsPerPage).ceil(); final totalPages = (filteredData.length / _rowsPerPage).ceil();
const visiblePageCount = 5; const visiblePageCount = 5;
@ -1832,7 +1834,8 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
if (_currentPage <= 3) { if (_currentPage <= 3) {
return [1, 2, 3, 4, 5]; return [1, 2, 3, 4, 5];
} else if (_currentPage >= totalPages - 2) { }
if (_currentPage >= totalPages - 2) {
return [ return [
totalPages - 4, totalPages - 4,
totalPages - 3, totalPages - 3,
@ -1840,7 +1843,7 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
totalPages - 1, totalPages - 1,
totalPages totalPages
]; ];
} else { }
return [ return [
_currentPage - 2, _currentPage - 2,
_currentPage - 1, _currentPage - 1,
@ -1848,35 +1851,50 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
_currentPage + 1, _currentPage + 1,
_currentPage + 2, _currentPage + 2,
]; ];
}
} }
List<int> visiblePages = getVisiblePages(); List<int> visiblePages = getVisiblePages();
return Row( return Padding(
mainAxisAlignment: MainAxisAlignment.end, // Match this horizontal padding (16) to your Table Header padding for perfect alignment
children: [ padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
Padding( child: Row(
padding: const EdgeInsets.symmetric(vertical: 12), mainAxisAlignment: MainAxisAlignment.spaceBetween, // Pushes text to left, buttons to right
child: Row( children: [
// --- LEFT SIDE: Showing Text ---
Text(
"Showing $startEntry to $endEntry of $totalItems entries",
style: GoogleFonts.poppins(
fontSize: 13,
color: const Color(0xFF585757),
fontWeight: FontWeight.w400,
),
),
// --- RIGHT SIDE: Controls ---
Row(
children: [ children: [
// Dropdown for rows per page // Dropdown for rows per page
DropdownButton<int>( DropdownButton<int>(
value: _rowsPerPage, value: _rowsPerPage,
items: [5, 10, 15, 20, 50].map((int value) { // focusColor: Colors.transparent, // Fix: Removes the grey/blue highlight on change
return DropdownMenuItem<int>( items: [5, 10, 15, 20, 50].map((int value) {
value: value, return DropdownMenuItem<int>(
child: Text(' $value ', value: value,
style: GoogleFonts.poppins(fontSize: 15)), child: Text(' $value ',
); style: GoogleFonts.poppins(fontSize: 15)),
}).toList(), );
onChanged: (newValue) { }).toList(),
setState(() { onChanged: (newValue) {
_rowsPerPage = newValue!; setState(() {
_currentPage = 1; _rowsPerPage = newValue!;
}); _currentPage = 1;
}, });
), },
),
const SizedBox(width: 8),
// Previous button // Previous button
IconButton( IconButton(
@ -1901,7 +1919,7 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
for (int page in visiblePages) _buildPageButton(page), for (int page in visiblePages) _buildPageButton(page),
// Right ellipsis + last page // Right ellipsis + last page
if (!visiblePages.contains(totalPages)) if (!visiblePages.contains(totalPages) && totalPages > 0)
Row(children: [ Row(children: [
const Padding( const Padding(
padding: EdgeInsets.symmetric(horizontal: 4), padding: EdgeInsets.symmetric(horizontal: 4),
@ -1919,8 +1937,8 @@ class _HrPolicyDetailsState extends State<hrPolicyDetails>
), ),
], ],
), ),
), ],
], ),
); );
} }

104
lib/presentation/postFileUpload.dart
View File

@ -98,6 +98,9 @@ class _postFileUploadState extends State<postFileUpload> {
String? _selectedOption; String? _selectedOption;
final List<String> _allowedExtensions = ['xlsx', 'xls']; final List<String> _allowedExtensions = ['xlsx', 'xls'];
bool showSampleButton = false;
String? currentApiValue; // To store the 'value' for the 2nd param
int _currentPage = 1; int _currentPage = 1;
int _rowsPerPage = 5; int _rowsPerPage = 5;
@ -291,6 +294,54 @@ class _postFileUploadState extends State<postFileUpload> {
} }
} }
Future<void> downloadPostSampleFile(String apiParam) async {
print("fun Sam f - in");
final post_file_name = apiParam+'_sample_file.xlsx';
print("fun Sam f - name $post_file_name" );
final apiurl = Environment.apiUrlPost;
final String url = '$apiurl/downloadSampleExcel/$apiParam';
final token = widget.Token;
final response = await http.get(
Uri.parse(url),
headers: {
'APP-SIGNATURE': 'nhance-2025-signature-T8f6gV9k5fK2wf5V5c4vId3b0J8z6cAm2x8Y',
'Authorization': 'Bearer $token',
'Content-Type': 'application/json',
// 'app-signature': 'ts-traveltool-2025-signature-123456',
},
);
if (response.statusCode == 200) {
try {
print("fun sam f - ${response.statusCode}" );
// ✅ Create a blob from the response body bytes
final blob = html.Blob([response.bodyBytes]);
// ✅ Generate a download URL
final url = html.Url.createObjectUrlFromBlob(blob);
// ✅ Trigger file download automatically
final anchor = html.AnchorElement(href: url)
..setAttribute('download', '$post_file_name')
..click();
// ✅ Revoke the URL to free memory
html.Url.revokeObjectUrl(url);
ToastHelper.showSuccessToast(context, 'File Downloaded Successfully');
} catch (e) {
print("fun sam f - fail" );
throw Exception('Error parsing response: $e');
}
} else {
ToastHelper.showErrorToast(context, 'Failed to download');
print("Download failed with status: ${response.statusCode}");
}
}
void _uploadFile() async { void _uploadFile() async {
print('Test'); print('Test');
if (kIsWeb) { if (kIsWeb) {
@ -562,11 +613,10 @@ class _postFileUploadState extends State<postFileUpload> {
constraints: const BoxConstraints(), constraints: const BoxConstraints(),
), ),
const SizedBox(width: 6), const SizedBox(width: 6),
Container( Expanded(
// color: Colors.redAccent.shade100,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, // mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Text( Text(
"${widget.cardType} - ${widget.cardPolicyNo} " ?? "${widget.cardType} - ${widget.cardPolicyNo} " ??
@ -581,15 +631,35 @@ class _postFileUploadState extends State<postFileUpload> {
widget.TokenType == 'pre' widget.TokenType == 'pre'
? "${widget.cardPolicy_name} (${widget.cardPolicy_ExpDate})" ? "${widget.cardPolicy_name} (${widget.cardPolicy_ExpDate})"
: "${widget.cardInsurer_name} - ${widget.cardPolicy_name} (${widget.cardPolicy_ExpDate})", : "${widget.cardInsurer_name} - ${widget.cardPolicy_name} (${widget.cardPolicy_ExpDate})",
style: GoogleFonts.poppins( style: GoogleFonts.poppins(color: Colors.grey, fontSize: 12, fontWeight: FontWeight.w400),
color: Colors.grey,
fontSize: 12,
fontWeight: FontWeight.w400,
),
), ),
], ],
), ),
), ),
// Visibility toggles based on dropdown selection
Visibility(
visible: showSampleButton,
child: Padding(
padding: const EdgeInsets.only(left: 10),
child: SizedBox(
child: ElevatedButton(
onPressed: () {
// Pass the dynamic value to the function
downloadPostSampleFile(currentApiValue ?? '');
},
style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFFE26728),
elevation: 0,
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
),
child: Text(
'Sample Excel',
style: GoogleFonts.poppins(fontSize: 14, fontWeight: FontWeight.w700, color: Colors.white),
),
),
),
),
),
], ],
), ),
SizedBox(height:20), SizedBox(height:20),
@ -606,8 +676,10 @@ class _postFileUploadState extends State<postFileUpload> {
onChanged: (val) { onChanged: (val) {
setState(() { setState(() {
selectedKey = val; selectedKey = val;
selectedValue = getFileUploadMasterList final selectedItem = getFileUploadMasterList.firstWhere((e) => e['key'] == val);
.firstWhere((e) => e['key'] == val)['value']; selectedValue = selectedItem['value'];
currentApiValue = selectedItem['key'];
showSampleButton = true;
}); });
}, },
), ),
@ -1089,6 +1161,12 @@ class _postFileUploadState extends State<postFileUpload> {
); );
Widget _buildPagination(BuildContext context) { Widget _buildPagination(BuildContext context) {
final totalItems = filteredData.length;
final int startEntry = totalItems == 0 ? 0 : ((_currentPage - 1) * _rowsPerPage) + 1;
int endEntry = _currentPage * _rowsPerPage;
if (endEntry > totalItems) endEntry = totalItems;
final totalPages = (filteredData.length / _rowsPerPage).ceil(); final totalPages = (filteredData.length / _rowsPerPage).ceil();
const visiblePageCount = 5; const visiblePageCount = 5;
@ -1099,7 +1177,7 @@ class _postFileUploadState extends State<postFileUpload> {
if (_currentPage <= 3) { if (_currentPage <= 3) {
return [1, 2, 3, 4, 5]; return [1, 2, 3, 4, 5];
} else if (_currentPage >= totalPages - 2) { } if (_currentPage >= totalPages - 2) {
return [ return [
totalPages - 4, totalPages - 4,
totalPages - 3, totalPages - 3,
@ -1107,7 +1185,7 @@ class _postFileUploadState extends State<postFileUpload> {
totalPages - 1, totalPages - 1,
totalPages totalPages
]; ];
} else { }
return [ return [
_currentPage - 2, _currentPage - 2,
_currentPage - 1, _currentPage - 1,
@ -1115,7 +1193,7 @@ class _postFileUploadState extends State<postFileUpload> {
_currentPage + 1, _currentPage + 1,
_currentPage + 2, _currentPage + 2,
]; ];
}
} }
List<int> visiblePages = getVisiblePages(); List<int> visiblePages = getVisiblePages();

76
lib/presentation/preFileUpload.dart
View File

@ -882,7 +882,9 @@ class _excelVerifyState extends State<preFileUpload> {
SizedBox( SizedBox(
width: 40, width: 40,
height: 40 , height: 40 ,
child: ElevatedButton( child: Tooltip(
message: 'Upload', // The text that appears on hover
child: ElevatedButton(
onPressed: () => null, onPressed: () => null,
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFFD4F1F2), backgroundColor: const Color(0xFFD4F1F2),
@ -903,6 +905,7 @@ class _excelVerifyState extends State<preFileUpload> {
color: Color(0xFF00999E), color: Color(0xFF00999E),
) )
), ),
),
), ),
const SizedBox(height: 15), const SizedBox(height: 15),
Text( Text(
@ -941,7 +944,9 @@ class _excelVerifyState extends State<preFileUpload> {
SizedBox( SizedBox(
width: 40, width: 40,
height: 40 , height: 40 ,
child: ElevatedButton( child: Tooltip(
message: 'Upload', // The text that appears on hover
child: ElevatedButton(
onPressed: () { onPressed: () {
if (!_validateDatesBeforeUpload()) return; if (!_validateDatesBeforeUpload()) return;
if (fileName == null) { if (fileName == null) {
@ -967,6 +972,7 @@ class _excelVerifyState extends State<preFileUpload> {
color: Color(0xFF00999E), color: Color(0xFF00999E),
) )
), ),
),
), ),
SizedBox(height: 12), SizedBox(height: 12),
Text('Upload Your Documents', Text('Upload Your Documents',
@ -1175,7 +1181,9 @@ class _excelVerifyState extends State<preFileUpload> {
Row( Row(
children: [ children: [
if (item['file_error_status'] == '1') if (item['file_error_status'] == '1')
InkWell( Tooltip(
message: 'Info', // Added tooltip name
child:InkWell(
onTap: () async { onTap: () async {
print(item); print(item);
// return; // return;
@ -1227,10 +1235,13 @@ class _excelVerifyState extends State<preFileUpload> {
color: Colors.red, color: Colors.red,
), ),
), ),
),
SizedBox(width: 10), SizedBox(width: 10),
_buildStatusChip(item['status']), _buildStatusChip(item['status']),
SizedBox(width: 10), SizedBox(width: 10),
InkWell( Tooltip(
message: 'Download', // Added tooltip name
child:InkWell(
onTap: () { onTap: () {
getHrFileDownload(item['id'], item['file_name']); getHrFileDownload(item['id'], item['file_name']);
}, },
@ -1249,6 +1260,7 @@ class _excelVerifyState extends State<preFileUpload> {
), ),
), ),
), ),
),
], ],
), ),
/// ⬇ Download /// ⬇ Download
@ -1293,6 +1305,12 @@ class _excelVerifyState extends State<preFileUpload> {
} }
Widget _buildPagination(BuildContext context) { Widget _buildPagination(BuildContext context) {
// 1. Calculate the range of entries being shown
final totalItems = filteredData.length;
final int startEntry = totalItems == 0 ? 0 : ((_currentPage - 1) * _rowsPerPage) + 1;
int endEntry = _currentPage * _rowsPerPage;
if (endEntry > totalItems) endEntry = totalItems;
final totalPages = (filteredData.length / _rowsPerPage).ceil(); final totalPages = (filteredData.length / _rowsPerPage).ceil();
const visiblePageCount = 5; const visiblePageCount = 5;
@ -1303,7 +1321,8 @@ class _excelVerifyState extends State<preFileUpload> {
if (_currentPage <= 3) { if (_currentPage <= 3) {
return [1, 2, 3, 4, 5]; return [1, 2, 3, 4, 5];
} else if (_currentPage >= totalPages - 2) { }
if (_currentPage >= totalPages - 2) {
return [ return [
totalPages - 4, totalPages - 4,
totalPages - 3, totalPages - 3,
@ -1311,29 +1330,42 @@ class _excelVerifyState extends State<preFileUpload> {
totalPages - 1, totalPages - 1,
totalPages totalPages
]; ];
} else {
return [
_currentPage - 2,
_currentPage - 1,
_currentPage,
_currentPage + 1,
_currentPage + 2,
];
} }
return [
_currentPage - 2,
_currentPage - 1,
_currentPage,
_currentPage + 1,
_currentPage + 2,
];
} }
List<int> visiblePages = getVisiblePages(); List<int> visiblePages = getVisiblePages();
return Row( return Padding(
mainAxisAlignment: MainAxisAlignment.end, // Match this horizontal padding (16) to your Table Header padding for perfect alignment
children: [ padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
Padding( child: Row(
padding: const EdgeInsets.symmetric(vertical: 12), mainAxisAlignment: MainAxisAlignment.spaceBetween, // Pushes text to left, buttons to right
child: Row( children: [
// --- LEFT SIDE: Showing Text ---
Text(
"Showing $startEntry to $endEntry of $totalItems entries",
style: GoogleFonts.poppins(
fontSize: 13,
color: const Color(0xFF585757),
fontWeight: FontWeight.w400,
),
),
// --- RIGHT SIDE: Controls ---
Row(
children: [ children: [
// Dropdown for rows per page // Dropdown for rows per page
DropdownButton<int>( DropdownButton<int>(
value: _rowsPerPage, value: _rowsPerPage,
// focusColor: Colors.transparent, // Fix: Removes the grey/blue highlight on change
items: [5, 10, 15, 20, 50].map((int value) { items: [5, 10, 15, 20, 50].map((int value) {
return DropdownMenuItem<int>( return DropdownMenuItem<int>(
value: value, value: value,
@ -1371,7 +1403,7 @@ class _excelVerifyState extends State<preFileUpload> {
for (int page in visiblePages) _buildPageButton(page), for (int page in visiblePages) _buildPageButton(page),
// Right ellipsis + last page // Right ellipsis + last page
if (!visiblePages.contains(totalPages)) if (!visiblePages.contains(totalPages) && totalPages > 0)
Row(children: [ Row(children: [
const Padding( const Padding(
padding: EdgeInsets.symmetric(horizontal: 4), padding: EdgeInsets.symmetric(horizontal: 4),
@ -1389,8 +1421,8 @@ class _excelVerifyState extends State<preFileUpload> {
), ),
], ],
), ),
), ],
], ),
); );
} }

59
lib/service/hrDashboardTabs/cd.dart
View File

@ -553,6 +553,12 @@ class _CdPolicieState extends State<CdPolicies> {
); );
Widget _buildPagination(BuildContext context) { Widget _buildPagination(BuildContext context) {
// 1. Calculate the range of entries being shown
final totalItems = filteredData.length;
final int startEntry = totalItems == 0 ? 0 : ((_currentPage - 1) * _rowsPerPage) + 1;
int endEntry = _currentPage * _rowsPerPage;
if (endEntry > totalItems) endEntry = totalItems;
final totalPages = (filteredData.length / _rowsPerPage).ceil(); final totalPages = (filteredData.length / _rowsPerPage).ceil();
const visiblePageCount = 5; const visiblePageCount = 5;
@ -563,7 +569,8 @@ class _CdPolicieState extends State<CdPolicies> {
if (_currentPage <= 3) { if (_currentPage <= 3) {
return [1, 2, 3, 4, 5]; return [1, 2, 3, 4, 5];
} else if (_currentPage >= totalPages - 2) { }
if (_currentPage >= totalPages - 2) {
return [ return [
totalPages - 4, totalPages - 4,
totalPages - 3, totalPages - 3,
@ -571,29 +578,42 @@ class _CdPolicieState extends State<CdPolicies> {
totalPages - 1, totalPages - 1,
totalPages totalPages
]; ];
} else {
return [
_currentPage - 2,
_currentPage - 1,
_currentPage,
_currentPage + 1,
_currentPage + 2,
];
} }
return [
_currentPage - 2,
_currentPage - 1,
_currentPage,
_currentPage + 1,
_currentPage + 2,
];
} }
List<int> visiblePages = getVisiblePages(); List<int> visiblePages = getVisiblePages();
return Row( return Padding(
mainAxisAlignment: MainAxisAlignment.end, // Match this horizontal padding (16) to your Table Header padding for perfect alignment
children: [ padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
Padding( child: Row(
padding: const EdgeInsets.symmetric(vertical: 12), mainAxisAlignment: MainAxisAlignment.spaceBetween, // Pushes text to left, buttons to right
child: Row( children: [
// --- LEFT SIDE: Showing Text ---
Text(
"Showing $startEntry to $endEntry of $totalItems entries",
style: GoogleFonts.poppins(
fontSize: 13,
color: const Color(0xFF585757),
fontWeight: FontWeight.w400,
),
),
// --- RIGHT SIDE: Controls ---
Row(
children: [ children: [
// Dropdown for rows per page // Dropdown for rows per page
DropdownButton<int>( DropdownButton<int>(
value: _rowsPerPage, value: _rowsPerPage,
// focusColor: Colors.transparent, // Fix: Removes the grey/blue highlight on change
items: [5, 10, 15, 20, 50].map((int value) { items: [5, 10, 15, 20, 50].map((int value) {
return DropdownMenuItem<int>( return DropdownMenuItem<int>(
value: value, value: value,
@ -609,8 +629,11 @@ class _CdPolicieState extends State<CdPolicies> {
}, },
), ),
const SizedBox(width: 8),
// Previous button // Previous button
IconButton( IconButton(
tooltip: 'Previous Page',
onPressed: _currentPage > 1 onPressed: _currentPage > 1
? () => setState(() => _currentPage--) ? () => setState(() => _currentPage--)
: null, : null,
@ -631,7 +654,7 @@ class _CdPolicieState extends State<CdPolicies> {
for (int page in visiblePages) _buildPageButton(page), for (int page in visiblePages) _buildPageButton(page),
// Right ellipsis + last page // Right ellipsis + last page
if (!visiblePages.contains(totalPages)) if (!visiblePages.contains(totalPages) && totalPages > 0)
Row(children: [ Row(children: [
const Padding( const Padding(
padding: EdgeInsets.symmetric(horizontal: 4), padding: EdgeInsets.symmetric(horizontal: 4),
@ -649,8 +672,8 @@ class _CdPolicieState extends State<CdPolicies> {
), ),
], ],
), ),
), ],
], ),
); );
} }

1
lib/service/multi_file_upload_widget.dart
View File

@ -203,6 +203,7 @@ class _MultiFileUploadWidgetState extends State<MultiFileUploadWidget> {
title: Text(uploaded.file.name, style: const TextStyle(fontSize: 14)), title: Text(uploaded.file.name, style: const TextStyle(fontSize: 14)),
trailing: IconButton( trailing: IconButton(
icon: const Icon(Icons.close, color: Colors.red), icon: const Icon(Icons.close, color: Colors.red),
tooltip: 'Remove', // Built-in property
onPressed: () => _removeFile(index), onPressed: () => _removeFile(index),
), ),
), ),