diff --git a/src/app/templates/my_projects.html b/src/app/templates/my_projects.html new file mode 100644 index 0000000..c6d7134 --- /dev/null +++ b/src/app/templates/my_projects.html @@ -0,0 +1,29 @@ +$def with (nav, categories, open_projects) + + + Beelance2 + + + + + + + + $:nav + +

Open Projects:

+ +
+ $for category in categories: +
$category[1]
+
+ +
+ $for project in open_projects: +

$project[3]

$project[4]

+
+ + Honeybee + + + \ No newline at end of file diff --git a/src/app/views/my_projects.py b/src/app/views/my_projects.py new file mode 100644 index 0000000..84360ba --- /dev/null +++ b/src/app/views/my_projects.py @@ -0,0 +1,20 @@ +import web +from views.utils import get_nav_bar +from views.project import Project +from models.project import get_categories, get_projects_by_status_and_category + +# Get html templates +render = web.template.render('templates/') + +class My_projects: + + # Get projects + def GET(self): + session = web.ctx.session + data = web.input(categoryid=0) + open_projects=[] + if data.categoryid != 0: + open_projects = get_projects_by_status_and_category(data.categoryid, "open") + nav = get_nav_bar(session) + categories = get_categories() + return render.my_projects(nav, categories, open_projects) diff --git a/src/app/views/project.py b/src/app/views/project.py index 9634a98..132bc19 100644 --- a/src/app/views/project.py +++ b/src/app/views/project.py @@ -22,25 +22,22 @@ class Project: data = web.input() session = web.ctx.session nav = get_nav_bar(session) - print(data) - task_count = self.get_task_count(data) try: if data["Add Task"]: - print("tiss") - project_form = self.compose_form(task_count, data, True) + project_form = self.compose_form(data, True) return render.project(nav, project_form) except Exception as e: try: if data["Remove Task"]: - print("ass") - project_form = self.compose_form(task_count, data, False) + project_form = self.compose_form(data, False) return render.project(nav, project_form) else: pass except Exception as e: try: if data["Create Project"]: + print("Create") pass else: pass @@ -53,26 +50,35 @@ class Project: def get_task_count(self, data): task_count = 0 - while True: + print(len(data)) + task_count = int((len(data) - 4) / 3) + """while True: try: if data["task_title_"+str(task_count)] or data["task_description_"+str(task_count)] or data["task_budget_"+str(task_count)]: task_count += 1 except Exception as e: pass - break + break""" return task_count - def compose_form(self, task_count, data, add): + def compose_form(self, data, add): + task_count = self.get_task_count(data) + # A task is either added or removed + print("init count", task_count) + if not add and task_count >= 1: + task_count -= 1 + + print("modded", task_count) + project_form_elements = get_project_form_elements(data.project_title, data.project_description, data.category_name) task_form_elements = () old_task_form_element = () - print(task_count) + for i in range(0, task_count): - print("i: ", i) + print(i, data) old_task_form_element = get_task_form_elements(i, data["task_title_"+str(i)], data["task_description_"+str(i)], data["budget_"+str(i)]) task_form_elements = (task_form_elements + old_task_form_element) - print(len(task_form_elements)) if add: new_task_form_elements = get_task_form_elements(task_count)