Skip to content

Commit 6d36bf2

Browse files
committed
fix: requirements fixed
1 parent 73fae98 commit 6d36bf2

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

frontend-v2/src/pages/ClassesPage.tsx

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import { BulkCancelClassesModal } from '@/components/BulkCancelClassesModal';
4949

5050
const STATUS_OPTIONS: { label: string; value: string }[] = [
5151
{ label: 'All Status', value: 'all' },
52+
{ label: 'Active & Scheduled', value: 'active_scheduled' },
5253
{ label: 'Active', value: SelectedClassStatus.Active },
5354
{ label: 'Scheduled', value: SelectedClassStatus.Scheduled },
5455
{ label: 'Completed', value: SelectedClassStatus.Completed },
@@ -178,7 +179,13 @@ export default function ClassesPage() {
178179
result = result.filter((cls) => cls.program_id === pid);
179180
}
180181

181-
if (statusFilter !== 'all') {
182+
if (statusFilter === 'active_scheduled') {
183+
result = result.filter(
184+
(cls) =>
185+
cls.status === SelectedClassStatus.Active ||
186+
cls.status === SelectedClassStatus.Scheduled
187+
);
188+
} else if (statusFilter !== 'all') {
182189
result = result.filter((cls) => cls.status === statusFilter);
183190
}
184191

@@ -211,7 +218,9 @@ export default function ClassesPage() {
211218
Classes
212219
</h1>
213220
<p className="text-gray-600 mt-1">
214-
Manage and monitor all classes at your facility
221+
{deptAdmin
222+
? 'Manage and monitor classes across all facilities'
223+
: 'Manage and monitor all classes at your facility'}
215224
</p>
216225
</div>
217226
<div className="flex gap-2">
@@ -534,11 +543,11 @@ function ClassRow({
534543
value={enrollPct}
535544
className="h-2 bg-gray-200"
536545
indicatorClassName={cn(
537-
enrollPct >= 75
546+
enrollPct >= 80
538547
? 'bg-[#556830]'
539-
: enrollPct >= 40
548+
: enrollPct >= 50
540549
? 'bg-[#F1B51C]'
541-
: 'bg-red-500'
550+
: 'bg-gray-400'
542551
)}
543552
/>
544553
</div>

0 commit comments

Comments
 (0)