Innovenergy
/
Innovenergy_trunk
3
1
Fork 1
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

made Battery SN automatically filled by Scanner and keep the memory of it when the Battery Number changes

This commit is contained in:
Yinyin Liu 2026-02-10 14:32:46 +01:00
parent 988b714d57
commit 2895b11efc
1 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
typescript/frontend-marios2/src/content/dashboards/Information/InformationSodistoreHome.tsx
View File

@ -7,7 +7,6 @@ import {
FormControl, FormControl,
Grid, Grid,
IconButton, IconButton,
InputAdornment,
InputLabel, InputLabel,
MenuItem, MenuItem,
Modal, Modal,
@ -19,7 +18,7 @@ import {
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import Button from '@mui/material/Button'; import Button from '@mui/material/Button';
import { Close as CloseIcon } from '@mui/icons-material'; import { Close as CloseIcon } from '@mui/icons-material';
import React, { useContext, useState, useEffect } from 'react'; import React, { useContext, useState, useEffect, useRef } from 'react';
import { I_S3Credentials } from '../../../interfaces/S3Types'; import { I_S3Credentials } from '../../../interfaces/S3Types';
import { I_Installation } from '../../../interfaces/InstallationTypes'; import { I_Installation } from '../../../interfaces/InstallationTypes';
import { InstallationsContext } from '../../../contexts/InstallationsContextProvider'; import { InstallationsContext } from '../../../contexts/InstallationsContextProvider';
@ -57,8 +56,7 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) {
{ id: 4, name: 'Sinexcel' } { id: 4, name: 'Sinexcel' }
]; ];
const BATTERY_SN_PREFIX = 'PNR020125101'; const batterySnRefs = useRef<(HTMLInputElement | null)[]>([]);
const BATTERY_SN_SUFFIX_LENGTH = 4;
// Initialize battery data from props // Initialize battery data from props
useEffect(() => { useEffect(() => {
@ -68,14 +66,7 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) {
if (props.values.batterySerialNumbers) { if (props.values.batterySerialNumbers) {
const serialNumbers = props.values.batterySerialNumbers const serialNumbers = props.values.batterySerialNumbers
.split(',') .split(',')
.filter((sn) => sn.trim() !== '') .filter((sn) => sn.trim() !== '');
.map((sn) => {
// If it has the prefix, extract only the suffix
if (sn.startsWith(BATTERY_SN_PREFIX)) {
return sn.substring(BATTERY_SN_PREFIX.length);
}
return sn;
});
setBatterySerialNumbers(serialNumbers); setBatterySerialNumbers(serialNumbers);
} }
}, []); }, []);
@ -107,41 +98,47 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) {
const value = inputValue === '' ? 0 : parseInt(inputValue); const value = inputValue === '' ? 0 : parseInt(inputValue);
setBatteryNumber(value); setBatteryNumber(value);
// Preserve existing serial numbers and adjust array size if (value > 0) {
const newSerialNumbers = Array.from({ length: value }, (_, index) => { // Resize array: preserve existing serial numbers, add empty for new slots
// Keep existing serial number if it exists, otherwise use empty string const newSerialNumbers = Array.from({ length: value }, (_, index) => {
return batterySerialNumbers[index] || ''; return batterySerialNumbers[index] || '';
}); });
setBatterySerialNumbers(newSerialNumbers); setBatterySerialNumbers(newSerialNumbers);
// Update formValues with preserved serial numbers setFormValues({
const fullSerialNumbers = newSerialNumbers ...formValues,
.map((suffix) => (suffix ? BATTERY_SN_PREFIX + suffix : '')) batteryNumber: value,
.filter((sn) => sn !== ''); batterySerialNumbers: newSerialNumbers.filter((sn) => sn !== '').join(',')
});
setFormValues({ } else {
...formValues, // Field is empty (user is mid-edit) — don't clear serial numbers
batteryNumber: value, setFormValues({
batterySerialNumbers: fullSerialNumbers.join(',') ...formValues,
}); batteryNumber: 0
});
}
} }
}; };
const handleBatterySerialNumberChange = (index: number, value: string) => { const handleBatterySerialNumberChange = (index: number, value: string) => {
// Only allow digits and limit to 3 characters
const sanitizedValue = value.replace(/\D/g, '').substring(0, BATTERY_SN_SUFFIX_LENGTH);
const updatedSerialNumbers = [...batterySerialNumbers]; const updatedSerialNumbers = [...batterySerialNumbers];
updatedSerialNumbers[index] = sanitizedValue; updatedSerialNumbers[index] = value;
setBatterySerialNumbers(updatedSerialNumbers); setBatterySerialNumbers(updatedSerialNumbers);
// Update formValues for persistence with full serial numbers (prefix + suffix)
const fullSerialNumbers = updatedSerialNumbers
.map((suffix) => (suffix ? BATTERY_SN_PREFIX + suffix : ''))
.filter((sn) => sn !== '');
setFormValues({ setFormValues({
...formValues, ...formValues,
batterySerialNumbers: fullSerialNumbers.join(',') batterySerialNumbers: updatedSerialNumbers.filter((sn) => sn !== '').join(',')
}); });
}; };
const handleBatterySnKeyDown = (e: React.KeyboardEvent, index: number) => {
if (e.key === 'Enter') {
e.preventDefault();
const nextIndex = index + 1;
if (nextIndex < batteryNumber && batterySnRefs.current[nextIndex]) {
batterySnRefs.current[nextIndex].focus();
}
}
};
const handleSubmit = () => { const handleSubmit = () => {
setLoading(true); setLoading(true);
setError(false); setError(false);
@ -467,20 +464,11 @@ function InformationSodistorehome(props: InformationSodistorehomeProps) {
onChange={(e) => onChange={(e) =>
handleBatterySerialNumberChange(index, e.target.value) handleBatterySerialNumberChange(index, e.target.value)
} }
onKeyDown={(e) => handleBatterySnKeyDown(e, index)}
inputRef={(el) => (batterySnRefs.current[index] = el)}
variant="outlined" variant="outlined"
fullWidth fullWidth
InputProps={{ placeholder="Scan or enter serial number"
startAdornment: (
<InputAdornment position="start">
{BATTERY_SN_PREFIX}
</InputAdornment>
)
}}
inputProps={{
maxLength: BATTERY_SN_SUFFIX_LENGTH,
placeholder: '0000'
}}
helperText={`Enter ${BATTERY_SN_SUFFIX_LENGTH} digits`}
/> />
</div> </div>
))} ))}