only change password, docs and mail left
This commit is contained in:
@@ -15,16 +15,17 @@ import IngresoCard from '../components/Ingresos/IngresoCard';
|
||||
import IngresosFilter from '../components/Ingresos/IngresosFilter';
|
||||
import { IngresosPDF } from '../components/Ingresos/IngresosPDF';
|
||||
import { CONSTANTS } from '../util/constants';
|
||||
import { errorParser } from '../util/parsers/errorParser';
|
||||
|
||||
import '../css/Ingresos.css';
|
||||
import CustomModal from '../components/CustomModal';
|
||||
import { Button } from 'react-bootstrap';
|
||||
import { useError } from '../context/ErrorContext';
|
||||
|
||||
const PAGE_SIZE = 10;
|
||||
|
||||
const Ingresos = () => {
|
||||
const { config, configLoading } = useConfig();
|
||||
const { showError } = useError();
|
||||
|
||||
if (configLoading) return <p><LoadingIcon /></p>;
|
||||
|
||||
@@ -36,22 +37,22 @@ const Ingresos = () => {
|
||||
};
|
||||
|
||||
return (
|
||||
<DataProvider config={reqConfig}>
|
||||
<DataProvider config={reqConfig} onError={showError}>
|
||||
<IngresosContent reqConfig={reqConfig} />
|
||||
</DataProvider>
|
||||
);
|
||||
};
|
||||
|
||||
const IngresosContent = ({ reqConfig }) => {
|
||||
const { data, dataLoading, dataError, postData, putData, deleteData } = useDataContext();
|
||||
const { data, dataLoading, postData, putData, deleteData } = useDataContext();
|
||||
const [showPDFModal, setShowPDFModal] = useState(false);
|
||||
const [creatingIngreso, setCreatingIngreso] = useState(false);
|
||||
const [tempIngreso, setTempIngreso] = useState(null);
|
||||
const [error, setError] = useState(null);
|
||||
const [deleteTargetId, setDeleteTargetId] = useState(null);
|
||||
const [fieldErrors, setFieldErrors] = useState(null);
|
||||
|
||||
const members = data
|
||||
? Array.from(
|
||||
? Array.from(
|
||||
new Map(
|
||||
data.map(i => [i.memberNumber, {
|
||||
memberNumber: i.memberNumber,
|
||||
@@ -60,7 +61,7 @@ const IngresosContent = ({ reqConfig }) => {
|
||||
}])
|
||||
).values()
|
||||
).sort((a, b) => a.memberNumber - b.memberNumber)
|
||||
: [];
|
||||
: [];
|
||||
|
||||
const {
|
||||
filtered,
|
||||
@@ -92,9 +93,9 @@ const IngresosContent = ({ reqConfig }) => {
|
||||
},
|
||||
searchFn: (ingreso, term) => {
|
||||
const normalized = term.toLowerCase();
|
||||
return ingreso.concept?.toLowerCase().includes(normalized) ||
|
||||
String(ingreso.memberNumber).includes(normalized) ||
|
||||
ingreso.displayName?.toLowerCase().includes(normalized);
|
||||
return ingreso.concept?.toLowerCase().includes(normalized) ||
|
||||
String(ingreso.memberNumber).includes(normalized) ||
|
||||
ingreso.displayName?.toLowerCase().includes(normalized);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -116,38 +117,39 @@ const IngresosContent = ({ reqConfig }) => {
|
||||
const handleCancelCreate = () => {
|
||||
setCreatingIngreso(false);
|
||||
setTempIngreso(null);
|
||||
setError(null);
|
||||
setFieldErrors(null);
|
||||
};
|
||||
|
||||
const handleCreateSubmit = async (nuevo) => {
|
||||
try {
|
||||
await postData(reqConfig.rawUrl, nuevo);
|
||||
setError(null);
|
||||
setCreatingIngreso(false);
|
||||
setTempIngreso(null);
|
||||
setFieldErrors(null);
|
||||
} catch (err) {
|
||||
setTempIngreso({ ...nuevo });
|
||||
setError(errorParser(err));
|
||||
if (err?.status === 422 && err?.errors) {
|
||||
setFieldErrors(err.errors);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const handleEditSubmit = async (editado, id) => {
|
||||
try {
|
||||
await putData(`${reqConfig.rawUrl}/${id}`, editado);
|
||||
setError(null);
|
||||
} catch (err) {
|
||||
setError(errorParser(err));
|
||||
if (err?.status === 422 && err?.errors) {
|
||||
setFieldErrors(err.errors);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
const handleDelete = async (id) => {
|
||||
setDeleteTargetId(id);
|
||||
};
|
||||
|
||||
if (dataLoading) return <p className="text-center my-5"><LoadingIcon /></p>;
|
||||
if (dataError) return <p className="text-danger text-center my-5">{dataError}</p>;
|
||||
|
||||
|
||||
return (
|
||||
<CustomContainer>
|
||||
<ContentWrapper>
|
||||
@@ -173,9 +175,8 @@ const IngresosContent = ({ reqConfig }) => {
|
||||
isNew
|
||||
onCreate={handleCreateSubmit}
|
||||
onCancel={handleCancelCreate}
|
||||
error={error}
|
||||
onClearError={() => setError(null)}
|
||||
members={members}
|
||||
fieldErrors={fieldErrors}
|
||||
/>
|
||||
)}
|
||||
renderCard={(income) => (
|
||||
@@ -184,8 +185,7 @@ const IngresosContent = ({ reqConfig }) => {
|
||||
income={income}
|
||||
onUpdate={(data, id) => handleEditSubmit(data, id)}
|
||||
onDelete={() => handleDelete(income.incomeId)}
|
||||
error={error}
|
||||
onClearError={() => setError(null)}
|
||||
fieldErrors={fieldErrors}
|
||||
/>
|
||||
)}
|
||||
/>
|
||||
@@ -210,7 +210,7 @@ const IngresosContent = ({ reqConfig }) => {
|
||||
setSearchTerm("");
|
||||
setDeleteTargetId(null);
|
||||
} catch (err) {
|
||||
setError(errorParser(err));
|
||||
console.log(err);
|
||||
}
|
||||
}}
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user