wibu/sistem-desa-mandiri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #89 from bipproduction/lukman/2-agustus-2024

Browse Source 
Lukman/2 agustus 2024
This commit is contained in:
Amalia
2024-08-02 15:16:07 +08:00
committed by GitHub
parent aad113519f a0f29efa9c
commit 4cf3f84f0d
10 changed files with 279 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api.http
View File

@@ -118,7 +118,7 @@ Content-Type: application/json
// USERS
###
GET http://localhost:3000/api/user/get?path=get-all-users&roleID=dev&villageID=121212&groupID=2&positionID=clz24bff70001w01in64dd9ea HTTP/1.1
GET http://localhost:3000/api/user/get?path=get-all-users&active=true HTTP/1.1
###
GET http://localhost:3000/api/user/get?path=get-one-users&userID=devAmalia HTTP/1.1

1
src/module/_global/bin/api_address.ts
View File

@@ -12,6 +12,7 @@ export const API_ADDRESS = {
"apiCreateUser": "/api/user/post?path=create-users",
"apiUpdateUser": "/api/user/post?path=update-users",
"apiDeleteUser": "/api/user/post?path=delete-users",
"apiGetRoleUser": "/api/user/get?path=get-role-user",
// Announcement
"apiGetAllAnnouncement": "/api/announcement/get?path=get-all-announcement",

2
src/module/group/api/post/createGroup.ts
View File

@@ -4,7 +4,7 @@ import { revalidatePath } from "next/cache";
export async function createGroup(req: Request) {
try {
const data = await req.json();
const villaId = "121212";
const villaId = "desa1";
if (!data || !data.name) {
return Response.json(

12
src/module/position/api/get/getAllPosition.ts
View File

@@ -1,12 +1,22 @@
import { prisma } from "@/module/_global";
import { funGetUserByCookies } from "@/module/auth";
import _, { omit } from "lodash";
import { NextRequest } from "next/server";
export async function getAllPosition(req: NextRequest) {
try {
let grupFix
const searchParams = req.nextUrl.searchParams
const groupID = "3";
const groupID = searchParams.get('groupId');
const active = searchParams.get('active');
const user = await funGetUserByCookies()
console.log(groupID)
// if(user.)
const positions = await prisma.position.findMany({
where: {
idGroup: String(groupID),

6
src/module/user/api/api_index.ts
View File

@@ -4,6 +4,7 @@ import { getOneUser } from "./get/getOneUser";
import { updateUser } from "./post/updateUser";
import { deleteUser } from "./post/deleteUser";
import { createUser } from "./post/createUser";
import { getRoleUser } from "./get/getRoleUser";
export const API_INDEX_USER = [
{
@@ -31,4 +32,9 @@ export const API_INDEX_USER = [
method: "POST",
bin: deleteUser,
},
{
path: "get-role-user",
method: "GET",
bin: getRoleUser,
},
];

19
src/module/user/api/get/getAllUser.ts
View File

@@ -1,4 +1,5 @@
import { prisma } from "@/module/_global";
import _ from "lodash";
import { NextRequest } from "next/server";
export async function getAllUser(req: NextRequest) {
@@ -7,14 +8,10 @@ export async function getAllUser(req: NextRequest) {
const idGroup = searchParams.get("idGroup");;
const idVillage = "121212";
const active = searchParams.get("active");
const idPosition = searchParams.get("idPosition");
const idUserRole = searchParams.get("idUserRole");
const users = await prisma.user.findMany({
where: {
isActive: active == "true" ? true : false,
idUserRole: String(idUserRole),
idPosition: String(idPosition),
idVillage: String(idVillage),
idGroup: String(idGroup),
},
@@ -26,6 +23,11 @@ export async function getAllUser(req: NextRequest) {
phone: true,
email: true,
gender: true,
Position: {
select: {
name: true,
},
},
Group: {
select: {
name: true,
@@ -34,7 +36,14 @@ export async function getAllUser(req: NextRequest) {
},
});
return Response.json(users);
const allData = users.map((v: any) => ({
..._.omit(v, ["Group", "Position"]),
group: v.Group.name,
position: v.Position.name,
}));
return Response.json(allData);
} catch (error) {
console.error(error);
return Response.json(

21
src/module/user/api/get/getRoleUser.ts Normal file
View File

@@ -0,0 +1,21 @@
import { prisma } from "@/module/_global";
import { NextRequest } from "next/server";
export async function getRoleUser(req: NextRequest) {
try {
const res = await prisma.userRole.findMany({
select: {
id: true,
name: true,
},
});
return Response.json(res);
} catch (error) {
console.error(error);
return Response.json(
{ success: false, message: "Internal Server Error" },
{ status: 500 }
);
}
}

55
src/module/user/api/post/createUser.ts
View File

@@ -5,33 +5,48 @@ import { NextRequest } from "next/server";
export async function createUser(req: NextRequest) {
try {
const data = await req.json();
const village = "desa1"
const users = await prisma.user.create({
data: {
const cek = await prisma.user.count({
where: {
nik: data.nik,
name: data.name,
phone: data.phone,
email: data.email,
gender: data.gender,
idGroup: data.idGroup,
idVillage: data.idVillage,
idPosition: data.idPosition,
idUserRole: data.idUserRole,
},
select: {
id: true,
nik: true,
name: true,
phone: true,
email: true,
gender: true,
phone: data.phone
},
});
// create log user
const log = await createLogUser({ act: 'CREATE', desc: 'User membuat data user baru', table: 'user', data: users.id })
if (cek == 0) {
const users = await prisma.user.create({
data: {
nik: data.nik,
name: data.name,
phone: data.phone,
email: data.email,
gender: data.gender,
idGroup: data.idGroup,
idVillage: village,
idPosition: data.idPosition,
idUserRole: data.idUserRole,
},
select: {
id: true,
nik: true,
name: true,
phone: true,
email: true,
gender: true,
},
});
// create log user
const log = await createLogUser({ act: 'CREATE', desc: 'User membuat data user baru', table: 'user', data: users.id })
return Response.json({ success: true, message: 'Sukses membuat user' }, { status: 200 });
} else {
return Response.json({ success: false, message: "User sudah ada" }, { status: 400 });
}
return Response.json({ success: true, message: 'Sukses membuat user' }, { status: 200 });
} catch (error) {
console.error(error);

189
src/module/user/member/component/create_member.tsx
View File

@@ -1,13 +1,123 @@
'use client'
import { WARNA } from "@/module/_global";
import { API_ADDRESS, WARNA } from "@/module/_global";
import LayoutModal from "@/module/_global/layout/layout_modal";
import { Box, Button, Select, Stack, TextInput } from "@mantine/core";
import { useState } from "react";
import { useRouter } from "next/navigation";
import { useEffect, useState } from "react";
import toast from "react-hot-toast";
import { HiUser } from "react-icons/hi2";
type dataGroup = {
id: string;
name: string;
};
type dataPosition = {
id: string;
name: string;
};
type dataROleUser = {
id: string;
name: string;
}
export default function CreateMember() {
const router = useRouter()
const [isModal, setModal] = useState(false)
const [listGroup, setListGorup] = useState<dataGroup[]>([])
const [listPosition, setListPosition] = useState<dataPosition[]>([])
const [listUserRole, setListUserRole] = useState<dataROleUser[]>([])
const [listData, setListData] = useState({
nik: "",
name: "",
phone: "",
email: "",
gender: "",
idGroup: "",
idPosition: "",
idUserRole: "",
})
async function getAllGroup() {
try {
const res = await fetch(`${API_ADDRESS.apiGetAllGroup}&villageId=desa1&active=true`)
const data = await res.json()
setListGorup(data)
} catch (error) {
console.error(error)
}
}
async function getAllPosition(val: any) {
try {
const res = await fetch(`${API_ADDRESS.apiGetAllPosition}&groupId=${val}&active=true`)
const data = await res.json()
setListPosition(data)
} catch (error) {
console.error(error)
}
}
async function getAllUserRole() {
try {
const res = await fetch(`${API_ADDRESS.apiGetRoleUser}`)
const data = await res.json()
setListUserRole(data)
} catch (error) {
console.error(error)
}
}
async function changeGrup(val: any) {
console.log(val)
setListPosition([])
setListData({
...listData,
idGroup: val,
idPosition: ""
})
getAllPosition(val)
}
async function onSubmit(val: boolean) {
try {
const res = await fetch(API_ADDRESS.apiCreateUser, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
nik: listData.nik,
name: listData.name,
phone: listData.phone,
email: listData.email,
gender: listData.gender,
idGroup: listData.idGroup,
idPosition: listData.idPosition,
idUserRole: listData.idUserRole
})
})
toast.success("Sukses! Data tersimpan");
setModal(false)
router.push('/member')
} catch (error) {
toast.error('Error')
toast.error("Sukses! Data tersimpan");
}
}
useEffect(() => {
getAllGroup()
getAllUserRole()
}, [])
function onTrue(val: boolean) {
if (val) {
@@ -40,7 +150,17 @@ export default function CreateMember() {
borderColor: WARNA.biruTua,
},
}}
data={['Dinas', 'Adat', 'LPD', 'PKK']}
data={
listGroup
? listGroup.map((data) => ({
value: data.id,
label: data.name,
}))
: []
}
onChange={(val: any) => {
changeGrup(val)
}}
/>
<Select
placeholder="Pilih Jabatan" label="Jabatan" w={"100%"} size="md" required withAsterisk radius={30}
@@ -51,7 +171,41 @@ export default function CreateMember() {
borderColor: WARNA.biruTua,
},
}}
data={['Kepala', 'Sekretaris', 'Bendahara', 'Anggota']}
data={
listPosition
? listPosition.map((data) => ({
value: data.id,
label: data.name,
}))
: []
}
onChange={(val: any) => setListData({
...listData,
idPosition: val
})}
value={listData.idPosition}
/>
<Select
placeholder="Pilih Role" label="User Role" w={"100%"} size="md" required withAsterisk radius={30}
styles={{
input: {
color: WARNA.biruTua,
borderRadius: WARNA.biruTua,
borderColor: WARNA.biruTua,
},
}}
data={
listUserRole
? listUserRole.map((data) => ({
value: data.id,
label: data.name,
}))
: []
}
onChange={(val: any) => setListData({
...listData,
idUserRole: val
})}
/>
<TextInput
size="md" type="number" radius={30} placeholder="NIK" withAsterisk label="NIK" w={"100%"}
@@ -62,6 +216,10 @@ export default function CreateMember() {
borderColor: WARNA.biruTua,
},
}}
onChange={(event: any) => setListData({
...listData,
nik: event.target.value
})}
/>
<TextInput
size="md" type="text" radius={30} placeholder="Nama" withAsterisk label="Nama" w={"100%"}
@@ -72,6 +230,10 @@ export default function CreateMember() {
borderColor: WARNA.biruTua,
},
}}
onChange={(event: any) => setListData({
...listData,
name: event.target.value
})}
/>
<TextInput
size="md" type="email" radius={30} placeholder="Email" withAsterisk label="Email" w={"100%"}
@@ -82,6 +244,10 @@ export default function CreateMember() {
borderColor: WARNA.biruTua,
},
}}
onChange={(event: any) => setListData({
...listData,
email: event.target.value
})}
/>
<TextInput
size="md" type="number" radius={30} placeholder="+62...." withAsterisk label="Nomor Telepon" w={"100%"}
@@ -92,6 +258,10 @@ export default function CreateMember() {
borderColor: WARNA.biruTua,
},
}}
onChange={(event: any) => setListData({
...listData,
phone: event.target.value
})}
/>
<Select
placeholder="Pilih Gender" label="Gender" w={"100%"} size="md" required withAsterisk radius={30}
@@ -102,7 +272,14 @@ export default function CreateMember() {
borderColor: WARNA.biruTua,
},
}}
data={['Laki-laki', 'Perempuan']}
data={[
{ value: 'M', label: 'Laki-laki' },
{ value: 'F', label: 'Perempuan' },
]}
onChange={(val: any) => setListData({
...listData,
gender: val
})}
/>
</Stack>
<Box mt={30} mx={20} pb={20}>
@@ -119,7 +296,7 @@ export default function CreateMember() {
</Box>
<LayoutModal opened={isModal} onClose={() => setModal(false)}
description="Apakah Anda yakin ingin menambahkan data?"
onYes={(val) => { onTrue(val) }} />
onYes={(val) => { onSubmit(val) }} />
</Box>
)
}

15
src/module/user/member/component/ui/tab_list_member.tsx
View File

@@ -8,17 +8,14 @@ import { HiMiniUser } from "react-icons/hi2"
type dataMember = {
id: string,
idUserRole: string,
idVillage: string,
idGroup: string,
idPosition: string,
isActive: boolean
nik: string,
name: string,
phone: string,
email: string,
gender: string,
isActive: boolean
group: string,
position: string,
}
export default function TabListMember({ status }: { status: boolean }) {
@@ -30,7 +27,7 @@ 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) {
@@ -42,7 +39,7 @@ export default function TabListMember({ status }: { status: boolean }) {
useShallowEffect(() => {
getAllUser()
}, [])
}, [status])
return (
<>
@@ -62,7 +59,7 @@ export default function TabListMember({ status }: { status: boolean }) {
</Box>
<Box>
<Text fw={'bold'} c={WARNA.biruTua}>{v.name}</Text>
{/* <Text fw={'lighter'} fz={12}>{v.grup + ' - ' + v.desc}</Text> */}
<Text fw={'lighter'} fz={12}>{v.group + ' - ' + v.position}</Text>
</Box>
</Group>
</Box>