BiG-5: Complete, add switch small and medium table row size.

This commit is contained in:
elforjani13
2021-09-26 21:02:53 +02:00
parent fcace4213c
commit 71f9fa47d4
45 changed files with 337 additions and 196 deletions

View File

@@ -62,6 +62,18 @@ function BillForm({
bill_number: intl.get('bill_number_exists'),
});
}
if (
errors.some(
(e) => e.type === ERROR.ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED,
)
) {
setErrors(
AppToaster.show({
intent: Intent.DANGER,
message: 'ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED',
}),
);
}
};
// Handles form submit.

View File

@@ -72,7 +72,7 @@ function BillActionsBar({
// Handle table row size change.
const handleTableRowSizeChange = (size) => {
addSetting('bill', 'tableSize', size);
addSetting('bills', 'tableSize', size);
};
return (
@@ -156,7 +156,7 @@ export default compose(
withBills(({ billsTableState }) => ({
billsConditionsRoles: billsTableState.filterRoles,
})),
withSettings(({ billPaymentSettings }) => ({
billsTableSize: billPaymentSettings?.tableSize, // fix to bill
withSettings(({ billsettings }) => ({
billsTableSize: billsettings?.tableSize,
})),
)(BillActionsBar);

View File

@@ -15,6 +15,7 @@ import withBillActions from './withBillsActions';
import withAlertsActions from 'containers/Alert/withAlertActions';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import withSettings from '../../../Settings/withSettings';
import { useBillsTableColumns, ActionsMenu } from './components';
import { useBillsListContext } from './BillsListProvider';
@@ -40,6 +41,9 @@ function BillsDataTable({
// #withDrawerActions
openDrawer,
// #withSettings
billsTableSize,
}) {
// Bills list context.
const { bills, pagination, isBillsLoading, isBillsFetching, isEmptyStatus } =
@@ -125,6 +129,7 @@ function BillsDataTable({
onCellClick={handleCellClick}
initialColumnsWidths={initialColumnsWidths}
onColumnResizing={handleColumnResizing}
size={billsTableSize}
payload={{
onDelete: handleDeleteBill,
onEdit: handleEditBill,
@@ -144,4 +149,7 @@ export default compose(
withAlertsActions,
withDrawerActions,
withDialogActions,
withSettings(({ billsettings }) => ({
billsTableSize: billsettings?.tableSize,
})),
)(BillsDataTable);

View File

@@ -73,7 +73,7 @@ function PaymentMadeActionsBar({
// Handle table row size change.
const handleTableRowSizeChange = (size) => {
addSetting('payment_made', 'tableSize', size);
addSetting('billPayments', 'tableSize', size);
};
return (

View File

@@ -16,6 +16,7 @@ import withCurrentOrganization from 'containers/Organization/withCurrentOrganiza
import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import withSettings from '../../../Settings/withSettings';
import { usePaymentMadesTableColumns, ActionsMenu } from './components';
import { usePaymentMadesListContext } from './PaymentMadesListProvider';
@@ -36,6 +37,9 @@ function PaymentMadesTable({
// #withDrawerActions
openDrawer,
// #withSettings
paymentMadesTableSize,
}) {
// Payment mades table columns.
const columns = usePaymentMadesTableColumns();
@@ -114,6 +118,7 @@ function PaymentMadesTable({
onCellClick={handleCellClick}
initialColumnsWidths={initialColumnsWidths}
onColumnResizing={handleColumnResizing}
size={paymentMadesTableSize}
payload={{
onEdit: handleEditPaymentMade,
onDelete: handleDeletePaymentMade,
@@ -130,4 +135,7 @@ export default compose(
withAlertsActions,
withDrawerActions,
withCurrentOrganization(),
withSettings(({ billPaymentSettings }) => ({
paymentMadesTableSize: billPaymentSettings?.tableSize,
})),
)(PaymentMadesTable);