working leantime widget 120
This commit is contained in:
Alma
parent
94aac5fc4a
commit
840685ae26
@ -81,6 +81,7 @@ export function Flow() {
|
||||
};
|
||||
|
||||
const getValidDate = (task: Task): string | null => {
|
||||
// Only use dateToFinish
|
||||
if (task.dateToFinish && task.dateToFinish !== '0000-00-00 00:00:00') {
|
||||
return task.dateToFinish;
|
||||
}
|
||||
@ -94,32 +95,29 @@ export function Flow() {
|
||||
const data = await response.json();
|
||||
|
||||
if (!Array.isArray(data)) {
|
||||
console.warn('No tasks found in response');
|
||||
console.warn('No tasks found in response', data as unknown);
|
||||
setTasks([]);
|
||||
return;
|
||||
}
|
||||
|
||||
// Process tasks with valid dates
|
||||
const processedTasks = data.map((task: Task) => {
|
||||
const dateStr = getValidDate(task);
|
||||
return {
|
||||
...task,
|
||||
validDate: dateStr ? new Date(dateStr) : undefined
|
||||
};
|
||||
});
|
||||
|
||||
// Filter and sort tasks - include status 3 (In Progress)
|
||||
const sortedTasks = processedTasks
|
||||
.filter((task: TaskWithDate) => task.validDate) // Only keep tasks with valid dates
|
||||
.sort((a: TaskWithDate, b: TaskWithDate) => {
|
||||
if (!a.validDate || !b.validDate) return 0;
|
||||
return a.validDate.getTime() - b.validDate.getTime();
|
||||
// Filter out completed tasks (status 3) and sort by dateToFinish
|
||||
const sortedTasks = data
|
||||
.filter((task: Task) => task.status !== 3)
|
||||
.sort((a: Task, b: Task) => {
|
||||
const dateA = getValidDate(a);
|
||||
const dateB = getValidDate(b);
|
||||
|
||||
if (!dateA && !dateB) return 0;
|
||||
if (!dateA) return 1;
|
||||
if (!dateB) return -1;
|
||||
|
||||
return new Date(dateA).getTime() - new Date(dateB).getTime();
|
||||
});
|
||||
|
||||
console.log('Number of tasks found:', sortedTasks.length);
|
||||
console.log('Sorted tasks by dateToFinish:', sortedTasks);
|
||||
setTasks(sortedTasks.slice(0, 6));
|
||||
} catch (error) {
|
||||
console.error('Error fetching tasks');
|
||||
console.error('Error fetching tasks:', error);
|
||||
setError('Failed to fetch tasks');
|
||||
} finally {
|
||||
setLoading(false);
|
||||
@ -135,8 +133,8 @@ export function Flow() {
|
||||
if (!task.validDate) {
|
||||
return (
|
||||
<>
|
||||
<span className="text-[10px] text-gray-600 font-medium">NO</span>
|
||||
<span className="text-sm text-gray-700 font-bold">DATE</span>
|
||||
<span className="text-xs text-gray-600 font-medium">NO</span>
|
||||
<span className="text-lg text-gray-700 font-bold">DATE</span>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@ -148,27 +146,23 @@ export function Flow() {
|
||||
try {
|
||||
const month = task.validDate.toLocaleString('fr-FR', { month: 'short' }).toUpperCase();
|
||||
const day = task.validDate.getDate();
|
||||
const year = task.validDate.getFullYear();
|
||||
|
||||
return (
|
||||
<>
|
||||
<span className={`text-[10px] font-medium uppercase ${isPastDue ? 'text-red-600' : 'text-blue-600'}`}>
|
||||
<span className={`text-xs font-medium uppercase ${isPastDue ? 'text-red-600' : 'text-blue-600'}`}>
|
||||
{month}
|
||||
</span>
|
||||
<span className={`text-sm font-bold ${isPastDue ? 'text-red-700' : 'text-blue-700'}`}>
|
||||
<span className={`text-lg font-bold ${isPastDue ? 'text-red-700' : 'text-blue-700'}`}>
|
||||
{day}
|
||||
</span>
|
||||
<span className={`text-[8px] font-medium ${isPastDue ? 'text-red-600' : 'text-blue-600'}`}>
|
||||
{year}
|
||||
</span>
|
||||
</>
|
||||
);
|
||||
} catch (error) {
|
||||
console.error('Error formatting date for task', task.id);
|
||||
console.error('Error formatting date for task', task.id, error);
|
||||
return (
|
||||
<>
|
||||
<span className="text-[10px] text-gray-600 font-medium">ERR</span>
|
||||
<span className="text-sm text-gray-700 font-bold">DATE</span>
|
||||
<span className="text-xs text-gray-600 font-medium">ERR</span>
|
||||
<span className="text-lg text-gray-700 font-bold">DATE</span>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@ -176,48 +170,48 @@ export function Flow() {
|
||||
|
||||
return (
|
||||
<Card className="transition-transform duration-500 ease-in-out transform hover:scale-105 bg-white/95 backdrop-blur-sm border-0 shadow-lg">
|
||||
<CardHeader className="flex flex-row items-center justify-between pb-2 border-b border-gray-100 space-y-0 pt-3 px-3">
|
||||
<CardTitle className="text-lg font-semibold text-gray-800">Flow</CardTitle>
|
||||
<CardHeader className="flex flex-row items-center justify-between pb-2 border-b border-gray-100">
|
||||
<CardTitle className="text-xl font-semibold text-gray-800">Flow</CardTitle>
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
onClick={() => fetchTasks()}
|
||||
className="h-6 w-6 p-0 hover:bg-gray-100/50 rounded-full"
|
||||
className="h-8 w-8 p-0 hover:bg-gray-100/50 rounded-full"
|
||||
>
|
||||
<RefreshCw className="h-3 w-3 text-gray-600" />
|
||||
<RefreshCw className="h-4 w-4 text-gray-600" />
|
||||
</Button>
|
||||
</CardHeader>
|
||||
<CardContent className="p-3">
|
||||
<CardContent className="p-4">
|
||||
{loading ? (
|
||||
<div className="flex items-center justify-center py-6">
|
||||
<div className="h-4 w-4 animate-spin rounded-full border-2 border-blue-500 border-t-transparent" />
|
||||
<div className="flex items-center justify-center py-8">
|
||||
<div className="h-5 w-5 animate-spin rounded-full border-2 border-blue-500 border-t-transparent" />
|
||||
</div>
|
||||
) : error ? (
|
||||
<div className="text-xs text-red-500 text-center py-3">{error}</div>
|
||||
<div className="text-sm text-red-500 text-center py-4">{error}</div>
|
||||
) : tasks.length === 0 ? (
|
||||
<div className="text-xs text-gray-500 text-center py-6">No tasks with due dates found</div>
|
||||
<div className="text-sm text-gray-500 text-center py-8">No tasks with due dates found</div>
|
||||
) : (
|
||||
<div className="space-y-2 max-h-[360px] overflow-y-auto pr-2 scrollbar-thin scrollbar-thumb-gray-200 scrollbar-track-transparent">
|
||||
<div className="space-y-3 max-h-[460px] overflow-y-auto pr-2 scrollbar-thin scrollbar-thumb-gray-200 scrollbar-track-transparent">
|
||||
{tasks.map((task) => (
|
||||
<div
|
||||
key={task.id}
|
||||
className="p-2 rounded-lg bg-white shadow-sm hover:shadow-md transition-all duration-200 border border-gray-100"
|
||||
className="p-3 rounded-xl bg-white shadow-sm hover:shadow-md transition-all duration-200 border border-gray-100"
|
||||
>
|
||||
<div className="flex gap-2">
|
||||
<div className="flex-shrink-0 w-12 h-12 rounded-lg bg-blue-50 flex flex-col items-center justify-center border border-blue-100">
|
||||
<div className="flex gap-3">
|
||||
<div className="flex-shrink-0 w-14 h-14 rounded-lg bg-blue-50 flex flex-col items-center justify-center border border-blue-100">
|
||||
<TaskDate task={task} />
|
||||
</div>
|
||||
<div className="flex-1 min-w-0 space-y-1">
|
||||
<div className="flex-1 min-w-0 space-y-1.5">
|
||||
<a
|
||||
href={`https://agilite.slm-lab.net/tickets/showTicket/${task.id}`}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="text-blue-600 hover:text-blue-700 font-medium block text-sm line-clamp-2"
|
||||
className="text-blue-600 hover:text-blue-700 font-medium block text-base line-clamp-2"
|
||||
>
|
||||
{task.headline}
|
||||
</a>
|
||||
<div className="flex items-center text-gray-500 text-[10px] bg-gray-50 px-1.5 py-0.5 rounded-md">
|
||||
<Folder className="h-2.5 w-2.5 mr-1 opacity-70" />
|
||||
<div className="flex items-center text-gray-500 text-xs bg-gray-50 px-2 py-1 rounded-md">
|
||||
<Folder className="h-3 w-3 mr-1.5 opacity-70" />
|
||||
<span className="truncate">{task.projectName}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user