Enhancement in CLI output & bugfix in time comparison

- Now the short_result_cli is used if no --group given
- Fixed the special case where a workday ends at midnight and night work
- Adds testcase for a workday ending at midnight and night work

git_oh.py

@@ -52,7 +52,7 @@ def main():
         return
 
     if args.csv_output is None:
-        if args.group_by or args.details:
+        if args.group_by:
             print(result_cli(commit_stats, args.details))
         else:
             print(short_result_cli(commit_stats))
@@ -90,6 +90,10 @@ tzinfo : comparisons are done without taking tzoffset in considaration")
     if moment.weekday() in weekend:
         return False
     localtime = moment.time()
+    if stophour == datetime.time(0,0):
+        return starthour <= localtime
+    if stophour < starthour:
+        return localtime >= starthour or localtime <= stophour
     return starthour <= localtime <= stophour
 
 

test.py

@@ -193,6 +193,34 @@ class TestTimeUtils(unittest.TestCase):
             self.assertTrue(git_oh.in_office_hours(moment,
                 starthour, stophour, weekend=weekend))
 
+    def test_office_hours_midnight(self):
+        """ Test in_office_hours special case for daystop at midnight """
+        starthour = datetime.time(12,0)
+        stophour = datetime.time(0,0)
+
+        moment = datetime.datetime.fromisoformat("2023-11-01T09:00+0200")
+        self.assertFalse(git_oh.in_office_hours(moment, starthour, stophour))
+
+        moment = datetime.datetime.fromisoformat("2023-11-01T13:00+0200")
+        self.assertTrue(git_oh.in_office_hours(moment, starthour, stophour))
+
+    def test_office_hours_nightwork(self):
+        """ Testing in_office_hours when daystop < daystart """
+        starthour = datetime.time(20,0)
+        stophour = datetime.time(8,0)
+
+        moment = datetime.datetime.fromisoformat("2023-11-01T00:00+0200")
+        self.assertTrue(git_oh.in_office_hours(moment, starthour, stophour))
+
+        moment = datetime.datetime.fromisoformat("2023-11-01T05:00+0200")
+        self.assertTrue(git_oh.in_office_hours(moment, starthour, stophour))
+
+        moment = datetime.datetime.fromisoformat("2023-11-01T23:00+0200")
+        self.assertTrue(git_oh.in_office_hours(moment, starthour, stophour))
+
+        moment = datetime.datetime.fromisoformat("2023-11-01T12:00+0200")
+        self.assertFalse(git_oh.in_office_hours(moment, starthour, stophour))
+
     def test_office_hours_tz_drop(self):
         """ Checks that in_office_hours do not use tzinfo to compare
             moment with start & stop hours