Merge with master.

app/main/views/add_service.py

@@ -1,4 +1,4 @@
-from flask import render_template, jsonify, redirect, session, url_for
+from flask import request, render_template, jsonify, redirect, session, url_for, abort
 from flask_login import login_required
 from app.main import main
 from app.main.dao import services_dao, users_dao
@@ -8,11 +8,19 @@ from app.main.forms import AddServiceForm
 @main.route("/add-service", methods=['GET', 'POST'])
 @login_required
 def add_service():
-    # TODO fix up this
     form = AddServiceForm(services_dao.find_all_service_names)
+    services = services_dao.get_services()
+    if len(services) > 0:
+        heading = 'Set up notifications for your service'
+    else:
+        heading = 'Add a new service'
     if form.validate_on_submit():
         user = users_dao.get_user_by_id(session['user_id'])
         service_id = services_dao.insert_new_service(form.name.data, user)
         return redirect(url_for('main.service_dashboard', service_id=service_id))
     else:
-        return render_template('views/add-service.html', form=form)
+        return render_template(
+            'views/add-service.html',
+            form=form,
+            heading=heading
+        )