fix: control report drawer header.

This commit is contained in:
a.bouhuolia
2022-02-16 17:49:28 +02:00
parent 7eacaa0660
commit e6fcbfeea6
16 changed files with 181 additions and 67 deletions

View File

@@ -4,6 +4,7 @@ import { Formik, Form } from 'formik';
import * as Yup from 'yup'; import * as Yup from 'yup';
import moment from 'moment'; import moment from 'moment';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import styled from 'styled-components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import APAgingSummaryHeaderGeneral from './APAgingSummaryHeaderGeneral'; import APAgingSummaryHeaderGeneral from './APAgingSummaryHeaderGeneral';
@@ -11,8 +12,8 @@ import APAgingSummaryHeaderGeneral from './APAgingSummaryHeaderGeneral';
import withAPAgingSummary from './withAPAgingSummary'; import withAPAgingSummary from './withAPAgingSummary';
import withAPAgingSummaryActions from './withAPAgingSummaryActions'; import withAPAgingSummaryActions from './withAPAgingSummaryActions';
import { compose } from 'utils';
import { transformToForm } from '../../../utils'; import { transformToForm } from '../../../utils';
import { compose } from 'utils';
/** /**
* AP Aging Summary Report - Drawer Header. * AP Aging Summary Report - Drawer Header.
@@ -72,7 +73,7 @@ function APAgingSummaryHeader({
}; };
return ( return (
<FinancialStatementHeader <APAgingDrawerHeader
isOpen={isFilterDrawerOpen} isOpen={isFilterDrawerOpen}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{ onClose: handleDrawerClose }}
> >
@@ -99,7 +100,7 @@ function APAgingSummaryHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </APAgingDrawerHeader>
); );
} }
@@ -109,3 +110,9 @@ export default compose(
isFilterDrawerOpen: APAgingSummaryFilterDrawer, isFilterDrawerOpen: APAgingSummaryFilterDrawer,
})), })),
)(APAgingSummaryHeader); )(APAgingSummaryHeader);
const APAgingDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 520px;
}
`;

View File

@@ -4,6 +4,7 @@ import { Formik, Form } from 'formik';
import * as Yup from 'yup'; import * as Yup from 'yup';
import moment from 'moment'; import moment from 'moment';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import styled from 'styled-components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import ARAgingSummaryHeaderGeneral from './ARAgingSummaryHeaderGeneral'; import ARAgingSummaryHeaderGeneral from './ARAgingSummaryHeaderGeneral';
@@ -57,14 +58,12 @@ function ARAgingSummaryHeader({
}, },
defaultValues, defaultValues,
); );
// Handle form submit. // Handle form submit.
const handleSubmit = (values, { setSubmitting }) => { const handleSubmit = (values, { setSubmitting }) => {
onSubmitFilter(values); onSubmitFilter(values);
toggleFilterDrawerDisplay(false); toggleFilterDrawerDisplay(false);
setSubmitting(false); setSubmitting(false);
}; };
// Handle cancel button click. // Handle cancel button click.
const handleCancelClick = () => { const handleCancelClick = () => {
toggleFilterDrawerDisplay(false); toggleFilterDrawerDisplay(false);
@@ -75,7 +74,7 @@ function ARAgingSummaryHeader({
}; };
return ( return (
<FinancialStatementHeader <ARAgingDrawerHeader
isOpen={isFilterDrawerOpen} isOpen={isFilterDrawerOpen}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{ onClose: handleDrawerClose }}
> >
@@ -103,7 +102,7 @@ function ARAgingSummaryHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </ARAgingDrawerHeader>
); );
} }
@@ -113,3 +112,9 @@ export default compose(
isFilterDrawerOpen: ARAgingSummaryFilterDrawer, isFilterDrawerOpen: ARAgingSummaryFilterDrawer,
})), })),
)(ARAgingSummaryHeader); )(ARAgingSummaryHeader);
const ARAgingDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 520px;
}
`;

View File

@@ -1,8 +1,10 @@
import React from 'react'; import React from 'react';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import { FormattedMessage as T } from 'components';
import moment from 'moment'; import moment from 'moment';
import { Formik, Form } from 'formik'; import { Formik, Form } from 'formik';
import styled from 'styled-components';
import { FormattedMessage as T } from 'components';
import withBalanceSheet from './withBalanceSheet'; import withBalanceSheet from './withBalanceSheet';
import withBalanceSheetActions from './withBalanceSheetActions'; import withBalanceSheetActions from './withBalanceSheetActions';
@@ -64,9 +66,11 @@ function BalanceSheetHeader({
}; };
return ( return (
<FinancialStatementHeader <BalanceSheetFinancialHeader
isOpen={balanceSheetDrawerFilter} isOpen={balanceSheetDrawerFilter}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{
onClose: handleDrawerClose,
}}
> >
<Formik <Formik
initialValues={initialValues} initialValues={initialValues}
@@ -97,7 +101,7 @@ function BalanceSheetHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </BalanceSheetFinancialHeader>
); );
} }
@@ -107,3 +111,9 @@ export default compose(
})), })),
withBalanceSheetActions, withBalanceSheetActions,
)(BalanceSheetHeader); )(BalanceSheetHeader);
const BalanceSheetFinancialHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 520px;
}
`;

View File

@@ -3,6 +3,8 @@ import * as Yup from 'yup';
import { Formik, Form } from 'formik'; import { Formik, Form } from 'formik';
import moment from 'moment'; import moment from 'moment';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import styled from 'styled-components';
import { FormattedMessage as T } from 'components'; import { FormattedMessage as T } from 'components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
@@ -30,7 +32,6 @@ function CustomersBalanceSummaryHeader({
const validationSchema = Yup.object().shape({ const validationSchema = Yup.object().shape({
asDate: Yup.date().required().label('asDate'), asDate: Yup.date().required().label('asDate'),
}); });
// Default form values. // Default form values.
const defaultValues = { const defaultValues = {
...pageFilter, ...pageFilter,
@@ -47,21 +48,19 @@ function CustomersBalanceSummaryHeader({
}, },
defaultValues, defaultValues,
); );
// handle form submit. // handle form submit.
const handleSubmit = (values, { setSubmitting }) => { const handleSubmit = (values, { setSubmitting }) => {
onSubmitFilter(values); onSubmitFilter(values);
toggleCustomerBalanceFilterDrawer(false); toggleCustomerBalanceFilterDrawer(false);
setSubmitting(false); setSubmitting(false);
}; };
// handle close drawer. // handle close drawer.
const handleDrawerClose = () => { const handleDrawerClose = () => {
toggleCustomerBalanceFilterDrawer(false); toggleCustomerBalanceFilterDrawer(false);
}; };
return ( return (
<FinancialStatementHeader <CustomerBalanceDrawerHeader
isOpen={customersBalanceDrawerFilter} isOpen={customersBalanceDrawerFilter}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{ onClose: handleDrawerClose }}
> >
@@ -89,7 +88,7 @@ function CustomersBalanceSummaryHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </CustomerBalanceDrawerHeader>
); );
} }
@@ -99,3 +98,9 @@ export default compose(
})), })),
withCustomersBalanceSummaryActions, withCustomersBalanceSummaryActions,
)(CustomersBalanceSummaryHeader); )(CustomersBalanceSummaryHeader);
const CustomerBalanceDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 450px;
}
`;

View File

@@ -5,6 +5,7 @@ import intl from 'react-intl-universal';
import moment from 'moment'; import moment from 'moment';
import * as Yup from 'yup'; import * as Yup from 'yup';
import { Formik, Form } from 'formik'; import { Formik, Form } from 'formik';
import styled from 'styled-components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import CustomersTransactionsHeaderGeneralPanel from './CustomersTransactionsHeaderGeneralPanel'; import CustomersTransactionsHeaderGeneralPanel from './CustomersTransactionsHeaderGeneralPanel';
@@ -67,7 +68,7 @@ function CustomersTransactionsHeader({
}; };
return ( return (
<FinancialStatementHeader <CustomerTransactionsDrawerHeader
isOpen={isFilterDrawerOpen} isOpen={isFilterDrawerOpen}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{ onClose: handleDrawerClose }}
> >
@@ -95,7 +96,7 @@ function CustomersTransactionsHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </CustomerTransactionsDrawerHeader>
); );
} }
@@ -105,3 +106,9 @@ export default compose(
})), })),
withCustomersTransactionsActions, withCustomersTransactionsActions,
)(CustomersTransactionsHeader); )(CustomersTransactionsHeader);
const CustomerTransactionsDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 450px;
}
`;

View File

@@ -3,10 +3,15 @@ import classNames from 'classnames';
import { Position, Drawer } from '@blueprintjs/core'; import { Position, Drawer } from '@blueprintjs/core';
import 'style/containers/FinancialStatements/DrawerHeader.scss'; import 'style/containers/FinancialStatements/DrawerHeader.scss';
/**
* Financial statement header.
* @returns {JSX.Element}
*/
export default function FinancialStatementHeader({ export default function FinancialStatementHeader({
children, children,
isOpen, isOpen,
drawerProps, drawerProps,
className,
}) { }) {
const timeoutRef = React.useRef(); const timeoutRef = React.useRef();
const [isDrawerOpen, setIsDrawerOpen] = useState(false); const [isDrawerOpen, setIsDrawerOpen] = useState(false);
@@ -42,6 +47,7 @@ export default function FinancialStatementHeader({
{ {
'is-hidden': !isDrawerOpen, 'is-hidden': !isDrawerOpen,
}, },
className,
)} )}
> >
<Drawer <Drawer

