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

Add and remove tasks in project in frontend

https
jakobsn 6 years ago
parent
fd9b18cee6
commit
bde66701a1
3 changed files with 67 additions and 12 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +29
    -0
      src/app/templates/my_projects.html
  2. +20
    -0
      src/app/views/my_projects.py
  3. +18
    -12
      src/app/views/project.py

+ 29
- 0
src/app/templates/my_projects.html View File

@@ -0,0 +1,29 @@
$def with (nav, categories, open_projects)

<head>
<title>Beelance2</title>
<meta charset="utf-8">
<link rel="stylesheet" type="text/css" href="static/stylesheet.css">
<link rel="shortcut icon" type="image/png" href="static/honeybee.png"/>
</head>

<body>

$:nav
<h1 class="title">Open Projects:</h1>
<div class="categories">
$for category in categories:
<div class="category" onclick="location.href='/?categoryid=$category[0]'">$category[1]</div>
</div>

<div class="projects">
$for project in open_projects:
<div class="project"><h4>$project[3]</h4><p>$project[4]</p></div>
</div>

<img src="static/honeybee.png" alt="Honeybee">


</body>

+ 20
- 0
src/app/views/my_projects.py View File

@@ -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)

+ 18
- 12
src/app/views/project.py View File

@@ -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)


Write Preview
Loading…
Cancel
Save