v0.2.1 adding remaining info to swapping.html

RPi.py

@@ -0,0 +1,4 @@
+class GPIO:
+
+    def output(a,b):
+        pass

app.py

@@ -74,8 +74,8 @@
 bar.drinks[3].create_version(shortname='single', ingredients=[bar.ingredients[5], bar.ingredients[6]], proportions=[30,70], glassize=200)
 
 bar.save_config('config')
-
 '''
+
 '''BARTENDER2 SECTION END'''
 
 bar = reload_config('config')
@@ -349,19 +349,27 @@ def submitDeleteVersion():
 
 @app.route("/swapping")
 def swapView(toast=""):
+    if request.method == 'GET':
+        toast = request.args.get('toast')
     return render_template('/swapping.html', toast=toast, ingredients=bar.ingredients)
 
-@app.route("/tools/swap", methods=['POST'])
+@app.route("/tools/swap", methods=['GET','POST'])
 def swapAction():
     try:
-        iding = request.form.get('iding')
+        iding = "";
+        if request.method == 'POST':
+            iding = request.form.get('iding')
+        else:
+            iding = request.args.get('iding')
 
         if iding == "":
             raise Exception()
+
         iding = int(iding)
 
         bar.ingredients[iding].swapBottle()
         bar.save_config('config')
+        return redirect(url_for('swapView', toast='Bottle refilled.'))
         return swapView('Bottle refilled.')
     except:
         return swapView('Something went wrong..')
@@ -414,6 +422,7 @@ def startChrome():
     driver.get("http://127.0.0.1:5000")
 
 if __name__ == "__main__":
-    t = Thread(target=startChrome
+    t = Thread(target=startChrome)
     t.start()
     app.run(debug=False)
+    #app.run(host='192.168.0.77', port=5000, debug=False)

bar.py

@@ -1,6 +1,7 @@
 import time
 import sys
-import RPi.GPIO as GPIO
+#import RPi.GPIO as GPIO
+from RPi import GPIO
 import json
 from threading import Thread
 import traceback

templates/swapping.html

@@ -2,9 +2,9 @@
 
 {% block content %}
 
-<div class="container" id="detailView">
+<div class="container">
 	  <div class="row">
-		  <div class="col s12">
+		  <div class="col s12">{#
 			  <div class="row">
                   <h3 class="header">Swap bottle</h3>
                   <form action="/tools/swap" enctype="multipart/form-data" method="post">
@@ -25,18 +25,57 @@ <h3 class="header">Swap bottle</h3>
 
 			  </div>
 		  </div>
-
+#}
   		</div>
+
+        <div class="row">
+            <div class="col s12">
+                <h3 class="header">Swap bottle</h3>
+            </div>
+            <div class="collection">
+                {% for ingredient in ingredients %}
+                <a href="#modal{{ loop.index }}" class="collection-item black-text modal-trigger">
+                    <span class="badge">
+                        <div class="progress">
+                            <div id="makeprogress" class="determinate black" style="width: {{ ingredient.remaining / ingredient.bottlesize * 100 }}%"></div>
+                        </div>
+                    </span>
+                    <span class="badge">
+                        {{ ingredient.remaining|round|int }} ml of {{ ingredient.bottlesize|round|int }} ml left
+                    </span>
+
+                {{ ingredient.name }}
+                </a>
+                {% endfor %}
+            </div>
+        </div>
+  </div>
+
+    <!-- Modal Structure -->
+    {% for ingredient in ingredients %}
+  <div id="modal{{ loop.index }}" class="modal">
+    <div class="modal-content">
+      <h4>Swap {{ ingredient.name }}</h4>
+      <p>Do you want to swap {{ ingredient.name }}?</p>
+    </div>
+    <div class="modal-footer">
+      <a href="#!" class="modal-close waves-effect waves-green btn-flat">Dismiss</a>
+      <a href="tools/swap?iding={{ loop.index-1 }}" class="modal-close waves-effect waves-green btn-flat">Swap bottle</a>
+    </div>
   </div>
+    {% endfor %}
 
 {% endblock content%}
 
 {% block scripts%}
 <script>
 
     $(document).ready(function(){
-        var toast = '{{toast}}';
-        if (toast) M.toast({html: toast});
+        $('.modal').modal();
+        let toast = '{{toast}}';
+        if (toast){
+            if(toast != "None") M.toast({html: toast});
+        }
     $('select').formSelect();
   });