Auto stash before merge of "master" and "origin/master"

mattstibbs · Jul 16, 2017 · 5032bb0 · 5032bb0
1 parent 87b1c7e
commit 5032bb0
Show file tree

Hide file tree

Showing 10 changed files with 654 additions and 2 deletions.
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/nhshd-service-api.iml b/.idea/nhshd-service-api.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Pipfile b/Pipfile
@@ -3,8 +3,8 @@ url = "https://pypi.python.org/simple"
 verify_ssl = true
 
 [packages]
-flask = "*"
 requests = "*"
 untangle = "*"
-flask-cors = "*"
 gunicorn = "*"
+Flask = "*"
+Flask-Cors = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/app.py b/app.py
@@ -103,6 +103,13 @@ def display_thankyou():
 def display_onlinereg():
     return render_template('onlinereg.html')
 
+
+@app.route('/feedback/<service_id>')
+def show_feedback(service_id):
+    response = get_choices_service(service_id)
+    return render_template('ratings.html',
+                           name=response['name'])
+
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=int(os.getenv('PORT', 5000)), debug=True)
 
diff --git a/templates/ratings.html b/templates/ratings.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.4.3/css/bulma.css">
+  <script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js'></script>
+  <link rel="stylesheet" href="style.css">
+  <meta charset="UTF-8">
+  <title>Feedback</title>
+</head>
+
+<body>
+  <div class='container has-text-centered'>
+
+    <div class='hero'>
+      <div class="hero-body">
+        <img src="http://nhshackday.com/assets/images/nhshd/header-logo2.png">
+      </div>
+    </div>
+    <div class='container'>
+      <h1 class='title'>NHS feedback</h1>
+
+      <p>How would you rate your service at {{name}} today?</p>
+
+      <div class='icons'>
+        <span class='icon is-large' id="1">
+<i class = 'fa fa-star' onclick="fa fa-star"></i>
+</span>
+
+        <span class='icon is-large' id="2">
+<i class = 'fa fa-star'></i>
+</span>
+
+        <span class='icon is-large' id="3">
+<i class = 'fa fa-star'></i>
+</span>
+
+        <span class='icon is-large' id="4">
+<i class = 'fa fa-star'></i>
+</span>
+
+        <span class='icon is-large' id="5">
+<i class = 'fa fa-star'></i>
+</span>
+      </div>
+
+      <button class='button is-primary' onclick=submit()>Submit</button>
+    </div>
+  </div>
+</body>
+
+</html>