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
Showing only changes of commit 9a1e98325e - Show all commits

View File

@ -189,7 +189,7 @@ export default function AssessmentResultPage() {
// Dropdown State // Dropdown State
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
const [selectedItem, setSelectedItem] = useState('Hasil Assessment'); const [selectedItem, setSelectedItem] = useState('Hasil Asesmen');
const handleDropdownToggle = () => { const handleDropdownToggle = () => {
setIsOpen((prev) => !prev); setIsOpen((prev) => !prev);
@ -197,7 +197,7 @@ export default function AssessmentResultPage() {
const handleItemClick = () => { const handleItemClick = () => {
setSelectedItem(prev => setSelectedItem(prev =>
prev === 'Hasil Assessment' ? 'Hasil Terverifikasi' : 'Hasil Assessment' prev === 'Hasil Asesmen' ? 'Hasil Terverifikasi' : 'Hasil Asesmen'
); );
setIsOpen(false); setIsOpen(false);
}; };
@ -447,7 +447,7 @@ export default function AssessmentResultPage() {
{/* Total verified score */} {/* Total verified score */}
<div className="pt-14"> <div className="pt-14">
{selectedItem === 'Hasil Assessment' ? ( {selectedItem === 'Hasil Asesmen' ? (
<> <>
<div className="flex flex-row h-16 border-t font-semibold justify-between items-center gap-2 pl-8 pr-6 -ml-6"> <div className="flex flex-row h-16 border-t font-semibold justify-between items-center gap-2 pl-8 pr-6 -ml-6">
<p className="text-lg">Nilai Maturitas</p> <p className="text-lg">Nilai Maturitas</p>
@ -572,7 +572,7 @@ export default function AssessmentResultPage() {
{isOpen && ( {isOpen && (
<DropdownMenuContent className="bg-white text-black flex w-44 rounded-sm text-sm items-start"> <DropdownMenuContent className="bg-white text-black flex w-44 rounded-sm text-sm items-start">
<DropdownMenuItem className="w-full" onClick={handleItemClick}> <DropdownMenuItem className="w-full" onClick={handleItemClick}>
{selectedItem === 'Hasil Assessment' ? 'Hasil Terverifikasi' : 'Hasil Assessment'} {selectedItem === 'Hasil Asesmen' ? 'Hasil Terverifikasi' : 'Hasil Asesmen'}
</DropdownMenuItem> </DropdownMenuItem>
</DropdownMenuContent> </DropdownMenuContent>
)} )}
@ -630,7 +630,7 @@ export default function AssessmentResultPage() {
<p>{assessmentResult?.address}</p> <p>{assessmentResult?.address}</p>
</div> </div>
<div> <div>
<p className="text-muted-foreground">Tanggal Assessment</p> <p className="text-muted-foreground">Tanggal Asesmen</p>
<p> <p>
{assessmentResult?.assessmentDate ? ( {assessmentResult?.assessmentDate ? (
new Intl.DateTimeFormat("id-ID", { new Intl.DateTimeFormat("id-ID", {
@ -652,7 +652,7 @@ export default function AssessmentResultPage() {
</div> </div>
<div className="flex flex-col gap-4"> <div className="flex flex-col gap-4">
<div> <div>
<p className="text-muted-foreground">Status Assesment</p> <p className="text-muted-foreground">Status Asesmen</p>
<p>{assessmentResult?.statusAssessment}</p> <p>{assessmentResult?.statusAssessment}</p>
</div> </div>
</div> </div>
@ -661,11 +661,11 @@ export default function AssessmentResultPage() {
} }
{/* Conditional rendering based on selectedItem */} {/* Conditional rendering based on selectedItem */}
{selectedItem === 'Hasil Assessment' ? ( {selectedItem === 'Hasil Asesmen' ? (
<> <>
{/* Score Table */} {/* Score Table */}
<Card className="flex flex-col h-fit my-2 mb-6 overflow-hidden lg:mx-4"> <Card className="flex flex-col h-fit my-2 mb-6 overflow-hidden lg:mx-4">
<p className="text-sm lg:text-lg font-bold p-2 border-b">Tabel Nilai Hasil Assessment</p> <p className="text-sm lg:text-lg font-bold p-2 border-b">Tabel Nilai Hasil Asesmen</p>
<table className="w-full table-fixed border-collapse border rounded-lg overflow-hidden"> <table className="w-full table-fixed border-collapse border rounded-lg overflow-hidden">
<thead> <thead>
<tr> <tr>
@ -715,7 +715,7 @@ export default function AssessmentResultPage() {
<> <>
{/* Verified Result Table */} {/* Verified Result Table */}
<Card className="flex flex-col h-fit my-2 mb-6 overflow-hidden border-y lg:mx-4"> <Card className="flex flex-col h-fit my-2 mb-6 overflow-hidden border-y lg:mx-4">
<p className="text-sm lg:text-lg font-bold p-2 border-b">Tabel Nilai Hasil Assessment Terverifikasi</p> <p className="text-sm lg:text-lg font-bold p-2 border-b">Tabel Nilai Hasil Asesmen Terverifikasi</p>
<table className="w-full table-fixed border-collapse border rounded-lg overflow-hidden"> <table className="w-full table-fixed border-collapse border rounded-lg overflow-hidden">
<thead> <thead>
<tr> <tr>
@ -765,11 +765,11 @@ export default function AssessmentResultPage() {
<Card className="flex flex-col lg:flex-row gap-4 border-none shadow-none lg:mx-4 bg-transparent"> <Card className="flex flex-col lg:flex-row gap-4 border-none shadow-none lg:mx-4 bg-transparent">
{/* Bar Chart */} {/* Bar Chart */}
{selectedItem === 'Hasil Assessment' ? ( {selectedItem === 'Hasil Asesmen' ? (
<> <>
<Card className="w-full"> <Card className="w-full">
<CardHeader className="items-start"> <CardHeader className="items-start">
<CardTitle className="text-sm lg:text-lg">Diagram Nilai Hasil Assessment</CardTitle> <CardTitle className="text-sm lg:text-lg">Diagram Nilai Hasil Asesmen</CardTitle>
</CardHeader> </CardHeader>
<CardContent> <CardContent>
<BarChartComponent barChartData={sortedBarChartData} barChartConfig={barChartConfig} /> <BarChartComponent barChartData={sortedBarChartData} barChartConfig={barChartConfig} />
@ -780,7 +780,7 @@ export default function AssessmentResultPage() {
<> <>
<Card className="w-full"> <Card className="w-full">
<CardHeader className="items-start"> <CardHeader className="items-start">
<CardTitle className="text-sm lg:text-lg">Diagram Nilai Hasil Assessment Terverifikasi</CardTitle> <CardTitle className="text-sm lg:text-lg">Diagram Nilai Hasil Asesmen Terverifikasi</CardTitle>
</CardHeader> </CardHeader>
<CardContent> <CardContent>
<BarChartComponent barChartData={sortedVerifiedBarChartData} barChartConfig={barChartConfig} /> <BarChartComponent barChartData={sortedVerifiedBarChartData} barChartConfig={barChartConfig} />
@ -790,7 +790,7 @@ export default function AssessmentResultPage() {
)} )}
{/* Pie Chart */} {/* Pie Chart */}
{selectedItem === 'Hasil Assessment' ? ( {selectedItem === 'Hasil Asesmen' ? (
<Card className="flex flex-col w-full lg:w-64"> <Card className="flex flex-col w-full lg:w-64">
<CardContent> <CardContent>
<PieChartComponent <PieChartComponent