Implement manual and weighted progress features for tasks

- Added SQL migrations to support manual progress and weighted progress calculations in tasks. - Updated the `get_task_complete_ratio` function to consider manual progress and subtask weights. - Enhanced the project model to include flags for manual, weighted, and time-based progress. - Integrated new progress settings in the project drawer and task drawer components. - Implemented socket events for real-time updates on task progress and weight changes. - Updated frontend localization files to include new progress-related terms and tooltips.
2025-04-29 17:04:36 +05:30
parent a50ef47a52
commit f7582173ed
24 changed files with 1230 additions and 68 deletions
--- a/worklenz-frontend/public/locales/en/project-drawer.json
+++ b/worklenz-frontend/public/locales/en/project-drawer.json
@@ -38,5 +38,12 @@
  "createClient": "Create client",
  "searchInputPlaceholder": "Search by name or email",
  "hoursPerDayValidationMessage": "Hours per day must be a number between 1 and 24",
-  "noPermission": "No permission"
+  "noPermission": "No permission",
+  "progressSettings": "Progress Settings",
+  "manualProgress": "Manual Progress",
+  "manualProgressTooltip": "Allow manual progress updates for tasks without subtasks",
+  "weightedProgress": "Weighted Progress",
+  "weightedProgressTooltip": "Calculate progress based on subtask weights",
+  "timeProgress": "Time-based Progress",
+  "timeProgressTooltip": "Calculate progress based on estimated time"
 }
--- a/worklenz-frontend/public/locales/en/task-drawer/task-drawer.json
+++ b/worklenz-frontend/public/locales/en/task-drawer/task-drawer.json
@@ -22,7 +22,15 @@
      "hide-start-date": "Hide Start Date",
      "show-start-date": "Show Start Date",
      "hours": "Hours",
-      "minutes": "Minutes"
+      "minutes": "Minutes",
+      "progressValue": "Progress Value",
+      "progressValueTooltip": "Set the progress percentage (0-100%)",
+      "progressValueRequired": "Please enter a progress value",
+      "progressValueRange": "Progress must be between 0 and 100",
+      "taskWeight": "Task Weight",
+      "taskWeightTooltip": "Set the weight of this subtask (percentage)",
+      "taskWeightRequired": "Please enter a task weight",
+      "taskWeightRange": "Weight must be between 0 and 100"
    },
    "labels": {
      "labelInputPlaceholder": "Search or create",
--- a/worklenz-frontend/public/locales/es/project-drawer.json
+++ b/worklenz-frontend/public/locales/es/project-drawer.json
@@ -38,5 +38,12 @@
  "createClient": "Crear cliente",
  "searchInputPlaceholder": "Busca por nombre o email",
  "hoursPerDayValidationMessage": "Las horas por día deben ser un número entre 1 y 24",
-  "noPermission": "Sin permiso"
+  "noPermission": "Sin permiso",
+  "progressSettings": "Configuración de Progreso",
+  "manualProgress": "Progreso Manual",
+  "manualProgressTooltip": "Permitir actualizaciones manuales de progreso para tareas sin subtareas",
+  "weightedProgress": "Progreso Ponderado",
+  "weightedProgressTooltip": "Calcular el progreso basado en los pesos de las subtareas",
+  "timeProgress": "Progreso Basado en Tiempo",
+  "timeProgressTooltip": "Calcular el progreso basado en el tiempo estimado"
 }
--- a/worklenz-frontend/public/locales/es/task-drawer/task-drawer.json
+++ b/worklenz-frontend/public/locales/es/task-drawer/task-drawer.json
@@ -22,7 +22,15 @@
      "hide-start-date": "Ocultar fecha de inicio",
      "show-start-date": "Mostrar fecha de inicio",
      "hours": "Horas",
