working leantime widget 83
This commit is contained in:
parent
765e390ead
commit
0ba915bddb
@ -74,12 +74,18 @@ export function Flow() {
|
|||||||
}
|
}
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
|
|
||||||
// Check if data is an array directly
|
// Extract tasks from the result property
|
||||||
const tasksList = Array.isArray(data) ? data : [];
|
const tasksList = data.result || [];
|
||||||
|
|
||||||
|
if (!Array.isArray(tasksList)) {
|
||||||
|
console.warn('No tasks found in response', tasksList);
|
||||||
|
setTasks([]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Filter tasks with status 3 and sort by date
|
// Filter tasks with status 3 and sort by date
|
||||||
const filteredAndSortedTasks = tasksList
|
const filteredAndSortedTasks = tasksList
|
||||||
.filter((task: Task) => task.status === 3)
|
.filter((task: Task) => task.status === 3 && task.userId === 2)
|
||||||
.sort((a: Task, b: Task) => {
|
.sort((a: Task, b: Task) => {
|
||||||
const dateA = a.dateToFinish ? new Date(a.dateToFinish).getTime() :
|
const dateA = a.dateToFinish ? new Date(a.dateToFinish).getTime() :
|
||||||
a.date ? new Date(a.date).getTime() : Date.now();
|
a.date ? new Date(a.date).getTime() : Date.now();
|
||||||
@ -89,6 +95,7 @@ export function Flow() {
|
|||||||
})
|
})
|
||||||
.slice(0, 4); // Limit to 4 tasks
|
.slice(0, 4); // Limit to 4 tasks
|
||||||
|
|
||||||
|
console.log('Filtered tasks:', filteredAndSortedTasks); // Debug log
|
||||||
setTasks(filteredAndSortedTasks);
|
setTasks(filteredAndSortedTasks);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error fetching tasks:', error);
|
console.error('Error fetching tasks:', error);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user