forked from Decentrala/taskmanager
add project page
This commit is contained in:
parent
52866f9c84
commit
d81ff0592e
@ -8,20 +8,48 @@ def index():
|
|||||||
tasks = Task.query.all()
|
tasks = Task.query.all()
|
||||||
return render_template('index.html', tasks = tasks)
|
return render_template('index.html', tasks = tasks)
|
||||||
|
|
||||||
@app.route('/submit', methods=['POST', 'GET'])
|
@app.route('/register', methods=['POST', 'GET'])
|
||||||
def submit():
|
def register():
|
||||||
if request.method == 'GET':
|
if request.method == 'GET':
|
||||||
return render_template('submit.html')
|
return render_template('register.html')
|
||||||
elif request.method == 'POST':
|
elif request.method == 'POST':
|
||||||
userinput1 = request.form['forminput1']
|
username = request.form['username']
|
||||||
userinput2 = request.form['forminput2']
|
contact = request.form['contact']
|
||||||
sqlrow = Table(variable1 = int(userinput1), variable2 = int(userinput2))
|
sqladduser = User(username = username, contact = contact)
|
||||||
try:
|
try:
|
||||||
db.session.add(sqlrow)
|
db.session.add(sqladduser)
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
return 'Row added'
|
return 'User added'
|
||||||
except:
|
except:
|
||||||
return 'Adding row to table failed'
|
return 'Adding user failed'
|
||||||
|
|
||||||
else:
|
else:
|
||||||
return 'HTTP request method not recogniezed'
|
return 'HTTP request method not recogniezed'
|
||||||
|
|
||||||
|
|
||||||
|
@app.route('/projects/<int:task_id>', methods=['GET','POST'])
|
||||||
|
def project(task_id:int):
|
||||||
|
if request.method == 'GET':
|
||||||
|
try:
|
||||||
|
task = Task.query.get(task_id)
|
||||||
|
except:
|
||||||
|
return 'Task not found, bad URL'
|
||||||
|
try:
|
||||||
|
userid = TaskUser.query.filter_by(taskid = task_id).first().userid
|
||||||
|
users = User.query.get(userid).username
|
||||||
|
except:
|
||||||
|
users = "No users added to this task"
|
||||||
|
return render_template("project.html", task = task, users = users)
|
||||||
|
elif request.method == 'POST':
|
||||||
|
username = request.form['username']
|
||||||
|
try:
|
||||||
|
userid = User.query.filter_by(username = username).first().id
|
||||||
|
except:
|
||||||
|
return 'User not found, please <a href="/register">register</a>.'
|
||||||
|
sqladduser = TaskUser(userid = userid, taskid = task_id)
|
||||||
|
try:
|
||||||
|
db.session.add(sqladduser)
|
||||||
|
db.session.commit()
|
||||||
|
return 'User added'
|
||||||
|
except:
|
||||||
|
return 'Adding user failed'
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
<main>
|
<main>
|
||||||
<section>
|
<section>
|
||||||
{% for task in tasks %}
|
{% for task in tasks %}
|
||||||
<li>{{task}}</li>
|
<li><a href="/projects/{{task.id}}"> {{task.name}} </a></li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
|
29
taskmanager/templates/project.html
Normal file
29
taskmanager/templates/project.html
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Decentrala</title>
|
||||||
|
<link rel="stylesheet" href="/static/style.css">
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<header>
|
||||||
|
</header>
|
||||||
|
<main>
|
||||||
|
<section>
|
||||||
|
<li>{{task.name}}</li>
|
||||||
|
<li>{{task.desc}}</li>
|
||||||
|
<li>{{users}}</li>
|
||||||
|
</section>
|
||||||
|
<h1> Add yourself to task </h1>
|
||||||
|
<form action="/projects/{{task.id}}" method="POST">
|
||||||
|
<label for="username">username</label>
|
||||||
|
<input type="text" name="username" id="username" required>
|
||||||
|
<button> Submit </button>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
</main>
|
||||||
|
<footer>
|
||||||
|
</footer>
|
||||||
|
</body>
|
||||||
|
</html>
|
@ -1,20 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<title>Submit</title>
|
|
||||||
<link rel="stylesheet" href="/static/style.css">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<main>
|
|
||||||
<form action="/submit" method="POST">
|
|
||||||
<label for="forminput1">forminput1</label>
|
|
||||||
<input type="text" name="forminput1" id="forminput1" required>
|
|
||||||
<label for="forminput2">forminput2</label>
|
|
||||||
<input type="text" name="forminput2" id="forminput2" required>
|
|
||||||
<button> Submit </button>
|
|
||||||
</form>
|
|
||||||
</main>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
Loading…
Reference in New Issue
Block a user