feat(time-report-filters): enhance billable status filtering and localization updates

- Added "Clear All" and "Filter by Billable Status" options to the billable filter dropdown in the time report page.
- Updated localization files for English, Spanish, and Portuguese to include new keys for the added filter options.
- Improved the billable filter component to handle selection states and provide a better user experience.
- Optimized the fetching of members and utilization data based on the current route to reduce unnecessary data loading.
This commit is contained in:
chamiakJ
2025-06-03 09:49:12 +05:30
parent 4f082e982b
commit 0f5946134c
5 changed files with 224 additions and 15 deletions

View File

@@ -5,6 +5,7 @@
"searchByName": "Search by name",
"selectAll": "Select All",
"clearAll": "Clear All",
"teams": "Teams",
"searchByProject": "Search by project name",
@@ -15,6 +16,8 @@
"billable": "Billable",
"nonBillable": "Non Billable",
"filterByBillableStatus": "Filter by Billable Status",
"allBillableTypes": "All Billable Types",
"total": "Total",

View File

@@ -5,6 +5,7 @@
"searchByName": "Buscar por nombre",
"selectAll": "Seleccionar Todo",
"clearAll": "Limpiar Todo",
"teams": "Equipos",
"searchByProject": "Buscar por nombre de proyecto",
@@ -15,6 +16,8 @@
"billable": "Facturable",
"nonBillable": "No Facturable",
"filterByBillableStatus": "Filtrar por Estado Facturable",
"allBillableTypes": "Todos los Tipos Facturables",
"total": "Total",

View File

@@ -5,6 +5,7 @@
"searchByName": "Pesquisar por nome",
"selectAll": "Selecionar Todos",
"clearAll": "Limpar Todos",
"teams": "Equipes",
"searchByProject": "Pesquisar por nome do projeto",
@@ -15,6 +16,8 @@
"billable": "Cobrável",
"nonBillable": "Não Cobrável",
"filterByBillableStatus": "Filtrar por Status de Cobrança",
"allBillableTypes": "Todos os Tipos Cobráveis",
"total": "Total",

View File

