gitea/amati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update: save and exit buttons are outside the scrollarea in manAssReq and manAspect

Browse Source
This commit is contained in:
percyfikri 2024-11-15 10:08:04 +07:00
parent 830ea9f635
commit 28c314a8ba
2 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apps/frontend/src/modules/aspectManagement/modals/AspectFormModal.tsx
View File

@ -189,8 +189,8 @@ export default function AspectFormModal() {
</AlertDialogDescription> </AlertDialogDescription>
</AlertDialogHeader> </AlertDialogHeader>
<ScrollArea className="h-[300px] p-4"> <form onSubmit={handleSubmit}>
<form onSubmit={handleSubmit}> <ScrollArea className="h-[300px] p-4">
<div className="grid gap-4"> <div className="grid gap-4">
<div className="mb-4"> <div className="mb-4">
<Label htmlFor="name" className="block text-left mb-1">Nama Aspek</Label> <Label htmlFor="name" className="block text-left mb-1">Nama Aspek</Label>
@ -266,16 +266,17 @@ export default function AspectFormModal() {
</Button> </Button>
)} )}
</div> </div>
<AlertDialogFooter> </ScrollArea>
<AlertDialogCancel disabled={isSubmitting}>Tutup</AlertDialogCancel>
{formType !== "detail" && ( <AlertDialogFooter>
<Button type="submit" disabled={isSubmitting}> <AlertDialogCancel disabled={isSubmitting}>Tutup</AlertDialogCancel>
{isSubmitting ? "Menyimpan..." : modalTitle} {formType !== "detail" && (
</Button> <Button type="submit" disabled={isSubmitting}>
)} {isSubmitting ? "Menyimpan..." : modalTitle}
</AlertDialogFooter> </Button>
</form> )}
</ScrollArea> </AlertDialogFooter>
</form>
</AlertDialogContent> </AlertDialogContent>
</AlertDialog> </AlertDialog>
); );

60
apps/frontend/src/modules/assessmentRequestManagement/modals/AssessmentRequestManagementFormModal.tsx
View File

@ -198,37 +198,37 @@ export default function AssessmentRequestManagementFormModal({
], ],
})} })}
<div className="flex justify-end gap-4 mt-4">
<Button
onClick={onClose}
variant="outline"
disabled={mutation.isPending}
className="min-w-20"
>
Tutup
</Button>
{status !== "selesai" && (
<>
<Button
onClick={() => handleStatusChange("ditolak")}
variant="destructive"
disabled={mutation.isPending}
className="min-w-20"
>
Tolak
</Button>
<Button
onClick={() => handleStatusChange("diterima")}
variant="default"
disabled={mutation.isPending}
className="min-w-20"
>
Terima
</Button>
</>
)}
</div>
</ScrollArea> </ScrollArea>
<div className="flex justify-end gap-4 mt-4">
<Button
onClick={onClose}
variant="outline"
disabled={mutation.isPending}
className="min-w-20"
>
Tutup
</Button>
{status !== "selesai" && (
<>
<Button
onClick={() => handleStatusChange("ditolak")}
variant="destructive"
disabled={mutation.isPending}
className="min-w-20"
>
Tolak
</Button>
<Button
onClick={() => handleStatusChange("diterima")}
variant="default"
disabled={mutation.isPending}
className="min-w-20"
>
Terima
</Button>
</>
)}
</div>
</DialogDescription> </DialogDescription>
</DialogContent> </DialogContent>
</Dialog> </Dialog>