View File

@@ -3,6 +3,8 @@ import moment from 'moment';
import * as Yup from 'yup'; import * as Yup from 'yup';
import { Formik, Form } from 'formik'; import { Formik, Form } from 'formik';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import styled from 'styled-components';
import { FormattedMessage as T } from 'components'; import { FormattedMessage as T } from 'components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
@@ -68,7 +70,7 @@ function GeneralLedgerHeader({
}; };
return ( return (
<FinancialStatementHeader <GeneralLedgerDrawerHeader
isOpen={isFilterDrawerOpen} isOpen={isFilterDrawerOpen}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{ onClose: handleDrawerClose }}
> >
@@ -97,7 +99,7 @@ function GeneralLedgerHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </GeneralLedgerDrawerHeader>
); );
} }
@@ -107,3 +109,9 @@ export default compose(
})), })),
withGeneralLedgerActions, withGeneralLedgerActions,
)(GeneralLedgerHeader); )(GeneralLedgerHeader);
const GeneralLedgerDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 520px;
}
`;

View File

@@ -3,8 +3,10 @@ import * as Yup from 'yup';
import moment from 'moment'; import moment from 'moment';
import { Formik, Form } from 'formik'; import { Formik, Form } from 'formik';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import styled from 'styled-components';
import { FormattedMessage as T } from 'components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import InventoryItemDetailsHeaderGeneralPanel from './InventoryItemDetailsHeaderGeneralPanel'; import InventoryItemDetailsHeaderGeneralPanel from './InventoryItemDetailsHeaderGeneralPanel';
@@ -35,24 +37,23 @@ function InventoryItemDetailsHeader({
}; };
// Filter form initial values. // Filter form initial values.
const initialValues = transformToForm({ const initialValues = transformToForm(
{
...pageFilter, ...pageFilter,
fromDate: moment(pageFilter.fromDate).toDate(), fromDate: moment(pageFilter.fromDate).toDate(),
toDate: moment(pageFilter.toDate).toDate(), toDate: moment(pageFilter.toDate).toDate(),
}, defaultValues); },
defaultValues,
);
// Validation schema. // Validation schema.
const validationSchema = Yup.object().shape({ const validationSchema = Yup.object().shape({
fromDate: Yup.date() fromDate: Yup.date().required().label(intl.get('fromDate')),
.required()
.label(intl.get('fromDate')),
toDate: Yup.date() toDate: Yup.date()
.min(Yup.ref('fromDate')) .min(Yup.ref('fromDate'))
.required() .required()
.label(intl.get('toDate')), .label(intl.get('toDate')),
}); });
;
// Handle form submit. // Handle form submit.
const handleSubmit = (values, { setSubmitting }) => { const handleSubmit = (values, { setSubmitting }) => {
onSubmitFilter(values); onSubmitFilter(values);
@@ -61,10 +62,12 @@ function InventoryItemDetailsHeader({
}; };
// Handle drawer close action. // Handle drawer close action.
const handleDrawerClose = () => { toggleFilterDrawer(false); }; const handleDrawerClose = () => {
toggleFilterDrawer(false);
};
return ( return (
<FinancialStatementHeader <InventoryItemDetailsDrawerHeader
isOpen={isFilterDrawerOpen} isOpen={isFilterDrawerOpen}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{ onClose: handleDrawerClose }}
> >
@@ -91,7 +94,7 @@ function InventoryItemDetailsHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </InventoryItemDetailsDrawerHeader>
); );
} }
@@ -101,3 +104,9 @@ export default compose(
})), })),
withInventoryItemDetailsActions, withInventoryItemDetailsActions,
)(InventoryItemDetailsHeader); )(InventoryItemDetailsHeader);
const InventoryItemDetailsDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 400px;
}
`;

