diff --git a/src/app/admin/maintenance/page.tsx b/src/app/admin/maintenance/page.tsx
index 0c8f108..af13835 100644
--- a/src/app/admin/maintenance/page.tsx
+++ b/src/app/admin/maintenance/page.tsx
@@ -1,13 +1,14 @@
'use client';
import Link from 'next/link';
+import { useRouter } from 'next/navigation';
import { useState } from 'react';
import {
AlertTriangle, Search, Plus, X, Check, Clock, Bike, User, Phone,
- MapPin, FileText, Image, DollarSign, Wrench, Battery, Key,
+ MapPin, FileText, Image as ImageIcon, DollarSign, Wrench, Battery, Key,
CheckCircle, XCircle, ChevronDown, ChevronUp, Download, Eye, Edit,
- MessageSquare, Filter, Calendar, Save, Printer, Send
+ MessageSquare, Filter, Calendar, Save, Printer, Send, Activity
} from 'lucide-react';
type TransactionType = 'deposit' | 'rent_income' | 'investor_funding' | 'investor_withdraw' | 'salary' | 'rent_expense' | 'utility' | 'maintenance' | 'bike_purchase' | 'bike_sale' | 'other_income' | 'other_expense';
@@ -245,6 +246,7 @@ const typeIcons: Record
= {
};
export default function MaintenancePage() {
+ const router = useRouter();
const [mainCategory, setMainCategory] = useState<'damage' | 'maintenance'>('damage');
const [targetType, setTargetType] = useState<'all' | 'battery' | 'fleet'>('all');
const [records, setRecords] = useState(mockMaintenance);
@@ -261,6 +263,7 @@ export default function MaintenancePage() {
const [newNoteText, setNewNoteText] = useState('');
const [editForm, setEditForm] = useState>({});
const [reportType, setReportType] = useState<'damage' | 'maintenance'>('damage');
+ const [showSuccessModal, setShowSuccessModal] = useState(false);
const filteredRecords = records.filter(r => {
const isDamage = r.type === 'damage';
@@ -281,13 +284,21 @@ export default function MaintenancePage() {
const damageRecords = records.filter(r => r.type === 'damage');
const maintenanceRecords = records.filter(r => r.type !== 'damage');
+ const currentMonth = new Date().toISOString().slice(0, 7);
const stats = {
damageCount: damageRecords.length,
maintenanceCount: maintenanceRecords.length,
+ damageThisMonth: damageRecords.filter(r => r.date?.slice(0, 7) === currentMonth).length,
+ maintenanceThisMonth: maintenanceRecords.filter(r => r.date?.slice(0, 7) === currentMonth).length,
+ completedThisMonth: records.filter(r => r.status === 'completed' && r.resolvedAt?.slice(0, 7) === currentMonth).length,
batteryDamage: damageRecords.filter(r => r.batteryId).length,
fleetDamage: damageRecords.filter(r => r.bikeId && !r.batteryId).length,
batteryMaintenance: maintenanceRecords.filter(r => r.batteryId).length,
fleetMaintenance: maintenanceRecords.filter(r => r.bikeId && !r.batteryId).length,
+ upcomingBattery: maintenanceRecords.filter(r => r.batteryId && r.status === 'reported').length,
+ upcomingFleet: maintenanceRecords.filter(r => r.bikeId && !r.batteryId && r.status === 'reported').length,
+ ongoingBattery: maintenanceRecords.filter(r => r.batteryId && r.status === 'in_progress').length,
+ ongoingFleet: maintenanceRecords.filter(r => r.bikeId && !r.batteryId && r.status === 'in_progress').length,
pendingMaintenance: maintenanceRecords.filter(r => r.status === 'reported' || r.status === 'in_progress').length,
completedMaintenance: maintenanceRecords.filter(r => r.status === 'completed').length,
critical: records.filter(r => r.severity === 'critical' && r.status !== 'completed').length,
@@ -414,7 +425,7 @@ export default function MaintenancePage() {
};
return (
-
+
Damage & Maintenance
@@ -436,8 +447,11 @@ export default function MaintenancePage() {
-
-
{stats.damageCount}
+
+
+
{stats.damageCount}
+
{stats.damageThisMonth} this month
+
Total Damage
@@ -447,19 +461,25 @@ export default function MaintenancePage() {
-
-
{stats.maintenanceCount}
+
+
+
{stats.maintenanceCount}
+
{stats.maintenanceThisMonth} this month
+
Total Maintenance
-
+
-
-
{stats.completed}
+
+
+
{stats.completed}
+
{stats.completedThisMonth} this month
+
Completed
@@ -550,36 +570,36 @@ export default function MaintenancePage() {
-
-
-
-
-
-
-
{stats.batteryMaintenance}
-
Battery Maintenance
-
-
-
-
{stats.fleetMaintenance}
-
Fleet Maintenance
+
{stats.upcomingFleet}
+
Upcoming Fleet
+
+
+
+
+
+
+
+
+
+
{stats.upcomingBattery}
+
Upcoming Battery
-
{stats.pendingMaintenance}
-
Pending Maintenance
+
{stats.ongoingBattery + stats.ongoingFleet}
+
Ongoing Maintenance
@@ -656,57 +676,59 @@ export default function MaintenancePage() {
{filteredRecords.map(record => {
const TypeIcon = typeIcons[record.type];
return (
-
-
-
-
-
+
+
+
+
+
-
-
-
{record.id}
+
+
+
{record.id}
{record.batteryId && (
-
+
Battery
)}
{!record.batteryId && record.bikeId && (
-
+
Fleet
)}
-
+
{record.severity}
-
- {record.bikeModel} ({record.bikePlate})
- |
- {record.reporterName}
+
+ {record.bikeModel}
+ |
+ {record.bikePlate}
+ |
+ {record.reporterName}
-
-
{record.description}
-
+
+
{record.description}
+
{record.date}
-
- {record.location}
+
+ {record.location}
{record.images.length > 0 && (
- {record.images.length} photos
+ {record.images.length}
)}
{record.notes.length > 0 && (
)}
@@ -721,24 +743,24 @@ export default function MaintenancePage() {
)}
-
-
+
+
৳{record.actualCost || record.estimatedCost}
{record.paymentStatus === 'paid' ? 'Paid' : record.paymentStatus === 'approved' ? 'Approved' : 'Payment ' + record.paymentStatus}
-
- {record.status === 'reported' && }
- {record.status === 'in_progress' && }
- {record.status === 'parts_ordered' && }
- {record.status === 'completed' && }
- {record.status === 'cancelled' && }
- {record.status.replace('_', ' ')}
-
+
+
+ {record.status === 'reported' && }
+ {record.status === 'in_progress' && }
+ {record.status === 'parts_ordered' && }
+ {record.status === 'completed' && }
+ {record.status === 'cancelled' && }
+ {record.status.replace('_', ' ')}
+
-
)}
+
+ {showSuccessModal && (
+
+
+
+
+
+
Issue Reported Successfully!
+
Your issue has been submitted and will be reviewed shortly.
+
+
+
+ )}
);
}
\ No newline at end of file