From ead590f4181b3ef17350065c77447669a99de5c9 Mon Sep 17 00:00:00 2001
From: jakobsn <jakob_sn_@hotmail.com>
Date: Wed, 13 Nov 2019 14:49:17 +0100
Subject: [PATCH] remove user field

---
 src/app/views/forms.py       |  1 +
 src/app/views/new_project.py | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/views/forms.py b/src/app/views/forms.py
index 4c88ec1..19bf409 100644
--- a/src/app/views/forms.py
+++ b/src/app/views/forms.py
@@ -82,6 +82,7 @@ def get_new_project_form(elements):
     """
     return form.Form(*elements, 
     form.Button("Add User", type="submit", description="Add User", value="add_user"),
+    form.Button("Remove User", type="submit", description="Remove User", value="remove_user"),
     form.Button("Add Task", type="submit", description="Add Task", value="add_task"),
     form.Button("Remove Task", type="submit", description="Remove Task ", value="remove_task"),
     form.Button("Create Project", type="submit", description="Create Project", value="create_project")
diff --git a/src/app/views/new_project.py b/src/app/views/new_project.py
index cf17cd1..910984a 100644
--- a/src/app/views/new_project.py
+++ b/src/app/views/new_project.py
@@ -65,8 +65,13 @@ class New_project:
                             project_form = self.compose_form(data, "add_user")
                             return render.new_project(nav, project_form)     
                     except Exception as e:
-                        raise e
-
+                        try:
+                            if data["Remove User"]:
+                                project_form = self.compose_form(data, "remove_user")
+                                return render.new_project(nav, project_form)    
+                        except Exception as e:
+                            raise e        
+                        
     def get_task_count(self, data):
         """
         Determine the number of tasks created by removing 
@@ -109,7 +114,7 @@ class New_project:
         task_count = self.get_task_count(data)
         user_count = self.get_user_count(data)
         print(user_count)
-        if operation == "remove_task" and task_count >= 1:
+        if operation == "remove_task" and task_count > 1:
             task_count -= 1
 
         if operation == "remove_user" and user_count >=1:
@@ -159,6 +164,6 @@ class New_project:
             project_form = get_new_project_form((project_form_elements + task_form_elements + user_form_elements + new_user_form_elements))
             return project_form
 
-        project_form = get_new_project_form((project_form_elements + task_form_elements))
+        project_form = get_new_project_form((project_form_elements + task_form_elements + user_form_elements))
         return project_form