From d959a8169666610f0e01b793c57a828a5d7a0400 Mon Sep 17 00:00:00 2001 From: Pradip-p Date: Mon, 14 Oct 2024 18:47:49 +0545 Subject: [PATCH] fix(backend): reslove merge conflict in pyproject.toml --- src/backend/app/projects/project_schemas.py | 9 --------- src/backend/pyproject.toml | 3 --- 2 files changed, 12 deletions(-) diff --git a/src/backend/app/projects/project_schemas.py b/src/backend/app/projects/project_schemas.py index 545322e1..a8bf4173 100644 --- a/src/backend/app/projects/project_schemas.py +++ b/src/backend/app/projects/project_schemas.py @@ -530,21 +530,12 @@ def calculate_status(cls, values): completed_task_count = values.completed_task_count total_task_count = values.total_task_count -<<<<<<< HEAD - if completed_task_count == 0 and ongoing_task_count == 0: - values.status = "not-started" - elif completed_task_count == total_task_count: - values.status = "completed" - else: - values.status = "ongoing" -======= if ongoing_task_count == 0: values.status = "not-started" elif ongoing_task_count > 0 and ongoing_task_count != completed_task_count: values.status = "ongoing" elif ongoing_task_count == total_task_count: values.status = "completed" ->>>>>>> 5e8a37ab505a3c4c12fa2a98348992c427652b61 return values diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml index f392dd4f..857ea7e8 100644 --- a/src/backend/pyproject.toml +++ b/src/backend/pyproject.toml @@ -33,10 +33,7 @@ dependencies = [ "psycopg2>=2.9.9", "pyodm>=1.5.11", "asgiref>=3.8.1", -<<<<<<< HEAD "drone-flightplan>=0.3.1", -======= ->>>>>>> 5e8a37ab505a3c4c12fa2a98348992c427652b61 ] requires-python = ">=3.11" license = {text = "GPL-3.0-only"}