bug fix: corrected start date after end date for overlapping "Sonstige"

1 files changed, 9 insertions, 51 deletions

diff --git a/test.py b/test.py
index 2b795eb..cbad19d 100644
--- a/test.py
+++ b/test.py
@@ -10,14 +10,14 @@ def test_calculate_prediction():
     print("Testing refactored prediction calculation system...")
     
     # Input event dates as strings
-    event1_str = ["2023-01-01", "2023-01-10"]
+    event1_str = ["2023-01-01", "2023-01-02"]
     event2_str = ["2023-01-05", "2023-01-15"]
 
     # Input full project dates as strings
-    project1_str = ["2025-01-02", "2025-02-11"]
+    project1_str = ["2023-01-01", "2024-12-31"]
 
     # Input half project dates as strings
-    project2_str = ["2025-02-01", "2025-06-30"]
+    project2_str = ["2025-01-01", "2026-12-31"]
     project3_str = ["2024-05-05", "2024-06-07"]
 
     # Initialize components
@@ -27,11 +27,11 @@ def test_calculate_prediction():
     
     # Add entries to calendar
     print("Adding calendar entries...")
+    # calendar_manager.add_entry(event2_str[0], event2_str[1], "Sonstige")
+    calendar_manager.add_entry(project1_str[0], project1_str[1], "EZ pauschal")
     calendar_manager.add_entry(event1_str[0], event1_str[1], "Sonstige")
-    calendar_manager.add_entry(event2_str[0], event2_str[1], "Sonstige")
-    calendar_manager.add_entry(project1_str[0], project1_str[1], "EZ 100%")
-    calendar_manager.add_entry(project2_str[0], project2_str[1], "EZ 50%")
-    calendar_manager.add_entry(project3_str[0], project3_str[1], "EZ 50%")
+    calendar_manager.add_entry(project2_str[0], project2_str[1], "EZ pauschal")
+    # calendar_manager.add_entry(project3_str[0], project3_str[1], "EZ 50%")
 
     # Test validation
     print("Testing input validation...")
@@ -43,12 +43,12 @@ def test_calculate_prediction():
 
     # Calculate prediction
     print("Calculating prediction...")
-    success = prediction_controller.make_prediction("2023-01-01", 2)
+    success = prediction_controller.make_prediction("2023-01-01", 1)
     
     if success:
         prediction = prediction_controller.get_prediction()
         print(f"Predicted completion date: {prediction}")
-        
+        print(calendar_manager.entries)
         # Test event type handler
         print("\nTesting EventTypeHandler...")
         entries = calendar_manager.list_entries()
@@ -64,48 +64,6 @@ def test_calculate_prediction():
     else:
         print("Prediction calculation failed")
 
-def test_event_type_handler():
-    """Test the EventTypeHandler functionality"""
-    print("\nTesting EventTypeHandler...")
-    
-    # Test keyword validation
-    for keyword in EventConfig.KEYWORDS:
-        is_valid = EventTypeHandler.validate_event_type(keyword)
-        print(f"Keyword '{keyword}' is valid: {is_valid}")
-    
-    # Test duration calculation
-    from datetime import datetime
-    start_date = datetime(2023, 1, 1)
-    duration = EventTypeHandler.get_duration_for_type("EZ pauschal", start_date)
-    print(f"EZ pauschal duration from {start_date}: {duration}")
-    
-    # Test display names
-    for keyword in EventConfig.KEYWORDS:
-        display_name = EventTypeHandler.get_event_type_display_name(keyword)
-        print(f"'{keyword}' -> '{display_name}'")
-
-def test_date_calculator():
-    """Test the refactored DateCalculator"""
-    print("\nTesting DateCalculator...")
-    
-    from datetime import datetime
-    
-    # Test period sorting
-    periods = [
-        (datetime(2023, 3, 1), datetime(2023, 3, 10), "id1"),
-        (datetime(2023, 1, 1), datetime(2023, 1, 10), "id2"),
-        (datetime(2023, 2, 1), datetime(2023, 2, 10), "id3")
-    ]
-    
-    sorted_periods = DateCalculator.sort_periods(periods)
-    print(f"Sorted periods: {[(p[0].strftime('%Y-%m-%d'), p[1].strftime('%Y-%m-%d'), p[2]) for p in sorted_periods]}")
-    
-    # Test truncation
-    launch_date = datetime(2023, 1, 15)
-    truncated = DateCalculator.truncate_periods(sorted_periods, launch_date)
-    print(f"Truncated periods: {[(p[0].strftime('%Y-%m-%d'), p[1].strftime('%Y-%m-%d'), p[2]) for p in truncated]}")
 
 if __name__ == "__main__":
     test_calculate_prediction()
-    test_event_type_handler()
-    test_date_calculator()
\ No newline at end of file