new total screen and small bug fix

Author: c4pointer

bunker_calc_prev.db

@@ -10,9 +10,18 @@ ScreenManager:
             id: top_menu
             elevation:4
             pos_hint: {"top": 1}
-            # md_bg_color: "#e7e4c0"
+            # anchor_title: "center"
+            md_bg_color: "#e7e4c0"
             specific_text_color: "#4a4939"
-            left_action_items: [["menu", lambda x: app.dropdown(x)]]
+            left_action_items: [["menu", lambda x: (x)]]
+            right_action_items: [["menu", lambda x:app.screen2()]]
+
+            MDLabel:
+                id: right_action
+                halign: "right"
+                theme_text_color: "Custom"
+                text_color: "#4a4939"
+                
 
         MDTabs:
             id: tabs
@@ -41,7 +50,15 @@ ScreenManager:
         pos_hint: {"top": 1}
         #md_bg_color: "#e7e4c0"
         specific_text_color: "#4a4939"
-        left_action_items: [["menu", lambda x: app.dropdown(x)]]
+        left_action_items: [["menu", lambda x:(x)]]
+        right_action_items: [["menu", lambda x:app.screen2()]]
+
+        MDLabel:
+            id: right_action
+            halign: "right"
+            theme_text_color: "Custom"
+            text_color: "#4a4939"
+
     MDFloatLayout:
         orientation: "vertical"
         MDLabel:

bunkercalc.kv

@@ -60,28 +60,28 @@ def build(self):
         self.theme_cls.primary_hue = "600"
         self.theme_cls.theme_style = "Dark"
 
-    def dropdown(self, x):
-        """
-        Create a dropdown menu for navigate beetwen the screens
-        """
-        self.menu_items = [
-            {
-                "viewclass": "OneLineListItem",
-                "text": "Tanks Sounding",
-                "on_release": lambda x="Tanks Sounding": self.screen1()
-            },
-            {
-                "viewclass": "OneLineListItem",
-                "text": "Total Result",
-                "on_release": lambda x="Total Result": self.screen2()
-            }
-        ]
-        self.menu = MDDropdownMenu(
-            items=self.menu_items,
-            width_mult=4
-        )
-        self.menu.caller = x
-        self.menu.open()
+    # def dropdown(self, x):
+    #     """
+    #     Create a dropdown menu for navigate beetwen the screens
+    #     """
+    #     self.menu_items = [
+    #         {
+    #             "viewclass": "OneLineListItem",
+    #             "text": "Tanks Sounding",
+    #             "on_release": lambda x="Tanks Sounding": self.screen1()
+    #         },
+    #         {
+    #             "viewclass": "OneLineListItem",
+    #             "text": "Total Result",
+    #             "on_release": lambda x="Total Result": self.screen2()
+    #         }
+    #     ]
+    #     self.menu = MDDropdownMenu(
+    #         items=self.menu_items,
+    #         width_mult=4
+    #     )
+    #     self.menu.caller = x
+    #     self.menu.open()
 
     def calculate_total(self):
         # Calculate the total m3 in our "total_list"
@@ -123,20 +123,24 @@ def screen2(self):
         At each time when "total_screen" is pressed is recalculated
         total figure
         """
-        self.root.current = "total_screen"
-        self.calculate_total()
-        self.root.get_screen("total_screen").ids.total_hfo.text = str(round(self.sum_hfo, 3)) + str(" m3 HFO")
-        self.root.get_screen("total_screen").ids.total_mdo.text = str(round(self.sum_mdo, 3)) + str(" m3 MDO")
-
-    def screen1(self):
-        self.root.current = "tab_screen"
+        if self.root.current != "total_screen":
+            self.root.current = "total_screen"
+            self.calculate_total()
+            self.root.get_screen("total_screen").ids.right_action.text = "Tank sounding"
+            self.root.get_screen("total_screen").ids.total_hfo.text = str(round(self.sum_hfo, 3)) + str(" m3 HFO")
+            self.root.get_screen("total_screen").ids.total_mdo.text = str(round(self.sum_mdo, 3)) + str(" m3 MDO")
+        else:
+            self.root.get_screen("tab_screen").ids.right_action.text = "Total  result"
+            self.root.current = "tab_screen"
 
 
     def vessel_name(self):
+        self.root.get_screen("tab_screen").ids.right_action.text = "Total  result"
         self.vessel = self.root.get_screen("tab_screen").ids.top_menu.title = vessels[0]
         self.set_vessel_name()
 
     def set_vessel_name(self):
+        # self.root.get_screen("tab_screen").ids.top_menu.title.halign = 'right'
         self.root.get_screen("total_screen").ids.total_menu.title = str(self.vessel)
 
     def name_of_tank(self):
@@ -200,11 +204,11 @@ def on_tab_switch(
 
 
         #if no any entries are inserted we show below text to user
-        if len(total_list_mdo)==0:
+        if len(total_list_mdo)==0 and len(total_list_hfo)==0:
             try:
                 self.result.text = str("Previous quantity:\n")+\
                 str(db_reading.prev_label_text[str(self.tank_name.text.removesuffix('mdo')).strip(' ')][0])+ \
-                str(" m3, at ") + str(db_reading.prev_label_text[str(self.tank_name.text.removesuffix('mdo')).strip(' ')][1])+ str("cm")
+                str(" m3, at ") + str(db_reading.prev_label_text[str(self.tank_name.text.removesuffix('mdo')).strip(' ')][1])+ str(" cm")
                 self.result.font_size = "30dp"
                 db_editing.type_sel(tab_text)