fix: dashboard project amount data

haydenull · May 4, 2022 · 5b841cb · 5b841cb
1 parent 9498568
commit 5b841cb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/model/gantt.tsx b/src/model/gantt.tsx
@@ -6,6 +6,7 @@ import { ISchedule } from 'tui-calendar'
 import dayjs from 'dayjs'
 import { scheduleCalendarMapAtom } from './schedule'
 import { getPageData } from '@/util/logseq'
+import { catrgorizeTask } from '@/util/schedule'
 
 const MOCK_PROJECTS: IGroup[] = [
   { id: '111', title: 'project1', events: [ { title: 'xxxxxxx', start: '2022-05-03', end: '2022-05-04', id: 'yyyy' } ], milestones: [ {start: '2022-05-03', end: '2022-05-03', title: 'milesttttsfasfsadfasffdasf', 'id': 'xxx'} ], style: { bgColor: '#fff', borderColor: '#fff', color: '#000' } },
@@ -20,6 +21,7 @@ export const ganttDataAtom = atom<IGroup[] | null>((get) => {
   const ganttData: IGroup[] = (enabledCalendarList.map(calendar => calendar.id)).map(calendarId => {
     const schedules = get(scheduleCalendarMapAtom).get(calendarId)
     if (!schedules) return null
+    const { doing, todo, done } = catrgorizeTask(schedules)
     const convertScheduleToGanttEvent = (schedule: ISchedule): IEvent => {
       const { raw = {}, start, end, id = '', title = '' } = schedule
       const dayjsStart = dayjs(start as string)
@@ -57,6 +59,11 @@ export const ganttDataAtom = atom<IGroup[] | null>((get) => {
     return {
       id: calendarId,
       title: calendarId,
+      amount: {
+        doing: doing?.length,
+        todo: todo?.length,
+        done: done?.length,
+      },
       style: {
         bgColor: schedules?.[0]?.bgColor || '#fff',
         borderColor: schedules?.[0]?.borderColor || '#fff',

diff --git a/src/packages/Gantt/type.ts b/src/packages/Gantt/type.ts
@@ -15,6 +15,11 @@ export type IGroup = {
   events: IEvent[]
   milestones?: IEvent[]
   levelCount?: number
+  amount?: {
+    todo: number
+    doing: number
+    done: number
+  },
   style?: {
     color: string
     bgColor: string

diff --git a/src/pages/Dashboard/components/Project.tsx b/src/pages/Dashboard/components/Project.tsx
@@ -40,7 +40,7 @@ const Project: React.FC<{
             <div className="ml-3">
               <div className="text-lg title-text">{data.title}</div>
               <div className="mt-1 description-text">
-                todo: 10 doing: 5 done: 5
+                {`doing: ${data?.amount?.doing || 0} todo: ${data?.amount?.todo || 0} done: ${data?.amount?.done || 0}`}
               </div>
             </div>
           </div>