View File

@@ -1,9 +1,11 @@
import React from 'react'; import React from 'react';
import * as Yup from 'yup'; import * as Yup from 'yup';
import moment from 'moment'; import moment from 'moment';
import { FormattedMessage as T } from 'components';
import { Formik, Form } from 'formik'; import { Formik, Form } from 'formik';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import styled from 'styled-components';
import { FormattedMessage as T } from 'components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import InventoryValuationHeaderGeneralPanel from './InventoryValuationHeaderGeneralPanel'; import InventoryValuationHeaderGeneralPanel from './InventoryValuationHeaderGeneralPanel';
@@ -38,11 +40,14 @@ function InventoryValuationHeader({
itemsIds: [], itemsIds: [],
}; };
// Initial values. // Initial values.
const initialValues = transformToForm({ const initialValues = transformToForm(
{
...pageFilter, ...pageFilter,
...defaultValues, ...defaultValues,
asDate: moment(pageFilter.asDate).toDate(), asDate: moment(pageFilter.asDate).toDate(),
}, defaultValues); },
defaultValues,
);
// Handle the form of header submit. // Handle the form of header submit.
const handleSubmit = (values, { setSubmitting }) => { const handleSubmit = (values, { setSubmitting }) => {
@@ -62,7 +67,7 @@ function InventoryValuationHeader({
}; };
return ( return (
<FinancialStatementHeader <InventoryValuationDrawerHeader
isOpen={isFilterDrawerOpen} isOpen={isFilterDrawerOpen}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{ onClose: handleDrawerClose }}
> >
@@ -89,7 +94,7 @@ function InventoryValuationHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </InventoryValuationDrawerHeader>
); );
} }
@@ -99,3 +104,9 @@ export default compose(
})), })),
withInventoryValuationActions, withInventoryValuationActions,
)(InventoryValuationHeader); )(InventoryValuationHeader);
const InventoryValuationDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 450px;
}
`;

View File

@@ -3,6 +3,8 @@ import moment from 'moment';
import { Formik, Form } from 'formik'; import { Formik, Form } from 'formik';
import { Tab, Tabs, Button, Intent } from '@blueprintjs/core'; import { Tab, Tabs, Button, Intent } from '@blueprintjs/core';
import * as Yup from 'yup'; import * as Yup from 'yup';
import styled from 'styled-components';
import { FormattedMessage as T } from 'components'; import { FormattedMessage as T } from 'components';
import JournalSheetHeaderGeneral from './JournalSheetHeaderGeneral'; import JournalSheetHeaderGeneral from './JournalSheetHeaderGeneral';
@@ -55,7 +57,7 @@ function JournalHeader({
}; };
return ( return (
<FinancialStatementHeader <JournalDrawerHeader
isOpen={journalSheetDrawerFilter} isOpen={journalSheetDrawerFilter}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{ onClose: handleDrawerClose }}
> >
@@ -83,7 +85,7 @@ function JournalHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </JournalDrawerHeader>
); );
} }
@@ -93,3 +95,9 @@ export default compose(
})), })),
withJournalActions, withJournalActions,
)(JournalHeader); )(JournalHeader);
const JournalDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 350px;
}
`;

