Meters fix to show data in table component
This commit is contained in:
@@ -10,20 +10,25 @@ const getAuthHeaders = () => ({
|
||||
export interface MeterRecord {
|
||||
id: string;
|
||||
fields: {
|
||||
device_id: string;
|
||||
meter_address: string;
|
||||
manufacturer_code: string;
|
||||
forward_cumulative_flow: number;
|
||||
reverse_cumulative_flow: number;
|
||||
forward_instantaneous_flow: number;
|
||||
water_temperature: number;
|
||||
voltage: number;
|
||||
echo_amplitude: number;
|
||||
ultrasonic_flight_time: number;
|
||||
timestamp: string;
|
||||
alarm_bytes: string;
|
||||
checksum_ok: boolean;
|
||||
received_at: string;
|
||||
CreatedAt: string;
|
||||
UpdatedAt: string;
|
||||
"Area Name": string;
|
||||
"Account Number": string | null;
|
||||
"User Name": string | null;
|
||||
"User Address": string | null;
|
||||
"Meter S/N": string;
|
||||
"Meter Name": string;
|
||||
"Meter Status": string;
|
||||
"Protocol Type": string;
|
||||
"Price No.": string | null;
|
||||
"Price Name": string | null;
|
||||
"DMA Partition": string | null;
|
||||
"Supply Types": string;
|
||||
"Device ID": string;
|
||||
"Device Name": string;
|
||||
"Device Type": string;
|
||||
"Usage Analysis Type": string;
|
||||
"Installed Time": string;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -37,20 +42,25 @@ export interface MetersResponse {
|
||||
|
||||
export interface Meter {
|
||||
id: string;
|
||||
createdAt: string;
|
||||
updatedAt: string;
|
||||
areaName: string;
|
||||
accountNumber: string | null;
|
||||
userName: string | null;
|
||||
userAddress: string | null;
|
||||
meterSerialNumber: string;
|
||||
meterName: string;
|
||||
meterStatus: string;
|
||||
protocolType: string;
|
||||
priceNo: string | null;
|
||||
priceName: string | null;
|
||||
dmaPartition: string | null;
|
||||
supplyTypes: string;
|
||||
deviceId: string;
|
||||
meterAddress: string;
|
||||
manufacturerCode: string;
|
||||
forwardCumulativeFlow: number;
|
||||
reverseCumulativeFlow: number;
|
||||
forwardInstantaneousFlow: number;
|
||||
waterTemperature: number;
|
||||
voltage: number;
|
||||
echoAmplitude: number;
|
||||
ultrasonicFlightTime: number;
|
||||
timestamp: string;
|
||||
alarmBytes: string;
|
||||
checksumOk: boolean;
|
||||
receivedAt: string;
|
||||
deviceName: string;
|
||||
deviceType: string;
|
||||
usageAnalysisType: string;
|
||||
installedTime: string;
|
||||
}
|
||||
|
||||
export const fetchMeters = async (): Promise<Meter[]> => {
|
||||
@@ -65,24 +75,31 @@ export const fetchMeters = async (): Promise<Meter[]> => {
|
||||
}
|
||||
|
||||
const data: MetersResponse = await response.json();
|
||||
|
||||
return data.records.map((r: MeterRecord) => ({
|
||||
const ans = data.records.map((r: MeterRecord) => ({
|
||||
id: r.id,
|
||||
deviceId: r.fields.device_id || "",
|
||||
meterAddress: r.fields.meter_address || "",
|
||||
manufacturerCode: r.fields.manufacturer_code || "",
|
||||
forwardCumulativeFlow: r.fields.forward_cumulative_flow || 0,
|
||||
reverseCumulativeFlow: r.fields.reverse_cumulative_flow || 0,
|
||||
forwardInstantaneousFlow: r.fields.forward_instantaneous_flow || 0,
|
||||
waterTemperature: r.fields.water_temperature || 0,
|
||||
voltage: r.fields.voltage || 0,
|
||||
echoAmplitude: r.fields.echo_amplitude || 0,
|
||||
ultrasonicFlightTime: r.fields.ultrasonic_flight_time || 0,
|
||||
timestamp: r.fields.timestamp || "",
|
||||
alarmBytes: r.fields.alarm_bytes || "",
|
||||
checksumOk: r.fields.checksum_ok || false,
|
||||
receivedAt: r.fields.received_at || "",
|
||||
createdAt: r.fields.CreatedAt || "",
|
||||
updatedAt: r.fields.UpdatedAt || "",
|
||||
areaName: r.fields["Area Name"] || "",
|
||||
accountNumber: r.fields["Account Number"] || null,
|
||||
userName: r.fields["User Name"] || null,
|
||||
userAddress: r.fields["User Address"] || null,
|
||||
meterSerialNumber: r.fields["Meter S/N"] || "",
|
||||
meterName: r.fields["Meter Name"] || "",
|
||||
meterStatus: r.fields["Meter Status"] || "",
|
||||
protocolType: r.fields["Protocol Type"] || "",
|
||||
priceNo: r.fields["Price No."] || null,
|
||||
priceName: r.fields["Price Name"] || null,
|
||||
dmaPartition: r.fields["DMA Partition"] || null,
|
||||
supplyTypes: r.fields["Supply Types"] || "",
|
||||
deviceId: r.fields["Device ID"] || "",
|
||||
deviceName: r.fields["Device Name"] || "",
|
||||
deviceType: r.fields["Device Type"] || "",
|
||||
usageAnalysisType: r.fields["Usage Analysis Type"] || "",
|
||||
installedTime: r.fields["Installed Time"] || "",
|
||||
}));
|
||||
console.log ("ans", ans);
|
||||
|
||||
return ans;
|
||||
} catch (error) {
|
||||
console.error("Error fetching meters:", error);
|
||||
throw error;
|
||||
@@ -98,20 +115,25 @@ export const createMeter = async (
|
||||
headers: getAuthHeaders(),
|
||||
body: JSON.stringify({
|
||||
fields: {
|
||||
device_id: meterData.deviceId,
|
||||
meter_address: meterData.meterAddress,
|
||||
manufacturer_code: meterData.manufacturerCode,
|
||||
forward_cumulative_flow: meterData.forwardCumulativeFlow,
|
||||
reverse_cumulative_flow: meterData.reverseCumulativeFlow,
|
||||
forward_instantaneous_flow: meterData.forwardInstantaneousFlow,
|
||||
water_temperature: meterData.waterTemperature,
|
||||
voltage: meterData.voltage,
|
||||
echo_amplitude: meterData.echoAmplitude,
|
||||
ultrasonic_flight_time: meterData.ultrasonicFlightTime,
|
||||
timestamp: meterData.timestamp,
|
||||
alarm_bytes: meterData.alarmBytes,
|
||||
checksum_ok: meterData.checksumOk,
|
||||
received_at: meterData.receivedAt,
|
||||
CreatedAt: meterData.createdAt,
|
||||
UpdatedAt: meterData.updatedAt,
|
||||
"Area Name": meterData.areaName,
|
||||
"Account Number": meterData.accountNumber,
|
||||
"User Name": meterData.userName,
|
||||
"User Address": meterData.userAddress,
|
||||
"Meter S/N": meterData.meterSerialNumber,
|
||||
"Meter Name": meterData.meterName,
|
||||
"Meter Status": meterData.meterStatus,
|
||||
"Protocol Type": meterData.protocolType,
|
||||
"Price No.": meterData.priceNo,
|
||||
"Price Name": meterData.priceName,
|
||||
"DMA Partition": meterData.dmaPartition,
|
||||
"Supply Types": meterData.supplyTypes,
|
||||
"Device ID": meterData.deviceId,
|
||||
"Device Name": meterData.deviceName,
|
||||
"Device Type": meterData.deviceType,
|
||||
"Usage Analysis Type": meterData.usageAnalysisType,
|
||||
"Installed Time": meterData.installedTime,
|
||||
},
|
||||
}),
|
||||
});
|
||||
@@ -129,20 +151,25 @@ export const createMeter = async (
|
||||
|
||||
return {
|
||||
id: createdRecord.id,
|
||||
deviceId: createdRecord.fields.device_id || meterData.deviceId,
|
||||
meterAddress: createdRecord.fields.meter_address || meterData.meterAddress,
|
||||
manufacturerCode: createdRecord.fields.manufacturer_code || meterData.manufacturerCode,
|
||||
forwardCumulativeFlow: createdRecord.fields.forward_cumulative_flow || meterData.forwardCumulativeFlow,
|
||||
reverseCumulativeFlow: createdRecord.fields.reverse_cumulative_flow || meterData.reverseCumulativeFlow,
|
||||
forwardInstantaneousFlow: createdRecord.fields.forward_instantaneous_flow || meterData.forwardInstantaneousFlow,
|
||||
waterTemperature: createdRecord.fields.water_temperature || meterData.waterTemperature,
|
||||
voltage: createdRecord.fields.voltage || meterData.voltage,
|
||||
echoAmplitude: createdRecord.fields.echo_amplitude || meterData.echoAmplitude,
|
||||
ultrasonicFlightTime: createdRecord.fields.ultrasonic_flight_time || meterData.ultrasonicFlightTime,
|
||||
timestamp: createdRecord.fields.timestamp || meterData.timestamp,
|
||||
alarmBytes: createdRecord.fields.alarm_bytes || meterData.alarmBytes,
|
||||
checksumOk: createdRecord.fields.checksum_ok || meterData.checksumOk,
|
||||
receivedAt: createdRecord.fields.received_at || meterData.receivedAt,
|
||||
createdAt: createdRecord.fields.CreatedAt || meterData.createdAt,
|
||||
updatedAt: createdRecord.fields.UpdatedAt || meterData.updatedAt,
|
||||
areaName: createdRecord.fields["Area Name"] || meterData.areaName,
|
||||
accountNumber: createdRecord.fields["Account Number"] || meterData.accountNumber,
|
||||
userName: createdRecord.fields["User Name"] || meterData.userName,
|
||||
userAddress: createdRecord.fields["User Address"] || meterData.userAddress,
|
||||
meterSerialNumber: createdRecord.fields["Meter S/N"] || meterData.meterSerialNumber,
|
||||
meterName: createdRecord.fields["Meter Name"] || meterData.meterName,
|
||||
meterStatus: createdRecord.fields["Meter Status"] || meterData.meterStatus,
|
||||
protocolType: createdRecord.fields["Protocol Type"] || meterData.protocolType,
|
||||
priceNo: createdRecord.fields["Price No."] || meterData.priceNo,
|
||||
priceName: createdRecord.fields["Price Name"] || meterData.priceName,
|
||||
dmaPartition: createdRecord.fields["DMA Partition"] || meterData.dmaPartition,
|
||||
supplyTypes: createdRecord.fields["Supply Types"] || meterData.supplyTypes,
|
||||
deviceId: createdRecord.fields["Device ID"] || meterData.deviceId,
|
||||
deviceName: createdRecord.fields["Device Name"] || meterData.deviceName,
|
||||
deviceType: createdRecord.fields["Device Type"] || meterData.deviceType,
|
||||
usageAnalysisType: createdRecord.fields["Usage Analysis Type"] || meterData.usageAnalysisType,
|
||||
installedTime: createdRecord.fields["Installed Time"] || meterData.installedTime,
|
||||
};
|
||||
} catch (error) {
|
||||
console.error("Error creating meter:", error);
|
||||
@@ -161,20 +188,25 @@ export const updateMeter = async (
|
||||
body: JSON.stringify({
|
||||
id: id,
|
||||
fields: {
|
||||
device_id: meterData.deviceId,
|
||||
meter_address: meterData.meterAddress,
|
||||
manufacturer_code: meterData.manufacturerCode,
|
||||
forward_cumulative_flow: meterData.forwardCumulativeFlow,
|
||||
reverse_cumulative_flow: meterData.reverseCumulativeFlow,
|
||||
forward_instantaneous_flow: meterData.forwardInstantaneousFlow,
|
||||
water_temperature: meterData.waterTemperature,
|
||||
voltage: meterData.voltage,
|
||||
echo_amplitude: meterData.echoAmplitude,
|
||||
ultrasonic_flight_time: meterData.ultrasonicFlightTime,
|
||||
timestamp: meterData.timestamp,
|
||||
alarm_bytes: meterData.alarmBytes,
|
||||
checksum_ok: meterData.checksumOk,
|
||||
received_at: meterData.receivedAt,
|
||||
CreatedAt: meterData.createdAt,
|
||||
UpdatedAt: meterData.updatedAt,
|
||||
"Area Name": meterData.areaName,
|
||||
"Account Number": meterData.accountNumber,
|
||||
"User Name": meterData.userName,
|
||||
"User Address": meterData.userAddress,
|
||||
"Meter S/N": meterData.meterSerialNumber,
|
||||
"Meter Name": meterData.meterName,
|
||||
"Meter Status": meterData.meterStatus,
|
||||
"Protocol Type": meterData.protocolType,
|
||||
"Price No.": meterData.priceNo,
|
||||
"Price Name": meterData.priceName,
|
||||
"DMA Partition": meterData.dmaPartition,
|
||||
"Supply Types": meterData.supplyTypes,
|
||||
"Device ID": meterData.deviceId,
|
||||
"Device Name": meterData.deviceName,
|
||||
"Device Type": meterData.deviceType,
|
||||
"Usage Analysis Type": meterData.usageAnalysisType,
|
||||
"Installed Time": meterData.installedTime,
|
||||
},
|
||||
}),
|
||||
});
|
||||
@@ -196,20 +228,25 @@ export const updateMeter = async (
|
||||
|
||||
return {
|
||||
id: updatedRecord.id,
|
||||
deviceId: updatedRecord.fields.device_id || meterData.deviceId,
|
||||
meterAddress: updatedRecord.fields.meter_address || meterData.meterAddress,
|
||||
manufacturerCode: updatedRecord.fields.manufacturer_code || meterData.manufacturerCode,
|
||||
forwardCumulativeFlow: updatedRecord.fields.forward_cumulative_flow || meterData.forwardCumulativeFlow,
|
||||
reverseCumulativeFlow: updatedRecord.fields.reverse_cumulative_flow || meterData.reverseCumulativeFlow,
|
||||
forwardInstantaneousFlow: updatedRecord.fields.forward_instantaneous_flow || meterData.forwardInstantaneousFlow,
|
||||
waterTemperature: updatedRecord.fields.water_temperature || meterData.waterTemperature,
|
||||
voltage: updatedRecord.fields.voltage || meterData.voltage,
|
||||
echoAmplitude: updatedRecord.fields.echo_amplitude || meterData.echoAmplitude,
|
||||
ultrasonicFlightTime: updatedRecord.fields.ultrasonic_flight_time || meterData.ultrasonicFlightTime,
|
||||
timestamp: updatedRecord.fields.timestamp || meterData.timestamp,
|
||||
alarmBytes: updatedRecord.fields.alarm_bytes || meterData.alarmBytes,
|
||||
checksumOk: updatedRecord.fields.checksum_ok || meterData.checksumOk,
|
||||
receivedAt: updatedRecord.fields.received_at || meterData.receivedAt,
|
||||
createdAt: updatedRecord.fields.CreatedAt || meterData.createdAt,
|
||||
updatedAt: updatedRecord.fields.UpdatedAt || meterData.updatedAt,
|
||||
areaName: updatedRecord.fields["Area Name"] || meterData.areaName,
|
||||
accountNumber: updatedRecord.fields["Account Number"] || meterData.accountNumber,
|
||||
userName: updatedRecord.fields["User Name"] || meterData.userName,
|
||||
userAddress: updatedRecord.fields["User Address"] || meterData.userAddress,
|
||||
meterSerialNumber: updatedRecord.fields["Meter S/N"] || meterData.meterSerialNumber,
|
||||
meterName: updatedRecord.fields["Meter Name"] || meterData.meterName,
|
||||
meterStatus: updatedRecord.fields["Meter Status"] || meterData.meterStatus,
|
||||
protocolType: updatedRecord.fields["Protocol Type"] || meterData.protocolType,
|
||||
priceNo: updatedRecord.fields["Price No."] || meterData.priceNo,
|
||||
priceName: updatedRecord.fields["Price Name"] || meterData.priceName,
|
||||
dmaPartition: updatedRecord.fields["DMA Partition"] || meterData.dmaPartition,
|
||||
supplyTypes: updatedRecord.fields["Supply Types"] || meterData.supplyTypes,
|
||||
deviceId: updatedRecord.fields["Device ID"] || meterData.deviceId,
|
||||
deviceName: updatedRecord.fields["Device Name"] || meterData.deviceName,
|
||||
deviceType: updatedRecord.fields["Device Type"] || meterData.deviceType,
|
||||
usageAnalysisType: updatedRecord.fields["Usage Analysis Type"] || meterData.usageAnalysisType,
|
||||
installedTime: updatedRecord.fields["Installed Time"] || meterData.installedTime,
|
||||
};
|
||||
} catch (error) {
|
||||
console.error("Error updating meter:", error);
|
||||
|
||||
@@ -73,20 +73,25 @@ export default function MeterManagement() {
|
||||
const [editingId, setEditingId] = useState<string | null>(null);
|
||||
|
||||
const emptyMeter: Omit<Meter, "id"> = {
|
||||
createdAt: new Date().toISOString(),
|
||||
updatedAt: new Date().toISOString(),
|
||||
areaName: "",
|
||||
accountNumber: null,
|
||||
userName: null,
|
||||
userAddress: null,
|
||||
meterSerialNumber: "",
|
||||
meterName: "",
|
||||
meterStatus: "Installed",
|
||||
protocolType: "",
|
||||
priceNo: null,
|
||||
priceName: null,
|
||||
dmaPartition: null,
|
||||
supplyTypes: "",
|
||||
deviceId: "",
|
||||
meterAddress: "",
|
||||
manufacturerCode: "",
|
||||
forwardCumulativeFlow: 0,
|
||||
reverseCumulativeFlow: 0,
|
||||
forwardInstantaneousFlow: 0,
|
||||
waterTemperature: 0,
|
||||
voltage: 0,
|
||||
echoAmplitude: 0,
|
||||
ultrasonicFlightTime: 0,
|
||||
timestamp: new Date().toISOString(),
|
||||
alarmBytes: "",
|
||||
checksumOk: true,
|
||||
receivedAt: new Date().toISOString(),
|
||||
deviceName: "",
|
||||
deviceType: "",
|
||||
usageAnalysisType: "",
|
||||
installedTime: new Date().toISOString(),
|
||||
};
|
||||
|
||||
const [form, setForm] = useState<Omit<Meter, "id">>(emptyMeter);
|
||||
@@ -144,7 +149,7 @@ export default function MeterManagement() {
|
||||
if (!activeMeter) return;
|
||||
|
||||
const confirmDelete = window.confirm(
|
||||
`Are you sure you want to delete the meter "${activeMeter.deviceId}"?`
|
||||
`Are you sure you want to delete the meter "${activeMeter.meterName}" (${activeMeter.meterSerialNumber})?`
|
||||
);
|
||||
|
||||
if (!confirmDelete) return;
|
||||
@@ -171,9 +176,10 @@ export default function MeterManagement() {
|
||||
/* ================= FILTER ================= */
|
||||
const filtered = meters.filter(
|
||||
(m) =>
|
||||
(m.deviceId.toLowerCase().includes(search.toLowerCase()) ||
|
||||
m.meterAddress.toLowerCase().includes(search.toLowerCase()) ||
|
||||
m.manufacturerCode.toLowerCase().includes(search.toLowerCase()))
|
||||
(m.meterName.toLowerCase().includes(search.toLowerCase()) ||
|
||||
m.meterSerialNumber.toLowerCase().includes(search.toLowerCase()) ||
|
||||
m.deviceId.toLowerCase().includes(search.toLowerCase()) ||
|
||||
m.areaName.toLowerCase().includes(search.toLowerCase()))
|
||||
);
|
||||
|
||||
/* ================= UI ================= */
|
||||
@@ -244,20 +250,25 @@ export default function MeterManagement() {
|
||||
if (!activeMeter) return;
|
||||
setEditingId(activeMeter.id);
|
||||
setForm({
|
||||
createdAt: activeMeter.createdAt,
|
||||
updatedAt: activeMeter.updatedAt,
|
||||
areaName: activeMeter.areaName,
|
||||
accountNumber: activeMeter.accountNumber,
|
||||
userName: activeMeter.userName,
|
||||
userAddress: activeMeter.userAddress,
|
||||
meterSerialNumber: activeMeter.meterSerialNumber,
|
||||
meterName: activeMeter.meterName,
|
||||
meterStatus: activeMeter.meterStatus,
|
||||
protocolType: activeMeter.protocolType,
|
||||
priceNo: activeMeter.priceNo,
|
||||
priceName: activeMeter.priceName,
|
||||
dmaPartition: activeMeter.dmaPartition,
|
||||
supplyTypes: activeMeter.supplyTypes,
|
||||
deviceId: activeMeter.deviceId,
|
||||
meterAddress: activeMeter.meterAddress,
|
||||
manufacturerCode: activeMeter.manufacturerCode,
|
||||
forwardCumulativeFlow: activeMeter.forwardCumulativeFlow,
|
||||
reverseCumulativeFlow: activeMeter.reverseCumulativeFlow,
|
||||
forwardInstantaneousFlow: activeMeter.forwardInstantaneousFlow,
|
||||
waterTemperature: activeMeter.waterTemperature,
|
||||
voltage: activeMeter.voltage,
|
||||
echoAmplitude: activeMeter.echoAmplitude,
|
||||
ultrasonicFlightTime: activeMeter.ultrasonicFlightTime,
|
||||
timestamp: activeMeter.timestamp,
|
||||
alarmBytes: activeMeter.alarmBytes,
|
||||
checksumOk: activeMeter.checksumOk,
|
||||
receivedAt: activeMeter.receivedAt,
|
||||
deviceName: activeMeter.deviceName,
|
||||
deviceType: activeMeter.deviceType,
|
||||
usageAnalysisType: activeMeter.usageAnalysisType,
|
||||
installedTime: activeMeter.installedTime,
|
||||
});
|
||||
setShowModal(true);
|
||||
}}
|
||||
@@ -287,7 +298,7 @@ export default function MeterManagement() {
|
||||
{/* SEARCH */}
|
||||
<input
|
||||
className="bg-white rounded-lg shadow px-4 py-2 text-sm"
|
||||
placeholder="Search meter..."
|
||||
placeholder="Search by meter name, serial number, device ID, or area..."
|
||||
value={search}
|
||||
onChange={(e) => setSearch(e.target.value)}
|
||||
/>
|
||||
@@ -297,41 +308,30 @@ export default function MeterManagement() {
|
||||
title="Meters"
|
||||
isLoading={loadingMeters}
|
||||
columns={[
|
||||
{ title: "Meter Name", field: "meterName" },
|
||||
{ title: "Serial Number", field: "meterSerialNumber" },
|
||||
{ title: "Area", field: "areaName" },
|
||||
{ title: "Device ID", field: "deviceId" },
|
||||
{ title: "Meter Address", field: "meterAddress" },
|
||||
{ title: "Manufacturer Code", field: "manufacturerCode" },
|
||||
{ title: "Device Name", field: "deviceName" },
|
||||
{
|
||||
title: "Forward Flow",
|
||||
field: "forwardCumulativeFlow",
|
||||
render: (rowData) => `${rowData.forwardCumulativeFlow?.toFixed(3) || 0} m³`
|
||||
},
|
||||
{
|
||||
title: "Water Temp",
|
||||
field: "waterTemperature",
|
||||
render: (rowData) => `${rowData.waterTemperature?.toFixed(1) || 0}°C`
|
||||
},
|
||||
{
|
||||
title: "Voltage",
|
||||
field: "voltage",
|
||||
render: (rowData) => `${rowData.voltage || 0}V`
|
||||
},
|
||||
{
|
||||
title: "Checksum OK",
|
||||
field: "checksumOk",
|
||||
title: "Status",
|
||||
field: "meterStatus",
|
||||
render: (rowData) => (
|
||||
<span
|
||||
className={`px-3 py-1 rounded-full text-xs font-semibold border ${
|
||||
rowData.checksumOk
|
||||
rowData.meterStatus === "Installed"
|
||||
? "text-green-600 border-green-600"
|
||||
: "text-red-600 border-red-600"
|
||||
: "text-gray-600 border-gray-600"
|
||||
}`}
|
||||
>
|
||||
{rowData.checksumOk ? "OK" : "ERROR"}
|
||||
{rowData.meterStatus}
|
||||
</span>
|
||||
),
|
||||
},
|
||||
{ title: "Timestamp", field: "timestamp", type: "datetime" },
|
||||
{ title: "Received At", field: "receivedAt", type: "datetime" },
|
||||
{ title: "Protocol", field: "protocolType" },
|
||||
{ title: "Device Type", field: "deviceType" },
|
||||
{ title: "Created At", field: "createdAt", type: "datetime" },
|
||||
{ title: "Updated At", field: "updatedAt", type: "datetime" },
|
||||
]}
|
||||
data={filtered}
|
||||
onRowClick={(_, rowData) => setActiveMeter(rowData as Meter)}
|
||||
@@ -365,6 +365,36 @@ export default function MeterManagement() {
|
||||
{editingId ? "Edit Meter" : "Add Meter"}
|
||||
</h2>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Meter Name</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="Meter Name"
|
||||
value={form.meterName}
|
||||
onChange={(e) => setForm({ ...form, meterName: e.target.value })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Meter Serial Number</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="Meter S/N"
|
||||
value={form.meterSerialNumber}
|
||||
onChange={(e) => setForm({ ...form, meterSerialNumber: e.target.value })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Area Name</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="Area Name"
|
||||
value={form.areaName}
|
||||
onChange={(e) => setForm({ ...form, areaName: e.target.value })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Device ID</label>
|
||||
<input
|
||||
@@ -376,144 +406,135 @@ export default function MeterManagement() {
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Meter Address</label>
|
||||
<label className="block text-sm font-medium text-gray-700">Device Name</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="Meter Address"
|
||||
value={form.meterAddress}
|
||||
onChange={(e) => setForm({ ...form, meterAddress: e.target.value })}
|
||||
placeholder="Device Name"
|
||||
value={form.deviceName}
|
||||
onChange={(e) => setForm({ ...form, deviceName: e.target.value })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Manufacturer Code</label>
|
||||
<label className="block text-sm font-medium text-gray-700">Device Type</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="Manufacturer Code"
|
||||
value={form.manufacturerCode}
|
||||
onChange={(e) => setForm({ ...form, manufacturerCode: e.target.value })}
|
||||
placeholder="Device Type"
|
||||
value={form.deviceType}
|
||||
onChange={(e) => setForm({ ...form, deviceType: e.target.value })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Forward Cumulative Flow (m³)</label>
|
||||
<input
|
||||
type="number"
|
||||
step="0.001"
|
||||
<label className="block text-sm font-medium text-gray-700">Meter Status</label>
|
||||
<select
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="0.000"
|
||||
value={form.forwardCumulativeFlow}
|
||||
onChange={(e) => setForm({ ...form, forwardCumulativeFlow: parseFloat(e.target.value) || 0 })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Reverse Cumulative Flow (m³)</label>
|
||||
<input
|
||||
type="number"
|
||||
step="0.001"
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="0.000"
|
||||
value={form.reverseCumulativeFlow}
|
||||
onChange={(e) => setForm({ ...form, reverseCumulativeFlow: parseFloat(e.target.value) || 0 })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Forward Instantaneous Flow</label>
|
||||
<input
|
||||
type="number"
|
||||
step="0.001"
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="0.000"
|
||||
value={form.forwardInstantaneousFlow}
|
||||
onChange={(e) => setForm({ ...form, forwardInstantaneousFlow: parseFloat(e.target.value) || 0 })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Water Temperature (°C)</label>
|
||||
<input
|
||||
type="number"
|
||||
step="0.1"
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="0.0"
|
||||
value={form.waterTemperature}
|
||||
onChange={(e) => setForm({ ...form, waterTemperature: parseFloat(e.target.value) || 0 })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Voltage (V)</label>
|
||||
<input
|
||||
type="number"
|
||||
step="0.1"
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="0.0"
|
||||
value={form.voltage}
|
||||
onChange={(e) => setForm({ ...form, voltage: parseFloat(e.target.value) || 0 })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Echo Amplitude</label>
|
||||
<input
|
||||
type="number"
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="0"
|
||||
value={form.echoAmplitude}
|
||||
onChange={(e) => setForm({ ...form, echoAmplitude: parseInt(e.target.value) || 0 })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Ultrasonic Flight Time</label>
|
||||
<input
|
||||
type="number"
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="0"
|
||||
value={form.ultrasonicFlightTime}
|
||||
onChange={(e) => setForm({ ...form, ultrasonicFlightTime: parseInt(e.target.value) || 0 })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Timestamp</label>
|
||||
<input
|
||||
type="datetime-local"
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
value={form.timestamp ? new Date(form.timestamp).toISOString().slice(0, 16) : ""}
|
||||
onChange={(e) => setForm({ ...form, timestamp: new Date(e.target.value).toISOString() })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Alarm Bytes</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="Alarm Bytes"
|
||||
value={form.alarmBytes}
|
||||
onChange={(e) => setForm({ ...form, alarmBytes: e.target.value })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Checksum OK</label>
|
||||
<button
|
||||
onClick={() => setForm({ ...form, checksumOk: !form.checksumOk })}
|
||||
className="w-full border rounded px-3 py-2 hover:bg-gray-50"
|
||||
value={form.meterStatus}
|
||||
onChange={(e) => setForm({ ...form, meterStatus: e.target.value })}
|
||||
>
|
||||
Status: {form.checksumOk ? "OK" : "ERROR"}
|
||||
</button>
|
||||
<option value="Installed">Installed</option>
|
||||
<option value="Uninstalled">Uninstalled</option>
|
||||
<option value="Maintenance">Maintenance</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Received At</label>
|
||||
<label className="block text-sm font-medium text-gray-700">Protocol Type</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="Protocol Type"
|
||||
value={form.protocolType}
|
||||
onChange={(e) => setForm({ ...form, protocolType: e.target.value })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Supply Types</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="Supply Types"
|
||||
value={form.supplyTypes}
|
||||
onChange={(e) => setForm({ ...form, supplyTypes: e.target.value })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Usage Analysis Type</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="Usage Analysis Type"
|
||||
value={form.usageAnalysisType}
|
||||
onChange={(e) => setForm({ ...form, usageAnalysisType: e.target.value })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Account Number</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="Account Number (optional)"
|
||||
value={form.accountNumber || ""}
|
||||
onChange={(e) => setForm({ ...form, accountNumber: e.target.value || null })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">User Name</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="User Name (optional)"
|
||||
value={form.userName || ""}
|
||||
onChange={(e) => setForm({ ...form, userName: e.target.value || null })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">User Address</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="User Address (optional)"
|
||||
value={form.userAddress || ""}
|
||||
onChange={(e) => setForm({ ...form, userAddress: e.target.value || null })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Price No.</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="Price No. (optional)"
|
||||
value={form.priceNo || ""}
|
||||
onChange={(e) => setForm({ ...form, priceNo: e.target.value || null })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Price Name</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="Price Name (optional)"
|
||||
value={form.priceName || ""}
|
||||
onChange={(e) => setForm({ ...form, priceName: e.target.value || null })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">DMA Partition</label>
|
||||
<input
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
placeholder="DMA Partition (optional)"
|
||||
value={form.dmaPartition || ""}
|
||||
onChange={(e) => setForm({ ...form, dmaPartition: e.target.value || null })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-1">
|
||||
<label className="block text-sm font-medium text-gray-700">Installed Time</label>
|
||||
<input
|
||||
type="datetime-local"
|
||||
className="w-full border px-3 py-2 rounded"
|
||||
value={form.receivedAt ? new Date(form.receivedAt).toISOString().slice(0, 16) : ""}
|
||||
onChange={(e) => setForm({ ...form, receivedAt: new Date(e.target.value).toISOString() })}
|
||||
value={form.installedTime ? new Date(form.installedTime).toISOString().slice(0, 16) : ""}
|
||||
onChange={(e) => setForm({ ...form, installedTime: new Date(e.target.value).toISOString() })}
|
||||
/>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
import tailwindcss from "@tailwindcss/vite"
|
||||
import { defineConfig } from "vite";
|
||||
import react from "@vitejs/plugin-react";
|
||||
import tailwindcss from "@tailwindcss/vite";
|
||||
|
||||
// https://vitejs.dev/config/
|
||||
export default defineConfig({
|
||||
plugins: [react(),tailwindcss()],
|
||||
plugins: [react(), tailwindcss()],
|
||||
|
||||
server: {
|
||||
host: '0.0.0.0',
|
||||
allowedHosts: [
|
||||
"localhost",
|
||||
"127.0.0.1",
|
||||
"reyna-compressive-shaunna.ngrok-free.dev",
|
||||
],
|
||||
port: 5173,
|
||||
},
|
||||
|
||||
})
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user