From f9c8c92d3b56eef9ff94428484f05041a7c7586c Mon Sep 17 00:00:00 2001 From: amaliadwiy Date: Wed, 8 Oct 2025 12:07:56 +0800 Subject: [PATCH] upd: komentar diskusi umum dan divisi Deskripsi: - memberikan note sesuai dengan status diskusi agar lebih jelas - pada fitur diskusi umum dan diskusi divisi No Issues --- app/(application)/discussion/[id].tsx | 57 +++++---- .../discussion/[detail]/index.tsx | 114 +++++++++--------- constants/Styles.ts | 3 + 3 files changed, 98 insertions(+), 76 deletions(-) diff --git a/app/(application)/discussion/[id].tsx b/app/(application)/discussion/[id].tsx index 6dc320b..9e71db3 100644 --- a/app/(application)/discussion/[id].tsx +++ b/app/(application)/discussion/[id].tsx @@ -211,28 +211,41 @@ export default function DetailDiscussionGeneral() { Styles.w100, { backgroundColor: "#f4f4f4" }, ]}> - { - (komentar != '' && !regexOnlySpacesOrEnter.test(komentar) && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin"))) - && handleKomentar() - }} - style={[ - Platform.OS == 'android' && Styles.mb12, - ]} - > - - - } - /> + { + data?.status != 2 && data?.isActive && ((entityUser.role != "user" && entityUser.role != "coadmin") || memberDiscussion) + ? + { + (komentar != '' && !regexOnlySpacesOrEnter.test(komentar) && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin"))) + && handleKomentar() + }} + style={[ + Platform.OS == 'android' && Styles.mb12, + ]} + > + + + } + /> + : + + + { + data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota diskusi yang dapat memberikan komentar" + } + + + } + diff --git a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx index ec703e6..2031dae 100644 --- a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx @@ -295,61 +295,67 @@ export default function DiscussionDetail() { { backgroundColor: "#f4f4f4" }, ]} > - { - komentar != "" && - !regexOnlySpacesOrEnter.test(komentar) && - !loadingSend && - data?.status != 2 && - data?.isActive && - (((entityUser.role == "user" || - entityUser.role == "coadmin") && - isMemberDivision) || - entityUser.role == "admin" || - entityUser.role == "supadmin" || - entityUser.role == "developer" || - entityUser.role == "cosupadmin") && - handleKomentar(); - }} - style={[ - Platform.OS == 'android' && Styles.mb12, - ]} - > - { + komentar != "" && + !regexOnlySpacesOrEnter.test(komentar) && + !loadingSend && + data?.status != 2 && + data?.isActive && + (((entityUser.role == "user" || + entityUser.role == "coadmin") && + isMemberDivision) || + entityUser.role == "admin" || + entityUser.role == "supadmin" || + entityUser.role == "developer" || + entityUser.role == "cosupadmin") && + handleKomentar(); + }} + style={[ + Platform.OS == 'android' && Styles.mb12, + ]} + > + + + } + /> + : + + + { + data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota divisi yang dapat memberikan komentar" } - /> - - } - /> + + + } + diff --git a/constants/Styles.ts b/constants/Styles.ts index 9c41fa6..f4b0117 100644 --- a/constants/Styles.ts +++ b/constants/Styles.ts @@ -187,6 +187,9 @@ const Styles = StyleSheet.create({ pv15: { paddingVertical: 15 }, + pv20: { + paddingVertical: 20 + }, p15: { padding: 15 },