View File

@@ -3,6 +3,7 @@ import moment from 'moment';
import { Formik, Form } from 'formik'; import { Formik, Form } from 'formik';
import * as R from 'ramda'; import * as R from 'ramda';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import styled from 'styled-components';
import { FormattedMessage as T } from 'components'; import { FormattedMessage as T } from 'components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
@@ -53,7 +54,7 @@ function ProfitLossHeader({
}; };
return ( return (
<FinancialStatementHeader <ProfitLossSheetHeader
isOpen={profitLossDrawerFilter} isOpen={profitLossDrawerFilter}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{ onClose: handleDrawerClose }}
> >
@@ -86,7 +87,7 @@ function ProfitLossHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </ProfitLossSheetHeader>
); );
} }
@@ -96,3 +97,9 @@ export default R.compose(
})), })),
withProfitLossActions, withProfitLossActions,
)(ProfitLossHeader); )(ProfitLossHeader);
const ProfitLossSheetHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 520px;
}
`;

View File

@@ -1,10 +1,12 @@
import React from 'react'; import React from 'react';
import * as Yup from 'yup'; import * as Yup from 'yup';
import moment from 'moment'; import moment from 'moment';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { Formik, Form } from 'formik'; import { Formik, Form } from 'formik';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import styled from 'styled-components';
import { FormattedMessage as T } from 'components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import PurchasesByItemsGeneralPanel from './PurchasesByItemsGeneralPanel'; import PurchasesByItemsGeneralPanel from './PurchasesByItemsGeneralPanel';
@@ -36,7 +38,6 @@ function PurchasesByItemsHeader({
.required() .required()
.label(intl.get('to_date')), .label(intl.get('to_date')),
}); });
// Default form values. // Default form values.
const defaultValues = { const defaultValues = {
...pageFilter, ...pageFilter,
@@ -68,7 +69,7 @@ function PurchasesByItemsHeader({
}; };
return ( return (
<FinancialStatementHeader <PurchasesByItemsDrawerHeader
isOpen={purchasesByItemsDrawerFilter} isOpen={purchasesByItemsDrawerFilter}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{ onClose: handleDrawerClose }}
> >
@@ -95,7 +96,7 @@ function PurchasesByItemsHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </PurchasesByItemsDrawerHeader>
); );
} }
@@ -105,3 +106,9 @@ export default compose(
})), })),
withPurchasesByItemsActions, withPurchasesByItemsActions,
)(PurchasesByItemsHeader); )(PurchasesByItemsHeader);
const PurchasesByItemsDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 450px;
}
`;

