Compare commits

..

3 Commits

Author SHA1 Message Date
elpatron68
08705ae44e Rename var 2024-05-27 13:27:31 +02:00
elpatron68
a57c5fa837 Add link 2024-05-27 13:20:11 +02:00
elpatron68
7a0be8aa61 Add tooltips 2024-05-27 13:16:18 +02:00
2 changed files with 25 additions and 20 deletions

16
app.py
View File

@@ -6,19 +6,19 @@ from flask_bootstrap import Bootstrap
app = Flask(__name__) app = Flask(__name__)
app.config['SECRET_KEY'] = 'j69ol5mcHLsEtLg4Y/+myd9wWD4pp56E' app.config['SECRET_KEY'] = 'j69ol5mcHLsEtLg4Y/+myd9wWD4pp56E'
# set up logging # setup logging
formatter = logging.Formatter( # pylint: disable=invalid-name formatter = logging.Formatter(
'%(asctime)s %(levelname)s %(process)d ---- %(threadName)s ' '%(asctime)s %(levelname)s %(process)d ---- %(threadName)s '
'%(module)s : %(funcName)s {%(pathname)s:%(lineno)d} %(message)s','%Y-%m-%dT%H:%M:%SZ') '%(module)s : %(funcName)s {%(pathname)s:%(lineno)d} %(message)s','%Y-%m-%dT%H:%M:%SZ')
handler = logging.StreamHandler() handler = logging.StreamHandler()
handler.setFormatter(formatter) handler.setFormatter(formatter)
app.logger.setLevel(logging.DEBUG) app.logger.setLevel(logging.DEBUG)
app.logger.addHandler(handler) app.logger.addHandler(handler)
app.logger.info('Starting erdbeerhannah v1.0.4') app.logger.info('Starting erdbeerhannah v1.0.5')
Bootstrap(app) Bootstrap(app)
requestcounter = 0 postcounter = 0
gesamtwert = 0 gesamtwert = 0
change = 0 change = 0
givenfloat = 0 givenfloat = 0
@@ -32,11 +32,11 @@ item6 = 0
@app.route("/", methods=["GET", "POST"]) @app.route("/", methods=["GET", "POST"])
def index(): def index():
global gesamtwert, item1, item2, item3, item4, item5, item6, sum, givenfloat, change, given, background, requestcounter global gesamtwert, item1, item2, item3, item4, item5, item6, sum, givenfloat, change, given, background, postcounter
background = "bg-white" background = "bg-white"
if request.method == "POST": if request.method == "POST":
requestcounter += 1 postcounter += 1
# wert = float(request.form["wert"]) # wert = float(request.form["wert"])
wert = request.form.get('wert', "0", type=float) wert = request.form.get('wert', "0", type=float)
given = request.form.get('given', "0", type=float) given = request.form.get('given', "0", type=float)
@@ -101,7 +101,7 @@ def index():
session['given'] = givenfloat session['given'] = givenfloat
app.logger.info('*** sum %s, given %s, change %s', sum, givenfloat, change) app.logger.info('*** sum %s, given %s, change %s', sum, givenfloat, change)
app.logger.info('*** requestcounter %s', requestcounter) app.logger.info('*** postcounter %s', postcounter)
return render_template("index.html", gesamtwert=session.get('summestring', 0), return render_template("index.html", gesamtwert=session.get('summestring', 0),
change=session.get('change', 0), change=session.get('change', 0),
@@ -126,4 +126,4 @@ def favicon():
# 'about.html') # 'about.html')
if __name__ == "__main__": if __name__ == "__main__":
app.run(debug=True, host='0.0.0.0') app.run(debug=True, host='127.0.0.1')

View File

@@ -73,40 +73,45 @@
} }
</style> </style>
</head> </head>
<script>
$(document).ready(function(){
$('[data-toggle="tooltip"]').tooltip();
});
</script>
<body> <body>
<div class="container-fluid table-container"> <div class="container-fluid table-container">
<table class="table table-bordered"> <table class="table table-bordered">
<form method="post"> <form method="post">
<tbody> <tbody>
<tr class="bold-row"> <tr class="bold-row">
<td colspan="3">Erdbeerkasse 🍓💶</td> <td colspan="3">erdbeerkasse 🍓💶</td>
</tr> </tr>
<tr> <tr>
<td><button type="submit" name="wert" value="5.8" class="btn btn-xl btn-primary custom-btn-size">🍓 5,80€ ({{ item1 }})</button></td> <td><button type="submit" name="wert" value="5.8" data-toggle="tooltip" data-placement="top" title="500g Erdbeeren" class="btn btn-xl btn-primary custom-btn-size">🍓 5,80€ ({{ item1 }})</button></td>
<td><button type="submit" name="wert" value="4.8" class="btn btn-xl btn-danger custom-btn-size">🫙🫙 4,80€ ({{ item2 }})</button></td> <td><button type="submit" name="wert" value="4.8" data-toggle="tooltip" data-placement="top" title="Marmelade groß" class="btn btn-xl btn-danger custom-btn-size">🫙🫙 4,80€ ({{ item2 }})</button></td>
<td><button type="submit" name="wert" value="3.3" class="btn btn-xl btn-danger custom-btn-size">🫙 3,30€ ({{ item3 }})</button></td> <td><button type="submit" name="wert" value="3.3" data-toggle="tooltip" data-placement="top" title="Marmelade klein" class="btn btn-xl btn-danger custom-btn-size">🫙 3,30€ ({{ item3 }})</button></td>
</tr> </tr>
<tr> <tr>
<td><button type="submit" name="wert" value="8.8" class="btn btn-xl btn-warning custom-btn-size">🧃🧃 8,80€ ({{ item4 }})</button></td> <td><button type="submit" name="wert" value="8.8" data-toggle="tooltip" data-placement="top" title="Saft 5l" class="btn btn-xl btn-warning custom-btn-size">🧃🧃 8,80€ ({{ item4 }})</button></td>
<td><button type="submit" name="wert" value="5.5" class="btn btn-xl btn-warning custom-btn-size">🧃 5,50€ ({{ item5 }})</button></td> <td><button type="submit" name="wert" value="5.5" data-toggle="tooltip" data-placement="top" title="Saft 3l" class="btn btn-xl btn-warning custom-btn-size">🧃 5,50€ ({{ item5 }})</button></td>
<td><button type="submit" name="wert" value="0.2" class="btn btn-xl btn-success custom-btn-size">🛍️ 0,20€ ({{ item6 }})</button></td> <td><button type="submit" name="wert" value="0.2" data-toggle="tooltip" data-placement="top" title="Tragetasche" class="btn btn-xl btn-success custom-btn-size">🛍️ 0,20€ ({{ item6 }})</button></td>
</tr> </tr>
<tr> <tr>
<td class="bold-row">🫰 {{ gesamtwert }}€</td> <td data-toggle="tooltip" data-placement="top" title="Summe" class="bold-row">🫰 {{ gesamtwert }}€</td>
<td> <td>
<div class="input-container"> <div class="input-container">
<input type="text" class="form-control" name="given" placeholder="{{ given }}"> <input type="text" class="form-control" name="given" placeholder="{{ given }}">
<button type="submit" name="wert" value="-2" class="btn btn-xl btn-primary custom-btn-size-med">🧾</button> <button type="submit" name="wert" value="-2" data-toggle="tooltip" data-placement="top" title="Wechselgeld berechnen" class="btn btn-xl btn-primary custom-btn-size-med">🧾</button>
</div> </div>
</td> </td>
<td class="bold-row {{ background }}">🪙 {{ change }}€</td> <td data-toggle="tooltip" data-placement="top" title="Wechselgeld" class="bold-row {{ background }}">🪙 {{ change }}€</td>
</tr> </tr>
<tr> <tr>
<td colspan="3"><button type="submit" name="wert" value="0" id="reset" class="btn btn-xl btn-dark custom-btn-size">Reset 🦭</button></td> <td colspan="3"><button type="submit" name="wert" value="0" id="reset" class="btn btn-xl btn-dark custom-btn-size">Reset 🦭</button></td>
</tr> </tr>
<tr> <tr>
<td colspan="3">Made with ♥️, marmalade and zero knowledge in Kiel Strawberry City.<br> <td colspan="3">Made with ♥️, marmalade and zero knowledge in <a href="https://kiel-sailing-city.de/" target="_blank">Kiel Strawberry City.</a><br>
Version: 1.0.4/2024-05-27<br> Version: 1.0.5/2024-05-27<br>
<a href="https://gitea.elpatron.me/elpatron/erdbeerhannah/src/branch/main/README.md" target="_blank">Weitere Infos</a></td> <a href="https://gitea.elpatron.me/elpatron/erdbeerhannah/src/branch/main/README.md" target="_blank">Weitere Infos</a></td>
</tr> </tr>
</tbody> </tbody>