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

Pull Request branch dev-clone to main #1

Merged
gitea merged 429 commits from dev-clone into main 2024-12-23 09:31:34 +00:00
Conversation 0 Commits 429 Files Changed 142 +43 -42
2 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 28c314a8ba - Show all commits

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

@ -189,8 +189,8 @@ export default function AspectFormModal() {
</AlertDialogDescription>
</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="mb-4">
<Label htmlFor="name" className="block text-left mb-1">Nama Aspek</Label>
@ -266,16 +266,17 @@ export default function AspectFormModal() {
</Button>
)}
</div>
<AlertDialogFooter>
<AlertDialogCancel disabled={isSubmitting}>Tutup</AlertDialogCancel>
{formType !== "detail" && (
<Button type="submit" disabled={isSubmitting}>
{isSubmitting ? "Menyimpan..." : modalTitle}
</Button>
)}
</AlertDialogFooter>
</form>
</ScrollArea>
</ScrollArea>
<AlertDialogFooter>
<AlertDialogCancel disabled={isSubmitting}>Tutup</AlertDialogCancel>
{formType !== "detail" && (
<Button type="submit" disabled={isSubmitting}>
{isSubmitting ? "Menyimpan..." : modalTitle}
</Button>
)}
</AlertDialogFooter>
</form>
</AlertDialogContent>
</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>
<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>
</DialogContent>
</Dialog>