View File

@@ -1,10 +1,12 @@
import React from 'react'; import React from 'react';
import * as Yup from 'yup'; import * as Yup from 'yup';
import moment from 'moment'; import moment from 'moment';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { Formik, Form } from 'formik'; import { Formik, Form } from 'formik';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import styled from 'styled-components';
import { FormattedMessage as T } from 'components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import SalesByItemsHeaderGeneralPanel from './SalesByItemsHeaderGeneralPanel'; import SalesByItemsHeaderGeneralPanel from './SalesByItemsHeaderGeneralPanel';
@@ -61,7 +63,7 @@ function SalesByItemsHeader({
}; };
return ( return (
<FinancialStatementHeader <SalesByItemsDrawerHeader
isOpen={salesByItemsDrawerFilter} isOpen={salesByItemsDrawerFilter}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{ onClose: handleDrawerClose }}
> >
@@ -88,7 +90,7 @@ function SalesByItemsHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </SalesByItemsDrawerHeader>
); );
} }
@@ -98,3 +100,9 @@ export default compose(
})), })),
withSalesByItemsActions, withSalesByItemsActions,
)(SalesByItemsHeader); )(SalesByItemsHeader);
const SalesByItemsDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 450px;
}
`;

View File

@@ -22,9 +22,6 @@ import { compose } from 'utils';
* Trial balance sheet. * Trial balance sheet.
*/ */
function TrialBalanceSheet({ function TrialBalanceSheet({
// #withPreferences
organizationName,
// #withTrialBalanceSheetActions // #withTrialBalanceSheetActions
toggleTrialBalanceFilterDrawer: toggleFilterDrawer, toggleTrialBalanceFilterDrawer: toggleFilterDrawer,
}) { }) {
@@ -44,7 +41,6 @@ function TrialBalanceSheet({
}, },
[setFilter], [setFilter],
); );
// Handle numebr format form submit. // Handle numebr format form submit.
const handleNumberFormatSubmit = (numberFormat) => { const handleNumberFormatSubmit = (numberFormat) => {
setFilter({ setFilter({

View File

@@ -1,10 +1,12 @@
import React from 'react'; import React from 'react';
import * as Yup from 'yup'; import * as Yup from 'yup';
import moment from 'moment'; import moment from 'moment';
import { FormattedMessage as T } from 'components';
import intl from 'react-intl-universal';
import { Formik, Form } from 'formik'; import { Formik, Form } from 'formik';
import intl from 'react-intl-universal';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import styled from 'styled-components';
import { FormattedMessage as T } from 'components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
import TrialBalanceSheetHeaderGeneralPanel from './TrialBalanceSheetHeaderGeneralPanel'; import TrialBalanceSheetHeaderGeneralPanel from './TrialBalanceSheetHeaderGeneralPanel';
@@ -59,13 +61,17 @@ function TrialBalanceSheetHeader({
toggleFilterDrawer(false); toggleFilterDrawer(false);
}; };
// Handle drawer close action. // Handle drawer close action.
const handleDrawerClose = () => { toggleFilterDrawer(false); }; const handleDrawerClose = () => {
toggleFilterDrawer(false);
};
// Handle cancel button click. // Handle cancel button click.
const handleCancelClick = () => { toggleFilterDrawer(false); }; const handleCancelClick = () => {
toggleFilterDrawer(false);
};
return ( return (
<FinancialStatementHeader <TrialBalanceSheetDrawerHeader
isOpen={trialBalanceDrawerFilter} isOpen={trialBalanceDrawerFilter}
drawerProps={{ onClose: handleDrawerClose }} drawerProps={{ onClose: handleDrawerClose }}
> >
@@ -93,7 +99,7 @@ function TrialBalanceSheetHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </TrialBalanceSheetDrawerHeader>
); );
} }
@@ -103,3 +109,9 @@ export default compose(
})), })),
withTrialBalanceActions, withTrialBalanceActions,
)(TrialBalanceSheetHeader); )(TrialBalanceSheetHeader);
const TrialBalanceSheetDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 450px;
}
`;

