Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions application.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ def index():
graph = build_graph(graph_name, results, topics)
graph_str = get_graph_string(graph)
interests_links = get_interests_links()
return render_template('graph.html', name=graph_name, node_count=len(graph.nodes()), graph=graph_str, interests=interests_links)

return render_template('graph.html', name=graph_name, node_count=len(graph.nodes()), graph=graph_str, interests=interests_links, skills=get_skills())


def get_interests_links():
Expand All @@ -250,7 +251,7 @@ def get_interests_links():
def show_person(name=None):
if not name:
interests_links = get_interests_links()
return render_template('notfound.html', interests=interests_links)
return render_template('notfound.html', interests=interests_links, skills=get_skills())

graph_name = name.replace('_', ' ') + "'s skills"

Expand All @@ -263,10 +264,10 @@ def show_person(name=None):
if graph is False:
pname=name
interests_links = get_interests_links()
return render_template('notfound.html', search_term=pname, interests=interests_links)
return render_template('notfound.html', search_term=pname, interests=interests_links, skills=get_skills())
graph_str = get_graph_string(graph)

return render_template('graph.html', name=graph_name, node_count=len(graph.nodes()), graph=graph_str)
return render_template('graph.html', name=graph_name, node_count=len(graph.nodes()), graph=graph_str, skills=get_skills())


@app.route('/topic/<name>')
Expand Down Expand Up @@ -294,13 +295,13 @@ def show_topic(name):

graph = build_graph(graph_name, results, topics)
graph_str = get_graph_string(graph)
return render_template('graph.html', name=graph_name, node_count=len(graph.nodes()), graph=graph_str, interests=interests_links)
return render_template('graph.html', name=graph_name, node_count=len(graph.nodes()), graph=graph_str, interests=interests_links, skills=get_skills())

# 2019-04-08 | New : Try to handle empty search
@app.route('/topic/')
def show_topic_notfound():
interests_links = get_interests_links()
return render_template('notfound.html', interests=interests_links)
return render_template('notfound.html', interests=interests_links, skills=get_skills())

@app.route('/topic-search')
def topic_search():
Expand Down
7 changes: 6 additions & 1 deletion templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@
<body>
<img src="{{ url_for('static', filename='images/uom-logo.png') }}" width="150" height="64">
<form name="topic_keyword" action="{{ url_for('topic_search') }}" method="get">
<input type="text" name="topic" size="50">
<input type="text" name="topic"size="50" list="skills" placeholder="Enter topic">
<datalist id="skills">
{% for skill in skills %}
<option value="{{ skill }}">{{ skill }}</option>
{% endfor %}
</datalist>
<input type="submit" value="Search Topics">
</form>
{% block content %}{% endblock %}
Expand Down