Bug fixed BPHTB terkait query waktu

payment_report/scripts/bphtb.py

@@ -10,6 +10,8 @@ from sqlalchemy import (
     Date, ForeignKey,
     Date, ForeignKey,
     UniqueConstraint,
     UniqueConstraint,
     func,
     func,
+    or_,
+    and_,
     )
     )
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.exc import (
 from sqlalchemy.exc import (
@@ -303,9 +305,13 @@ class App(BaseApp):
     def get_filter_query(self, q):
     def get_filter_query(self, q):
         if isinstance(self.tgl_awal, datetime):
         if isinstance(self.tgl_awal, datetime):
             return q.filter(
             return q.filter(
+                    or_(
+                        and_(
                             self.Payment.tanggal >= self.tgl_awal.date(),
                             self.Payment.tanggal >= self.tgl_awal.date(),
-                    self.Payment.jam >= self.tgl_awal.time(),
-                    self.Payment.tanggal < self.tgl_akhir + one_day)
+                            self.Payment.jam >= self.tgl_awal.time()),
+                        and_(
+                            self.Payment.tanggal > self.tgl_awal.date(),
+                            self.Payment.tanggal < self.tgl_akhir + one_day)))
         return q.filter(
         return q.filter(
                 self.Payment.tanggal >= self.tgl_awal,
                 self.Payment.tanggal >= self.tgl_awal,
                 self.Payment.tanggal < self.tgl_akhir + one_day)
                 self.Payment.tanggal < self.tgl_akhir + one_day)