fix: project
Deskripsi: - ganti warna sesuai temq - pencarian anggota - realtime edit tugas - loading saat upload file - order list file by created at - tidak menampilkan anggota dg user role selain coadmin dan user pada tambah anggota project - perbaikan link roouter tombol back pada detail project - memberikan loading pada cancel kegiatan No Issues
This commit is contained in:
@@ -136,6 +136,10 @@ export async function GET(request: Request, context: { params: { id: string } })
|
||||
id: {
|
||||
not: String(userId)
|
||||
},
|
||||
OR: [
|
||||
{ idUserRole: 'coadmin', },
|
||||
{ idUserRole: 'user', }
|
||||
],
|
||||
isActive: true,
|
||||
name: {
|
||||
contains: (name == undefined || name == "null") ? "" : name,
|
||||
@@ -147,14 +151,24 @@ export async function GET(request: Request, context: { params: { id: string } })
|
||||
id: true,
|
||||
name: true,
|
||||
email: true,
|
||||
img: true
|
||||
img: true,
|
||||
UserRole: {
|
||||
select: {
|
||||
name: true
|
||||
}
|
||||
}
|
||||
},
|
||||
orderBy: {
|
||||
name: 'asc'
|
||||
}
|
||||
})
|
||||
|
||||
const fixMember = member.map((v: any) => ({
|
||||
const omitData = member.map((v: any) => ({
|
||||
..._.omit(v, ["UserRole"]),
|
||||
userRole: v.UserRole.name
|
||||
}))
|
||||
|
||||
const fixMember = omitData.map((v: any) => ({
|
||||
idUser: v.id,
|
||||
name: v.name,
|
||||
email: v.email,
|
||||
|
||||
@@ -65,6 +65,7 @@ export async function GET(request: Request, context: { params: { id: string } })
|
||||
status: true,
|
||||
dateStart: true,
|
||||
dateEnd: true,
|
||||
createdAt: true
|
||||
},
|
||||
orderBy: {
|
||||
createdAt: 'asc'
|
||||
@@ -72,12 +73,13 @@ export async function GET(request: Request, context: { params: { id: string } })
|
||||
})
|
||||
|
||||
const formatData = dataProgress.map((v: any) => ({
|
||||
..._.omit(v, ["dateStart", "dateEnd"]),
|
||||
..._.omit(v, ["dateStart", "dateEnd", "createdAt"]),
|
||||
dateStart: moment(v.dateStart).format("DD-MM-YYYY"),
|
||||
dateEnd: moment(v.dateEnd).format("DD-MM-YYYY"),
|
||||
createdAt: moment(v.createdAt).format("DD-MM-YYYY HH:mm"),
|
||||
}))
|
||||
|
||||
allData = formatData
|
||||
const dataFix = _.orderBy(formatData, 'createdAt', 'asc')
|
||||
allData = dataFix
|
||||
|
||||
} else if (kategori == "file") {
|
||||
const dataFile = await prisma.projectFile.findMany({
|
||||
@@ -86,7 +88,7 @@ export async function GET(request: Request, context: { params: { id: string } })
|
||||
idProject: String(id)
|
||||
},
|
||||
orderBy: {
|
||||
createdAt: 'desc'
|
||||
createdAt: 'asc'
|
||||
},
|
||||
select: {
|
||||
id: true,
|
||||
|
||||
Reference in New Issue
Block a user