diff --git a/DeliveryObject.py b/DeliveryObject.py index 0d5e110..e6b1cdf 100644 --- a/DeliveryObject.py +++ b/DeliveryObject.py @@ -26,6 +26,7 @@ class DeliveryObject: class deliveryStatus(Enum): NO_STATUS = 0 - AT_THE_HUB = 1 - IN_ROUTE = 2 - DELIVERED = 3 \ No newline at end of file + IN_ROUTE_TO_HUB = 1 + AT_THE_HUB = 2 + IN_ROUTE = 3 + DELIVERED = 4 \ No newline at end of file diff --git a/Screenshots/.DS_Store b/Screenshots/.DS_Store index 4289a97..c054d9e 100644 Binary files a/Screenshots/.DS_Store and b/Screenshots/.DS_Store differ diff --git a/Screenshots/Status of PKG @ 9 pt 2.png b/Screenshots/Status of PKG @ 9 pt 2.png index 19f7681..e8fbf62 100644 Binary files a/Screenshots/Status of PKG @ 9 pt 2.png and b/Screenshots/Status of PKG @ 9 pt 2.png differ diff --git a/Screenshots/Status of PKG @ 9.png b/Screenshots/Status of PKG @ 9.png index 7ec961d..d6d3246 100644 Binary files a/Screenshots/Status of PKG @ 9.png and b/Screenshots/Status of PKG @ 9.png differ diff --git a/__pycache__/DeliveryObject.cpython-314.pyc b/__pycache__/DeliveryObject.cpython-314.pyc index b4f3658..a325af0 100644 Binary files a/__pycache__/DeliveryObject.cpython-314.pyc and b/__pycache__/DeliveryObject.cpython-314.pyc differ diff --git a/main.py b/main.py index 8697bf8..2881f2d 100755 --- a/main.py +++ b/main.py @@ -14,7 +14,10 @@ def main(): package_hash = DerekHashTable() # Init the hash table for pkg in AssignmentData.packages: # Load the packages into the hash table - pkg.status = deliveryStatus.AT_THE_HUB + if "Delayed" in pkg.notes: + pkg.status = deliveryStatus.IN_ROUTE_TO_HUB + else: + pkg.status = deliveryStatus.AT_THE_HUB package_hash.addItem(pkg.id, pkg) truck1 = Truck("1") # Init truck 1 starting at 8:00 @@ -66,8 +69,16 @@ def main(): debounce2 = True debounce3 = True truck3LoadDebounce = True + arrivalDebounce = True while True: + # check if packages have arrived to the hub + if arrivalDebounce and globalTime >= datetime.time(9, 5): + arrivalDebounce = False + for v in package_hash: + if v.status == deliveryStatus.IN_ROUTE_TO_HUB: + v.status = deliveryStatus.AT_THE_HUB + # check for pause time if globalTime >= pauseTime: pauseTime = UserUI.TimePrompt(globalTime, truck1, truck2, truck3, package_hash)