View File

@@ -3,6 +3,8 @@ import * as Yup from 'yup';
import { Formik, Form } from 'formik'; import { Formik, Form } from 'formik';
import moment from 'moment'; import moment from 'moment';
import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core';
import styled from 'styled-components';
import { FormattedMessage as T } from 'components'; import { FormattedMessage as T } from 'components';
import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader';
@@ -61,7 +63,7 @@ function VendorsBalanceSummaryHeader({
}; };
return ( return (
<FinancialStatementHeader <VendorBalanceDrawerHeader
isOpen={VendorsSummaryFilterDrawer} isOpen={VendorsSummaryFilterDrawer}
drawerProps={{ onClose: handleCancelClick }} drawerProps={{ onClose: handleCancelClick }}
> >
@@ -88,7 +90,7 @@ function VendorsBalanceSummaryHeader({
</div> </div>
</Form> </Form>
</Formik> </Formik>
</FinancialStatementHeader> </VendorBalanceDrawerHeader>
); );
} }
@@ -98,3 +100,9 @@ export default compose(
})), })),
withVendorsBalanceSummaryActions, withVendorsBalanceSummaryActions,
)(VendorsBalanceSummaryHeader); )(VendorsBalanceSummaryHeader);
const VendorBalanceDrawerHeader = styled(FinancialStatementHeader)`
.bp3-drawer {
max-height: 450px;
}
`;