@@ -31,7 +31,7 @@ const DueDateRecord = ({dueDate}) => {
|
||||
const relativeDueDate = dueDateDayjs.fromNow();
|
||||
const today = dayjs();
|
||||
|
||||
if (dueDateDayjs.isAfter(today)) {
|
||||
if (dueDateDayjs.isBefore(today)) {
|
||||
return <div title={relativeDueDate} style={{color: 'red'}}>
|
||||
<DateFormatter>{dueDate}</DateFormatter></div>;
|
||||
} else {
|
||||
@@ -81,13 +81,14 @@ const mapStateToProps = (state) => ({
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(TaskListComponent);
|
||||
|
||||
function TaskListComponent({
|
||||
loading,
|
||||
tasks,
|
||||
total,
|
||||
refetch,
|
||||
toggleCompletedStatus,
|
||||
loading,
|
||||
tasks,
|
||||
total,
|
||||
refetch,
|
||||
toggleCompletedStatus,
|
||||
setTaskUpsertContext,
|
||||
}) {
|
||||
toggleDeletedStatus
|
||||
}) {
|
||||
const {t} = useTranslation();
|
||||
|
||||
const search = queryString.parse(useLocation().search);
|
||||
@@ -135,7 +136,7 @@ function TaskListComponent({
|
||||
key: "due_date",
|
||||
sorter: true,
|
||||
sortOrder: sortcolumn === "due_date" && sortorder,
|
||||
width: '5%',
|
||||
width: '8%',
|
||||
render: (text, record) => <DueDateRecord dueDate={record.due_date} />,
|
||||
},
|
||||
{
|
||||
@@ -154,7 +155,7 @@ function TaskListComponent({
|
||||
width: '5%',
|
||||
render: (text, record) => (
|
||||
<Space direction='horizontal'>
|
||||
<Button title={t('tasks.actions.edit')} onClick={() => {
|
||||
<Button title={t('tasks.buttons.edit')} onClick={() => {
|
||||
setTaskUpsertContext({
|
||||
actions: {},
|
||||
context: {
|
||||
@@ -164,12 +165,12 @@ function TaskListComponent({
|
||||
}}>
|
||||
<EditFilled/>
|
||||
</Button>
|
||||
<Button title={t('tasks.actions.toggle_completed')}
|
||||
<Button title={t('tasks.buttons.complete')}
|
||||
onClick={() => toggleCompletedStatus(record.id, record.completed)}>
|
||||
{record.completed ? <CheckCircleOutlined/> :
|
||||
<CheckCircleFilled/>}
|
||||
</Button>
|
||||
<Button title={t('tasks.actions.toggle_deleted')}
|
||||
<Button title={t('tasks.buttons.delete')}
|
||||
onClick={() => toggleDeletedStatus(record.id, record.deleted)}>
|
||||
{record.deleted ? <DeleteFilled/> : <DeleteOutlined/>}
|
||||
</Button>
|
||||
@@ -228,10 +229,10 @@ function TaskListComponent({
|
||||
checked={deleted === "true"}
|
||||
onChange={(value) => handleSwitchChange('deleted', value)}
|
||||
/>
|
||||
<Button title={t('tasks.titles.create')} onClick={handleCreateTask}>
|
||||
<Button title={t('tasks.buttons.create')} onClick={handleCreateTask}>
|
||||
<PlusCircleFilled/>{t('tasks.buttons.create')}
|
||||
</Button>
|
||||
<Button title={t('tasks.titles.refresh')}
|
||||
<Button title={t('tasks.buttons.refresh')}
|
||||
onClick={() => refetch()}>
|
||||
<SyncOutlined/>
|
||||
</Button>
|
||||
|
||||
Reference in New Issue
Block a user