fix(webapp): change the default from/to date values of reports

bigcapitalhq · Aug 27, 2023 · 4df6356 · 4df6356
1 parent c7a3bac
commit 4df6356
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 32 deletions.
diff --git a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryProvider.tsx b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryProvider.tsx
@@ -11,19 +11,21 @@ const ARAgingSummaryContext = createContext();
  */
 function ARAgingSummaryProvider({ filter, ...props }) {
   // Transformes the filter from to the url query.
-  const query = useMemo(() => transformFilterFormToQuery(filter), [filter]);
+  const requestQuery = useMemo(
+    () => transformFilterFormToQuery(filter),
+    [filter],
+  );
 
   // A/R aging summary sheet context.
   const {
     data: ARAgingSummary,
     isLoading: isARAgingLoading,
     isFetching: isARAgingFetching,
     refetch,
-  } = useARAgingSummaryReport(query, { keepPreviousData: true });
+  } = useARAgingSummaryReport(requestQuery, { keepPreviousData: true });
 
   const provider = {
     ARAgingSummary,
-
     isARAgingLoading,
     isARAgingFetching,
     refetch,

diff --git a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryTable.tsx b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryTable.tsx
@@ -20,7 +20,7 @@ export default function ReceivableAgingSummaryTable({
 }) {
   // AR aging summary report context.
   const {
-    ARAgingSummary: { table },
+    ARAgingSummary: { table, query },
     isARAgingLoading,
   } = useARAgingSummaryContext();
 
@@ -31,7 +31,7 @@ export default function ReceivableAgingSummaryTable({
     <FinancialSheet
       companyName={organizationName}
       sheetType={intl.get('receivable_aging_summary')}
-      asDate={new Date()}
+      asDate={query.as_date}
       loading={isARAgingLoading}
     >
       <ARAgingSummaryDataTable

diff --git a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/utils.tsx b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/utils.tsx
@@ -15,7 +15,7 @@ import { useAppQueryString } from '@/hooks';
  */
 export const getDefaultBalanceSheetQuery = () => ({
   fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-  toDate: moment().endOf('year').format('YYYY-MM-DD'),
+  toDate: moment().format('YYYY-MM-DD'),
   basis: 'cash',
   displayColumnsType: 'total',
   filterByOption: 'without-zero-balance',

diff --git a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/utils.tsx b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/utils.tsx
@@ -12,7 +12,7 @@ import { useAppQueryString } from '@/hooks';
 export const getDefaultCashFlowSheetQuery = () => {
   return {
     fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-    toDate: moment().endOf('year').format('YYYY-MM-DD'),
+    toDate: moment().format('YYYY-MM-DD'),
     basis: 'cash',
     displayColumnsType: 'total',
     filterByOption: 'with-transactions',

diff --git a/...c/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryTable.tsx b/...c/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryTable.tsx
@@ -18,7 +18,7 @@ export default function CustomersBalanceSummaryTable({
   companyName,
 }) {
   const {
-    CustomerBalanceSummary: { table },
+    CustomerBalanceSummary: { table, query },
   } = useCustomersBalanceSummaryContext();
 
   // Retrieves the customers summary columns.
@@ -28,7 +28,7 @@ export default function CustomersBalanceSummaryTable({
     <FinancialSheet
       companyName={companyName}
       sheetType={intl.get('customers_balance_summary')}
-      asDate={new Date()}
+      asDate={query.as_date}
     >
       <CustomerBalanceDataTable
         columns={columns}

diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/_utils.ts b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/_utils.ts
@@ -13,7 +13,7 @@ export const getCustomersTransactionsQuerySchema = () => {
 };
 
 export const getCustomersTransactionsDefaultQuery = () => ({
-  fromDate: moment().toDate(),
+  fromDate: moment().startOf('month').toDate(),
   toDate: moment().toDate(),
   customersIds: [],
 });
diff --git a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/common.tsx b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/common.tsx
@@ -28,8 +28,8 @@ export const filterAccountsOptions = [
  * Retrieves the default general ledger query.
  */
 export const getDefaultGeneralLedgerQuery = () => ({
-  fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-  toDate: moment().endOf('year').format('YYYY-MM-DD'),
+  fromDate: moment().startOf('month').format('YYYY-MM-DD'),
+  toDate: moment().format('YYYY-MM-DD'),
   basis: 'accrual',
   filterByOption: 'with-transactions',
   branchesIds: [],

diff --git a/...app/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.tsx b/...app/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsTable.tsx
@@ -35,8 +35,8 @@ export function InventoryItemDetailsTable({
       companyName={companyName}
       sheetType={intl.get('inventory_item_details')}
       loading={isInventoryItemDetailsLoading}
-      fromDate={query.from_date}
-      toDate={query.to_date}
+      fromDate={query.fromDate}
+      toDate={query.toDate}
       fullWidth={true}
     >
       <InventoryItemDetailsDataTable

diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/utils.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/utils.tsx
@@ -31,9 +31,6 @@ const numericColumn = R.curry((data, index, column) => ({
   align: Align.Right,
 }));
 
-/**
- *  columns mapper.
- */
 const columnsMapper = R.curry((data, index, column) => ({
   id: column.key,
   key: column.key,

diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/utils2.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/utils2.tsx
@@ -12,8 +12,8 @@ import { transformToForm } from '@/utils';
  * Retrieves inventory item details default query.
  */
 export const getInventoryItemDetailsDefaultQuery = () => ({
-  fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-  toDate: moment().endOf('year').format('YYYY-MM-DD'),
+  fromDate: moment().startOf('month').format('YYYY-MM-DD'),
+  toDate: moment().format('YYYY-MM-DD'),
   itemsIds: [],
   warehousesIds: [],
   branchesIds: [],

diff --git a/.../webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationTable.tsx b/.../webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationTable.tsx
@@ -19,7 +19,7 @@ export default function InventoryValuationTable({
 }) {
   // inventory valuation context.
   const {
-    inventoryValuation: { tableRows },
+    inventoryValuation: { tableRows, query },
     isLoading,
   } = useInventoryValuationContext();
 
@@ -30,7 +30,7 @@ export default function InventoryValuationTable({
     <InventoryValuationSheet
       companyName={companyName}
       sheetType={intl.get('inventory_valuation')}
-      asDate={new Date()}
+      asDate={query.as_date}
       loading={isLoading}
     >
       <InventoryValuationDataTable

diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/utils.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/utils.tsx
@@ -20,7 +20,7 @@ export const getInventoryValuationQuerySchema = () => {
  * Retrieves the inventory valuation sheet default query.
  */
 export const getInventoryValuationQuery = () => ({
-  asDate: moment().endOf('day').format('YYYY-MM-DD'),
+  asDate: moment().format('YYYY-MM-DD'),
   filterByOption: 'with-transactions',
   itemsIds: [],
   branchesIds: [],

diff --git a/packages/webapp/src/containers/FinancialStatements/Journal/utils.tsx b/packages/webapp/src/containers/FinancialStatements/Journal/utils.tsx
@@ -11,17 +11,16 @@ import { transformToForm } from '@/utils';
  */
 export const getDefaultJournalQuery = () => {
   return {
-    fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-    toDate: moment().endOf('year').format('YYYY-MM-DD'),
+    fromDate: moment().startOf('month').format('YYYY-MM-DD'),
+    toDate: moment().format('YYYY-MM-DD'),
     basis: 'accrual',
   };
 };
 
-
 /**
  * Parses balance sheet query.
  */
- const parseJournalQuery = (locationQuery) => {
+const parseJournalQuery = (locationQuery) => {
   const defaultQuery = getDefaultJournalQuery();
 
   return {

diff --git a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/utils.tsx b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/utils.tsx
@@ -16,7 +16,7 @@ import { castArray } from 'lodash';
 export const getDefaultProfitLossQuery = () => ({
   basis: 'cash',
   fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-  toDate: moment().endOf('year').format('YYYY-MM-DD'),
+  toDate: moment().format('YYYY-MM-DD'),
   displayColumnsType: 'total',
   filterByOption: 'with-transactions',
 

diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/utils.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/utils.tsx
@@ -11,8 +11,8 @@ import { castArray } from 'lodash';
  * Retrieves the purchases by items query.
  */
 export const getDefaultPurchasesByItemsQuery = () => ({
-  fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-  toDate: moment().endOf('year').format('YYYY-MM-DD'),
+  fromDate: moment().startOf('month').format('YYYY-MM-DD'),
+  toDate: moment().format('YYYY-MM-DD'),
   filterByOption: 'with-transactions',
   itemsIds: [],
 });

diff --git a/packages/webapp/src/containers/FinancialStatements/SalesByItems/utils.tsx b/packages/webapp/src/containers/FinancialStatements/SalesByItems/utils.tsx
@@ -25,8 +25,8 @@ export const getSalesByItemsQueryShema = () => {
  * Retrieves the default query.
  */
 export const getDefaultSalesByItemsQuery = () => ({
-  fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-  toDate: moment().endOf('year').format('YYYY-MM-DD'),
+  fromDate: moment().startOf('month').format('YYYY-MM-DD'),
+  toDate: moment().format('YYYY-MM-DD'),
   filterByOption: 'with-transactions',
   itemsIds: [],
 });

diff --git a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/utils.tsx b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/utils.tsx
@@ -12,7 +12,7 @@ import { transformToForm } from '@/utils';
 export function getDefaultTrialBalanceQuery() {
   return {
     fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-    toDate: moment().endOf('year').format('YYYY-MM-DD'),
+    toDate: moment().format('YYYY-MM-DD'),
     basis: 'accrual',
     filterByOption: 'with-transactions',
     branchesIds: [],