@@ -1,45 +1,236 @@
import { setSelectOrDeselectBillable } from '@/features/reporting/time-reports/time-reports-overview.slice';
import { useAppDispatch } from '@/hooks/useAppDispatch';
import { useAppSelector } from '@/hooks/useAppSelector';
import { CaretDownFilled } from '@ant-design/icons';
import { Button, Checkbox, Dropdown, MenuProps } from 'antd';
import React from 'react';
import { CaretDownFilled, FilterOutlined, CheckCircleFilled } from '@ant-design/icons';
import { Button, Checkbox, Dropdown, MenuProps, Space, Badge, Divider, theme } from 'antd';
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
const Billable: React.FC = () => {
const { t } = useTranslation('time-report');
const dispatch = useAppDispatch();
const { token } = theme.useToken();
const { billable } = useAppSelector(state => state.timeReportsOverviewReducer);
// Calculate active filters count
const activeFiltersCount = useMemo(() => {
let count = 0;
if (billable.billable) count++;
if (billable.nonBillable) count++;
return count;
}, [billable.billable, billable.nonBillable]);
// Check if all options are selected
const isAllSelected = billable.billable && billable.nonBillable;
const isNoneSelected = !billable.billable && !billable.nonBillable;
// Handle select all
const handleSelectAll = () => {
dispatch(setSelectOrDeselectBillable({
billable: true,
nonBillable: true
}));
};
// Handle clear all
const handleClearAll = () => {
dispatch(setSelectOrDeselectBillable({
billable: false,
nonBillable: false
}));
};
// Theme-aware colors
const isDark = token.colorBgContainer !== '#ffffff';
const colors = {
headerText: isDark ? token.colorTextSecondary : '#262626',
borderColor: isDark ? token.colorBorder : '#f0f0f0',
linkActive: token.colorPrimary,
linkDisabled: isDark ? token.colorTextDisabled : '#d9d9d9',
successColor: token.colorSuccess,
errorColor: token.colorError,
buttonBorder: activeFiltersCount > 0 ? token.colorPrimary : token.colorBorder,
buttonText: activeFiltersCount > 0 ? token.colorPrimary : token.colorTextSecondary,
buttonBg: activeFiltersCount > 0 ? (isDark ? token.colorPrimaryBg : '#f6ffed') : 'transparent',
dropdownBg: token.colorBgElevated,
dropdownBorder: token.colorBorderSecondary,
};
// Dropdown items for the menu
const menuItems: MenuProps['items'] = [
{
key: 'search',
label: <Checkbox checked={billable.billable}>{t('billable')}</Checkbox>,
key: 'header',
label: (
<div style={{
padding: '4px 4px 2px',
fontWeight: 600,
fontSize: '12px',
color: colors.headerText,
borderBottom: `1px solid ${colors.borderColor}`,
marginBottom: '2px'
}}>
{t('filterByBillableStatus')}
</div>
),
disabled: true,
},
{
key: 'actions',
label: (
<div style={{ padding: '2px 4px', marginBottom: '2px' }}>
<Space size="small">
<Button
type="link"
size="small"
onClick={handleSelectAll}
disabled={isAllSelected}
style={{
padding: '0 2px',
height: 'auto',
fontSize: '11px',
color: isAllSelected ? colors.linkDisabled : colors.linkActive
}}
>
{t('selectAll')}
</Button>
<Divider type="vertical" style={{ margin: '0 2px' }} />
<Button
type="link"
size="small"
onClick={handleClearAll}
disabled={isNoneSelected}
style={{
padding: '0 2px',
height: 'auto',
fontSize: '11px',
color: isNoneSelected ? colors.linkDisabled : colors.errorColor
}}
>
{t('clearAll')}
</Button>
</Space>
</div>
),
disabled: true,
},
{
key: 'billable',
label: (
<div
style={{
padding: '4px',
display: 'flex',
alignItems: 'center',
gap: '6px',
borderRadius: '4px',
transition: 'background-color 0.2s'
}}
>
<Checkbox checked={billable.billable} style={{ fontSize: '14px' }}>
<span style={{ marginLeft: '2px', fontSize: '14px' }}>{t('billable')}</span>
</Checkbox>
{billable.billable && (
<CheckCircleFilled style={{ color: colors.successColor, fontSize: '10px' }} />
)}
</div>
),
onClick: () => {
dispatch(setSelectOrDeselectBillable({ ...billable, billable: !billable.billable }));
},
},
{
key: 'selectAll',
label: <Checkbox checked={billable.nonBillable}>{t('nonBillable')}</Checkbox>,
key: 'nonBillable',
label: (
<div
style={{
padding: '4px',
display: 'flex',
alignItems: 'center',
gap: '6px',
borderRadius: '4px',
transition: 'background-color 0.2s'
}}
>
<Checkbox checked={billable.nonBillable} style={{ fontSize: '14px' }}>
<span style={{ marginLeft: '2px', fontSize: '14px' }}>{t('nonBillable')}</span>
</Checkbox>
{billable.nonBillable && (
<CheckCircleFilled style={{ color: colors.successColor, fontSize: '10px' }} />
)}
</div>
),
onClick: () => {
dispatch(setSelectOrDeselectBillable({ ...billable, nonBillable: !billable.nonBillable }));
},
},
];
// Button text based on selection state
const getButtonText = () => {
if (isNoneSelected) return t('billable');
if (isAllSelected) return t('allBillableTypes');
if (billable.billable && !billable.nonBillable) return t('billable');
if (!billable.billable && billable.nonBillable) return t('nonBillable');
return t('billable');
};
return (
<div>
<Dropdown
menu={{ items: menuItems }}
placement="bottomLeft"
trigger={['click']}
overlayStyle={{ maxHeight: '330px', overflowY: 'auto' }}
overlayStyle={{
maxHeight: '330px',
overflowY: 'auto',
boxShadow: isDark
? '0 6px 16px 0 rgba(0, 0, 0, 0.32), 0 3px 6px -4px rgba(0, 0, 0, 0.32), 0 9px 28px 8px rgba(0, 0, 0, 0.20)'
: '0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 9px 28px 8px rgba(0, 0, 0, 0.05)',
borderRadius: '8px',
border: `1px solid ${colors.dropdownBorder}`,
backgroundColor: colors.dropdownBg
}}
overlayClassName="billable-filter-dropdown"
>
<Button>
{t('billable')} <CaretDownFilled />
<Button
style={{
display: 'flex',
alignItems: 'center',
gap: '6px',
height: '32px',
borderColor: colors.buttonBorder,
color: colors.buttonText,
fontWeight: activeFiltersCount > 0 ? 500 : 400,
transition: 'all 0.2s cubic-bezier(0.645, 0.045, 0.355, 1)',
backgroundColor: colors.buttonBg,
}}
onMouseEnter={(e) => {
if (activeFiltersCount > 0) {
e.currentTarget.style.borderColor = token.colorPrimaryHover;
e.currentTarget.style.boxShadow = `0 2px 4px ${token.colorPrimary}20`;
}
}}
onMouseLeave={(e) => {
if (activeFiltersCount > 0) {
e.currentTarget.style.borderColor = token.colorPrimary;
e.currentTarget.style.boxShadow = 'none';
}
}}
>
<FilterOutlined
style={{
fontSize: '14px',
color: activeFiltersCount > 0 ? token.colorPrimary : token.colorTextTertiary
}}
/>
<span>{getButtonText()}</span>
<CaretDownFilled
style={{
fontSize: '10px',
marginLeft: '2px'
}}
/>
</Button>
</Dropdown>
</div>

View File

@@ -1,4 +1,5 @@
import React, { useEffect } from 'react';
import { useLocation } from 'react-router-dom';
import Team from './team';
import Categories from './categories';
import Projects from './projects';
@@ -16,18 +17,26 @@ import Utilization from './utilization';
const TimeReportPageHeader: React.FC = () => {
const dispatch = useAppDispatch();
const location = useLocation();
// Check if current route is members time sheet
const isMembersTimeSheet = location.pathname.includes('time-sheet-members');
useEffect(() => {
const fetchData = async () => {
await dispatch(fetchReportingTeams());
await dispatch(fetchReportingCategories());
await dispatch(fetchReportingProjects());
await dispatch(fetchReportingMembers());
await dispatch(fetchReportingUtilization());
// Only fetch members and utilization data for members time sheet
if (isMembersTimeSheet) {
await dispatch(fetchReportingMembers());
await dispatch(fetchReportingUtilization());
}
};
fetchData();
}, [dispatch]);
}, [dispatch, isMembersTimeSheet]);
return (
<div style={{ display: 'flex', gap: '8px' }}>
@@ -35,8 +44,8 @@ const TimeReportPageHeader: React.FC = () => {
<Categories />
<Projects />
<Billable />
<Members/>
<Utilization />
{isMembersTimeSheet && <Members/>}
{isMembersTimeSheet && <Utilization />}
</div>
);
};