X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=income_progress_bars.py;h=1ecd8b9a14452b0bc352084ef98ca7f4a8955140;hb=3edadb6c0b977d0362ca8344303b3260184bebae;hp=48b1179430326ec4ea1c26ef29a0801b30974fa2;hpb=739e107240a6594839fbd349b972694527589434;p=misc

diff --git a/income_progress_bars.py b/income_progress_bars.py
index 48b1179..1ecd8b9 100644
--- a/income_progress_bars.py
+++ b/income_progress_bars.py
@@ -1,10 +1,9 @@
-# Python 3 server example
 from http.server import BaseHTTPRequestHandler, HTTPServer
 import os
 import json
 
 hostName = "localhost"
-serverPort = 8080
+serverPort = 8081
 
 header = """<html>
 <meta charset="UTF-8">
@@ -26,6 +25,9 @@ td, th {
   background-color: black;
   border: none;
 }
+.surplusbar {
+  width: 200px;
+}
 .time_progress {
   position: absolute;
   height: 20px;
@@ -213,14 +215,18 @@ class MyServer(BaseHTTPRequestHandler):
             success_income_cut = min(success_income, 1.0) 
             success_income_bonus = max(success_income - 1.0, 0) 
             success = success_income + 0
-            diff_goal = earned - goal 
+            diff_goal = "%.2fâ¬" % (earned - goal)
+            if title != "workday":
+                diff_goal += "(%.2fâ¬)" % (earned - (goal * time_progress))
             if time_progress >= 0:
-                success = success_income / time_progress
+                success = 1
+                if time_progress > 0:
+                    success = success_income / time_progress
                 time_progress_indicator = "<div class=\"time_progress\" style=\"margin-left: %spx\"></div>" % int(time_progress * 100) 
             return "<tr><th>%s</th>" \
                     "<td class=\"countable\">%.2fâ¬</td>" \
                     "<td class=\"progressbar\">%s<div class=\"progress\" style=\"background-color: %s; width: %s\"></div></td>" \
-                    "<td class=\"progressbar\"><div class=\"diff_goal\">%.2fâ¬</div><div class=\"progress surplus\" style=\"width: %s\"></div></td></tr>" % (
+                    "<td class=\"progressbar surplusbar\"><div class=\"diff_goal\">%s</div><div class=\"progress surplus\" style=\"width: %s\"></div></td></tr>" % (
                     title, earned, time_progress_indicator, success_color(success), int(success_income_cut * 100), diff_goal, int(success_income_bonus * 100))
         day_income = (db["workday_minutes_worked_1"] / 60.0) * db["workday_hourly_rate_1"] 
         day_income += (db["workday_minutes_worked_2"] / 60.0) * db["workday_hourly_rate_2"] 
@@ -251,7 +257,7 @@ class MyServer(BaseHTTPRequestHandler):
 
 if __name__ == "__main__":        
     webServer = HTTPServer((hostName, serverPort), MyServer)
-    print("Server started http://%s:%s" % (hostName, serverPort))
+    print(f"Server started http://{hostName}:{serverPort}")
     try:
         webServer.serve_forever()
     except KeyboardInterrupt:
