Navigator and Driver indications are now functioning

Author: DeadlyApps

Frames/MobTimerController.py

@@ -15,13 +15,13 @@ def __init__(self, *args, **kwargs):
         container.grid_rowconfigure(0, weight=1)
         container.grid_columnconfigure(0, weight=1)
 
-        time_options_manager = TimeOptionsManager()
-        mobber_manager = MobberManager()
-        countdown_manager = CountdownManager(container)
+        self.time_options_manager = TimeOptionsManager()
+        self.mobber_manager = MobberManager()
+        self.countdown_manager = CountdownManager(container)
 
         self.frames = {}
         for F in (ScreenBlockerFrame, TransparentCountdownFrame):
-            frame = F(container, self, time_options_manager, mobber_manager, countdown_manager)
+            frame = F(container, self, self.time_options_manager, self.mobber_manager, self.countdown_manager)
             self.frames[F] = frame
             frame.grid(row=0, column=0, sticky="nsew")
         self.last_frame = None
@@ -32,13 +32,13 @@ def show_frame(self, frame_class):
         if self.last_frame != frame_class:
             frame = self.frames[frame_class]
             frame.tkraise()
-            print(frame_class)
             switched_frames = True
         self.last_frame = frame_class
         return switched_frames
 
     def show_screen_blocker_frame(self):
         if self.show_frame(ScreenBlockerFrame):
+            self.mobber_manager.switch_navigator_driver()
             self.set_full_screen_always_on_top()
 
     def show_transparent_countdown_frame(self):

Frames/ScreenBlockerFrame.py

@@ -13,13 +13,13 @@ def __init__(self, parent, controller, time_options_manager, mobber_manager, cou
         self.time_options_manager.subscribe_to_timechange(self.time_change_callback)
         self.mobber_manager.subscribe_to_mobber_list_change(self.mobber_list_change_callback)
 
-    def mobber_list_change_callback(self, mobber_list):
+    def mobber_list_change_callback(self, mobber_list, driver_index, navigator_index ):
         self.names_list.delete(0, END)
         for index in range(0, mobber_list.__len__()):
             name = mobber_list[index]
-            if index == 0:
+            if index == driver_index:
                 name += " <= Driver"
-            if index == 1:
+            if index == navigator_index:
                 name += " <= Navigator"
             self.names_list.insert(END, name)
 
@@ -59,14 +59,6 @@ def build_window_content(self):
         self.label_seconds.bind("<Button-3>", lambda event: self.time_options_manager.decrement_seconds())
         row_index += 1
 
-        self.label_current_mobber = Label(center_frame, text="Mobber Sit At the Keyboard", font="Helvetica 50 bold")
-        self.label_current_mobber.grid(row=row_index, columnspan=3, padx=30, pady=0, sticky=N)
-        row_index += 1
-
-        self.label_next_mobber = Label(center_frame, text="Next Mobber get ready!", font="Helvetica 16 bold")
-        self.label_next_mobber.grid(row=row_index, columnspan=3, padx=30, pady=0, sticky=N)
-        row_index += 1
-
         self.add_mobber_entry = Entry(center_frame, text="Add Mobber", font="Helvetica 16 bold")
         self.add_mobber_entry.grid(row=row_index, columnspan=2, sticky=N + E + W, padx=10, pady=10)
         self.add_mobber_entry.bind("<Return>", self.add_mobber_left_click)

Frames/TransparentCountdownFrame.py

@@ -7,6 +7,8 @@ def __init__(self, parent, controller, time_options_manager, mobber_manager, cou
         self.master = parent
         self.controller = controller
         self.create_frame_content()
+        self.mobber_manager = mobber_manager
+        self.mobber_manager.subscribe_to_mobber_list_change(self.mobber_list_change_callback)
         countdown_manager.subscribe_to_time_changes(self.update_time_change_callback)
 
     def update_time_change_callback(self, days, minutes, seconds):
@@ -15,6 +17,17 @@ def update_time_change_callback(self, days, minutes, seconds):
         self.label_minutes['text'] = "{0:0>2}".format(minutes)
         self.label_seconds['text'] = "{0:0>2}".format(seconds)
 
+    def mobber_list_change_callback(self, mobber_list, driver_index, navigator_index):
+        mobber_count = mobber_list.__len__()
+        if mobber_count > navigator_index:
+            self.label_navigator['text'] = self.get_navigator_text(mobber_list[navigator_index])
+        else:
+            self.label_navigator['text'] = self.get_navigator_text("")
+        if mobber_count > driver_index:
+            self.label_driver['text'] = self.get_driver_text(mobber_list[driver_index])
+        else:
+            self.label_driver['text'] = self.get_driver_text("")
+
     def create_frame_content(self):
         row_index = 0
         self.label_minutes = Label(self, text="10", font="Helvetica 120 bold")
@@ -23,4 +36,16 @@ def create_frame_content(self):
         label_colon.grid(row=row_index, column=1, sticky=N)
         self.label_seconds = Label(self, text="30", font="Helvetica 120 bold")
         self.label_seconds.grid(row=row_index, column=2, sticky=W)
-        row_index += 1
+        row_index += 1
+        self.label_driver = Label(self, text=self.get_driver_text(""), font="Helvetica 20 bold")
+        self.label_driver.grid(row=row_index, columnspan=3, sticky=W)
+        row_index += 1
+        self.label_navigator = Label(self, text=self.get_navigator_text(""), font="Helvetica 20 bold")
+        self.label_navigator.grid(row=row_index, columnspan=3, sticky=W)
+        row_index += 1
+
+    def get_navigator_text(self,name ):
+        return "Navigator: " + name
+
+    def get_driver_text(self, name):
+        return "Driver: " + name

Infrastructure/CountdownManager.py

@@ -27,12 +27,11 @@ def fire_time_change_callbacks(self):
         end_time = time.time()
         up_time = end_time - self.start_time
         remaining_time = self.count_down_total - datetime.timedelta(seconds=(int(up_time)))
-        print(remaining_time.days)
         for callback in self.time_change_callbacks:
             if callback:
                 callback(remaining_time.days, (remaining_time.seconds // 60) % 60, remaining_time.seconds % 60)
 
     def refresh_timer(self):
+        self.fire_time_change_callbacks()
         if self.root_tk_app:
-            self.fire_time_change_callbacks()
             self.root_tk_app.after(500, self.refresh_timer)

Infrastructure/MobberManager.py

@@ -1,5 +1,7 @@
 class MobberManager(object):
     def __init__(self):
+        self.driver_index = 0
+        self.navigator_index = 1
         self.mobber_list = []
         self.mobber_list_change_callbacks = []
 
@@ -37,10 +39,26 @@ def subscribe_to_mobber_list_change(self, mobber_list_change_callback):
         self.fire_time_change_callbacks()
 
     def fire_time_change_callbacks(self):
+        self.update_navigator_driver_index()
         for mobber_list_change_callback in self.mobber_list_change_callbacks:
             if mobber_list_change_callback:
-                mobber_list_change_callback(self.mobber_list)
+                mobber_list_change_callback(self.mobber_list, self.driver_index, self.navigator_index)
 
     def clear(self):
         self.mobber_list = []
-        self.fire_time_change_callbacks()
+        self.fire_time_change_callbacks()
+
+    def switch_navigator_driver(self):
+        mobber_count = self.mobber_list.__len__()
+        if mobber_count > 0:
+            self.driver_index = (self.driver_index + 1) % mobber_count
+        self.update_navigator_driver_index()
+        self.fire_time_change_callbacks()
+
+    def update_navigator_driver_index(self):
+        if self.mobber_list.__len__() > 0:
+            self.driver_index = self.driver_index % self.mobber_list.__len__()
+            self.navigator_index =(self.driver_index + 1) % self.mobber_list.__len__()
+        else:
+            self.driver_index = 0
+            self.navigator_index = 1

tests/Infrastructure/MobberManager/TestsMobberManager.py

@@ -1,11 +1,11 @@
 import os
 import unittest
-
 from approvaltests import Approvals
 from approvaltests.TextDiffReporter import TextDiffReporter
-
 from Infrastructure.MobberManager import MobberManager
 
+os.environ["APPROVALS_TEXT_DIFF_TOOL"] = "C:\\Program Files\\TortoiseSVN\\bin\\TortoiseMerge.exe"
+
 
 class TestsMobberManager(unittest.TestCase):
     def test_empty_mobber_manager_has_no_items(self):
@@ -20,58 +20,58 @@ def test_add_mobber_chris_has_chris(self):
 
     def test_add_mobber_joe_chris_has_joe_chris(self):
         mobber_manager = MobberManager()
-        mobber_manager.add_mobber("Smokey Joe")
+        mobber_manager.add_mobber("Joe")
         mobber_manager.add_mobber("Chris")
-        result = ["Smokey Joe", "Chris"]
+        result = ["Joe", "Chris"]
         self.assertEqual(mobber_manager.get_mobbers(), result)
 
     def test_add_mobber_joe_chris_joe__remove_joe_has_joe_chris(self):
         mobber_manager = MobberManager()
-        mobber_manager.add_mobber("Smokey Joe")
+        mobber_manager.add_mobber("Joe")
         mobber_manager.add_mobber("Chris")
-        mobber_manager.add_mobber("Smokey Joe")
+        mobber_manager.add_mobber("Joe")
         mobber_manager.remove_mobber(2)
-        result = ["Smokey Joe", "Chris"]
+        result = ["Joe", "Chris"]
         self.assertEqual(mobber_manager.get_mobbers(), result)
 
     def test_add_4_mobbers_move_up_middle(self):
         mobber_manager = MobberManager()
-        mobber_manager.add_mobber("Smokey Joe")
+        mobber_manager.add_mobber("Joe")
         mobber_manager.add_mobber("Chris")
         mobber_manager.add_mobber("Will")
         mobber_manager.add_mobber("Eric")
         mobber_manager.move_mobber_up(2)
-        result = ["Smokey Joe", "Will", "Chris", "Eric"]
+        result = ["Joe", "Will", "Chris", "Eric"]
         self.assertEqual(mobber_manager.get_mobbers(), result)
 
     def test_add_4_mobbers_move_up_top(self):
         mobber_manager = MobberManager()
-        mobber_manager.add_mobber("Smokey Joe")
+        mobber_manager.add_mobber("Joe")
         mobber_manager.add_mobber("Chris")
         mobber_manager.add_mobber("Will")
         mobber_manager.add_mobber("Eric")
         mobber_manager.move_mobber_up(0)
-        result = ["Eric", "Chris", "Will", "Smokey Joe"]
+        result = ["Eric", "Chris", "Will", "Joe"]
         self.assertEqual(mobber_manager.get_mobbers(), result)
 
     def test_add_4_mobbers_move_down_middle(self):
         mobber_manager = MobberManager()
-        mobber_manager.add_mobber("Smokey Joe")
+        mobber_manager.add_mobber("Joe")
         mobber_manager.add_mobber("Chris")
         mobber_manager.add_mobber("Will")
         mobber_manager.add_mobber("Eric")
         mobber_manager.move_mobber_down(2)
-        result = ["Smokey Joe", "Chris", "Eric", "Will"]
+        result = ["Joe", "Chris", "Eric", "Will"]
         self.assertEqual(mobber_manager.get_mobbers(), result)
 
     def test_add_4_mobbers_move_down_bottom(self):
         mobber_manager = MobberManager()
-        mobber_manager.add_mobber("Smokey Joe")
+        mobber_manager.add_mobber("Joe")
         mobber_manager.add_mobber("Chris")
         mobber_manager.add_mobber("Will")
         mobber_manager.add_mobber("Eric")
         mobber_manager.move_mobber_down(3)
-        result = ["Eric", "Chris", "Will", "Smokey Joe"]
+        result = ["Eric", "Chris", "Will", "Joe"]
         self.assertEqual(mobber_manager.get_mobbers(), result)
 
     def test_move_down_empty(self):
@@ -94,32 +94,46 @@ def test_remove_empty(self):
 
     def test_clear(self):
         mobber_manager = MobberManager()
-        mobber_manager.add_mobber("Smokey Joe")
+        mobber_manager.add_mobber("Joe")
         mobber_manager.add_mobber("Chris")
         mobber_manager.add_mobber("Sam")
         mobber_manager.clear()
         result = []
         self.assertEqual(mobber_manager.get_mobbers(), result)
 
-
     def test_subscribe_to_mobber_list_changes(self):
         mobber_manager = MobberManager()
-        result = { "result" : "Mobbers in List for Each Change\n", "increment" : 0}
+        result = {"result": "Mobbers in List for Each Change\n", "increment": 0}
 
-        def time_change_callback(mobber_list):
+        def time_change_callback(mobber_list, driver_index, navigator_index):
             result["increment"] += 1
-            result["result"] += "Action " + result["increment"].__str__()  + ":"
-            for mobber in mobber_list:
-                result["result"] += mobber + ","
+            result["result"] += "Action " + result["increment"].__str__() + ":"
+            for mobber_index in range(0, mobber_list.__len__()):
+                result["result"] += mobber_list[mobber_index]
+                if mobber_index == driver_index:
+                    result["result"] += " (Driver)"
+                if mobber_index == navigator_index:
+                    result["result"] += " (Navigator)"
+                result["result"] += ", "
+
             result["result"] += "\n"
 
         mobber_manager.subscribe_to_mobber_list_change(time_change_callback)
 
-        mobber_manager.add_mobber("Smokey Joe")
+        mobber_manager.add_mobber("Joe")
         mobber_manager.add_mobber("Chris")
         mobber_manager.add_mobber("Sam")
+        mobber_manager.add_mobber("John")
+        mobber_manager.switch_navigator_driver()
+        mobber_manager.add_mobber("Bill")
+        mobber_manager.switch_navigator_driver()
+        mobber_manager.switch_navigator_driver()
+        mobber_manager.switch_navigator_driver()
+        mobber_manager.switch_navigator_driver()
+        mobber_manager.switch_navigator_driver()
         mobber_manager.remove_mobber(2)
         mobber_manager.remove_mobber(0)
+        mobber_manager.switch_navigator_driver()
         mobber_manager.add_mobber("Seth")
         mobber_manager.move_mobber_down(0)
         mobber_manager.add_mobber("Fredrick")
@@ -130,6 +144,21 @@ def time_change_callback(mobber_list):
 
         Approvals.verify(result["result"], TextDiffReporter())
 
+    def test_navigator1_driver0_index(self):
+        mobber_manager = MobberManager()
+        mobber_manager.add_mobber("Joe")
+        mobber_manager.add_mobber("Chris")
+        result = "Navigator: " + str(mobber_manager.navigator_index) + " Driver: " + str(mobber_manager.driver_index)
+        self.assertEqual(result, "Navigator: 1 Driver: 0")
+
+    def test_switch_navigator0_driver1_index(self):
+        mobber_manager = MobberManager()
+        mobber_manager.add_mobber("Joe")
+        mobber_manager.add_mobber("Chris")
+        mobber_manager.switch_navigator_driver()
+        result = "Navigator: " + str(mobber_manager.navigator_index) + " Driver: " + str(mobber_manager.driver_index)
+        self.assertEqual(result, "Navigator: 0 Driver: 1")
+
+
 if __name__ == '__main__':
-    os.environ["APPROVALS_TEXT_DIFF_TOOL"] = "meld"
     unittest.main()

tests/Infrastructure/MobberManager/tests.Infrastructure.MobberManager.TestsMobberManager.test_subscribe_to_mobber_list_changes.approved.txt

@@ -1,14 +1,23 @@
 Mobbers in List for Each Change
 Action 1:
-Action 2:Smokey Joe,
-Action 3:Smokey Joe,Chris,
-Action 4:Smokey Joe,Chris,Sam,
-Action 5:Smokey Joe,Chris,
-Action 6:Chris,
-Action 7:Chris,Seth,
-Action 8:Seth,Chris,
-Action 9:Seth,Chris,Fredrick,
-Action 10:Seth,Fredrick,Chris,
-Action 11:Seth,Chris,
-Action 12:Chris,
-Action 13:
+Action 2:Joe (Driver) (Navigator), 
+Action 3:Joe (Driver), Chris (Navigator), 
+Action 4:Joe (Driver), Chris (Navigator), Sam, 
+Action 5:Joe (Driver), Chris (Navigator), Sam, John, 
+Action 6:Joe, Chris (Driver), Sam (Navigator), John, 
+Action 7:Joe, Chris (Driver), Sam (Navigator), John, Bill, 
+Action 8:Joe, Chris, Sam (Driver), John (Navigator), Bill, 
+Action 9:Joe, Chris, Sam, John (Driver), Bill (Navigator), 
+Action 10:Joe (Navigator), Chris, Sam, John, Bill (Driver), 
+Action 11:Joe (Driver), Chris (Navigator), Sam, John, Bill, 
+Action 12:Joe, Chris (Driver), Sam (Navigator), John, Bill, 
+Action 13:Joe, Chris (Driver), John (Navigator), Bill, 
+Action 14:Chris, John (Driver), Bill (Navigator), 
+Action 15:Chris (Navigator), John, Bill (Driver), 
+Action 16:Chris, John, Bill (Driver), Seth (Navigator), 
+Action 17:John, Chris, Bill (Driver), Seth (Navigator), 
+Action 18:John, Chris, Bill (Driver), Seth (Navigator), Fredrick, 
+Action 19:John, Bill, Chris (Driver), Seth (Navigator), Fredrick, 
+Action 20:John, Chris, Seth (Driver), Fredrick (Navigator), 
+Action 21:Chris (Navigator), Seth, Fredrick (Driver), 
+Action 22:Seth (Driver), Fredrick (Navigator),