From 38c60734a8c3f2a218f6423a63e914f5aa59e618 Mon Sep 17 00:00:00 2001 From: jakobsn Date: Fri, 29 Nov 2019 12:02:15 +0100 Subject: [PATCH] checkpoint --- src/app/templates/new_project.html | 18 ++++++++++++++++-- src/app/views/forms.py | 6 ++++-- src/app/views/new_project.py | 16 ++++++++-------- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/app/templates/new_project.html b/src/app/templates/new_project.html index c3609a2..70a72ae 100644 --- a/src/app/templates/new_project.html +++ b/src/app/templates/new_project.html @@ -1,4 +1,4 @@ -$def with (nav, project_form, messasge) +$def with (nav, project_form, project_buttons, messasge) Beelance2 @@ -14,7 +14,21 @@ $def with (nav, project_form, messasge)

Add project!

- $:project_form.render() +
+ $:project_form.render() +
+ +
+
+ $:project_buttons.add_task.render() + $:project_buttons.remove_task.render() +
+
+ $:project_buttons.add_user.render() + $:project_buttons.remove_user.render() +
+
+ $:project_buttons.create_project.render()

$messasge

diff --git a/src/app/views/forms.py b/src/app/views/forms.py index 513df15..852d85e 100644 --- a/src/app/views/forms.py +++ b/src/app/views/forms.py @@ -86,13 +86,15 @@ def get_new_project_form(elements): :param elemets: All the project and task form elements :return: The ready to use project form """ - return form.Form(*elements, + return form.Form(*elements) + +project_buttons = form.Form( form.Button("add_user", type="submit", description="Add User", value="add_user", html="Add User"), form.Button("remove_user", type="submit", description="Remove User", value="remove_user", html="Remove User"), form.Button("add_task", type="submit", description="Add Task", value="add_task", html="Add Task"), form.Button("remove_task", type="submit", description="Remove Task ", value="remove_task", html="Remove Task"), form.Button("create_project", type="submit", description="Create Project", value="create_project", html="Create Project") - ) +) def get_apply_form(elements): try: diff --git a/src/app/views/new_project.py b/src/app/views/new_project.py index 78f2d4c..149e506 100644 --- a/src/app/views/new_project.py +++ b/src/app/views/new_project.py @@ -1,5 +1,5 @@ import web -from views.forms import get_task_form_elements, get_new_project_form, get_project_form_elements, get_user_form_elements +from views.forms import get_task_form_elements, get_new_project_form, get_project_form_elements, get_user_form_elements, project_buttons import models.project import models.login from views.utils import get_nav_bar @@ -21,7 +21,7 @@ class New_project: task_form_elements = get_task_form_elements() user_form_elements = get_user_form_elements() project_form = get_new_project_form((project_form_elements + task_form_elements + user_form_elements)) - return render.new_project(nav, project_form, "") + return render.new_project(nav, project_form, project_buttons, "") def POST(self): """ @@ -39,27 +39,27 @@ class New_project: # Add a set of task fields to the form if data.add_task: project_form = self.compose_form(data, "add_task") - return render.new_project(nav, project_form, "") + return render.new_project(nav, project_form, project_buttons, "") # Remove a set of task fields from the form if data.remove_task: project_form = self.compose_form(data, "remove_task") - return render.new_project(nav, project_form, "") + return render.new_project(nav, project_form, project_buttons, "") if data.add_user: project_form = self.compose_form(data, "add_user") - return render.new_project(nav, project_form, "") + return render.new_project(nav, project_form, project_buttons, "") if data.remove_user: project_form = self.compose_form(data, "remove_user") - return render.new_project(nav, project_form, "") + return render.new_project(nav, project_form, project_buttons, "") # Post the form data and save the project in the database if data.create_project: project_form = self.compose_form(data, None) if not project_form.validates(): - return render.new_project(nav, project_form, "") + return render.new_project(nav, project_form, project_buttons, "") task_count = get_task_count(data) user_count = get_user_count(data) @@ -72,7 +72,7 @@ class New_project: # Validate the input user names for i in range(0, user_count): if len(data["user_name_"+str(i)]) and not models.login.get_user_id_by_name(data["user_name_"+str(i)]): - return render.register(nav, project_form, "Invalid user: " + data["user_name_"+str(i)]) + return render.register(nav, project_form, project_buttons, "Invalid user: " + data["user_name_"+str(i)]) # Save the project to the database projectid = models.project.set_project(data.category_name, str(session.userid),