Update app.py

app.py

@@ -8,7 +8,7 @@ def process_cal(production,f_t):
     steam = 6
     enthalpy = 494
     hot_drain = 0
-    cold_drain = 0 
+    cold_drain = 0
     heat_water = water*1*(final_temp-intial_temp)
     heat_fabric = production*0.4*(final_temp-intial_temp)
     heat_radition = 10*10*(final_temp-30)*step_time/60
@@ -21,7 +21,8 @@ def process_cal(production,f_t):
       cold_drain = water
 
     return steam_consumption , cold_drain , hot_drain , water
-def dark_shade(production):
+
+def dark_shade_jet(production):
   total_water = 0
   steam_consumption = 0
   hot_drain = 0
@@ -38,9 +39,16 @@ def dark_shade(production):
   cold_drain = int(cold_drain)
   hot_drain = int(hot_drain)
   total_water = cold_drain + hot_drain
+  if production != 0:
+     ssc1 = round(steam_consumption/production,2)
+     swc1 = round(total_water/production,2)
+  else:
+    ssc1 = 0
+    swc1 = 0
     #print(steam,cold,hot,water)
-  return steam_consumption , cold_drain , hot_drain , total_water
-def medium_shade(production):
+  return steam_consumption , cold_drain , hot_drain , total_water, ssc1,swc1
+
+def medium_shade_jet(production):
   total_water = 0
   steam_consumption = 0
   hot_drain = 0
@@ -57,9 +65,16 @@ def medium_shade(production):
   cold_drain = int(cold_drain)
   hot_drain = int(hot_drain)
   total_water = cold_drain + hot_drain
+  if production != 0:
+     ssc2 = round(steam_consumption/production,2)
+     swc2 = round(total_water/production,2)
+  else:
+    ssc2 = 0
+    swc2 = 0
     #print(steam,cold,hot,water)
-  return steam_consumption , cold_drain , hot_drain , total_water
-def white_shade(production):
+  return steam_consumption , cold_drain , hot_drain , total_water , ssc2,swc2
+
+def white_shade_jet(production):
   total_water = 0
   steam_consumption = 0
   hot_drain = 0
@@ -76,9 +91,16 @@ def white_shade(production):
   cold_drain = int(cold_drain)
   hot_drain = int(hot_drain)
   total_water = cold_drain + hot_drain
+  if production != 0:
+     ssc3 = round(steam_consumption/production,2)
+     swc3 = round(total_water/production,2)
+  else:
+    ssc3 = 0
+    swc3 = 0
     #print(steam,cold,hot,water)
-  return steam_consumption , cold_drain , hot_drain , total_water
-def light_shade(production):
+  return steam_consumption , cold_drain , hot_drain , total_water , ssc3,swc3
+
+def light_shade_jet(production):
   total_water = 0
   steam_consumption = 0
   hot_drain = 0
@@ -95,44 +117,51 @@ def light_shade(production):
   cold_drain = int(cold_drain)
   hot_drain = int(hot_drain)
   total_water = cold_drain + hot_drain
+  if production != 0:
+     ssc4 = round(steam_consumption/production,2)
+     swc4 = round(total_water/production,2)
+  else:
+    ssc4 = 0
+    swc4 = 0
     #print(steam,cold,hot,water)
-  return steam_consumption , cold_drain , hot_drain , total_water
+  return steam_consumption , cold_drain , hot_drain , total_water,ssc4,swc4
+
 def jigger(value1, value2, value3, value4):
-  s1,c1,h1,t1 = dark_shade(value1)
-  s2,c2,h2,t2 = medium_shade(value2)
-  s3,c3,h3,t3 = white_shade(value3)
-  s4,c4,h4,t4 = light_shade(value4)
+  s1,c1,h1,t1,ssc1,swc1 = dark_shade_jet(value1)
+  s2,c2,h2,t2,ssc2,swc2 = medium_shade_jet(value2)
+  s3,c3,h3,t3,ssc3,swc3 = white_shade_jet(value3)
+  s4,c4,h4,t4,ssc4,swc4 = light_shade_jet(value4)
   final_steam = s1+s2+s3+s4
   final_cold_drain = c1+c2+c3+c4
   final_hot_drain = h1+h2+h3+h4
   final_total_drain = t1+t2+t3+t4
-  Dark = [s1,c1,h1,t1]
-  Medium = [s2,c2,h2,t2]
-  Light = [s3,c3,h3,t3]
-  White = [s4,c4,h4,t4]
-  Total = [final_steam,final_cold_drain,final_hot_drain,final_total_drain]
-  return [Dark,Medium,Light,White,Total]
-# Create the Gradio interface
+  total_production = value1 + value2 + value3 + value4
+  ssc_final = round(final_steam/total_production,2)
+  swc_final = round(final_total_drain/total_production,2)
+  table_html = f"""
+  <table>
+    <tr><th>Shade</th><th>Steam Consumption</th><th>Cold Drain</th><th>Hot Drain</th><th>Total Water</th><th>SSC</th><th>SWC</th></tr>
+    <tr><th>Dark</th><td>{s1}</td><td>{c1}</td><td>{h1}</td><td>{t1}</td><td>{ssc1}</td><td>{swc1}</td></tr>
+    <tr><th>Medium</th><td>{s2}</td><td>{c2}</td><td>{h2}</td><td>{t2}</td><td>{ssc2}</td><td>{swc2}</td></tr>
+    <tr><th>Light</th><td>{s3}</td><td>{c3}</td><td>{h3}</td><td>{t3}</td><td>{ssc3}</td><td>{swc3}</td></tr>
+    <tr><th>White</th><td>{s4}</td><td>{c4}</td><td>{h4}</td><td>{t4}</td><td>{ssc4}</td><td>{swc4}</td></tr>
+    <tr><th>Total</th><td>{final_steam}</td><td>{final_cold_drain}</td><td>{final_hot_drain}</td><td>{final_total_drain}</td><td>{ssc_final}</td><td>{swc_final}</td></tr>
+
+  </table>
+  """
+  return table_html
+
 iface = gr.Interface(
     fn=jigger,
-    inputs=[
+    inputs= [
         gr.Number(value=0, label="Dark"),
         gr.Number(value=0, label="Medium"),
         gr.Number(value=0, label="Light"),
         gr.Number(value=0, label="White"),
     ],
-    outputs=[
-        gr.Textbox(label="Dark"),
-        gr.Textbox(label="Medium"),
-        gr.Textbox(label="Light"),
-        gr.Textbox(label="White"),
-        gr.Textbox(label="Total")
-    ],
-    title="Steam Consumption, Water, Hot_Drain, Cold_Drain Calculation Dashboard for Jigger",
-    description="Enter values and click 'Calculate' to see the results.<br/><br/>" 
-                + "<sup>***</sup> Result will be in order Steam Consumption,Cold Drain, Hot Drain, Total Water.", 
-    css=".gr-box {padding: 20px;}"
-)
+    outputs= gr.components.HTML(label="Final Table"),
+    title ="Steam Consumption, Water, Hot_Drain, Cold_Drain Calculation Dashboard for Jigger",
+    description="Enter values and click 'Calculate' to see the results.<br/><br/>" ,
+    css=".gr-box {padding: 20px;}" )
 
-# Launch the interface
 iface.launch()