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

5
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,6 +266,8 @@ export default function AspectFormModal() {
</Button> </Button>
)} )}
</div> </div>
</ScrollArea>
<AlertDialogFooter> <AlertDialogFooter>
<AlertDialogCancel disabled={isSubmitting}>Tutup</AlertDialogCancel> <AlertDialogCancel disabled={isSubmitting}>Tutup</AlertDialogCancel>
{formType !== "detail" && ( {formType !== "detail" && (
@ -275,7 +277,6 @@ export default function AspectFormModal() {
)} )}
</AlertDialogFooter> </AlertDialogFooter>
</form> </form>
</ScrollArea>
</AlertDialogContent> </AlertDialogContent>
</AlertDialog> </AlertDialog>
); );

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

@ -198,6 +198,7 @@ export default function AssessmentRequestManagementFormModal({
], ],
})} })}
</ScrollArea>
<div className="flex justify-end gap-4 mt-4"> <div className="flex justify-end gap-4 mt-4">
<Button <Button
onClick={onClose} onClick={onClose}
@ -228,7 +229,6 @@ export default function AssessmentRequestManagementFormModal({
</> </>
)} )}
</div> </div>
</ScrollArea>
</DialogDescription> </DialogDescription>
</DialogContent> </DialogContent>
</Dialog> </Dialog>