Merge pull request #91 from bipproduction/lukman/5-agustus-2024

feat : update member

src/module/position/api/get/getAllPosition.ts

@@ -13,13 +13,17 @@ export async function getAllPosition(req: NextRequest) {
     const user = await funGetUserByCookies()
     console.log(groupID)
 
-    // if(user.)
+    if (groupID == null) {
+      grupFix = user.idGroup
+    } else {
+      grupFix = groupID
+    }
     
 
 
     const positions = await prisma.position.findMany({
       where: {
-        idGroup: String(groupID),
+        idGroup: String(grupFix),
         isActive: (active == "true" ? true : false),
       },
       select: {

src/module/user/api/get/getAllUser.ts

@@ -20,7 +20,7 @@ export async function getAllUser(req: NextRequest) {
     const users = await prisma.user.findMany({
       where: {
         isActive: active == "true" ? true : false,
-        idGroup: String(idGroup),
+        idGroup: String(fixGroup),
       },
       select: {
         id: true,

src/module/user/member/component/create_member.tsx

@@ -52,9 +52,14 @@ export default function CreateMember() {
 
    async function getAllPosition(val: any) {
       try {
-         const res = await fetch(`${API_ADDRESS.apiGetAllPosition}&groupId=${val}&active=true`)
+         if (val != null) {
-         const data = await res.json()
+            const res = await fetch(`${API_ADDRESS.apiGetAllPosition}&groupId=${val}&active=true`)
-         setListPosition(data)
+            const data = await res.json()
+            setListPosition(data)
+         } else {
+            setListPosition([])
+         }
+
       } catch (error) {
          console.error(error)
       }
@@ -72,8 +77,6 @@ export default function CreateMember() {
 
 
    async function changeGrup(val: any) {
-
-      console.log(val)
       setListPosition([])
       setListData({
          ...listData,
@@ -183,7 +186,7 @@ export default function CreateMember() {
                   ...listData,
                   idPosition: val
                })}
-               value={listData.idPosition}
+               value={(listData.idPosition == "") ? null : listData.idPosition}
             />
             <Select
                placeholder="Pilih Role" label="User Role" w={"100%"} size="md" required withAsterisk radius={30}

src/module/user/member/component/ui/tab_list_member.tsx

@@ -27,8 +27,9 @@ export default function TabListMember({ status }: { status: boolean }) {
    async function getAllUser() {
       try {
          setLoading(true)
-         const res = await fetch(`${API_ADDRESS.apiGetAllUser}&active=` + status)
+         const res = await fetch(API_ADDRESS.apiGetAllUser + '&active=' + status  )
          const data = await res.json()
+
          setDataMember(data)
       } catch (error) {
          console.error(error)