-      "minutes": "Minutos"
+      "minutes": "Minutos",
+      "progressValue": "Valor de Progreso",
+      "progressValueTooltip": "Establecer el porcentaje de progreso (0-100%)",
+      "progressValueRequired": "Por favor, introduce un valor de progreso",
+      "progressValueRange": "El progreso debe estar entre 0 y 100",
+      "taskWeight": "Peso de la Tarea",
+      "taskWeightTooltip": "Establecer el peso de esta subtarea (porcentaje)",
+      "taskWeightRequired": "Por favor, introduce un peso para la tarea",
+      "taskWeightRange": "El peso debe estar entre 0 y 100"
    },
    "labels": {
      "labelInputPlaceholder": "Buscar o crear",
--- a/worklenz-frontend/public/locales/pt/project-drawer.json
+++ b/worklenz-frontend/public/locales/pt/project-drawer.json
@@ -38,5 +38,12 @@
  "createClient": "Criar cliente",
  "searchInputPlaceholder": "Pesquise por nome ou email",
  "hoursPerDayValidationMessage": "As horas por dia devem ser um número entre 1 e 24",
-  "noPermission": "Sem permissão"
+  "noPermission": "Sem permissão",
+  "progressSettings": "Configurações de Progresso",
+  "manualProgress": "Progresso Manual",
+  "manualProgressTooltip": "Permitir atualizações manuais de progresso para tarefas sem subtarefas",
+  "weightedProgress": "Progresso Ponderado",
+  "weightedProgressTooltip": "Calcular o progresso com base nos pesos das subtarefas",
+  "timeProgress": "Progresso Baseado em Tempo",
+  "timeProgressTooltip": "Calcular o progresso com base no tempo estimado"
 }
--- a/worklenz-frontend/public/locales/pt/task-drawer/task-drawer.json
+++ b/worklenz-frontend/public/locales/pt/task-drawer/task-drawer.json
@@ -22,7 +22,15 @@
      "hide-start-date": "Ocultar data de início",
      "show-start-date": "Mostrar data de início",
      "hours": "Horas",
