diff --git a/src/components/Global/CardList.jsx b/src/components/Global/CardList.jsx index 39b7693..262b8ba 100644 --- a/src/components/Global/CardList.jsx +++ b/src/components/Global/CardList.jsx @@ -12,11 +12,12 @@ const CardList = ({ showEditModal, showDeleteDialog, cardColor, + fieldColor, }) => { - const getCardStyle = () => { - const color = cardColor ?? '#F3EDEA'; // Orange color + const getCardStyle = (color) => { + const colorStyle = color ?? '#F3EDEA'; // Orange color return { - border: `2px solid ${color}`, + border: `2px solid ${colorStyle}`, borderRadius: '8px', textAlign: 'center', // Center text }; @@ -47,12 +48,14 @@ const CardList = ({ alignItems: 'center', }} > - + {item[header]} } - style={getCardStyle()} + style={getCardStyle(fieldColor ? item[fieldColor] : cardColor)} actions={[ ); - } else if (record.is_approve === 2 || record.is_approve === '2' || record.is_approve === true) { + } else if ( + record.is_approve === 2 || + record.is_approve === '2' || + record.is_approve === true + ) { // Approved return ( @@ -174,7 +178,11 @@ const columns = ( align: 'center', render: (_, record) => { // Only show active status if user is approved - if (record.is_approve === 2 || record.is_approve === '2' || record.is_approve === true) { + if ( + record.is_approve === 2 || + record.is_approve === '2' || + record.is_approve === true + ) { if (record.is_active === true || record.is_active === 1) { return ( @@ -450,6 +458,12 @@ const ListUser = memo(function ListUser(props) {