diff --git a/docs/task-progress-guide-for-users.md b/docs/task-progress-guide-for-users.md
index 4ff27ae7..1eeb15c1 100644
--- a/docs/task-progress-guide-for-users.md
+++ b/docs/task-progress-guide-for-users.md
@@ -1,9 +1,21 @@
# WorkLenz Task Progress Guide for Users
## Introduction
-
WorkLenz offers three different ways to track and calculate task progress, each designed for different project management needs. This guide explains how each method works and when to use them.
+## Default Progress Method
+
+WorkLenz uses a simple completion-based approach as the default progress calculation method. This method is applied when no special progress methods are enabled.
+
+### Example
+
+If you have a parent task with four subtasks and two of the subtasks are marked complete:
+- Parent task: Not done
+- 2 subtasks: Done
+- 2 subtasks: Not done
+
+The parent task will show as 40% complete (2 completed out of 5 total tasks).
+
## Available Progress Tracking Methods
WorkLenz provides these progress tracking methods:
@@ -150,10 +162,6 @@ The parent task would be approximately 29% complete.
This demonstrates how tasks with longer time estimates (like Subtask C) have more influence on the overall progress calculation. Even though Subtask B is 80% complete, its shorter time estimate means it contributes less to the overall progress than the partially-completed but longer Subtask A.
-## Default Progress Method
-
-If none of the special progress methods are enabled, WorkLenz uses a simple completion-based approach:
-
### How It Works
- Tasks are either 0% (not done) or 100% (done)
@@ -212,4 +220,4 @@ A: Open the task drawer, go to the Info tab, and use the progress slider for tas
A: Yes, each project can have its own progress method.
**Q: What if I don't see progress fields in my task drawer?**
-A: Progress input is only visible for tasks without subtasks. Parent tasks' progress is automatically calculated.
\ No newline at end of file
+A: Progress input is only visible for tasks without subtasks. Parent tasks' progress is automatically calculated.
\ No newline at end of file
diff --git a/worklenz-backend/database/migrations/20250426000000-update-progress-mode-handlers.sql b/worklenz-backend/database/migrations/20250426000000-update-progress-mode-handlers.sql
new file mode 100644
index 00000000..7f16670b
--- /dev/null
+++ b/worklenz-backend/database/migrations/20250426000000-update-progress-mode-handlers.sql
@@ -0,0 +1,150 @@
+-- Migration: Update socket event handlers to set progress-mode handlers
+-- Date: 2025-04-26
+-- Version: 1.0.0
+
+BEGIN;
+
+-- Create ENUM type for progress modes
+CREATE TYPE progress_mode_type AS ENUM ('manual', 'weighted', 'time', 'default');
+
+-- Alter tasks table to use ENUM type
+ALTER TABLE tasks
+ALTER COLUMN progress_mode TYPE progress_mode_type
+USING progress_mode::text::progress_mode_type;
+
+-- Update the on_update_task_progress function to set progress_mode
+CREATE OR REPLACE FUNCTION on_update_task_progress(_body json) RETURNS json
+ LANGUAGE plpgsql
+AS
+$$
+DECLARE
+ _task_id UUID;
+ _progress_value INTEGER;
+ _parent_task_id UUID;
+ _project_id UUID;
+ _current_mode progress_mode_type;
+BEGIN
+ _task_id = (_body ->> 'task_id')::UUID;
+ _progress_value = (_body ->> 'progress_value')::INTEGER;
+ _parent_task_id = (_body ->> 'parent_task_id')::UUID;
+
+ -- Get the project ID and determine the current progress mode
+ SELECT project_id INTO _project_id FROM tasks WHERE id = _task_id;
+
+ IF _project_id IS NOT NULL THEN
+ SELECT
+ CASE
+ WHEN use_manual_progress IS TRUE THEN 'manual'
+ WHEN use_weighted_progress IS TRUE THEN 'weighted'
+ WHEN use_time_progress IS TRUE THEN 'time'
+ ELSE 'default'
+ END
+ INTO _current_mode
+ FROM projects
+ WHERE id = _project_id;
+ ELSE
+ _current_mode := 'default';
+ END IF;
+
+ -- Update the task with progress value and set the progress mode
+ UPDATE tasks
+ SET progress_value = _progress_value,
+ manual_progress = TRUE,
+ progress_mode = _current_mode,
+ updated_at = CURRENT_TIMESTAMP
+ WHERE id = _task_id;
+
+ -- Return the updated task info
+ RETURN JSON_BUILD_OBJECT(
+ 'task_id', _task_id,
+ 'progress_value', _progress_value,
+ 'progress_mode', _current_mode
+ );
+END;
+$$;
+
+-- Update the on_update_task_weight function to set progress_mode when weight is updated
+CREATE OR REPLACE FUNCTION on_update_task_weight(_body json) RETURNS json
+ LANGUAGE plpgsql
+AS
+$$
+DECLARE
+ _task_id UUID;
+ _weight INTEGER;
+ _parent_task_id UUID;
+ _project_id UUID;
+BEGIN
+ _task_id = (_body ->> 'task_id')::UUID;
+ _weight = (_body ->> 'weight')::INTEGER;
+ _parent_task_id = (_body ->> 'parent_task_id')::UUID;
+
+ -- Get the project ID
+ SELECT project_id INTO _project_id FROM tasks WHERE id = _task_id;
+
+ -- Update the task with weight value and set progress_mode to 'weighted'
+ UPDATE tasks
+ SET weight = _weight,
+ progress_mode = 'weighted',
+ updated_at = CURRENT_TIMESTAMP
+ WHERE id = _task_id;
+
+ -- Return the updated task info
+ RETURN JSON_BUILD_OBJECT(
+ 'task_id', _task_id,
+ 'weight', _weight
+ );
+END;
+$$;
+
+-- Create a function to reset progress values when switching project progress modes
+CREATE OR REPLACE FUNCTION reset_project_progress_values() RETURNS TRIGGER
+ LANGUAGE plpgsql
+AS
+$$
+DECLARE
+ _old_mode progress_mode_type;
+ _new_mode progress_mode_type;
+ _project_id UUID;
+BEGIN
+ _project_id := NEW.id;
+
+ -- Determine old and new modes
+ _old_mode :=
+ CASE
+ WHEN OLD.use_manual_progress IS TRUE THEN 'manual'
+ WHEN OLD.use_weighted_progress IS TRUE THEN 'weighted'
+ WHEN OLD.use_time_progress IS TRUE THEN 'time'
+ ELSE 'default'
+ END;
+
+ _new_mode :=
+ CASE
+ WHEN NEW.use_manual_progress IS TRUE THEN 'manual'
+ WHEN NEW.use_weighted_progress IS TRUE THEN 'weighted'
+ WHEN NEW.use_time_progress IS TRUE THEN 'time'
+ ELSE 'default'
+ END;
+
+ -- If mode has changed, reset progress values for tasks with the old mode
+ IF _old_mode <> _new_mode THEN
+ -- Reset progress values for tasks that were set in the old mode
+ UPDATE tasks
+ SET progress_value = NULL,
+ progress_mode = NULL
+ WHERE project_id = _project_id
+ AND progress_mode = _old_mode;
+ END IF;
+
+ RETURN NEW;
+END;
+$$;
+
+-- Create trigger to reset progress values when project progress mode changes
+DROP TRIGGER IF EXISTS reset_progress_on_mode_change ON projects;
+CREATE TRIGGER reset_progress_on_mode_change
+ AFTER UPDATE OF use_manual_progress, use_weighted_progress, use_time_progress
+ ON projects
+ FOR EACH ROW
+ EXECUTE FUNCTION reset_project_progress_values();
+
+COMMIT;
\ No newline at end of file
diff --git a/worklenz-backend/database/migrations/consolidated-progress-migrations.sql b/worklenz-backend/database/migrations/consolidated-progress-migrations.sql
index 832b93c5..c1007d24 100644
--- a/worklenz-backend/database/migrations/consolidated-progress-migrations.sql
+++ b/worklenz-backend/database/migrations/consolidated-progress-migrations.sql
@@ -1,44 +1,55 @@
BEGIN;
+-- Create ENUM type for progress modes
+CREATE TYPE PROGRESS_MODE_TYPE AS ENUM ('manual', 'weighted', 'time', 'default');
+
+-- Alter tasks table to use ENUM type
+ALTER TABLE tasks
+ ADD COLUMN IF NOT EXISTS manual_progress BOOLEAN DEFAULT FALSE,
+ ADD COLUMN IF NOT EXISTS progress_value INTEGER DEFAULT NULL,
+ ADD COLUMN IF NOT EXISTS progress_mode PROGRESS_MODE_TYPE DEFAULT 'default',
+ ADD COLUMN IF NOT EXISTS weight INTEGER DEFAULT NULL;
+
-- Add manual progress fields to tasks table
-ALTER TABLE tasks
-ADD COLUMN IF NOT EXISTS manual_progress BOOLEAN DEFAULT FALSE,
-ADD COLUMN IF NOT EXISTS progress_value INTEGER DEFAULT NULL,
-ADD COLUMN IF NOT EXISTS weight INTEGER DEFAULT NULL;
+ALTER TABLE tasks
+ ADD COLUMN IF NOT EXISTS manual_progress BOOLEAN DEFAULT FALSE,
+ ADD COLUMN IF NOT EXISTS progress_value INTEGER DEFAULT NULL,
+ ADD COLUMN IF NOT EXISTS weight INTEGER DEFAULT NULL;
-- Add progress-related fields to projects table
ALTER TABLE projects
-ADD COLUMN IF NOT EXISTS use_manual_progress BOOLEAN DEFAULT FALSE,
-ADD COLUMN IF NOT EXISTS use_weighted_progress BOOLEAN DEFAULT FALSE,
-ADD COLUMN IF NOT EXISTS use_time_progress BOOLEAN DEFAULT FALSE;
+ ADD COLUMN IF NOT EXISTS use_manual_progress BOOLEAN DEFAULT FALSE,
+ ADD COLUMN IF NOT EXISTS use_weighted_progress BOOLEAN DEFAULT FALSE,
+ ADD COLUMN IF NOT EXISTS use_time_progress BOOLEAN DEFAULT FALSE;
-- Update function to consider manual progress
-CREATE OR REPLACE FUNCTION get_task_complete_ratio(_task_id uuid) RETURNS json
+CREATE OR REPLACE FUNCTION get_task_complete_ratio(_task_id UUID) RETURNS JSON
LANGUAGE plpgsql
AS
$$
DECLARE
- _parent_task_done FLOAT = 0;
- _sub_tasks_done FLOAT = 0;
- _sub_tasks_count FLOAT = 0;
- _total_completed FLOAT = 0;
- _total_tasks FLOAT = 0;
- _ratio FLOAT = 0;
- _is_manual BOOLEAN = FALSE;
- _manual_value INTEGER = NULL;
- _project_id UUID;
- _use_manual_progress BOOLEAN = FALSE;
+ _parent_task_done FLOAT = 0;
+ _sub_tasks_done FLOAT = 0;
+ _sub_tasks_count FLOAT = 0;
+ _total_completed FLOAT = 0;
+ _total_tasks FLOAT = 0;
+ _ratio FLOAT = 0;
+ _is_manual BOOLEAN = FALSE;
+ _manual_value INTEGER = NULL;
+ _project_id UUID;
+ _use_manual_progress BOOLEAN = FALSE;
_use_weighted_progress BOOLEAN = FALSE;
- _use_time_progress BOOLEAN = FALSE;
+ _use_time_progress BOOLEAN = FALSE;
BEGIN
-- Check if manual progress is set
SELECT manual_progress, progress_value, project_id
- FROM tasks
+ FROM tasks
WHERE id = _task_id
INTO _is_manual, _manual_value, _project_id;
-
+
-- Check if the project uses manual progress
- IF _project_id IS NOT NULL THEN
+ IF _project_id IS NOT NULL
+ THEN
SELECT COALESCE(use_manual_progress, FALSE),
COALESCE(use_weighted_progress, FALSE),
COALESCE(use_time_progress, FALSE)
@@ -46,17 +57,18 @@ BEGIN
WHERE id = _project_id
INTO _use_manual_progress, _use_weighted_progress, _use_time_progress;
END IF;
-
+
-- If manual progress is enabled and has a value, use it directly
- IF _is_manual IS TRUE AND _manual_value IS NOT NULL THEN
+ IF _is_manual IS TRUE AND _manual_value IS NOT NULL
+ THEN
RETURN JSON_BUILD_OBJECT(
- 'ratio', _manual_value,
- 'total_completed', 0,
- 'total_tasks', 0,
- 'is_manual', TRUE
- );
+ 'ratio', _manual_value,
+ 'total_completed', 0,
+ 'total_tasks', 0,
+ 'is_manual', TRUE
+ );
END IF;
-
+
-- Otherwise calculate automatically as before
SELECT (CASE
WHEN EXISTS(SELECT 1
@@ -75,24 +87,25 @@ BEGIN
_total_completed = _parent_task_done + _sub_tasks_done;
_total_tasks = _sub_tasks_count; -- +1 for the parent task
-
- IF _total_tasks > 0 THEN
+
+ IF _total_tasks > 0
+ THEN
_ratio = (_total_completed / _total_tasks) * 100;
ELSE
_ratio = _parent_task_done * 100;
END IF;
RETURN JSON_BUILD_OBJECT(
- 'ratio', _ratio,
- 'total_completed', _total_completed,
- 'total_tasks', _total_tasks,
- 'is_manual', FALSE
- );
+ 'ratio', _ratio,
+ 'total_completed', _total_completed,
+ 'total_tasks', _total_tasks,
+ 'is_manual', FALSE
+ );
END
$$;
-- Update project functions to handle progress-related fields
-CREATE OR REPLACE FUNCTION update_project(_body json) RETURNS json
+CREATE OR REPLACE FUNCTION update_project(_body JSON) RETURNS JSON
LANGUAGE plpgsql
AS
$$
@@ -124,10 +137,11 @@ BEGIN
END IF;
-- check whether the project name is already in
- IF EXISTS(
- SELECT name FROM projects WHERE LOWER(name) = LOWER(_project_name)
- AND team_id = _team_id AND id != (_body ->> 'id')::UUID
- )
+ IF EXISTS(SELECT name
+ FROM projects
+ WHERE LOWER(name) = LOWER(_project_name)
+ AND team_id = _team_id
+ AND id != (_body ->> 'id')::UUID)
THEN
RAISE 'PROJECT_EXISTS_ERROR:%', _project_name;
END IF;
@@ -156,7 +170,9 @@ BEGIN
AND team_id = _team_id
RETURNING id INTO _project_id;
- UPDATE project_members SET project_access_level_id = (SELECT id FROM project_access_levels WHERE key = 'MEMBER') WHERE project_id = _project_id;
+ UPDATE project_members
+ SET project_access_level_id = (SELECT id FROM project_access_levels WHERE key = 'MEMBER')
+ WHERE project_id = _project_id;
IF NOT (_project_manager_team_member_id IS NULL)
THEN
@@ -167,11 +183,11 @@ BEGIN
'id', _project_id,
'name', (_body ->> 'name')::TEXT,
'project_manager_id', _project_manager_team_member_id::UUID
- );
+ );
END;
$$;
-CREATE OR REPLACE FUNCTION create_project(_body json) RETURNS json
+CREATE OR REPLACE FUNCTION create_project(_body JSON) RETURNS JSON
LANGUAGE plpgsql
AS
$$
@@ -217,8 +233,9 @@ BEGIN
-- create the project
INSERT
- INTO projects (name, key, color_code, start_date, end_date, team_id, notes, owner_id, status_id, health_id, folder_id,
- category_id, estimated_working_days, estimated_man_days, hours_per_day,
+ INTO projects (name, key, color_code, start_date, end_date, team_id, notes, owner_id, status_id, health_id,
+ folder_id,
+ category_id, estimated_working_days, estimated_man_days, hours_per_day,
use_manual_progress, use_weighted_progress, use_time_progress, client_id)
VALUES (_project_name,
UPPER(_project_key),
@@ -264,7 +281,8 @@ BEGIN
PERFORM insert_task_list_columns(_project_id);
-- add project manager role if exists
- IF NOT is_null_or_empty(_project_manager_team_member_id) THEN
+ IF NOT is_null_or_empty(_project_manager_team_member_id)
+ THEN
PERFORM update_project_manager(_project_manager_team_member_id, _project_id);
END IF;
@@ -272,7 +290,7 @@ BEGIN
'id', _project_id,
'name', _project_name,
'project_created_log_id', _project_created_log_id
- );
+ );
END;
$$;
@@ -280,40 +298,187 @@ COMMIT;
BEGIN;
--- Update function to use time-based progress for all tasks
-CREATE OR REPLACE FUNCTION get_task_complete_ratio(_task_id uuid) RETURNS json
+-- Update the on_update_task_progress function to set progress_mode
+CREATE OR REPLACE FUNCTION on_update_task_progress(_body JSON) RETURNS JSON
LANGUAGE plpgsql
AS
$$
DECLARE
- _parent_task_done FLOAT = 0;
- _sub_tasks_done FLOAT = 0;
- _sub_tasks_count FLOAT = 0;
- _total_completed FLOAT = 0;
- _total_tasks FLOAT = 0;
- _ratio FLOAT = 0;
- _is_manual BOOLEAN = FALSE;
- _manual_value INTEGER = NULL;
- _project_id UUID;
- _use_manual_progress BOOLEAN = FALSE;
- _use_weighted_progress BOOLEAN = FALSE;
- _use_time_progress BOOLEAN = FALSE;
- _task_complete BOOLEAN = FALSE;
+ _task_id UUID;
+ _progress_value INTEGER;
+ _parent_task_id UUID;
+ _project_id UUID;
+ _current_mode VARCHAR(20);
+BEGIN
+ _task_id = (_body ->> 'task_id')::UUID;
+ _progress_value = (_body ->> 'progress_value')::INTEGER;
+ _parent_task_id = (_body ->> 'parent_task_id')::UUID;
+
+ -- Get the project ID and determine the current progress mode
+ SELECT project_id INTO _project_id FROM tasks WHERE id = _task_id;
+
+ IF _project_id IS NOT NULL
+ THEN
+ SELECT CASE
+ WHEN use_manual_progress IS TRUE THEN 'manual'
+ WHEN use_weighted_progress IS TRUE THEN 'weighted'
+ WHEN use_time_progress IS TRUE THEN 'time'
+ ELSE 'default'
+ END
+ INTO _current_mode
+ FROM projects
+ WHERE id = _project_id;
+ ELSE
+ _current_mode := 'default';
+ END IF;
+
+ -- Update the task with progress value and set the progress mode
+ UPDATE tasks
+ SET progress_value = _progress_value,
+ manual_progress = TRUE,
+ progress_mode = _current_mode,
+ updated_at = CURRENT_TIMESTAMP
+ WHERE id = _task_id;
+
+ -- Return the updated task info
+ RETURN JSON_BUILD_OBJECT(
+ 'task_id', _task_id,
+ 'progress_value', _progress_value,
+ 'progress_mode', _current_mode
+ );
+END;
+$$;
+
+-- Update the on_update_task_weight function to set progress_mode when weight is updated
+CREATE OR REPLACE FUNCTION on_update_task_weight(_body JSON) RETURNS JSON
+ LANGUAGE plpgsql
+AS
+$$
+DECLARE
+ _task_id UUID;
+ _weight INTEGER;
+ _parent_task_id UUID;
+ _project_id UUID;
+BEGIN
+ _task_id = (_body ->> 'task_id')::UUID;
+ _weight = (_body ->> 'weight')::INTEGER;
+ _parent_task_id = (_body ->> 'parent_task_id')::UUID;
+
+ -- Get the project ID
+ SELECT project_id INTO _project_id FROM tasks WHERE id = _task_id;
+
+ -- Update the task with weight value and set progress_mode to 'weighted'
+ UPDATE tasks
+ SET weight = _weight,
+ progress_mode = 'weighted',
+ updated_at = CURRENT_TIMESTAMP
+ WHERE id = _task_id;
+
+ -- Return the updated task info
+ RETURN JSON_BUILD_OBJECT(
+ 'task_id', _task_id,
+ 'weight', _weight
+ );
+END;
+$$;
+
+-- Create a function to reset progress values when switching project progress modes
+CREATE OR REPLACE FUNCTION reset_project_progress_values() RETURNS TRIGGER
+ LANGUAGE plpgsql
+AS
+$$
+DECLARE
+ _old_mode VARCHAR(20);
+ _new_mode VARCHAR(20);
+ _project_id UUID;
+BEGIN
+ _project_id := NEW.id;
+
+ -- Determine old and new modes
+ _old_mode :=
+ CASE
+ WHEN OLD.use_manual_progress IS TRUE THEN 'manual'
+ WHEN OLD.use_weighted_progress IS TRUE THEN 'weighted'
+ WHEN OLD.use_time_progress IS TRUE THEN 'time'
+ ELSE 'default'
+ END;
+
+ _new_mode :=
+ CASE
+ WHEN NEW.use_manual_progress IS TRUE THEN 'manual'
+ WHEN NEW.use_weighted_progress IS TRUE THEN 'weighted'
+ WHEN NEW.use_time_progress IS TRUE THEN 'time'
+ ELSE 'default'
+ END;
+
+ -- If mode has changed, reset progress values for tasks with the old mode
+ IF _old_mode <> _new_mode
+ THEN
+ -- Reset progress values for tasks that were set in the old mode
+ UPDATE tasks
+ SET progress_value = NULL,
+ progress_mode = NULL
+ WHERE project_id = _project_id
+ AND progress_mode = _old_mode;
+ END IF;
+
+ RETURN NEW;
+END;
+$$;
+
+-- Create trigger to reset progress values when project progress mode changes
+DROP TRIGGER IF EXISTS reset_progress_on_mode_change ON projects;
+CREATE TRIGGER reset_progress_on_mode_change
+ AFTER UPDATE OF use_manual_progress, use_weighted_progress, use_time_progress
+ ON projects
+ FOR EACH ROW
+EXECUTE FUNCTION reset_project_progress_values();
+
+COMMIT;
+
+BEGIN;
+
+-- Add progress_mode column to tasks table to track which mode the progress was set in
+ALTER TABLE tasks
+ ADD COLUMN IF NOT EXISTS progress_mode VARCHAR(20) DEFAULT NULL;
+
+-- Update function to use time-based progress for all tasks and respect mode changes
+CREATE OR REPLACE FUNCTION get_task_complete_ratio(_task_id UUID) RETURNS JSON
+ LANGUAGE plpgsql
+AS
+$$
+DECLARE
+ _parent_task_done FLOAT = 0;
+ _sub_tasks_done FLOAT = 0;
+ _sub_tasks_count FLOAT = 0;
+ _total_completed FLOAT = 0;
+ _total_tasks FLOAT = 0;
+ _ratio FLOAT = 0;
+ _is_manual BOOLEAN = FALSE;
+ _manual_value INTEGER = NULL;
+ _project_id UUID;
+ _use_manual_progress BOOLEAN = FALSE;
+ _use_weighted_progress BOOLEAN = FALSE;
+ _use_time_progress BOOLEAN = FALSE;
+ _task_complete BOOLEAN = FALSE;
+ _progress_mode VARCHAR(20) = NULL;
BEGIN
-- Check if manual progress is set for this task
- SELECT manual_progress, progress_value, project_id,
- EXISTS(
- SELECT 1
- FROM tasks_with_status_view
- WHERE tasks_with_status_view.task_id = tasks.id
- AND is_done IS TRUE
- ) AS is_complete
- FROM tasks
+ SELECT manual_progress,
+ progress_value,
+ project_id,
+ progress_mode,
+ EXISTS(SELECT 1
+ FROM tasks_with_status_view
+ WHERE tasks_with_status_view.task_id = tasks.id
+ AND is_done IS TRUE) AS is_complete
+ FROM tasks
WHERE id = _task_id
- INTO _is_manual, _manual_value, _project_id, _task_complete;
-
+ INTO _is_manual, _manual_value, _project_id, _progress_mode, _task_complete;
+
-- Check if the project uses manual progress
- IF _project_id IS NOT NULL THEN
+ IF _project_id IS NOT NULL
+ THEN
SELECT COALESCE(use_manual_progress, FALSE),
COALESCE(use_weighted_progress, FALSE),
COALESCE(use_time_progress, FALSE)
@@ -321,198 +486,206 @@ BEGIN
WHERE id = _project_id
INTO _use_manual_progress, _use_weighted_progress, _use_time_progress;
END IF;
-
+
-- Get all subtasks
- SELECT COUNT(*)
- FROM tasks
- WHERE parent_task_id = _task_id AND archived IS FALSE
+ SELECT COUNT(*)
+ FROM tasks
+ WHERE parent_task_id = _task_id
+ AND archived IS FALSE
INTO _sub_tasks_count;
-
+
-- If task is complete, always return 100%
- IF _task_complete IS TRUE THEN
+ IF _task_complete IS TRUE
+ THEN
RETURN JSON_BUILD_OBJECT(
- 'ratio', 100,
- 'total_completed', 1,
- 'total_tasks', 1,
- 'is_manual', FALSE
- );
+ 'ratio', 100,
+ 'total_completed', 1,
+ 'total_tasks', 1,
+ 'is_manual', FALSE
+ );
END IF;
-
- -- Use manual progress value in two cases:
- -- 1. When task has manual_progress = TRUE and progress_value is set
- -- 2. When project has use_manual_progress = TRUE and progress_value is set
- IF (_is_manual IS TRUE AND _manual_value IS NOT NULL) OR
- (_use_manual_progress IS TRUE AND _manual_value IS NOT NULL) THEN
- RETURN JSON_BUILD_OBJECT(
- 'ratio', _manual_value,
- 'total_completed', 0,
- 'total_tasks', 0,
- 'is_manual', TRUE
- );
- END IF;
-
+
+ -- Determine current active mode
+ DECLARE
+ _current_mode VARCHAR(20) = CASE
+ WHEN _use_manual_progress IS TRUE THEN 'manual'
+ WHEN _use_weighted_progress IS TRUE THEN 'weighted'
+ WHEN _use_time_progress IS TRUE THEN 'time'
+ ELSE 'default'
+ END;
+ BEGIN
+ -- Only use manual progress value if it was set in the current active mode
+ -- or if the task is explicitly marked for manual progress
+ IF (_is_manual IS TRUE AND _manual_value IS NOT NULL AND
+ (_progress_mode IS NULL OR _progress_mode = _current_mode)) OR
+ (_use_manual_progress IS TRUE AND _manual_value IS NOT NULL AND
+ (_progress_mode IS NULL OR _progress_mode = 'manual'))
+ THEN
+ RETURN JSON_BUILD_OBJECT(
+ 'ratio', _manual_value,
+ 'total_completed', 0,
+ 'total_tasks', 0,
+ 'is_manual', TRUE
+ );
+ END IF;
+ END;
+
-- If there are no subtasks, just use the parent task's status (unless in time-based mode)
- IF _sub_tasks_count = 0 THEN
+ IF _sub_tasks_count = 0
+ THEN
-- Use time-based estimation for tasks without subtasks if enabled
- IF _use_time_progress IS TRUE THEN
+ IF _use_time_progress IS TRUE
+ THEN
-- For time-based tasks without subtasks, we still need some progress calculation
-- If the task is completed, return 100%
- -- Otherwise, use the progress value if set manually, or 0
- SELECT
- CASE
- WHEN _task_complete IS TRUE THEN 100
- ELSE COALESCE(_manual_value, 0)
- END
+ -- Otherwise, use the progress value if set manually in the correct mode, or 0
+ SELECT CASE
+ WHEN _task_complete IS TRUE THEN 100
+ WHEN _manual_value IS NOT NULL AND (_progress_mode = 'time' OR _progress_mode IS NULL)
+ THEN _manual_value
+ ELSE 0
+ END
INTO _ratio;
ELSE
-- Traditional calculation for non-time-based tasks
SELECT (CASE WHEN _task_complete IS TRUE THEN 1 ELSE 0 END)
INTO _parent_task_done;
-
+
_ratio = _parent_task_done * 100;
END IF;
ELSE
-- If project uses manual progress, calculate based on subtask manual progress values
- IF _use_manual_progress IS TRUE THEN
- WITH subtask_progress AS (
- SELECT
- t.id,
- t.manual_progress,
- t.progress_value,
- EXISTS(
- SELECT 1
- FROM tasks_with_status_view
- WHERE tasks_with_status_view.task_id = t.id
- AND is_done IS TRUE
- ) AS is_complete
- FROM tasks t
- WHERE t.parent_task_id = _task_id
- AND t.archived IS FALSE
- ),
- subtask_with_values AS (
- SELECT
- CASE
- -- For completed tasks, always use 100%
- WHEN is_complete IS TRUE THEN 100
- -- For tasks with progress value set, use it regardless of manual_progress flag
- WHEN progress_value IS NOT NULL THEN progress_value
- -- Default to 0 for incomplete tasks with no progress value
- ELSE 0
- END AS progress_value
- FROM subtask_progress
- )
+ IF _use_manual_progress IS TRUE
+ THEN
+ WITH subtask_progress AS (SELECT t.id,
+ t.manual_progress,
+ t.progress_value,
+ t.progress_mode,
+ EXISTS(SELECT 1
+ FROM tasks_with_status_view
+ WHERE tasks_with_status_view.task_id = t.id
+ AND is_done IS TRUE) AS is_complete
+ FROM tasks t
+ WHERE t.parent_task_id = _task_id
+ AND t.archived IS FALSE),
+ subtask_with_values AS (SELECT CASE
+ -- For completed tasks, always use 100%
+ WHEN is_complete IS TRUE THEN 100
+ -- For tasks with progress value set in the correct mode, use it
+ WHEN progress_value IS NOT NULL AND
+ (progress_mode = 'manual' OR progress_mode IS NULL)
+ THEN progress_value
+ -- Default to 0 for incomplete tasks with no progress value or wrong mode
+ ELSE 0
+ END AS progress_value
+ FROM subtask_progress)
SELECT COALESCE(AVG(progress_value), 0)
FROM subtask_with_values
INTO _ratio;
- -- If project uses weighted progress, calculate based on subtask weights
- ELSIF _use_weighted_progress IS TRUE THEN
- WITH subtask_progress AS (
- SELECT
- t.id,
- t.manual_progress,
- t.progress_value,
- EXISTS(
- SELECT 1
- FROM tasks_with_status_view
- WHERE tasks_with_status_view.task_id = t.id
- AND is_done IS TRUE
- ) AS is_complete,
- COALESCE(t.weight, 100) AS weight
- FROM tasks t
- WHERE t.parent_task_id = _task_id
- AND t.archived IS FALSE
- ),
- subtask_with_values AS (
- SELECT
- CASE
- -- For completed tasks, always use 100%
- WHEN is_complete IS TRUE THEN 100
- -- For tasks with progress value set, use it regardless of manual_progress flag
- WHEN progress_value IS NOT NULL THEN progress_value
- -- Default to 0 for incomplete tasks with no progress value
- ELSE 0
- END AS progress_value,
- weight
- FROM subtask_progress
- )
+ -- If project uses weighted progress, calculate based on subtask weights
+ ELSIF _use_weighted_progress IS TRUE
+ THEN
+ WITH subtask_progress AS (SELECT t.id,
+ t.manual_progress,
+ t.progress_value,
+ t.progress_mode,
+ EXISTS(SELECT 1
+ FROM tasks_with_status_view
+ WHERE tasks_with_status_view.task_id = t.id
+ AND is_done IS TRUE) AS is_complete,
+ COALESCE(t.weight, 100) AS weight
+ FROM tasks t
+ WHERE t.parent_task_id = _task_id
+ AND t.archived IS FALSE),
+ subtask_with_values AS (SELECT CASE
+ -- For completed tasks, always use 100%
+ WHEN is_complete IS TRUE THEN 100
+ -- For tasks with progress value set in the correct mode, use it
+ WHEN progress_value IS NOT NULL AND
+ (progress_mode = 'weighted' OR progress_mode IS NULL)
+ THEN progress_value
+ -- Default to 0 for incomplete tasks with no progress value or wrong mode
+ ELSE 0
+ END AS progress_value,
+ weight
+ FROM subtask_progress)
SELECT COALESCE(
- SUM(progress_value * weight) / NULLIF(SUM(weight), 0),
- 0
- )
+ SUM(progress_value * weight) / NULLIF(SUM(weight), 0),
+ 0
+ )
FROM subtask_with_values
INTO _ratio;
- -- If project uses time-based progress, calculate based on estimated time
- ELSIF _use_time_progress IS TRUE THEN
- WITH subtask_progress AS (
- SELECT
- t.id,
- t.manual_progress,
- t.progress_value,
- EXISTS(
- SELECT 1
- FROM tasks_with_status_view
- WHERE tasks_with_status_view.task_id = t.id
- AND is_done IS TRUE
- ) AS is_complete,
- COALESCE(t.total_minutes, 0) AS estimated_minutes
- FROM tasks t
- WHERE t.parent_task_id = _task_id
- AND t.archived IS FALSE
- ),
- subtask_with_values AS (
- SELECT
- CASE
- -- For completed tasks, always use 100%
- WHEN is_complete IS TRUE THEN 100
- -- For tasks with progress value set, use it regardless of manual_progress flag
- WHEN progress_value IS NOT NULL THEN progress_value
- -- Default to 0 for incomplete tasks with no progress value
- ELSE 0
- END AS progress_value,
- estimated_minutes
- FROM subtask_progress
- )
+ -- If project uses time-based progress, calculate based on estimated time
+ ELSIF _use_time_progress IS TRUE
+ THEN
+ WITH subtask_progress AS (SELECT t.id,
+ t.manual_progress,
+ t.progress_value,
+ t.progress_mode,
+ EXISTS(SELECT 1
+ FROM tasks_with_status_view
+ WHERE tasks_with_status_view.task_id = t.id
+ AND is_done IS TRUE) AS is_complete,
+ COALESCE(t.total_minutes, 0) AS estimated_minutes
+ FROM tasks t
+ WHERE t.parent_task_id = _task_id
+ AND t.archived IS FALSE),
+ subtask_with_values AS (SELECT CASE
+ -- For completed tasks, always use 100%
+ WHEN is_complete IS TRUE THEN 100
+ -- For tasks with progress value set in the correct mode, use it
+ WHEN progress_value IS NOT NULL AND
+ (progress_mode = 'time' OR progress_mode IS NULL)
+ THEN progress_value
+ -- Default to 0 for incomplete tasks with no progress value or wrong mode
+ ELSE 0
+ END AS progress_value,
+ estimated_minutes
+ FROM subtask_progress)
SELECT COALESCE(
- SUM(progress_value * estimated_minutes) / NULLIF(SUM(estimated_minutes), 0),
- 0
- )
+ SUM(progress_value * estimated_minutes) / NULLIF(SUM(estimated_minutes), 0),
+ 0
+ )
FROM subtask_with_values
INTO _ratio;
ELSE
-- Traditional calculation based on completion status
SELECT (CASE WHEN _task_complete IS TRUE THEN 1 ELSE 0 END)
INTO _parent_task_done;
-
+
SELECT COUNT(*)
FROM tasks_with_status_view
WHERE parent_task_id = _task_id
AND is_done IS TRUE
INTO _sub_tasks_done;
-
+
_total_completed = _parent_task_done + _sub_tasks_done;
_total_tasks = _sub_tasks_count + 1; -- +1 for the parent task
-
- IF _total_tasks = 0 THEN
+
+ IF _total_tasks = 0
+ THEN
_ratio = 0;
ELSE
_ratio = (_total_completed / _total_tasks) * 100;
END IF;
END IF;
END IF;
-
+
-- Ensure ratio is between 0 and 100
- IF _ratio < 0 THEN
+ IF _ratio < 0
+ THEN
_ratio = 0;
- ELSIF _ratio > 100 THEN
+ ELSIF _ratio > 100
+ THEN
_ratio = 100;
END IF;
RETURN JSON_BUILD_OBJECT(
- 'ratio', _ratio,
- 'total_completed', _total_completed,
- 'total_tasks', _total_tasks,
- 'is_manual', _is_manual
- );
+ 'ratio', _ratio,
+ 'total_completed', _total_completed,
+ 'total_tasks', _total_tasks,
+ 'is_manual', _is_manual
+ );
END
$$;
@@ -564,42 +737,42 @@ BEGIN
status_id,
parent_task_id,
sort_order,
- (SELECT phase_id FROM task_phase WHERE task_id = tasks.id) AS phase_id,
- CONCAT((SELECT key FROM projects WHERE id = tasks.project_id), '-', task_no) AS task_key,
+ (SELECT phase_id FROM task_phase WHERE task_id = tasks.id) AS phase_id,
+ CONCAT((SELECT key FROM projects WHERE id = tasks.project_id), '-', task_no) AS task_key,
(SELECT start_time
FROM task_timers
WHERE task_id = tasks.id
- AND user_id = _user_id) AS timer_start_time,
- parent_task_id IS NOT NULL AS is_sub_task,
+ AND user_id = _user_id) AS timer_start_time,
+ parent_task_id IS NOT NULL AS is_sub_task,
(SELECT COUNT('*')
FROM tasks
WHERE parent_task_id = tasks.id
- AND archived IS FALSE) AS sub_tasks_count,
+ AND archived IS FALSE) AS sub_tasks_count,
(SELECT COUNT(*)
FROM tasks_with_status_view tt
WHERE (tt.parent_task_id = tasks.id OR tt.task_id = tasks.id)
AND tt.is_done IS TRUE)
- AS completed_count,
- (SELECT COUNT(*) FROM task_attachments WHERE task_id = tasks.id) AS attachments_count,
+ AS completed_count,
+ (SELECT COUNT(*) FROM task_attachments WHERE task_id = tasks.id) AS attachments_count,
(SELECT COALESCE(ARRAY_TO_JSON(ARRAY_AGG(ROW_TO_JSON(r))), '[]'::JSON)
FROM (SELECT task_labels.label_id AS id,
(SELECT name FROM team_labels WHERE id = task_labels.label_id),
(SELECT color_code FROM team_labels WHERE id = task_labels.label_id)
FROM task_labels
WHERE task_id = tasks.id
- ORDER BY name) r) AS labels,
+ ORDER BY name) r) AS labels,
(SELECT color_code
FROM sys_task_status_categories
WHERE id = (SELECT category_id FROM task_statuses WHERE id = tasks.status_id)) AS status_color,
- (SELECT COUNT(*) FROM tasks WHERE parent_task_id = _task_id) AS sub_tasks_count,
- (SELECT name FROM users WHERE id = tasks.reporter_id) AS reporter,
- (SELECT get_task_assignees(tasks.id)) AS assignees,
- (SELECT id FROM team_members WHERE user_id = _user_id AND team_id = _team_id) AS team_member_id,
+ (SELECT COUNT(*) FROM tasks WHERE parent_task_id = _task_id) AS sub_tasks_count,
+ (SELECT name FROM users WHERE id = tasks.reporter_id) AS reporter,
+ (SELECT get_task_assignees(tasks.id)) AS assignees,
+ (SELECT id FROM team_members WHERE user_id = _user_id AND team_id = _team_id) AS team_member_id,
billable,
schedule_id,
progress_value,
weight,
- (SELECT MAX(level) FROM task_hierarchy) AS task_level
+ (SELECT MAX(level) FROM task_hierarchy) AS task_level
FROM tasks
WHERE id = _task_id) rec;
@@ -654,4 +827,144 @@ $$;
COMMIT;
+BEGIN;
+
+-- Update the on_update_task_progress function to set progress_mode
+CREATE OR REPLACE FUNCTION on_update_task_progress(_body JSON) RETURNS JSON
+ LANGUAGE plpgsql
+AS
+$$
+DECLARE
+ _task_id UUID;
+ _progress_value INTEGER;
+ _parent_task_id UUID;
+ _project_id UUID;
+ _current_mode VARCHAR(20);
+BEGIN
+ _task_id = (_body ->> 'task_id')::UUID;
+ _progress_value = (_body ->> 'progress_value')::INTEGER;
+ _parent_task_id = (_body ->> 'parent_task_id')::UUID;
+
+ -- Get the project ID and determine the current progress mode
+ SELECT project_id INTO _project_id FROM tasks WHERE id = _task_id;
+
+ IF _project_id IS NOT NULL
+ THEN
+ SELECT CASE
+ WHEN use_manual_progress IS TRUE THEN 'manual'
+ WHEN use_weighted_progress IS TRUE THEN 'weighted'
+ WHEN use_time_progress IS TRUE THEN 'time'
+ ELSE 'default'
+ END
+ INTO _current_mode
+ FROM projects
+ WHERE id = _project_id;
+ ELSE
+ _current_mode := 'default';
+ END IF;
+
+ -- Update the task with progress value and set the progress mode
+ UPDATE tasks
+ SET progress_value = _progress_value,
+ manual_progress = TRUE,
+ progress_mode = _current_mode,
+ updated_at = CURRENT_TIMESTAMP
+ WHERE id = _task_id;
+
+ -- Return the updated task info
+ RETURN JSON_BUILD_OBJECT(
+ 'task_id', _task_id,
+ 'progress_value', _progress_value,
+ 'progress_mode', _current_mode
+ );
+END;
+$$;
+
+-- Update the on_update_task_weight function to set progress_mode when weight is updated
+CREATE OR REPLACE FUNCTION on_update_task_weight(_body JSON) RETURNS JSON
+ LANGUAGE plpgsql
+AS
+$$
+DECLARE
+ _task_id UUID;
+ _weight INTEGER;
+ _parent_task_id UUID;
+ _project_id UUID;
+BEGIN
+ _task_id = (_body ->> 'task_id')::UUID;
+ _weight = (_body ->> 'weight')::INTEGER;
+ _parent_task_id = (_body ->> 'parent_task_id')::UUID;
+
+ -- Get the project ID
+ SELECT project_id INTO _project_id FROM tasks WHERE id = _task_id;
+
+ -- Update the task with weight value and set progress_mode to 'weighted'
+ UPDATE tasks
+ SET weight = _weight,
+ progress_mode = 'weighted',
+ updated_at = CURRENT_TIMESTAMP
+ WHERE id = _task_id;
+
+ -- Return the updated task info
+ RETURN JSON_BUILD_OBJECT(
+ 'task_id', _task_id,
+ 'weight', _weight
+ );
+END;
+$$;
+
+-- Create a function to reset progress values when switching project progress modes
+CREATE OR REPLACE FUNCTION reset_project_progress_values() RETURNS TRIGGER
+ LANGUAGE plpgsql
+AS
+$$
+DECLARE
+ _old_mode VARCHAR(20);
+ _new_mode VARCHAR(20);
+ _project_id UUID;
+BEGIN
+ _project_id := NEW.id;
+
+ -- Determine old and new modes
+ _old_mode :=
+ CASE
+ WHEN OLD.use_manual_progress IS TRUE THEN 'manual'
+ WHEN OLD.use_weighted_progress IS TRUE THEN 'weighted'
+ WHEN OLD.use_time_progress IS TRUE THEN 'time'
+ ELSE 'default'
+ END;
+
+ _new_mode :=
+ CASE
+ WHEN NEW.use_manual_progress IS TRUE THEN 'manual'
+ WHEN NEW.use_weighted_progress IS TRUE THEN 'weighted'
+ WHEN NEW.use_time_progress IS TRUE THEN 'time'
+ ELSE 'default'
+ END;
+
+ -- If mode has changed, reset progress values for tasks with the old mode
+ IF _old_mode <> _new_mode
+ THEN
+ -- Reset progress values for tasks that were set in the old mode
+ UPDATE tasks
+ SET progress_value = NULL,
+ progress_mode = NULL
+ WHERE project_id = _project_id
+ AND progress_mode = _old_mode;
+ END IF;
+
+ RETURN NEW;
+END;
+$$;
+
+-- Create trigger to reset progress values when project progress mode changes
+DROP TRIGGER IF EXISTS reset_progress_on_mode_change ON projects;
+CREATE TRIGGER reset_progress_on_mode_change
+ AFTER UPDATE OF use_manual_progress, use_weighted_progress, use_time_progress
+ ON projects
+ FOR EACH ROW
+EXECUTE FUNCTION reset_project_progress_values();
+
+COMMIT;
+
diff --git a/worklenz-frontend/index.html b/worklenz-frontend/index.html
index 86abad6e..7f1e3d71 100644
--- a/worklenz-frontend/index.html
+++ b/worklenz-frontend/index.html
@@ -14,6 +14,8 @@
Worklenz
+
+
diff --git a/worklenz-frontend/public/locales/en/admin-center/current-bill.json b/worklenz-frontend/public/locales/en/admin-center/current-bill.json
index e5846b79..a4f39319 100644
--- a/worklenz-frontend/public/locales/en/admin-center/current-bill.json
+++ b/worklenz-frontend/public/locales/en/admin-center/current-bill.json
@@ -109,5 +109,13 @@
"expiredDaysAgo": "{{days}} days ago",
"continueWith": "Continue with {{plan}}",
- "changeToPlan": "Change to {{plan}}"
+ "changeToPlan": "Change to {{plan}}",
+ "creditPlan": "Credit Plan",
+ "customPlan": "Custom Plan",
+ "planValidTill": "Your plan is valid till {{date}}",
+ "purchaseSeatsText": "To continue, you'll need to purchase additional seats.",
+ "currentSeatsText": "You currently have {{seats}} seats available.",
+ "selectSeatsText": "Please select the number of additional seats to purchase.",
+ "purchase": "Purchase",
+ "contactSales": "Contact sales"
}
diff --git a/worklenz-frontend/public/locales/es/admin-center/current-bill.json b/worklenz-frontend/public/locales/es/admin-center/current-bill.json
index 9278dfe1..5af54652 100644
--- a/worklenz-frontend/public/locales/es/admin-center/current-bill.json
+++ b/worklenz-frontend/public/locales/es/admin-center/current-bill.json
@@ -101,5 +101,13 @@
"expirestoday": "hoy",
"expirestomorrow": "mañana",
- "expiredDaysAgo": "hace {{days}} días"
+ "expiredDaysAgo": "hace {{days}} días",
+ "creditPlan": "Plan de Crédito",
+ "customPlan": "Plan Personalizado",
+ "planValidTill": "Su plan es válido hasta {{date}}",
+ "purchaseSeatsText": "Para continuar, deberá comprar asientos adicionales.",
+ "currentSeatsText": "Actualmente tiene {{seats}} asientos disponibles.",
+ "selectSeatsText": "Seleccione el número de asientos adicionales a comprar.",
+ "purchase": "Comprar",
+ "contactSales": "Contactar ventas"
}
diff --git a/worklenz-frontend/public/locales/pt/admin-center/current-bill.json b/worklenz-frontend/public/locales/pt/admin-center/current-bill.json
index c4bc4126..063fc9c8 100644
--- a/worklenz-frontend/public/locales/pt/admin-center/current-bill.json
+++ b/worklenz-frontend/public/locales/pt/admin-center/current-bill.json
@@ -101,5 +101,13 @@
"expirestoday": "hoje",
"expirestomorrow": "amanhã",
- "expiredDaysAgo": "há {{days}} dias"
+ "expiredDaysAgo": "há {{days}} dias",
+ "creditPlan": "Plano de Crédito",
+ "customPlan": "Plano Personalizado",
+ "planValidTill": "Seu plano é válido até {{date}}",
+ "purchaseSeatsText": "Para continuar, você precisará comprar assentos adicionais.",
+ "currentSeatsText": "Atualmente você tem {{seats}} assentos disponíveis.",
+ "selectSeatsText": "Selecione o número de assentos adicionais para comprar.",
+ "purchase": "Comprar",
+ "contactSales": "Fale com vendas"
}
diff --git a/worklenz-frontend/public/unregister-sw.js b/worklenz-frontend/public/unregister-sw.js
new file mode 100644
index 00000000..62fb7ac4
--- /dev/null
+++ b/worklenz-frontend/public/unregister-sw.js
@@ -0,0 +1,7 @@
+if ('serviceWorker' in navigator) {
+ navigator.serviceWorker.getRegistrations().then(function(registrations) {
+ for(let registration of registrations) {
+ registration.unregister();
+ }
+ });
+}
\ No newline at end of file
diff --git a/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx b/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx
index 42e1a449..8111bc56 100644
--- a/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx
+++ b/worklenz-frontend/src/components/admin-center/billing/current-plan-details/current-plan-details.tsx
@@ -246,7 +246,7 @@ const CurrentPlanDetails = () => {
const renderFreePlan = () => (
- Free Plan
+ {t('freePlan')} -{' '}
{freePlanSettings?.team_member_limit === 0
@@ -309,16 +309,16 @@ const CurrentPlanDetails = () => {
const renderCreditSubscriptionInfo = () => {
return
- Credit Plan
+ {t('creditPlan','Credit Plan')}
- };
+ };
const renderCustomSubscriptionInfo = () => {
return
- Custom Plan
- Your plan is valid till {billingInfo?.valid_till_date}
+ {t('customPlan','Custom Plan')}
+ {t('planValidTill','Your plan is valid till {{date}}',{date: billingInfo?.valid_till_date})}
- };
+ };
return (
{
>
- To continue, you'll need to purchase additional seats.
+ {t('purchaseSeatsText','To continue, you\'ll need to purchase additional seats.')}
- You currently have {billingInfo?.total_seats} seats available.
+ {t('currentSeatsText','You currently have {{seats}} seats available.',{seats: billingInfo?.total_seats})}
- Please select the number of additional seats to purchase.
+ {t('selectSeatsText','Please select the number of additional seats to purchase.')}