-      "minutes": "Minutos"
+      "minutes": "Minutos",
+      "progressValue": "Valor de Progresso",
+      "progressValueTooltip": "Definir a porcentagem de progresso (0-100%)",
+      "progressValueRequired": "Por favor, insira um valor de progresso",
+      "progressValueRange": "O progresso deve estar entre 0 e 100",
+      "taskWeight": "Peso da Tarefa",
+      "taskWeightTooltip": "Definir o peso desta subtarefa (porcentagem)",
+      "taskWeightRequired": "Por favor, insira um peso para a tarefa",
+      "taskWeightRange": "O peso deve estar entre 0 e 100"
    },
    "labels": {
      "labelInputPlaceholder": "Pesquisar ou criar",
--- a/worklenz-frontend/src/api/projects/projects.api.service.ts
+++ b/worklenz-frontend/src/api/projects/projects.api.service.ts
@@ -10,6 +10,11 @@ import { IProjectManager } from '@/types/project/projectManager.types';

 const rootUrl = `${API_BASE_URL}/projects`;

+interface UpdateProjectPayload {
+  id: string;
+  [key: string]: any;
+}
+
 export const projectsApiService = {
  getProjects: async (
    index: number,
@@ -78,13 +83,11 @@ export const projectsApiService = {
    return response.data;
  },

-  updateProject: async (
-    id: string,
-    project: IProjectViewModel
-  ): Promise<IServerResponse<IProjectViewModel>> => {
+  updateProject: async (payload: UpdateProjectPayload): Promise<IServerResponse<IProjectViewModel>> => {
+    const { id, ...data } = payload;
    const q = toQueryString({ current_project_id: id });
-    const url = `${rootUrl}/${id}${q}`;
-    const response = await apiClient.put<IServerResponse<IProjectViewModel>>(`${url}`, project);
+    const url = `${API_BASE_URL}/projects/${id}${q}`;
+    const response = await apiClient.patch<IServerResponse<IProjectViewModel>>(url, data);
    return response.data;
  },

--- a/worklenz-frontend/src/components/projects/project-drawer/project-drawer.tsx
+++ b/worklenz-frontend/src/components/projects/project-drawer/project-drawer.tsx
@@ -14,6 +14,7 @@ import {
  Popconfirm,
  Skeleton,
  Space,
+  Switch,
  Tooltip,
  Typography,
 } from 'antd';
@@ -96,6 +97,9 @@ const ProjectDrawer = ({ onClose }: { onClose: () => void }) => {
      working_days: project?.working_days || 0,
      man_days: project?.man_days || 0,
      hours_per_day: project?.hours_per_day || 8,
+      use_manual_progress: project?.use_manual_progress || false,
+      use_weighted_progress: project?.use_weighted_progress || false,
+      use_time_progress: project?.use_time_progress || false,
    }),
    [project, projectStatuses, projectHealths]
  );
@@ -155,6 +159,9 @@ const ProjectDrawer = ({ onClose }: { onClose: () => void }) => {
        man_days: parseInt(values.man_days),
        hours_per_day: parseInt(values.hours_per_day),
        project_manager: selectedProjectManager,
+        use_manual_progress: values.use_manual_progress || false,
+        use_weighted_progress: values.use_weighted_progress || false,
+        use_time_progress: values.use_time_progress || false,
      };

      const action =
@@ -214,6 +221,9 @@ const ProjectDrawer = ({ onClose }: { onClose: () => void }) => {
            start_date: project.start_date ? dayjs(project.start_date) : null,
            end_date: project.end_date ? dayjs(project.end_date) : null,
            working_days: form.getFieldValue('start_date') && form.getFieldValue('end_date') ? calculateWorkingDays(form.getFieldValue('start_date'), form.getFieldValue('end_date')) : project.working_days || 0,
+            use_manual_progress: project.use_manual_progress || false,
+            use_weighted_progress: project.use_weighted_progress || false,
+            use_time_progress: project.use_time_progress || false,
          });
          setSelectedProjectManager(project.project_manager || null);
          setLoading(false);
@@ -284,6 +294,49 @@ const ProjectDrawer = ({ onClose }: { onClose: () => void }) => {
    setIsFormValid(isValid);
  };

+  // Progress calculation method handlers
+  const handleManualProgressChange = (checked: boolean) => {
+    if (checked) {
+      form.setFieldsValue({
+        use_manual_progress: true,
+        use_weighted_progress: false,
+        use_time_progress: false,
+      });
+    } else {
+      form.setFieldsValue({
+        use_manual_progress: false,
+      });
+    }
+  };
+
+  const handleWeightedProgressChange = (checked: boolean) => {
+    if (checked) {
+      form.setFieldsValue({
+        use_manual_progress: false,
+        use_weighted_progress: true,
+        use_time_progress: false,
+      });
+    } else {
+      form.setFieldsValue({
+        use_weighted_progress: false,
+      });
+    }
+  };
+
+  const handleTimeProgressChange = (checked: boolean) => {
+    if (checked) {
+      form.setFieldsValue({
+        use_manual_progress: false,
+        use_weighted_progress: false,
+        use_time_progress: true,
+      });
+    } else {
+      form.setFieldsValue({
+        use_time_progress: false,
+      });
+    }
+  };
+
  return (
    <Drawer
      // loading={loading}
@@ -429,22 +482,15 @@ const ProjectDrawer = ({ onClose }: { onClose: () => void }) => {
              </Form.Item>
            </Flex>
          </Form.Item>
-          {/* <Form.Item
-            name="working_days"
-            label={t('estimateWorkingDays')}
-          >
-            <Input
-              type="number"
-              disabled // Make it read-only since it's calculated
-            />
-          </Form.Item> */}

          <Form.Item name="working_days" label={t('estimateWorkingDays')}>
            <Input type="number" disabled={!isProjectManager && !isOwnerorAdmin} />
          </Form.Item>
+
          <Form.Item name="man_days" label={t('estimateManDays')}>
            <Input type="number" disabled={!isProjectManager && !isOwnerorAdmin} />
          </Form.Item>
+
          <Form.Item
            name="hours_per_day"
            label={t('hoursPerDay')}
@@ -461,6 +507,62 @@ const ProjectDrawer = ({ onClose }: { onClose: () => void }) => {
          >
            <Input type="number" disabled={!isProjectManager && !isOwnerorAdmin} />
          </Form.Item>
+
+          <Divider orientation="left">{t('progressSettings')}</Divider>
+          
+          <Form.Item
+            name="use_manual_progress"
+            label={
+              <Space>
+                <Typography.Text>{t('manualProgress')}</Typography.Text>
+                <Tooltip title={t('manualProgressTooltip')}>
+                  <Button type="text" size="small" icon={<Typography.Text>ⓘ</Typography.Text>} />
+                </Tooltip>
+              </Space>
+            }
+            valuePropName="checked"
+          >
+            <Switch 
+              onChange={handleManualProgressChange}
+              disabled={!isProjectManager && !isOwnerorAdmin}
+            />
+          </Form.Item>
+
+          <Form.Item
+            name="use_weighted_progress"
+            label={
+              <Space>
+                <Typography.Text>{t('weightedProgress')}</Typography.Text>
+                <Tooltip title={t('weightedProgressTooltip')}>
+                  <Button type="text" size="small" icon={<Typography.Text>ⓘ</Typography.Text>} />
+                </Tooltip>
+              </Space>
+            }
+            valuePropName="checked"
+          >
+            <Switch 
+              onChange={handleWeightedProgressChange}
+              disabled={!isProjectManager && !isOwnerorAdmin}
+            />
+          </Form.Item>
+
+          <Form.Item
+            name="use_time_progress"
+            label={
+              <Space>
+                <Typography.Text>{t('timeProgress')}</Typography.Text>
+                <Tooltip title={t('timeProgressTooltip')}>
+                  <Button type="text" size="small" icon={<Typography.Text>ⓘ</Typography.Text>} />
+                </Tooltip>
+              </Space>
+            }
+            valuePropName="checked"
+          >
+            <Switch 
+              onChange={handleTimeProgressChange}
+              disabled={!isProjectManager && !isOwnerorAdmin}
+            />
+          </Form.Item>
        </Form>

        {editMode && (
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-progress/task-drawer-progress.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/details/task-drawer-progress/task-drawer-progress.tsx
@@ -0,0 +1,155 @@
+import { Form, InputNumber, Tooltip } from 'antd';
+import { useTranslation } from 'react-i18next';
+import { QuestionCircleOutlined } from '@ant-design/icons';
+import { useAppSelector } from '@/hooks/useAppSelector';
+import { ITaskViewModel } from '@/types/tasks/task.types';
+import Flex from 'antd/lib/flex';
+import { SocketEvents } from '@/shared/socket-events';
+import { useEffect } from 'react';
+import { useSocket } from '@/socket/socketContext';
+
+interface TaskDrawerProgressProps {
+  task: ITaskViewModel;
+  form: any;
+}
+
+const TaskDrawerProgress = ({ task, form }: TaskDrawerProgressProps) => {
+  const { t } = useTranslation('task-drawer/task-drawer');
+  const { project } = useAppSelector(state => state.projectReducer);
+  const { socket, connected } = useSocket();
+
+  const isSubTask = !!task?.parent_task_id;
+  const hasSubTasks = task?.sub_tasks_count > 0;
+
+  // Determine which progress input to show based on project settings
+  const showManualProgressInput = project?.use_manual_progress && !hasSubTasks && !isSubTask;
+  const showTaskWeightInput = project?.use_weighted_progress && isSubTask;
+
+  useEffect(() => {
+    // Listen for progress updates from the server
+    socket?.on(SocketEvents.TASK_PROGRESS_UPDATED.toString(), (data) => {
+      if (data.task_id === task.id) {
+        if (data.progress_value !== undefined) {
+          form.setFieldsValue({ progress_value: data.progress_value });
+        }
+        if (data.weight !== undefined) {
+          form.setFieldsValue({ weight: data.weight });
+        }
+      }
+    });
+
+    return () => {
+      socket?.off(SocketEvents.TASK_PROGRESS_UPDATED.toString());
+    };
+  }, [socket, task.id, form]);
+
+  const handleProgressChange = (value: number | null) => {
+    if (connected && task.id && value !== null) {
+      socket?.emit(SocketEvents.UPDATE_TASK_PROGRESS.toString(), JSON.stringify({
+        task_id: task.id,
+        progress_value: value,
+        parent_task_id: task.parent_task_id
+      }));
+    }
+  };
+
+  const handleWeightChange = (value: number | null) => {
+    if (connected && task.id && value !== null) {
+      socket?.emit(SocketEvents.UPDATE_TASK_WEIGHT.toString(), JSON.stringify({
+        task_id: task.id,
+        weight: value,
+        parent_task_id: task.parent_task_id
+      }));
+    }
+  };
+
+  const percentFormatter = (value: number | undefined) => value ? `${value}%` : '0%';
+  const percentParser = (value: string | undefined) => {
+    const parsed = parseInt(value?.replace('%', '') || '0', 10);
+    return isNaN(parsed) ? 0 : parsed;
+  };
+
+  if (!showManualProgressInput && !showTaskWeightInput) {
+    return null; // Don't show any progress inputs if not applicable
+  }
+
+  return (
+    <>
+      {showManualProgressInput && (
+        <Form.Item
+          name="progress_value"
+          label={
+            <Flex align="center" gap={4}>
+              {t('taskInfoTab.details.progressValue')}
+              <Tooltip title={t('taskInfoTab.details.progressValueTooltip')}>
+                <QuestionCircleOutlined />
+              </Tooltip>
+            </Flex>
+          }
+          rules={[
+            {
+              required: true,
+              message: t('taskInfoTab.details.progressValueRequired'),
+            },
+            {
+              type: 'number',
+              min: 0,
+              max: 100,
+              message: t('taskInfoTab.details.progressValueRange'),
+            },
+          ]}
+        >
+          <InputNumber 
+            min={0}
+            max={100}
+            formatter={percentFormatter}
+            parser={percentParser}
+            onBlur={(e) => {
+              const value = percentParser(e.target.value);
+              handleProgressChange(value);
+            }}
+          />
+        </Form.Item>
+      )}
+
+      {showTaskWeightInput && (
+        <Form.Item
+          name="weight"
+          label={
+            <Flex align="center" gap={4}>
+              {t('taskInfoTab.details.taskWeight')}
+              <Tooltip title={t('taskInfoTab.details.taskWeightTooltip')}>
+                <QuestionCircleOutlined />
+              </Tooltip>
+            </Flex>
+          }
+          rules={[
+            {
+              required: true,
+              message: t('taskInfoTab.details.taskWeightRequired'),
+            },
+            {
+              type: 'number',
+              min: 0,
+              max: 100,
+              message: t('taskInfoTab.details.taskWeightRange'),
+            },
+          ]}
+        >
+          <InputNumber
+            min={0}
+            max={100}
+            formatter={percentFormatter}
+            parser={percentParser}
+            onBlur={(e) => {
+              const value = percentParser(e.target.value);
+              handleWeightChange(value);
+            }}
+          />
+        </Form.Item>
+      )}
+    </>
+  );
+};
+
+export default TaskDrawerProgress; 
--- a/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-details-form.tsx
+++ b/worklenz-frontend/src/components/task-drawer/shared/info-tab/task-details-form.tsx
@@ -26,6 +26,8 @@ import TaskDrawerDueDate from './details/task-drawer-due-date/task-drawer-due-da
 import TaskDrawerEstimation from './details/task-drawer-estimation/task-drawer-estimation';
 import TaskDrawerPrioritySelector from './details/task-drawer-priority-selector/task-drawer-priority-selector';
 import TaskDrawerBillable from './details/task-drawer-billable/task-drawer-billable';
+import TaskDrawerProgress from './details/task-drawer-progress/task-drawer-progress';
+import { useAppSelector } from '@/hooks/useAppSelector';

 interface TaskDetailsFormProps {
  taskFormViewModel?: ITaskFormViewModel | null;
@@ -34,6 +36,7 @@ interface TaskDetailsFormProps {
 const TaskDetailsForm = ({ taskFormViewModel = null }: TaskDetailsFormProps) => {
  const { t } = useTranslation('task-drawer/task-drawer');
  const [form] = Form.useForm();
+  const { project } = useAppSelector(state => state.projectReducer);

  useEffect(() => {
    if (!taskFormViewModel) {
@@ -53,6 +56,8 @@ const TaskDetailsForm = ({ taskFormViewModel = null }: TaskDetailsFormProps) =>
      labels: task?.labels || [],
      billable: task?.billable || false,
      notify: [],
+      progress_value: task?.progress_value || null,
+      weight: task?.weight || null,
    });
  }, [taskFormViewModel, form]);

@@ -89,6 +94,8 @@ const TaskDetailsForm = ({ taskFormViewModel = null }: TaskDetailsFormProps) =>
          hours: 0,
          minutes: 0,
          billable: false,
+          progress_value: null,
+          weight: null,
        }}
        onFinish={handleSubmit}
      >
@@ -103,7 +110,7 @@ const TaskDetailsForm = ({ taskFormViewModel = null }: TaskDetailsFormProps) =>

        <Form.Item name="assignees" label={t('taskInfoTab.details.assignees')}>
          <Flex gap={4} align="center">
-            <Avatars members={taskFormViewModel?.task?.names || []} />
+            <Avatars members={taskFormViewModel?.task?.assignee_names || []} />
            <TaskDrawerAssigneeSelector
              task={(taskFormViewModel?.task as ITaskViewModel) || null}
            />
@@ -114,6 +121,10 @@ const TaskDetailsForm = ({ taskFormViewModel = null }: TaskDetailsFormProps) =>

        <TaskDrawerEstimation t={t} task={taskFormViewModel?.task as ITaskViewModel} form={form} />

+        {(project?.use_manual_progress || project?.use_weighted_progress) && (taskFormViewModel?.task) && (
+          <TaskDrawerProgress task={taskFormViewModel?.task as ITaskViewModel} form={form} />
+        )}
+
        <Form.Item name="priority" label={t('taskInfoTab.details.priority')}>
          <TaskDrawerPrioritySelector task={taskFormViewModel?.task as ITaskViewModel} />
        </Form.Item>
--- a/worklenz-frontend/src/features/project/project.slice.ts
+++ b/worklenz-frontend/src/features/project/project.slice.ts
@@ -55,10 +55,9 @@ const initialState: TaskListState = {

 export const getProject = createAsyncThunk(
  'project/getProject',
-  async (projectId: string, { rejectWithValue, dispatch }) => {
+  async (projectId: string, { rejectWithValue }) => {
    try {
      const response = await projectsApiService.getProject(projectId);
-      dispatch(setProject(response.body));
      return response.body;
    } catch (error) {
      return rejectWithValue(error instanceof Error ? error.message : 'Failed to fetch project');
--- a/worklenz-frontend/src/features/projects/projects.slice.ts
+++ b/worklenz-frontend/src/features/projects/projects.slice.ts
@@ -0,0 +1,42 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+import { projectsApiService } from '@/api/projects/projects.api.service';
+
+interface UpdateProjectPayload {
+  id: string;
+  [key: string]: any;
+}
+
+export const projectsSlice = createSlice({
+  name: 'projects',
+  initialState: {
+    loading: false,
+    error: null,
+  },
+  reducers: {
+    setLoading: (state, action: PayloadAction<boolean>) => {
+      state.loading = action.payload;
+    },
+    setError: (state, action: PayloadAction<string | null>) => {
+      state.error = action.payload;
+    },
+  },
+});
+
+// Export actions
+export const { setLoading, setError } = projectsSlice.actions;
+
+// Async thunks
+export const updateProject = (payload: UpdateProjectPayload) => async (dispatch: any) => {
+  try {
+    dispatch(setLoading(true));
+    const response = await projectsApiService.updateProject(payload);
+    dispatch(setLoading(false));
+    return response;
+  } catch (error) {
+    dispatch(setError((error as Error).message));
+    dispatch(setLoading(false));
+    throw error;
+  }
+};
+
+export default projectsSlice.reducer; 
--- a/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-group-wrapper/task-group-wrapper.tsx
+++ b/worklenz-frontend/src/pages/projects/projectView/taskList/task-list-table/task-group-wrapper/task-group-wrapper.tsx
@@ -377,6 +377,41 @@ const TaskGroupWrapper = ({ taskGroups, groupBy }: TaskGroupWrapperProps) => {
    };
  }, [socket, dispatch]);

+  // Socket handler for task progress updates
+  useEffect(() => {
+    if (!socket) return;
+
+    const handleTaskProgressUpdated = (data: {
+      task_id: string;
+      progress_value?: number;
+      weight?: number;
+    }) => {
+      if (data.progress_value !== undefined) {
+        // Find the task in the task groups and update its progress
+        for (const group of taskGroups) {
+          const task = group.tasks.find(task => task.id === data.task_id);
+          if (task) {
+            dispatch(
+              updateTaskProgress({
+                taskId: data.task_id,
+                progress: data.progress_value,
+                totalTasksCount: task.total_tasks_count || 0,
+                completedCount: task.completed_count || 0,
+              })
+            );
+            break;
+          }
+        }
+      }
+    };
+
+    socket.on(SocketEvents.TASK_PROGRESS_UPDATED.toString(), handleTaskProgressUpdated);
+
+    return () => {
+      socket.off(SocketEvents.TASK_PROGRESS_UPDATED.toString(), handleTaskProgressUpdated);
+    };
+  }, [socket, dispatch, taskGroups]);
+
  const handleDragStart = useCallback(({ active }: DragStartEvent) => {
    setActiveId(active.id as string);

--- a/worklenz-frontend/src/shared/socket-events.ts
+++ b/worklenz-frontend/src/shared/socket-events.ts
@@ -58,4 +58,9 @@ export enum SocketEvents {
  TASK_CUSTOM_COLUMN_UPDATE,
  CUSTOM_COLUMN_PINNED_CHANGE,
  TEAM_MEMBER_ROLE_CHANGE,
+  
+  // Task progress events
+  UPDATE_TASK_PROGRESS,
+  UPDATE_TASK_WEIGHT,
+  TASK_PROGRESS_UPDATED,
 }
--- a/worklenz-frontend/src/types/project/project-view-model.types.ts
+++ b/worklenz-frontend/src/types/project/project-view-model.types.ts
@@ -0,0 +1,11 @@
+export interface IProjectViewModel {
+  id: string;
+  name: string;
+  description: string;
+  team_id: string;
+  created_at: string;
+  updated_at: string;
+  use_manual_progress: boolean;
+  use_weighted_progress: boolean;
+  use_time_progress: boolean;
+} 
--- a/worklenz-frontend/src/types/project/projectViewModel.types.ts
+++ b/worklenz-frontend/src/types/project/projectViewModel.types.ts
@@ -41,4 +41,28 @@ export interface IProjectViewModel extends IProject {

  team_member_default_view?: string;
  working_days?: number;
+
+  id?: string;
+  name?: string;
+  description?: string;
+  notes?: string;
+  color_code?: string;
+  status_id?: string;
+  status_name?: string;
+  status_color_dark?: string;
+  health_name?: string;
+  health_color?: string;
+  health_color_dark?: string;
+  category_color_dark?: string;
+  client_id?: string;
+  total_tasks?: number;
+  completed_tasks?: number;
+  tasks_progress?: number;
+  man_days?: number;
+  hours_per_day?: number;
+  default_view?: string;
+  task_key_prefix?: string;
+  use_manual_progress?: boolean;
+  use_weighted_progress?: boolean;
+  use_time_progress?: boolean;
 }
--- a/worklenz-frontend/src/types/tasks/task.types.ts
+++ b/worklenz-frontend/src/types/tasks/task.types.ts
@@ -17,42 +17,28 @@ export interface ITaskAssignee {
 }

 export interface ITask {
-  assignees?: ITaskAssignee[] | string[];
-  assignees_ids?: any[];
-  description?: string;
-  done?: boolean;
-  end?: string | Date;
-  end_date?: string | Date;
-  id?: string;
-  name?: string;
-  resize_valid?: boolean;
-  start?: string | Date;
-  start_date?: string | Date;
-  _start?: Date;
-  _end?: Date;
-  color_code?: string;
-  priority?: string;
-  priority_id?: string;
-  status?: string;
-  status_id?: string;
-  project_id?: string;
-  reporter_id?: string;
-  created_at?: string;
-  updated_at?: string;
-  show_handles?: boolean;
-  min?: number;
-  max?: number;
-  total_hours?: number;
-  total_minutes?: number;
-  name_color?: string;
-  sub_tasks_count?: number;
-  is_sub_task?: boolean;
-  parent_task_name?: string;
-  parent_task_id?: string;
-  show_sub_tasks?: boolean;
-  sub_tasks?: ISubTask[];
-  archived?: boolean;
-  subscribers?: IUser[];
+  id: string;
+  name: string;
+  description: string;
+  status_id: string;
+  priority: string;
+  start_date: string;
+  end_date: string;
+  total_hours: number;
+  total_minutes: number;
+  billable: boolean;
+  phase_id: string;
+  parent_task_id: string | null;
+  project_id: string;
+  team_id: string;
+  task_key: string;
+  labels: string[];
+  assignees: string[];
+  names: string[];
+  sub_tasks_count: number;
+  manual_progress: boolean;
+  progress_value: number | null;
+  weight: number | null;
 }

 export interface IProjectMemberViewModel extends IProjectMember {
@@ -65,23 +51,17 @@ export interface IProjectMemberViewModel extends IProjectMember {
 }

 export interface ITaskViewModel extends ITask {
-  task_key?: string;
  created_from_now?: string;
  updated_from_now?: string;
  reporter?: string;
-  start_date?: string;
-  end_date?: string;
-  sub_tasks_count?: number;
  is_sub_task?: boolean;
  status_color?: string;
  status_color_dark?: string;
  attachments_count?: number;
  complete_ratio?: number;
-  names?: InlineMember[];
-  labels?: ITaskLabel[];
+  assignee_names?: InlineMember[];
+  task_labels?: ITaskLabel[];
  timer_start_time?: number;
-  phase_id?: string;
-  billable?: boolean;
  recurring?: boolean;
 }