-
-
-
- HUT Polwan ke-76, Kapolri Apresiasi Prestasi yang Diberikan
-
-
- Kapolri Jenderal Pol. Listyo Sigit Prabowo memberikan apresiasi
- kepada polisi wanita yang berprestasi...
-
-
- Lihat Selengkapnya
-
+ {/* Right Side - Event Detail */}
+
+
+
+ Detail Acara
+
+
+ {selectedEvent ? (
+
+
{
+ const target = e.target as HTMLImageElement;
+ target.src = "/images/default-event.png";
+ }}
+ />
+
+
+
+ {selectedEvent.title}
+
+
+
+
+ Tanggal:
+ {formatDateRange(selectedEvent.startDate, selectedEvent.endDate)}
+
+
+
+ {selectedEvent.description || "Tidak ada deskripsi tersedia."}
+
+
+
+
+
+
+
+
+
+ ) : (
+
+ Pilih acara untuk melihat detail
+
+ )}
@@ -88,4 +287,4 @@ const EventCalender = () => {
);
};
-export default EventCalender;
+export default EventCalender;
\ No newline at end of file
diff --git a/components/landing-page/search-section-polda.tsx b/components/landing-page/search-section-polda.tsx
index 399333e7..1d6108b5 100644
--- a/components/landing-page/search-section-polda.tsx
+++ b/components/landing-page/search-section-polda.tsx
@@ -12,20 +12,7 @@ import AreaCoverageWorkUnits from "./area-coverage-and-work-units";
import EventCalender from "./event-calender";
import UserSurveyBox from "./survey-box";
import ScrollableContentPolda from "./scrollable-content-polda";
-
-const LeftBanner = () => (
-
-
-
-
-);
-
-const RightBanner = () => (
-
-
-
-
-);
+import AdvertisementPlacements from "./advertisement-placements";
const SearchSectionPolda = () => {
const [contentType, setContentType] = useState("all");
@@ -35,7 +22,7 @@ const SearchSectionPolda = () => {
return (
@@ -49,7 +36,7 @@ const SearchSectionPolda = () => {
);
diff --git a/components/landing-page/search-section-satker.tsx b/components/landing-page/search-section-satker.tsx
index 9d24a8a3..e9aefa93 100644
--- a/components/landing-page/search-section-satker.tsx
+++ b/components/landing-page/search-section-satker.tsx
@@ -13,20 +13,7 @@ import EventCalender from "./event-calender";
import UserSurveyBox from "./survey-box";
import ScrollableContentPolda from "./scrollable-content-polda";
import ScrollableContentSatker from "./scrollable-content-satker";
-
-const LeftBanner = () => (
-
-
-
-
-);
-
-const RightBanner = () => (
-
-
-
-
-);
+import AdvertisementPlacements from "./advertisement-placements";
const SearchSectionSatker = () => {
const [contentType, setContentType] = useState("all");
@@ -36,7 +23,7 @@ const SearchSectionSatker = () => {
return (
@@ -50,7 +37,7 @@ const SearchSectionSatker = () => {
);
diff --git a/components/landing-page/search-section.tsx b/components/landing-page/search-section.tsx
index 5307d836..9af0b96a 100644
--- a/components/landing-page/search-section.tsx
+++ b/components/landing-page/search-section.tsx
@@ -18,20 +18,7 @@ import ContentCategory from "./content-category";
import AreaCoverageWorkUnits from "./area-coverage-and-work-units";
import EventCalender from "./event-calender";
import UserSurveyBox from "./survey-box";
-
-const LeftBanner = () => (
-
-
-
-
-);
-
-const RightBanner = () => (
-
-
-
-
-);
+import AdvertisementPlacements from "./advertisement-placements";
const SearchSection = () => {
const [contentType, setContentType] = useState("all");
@@ -44,7 +31,7 @@ const SearchSection = () => {
style={{ backgroundImage: "url('/assets/background.png')" }}
>
@@ -58,7 +45,7 @@ const SearchSection = () => {
);
diff --git a/messages/in.json b/messages/in.json
index e0af7ea4..a7720cdc 100644
--- a/messages/in.json
+++ b/messages/in.json
@@ -690,7 +690,7 @@
"type-task": "Tipe Penugasan",
"category-task": "Kategori Penugasan",
"areas-expertise": "Bidang Keahlian",
- "choose-expert": "Pilih Tenaga Ahli",
+ "choose-expert": "Tenaga Ahli",
"code": "Kode",
"start-date": "Tanggal Mulai",
"end-date": "Tanggal Selesai",
diff --git a/service/broadcast/broadcast.ts b/service/broadcast/broadcast.ts
index b1ca2176..745c124e 100644
--- a/service/broadcast/broadcast.ts
+++ b/service/broadcast/broadcast.ts
@@ -20,11 +20,9 @@ export async function listDataAdvertisements(
page: number,
limit: string,
search: string,
- categoryFilter: string,
- statusFilter: string
) {
const name = search || "";
- const url = `advertisements/pagination?title=${name}&enablePage=1&sortBy=createdAt&sort=desc&size=${limit}&page=${page}&typeId=1&categoryId=${categoryFilter}&statusId=${statusFilter}`;
+ const url = `advertisements/pagination?title=${search}&enablePage=1&sortBy=createdAt&sort=desc&size=${limit}&page=${page}`;
return httpGetInterceptor(url);
}
diff --git a/service/schedule/schedule.ts b/service/schedule/schedule.ts
index 62024a8a..b18531e5 100644
--- a/service/schedule/schedule.ts
+++ b/service/schedule/schedule.ts
@@ -20,17 +20,16 @@ export async function paginationSchedule(
);
}
-export async function paginationCalendar(
+export async function getCalendarPagination(
size: any,
page: number,
- type: any,
title: string = "",
statusFilter: number[] = []
) {
const statusQuery =
statusFilter.length > 0 ? `&statusId=${statusFilter.join(",")}` : "";
return await httpGetInterceptor(
- `calendars/pagination?enablePage=1&scheduleTypeId=${type}&page=${page}&size=${size}&title=${title}${statusQuery}`
+ `calendars/pagination?enablePage=1&page=${page}&size=${size}&title=${title}${statusQuery}`
);
}
diff --git a/service/settings/settings.ts b/service/settings/settings.ts
index 1d36d564..adc70c7d 100644
--- a/service/settings/settings.ts
+++ b/service/settings/settings.ts
@@ -132,5 +132,8 @@ export async function getTagsByParentId(parentId: string | number) {
export async function postAdvertisements(data: any) {
const url = "advertisements";
- return httpPostInterceptor(url, data);
+ const headers = {
+ "Content-Type": "multipart/form-data",
+ };
+ return httpPostInterceptor(url, data, headers);
}
diff --git a/service/task.ts b/service/task.ts
index a103a2e3..8c853a34 100644
--- a/service/task.ts
+++ b/service/task.ts
@@ -146,7 +146,7 @@ export async function listTaskTa(
}
return httpGetInterceptor(
- `assignment-expert/pagination?enablePage=1&size=${size}&page=${page}&title=${title}&taskType=${taskType}&uniqueCode=${code}&createdAt=${createdAt}${statusQuery}`
+ `assignment-expert/pagination?enablePage=1&size=${size}&page=${page}&title=${title}&assignmentType=${taskType}&uniqueCode=${code}&createdAt=${createdAt}${statusQuery}`
);
}