From 7a0d5063950fafdd9a06c33bfda6ff3bb87f93f0 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Thu, 13 Jan 2022 15:25:04 +0200 Subject: [PATCH 01/72] feat: balance sheet comparison --- .../BalanceSheet/BalanceSheet.js | 2 +- .../BalanceSheet/BalanceSheetHeader.js | 8 +- .../BalanceSheetHeaderComparisonPanal.js | 142 ++++++++++++++++++ .../BalanceSheet/BalanceSheetTable.js | 113 +++++++------- .../BalanceSheet/components.js | 15 ++ .../FinancialStatements/BalanceSheet/utils.js | 84 +++++++++++ src/hooks/query/financialReports.js | 28 +++- src/lang/en/index.json | 10 +- 8 files changed, 331 insertions(+), 71 deletions(-) create mode 100644 src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js index 9d3b47c6f..861a10cb7 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js @@ -80,7 +80,7 @@ function BalanceSheet({ - + {/* */} ); } diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js index 6fefd517b..5c713bff0 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js @@ -8,6 +8,7 @@ import withBalanceSheet from './withBalanceSheet'; import withBalanceSheetActions from './withBalanceSheetActions'; import BalanceSheetHeaderGeneralPanal from './BalanceSheetHeaderGeneralPanal'; +import BalanceSheetHeaderComparisonPanal from './BalanceSheetHeaderComparisonPanal'; import FinancialStatementHeader from '../../FinancialStatements/FinancialStatementHeader'; import { compose, transformToForm } from 'utils'; @@ -75,10 +76,15 @@ function BalanceSheetHeader({ >
- } panel={} + /> */} + } + panel={} /> diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js new file mode 100644 index 000000000..51e0f563f --- /dev/null +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js @@ -0,0 +1,142 @@ +import React from 'react'; +import { FastField, Field } from 'formik'; +import { FormGroup, Checkbox } from '@blueprintjs/core'; +import styled from 'styled-components'; + +import { FormattedMessage as T } from 'components'; + +import { Row, Col, FieldHint } from '../../../components'; + +/** + * Balance sheet header - Comparison panal. + */ +export default function BalanceSheetHeaderComparisonPanal() { + return ( +
+ {/*------------ Percentage -----------*/} + + + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + {/*------------ Previous Year -----------*/} + + + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + {/*------------ Previous Period -----------*/} + + + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + +
+ ); +} diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js index 38aa54e26..69cc36e45 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js @@ -9,6 +9,8 @@ import { useBalanceSheetContext } from './BalanceSheetProvider'; import { defaultExpanderReducer, getColumnWidth } from 'utils'; +import { useBalanceSheetColumns } from './components'; + /** * Balance sheet table. */ @@ -16,90 +18,77 @@ export default function BalanceSheetTable({ // #ownProps companyName, }) { - - // Balance sheet context. const { balanceSheet: { tableRows, columns, query }, isLoading, } = useBalanceSheetContext(); - const tableColumns = useMemo( - () => [ - { - Header: intl.get('account_name'), - accessor: (row) => (row.code ? `${row.name} - ${row.code}` : row.name), - className: 'account_name', - textOverview: true, - width: 240, - }, - ...(query.display_columns_type === 'total' - ? [ - { - Header: intl.get('total'), - accessor: 'total.formatted_amount', - Cell: CellTextSpan, - className: 'total', - width: 140, - }, - ] - : []), - ...(query.display_columns_type === 'date_periods' - ? columns.map((column, index) => ({ - id: `date_period_${index}`, - Header: column, - Cell: CellTextSpan, - accessor: `total_periods[${index}].formatted_amount`, - className: classNames('total-period', `total-periods-${index}`), - width: getColumnWidth( - tableRows, - `total_periods.${index}.formatted_amount`, - { minWidth: 100 }, - ), - })) - : []), - ], - [query, columns, tableRows], - ); + const tableColumns = useBalanceSheetColumns(); + + // const tableColumns = useMemo( + // () => [ + // { + // Header: intl.get('account_name'), + // accessor: (row) => (row.code ? `${row.name} - ${row.code}` : row.name), + // className: 'account_name', + // textOverview: true, + // width: 240, + // }, + // ...(query.display_columns_type === 'total' + // ? [ + // { + // Header: intl.get('total'), + // accessor: 'total.formatted_amount', + // Cell: CellTextSpan, + // className: 'total', + // width: 140, + // }, + // ] + // : []), + // ...(query.display_columns_type === 'date_periods' + // ? columns.map((column, index) => ({ + // id: `date_period_${index}`, + // Header: column, + // Cell: CellTextSpan, + // accessor: `total_periods[${index}].formatted_amount`, + // className: classNames('total-period', `total-periods-${index}`), + // width: getColumnWidth( + // tableRows, + // `total_periods.${index}.formatted_amount`, + // { minWidth: 100 }, + // ), + // })) + // : []), + // ], + // [query, columns, tableRows], + // ); // Calculates the default expanded rows of balance sheet table. - const expandedRows = useMemo(() => defaultExpanderReducer(tableRows, 4), [tableRows]); - - const rowClassNames = useCallback((row) => { - const { original } = row; - const rowTypes = Array.isArray(original.row_types) - ? original.row_types - : [original.row_types]; - - return { - ...rowTypes.reduce((acc, rowType) => { - acc[`row_type--${rowType}`] = rowType; - return acc; - }, {}), - }; - }, []); + // const expandedRows = useMemo(() => { + // return defaultExpanderReducer(tableRows, 4); + // }, [tableRows]); return ( ); diff --git a/src/containers/FinancialStatements/BalanceSheet/components.js b/src/containers/FinancialStatements/BalanceSheet/components.js index be3962ed9..fcd22362c 100644 --- a/src/containers/FinancialStatements/BalanceSheet/components.js +++ b/src/containers/FinancialStatements/BalanceSheet/components.js @@ -4,6 +4,7 @@ import { Icon, If } from 'components'; import { useBalanceSheetContext } from './BalanceSheetProvider'; import { FormattedMessage as T } from 'components'; import FinancialLoadingBar from '../FinancialLoadingBar'; +import { dynamicColumns } from './utils'; /** * Balance sheet alerts. @@ -46,3 +47,17 @@ export function BalanceSheetLoadingBar() { ); } + +/** + * Retrieve balance sheet columns. + */ +export const useBalanceSheetColumns = () => { + const { + balanceSheet: { columns, tableRows }, + } = useBalanceSheetContext(); + + return React.useMemo( + () => dynamicColumns(columns, tableRows), + [columns, tableRows], + ); +}; diff --git a/src/containers/FinancialStatements/BalanceSheet/utils.js b/src/containers/FinancialStatements/BalanceSheet/utils.js index 0a5301b23..1a4367589 100644 --- a/src/containers/FinancialStatements/BalanceSheet/utils.js +++ b/src/containers/FinancialStatements/BalanceSheet/utils.js @@ -1,6 +1,9 @@ import * as Yup from 'yup'; +import * as R from 'ramda'; import intl from 'react-intl-universal'; import moment from 'moment'; +import { CellTextSpan } from 'components/Datatable/Cells'; +import { getColumnWidth } from 'utils'; export const getBalanceSheetHeaderDefaultValues = () => { return { @@ -23,3 +26,84 @@ export const getBalanceSheetHeaderValidationSchema = () => filterByOption: Yup.string(), displayColumnsType: Yup.string(), }); + +/** + * Account name column mapper. + */ +const accountNameMapper = (data, index, column) => { + return { + id: column.key, + key: column.key, + Header: column.label, + accessor: `cells[${index}].value`, + className: column.key, + textOverview: true, + Cell: CellTextSpan, + width: getColumnWidth(data, `cells[${index}].value`, { + magicSpacing: 10, + minWidth: 240, + }), + }; +}; + +/** + * Date range columns mapper. + */ +const dateRangeMapper = (data, index, column) => ({ + id: column.key, + Header: column.label, + key: column.key, + accessor: `cells[${index}].value`, + width: getColumnWidth(data, `cells.${index}.value`, { + magicSpacing: 10, + minWidth: 100, + }), + className: `date-period ${column.key}`, + disableSortBy: true, + textOverview: true, +}); + +/** + * Total column mapper. + */ +const totalMapper = (data, index, column) => { + return { + id: column.key, + key: column.key, + Header: column.label, + accessor: `cells[${index}].value`, + className: 'total', + textOverview: true, + Cell: CellTextSpan, + width: getColumnWidth(data, `cells[${index}].value`, { + magicSpacing: 10, + minWidth: 200, + }), + disableSortBy: true, + }; +}; + +/** + * Detarmines the given string starts with `date-range` string. + */ +const isMatchesDateRange = (r) => R.match(/^date-range/g, r).length > 0; + +/** + * Cash flow dynamic columns. + */ +export const dynamicColumns = (columns, data) => { + const mapper = (column, index) => { + return R.compose( + R.when( + R.pathSatisfies(isMatchesDateRange, ['key']), + R.curry(dateRangeMapper)(data, index), + ), + R.when( + R.pathEq(['key'], 'name'), + R.curry(accountNameMapper)(data, index), + ), + R.when(R.pathEq(['key'], 'total'), R.curry(totalMapper)(data, index)), + )(column); + }; + return columns.map(mapper); +}; diff --git a/src/hooks/query/financialReports.js b/src/hooks/query/financialReports.js index 57023381a..12ac238bd 100644 --- a/src/hooks/query/financialReports.js +++ b/src/hooks/query/financialReports.js @@ -23,20 +23,38 @@ export function useBalanceSheet(query, props) { method: 'get', url: '/financial_statements/balance_sheet', params: query, + headers: { + Accept: 'application/json+table', + }, }, { select: (res) => ({ - tableRows: balanceSheetRowsReducer(res.data.data), - ...res.data, + columns: res.data.table.columns, + tableRows: res.data.table.rows, + // query: res.data.query, + // meta: res.data.meta, }), defaultData: { - data: [], - columns: [], - query: {}, tableRows: [], + columns: [], + // query: {}, + // meta: {}, }, ...props, }, + // { + // select: (res) => ({ + // tableRows: balanceSheetRowsReducer(res.data.data), + // ...res.data, + // }), + // defaultData: { + // data: [], + // columns: [], + // query: {}, + // tableRows: [], + // }, + // ...props, + // }, ); } diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 51cc47d1d..71bc2f1f3 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1734,8 +1734,14 @@ "payment_made.drawer.title": "Payment made details {number}", "manual_journal.drawer.title": "Manual journal details ({number})", "expense.drawer.title": "Expense details", - "global_error.you_dont_have_permissions": "You do not have permissions to access this page.", "global_error.transactions_locked": "Transactions before {lockedToDate} has been locked. Hence action cannot be performed.", - "global_error.authorized_user_inactive": "The authorized user is inactive." + "global_error.authorized_user_inactive": "The authorized user is inactive.", + "balance_sheet.comparisons": "Comparisons", + "balance_sheet.percentage_of_column": "% of Columns", + "balance_sheet.percentage_of_row": "% of Rows", + "balance_sheet.previous_year": "Previous Year (PY)", + "balance_sheet.total_change": "Total Change", + "balance_sheet.change": "% Change", + "balance_sheet.previous_period": "Previous Period (PP)" } \ No newline at end of file From 85a78b3809d90af06902cdeb866cb6df98ee0ea1 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Thu, 13 Jan 2022 16:25:46 +0200 Subject: [PATCH 02/72] feat: style balance sheet comparison. --- .../BalanceSheetHeaderComparisonPanal.js | 22 +++++++++++++++++-- .../FinancialStatements/BalanceSheet.scss | 4 ++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js index 51e0f563f..ee3fbb152 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js @@ -12,7 +12,7 @@ import { Row, Col, FieldHint } from '../../../components'; */ export default function BalanceSheetHeaderComparisonPanal() { return ( -
+ {/*------------ Percentage -----------*/} @@ -137,6 +137,24 @@ export default function BalanceSheetHeaderComparisonPanal() { -
+ ); } + +const BalanceSheetComparisonWrap = styled.div` + .row { + display: flex; + flex-wrap: nowrap; + margin-left: -0.3rem; + margin-right: -0.3rem; + + .col { + padding-left: 0.3rem; + padding-right: 0.3rem; + + .bp3-form-group { + margin-bottom: 0; + } + } + } +`; diff --git a/src/style/pages/FinancialStatements/BalanceSheet.scss b/src/style/pages/FinancialStatements/BalanceSheet.scss index 90b59ca54..eea6edd57 100644 --- a/src/style/pages/FinancialStatements/BalanceSheet.scss +++ b/src/style/pages/FinancialStatements/BalanceSheet.scss @@ -6,8 +6,8 @@ .thead, .tbody{ - .tr .td.account_name ~ .td, - .tr .th.account_name ~ .th{ + .tr .td.name ~ .td, + .tr .th.name ~ .th{ text-align: right; } } From 225619be601498efe04d64f3ac3b827594156ee8 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Thu, 13 Jan 2022 16:33:32 +0200 Subject: [PATCH 03/72] fix(balanceSheet) balance sheet header. --- .../FinancialStatements/BalanceSheet/BalanceSheetHeader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js index 5c713bff0..0a2c51006 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js @@ -76,11 +76,11 @@ function BalanceSheetHeader({ > - {/* } panel={} - /> */} + /> } From 354d1e8f75b96d63c2a65d19faafb08199dd58e4 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:55:44 +0200 Subject: [PATCH 04/72] feat(P&L Comparisons): add P&L comparisons. --- .../ProfitLossSheet/ProfitLossSheetHeader.js | 6 + .../ProfitLossSheetHeaderComparisonPanel.js | 170 ++++++++++++++++++ src/lang/en/index.json | 11 +- 3 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeaderComparisonPanel.js diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js index 5e6ef56e1..6f33077e2 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js @@ -8,6 +8,7 @@ import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import FinancialStatementHeader from 'containers/FinancialStatements/FinancialStatementHeader'; import ProfitLossSheetHeaderGeneralPane from './ProfitLossSheetHeaderGeneralPane'; +import ProfitLossSheetHeaderComparisonPanel from './ProfitLossSheetHeaderComparisonPanel'; import withProfitLoss from './withProfitLoss'; import withProfitLossActions from './withProfitLossActions'; @@ -75,6 +76,11 @@ function ProfitLossHeader({ title={} panel={} /> + } + panel={} + />
diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeaderComparisonPanel.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeaderComparisonPanel.js new file mode 100644 index 000000000..98a2f63a1 --- /dev/null +++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeaderComparisonPanel.js @@ -0,0 +1,170 @@ +import React from 'react'; +import { FastField, Field } from 'formik'; +import { FormGroup, Checkbox } from '@blueprintjs/core'; +import styled from 'styled-components'; + +import { FormattedMessage as T } from 'components'; + +import { Row, Col, FieldHint } from '../../../components'; + +/** + * ProfitLoss sheet header -comparison panel. + */ +export default function ProfitLossSheetHeaderComparisonPanel() { + return ( + + {/**----------- Previous Year -----------*/} + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + {/**----------- Previous Period (PP) -----------*/} + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + + {/**----------- % of Column -----------*/} + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + {/**----------- % of Row -----------*/} + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + {/**----------- % of Expense -----------*/} + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + {/**----------- % of Income -----------*/} + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + ); +} + +const ProfitLossSheetComparisonWrap = styled.div` + .row { + margin-left: 0.15rem; + .col { + min-width: 150px; + max-width: 190px; + } + } + .bp3-form-group { + margin-bottom: 3px; + /* margin-bottom: 0; */ + } +`; diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 71bc2f1f3..9eec37c69 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1743,5 +1743,14 @@ "balance_sheet.previous_year": "Previous Year (PY)", "balance_sheet.total_change": "Total Change", "balance_sheet.change": "% Change", - "balance_sheet.previous_period": "Previous Period (PP)" + "balance_sheet.previous_period": "Previous Period (PP)", + "profit_loss_sheet.comparisons":"Comparisons", + "profit_loss_sheet.previous_year":"Previous Year", + "profit_loss_sheet.total_change": "Total Change", + "profit_loss_sheet.perentage_change": "Perentage Change", + "profit_loss_sheet.previous_period":"Previous Period (PP)", + "profit_loss_sheet.percentage_of_column":"% of Column", + "profit_loss_sheet.percentage_of_row":"% of Row", + "profit_loss_sheet.percentage_of_expense":"% of Expense", + "profit_loss_sheet.percentage_of_income":"% of Income" } \ No newline at end of file From 735803f1a5ee79a0b38739f526a82dbdce72b271 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 25 Jan 2022 20:12:13 +0200 Subject: [PATCH 05/72] feat(balancesheet): balance sheet comparisons. --- .../BalanceSheetHeaderComparisonPanal.js | 131 ++++++++---------- 1 file changed, 60 insertions(+), 71 deletions(-) diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js index ee3fbb152..979b7b0a1 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js @@ -13,53 +13,20 @@ import { Row, Col, FieldHint } from '../../../components'; export default function BalanceSheetHeaderComparisonPanal() { return ( - {/*------------ Percentage -----------*/} + {/**----------- Previous Year -----------*/} + + {({ field }) => ( + }> + } + {...field} + /> + + )} + - - - {({ field }) => ( - }> - } - {...field} - /> - - )} - - - - - {({ field }) => ( - }> - } - {...field} - /> - - )} - - - - {/*------------ Previous Year -----------*/} - - - - {({ field }) => ( - }> - } - {...field} - /> - - )} - - {({ field }) => ( @@ -90,21 +57,19 @@ export default function BalanceSheetHeaderComparisonPanal() { {/*------------ Previous Period -----------*/} + + {({ field }) => ( + }> + } + {...field} + /> + + )} + - - - {({ field }) => ( - }> - } - {...field} - /> - - )} - - {({ field }) => ( @@ -137,24 +102,48 @@ export default function BalanceSheetHeaderComparisonPanal() { + + {/**----------- % of Column -----------*/} + + {({ field }) => ( + }> + } + {...field} + /> + + )} + + + {/**----------- % of Row -----------*/} + + {({ field }) => ( + }> + } + {...field} + /> + + )} + ); } const BalanceSheetComparisonWrap = styled.div` .row { - display: flex; - flex-wrap: nowrap; - margin-left: -0.3rem; - margin-right: -0.3rem; - + margin-left: 0.15rem; .col { - padding-left: 0.3rem; - padding-right: 0.3rem; - - .bp3-form-group { - margin-bottom: 0; - } + min-width: 150px; + max-width: 190px; } } + .bp3-form-group { + margin-bottom: 3px; + /* margin-bottom: 0; */ + } `; From 77d826e6d468fc9e606d2aa34214b48781227a20 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sat, 29 Jan 2022 20:46:41 +0200 Subject: [PATCH 06/72] feat(BalanceSheet|ProfitLoss): comparions feature. --- src/components/Datatable/TableHeader.js | 2 +- src/components/FinancialSheet.js | 2 - .../BalanceSheet/BalanceSheet.js | 1 - .../BalanceSheet/BalanceSheetTable.js | 97 +++-- .../BalanceSheet/components.js | 12 +- .../FinancialStatements/BalanceSheet/utils.js | 324 +++++++++++++--- .../ProfitLossSheet/ProfitLossSheet.js | 6 +- .../ProfitLossSheetHeaderComparisonPanel.js | 18 +- .../ProfitLossSheet/ProfitLossSheetTable.js | 121 +++--- .../ProfitLossSheet/hooks.js | 14 + .../ProfitLossSheet/utils.js | 365 ++++++++++++++++++ src/hooks/query/financialReports.js | 22 +- src/style/App.scss | 3 + src/style/components/DataTable/DataTable.scss | 6 +- .../FinancialStatements/BalanceSheet.scss | 47 --- .../FinancialStatements/FinancialSheet.scss | 26 -- src/utils/index.js | 12 + 17 files changed, 795 insertions(+), 283 deletions(-) create mode 100644 src/containers/FinancialStatements/ProfitLossSheet/hooks.js create mode 100644 src/containers/FinancialStatements/ProfitLossSheet/utils.js delete mode 100644 src/style/pages/FinancialStatements/BalanceSheet.scss delete mode 100644 src/style/pages/FinancialStatements/FinancialSheet.scss diff --git a/src/components/Datatable/TableHeader.js b/src/components/Datatable/TableHeader.js index b1916bb49..de8405ff7 100644 --- a/src/components/Datatable/TableHeader.js +++ b/src/components/Datatable/TableHeader.js @@ -15,7 +15,7 @@ function TableHeaderCell({ column, index }) {
diff --git a/src/components/FinancialSheet.js b/src/components/FinancialSheet.js index 49d10231d..389272c4c 100644 --- a/src/components/FinancialSheet.js +++ b/src/components/FinancialSheet.js @@ -4,8 +4,6 @@ import classnames from 'classnames'; import { FormattedMessage as T } from 'components'; import intl from 'react-intl-universal'; -import 'style/pages/FinancialStatements/FinancialSheet.scss'; - import { If, LoadingIndicator, MODIFIER } from 'components'; export default function FinancialSheet({ diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js index 861a10cb7..84e91a083 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js @@ -1,6 +1,5 @@ import React, { useEffect, useState } from 'react'; import moment from 'moment'; -import 'style/pages/FinancialStatements/BalanceSheet.scss'; import { BalanceSheetAlerts, BalanceSheetLoadingBar } from './components'; import { FinancialStatement } from 'components'; diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js index 69cc36e45..242b29d8d 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js @@ -1,14 +1,13 @@ -import React, { useMemo, useCallback } from 'react'; +import React from 'react'; +import styled from 'styled-components'; import intl from 'react-intl-universal'; -import classNames from 'classnames'; import FinancialSheet from 'components/FinancialSheet'; import DataTable from 'components/DataTable'; -import { CellTextSpan } from 'components/Datatable/Cells'; import { useBalanceSheetContext } from './BalanceSheetProvider'; -import { defaultExpanderReducer, getColumnWidth } from 'utils'; - +import { defaultExpanderReducer, tableRowTypesToClassnames } from 'utils'; +import { TableStyle } from 'common'; import { useBalanceSheetColumns } from './components'; /** @@ -20,54 +19,17 @@ export default function BalanceSheetTable({ }) { // Balance sheet context. const { - balanceSheet: { tableRows, columns, query }, - isLoading, + balanceSheet: { table, query }, } = useBalanceSheetContext(); + // Retrieve the database columns. const tableColumns = useBalanceSheetColumns(); - // const tableColumns = useMemo( - // () => [ - // { - // Header: intl.get('account_name'), - // accessor: (row) => (row.code ? `${row.name} - ${row.code}` : row.name), - // className: 'account_name', - // textOverview: true, - // width: 240, - // }, - // ...(query.display_columns_type === 'total' - // ? [ - // { - // Header: intl.get('total'), - // accessor: 'total.formatted_amount', - // Cell: CellTextSpan, - // className: 'total', - // width: 140, - // }, - // ] - // : []), - // ...(query.display_columns_type === 'date_periods' - // ? columns.map((column, index) => ({ - // id: `date_period_${index}`, - // Header: column, - // Cell: CellTextSpan, - // accessor: `total_periods[${index}].formatted_amount`, - // className: classNames('total-period', `total-periods-${index}`), - // width: getColumnWidth( - // tableRows, - // `total_periods.${index}.formatted_amount`, - // { minWidth: 100 }, - // ), - // })) - // : []), - // ], - // [query, columns, tableRows], - // ); - - // Calculates the default expanded rows of balance sheet table. - // const expandedRows = useMemo(() => { - // return defaultExpanderReducer(tableRows, 4); - // }, [tableRows]); + // Retrieve default expanded rows of balance sheet. + const expandedRows = React.useMemo( + () => defaultExpanderReducer(table?.rows || [], 3), + [table], + ); return ( - ); } + +const BalanceSheetDataTable = styled(DataTable)` + .table { + .tbody .tr { + .td { + border-bottom: 0; + padding-top: 0.36rem; + padding-bottom: 0.36rem; + } + &.is-expanded { + .td:not(.name) .cell-inner { + opacity: 0; + } + } + &.row_type--TOTAL { + .td { + font-weight: 500; + border-top: 1px solid #bbb; + } + } + + &:last-of-type .td{ + border-bottom: 1px solid #bbb; + } + } + } +`; diff --git a/src/containers/FinancialStatements/BalanceSheet/components.js b/src/containers/FinancialStatements/BalanceSheet/components.js index fcd22362c..a5110d4f6 100644 --- a/src/containers/FinancialStatements/BalanceSheet/components.js +++ b/src/containers/FinancialStatements/BalanceSheet/components.js @@ -18,15 +18,14 @@ export function BalanceSheetAlerts() { refetchBalanceSheet(); }; // Can't display any error if the report is loading. - if (isLoading) { - return null; - } + if (isLoading) return null; return (
{' '} + @@ -52,12 +51,13 @@ export function BalanceSheetLoadingBar() { * Retrieve balance sheet columns. */ export const useBalanceSheetColumns = () => { + // Balance sheet context. const { - balanceSheet: { columns, tableRows }, + balanceSheet: { table }, } = useBalanceSheetContext(); return React.useMemo( - () => dynamicColumns(columns, tableRows), - [columns, tableRows], + () => dynamicColumns(table?.columns || [], table?.rows || []), + [table], ); }; diff --git a/src/containers/FinancialStatements/BalanceSheet/utils.js b/src/containers/FinancialStatements/BalanceSheet/utils.js index 1a4367589..d22ee2aec 100644 --- a/src/containers/FinancialStatements/BalanceSheet/utils.js +++ b/src/containers/FinancialStatements/BalanceSheet/utils.js @@ -1,10 +1,19 @@ import * as Yup from 'yup'; import * as R from 'ramda'; +import { isEmpty } from 'lodash'; import intl from 'react-intl-universal'; import moment from 'moment'; import { CellTextSpan } from 'components/Datatable/Cells'; import { getColumnWidth } from 'utils'; +const getTableCellValueAccessor = (index) => `cells[${index}].value`; + +const Align = { Left: 'left', Right: 'right', Center: 'center' }; + +/** + * + * @returns + */ export const getBalanceSheetHeaderDefaultValues = () => { return { basic: 'cash', @@ -15,6 +24,10 @@ export const getBalanceSheetHeaderDefaultValues = () => { }; }; +/** + * + * @returns + */ export const getBalanceSheetHeaderValidationSchema = () => Yup.object().shape({ dateRange: Yup.string().optional(), @@ -30,80 +43,303 @@ export const getBalanceSheetHeaderValidationSchema = () => /** * Account name column mapper. */ -const accountNameMapper = (data, index, column) => { +const accountNameMapper = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + return { - id: column.key, key: column.key, Header: column.label, - accessor: `cells[${index}].value`, + accessor, className: column.key, textOverview: true, - Cell: CellTextSpan, - width: getColumnWidth(data, `cells[${index}].value`, { - magicSpacing: 10, - minWidth: 240, - }), + width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 240 }), + }; +}); + +/** + * Assoc columns to total column. + */ +const assocColumnsToTotalColumn = R.curry((data, column, columnAccessor) => { + const columns = totalColumnsComposer(data, column); + + return R.assoc('columns', columns, columnAccessor); +}); + +/** + * Detarmines whether the given column has children columns. + * @returns {boolean} + */ +const isColumnHasColumns = (column) => !isEmpty(column.children); + +/** + * + * @param {*} data + * @param {*} column + * @returns + */ +const dateRangeSoloColumnAttrs = (data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + accessor, + width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), }; }; /** * Date range columns mapper. */ -const dateRangeMapper = (data, index, column) => ({ - id: column.key, - Header: column.label, - key: column.key, - accessor: `cells[${index}].value`, - width: getColumnWidth(data, `cells.${index}.value`, { - magicSpacing: 10, - minWidth: 100, - }), - className: `date-period ${column.key}`, - disableSortBy: true, - textOverview: true, +const dateRangeMapper = R.curry((data, column) => { + const isDateColumnHasColumns = isColumnHasColumns(column); + + const columnAccessor = { + Header: column.label, + key: column.key, + disableSortBy: true, + textOverview: true, + align: Align.Center, + }; + return R.compose( + R.when( + R.always(isDateColumnHasColumns), + assocColumnsToTotalColumn(data, column), + ), + R.when( + R.always(!isDateColumnHasColumns), + R.mergeLeft(dateRangeSoloColumnAttrs(data, column)), + ), + )(columnAccessor); }); /** * Total column mapper. */ -const totalMapper = (data, index, column) => { - return { - id: column.key, +const totalMapper = R.curry((data, column) => { + const hasChildren = !isEmpty(column.children); + const accessor = getTableCellValueAccessor(column.cell_index); + + const columnAccessor = { key: column.key, Header: column.label, - accessor: `cells[${index}].value`, - className: 'total', + accessor, textOverview: true, Cell: CellTextSpan, - width: getColumnWidth(data, `cells[${index}].value`, { - magicSpacing: 10, - minWidth: 200, - }), + width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 200 }), disableSortBy: true, + align: hasChildren ? 'center' : 'right', }; -}; + return R.compose( + R.when(R.always(hasChildren), assocColumnsToTotalColumn(data, column)), + )(columnAccessor); +}); + +/** + * `Percentage of column` column accessor. + */ +const percentageOfColumnAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * `Percentage of row` column accessor. + */ +const percentageOfRowAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * Previous year column accessor. + */ +const previousYearAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * Pervious year change column accessor. + */ +const previousYearChangeAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * Previous year percentage column accessor. + */ +const previousYearPercentageAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * Previous period column accessor. + */ +const previousPeriodAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * Previous period change column accessor. + */ +const previousPeriodChangeAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * Previous period percentage column accessor. + */ +const previousPeriodPercentageAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * + * @param {*} column + * @param {*} index + * @returns + */ +const totalColumnsMapper = R.curry((data, column) => { + return R.compose( + R.when(R.pathEq(['key'], 'total'), totalMapper(data)), + // Percetage of column/row. + R.when( + R.pathEq(['key'], 'percentage_of_column'), + percentageOfColumnAccessor(data), + ), + R.when( + R.pathEq(['key'], 'percentage_of_row'), + percentageOfRowAccessor(data), + ), + // Previous year. + R.when(R.pathEq(['key'], 'previous_year'), previousYearAccessor(data)), + R.when( + R.pathEq(['key'], 'previous_year_change'), + previousYearChangeAccessor(data), + ), + R.when( + R.pathEq(['key'], 'previous_year_percentage'), + previousYearPercentageAccessor(data), + ), + // Pervious period. + R.when(R.pathEq(['key'], 'previous_period'), previousPeriodAccessor(data)), + R.when( + R.pathEq(['key'], 'previous_period_change'), + previousPeriodChangeAccessor(data), + ), + R.when( + R.pathEq(['key'], 'previous_period_percentage'), + previousPeriodPercentageAccessor(data), + ), + )(column); +}); + +/** + * Total sub-columns composer. + */ +const totalColumnsComposer = R.curry((data, column) => { + return R.map(totalColumnsMapper(data), column.children); +}); /** * Detarmines the given string starts with `date-range` string. */ const isMatchesDateRange = (r) => R.match(/^date-range/g, r).length > 0; +/** + * Dynamic column mapper. + */ +const dynamicColumnMapper = R.curry((data, column) => { + const indexTotalMapper = totalMapper(data); + const indexAccountNameMapper = accountNameMapper(data); + const indexDatePeriodMapper = dateRangeMapper(data); + + return R.compose( + R.when(R.pathSatisfies(isMatchesDateRange, ['key']), indexDatePeriodMapper), + R.when(R.pathEq(['key'], 'name'), indexAccountNameMapper), + R.when(R.pathEq(['key'], 'total'), indexTotalMapper), + )(column); +}); + /** * Cash flow dynamic columns. */ export const dynamicColumns = (columns, data) => { - const mapper = (column, index) => { - return R.compose( - R.when( - R.pathSatisfies(isMatchesDateRange, ['key']), - R.curry(dateRangeMapper)(data, index), - ), - R.when( - R.pathEq(['key'], 'name'), - R.curry(accountNameMapper)(data, index), - ), - R.when(R.pathEq(['key'], 'total'), R.curry(totalMapper)(data, index)), - )(column); - }; - return columns.map(mapper); + return R.map(dynamicColumnMapper(data), columns); }; diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js index c7c264b43..67244362f 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js @@ -51,7 +51,6 @@ function ProfitLossSheet({ numberFormat, }); }; - // Hide the filter drawer once the page unmount. React.useEffect( () => () => { @@ -66,8 +65,8 @@ function ProfitLossSheet({ numberFormat={filter.numberFormat} onNumberFormatSubmit={handleNumberFormatSubmit} /> - - + {/* */} + {/* */}
@@ -75,7 +74,6 @@ function ProfitLossSheet({ pageFilter={filter} onSubmitFilter={handleSubmitFilter} /> -
diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeaderComparisonPanel.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeaderComparisonPanel.js index 98a2f63a1..b911cccc0 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeaderComparisonPanel.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeaderComparisonPanel.js @@ -28,7 +28,7 @@ export default function ProfitLossSheetHeaderComparisonPanel() { - + {({ field }) => ( }> - + {({ field }) => ( }> {/**----------- Previous Period (PP) -----------*/} - + {({ field }) => ( }> - + {({ field }) => ( }> - + {({ field }) => ( }> {/**----------- % of Column -----------*/} - + {({ field }) => ( }> {/**----------- % of Row -----------*/} - + {({ field }) => ( }> {/**----------- % of Expense -----------*/} - + {({ field }) => ( }> {/**----------- % of Income -----------*/} - + {({ field }) => ( }> [ - { - Header: intl.get('account'), - accessor: (row) => (row.code ? `${row.name} - ${row.code}` : row.name), - className: 'name', - textOverview: true, - width: 240, - }, - ...(query.display_columns_type === 'total' - ? [ - { - Header: intl.get('total'), - Cell: CellTextSpan, - accessor: 'total.formatted_amount', - className: 'total', - width: 140, - }, - ] - : []), - ...(query.display_columns_type === 'date_periods' - ? columns.map((column, index) => ({ - id: `date_period_${index}`, - Header: column, - Cell: CellTextSpan, - accessor: `total_periods[${index}].formatted_amount`, - width: getColumnWidth( - tableRows, - `total_periods.${index}.formatted_amount`, - { minWidth: 100 }, - ), - className: 'total-period', - })) - : []), - ], - [ - query.display_columns_type, - tableRows, - columns, - ], - ); + // Retrieves the profit/loss table columns. + const tableColumns = useProfitLossSheetColumns(); // Retrieve default expanded rows of balance sheet. - const expandedRows = useMemo( - () => defaultExpanderReducer(tableRows, 3), - [tableRows], + const expandedRows = React.useMemo( + () => defaultExpanderReducer(table?.rows || [], 3), + [table], ); - // Retrieve conditional datatable row classnames. - const rowClassNames = useCallback((row) => { - const { original } = row; - const rowTypes = Array.isArray(original.rowTypes) ? original.rowTypes : []; - - return { - ...rowTypes.reduce((acc, rowType) => { - acc[`row_type--${rowType}`] = rowType; - return acc; - }, {}), - }; - }, []); - return ( } - fromDate={query.from_date} - toDate={query.to_date} + // fromDate={query.from_date} + // toDate={query.to_date} name="profit-loss-sheet" loading={isLoading} - basis={query.basis} + // basis={query.basis} > - ); } + +const ProfitLossDataTable = styled(DataTable)` + .table { + .tbody .tr { + .td { + border-bottom: 0; + padding-top: 0.36rem; + padding-bottom: 0.36rem; + } + &.is-expanded { + .td:not(.name) .cell-inner { + opacity: 0; + } + } + &.row_type--TOTAL { + .td { + font-weight: 500; + border-top: 1px solid #bbb; + } + } + &:last-of-type .td{ + border-bottom: 1px solid #bbb; + } + } + } +`; diff --git a/src/containers/FinancialStatements/ProfitLossSheet/hooks.js b/src/containers/FinancialStatements/ProfitLossSheet/hooks.js new file mode 100644 index 000000000..6f89ce860 --- /dev/null +++ b/src/containers/FinancialStatements/ProfitLossSheet/hooks.js @@ -0,0 +1,14 @@ +import React from 'react'; +import { dynamicColumns } from './utils'; +import { useProfitLossSheetContext } from './ProfitLossProvider'; + +export const useProfitLossSheetColumns = () => { + const { + profitLossSheet: { table }, + } = useProfitLossSheetContext(); + + return React.useMemo( + () => dynamicColumns(table.columns || [], table.rows || []), + [table], + ); +}; diff --git a/src/containers/FinancialStatements/ProfitLossSheet/utils.js b/src/containers/FinancialStatements/ProfitLossSheet/utils.js new file mode 100644 index 000000000..b0d42cc5d --- /dev/null +++ b/src/containers/FinancialStatements/ProfitLossSheet/utils.js @@ -0,0 +1,365 @@ +import * as R from 'ramda'; +import { isEmpty } from 'lodash'; +import { CellTextSpan } from 'components/Datatable/Cells'; +import { getColumnWidth } from 'utils'; + +const Align = { Left: 'left', Right: 'right', Center: 'center' }; +const getTableCellValueAccessor = (index) => `cells[${index}].value`; + +const getReportColWidth = (data, accessor) => { + return getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }); +}; + +const isNodeHasChildren = (node) => !isEmpty(node.children); + +/** + * `Percentage of income` column accessor. + */ +const percentageOfIncomeAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getReportColWidth(data, accessor), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * `Percentage of expense` column accessor. + */ +const percentageOfExpenseAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getReportColWidth(data, accessor), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * `Percentage of column` column accessor. + */ +const percentageOfColumnAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getReportColWidth(data, accessor), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * `Percentage of row` column accessor. + */ +const percentageOfRowAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getReportColWidth(data, accessor), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * Previous year column accessor. + */ +const previousYearAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getReportColWidth(data, accessor), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * Pervious year change column accessor. + */ +const previousYearChangeAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getReportColWidth(data, accessor), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * Previous year percentage column accessor. + */ +const previousYearPercentageAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getReportColWidth(data, accessor), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * Previous period column accessor. + */ +const previousPeriodAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getReportColWidth(data, accessor), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * Previous period change column accessor. + */ +const previousPeriodChangeAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getReportColWidth(data, accessor), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * Previous period percentage column accessor. + */ +const previousPeriodPercentageAccessor = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + Header: column.label, + key: column.key, + accessor, + width: getReportColWidth(data, accessor), + align: Align.Right, + disableSortBy: true, + textOverview: true, + }; +}); + +/** + * + * @param {*} column + * @param {*} index + * @returns + */ +const totalColumnsMapper = R.curry((data, column) => { + return R.compose( + R.when(R.pathEq(['key'], 'total'), totalColumn(data)), + // Percetage of column/row. + R.when( + R.pathEq(['key'], 'percentage_column'), + percentageOfColumnAccessor(data), + ), + R.when( + R.pathEq(['key'], 'percentage_row'), + percentageOfRowAccessor(data), + ), + R.when( + R.pathEq(['key'], 'percentage_income'), + percentageOfIncomeAccessor(data), + ), + R.when( + R.pathEq(['key'], 'percentage_expenses'), + percentageOfExpenseAccessor(data), + ), + // Previous year. + R.when(R.pathEq(['key'], 'previous_year'), previousYearAccessor(data)), + R.when( + R.pathEq(['key'], 'previous_year_change'), + previousYearChangeAccessor(data), + ), + R.when( + R.pathEq(['key'], 'previous_year_percentage'), + previousYearPercentageAccessor(data), + ), + // Pervious period. + R.when(R.pathEq(['key'], 'previous_period'), previousPeriodAccessor(data)), + R.when( + R.pathEq(['key'], 'previous_period_change'), + previousPeriodChangeAccessor(data), + ), + R.when( + R.pathEq(['key'], 'previous_period_percentage'), + previousPeriodPercentageAccessor(data), + ), + )(column); +}); + +/** + * Total sub-columns composer. + */ +const totalColumnsComposer = R.curry((data, column) => { + return R.map(totalColumnsMapper(data), column.children); +}); + +/** + * Assoc columns to total column. + */ +const assocColumnsToTotalColumn = R.curry((data, column, columnAccessor) => { + const columns = totalColumnsComposer(data, column); + + return R.assoc('columns', columns, columnAccessor); +}); + +/** + * + */ +const totalColumn = R.curry((data, column) => { + const hasChildren = isNodeHasChildren(column); + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + key: column.key, + Header: column.label, + accessor, + textOverview: true, + Cell: CellTextSpan, + width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 200 }), + disableSortBy: true, + align: hasChildren ? 'center' : 'right', + }; +}); + +/** + * + */ +const totalColumnCompose = R.curry((data, column) => { + const hasChildren = isNodeHasChildren(column); + + return R.compose( + R.when(R.always(hasChildren), assocColumnsToTotalColumn(data, column)), + totalColumn(data), + )(column); +}); + +/** + * Account name column mapper. + */ +const accountNameColumn = R.curry((data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + key: column.key, + Header: column.label, + accessor, + className: column.key, + textOverview: true, + width: getReportColWidth(data, accessor), + }; +}); + + +/** + * + * @param {*} data + * @param {*} column + * @returns + */ + const dateRangeSoloColumnAttrs = (data, column) => { + const accessor = getTableCellValueAccessor(column.cell_index); + + return { + accessor, + width: getReportColWidth(data, accessor), + }; +}; + +const dateRangeColumn = R.curry((data, column) => { + const isDateColumnHasColumns = isNodeHasChildren(column); + + const columnAccessor = { + Header: column.label, + key: column.key, + disableSortBy: true, + textOverview: true, + align: Align.Center, + }; + return R.compose( + R.when( + R.always(isDateColumnHasColumns), + assocColumnsToTotalColumn(data, column), + ), + R.when( + R.always(!isDateColumnHasColumns), + R.mergeLeft(dateRangeSoloColumnAttrs(data, column)), + ), + )(columnAccessor); +}) + +/** + * Detarmines the given string starts with `date-range` string. + */ + const isMatchesDateRange = (r) => R.match(/^date-range/g, r).length > 0; + +/** + * + * @param {} data + * @param {} column + */ +const dynamicColumnMapper = R.curry((data, column) => { + const indexTotalColumn = totalColumnCompose(data); + const indexAccountNameColumn = accountNameColumn(data); + const indexDatePeriodMapper = dateRangeColumn(data); + + return R.compose( + R.when(R.pathSatisfies(isMatchesDateRange, ['key']), indexDatePeriodMapper), + R.when(R.pathEq(['key'], 'name'), indexAccountNameColumn), + R.when(R.pathEq(['key'], 'total'), indexTotalColumn), + )(column); +}); + +/** + * + * @param {*} columns + * @param {*} data + * @returns + */ +export const dynamicColumns = (columns, data) => { + return R.map(dynamicColumnMapper(data), columns); +}; diff --git a/src/hooks/query/financialReports.js b/src/hooks/query/financialReports.js index 12ac238bd..dce611916 100644 --- a/src/hooks/query/financialReports.js +++ b/src/hooks/query/financialReports.js @@ -29,16 +29,10 @@ export function useBalanceSheet(query, props) { }, { select: (res) => ({ - columns: res.data.table.columns, - tableRows: res.data.table.rows, - // query: res.data.query, - // meta: res.data.meta, + table: res.data.table }), defaultData: { - tableRows: [], - columns: [], - // query: {}, - // meta: {}, + table: {}, }, ...props, }, @@ -68,6 +62,7 @@ export function useTrialBalanceSheet(query, props) { method: 'get', url: '/financial_statements/trial_balance_sheet', params: query, + }, { select: (res) => ({ @@ -94,17 +89,16 @@ export function useProfitLossSheet(query, props) { method: 'get', url: '/financial_statements/profit_loss_sheet', params: query, + headers: { + Accept: 'application/json+table', + }, }, { select: (res) => ({ - tableRows: profitLossSheetReducer(res.data.data), - ...res.data, + table: res.data.table }), defaultData: { - data: {}, - tableRows: [], - columns: [], - query: {}, + table: {}, }, ...props, }, diff --git a/src/style/App.scss b/src/style/App.scss index 55b604c00..f4a0e9186 100644 --- a/src/style/App.scss +++ b/src/style/App.scss @@ -285,6 +285,9 @@ html[lang^="ar"] { .align-right { text-align: right; } +.align-center{ + text-align: center; +} .font-bold { font-weight: 600; diff --git a/src/style/components/DataTable/DataTable.scss b/src/style/components/DataTable/DataTable.scss index 1258e6160..a2c396075 100644 --- a/src/style/components/DataTable/DataTable.scss +++ b/src/style/components/DataTable/DataTable.scss @@ -363,11 +363,15 @@ .table-constrant, .table--constrant { .table { + .thead{ + .tr:first-of-type{ + border-top: 1px solid #000000; + } + } .thead .th { background: transparent; color: #222222; border-bottom: 1px solid #000000; - border-top: 1px solid #000000; padding: 0.5rem; } diff --git a/src/style/pages/FinancialStatements/BalanceSheet.scss b/src/style/pages/FinancialStatements/BalanceSheet.scss deleted file mode 100644 index eea6edd57..000000000 --- a/src/style/pages/FinancialStatements/BalanceSheet.scss +++ /dev/null @@ -1,47 +0,0 @@ - -.financial-sheet{ - - &--balance-sheet{ - .financial-sheet__table{ - - .thead, - .tbody{ - .tr .td.name ~ .td, - .tr .th.name ~ .th{ - text-align: right; - } - } - .tbody{ - .tr .td{ - border-bottom: 0; - padding-top: 0.4rem; - padding-bottom: 0.4rem; - } - .tr.row_type--total-row .td{ - border-top: 1px solid #BBB; - } - .tr.row_type--total-row.row_type--assets .td, - .tr.row_type--total-row.row_type--liabilities_equity .td{ - border-bottom: 3px double #333; - } - .tr.row_type--total-row{ - .total.td, - .account_name.td, - .total-period.td{ - font-weight: 600; - color: #333; - } - } - - .tr.is-expanded{ - .td.total, - .td.total-period{ - .cell-text{ - display: none; - } - } - } - } - } - } -} \ No newline at end of file diff --git a/src/style/pages/FinancialStatements/FinancialSheet.scss b/src/style/pages/FinancialStatements/FinancialSheet.scss deleted file mode 100644 index 5c37bfdd3..000000000 --- a/src/style/pages/FinancialStatements/FinancialSheet.scss +++ /dev/null @@ -1,26 +0,0 @@ - -.bigcapital-datatable{ - - &--financial-report{ - .table { - .tbody{ - - .tr.no-results { - .td{ - border-bottom: 1px solid #DDD; - } - } - } - .thead{ - .tr .th{ - background-color: #fff; - border-top: 1px solid #666; - border-bottom: 1px solid #666; - - padding: 8px 0.4rem; - color: #222; - } - } - } - } -} diff --git a/src/utils/index.js b/src/utils/index.js index f91986577..945a41c09 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -900,3 +900,15 @@ export function ignoreEventFromSelectors(event, selectors) { .map((selector) => event.target.closest(selector)) .some((element) => !!element); } + + + +export const tableRowTypesToClassnames = ({ original }) => { + const rowTypes = _.castArray(original.row_types); + + return rowTypes.reduce((acc, rowType) => { + acc[`row_type--${rowType}`] = rowType; + + return acc; + }, {}); +}; \ No newline at end of file From 066df2825709c189d33369b25ddbaad6f906bad1 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sat, 29 Jan 2022 21:32:20 +0200 Subject: [PATCH 07/72] fix(BalanceSheet): columns width based in cells contents. --- .../FinancialStatements/BalanceSheet/utils.js | 43 ++++++++++---- .../ProfitLossSheet/utils.js | 57 ++++++++++++------- src/style/components/DataTable/DataTable.scss | 2 +- src/utils/index.js | 2 + 4 files changed, 69 insertions(+), 35 deletions(-) diff --git a/src/containers/FinancialStatements/BalanceSheet/utils.js b/src/containers/FinancialStatements/BalanceSheet/utils.js index d22ee2aec..33bb72e01 100644 --- a/src/containers/FinancialStatements/BalanceSheet/utils.js +++ b/src/containers/FinancialStatements/BalanceSheet/utils.js @@ -10,6 +10,15 @@ const getTableCellValueAccessor = (index) => `cells[${index}].value`; const Align = { Left: 'left', Right: 'right', Center: 'center' }; +const getReportColWidth = (data, accessor, headerText) => { + return getColumnWidth( + data, + accessor, + { magicSpacing: 10, minWidth: 100 }, + headerText, + ); +}; + /** * * @returns @@ -45,6 +54,7 @@ export const getBalanceSheetHeaderValidationSchema = () => */ const accountNameMapper = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { key: column.key, @@ -52,7 +62,7 @@ const accountNameMapper = R.curry((data, column) => { accessor, className: column.key, textOverview: true, - width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 240 }), + width, }; }); @@ -82,7 +92,7 @@ const dateRangeSoloColumnAttrs = (data, column) => { return { accessor, - width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + width: getReportColWidth(data, accessor), }; }; @@ -117,6 +127,7 @@ const dateRangeMapper = R.curry((data, column) => { const totalMapper = R.curry((data, column) => { const hasChildren = !isEmpty(column.children); const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); const columnAccessor = { key: column.key, @@ -124,9 +135,9 @@ const totalMapper = R.curry((data, column) => { accessor, textOverview: true, Cell: CellTextSpan, - width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 200 }), + width, disableSortBy: true, - align: hasChildren ? 'center' : 'right', + align: hasChildren ? Align.Center : Align.Left, }; return R.compose( R.when(R.always(hasChildren), assocColumnsToTotalColumn(data, column)), @@ -138,12 +149,13 @@ const totalMapper = R.curry((data, column) => { */ const percentageOfColumnAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -155,12 +167,13 @@ const percentageOfColumnAccessor = R.curry((data, column) => { */ const percentageOfRowAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -172,12 +185,13 @@ const percentageOfRowAccessor = R.curry((data, column) => { */ const previousYearAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -189,12 +203,13 @@ const previousYearAccessor = R.curry((data, column) => { */ const previousYearChangeAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -206,12 +221,13 @@ const previousYearChangeAccessor = R.curry((data, column) => { */ const previousYearPercentageAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -223,12 +239,13 @@ const previousYearPercentageAccessor = R.curry((data, column) => { */ const previousPeriodAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -240,12 +257,13 @@ const previousPeriodAccessor = R.curry((data, column) => { */ const previousPeriodChangeAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -257,12 +275,13 @@ const previousPeriodChangeAccessor = R.curry((data, column) => { */ const previousPeriodPercentageAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }), + width, align: Align.Right, disableSortBy: true, textOverview: true, diff --git a/src/containers/FinancialStatements/ProfitLossSheet/utils.js b/src/containers/FinancialStatements/ProfitLossSheet/utils.js index b0d42cc5d..67644edca 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/utils.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/utils.js @@ -6,8 +6,13 @@ import { getColumnWidth } from 'utils'; const Align = { Left: 'left', Right: 'right', Center: 'center' }; const getTableCellValueAccessor = (index) => `cells[${index}].value`; -const getReportColWidth = (data, accessor) => { - return getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 100 }); +const getReportColWidth = (data, accessor, labelText) => { + return getColumnWidth( + data, + accessor, + { magicSpacing: 10, minWidth: 100 }, + labelText, + ); }; const isNodeHasChildren = (node) => !isEmpty(node.children); @@ -17,12 +22,13 @@ const isNodeHasChildren = (node) => !isEmpty(node.children); */ const percentageOfIncomeAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getReportColWidth(data, accessor), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -34,12 +40,13 @@ const percentageOfIncomeAccessor = R.curry((data, column) => { */ const percentageOfExpenseAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getReportColWidth(data, accessor), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -51,12 +58,13 @@ const percentageOfExpenseAccessor = R.curry((data, column) => { */ const percentageOfColumnAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getReportColWidth(data, accessor), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -68,12 +76,13 @@ const percentageOfColumnAccessor = R.curry((data, column) => { */ const percentageOfRowAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getReportColWidth(data, accessor), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -85,12 +94,13 @@ const percentageOfRowAccessor = R.curry((data, column) => { */ const previousYearAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getReportColWidth(data, accessor), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -102,12 +112,13 @@ const previousYearAccessor = R.curry((data, column) => { */ const previousYearChangeAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getReportColWidth(data, accessor), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -119,12 +130,13 @@ const previousYearChangeAccessor = R.curry((data, column) => { */ const previousYearPercentageAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getReportColWidth(data, accessor), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -136,12 +148,13 @@ const previousYearPercentageAccessor = R.curry((data, column) => { */ const previousPeriodAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getReportColWidth(data, accessor), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -153,12 +166,13 @@ const previousPeriodAccessor = R.curry((data, column) => { */ const previousPeriodChangeAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getReportColWidth(data, accessor), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -170,12 +184,13 @@ const previousPeriodChangeAccessor = R.curry((data, column) => { */ const previousPeriodPercentageAccessor = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { Header: column.label, key: column.key, accessor, - width: getReportColWidth(data, accessor), + width, align: Align.Right, disableSortBy: true, textOverview: true, @@ -196,10 +211,7 @@ const totalColumnsMapper = R.curry((data, column) => { R.pathEq(['key'], 'percentage_column'), percentageOfColumnAccessor(data), ), - R.when( - R.pathEq(['key'], 'percentage_row'), - percentageOfRowAccessor(data), - ), + R.when(R.pathEq(['key'], 'percentage_row'), percentageOfRowAccessor(data)), R.when( R.pathEq(['key'], 'percentage_income'), percentageOfIncomeAccessor(data), @@ -253,6 +265,7 @@ const assocColumnsToTotalColumn = R.curry((data, column, columnAccessor) => { const totalColumn = R.curry((data, column) => { const hasChildren = isNodeHasChildren(column); const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { key: column.key, @@ -260,7 +273,7 @@ const totalColumn = R.curry((data, column) => { accessor, textOverview: true, Cell: CellTextSpan, - width: getColumnWidth(data, accessor, { magicSpacing: 10, minWidth: 200 }), + width, disableSortBy: true, align: hasChildren ? 'center' : 'right', }; @@ -283,6 +296,7 @@ const totalColumnCompose = R.curry((data, column) => { */ const accountNameColumn = R.curry((data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); + const width = getReportColWidth(data, accessor, column.label); return { key: column.key, @@ -290,18 +304,17 @@ const accountNameColumn = R.curry((data, column) => { accessor, className: column.key, textOverview: true, - width: getReportColWidth(data, accessor), + width, }; }); - /** * * @param {*} data * @param {*} column * @returns */ - const dateRangeSoloColumnAttrs = (data, column) => { +const dateRangeSoloColumnAttrs = (data, column) => { const accessor = getTableCellValueAccessor(column.cell_index); return { @@ -330,12 +343,12 @@ const dateRangeColumn = R.curry((data, column) => { R.mergeLeft(dateRangeSoloColumnAttrs(data, column)), ), )(columnAccessor); -}) +}); /** * Detarmines the given string starts with `date-range` string. */ - const isMatchesDateRange = (r) => R.match(/^date-range/g, r).length > 0; +const isMatchesDateRange = (r) => R.match(/^date-range/g, r).length > 0; /** * diff --git a/src/style/components/DataTable/DataTable.scss b/src/style/components/DataTable/DataTable.scss index a2c396075..0306567bb 100644 --- a/src/style/components/DataTable/DataTable.scss +++ b/src/style/components/DataTable/DataTable.scss @@ -364,7 +364,7 @@ .table--constrant { .table { .thead{ - .tr:first-of-type{ + .tr:first-of-type .th{ border-top: 1px solid #000000; } } diff --git a/src/utils/index.js b/src/utils/index.js index 945a41c09..d1957f2df 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -439,9 +439,11 @@ export const getColumnWidth = ( rows, accessor, { maxWidth, minWidth, magicSpacing = 14 }, + headerText = '' ) => { const cellLength = Math.max( ...rows.map((row) => (`${_.get(row, accessor)}` || '').length), + headerText.length ); let result = cellLength * magicSpacing; From 34501a9a61390eefe24acfa059dc6d2289d9d745 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sat, 29 Jan 2022 21:35:31 +0200 Subject: [PATCH 08/72] fix(BalanceSheet): dynamic columns width. --- src/containers/FinancialStatements/BalanceSheet/utils.js | 4 ++-- src/containers/FinancialStatements/ProfitLossSheet/utils.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/containers/FinancialStatements/BalanceSheet/utils.js b/src/containers/FinancialStatements/BalanceSheet/utils.js index 33bb72e01..db59cd326 100644 --- a/src/containers/FinancialStatements/BalanceSheet/utils.js +++ b/src/containers/FinancialStatements/BalanceSheet/utils.js @@ -14,7 +14,7 @@ const getReportColWidth = (data, accessor, headerText) => { return getColumnWidth( data, accessor, - { magicSpacing: 10, minWidth: 100 }, + { magicSpacing: 9, minWidth: 100 }, headerText, ); }; @@ -137,7 +137,7 @@ const totalMapper = R.curry((data, column) => { Cell: CellTextSpan, width, disableSortBy: true, - align: hasChildren ? Align.Center : Align.Left, + align: hasChildren ? Align.Center : Align.Right, }; return R.compose( R.when(R.always(hasChildren), assocColumnsToTotalColumn(data, column)), diff --git a/src/containers/FinancialStatements/ProfitLossSheet/utils.js b/src/containers/FinancialStatements/ProfitLossSheet/utils.js index 67644edca..aee0c6008 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/utils.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/utils.js @@ -10,7 +10,7 @@ const getReportColWidth = (data, accessor, labelText) => { return getColumnWidth( data, accessor, - { magicSpacing: 10, minWidth: 100 }, + { magicSpacing: 9, minWidth: 100 }, labelText, ); }; From fa455152a33948e60cd2f1e8baa7fbf825a3c610 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sat, 29 Jan 2022 21:57:39 +0200 Subject: [PATCH 09/72] feat(ProfitLoss): WIP --- .../ProfitLossSheet/ProfitLossSheet.js | 1 - .../ProfitLossSheet/utils.js | 12 ++++-- .../FinancialStatements/ProfitLossSheet.scss | 42 ------------------- 3 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 src/style/pages/FinancialStatements/ProfitLossSheet.scss diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js index 67244362f..70bbcb4cf 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js @@ -12,7 +12,6 @@ import withDashboardActions from 'containers/Dashboard/withDashboardActions'; import withProfitLossActions from './withProfitLossActions'; import withCurrentOrganization from '../../Organization/withCurrentOrganization'; -import 'style/pages/FinancialStatements/ProfitLossSheet.scss'; import { ProfitLossSheetProvider } from './ProfitLossProvider'; import { ProfitLossSheetLoadingBar, ProfitLossSheetAlerts } from './components'; diff --git a/src/containers/FinancialStatements/ProfitLossSheet/utils.js b/src/containers/FinancialStatements/ProfitLossSheet/utils.js index aee0c6008..bd8ad6990 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/utils.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/utils.js @@ -10,7 +10,7 @@ const getReportColWidth = (data, accessor, labelText) => { return getColumnWidth( data, accessor, - { magicSpacing: 9, minWidth: 100 }, + { magicSpacing: 10, minWidth: 100 }, labelText, ); }; @@ -260,7 +260,7 @@ const assocColumnsToTotalColumn = R.curry((data, column, columnAccessor) => { }); /** - * + * Retrieves the total column. */ const totalColumn = R.curry((data, column) => { const hasChildren = isNodeHasChildren(column); @@ -275,7 +275,7 @@ const totalColumn = R.curry((data, column) => { Cell: CellTextSpan, width, disableSortBy: true, - align: hasChildren ? 'center' : 'right', + align: hasChildren ? Align.Center : Align.Right, }; }); @@ -323,6 +323,9 @@ const dateRangeSoloColumnAttrs = (data, column) => { }; }; +/** + * Retrieves date range column. + */ const dateRangeColumn = R.curry((data, column) => { const isDateColumnHasColumns = isNodeHasChildren(column); @@ -331,7 +334,7 @@ const dateRangeColumn = R.curry((data, column) => { key: column.key, disableSortBy: true, textOverview: true, - align: Align.Center, + align: isDateColumnHasColumns ? Align.Center : Align.Center, }; return R.compose( R.when( @@ -374,5 +377,6 @@ const dynamicColumnMapper = R.curry((data, column) => { * @returns */ export const dynamicColumns = (columns, data) => { + debugger; return R.map(dynamicColumnMapper(data), columns); }; diff --git a/src/style/pages/FinancialStatements/ProfitLossSheet.scss b/src/style/pages/FinancialStatements/ProfitLossSheet.scss deleted file mode 100644 index 44e394406..000000000 --- a/src/style/pages/FinancialStatements/ProfitLossSheet.scss +++ /dev/null @@ -1,42 +0,0 @@ - -.financial-sheet{ - &--profit-loss-sheet{ - .financial-sheet__table{ - .thead, - .tbody{ - .tr .td:not(:first-child), - .tr .th:not(:first-child) { - text-align: right; - } - } - .tbody{ - .tr .td{ - border-bottom: 0; - padding-top: 0.4rem; - padding-bottom: 0.4rem; - } - .tr.row_type--total{ - font-weight: 500; - } - .tr.row_type--section_total .td{ - border-top: 1px solid #BBB - } - .tr.row_type--section_total + .tr .td{ - border-top: 1px solid #666; - } - .tr.row_type--net_income_total.row_type--total .td{ - border-bottom: 3px double #333; - } - - .tr.is-expanded{ - .td.total, - .td.total-period{ - .cell-text{ - display: none; - } - } - } - } - } - } -} \ No newline at end of file From 3d78d2d051fe88f78934c122ff21ac0148cc4d59 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sun, 30 Jan 2022 15:57:27 +0200 Subject: [PATCH 10/72] feat: integrate balance sheet and P&L sheet with new API. --- .../BalanceSheet/BalanceSheet.js | 26 +--- .../BalanceSheet/BalanceSheetBody.js | 30 ++++ .../BalanceSheet/BalanceSheetProvider.js | 1 - .../BalanceSheet/BalanceSheetTable.js | 9 +- .../BalanceSheet/components.js | 13 +- .../FinancialReportPage.js | 48 +++++- .../ProfitLossSheet/ProfitLossBody.js | 35 +++++ .../ProfitLossSheet/ProfitLossSheet.js | 27 +--- .../ProfitLossSheet/ProfitLossSheetHeader.js | 2 +- .../ProfitLossSheet/ProfitLossSheetTable.js | 8 +- .../FinancialStatements/reducers.js | 143 +----------------- src/hooks/query/financialReports.js | 30 +--- .../FinancialReportPage.scss | 31 +--- 13 files changed, 147 insertions(+), 256 deletions(-) create mode 100644 src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js create mode 100644 src/containers/FinancialStatements/ProfitLossSheet/ProfitLossBody.js diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js index 84e91a083..b79940fb0 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js @@ -5,23 +5,21 @@ import { BalanceSheetAlerts, BalanceSheetLoadingBar } from './components'; import { FinancialStatement } from 'components'; import BalanceSheetHeader from './BalanceSheetHeader'; -import BalanceSheetTable from './BalanceSheetTable'; import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; import BalanceSheetActionsBar from './BalanceSheetActionsBar'; import { BalanceSheetProvider } from './BalanceSheetProvider'; +import { BalanceSheetBody } from './BalanceSheetBody'; +import { FinancialReportBody } from '../FinancialReportPage'; import withBalanceSheetActions from './withBalanceSheetActions'; -import withCurrentOrganization from '../../../containers/Organization/withCurrentOrganization'; import { compose } from 'utils'; /** * Balance sheet. + * @returns {React.JSX} */ function BalanceSheet({ - // #withCurrentOrganization - organizationName, - // #withBalanceSheetActions toggleBalanceSheetFilterDrawer, }) { @@ -42,7 +40,6 @@ function BalanceSheet({ }; setFilter({ ..._filter }); }; - // Handle number format submit. const handleNumberFormatSubmit = (values) => { setFilter({ @@ -50,7 +47,6 @@ function BalanceSheet({ numberFormat: values, }); }; - // Hides the balance sheet filter drawer once the page unmount. useEffect( () => () => { @@ -66,6 +62,7 @@ function BalanceSheet({ onNumberFormatSubmit={handleNumberFormatSubmit} /> + {/* */} @@ -73,20 +70,13 @@ function BalanceSheet({ pageFilter={filter} onSubmitFilter={handleFilterSubmit} /> -
- -
+ + + - - {/* */} ); } -export default compose( - withCurrentOrganization(({ organization }) => ({ - organizationName: organization.name, - })), - withBalanceSheetActions, -)(BalanceSheet); +export default compose(withBalanceSheetActions)(BalanceSheet); diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js new file mode 100644 index 000000000..68214e408 --- /dev/null +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js @@ -0,0 +1,30 @@ +import React from 'react'; + +import BalanceSheetTable from './BalanceSheetTable'; +import withCurrentOrganization from '../../../containers/Organization/withCurrentOrganization'; +import { useBalanceSheetContext } from './BalanceSheetProvider'; + +import { compose } from 'utils'; + +/** + * Balance sheet body JSX. + * @returns {React.JSX} + */ +function BalanceSheetBodyJSX({ + // #withCurrentOrganization + organizationName, +}) { + const { isLoading } = useBalanceSheetContext(); + + return isLoading ? ( + 'loading' + ) : ( + + ); +} + +export const BalanceSheetBody = compose( + withCurrentOrganization(({ organization }) => ({ + organizationName: organization.name, + })), +)(BalanceSheetBodyJSX); diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetProvider.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetProvider.js index 087728cd1..3249e8bc5 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetProvider.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetProvider.js @@ -10,7 +10,6 @@ function BalanceSheetProvider({ filter, ...props }) { const query = React.useMemo(() => transformFilterFormToQuery(filter), [ filter, ]); - // Fetches the balance sheet report. const { data: balanceSheet, diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js index 242b29d8d..d73d14e06 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js @@ -36,14 +36,13 @@ export default function BalanceSheetTable({ name="balance-sheet" companyName={companyName} sheetType={intl.get('balance_sheet')} - // fromDate={query.from_date} - // toDate={query.to_date} - // basis={query.basis} - // loading={isLoading} + fromDate={query.from_date} + toDate={query.to_date} + basis={query.basis} > -
+ {' '} -
+ ); } @@ -57,7 +60,7 @@ export const useBalanceSheetColumns = () => { } = useBalanceSheetContext(); return React.useMemo( - () => dynamicColumns(table?.columns || [], table?.rows || []), + () => dynamicColumns(table.columns, table.rows), [table], ); }; diff --git a/src/containers/FinancialStatements/FinancialReportPage.js b/src/containers/FinancialStatements/FinancialReportPage.js index 8ffc610e1..d637f11ed 100644 --- a/src/containers/FinancialStatements/FinancialReportPage.js +++ b/src/containers/FinancialStatements/FinancialReportPage.js @@ -1,18 +1,60 @@ import React from 'react'; import classNames from 'classnames'; import { DashboardInsider } from 'components'; +import styled from 'styled-components'; import { CLASSES } from 'common/classes'; -import 'style/pages/FinancialStatements/FinancialReportPage.scss'; - /** * Financial report page. */ export default function FinancialReportPage(props) { return ( - ); } + +export const FinancialComputeAlert = styled.div` + position: relative; + padding: 8px 20px; + border-radius: 2px; + background-color: #fdecda; + color: #342515; + font-size: 13px; + + button { + font-size: 12px; + min-height: 16px; + padding: 0 4px; + + &, + &:hover { + color: #824400; + text-decoration: underline; + } + } + svg { + margin-right: 6px; + position: relative; + top: -2px; + fill: #975f19; + } +`; + +export const FinancialProgressbar = styled.div` + .progress-materializecss { + top: -2px; + } +`; + +export const FinancialReportPageRoot = styled(DashboardInsider)``; + +export const FinancialReportBody = styled.div` + padding-left: 15px; + padding-right: 15px; + display: flex; + justify-content: center; + align-items: center; +`; diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossBody.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossBody.js new file mode 100644 index 000000000..8a853e1c3 --- /dev/null +++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossBody.js @@ -0,0 +1,35 @@ +import React from 'react'; + +import ProfitLossSheetTable from './ProfitLossSheetTable'; +import { FinancialReportBody } from '../FinancialReportPage'; + +import withCurrentOrganization from '../../Organization/withCurrentOrganization'; +import { useProfitLossSheetContext } from './ProfitLossProvider'; + +import { compose } from 'utils'; + +/** + * @returns {React.JSX} + */ +function ProfitLossBodyJSX({ + // #withPreferences + organizationName, +}) { + const { isLoading } = useProfitLossSheetContext(); + + return ( + + {isLoading ? ( + 'loading' + ) : ( + + )} + + ); +} + +export const ProfitLossBody = compose( + withCurrentOrganization(({ organization }) => ({ + organizationName: organization.name, + })), +)(ProfitLossBodyJSX); diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js index 70bbcb4cf..7a251da38 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.js @@ -3,25 +3,21 @@ import moment from 'moment'; import { compose } from 'utils'; import ProfitLossSheetHeader from './ProfitLossSheetHeader'; -import ProfitLossSheetTable from './ProfitLossSheetTable'; import ProfitLossActionsBar from './ProfitLossActionsBar'; import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; import withDashboardActions from 'containers/Dashboard/withDashboardActions'; import withProfitLossActions from './withProfitLossActions'; -import withCurrentOrganization from '../../Organization/withCurrentOrganization'; import { ProfitLossSheetProvider } from './ProfitLossProvider'; import { ProfitLossSheetLoadingBar, ProfitLossSheetAlerts } from './components'; +import { ProfitLossBody } from './ProfitLossBody'; /** * Profit/Loss financial statement sheet. */ function ProfitLossSheet({ - // #withPreferences - organizationName, - // #withProfitLossActions toggleProfitLossFilterDrawer: toggleDisplayFilterDrawer, }) { @@ -32,7 +28,6 @@ function ProfitLossSheet({ displayColumnsType: 'total', filterByOption: 'with-transactions', }); - // Handle submit filter. const handleSubmitFilter = (filter) => { const _filter = { @@ -42,7 +37,6 @@ function ProfitLossSheet({ }; setFilter(_filter); }; - // Handle number format submit. const handleNumberFormatSubmit = (numberFormat) => { setFilter({ @@ -64,19 +58,15 @@ function ProfitLossSheet({ numberFormat={filter.numberFormat} onNumberFormatSubmit={handleNumberFormatSubmit} /> - {/* */} + {/* */} -
- -
- -
-
+ + ); @@ -85,7 +75,4 @@ function ProfitLossSheet({ export default compose( withDashboardActions, withProfitLossActions, - withCurrentOrganization(({ organization }) => ({ - organizationName: organization.name, - })), )(ProfitLossSheet); diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js index 6f33077e2..1a958a447 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.js @@ -1,4 +1,4 @@ -import React, { useEffect } from 'react'; +import React from 'react'; import moment from 'moment'; import { Formik, Form } from 'formik'; import { FormattedMessage as T } from 'components'; diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js index 5b655ece2..501838dc7 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js @@ -17,7 +17,7 @@ export default function ProfitLossSheetTable({ }) { // Profit/Loss sheet context. const { - profitLossSheet: { table }, + profitLossSheet: { table, query }, isLoading, } = useProfitLossSheetContext(); @@ -34,11 +34,11 @@ export default function ProfitLossSheetTable({ } - // fromDate={query.from_date} - // toDate={query.to_date} + fromDate={query.from_date} + toDate={query.to_date} name="profit-loss-sheet" loading={isLoading} - // basis={query.basis} + basis={query.basis} > { - return accounts.map((account) => { - return { - ...account, - children: balanceSheetRowsReducer([ - ...(account.children ? account.children : []), - ...(account.total && account.children && account.children.length > 0 - ? [ - { - name: intl.get('total_name', { name: account.name }), - row_types: ['total-row', account.section_type], - total: { ...account.total }, - ...(account.total_periods && { - total_periods: account.total_periods, - }), - }, - ] - : []), - ]), - }; - }); -}; - export const trialBalanceSheetReducer = (sheet) => { const results = []; @@ -44,124 +21,6 @@ export const trialBalanceSheetReducer = (sheet) => { return results; }; -export const profitLossSheetReducer = (profitLoss) => { - const results = []; - - if (profitLoss.income) { - results.push({ - name: , - total: profitLoss.income.total, - children: [ - ...profitLoss.income.accounts, - { - name: , - total: profitLoss.income.total, - total_periods: profitLoss.income.total_periods, - rowTypes: ['income_total', 'section_total', 'total'], - }, - ], - total_periods: profitLoss.income.total_periods, - }); - } - if (profitLoss.cost_of_sales) { - results.push({ - name: , - total: profitLoss.cost_of_sales.total, - children: [ - ...profitLoss.cost_of_sales.accounts, - { - name: , - total: profitLoss.cost_of_sales.total, - total_periods: profitLoss.cost_of_sales.total_periods, - rowTypes: ['cogs_total', 'section_total', 'total'], - }, - ], - total_periods: profitLoss.cost_of_sales.total_periods, - }); - } - if (profitLoss.gross_profit) { - results.push({ - name: , - total: profitLoss.gross_profit.total, - total_periods: profitLoss.gross_profit.total_periods, - rowTypes: ['gross_total', 'section_total', 'total'], - }); - } - if (profitLoss.expenses) { - results.push({ - name: , - total: profitLoss.expenses.total, - children: [ - ...profitLoss.expenses.accounts, - { - name: , - total: profitLoss.expenses.total, - total_periods: profitLoss.expenses.total_periods, - rowTypes: ['expenses_total', 'section_total', 'total'], - }, - ], - total_periods: profitLoss.expenses.total_periods, - }); - } - if (profitLoss.operating_profit) { - results.push({ - name: , - total: profitLoss.operating_profit.total, - total_periods: profitLoss.income.total_periods, - rowTypes: ['net_operating_total', 'section_total', 'total'], - }); - } - if (profitLoss.other_income) { - results.push({ - - name:, - total: profitLoss.other_income.total, - total_periods: profitLoss.other_income.total_periods, - children: [ - ...profitLoss.other_income.accounts, - { - name: , - total: profitLoss.other_income.total, - total_periods: profitLoss.other_income.total_periods, - rowTypes: ['expenses_total', 'section_total', 'total'], - }, - ], - }); - } - if (profitLoss.other_expenses) { - results.push({ - name: , - total: profitLoss.other_expenses.total, - total_periods: profitLoss.other_expenses.total_periods, - children: [ - ...profitLoss.other_expenses.accounts, - { - name: , - total: profitLoss.other_expenses.total, - total_periods: profitLoss.other_expenses.total_periods, - rowTypes: ['expenses_total', 'section_total', 'total'], - }, - ], - }); - } - if (profitLoss.net_other_income) { - results.push({ - name: , - total: profitLoss.net_other_income.total, - total_periods: profitLoss.net_other_income.total_periods, - rowTypes: ['net_other_income', 'section_total', 'total'], - }); - } - if (profitLoss.net_income) { - results.push({ - name: , - total: profitLoss.net_income.total, - total_periods: profitLoss.net_income.total_periods, - rowTypes: ['net_income_total', 'section_total', 'total'], - }); - } - return results; -}; export const journalTableRowsReducer = (journal) => { const TYPES = { diff --git a/src/hooks/query/financialReports.js b/src/hooks/query/financialReports.js index dce611916..018ab3d4f 100644 --- a/src/hooks/query/financialReports.js +++ b/src/hooks/query/financialReports.js @@ -1,8 +1,6 @@ import { useRequestQuery } from '../useQueryRequest'; import { trialBalanceSheetReducer, - balanceSheetRowsReducer, - profitLossSheetReducer, generalLedgerTableRowsReducer, journalTableRowsReducer, ARAgingSummaryTableRowsMapper, @@ -28,27 +26,9 @@ export function useBalanceSheet(query, props) { }, }, { - select: (res) => ({ - table: res.data.table - }), - defaultData: { - table: {}, - }, + select: (res) => res.data, ...props, }, - // { - // select: (res) => ({ - // tableRows: balanceSheetRowsReducer(res.data.data), - // ...res.data, - // }), - // defaultData: { - // data: [], - // columns: [], - // query: {}, - // tableRows: [], - // }, - // ...props, - // }, ); } @@ -62,7 +42,6 @@ export function useTrialBalanceSheet(query, props) { method: 'get', url: '/financial_statements/trial_balance_sheet', params: query, - }, { select: (res) => ({ @@ -94,12 +73,7 @@ export function useProfitLossSheet(query, props) { }, }, { - select: (res) => ({ - table: res.data.table - }), - defaultData: { - table: {}, - }, + select: (res) => res.data, ...props, }, ); diff --git a/src/style/pages/FinancialStatements/FinancialReportPage.scss b/src/style/pages/FinancialStatements/FinancialReportPage.scss index 213fcd485..686646f18 100644 --- a/src/style/pages/FinancialStatements/FinancialReportPage.scss +++ b/src/style/pages/FinancialStatements/FinancialReportPage.scss @@ -4,35 +4,8 @@ .dashboard__insider--financial-report{ .alert-compute-running{ - position: relative; - padding: 8px 20px; - border-radius: 2px; - background-color: #fdecda; - color: #342515; - font-size: 13px; - - button{ - font-size: 12px; - min-height: 16px; - padding: 0 4px; - - &, - &:hover{ - color: #824400; - text-decoration: underline; - } - } - svg{ - margin-right: 6px; - position: relative; - top: -2px; - fill: #975f19; - } + } - .financial-progressbar{ - .progress-materializecss{ - top: -2px; - } - } + } \ No newline at end of file From e296507a964d47fb7460ddf58d391b772dd3d4df Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sun, 30 Jan 2022 16:01:59 +0200 Subject: [PATCH 11/72] chore: remove dubugger point. --- src/containers/FinancialStatements/ProfitLossSheet/utils.js | 1 - src/containers/FinancialStatements/reducers.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/containers/FinancialStatements/ProfitLossSheet/utils.js b/src/containers/FinancialStatements/ProfitLossSheet/utils.js index bd8ad6990..158af7ecb 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/utils.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/utils.js @@ -377,6 +377,5 @@ const dynamicColumnMapper = R.curry((data, column) => { * @returns */ export const dynamicColumns = (columns, data) => { - debugger; return R.map(dynamicColumnMapper(data), columns); }; diff --git a/src/containers/FinancialStatements/reducers.js b/src/containers/FinancialStatements/reducers.js index 919a8c4ba..05b2ad05a 100644 --- a/src/containers/FinancialStatements/reducers.js +++ b/src/containers/FinancialStatements/reducers.js @@ -1,8 +1,7 @@ -containers/FinancialStatements/reducersimport React from 'react'; +import React from 'react'; import { chain } from 'lodash'; import moment from 'moment'; import { FormattedMessage as T } from 'components'; -import intl from 'react-intl-universal'; export const trialBalanceSheetReducer = (sheet) => { const results = []; @@ -22,6 +21,7 @@ export const trialBalanceSheetReducer = (sheet) => { }; + export const journalTableRowsReducer = (journal) => { const TYPES = { ENTRY: 'ENTRY', From 8d6ed9be417b561cf2dc7d9ff42dd30f157e85f8 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sun, 30 Jan 2022 16:05:59 +0200 Subject: [PATCH 12/72] fix: balance sheet. --- .../BalanceSheet/BalanceSheet.js | 5 +---- .../BalanceSheet/BalanceSheetBody.js | 16 +++++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js index b79940fb0..13ee11db6 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.js @@ -9,7 +9,6 @@ import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; import BalanceSheetActionsBar from './BalanceSheetActionsBar'; import { BalanceSheetProvider } from './BalanceSheetProvider'; import { BalanceSheetBody } from './BalanceSheetBody'; -import { FinancialReportBody } from '../FinancialReportPage'; import withBalanceSheetActions from './withBalanceSheetActions'; @@ -70,9 +69,7 @@ function BalanceSheet({ pageFilter={filter} onSubmitFilter={handleFilterSubmit} /> - - - + diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js index 68214e408..f40d3f7be 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js @@ -1,7 +1,9 @@ import React from 'react'; import BalanceSheetTable from './BalanceSheetTable'; -import withCurrentOrganization from '../../../containers/Organization/withCurrentOrganization'; +import { FinancialReportBody } from '../FinancialReportPage'; + +import withCurrentOrganization from 'containers/Organization/withCurrentOrganization'; import { useBalanceSheetContext } from './BalanceSheetProvider'; import { compose } from 'utils'; @@ -16,10 +18,14 @@ function BalanceSheetBodyJSX({ }) { const { isLoading } = useBalanceSheetContext(); - return isLoading ? ( - 'loading' - ) : ( - + return ( + + {isLoading ? ( + 'loading' + ) : ( + + )} + ); } From ce223e7e2f3dc316136f942833182d41b61dd7c6 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Mon, 31 Jan 2022 01:04:23 +0200 Subject: [PATCH 13/72] feat(BalanceSheet|P&L): account name min-width. --- src/containers/FinancialStatements/BalanceSheet/utils.js | 2 +- src/containers/FinancialStatements/ProfitLossSheet/utils.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/containers/FinancialStatements/BalanceSheet/utils.js b/src/containers/FinancialStatements/BalanceSheet/utils.js index db59cd326..1e7c1b99b 100644 --- a/src/containers/FinancialStatements/BalanceSheet/utils.js +++ b/src/containers/FinancialStatements/BalanceSheet/utils.js @@ -62,7 +62,7 @@ const accountNameMapper = R.curry((data, column) => { accessor, className: column.key, textOverview: true, - width, + width: Math.max(width, 300), }; }); diff --git a/src/containers/FinancialStatements/ProfitLossSheet/utils.js b/src/containers/FinancialStatements/ProfitLossSheet/utils.js index 158af7ecb..aa9b223c6 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/utils.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/utils.js @@ -304,7 +304,7 @@ const accountNameColumn = R.curry((data, column) => { accessor, className: column.key, textOverview: true, - width, + width: Math.max(width, 300), }; }); From a3d250cdc8ea56db22e83964c6b2c526549c3168 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 1 Feb 2022 00:29:50 +0200 Subject: [PATCH 14/72] fix(Balance & P/L Sheet): fix comparison panel. --- .../BalanceSheetHeaderComparisonPanal.js | 69 ++++++++++++++----- .../FinancialStatements/BalanceSheet/utils.js | 14 ++++ .../ProfitLossSheetHeaderComparisonPanel.js | 56 ++++++++++++--- .../ProfitLossSheet/utils.js | 14 ++++ 4 files changed, 124 insertions(+), 29 deletions(-) diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js index 979b7b0a1..16a1485db 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js @@ -1,4 +1,5 @@ import React from 'react'; + import { FastField, Field } from 'formik'; import { FormGroup, Checkbox } from '@blueprintjs/core'; import styled from 'styled-components'; @@ -6,6 +7,10 @@ import styled from 'styled-components'; import { FormattedMessage as T } from 'components'; import { Row, Col, FieldHint } from '../../../components'; +import { + handlePreviousYearCheckBoxChange, + handlePreviousPeriodCheckBoxChange, +} from './utils'; /** * Balance sheet header - Comparison panal. @@ -14,42 +19,55 @@ export default function BalanceSheetHeaderComparisonPanal() { return ( {/**----------- Previous Year -----------*/} - - {({ field }) => ( + + {({ form, field }) => ( }> } {...field} + onChange={handlePreviousYearCheckBoxChange(form)} /> )} - + - - {({ field }) => ( + + {({ form: { setFieldValue }, field }) => ( }> } {...field} + onChange={({ currentTarget }) => { + setFieldValue('previous_year', currentTarget.checked); + setFieldValue( + 'previous_year_amount_change', + currentTarget.checked, + ); + }} /> )} - + - {({ field }) => ( + {({ form: { setFieldValue }, field }) => ( }> } {...field} + onChange={({ currentTarget }) => { + setFieldValue('previous_year', currentTarget.checked); + setFieldValue( + 'previous_year_percentage_change', + currentTarget.checked, + ); + }} /> )} @@ -58,13 +76,14 @@ export default function BalanceSheetHeaderComparisonPanal() { {/*------------ Previous Period -----------*/} - {({ field }) => ( + {({ form, field }) => ( }> } {...field} + onChange={handlePreviousPeriodCheckBoxChange(form)} /> )} @@ -72,13 +91,20 @@ export default function BalanceSheetHeaderComparisonPanal() { - {({ field }) => ( + {({ form: { setFieldValue }, field }) => ( }> } {...field} + onChange={({ currentTarget }) => { + setFieldValue('previous_period', currentTarget.checked); + setFieldValue( + 'previous_period_amount_change', + currentTarget.checked, + ); + }} /> )} @@ -89,22 +115,28 @@ export default function BalanceSheetHeaderComparisonPanal() { name={'previous_period_percentage_change'} type={'checkbox'} > - {({ field }) => ( + {({ form: { setFieldValue }, field }) => ( }> } {...field} + onChange={({ currentTarget }) => { + setFieldValue('previous_period', currentTarget.checked); + setFieldValue( + 'previous_period_percentage_change', + currentTarget.checked, + ); + }} /> )} - + {/**----------- % of Column -----------*/} - + {({ field }) => ( }> {/**----------- % of Row -----------*/} - + {({ field }) => ( }> { export const dynamicColumns = (columns, data) => { return R.map(dynamicColumnMapper(data), columns); }; + +export const handlePreviousYearCheckBoxChange = R.curry((form, event) => { + const isChecked = event.currentTarget.checked; + form.setFieldValue('previous_year', isChecked); + form.setFieldValue('previous_year_amount_change', isChecked); + form.setFieldValue('previous_year_percentage_change', isChecked); +}); + +export const handlePreviousPeriodCheckBoxChange = R.curry((form, event) => { + const isChecked = event.currentTarget.checked; + form.setFieldValue('previous_period', isChecked); + form.setFieldValue('previous_period_amount_change', isChecked); + form.setFieldValue('previous_period_amount_change', isChecked); +}); diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeaderComparisonPanel.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeaderComparisonPanel.js index b911cccc0..76f8a8fb7 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeaderComparisonPanel.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeaderComparisonPanel.js @@ -6,6 +6,10 @@ import styled from 'styled-components'; import { FormattedMessage as T } from 'components'; import { Row, Col, FieldHint } from '../../../components'; +import { + handlePreviousYearCheckBoxChange, + handlePreviousPeriodCheckBoxChange, +} from './utils'; /** * ProfitLoss sheet header -comparison panel. @@ -15,13 +19,14 @@ export default function ProfitLossSheetHeaderComparisonPanel() { {/**----------- Previous Year -----------*/} - {({ field }) => ( + {({ form, field }) => ( }> } {...field} + onChange={handlePreviousYearCheckBoxChange(form)} /> )} @@ -29,13 +34,20 @@ export default function ProfitLossSheetHeaderComparisonPanel() { - {({ field }) => ( + {({ form: { setFieldValue }, field }) => ( }> } {...field} + onChange={({ currentTarget }) => { + setFieldValue('previous_year', currentTarget.checked); + setFieldValue( + 'previous_year_amount_change', + currentTarget.checked, + ); + }} /> )} @@ -43,13 +55,20 @@ export default function ProfitLossSheetHeaderComparisonPanel() { - {({ field }) => ( + {({ form: { setFieldValue }, field }) => ( }> } {...field} + onChange={({ currentTarget }) => { + setFieldValue('previous_year', currentTarget.checked); + setFieldValue( + 'previous_year_percentage_change', + currentTarget.checked, + ); + }} /> )} @@ -58,13 +77,14 @@ export default function ProfitLossSheetHeaderComparisonPanel() { {/**----------- Previous Period (PP) -----------*/} - {({ field }) => ( + {({ form, field }) => ( }> } {...field} + onChange={handlePreviousPeriodCheckBoxChange(form)} /> )} @@ -72,27 +92,44 @@ export default function ProfitLossSheetHeaderComparisonPanel() { - {({ field }) => ( + {({ form: { setFieldValue }, field }) => ( }> } {...field} + onChange={({ currentTarget }) => { + setFieldValue('previous_period', currentTarget.checked); + setFieldValue( + 'previous_period_amount_change', + currentTarget.checked, + ); + }} /> )} - - {({ field }) => ( + + {({ form: { setFieldValue }, field }) => ( }> } {...field} + onChange={({ currentTarget }) => { + setFieldValue('previous_period', currentTarget.checked); + setFieldValue( + 'previous_period_percentage_change', + currentTarget.checked, + ); + }} /> )} @@ -159,12 +196,11 @@ const ProfitLossSheetComparisonWrap = styled.div` .row { margin-left: 0.15rem; .col { - min-width: 150px; - max-width: 190px; + min-width: 150px !important; + max-width: 190px !important; } } .bp3-form-group { margin-bottom: 3px; - /* margin-bottom: 0; */ } `; diff --git a/src/containers/FinancialStatements/ProfitLossSheet/utils.js b/src/containers/FinancialStatements/ProfitLossSheet/utils.js index aa9b223c6..d4826fbbd 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/utils.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/utils.js @@ -379,3 +379,17 @@ const dynamicColumnMapper = R.curry((data, column) => { export const dynamicColumns = (columns, data) => { return R.map(dynamicColumnMapper(data), columns); }; + +export const handlePreviousYearCheckBoxChange = R.curry((form, event) => { + const isChecked = event.currentTarget.checked; + form.setFieldValue('previous_year', isChecked); + form.setFieldValue('previous_year_amount_change', isChecked); + form.setFieldValue('previous_year_percentage_change', isChecked); +}); + +export const handlePreviousPeriodCheckBoxChange = R.curry((form, event) => { + const isChecked = event.currentTarget.checked; + form.setFieldValue('previous_period', isChecked); + form.setFieldValue('previous_period_amount_change', isChecked); + form.setFieldValue('previous_period_amount_change', isChecked); +}); From c72802d683b7705bc668159ac14f6611034c9d50 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Wed, 2 Feb 2022 12:08:57 +0200 Subject: [PATCH 15/72] feat(FinancialSheet): add skeleton view. --- src/common/index.js | 5 +- .../Datatable/TableHeaderSkeleton.js | 9 +- src/components/Datatable/TableSkeletonRows.js | 9 +- src/components/FinancialReport/index.js | 23 ++++ src/components/FinancialSheet.js | 101 --------------- .../FinancialSheet/FinancialSheet.js | 95 ++++++++++++++ .../FinancialSheet/FinancialSheetSkeleton.js | 84 +++++++++++++ .../FinancialSheet/StyledFinancialSheet.js | 82 ++++++++++++ src/components/FinancialSheet/index.js | 2 + src/components/FinancialStatement.js | 29 +++-- src/components/Skeleton.js | 34 ++++- src/components/SkeletonText.js | 0 src/components/index.js | 10 +- .../APAgingSummary/APAgingSummaryTable.js | 9 +- .../ARAgingSummary/ARAgingSummaryTable.js | 6 +- .../BalanceSheet/BalanceSheetBody.js | 4 +- .../BalanceSheet/BalanceSheetTable.js | 13 +- .../FinancialStatements/BalanceSheet/utils.js | 4 +- .../CashFlowStatementTable.js | 6 +- .../CustomersBalanceSummaryTable.js | 3 +- .../CustomersTransactionsTable.js | 4 +- .../GeneralLedger/GeneralLedgerTable.js | 3 +- .../InventoryItemDetailsTable.js | 3 +- .../InventoryValuationTable.js | 3 +- .../Journal/JournalTable.js | 24 ++-- .../ProfitLossSheet/ProfitLossBody.js | 3 +- .../ProfitLossSheet/ProfitLossSheetTable.js | 15 +-- .../ProfitLossSheet/utils.js | 3 +- .../PurchasesByItems/PurchasesByItemsTable.js | 4 +- .../SalesByItems/SalesByItemsTable.js | 4 +- .../TrialBalanceSheetTable.js | 5 +- .../VendorsBalanceSummaryTable.js | 5 +- .../VendorsTransactionsTable.js | 4 +- src/style/components/DataTable/DataTable.scss | 20 ++- .../FinancialStatements/FinancialSheet.scss | 118 ------------------ 35 files changed, 426 insertions(+), 320 deletions(-) create mode 100644 src/components/FinancialReport/index.js delete mode 100644 src/components/FinancialSheet.js create mode 100644 src/components/FinancialSheet/FinancialSheet.js create mode 100644 src/components/FinancialSheet/FinancialSheetSkeleton.js create mode 100644 src/components/FinancialSheet/StyledFinancialSheet.js create mode 100644 src/components/FinancialSheet/index.js create mode 100644 src/components/SkeletonText.js delete mode 100644 src/style/containers/FinancialStatements/FinancialSheet.scss diff --git a/src/common/index.js b/src/common/index.js index 25821fa35..626d9153b 100644 --- a/src/common/index.js +++ b/src/common/index.js @@ -1,4 +1,3 @@ +export * from './TableStyle'; - - -export * from './TableStyle'; \ No newline at end of file +export const Align = { Left: 'left', Right: 'right', Center: 'center' }; diff --git a/src/components/Datatable/TableHeaderSkeleton.js b/src/components/Datatable/TableHeaderSkeleton.js index e5f2baba7..545db3147 100644 --- a/src/components/Datatable/TableHeaderSkeleton.js +++ b/src/components/Datatable/TableHeaderSkeleton.js @@ -1,4 +1,5 @@ import React, { useContext } from 'react'; +import clsx from 'classnames'; import TableContext from './TableContext'; import { Skeleton } from 'components'; @@ -8,7 +9,13 @@ function TableHeaderCell({ column }) { return (
diff --git a/src/components/Datatable/TableSkeletonRows.js b/src/components/Datatable/TableSkeletonRows.js index cf1d74e89..cf58e635d 100644 --- a/src/components/Datatable/TableSkeletonRows.js +++ b/src/components/Datatable/TableSkeletonRows.js @@ -1,4 +1,5 @@ import React, { useContext } from 'react'; +import clsx from 'classnames'; import TableContext from './TableContext'; import { Skeleton } from 'components'; @@ -11,7 +12,13 @@ function TableHeaderCell({ column }) { return (
diff --git a/src/components/FinancialReport/index.js b/src/components/FinancialReport/index.js new file mode 100644 index 000000000..50b418c3f --- /dev/null +++ b/src/components/FinancialReport/index.js @@ -0,0 +1,23 @@ +import React from 'react'; +import styled from 'styled-components'; + +const FinancialStatementRoot = styled.div``; +const FinancialStatementBodyRoot = styled.div``; + +/** + * + * @returns {React.JSX} + */ +export function FinancialReport({ children, className }) { + return ; +} + +/** + * + * @param {React.JSX} + */ +export function FinancialReportBody({ children, className }) { + return ( + + ); +} diff --git a/src/components/FinancialSheet.js b/src/components/FinancialSheet.js deleted file mode 100644 index 389272c4c..000000000 --- a/src/components/FinancialSheet.js +++ /dev/null @@ -1,101 +0,0 @@ -import React, { useMemo, useCallback } from 'react'; -import moment from 'moment'; -import classnames from 'classnames'; -import { FormattedMessage as T } from 'components'; -import intl from 'react-intl-universal'; - -import { If, LoadingIndicator, MODIFIER } from 'components'; - -export default function FinancialSheet({ - companyName, - sheetType, - fromDate, - toDate, - asDate, - children, - accountingBasis, - name, - loading, - className, - basis, - minimal = false, - fullWidth = false, - currentDate = true, -}) { - - const format = 'DD MMMM YYYY'; - const formattedFromDate = useMemo(() => moment(fromDate).format(format), [ - fromDate, - ]); - const formattedToDate = useMemo(() => moment(toDate).format(format), [ - toDate, - ]); - const formattedAsDate = useMemo(() => moment(asDate).format(format), [ - asDate, - ]); - - const nameModifer = name ? `financial-sheet--${name}` : ''; - const methodsLabels = useMemo( - () => ({ - cash: intl.get('cash'), - accrual: intl.get('accrual'), - }), - [], - ); - const getBasisLabel = useCallback((b) => methodsLabels[b], [methodsLabels]); - const basisLabel = useMemo(() => getBasisLabel(basis), [ - getBasisLabel, - basis, - ]); - - return ( -
- {loading ? ( - - ) : ( -
- -

{companyName}

- - - -
{sheetType}
- - -
- - {formattedAsDate} - - - - {formattedFromDate} | {' '} - {formattedToDate} - -
- -
{children}
-
{accountingBasis}
- -
- - - {basisLabel} - - - - - - {moment().format('YYYY MMM DD HH:MM')} - - -
-
- )} -
- ); -} diff --git a/src/components/FinancialSheet/FinancialSheet.js b/src/components/FinancialSheet/FinancialSheet.js new file mode 100644 index 000000000..329005948 --- /dev/null +++ b/src/components/FinancialSheet/FinancialSheet.js @@ -0,0 +1,95 @@ +import React, { useMemo, useCallback } from 'react'; +import moment from 'moment'; +import intl from 'react-intl-universal'; + +import { If, FormattedMessage as T } from 'components'; +import { + FinancialSheetRoot, + FinancialSheetFooterCurrentTime, + FinancialSheetFooterBasis, + FinancialSheetFooter, + FinancialSheetAccountingBasis, + FinancialSheetTable, + FinancialSheetDate, + FinancialSheetType, + FinancialSheetTitle, +} from './StyledFinancialSheet'; + +/** + * Financial sheet. + * @returns {React.JSX} + */ +export function FinancialSheet({ + companyName, + sheetType, + fromDate, + toDate, + asDate, + children, + accountingBasis, + basis, + minimal = false, + fullWidth = false, + currentDate = true, +}) { + const format = 'DD MMMM YYYY'; + const formattedFromDate = useMemo( + () => moment(fromDate).format(format), + [fromDate], + ); + const formattedToDate = useMemo( + () => moment(toDate).format(format), + [toDate], + ); + const formattedAsDate = useMemo( + () => moment(asDate).format(format), + [asDate], + ); + const methodsLabels = useMemo( + () => ({ + cash: intl.get('cash'), + accrual: intl.get('accrual'), + }), + [], + ); + const getBasisLabel = useCallback((b) => methodsLabels[b], [methodsLabels]); + const basisLabel = useMemo( + () => getBasisLabel(basis), + [getBasisLabel, basis], + ); + + return ( + + {companyName && {companyName}} + {sheetType && {sheetType}} + + + + {formattedAsDate} + + + {formattedFromDate} | {' '} + {formattedToDate} + + + + {children} + + {accountingBasis} + + + + {basisLabel && ( + + {basisLabel} + + )} + {currentDate && ( + + {moment().format('YYYY MMM DD HH:MM')} + + )} + + + ); +} diff --git a/src/components/FinancialSheet/FinancialSheetSkeleton.js b/src/components/FinancialSheet/FinancialSheetSkeleton.js new file mode 100644 index 000000000..8feb034b5 --- /dev/null +++ b/src/components/FinancialSheet/FinancialSheetSkeleton.js @@ -0,0 +1,84 @@ +import React from 'react'; +import styled from 'styled-components'; + +import { Align } from 'common'; +import { SkeletonText, DataTable } from 'components'; + +import TableSkeletonRows from 'components/Datatable/TableSkeletonRows'; +import TableSkeletonHeader from 'components/Datatable/TableHeaderSkeleton'; +import { TableStyle } from 'common'; +import { + FinancialSheetRoot, + FinancialSheetTitle, + FinancialSheetType, + FinancialSheetDate, + FinancialSheetTable, +} from './StyledFinancialSheet'; + +/** + * Financial sheet paper skeleton. + * @returns {React.JSX} + */ +export function FinancialSheetSkeleton({ + minimal, + fullWidth, + titleCharsLength, + typeCharsLength, + dateCharsLength, + skeletonTableColumns, +}) { + return ( + + + + + + + + + + + + + + + + + + ); +} + +FinancialSheetSkeleton.defaultProps = { + titleCharsLength: 20, + typeCharsLength: 40, + dateCharsLength: 20, + skeletonTableColumns: [ + { + id: 'skeleton-1', + className: 'skeleton-1', + }, + { + id: 'skeleton-2', + className: 'skeleton-2', + align: Align.Right, + }, + ], +}; + +const FinancialSkeletonTable = styled(DataTable)` + .table .th .skeleton, + .table .td .skeleton { + margin-top: 4px; + margin-bottom: 4px; + } +`; diff --git a/src/components/FinancialSheet/StyledFinancialSheet.js b/src/components/FinancialSheet/StyledFinancialSheet.js new file mode 100644 index 000000000..84e521b1f --- /dev/null +++ b/src/components/FinancialSheet/StyledFinancialSheet.js @@ -0,0 +1,82 @@ +import styled from 'styled-components'; + +export const FinancialSheetRoot = styled.div` + border: 2px solid #f0f0f0; + border-radius: 10px; + min-width: 640px; + width: auto; + padding: 30px 18px; + max-width: 100%; + margin: 35px auto; + min-height: 400px; + display: flex; + flex-direction: column; + background: #fff; + + ${(props) => + props.fullWidth && + ` + width: 100%; + margin-top: 25px;`} + + ${(props) => + props.minimal && + ` + border: 0; + padding: 0; + margin-top: 20px; + + ${FinancialSheetTitle} { + font-size: 18px; + color: #333; + } + ${FinancialSheetTitle} + ${FinancialSheetDate} { + margin-top: 8px; + } + ${FinancialSheetDate} { + margin-top: 20px; + } +`} +`; + +export const FinancialSheetTitle = styled.h1` + margin: 0; + font-weight: 400; + font-size: 20px; + color: #464646; + text-align: center; +`; + +export const FinancialSheetType = styled.h6` + text-align: center; + margin: 0; + font-size: 16px; + font-weight: 400; + color: #666; + margin-top: 6px; +`; + +export const FinancialSheetDate = styled.div` + text-align: center; + color: #666; + margin-top: 6px; +`; + +export const FinancialSheetFooter = styled.div` + color: #888; + text-align: center; + margin-top: auto; + padding-top: 18px; + font-size: 13px; + + > span + span { + padding-left: 10px; + } +`; +export const FinancialSheetTable = styled.div` + margin-top: 24px; +`; +export const FinancialSheetFooterBasis = styled.span``; +export const FinancialSheetFooterCurrentTime = styled.span``; + +export const FinancialSheetAccountingBasis = styled.div``; diff --git a/src/components/FinancialSheet/index.js b/src/components/FinancialSheet/index.js new file mode 100644 index 000000000..ca17c27c5 --- /dev/null +++ b/src/components/FinancialSheet/index.js @@ -0,0 +1,2 @@ +export * from './FinancialSheet'; +export * from './FinancialSheetSkeleton'; \ No newline at end of file diff --git a/src/components/FinancialStatement.js b/src/components/FinancialStatement.js index 1f98e34f5..e077ffdb4 100644 --- a/src/components/FinancialStatement.js +++ b/src/components/FinancialStatement.js @@ -1,15 +1,24 @@ import React from 'react'; -import className from 'classnames'; -import 'style/containers/FinancialStatements/FinancialSheet.scss'; +import styled from 'styled-components'; -export default function FinancialStatements({ name, children }) { +const FinancialStatementRoot = styled.div``; +const FinancialStatementBodyRoot = styled.div``; + +/** + * + * @param {*} param0 + * @returns + */ +export function FinancialStatement({ children, className }) { + return ; +} + +/** + * + * @param {React.JSX} + */ +export function FinancialStatementBody({ children, className }) { return ( -
- {children} -
+ ); } diff --git a/src/components/Skeleton.js b/src/components/Skeleton.js index df6df2c25..b5b7a9cde 100644 --- a/src/components/Skeleton.js +++ b/src/components/Skeleton.js @@ -6,14 +6,36 @@ import { randomNumber } from 'utils'; /** * Skeleton component. */ -export default function Skeleton({ +export function Skeleton({ Tag = 'span', minWidth = 40, maxWidth = 100, + children, }) { - const randomWidth = useMemo(() => randomNumber(minWidth, maxWidth), [ - minWidth, - maxWidth, - ]); - return ; + const randomWidth = useMemo( + () => randomNumber(minWidth, maxWidth), + [minWidth, maxWidth], + ); + return ( + + ); +} + +export function SkeletonText({ + Tag = 'span', + charsLength, + minChars = 40, + maxChars = 100, +}) { + const computedCharLength = useMemo( + () => (charsLength ? charsLength : randomNumber(minChars, maxChars)), + [charsLength, minChars, maxChars], + ); + const randamText = 'X'.repeat(computedCharLength); + + return {randamText}; } diff --git a/src/components/SkeletonText.js b/src/components/SkeletonText.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/components/index.js b/src/components/index.js index 5e14f2288..cdf278b7b 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -5,9 +5,6 @@ import Choose from './Utils/Choose'; import For from './Utils/For'; import { FormattedMessage, FormattedHTMLMessage } from './FormattedMessage'; import ListSelect from './ListSelect'; -import FinancialStatement from './FinancialStatement'; -// import DynamicFilterValueField from './DynamicFilter/DynamicFilterValueField'; -// import DynamicFilterCompatatorField from './DynamicFilter/DynamicFilterCompatatorField'; import ErrorMessage from './ErrorMessage'; import MODIFIER from './modifiers'; import FieldHint from './FieldHint'; @@ -41,7 +38,6 @@ import InputPrependText from './Forms/InputPrependText'; import PageFormBigNumber from './PageFormBigNumber'; import AccountsMultiSelect from './AccountsMultiSelect'; import ContactsMultiSelect from './ContactsMultiSelect'; -import Skeleton from './Skeleton'; import ContextMenu from './ContextMenu'; import TableFastCell from './Datatable/TableFastCell'; import DashboardContentTable from './Dashboard/DashboardContentTable'; @@ -95,6 +91,10 @@ export * from './Card'; export * from './Customers' export * from './Vendors' export * from './Table'; +export * from './Skeleton'; +export * from './FinancialStatement'; +export * from './FinancialReport'; +export * from './FinancialSheet'; const Hint = FieldHint; @@ -110,7 +110,6 @@ export { T, Money, ListSelect, - FinancialStatement, // DynamicFilterValueField, // DynamicFilterCompatatorField, MODIFIER, @@ -148,7 +147,6 @@ export { DataTableEditable, ContactsMultiSelect, TableFastCell, - Skeleton, ContextMenu, DashboardContentTable, DashboardPageContent, diff --git a/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryTable.js b/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryTable.js index 36fd8daae..c8feefb61 100644 --- a/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryTable.js +++ b/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryTable.js @@ -1,8 +1,7 @@ -import React, { useCallback } from 'react'; -import { FormattedMessage as T } from 'components'; +import React from 'react'; import intl from 'react-intl-universal'; -import { DataTable } from 'components'; -import FinancialSheet from 'components/FinancialSheet'; + +import { DataTable, FinancialSheet } from 'components'; import { useAPAgingSummaryContext } from './APAgingSummaryProvider'; import { useAPAgingSummaryColumns } from './components'; @@ -14,8 +13,6 @@ export default function APAgingSummaryTable({ //#ownProps organizationName, }) { - - // AP aging summary report content. const { APAgingSummary: { tableRows }, diff --git a/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryTable.js b/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryTable.js index 41b58a805..0a2a84379 100644 --- a/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryTable.js +++ b/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryTable.js @@ -1,7 +1,7 @@ -import React, { useCallback } from 'react'; +import React from 'react'; import intl from 'react-intl-universal'; -import DataTable from 'components/DataTable'; -import FinancialSheet from 'components/FinancialSheet'; + +import { DataTable, FinancialSheet } from 'components'; import { useARAgingSummaryContext } from './ARAgingSummaryProvider'; import { useARAgingSummaryColumns } from './components'; diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js index f40d3f7be..d9e4373fc 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.js @@ -5,7 +5,7 @@ import { FinancialReportBody } from '../FinancialReportPage'; import withCurrentOrganization from 'containers/Organization/withCurrentOrganization'; import { useBalanceSheetContext } from './BalanceSheetProvider'; - +import { FinancialSheetSkeleton } from '../../../components/FinancialSheet'; import { compose } from 'utils'; /** @@ -21,7 +21,7 @@ function BalanceSheetBodyJSX({ return ( {isLoading ? ( - 'loading' + ) : ( )} diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js index d73d14e06..86174e62d 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js @@ -2,8 +2,8 @@ import React from 'react'; import styled from 'styled-components'; import intl from 'react-intl-universal'; -import FinancialSheet from 'components/FinancialSheet'; -import DataTable from 'components/DataTable'; +import { DataTable, FinancialSheet } from 'components'; + import { useBalanceSheetContext } from './BalanceSheetProvider'; import { defaultExpanderReducer, tableRowTypesToClassnames } from 'utils'; @@ -36,8 +36,7 @@ export default function BalanceSheetTable({ name="balance-sheet" companyName={companyName} sheetType={intl.get('balance_sheet')} - fromDate={query.from_date} - toDate={query.to_date} + asDate={query.to_date} basis={query.basis} > @@ -60,8 +61,8 @@ const BalanceSheetDataTable = styled(DataTable)` .tbody .tr { .td { border-bottom: 0; - padding-top: 0.36rem; - padding-bottom: 0.36rem; + padding-top: 0.32rem; + padding-bottom: 0.32rem; } &.is-expanded { .td:not(.name) .cell-inner { diff --git a/src/containers/FinancialStatements/BalanceSheet/utils.js b/src/containers/FinancialStatements/BalanceSheet/utils.js index 19afab84a..c89f2651f 100644 --- a/src/containers/FinancialStatements/BalanceSheet/utils.js +++ b/src/containers/FinancialStatements/BalanceSheet/utils.js @@ -3,13 +3,13 @@ import * as R from 'ramda'; import { isEmpty } from 'lodash'; import intl from 'react-intl-universal'; import moment from 'moment'; + +import { Align } from 'common'; import { CellTextSpan } from 'components/Datatable/Cells'; import { getColumnWidth } from 'utils'; const getTableCellValueAccessor = (index) => `cells[${index}].value`; -const Align = { Left: 'left', Right: 'right', Center: 'center' }; - const getReportColWidth = (data, accessor, headerText) => { return getColumnWidth( data, diff --git a/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementTable.js b/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementTable.js index 4f813c1d2..e4dfd0881 100644 --- a/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementTable.js +++ b/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementTable.js @@ -1,8 +1,8 @@ import React, { useMemo } from 'react'; import intl from 'react-intl-universal'; -import { DataTable } from 'components'; -import FinancialSheet from 'components/FinancialSheet'; +import { DataTable, FinancialSheet } from 'components'; + import { useCashFlowStatementColumns } from './components'; import { useCashFlowStatementContext } from './CashFlowStatementProvider'; @@ -15,8 +15,6 @@ export default function CashFlowStatementTable({ // #ownProps companyName, }) { - - const { cashFlowStatement: { tableRows }, isCashFlowLoading, diff --git a/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryTable.js b/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryTable.js index 103dd3ea0..931ca053e 100644 --- a/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryTable.js +++ b/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryTable.js @@ -1,8 +1,7 @@ import React from 'react'; import intl from 'react-intl-universal'; -import FinancialSheet from 'components/FinancialSheet'; -import DataTable from 'components/DataTable'; +import { DataTable, FinancialSheet } from 'components'; import { useCustomersBalanceSummaryContext } from './CustomersBalanceSummaryProvider'; import { useCustomersSummaryColumns } from './components'; diff --git a/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsTable.js b/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsTable.js index 3ff054d9e..122b921f9 100644 --- a/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsTable.js +++ b/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsTable.js @@ -1,8 +1,8 @@ import React, { useMemo } from 'react'; import intl from 'react-intl-universal'; -import FinancialSheet from 'components/FinancialSheet'; -import DataTable from 'components/DataTable'; +import { DataTable, FinancialSheet } from 'components'; + import { useCustomersTransactionsColumns } from './components'; import { useCustomersTransactionsContext } from './CustomersTransactionsProvider'; diff --git a/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerTable.js b/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerTable.js index 539b735c7..d07c3b78a 100644 --- a/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerTable.js +++ b/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerTable.js @@ -3,7 +3,7 @@ import React, { useMemo } from 'react'; import { defaultExpanderReducer } from 'utils'; import intl from 'react-intl-universal'; -import FinancialSheet from 'components/FinancialSheet'; +import { FinancialSheet } from 'components'; import DataTable from 'components/DataTable'; import TableVirtualizedListRows from 'components/Datatable/TableVirtualizedRows'; import TableFastCell from 'components/Datatable/TableFastCell'; @@ -37,7 +37,6 @@ export default function GeneralLedgerTable({ companyName }) { sheetType={intl.get('general_ledger_sheet')} fromDate={query.from_date} toDate={query.to_date} - name="general-ledger" loading={isLoading} fullWidth={true} > diff --git a/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.js b/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.js index 5ab72ed72..4c3963e2c 100644 --- a/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.js +++ b/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.js @@ -1,8 +1,7 @@ import React, { useMemo } from 'react'; import intl from 'react-intl-universal'; -import FinancialSheet from 'components/FinancialSheet'; -import { DataTable } from 'components'; +import { DataTable, FinancialSheet } from 'components'; import { useInventoryItemDetailsColumns } from './components'; import { useInventoryItemDetailsContext } from './InventoryItemDetailsProvider'; diff --git a/src/containers/FinancialStatements/InventoryValuation/InventoryValuationTable.js b/src/containers/FinancialStatements/InventoryValuation/InventoryValuationTable.js index 6c86aeace..96fe37fa2 100644 --- a/src/containers/FinancialStatements/InventoryValuation/InventoryValuationTable.js +++ b/src/containers/FinancialStatements/InventoryValuation/InventoryValuationTable.js @@ -1,8 +1,7 @@ import React from 'react'; import intl, { init } from 'react-intl-universal'; -import FinancialSheet from 'components/FinancialSheet'; -import { DataTable } from 'components'; +import { DataTable, FinancialSheet } from 'components'; import { useInventoryValuationContext } from './InventoryValuationProvider'; import { useInventoryValuationTableColumns } from './components'; diff --git a/src/containers/FinancialStatements/Journal/JournalTable.js b/src/containers/FinancialStatements/Journal/JournalTable.js index 372b7c411..992aba2ad 100644 --- a/src/containers/FinancialStatements/Journal/JournalTable.js +++ b/src/containers/FinancialStatements/Journal/JournalTable.js @@ -1,25 +1,24 @@ import React, { useCallback, useMemo } from 'react'; import intl from 'react-intl-universal'; -import FinancialSheet from 'components/FinancialSheet'; -import DataTable from 'components/DataTable'; -import { useJournalSheetContext } from './JournalProvider'; +import { DataTable, FinancialSheet } from 'components'; import TableVirtualizedListRows from 'components/Datatable/TableVirtualizedRows'; import TableFastCell from 'components/Datatable/TableFastCell'; -import { defaultExpanderReducer } from 'utils'; + import { useJournalTableColumns } from './components'; +import { useJournalSheetContext } from './JournalProvider'; + +import { defaultExpanderReducer } from 'utils'; export default function JournalSheetTable({ // #ownProps onFetchData, companyName, }) { - - // Journal sheet context. const { journalSheet: { tableRows, query }, - isLoading + isLoading, } = useJournalSheetContext(); // Retreive the journal table columns. @@ -42,8 +41,6 @@ export default function JournalSheetTable({ }; }, []); - - return ( + > ); -} \ No newline at end of file +} diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossBody.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossBody.js index 8a853e1c3..86b075957 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossBody.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossBody.js @@ -1,5 +1,6 @@ import React from 'react'; +import { FinancialSheetSkeleton } from '../../../components/FinancialSheet'; import ProfitLossSheetTable from './ProfitLossSheetTable'; import { FinancialReportBody } from '../FinancialReportPage'; @@ -20,7 +21,7 @@ function ProfitLossBodyJSX({ return ( {isLoading ? ( - 'loading' + ) : ( )} diff --git a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js index 501838dc7..495626c5d 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable.js @@ -2,13 +2,10 @@ import React from 'react'; import styled from 'styled-components'; import { TableStyle } from 'common'; -import { FormattedMessage as T } from 'components'; - -import { useProfitLossSheetColumns } from './hooks'; -import FinancialSheet from 'components/FinancialSheet'; -import DataTable from 'components/DataTable'; +import { DataTable, FinancialSheet, FormattedMessage as T } from 'components'; import { tableRowTypesToClassnames, defaultExpanderReducer } from 'utils'; +import { useProfitLossSheetColumns } from './hooks'; import { useProfitLossSheetContext } from './ProfitLossProvider'; export default function ProfitLossSheetTable({ @@ -60,8 +57,8 @@ const ProfitLossDataTable = styled(DataTable)` .tbody .tr { .td { border-bottom: 0; - padding-top: 0.36rem; - padding-bottom: 0.36rem; + padding-top: 0.32rem; + padding-bottom: 0.32rem; } &.is-expanded { .td:not(.name) .cell-inner { @@ -74,8 +71,8 @@ const ProfitLossDataTable = styled(DataTable)` border-top: 1px solid #bbb; } } - &:last-of-type .td{ - border-bottom: 1px solid #bbb; + &:last-of-type .td { + border-bottom: 3px double #000; } } } diff --git a/src/containers/FinancialStatements/ProfitLossSheet/utils.js b/src/containers/FinancialStatements/ProfitLossSheet/utils.js index d4826fbbd..7b1dcf956 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/utils.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/utils.js @@ -1,9 +1,10 @@ import * as R from 'ramda'; import { isEmpty } from 'lodash'; + +import { Align } from 'common'; import { CellTextSpan } from 'components/Datatable/Cells'; import { getColumnWidth } from 'utils'; -const Align = { Left: 'left', Right: 'right', Center: 'center' }; const getTableCellValueAccessor = (index) => `cells[${index}].value`; const getReportColWidth = (data, accessor, labelText) => { diff --git a/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.js b/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.js index 63f20e766..f251a9960 100644 --- a/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.js +++ b/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsTable.js @@ -1,11 +1,9 @@ import React from 'react'; import intl from 'react-intl-universal'; -import FinancialSheet from 'components/FinancialSheet'; -import { DataTable } from 'components'; +import { DataTable, FinancialSheet } from 'components'; import { usePurchaseByItemsContext } from './PurchasesByItemsProvider'; - import { usePurchasesByItemsTableColumns } from './components'; /** diff --git a/src/containers/FinancialStatements/SalesByItems/SalesByItemsTable.js b/src/containers/FinancialStatements/SalesByItems/SalesByItemsTable.js index 4fd996d09..c8569498c 100644 --- a/src/containers/FinancialStatements/SalesByItems/SalesByItemsTable.js +++ b/src/containers/FinancialStatements/SalesByItems/SalesByItemsTable.js @@ -1,8 +1,8 @@ import React from 'react'; import intl from 'react-intl-universal'; -import FinancialSheet from 'components/FinancialSheet'; -import { DataTable } from 'components'; +import { DataTable, FinancialSheet } from 'components'; + import { useSalesByItemsContext } from './SalesByItemProvider'; import { useSalesByItemsTableColumns } from './components'; diff --git a/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetTable.js b/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetTable.js index e31a0f34f..656eb103d 100644 --- a/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetTable.js +++ b/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetTable.js @@ -1,12 +1,9 @@ import React from 'react'; import intl from 'react-intl-universal'; -import FinancialSheet from 'components/FinancialSheet'; -import DataTable from 'components/DataTable'; +import { DataTable, FinancialSheet } from 'components'; import { useTrialBalanceSheetContext } from './TrialBalanceProvider'; - - import { useTrialBalanceTableColumns } from './components'; /** diff --git a/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js b/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js index 84401992a..0717b0cbd 100644 --- a/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js +++ b/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryTable.js @@ -1,8 +1,7 @@ import React from 'react'; -import { FormattedMessage as T } from 'components'; import intl from 'react-intl-universal'; -import { DataTable } from 'components'; -import FinancialSheet from 'components/FinancialSheet'; + +import { DataTable, FinancialSheet } from 'components'; import { useVendorsBalanceColumns } from './components'; import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider'; diff --git a/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js b/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js index a12f2408b..af549d401 100644 --- a/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js +++ b/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsTable.js @@ -1,8 +1,8 @@ import React, { useMemo } from 'react'; import intl from 'react-intl-universal'; -import FinancialSheet from 'components/FinancialSheet'; -import DataTable from 'components/DataTable'; +import { DataTable, FinancialSheet } from 'components'; + import { useVendorsTransactionsColumns } from './components'; import { useVendorsTransactionsContext } from './VendorsTransactionsProvider'; diff --git a/src/style/components/DataTable/DataTable.scss b/src/style/components/DataTable/DataTable.scss index 0306567bb..5659c52c1 100644 --- a/src/style/components/DataTable/DataTable.scss +++ b/src/style/components/DataTable/DataTable.scss @@ -147,6 +147,19 @@ width: 65%; margin: 10px 0; } + + &.align-right { + .skeleton { + margin-left: auto; + } + } + + &.align-center { + .skeleton { + margin-left: auto; + margin-right: auto; + } + } } .th { @@ -363,13 +376,14 @@ .table-constrant, .table--constrant { .table { - .thead{ - .tr:first-of-type .th{ + .thead { + .tr:first-of-type .th { border-top: 1px solid #000000; } } + .thead .th { - background: transparent; + background: #fff; color: #222222; border-bottom: 1px solid #000000; padding: 0.5rem; diff --git a/src/style/containers/FinancialStatements/FinancialSheet.scss b/src/style/containers/FinancialStatements/FinancialSheet.scss deleted file mode 100644 index 18b3c7957..000000000 --- a/src/style/containers/FinancialStatements/FinancialSheet.scss +++ /dev/null @@ -1,118 +0,0 @@ -// Financial sheet. -// ----------------------- -.financial-sheet { - border: 2px solid #f0f0f0; - border-radius: 10px; - min-width: 640px; - width: auto; - padding: 30px 18px; - max-width: 100%; - margin: 35px auto; - min-height: 400px; - display: flex; - flex-direction: column; - background: #fff; - - &__title { - margin: 0; - font-weight: 400; - font-size: 20px; - color: #464646; - text-align: center; - } - &__sheet-type { - text-align: center; - margin: 0; - font-size: 16px; - font-weight: 400; - color: #666; - margin-top: 6px; - } - &__date { - text-align: center; - color: #666; - margin-top: 6px; - } - &__table { - margin-top: 24px; - - .table { - .tbody, - .thead { - .tr .td, - .tr .th { - background: #fff; - } - } - - .tr.no-results { - .td { - flex-direction: column; - padding: 20px; - color: #666; - align-items: center; - } - } - } - } - &__inner { - &.is-loading { - display: none; - } - } - &__footer { - color: #888; - text-align: center; - margin-top: auto; - padding-top: 18px; - font-size: 13px; - - - > span + span{ - padding-left: 10px; - } - } - .dashboard__loading-indicator { - margin: auto; - padding: 0; - } - &--expended { - width: auto; - } - - &--minimal { - border: 0; - padding: 0; - margin-top: 20px; - - .financial-sheet { - &__title { - font-size: 18px; - color: #333; - } - &__title + .financial-sheet__date { - margin-top: 8px; - } - &__table { - margin-top: 20px; - } - } - } - &.is-full-width { - width: 100%; - margin-top: 25px; - } -} - -.financial-statement { - &__header { - } - - &__body { - padding-left: 15px; - padding-right: 15px; - display: flex; - justify-content: center; - align-items: center; - } -} From 2c2740ea737abd8e85d5e6535fc8810a1e247a97 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Wed, 2 Feb 2022 13:33:54 +0200 Subject: [PATCH 16/72] fix(BalanceSheet): highlight total assets and libaiities. --- .../BalanceSheet/BalanceSheetTable.js | 8 +++++++- .../FinancialStatements/BalanceSheet/utils.js | 2 +- src/utils/index.js | 17 ++++++++--------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js index 86174e62d..224448b8a 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetTable.js @@ -76,9 +76,15 @@ const BalanceSheetDataTable = styled(DataTable)` } } - &:last-of-type .td{ + &:last-of-type .td { border-bottom: 1px solid #bbb; } + &.row_type--TOTAL.row-id--ASSETS, + &.row_type--TOTAL.row-id--LIABILITY_EQUITY { + .td{ + border-bottom: 3px double #000; + } + } } } `; diff --git a/src/containers/FinancialStatements/BalanceSheet/utils.js b/src/containers/FinancialStatements/BalanceSheet/utils.js index c89f2651f..bf61bce57 100644 --- a/src/containers/FinancialStatements/BalanceSheet/utils.js +++ b/src/containers/FinancialStatements/BalanceSheet/utils.js @@ -14,7 +14,7 @@ const getReportColWidth = (data, accessor, headerText) => { return getColumnWidth( data, accessor, - { magicSpacing: 9, minWidth: 100 }, + { magicSpacing: 10, minWidth: 100 }, headerText, ); }; diff --git a/src/utils/index.js b/src/utils/index.js index d1957f2df..123967ffe 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -3,6 +3,7 @@ import moment from 'moment'; import _ from 'lodash'; import * as R from 'ramda'; import Currencies from 'js-money/lib/currency'; +import clsx from 'classnames'; import { Intent } from '@blueprintjs/core'; import Currency from 'js-money/lib/currency'; @@ -439,11 +440,11 @@ export const getColumnWidth = ( rows, accessor, { maxWidth, minWidth, magicSpacing = 14 }, - headerText = '' + headerText = '', ) => { const cellLength = Math.max( ...rows.map((row) => (`${_.get(row, accessor)}` || '').length), - headerText.length + headerText.length, ); let result = cellLength * magicSpacing; @@ -903,14 +904,12 @@ export function ignoreEventFromSelectors(event, selectors) { .some((element) => !!element); } - - export const tableRowTypesToClassnames = ({ original }) => { const rowTypes = _.castArray(original.row_types); + const rowId = original.id; - return rowTypes.reduce((acc, rowType) => { - acc[`row_type--${rowType}`] = rowType; + const rowTypesClsx = rowTypes.map((t) => `row_type--${t}`); + const rowIdClsx = `row-id--${original.id}`; - return acc; - }, {}); -}; \ No newline at end of file + return clsx(rowTypesClsx, { [`${rowIdClsx}`]: rowId }); +}; From f204b814077349b74d131502049b5e3c82346a6e Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Thu, 3 Feb 2022 16:05:24 +0200 Subject: [PATCH 17/72] fix(BS|PL): date periods columns alignment. --- src/containers/FinancialStatements/BalanceSheet/utils.js | 2 +- src/containers/FinancialStatements/ProfitLossSheet/utils.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/containers/FinancialStatements/BalanceSheet/utils.js b/src/containers/FinancialStatements/BalanceSheet/utils.js index bf61bce57..afc18d89b 100644 --- a/src/containers/FinancialStatements/BalanceSheet/utils.js +++ b/src/containers/FinancialStatements/BalanceSheet/utils.js @@ -107,7 +107,7 @@ const dateRangeMapper = R.curry((data, column) => { key: column.key, disableSortBy: true, textOverview: true, - align: Align.Center, + align: isDateColumnHasColumns ? Align.Center : Align.Right, }; return R.compose( R.when( diff --git a/src/containers/FinancialStatements/ProfitLossSheet/utils.js b/src/containers/FinancialStatements/ProfitLossSheet/utils.js index 7b1dcf956..16acd2735 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/utils.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/utils.js @@ -335,7 +335,7 @@ const dateRangeColumn = R.curry((data, column) => { key: column.key, disableSortBy: true, textOverview: true, - align: isDateColumnHasColumns ? Align.Center : Align.Center, + align: isDateColumnHasColumns ? Align.Center : Align.Right, }; return R.compose( R.when( From 47f6845633f72f214ba8f0e676348602a4a62524 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Thu, 3 Feb 2022 17:03:24 +0200 Subject: [PATCH 18/72] feat(BS&PL): add sticky to account column. --- src/containers/FinancialStatements/BalanceSheet/utils.js | 1 + src/containers/FinancialStatements/ProfitLossSheet/utils.js | 1 + src/style/components/DataTable/DataTable.scss | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/containers/FinancialStatements/BalanceSheet/utils.js b/src/containers/FinancialStatements/BalanceSheet/utils.js index afc18d89b..b75d5f621 100644 --- a/src/containers/FinancialStatements/BalanceSheet/utils.js +++ b/src/containers/FinancialStatements/BalanceSheet/utils.js @@ -63,6 +63,7 @@ const accountNameMapper = R.curry((data, column) => { className: column.key, textOverview: true, width: Math.max(width, 300), + sticky: Align.Left, }; }); diff --git a/src/containers/FinancialStatements/ProfitLossSheet/utils.js b/src/containers/FinancialStatements/ProfitLossSheet/utils.js index 16acd2735..2426e45ab 100644 --- a/src/containers/FinancialStatements/ProfitLossSheet/utils.js +++ b/src/containers/FinancialStatements/ProfitLossSheet/utils.js @@ -306,6 +306,7 @@ const accountNameColumn = R.curry((data, column) => { className: column.key, textOverview: true, width: Math.max(width, 300), + sticky: Align.Left, }; }); diff --git a/src/style/components/DataTable/DataTable.scss b/src/style/components/DataTable/DataTable.scss index 5659c52c1..aabd7df18 100644 --- a/src/style/components/DataTable/DataTable.scss +++ b/src/style/components/DataTable/DataTable.scss @@ -353,11 +353,11 @@ } [data-sticky-last-left-td] { - // box-shadow: 2px 0px 3px #ccc; + } [data-sticky-first-right-td] { - // box-shadow: -2px 0px 3px #ccc; + } } @@ -390,7 +390,7 @@ } .tbody .tr .td { - background: transparent; + background: #fff; padding: 0.5rem 0.5rem; border-bottom: 0; } From d300231838feb10a41f72acce4c701bdc9f5943b Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sat, 5 Feb 2022 11:31:57 +0200 Subject: [PATCH 19/72] fix(DataTable): sticky column. --- package.json | 2 +- src/components/Datatable/TableHeader.js | 14 ++++++++------ src/style/components/DataTable/DataTable.scss | 6 ++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 56532c6c0..e0e766a3e 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "react-sortablejs": "^2.0.11", "react-split-pane": "^0.1.91", "react-table": "^7.6.3", - "react-table-sticky": "^1.1.2", + "react-table-sticky": "^1.1.3", "react-transition-group": "^4.4.1", "react-use": "^13.26.1", "react-use-context-menu": "^0.1.4", diff --git a/src/components/Datatable/TableHeader.js b/src/components/Datatable/TableHeader.js index de8405ff7..79d435620 100644 --- a/src/components/Datatable/TableHeader.js +++ b/src/components/Datatable/TableHeader.js @@ -89,12 +89,14 @@ export default function TableHeader() { return (
- {headerGroups.map((headerGroup, index) => ( - - ))} - - - +
+ {headerGroups.map((headerGroup, index) => ( + + ))} + + + +
); diff --git a/src/style/components/DataTable/DataTable.scss b/src/style/components/DataTable/DataTable.scss index aabd7df18..b5e6276c6 100644 --- a/src/style/components/DataTable/DataTable.scss +++ b/src/style/components/DataTable/DataTable.scss @@ -9,6 +9,11 @@ min-width: 100%; display: block; + .thead .thead-inner, + .tbody .tbody-inner{ + min-width: fit-content; + } + .thead { overflow: hidden; @@ -393,6 +398,7 @@ background: #fff; padding: 0.5rem 0.5rem; border-bottom: 0; + color: #000; } } } \ No newline at end of file From 93df479c05c2f0b36c7dcca6f5b88f88d5f4ef88 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 8 Feb 2022 16:54:57 +0200 Subject: [PATCH 20/72] feat(PL & PL): add localizing. --- .../BalanceSheetHeaderComparisonPanal.js | 4 +-- src/lang/ar/index.json | 32 +++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js index 16a1485db..d2da96772 100644 --- a/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js +++ b/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeaderComparisonPanal.js @@ -142,7 +142,7 @@ export default function BalanceSheetHeaderComparisonPanal() { } + label={} {...field} /> @@ -156,7 +156,7 @@ export default function BalanceSheetHeaderComparisonPanal() { } + label={} {...field} /> diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index a20aa93a8..dc9e10edc 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -1754,21 +1754,33 @@ "payment_made.drawer.title": "تفاصيل سند المورد {number}", "manual_journal.drawer.title": "تفاصيل قيد يدوي ({number})", "expense.drawer.title": " تفاصيل المصروف", - "global_error.you_dont_have_permissions": "ليس لديك صلاحية الوصول إلى هذه الصفحة.", "global_error.transactions_locked": "تم قفل المعاملات التي تمت قبل {lockedToDate}. ومن ثم لا يمكن القيام بأي عمل.", "global_error.authorized_user_inactive": "المستخدم المصرح له تم تعطيلة.", - "vendor.alert.activated_message": "تم تفعيل المورد بنجاح.", "vendor.alert.are_you_sure_want_to_activate_this_vendor": "هل أنت متأكد أنك تريد تفعيل هذا المورد؟ ستتمكن من تعطيله لاحقًا", "vendor.alert.inactivated_message": "تم إلغاء تنشيط المورد بنجاح.", - "vendor.alert.are_you_sure_want_to_inactivate_this_vendor":"هل أنت متأكد أنك تريد إلغاء تنشيط هذا المورد؟ ستكون قادرًا على تنشيطه لاحقًا", - - "customer.alert.activated_message":"تم تفعيل الزبون بنجاح.", + "vendor.alert.are_you_sure_want_to_inactivate_this_vendor": "هل أنت متأكد أنك تريد إلغاء تنشيط هذا المورد؟ ستكون قادرًا على تنشيطه لاحقًا", + "customer.alert.activated_message": "تم تفعيل الزبون بنجاح.", "customer.alert.are_you_sure_want_to_activate_this_customer": "هل أنت متأكد أنك تريد تفعيل هذا الزبون؟ ستتمكن من تعطيله لاحقًا", "customer.alert.inactivated_message": "تم إلغاء تنشيط الزبون بنجاح.", - "customer.alert.are_you_sure_want_to_inactivate_this_customer":"هل أنت متأكد أنك تريد إلغاء تنشيط هذا الزبون؟ ستكون قادرًا على تنشيطه لاحقًا", - - "credit_note_preview.dialog.title":"معاينة إشعار الدائن PDF", - "payment_receive_preview.dialog.title":"معاينة سند الزبون PDF" -} + "customer.alert.are_you_sure_want_to_inactivate_this_customer": "هل أنت متأكد أنك تريد إلغاء تنشيط هذا الزبون؟ ستكون قادرًا على تنشيطه لاحقًا", + "credit_note_preview.dialog.title": "معاينة إشعار الدائن PDF", + "payment_receive_preview.dialog.title": "معاينة سند الزبون PDF", + "balance_sheet.comparisons": "مقارنات", + "balance_sheet.percentage_of_column": "% التغير العمودي", + "balance_sheet.percentage_of_row": "% التغير الأفقي", + "balance_sheet.previous_year": "السنة السابقة (س.س)", + "balance_sheet.total_change": "إجمالي التغيرات", + "balance_sheet.change": "% التغيرات", + "balance_sheet.previous_period": "الفترة السابقة (ف.س) ", + "profit_loss_sheet.comparisons": "مقارنات", + "profit_loss_sheet.previous_year": "السنة السابقة (س.س)", + "profit_loss_sheet.total_change": "إجمالي التغيرات", + "profit_loss_sheet.perentage_change": "% التغيرات", + "profit_loss_sheet.previous_period": "الفترة السابقة (ف.س) ", + "profit_loss_sheet.percentage_of_column": "% التغير العمودي", + "profit_loss_sheet.percentage_of_row": "% التغير الأفقي", + "profit_loss_sheet.percentage_of_expense": "% التغير في المصاريف", + "profit_loss_sheet.percentage_of_income": "% التغير الإيرادات" +} \ No newline at end of file From b759d7327e2bf1d3d10b7d8277a5c3f60208f490 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Wed, 9 Feb 2022 17:11:55 +0200 Subject: [PATCH 21/72] feat(App): Horjar code on production envirement only. --- public/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/index.html b/public/index.html index 376b31d38..13da217ae 100644 --- a/public/index.html +++ b/public/index.html @@ -19,6 +19,8 @@ user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ --> + + <% if (process.env.NODE_ENV === 'production') { %> + <% } %> + AD + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AE.svg b/src/static/svg/AE.svg new file mode 100644 index 000000000..3095fe319 --- /dev/null +++ b/src/static/svg/AE.svg @@ -0,0 +1,33 @@ + + + + AE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AF.svg b/src/static/svg/AF.svg new file mode 100644 index 000000000..75216b744 --- /dev/null +++ b/src/static/svg/AF.svg @@ -0,0 +1,34 @@ + + + + AF + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AG.svg b/src/static/svg/AG.svg new file mode 100644 index 000000000..ac56b808e --- /dev/null +++ b/src/static/svg/AG.svg @@ -0,0 +1,44 @@ + + + + AG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AI.svg b/src/static/svg/AI.svg new file mode 100644 index 000000000..7f53e4649 --- /dev/null +++ b/src/static/svg/AI.svg @@ -0,0 +1,50 @@ + + + + AI + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AL.svg b/src/static/svg/AL.svg new file mode 100644 index 000000000..43ff1a3b3 --- /dev/null +++ b/src/static/svg/AL.svg @@ -0,0 +1,27 @@ + + + + AL + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AM.svg b/src/static/svg/AM.svg new file mode 100644 index 000000000..5224d30f7 --- /dev/null +++ b/src/static/svg/AM.svg @@ -0,0 +1,32 @@ + + + + AM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AO.svg b/src/static/svg/AO.svg new file mode 100644 index 000000000..86044f3b3 --- /dev/null +++ b/src/static/svg/AO.svg @@ -0,0 +1,37 @@ + + + + AO + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AR.svg b/src/static/svg/AR.svg new file mode 100644 index 000000000..4dbc96f1f --- /dev/null +++ b/src/static/svg/AR.svg @@ -0,0 +1,26 @@ + + + + AR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AS.svg b/src/static/svg/AS.svg new file mode 100644 index 000000000..afb37540f --- /dev/null +++ b/src/static/svg/AS.svg @@ -0,0 +1,36 @@ + + + + AS + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AT.svg b/src/static/svg/AT.svg new file mode 100644 index 000000000..627245e3b --- /dev/null +++ b/src/static/svg/AT.svg @@ -0,0 +1,24 @@ + + + + AT + Created with sketchtool. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AU.svg b/src/static/svg/AU.svg new file mode 100644 index 000000000..aad6b1e6b --- /dev/null +++ b/src/static/svg/AU.svg @@ -0,0 +1,36 @@ + + + + AU + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AW.svg b/src/static/svg/AW.svg new file mode 100644 index 000000000..892d8aa0e --- /dev/null +++ b/src/static/svg/AW.svg @@ -0,0 +1,30 @@ + + + + AW + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AX.svg b/src/static/svg/AX.svg new file mode 100644 index 000000000..577cd2683 --- /dev/null +++ b/src/static/svg/AX.svg @@ -0,0 +1,32 @@ + + + + AX + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/AZ.svg b/src/static/svg/AZ.svg new file mode 100644 index 000000000..3f082f336 --- /dev/null +++ b/src/static/svg/AZ.svg @@ -0,0 +1,33 @@ + + + + AZ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BA.svg b/src/static/svg/BA.svg new file mode 100644 index 000000000..a16324e1f --- /dev/null +++ b/src/static/svg/BA.svg @@ -0,0 +1,32 @@ + + + + BA + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BB.svg b/src/static/svg/BB.svg new file mode 100644 index 000000000..5c89e132d --- /dev/null +++ b/src/static/svg/BB.svg @@ -0,0 +1,38 @@ + + + + BB + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BD.svg b/src/static/svg/BD.svg new file mode 100644 index 000000000..e1a3cd311 --- /dev/null +++ b/src/static/svg/BD.svg @@ -0,0 +1,27 @@ + + + + BD + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BE.svg b/src/static/svg/BE.svg new file mode 100644 index 000000000..ac00173d2 --- /dev/null +++ b/src/static/svg/BE.svg @@ -0,0 +1,32 @@ + + + + BE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BF.svg b/src/static/svg/BF.svg new file mode 100644 index 000000000..5b4286bb5 --- /dev/null +++ b/src/static/svg/BF.svg @@ -0,0 +1,28 @@ + + + + BF + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BG.svg b/src/static/svg/BG.svg new file mode 100644 index 000000000..e8256f476 --- /dev/null +++ b/src/static/svg/BG.svg @@ -0,0 +1,28 @@ + + + + BG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BH.svg b/src/static/svg/BH.svg new file mode 100644 index 000000000..e1c110938 --- /dev/null +++ b/src/static/svg/BH.svg @@ -0,0 +1,23 @@ + + + + BH + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BI.svg b/src/static/svg/BI.svg new file mode 100644 index 000000000..2f208253b --- /dev/null +++ b/src/static/svg/BI.svg @@ -0,0 +1,36 @@ + + + + BI + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BJ.svg b/src/static/svg/BJ.svg new file mode 100644 index 000000000..b21c46e03 --- /dev/null +++ b/src/static/svg/BJ.svg @@ -0,0 +1,32 @@ + + + + BJ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BL.svg b/src/static/svg/BL.svg new file mode 100644 index 000000000..b99bc2c79 --- /dev/null +++ b/src/static/svg/BL.svg @@ -0,0 +1,42 @@ + + + + BL + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BM.svg b/src/static/svg/BM.svg new file mode 100644 index 000000000..798dd8b96 --- /dev/null +++ b/src/static/svg/BM.svg @@ -0,0 +1,49 @@ + + + + BM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BN.svg b/src/static/svg/BN.svg new file mode 100644 index 000000000..1fe9afc48 --- /dev/null +++ b/src/static/svg/BN.svg @@ -0,0 +1,28 @@ + + + + BN + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BO.svg b/src/static/svg/BO.svg new file mode 100644 index 000000000..7ee247bdb --- /dev/null +++ b/src/static/svg/BO.svg @@ -0,0 +1,32 @@ + + + + BO + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BR.svg b/src/static/svg/BR.svg new file mode 100644 index 000000000..17edb1033 --- /dev/null +++ b/src/static/svg/BR.svg @@ -0,0 +1,35 @@ + + + + BR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BS.svg b/src/static/svg/BS.svg new file mode 100644 index 000000000..767423af6 --- /dev/null +++ b/src/static/svg/BS.svg @@ -0,0 +1,33 @@ + + + + BS + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BT.svg b/src/static/svg/BT.svg new file mode 100644 index 000000000..d2f749bdb --- /dev/null +++ b/src/static/svg/BT.svg @@ -0,0 +1,27 @@ + + + + BT + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BV.svg b/src/static/svg/BV.svg new file mode 100644 index 000000000..00a47ee5a --- /dev/null +++ b/src/static/svg/BV.svg @@ -0,0 +1,28 @@ + + + + BV + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BW.svg b/src/static/svg/BW.svg new file mode 100644 index 000000000..ccac652ba --- /dev/null +++ b/src/static/svg/BW.svg @@ -0,0 +1,29 @@ + + + + BW + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BY.svg b/src/static/svg/BY.svg new file mode 100644 index 000000000..d584988d9 --- /dev/null +++ b/src/static/svg/BY.svg @@ -0,0 +1,30 @@ + + + + BY + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/BZ.svg b/src/static/svg/BZ.svg new file mode 100644 index 000000000..8758df239 --- /dev/null +++ b/src/static/svg/BZ.svg @@ -0,0 +1,30 @@ + + + + BZ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CA.svg b/src/static/svg/CA.svg new file mode 100644 index 000000000..786b609b4 --- /dev/null +++ b/src/static/svg/CA.svg @@ -0,0 +1,25 @@ + + + + CA + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CC.svg b/src/static/svg/CC.svg new file mode 100644 index 000000000..b96f3016b --- /dev/null +++ b/src/static/svg/CC.svg @@ -0,0 +1,33 @@ + + + + CC + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CD.svg b/src/static/svg/CD.svg new file mode 100644 index 000000000..0d351c308 --- /dev/null +++ b/src/static/svg/CD.svg @@ -0,0 +1,31 @@ + + + + CD + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CF.svg b/src/static/svg/CF.svg new file mode 100644 index 000000000..68566a2ee --- /dev/null +++ b/src/static/svg/CF.svg @@ -0,0 +1,43 @@ + + + + CF + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CG.svg b/src/static/svg/CG.svg new file mode 100644 index 000000000..bc4eb95bc --- /dev/null +++ b/src/static/svg/CG.svg @@ -0,0 +1,34 @@ + + + + CG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CH.svg b/src/static/svg/CH.svg new file mode 100644 index 000000000..772f4fa33 --- /dev/null +++ b/src/static/svg/CH.svg @@ -0,0 +1,23 @@ + + + + CH + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CI.svg b/src/static/svg/CI.svg new file mode 100644 index 000000000..096d98ab9 --- /dev/null +++ b/src/static/svg/CI.svg @@ -0,0 +1,28 @@ + + + + CI + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CK.svg b/src/static/svg/CK.svg new file mode 100644 index 000000000..c1ea37345 --- /dev/null +++ b/src/static/svg/CK.svg @@ -0,0 +1,31 @@ + + + + CK + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CL.svg b/src/static/svg/CL.svg new file mode 100644 index 000000000..d456d9518 --- /dev/null +++ b/src/static/svg/CL.svg @@ -0,0 +1,29 @@ + + + + CL + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CM.svg b/src/static/svg/CM.svg new file mode 100644 index 000000000..482f4a97f --- /dev/null +++ b/src/static/svg/CM.svg @@ -0,0 +1,38 @@ + + + + CM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CN.svg b/src/static/svg/CN.svg new file mode 100644 index 000000000..883ba157f --- /dev/null +++ b/src/static/svg/CN.svg @@ -0,0 +1,32 @@ + + + + CN + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CO.svg b/src/static/svg/CO.svg new file mode 100644 index 000000000..be492e3df --- /dev/null +++ b/src/static/svg/CO.svg @@ -0,0 +1,32 @@ + + + + CO + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CR.svg b/src/static/svg/CR.svg new file mode 100644 index 000000000..271204ebd --- /dev/null +++ b/src/static/svg/CR.svg @@ -0,0 +1,29 @@ + + + + CR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CU.svg b/src/static/svg/CU.svg new file mode 100644 index 000000000..23750cd96 --- /dev/null +++ b/src/static/svg/CU.svg @@ -0,0 +1,32 @@ + + + + CU + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CV.svg b/src/static/svg/CV.svg new file mode 100644 index 000000000..4b6152fbe --- /dev/null +++ b/src/static/svg/CV.svg @@ -0,0 +1,30 @@ + + + + CV + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CW.svg b/src/static/svg/CW.svg new file mode 100644 index 000000000..14acd27f8 --- /dev/null +++ b/src/static/svg/CW.svg @@ -0,0 +1,29 @@ + + + + CW + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CX.svg b/src/static/svg/CX.svg new file mode 100644 index 000000000..b3fe73d93 --- /dev/null +++ b/src/static/svg/CX.svg @@ -0,0 +1,38 @@ + + + + CX + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CY.svg b/src/static/svg/CY.svg new file mode 100644 index 000000000..b7860aa93 --- /dev/null +++ b/src/static/svg/CY.svg @@ -0,0 +1,24 @@ + + + + CY + Created with sketchtool. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/CZ.svg b/src/static/svg/CZ.svg new file mode 100644 index 000000000..d56c61b81 --- /dev/null +++ b/src/static/svg/CZ.svg @@ -0,0 +1,28 @@ + + + + CZ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/DE.svg b/src/static/svg/DE.svg new file mode 100644 index 000000000..4ff1ebd53 --- /dev/null +++ b/src/static/svg/DE.svg @@ -0,0 +1,32 @@ + + + + DE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/DJ.svg b/src/static/svg/DJ.svg new file mode 100644 index 000000000..c0a019f9d --- /dev/null +++ b/src/static/svg/DJ.svg @@ -0,0 +1,33 @@ + + + + DJ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/DK.svg b/src/static/svg/DK.svg new file mode 100644 index 000000000..27900e157 --- /dev/null +++ b/src/static/svg/DK.svg @@ -0,0 +1,23 @@ + + + + DK + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/DM.svg b/src/static/svg/DM.svg new file mode 100644 index 000000000..d5c401ebc --- /dev/null +++ b/src/static/svg/DM.svg @@ -0,0 +1,41 @@ + + + + DM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/DO.svg b/src/static/svg/DO.svg new file mode 100644 index 000000000..9188e0beb --- /dev/null +++ b/src/static/svg/DO.svg @@ -0,0 +1,33 @@ + + + + DO + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/DZ.svg b/src/static/svg/DZ.svg new file mode 100644 index 000000000..0920d7121 --- /dev/null +++ b/src/static/svg/DZ.svg @@ -0,0 +1,29 @@ + + + + DZ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/EC.svg b/src/static/svg/EC.svg new file mode 100644 index 000000000..0fbd3ea61 --- /dev/null +++ b/src/static/svg/EC.svg @@ -0,0 +1,39 @@ + + + + EC + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/EE.svg b/src/static/svg/EE.svg new file mode 100644 index 000000000..636052239 --- /dev/null +++ b/src/static/svg/EE.svg @@ -0,0 +1,28 @@ + + + + EE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/EG.svg b/src/static/svg/EG.svg new file mode 100644 index 000000000..32d4447e4 --- /dev/null +++ b/src/static/svg/EG.svg @@ -0,0 +1,30 @@ + + + + EG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/ER.svg b/src/static/svg/ER.svg new file mode 100644 index 000000000..bb70368b7 --- /dev/null +++ b/src/static/svg/ER.svg @@ -0,0 +1,40 @@ + + + + ER + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/ES.svg b/src/static/svg/ES.svg new file mode 100644 index 000000000..883554f89 --- /dev/null +++ b/src/static/svg/ES.svg @@ -0,0 +1,34 @@ + + + + ES + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/ET.svg b/src/static/svg/ET.svg new file mode 100644 index 000000000..c4387b9fe --- /dev/null +++ b/src/static/svg/ET.svg @@ -0,0 +1,42 @@ + + + + ET + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/EU.svg b/src/static/svg/EU.svg new file mode 100644 index 000000000..db74ffaf9 --- /dev/null +++ b/src/static/svg/EU.svg @@ -0,0 +1,27 @@ + + + + EU + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/FI.svg b/src/static/svg/FI.svg new file mode 100644 index 000000000..9d243ed5b --- /dev/null +++ b/src/static/svg/FI.svg @@ -0,0 +1,22 @@ + + + + FI + Created with sketchtool. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/FJ.svg b/src/static/svg/FJ.svg new file mode 100644 index 000000000..e3ebc9bb1 --- /dev/null +++ b/src/static/svg/FJ.svg @@ -0,0 +1,51 @@ + + + + FJ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/FK.svg b/src/static/svg/FK.svg new file mode 100644 index 000000000..01b0f2a8e --- /dev/null +++ b/src/static/svg/FK.svg @@ -0,0 +1,58 @@ + + + + FK + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/FM.svg b/src/static/svg/FM.svg new file mode 100644 index 000000000..befd157c0 --- /dev/null +++ b/src/static/svg/FM.svg @@ -0,0 +1,23 @@ + + + + FM + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/FO.svg b/src/static/svg/FO.svg new file mode 100644 index 000000000..77618c05e --- /dev/null +++ b/src/static/svg/FO.svg @@ -0,0 +1,27 @@ + + + + FO + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/FR.svg b/src/static/svg/FR.svg new file mode 100644 index 000000000..940de6169 --- /dev/null +++ b/src/static/svg/FR.svg @@ -0,0 +1,28 @@ + + + + FR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GA.svg b/src/static/svg/GA.svg new file mode 100644 index 000000000..45c680870 --- /dev/null +++ b/src/static/svg/GA.svg @@ -0,0 +1,32 @@ + + + + GA + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GB-ENG.svg b/src/static/svg/GB-ENG.svg new file mode 100644 index 000000000..f032cb445 --- /dev/null +++ b/src/static/svg/GB-ENG.svg @@ -0,0 +1,22 @@ + + + + GB-ENG + Created with sketchtool. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GB-NIR.svg b/src/static/svg/GB-NIR.svg new file mode 100644 index 000000000..5d04864f5 --- /dev/null +++ b/src/static/svg/GB-NIR.svg @@ -0,0 +1,41 @@ + + + + GB-NIR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GB-SCT.svg b/src/static/svg/GB-SCT.svg new file mode 100644 index 000000000..6aabe9964 --- /dev/null +++ b/src/static/svg/GB-SCT.svg @@ -0,0 +1,23 @@ + + + + GB-SCT + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GB-WLS.svg b/src/static/svg/GB-WLS.svg new file mode 100644 index 000000000..607b33306 --- /dev/null +++ b/src/static/svg/GB-WLS.svg @@ -0,0 +1,28 @@ + + + + GB-WLS + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GB-ZET.svg b/src/static/svg/GB-ZET.svg new file mode 100644 index 000000000..7080d48bc --- /dev/null +++ b/src/static/svg/GB-ZET.svg @@ -0,0 +1,23 @@ + + + + GB-ZET + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GB.svg b/src/static/svg/GB.svg new file mode 100644 index 000000000..679d27c75 --- /dev/null +++ b/src/static/svg/GB.svg @@ -0,0 +1,32 @@ + + + + GB + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GD.svg b/src/static/svg/GD.svg new file mode 100644 index 000000000..210dc3fd8 --- /dev/null +++ b/src/static/svg/GD.svg @@ -0,0 +1,49 @@ + + + + GD + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GE.svg b/src/static/svg/GE.svg new file mode 100644 index 000000000..818f3f5b5 --- /dev/null +++ b/src/static/svg/GE.svg @@ -0,0 +1,26 @@ + + + + GE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GF.svg b/src/static/svg/GF.svg new file mode 100644 index 000000000..bae1448dc --- /dev/null +++ b/src/static/svg/GF.svg @@ -0,0 +1,32 @@ + + + + GF + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GG.svg b/src/static/svg/GG.svg new file mode 100644 index 000000000..fa4285352 --- /dev/null +++ b/src/static/svg/GG.svg @@ -0,0 +1,27 @@ + + + + GG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GH.svg b/src/static/svg/GH.svg new file mode 100644 index 000000000..528473ff2 --- /dev/null +++ b/src/static/svg/GH.svg @@ -0,0 +1,37 @@ + + + + GH + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GI.svg b/src/static/svg/GI.svg new file mode 100644 index 000000000..ecd8530aa --- /dev/null +++ b/src/static/svg/GI.svg @@ -0,0 +1,38 @@ + + + + GI + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GL.svg b/src/static/svg/GL.svg new file mode 100644 index 000000000..33b223337 --- /dev/null +++ b/src/static/svg/GL.svg @@ -0,0 +1,33 @@ + + + + GL + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GM.svg b/src/static/svg/GM.svg new file mode 100644 index 000000000..b6330f523 --- /dev/null +++ b/src/static/svg/GM.svg @@ -0,0 +1,33 @@ + + + + GM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GN.svg b/src/static/svg/GN.svg new file mode 100644 index 000000000..2d20595ea --- /dev/null +++ b/src/static/svg/GN.svg @@ -0,0 +1,32 @@ + + + + GN + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GP.svg b/src/static/svg/GP.svg new file mode 100644 index 000000000..3dbdcc132 --- /dev/null +++ b/src/static/svg/GP.svg @@ -0,0 +1,40 @@ + + + + GP + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GQ.svg b/src/static/svg/GQ.svg new file mode 100644 index 000000000..e2d5c67d2 --- /dev/null +++ b/src/static/svg/GQ.svg @@ -0,0 +1,34 @@ + + + + GQ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GR.svg b/src/static/svg/GR.svg new file mode 100644 index 000000000..a9b12c000 --- /dev/null +++ b/src/static/svg/GR.svg @@ -0,0 +1,22 @@ + + + + GR + Created with sketchtool. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GS.svg b/src/static/svg/GS.svg new file mode 100644 index 000000000..039845211 --- /dev/null +++ b/src/static/svg/GS.svg @@ -0,0 +1,112 @@ + + + + GS + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GT.svg b/src/static/svg/GT.svg new file mode 100644 index 000000000..be45ee89f --- /dev/null +++ b/src/static/svg/GT.svg @@ -0,0 +1,26 @@ + + + + GT + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GU.svg b/src/static/svg/GU.svg new file mode 100644 index 000000000..6233a0bbd --- /dev/null +++ b/src/static/svg/GU.svg @@ -0,0 +1,65 @@ + + + + GU + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GW.svg b/src/static/svg/GW.svg new file mode 100644 index 000000000..b09530d44 --- /dev/null +++ b/src/static/svg/GW.svg @@ -0,0 +1,37 @@ + + + + GW + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/GY.svg b/src/static/svg/GY.svg new file mode 100644 index 000000000..e5937c245 --- /dev/null +++ b/src/static/svg/GY.svg @@ -0,0 +1,42 @@ + + + + GY + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/HK.svg b/src/static/svg/HK.svg new file mode 100644 index 000000000..f99b8882c --- /dev/null +++ b/src/static/svg/HK.svg @@ -0,0 +1,23 @@ + + + + HK + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/HM.svg b/src/static/svg/HM.svg new file mode 100644 index 000000000..8ef4f3463 --- /dev/null +++ b/src/static/svg/HM.svg @@ -0,0 +1,36 @@ + + + + HM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/HN.svg b/src/static/svg/HN.svg new file mode 100644 index 000000000..50a48cd94 --- /dev/null +++ b/src/static/svg/HN.svg @@ -0,0 +1,33 @@ + + + + HN + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/HR.svg b/src/static/svg/HR.svg new file mode 100644 index 000000000..a6cf5daa3 --- /dev/null +++ b/src/static/svg/HR.svg @@ -0,0 +1,35 @@ + + + + HR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/HT.svg b/src/static/svg/HT.svg new file mode 100644 index 000000000..0cd82be12 --- /dev/null +++ b/src/static/svg/HT.svg @@ -0,0 +1,46 @@ + + + + HT + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/HU.svg b/src/static/svg/HU.svg new file mode 100644 index 000000000..795319ea1 --- /dev/null +++ b/src/static/svg/HU.svg @@ -0,0 +1,28 @@ + + + + HU + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/ID.svg b/src/static/svg/ID.svg new file mode 100644 index 000000000..8101da05c --- /dev/null +++ b/src/static/svg/ID.svg @@ -0,0 +1,23 @@ + + + + ID + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/IE.svg b/src/static/svg/IE.svg new file mode 100644 index 000000000..60d9af87c --- /dev/null +++ b/src/static/svg/IE.svg @@ -0,0 +1,28 @@ + + + + IE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/IL.svg b/src/static/svg/IL.svg new file mode 100644 index 000000000..7646f91e9 --- /dev/null +++ b/src/static/svg/IL.svg @@ -0,0 +1,26 @@ + + + + IL + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/IM.svg b/src/static/svg/IM.svg new file mode 100644 index 000000000..ecc7c12e2 --- /dev/null +++ b/src/static/svg/IM.svg @@ -0,0 +1,30 @@ + + + + IM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/IN.svg b/src/static/svg/IN.svg new file mode 100644 index 000000000..3726ceb79 --- /dev/null +++ b/src/static/svg/IN.svg @@ -0,0 +1,31 @@ + + + + IN + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/IO.svg b/src/static/svg/IO.svg new file mode 100644 index 000000000..4d8b52291 --- /dev/null +++ b/src/static/svg/IO.svg @@ -0,0 +1,33 @@ + + + + IO + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/IQ.svg b/src/static/svg/IQ.svg new file mode 100644 index 000000000..16c4cf185 --- /dev/null +++ b/src/static/svg/IQ.svg @@ -0,0 +1,33 @@ + + + + IQ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/IR.svg b/src/static/svg/IR.svg new file mode 100644 index 000000000..af3250176 --- /dev/null +++ b/src/static/svg/IR.svg @@ -0,0 +1,31 @@ + + + + IR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/IS.svg b/src/static/svg/IS.svg new file mode 100644 index 000000000..385a2bf93 --- /dev/null +++ b/src/static/svg/IS.svg @@ -0,0 +1,28 @@ + + + + IS + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/IT.svg b/src/static/svg/IT.svg new file mode 100644 index 000000000..9e76f24c3 --- /dev/null +++ b/src/static/svg/IT.svg @@ -0,0 +1,28 @@ + + + + IT + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/JE.svg b/src/static/svg/JE.svg new file mode 100644 index 000000000..6663c5042 --- /dev/null +++ b/src/static/svg/JE.svg @@ -0,0 +1,32 @@ + + + + JE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/JM.svg b/src/static/svg/JM.svg new file mode 100644 index 000000000..54779e777 --- /dev/null +++ b/src/static/svg/JM.svg @@ -0,0 +1,33 @@ + + + + JM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/JO.svg b/src/static/svg/JO.svg new file mode 100644 index 000000000..b0788e769 --- /dev/null +++ b/src/static/svg/JO.svg @@ -0,0 +1,34 @@ + + + + JO + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/JP.svg b/src/static/svg/JP.svg new file mode 100644 index 000000000..0a655c041 --- /dev/null +++ b/src/static/svg/JP.svg @@ -0,0 +1,22 @@ + + + + JP + Created with sketchtool. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/KE.svg b/src/static/svg/KE.svg new file mode 100644 index 000000000..6c6a6cf6f --- /dev/null +++ b/src/static/svg/KE.svg @@ -0,0 +1,43 @@ + + + + KE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/KG.svg b/src/static/svg/KG.svg new file mode 100644 index 000000000..12e6a244d --- /dev/null +++ b/src/static/svg/KG.svg @@ -0,0 +1,28 @@ + + + + KG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/KH.svg b/src/static/svg/KH.svg new file mode 100644 index 000000000..9ea454bbe --- /dev/null +++ b/src/static/svg/KH.svg @@ -0,0 +1,29 @@ + + + + KH + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/KI.svg b/src/static/svg/KI.svg new file mode 100644 index 000000000..e00e2352a --- /dev/null +++ b/src/static/svg/KI.svg @@ -0,0 +1,35 @@ + + + + KI + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/KM.svg b/src/static/svg/KM.svg new file mode 100644 index 000000000..2da152d57 --- /dev/null +++ b/src/static/svg/KM.svg @@ -0,0 +1,39 @@ + + + + KM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/KN.svg b/src/static/svg/KN.svg new file mode 100644 index 000000000..e65b7b61f --- /dev/null +++ b/src/static/svg/KN.svg @@ -0,0 +1,39 @@ + + + + KN + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/KP.svg b/src/static/svg/KP.svg new file mode 100644 index 000000000..649feb275 --- /dev/null +++ b/src/static/svg/KP.svg @@ -0,0 +1,30 @@ + + + + KP + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/KR.svg b/src/static/svg/KR.svg new file mode 100644 index 000000000..078665a50 --- /dev/null +++ b/src/static/svg/KR.svg @@ -0,0 +1,38 @@ + + + + KR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/KW.svg b/src/static/svg/KW.svg new file mode 100644 index 000000000..a73b01139 --- /dev/null +++ b/src/static/svg/KW.svg @@ -0,0 +1,33 @@ + + + + KW + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/KY.svg b/src/static/svg/KY.svg new file mode 100644 index 000000000..2240dbc6b --- /dev/null +++ b/src/static/svg/KY.svg @@ -0,0 +1,44 @@ + + + + KY + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/KZ.svg b/src/static/svg/KZ.svg new file mode 100644 index 000000000..6076ac54e --- /dev/null +++ b/src/static/svg/KZ.svg @@ -0,0 +1,29 @@ + + + + KZ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/LA.svg b/src/static/svg/LA.svg new file mode 100644 index 000000000..5b740da70 --- /dev/null +++ b/src/static/svg/LA.svg @@ -0,0 +1,29 @@ + + + + LA + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/LB.svg b/src/static/svg/LB.svg new file mode 100644 index 000000000..401a235d6 --- /dev/null +++ b/src/static/svg/LB.svg @@ -0,0 +1,29 @@ + + + + LB + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/LC.svg b/src/static/svg/LC.svg new file mode 100644 index 000000000..8d809d3e3 --- /dev/null +++ b/src/static/svg/LC.svg @@ -0,0 +1,33 @@ + + + + LC + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/LGBT.svg b/src/static/svg/LGBT.svg new file mode 100644 index 000000000..a3f751934 --- /dev/null +++ b/src/static/svg/LGBT.svg @@ -0,0 +1,42 @@ + + + + LGBT + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/LI.svg b/src/static/svg/LI.svg new file mode 100644 index 000000000..1160975a6 --- /dev/null +++ b/src/static/svg/LI.svg @@ -0,0 +1,27 @@ + + + + LI + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/LK.svg b/src/static/svg/LK.svg new file mode 100644 index 000000000..55386d5c5 --- /dev/null +++ b/src/static/svg/LK.svg @@ -0,0 +1,43 @@ + + + + LK + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/LR.svg b/src/static/svg/LR.svg new file mode 100644 index 000000000..3d6cef1e0 --- /dev/null +++ b/src/static/svg/LR.svg @@ -0,0 +1,36 @@ + + + + LR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/LS.svg b/src/static/svg/LS.svg new file mode 100644 index 000000000..3ec5277d5 --- /dev/null +++ b/src/static/svg/LS.svg @@ -0,0 +1,34 @@ + + + + LS + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/LT.svg b/src/static/svg/LT.svg new file mode 100644 index 000000000..8e592267e --- /dev/null +++ b/src/static/svg/LT.svg @@ -0,0 +1,32 @@ + + + + LT + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/LU.svg b/src/static/svg/LU.svg new file mode 100644 index 000000000..860e730bc --- /dev/null +++ b/src/static/svg/LU.svg @@ -0,0 +1,28 @@ + + + + LU + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/LV.svg b/src/static/svg/LV.svg new file mode 100644 index 000000000..5d0255e6d --- /dev/null +++ b/src/static/svg/LV.svg @@ -0,0 +1,24 @@ + + + + LV + Created with sketchtool. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/LY.svg b/src/static/svg/LY.svg new file mode 100644 index 000000000..4b9f2a0e3 --- /dev/null +++ b/src/static/svg/LY.svg @@ -0,0 +1,33 @@ + + + + LY + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MA.svg b/src/static/svg/MA.svg new file mode 100644 index 000000000..cb22ba958 --- /dev/null +++ b/src/static/svg/MA.svg @@ -0,0 +1,23 @@ + + + + MA + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MC.svg b/src/static/svg/MC.svg new file mode 100644 index 000000000..207590a77 --- /dev/null +++ b/src/static/svg/MC.svg @@ -0,0 +1,23 @@ + + + + MC + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MD.svg b/src/static/svg/MD.svg new file mode 100644 index 000000000..301e93ee1 --- /dev/null +++ b/src/static/svg/MD.svg @@ -0,0 +1,42 @@ + + + + MD + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/ME.svg b/src/static/svg/ME.svg new file mode 100644 index 000000000..9b0838e93 --- /dev/null +++ b/src/static/svg/ME.svg @@ -0,0 +1,29 @@ + + + + ME + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MF.svg b/src/static/svg/MF.svg new file mode 100644 index 000000000..c45b62a0f --- /dev/null +++ b/src/static/svg/MF.svg @@ -0,0 +1,28 @@ + + + + MF + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MG.svg b/src/static/svg/MG.svg new file mode 100644 index 000000000..c173fdd51 --- /dev/null +++ b/src/static/svg/MG.svg @@ -0,0 +1,28 @@ + + + + MG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MH.svg b/src/static/svg/MH.svg new file mode 100644 index 000000000..e6b660911 --- /dev/null +++ b/src/static/svg/MH.svg @@ -0,0 +1,29 @@ + + + + MH + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MK.svg b/src/static/svg/MK.svg new file mode 100644 index 000000000..35b922973 --- /dev/null +++ b/src/static/svg/MK.svg @@ -0,0 +1,29 @@ + + + + MK + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/ML.svg b/src/static/svg/ML.svg new file mode 100644 index 000000000..babc6e592 --- /dev/null +++ b/src/static/svg/ML.svg @@ -0,0 +1,32 @@ + + + + ML + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MM.svg b/src/static/svg/MM.svg new file mode 100644 index 000000000..eb3c18a30 --- /dev/null +++ b/src/static/svg/MM.svg @@ -0,0 +1,33 @@ + + + + MM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MN.svg b/src/static/svg/MN.svg new file mode 100644 index 000000000..8af15a515 --- /dev/null +++ b/src/static/svg/MN.svg @@ -0,0 +1,33 @@ + + + + MN + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MO.svg b/src/static/svg/MO.svg new file mode 100644 index 000000000..be4bc8756 --- /dev/null +++ b/src/static/svg/MO.svg @@ -0,0 +1,26 @@ + + + + MO + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MP.svg b/src/static/svg/MP.svg new file mode 100644 index 000000000..331514895 --- /dev/null +++ b/src/static/svg/MP.svg @@ -0,0 +1,29 @@ + + + + MP + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MQ.svg b/src/static/svg/MQ.svg new file mode 100644 index 000000000..adc820743 --- /dev/null +++ b/src/static/svg/MQ.svg @@ -0,0 +1,27 @@ + + + + MQ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MR.svg b/src/static/svg/MR.svg new file mode 100644 index 000000000..da5adee6b --- /dev/null +++ b/src/static/svg/MR.svg @@ -0,0 +1,27 @@ + + + + MR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MS.svg b/src/static/svg/MS.svg new file mode 100644 index 000000000..184c9178a --- /dev/null +++ b/src/static/svg/MS.svg @@ -0,0 +1,47 @@ + + + + MS + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MT.svg b/src/static/svg/MT.svg new file mode 100644 index 000000000..5ce0b3fed --- /dev/null +++ b/src/static/svg/MT.svg @@ -0,0 +1,29 @@ + + + + MT + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MU.svg b/src/static/svg/MU.svg new file mode 100644 index 000000000..f2c6f3f86 --- /dev/null +++ b/src/static/svg/MU.svg @@ -0,0 +1,37 @@ + + + + MU + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MV.svg b/src/static/svg/MV.svg new file mode 100644 index 000000000..f10e07d5f --- /dev/null +++ b/src/static/svg/MV.svg @@ -0,0 +1,28 @@ + + + + MV + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MW.svg b/src/static/svg/MW.svg new file mode 100644 index 000000000..5b0cc5c6f --- /dev/null +++ b/src/static/svg/MW.svg @@ -0,0 +1,33 @@ + + + + MW + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MX.svg b/src/static/svg/MX.svg new file mode 100644 index 000000000..7ed245bc7 --- /dev/null +++ b/src/static/svg/MX.svg @@ -0,0 +1,30 @@ + + + + MX + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MY.svg b/src/static/svg/MY.svg new file mode 100644 index 000000000..e7ff885f2 --- /dev/null +++ b/src/static/svg/MY.svg @@ -0,0 +1,32 @@ + + + + MY + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/MZ.svg b/src/static/svg/MZ.svg new file mode 100644 index 000000000..7f553b00c --- /dev/null +++ b/src/static/svg/MZ.svg @@ -0,0 +1,43 @@ + + + + MZ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/NA.svg b/src/static/svg/NA.svg new file mode 100644 index 000000000..cb0ba69fd --- /dev/null +++ b/src/static/svg/NA.svg @@ -0,0 +1,75 @@ + + + + NA + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/NC.svg b/src/static/svg/NC.svg new file mode 100644 index 000000000..bae580e8d --- /dev/null +++ b/src/static/svg/NC.svg @@ -0,0 +1,42 @@ + + + + NC + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/NE.svg b/src/static/svg/NE.svg new file mode 100644 index 000000000..12bcf8a0d --- /dev/null +++ b/src/static/svg/NE.svg @@ -0,0 +1,33 @@ + + + + NE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/NF.svg b/src/static/svg/NF.svg new file mode 100644 index 000000000..b707e52d0 --- /dev/null +++ b/src/static/svg/NF.svg @@ -0,0 +1,29 @@ + + + + NF + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/NG.svg b/src/static/svg/NG.svg new file mode 100644 index 000000000..4063ff846 --- /dev/null +++ b/src/static/svg/NG.svg @@ -0,0 +1,24 @@ + + + + NG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/NI.svg b/src/static/svg/NI.svg new file mode 100644 index 000000000..7adb4ba40 --- /dev/null +++ b/src/static/svg/NI.svg @@ -0,0 +1,26 @@ + + + + NI + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/NL.svg b/src/static/svg/NL.svg new file mode 100644 index 000000000..c62f42ad8 --- /dev/null +++ b/src/static/svg/NL.svg @@ -0,0 +1,28 @@ + + + + NL + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/NO.svg b/src/static/svg/NO.svg new file mode 100644 index 000000000..cdc23f499 --- /dev/null +++ b/src/static/svg/NO.svg @@ -0,0 +1,28 @@ + + + + NO + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/NP.svg b/src/static/svg/NP.svg new file mode 100644 index 000000000..c879fa80f --- /dev/null +++ b/src/static/svg/NP.svg @@ -0,0 +1,35 @@ + + + + NP + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/NR.svg b/src/static/svg/NR.svg new file mode 100644 index 000000000..1a6c3a21a --- /dev/null +++ b/src/static/svg/NR.svg @@ -0,0 +1,28 @@ + + + + NR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/NU.svg b/src/static/svg/NU.svg new file mode 100644 index 000000000..3d9bc80c6 --- /dev/null +++ b/src/static/svg/NU.svg @@ -0,0 +1,41 @@ + + + + NU + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/NZ.svg b/src/static/svg/NZ.svg new file mode 100644 index 000000000..c1f624df8 --- /dev/null +++ b/src/static/svg/NZ.svg @@ -0,0 +1,34 @@ + + + + NZ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/OM.svg b/src/static/svg/OM.svg new file mode 100644 index 000000000..cb08ac82a --- /dev/null +++ b/src/static/svg/OM.svg @@ -0,0 +1,29 @@ + + + + OM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PA.svg b/src/static/svg/PA.svg new file mode 100644 index 000000000..d8516682e --- /dev/null +++ b/src/static/svg/PA.svg @@ -0,0 +1,30 @@ + + + + PA + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PE.svg b/src/static/svg/PE.svg new file mode 100644 index 000000000..98a26cf20 --- /dev/null +++ b/src/static/svg/PE.svg @@ -0,0 +1,24 @@ + + + + PE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PF.svg b/src/static/svg/PF.svg new file mode 100644 index 000000000..b29385f4b --- /dev/null +++ b/src/static/svg/PF.svg @@ -0,0 +1,52 @@ + + + + PF + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PG.svg b/src/static/svg/PG.svg new file mode 100644 index 000000000..0630fab6f --- /dev/null +++ b/src/static/svg/PG.svg @@ -0,0 +1,36 @@ + + + + PG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PH.svg b/src/static/svg/PH.svg new file mode 100644 index 000000000..4c1087b8b --- /dev/null +++ b/src/static/svg/PH.svg @@ -0,0 +1,33 @@ + + + + PH + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PK.svg b/src/static/svg/PK.svg new file mode 100644 index 000000000..7ecb09cfd --- /dev/null +++ b/src/static/svg/PK.svg @@ -0,0 +1,32 @@ + + + + PK + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PL.svg b/src/static/svg/PL.svg new file mode 100644 index 000000000..fadbd2d6b --- /dev/null +++ b/src/static/svg/PL.svg @@ -0,0 +1,23 @@ + + + + PL + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PM.svg b/src/static/svg/PM.svg new file mode 100644 index 000000000..1f39fd0a2 --- /dev/null +++ b/src/static/svg/PM.svg @@ -0,0 +1,66 @@ + + + + PM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PN.svg b/src/static/svg/PN.svg new file mode 100644 index 000000000..f2b2cc4fe --- /dev/null +++ b/src/static/svg/PN.svg @@ -0,0 +1,51 @@ + + + + PN + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PR.svg b/src/static/svg/PR.svg new file mode 100644 index 000000000..7d1204451 --- /dev/null +++ b/src/static/svg/PR.svg @@ -0,0 +1,30 @@ + + + + PR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PS.svg b/src/static/svg/PS.svg new file mode 100644 index 000000000..e68583ba0 --- /dev/null +++ b/src/static/svg/PS.svg @@ -0,0 +1,33 @@ + + + + PS + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PT.svg b/src/static/svg/PT.svg new file mode 100644 index 000000000..49b59be24 --- /dev/null +++ b/src/static/svg/PT.svg @@ -0,0 +1,38 @@ + + + + PT + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PW.svg b/src/static/svg/PW.svg new file mode 100644 index 000000000..4ab7f1661 --- /dev/null +++ b/src/static/svg/PW.svg @@ -0,0 +1,27 @@ + + + + PW + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/PY.svg b/src/static/svg/PY.svg new file mode 100644 index 000000000..2ae005460 --- /dev/null +++ b/src/static/svg/PY.svg @@ -0,0 +1,30 @@ + + + + PY + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/QA.svg b/src/static/svg/QA.svg new file mode 100644 index 000000000..985171d17 --- /dev/null +++ b/src/static/svg/QA.svg @@ -0,0 +1,23 @@ + + + + QA + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/RE.svg b/src/static/svg/RE.svg new file mode 100644 index 000000000..7e1309388 --- /dev/null +++ b/src/static/svg/RE.svg @@ -0,0 +1,28 @@ + + + + RE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/RO.svg b/src/static/svg/RO.svg new file mode 100644 index 000000000..dd82b266f --- /dev/null +++ b/src/static/svg/RO.svg @@ -0,0 +1,32 @@ + + + + RO + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/RS.svg b/src/static/svg/RS.svg new file mode 100644 index 000000000..892dd5e4a --- /dev/null +++ b/src/static/svg/RS.svg @@ -0,0 +1,39 @@ + + + + RS + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/RU.svg b/src/static/svg/RU.svg new file mode 100644 index 000000000..a9ba65b57 --- /dev/null +++ b/src/static/svg/RU.svg @@ -0,0 +1,28 @@ + + + + RU + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/RW.svg b/src/static/svg/RW.svg new file mode 100644 index 000000000..43b26156b --- /dev/null +++ b/src/static/svg/RW.svg @@ -0,0 +1,37 @@ + + + + RW + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SA.svg b/src/static/svg/SA.svg new file mode 100644 index 000000000..735b986f8 --- /dev/null +++ b/src/static/svg/SA.svg @@ -0,0 +1,26 @@ + + + + SA + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SB.svg b/src/static/svg/SB.svg new file mode 100644 index 000000000..768c45c0b --- /dev/null +++ b/src/static/svg/SB.svg @@ -0,0 +1,39 @@ + + + + SB + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SC.svg b/src/static/svg/SC.svg new file mode 100644 index 000000000..62b380b8d --- /dev/null +++ b/src/static/svg/SC.svg @@ -0,0 +1,43 @@ + + + + SC + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SD.svg b/src/static/svg/SD.svg new file mode 100644 index 000000000..c68d6b1b1 --- /dev/null +++ b/src/static/svg/SD.svg @@ -0,0 +1,33 @@ + + + + SD + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SE.svg b/src/static/svg/SE.svg new file mode 100644 index 000000000..bb4f4e117 --- /dev/null +++ b/src/static/svg/SE.svg @@ -0,0 +1,27 @@ + + + + SE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SG.svg b/src/static/svg/SG.svg new file mode 100644 index 000000000..270114839 --- /dev/null +++ b/src/static/svg/SG.svg @@ -0,0 +1,24 @@ + + + + SG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SH.svg b/src/static/svg/SH.svg new file mode 100644 index 000000000..e0dde7643 --- /dev/null +++ b/src/static/svg/SH.svg @@ -0,0 +1,53 @@ + + + + SH + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SI.svg b/src/static/svg/SI.svg new file mode 100644 index 000000000..497f87054 --- /dev/null +++ b/src/static/svg/SI.svg @@ -0,0 +1,28 @@ + + + + SI + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SJ.svg b/src/static/svg/SJ.svg new file mode 100644 index 000000000..bef7e5056 --- /dev/null +++ b/src/static/svg/SJ.svg @@ -0,0 +1,28 @@ + + + + SJ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SK.svg b/src/static/svg/SK.svg new file mode 100644 index 000000000..2b8ba801a --- /dev/null +++ b/src/static/svg/SK.svg @@ -0,0 +1,46 @@ + + + + SK + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SL.svg b/src/static/svg/SL.svg new file mode 100644 index 000000000..817419ef6 --- /dev/null +++ b/src/static/svg/SL.svg @@ -0,0 +1,28 @@ + + + + SL + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SM.svg b/src/static/svg/SM.svg new file mode 100644 index 000000000..abf621717 --- /dev/null +++ b/src/static/svg/SM.svg @@ -0,0 +1,25 @@ + + + + SM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SN.svg b/src/static/svg/SN.svg new file mode 100644 index 000000000..09484160a --- /dev/null +++ b/src/static/svg/SN.svg @@ -0,0 +1,33 @@ + + + + SN + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SO.svg b/src/static/svg/SO.svg new file mode 100644 index 000000000..6372e3770 --- /dev/null +++ b/src/static/svg/SO.svg @@ -0,0 +1,23 @@ + + + + SO + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SR.svg b/src/static/svg/SR.svg new file mode 100644 index 000000000..97963b0c6 --- /dev/null +++ b/src/static/svg/SR.svg @@ -0,0 +1,34 @@ + + + + SR + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SS.svg b/src/static/svg/SS.svg new file mode 100644 index 000000000..e8d68dd02 --- /dev/null +++ b/src/static/svg/SS.svg @@ -0,0 +1,44 @@ + + + + SS + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/ST.svg b/src/static/svg/ST.svg new file mode 100644 index 000000000..4b355d712 --- /dev/null +++ b/src/static/svg/ST.svg @@ -0,0 +1,39 @@ + + + + ST + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SV.svg b/src/static/svg/SV.svg new file mode 100644 index 000000000..9bfdd5ce9 --- /dev/null +++ b/src/static/svg/SV.svg @@ -0,0 +1,30 @@ + + + + SV + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SX.svg b/src/static/svg/SX.svg new file mode 100644 index 000000000..ccefe037b --- /dev/null +++ b/src/static/svg/SX.svg @@ -0,0 +1,45 @@ + + + + SX + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SY.svg b/src/static/svg/SY.svg new file mode 100644 index 000000000..040530b60 --- /dev/null +++ b/src/static/svg/SY.svg @@ -0,0 +1,34 @@ + + + + SY + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/SZ.svg b/src/static/svg/SZ.svg new file mode 100644 index 000000000..fc4120dec --- /dev/null +++ b/src/static/svg/SZ.svg @@ -0,0 +1,47 @@ + + + + SZ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TC.svg b/src/static/svg/TC.svg new file mode 100644 index 000000000..c3ea149a6 --- /dev/null +++ b/src/static/svg/TC.svg @@ -0,0 +1,40 @@ + + + + TC + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TD.svg b/src/static/svg/TD.svg new file mode 100644 index 000000000..74756faf5 --- /dev/null +++ b/src/static/svg/TD.svg @@ -0,0 +1,32 @@ + + + + TD + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TF.svg b/src/static/svg/TF.svg new file mode 100644 index 000000000..d1ea69184 --- /dev/null +++ b/src/static/svg/TF.svg @@ -0,0 +1,35 @@ + + + + TF + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TG.svg b/src/static/svg/TG.svg new file mode 100644 index 000000000..e9f6360fd --- /dev/null +++ b/src/static/svg/TG.svg @@ -0,0 +1,33 @@ + + + + TG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TH.svg b/src/static/svg/TH.svg new file mode 100644 index 000000000..1bf403a23 --- /dev/null +++ b/src/static/svg/TH.svg @@ -0,0 +1,29 @@ + + + + TH + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TJ.svg b/src/static/svg/TJ.svg new file mode 100644 index 000000000..77d6728b6 --- /dev/null +++ b/src/static/svg/TJ.svg @@ -0,0 +1,29 @@ + + + + TJ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TK.svg b/src/static/svg/TK.svg new file mode 100644 index 000000000..3cde9608b --- /dev/null +++ b/src/static/svg/TK.svg @@ -0,0 +1,31 @@ + + + + TK + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TL.svg b/src/static/svg/TL.svg new file mode 100644 index 000000000..41b895218 --- /dev/null +++ b/src/static/svg/TL.svg @@ -0,0 +1,33 @@ + + + + TL + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TM.svg b/src/static/svg/TM.svg new file mode 100644 index 000000000..dac62a132 --- /dev/null +++ b/src/static/svg/TM.svg @@ -0,0 +1,74 @@ + + + + TM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TN.svg b/src/static/svg/TN.svg new file mode 100644 index 000000000..3ff74a9ea --- /dev/null +++ b/src/static/svg/TN.svg @@ -0,0 +1,23 @@ + + + + TN + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TO.svg b/src/static/svg/TO.svg new file mode 100644 index 000000000..e0e42ee2f --- /dev/null +++ b/src/static/svg/TO.svg @@ -0,0 +1,28 @@ + + + + TO + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TR.svg b/src/static/svg/TR.svg new file mode 100644 index 000000000..e5c0924d0 --- /dev/null +++ b/src/static/svg/TR.svg @@ -0,0 +1,23 @@ + + + + TR + Created with sketchtool. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TT.svg b/src/static/svg/TT.svg new file mode 100644 index 000000000..69bdb9a95 --- /dev/null +++ b/src/static/svg/TT.svg @@ -0,0 +1,28 @@ + + + + TT + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TV.svg b/src/static/svg/TV.svg new file mode 100644 index 000000000..839c97f12 --- /dev/null +++ b/src/static/svg/TV.svg @@ -0,0 +1,36 @@ + + + + TV + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TW.svg b/src/static/svg/TW.svg new file mode 100644 index 000000000..488d1120d --- /dev/null +++ b/src/static/svg/TW.svg @@ -0,0 +1,28 @@ + + + + TW + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/TZ.svg b/src/static/svg/TZ.svg new file mode 100644 index 000000000..d652e2110 --- /dev/null +++ b/src/static/svg/TZ.svg @@ -0,0 +1,37 @@ + + + + TZ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/UA.svg b/src/static/svg/UA.svg new file mode 100644 index 000000000..8dac83662 --- /dev/null +++ b/src/static/svg/UA.svg @@ -0,0 +1,27 @@ + + + + UA + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/UG.svg b/src/static/svg/UG.svg new file mode 100644 index 000000000..7fabd77c8 --- /dev/null +++ b/src/static/svg/UG.svg @@ -0,0 +1,37 @@ + + + + UG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/UM.svg b/src/static/svg/UM.svg new file mode 100644 index 000000000..1a8fc6a79 --- /dev/null +++ b/src/static/svg/UM.svg @@ -0,0 +1,28 @@ + + + + UM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/US-CA.svg b/src/static/svg/US-CA.svg new file mode 100644 index 000000000..8860c7a54 --- /dev/null +++ b/src/static/svg/US-CA.svg @@ -0,0 +1,33 @@ + + + + US-CA + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/US.svg b/src/static/svg/US.svg new file mode 100644 index 000000000..846ec9d20 --- /dev/null +++ b/src/static/svg/US.svg @@ -0,0 +1,28 @@ + + + + US + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/UY.svg b/src/static/svg/UY.svg new file mode 100644 index 000000000..81c281549 --- /dev/null +++ b/src/static/svg/UY.svg @@ -0,0 +1,29 @@ + + + + UY + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/UZ.svg b/src/static/svg/UZ.svg new file mode 100644 index 000000000..f6cf21400 --- /dev/null +++ b/src/static/svg/UZ.svg @@ -0,0 +1,29 @@ + + + + UZ + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/VA.svg b/src/static/svg/VA.svg new file mode 100644 index 000000000..14c78aaa2 --- /dev/null +++ b/src/static/svg/VA.svg @@ -0,0 +1,39 @@ + + + + VA + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/VC.svg b/src/static/svg/VC.svg new file mode 100644 index 000000000..22cc1d530 --- /dev/null +++ b/src/static/svg/VC.svg @@ -0,0 +1,37 @@ + + + + VC + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/VE.svg b/src/static/svg/VE.svg new file mode 100644 index 000000000..1a14634f9 --- /dev/null +++ b/src/static/svg/VE.svg @@ -0,0 +1,33 @@ + + + + VE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/VG.svg b/src/static/svg/VG.svg new file mode 100644 index 000000000..c3c31ed1e --- /dev/null +++ b/src/static/svg/VG.svg @@ -0,0 +1,42 @@ + + + + VG + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/VI.svg b/src/static/svg/VI.svg new file mode 100644 index 000000000..071cf62c0 --- /dev/null +++ b/src/static/svg/VI.svg @@ -0,0 +1,49 @@ + + + + VI + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/VN.svg b/src/static/svg/VN.svg new file mode 100644 index 000000000..2bb795642 --- /dev/null +++ b/src/static/svg/VN.svg @@ -0,0 +1,27 @@ + + + + VN + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/VU.svg b/src/static/svg/VU.svg new file mode 100644 index 000000000..26e029810 --- /dev/null +++ b/src/static/svg/VU.svg @@ -0,0 +1,38 @@ + + + + VU + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/WF.svg b/src/static/svg/WF.svg new file mode 100644 index 000000000..26a5e4144 --- /dev/null +++ b/src/static/svg/WF.svg @@ -0,0 +1,28 @@ + + + + WF + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/WS.svg b/src/static/svg/WS.svg new file mode 100644 index 000000000..756c78f56 --- /dev/null +++ b/src/static/svg/WS.svg @@ -0,0 +1,28 @@ + + + + WS + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/XK.svg b/src/static/svg/XK.svg new file mode 100644 index 000000000..a9c245fd1 --- /dev/null +++ b/src/static/svg/XK.svg @@ -0,0 +1,28 @@ + + + + XK + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/YE.svg b/src/static/svg/YE.svg new file mode 100644 index 000000000..535406f9a --- /dev/null +++ b/src/static/svg/YE.svg @@ -0,0 +1,28 @@ + + + + YE + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/YT.svg b/src/static/svg/YT.svg new file mode 100644 index 000000000..be67985d1 --- /dev/null +++ b/src/static/svg/YT.svg @@ -0,0 +1,77 @@ + + + + YT + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/ZA.svg b/src/static/svg/ZA.svg new file mode 100644 index 000000000..f3ad37267 --- /dev/null +++ b/src/static/svg/ZA.svg @@ -0,0 +1,44 @@ + + + + ZA + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/ZM.svg b/src/static/svg/ZM.svg new file mode 100644 index 000000000..3e6f42a81 --- /dev/null +++ b/src/static/svg/ZM.svg @@ -0,0 +1,42 @@ + + + + ZM + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/static/svg/ZW.svg b/src/static/svg/ZW.svg new file mode 100644 index 000000000..dfaf1f3fa --- /dev/null +++ b/src/static/svg/ZW.svg @@ -0,0 +1,43 @@ + + + + ZW + Created with sketchtool. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/style/pages/Dashboard/Dashboard.scss b/src/style/pages/Dashboard/Dashboard.scss index 0039c1e8e..d17b56fc7 100644 --- a/src/style/pages/Dashboard/Dashboard.scss +++ b/src/style/pages/Dashboard/Dashboard.scss @@ -96,13 +96,13 @@ $dashboard-views-bar-height: 44px; } } - &-subscription-msg{ + &-subscription-msg { display: flex; flex-direction: row; padding-right: 6px; font-size: 12px; - span{ + span { margin: auto; } } @@ -371,13 +371,13 @@ $dashboard-views-bar-height: 44px; } } - &__centered-empty-status{ + &__centered-empty-status { display: flex; flex: 1 0 0; flex-direction: column; margin: auto; - .datatable-empty-status{ + .datatable-empty-status { margin: auto; padding-bottom: 40px; } @@ -537,6 +537,12 @@ $dashboard-views-bar-height: 44px; .bp3-tab[aria-selected='true'] { box-shadow: inset 0 -2px 0 #0052cc; } + .bp3-button { + &:hover { + background: rgba(167, 182, 194, 0.12); + color: #32304a; + } + } } .navbar--omnibar { @@ -565,3 +571,25 @@ $dashboard-views-bar-height: 44px; } } } + +.navbar--dashboard-topbar { + box-shadow: 0 0 0; + border-bottom: 1px solid #d2dce2; + /* height: 44px; */ + height: 37px; + padding: 0 20px; + + .bp3-navbar-group { + height: 37px; + } + + .bp3-navbar-divider { + border-left-color: #d2dce2; + } + .bp3-button { + &:hover { + background: rgba(167, 182, 194, 0.12); + color: #32304a; + } + } +} diff --git a/src/style/pages/SaleInvoice/PageForm.scss b/src/style/pages/SaleInvoice/PageForm.scss index bfb6be69c..75c21d936 100644 --- a/src/style/pages/SaleInvoice/PageForm.scss +++ b/src/style/pages/SaleInvoice/PageForm.scss @@ -31,6 +31,28 @@ body.page-invoice-edit { max-width: 450px; } } + .row { + display: flex; + flex-wrap: nowrap; + .col { + max-width: 470px; + + &--terms, + &--due-date { + .bp3-form-group { + margin: 0px 15px 15px; + .bp3-label { + min-width: 70px; + } + } + } + &--due-date { + .bp3-input-group .bp3-input { + border: 1px dashed #ced4da; + } + } + } + } .col--invoice-date { max-width: 435px; } From e05f51dec88d66c40bea17ce4577501aefefa7f4 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Mon, 7 Feb 2022 13:45:00 +0200 Subject: [PATCH 62/72] feat(invoice): add branch & warehouse schema. --- .../FlagKit.js => components/Tags/FlagTag.js} | 4 +- src/components/Tags/index.js | 3 +- .../InvoiceForm/InvoiceForm.schema.js | 92 +++++++++---------- .../InvoiceForm/InvoiceFormHeaderFields.js | 20 ++-- .../Invoices/InvoiceForm/InvoiceFormTopBar.js | 14 +-- .../Sales/Invoices/InvoiceForm/utils.js | 3 + src/static/json/icons.js | 2 +- 7 files changed, 73 insertions(+), 65 deletions(-) rename src/{containers/Sales/Invoices/InvoiceForm/FlagKit.js => components/Tags/FlagTag.js} (88%) diff --git a/src/containers/Sales/Invoices/InvoiceForm/FlagKit.js b/src/components/Tags/FlagTag.js similarity index 88% rename from src/containers/Sales/Invoices/InvoiceForm/FlagKit.js rename to src/components/Tags/FlagTag.js index 0a64a8ad6..ed3623d8b 100644 --- a/src/containers/Sales/Invoices/InvoiceForm/FlagKit.js +++ b/src/components/Tags/FlagTag.js @@ -1,7 +1,7 @@ import React from 'react'; import styled from 'styled-components'; -export default function FlagKit({ flage }) { +export const FlagTag = ({ flage }) => { return ( ); -} +}; const Img = styled.img` display: inline-block; diff --git a/src/components/Tags/index.js b/src/components/Tags/index.js index 7eca83954..03795ed67 100644 --- a/src/components/Tags/index.js +++ b/src/components/Tags/index.js @@ -1,3 +1,4 @@ -export * from './CurrencyTag'; \ No newline at end of file +export * from './CurrencyTag'; +export * from './FlagTag' \ No newline at end of file diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.schema.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.schema.js index dd89ccbba..eaedac85f 100644 --- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.schema.js +++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.schema.js @@ -3,53 +3,51 @@ import intl from 'react-intl-universal'; import { DATATYPES_LENGTH } from 'common/dataTypes'; import { isBlank } from 'utils'; -const getSchema = () => Yup.object().shape({ - customer_id: Yup.string() - .label(intl.get('customer_name_')) - .required(), - invoice_date: Yup.date() - .required() - .label(intl.get('invoice_date_')), - due_date: Yup.date() - .required() - .label(intl.get('due_date_')), - invoice_no: Yup.string() - .max(DATATYPES_LENGTH.STRING) - .label(intl.get('invoice_no_')), - reference_no: Yup.string().min(1).max(DATATYPES_LENGTH.STRING), - delivered: Yup.boolean(), - from_estimate_id: Yup.string(), - invoice_message: Yup.string() - .trim() - .min(1) - .max(DATATYPES_LENGTH.TEXT) - .label(intl.get('note')), - terms_conditions: Yup.string() - .trim() - .min(1) - .max(DATATYPES_LENGTH.TEXT) - .label(intl.get('note')), - entries: Yup.array().of( - Yup.object().shape({ - quantity: Yup.number() - .nullable() - .max(DATATYPES_LENGTH.INT_10) - .when(['rate'], { - is: (rate) => rate, - then: Yup.number().required(), - }), - rate: Yup.number().nullable().max(DATATYPES_LENGTH.INT_10), - item_id: Yup.number() - .nullable() - .when(['quantity', 'rate'], { - is: (quantity, rate) => !isBlank(quantity) && !isBlank(rate), - then: Yup.number().required(), - }), - discount: Yup.number().nullable().min(0).max(100), - description: Yup.string().nullable().max(DATATYPES_LENGTH.TEXT), - }), - ), -}); +const getSchema = () => + Yup.object().shape({ + customer_id: Yup.string().label(intl.get('customer_name_')).required(), + invoice_date: Yup.date().required().label(intl.get('invoice_date_')), + due_date: Yup.date().required().label(intl.get('due_date_')), + invoice_no: Yup.string() + .max(DATATYPES_LENGTH.STRING) + .label(intl.get('invoice_no_')), + reference_no: Yup.string().min(1).max(DATATYPES_LENGTH.STRING), + delivered: Yup.boolean(), + from_estimate_id: Yup.string(), + invoice_message: Yup.string() + .trim() + .min(1) + .max(DATATYPES_LENGTH.TEXT) + .label(intl.get('note')), + terms_conditions: Yup.string() + .trim() + .min(1) + .max(DATATYPES_LENGTH.TEXT) + .label(intl.get('note')), + exchange_rate: Yup.number(), + branch_id: Yup.string(), + warehouse_id: Yup.string(), + entries: Yup.array().of( + Yup.object().shape({ + quantity: Yup.number() + .nullable() + .max(DATATYPES_LENGTH.INT_10) + .when(['rate'], { + is: (rate) => rate, + then: Yup.number().required(), + }), + rate: Yup.number().nullable().max(DATATYPES_LENGTH.INT_10), + item_id: Yup.number() + .nullable() + .when(['quantity', 'rate'], { + is: (quantity, rate) => !isBlank(quantity) && !isBlank(rate), + then: Yup.number().required(), + }), + discount: Yup.number().nullable().min(0).max(100), + description: Yup.string().nullable().max(DATATYPES_LENGTH.TEXT), + }), + ), + }); export const getCreateInvoiceFormSchema = getSchema; export const getEditInvoiceFormSchema = getSchema; diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js index 11a9c319a..135b78af0 100644 --- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js +++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormHeaderFields.js @@ -4,12 +4,13 @@ import { InputGroup, Position, ControlGroup, - Classes, } from '@blueprintjs/core'; import { DateInput } from '@blueprintjs/datetime'; import { FastField, Field, ErrorMessage } from 'formik'; import { FormattedMessage as T, Col, Row } from 'components'; import { momentFormatter, compose, tansformDateValue } from 'utils'; +import { upperCase } from 'lodash'; + import classNames from 'classnames'; import styled from 'styled-components'; @@ -25,19 +26,22 @@ import { Icon, InputPrependButton, MoneyInputGroup, + FlagTag, } from 'components'; -import ItemsSuggestField from 'components/ItemsSuggestField'; import { useInvoiceFormContext } from './InvoiceFormProvider'; import withSettings from 'containers/Settings/withSettings'; import withDialogActions from 'containers/Dialog/withDialogActions'; import { inputIntent, handleDateChange } from 'utils'; import BaseCurrency from './BaseCurrency'; -import FlagKit from './FlagKit'; const Data = [ { - id: '10', + id: 10, + name: 'Due on Receipt', + }, + { + id: 20, name: 'Due on Receipt', }, ]; @@ -118,7 +122,7 @@ function InvoiceFormHeaderFields({ - 1 USD = + 1 USD = {/* ----------- Exchange reate ----------- */} @@ -138,14 +142,16 @@ function InvoiceFormHeaderFields({ value={field.value} allowDecimals={false} allowNegativeValue={true} - onChange={(value) => {}} + onChange={(value) => { + setFieldValue('exchange_rate', value); + }} intent={inputIntent({ error, touched })} /> )} - LYD + LYD diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js index 3d4b4afc5..1cc828986 100644 --- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js +++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js @@ -17,30 +17,30 @@ export default function InvoiceFormTopBar() { return ( - + {({ form, field: { value }, meta: { error, touched } }) => ( { - form.setFieldValue('name', item.id); + onItemSelected={({ id }) => { + form.setFieldValue('branch_id', id); }} selectedItemId={value} buttonProps={{ - icon: , + icon: , }} /> )} - + {({ form, field: { value }, meta: { error, touched } }) => ( { - form.setFieldValue('warehouse', item.id); + onItemSelected={({ id }) => { + form.setFieldValue('warehouse_id', id); }} selectedItemId={value} buttonProps={{ diff --git a/src/containers/Sales/Invoices/InvoiceForm/utils.js b/src/containers/Sales/Invoices/InvoiceForm/utils.js index 7116ba19d..cbe52c399 100644 --- a/src/containers/Sales/Invoices/InvoiceForm/utils.js +++ b/src/containers/Sales/Invoices/InvoiceForm/utils.js @@ -43,6 +43,9 @@ export const defaultInvoice = { reference_no: '', invoice_message: '', terms_conditions: '', + exchange_rate: '', + branch_id: '', + warehouse_id: '', entries: [...repeatValue(defaultInvoiceEntry, MIN_LINES_NUMBER)], }; diff --git a/src/static/json/icons.js b/src/static/json/icons.js index 01f4f6d57..892a994bb 100644 --- a/src/static/json/icons.js +++ b/src/static/json/icons.js @@ -528,7 +528,7 @@ export default { ], viewBox: '0 0 24 24', }, - 'domain-16': { + 'branch-16': { path: [ 'M12 7V3H2v18h20V7H12zM6 19H4v-2h2v2zm0-4H4v-2h2v2zm0-4H4V9h2v2zm0-4H4V5h2v2zm4 12H8v-2h2v2zm0-4H8v-2h2v2zm0-4H8V9h2v2zm0-4H8V5h2v2zm10 12h-8v-2h2v-2h-2v-2h2v-2h-2V9h8v10zm-2-8h-2v2h2v-2zm0 4h-2v2h2v-2z', ], From 7e4208da819589e5bb90120a874c3003aadcf0d0 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Mon, 7 Feb 2022 23:00:15 +0200 Subject: [PATCH 63/72] feat(branches& warehouses): add branches & warehouses activate dialog. --- src/components/DialogsContainer.js | 4 ++ .../BranchActivateDialogContent.js | 43 +++++++++++++++++ .../Dialogs/BranchActivateDialog/index.js | 32 +++++++++++++ .../WarehouseActivateDialogContent.js | 48 +++++++++++++++++++ .../Dialogs/WarehouseActivateDialog/index.js | 32 +++++++++++++ 5 files changed, 159 insertions(+) create mode 100644 src/containers/Dialogs/BranchActivateDialog/BranchActivateDialogContent.js create mode 100644 src/containers/Dialogs/BranchActivateDialog/index.js create mode 100644 src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateDialogContent.js create mode 100644 src/containers/Dialogs/WarehouseActivateDialog/index.js diff --git a/src/components/DialogsContainer.js b/src/components/DialogsContainer.js index ed46913da..833016beb 100644 --- a/src/components/DialogsContainer.js +++ b/src/components/DialogsContainer.js @@ -36,6 +36,8 @@ import CreditNotePdfPreviewDialog from '../containers/Dialogs/CreditNotePdfPrevi import PaymentReceivePdfPreviewDialog from '../containers/Dialogs/PaymentReceivePdfPreviewDialog'; import WarehouseFormDialog from '../containers/Dialogs/WarehouseFormDialog'; import BranchFormDialog from '../containers/Dialogs/BranchFormDialog'; +import BranchActivateDialog from '../containers/Dialogs/BranchActivateDialog'; +import WarehouseActivateDialog from '../containers/Dialogs/WarehouseActivateDialog'; /** * Dialogs container. @@ -82,6 +84,8 @@ export default function DialogsContainer() { + +
); } diff --git a/src/containers/Dialogs/BranchActivateDialog/BranchActivateDialogContent.js b/src/containers/Dialogs/BranchActivateDialog/BranchActivateDialogContent.js new file mode 100644 index 000000000..ab0d71c3f --- /dev/null +++ b/src/containers/Dialogs/BranchActivateDialog/BranchActivateDialogContent.js @@ -0,0 +1,43 @@ +import React from 'react'; +import { Intent, Button, Callout, Classes } from '@blueprintjs/core'; +import { DialogContent, T } from 'components'; +import withDialogActions from 'containers/Dialog/withDialogActions'; + +import { compose } from 'utils'; + +function BranchActivateDialogContent({ + // #ownProps + dialogName, + // #withDialogActions + closeDialog, +}) { + // Handle close button click. + const handleCancelBtnClick = () => { + closeDialog(dialogName); + }; + return ( + +
+ + Aute esse eiusmod dolore ipsum dolor sint qui proident pariatur + proident fugiat ea ad aliquip. + +
+
+
+ + +
+
+ + ); +} +export default compose(withDialogActions)(BranchActivateDialogContent); diff --git a/src/containers/Dialogs/BranchActivateDialog/index.js b/src/containers/Dialogs/BranchActivateDialog/index.js new file mode 100644 index 000000000..26b51a1a2 --- /dev/null +++ b/src/containers/Dialogs/BranchActivateDialog/index.js @@ -0,0 +1,32 @@ +import React from 'react'; +import { FormattedMessage as T } from 'components'; +import { Dialog, DialogSuspense } from 'components'; +import withDialogRedux from 'components/DialogReduxConnect'; + +import { compose } from 'utils'; + +const BranchActivateDialogContent = React.lazy(() => + import('./BranchActivateDialogContent'), +); + +/** + * Branch activate dialog. + */ +function BranchActivateDialog({ dialogName, payload: {}, isOpen }) { + return ( + + + + + + ); +} + +export default compose(withDialogRedux())(BranchActivateDialog); diff --git a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateDialogContent.js b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateDialogContent.js new file mode 100644 index 000000000..c5d481e63 --- /dev/null +++ b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateDialogContent.js @@ -0,0 +1,48 @@ +import React from 'react'; +import { Intent, Button, Callout, Classes } from '@blueprintjs/core'; +import { DialogContent, T } from 'components'; +import withDialogActions from 'containers/Dialog/withDialogActions'; + +import { compose } from 'utils'; + +/** + * Warehouse activate dialog content. + * @returns + */ +function WarehouseActivateDialogContent({ + // #ownProps + dialogName, + // #withDialogActions + closeDialog, +}) { + // Handle close button click. + const handleCancelBtnClick = () => { + closeDialog(dialogName); + }; + return ( + +
+ + Aute esse eiusmod dolore ipsum dolor sint qui proident pariatur + proident fugiat ea ad aliquip. + +
+
+
+ + +
+
+ + ); +} + +export default compose(withDialogActions)(WarehouseActivateDialogContent); diff --git a/src/containers/Dialogs/WarehouseActivateDialog/index.js b/src/containers/Dialogs/WarehouseActivateDialog/index.js new file mode 100644 index 000000000..002eda110 --- /dev/null +++ b/src/containers/Dialogs/WarehouseActivateDialog/index.js @@ -0,0 +1,32 @@ +import React from 'react'; +import { FormattedMessage as T } from 'components'; +import { Dialog, DialogSuspense } from 'components'; +import withDialogRedux from 'components/DialogReduxConnect'; + +import { compose } from 'utils'; + +const WarehouseActivateDialogContent = React.lazy(() => + import('./WarehouseActivateDialogContent'), +); + +/** + * Warehouse activate dialog. + */ +function WarehouseActivateDialog({ dialogName, payload: {}, isOpen }) { + return ( + + + + + + ); +} + +export default compose(withDialogRedux())(WarehouseActivateDialog); From 4a56743af1f2f0b254c6ebd35cb35f25ef96d780 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Mon, 7 Feb 2022 23:00:56 +0200 Subject: [PATCH 64/72] feat(branches& warehouses): add empty status. --- .../Preferences/Branches/BranchesDataTable.js | 7 +++ .../Branches/BranchesEmptyStatus.js | 42 ++++++++++++++++++ .../Preferences/Warehouses/Warehouses.js | 14 +----- .../Warehouses/WarehousesEmptyStatus.js | 43 +++++++++++++++++++ .../Preferences/Warehouses/WarehousesList.js | 24 +++++++++++ .../Preferences/Warehouses/index.js | 4 +- 6 files changed, 119 insertions(+), 15 deletions(-) create mode 100644 src/containers/Preferences/Branches/BranchesEmptyStatus.js create mode 100644 src/containers/Preferences/Warehouses/WarehousesEmptyStatus.js create mode 100644 src/containers/Preferences/Warehouses/WarehousesList.js diff --git a/src/containers/Preferences/Branches/BranchesDataTable.js b/src/containers/Preferences/Branches/BranchesDataTable.js index 2f238fafa..abdab2a13 100644 --- a/src/containers/Preferences/Branches/BranchesDataTable.js +++ b/src/containers/Preferences/Branches/BranchesDataTable.js @@ -3,6 +3,7 @@ import styled from 'styled-components'; import { DataTable } from 'components'; import TableSkeletonRows from 'components/Datatable/TableSkeletonRows'; +import BranchesEmptyStatus from './BranchesEmptyStatus'; import { useBranchesTableColumns, ActionsMenu } from './components'; import { useBranchesContext } from './BranchesProvider'; @@ -24,6 +25,8 @@ function BranchesDataTable({ // Table columns. const columns = useBranchesTableColumns(); + const Time = true; + const { branches, isBranchesLoading, isBranchesFetching } = useBranchesContext(); @@ -35,6 +38,10 @@ function BranchesDataTable({ openAlert('branch-delete', { branchId: id }); }; + if (Time) { + return ; + } + return ( { + openDialog('branch-activate', {}); + }; + + return ( + + + + + + } + /> + ); +} +export default compose(withDialogActions)(BranchesEmptyStatus); diff --git a/src/containers/Preferences/Warehouses/Warehouses.js b/src/containers/Preferences/Warehouses/Warehouses.js index 30e1c0388..936d954c1 100644 --- a/src/containers/Preferences/Warehouses/Warehouses.js +++ b/src/containers/Preferences/Warehouses/Warehouses.js @@ -4,27 +4,15 @@ import styled from 'styled-components'; import { useWarehousesContext } from './WarehousesProvider'; import WarehousesGridItems from './WarehousesGridItems'; -import withDashboardActions from 'containers/Dashboard/withDashboardActions'; - -import { compose } from 'utils'; /** * Warehouses. * @returns */ -function Warehouses({ - // #withDashboardActions - changePreferencesPageTitle, -}) { +export default function Warehouses() { const { warehouses } = useWarehousesContext(); - React.useEffect(() => { - changePreferencesPageTitle(intl.get('warehouses.label')); - }, [changePreferencesPageTitle]); - return warehouses.map((warehouse) => ( )); } - -export default compose(withDashboardActions)(Warehouses); diff --git a/src/containers/Preferences/Warehouses/WarehousesEmptyStatus.js b/src/containers/Preferences/Warehouses/WarehousesEmptyStatus.js new file mode 100644 index 000000000..51b6543b4 --- /dev/null +++ b/src/containers/Preferences/Warehouses/WarehousesEmptyStatus.js @@ -0,0 +1,43 @@ +import React from 'react'; +import styled from 'styled-components'; +import { Button, Intent } from '@blueprintjs/core'; +import { FormattedMessage as T, EmptyStatus } from '../../../components'; +import withDialogActions from 'containers/Dialog/withDialogActions'; + +import { compose } from 'utils'; + +function WarehousesEmptyStatus({ + // #withDialogActions + openDialog, +}) { + // Handle activate action warehouse. + const handleActivateWarehouse = () => { + openDialog('warehouse-activate', {}); + }; + + return ( + + + + + + } + /> + ); +} + +export default compose(withDialogActions)(WarehousesEmptyStatus); diff --git a/src/containers/Preferences/Warehouses/WarehousesList.js b/src/containers/Preferences/Warehouses/WarehousesList.js new file mode 100644 index 000000000..fc6051b3a --- /dev/null +++ b/src/containers/Preferences/Warehouses/WarehousesList.js @@ -0,0 +1,24 @@ +import React from 'react'; +import intl from 'react-intl-universal'; +import Warehouses from './Warehouses'; +import WarehousesEmptyStatus from './WarehousesEmptyStatus'; +import withDashboardActions from 'containers/Dashboard/withDashboardActions'; + +import { compose } from 'utils'; + +function WarehousesList({ + // #withDashboardActions + changePreferencesPageTitle, +}) { + React.useEffect(() => { + changePreferencesPageTitle(intl.get('warehouses.label')); + }, [changePreferencesPageTitle]); + + // if () { + // return ; + // } + + return ; +} + +export default compose(withDashboardActions)(WarehousesList); diff --git a/src/containers/Preferences/Warehouses/index.js b/src/containers/Preferences/Warehouses/index.js index 5a7270e10..e3d8066e4 100644 --- a/src/containers/Preferences/Warehouses/index.js +++ b/src/containers/Preferences/Warehouses/index.js @@ -1,6 +1,6 @@ import React from 'react'; import { WarehousesProvider } from './WarehousesProvider'; -import Warehouses from './Warehouses'; +import WarehousesList from './WarehousesList'; /** * Warehouses Preferences. @@ -9,7 +9,7 @@ import Warehouses from './Warehouses'; export default function WarehousesPerences() { return ( - + ); } From f0dc39eeaf50d34e4eff560b147b14ea4cbb0d4e Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Mon, 7 Feb 2022 23:01:12 +0200 Subject: [PATCH 65/72] feat(branches& warehouses): add api. --- src/hooks/query/branches.js | 16 ++++++++++++++++ src/hooks/query/warehouses.js | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/hooks/query/branches.js b/src/hooks/query/branches.js index b4cbb7daf..2eb95f58c 100644 --- a/src/hooks/query/branches.js +++ b/src/hooks/query/branches.js @@ -97,3 +97,19 @@ export function useBranch(id, props, requestProps) { }, ); } + +/** + * Activate the given branches. + */ +export function useActivateBranches(props) { + const queryClient = useQueryClient(); + const apiRequest = useApiRequest(); + + return useMutation((id) => apiRequest.post(`branches/activate`), { + onSuccess: (res, id) => { + // Common invalidate queries. + commonInvalidateQueries(queryClient); + }, + ...props, + }); +} diff --git a/src/hooks/query/warehouses.js b/src/hooks/query/warehouses.js index a095ab87e..18bca2b04 100644 --- a/src/hooks/query/warehouses.js +++ b/src/hooks/query/warehouses.js @@ -217,3 +217,19 @@ export function useRefreshWarehouseTransfers() { }, }; } + +/** + * Activate the given warehouse. + */ +export function useActivateWarehouses(props) { + const queryClient = useQueryClient(); + const apiRequest = useApiRequest(); + + return useMutation((id) => apiRequest.post(`warehouses/activate`), { + onSuccess: (res, id) => { + // Common invalidate queries. + commonInvalidateQueries(queryClient); + }, + ...props, + }); +} From 28a9fd239081af23e825580a62e5176d849702d5 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 8 Feb 2022 16:05:40 +0200 Subject: [PATCH 66/72] feat(branches& warehouses): fix EmptyStatus. --- src/common/classes.js | 1 + .../Preferences/Branches/Branches.js | 2 - .../Preferences/Branches/BranchesDataTable.js | 38 +++++++++++-------- .../Preferences/Branches/BranchesProvider.js | 10 +---- .../Preferences/Warehouses/WarehousesList.js | 15 +++++++- .../Warehouses/WarehousesProvider.js | 17 +++++---- src/style/pages/Preferences/branchesList.scss | 6 +++ .../pages/Preferences/warehousesList.scss | 5 +++ 8 files changed, 58 insertions(+), 36 deletions(-) create mode 100644 src/style/pages/Preferences/branchesList.scss create mode 100644 src/style/pages/Preferences/warehousesList.scss diff --git a/src/common/classes.js b/src/common/classes.js index c00f489f3..0672377fb 100644 --- a/src/common/classes.js +++ b/src/common/classes.js @@ -72,6 +72,7 @@ const CLASSES = { PREFERENCES_PAGE_INSIDE_CONTENT_SMS_INTEGRATION: 'preferences-page__inside-content--sms-integration', PREFERENCES_PAGE_INSIDE_CONTENT_ROLES_FORM: 'preferences-page__inside-content--roles-form', PREFERENCES_PAGE_INSIDE_CONTENT_BRANCHES: 'preferences-page__inside-content--branches', + PREFERENCES_PAGE_INSIDE_CONTENT_WAREHOUSES: 'preferences-page__inside-content--warehouses', FINANCIAL_REPORT_INSIDER: 'dashboard__insider--financial-report', diff --git a/src/containers/Preferences/Branches/Branches.js b/src/containers/Preferences/Branches/Branches.js index af93b014c..e7b434354 100644 --- a/src/containers/Preferences/Branches/Branches.js +++ b/src/containers/Preferences/Branches/Branches.js @@ -1,7 +1,5 @@ import React from 'react'; import intl from 'react-intl-universal'; -import classNames from 'classnames'; -import { CLASSES } from 'common/classes'; import BranchesDataTable from './BranchesDataTable'; import withDashboardActions from 'containers/Dashboard/withDashboardActions'; diff --git a/src/containers/Preferences/Branches/BranchesDataTable.js b/src/containers/Preferences/Branches/BranchesDataTable.js index abdab2a13..1a47a03d8 100644 --- a/src/containers/Preferences/Branches/BranchesDataTable.js +++ b/src/containers/Preferences/Branches/BranchesDataTable.js @@ -1,7 +1,9 @@ import React from 'react'; import styled from 'styled-components'; -import { DataTable } from 'components'; +import 'style/pages/Preferences/branchesList.scss'; + +import { DataTable, Card } from 'components'; import TableSkeletonRows from 'components/Datatable/TableSkeletonRows'; import BranchesEmptyStatus from './BranchesEmptyStatus'; import { useBranchesTableColumns, ActionsMenu } from './components'; @@ -43,23 +45,27 @@ function BranchesDataTable({ } return ( - + + + ); } export default compose(withDialogActions, withAlertActions)(BranchesDataTable); -const BranchesTable = styled(DataTable)``; +const BranchesTableCard = styled(Card)` + padding: 0; +`; diff --git a/src/containers/Preferences/Branches/BranchesProvider.js b/src/containers/Preferences/Branches/BranchesProvider.js index eb6f47f3a..da17ca418 100644 --- a/src/containers/Preferences/Branches/BranchesProvider.js +++ b/src/containers/Preferences/Branches/BranchesProvider.js @@ -1,8 +1,6 @@ import React from 'react'; -import styled from 'styled-components'; import classNames from 'classnames'; import { CLASSES } from 'common/classes'; -import { Card } from 'components'; import { useBranches } from 'hooks/query'; import PreferencesPageLoader from '../PreferencesPageLoader'; @@ -33,16 +31,10 @@ function BranchesProvider({ ...props }) { CLASSES.PREFERENCES_PAGE_INSIDE_CONTENT_BRANCHES, )} > - - - +
); } const useBranchesContext = () => React.useContext(BranchesContext); export { BranchesProvider, useBranchesContext }; - -const BrachesPreferencesCard = styled(Card)` - padding: 0; -`; diff --git a/src/containers/Preferences/Warehouses/WarehousesList.js b/src/containers/Preferences/Warehouses/WarehousesList.js index fc6051b3a..d23f20632 100644 --- a/src/containers/Preferences/Warehouses/WarehousesList.js +++ b/src/containers/Preferences/Warehouses/WarehousesList.js @@ -1,5 +1,8 @@ import React from 'react'; +import styled from 'styled-components'; import intl from 'react-intl-universal'; + +import '../../../style/pages/Preferences/warehousesList.scss'; import Warehouses from './Warehouses'; import WarehousesEmptyStatus from './WarehousesEmptyStatus'; import withDashboardActions from 'containers/Dashboard/withDashboardActions'; @@ -18,7 +21,17 @@ function WarehousesList({ // return ; // } - return ; + return ( + + + + ); } export default compose(withDashboardActions)(WarehousesList); + +const WarehousesListRoot = styled.div` + display: flex; + flex-wrap: wrap; + margin: 15px; +`; diff --git a/src/containers/Preferences/Warehouses/WarehousesProvider.js b/src/containers/Preferences/Warehouses/WarehousesProvider.js index 3b2320431..bbcfdcf38 100644 --- a/src/containers/Preferences/Warehouses/WarehousesProvider.js +++ b/src/containers/Preferences/Warehouses/WarehousesProvider.js @@ -21,14 +21,19 @@ function WarehousesProvider({ ...props }) { }; return ( -
- +
+ {isWarehouesLoading ? ( ) : ( )} - +
); } @@ -37,8 +42,4 @@ const useWarehousesContext = () => React.useContext(WarehousesContext); export { WarehousesProvider, useWarehousesContext }; -const WarehousePreference = styled.div` - display: flex; - flex-wrap: wrap; - margin: 15px; -`; +const WarehousePreference = styled.div``; diff --git a/src/style/pages/Preferences/branchesList.scss b/src/style/pages/Preferences/branchesList.scss new file mode 100644 index 000000000..ffdfaa9a0 --- /dev/null +++ b/src/style/pages/Preferences/branchesList.scss @@ -0,0 +1,6 @@ +// Branches List. +// --------------------------------- +.preferences-page__inside-content--branches { + height: 100%; + +} diff --git a/src/style/pages/Preferences/warehousesList.scss b/src/style/pages/Preferences/warehousesList.scss new file mode 100644 index 000000000..f80a690a1 --- /dev/null +++ b/src/style/pages/Preferences/warehousesList.scss @@ -0,0 +1,5 @@ +// warehouses List. +// --------------------------------- +.preferences-page__inside-content--warehouses { + height: 100%; +} From 76a15c3f4e0fb05191a7dfcaa1a482889ddc9e82 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 8 Feb 2022 20:16:46 +0200 Subject: [PATCH 67/72] feat(branche & warehouse activate) add api. --- .../BranchActivateDialogContent.js | 40 ++---------- .../BranchActivateForm.js | 64 +++++++++++++++++++ .../BranchActivateFormContent.js | 21 ++++++ .../BranchActivateFormFloatingActions.js | 47 ++++++++++++++ .../BranchActivateFormProvider.js | 29 +++++++++ .../WarehouseActivateDialogContent.js | 45 ++----------- .../WarehouseActivateForm.js | 63 ++++++++++++++++++ .../WarehouseActivateFormContent.js | 22 +++++++ .../WarehouseActivateFormFloatingActions.js | 46 +++++++++++++ .../WarehouseActivateFormProvider.js | 31 +++++++++ 10 files changed, 335 insertions(+), 73 deletions(-) create mode 100644 src/containers/Dialogs/BranchActivateDialog/BranchActivateForm.js create mode 100644 src/containers/Dialogs/BranchActivateDialog/BranchActivateFormContent.js create mode 100644 src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.js create mode 100644 src/containers/Dialogs/BranchActivateDialog/BranchActivateFormProvider.js create mode 100644 src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateForm.js create mode 100644 src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormContent.js create mode 100644 src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.js create mode 100644 src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormProvider.js diff --git a/src/containers/Dialogs/BranchActivateDialog/BranchActivateDialogContent.js b/src/containers/Dialogs/BranchActivateDialog/BranchActivateDialogContent.js index ab0d71c3f..31c1f8a86 100644 --- a/src/containers/Dialogs/BranchActivateDialog/BranchActivateDialogContent.js +++ b/src/containers/Dialogs/BranchActivateDialog/BranchActivateDialogContent.js @@ -1,43 +1,15 @@ import React from 'react'; -import { Intent, Button, Callout, Classes } from '@blueprintjs/core'; -import { DialogContent, T } from 'components'; -import withDialogActions from 'containers/Dialog/withDialogActions'; -import { compose } from 'utils'; +import BranchActivateForm from './BranchActivateForm'; +import { BranchActivateFormProvider } from './BranchActivateFormProvider'; -function BranchActivateDialogContent({ +export default function BranchActivateDialogContent({ // #ownProps dialogName, - // #withDialogActions - closeDialog, }) { - // Handle close button click. - const handleCancelBtnClick = () => { - closeDialog(dialogName); - }; return ( - -
- - Aute esse eiusmod dolore ipsum dolor sint qui proident pariatur - proident fugiat ea ad aliquip. - -
-
-
- - -
-
- + + + ); } -export default compose(withDialogActions)(BranchActivateDialogContent); diff --git a/src/containers/Dialogs/BranchActivateDialog/BranchActivateForm.js b/src/containers/Dialogs/BranchActivateDialog/BranchActivateForm.js new file mode 100644 index 000000000..d5f154a40 --- /dev/null +++ b/src/containers/Dialogs/BranchActivateDialog/BranchActivateForm.js @@ -0,0 +1,64 @@ +import React from 'react'; +import intl from 'react-intl-universal'; + +import { Formik } from 'formik'; +import { Intent } from '@blueprintjs/core'; + +import { AppToaster } from 'components'; +import { useBranchActivateContext } from './BranchActivateFormProvider'; +import BranchActivateFormContent from './BranchActivateFormContent'; + +import withDialogActions from 'containers/Dialog/withDialogActions'; + +import { compose } from 'utils'; + +/** + * Branch activate form. + */ +function BranchActivateForm({ + // #withDialogActions + closeDialog, +}) { + const { activateBranches, dialogName } = useBranchActivateContext(); + + // Initial form values + const initialValues = {}; + + // Handles the form submit. + const handleFormSubmit = (values, { setSubmitting, setErrors }) => { + const form = { + ...values, + }; + setSubmitting(true); + // Handle request response success. + const onSuccess = (response) => { + AppToaster.show({ + message: intl.get('branch_activate.dialog_success_message'), + intent: Intent.SUCCESS, + }); + closeDialog(dialogName); + }; + + // Handle request response errors. + const onError = ({ + response: { + data: { errors }, + }, + }) => { + if (errors) { + } + setSubmitting(false); + }; + activateBranches(form).then(onSuccess).catch(onError); + }; + + return ( + + ); +} + +export default compose(withDialogActions)(BranchActivateForm); diff --git a/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormContent.js b/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormContent.js new file mode 100644 index 000000000..e6b7d0169 --- /dev/null +++ b/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormContent.js @@ -0,0 +1,21 @@ +import React from 'react'; +import { Form } from 'formik'; +import { Intent, Callout, Classes } from '@blueprintjs/core'; +import BranchActivateFormFloatingActions from './BranchActivateFormFloatingActions'; + +/** + * Branch activate form content. + */ +export default function BranchActivateFormContent() { + return ( + +
+ + Aute esse eiusmod dolore ipsum dolor sint qui proident pariatur + proident fugiat ea ad aliquip. + +
+ + + ); +} diff --git a/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.js b/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.js new file mode 100644 index 000000000..395758d44 --- /dev/null +++ b/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.js @@ -0,0 +1,47 @@ +import React from 'react'; +import { Intent, Button, Classes } from '@blueprintjs/core'; +import { useFormikContext } from 'formik'; +import { FormattedMessage as T } from 'components'; + +import { useBranchActivateContext } from './BranchActivateFormProvider'; +import withDialogActions from 'containers/Dialog/withDialogActions'; +import { compose } from 'utils'; + +/** + * branch activate form floating actions. + */ +function BranchActivateFormFloatingActions({ + // #withDialogActions + closeDialog, +}) { + // branch activate dialog context. + const { dialogName } = useBranchActivateContext(); + + // Formik context. + const { isSubmitting } = useFormikContext(); + + // Handle close button click. + const handleCancelBtnClick = () => { + closeDialog(dialogName); + }; + + return ( +
+
+ + +
+
+ ); +} + +export default compose(withDialogActions)(BranchActivateFormFloatingActions); diff --git a/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormProvider.js b/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormProvider.js new file mode 100644 index 000000000..5e0299b6f --- /dev/null +++ b/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormProvider.js @@ -0,0 +1,29 @@ +import React from 'react'; + +import { DialogContent } from 'components'; +import { useActivateBranches } from 'hooks/query'; + +const BranchActivateContext = React.createContext(); + +/** + * Branch activate form provider. + */ +function BranchActivateFormProvider({ dialogName, ...props }) { + const { mutateAsync: activateBranches, isLoading } = useActivateBranches(); + + // State provider. + const provider = { + activateBranches, + dialogName, + }; + + return ( + + + + ); +} + +const useBranchActivateContext = () => React.useContext(BranchActivateContext); + +export { BranchActivateFormProvider, useBranchActivateContext }; diff --git a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateDialogContent.js b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateDialogContent.js index c5d481e63..b0950d535 100644 --- a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateDialogContent.js +++ b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateDialogContent.js @@ -1,48 +1,15 @@ import React from 'react'; -import { Intent, Button, Callout, Classes } from '@blueprintjs/core'; -import { DialogContent, T } from 'components'; -import withDialogActions from 'containers/Dialog/withDialogActions'; -import { compose } from 'utils'; +import WarehouseActivateForm from './WarehouseActivateForm'; +import { WarehouseActivateFormProvider } from './WarehouseActivateFormProvider'; -/** - * Warehouse activate dialog content. - * @returns - */ -function WarehouseActivateDialogContent({ +export default function WarehouseActivateDialogContent({ // #ownProps dialogName, - // #withDialogActions - closeDialog, }) { - // Handle close button click. - const handleCancelBtnClick = () => { - closeDialog(dialogName); - }; return ( - -
- - Aute esse eiusmod dolore ipsum dolor sint qui proident pariatur - proident fugiat ea ad aliquip. - -
-
-
- - -
-
- + + + ); } - -export default compose(withDialogActions)(WarehouseActivateDialogContent); diff --git a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateForm.js b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateForm.js new file mode 100644 index 000000000..748023d45 --- /dev/null +++ b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateForm.js @@ -0,0 +1,63 @@ +import React from 'react'; +import intl from 'react-intl-universal'; + +import { Formik } from 'formik'; +import { Intent } from '@blueprintjs/core'; + +import { AppToaster } from 'components'; +import { useWarehouseActivateContext } from './WarehouseActivateFormProvider'; +import WarehouseActivateFormContent from './WarehouseActivateFormContent'; + +import withDialogActions from 'containers/Dialog/withDialogActions'; + +import { compose } from 'utils'; + +/** + * warehouse activate form. + */ +function WarehouseActivateForm({ + // #withDialogActions + closeDialog, +}) { + const { activateWarehouses, dialogName } = useWarehouseActivateContext(); + + // Initial form values + const initialValues = {}; + + // Handles the form submit. + const handleFormSubmit = (values, { setSubmitting, setErrors }) => { + const form = { + ...values, + }; + setSubmitting(true); + // Handle request response success. + const onSuccess = (response) => { + AppToaster.show({ + message: intl.get('warehouse_activate.dialog_success_message'), + intent: Intent.SUCCESS, + }); + closeDialog(dialogName); + }; + + // Handle request response errors. + const onError = ({ + response: { + data: { errors }, + }, + }) => { + if (errors) { + } + setSubmitting(false); + }; + activateWarehouses(form).then(onSuccess).catch(onError); + }; + + return ( + + ); +} +export default compose(withDialogActions)(WarehouseActivateForm); diff --git a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormContent.js b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormContent.js new file mode 100644 index 000000000..137142a05 --- /dev/null +++ b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormContent.js @@ -0,0 +1,22 @@ +import React from 'react'; +import { Form } from 'formik'; +import { Intent, Callout, Classes } from '@blueprintjs/core'; + +import WarehouseActivateFormFloatingActions from './WarehouseActivateFormFloatingActions'; + +/** + * warehouse activate form content. + */ +export default function WarehouseActivateFormContent() { + return ( +
+
+ + Aute esse eiusmod dolore ipsum dolor sint qui proident pariatur + proident fugiat ea ad aliquip. + +
+ + + ); +} diff --git a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.js b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.js new file mode 100644 index 000000000..ab6444268 --- /dev/null +++ b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.js @@ -0,0 +1,46 @@ +import React from 'react'; +import { Intent, Button, Classes } from '@blueprintjs/core'; +import { useFormikContext } from 'formik'; +import { FormattedMessage as T } from 'components'; + +import { useWarehouseActivateContext } from './WarehouseActivateFormProvider'; +import withDialogActions from 'containers/Dialog/withDialogActions'; +import { compose } from 'utils'; + +/** + * warehouse activate form floating actions. + */ +function WarehouseActivateFormFloatingActions({ + // #withDialogActions + closeDialog, +}) { + // warehouse activate dialog context. + const { dialogName } = useWarehouseActivateContext(); + + // Formik context. + const { isSubmitting } = useFormikContext(); + + // Handle close button click. + const handleCancelBtnClick = () => { + closeDialog(dialogName); + }; + + return ( +
+
+ + +
+
+ ); +} +export default compose(withDialogActions)(WarehouseActivateFormFloatingActions); diff --git a/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormProvider.js b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormProvider.js new file mode 100644 index 000000000..5d8b84a40 --- /dev/null +++ b/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormProvider.js @@ -0,0 +1,31 @@ +import React from 'react'; + +import { DialogContent } from 'components'; +import { useActivateWarehouses } from 'hooks/query'; + +const WarehouseActivateContext = React.createContext(); + +/** + * warehouse activate form provider. + */ +function WarehouseActivateFormProvider({ dialogName, ...props }) { + const { mutateAsync: activateWarehouses, isLoading } = + useActivateWarehouses(); + + // State provider. + const provider = { + activateWarehouses, + dialogName, + }; + + return ( + + + + ); +} + +const useWarehouseActivateContext = () => + React.useContext(WarehouseActivateContext); + +export { WarehouseActivateFormProvider, useWarehouseActivateContext }; From 5aae2c849d112b4591932ad370ec89e82fec503c Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 8 Feb 2022 20:31:15 +0200 Subject: [PATCH 68/72] feat(branche & warehouse ) add mark primary alert. --- .../Alerts/Branches/BranchMarkPrimaryAlert.js | 70 +++++++++++++++++++ .../Warehouses/WarehouseMarkPrimaryAlert.js | 70 +++++++++++++++++++ .../Preferences/Branches/BranchesAlerts.js | 11 ++- .../Preferences/Branches/BranchesDataTable.js | 16 +++-- .../Preferences/Branches/components.js | 7 +- .../Warehouses/WarehousesAlerts.js | 11 ++- .../Warehouses/WarehousesGridItems.js | 6 ++ .../Preferences/Warehouses/WarehousesList.js | 2 +- .../Warehouses/WarehousesProvider.js | 6 +- .../Preferences/Warehouses/components.js | 2 +- src/hooks/query/branches.js | 18 +++++ src/hooks/query/warehouses.js | 18 +++++ src/lang/en/index.json | 28 +++++--- 13 files changed, 242 insertions(+), 23 deletions(-) create mode 100644 src/containers/Alerts/Branches/BranchMarkPrimaryAlert.js create mode 100644 src/containers/Alerts/Warehouses/WarehouseMarkPrimaryAlert.js diff --git a/src/containers/Alerts/Branches/BranchMarkPrimaryAlert.js b/src/containers/Alerts/Branches/BranchMarkPrimaryAlert.js new file mode 100644 index 000000000..e61159587 --- /dev/null +++ b/src/containers/Alerts/Branches/BranchMarkPrimaryAlert.js @@ -0,0 +1,70 @@ +import React from 'react'; +import intl from 'react-intl-universal'; +import { Intent, Alert } from '@blueprintjs/core'; +import { FormattedMessage as T } from 'components'; + +import { useMarkPrimaryBranches } from 'hooks/query'; +import { AppToaster } from 'components'; + +import withAlertActions from 'containers/Alert/withAlertActions'; +import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect'; + +import { compose } from 'utils'; + +/** + * branch mark primary alert. + */ +function BranchMarkPrimaryAlert({ + name, + + // #withAlertStoreConnect + isOpen, + payload: { branchId }, + + // #withAlertActions + closeAlert, +}) { + const { mutateAsync: markPrimaryBranchMutate, isLoading } = + useMarkPrimaryBranches(); + + // Handle cancel mark primary alert. + const handleCancelMarkPrimaryAlert = () => { + closeAlert(name); + }; + + // andle cancel mark primary confirm. + const handleConfirmMarkPrimaryBranch = () => { + markPrimaryBranchMutate(branchId) + .then(() => { + AppToaster.show({ + message: intl.get('branch.alert.mark_primary_message'), + intent: Intent.SUCCESS, + }); + closeAlert(name); + }) + .catch((error) => { + closeAlert(name); + }); + }; + + return ( + } + confirmButtonText={} + intent={Intent.WARNING} + isOpen={isOpen} + onCancel={handleCancelMarkPrimaryAlert} + onConfirm={handleConfirmMarkPrimaryBranch} + loading={isLoading} + > +

+ +

+ + ); +} + +export default compose( + withAlertStoreConnect(), + withAlertActions, +)(BranchMarkPrimaryAlert); diff --git a/src/containers/Alerts/Warehouses/WarehouseMarkPrimaryAlert.js b/src/containers/Alerts/Warehouses/WarehouseMarkPrimaryAlert.js new file mode 100644 index 000000000..b51c7fa45 --- /dev/null +++ b/src/containers/Alerts/Warehouses/WarehouseMarkPrimaryAlert.js @@ -0,0 +1,70 @@ +import React from 'react'; +import intl from 'react-intl-universal'; +import { Intent, Alert } from '@blueprintjs/core'; +import { FormattedMessage as T } from 'components'; + +import { useMarkPrimaryWarehouse } from 'hooks/query'; +import { AppToaster } from 'components'; + +import withAlertActions from 'containers/Alert/withAlertActions'; +import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect'; + +import { compose } from 'utils'; + +/** + * warehouse mark primary alert. + */ +function WarehouseMarkPrimaryAlert({ + name, + + // #withAlertStoreConnect + isOpen, + payload: { warehouseId }, + + // #withAlertActions + closeAlert, +}) { + const { mutateAsync: markPrimaryWarehouseMutate, isLoading } = + useMarkPrimaryWarehouse(); + + // Handle cancel mark primary alert. + const handleCancelMarkPrimaryAlert = () => { + closeAlert(name); + }; + + // andle cancel mark primary confirm. + const handleConfirmMarkPrimaryWarehouse = () => { + markPrimaryWarehouseMutate(warehouseId) + .then(() => { + AppToaster.show({ + message: intl.get('warehouse.alert.mark_primary_message'), + intent: Intent.SUCCESS, + }); + closeAlert(name); + }) + .catch((error) => { + closeAlert(name); + }); + }; + + return ( + } + confirmButtonText={} + intent={Intent.WARNING} + isOpen={isOpen} + onCancel={handleCancelMarkPrimaryAlert} + onConfirm={handleConfirmMarkPrimaryWarehouse} + loading={isLoading} + > +

+ +

+ + ); +} + +export default compose( + withAlertStoreConnect(), + withAlertActions, +)(WarehouseMarkPrimaryAlert); diff --git a/src/containers/Preferences/Branches/BranchesAlerts.js b/src/containers/Preferences/Branches/BranchesAlerts.js index c444030db..2facc34b8 100644 --- a/src/containers/Preferences/Branches/BranchesAlerts.js +++ b/src/containers/Preferences/Branches/BranchesAlerts.js @@ -3,5 +3,14 @@ import React from 'react'; const BranchDeleteAlert = React.lazy(() => import('../../Alerts/Branches/BranchDeleteAlert'), ); +const BranchMarkPrimaryAlert = React.lazy(() => + import('../../Alerts/Branches/BranchMarkPrimaryAlert'), +); -export default [{ name: 'branch-delete', component: BranchDeleteAlert }]; +export default [ + { name: 'branch-delete', component: BranchDeleteAlert }, + { + name: 'branch-mark-primary', + component: BranchMarkPrimaryAlert, + }, +]; diff --git a/src/containers/Preferences/Branches/BranchesDataTable.js b/src/containers/Preferences/Branches/BranchesDataTable.js index 1a47a03d8..e34affa54 100644 --- a/src/containers/Preferences/Branches/BranchesDataTable.js +++ b/src/containers/Preferences/Branches/BranchesDataTable.js @@ -27,22 +27,27 @@ function BranchesDataTable({ // Table columns. const columns = useBranchesTableColumns(); - const Time = true; - const { branches, isBranchesLoading, isBranchesFetching } = useBranchesContext(); + // Handle edit branch. const handleEditBranch = ({ id }) => { openDialog('branch-form', { branchId: id, action: 'edit' }); }; + // Handle delete branch. const handleDeleteBranch = ({ id }) => { openAlert('branch-delete', { branchId: id }); }; - if (Time) { - return ; - } + // Handle mark primary branch. + const handleMarkPrimaryBranch = ({ id }) => { + openAlert('branch-mark-primary', { branchId: id }); + }; + + // if (type) { + // return ; + // } return ( @@ -58,6 +63,7 @@ function BranchesDataTable({ payload={{ onEdit: handleEditBranch, onDelete: handleDeleteBranch, + onMarkPrimary: handleMarkPrimaryBranch, }} /> diff --git a/src/containers/Preferences/Branches/components.js b/src/containers/Preferences/Branches/components.js index 771681fba..defa408d6 100644 --- a/src/containers/Preferences/Branches/components.js +++ b/src/containers/Preferences/Branches/components.js @@ -9,7 +9,7 @@ import { Icon } from 'components'; * Context menu of Branches. */ export function ActionsMenu({ - payload: { onEdit, onDelete }, + payload: { onEdit, onDelete, onMarkPrimary }, row: { original }, }) { return ( @@ -19,6 +19,11 @@ export function ActionsMenu({ text={intl.get('branches.action.edit_branch')} onClick={safeCallback(onEdit, original)} /> + } + text={intl.get('branches.action.mark_as_primary')} + onClick={safeCallback(onMarkPrimary, original)} + /> } diff --git a/src/containers/Preferences/Warehouses/WarehousesAlerts.js b/src/containers/Preferences/Warehouses/WarehousesAlerts.js index 7e19d865a..bf2ce3883 100644 --- a/src/containers/Preferences/Warehouses/WarehousesAlerts.js +++ b/src/containers/Preferences/Warehouses/WarehousesAlerts.js @@ -3,8 +3,17 @@ import React from 'react'; const WarehouseDeleteAlert = React.lazy(() => import('../../Alerts/Warehouses/WarehouseDeleteAlert'), ); +const WarehouseMarkPrimaryAlert = React.lazy(() => + import('../../Alerts/Warehouses/WarehouseMarkPrimaryAlert'), +); /** * Warehouses alerts. */ -export default [{ name: 'warehouse-delete', component: WarehouseDeleteAlert }]; +export default [ + { name: 'warehouse-delete', component: WarehouseDeleteAlert }, + { + name: 'warehouse-mark-primary', + component: WarehouseMarkPrimaryAlert, + }, +]; diff --git a/src/containers/Preferences/Warehouses/WarehousesGridItems.js b/src/containers/Preferences/Warehouses/WarehousesGridItems.js index edc33ff22..4668ce10a 100644 --- a/src/containers/Preferences/Warehouses/WarehousesGridItems.js +++ b/src/containers/Preferences/Warehouses/WarehousesGridItems.js @@ -30,12 +30,18 @@ function WarehousesGridItems({ openAlert('warehouse-delete', { warehouseId: warehouse.id }); }; + // Handle mark primary warehouse. + const handleMarkPrimaryWarehouse = () => { + openAlert('warehouse-mark-primary', { warehouseId: warehouse.id }); + }; + return ( } > diff --git a/src/containers/Preferences/Warehouses/WarehousesList.js b/src/containers/Preferences/Warehouses/WarehousesList.js index d23f20632..c2e6c7816 100644 --- a/src/containers/Preferences/Warehouses/WarehousesList.js +++ b/src/containers/Preferences/Warehouses/WarehousesList.js @@ -17,7 +17,7 @@ function WarehousesList({ changePreferencesPageTitle(intl.get('warehouses.label')); }, [changePreferencesPageTitle]); - // if () { + // if (type) { // return ; // } diff --git a/src/containers/Preferences/Warehouses/WarehousesProvider.js b/src/containers/Preferences/Warehouses/WarehousesProvider.js index bbcfdcf38..69ba03b5f 100644 --- a/src/containers/Preferences/Warehouses/WarehousesProvider.js +++ b/src/containers/Preferences/Warehouses/WarehousesProvider.js @@ -28,11 +28,11 @@ function WarehousesProvider({ ...props }) { )} > - {isWarehouesLoading ? ( + {/* {isWarehouesLoading ? ( - ) : ( + ) : ( */} - )} + {/* )} */}
); diff --git a/src/containers/Preferences/Warehouses/components.js b/src/containers/Preferences/Warehouses/components.js index 7027343b5..bcaf8f419 100644 --- a/src/containers/Preferences/Warehouses/components.js +++ b/src/containers/Preferences/Warehouses/components.js @@ -22,7 +22,7 @@ export function WarehouseContextMenu({ onClick={safeCallback(onEditClick)} /> } + icon={} text={intl.get('warehouses.action.make_as_parimary')} onClick={safeCallback(onPrimary)} /> diff --git a/src/hooks/query/branches.js b/src/hooks/query/branches.js index 2eb95f58c..b9a9e75c7 100644 --- a/src/hooks/query/branches.js +++ b/src/hooks/query/branches.js @@ -113,3 +113,21 @@ export function useActivateBranches(props) { ...props, }); } + +/** + * Mark primary the given branch. + */ +export function useMarkPrimaryBranches(props) { + const queryClient = useQueryClient(); + const apiRequest = useApiRequest(); + + return useMutation((id) => apiRequest.post(`branches/${id}/mark-primary`), { + onSuccess: (res, id) => { + // Invalidate specific inventory adjustment. + queryClient.invalidateQueries([t.BRANCH, id]); + + commonInvalidateQueries(queryClient); + }, + ...props, + }); +} diff --git a/src/hooks/query/warehouses.js b/src/hooks/query/warehouses.js index 18bca2b04..2499aaed4 100644 --- a/src/hooks/query/warehouses.js +++ b/src/hooks/query/warehouses.js @@ -233,3 +233,21 @@ export function useActivateWarehouses(props) { ...props, }); } + +/** + * Mark primary the given branch. + */ +export function useMarkPrimaryWarehouse(props) { + const queryClient = useQueryClient(); + const apiRequest = useApiRequest(); + + return useMutation((id) => apiRequest.post(`warehouses/${id}/mark-primary`), { + onSuccess: (res, id) => { + // Invalidate specific inventory adjustment. + queryClient.invalidateQueries([t.WAREHOUSE, id]); + + commonInvalidateQueries(queryClient); + }, + ...props, + }); +} diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 51c53548b..b41c21b0d 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1816,12 +1816,12 @@ "warehouse_transfer.label.edit_warehouse_transfer": "Edit Warehouse Transfer", "warehouse_transfer.label.new_warehouse_transfer": "New Warehouse Transfer", "warehouse_transfer.label.warehouse_transfer_list": "Warehouse Transfers List", - "warehouse_transfer.success_message":"The warehouse transfer transaction has been created successfully.", - "warehouse_transfer.edit_success_message":"The warehouse transfer transaction has been created successfully.", - "select_warehouse_transfer":"Select Warehouse Transfer", - "warehouse_transfer.alert.delete_message":"The warehouse transfer transaction has been deleted successfully", - "warehouse_transfer.once_delete_this_warehouse_transfer":"Once you delete this warehouse transfer, you won't be able to restore it later. Are you sure you want to delete this warehouse transfer?", - "warehouse_transfer.error.could_not_transfer_item_from_source_to_destination":"Could not transfer item from source to destination on the same warehouse", + "warehouse_transfer.success_message": "The warehouse transfer transaction has been created successfully.", + "warehouse_transfer.edit_success_message": "The warehouse transfer transaction has been created successfully.", + "select_warehouse_transfer": "Select Warehouse Transfer", + "warehouse_transfer.alert.delete_message": "The warehouse transfer transaction has been deleted successfully", + "warehouse_transfer.once_delete_this_warehouse_transfer": "Once you delete this warehouse transfer, you won't be able to restore it later. Are you sure you want to delete this warehouse transfer?", + "warehouse_transfer.error.could_not_transfer_item_from_source_to_destination": "Could not transfer item from source to destination on the same warehouse", "credit_note_preview.dialog.title": "Credit Note PDF Preview", "payment_receive_preview.dialog.title": "Payment Receive PDF Preview", @@ -1829,6 +1829,7 @@ "branches.label.new_branch": "New Branch", "branches.action.edit_branch": "Edit Branch", "branches.action.delete_branch": "Delete Branch", + "branches.action.mark_as_primary": "Make as Primary", "branches.column.branch_name": "Branch name", "branches.column.address": "Address", "branches.column.phone_number": "Phone number", @@ -1845,8 +1846,15 @@ "branch.dialog.label.email": "Email", "branch.dialog.label.website": "Website", "branch.dialog.success_message": "The branch has been created successfully.", - "branch.alert.delete_message":"The branch has been deleted successfully", - "branch.once_delete_this_branch":"Once you delete this branch, you won't be able to restore it later. Are you sure you want to delete this branch?", - "realized_gain_or_loss.label":"Realized Gain or Loss", - "unrealized_gain_or_loss.label":"Unrealized Gain or Loss" + "branch.alert.delete_message": "The branch has been deleted successfully", + "branch.once_delete_this_branch": "Once you delete this branch, you won't be able to restore it later. Are you sure you want to delete this branch?", + "realized_gain_or_loss.label": "Realized Gain or Loss", + "unrealized_gain_or_loss.label": "Unrealized Gain or Loss", + "branch_activate.dialog_success_message": "Multi-branches feature has been activated successfully.", + "branch.alert.mark_primary_message": "The branch has been marked as primary.", + "branch.alert.are_you_sure_you_want_to_make": "Are you sure you want to make a primary branch?", + "warehouse_activate.dialog_success_message": "Multi-branches feature has been activated successfully.", + "warehouse.alert.mark_primary_message": "The given warehouse has been marked as primary.", + "warehouse.alert.are_you_sure_you_want_to_make": "Are you sure you want to make a primary warehouse?", + "make_primary": "Make Primary" } \ No newline at end of file From 91c7d746b1e584bef3cf2f37817289995a93702e Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 8 Feb 2022 21:18:52 +0200 Subject: [PATCH 69/72] fix(warehouse ) fix mark primary warehouse alert. --- src/containers/Alerts/Warehouses/WarehouseMarkPrimaryAlert.js | 2 +- src/containers/Preferences/Warehouses/components.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/containers/Alerts/Warehouses/WarehouseMarkPrimaryAlert.js b/src/containers/Alerts/Warehouses/WarehouseMarkPrimaryAlert.js index b51c7fa45..17f8300f4 100644 --- a/src/containers/Alerts/Warehouses/WarehouseMarkPrimaryAlert.js +++ b/src/containers/Alerts/Warehouses/WarehouseMarkPrimaryAlert.js @@ -31,7 +31,7 @@ function WarehouseMarkPrimaryAlert({ const handleCancelMarkPrimaryAlert = () => { closeAlert(name); }; - + console.log(warehouseId, 'XX'); // andle cancel mark primary confirm. const handleConfirmMarkPrimaryWarehouse = () => { markPrimaryWarehouseMutate(warehouseId) diff --git a/src/containers/Preferences/Warehouses/components.js b/src/containers/Preferences/Warehouses/components.js index bcaf8f419..0928c8c99 100644 --- a/src/containers/Preferences/Warehouses/components.js +++ b/src/containers/Preferences/Warehouses/components.js @@ -12,7 +12,7 @@ import { safeCallback } from 'utils'; export function WarehouseContextMenu({ onEditClick, onDeleteClick, - onPrimary, + onMarkPrimary, }) { return ( @@ -24,7 +24,7 @@ export function WarehouseContextMenu({ } text={intl.get('warehouses.action.make_as_parimary')} - onClick={safeCallback(onPrimary)} + onClick={safeCallback(onMarkPrimary)} /> Date: Wed, 9 Feb 2022 00:23:50 +0200 Subject: [PATCH 70/72] feat(warehouse ): warehouse style. --- .../Preferences/Warehouses/components.js | 60 ++++++++++++------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/src/containers/Preferences/Warehouses/components.js b/src/containers/Preferences/Warehouses/components.js index 0928c8c99..6be10907c 100644 --- a/src/containers/Preferences/Warehouses/components.js +++ b/src/containers/Preferences/Warehouses/components.js @@ -39,36 +39,47 @@ export function WarehouseContextMenu({ export function WarehousesGrid({ warehouse }) { return ( - + {warehouse.name} {warehouse.code} + + + - {warehouse.city} - {warehouse.country} - {warehouse.email} - {warehouse.phone_number} - + + {warehouse.city} + {warehouse.country} + {warehouse.email} + {warehouse.phone_number} + + ); } -const WarehouseGrid = styled.div` +const WarehouseGridWrapper = styled.div` display: flex; flex-direction: column; + flex-shrink: 0; border-radius: 3px; - width: 280px; // 453px - height: 160px; //225px - background: #fff; - margin: 5px; - padding: 16px 12px 10px; border: 1px solid #c8cad0; //#CFD1D6 + background: #fff; + margin: 5px 5px 8px; + width: 300px; // 453px + height: 160px; //225px transition: all 0.1s ease-in-out; + position: relative; &:hover { border-color: #0153cc; } `; +const WarehouseHeader = styled.div` + position: relative; + padding: 16px 12px 10px; +`; + const WarehouseTitle = styled.div` font-size: 14px; //22px font-style: inherit; @@ -78,22 +89,31 @@ const WarehouseTitle = styled.div` line-height: 1; `; -const WarehouseHeader = styled.div` - margin: 4px 0px 15px; -`; - const WarehouseCode = styled.div` display: inline-block; font-size: 11px; color: #6b7176; `; -const WarehouseInfoItem = styled.div` +const WarehouseIcon = styled.div` + position: absolute; + top: 14px; + color: #abb3bb; + right: 12px; +`; + +const WarehouseContent = styled.div` display: inline-block; - font-size: 12px; + position: absolute; + bottom: 8px; + width: 100%; + padding: 0 12px 0px; +`; + +const WarehouseItem = styled.div` + font-size: 11px; color: #000; line-height: 1.3rem; - overflow: hidden; text-overflow: ellipsis; - margin: 0; + overflow: hidden; `; From 9463d8dc1cf59612fae293108d5472759951c9d4 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sun, 13 Feb 2022 15:12:50 +0200 Subject: [PATCH 71/72] fix: realized and unrealized report. --- .../RealizedGainOrLoss/RealizedGainOrLoss.js | 9 --------- .../UnrealizedGainOrLoss/UnrealizedGainOrLoss.js | 7 ------- 2 files changed, 16 deletions(-) diff --git a/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLoss.js b/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLoss.js index 529f2a376..154a9fe1a 100644 --- a/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLoss.js +++ b/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLoss.js @@ -1,11 +1,9 @@ import React from 'react'; import { FinancialStatement } from 'components'; - import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; import RealizedGainOrLossHeader from './RealizedGainOrLossHeader'; -import RealizedGainOrLossTable from './RealizedGainOrLossTable'; import RealizedGainOrLossActionsBar from './RealizedGainOrLossActionsBar'; import withCurrentOrganization from '../../Organization/withCurrentOrganization'; @@ -28,9 +26,6 @@ function RealizedGainOrLoss({ // Handle refetch realized Gain or Loss after filter change. const handleFilterSubmit = (filter) => {}; - // Handle format number submit. - const handleNumberFormatSubmit = (values) => {}; - React.useEffect( () => () => { toggleRealizedGainOrLossFilterDrawer(false); @@ -49,10 +44,6 @@ function RealizedGainOrLoss({ onSubmitFilter={handleFilterSubmit} /> - -
- -
diff --git a/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLoss.js b/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLoss.js index a8f20c4ed..5784a9acc 100644 --- a/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLoss.js +++ b/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLoss.js @@ -4,7 +4,6 @@ import { FinancialStatement } from 'components'; import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; import UnrealizedGainOrLossHeader from './UnrealizedGainOrLossHeader'; -import UnrealizedGainOrLossTable from './UnrealizedGainOrLossTable'; import UnrealizedGainOrLossActionsBar from './UnrealizedGainOrLossActionsBar'; import withCurrentOrganization from '../../Organization/withCurrentOrganization'; @@ -27,9 +26,6 @@ function UnrealizedGainOrLoss({ // Handle refetch unrealized Gain or Loss after filter change. const handleFilterSubmit = (filter) => {}; - // Handle format number submit. - const handleNumberFormatSubmit = (values) => {}; - React.useEffect( () => () => { toggleUnrealizedGainOrLossFilterDrawer(false); @@ -48,9 +44,6 @@ function UnrealizedGainOrLoss({ /> -
- -
From 9b7befc54435d39608a8b5192c1cfbe79eb7a231 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sun, 13 Feb 2022 16:29:50 +0200 Subject: [PATCH 72/72] feat: add feature guard as hook and component. --- src/common/features.js | 6 ++ src/common/index.js | 1 + src/components/FeatureGuard/FeatureCan.js | 13 +++ src/components/FeatureGuard/index.js | 1 + src/components/FeatureGuard/withFeatureCan.js | 17 ++++ src/components/index.js | 1 + .../Drawers/ItemDetailDrawer/ItemDetailTab.js | 17 ++-- .../Invoices/InvoiceForm/InvoiceFormTopBar.js | 84 +++++++++++-------- src/hooks/state/feature.js | 17 ++++ src/hooks/state/index.js | 3 +- src/store/dashboard/dashboard.reducer.js | 4 + src/store/dashboard/dashboard.selectors.js | 9 ++ 12 files changed, 134 insertions(+), 39 deletions(-) create mode 100644 src/common/features.js create mode 100644 src/components/FeatureGuard/FeatureCan.js create mode 100644 src/components/FeatureGuard/index.js create mode 100644 src/components/FeatureGuard/withFeatureCan.js create mode 100644 src/hooks/state/feature.js diff --git a/src/common/features.js b/src/common/features.js new file mode 100644 index 000000000..81df5f3be --- /dev/null +++ b/src/common/features.js @@ -0,0 +1,6 @@ + + +export const Features = { + Warehouses: 'warehouses', + Branches: 'branches' +} \ No newline at end of file diff --git a/src/common/index.js b/src/common/index.js index 626d9153b..2dc45dc41 100644 --- a/src/common/index.js +++ b/src/common/index.js @@ -1,3 +1,4 @@ export * from './TableStyle'; +export * from './features'; export const Align = { Left: 'left', Right: 'right', Center: 'center' }; diff --git a/src/components/FeatureGuard/FeatureCan.js b/src/components/FeatureGuard/FeatureCan.js new file mode 100644 index 000000000..9e21441b6 --- /dev/null +++ b/src/components/FeatureGuard/FeatureCan.js @@ -0,0 +1,13 @@ +import React from 'react'; +import * as R from 'ramda'; +import withFeatureCan from './withFeatureCan'; + +function FeatureCanJSX({ feature, children, isFeatureCan }) { + return isFeatureCan && children; +} + +export const FeatureCan = R.compose( + withFeatureCan(({ isFeatureCan }) => ({ + isFeatureCan, + })), +)(FeatureCanJSX); diff --git a/src/components/FeatureGuard/index.js b/src/components/FeatureGuard/index.js new file mode 100644 index 000000000..d8e32e3b0 --- /dev/null +++ b/src/components/FeatureGuard/index.js @@ -0,0 +1 @@ +export * from './FeatureCan'; \ No newline at end of file diff --git a/src/components/FeatureGuard/withFeatureCan.js b/src/components/FeatureGuard/withFeatureCan.js new file mode 100644 index 000000000..aee7666a8 --- /dev/null +++ b/src/components/FeatureGuard/withFeatureCan.js @@ -0,0 +1,17 @@ +import { connect } from 'react-redux'; +import { getDashboardFeaturesSelector } from '../../store/dashboard/dashboard.selectors'; + +export default (mapState) => { + const featuresSelector = getDashboardFeaturesSelector(); + + const mapStateToProps = (state, props) => { + const features = featuresSelector(state); + + const mapped = { + isFeatureCan: !!features[props.feature], + features, + }; + return mapState ? mapState(mapped, state, props) : mapped; + }; + return connect(mapStateToProps); +}; diff --git a/src/components/index.js b/src/components/index.js index d24fccb58..79f7b5acd 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -96,6 +96,7 @@ export * from './Skeleton'; export * from './FinancialStatement'; export * from './FinancialReport'; export * from './FinancialSheet'; +export * from './FeatureGuard'; const Hint = FieldHint; diff --git a/src/containers/Drawers/ItemDetailDrawer/ItemDetailTab.js b/src/containers/Drawers/ItemDetailDrawer/ItemDetailTab.js index a200ba943..3acaea233 100644 --- a/src/containers/Drawers/ItemDetailDrawer/ItemDetailTab.js +++ b/src/containers/Drawers/ItemDetailDrawer/ItemDetailTab.js @@ -1,12 +1,17 @@ import React from 'react'; import { Tab } from '@blueprintjs/core'; + import { DrawerMainTabs, FormattedMessage as T } from 'components'; import { ItemPaymentTransactions } from './ItemPaymentTransactions'; import ItemDetailHeader from './ItemDetailHeader'; import WarehousesLocationsTable from './WarehousesLocations'; +import { Features } from 'common'; +import { useFeatureCan } from 'hooks/state'; export default function ItemDetailTab() { + const { featureCan } = useFeatureCan(); + return ( } panel={} /> - } - panel={} - /> + {featureCan(Features.Warehouses) && ( + } + panel={} + /> + )} ); } diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js index 1cc828986..90d4c9bbd 100644 --- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js +++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormTopBar.js @@ -7,48 +7,66 @@ import { NavbarDivider, } from '@blueprintjs/core'; -import { Icon, FormattedMessage as T, CustomSelectList } from 'components'; - +import { useFeatureCan } from 'hooks/state'; +import { + Icon, + FormattedMessage as T, + CustomSelectList, + FeatureCan, +} from 'components'; import { useInvoiceFormContext } from './InvoiceFormProvider'; +import { Features } from 'common'; export default function InvoiceFormTopBar() { const { warehouses, branches } = useInvoiceFormContext(); + const { featureCan } = useFeatureCan(); + + // Can't display the navigation bar if warehouses or branches feature is not enabled. + if (!featureCan(Features.Warehouses) || !featureCan(Features.Branches)) { + return null; + } return ( - - {({ form, field: { value }, meta: { error, touched } }) => ( - { - form.setFieldValue('branch_id', id); - }} - selectedItemId={value} - buttonProps={{ - icon: , - }} - /> - )} - + + + {({ form, field: { value }, meta: { error, touched } }) => ( + { + form.setFieldValue('branch_id', id); + }} + selectedItemId={value} + buttonProps={{ + icon: , + }} + /> + )} + + - - - {({ form, field: { value }, meta: { error, touched } }) => ( - { - form.setFieldValue('warehouse_id', id); - }} - selectedItemId={value} - buttonProps={{ - icon: , - }} - /> - )} - + {featureCan(Features.Warehouses) && featureCan(Features.Branches) && ( + + )} + + + {({ form, field: { value }, meta: { error, touched } }) => ( + { + form.setFieldValue('warehouse_id', id); + }} + selectedItemId={value} + buttonProps={{ + icon: , + }} + /> + )} + + ); diff --git a/src/hooks/state/feature.js b/src/hooks/state/feature.js new file mode 100644 index 000000000..4ffe96954 --- /dev/null +++ b/src/hooks/state/feature.js @@ -0,0 +1,17 @@ +import { useSelector } from 'react-redux'; +import { createSelector } from 'reselect'; + +const featuresSelector = createSelector( + (state) => state.dashboard.features, + (features) => features, +); + +export const useFeatureCan = () => { + const features = useSelector(featuresSelector); + + return { + featureCan: (feature) => { + return !!features[feature]; + }, + }; +}; diff --git a/src/hooks/state/index.js b/src/hooks/state/index.js index 75580b504..0b5bb3434 100644 --- a/src/hooks/state/index.js +++ b/src/hooks/state/index.js @@ -3,4 +3,5 @@ export * from './authentication'; export * from './globalErrors'; export * from './subscriptions'; export * from './organizations'; -export * from './settings'; \ No newline at end of file +export * from './settings'; +export * from './feature'; \ No newline at end of file diff --git a/src/store/dashboard/dashboard.reducer.js b/src/store/dashboard/dashboard.reducer.js index 4108cf3af..a512de8f8 100644 --- a/src/store/dashboard/dashboard.reducer.js +++ b/src/store/dashboard/dashboard.reducer.js @@ -19,6 +19,10 @@ const initialState = { splashScreenLoading: null, appIsLoading: true, appIntlIsLoading: true, + features: { + branches: true, + warehouses: true, + }, }; const STORAGE_KEY = 'bigcapital:dashboard'; diff --git a/src/store/dashboard/dashboard.selectors.js b/src/store/dashboard/dashboard.selectors.js index 53e9f2e5c..fd7ef77d1 100644 --- a/src/store/dashboard/dashboard.selectors.js +++ b/src/store/dashboard/dashboard.selectors.js @@ -38,3 +38,12 @@ export const getDrawerPayloadFactory = () => createSelector(drawerByNameSelector, (drawer) => { return { ...drawer?.payload }; }); + +const featuresSelector = (state, props) => { + return state.dashboard.features; +}; + +export const getDashboardFeaturesSelector = () => + createSelector(featuresSelector, (features) => { + return features; + });