admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/IO-2677-Tasks (pull request #1430)

Browse Source 
Update reminder interval and resolve server side.
This commit is contained in:
Patrick Fic
2024-04-19 17:54:29 +00:00
parent 6fd70b165b 13569a1785
commit 059b854db9
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/task-list/task-list.container.jsx
View File

@@ -38,7 +38,13 @@ export function TaskListContainer({
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
const searchParams = queryString.parse(useLocation().search); const searchParams = queryString.parse(useLocation().search);
const { page, sortcolumn, sortorder, deleted, completed, mine } = searchParams; const {
page,
sortcolumn,
sortorder,
deleted,
completed //mine
} = searchParams;
const dispatch = useDispatch(); const dispatch = useDispatch();
const { loading, error, data, refetch } = useQuery(query[Object.keys(query)[0]], { const { loading, error, data, refetch } = useQuery(query[Object.keys(query)[0]], {

2
client/src/components/task-upsert-modal/task-upsert-modal.component.jsx
View File

@@ -270,7 +270,7 @@ export function TaskUpsertModalComponent({
rules={[ rules={[
{ {
validator: (_, value) => { validator: (_, value) => {
if (!value || existingTask?.remind_at === value || dayjs(value).isAfter(dayjs().add(30, "minute"))) { if (!value || existingTask?.remind_at === value || dayjs(value).isAfter(dayjs().add(15, "minute"))) {
return Promise.resolve(); return Promise.resolve();
} }
return Promise.reject(new Error(t("tasks.validation.remind_at_error_message"))); return Promise.reject(new Error(t("tasks.validation.remind_at_error_message")));

2
server/email/tasksEmails.js
View File

@@ -202,7 +202,7 @@ const tasksRemindEmail = async (req, res) => {
// Group tasks by assigned_to, to avoid sending multiple emails to the same recipient. // Group tasks by assigned_to, to avoid sending multiple emails to the same recipient.
const groupedTasks = tasksRequest.tasks.reduce((acc, task) => { const groupedTasks = tasksRequest.tasks.reduce((acc, task) => {
const key = task.assigned_to_email.user_email; const key = task.assigned_to_employee.user_email;
if (!acc[key]) { if (!acc[key]) {
acc[key] = []; acc[key] = [];
} }