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

Merge pull request #258 from bipproduction/amalia/26-september-24

Browse Source 
Amalia/26 september 24
This commit is contained in:
Amalia
2024-09-26 12:17:37 +08:00
committed by GitHub
parent cbda027816 8505a5b543
commit 89a8259283
14 changed files with 80 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/(application)/division/[id]/(fitur-division)/task/create/page.tsx
View File

@@ -1,10 +1,6 @@
import { CreateTask, FileSave } from "@/module/task";
import { CreateTask } from "@/module/task";
function Page({ searchParams }: { searchParams: any }) {
// if (searchParams.page == "file-save")
// return <FileSave kategori="task" />
return <CreateTask />
}

10
src/app/api/discussion/route.ts
View File

@@ -40,12 +40,10 @@ export async function GET(request: Request) {
where: {
isActive: true,
idDivision: idDivision,
User: {
name: {
contains: (name == undefined || name == "null") ? "" : name,
mode: "insensitive"
}
}
desc: {
contains: (name == undefined || name == "null") ? "" : name,
mode: "insensitive"
},
},
orderBy: {
createdAt: 'desc'

7
src/app/api/division/[id]/detail/route.ts
View File

@@ -86,7 +86,12 @@ export async function GET(request: Request, context: { params: { id: string } })
idDivision: String(id),
status: 0,
isActive: true,
dateStart: new Date()
dateStart: new Date(),
DivisionProject: {
status: {
lt: 3
}
}
},
select: {
id: true,

3
src/app/api/division/more/route.ts
View File

@@ -38,6 +38,9 @@ export async function GET(request: Request) {
select: {
id: true,
name: true,
},
orderBy: {
name: "asc"
}
});

51
src/app/api/task/[id]/route.ts
View File

@@ -44,14 +44,23 @@ export async function GET(request: Request, context: { params: { id: string } })
}
})
const semua = dataProgress.length
const selesai = _.filter(dataProgress, { status: 1 }).length
const progress = Math.ceil((selesai / semua) * 100)
if (dataProgress.length > 0) {
const semua = dataProgress.length
const selesai = _.filter(dataProgress, { status: 1 }).length
const progress = Math.ceil((selesai / semua) * 100)
allData = {
progress: progress,
lastUpdate: moment(dataProgress[0].updatedAt).format("DD MMMM YYYY"),
allData = {
progress: progress,
lastUpdate: moment(dataProgress[0]?.updatedAt).format("DD MMMM YYYY"),
}
} else {
allData = {
progress: 0,
lastUpdate: '1 Januari 1999',
}
}
} else if (kategori == "task") {
const dataProgress = await prisma.divisionProjectTask.findMany({
where: {
@@ -66,7 +75,7 @@ export async function GET(request: Request, context: { params: { id: string } })
dateEnd: true,
},
orderBy: {
status: 'desc'
createdAt: 'asc'
}
})
@@ -192,6 +201,34 @@ export async function POST(request: Request, context: { params: { id: string } }
}
});
// const cek progress
const dataTask = await prisma.divisionProjectTask.findMany({
where: {
isActive: true,
idProject: id
}
})
const semua = dataTask.length
const selesai = _.filter(dataTask, { status: 1 }).length
const progress = Math.ceil((selesai / semua) * 100)
let statusProject = 1
if (progress == 100) {
statusProject = 2
} else if (progress == 0) {
statusProject = 0
}
const updProject = await prisma.divisionProject.update({
where: {
id: id
},
data: {
status: statusProject
}
})
// create log user
const log = await createLogUser({ act: 'CREATE', desc: 'User menambahkan detail tugas divisi', table: 'divisionProjectTask', data: create.id })

3
src/app/api/task/route.ts
View File

@@ -68,6 +68,9 @@ export async function GET(request: Request) {
idUser: true
}
}
},
orderBy: {
createdAt: "desc"
}
});

2
src/module/_global/layout/layout_modal.tsx
View File

