sindre
/
Beelance
Watch 1
Star 0
Fork 0
Code Issues 6 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

checkpoint

https
jakobsn 6 years ago
parent
79caa8f23b
commit
38c60734a8
3 changed files with 28 additions and 12 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +16
    -2
      src/app/templates/new_project.html
  2. +4
    -2
      src/app/views/forms.py
  3. +8
    -8
      src/app/views/new_project.py

+ 16
- 2
src/app/templates/new_project.html View File

@@ -1,4 +1,4 @@
$def with (nav, project_form, messasge)
$def with (nav, project_form, project_buttons, messasge)


<head> <head>
<title>Beelance2</title> <title>Beelance2</title>
@@ -14,7 +14,21 @@ $def with (nav, project_form, messasge)


<h2>Add project!</h2> <h2>Add project!</h2>
<form method="POST"> <form method="POST">
$:project_form.render()
<div>
$:project_form.render()
</div>

<div>
<div>
$:project_buttons.add_task.render()
$:project_buttons.remove_task.render()
</div>
<div>
$:project_buttons.add_user.render()
$:project_buttons.remove_user.render()
</div>
</div>
$:project_buttons.create_project.render()
</form> </form>


<p>$messasge</p> <p>$messasge</p>


+ 4
- 2
src/app/views/forms.py View File

@@ -86,13 +86,15 @@ def get_new_project_form(elements):
:param elemets: All the project and task form elements :param elemets: All the project and task form elements
:return: The ready to use project form :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("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("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("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("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") form.Button("create_project", type="submit", description="Create Project", value="create_project", html="Create Project")
)
)


def get_apply_form(elements): def get_apply_form(elements):
try: try:


+ 8
- 8
src/app/views/new_project.py View File

@@ -1,5 +1,5 @@
import web 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.project
import models.login import models.login
from views.utils import get_nav_bar from views.utils import get_nav_bar
@@ -21,7 +21,7 @@ class New_project:
task_form_elements = get_task_form_elements() task_form_elements = get_task_form_elements()
user_form_elements = get_user_form_elements() user_form_elements = get_user_form_elements()
project_form = get_new_project_form((project_form_elements + task_form_elements + 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): def POST(self):
""" """
@@ -39,27 +39,27 @@ class New_project:
# Add a set of task fields to the form # Add a set of task fields to the form
if data.add_task: if data.add_task:
project_form = self.compose_form(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 # Remove a set of task fields from the form
if data.remove_task: if data.remove_task:
project_form = self.compose_form(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: if data.add_user:
project_form = self.compose_form(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: if data.remove_user:
project_form = self.compose_form(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 # Post the form data and save the project in the database
if data.create_project: if data.create_project:
project_form = self.compose_form(data, None) project_form = self.compose_form(data, None)
if not project_form.validates(): 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) task_count = get_task_count(data)
user_count = get_user_count(data) user_count = get_user_count(data)
@@ -72,7 +72,7 @@ class New_project:
# Validate the input user names # Validate the input user names
for i in range(0, user_count): 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)]): 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 # Save the project to the database
projectid = models.project.set_project(data.category_name, str(session.userid), projectid = models.project.set_project(data.category_name, str(session.userid),


Write Preview
Loading…
Cancel
Save