diff --git a/getAllTanggalHariBesarTigaTahun.php b/getAllTanggalHariBesarTigaTahun.php
index 4ad8d2c35a090815260ff630b8d05dc17b1120b5..9655a07906ff12c7f530d15b8b77446a0f09b2d8 100644
--- a/getAllTanggalHariBesarTigaTahun.php
+++ b/getAllTanggalHariBesarTigaTahun.php
@@ -15,9 +15,9 @@ require 'dbConnect.php';
 $requestedYear = $_GET["year"];
 $stmt = $conn->query(
     "SELECT `tgl` FROM `hari_besar` WHERE ((YEAR(`tgl`) >= "
-    .$requestedYear - 1 .
-    ") AND (YEAR(`tgl`)<="
-    . $requestedYear+1 . "))"
+    . $requestedYear . "- 1
+    ) AND (YEAR(`tgl`)<="
+    . $requestedYear . "+ 1 ))"
 );
 $count = $stmt->num_rows;
 $res = array();
diff --git a/getAllTanggalKegiatanTigaTahun.php b/getAllTanggalKegiatanTigaTahun.php
index e51bd186072c60ffd7b098d3cd60dd8880d36c84..f80c1f7dc00a7ebfc7e2733b9e0f01a740b4070d 100644
--- a/getAllTanggalKegiatanTigaTahun.php
+++ b/getAllTanggalKegiatanTigaTahun.php
@@ -12,14 +12,21 @@
 
 require 'dbConnect.php';
 
-$requestedYear = $_GET['year'];
+$requestedYear = (int)$_GET['year'];
+// $stmt = $conn->query(
+//     "SELECT `tanggal_kegiatan` FROM `kegiatan`
+//     WHERE ((YEAR(`tanggal_kegiatan`)>=" .
+//     $requestedYear-1 .
+//     ") AND (YEAR(`tanggal_kegiatan`)<=".$requestedYear+1 . "))"
+// );
+// echo $requestedYear;
 $stmt = $conn->query(
     "SELECT `tanggal_kegiatan` FROM `kegiatan` 
-    WHERE ((YEAR(`tanggal_kegiatan`)>=" .
-    $requestedYear-1 .
-    ") AND (YEAR(`tanggal_kegiatan`)<=".$requestedYear+1 . "))"
+    WHERE ((YEAR(`tanggal_kegiatan`)>= " . $requestedYear .
+    "-1) AND (YEAR(`tanggal_kegiatan`)<= " . $requestedYear ."+1))"
 );
 $count = $stmt->num_rows;
+// echo $count;
 $res = array();
 $fixed = array();
 while ($row = $stmt->fetch_assoc()) {