@@ -30,6 +30,7 @@ export default function LayoutModal({ opened, onClose, description, onYes }: { o
<Button loading={loading} fullWidth size="lg" radius={'xl'} bg={'green'} onClick={() => {
setLoading(true)
onYes(true)
setLoading(false)
}}>YA</Button>
<Button fullWidth size="lg" radius={'xl'} bg={'#F1C1CF'} c={'#D30B30'} onClick={() => onYes(false)}>TIDAK</Button>
</>
@@ -39,6 +40,7 @@ export default function LayoutModal({ opened, onClose, description, onYes }: { o
<Button loading={loading} fullWidth size="lg" radius={'xl'} bg={'green'} onClick={() => {
setLoading(true)
onYes(true)
setLoading(false)
}}>YA</Button>
</>

10
src/module/project/ui/tab_project.tsx
View File

@@ -26,12 +26,12 @@ export default function TabProject() {
{
id: "0",
title: "Segera",
icon: <RiProgress3Line style={iconStyle} />
icon: <TbClockPause style={iconStyle} />
},
{
id: "1",
title: "Dikerjakan",
icon: <TbClockPause style={iconStyle} />
icon: <RiProgress3Line style={iconStyle} />
},
{
id: "2",
@@ -73,7 +73,7 @@ export default function TabProject() {
color={
status == item.id
? "white"
: tema.get().utama
: (status == null && item.id == "0") ? "white" : tema.get().utama
}
key={index}
onClick={() => { router.push("?status=" + item.id + "&group=" + group) }}
@@ -81,8 +81,8 @@ export default function TabProject() {
radius={"xl"}
bg={
status == item.id
? tema.get().utama
: "transparent"
? tema.get().bgFiturDivision
: (status == null && item.id == "0") ? tema.get().bgFiturDivision : "transparent"
}
leftSection={item.icon}
>

4
src/module/task/ui/add_file_detail_task.tsx
View File

@@ -98,9 +98,9 @@ export default function AddFileDetailTask() {
}}
activateOnClick={false}
maxSize={3 * 1024 ** 2}
accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']}
accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf']}
onReject={(files) => {
return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
return toast.error('File yang diizinkan: .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
}}
>
</Dropzone>

4
src/module/task/ui/create_task.tsx
View File

@@ -304,9 +304,9 @@ export default function CreateTask() {
}}
activateOnClick={false}
maxSize={3 * 1024 ** 2}
accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']}
accept={['image/png', 'image/jpeg', 'image/heic', 'application/pdf']}
onReject={(files) => {
return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
return toast.error('File yang diizinkan: .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
}}
></Dropzone>

5
src/module/task/ui/detail_list_anggota_task.tsx
View File

@@ -100,9 +100,8 @@ export default function ListAnggotaDetailTask() {
style={{
border: `1px solid ${"#C7D6E8"}`,
borderRadius: 10,
padding: 20
}}
px={20}
py={10}
>
{
loading ?
@@ -114,7 +113,7 @@ export default function ListAnggotaDetailTask() {
</Box>
))
:
isData.length === 0 ? <Text>Tidak ada anggota</Text> :
isData.length === 0 ? <Text c={"dimmed"} ta={"center"} fs={"italic"}>Tidak ada anggota</Text> :
isData.map((v, i) => {
return (
<Box key={i}>

2
src/module/task/ui/detail_list_file_task.tsx
View File

@@ -109,7 +109,7 @@ export default function ListFileDetailTask() {
</Box>
))
:
isData.length === 0 ? <Text>Tidak ada file</Text> :
isData.length === 0 ? <Text c={"dimmed"} ta={"center"} fs={"italic"}>Tidak ada file</Text> :
isData.map((item, index) => {
return (
<Box

5
src/module/task/ui/detail_list_tugas_task.tsx
View File

@@ -118,9 +118,8 @@ export default function ListTugasDetailTask() {
style={{
borderRadius: 10,
border: `1px solid ${"#D6D8F6"}`,
padding:20
}}
pl={20}
pr={20}
>
{
loading ?
@@ -130,7 +129,7 @@ export default function ListTugasDetailTask() {
</Box>
</>
:
isData.length === 0 ? <Text>Tidak ada tugas</Text> :
isData.length === 0 ? <Text c={"dimmed"} ta={"center"} fs={"italic"}>Tidak ada tugas</Text> :
isData.map((item, index) => {
return (
<Box key={index}>

3
src/module/task/ui/edit_detail_task.tsx
View File

@@ -32,6 +32,7 @@ export default function EditDetailTask() {
const param = useParams<{ id: string, detail: string }>()
const [openModal, setOpenModal] = useState(false)
const [loading, setLoading] = useState(true)
const [idTugas, setIdTugas] = useState("")
const tema = useHookstate(TEMA)
async function onSubmit() {
@@ -50,6 +51,7 @@ export default function EditDetailTask() {
if (res.success) {
toast.success(res.message);
router.push(`/division/${param.id}/task/${idTugas}`)
} else {
toast.error(res.message);
}
@@ -65,6 +67,7 @@ export default function EditDetailTask() {
setLoading(true)
const res = await funGetDetailTask(param.detail);
if (res.success) {
setIdTugas(res.data.idProject)
setTitle(res.data.title)
setValue([
new Date(moment(res.data.dateStart).format('YYYY-MM-DD')),